diff --git a/.buildpacks b/.buildpacks
index 3450683ce84ce6592d034ed2b4d7f7c29259c657..5e73304a5d7c5b9ac8d076a937a735972b2688e0 100644
--- a/.buildpacks
+++ b/.buildpacks
@@ -1,4 +1,3 @@
 https://github.com/heroku/heroku-buildpack-apt
 https://github.com/Scalingo/ffmpeg-buildpack
-https://github.com/Scalingo/nodejs-buildpack
 https://github.com/Scalingo/ruby-buildpack
diff --git a/.codeclimate.yml b/.codeclimate.yml
index d8d5c0ac797f31bd96469473e00a989083681430..dc8ca9a6f2d600fd4c1c9827192cf7592c3cfe09 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -27,10 +27,10 @@ plugins:
     enabled: true
   eslint:
     enabled: true
-    channel: eslint-6
+    channel: eslint-7
   rubocop:
     enabled: true
-    channel: rubocop-0-82
+    channel: rubocop-0-92
   sass-lint:
     enabled: true
 exclude_patterns:
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index f49964bd9f5bfb2637bd258c3c4b399020ad7600..8ae4bb8825335b58f70dc7a45e3e1587deb7c95e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,7 @@
 ---
 name: Bug Report
 about: If something isn't working as expected
-
+labels: bug
 ---
 
 <!-- Make sure that you are submitting a new bug that was not previously reported or already fixed -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 3890729e22f22d5933f2e852573d5ac6c0397fdb..ff92c0316e031a28a4909165df28936998459f9f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,7 +1,6 @@
 ---
 name: Feature Request
 about: I have a suggestion
-
 ---
 
 <!-- Please use a concise and distinct title for the issue -->
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 6b47350a4dd29ee794229388e143be64fd3db9f8..c4cd4887876a0d6ab75f446742300532e8b9ce9e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -11,7 +11,7 @@ updates:
       interval: weekly
     open-pull-requests-limit: 99
     allow:
-      - dependency-type: all
+      - dependency-type: direct
 
   - package-ecosystem: bundler
     directory: "/"
@@ -19,4 +19,4 @@ updates:
       interval: weekly
     open-pull-requests-limit: 99
     allow:
-      - dependency-type: all
+      - dependency-type: direct
diff --git a/.rubocop.yml b/.rubocop.yml
index 25e0fa940b719fe66c416f9ac2445521a2df9eae..14728bf0e9417f3bebcd208eb9c19e11ef31168f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -25,30 +25,68 @@ Layout/AccessModifierIndentation:
 Layout/EmptyLineAfterMagicComment:
   Enabled: false
 
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
+Layout/HashAlignment:
+  Enabled: false
+  # EnforcedHashRocketStyle: table
+  # EnforcedColonStyle: table
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
 Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: space
 
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+
+Lint/DuplicateElsifCondition:
+  Enabled: true
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
 Lint/UselessAccessModifier:
   ContextCreatingMethods:
     - class_methods
 
 Metrics/AbcSize:
   Max: 100
+  Exclude:
+    - 'lib/mastodon/*_cli.rb'
 
 Metrics/BlockLength:
-  Max: 35
+  Max: 55
   Exclude:
     - 'lib/tasks/**/*'
+    - 'lib/mastodon/*_cli.rb'
 
 Metrics/BlockNesting:
   Max: 3
+  Exclude:
+    - 'lib/mastodon/*_cli.rb'
 
 Metrics/ClassLength:
   CountComments: false
-  Max: 300
+  Max: 400
+  Exclude:
+    - 'lib/mastodon/*_cli.rb'
 
 Metrics/CyclomaticComplexity:
   Max: 25
+  Exclude:
+    - 'lib/mastodon/*_cli.rb'
 
 Layout/LineLength:
   AllowURI: true
@@ -56,7 +94,9 @@ Layout/LineLength:
 
 Metrics/MethodLength:
   CountComments: false
-  Max: 55
+  Max: 65
+  Exclude:
+    - 'lib/mastodon/*_cli.rb'
 
 Metrics/ModuleLength:
   CountComments: false
@@ -67,24 +107,29 @@ Metrics/ParameterLists:
   CountKeywordArgs: true
 
 Metrics/PerceivedComplexity:
-  Max: 20
+  Max: 25
 
 Naming/MemoizedInstanceVariableName:
   Enabled: false
 
+Naming/MethodParameterName:
+  Enabled: true
+
 Rails:
   Enabled: true
 
-Rails/EnumHash:
+Rails/ApplicationController:
   Enabled: false
+  Exclude:
+    - 'app/controllers/well_known/**/*.rb'
 
-Rails/HasAndBelongsToMany:
+Rails/BelongsTo:
   Enabled: false
 
-Rails/SkipsModelValidations:
+Rails/ContentTag:
   Enabled: false
 
-Rails/HttpStatus:
+Rails/EnumHash:
   Enabled: false
 
 Rails/Exit:
@@ -92,9 +137,60 @@ Rails/Exit:
     - 'lib/mastodon/*'
     - 'lib/cli.rb'
 
+Rails/FilePath:
+  Enabled: false
+
+Rails/HasAndBelongsToMany:
+  Enabled: false
+
+Rails/HasManyOrHasOneDependent:
+  Enabled: false
+
 Rails/HelperInstanceVariable:
   Enabled: false
 
+Rails/HttpStatus:
+  Enabled: false
+
+Rails/IndexBy:
+  Enabled: false
+
+Rails/InverseOf:
+  Enabled: false
+
+Rails/LexicallyScopedActionFilter:
+  Enabled: false
+
+Rails/OutputSafety:
+  Enabled: true
+
+Rails/RakeEnvironment:
+  Enabled: false
+
+Rails/RedundantForeignKey:
+  Enabled: false
+
+Rails/SkipsModelValidations:
+  Enabled: false
+
+Rails/UniqueValidationWithoutIndex:
+  Enabled: false
+
+Style/AccessorGrouping:
+  Enabled: true
+
+Style/AccessModifierDeclarations:
+  Enabled: false
+
+Style/ArrayCoercion:
+  Enabled: true
+
+Style/BisectedAttrAccessor:
+  Enabled: true
+
+Style/CaseLikeIf:
+  Enabled: false
+
 Style/ClassAndModuleChildren:
   Enabled: false
 
@@ -109,6 +205,15 @@ Style/Documentation:
 Style/DoubleNegation:
   Enabled: true
 
+Style/ExpandPathArguments:
+  Enabled: false
+
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/FormatString:
+  Enabled: false
+
 Style/FormatStringToken:
   Enabled: false
 
@@ -118,9 +223,33 @@ Style/FrozenStringLiteralComment:
 Style/GuardClause:
   Enabled: false
 
+Style/HashAsLastArrayItem:
+  Enabled: false
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashLikeCase:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: false
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/InverseMethods:
+  Enabled: false
+
 Style/Lambda:
   Enabled: false
 
+Style/MutableConstant:
+  Enabled: false
+
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     '%i': '()'
@@ -129,9 +258,36 @@ Style/PercentLiteralDelimiters:
 Style/PerlBackrefs:
   AutoCorrect: false
 
+Style/RedundantAssignment:
+  Enabled: false
+
+Style/RedundantFetchBlock:
+  Enabled: true
+
+Style/RedundantFileExtensionInRequire:
+  Enabled: true
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: false
+
+Style/RedundantRegexpEscape:
+  Enabled: false
+
+Style/RedundantReturn:
+  Enabled: true
+
 Style/RegexpLiteral:
   Enabled: false
 
+Style/RescueStandardError:
+  Enabled: false
+
+Style/SignalException:
+  Enabled: false
+
+Style/SlicingWithRange:
+  Enabled: true
+
 Style/SymbolArray:
   Enabled: false
 
@@ -140,3 +296,6 @@ Style/TrailingCommaInArrayLiteral:
 
 Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: 'comma'
+
+Style/UnpackFirst:
+  Enabled: false
diff --git a/.ruby-version b/.ruby-version
index 338a5b5d8fec491b97978114dc35e36348fa56a7..37c2961c2430f357166156e7ddf1c590eb8d4ce1 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.6.6
+2.7.2
diff --git a/AUTHORS.md b/AUTHORS.md
index 5ff241afd3605c403d7321f3037c44466a5311d9..43adc3bb1af4085d1e479480e3709c087b898346 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -5,38 +5,39 @@ Mastodon is available on [GitHub](https://github.com/tootsuite/mastodon)
 and provided thanks to the work of the following contributors:
 
 * [Gargron](https://github.com/Gargron)
-* [dependabot-preview[bot]](https://github.com/apps/dependabot-preview)
 * [ThibG](https://github.com/ThibG)
-* [ykzts](https://github.com/ykzts)
+* [dependabot-preview[bot]](https://github.com/apps/dependabot-preview)
 * [dependabot[bot]](https://github.com/apps/dependabot)
+* [ykzts](https://github.com/ykzts)
 * [akihikodaki](https://github.com/akihikodaki)
 * [mjankowski](https://github.com/mjankowski)
 * [unarist](https://github.com/unarist)
 * [yiskah](https://github.com/yiskah)
 * [nolanlawson](https://github.com/nolanlawson)
 * [abcang](https://github.com/abcang)
-* [ysksn](https://github.com/ysksn)
 * [mayaeh](https://github.com/mayaeh)
+* [ysksn](https://github.com/ysksn)
 * [sorin-davidoi](https://github.com/sorin-davidoi)
+* [noellabo](https://github.com/noellabo)
 * [lynlynlynx](https://github.com/lynlynlynx)
 * [m4sk1n](mailto:me@m4sk.in)
 * [Marcin MikoÅ‚ajczak](mailto:me@m4sk.in)
 * [Kjwon15](https://github.com/Kjwon15)
-* [noellabo](https://github.com/noellabo)
 * [renatolond](https://github.com/renatolond)
 * [alpaca-tc](https://github.com/alpaca-tc)
 * [jeroenpraat](https://github.com/jeroenpraat)
 * [nclm](https://github.com/nclm)
 * [ineffyble](https://github.com/ineffyble)
-* [shleeable](https://github.com/shleeable)
 * [zunda](https://github.com/zunda)
+* [shleeable](https://github.com/shleeable)
 * [Masoud Abkenar](mailto:ampbox@gmail.com)
 * [blackle](https://github.com/blackle)
 * [Quent-in](https://github.com/Quent-in)
 * [JantsoP](https://github.com/JantsoP)
 * [nullkal](https://github.com/nullkal)
 * [yookoala](https://github.com/yookoala)
-* [Sasha-Sorokin](https://github.com/Sasha-Sorokin)
+* [Brawaru](https://github.com/Brawaru)
+* [ariasuni](https://github.com/ariasuni)
 * [Aditoo17](https://github.com/Aditoo17)
 * [Quenty31](https://github.com/Quenty31)
 * [marek-lach](https://github.com/marek-lach)
@@ -45,9 +46,9 @@ and provided thanks to the work of the following contributors:
 * [danhunsaker](https://github.com/danhunsaker)
 * [eramdam](https://github.com/eramdam)
 * [takayamaki](https://github.com/takayamaki)
-* [ariasuni](https://github.com/ariasuni)
 * [masarakki](https://github.com/masarakki)
 * [ticky](https://github.com/ticky)
+* [trwnh](https://github.com/trwnh)
 * [ThisIsMissEm](https://github.com/ThisIsMissEm)
 * [hinaloe](https://github.com/hinaloe)
 * [hcmiya](https://github.com/hcmiya)
@@ -57,10 +58,10 @@ and provided thanks to the work of the following contributors:
 * [yukimochi](https://github.com/yukimochi)
 * [palindromordnilap](https://github.com/palindromordnilap)
 * [rkarabut](https://github.com/rkarabut)
-* [trwnh](https://github.com/trwnh)
 * [nightpool](https://github.com/nightpool)
 * [Artoria2e5](https://github.com/Artoria2e5)
 * [marrus-sh](https://github.com/marrus-sh)
+* [dunn](https://github.com/dunn)
 * [krainboltgreene](https://github.com/krainboltgreene)
 * [pfigel](https://github.com/pfigel)
 * [BoFFire](https://github.com/BoFFire)
@@ -84,25 +85,25 @@ and provided thanks to the work of the following contributors:
 * [ashleyhull-versent](https://github.com/ashleyhull-versent)
 * [yhirano55](https://github.com/yhirano55)
 * [rinsuki](https://github.com/rinsuki)
-* [dunn](https://github.com/dunn)
 * [devkral](https://github.com/devkral)
 * [camponez](https://github.com/camponez)
 * [hugogameiro](https://github.com/hugogameiro)
 * [SerCom_KC](mailto:szescxz@gmail.com)
 * [aschmitz](https://github.com/aschmitz)
+* [mfmfuyu](https://github.com/mfmfuyu)
+* [kedamaDQ](https://github.com/kedamaDQ)
 * [fpiesche](https://github.com/fpiesche)
 * [gandaro](https://github.com/gandaro)
 * [johnsudaar](https://github.com/johnsudaar)
 * [trebmuh](https://github.com/trebmuh)
 * [rmhasan](https://github.com/rmhasan)
-* [kedamaDQ](https://github.com/kedamaDQ)
 * [lindwurm](https://github.com/lindwurm)
 * [victorhck](mailto:victorhck@geeko.site)
 * [voidsatisfaction](https://github.com/voidsatisfaction)
+* [mkljczk](https://github.com/mkljczk)
 * [hikari-no-yume](https://github.com/hikari-no-yume)
 * [seefood](https://github.com/seefood)
 * [jackjennings](https://github.com/jackjennings)
-* [mfmfuyu](https://github.com/mfmfuyu)
 * [puckipedia](https://github.com/puckipedia)
 * [spla](mailto:spla@mastodont.cat)
 * [walf443](https://github.com/walf443)
@@ -111,14 +112,15 @@ and provided thanks to the work of the following contributors:
 * [Ashley](mailto:expenses@airmail.cc)
 * [xqus](https://github.com/xqus)
 * [pfm-eyesightjp](https://github.com/pfm-eyesightjp)
-* [Samy KACIMI](mailto:samy.kacimi@gmail.com)
+* [fakenine](https://github.com/fakenine)
 * [tsuwatch](https://github.com/tsuwatch)
 * [victorhck](https://github.com/victorhck)
-* [mkljczk](https://github.com/mkljczk)
 * [manuelviens](https://github.com/manuelviens)
+* [tateisu](https://github.com/tateisu)
 * [fvh-P](https://github.com/fvh-P)
 * [rtucker](https://github.com/rtucker)
 * [Anna e sÃ³](mailto:contraexemplos@gmail.com)
+* [dariusk](https://github.com/dariusk)
 * [kazu9su](https://github.com/kazu9su)
 * [Komic](https://github.com/Komic)
 * [lmorchard](https://github.com/lmorchard)
@@ -145,9 +147,9 @@ and provided thanks to the work of the following contributors:
 * [fhemberger](https://github.com/fhemberger)
 * [Gomasy](https://github.com/Gomasy)
 * [greysteil](https://github.com/greysteil)
-* [hencatsmith](https://github.com/hencatsmith)
+* [hendotcat](https://github.com/hendotcat)
 * [d6rkaiz](https://github.com/d6rkaiz)
-* [Reverite](https://github.com/Reverite)
+* [ladyisatis](https://github.com/ladyisatis)
 * [JohnD28](https://github.com/JohnD28)
 * [znz](https://github.com/znz)
 * [saper](https://github.com/saper)
@@ -160,14 +162,14 @@ and provided thanks to the work of the following contributors:
 * [leopku](https://github.com/leopku)
 * [SansPseudoFix](https://github.com/SansPseudoFix)
 * [spla](mailto:sp@mastodont.cat)
-* [tateisu](https://github.com/tateisu)
 * [tomfhowe](https://github.com/tomfhowe)
 * [noraworld](https://github.com/noraworld)
 * [lfuelling](https://github.com/lfuelling)
-* [theboss](https://github.com/theboss)
+* [aji-su](https://github.com/aji-su)
 * [nzws](https://github.com/nzws)
 * [duxovni](https://github.com/duxovni)
 * [smorimoto](https://github.com/smorimoto)
+* [mashirozx](https://github.com/mashirozx)
 * [178inaba](https://github.com/178inaba)
 * [acid-chicken](https://github.com/acid-chicken)
 * [xgess](https://github.com/xgess)
@@ -175,7 +177,6 @@ and provided thanks to the work of the following contributors:
 * [aablinov](https://github.com/aablinov)
 * [stalker314314](https://github.com/stalker314314)
 * [cutls](https://github.com/cutls)
-* [dariusk](https://github.com/dariusk)
 * [huertanix](https://github.com/huertanix)
 * [eleboucher](https://github.com/eleboucher)
 * [halkeye](https://github.com/halkeye)
@@ -183,7 +184,7 @@ and provided thanks to the work of the following contributors:
 * [treby](https://github.com/treby)
 * [jpdevries](https://github.com/jpdevries)
 * [gdpelican](https://github.com/gdpelican)
-* [kmichl](https://github.com/kmichl)
+* [Korbinian](mailto:kontakt@korbinian-michl.de)
 * [Kurtis Rainbolt-Greene](mailto:me@kurtisrainboltgreene.name)
 * [panarom](https://github.com/panarom)
 * [Dar13](https://github.com/Dar13)
@@ -225,6 +226,7 @@ and provided thanks to the work of the following contributors:
 * [aaribaud](https://github.com/aaribaud)
 * [pointlessone](https://github.com/pointlessone)
 * [Andrew](mailto:andrewlchronister@gmail.com)
+* [arielrodrigues](https://github.com/arielrodrigues)
 * [aurelien-reeves](https://github.com/aurelien-reeves)
 * [elegaanz](https://github.com/elegaanz)
 * [estuans](https://github.com/estuans)
@@ -238,6 +240,7 @@ and provided thanks to the work of the following contributors:
 * [muffinista](https://github.com/muffinista)
 * [cdutson](https://github.com/cdutson)
 * [farlistener](https://github.com/farlistener)
+* [divergentdave](https://github.com/divergentdave)
 * [DavidLibeau](https://github.com/DavidLibeau)
 * [dmerejkowsky](https://github.com/dmerejkowsky)
 * [ddevault](https://github.com/ddevault)
@@ -276,7 +279,7 @@ and provided thanks to the work of the following contributors:
 * [xPaw](https://github.com/xPaw)
 * [petzah](https://github.com/petzah)
 * [ignisf](https://github.com/ignisf)
-* [raymestalez](https://github.com/raymestalez)
+* [lumenwrites](https://github.com/lumenwrites)
 * [remram44](https://github.com/remram44)
 * [sts10](https://github.com/sts10)
 * [SuperSandro2000](https://github.com/SuperSandro2000)
@@ -286,8 +289,9 @@ and provided thanks to the work of the following contributors:
 * [Sir-Boops](https://github.com/Sir-Boops)
 * [stemid](https://github.com/stemid)
 * [sumdog](https://github.com/sumdog)
+* [OmmyZhang](https://github.com/OmmyZhang)
 * [ThomasLeister](https://github.com/ThomasLeister)
-* [mcat-ee](https://github.com/mcat-ee)
+* [Tom McAtee](mailto:a1608768@student.adelaide.edu.au)
 * [tototoshi](https://github.com/tototoshi)
 * [TrashMacNugget](https://github.com/TrashMacNugget)
 * [VirtuBox](https://github.com/VirtuBox)
@@ -314,11 +318,13 @@ and provided thanks to the work of the following contributors:
 * [matsurai25](https://github.com/matsurai25)
 * [mecab](https://github.com/mecab)
 * [nicobz25](https://github.com/nicobz25)
+* [niwatori24](https://github.com/niwatori24)
 * [oliverkeeble](https://github.com/oliverkeeble)
 * [partev](https://github.com/partev)
 * [pinfort](https://github.com/pinfort)
 * [rbaumert](https://github.com/rbaumert)
 * [rhoio](https://github.com/rhoio)
+* [santiagorodriguez96](https://github.com/santiagorodriguez96)
 * [sclaire-1](https://github.com/sclaire-1)
 * [umonaca](https://github.com/umonaca)
 * [usagi-f](https://github.com/usagi-f)
@@ -327,7 +333,7 @@ and provided thanks to the work of the following contributors:
 * [wxcafe](https://github.com/wxcafe)
 * [Grawl](https://github.com/Grawl)
 * [æ–°éƒ½å¿ƒ(Neet Shin)](mailto:nucx@dio-vox.com)
-* [clarfon](https://github.com/clarfon)
+* [clarfonthey](https://github.com/clarfonthey)
 * [cygnan](https://github.com/cygnan)
 * [Awea](https://github.com/Awea)
 * [eai04191](https://github.com/eai04191)
@@ -358,11 +364,11 @@ and provided thanks to the work of the following contributors:
 * [schas002](https://github.com/schas002)
 * [contraexemplo](https://github.com/contraexemplo)
 * [abackstrom](https://github.com/abackstrom)
-* [arielrodrigues](https://github.com/arielrodrigues)
 * [orlea](https://github.com/orlea)
 * [armandfardeau](https://github.com/armandfardeau)
 * [raboof](https://github.com/raboof)
 * [jumbosushi](https://github.com/jumbosushi)
+* [acuteaura](https://github.com/acuteaura)
 * [ayumin](https://github.com/ayumin)
 * [bzg](https://github.com/bzg)
 * [BastienDurel](https://github.com/BastienDurel)
@@ -389,7 +395,7 @@ and provided thanks to the work of the following contributors:
 * [colindean](https://github.com/colindean)
 * [DeeUnderscore](https://github.com/DeeUnderscore)
 * [dachinat](https://github.com/dachinat)
-* [shapeshifter-system](https://github.com/shapeshifter-system)
+* [monsterpit-firedemon](https://github.com/monsterpit-firedemon)
 * [watilde](https://github.com/watilde)
 * [daprice](https://github.com/daprice)
 * [da2x](https://github.com/da2x)
@@ -400,14 +406,13 @@ and provided thanks to the work of the following contributors:
 * [singingwolfboy](https://github.com/singingwolfboy)
 * [caldwell](https://github.com/caldwell)
 * [davidcelis](https://github.com/davidcelis)
-* [divergentdave](https://github.com/divergentdave)
 * [davefp](https://github.com/davefp)
 * [yipdw](https://github.com/yipdw)
 * [debanshuk](https://github.com/debanshuk)
 * [mascali33](https://github.com/mascali33)
 * [DerekNonGeneric](https://github.com/DerekNonGeneric)
 * [dblandin](https://github.com/dblandin)
-* [Drew Gates](mailto:aranaur@users.noreply.github.com)
+* [Aranaur](https://github.com/Aranaur)
 * [dtschust](https://github.com/dtschust)
 * [Dryusdan](https://github.com/Dryusdan)
 * [d3vgru](https://github.com/d3vgru)
@@ -451,22 +456,25 @@ and provided thanks to the work of the following contributors:
 * [J Yeary](mailto:usbsnowcrash@users.noreply.github.com)
 * [jack-michaud](https://github.com/jack-michaud)
 * [Floppy](https://github.com/Floppy)
-* [loomchild](https://github.com/loomchild)
-* [jglauche](https://github.com/jglauche)
-* [jenkr55](https://github.com/jenkr55)
-* [hyenagirl64](https://github.com/hyenagirl64)
-* [press5](https://github.com/press5)
-* [TrollDecker](https://github.com/TrollDecker)
-* [jmontane](https://github.com/jmontane)
+* [Jarek Lipski](mailto:pub@loomchild.net)
+* [Jennifer Glauche](mailto:=^.^=@github19.jglauche.de)
+* [Jennifer Kruse](mailto:jenkr55@gmail.com)
+* [Jeremy Rose](mailto:nornagon@nornagon.net)
+* [Jessica](mailto:46502909+hyenagirl64@users.noreply.github.com)
+* [Jessica K. Litwin](mailto:jessica@litw.in)
+* [Jo Decker](mailto:trolldecker@users.noreply.github.com)
+* [Joan MontanÃ©](mailto:jmontane@users.noreply.github.com)
 * [Jonathan Klee](mailto:klee.jonathan@gmail.com)
 * [Jordan Guerder](mailto:jguerder@fr.pulseheberg.net)
 * [Joseph Mingrone](mailto:jehops@users.noreply.github.com)
+* [Josh Leeb-du Toit](mailto:mail@joshleeb.com)
 * [Joshua Wood](mailto:josh@joshuawood.net)
 * [Julien](mailto:tiwy57@users.noreply.github.com)
 * [Julien Deswaef](mailto:juego@requiem4tv.com)
 * [June Sallou](mailto:jnsll@users.noreply.github.com)
 * [JÃ©rÃ©my Benoist](mailto:j0k3r@users.noreply.github.com)
 * [KEINOS](mailto:github@keinos.com)
+* [Kairui Song | å®‹æºç¿](mailto:ryncsn@gmail.com)
 * [Keiji Matsuzaki](mailto:futoase@gmail.com)
 * [Kevin Liu](mailto:kevin@potatofrom.space)
 * [Kit Redgrave](mailto:qwertyitis@gmail.com)
@@ -482,7 +490,6 @@ and provided thanks to the work of the following contributors:
 * [Lukas Burk](mailto:jemus42@users.noreply.github.com)
 * [Manato Kameya](mailto:grabacr07+github@gmail.com)
 * [Mantas](mailto:mistermantas@users.noreply.github.com)
-* [Marcin MikoÅ‚ajczak](mailto:me@mkljczk.pl)
 * [Mareena Kunjachan](mailto:mareenakunjachan@gmail.com)
 * [Marek Lach](mailto:marek.brohatwack.lach@gmail.com)
 * [Markus R](mailto:wirehack7@users.noreply.github.com)
@@ -529,10 +536,12 @@ and provided thanks to the work of the following contributors:
 * [Norayr Chilingarian](mailto:norayr@arnet.am)
 * [NoÃ«lle Anthony](mailto:noelle.d.anthony@gmail.com)
 * [Næ°](mailto:uenok.htc@gmail.com)
+* [OSAMU SATO](mailto:satosamu@gmail.com)
 * [Olivier Nicole](mailto:olivierthnicole@gmail.com)
 * [Oskari Noppa](mailto:noppa@users.noreply.github.com)
 * [Otakan](mailto:otakan951@gmail.com)
 * [Padraig Fahy](mailto:tech@padraigfahy.com)
+* [Patrice Ferlet](mailto:metal3d@gmail.com)
 * [PatrickRWells](mailto:32802366+patrickrwells@users.noreply.github.com)
 * [Paul](mailto:naydex.mc+github@gmail.com)
 * [Pete Keen](mailto:pete@petekeen.net)
@@ -574,7 +583,6 @@ and provided thanks to the work of the following contributors:
 * [TakesxiSximada](mailto:takesxi.sximada@gmail.com)
 * [Tao Bror BojlÃ©n](mailto:brortao@users.noreply.github.com)
 * [Taras Gogol](mailto:taras2358@gmail.com)
-* [Tdxdxoz](mailto:tdxdxoz@gmail.com)
 * [TheInventrix](mailto:theinventrix@users.noreply.github.com)
 * [TheMainOne](mailto:50847364+theevilskeleton@users.noreply.github.com)
 * [Thomas Alberola](mailto:thomas@needacoffee.fr)
@@ -594,6 +602,7 @@ and provided thanks to the work of the following contributors:
 * [Wesley Ellis](mailto:tahnok@gmail.com)
 * [Wiktor](mailto:wiktor@metacode.biz)
 * [Wonderfall](mailto:wonderfall@schrodinger.io)
+* [Y.Yamashiro](mailto:shukukei@mojizuri.jp)
 * [YDrogen](mailto:ydrogen45@gmail.com)
 * [YMHuang](mailto:ymhuang@fmbase.tw)
 * [YOSHIOKA Eiichiro](mailto:yoshioka.eiichiro@gmail.com)
@@ -638,6 +647,7 @@ and provided thanks to the work of the following contributors:
 * [jumoru](mailto:jumoru@mailbox.org)
 * [kaiyou](mailto:pierre@jaury.eu)
 * [karlyeurl](mailto:karl.yeurl@gmail.com)
+* [kawaguchi](mailto:jiikko@users.noreply.github.com)
 * [kedama](mailto:32974885+kedamadq@users.noreply.github.com)
 * [kuro5hin](mailto:rusty@kuro5hin.org)
 * [leo60228](mailto:leo@60228.dev)
@@ -655,6 +665,7 @@ and provided thanks to the work of the following contributors:
 * [notozeki](mailto:notozeki@users.noreply.github.com)
 * [ntl-purism](mailto:57806346+ntl-purism@users.noreply.github.com)
 * [nzws](mailto:git-yuzu@svk.jp)
+* [proxy](mailto:51172302+3n-k1@users.noreply.github.com)
 * [rch850](mailto:rich850@gmail.com)
 * [roikale](mailto:roikale@users.noreply.github.com)
 * [rysiekpl](mailto:rysiek@hackerspace.pl)
@@ -694,122 +705,414 @@ This document is provided for informational purposes only. Since it is only upda
 
 Following people have contributed to translation of Mastodon:
 
-- ZoltÃ¡n Gera (*Hungarian*)
-- Kristijan Tkalec (*Slovenian*)
-- Evert Prants (*Estonian*)
+- á¦ááŽ¢áŽµá« ðŸ˜· (KNTRO) (*Spanish, Argentina*)
+- Sveinn Ã Felli (sveinki) (*Icelandic*)
+- qezwan (*Persian, Sorani (Kurdish)*)
+- Há»“ Nháº¥t Duy (kantcer) (*Vietnamese*)
+- taicv (*Vietnamese*)
+- ZoltÃ¡n Gera (gerazo) (*Hungarian*)
+- ButterflyOfFire (BoFFire) (*French, Arabic, Kabyle*)
+- adrmzz (*Sardinian*)
+- Ramdziana F Y (rafeyu) (*Indonesian*)
+- Evert Prants (IcyDiamond) (*Estonian*)
+- Daniele Lira Mereb (danilmereb) (*Portuguese, Brazilian*)
+- XosÃ© M. (XoseM) (*Spanish, Galician*)
+- Kristijan Tkalec (lapor) (*Slovenian*)
+- stan ionut (stanionut12) (*Romanian*)
+- Besnik_b (*Albanian*)
+- Emanuel Pina (emanuelpina) (*Portuguese*)
+- Thai Localization (thl10n) (*Thai*)
+- å¥ˆåœæ‹‰ (nebula_moe) (*Chinese Simplified*)
+- Jeong Arm (Kjwon15) (*Japanese, Korean, Esperanto*)
+- Michal Stanke (mstanke) (*Czech*)
+- Alix Rossi (palindromordnilap) (*French, Corsican*)
+- spla (*Spanish, Catalan*)
+- Imre Kristoffer Eilertsen (DandelionSprout) (*Norwegian*)
+- Jeroen (jeroenpraat) (*Dutch*)
 - borys_sh (*Ukrainian*)
-- ButterflyOfFire (*Arabic; French*)
-- Osoitz (*Basque*)
-- oÉ¹Ê‡uÊž (*Spanish, Argentina*)
+- Miguel Mayol (mitcoes) (*Spanish, Catalan*)
+- Danial Behzadi (danialbehzadi) (*Persian*)
+- yeft (*Chinese Traditional, Chinese Traditional, Hong Kong*)
 - koyu (*German*)
-- Jeroen (*Dutch*)
-- Muha Aliss (*Turkish*)
-- å”å®—å‹› (*Chinese Simplified*)
-- Jeong Arm (*Korean; Esperanto; Japanese*)
-- Oguz Ersen (*Turkish*)
-- spla (*Catalan*)
-- Ramdziana F Y (*Indonesian*)
-- Aditoo17 (*Czech*)
-- XosÃ© M. (*Galician*)
-- Roboron (*Spanish*)
-- Alix Rossi (*Corsican; French*)
-- Maya Minatsuki (*Japanese*)
-- Masoud Abkenar (*Persian*)
-- Thai Localization (*Thai*)
-- Marek Ä½ach (*Slovak; Polish*)
-- d5Ziif3K (*Ukrainian*)
+- Koala Yeung (yookoala) (*Chinese Traditional, Hong Kong*)
+- Osoitz (*Basque*)
+- Peterandre (*Norwegian, Norwegian Nynorsk*)
+- tzium (*Sardinian*)
+- IvÃ¡ns (Ivans_translator) (*Galician*)
+- Sasha Sorokin (Sasha-Sorokin) (*French, Catalan, Danish, German, Greek, Hungarian, Armenian, Korean, Russian, Albanian, Swedish, Ukrainian, Vietnamese, Galician*)
+- kamee (*Armenian*)
+- tolstoevsky (*Russian*)
+- enolp (*Asturian*)
+- FÃ©diQuÃ©bec (manuelviens) (*French*)
 - lamnatos (*Greek*)
-- Emyn Nant Nefydd (*Welsh*)
+- Maya Minatsuki (mayaeh) (*Japanese*)
+- Masoud Abkenar (mabkenar) (*Persian*)
+- Alessandro Levati (Oct326) (*Italian*)
+- arshat (*Kazakh*)
+- Roboron (*Spanish*)
+- ariasuni (*French, Arabic, Czech, German, Greek, Hungarian, Slovenian, Ukrainian, Chinese Simplified, Portuguese, Brazilian, Persian, Norwegian Nynorsk, Esperanto, Breton, Corsican, Sardinian, Kabyle*)
+- Ali DemirtaÅŸ (alidemirtas) (*Turkish*)
+- Em St Cenydd (cancennau) (*Welsh*)
+- Marek Ä½ach (mareklach) (*Polish, Slovak*)
+- Muha Aliss (muhaaliss) (*Turkish*)
+- Jurica (ahjk) (*Croatian*)
+- Aditoo17 (*Czech*)
 - Diluns (*Occitan*)
+- gagik_ (*Armenian*)
+- vishnuvaratharajan (*Tamil*)
+- Marcin MikoÅ‚ajczak (mkljczkk) (*Czech, Polish, Russian*)
+- regulartranslator (*Portuguese, Brazilian*)
+- Akarshan Biswas (biswasab) (*Bengali, Sanskrit*)
+- Yi-Jyun Pan (pan93412) (*Chinese Traditional*)
+- d5Ziif3K (*Ukrainian*)
+- GiorgioHerbie (*Italian*)
+- Rafael H L Moretti (Moretti) (*Portuguese, Brazilian*)
+- Saederup92 (*Danish*)
+- christalleras (*Norwegian Nynorsk*)
+- cybergene (cyber-gene) (*Japanese*)
+- Taloran (*Norwegian Nynorsk*)
+- ThibG (*French, Icelandic*)
+- xatier (*Chinese Traditional*)
+- otrapersona (*Spanish, Spanish, Mexico*)
 - atarashiako (*Chinese Simplified*)
-- 101010 (*Polish*)
-- Yi-Jyun Pan (*Chinese Traditional*)
+- 101010 (101010pl) (*Polish*)
 - silkevicious (*Italian*)
-- FÃ©diQuÃ©bec (*French*)
-- Jaz-Michael King (*Welsh*)
-- christalleras (*Norwegian Nynorsk*)
-- tykayn (*French*)
-- Alessandro Levati (*Italian*)
+- Floxu (fredrikdim1) (*Norwegian Nynorsk*)
+- Bertil Hedkvist (Berrahed) (*Swedish*)
+- William(Ñ•)â¿ (wmlgr) (*Spanish*)
+- norayr (*Armenian*)
+- Tiago EpifÃ¢nio (tfve) (*Portuguese*)
+- Ryo (DrRyo) (*Korean*)
+- Mentor Gashi (mentorgashi.com) (*Albanian*)
+- Jaz-Michael King (jazmichaelking) (*Welsh*)
 - carolinagiorno (*Portuguese, Brazilian*)
+- Roby Thomas (roby.thomas) (*Malayalam*)
+- Bharat Kumar (Marwari) (*Hindi*)
+- ThonyVezbe (*Breton*)
+- dkdarshan760 (*Sanskrit*)
+- Tagomago (tagomago) (*French, Spanish*)
+- tykayn (*French*)
+- axi (*Finnish*)
+- Selyan Slimane AMIRI (slimane_AMIRI) (*Kabyle*)
+- BalÃ¡zs MeskÃ³ (mesko.balazs) (*Hungarian*)
 - taoxvx (*Danish*)
-- sabri (*Spanish*)
-- Sasha Sorokin (*Russian*)
-- shioko (*Chinese Simplified*)
-- Evgeny Petrov (*Russian*)
-- ariasuni (*French; Esperanto*)
-- Tiago EpifÃ¢nio (*Portuguese*)
-- dxwc (*Bengali*)
+- Hrach Mkrtchyan (mhrach87) (*Armenian*)
+- sabri (thetomatoisavegetable) (*Spanish, Spanish, Argentina*)
+- Dewi (Unkorneg) (*French, Breton*)
+- Coelacanthus (*Chinese Simplified*)
+- syncopams (*Chinese Simplified, Chinese Traditional, Chinese Traditional, Hong Kong*)
+- SteinarK (*Norwegian Nynorsk*)
+- Sokratis Alichanidis (alichani) (*Greek*)
+- Mathias B. Vagnes (vagnes) (*Norwegian*)
+- dashersyed (*Urdu (Pakistan)*)
+- Acolyte (666noob404) (*Ukrainian*)
+- Conight Wang (xfddwhh) (*Chinese Simplified*)
 - liffon (*Swedish*)
+- Damjan Dimitrioski (gnud) (*Macedonian*)
+- PPNplus (*Thai*)
+- shioko (*Chinese Simplified*)
+- v4vachan (*Malayalam*)
+- Hakim Oubouali (zenata1) (*Standard Moroccan Tamazight*)
+- Evgeny Petrov (kondra007) (*Russian*)
+- Gwenn (Belvar) (*Breton*)
+- StanleyFrew (*French*)
+- Hayk Khachatryan (brutusromanus123) (*Armenian*)
+- jaranta (*Finnish*)
+- Felicia (midsommar) (*Swedish*)
+- Denys (dector) (*Ukrainian*)
+- Pukima (pukimaaa) (*German*)
 - Vanege (*Esperanto*)
-- Johan Schiff (*Swedish*)
-- kat (*Ukrainian; Russian*)
-- oti4500 (*Hungarian; Ukrainian*)
-- Juan JosÃ© Salvador Piedra (*Spanish*)
-- diazepan (*Spanish*)
+- Jess Rafn (therealyez) (*Danish*)
+- strubbl (*German*)
+- Stasiek Michalski (hellcp) (*Polish*)
+- dxwc (*Bengali*)
+- jmontane (*Catalan*)
+- Liboide (*Spanish*)
+- Johan Schiff (schyffel) (*Swedish*)
+- Arunmozhi (tecoholic) (*Tamil*)
+- kat (katktv) (*Russian, Ukrainian*)
+- Rikard Linde (rikardlinde) (*Swedish*)
+- oti4500 (*Hungarian, Ukrainian*)
+- Laura (selfisekai) (*Polish*)
+- Rachida S. (ZiriSut) (*Kabyle*)
+- diazepan (*Spanish, Spanish, Argentina*)
+- marzuquccen (*Kabyle*)
+- Juan JosÃ© Salvador Piedra (JuanjoSalvador) (*Spanish*)
+- Tigran (tigransimonyan) (*Armenian*)
+- BurekzFinezt (*Serbian (Cyrillic)*)
 - SHeija (*Finnish*)
-- Jack R (*Spanish*)
-- Saederup92 (*Danish*)
-- Stasiek Michalski (*Polish*)
-- Dewi (*Breton; French*)
-- cybergene (*Japanese*)
-- AW Unad (*Indonesian*)
-- Andrea Lo Iacono (*Italian*)
-- Ray (*Spanish*)
+- atriix (*Swedish*)
+- Jack R (isaac.97_WT) (*Spanish*)
+- antonyho (*Chinese Traditional, Hong Kong*)
+- andruhov (*Russian, Ukrainian*)
+- Aryamik Sharma (Aryamik) (*Swedish, Hindi*)
+- phena109 (*Chinese Traditional, Hong Kong*)
+- æ£®ã®åãƒªã‚¹ã®ãƒŸãƒ¼ã‚³ã®å¤§å†’é™º (Phroneris) (*Japanese*)
+- ã‚‹ã„ãƒ¼ã (ruine) (*Japanese*)
+- ahangarha (*Persian*)
+- Sam Tux (imahbub) (*Bengali*)
+- igordrozniak (*Polish*)
 - Unmual (*Spanish*)
-- Ryo (*Korean*)
-- juanda097 (*Spanish*)
+- Isaac Huang (caasih) (*Chinese Traditional*)
+- AW Unad (awcodify) (*Indonesian*)
+- Allen Zhong (AstroProfundis) (*Chinese Simplified*)
+- Cutls (cutls) (*Japanese*)
+- Ray (Ipsumry) (*Spanish*)
+- Falling Snowdin (tghgg) (*Vietnamese*)
+- coxde (*Chinese Simplified*)
+- Rasmus Lindroth (RasmusLindroth) (*Swedish*)
+- Andrea Lo Iacono (niels0n) (*Italian*)
+- Kinshuk Sunil (kinshuksunil) (*Hindi*)
+- Ullas Joseph (ullasjoseph) (*Malayalam*)
+- Goudarz Jafari (Goudarz) (*Persian*)
+- Yu-Pai Liu (tedliou) (*Chinese Traditional*)
+- Amarin Cemthong (acitmaster) (*Thai*)
+- juanda097 (juanda-097) (*Spanish*)
 - Anunnakey (*Macedonian*)
-- Cutls (*Japanese*)
+- fragola (*Italian*)
 - erikstl (*Esperanto*)
-- ruine (*Japanese*)
+- twpenguin (*Chinese Traditional*)
+- bobchao (*Chinese Traditional*)
+- Esther (esthermations) (*Portuguese*)
 - MadeInSteak (*Finnish*)
-- Sokratis Alichanidis (*Greek*)
-- dragnucs2 (*Arabic*)
-- frumble (*German*)
-- Rikard Linde (*Swedish*)
-- PPNplus (*Thai*)
+- Heimen Stoffels (vistausss) (*Dutch*)
+- Rajarshi Guha (rajarshiguha) (*Bengali*)
+- Andrew (iAndrew3) (*Romanian*)
+- Gopal Sharma (gopalvirat) (*Hindi*)
 - arethsu (*Swedish*)
-- EPEMA YT (*German*)
-- Rhys Harrison (*Esperanto*)
-- KEINOS (*Japanese*)
+- Tofiq Abdula (Xwla) (*Sorani (Kurdish)*)
+- Carlos SolÃs (csolisr) (*Esperanto*)
+- Parthan S Ramanujam (parthan) (*Tamil*)
+- Kasper Nymand (KasperNymand) (*Danish*)
+- TS (morte) (*Finnish*)
+- subram (*Turkish*)
+- SensDeViata (*Ukrainian*)
+- Ptrcmd (ptrcmd) (*Chinese Traditional*)
+- SergioFMiranda (*Portuguese, Brazilian*)
+- Scvoet (scvoet) (*Chinese Simplified*)
+- hiroTS (*Chinese Traditional*)
+- johne32rus23 (*Russian*)
+- AzureNya (*Chinese Simplified*)
+- OctolinGamer (octolingamer) (*Portuguese, Brazilian*)
+- Ram varma (ram4varma) (*Tamil*)
+- Hexandcube (hexandcube) (*Polish*)
+- åŒ—ä‘“å¦‚æ³• (Nyoho) (*Japanese*)
+- frumble (*German*)
+- kekkepikkuni (*Tamil*)
+- Neo_Chen (NeoChen1024) (*Chinese Traditional*)
+- oorsutri (*Tamil*)
+- Rhys Harrison (rhedders) (*Esperanto*)
+- Nithin V (Nithin896) (*Tamil*)
+- Miro Rauhala (mirorauhala) (*Finnish*)
+- diorama (*Italian*)
+- AlexKoala (alexkoala) (*Korean*)
+- Aswin C (officialcjunior) (*Malayalam*)
+- Guillaume Turchini (orion78fr) (*French*)
+- Ganesh D (auntgd) (*Marathi*)
+- dragnucs2 (*Arabic*)
+- Ryan Ho (koungho) (*Chinese Traditional*)
+- Pedro Henrique (exploronauta) (*Portuguese, Brazilian*)
+- Tejas Harad (h_tejas) (*Marathi*)
+- Vasanthan (vasanthan) (*Tamil*)
+- ç¡«é…¸é¶ (acid_chicken) (*Japanese*)
+- clarmin b8 (clarminb8) (*Sorani (Kurdish)*)
+- manukp (*Malayalam*)
+- psymyn (*Hebrew*)
+- earth dweller (sanethoughtyt) (*Marathi*)
+- meijerivoi (toilet) (*Finnish*)
+- essaar (*Tamil*)
+- serubeena (*Swedish*)
+- Karol Kosek (krkkPL) (*Polish*)
+- Rintan (*Japanese*)
+- valarivan (*Tamil*)
+- Hernik (hernik27) (*Czech*)
+- SebastiÃ¡n Andil (Selrond) (*Slovak*)
+- Hinaloe (hinaloe) (*Japanese*)
 - filippodb (*Italian*)
+- KEINOS (*Japanese*)
+- BalÃ¡zs MeskÃ³ (meskobalazs) (*Hungarian*)
+- Bottle (suryasalem2010) (*Tamil*)
 - JzshAC (*Chinese Simplified*)
-- Rintan1 (*Japanese*)
-- Antillion (*Spanish*)
+- Wrya ali (John12) (*Sorani (Kurdish)*)
+- KhÃ³o (khootiatling) (*Chinese Traditional*)
+- Steven Tappert (sammy8806) (*German*)
+- Antillion (antillion99) (*Spanish*)
+- Pukima (Pukimaa) (*German*)
+- Reg3xp (*Persian*)
 - hiphipvargas (*Portuguese*)
-- Ch. (*Korean*)
+- gowthamanb (*Tamil*)
+- Ch. (sftblw) (*Korean*)
+- Jeff Huang (s8321414) (*Chinese Traditional*)
+- Arttu YlhÃ¤vuori (arttu.ylhavuori) (*Finnish*)
 - tctovsli (*Norwegian Nynorsk*)
+- Timo Tijhof (Krinkle) (*Dutch*)
+- Yamagishi Kazutoshi (ykzts) (*Japanese, Icelandic, Sorani (Kurdish)*)
 - vjasiegd (*Polish*)
-- SamitiMed (*Thai*)
+- SamitiMed (samiti3d) (*Thai*)
+- Rekan Adl (rekan-adl1) (*Sorani (Kurdish)*)
 - umelard (*Hebrew*)
-- ç¡«é…¸é¶ (*Japanese*)
-- AdriÃ¡n Lattes (*Spanish*)
-- Hinaloe (*Japanese*)
-- Renato "Lond" Cerqueira (*Portuguese, Brazilian*)
+- Antara2Cinta (Se7enTime) (*Indonesian*)
+- VSx86 (*Russian*)
+- Daniel Dimitrov (danny-dimitrov) (*Bulgarian*)
 - parnikkapore (*Thai*)
-- Marcin MikoÅ‚ajczak (*Polish*)
-- æ£®ã®åãƒªã‚¹ã®ãƒŸãƒ¼ã‚³ã®å¤§å†’é™º (*Japanese*)
-- Marcepanek_ (*Polish*)
-- Sahak Petrosyan (*Armenian*)
-- Daniel Dimitrov (*Bulgarian*)
-- Hugh Liu (*Chinese Simplified*)
-- Rakino (*Chinese Simplified*)
+- mynameismonkey (*Welsh*)
+- Sherwan Othman (sherwanothman11) (*Sorani (Kurdish)*)
+- Yassine AÃ¯t-El-Mouden (yaitelmouden) (*Standard Moroccan Tamazight*)
+- SKELET (*Danish*)
+- Mo_der Steven (SakuraPuare) (*Chinese Simplified*)
+- Fei Yang (Fei1Yang) (*Chinese Traditional*)
+- ALEM FARID (faridatcemlulaqbayli) (*Kabyle*)
+- enipra (*Armenian*)
+- musix (*Persian*)
+- Renato "Lond" Cerqueira (renatolond) (*Portuguese, Brazilian*)
+- ã‚®ãƒ£ãƒ© (gyara) (*Japanese, Chinese Simplified*)
+- Hougo (hougo) (*French*)
+- ybardapurkar (*Marathi*)
+- AdriÃ¡n Lattes (haztecaso) (*Spanish*)
+- TracyJacks (*Chinese Simplified*)
+- rasheedgm (*Kannada*)
+- GatoOscuro (*Spanish*)
+- mecqor labi (mecqorlabi) (*Persian*)
+- Belkacem Mohammed (belkacem77) (*Kabyle*)
+- Navjot Singh (nspeaks) (*Hindi*)
+- omquylzu (*Latvian*)
+- Ozai (*German*)
+- Sahak Petrosyan (petrosyan) (*Armenian*)
+- siamano (*Thai, Esperanto*)
+- Viorel-CÄƒtÄƒlin RÄƒpiÈ›eanu (rapiteanu) (*Romanian*)
+- Siddhartha Sarathi Basu (quinoa_biryani) (*Bengali*)
+- Pachara Chantawong (pachara2202) (*Thai*)
+- mkljczk (*Polish*)
+- Skew (noan.perrot) (*French*)
+- Zijian Zhao (jobs2512821228) (*Chinese Simplified*)
+- turtle836 (*German*)
+- Guru Prasath Anandapadmanaban (guruprasath) (*Tamil*)
+- Lamin (laminne) (*Japanese*)
+- Marcepanek_ (thekingmarcepan) (*Polish*)
+- Feruz Oripov (FeruzOripov) (*Russian*)
+- Yann Aguettaz (yann-a) (*French*)
+- Mick Onio (xgc.redes) (*Asturian*)
+- Tianqi Zhang (tina.zhang040609) (*Chinese Simplified*)
+- Malik Mann (dermalikmann) (*German*)
+- dadosch (*German*)
+- r3dsp1 (*Chinese Traditional, Hong Kong*)
+- padulafacundo (*Spanish*)
+- hg6 (*Hindi*)
+- Orlando Murcio (Atos20) (*Spanish, Mexico*)
+- piupiupiudiu (*Chinese Simplified*)
+- shdy (*German*)
+- Padraic Calpin (padraic-padraic) (*Slovenian*)
+- Ð˜Ð»ÑŒÐ·Ð¸Ñ€Ð° Ð Ð°Ñ…Ð¼Ð°Ñ‚ÑƒÐ»Ð»Ð¸Ð½Ð° (rahmatullinailzira53) (*Tatar*)
+- cenegd (*Chinese Simplified*)
+- Hugh Liu (youloveonlymeh) (*Chinese Simplified*)
+- Pixelcode (realpixelcode) (*German*)
+- Yogesh K S (yogi) (*Kannada*)
+- Rakino (rakino) (*Chinese Simplified*)
+- Miquel SabatÃ© SolÃ  (mssola) (*Catalan*)
+- AmazighNM (*Kabyle*)
+- Jothipazhani Nagarajan (jothipazhani.n) (*Tamil*)
+- Clash Clans (KURD12345) (*Sorani (Kurdish)*)
+- hallomaurits (*Dutch*)
+- alnd hezh (alndhezh) (*Sorani (Kurdish)*)
+- Solid Rhino (SolidRhino) (*Dutch*)
+- k_taka (peaceroad) (*Japanese*)
+- Hallo Abdullah (hallo_hamza12) (*Sorani (Kurdish)*)
 - hussama (*Portuguese, Brazilian*)
-- ThibG (*French*)
+- SÃ©bastien FeugÃ¨re (smonff) (*French*)
+- æž—æ°´æº¶ (shuiRong) (*Chinese Simplified*)
+- eichkat3r (*German*)
+- OminousCry (*Russian*)
 - SnDer (*Dutch*)
 - PifyZ (*French*)
-- eichkat3r (*German*)
-- Karol Kosek (*Polish*)
-- Akarshan Biswas (*Bengali*)
-- Tradjincal (*French*)
-- Steven Tappert (*German*)
-- sergioaraujo1 (*Portuguese, Brazilian*)
+- Tom_ (*Czech*)
+- Tagada (Tagadda) (*French*)
+- shafouz (*Portuguese, Brazilian*)
+- Kahina Mess (K_hina) (*Kabyle*)
+- NathaÃ«l NoguÃ¨s (NatNgs) (*French*)
+- Kk (kishorkumara3) (*Kannada*)
+- Swati Sani (swatisani) (*Urdu (Pakistan)*)
+- Shrinivasan T (tshrinivasan) (*Tamil*)
+- ã•ã£ã‹ã‚Šã‚“ã«ãƒ¼ã•ã‚“ (saccharin23) (*Japanese*)
+- å¤œæ¥“Yoka (Yoka2627) (*Chinese Simplified*)
+- Daniel M. (daniconil) (*Catalan*)
+- Vikatakavi (*Kannada*)
+- SusVersiva (*Catalan*)
+- Tradjincal (tradjincal) (*French*)
+- pullopen (*Chinese Simplified*)
+- Robin van der Vliet (RobinvanderVliet) (*Esperanto*)
+- Zinkokooo (*Basque*)
 - mmokhi (*Persian*)
-- fedot (*Russian*)
+- Livingston Samuel (livingston) (*Tamil*)
+- prabhjot (*Hindi*)
+- sergioaraujo1 (*Portuguese, Brazilian*)
+- CyberAmoeba (pseudoobscura) (*Chinese Simplified*)
+- tsundoker (*Malayalam*)
 - skaaarrr (*German*)
-- JackXu (*Chinese Simplified*)
-- Lukas FÃ¼lling (*German*)
-- ZoÃ© BÅ‘le (*German*)
+- Ricardo Colin (rysard) (*Spanish*)
+- mkljczk (mykylyjczyk) (*Polish*)
+- Philipp Fischbeck (PFischbeck) (*German*)
+- fedot (*Russian*)
+- Paz Galindo (paz.almendra.g) (*Spanish*)
+- GaggiX (*Italian*)
+- ralozkolya (*Georgian*)
+- ZoÃ© BÅ‘le (zoe1337) (*German*)
+- Lukas FÃ¼lling (lfuelling) (*German*)
+- JackXu (Merman-Jack) (*Chinese Simplified*)
+- Aymeric (AymBroussier) (*French*)
+- Anoop (anoopp) (*Malayalam*)
+- pezcurrel (*Italian*)
 - Dremski (*Bulgarian*)
-- tamaina (*Japanese*)
+- Xurxo Guerra (xguerrap) (*Galician*)
+- mashirozx (*Chinese Simplified*)
+- Albatroz Jeremias (albjeremias) (*Portuguese*)
+- Samir Tighzert (samir_t7) (*Kabyle*)
+- Apple (blackteaovo) (*Chinese Simplified*)
+- Nocta (*French*)
 - OpenAlgeria (*Arabic*)
+- tamaina (*Japanese*)
+- abidin toumi (Zet24) (*Arabic*)
+- xpac1985 (xpac) (*German*)
+- Kaede (kaedech) (*Japanese*)
+- Ã€Å˜Ç¾Åš PÃ€ÅšÄ¦Ã€Ã (arospashai) (*Sorani (Kurdish)*)
+- Matias Lavik (matiaslavik) (*Norwegian Nynorsk*)
+- smedvedev (*Russian*)
+- mikel (mikelalas) (*Spanish*)
+- Doug (douglasalvespe) (*Portuguese, Brazilian*)
+- Trond Boksasp (boksasp) (*Norwegian*)
+- Fleva (*Sardinian*)
+- Mohammad Adnan Mahmood (adnanmig) (*Arabic*)
+- Sais Lakshmanan (Saislakshmanan) (*Tamil*)
+- Amith Raj Shetty (amithraj1989) (*Kannada*)
+- random_person (*Spanish*)
+- djoerd (*Dutch*)
+- Baban Abdulrahman (baban.abdulrehman) (*Sorani (Kurdish)*)
+- ebrezhoneg (*Breton*)
+- dashty (*Sorani (Kurdish)*)
+- Salh_haji6 (*Sorani (Kurdish)*)
+- Amir Kurdo (kuraking202) (*Sorani (Kurdish)*)
+- ãŠã• (osapon) (*Japanese*)
+- Ranj A Abdulqadir (RanjAhmed) (*Sorani (Kurdish)*)
+- umonaca (*Chinese Simplified*)
+- Bartek FijaÅ‚kowski (brateq) (*Polish*)
+- tateisu (*Japanese*)
+- centumix (*Japanese*)
+- Jari Ronkainen (ronchaine) (*Finnish*)
+- SavarÃn ElectrogrÃ¡fico Marmota Intergalactica (herrero.maty) (*Spanish*)
+- Torsten HÃ¶gel (torstenhoegel) (*German*)
+- Abijeet Patro (Abijeet) (*Basque*)
+- Ãcs ZoltÃ¡n (acszoltan111) (*Hungarian*)
+- Benjamin Cobb (benjamincobb) (*German*)
+- waweic (*German*)
+- Aries (orlea) (*Japanese*)
+- silverscat_3 (SilversCat) (*Japanese*)
+- kavitha129 (*Tamil*)
+- dcapillae (*Spanish*)
+- SamOak (*Portuguese, Brazilian*)
+- capiscuas (*Spanish*)
+- NeverMine17 (*Russian*)
+- Nithya Mary (nithyamary25) (*Tamil*)
+- t_aus_m (*German*)
+- dobrado (*Portuguese, Brazilian*)
+- Hannah (Aniqueper1) (*Chinese Simplified*)
+- Jiniux (*Italian*)
+- äºŽæ™šéœž (xissshawww) (*Chinese Simplified*)
diff --git a/Aptfile b/Aptfile
index 0a01fa24bdf07b4f073b65fb5c95044bdd7e1181..419d159ef6d64f5386de0092e3e546c0f457edb8 100644
--- a/Aptfile
+++ b/Aptfile
@@ -5,7 +5,6 @@ libidn11
 libidn11-dev
 libpq-dev
 libprotobuf-dev
-libssl-dev
 libxdamage1
 libxfixes3
 protobuf-compiler
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 348d1cefc25948117a429d72d2a1fa24609f2f57..8d749c255c3f30a48c350ae3031fd4d626f77137 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,238 @@ Changelog
 
 All notable changes to this project will be documented in this file.
 
-## Unreleased
+## [3.3.0] - 2020-12-27
+### Added
+
+- **Add hotkeys for audio/video control in web UI** ([Gargron](https://github.com/tootsuite/mastodon/pull/15158), [Gargron](https://github.com/tootsuite/mastodon/pull/15198))
+  - `Space` and `k` to toggle playback
+  - `m` to toggle mute
+  - `f` to toggle fullscreen
+  - `j` and `l` to go back and forward by 10 seconds
+  - `.` and `,` to go back and forward by a frame (video only)
+- Add expand/compress button on media modal in web UI ([mashirozx](https://github.com/tootsuite/mastodon/pull/15068), [mashirozx](https://github.com/tootsuite/mastodon/pull/15088), [mashirozx](https://github.com/tootsuite/mastodon/pull/15094))
+- Add border around ðŸ•º emoji in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14769))
+- Add border around ðŸž emoji in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14712))
+- Add home link to the getting started column when home isn't mounted ([ThibG](https://github.com/tootsuite/mastodon/pull/14707))
+- Add option to disable swiping motions across the web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13885))
+- **Add pop-out player for audio/video in web UI** ([Gargron](https://github.com/tootsuite/mastodon/pull/14870), [Gargron](https://github.com/tootsuite/mastodon/pull/15157), [Gargron](https://github.com/tootsuite/mastodon/pull/14915), [noellabo](https://github.com/tootsuite/mastodon/pull/15309))
+  - Continue watching/listening when you scroll away
+  - Action bar to interact with/open toot from the pop-out player
+- Add unread notification markers in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14818), [ThibG](https://github.com/tootsuite/mastodon/pull/14960), [ThibG](https://github.com/tootsuite/mastodon/pull/14954), [noellabo](https://github.com/tootsuite/mastodon/pull/14897), [noellabo](https://github.com/tootsuite/mastodon/pull/14907))
+- Add paragraph about browser add-ons when encountering errors in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14801))
+- Add import and export for bookmarks ([ThibG](https://github.com/tootsuite/mastodon/pull/14956))
+- Add cache buster feature for media files ([Gargron](https://github.com/tootsuite/mastodon/pull/15155))
+  - If you have a proxy cache in front of object storage, deleted files will persist until the cache expires
+  - If enabled, cache buster will make a special request to the proxy to signal a cache reset
+- Add duration option to the mute function ([aquarla](https://github.com/tootsuite/mastodon/pull/13831))
+- Add replies policy option to the list function ([ThibG](https://github.com/tootsuite/mastodon/pull/9205), [trwnh](https://github.com/tootsuite/mastodon/pull/15304))
+- Add `og:published_time` OpenGraph tags on toots ([nornagon](https://github.com/tootsuite/mastodon/pull/14865))
+- **Add option to be notified when a followed user posts** ([Gargron](https://github.com/tootsuite/mastodon/pull/13546), [ThibG](https://github.com/tootsuite/mastodon/pull/14896), [Gargron](https://github.com/tootsuite/mastodon/pull/14822))
+  - If you don't want to miss a toot, click the bell button!
+- Add client-side validation in password change forms ([ThibG](https://github.com/tootsuite/mastodon/pull/14564))
+- Add client-side validation in the registration form ([ThibG](https://github.com/tootsuite/mastodon/pull/14560), [ThibG](https://github.com/tootsuite/mastodon/pull/14599))
+- Add support for Gemini URLs ([joshleeb](https://github.com/tootsuite/mastodon/pull/15013))
+- Add app shortcuts to web app manifest ([mkljczk](https://github.com/tootsuite/mastodon/pull/15234))
+- Add WebAuthn as an alternative 2FA method ([santiagorodriguez96](https://github.com/tootsuite/mastodon/pull/14466), [jiikko](https://github.com/tootsuite/mastodon/pull/14806))
+- Add honeypot fields and minimum fill-out time for sign-up form ([ThibG](https://github.com/tootsuite/mastodon/pull/15276))
+- Add icon for mutual relationships in relationship manager ([noellabo](https://github.com/tootsuite/mastodon/pull/15149))
+- Add follow selected followers button in relationship manager ([noellabo](https://github.com/tootsuite/mastodon/pull/15148))
+- **Add subresource integrity for JS and CSS assets** ([Gargron](https://github.com/tootsuite/mastodon/pull/15096))
+  - If you use a CDN for static assets (JavaScript, CSS, and so on), you have to trust that the CDN does not modify the assets maliciously
+  - Subresource integrity compares server-generated asset digests with what's actually served from the CDN and prevents such attacks
+- Add `ku`, `sa`, `sc`, `zgh` to available locales ([ykzts](https://github.com/tootsuite/mastodon/pull/15138))
+- Add ability to force an account to mark media as sensitive ([noellabo](https://github.com/tootsuite/mastodon/pull/14361))
+- **Add ability to block access or limit sign-ups from chosen IPs** ([Gargron](https://github.com/tootsuite/mastodon/pull/14963), [ThibG](https://github.com/tootsuite/mastodon/pull/15263))
+  - Add rules for IPs or CIDR ranges that automatically expire after a configurable amount of time
+  - Choose the severity of the rule, either blocking all access or merely limiting sign-ups
+- **Add support for reversible suspensions through ActivityPub** ([Gargron](https://github.com/tootsuite/mastodon/pull/14989))
+  - Servers can signal that one of their accounts has been suspended
+  - During suspension, the account can only delete its own content
+  - A reversal of the suspension can be signalled the same way
+  - A local suspension always overrides a remote one
+- Add indication to admin UI of whether a report has been forwarded ([ThibG](https://github.com/tootsuite/mastodon/pull/13237))
+- Add display of reasons for joining of an account in admin UI ([mashirozx](https://github.com/tootsuite/mastodon/pull/15265))
+- Add option to obfuscate domain name in public list of domain blocks ([Gargron](https://github.com/tootsuite/mastodon/pull/15355))
+- Add option to make reasons for joining required on sign-up ([ThibG](https://github.com/tootsuite/mastodon/pull/15326), [ThibG](https://github.com/tootsuite/mastodon/pull/15358), [ThibG](https://github.com/tootsuite/mastodon/pull/15385), [ThibG](https://github.com/tootsuite/mastodon/pull/15405))
+- Add ActivityPub follower synchronization mechanism ([ThibG](https://github.com/tootsuite/mastodon/pull/14510), [ThibG](https://github.com/tootsuite/mastodon/pull/15026))
+- Add outbox attribute to instance actor ([ThibG](https://github.com/tootsuite/mastodon/pull/14721))
+- Add featured hashtags as an ActivityPub collection ([Gargron](https://github.com/tootsuite/mastodon/pull/11595), [noellabo](https://github.com/tootsuite/mastodon/pull/15277))
+- Add support for dereferencing objects through bearcaps ([Gargron](https://github.com/tootsuite/mastodon/pull/14683), [noellabo](https://github.com/tootsuite/mastodon/pull/14981))
+- Add `S3_READ_TIMEOUT` environment variable ([tateisu](https://github.com/tootsuite/mastodon/pull/14952))
+- Add `ALLOWED_PRIVATE_ADDRESSES` environment variable ([ThibG](https://github.com/tootsuite/mastodon/pull/14722))
+- Add `--fix-permissions` option to `tootctl media remove-orphans` ([Gargron](https://github.com/tootsuite/mastodon/pull/14383), [uist1idrju3i](https://github.com/tootsuite/mastodon/pull/14715))
+- Add `tootctl accounts merge` ([Gargron](https://github.com/tootsuite/mastodon/pull/15201), [ThibG](https://github.com/tootsuite/mastodon/pull/15264), [ThibG](https://github.com/tootsuite/mastodon/pull/15256))
+  - Has someone changed their domain or subdomain thereby creating two accounts where there should be one?
+  - This command will fix it on your end
+- Add `tootctl maintenance fix-duplicates` ([ThibG](https://github.com/tootsuite/mastodon/pull/14860), [Gargron](https://github.com/tootsuite/mastodon/pull/15223), [ThibG](https://github.com/tootsuite/mastodon/pull/15373))
+  - Index corruption in the database?
+  - This command is for you
+- **Add support for managing multiple stream subscriptions in a single connection** ([Gargron](https://github.com/tootsuite/mastodon/pull/14524), [Gargron](https://github.com/tootsuite/mastodon/pull/14566), [mfmfuyu](https://github.com/tootsuite/mastodon/pull/14859), [zunda](https://github.com/tootsuite/mastodon/pull/14608))
+  - Previously, getting live updates for multiple timelines required opening a HTTP or WebSocket connection for each
+  - More connections means more resource consumption on both ends, not to mention the (ever so slight) delay when establishing a new connection
+  - Now, with just a single WebSocket connection you can subscribe and unsubscribe to and from multiple streams
+- Add support for limiting results by both `min_id` and `max_id` at the same time in REST API ([tateisu](https://github.com/tootsuite/mastodon/pull/14776))
+- Add `GET /api/v1/accounts/:id/featured_tags` to REST API ([noellabo](https://github.com/tootsuite/mastodon/pull/11817), [noellabo](https://github.com/tootsuite/mastodon/pull/15270))
+- Add stoplight for object storage failures, return HTTP 503 in REST API ([Gargron](https://github.com/tootsuite/mastodon/pull/13043))
+- Add optional `tootctl remove media` cronjob in Helm chart ([dunn](https://github.com/tootsuite/mastodon/pull/14396))
+- Add clean error message when `RAILS_ENV` is unset ([ThibG](https://github.com/tootsuite/mastodon/pull/15381))
+
+### Changed
+
+- **Change media modals look in web UI** ([Gargron](https://github.com/tootsuite/mastodon/pull/15217), [Gargron](https://github.com/tootsuite/mastodon/pull/15221), [Gargron](https://github.com/tootsuite/mastodon/pull/15284), [Gargron](https://github.com/tootsuite/mastodon/pull/15283), [Kjwon15](https://github.com/tootsuite/mastodon/pull/15308), [noellabo](https://github.com/tootsuite/mastodon/pull/15305), [ThibG](https://github.com/tootsuite/mastodon/pull/15417))
+  - Background of the overlay matches the color of the image
+  - Action bar to interact with or open the toot from the modal
+- Change order of announcements in admin UI to be newest-first ([ThibG](https://github.com/tootsuite/mastodon/pull/15091))
+- **Change account suspensions to be reversible by default** ([Gargron](https://github.com/tootsuite/mastodon/pull/14726), [ThibG](https://github.com/tootsuite/mastodon/pull/15152), [ThibG](https://github.com/tootsuite/mastodon/pull/15106), [ThibG](https://github.com/tootsuite/mastodon/pull/15100), [ThibG](https://github.com/tootsuite/mastodon/pull/15099), [noellabo](https://github.com/tootsuite/mastodon/pull/14855), [ThibG](https://github.com/tootsuite/mastodon/pull/15380), [Gargron](https://github.com/tootsuite/mastodon/pull/15420), [Gargron](https://github.com/tootsuite/mastodon/pull/15414))
+  - Suspensions no longer equal deletions
+  - A suspended account can be unsuspended with minimal consequences for 30 days
+  - Immediate deletion of data is still available as an explicit option
+  - Suspended accounts can request an archive of their data through the UI
+- Change REST API to return empty data for suspended accounts (14765)
+- Change web UI to show empty profile for suspended accounts ([Gargron](https://github.com/tootsuite/mastodon/pull/14766), [Gargron](https://github.com/tootsuite/mastodon/pull/15345))
+- Change featured hashtag suggestions to be recently used instead of most used ([abcang](https://github.com/tootsuite/mastodon/pull/14760))
+- Change direct toots to appear in the home feed again ([Gargron](https://github.com/tootsuite/mastodon/pull/14711), [ThibG](https://github.com/tootsuite/mastodon/pull/15182), [noellabo](https://github.com/tootsuite/mastodon/pull/14727))
+  - Return to treating all toots the same instead of trying to retrofit direct visibility into an instant messaging model
+- Change email address validation to return more specific errors ([ThibG](https://github.com/tootsuite/mastodon/pull/14565))
+- Change HTTP signature requirements to include `Digest` header on `POST` requests ([ThibG](https://github.com/tootsuite/mastodon/pull/15069))
+- Change click area of video/audio player buttons to be bigger in web UI ([ariasuni](https://github.com/tootsuite/mastodon/pull/15049))
+- Change order of filters by alphabetic by "keyword or phrase" ([ariasuni](https://github.com/tootsuite/mastodon/pull/15050))
+- Change suspension of remote accounts to also undo outgoing follows ([ThibG](https://github.com/tootsuite/mastodon/pull/15188))
+- Change string "Home" to "Home and lists" in the filter creation screen ([ariasuni](https://github.com/tootsuite/mastodon/pull/15139))
+- Change string "Boost to original audience" to "Boost with original visibility" in web UI ([3n-k1](https://github.com/tootsuite/mastodon/pull/14598))
+- Change string "Show more" to "Show newer" and "Show older" on public pages ([ariasuni](https://github.com/tootsuite/mastodon/pull/15052))
+- Change order of announcements to be reverse chronological in web UI ([dariusk](https://github.com/tootsuite/mastodon/pull/15065), [dariusk](https://github.com/tootsuite/mastodon/pull/15070))
+- Change RTL detection to rely on unicode-bidi paragraph by paragraph in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/14573))
+- Change visibility icon next to timestamp to be clickable in web UI ([ariasuni](https://github.com/tootsuite/mastodon/pull/15053), [mayaeh](https://github.com/tootsuite/mastodon/pull/15055))
+- Change public thread view to hide "Show thread" link ([ThibG](https://github.com/tootsuite/mastodon/pull/15266))
+- Change number format on about page from full to shortened ([Gargron](https://github.com/tootsuite/mastodon/pull/15327))
+- Change how scheduled tasks run in multi-process environments ([noellabo](https://github.com/tootsuite/mastodon/pull/15314))
+  - New dedicated queue `scheduler`
+  - Runs by default when Sidekiq is executed with no options
+  - Has to be added manually in a multi-process environment
+
+### Removed
+
+- Remove fade-in animation from modals in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/15199))
+- Remove auto-redirect to direct messages in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/15142))
+- Remove obsolete IndexedDB operations from web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/14730))
+- Remove dependency on unused and unmaintained http_parser.rb gem ([ThibG](https://github.com/tootsuite/mastodon/pull/14574))
+
+### Fixed
+
+- Fix layout on about page when contact account has a long username ([ThibG](https://github.com/tootsuite/mastodon/pull/15357))
+- Fix follow limit preventing re-following of a moved account ([Gargron](https://github.com/tootsuite/mastodon/pull/14207), [ThibG](https://github.com/tootsuite/mastodon/pull/15384))
+- **Fix deletes not reaching every server that interacted with toot** ([Gargron](https://github.com/tootsuite/mastodon/pull/15200))
+  - Previously, delete of a toot would be primarily sent to the followers of its author, people mentioned in the toot, and people who reblogged the toot
+  - Now, additionally, it is ensured that it is sent to people who replied to it, favourited it, and to the person it replies to even if that person is not mentioned
+- Fix resolving an account through its non-canonical form (i.e. alternate domain) ([ThibG](https://github.com/tootsuite/mastodon/pull/15187))
+- Fix sending redundant ActivityPub events when processing remote account deletion ([ThibG](https://github.com/tootsuite/mastodon/pull/15104))
+- Fix Move handler not being triggered when failing to fetch target account ([ThibG](https://github.com/tootsuite/mastodon/pull/15107))
+- Fix downloading remote media files when server returns empty filename ([ThibG](https://github.com/tootsuite/mastodon/pull/14867))
+- Fix account processing failing because of large collections ([ThibG](https://github.com/tootsuite/mastodon/pull/15027))
+- Fix not being able to unfavorite toots one has lost access to ([ThibG](https://github.com/tootsuite/mastodon/pull/15192))
+- Fix not being able to unbookmark toots one has lost access to ([ThibG](https://github.com/tootsuite/mastodon/pull/14604))
+- Fix possible casing inconsistencies in hashtag search ([ThibG](https://github.com/tootsuite/mastodon/pull/14906))
+- Fix updating account counters when association is not yet created ([Gargron](https://github.com/tootsuite/mastodon/pull/15108))
+- Fix cookies not having a SameSite attribute ([Gargron](https://github.com/tootsuite/mastodon/pull/15098))
+- Fix poll ending notifications being created for each vote ([ThibG](https://github.com/tootsuite/mastodon/pull/15071))
+- Fix multiple boosts of a same toot erroneously appearing in TL ([ThibG](https://github.com/tootsuite/mastodon/pull/14759))
+- Fix asset builds not picking up `CDN_HOST` change ([ThibG](https://github.com/tootsuite/mastodon/pull/14381))
+- Fix desktop notifications permission prompt in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/14985), [Gargron](https://github.com/tootsuite/mastodon/pull/15141), [ThibG](https://github.com/tootsuite/mastodon/pull/13543), [ThibG](https://github.com/tootsuite/mastodon/pull/15176))
+  - Some time ago, browsers added a requirement that desktop notification prompts could only be displayed in response to a user-generated event (such as a click)
+  - This means that for some time, users who haven't already given the permission before were not getting a prompt and as such were not receiving desktop notifications
+- Fix "Mark media as sensitive" string not supporting pluralizations in other languages in web UI ([ariasuni](https://github.com/tootsuite/mastodon/pull/15051))
+- Fix glitched image uploads when canvas read access is blocked in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/15180))
+- Fix some account gallery items having empty labels in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/15073))
+- Fix alt-key hotkeys activating while typing in a text field in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14942))
+- Fix wrong seek bar width on media player in web UI ([mfmfuyu](https://github.com/tootsuite/mastodon/pull/15060))
+- Fix logging out on mobile in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14901))
+- Fix wrong click area for GIFVs in media modal in web UI ([noellabo](https://github.com/tootsuite/mastodon/pull/14615))
+- Fix unreadable placeholder text color in high contrast theme in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/14803))
+- Fix scrolling issues when closing some dropdown menus in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14606))
+- Fix notification filter bar incorrectly filtering gaps in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14808))
+- Fix disabled boost icon being replaced by private boost icon on hover in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14456))
+- Fix hashtag detection in compose form being different to server-side in web UI ([kedamaDQ](https://github.com/tootsuite/mastodon/pull/14484), [ThibG](https://github.com/tootsuite/mastodon/pull/14513))
+- Fix home last read marker mishandling gaps in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14809))
+- Fix unnecessary re-rendering of various components when typing in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/15286))
+- Fix notifications being unnecessarily re-rendered in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/15312))
+- Fix column swiping animation logic in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/15301))
+- Fix inefficiency when fetching hashtag timeline ([noellabo](https://github.com/tootsuite/mastodon/pull/14861), [akihikodaki](https://github.com/tootsuite/mastodon/pull/14662))
+- Fix inefficiency when fetching bookmarks ([akihikodaki](https://github.com/tootsuite/mastodon/pull/14674))
+- Fix inefficiency when fetching favourites ([akihikodaki](https://github.com/tootsuite/mastodon/pull/14673))
+- Fix inefficiency when fetching media-only account timeline ([akihikodaki](https://github.com/tootsuite/mastodon/pull/14675))
+- Fix inefficieny when deleting accounts ([Gargron](https://github.com/tootsuite/mastodon/pull/15387), [ThibG](https://github.com/tootsuite/mastodon/pull/15409), [ThibG](https://github.com/tootsuite/mastodon/pull/15407), [ThibG](https://github.com/tootsuite/mastodon/pull/15408), [ThibG](https://github.com/tootsuite/mastodon/pull/15402), [ThibG](https://github.com/tootsuite/mastodon/pull/15416), [Gargron](https://github.com/tootsuite/mastodon/pull/15421))
+- Fix redundant query when processing batch actions on custom emojis ([niwatori24](https://github.com/tootsuite/mastodon/pull/14534))
+- Fix slow distinct queries where grouped queries are faster ([Gargron](https://github.com/tootsuite/mastodon/pull/15287))
+- Fix performance on instances list in admin UI ([Gargron](https://github.com/tootsuite/mastodon/pull/15282))
+- Fix server actor appearing in list of accounts in admin UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14567))
+- Fix "bootstrap timeline accounts" toggle in site settings in admin UI ([ThibG](https://github.com/tootsuite/mastodon/pull/15325))
+- Fix PostgreSQL secret name for cronjob in Helm chart ([metal3d](https://github.com/tootsuite/mastodon/pull/15072))
+- Fix Procfile not being compatible with herokuish ([acuteaura](https://github.com/tootsuite/mastodon/pull/12685))
+- Fix installation of tini being split into multiple steps in Dockerfile ([ryncsn](https://github.com/tootsuite/mastodon/pull/14686))
+
+### Security
+
+- Fix streaming API allowing connections to persist after access token invalidation ([Gargron](https://github.com/tootsuite/mastodon/pull/15111))
+- Fix 2FA/sign-in token sessions being valid after password change ([Gargron](https://github.com/tootsuite/mastodon/pull/14802))
+- Fix resolving accounts sometimes creating duplicate records for a given ActivityPub identifier ([ThibG](https://github.com/tootsuite/mastodon/pull/15364))
+
+## [3.2.2] - 2020-12-19
+### Added
+
+- Add `tootctl maintenance fix-duplicates` ([ThibG](https://github.com/tootsuite/mastodon/pull/14860), [Gargron](https://github.com/tootsuite/mastodon/pull/15223))
+  - Index corruption in the database?
+  - This command is for you
+
+### Removed
+
+- Remove dependency on unused and unmaintained http_parser.rb gem ([ThibG](https://github.com/tootsuite/mastodon/pull/14574))
+
+### Fixed
+
+- Fix Move handler not being triggered when failing to fetch target account ([ThibG](https://github.com/tootsuite/mastodon/pull/15107))
+- Fix downloading remote media files when server returns empty filename ([ThibG](https://github.com/tootsuite/mastodon/pull/14867))
+- Fix possible casing inconsistencies in hashtag search ([ThibG](https://github.com/tootsuite/mastodon/pull/14906))
+- Fix updating account counters when association is not yet created ([Gargron](https://github.com/tootsuite/mastodon/pull/15108))
+- Fix account processing failing because of large collections ([ThibG](https://github.com/tootsuite/mastodon/pull/15027))
+- Fix resolving an account through its non-canonical form (i.e. alternate domain) ([ThibG](https://github.com/tootsuite/mastodon/pull/15187))
+- Fix slow distinct queries where grouped queries are faster ([Gargron](https://github.com/tootsuite/mastodon/pull/15287))
+
+### Security
+
+- Fix 2FA/sign-in token sessions being valid after password change ([Gargron](https://github.com/tootsuite/mastodon/pull/14802))
+- Fix resolving accounts sometimes creating duplicate records for a given ActivityPub identifier ([ThibG](https://github.com/tootsuite/mastodon/pull/15364))
+
+## [3.2.1] - 2020-10-19
+### Added
+
+- Add support for latest HTTP Signatures spec draft ([ThibG](https://github.com/tootsuite/mastodon/pull/14556))
+- Add support for inlined objects in ActivityPub `to`/`cc` ([ThibG](https://github.com/tootsuite/mastodon/pull/14514))
+
+### Changed
+
+- Change actors to not be served at all without authentication in limited federation mode ([ThibG](https://github.com/tootsuite/mastodon/pull/14800))
+  - Previously, a bare version of an actor was served when not authenticated, i.e. username and public key
+  - Because all actor fetch requests are signed using a separate system actor, that is no longer required
+
+### Fixed
+
+- Fix `tootctl media` commands not recognizing very large IDs ([ThibG](https://github.com/tootsuite/mastodon/pull/14536))
+- Fix crash when failing to load emoji picker in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14525))
+- Fix contrast requirements in thumbnail color extraction ([ThibG](https://github.com/tootsuite/mastodon/pull/14464))
+- Fix audio/video player not using `CDN_HOST` on public pages ([ThibG](https://github.com/tootsuite/mastodon/pull/14486))
+- Fix private boost icon not being used on public pages ([OmmyZhang](https://github.com/tootsuite/mastodon/pull/14471))
+- Fix audio player on Safari in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14485), [ThibG](https://github.com/tootsuite/mastodon/pull/14465))
+- Fix dereferencing remote statuses not using the correct account for signature when receiving a targeted inbox delivery ([ThibG](https://github.com/tootsuite/mastodon/pull/14656))
+- Fix nil error in `tootctl media remove` ([noellabo](https://github.com/tootsuite/mastodon/pull/14657))
+- Fix videos with near-60 fps being rejected ([Gargron](https://github.com/tootsuite/mastodon/pull/14684))
+- Fix reported statuses not being included in warning e-mail ([Gargron](https://github.com/tootsuite/mastodon/pull/14778))
+- Fix `Reject` activities of `Follow` objects not correctly destroying a follow relationship ([ThibG](https://github.com/tootsuite/mastodon/pull/14479))
+- Fix inefficiencies in fan-out-on-write service ([Gargron](https://github.com/tootsuite/mastodon/pull/14682), [noellabo](https://github.com/tootsuite/mastodon/pull/14709))
+- Fix timeout errors when trying to webfinger some IPv6 configurations ([Gargron](https://github.com/tootsuite/mastodon/pull/14919))
+- Fix files served as `application/octet-stream` being rejected without attempting mime type detection ([ThibG](https://github.com/tootsuite/mastodon/pull/14452))
+
+## [3.2.0] - 2020-07-27
 ### Added
 
 - Add `SMTP_SSL` environment variable ([OmmyZhang](https://github.com/tootsuite/mastodon/pull/14309))
@@ -29,7 +260,7 @@ All notable changes to this project will be documented in this file.
   - New REST API: `POST /api/v1/accounts/:id/note` with `comment` param
   - The Relationship entity in REST API has a new `note` attribute
 - Add Helm chart ([dunn](https://github.com/tootsuite/mastodon/pull/14090), [dunn](https://github.com/tootsuite/mastodon/pull/14256), [dunn](https://github.com/tootsuite/mastodon/pull/14245))
-- **Add customizable thumbnails for audio and video attachments** ([Gargron](https://github.com/tootsuite/mastodon/pull/14145), [Gargron](https://github.com/tootsuite/mastodon/pull/14244), [Gargron](https://github.com/tootsuite/mastodon/pull/14273), [Gargron](https://github.com/tootsuite/mastodon/pull/14203), [ThibG](https://github.com/tootsuite/mastodon/pull/14255), [ThibG](https://github.com/tootsuite/mastodon/pull/14306))
+- **Add customizable thumbnails for audio and video attachments** ([Gargron](https://github.com/tootsuite/mastodon/pull/14145), [Gargron](https://github.com/tootsuite/mastodon/pull/14244), [Gargron](https://github.com/tootsuite/mastodon/pull/14273), [Gargron](https://github.com/tootsuite/mastodon/pull/14203), [ThibG](https://github.com/tootsuite/mastodon/pull/14255), [ThibG](https://github.com/tootsuite/mastodon/pull/14306), [noellabo](https://github.com/tootsuite/mastodon/pull/14358), [noellabo](https://github.com/tootsuite/mastodon/pull/14357))
   - Metadata (album, artist, etc) is no longer stripped from audio files
   - Album art is automatically extracted from audio files
   - Thumbnail can be manually uploaded for both audio and video attachments
@@ -37,6 +268,7 @@ All notable changes to this project will be documented in this file.
     - On `POST /api/v1/media` and `POST /api/v2/media`
     - And on `PUT /api/v1/media/:id`
   - ActivityPub representation of media attachments represents custom thumbnails with an `icon` attribute
+  - The Media Attachment entity in REST API now has a `preview_remote_url` to its `preview_url`, equivalent to `remote_url` to its `url`
 - **Add color extraction for thumbnails** ([Gargron](https://github.com/tootsuite/mastodon/pull/14209), [ThibG](https://github.com/tootsuite/mastodon/pull/14264))
   - The `meta` attribute on the Media Attachment entity in REST API can now have a `colors` attribute which in turn contains three hex colors: `background`, `foreground`, and `accent`
   - The background color is chosen from the most dominant color around the edges of the thumbnail
@@ -48,6 +280,9 @@ All notable changes to this project will be documented in this file.
 - Add `tootctl email_domain_blocks` ([tateisu](https://github.com/tootsuite/mastodon/pull/13589), [Gargron](https://github.com/tootsuite/mastodon/pull/14147))
 - Add "Add new domain block" to header of federation page in admin UI ([ariasuni](https://github.com/tootsuite/mastodon/pull/13934))
 - Add ability to keep emoji picker open with ctrl+click in web UI ([bclindner](https://github.com/tootsuite/mastodon/pull/13896), [noellabo](https://github.com/tootsuite/mastodon/pull/14096))
+- Add custom icon for private boosts in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14380))
+- Add support for Create and Update activities that don't inline objects in ActivityPub ([ThibG](https://github.com/tootsuite/mastodon/pull/14359))
+- Add support for Undo activities that don't inline activities in ActivityPub ([ThibG](https://github.com/tootsuite/mastodon/pull/14346))
 
 ### Changed
 
@@ -59,9 +294,9 @@ All notable changes to this project will be documented in this file.
   - Some websites may not render OpenGraph tags into HTML if that's not the case
 - Change behaviour to carry blocks over when someone migrates their followers ([ThibG](https://github.com/tootsuite/mastodon/pull/14144))
 - Change volume control and download buttons in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/14122))
-- **Change design of audio players in web UI** ([Gargron](https://github.com/tootsuite/mastodon/pull/14095), [ThibG](https://github.com/tootsuite/mastodon/pull/14281), [Gargron](https://github.com/tootsuite/mastodon/pull/14282), [ThibG](https://github.com/tootsuite/mastodon/pull/14118), [Gargron](https://github.com/tootsuite/mastodon/pull/14199))
+- **Change design of audio players in web UI** ([Gargron](https://github.com/tootsuite/mastodon/pull/14095), [ThibG](https://github.com/tootsuite/mastodon/pull/14281), [Gargron](https://github.com/tootsuite/mastodon/pull/14282), [ThibG](https://github.com/tootsuite/mastodon/pull/14118), [Gargron](https://github.com/tootsuite/mastodon/pull/14199), [ThibG](https://github.com/tootsuite/mastodon/pull/14338))
 - Change reply filter to never filter own toots in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14128))
-- Change boost button to no longer serve as visibility indicator in web UI ([noellabo](https://github.com/tootsuite/mastodon/pull/14132))
+- Change boost button to no longer serve as visibility indicator in web UI ([noellabo](https://github.com/tootsuite/mastodon/pull/14132), [ThibG](https://github.com/tootsuite/mastodon/pull/14373))
 - Change contrast of flash messages ([cchoi12](https://github.com/tootsuite/mastodon/pull/13892))
 - Change wording from "Hide media" to "Hide image/images" in web UI ([ariasuni](https://github.com/tootsuite/mastodon/pull/13834))
 - Change appearence of settings pages to be more consistent ([ariasuni](https://github.com/tootsuite/mastodon/pull/13938))
@@ -69,6 +304,7 @@ All notable changes to this project will be documented in this file.
 - Change how badly contrasting emoji are rendered in web UI ([leo60228](https://github.com/tootsuite/mastodon/pull/13773), [ThibG](https://github.com/tootsuite/mastodon/pull/13772), [mfmfuyu](https://github.com/tootsuite/mastodon/pull/14020), [ThibG](https://github.com/tootsuite/mastodon/pull/14015))
 - Change structure of unavailable content section on about page ([ariasuni](https://github.com/tootsuite/mastodon/pull/13930))
 - Change behaviour to accept ActivityPub activities relayed through group actor ([noellabo](https://github.com/tootsuite/mastodon/pull/14279))
+- Change amount of processing retries for ActivityPub activities ([noellabo](https://github.com/tootsuite/mastodon/pull/14355))
 
 ### Removed
 
@@ -84,13 +320,18 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+- Fix `following` param not working when exact match is found in account search ([noellabo](https://github.com/tootsuite/mastodon/pull/14394))
+- Fix sometimes occuring duplicate mention notifications ([noellabo](https://github.com/tootsuite/mastodon/pull/14378))
+- Fix RSS feeds not being cachable ([ThibG](https://github.com/tootsuite/mastodon/pull/14368))
+- Fix lack of locking around processing of Announce activities in ActivityPub ([noellabo](https://github.com/tootsuite/mastodon/pull/14365))
+- Fix boosted toots from blocked account not being retroactively removed from TL ([ThibG](https://github.com/tootsuite/mastodon/pull/14339))
 - Fix large shortened numbers (like 1.2K) using incorrect pluralization ([Sasha-Sorokin](https://github.com/tootsuite/mastodon/pull/14061))
 - Fix streaming server trying to use empty password to connect to Redis when `REDIS_PASSWORD` is given but blank ([ThibG](https://github.com/tootsuite/mastodon/pull/14135))
 - Fix being unable to unboost posts when blocked by their author ([ThibG](https://github.com/tootsuite/mastodon/pull/14308))
 - Fix account domain block not properly unfollowing accounts from domain ([Gargron](https://github.com/tootsuite/mastodon/pull/14304))
 - Fix removing a domain allow wiping known accounts in open federation mode ([ThibG](https://github.com/tootsuite/mastodon/pull/14298))
 - Fix blocks and mutes pagination in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14275))
-- Fix new posts pushing down origin of opened dropdown in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14271))
+- Fix new posts pushing down origin of opened dropdown in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14271), [ThibG](https://github.com/tootsuite/mastodon/pull/14348))
 - Fix timeline markers not being saved sometimes ([ThibG](https://github.com/tootsuite/mastodon/pull/13887), [ThibG](https://github.com/tootsuite/mastodon/pull/13889), [ThibG](https://github.com/tootsuite/mastodon/pull/14155))
 - Fix CSV uploads being rejected ([noellabo](https://github.com/tootsuite/mastodon/pull/13835))
 - Fix incompatibility with ElasticSearch 7.x ([noellabo](https://github.com/tootsuite/mastodon/pull/13828))
@@ -112,7 +353,7 @@ All notable changes to this project will be documented in this file.
   - Use circuit breakers to stop hitting unresponsive servers
   - Avoid hitting servers that are already known to be generally unavailable
 - Fix filters ignoring media descriptions ([BenLubar](https://github.com/tootsuite/mastodon/pull/13837))
-- Fix soem actions on custom emojis leading to cryptic errors in admin UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13951))
+- Fix some actions on custom emojis leading to cryptic errors in admin UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13951))
 - Fix ActivityPub serialization of replies when some of them are URIs ([ThibG](https://github.com/tootsuite/mastodon/pull/13957))
 - Fix `rake mastodon:setup` choking on environment variables containing `%` ([ThibG](https://github.com/tootsuite/mastodon/pull/13940))
 - Fix account redirect confirmation message talking about moved followers ([ThibG](https://github.com/tootsuite/mastodon/pull/13950))
@@ -132,7 +373,7 @@ All notable changes to this project will be documented in this file.
 - Fix unapproved users being able to view profiles when in limited-federation mode *and* requiring approval for sign-ups ([ThibG](https://github.com/tootsuite/mastodon/pull/14093))
 - Fix initial audio volume not corresponding to what's displayed in audio player in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14057))
 - Fix timelines sometimes jumping when closing modals in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14019))
-- Fix memory usage of downloading remote files ([Gargron](https://github.com/tootsuite/mastodon/pull/14184), [Gargron](https://github.com/tootsuite/mastodon/pull/14181))
+- Fix memory usage of downloading remote files ([Gargron](https://github.com/tootsuite/mastodon/pull/14184), [Gargron](https://github.com/tootsuite/mastodon/pull/14181), [noellabo](https://github.com/tootsuite/mastodon/pull/14356))
   - Don't read entire file (up to 40 MB) into memory
   - Read and write it to temp file in small chunks
 - Fix inconsistent account header padding in web UI ([trwnh](https://github.com/tootsuite/mastodon/pull/14179))
@@ -146,14 +387,14 @@ All notable changes to this project will be documented in this file.
   - Only then proceed to start removing their data (slow)
   - Clear out media attachments in a separate worker (slow)
 
-## [v3.1.5] - 2020-07-07
+## [3.1.5] - 2020-07-07
 ### Security
 
 - Fix media attachment enumeration ([ThibG](https://github.com/tootsuite/mastodon/pull/14254))
 - Change rate limits for various paths ([Gargron](https://github.com/tootsuite/mastodon/pull/14253))
 - Fix other sessions not being logged out on password change ([Gargron](https://github.com/tootsuite/mastodon/pull/14252))
 
-## [v3.1.4] - 2020-05-14
+## [3.1.4] - 2020-05-14
 ### Added
 
 - Add `vi` to available locales ([taicv](https://github.com/tootsuite/mastodon/pull/13542))
@@ -220,7 +461,7 @@ All notable changes to this project will be documented in this file.
   - For apps that self-register on behalf of every individual user (such as most mobile apps), this is a non-issue
   - The issue only affects developers of apps who are shared between multiple users, such as server-side apps like cross-posters
 
-## [v3.1.3] - 2020-04-05
+## [3.1.3] - 2020-04-05
 ### Added
 
 - Add ability to filter audit log in admin UI ([Gargron](https://github.com/tootsuite/mastodon/pull/13381))
diff --git a/Dockerfile b/Dockerfile
index fa6abad5a1369081d3922a663db636cd27f6e10f..95d45bab427007e1e8fd2538ddc6dca229399927 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ FROM ubuntu:20.04 as build-dep
 SHELL ["bash", "-c"]
 
 # Install Node v12 (LTS)
-ENV NODE_VER="12.16.3"
+ENV NODE_VER="12.20.0"
 RUN ARCH= && \
     dpkgArch="$(dpkg --print-architecture)" && \
   case "${dpkgArch##*-}" in \
@@ -36,10 +36,11 @@ RUN apt update && \
 	./autogen.sh && \
 	./configure --prefix=/opt/jemalloc && \
 	make -j$(nproc) > /dev/null && \
-	make install_bin install_include install_lib
+	make install_bin install_include install_lib && \
+	cd .. && rm -rf jemalloc-$JE_VER $JE_VER.tar.gz
 
 # Install Ruby
-ENV RUBY_VER="2.6.6"
+ENV RUBY_VER="2.7.2"
 ENV CPPFLAGS="-I/opt/jemalloc/include"
 ENV LDFLAGS="-L/opt/jemalloc/lib/"
 RUN apt update && \
@@ -56,7 +57,8 @@ RUN apt update && \
 	  --disable-install-doc && \
 	ln -s /opt/jemalloc/lib/* /usr/lib/ && \
 	make -j$(nproc) > /dev/null && \
-	make install
+	make install && \
+	cd .. && rm -rf ruby-$RUBY_VER.tar.gz ruby-$RUBY_VER
 
 ENV PATH="${PATH}:/opt/ruby/bin:/opt/node/bin"
 
@@ -107,11 +109,14 @@ RUN apt -y --no-install-recommends install \
 	rm -rf /var/lib/apt/lists/*
 
 # Add tini
-ENV TINI_VERSION="0.18.0"
-ENV TINI_SUM="12d20136605531b09a2c2dac02ccee85e1b874eb322ef6baf7561cd93f93c855"
-ADD https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini /tini
-RUN echo "$TINI_SUM tini" | sha256sum -c -
-RUN chmod +x /tini
+ENV TINI_VERSION="0.19.0"
+RUN dpkgArch="$(dpkg --print-architecture)" && \
+	ARCH=$dpkgArch && \
+	wget https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-$ARCH \
+	https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-$ARCH.sha256sum && \
+	cat tini-$ARCH.sha256sum | sha256sum -c - && \
+	mv tini-$ARCH /tini && rm tini-$ARCH.sha256sum && \
+	chmod +x /tini
 
 # Copy over mastodon source, and dependencies from building, and set permissions
 COPY --chown=mastodon:mastodon . /opt/mastodon
diff --git a/Gemfile b/Gemfile
index 414bd2c305674bdcc25820bcfafaf249d20d617e..6180a1d110946084d9bd20a8907303c6e969cf15 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,22 +5,19 @@ ruby '>= 2.5.0', '< 3.0.0'
 
 gem 'pkg-config', '~> 1.4'
 
-gem 'puma', '~> 4.3'
-gem 'rails', '~> 5.2.4.3'
+gem 'puma', '~> 5.1'
+gem 'rails', '~> 5.2.4.4'
 gem 'sprockets', '~> 3.7.2'
-gem 'thor', '~> 0.20'
+gem 'thor', '~> 1.0'
 gem 'rack', '~> 2.2.3'
 
-gem 'thwait', '~> 0.1.0'
-gem 'e2mmap', '~> 0.1.0'
-
 gem 'hamlit-rails', '~> 0.2'
 gem 'pg', '~> 1.2'
 gem 'makara', '~> 0.4'
-gem 'pghero', '~> 2.5'
+gem 'pghero', '~> 2.7'
 gem 'dotenv-rails', '~> 2.7'
 
-gem 'aws-sdk-s3', '~> 1.73', require: false
+gem 'aws-sdk-s3', '~> 1.87', require: false
 gem 'fog-core', '<= 2.1.0'
 gem 'fog-openstack', '~> 0.3', require: false
 gem 'paperclip', '~> 6.0'
@@ -30,12 +27,12 @@ gem 'blurhash', '~> 0.1'
 
 gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.7'
-gem 'bootsnap', '~> 1.4', require: false
+gem 'bootsnap', '~> 1.5', require: false
 gem 'browser'
 gem 'charlock_holmes', '~> 0.7.7'
 gem 'iso-639'
 gem 'chewy', '~> 5.1'
-gem 'cld3', '~> 3.3.0'
+gem 'cld3', '~> 3.4.1'
 gem 'devise', '~> 4.7'
 gem 'devise-two-factor', '~> 3.1'
 
@@ -43,10 +40,11 @@ group :pam_authentication, optional: true do
   gem 'devise_pam_authenticatable2', '~> 9.2'
 end
 
-gem 'net-ldap', '~> 0.16'
-gem 'omniauth-cas', '~> 1.1'
+gem 'net-ldap', '~> 0.17'
+gem 'omniauth-cas', '~> 2.0'
 gem 'omniauth-saml', '~> 1.10'
 gem 'omniauth', '~> 1.9'
+gem 'omniauth-rails_csrf_protection', '~> 0.1'
 
 gem 'color_diff', '~> 0.1'
 gem 'discard', '~> 1.2'
@@ -54,14 +52,12 @@ gem 'doorkeeper', '~> 5.4'
 gem 'ed25519', '~> 1.2'
 gem 'fast_blank', '~> 1.0'
 gem 'fastimage'
-gem 'goldfinger', '~> 2.1'
 gem 'hiredis', '~> 0.6'
-gem 'redis-namespace', '~> 1.7'
+gem 'redis-namespace', '~> 1.8'
 gem 'health_check', git: 'https://github.com/ianheggie/health_check', ref: '0b799ead604f900ed50685e9b2d469cd2befba5b'
 gem 'htmlentities', '~> 4.3'
 gem 'http', '~> 4.4'
 gem 'http_accept_language', '~> 2.1'
-gem 'http_parser.rb', '~> 0.6', git: 'https://github.com/tmm1/http_parser.rb', ref: '54b17ba8c7d8d20a16dfc65d1775241833219cf2', submodules: true
 gem 'httplog', '~> 1.4.3'
 gem 'idn-ruby', require: 'idn'
 gem 'kaminari', '~> 1.2'
@@ -71,10 +67,10 @@ gem 'nilsimsa', git: 'https://github.com/witgo/nilsimsa', ref: 'fd184883048b922b
 gem 'nokogiri', '~> 1.10'
 gem 'nsa', '~> 0.2'
 gem 'oj', '~> 3.10'
-gem 'ox', '~> 2.13'
+gem 'ox', '~> 2.14'
 gem 'parslet'
-gem 'parallel', '~> 1.19'
-gem 'posix-spawn', git: 'https://github.com/rtomayko/posix-spawn', ref: '58465d2e213991f8afb13b984854a49fcdcc980c'
+gem 'parallel', '~> 1.20'
+gem 'posix-spawn'
 gem 'pundit', '~> 2.1'
 gem 'premailer-rails'
 gem 'rack-attack', '~> 6.3'
@@ -83,23 +79,25 @@ gem 'rails-i18n', '~> 5.1'
 gem 'rails-settings-cached', '~> 0.6'
 gem 'redis', '~> 4.2', require: ['redis', 'redis/connection/hiredis']
 gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
-gem 'rqrcode', '~> 1.1'
-gem 'ruby-progressbar', '~> 1.10'
+gem 'rqrcode', '~> 1.2'
+gem 'ruby-progressbar', '~> 1.11'
 gem 'sanitize', '~> 5.2'
-gem 'sidekiq', '~> 6.0'
+gem 'scenic', '~> 1.5'
+gem 'sidekiq', '~> 6.1'
 gem 'sidekiq-scheduler', '~> 3.0'
 gem 'sidekiq-unique-jobs', '~> 6.0'
 gem 'sidekiq-bulk', '~>0.2.0'
 gem 'simple-navigation', '~> 4.1'
 gem 'simple_form', '~> 5.0'
 gem 'sprockets-rails', '~> 3.2', require: 'sprockets/railtie'
-gem 'stoplight', '~> 2.2.0'
-gem 'strong_migrations', '~> 0.6'
-gem 'tty-prompt', '~> 0.21', require: false
+gem 'stoplight', '~> 2.2.1'
+gem 'strong_migrations', '~> 0.7'
+gem 'tty-prompt', '~> 0.23', require: false
 gem 'twitter-text', '~> 1.14'
 gem 'tzinfo-data', '~> 1.2020'
-gem 'webpacker', '~> 5.1'
+gem 'webpacker', '~> 5.2'
 gem 'webpush'
+gem 'webauthn', '~> 3.0.0.alpha1'
 
 gem 'json-ld'
 gem 'json-ld-preloaded', '~> 3.1'
@@ -119,35 +117,35 @@ group :production, :test do
 end
 
 group :test do
-  gem 'capybara', '~> 3.33'
+  gem 'capybara', '~> 3.34'
   gem 'climate_control', '~> 0.2'
-  gem 'faker', '~> 2.13'
+  gem 'faker', '~> 2.15'
   gem 'microformats', '~> 4.2'
   gem 'rails-controller-testing', '~> 1.0'
   gem 'rspec-sidekiq', '~> 3.1'
-  gem 'simplecov', '~> 0.18', require: false
-  gem 'webmock', '~> 3.8'
-  gem 'parallel_tests', '~> 3.0'
+  gem 'simplecov', '~> 0.21', require: false
+  gem 'webmock', '~> 3.11'
+  gem 'parallel_tests', '~> 3.4'
   gem 'rspec_junit_formatter', '~> 0.4'
 end
 
 group :development do
-  gem 'active_record_query_trace', '~> 1.7'
+  gem 'active_record_query_trace', '~> 1.8'
   gem 'annotate', '~> 3.1'
-  gem 'better_errors', '~> 2.7'
+  gem 'better_errors', '~> 2.9'
   gem 'binding_of_caller', '~> 0.7'
   gem 'bullet', '~> 6.1'
   gem 'letter_opener', '~> 1.7'
   gem 'letter_opener_web', '~> 1.4'
   gem 'memory_profiler'
-  gem 'rubocop', '~> 0.86', require: false
-  gem 'rubocop-rails', '~> 2.6', require: false
-  gem 'brakeman', '~> 4.8', require: false
+  gem 'rubocop', '~> 1.7', require: false
+  gem 'rubocop-rails', '~> 2.9', require: false
+  gem 'brakeman', '~> 4.10', require: false
   gem 'bundler-audit', '~> 0.7', require: false
 
   gem 'capistrano', '~> 3.14'
-  gem 'capistrano-rails', '~> 1.5'
-  gem 'capistrano-rbenv', '~> 2.1'
+  gem 'capistrano-rails', '~> 1.6'
+  gem 'capistrano-rbenv', '~> 2.2'
   gem 'capistrano-yarn', '~> 2.0'
 
   gem 'stackprof'
@@ -160,3 +158,6 @@ end
 
 gem 'concurrent-ruby', require: false
 gem 'connection_pool', require: false
+
+gem 'xorcist', '~> 1.1'
+gem 'pluck_each', '~> 0.1.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3d4fce643343ef15a86a5cd9d2be2235942c28ce..46207d01c9670fa6fdf386cdb97ffeb56be72987 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,21 +6,6 @@ GIT
     health_check (4.0.0.pre)
       rails (>= 4.0)
 
-GIT
-  remote: https://github.com/rtomayko/posix-spawn
-  revision: 58465d2e213991f8afb13b984854a49fcdcc980c
-  ref: 58465d2e213991f8afb13b984854a49fcdcc980c
-  specs:
-    posix-spawn (0.3.13)
-
-GIT
-  remote: https://github.com/tmm1/http_parser.rb
-  revision: 54b17ba8c7d8d20a16dfc65d1775241833219cf2
-  ref: 54b17ba8c7d8d20a16dfc65d1775241833219cf2
-  submodules: true
-  specs:
-    http_parser.rb (0.6.1)
-
 GIT
   remote: https://github.com/witgo/nilsimsa
   revision: fd184883048b922b176939f851338d0a4971a532
@@ -31,49 +16,49 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.4.3)
-      actionpack (= 5.2.4.3)
+    actioncable (5.2.4.4)
+      actionpack (= 5.2.4.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      actionview (= 5.2.4.3)
-      activejob (= 5.2.4.3)
+    actionmailer (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      actionview (= 5.2.4.4)
+      activejob (= 5.2.4.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.3)
-      actionview (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    actionpack (5.2.4.4)
+      actionview (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.3)
-      activesupport (= 5.2.4.3)
+    actionview (5.2.4.4)
+      activesupport (= 5.2.4.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_model_serializers (0.10.10)
-      actionpack (>= 4.1, < 6.1)
-      activemodel (>= 4.1, < 6.1)
+    active_model_serializers (0.10.12)
+      actionpack (>= 4.1, < 6.2)
+      activemodel (>= 4.1, < 6.2)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    active_record_query_trace (1.7)
-    activejob (5.2.4.3)
-      activesupport (= 5.2.4.3)
+    active_record_query_trace (1.8)
+    activejob (5.2.4.4)
+      activesupport (= 5.2.4.4)
       globalid (>= 0.3.6)
-    activemodel (5.2.4.3)
-      activesupport (= 5.2.4.3)
-    activerecord (5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    activemodel (5.2.4.4)
+      activesupport (= 5.2.4.4)
+    activerecord (5.2.4.4)
+      activemodel (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       arel (>= 9.0)
-    activestorage (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      activerecord (= 5.2.4.3)
+    activestorage (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      activerecord (= 5.2.4.4)
       marcel (~> 0.3.1)
-    activesupport (5.2.4.3)
+    activesupport (5.2.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -82,6 +67,7 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     airbrussh (1.4.0)
       sshkit (>= 1.6.1, != 1.7.0)
+    android_key_attestation (0.3.0)
     annotate (3.1.1)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
@@ -91,37 +77,39 @@ GEM
       encryptor (~> 3.0.0)
     av (0.9.0)
       cocaine (~> 0.5.3)
+    awrence (1.1.1)
     aws-eventstream (1.1.0)
-    aws-partitions (1.338.0)
-    aws-sdk-core (3.103.0)
+    aws-partitions (1.413.0)
+    aws-sdk-core (3.110.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.36.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-kms (1.40.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.73.0)
-      aws-sdk-core (~> 3, >= 3.102.1)
+    aws-sdk-s3 (1.87.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.1)
+    aws-sigv4 (1.2.2)
       aws-eventstream (~> 1, >= 1.0.2)
-    bcrypt (3.1.13)
-    better_errors (2.7.1)
+    bcrypt (3.1.16)
+    better_errors (2.9.1)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
+    bindata (2.4.8)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     blurhash (0.1.4)
       ffi (~> 1.10.0)
-    bootsnap (1.4.6)
+    bootsnap (1.5.1)
       msgpack (~> 1.0)
-    brakeman (4.8.2)
+    brakeman (4.10.1)
     browser (4.2.0)
     builder (3.2.4)
-    bullet (6.1.0)
+    bullet (6.1.2)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     bundler-audit (0.7.0.1)
@@ -133,17 +121,17 @@ GEM
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    capistrano-bundler (1.6.0)
+    capistrano-bundler (2.0.1)
       capistrano (~> 3.1)
-    capistrano-rails (1.5.0)
+    capistrano-rails (1.6.1)
       capistrano (~> 3.1)
-      capistrano-bundler (~> 1.1)
-    capistrano-rbenv (2.1.6)
+      capistrano-bundler (>= 1.1, < 3)
+    capistrano-rbenv (2.2.0)
       capistrano (~> 3.1)
       sshkit (~> 1.3)
     capistrano-yarn (2.0.2)
       capistrano (~> 3.0)
-    capybara (3.33.0)
+    capybara (3.34.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -153,28 +141,32 @@ GEM
       xpath (~> 3.2)
     case_transform (0.2)
       activesupport
+    cbor (0.5.9.6)
     charlock_holmes (0.7.7)
     chewy (5.1.0)
       activesupport (>= 4.0)
       elasticsearch (>= 2.0.0)
       elasticsearch-dsl
-    chunky_png (1.3.11)
-    cld3 (3.3.0)
-      ffi (>= 1.1.0, < 1.12.0)
+    chunky_png (1.3.15)
+    cld3 (3.4.1)
+      ffi (>= 1.1.0, < 1.15.0)
     climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.3)
     color_diff (0.1)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     connection_pool (2.2.3)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    cose (1.0.0)
+      cbor (~> 0.5.9)
+      openssl-signature_algorithm (~> 0.4.0)
+    crack (0.4.5)
+      rexml
     crass (1.0.6)
     css_parser (1.7.1)
       addressable
     debug_inspector (0.0.3)
-    devise (4.7.2)
+    devise (4.7.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -192,39 +184,38 @@ GEM
     diff-lcs (1.4.4)
     discard (1.2.0)
       activerecord (>= 4.2, < 7)
-    docile (1.3.2)
+    docile (1.3.4)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     doorkeeper (5.4.0)
       railties (>= 5)
-    dotenv (2.7.5)
-    dotenv-rails (2.7.5)
-      dotenv (= 2.7.5)
-      railties (>= 3.2, < 6.1)
+    dotenv (2.7.6)
+    dotenv-rails (2.7.6)
+      dotenv (= 2.7.6)
+      railties (>= 3.2)
     e2mmap (0.1.0)
     ed25519 (1.2.4)
-    elasticsearch (7.8.0)
-      elasticsearch-api (= 7.8.0)
-      elasticsearch-transport (= 7.8.0)
-    elasticsearch-api (7.8.0)
+    elasticsearch (7.9.0)
+      elasticsearch-api (= 7.9.0)
+      elasticsearch-transport (= 7.9.0)
+    elasticsearch-api (7.9.0)
       multi_json
     elasticsearch-dsl (0.1.9)
-    elasticsearch-transport (7.8.0)
+    elasticsearch-transport (7.9.0)
       faraday (~> 1)
       multi_json
     encryptor (3.0.0)
-    equatable (0.6.1)
-    erubi (1.9.0)
+    erubi (1.10.0)
     et-orbi (1.2.4)
       tzinfo
-    excon (0.75.0)
+    excon (0.76.0)
     fabrication (2.21.1)
-    faker (2.13.0)
+    faker (2.15.1)
       i18n (>= 1.6, < 2)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     fast_blank (1.0.0)
-    fastimage (2.1.7)
+    fastimage (2.2.1)
     ffi (1.10.0)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
@@ -242,20 +233,15 @@ GEM
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
     formatador (0.2.5)
-    fugit (1.3.6)
+    fugit (1.3.9)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.3)
-    fuubar (2.5.0)
+    fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    goldfinger (2.1.1)
-      addressable (~> 2.5)
-      http (~> 4.0)
-      nokogiri (~> 1.8)
-      oj (~> 3.0)
-    hamlit (2.11.0)
+    hamlit (2.13.0)
       temple (>= 0.8.2)
       thor
       tilt
@@ -286,9 +272,9 @@ GEM
     httplog (1.4.3)
       rack (>= 1.0)
       rainbow (>= 2.0.0)
-    i18n (1.8.3)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (0.9.31)
+    i18n-tasks (0.9.33)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       erubi
@@ -304,18 +290,18 @@ GEM
     jmespath (1.4.0)
     json (2.3.1)
     json-canonicalization (0.2.0)
-    json-ld (3.1.4)
+    json-ld (3.1.7)
       htmlentities (~> 4.3)
       json-canonicalization (~> 0.2)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.14)
       rack (~> 2.0)
       rdf (~> 3.1)
-    json-ld-preloaded (3.1.3)
+    json-ld-preloaded (3.1.4)
       json-ld (~> 3.1)
       rdf (~> 3.1)
     jsonapi-renderer (0.2.2)
-    jwt (2.2.1)
+    jwt (2.2.2)
     kaminari (1.2.1)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.1)
@@ -342,7 +328,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.6.0)
+    loofah (2.8.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -353,9 +339,9 @@ GEM
       mimemagic (~> 0.3.2)
     mario-redis-lock (1.2.1)
       redis (>= 3.0.5)
-    memory_profiler (0.9.14)
+    memory_profiler (1.0.0)
     method_source (1.0.0)
-    microformats (4.2.0)
+    microformats (4.2.1)
       json (~> 2.2)
       nokogiri (~> 1.10)
     mime-types (3.3.1)
@@ -364,17 +350,16 @@ GEM
     mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    minitest (5.14.2)
     msgpack (1.3.3)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multipart-post (2.1.1)
-    necromancer (0.5.1)
-    net-ldap (0.16.2)
+    net-ldap (0.17.0)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.1.0)
-    nio4r (2.5.2)
-    nokogiri (1.10.9)
+    nio4r (2.5.4)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.2)
       nokogiri (~> 1.8, >= 1.8.4)
@@ -383,19 +368,24 @@ GEM
       concurrent-ruby (~> 1.0, >= 1.0.2)
       sidekiq (>= 3.5)
       statsd-ruby (~> 1.4, >= 1.4.0)
-    oj (3.10.6)
+    oj (3.10.18)
     omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
-    omniauth-cas (1.1.1)
+    omniauth-cas (2.0.0)
       addressable (~> 2.3)
       nokogiri (~> 1.5)
       omniauth (~> 1.2)
-    omniauth-saml (1.10.2)
+    omniauth-rails_csrf_protection (0.1.2)
+      actionpack (>= 4.2)
+      omniauth (>= 1.3.1)
+    omniauth-saml (1.10.3)
       omniauth (~> 1.3, >= 1.3.2)
       ruby-saml (~> 1.9)
+    openssl (2.2.0)
+    openssl-signature_algorithm (0.4.0)
     orm_adapter (0.5.0)
-    ox (2.13.2)
+    ox (2.14.0)
     paperclip (6.0.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
@@ -405,20 +395,23 @@ GEM
     paperclip-av-transcoder (0.6.4)
       av (~> 0.9.0)
       paperclip (>= 2.5.2)
-    parallel (1.19.2)
-    parallel_tests (3.0.0)
+    parallel (1.20.1)
+    parallel_tests (3.4.0)
       parallel
-    parser (2.7.1.4)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
     parslet (2.0.0)
-    pastel (0.7.4)
-      equatable (~> 0.6)
+    pastel (0.8.0)
       tty-color (~> 0.5)
     pg (1.2.3)
-    pghero (2.5.1)
+    pghero (2.7.3)
       activerecord (>= 5)
-    pkg-config (1.4.1)
-    premailer (1.11.1)
+    pkg-config (1.4.4)
+    pluck_each (0.1.3)
+      activerecord (> 3.2.0)
+      activesupport (> 3.0.0)
+    posix-spawn (0.3.15)
+    premailer (1.14.2)
       addressable
       css_parser (>= 1.6.0)
       htmlentities (>= 4.0.0)
@@ -434,12 +427,12 @@ GEM
       pry (~> 0.13.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (4.0.5)
-    puma (4.3.5)
+    public_suffix (4.0.6)
+    puma (5.1.1)
       nio4r (~> 2.0)
     pundit (2.1.0)
       activesupport (>= 3.0.0)
-    raabro (1.3.1)
+    raabro (1.3.3)
     rack (2.2.3)
     rack-attack (6.3.1)
       rack (>= 1.0, < 3)
@@ -449,18 +442,18 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.4.3)
-      actioncable (= 5.2.4.3)
-      actionmailer (= 5.2.4.3)
-      actionpack (= 5.2.4.3)
-      actionview (= 5.2.4.3)
-      activejob (= 5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activerecord (= 5.2.4.3)
-      activestorage (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    rails (5.2.4.4)
+      actioncable (= 5.2.4.4)
+      actionmailer (= 5.2.4.4)
+      actionpack (= 5.2.4.4)
+      actionview (= 5.2.4.4)
+      activejob (= 5.2.4.4)
+      activemodel (= 5.2.4.4)
+      activerecord (= 5.2.4.4)
+      activestorage (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       bundler (>= 1.3.0)
-      railties (= 5.2.4.3)
+      railties (= 5.2.4.4)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -476,20 +469,20 @@ GEM
       railties (>= 5.0, < 6)
     rails-settings-cached (0.6.6)
       rails (>= 4.2.0)
-    railties (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    railties (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
-    rake (13.0.1)
-    rdf (3.1.4)
+    rake (13.0.3)
+    rdf (3.1.8)
       hamster (~> 3.0)
       link_header (~> 0.0, >= 0.0.8)
     rdf-normalize (0.4.0)
       rdf (~> 3.1)
-    redis (4.2.1)
+    redis (4.2.5)
     redis-actionpack (5.2.0)
       actionpack (>= 5, < 7)
       redis-rack (>= 2.1.0, < 3)
@@ -497,9 +490,9 @@ GEM
     redis-activesupport (5.2.0)
       activesupport (>= 3, < 7)
       redis-store (>= 1.3, < 2)
-    redis-namespace (1.7.0)
+    redis-namespace (1.8.0)
       redis (>= 3.0.4)
-    redis-rack (2.1.2)
+    redis-rack (2.1.3)
       rack (>= 2.0.8, < 3)
       redis-store (>= 1.2, < 2)
     redis-rails (5.0.2)
@@ -508,7 +501,7 @@ GEM
       redis-store (>= 1.2, < 2)
     redis-store (1.9.0)
       redis (>= 4, < 5)
-    regexp_parser (1.7.1)
+    regexp_parser (1.8.2)
     request_store (1.5.0)
       rack (>= 1.4)
     responders (3.0.1)
@@ -517,59 +510,64 @@ GEM
     rexml (3.2.4)
     rotp (2.1.2)
     rpam2 (4.0.2)
-    rqrcode (1.1.2)
+    rqrcode (1.2.0)
       chunky_png (~> 1.0)
-      rqrcode_core (~> 0.1)
-    rqrcode_core (0.1.2)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+      rqrcode_core (~> 0.2)
+    rqrcode_core (0.2.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-rails (4.0.1)
+      rspec-support (~> 3.10.0)
+    rspec-rails (4.0.2)
       actionpack (>= 4.2)
       activesupport (>= 4.2)
       railties (>= 4.2)
-      rspec-core (~> 3.9)
-      rspec-expectations (~> 3.9)
-      rspec-mocks (~> 3.9)
-      rspec-support (~> 3.9)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
     rspec-sidekiq (3.1.0)
       rspec-core (~> 3.0, >= 3.0.0)
       sidekiq (>= 2.4.0)
-    rspec-support (3.9.3)
+    rspec-support (3.10.1)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.86.0)
+    rubocop (1.7.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.0.3, < 1.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.1.0)
-      parser (>= 2.7.0.1)
-    rubocop-rails (2.6.0)
+    rubocop-ast (1.3.0)
+      parser (>= 2.7.1.5)
+    rubocop-rails (2.9.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.82.0)
-    ruby-progressbar (1.10.1)
+      rubocop (>= 0.90.0, < 2.0)
+    ruby-progressbar (1.11.0)
     ruby-saml (1.11.0)
       nokogiri (>= 1.5.10)
     rufus-scheduler (3.6.0)
       fugit (~> 1.1, >= 1.1.6)
-    safe_yaml (1.0.5)
+    safety_net_attestation (0.4.0)
+      jwt (~> 2.0)
     sanitize (5.2.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
+    scenic (1.5.4)
+      activerecord (>= 4.0.0)
+      railties (>= 4.0.0)
+    securecompare (1.0.0)
     semantic_range (2.3.0)
-    sidekiq (6.1.0)
+    sidekiq (6.1.2)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
@@ -582,74 +580,89 @@ GEM
       sidekiq (>= 3)
       thwait
       tilt (>= 1.4.0)
-    sidekiq-unique-jobs (6.0.22)
+    sidekiq-unique-jobs (6.0.25)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       sidekiq (>= 4.0, < 7.0)
-      thor (~> 0)
+      thor (>= 0.20, < 2.0)
     simple-navigation (4.1.0)
       activesupport (>= 2.3.2)
-    simple_form (5.0.2)
+    simple_form (5.0.3)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
-    simplecov (0.18.5)
+    simplecov (0.21.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sshkit (1.21.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
-    stackprof (0.2.15)
+    stackprof (0.2.16)
     statsd-ruby (1.4.0)
-    stoplight (2.2.0)
+    stoplight (2.2.1)
     streamio-ffmpeg (3.0.2)
       multi_json (~> 1.8)
-    strong_migrations (0.6.8)
+    strong_migrations (0.7.4)
       activerecord (>= 5)
     temple (0.8.2)
-    terminal-table (1.8.0)
+    terminal-table (2.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    thwait (0.1.0)
+    thwait (0.2.0)
+      e2mmap
     tilt (2.0.10)
-    tty-color (0.5.1)
+    tpm-key_attestation (0.9.0)
+      bindata (~> 2.4)
+      openssl-signature_algorithm (~> 0.4.0)
+    tty-color (0.6.0)
     tty-cursor (0.7.1)
-    tty-prompt (0.21.0)
-      necromancer (~> 0.5.0)
-      pastel (~> 0.7.0)
-      tty-reader (~> 0.7.0)
-    tty-reader (0.7.0)
+    tty-prompt (0.23.0)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
       tty-cursor (~> 0.7)
-      tty-screen (~> 0.7)
-      wisper (~> 2.0.0)
-    tty-screen (0.8.0)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.1)
     twitter-text (1.14.7)
       unf (~> 0.1.0)
-    tzinfo (1.2.7)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2020.1)
+    tzinfo-data (1.2020.6)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
     uniform_notifier (1.13.0)
-    warden (1.2.8)
-      rack (>= 2.0.6)
-    webmock (3.8.3)
+    warden (1.2.9)
+      rack (>= 2.0.9)
+    webauthn (3.0.0.alpha1)
+      android_key_attestation (~> 0.3.0)
+      awrence (~> 1.1)
+      bindata (~> 2.4)
+      cbor (~> 0.5.9)
+      cose (~> 1.0)
+      openssl (~> 2.0)
+      safety_net_attestation (~> 0.4.0)
+      securecompare (~> 1.0)
+      tpm-key_attestation (~> 0.9.0)
+    webmock (3.11.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webpacker (5.1.1)
+    webpacker (5.2.1)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
@@ -657,10 +670,11 @@ GEM
     webpush (0.3.8)
       hkdf (~> 0.2)
       jwt (~> 2.0)
-    websocket-driver (0.7.2)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     wisper (2.0.1)
+    xorcist (1.1.2)
     xpath (3.2.0)
       nokogiri (~> 1.8)
 
@@ -669,26 +683,26 @@ PLATFORMS
 
 DEPENDENCIES
   active_model_serializers (~> 0.10)
-  active_record_query_trace (~> 1.7)
+  active_record_query_trace (~> 1.8)
   addressable (~> 2.7)
   annotate (~> 3.1)
-  aws-sdk-s3 (~> 1.73)
-  better_errors (~> 2.7)
+  aws-sdk-s3 (~> 1.87)
+  better_errors (~> 2.9)
   binding_of_caller (~> 0.7)
   blurhash (~> 0.1)
-  bootsnap (~> 1.4)
-  brakeman (~> 4.8)
+  bootsnap (~> 1.5)
+  brakeman (~> 4.10)
   browser
   bullet (~> 6.1)
   bundler-audit (~> 0.7)
   capistrano (~> 3.14)
-  capistrano-rails (~> 1.5)
-  capistrano-rbenv (~> 2.1)
+  capistrano-rails (~> 1.6)
+  capistrano-rbenv (~> 2.2)
   capistrano-yarn (~> 2.0)
-  capybara (~> 3.33)
+  capybara (~> 3.34)
   charlock_holmes (~> 0.7.7)
   chewy (~> 5.1)
-  cld3 (~> 3.3.0)
+  cld3 (~> 3.4.1)
   climate_control (~> 0.2)
   color_diff (~> 0.1)
   concurrent-ruby
@@ -699,23 +713,20 @@ DEPENDENCIES
   discard (~> 1.2)
   doorkeeper (~> 5.4)
   dotenv-rails (~> 2.7)
-  e2mmap (~> 0.1.0)
   ed25519 (~> 1.2)
   fabrication (~> 2.21)
-  faker (~> 2.13)
+  faker (~> 2.15)
   fast_blank (~> 1.0)
   fastimage
   fog-core (<= 2.1.0)
   fog-openstack (~> 0.3)
   fuubar (~> 2.5)
-  goldfinger (~> 2.1)
   hamlit-rails (~> 0.2)
   health_check!
   hiredis (~> 0.6)
   htmlentities (~> 4.3)
   http (~> 4.4)
   http_accept_language (~> 2.1)
-  http_parser.rb (~> 0.6)!
   httplog (~> 1.4.3)
   i18n-tasks (~> 0.9)
   idn-ruby
@@ -732,67 +743,71 @@ DEPENDENCIES
   memory_profiler
   microformats (~> 4.2)
   mime-types (~> 3.3.1)
-  net-ldap (~> 0.16)
+  net-ldap (~> 0.17)
   nilsimsa!
   nokogiri (~> 1.10)
   nsa (~> 0.2)
   oj (~> 3.10)
   omniauth (~> 1.9)
-  omniauth-cas (~> 1.1)
+  omniauth-cas (~> 2.0)
+  omniauth-rails_csrf_protection (~> 0.1)
   omniauth-saml (~> 1.10)
-  ox (~> 2.13)
+  ox (~> 2.14)
   paperclip (~> 6.0)
   paperclip-av-transcoder (~> 0.6)
-  parallel (~> 1.19)
-  parallel_tests (~> 3.0)
+  parallel (~> 1.20)
+  parallel_tests (~> 3.4)
   parslet
   pg (~> 1.2)
-  pghero (~> 2.5)
+  pghero (~> 2.7)
   pkg-config (~> 1.4)
-  posix-spawn!
+  pluck_each (~> 0.1.3)
+  posix-spawn
   premailer-rails
   private_address_check (~> 0.5)
   pry-byebug (~> 3.9)
   pry-rails (~> 0.3)
-  puma (~> 4.3)
+  puma (~> 5.1)
   pundit (~> 2.1)
   rack (~> 2.2.3)
   rack-attack (~> 6.3)
   rack-cors (~> 1.1)
-  rails (~> 5.2.4.3)
+  rails (~> 5.2.4.4)
   rails-controller-testing (~> 1.0)
   rails-i18n (~> 5.1)
   rails-settings-cached (~> 0.6)
   rdf-normalize (~> 0.4)
   redis (~> 4.2)
-  redis-namespace (~> 1.7)
+  redis-namespace (~> 1.8)
   redis-rails (~> 5.0)
-  rqrcode (~> 1.1)
+  rqrcode (~> 1.2)
   rspec-rails (~> 4.0)
   rspec-sidekiq (~> 3.1)
   rspec_junit_formatter (~> 0.4)
-  rubocop (~> 0.86)
-  rubocop-rails (~> 2.6)
-  ruby-progressbar (~> 1.10)
+  rubocop (~> 1.7)
+  rubocop-rails (~> 2.9)
+  ruby-progressbar (~> 1.11)
   sanitize (~> 5.2)
-  sidekiq (~> 6.0)
+  scenic (~> 1.5)
+  sidekiq (~> 6.1)
   sidekiq-bulk (~> 0.2.0)
   sidekiq-scheduler (~> 3.0)
   sidekiq-unique-jobs (~> 6.0)
   simple-navigation (~> 4.1)
   simple_form (~> 5.0)
-  simplecov (~> 0.18)
+  simplecov (~> 0.21)
   sprockets (~> 3.7.2)
   sprockets-rails (~> 3.2)
   stackprof
-  stoplight (~> 2.2.0)
+  stoplight (~> 2.2.1)
   streamio-ffmpeg (~> 3.0)
-  strong_migrations (~> 0.6)
-  thor (~> 0.20)
-  thwait (~> 0.1.0)
-  tty-prompt (~> 0.21)
+  strong_migrations (~> 0.7)
+  thor (~> 1.0)
+  tty-prompt (~> 0.23)
   twitter-text (~> 1.14)
   tzinfo-data (~> 1.2020)
-  webmock (~> 3.8)
-  webpacker (~> 5.1)
+  webauthn (~> 3.0.0.alpha1)
+  webmock (~> 3.11)
+  webpacker (~> 5.2)
   webpush
+  xorcist (~> 1.1)
diff --git a/Procfile b/Procfile
index d48b0373b05233df9cb41d2d1a0b33a7feb16529..d15c835b867517918a583987552da231be9c5487 100644
--- a/Procfile
+++ b/Procfile
@@ -1,4 +1,4 @@
-web: if [ "$RUN_STREAMING" != "true" ]; then BIND=0.0.0.0 bundle exec puma -C config/puma.rb; else BIND=0.0.0.0 node ./streaming; fi
+web: bin/heroku-web
 worker: bundle exec sidekiq
 
 # For the streaming API, you need a separate app that shares Postgres and Redis:
diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb
index abd1ec0cb647296b08ee042e3c89a8cfe0d7946c..dcad5d3b44efb1a96906e3b305b8f258515d2231 100644
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
 class AboutController < ApplicationController
+  include RegistrationSpamConcern
+
   layout 'public'
 
   before_action :require_open_federation!, only: [:show, :more]
   before_action :set_body_classes, only: :show
   before_action :set_instance_presenter
-  before_action :set_expires_in, only: [:show, :more, :terms]
+  before_action :set_expires_in, only: [:more, :terms]
+  before_action :set_registration_form_time, only: :show
 
   skip_before_action :require_functional!, only: [:more, :terms]
 
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index db77b628c9f5b65af3a5271b7669fdc38d0dfe84..b902ada090ae02692cbb756dd828e7950913d5e2 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -7,6 +7,7 @@ class AccountsController < ApplicationController
   include AccountControllerConcern
   include SignatureAuthentication
 
+  before_action :require_signature!, if: -> { request.format == :json && authorized_fetch_mode? }
   before_action :set_cache_headers
   before_action :set_body_classes
 
@@ -28,8 +29,7 @@ class AccountsController < ApplicationController
         end
 
         @pinned_statuses = cache_collection(@account.pinned_statuses, Status) if show_pinned_statuses?
-        @statuses        = filtered_status_page
-        @statuses        = cache_collection(@statuses, Status)
+        @statuses        = cached_filtered_status_page
         @rss_url         = rss_url
 
         unless @statuses.empty?
@@ -49,7 +49,7 @@ class AccountsController < ApplicationController
 
       format.json do
         expires_in 3.minutes, public: !(authorized_fetch_mode? && signed_request_account.present?)
-        render_with_cache json: @account, content_type: 'application/activity+json', serializer: ActivityPub::ActorSerializer, adapter: ActivityPub::Adapter, fields: restrict_fields_to
+        render_with_cache json: @account, content_type: 'application/activity+json', serializer: ActivityPub::ActorSerializer, adapter: ActivityPub::Adapter
       end
     end
   end
@@ -81,7 +81,7 @@ class AccountsController < ApplicationController
   end
 
   def account_media_status_ids
-    @account.media_attachments.attached.reorder(nil).select(:status_id).distinct
+    @account.media_attachments.attached.reorder(nil).select(:status_id).group(:status_id)
   end
 
   def no_replies_scope
@@ -102,6 +102,10 @@ class AccountsController < ApplicationController
     params[:username]
   end
 
+  def skip_temporary_suspension_response?
+    request.format == :json
+  end
+
   def rss_url
     if tag_requested?
       short_account_tag_url(@account, params[:tag], format: 'rss')
@@ -142,19 +146,16 @@ class AccountsController < ApplicationController
     request.path.split('.').first.ends_with?(Addressable::URI.parse("/tagged/#{params[:tag]}").normalize)
   end
 
-  def filtered_status_page
-    filtered_statuses.paginate_by_id(PAGE_SIZE, params_slice(:max_id, :min_id, :since_id))
+  def cached_filtered_status_page
+    cache_collection_paginated_by_id(
+      filtered_statuses,
+      Status,
+      PAGE_SIZE,
+      params_slice(:max_id, :min_id, :since_id)
+    )
   end
 
   def params_slice(*keys)
     params.slice(*keys).permit(*keys)
   end
-
-  def restrict_fields_to
-    if signed_request_account.present? || public_fetch_mode?
-      # Return all fields
-    else
-      %i(id type preferred_username inbox public_key endpoints)
-    end
-  end
 end
diff --git a/app/controllers/activitypub/base_controller.rb b/app/controllers/activitypub/base_controller.rb
index 0c2591e9743ee534892adbbd8cc2329e5d1fd180..4cbc3ab8f209ad24fbdb4d8cf7f71ae3c27b71b1 100644
--- a/app/controllers/activitypub/base_controller.rb
+++ b/app/controllers/activitypub/base_controller.rb
@@ -8,4 +8,8 @@ class ActivityPub::BaseController < Api::BaseController
   def set_cache_headers
     response.headers['Vary'] = 'Signature' if authorized_fetch_mode?
   end
+
+  def skip_temporary_suspension_response?
+    false
+  end
 end
diff --git a/app/controllers/activitypub/collections_controller.rb b/app/controllers/activitypub/collections_controller.rb
index 380de54f5dc41354174c6f1bbc1947348e3520ac..c8b6dcc88d4fb94b6a2c29baa803f99fdc79dd33 100644
--- a/app/controllers/activitypub/collections_controller.rb
+++ b/app/controllers/activitypub/collections_controller.rb
@@ -12,7 +12,7 @@ class ActivityPub::CollectionsController < ActivityPub::BaseController
 
   def show
     expires_in 3.minutes, public: public_fetch_mode?
-    render_with_cache json: collection_presenter, content_type: 'application/activity+json', serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter, skip_activities: true
+    render_with_cache json: collection_presenter, content_type: 'application/activity+json', serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter
   end
 
   private
@@ -20,17 +20,9 @@ class ActivityPub::CollectionsController < ActivityPub::BaseController
   def set_items
     case params[:id]
     when 'featured'
-      @items = begin
-        # Because in public fetch mode we cache the response, there would be no
-        # benefit from performing the check below, since a blocked account or domain
-        # would likely be served the cache from the reverse proxy anyway
-
-        if authorized_fetch_mode? && !signed_request_account.nil? && (@account.blocking?(signed_request_account) || (!signed_request_account.domain.nil? && @account.domain_blocking?(signed_request_account.domain)))
-          []
-        else
-          cache_collection(@account.pinned_statuses, Status)
-        end
-      end
+      @items = for_signed_account { cache_collection(@account.pinned_statuses, Status) }
+    when 'tags'
+      @items = for_signed_account { @account.featured_tags }
     when 'devices'
       @items = @account.devices
     else
@@ -40,7 +32,7 @@ class ActivityPub::CollectionsController < ActivityPub::BaseController
 
   def set_size
     case params[:id]
-    when 'featured', 'devices'
+    when 'featured', 'devices', 'tags'
       @size = @items.size
     else
       not_found
@@ -51,7 +43,7 @@ class ActivityPub::CollectionsController < ActivityPub::BaseController
     case params[:id]
     when 'featured'
       @type = :ordered
-    when 'devices'
+    when 'devices', 'tags'
       @type = :unordered
     else
       not_found
@@ -66,4 +58,16 @@ class ActivityPub::CollectionsController < ActivityPub::BaseController
       items: @items
     )
   end
+
+  def for_signed_account
+    # Because in public fetch mode we cache the response, there would be no
+    # benefit from performing the check below, since a blocked account or domain
+    # would likely be served the cache from the reverse proxy anyway
+
+    if authorized_fetch_mode? && !signed_request_account.nil? && (@account.blocking?(signed_request_account) || (!signed_request_account.domain.nil? && @account.domain_blocking?(signed_request_account.domain)))
+      []
+    else
+      yield
+    end
+  end
 end
diff --git a/app/controllers/activitypub/followers_synchronizations_controller.rb b/app/controllers/activitypub/followers_synchronizations_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..52503110582b03c43fa9dcf8fa4e89ce63ca1f76
--- /dev/null
+++ b/app/controllers/activitypub/followers_synchronizations_controller.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class ActivityPub::FollowersSynchronizationsController < ActivityPub::BaseController
+  include SignatureVerification
+  include AccountOwnedConcern
+
+  before_action :require_signature!
+  before_action :set_items
+  before_action :set_cache_headers
+
+  def show
+    expires_in 0, public: false
+    render json: collection_presenter,
+           serializer: ActivityPub::CollectionSerializer,
+           adapter: ActivityPub::Adapter,
+           content_type: 'application/activity+json'
+  end
+
+  private
+
+  def uri_prefix
+    signed_request_account.uri[/http(s?):\/\/[^\/]+\//]
+  end
+
+  def set_items
+    @items = @account.followers.where(Account.arel_table[:uri].matches(uri_prefix + '%', false, true)).pluck(:uri)
+  end
+
+  def collection_presenter
+    ActivityPub::CollectionPresenter.new(
+      id: account_followers_synchronization_url(@account),
+      type: :ordered,
+      items: @items
+    )
+  end
+end
diff --git a/app/controllers/activitypub/inboxes_controller.rb b/app/controllers/activitypub/inboxes_controller.rb
index 0a561e7f0fab37c05c3dd82c4c4f06181a1ec98a..d3044f180f819a6ce2fe15540280e8a106729097 100644
--- a/app/controllers/activitypub/inboxes_controller.rb
+++ b/app/controllers/activitypub/inboxes_controller.rb
@@ -11,6 +11,7 @@ class ActivityPub::InboxesController < ActivityPub::BaseController
 
   def create
     upgrade_account
+    process_collection_synchronization
     process_payload
     head 202
   end
@@ -32,6 +33,10 @@ class ActivityPub::InboxesController < ActivityPub::BaseController
     params[:account_username].present?
   end
 
+  def skip_temporary_suspension_response?
+    true
+  end
+
   def body
     return @body if defined?(@body)
 
@@ -52,6 +57,19 @@ class ActivityPub::InboxesController < ActivityPub::BaseController
     DeliveryFailureTracker.reset!(signed_request_account.inbox_url)
   end
 
+  def process_collection_synchronization
+    raw_params = request.headers['Collection-Synchronization']
+    return if raw_params.blank? || ENV['DISABLE_FOLLOWERS_SYNCHRONIZATION'] == 'true'
+
+    # Re-using the syntax for signature parameters
+    tree   = SignatureParamsParser.new.parse(raw_params)
+    params = SignatureParamsTransformer.new.apply(tree)
+
+    ActivityPub::PrepareFollowersSynchronizationService.new.call(signed_request_account, params)
+  rescue Parslet::ParseFailed
+    Rails.logger.warn 'Error parsing Collection-Synchronization header'
+  end
+
   def process_payload
     ActivityPub::ProcessingWorker.perform_async(signed_request_account.id, body, @account&.id)
   end
diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb
index e25a4bc0797b402d9bd26d1c6045e0987dfb0180..5fd735ad6af3d6467f08c6659aa21f95e0e4943e 100644
--- a/app/controllers/activitypub/outboxes_controller.rb
+++ b/app/controllers/activitypub/outboxes_controller.rb
@@ -20,9 +20,9 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController
   def outbox_presenter
     if page_requested?
       ActivityPub::CollectionPresenter.new(
-        id: account_outbox_url(@account, page_params),
+        id: outbox_url(page_params),
         type: :ordered,
-        part_of: account_outbox_url(@account),
+        part_of: outbox_url,
         prev: prev_page,
         next: next_page,
         items: @statuses
@@ -32,12 +32,20 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController
         id: account_outbox_url(@account),
         type: :ordered,
         size: @account.statuses_count,
-        first: account_outbox_url(@account, page: true),
-        last: account_outbox_url(@account, page: true, min_id: 0)
+        first: outbox_url(page: true),
+        last: outbox_url(page: true, min_id: 0)
       )
     end
   end
 
+  def outbox_url(**kwargs)
+    if params[:account_username].present?
+      account_outbox_url(@account, **kwargs)
+    else
+      instance_actor_outbox_url(**kwargs)
+    end
+  end
+
   def next_page
     account_outbox_url(@account, page: true, max_id: @statuses.last.id) if @statuses.size == LIMIT
   end
@@ -49,9 +57,12 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController
   def set_statuses
     return unless page_requested?
 
-    @statuses = @account.statuses.permitted_for(@account, signed_request_account)
-    @statuses = @statuses.paginate_by_id(LIMIT, params_slice(:max_id, :min_id, :since_id))
-    @statuses = cache_collection(@statuses, Status)
+    @statuses = cache_collection_paginated_by_id(
+      @account.statuses.permitted_for(@account, signed_request_account),
+      Status,
+      LIMIT,
+      params_slice(:max_id, :min_id, :since_id)
+    )
   end
 
   def page_requested?
@@ -61,4 +72,8 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController
   def page_params
     { page: true, max_id: params[:max_id], min_id: params[:min_id] }.compact
   end
+
+  def set_account
+    @account = params[:account_username].present? ? Account.find_local!(username_param) : Account.representative
+  end
 end
diff --git a/app/controllers/activitypub/replies_controller.rb b/app/controllers/activitypub/replies_controller.rb
index 43bf4e657d12db09605a612fa954aef8dcadd204..fde6c861f28619b52ddfa7a8950502dd8ba87107 100644
--- a/app/controllers/activitypub/replies_controller.rb
+++ b/app/controllers/activitypub/replies_controller.rb
@@ -31,7 +31,7 @@ class ActivityPub::RepliesController < ActivityPub::BaseController
   end
 
   def set_replies
-    @replies = only_other_accounts? ? Status.where.not(account_id: @account.id) : @account.statuses
+    @replies = only_other_accounts? ? Status.where.not(account_id: @account.id).joins(:account).merge(Account.without_suspended) : @account.statuses
     @replies = @replies.where(in_reply_to_id: @status.id, visibility: [:public, :unlisted])
     @replies = @replies.paginate_by_min_id(DESCENDANTS_LIMIT, params[:min_id])
   end
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb
index 7b17835429974bbb76958e1097ee86619d443b71..1dd7430e098295c88e0d5282dcd7bbe114f63aff 100644
--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@@ -2,7 +2,7 @@
 
 module Admin
   class AccountsController < BaseController
-    before_action :set_account, only: [:show, :redownload, :remove_avatar, :remove_header, :enable, :unsilence, :unsuspend, :memorialize, :approve, :reject]
+    before_action :set_account, except: [:index]
     before_action :require_remote_account!, only: [:redownload]
     before_action :require_local_account!, only: [:enable, :memorialize, :approve, :reject]
 
@@ -14,49 +14,65 @@ module Admin
     def show
       authorize @account, :show?
 
+      @deletion_request        = @account.deletion_request
       @account_moderation_note = current_account.account_moderation_notes.new(target_account: @account)
       @moderation_notes        = @account.targeted_moderation_notes.latest
       @warnings                = @account.targeted_account_warnings.latest.custom
+      @domain_block            = DomainBlock.rule_for(@account.domain)
     end
 
     def memorialize
       authorize @account, :memorialize?
       @account.memorialize!
       log_action :memorialize, @account
-      redirect_to admin_account_path(@account.id)
+      redirect_to admin_account_path(@account.id), notice: I18n.t('admin.accounts.memorialized_msg', username: @account.acct)
     end
 
     def enable
       authorize @account.user, :enable?
       @account.user.enable!
       log_action :enable, @account.user
-      redirect_to admin_account_path(@account.id)
+      redirect_to admin_account_path(@account.id), notice: I18n.t('admin.accounts.enabled_msg', username: @account.acct)
     end
 
     def approve
       authorize @account.user, :approve?
       @account.user.approve!
-      redirect_to admin_pending_accounts_path
+      redirect_to admin_pending_accounts_path, notice: I18n.t('admin.accounts.approved_msg', username: @account.acct)
     end
 
     def reject
       authorize @account.user, :reject?
-      SuspendAccountService.new.call(@account, reserve_email: false, reserve_username: false)
-      redirect_to admin_pending_accounts_path
+      DeleteAccountService.new.call(@account, reserve_email: false, reserve_username: false)
+      redirect_to admin_pending_accounts_path, notice: I18n.t('admin.accounts.rejected_msg', username: @account.acct)
+    end
+
+    def destroy
+      authorize @account, :destroy?
+      Admin::AccountDeletionWorker.perform_async(@account.id)
+      redirect_to admin_account_path(@account.id), notice: I18n.t('admin.accounts.destroyed_msg', username: @account.acct)
+    end
+
+    def unsensitive
+      authorize @account, :unsensitive?
+      @account.unsensitize!
+      log_action :unsensitive, @account
+      redirect_to admin_account_path(@account.id)
     end
 
     def unsilence
       authorize @account, :unsilence?
       @account.unsilence!
       log_action :unsilence, @account
-      redirect_to admin_account_path(@account.id)
+      redirect_to admin_account_path(@account.id), notice: I18n.t('admin.accounts.unsilenced_msg', username: @account.acct)
     end
 
     def unsuspend
       authorize @account, :unsuspend?
       @account.unsuspend!
+      Admin::UnsuspensionWorker.perform_async(@account.id)
       log_action :unsuspend, @account
-      redirect_to admin_account_path(@account.id)
+      redirect_to admin_account_path(@account.id), notice: I18n.t('admin.accounts.unsuspended_msg', username: @account.acct)
     end
 
     def redownload
@@ -65,7 +81,7 @@ module Admin
       @account.update!(last_webfingered_at: nil)
       ResolveAccountService.new.call(@account)
 
-      redirect_to admin_account_path(@account.id)
+      redirect_to admin_account_path(@account.id), notice: I18n.t('admin.accounts.redownloaded_msg', username: @account.acct)
     end
 
     def remove_avatar
@@ -76,7 +92,7 @@ module Admin
 
       log_action :remove_avatar, @account.user
 
-      redirect_to admin_account_path(@account.id)
+      redirect_to admin_account_path(@account.id), notice: I18n.t('admin.accounts.removed_avatar_msg', username: @account.acct)
     end
 
     def remove_header
@@ -87,7 +103,7 @@ module Admin
 
       log_action :remove_header, @account.user
 
-      redirect_to admin_account_path(@account.id)
+      redirect_to admin_account_path(@account.id), notice: I18n.t('admin.accounts.removed_header_msg', username: @account.acct)
     end
 
     private
diff --git a/app/controllers/admin/announcements_controller.rb b/app/controllers/admin/announcements_controller.rb
index 494fd13d0f634b9450ff95c6bd8f63cc1df2da6e..351b9a9910709f721270e4f13ea8790e762cae02 100644
--- a/app/controllers/admin/announcements_controller.rb
+++ b/app/controllers/admin/announcements_controller.rb
@@ -71,7 +71,7 @@ class Admin::AnnouncementsController < Admin::BaseController
   private
 
   def set_announcements
-    @announcements = AnnouncementFilter.new(filter_params).results.page(params[:page])
+    @announcements = AnnouncementFilter.new(filter_params).results.reverse_chronological.page(params[:page])
   end
 
   def set_announcement
diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb
index 74a36b79ca3a2106308079e4f2065682445fb1bf..ba927b04adab1f809a9334cb7011e85e8f49c85f 100644
--- a/app/controllers/admin/domain_blocks_controller.rb
+++ b/app/controllers/admin/domain_blocks_controller.rb
@@ -29,6 +29,7 @@ module Admin
           @domain_block = existing_domain_block
           @domain_block.update(resource_params)
         end
+
         if @domain_block.save
           DomainBlockWorker.perform_async(@domain_block.id)
           log_action :create, @domain_block
@@ -40,7 +41,7 @@ module Admin
     end
 
     def update
-      authorize :domain_block, :create?
+      authorize :domain_block, :update?
 
       @domain_block.update(update_params)
 
@@ -48,7 +49,7 @@ module Admin
 
       if @domain_block.save
         DomainBlockWorker.perform_async(@domain_block.id, severity_changed)
-        log_action :create, @domain_block
+        log_action :update, @domain_block
         redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.created_msg')
       else
         render :edit
@@ -73,11 +74,11 @@ module Admin
     end
 
     def update_params
-      params.require(:domain_block).permit(:severity, :reject_media, :reject_reports, :private_comment, :public_comment)
+      params.require(:domain_block).permit(:severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
     end
 
     def resource_params
-      params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment)
+      params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
     end
   end
 end
diff --git a/app/controllers/admin/email_domain_blocks_controller.rb b/app/controllers/admin/email_domain_blocks_controller.rb
index c2591972624e3076ae5ad5328aa43daa0a780a0f..f7bdfb0c5f6f8b3aa4a23bdca00d9fd07622cedc 100644
--- a/app/controllers/admin/email_domain_blocks_controller.rb
+++ b/app/controllers/admin/email_domain_blocks_controller.rb
@@ -27,7 +27,7 @@ module Admin
           ips       = []
 
           Resolv::DNS.open do |dns|
-            dns.timeouts = 1
+            dns.timeouts = 5
 
             hostnames = dns.getresources(@email_domain_block.domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }
 
diff --git a/app/controllers/admin/instances_controller.rb b/app/controllers/admin/instances_controller.rb
index 1790becbf2fe66fa1e16db1f34696d429f78b9e2..b5918d231c7e680f07e5c7112fc4740db54b39f6 100644
--- a/app/controllers/admin/instances_controller.rb
+++ b/app/controllers/admin/instances_controller.rb
@@ -2,65 +2,31 @@
 
 module Admin
   class InstancesController < BaseController
-    before_action :set_domain_block, only: :show
-    before_action :set_domain_allow, only: :show
+    before_action :set_instances, only: :index
     before_action :set_instance, only: :show
 
     def index
       authorize :instance, :index?
-
-      @instances = ordered_instances
     end
 
     def show
       authorize :instance, :show?
-
-      @following_count = Follow.where(account: Account.where(domain: params[:id])).count
-      @followers_count = Follow.where(target_account: Account.where(domain: params[:id])).count
-      @reports_count   = Report.where(target_account: Account.where(domain: params[:id])).count
-      @blocks_count    = Block.where(target_account: Account.where(domain: params[:id])).count
-      @available       = DeliveryFailureTracker.available?(params[:id])
-      @media_storage   = MediaAttachment.where(account: Account.where(domain: params[:id])).sum(:file_file_size)
-      @private_comment = @domain_block&.private_comment
-      @public_comment  = @domain_block&.public_comment
     end
 
     private
 
-    def set_domain_block
-      @domain_block = DomainBlock.rule_for(params[:id])
-    end
-
-    def set_domain_allow
-      @domain_allow = DomainAllow.rule_for(params[:id])
-    end
-
     def set_instance
-      resource   = Account.by_domain_accounts.find_by(domain: params[:id])
-      resource ||= @domain_block
-      resource ||= @domain_allow
+      @instance = Instance.find(params[:id])
+    end
 
-      if resource
-        @instance = Instance.new(resource)
-      else
-        not_found
-      end
+    def set_instances
+      @instances = filtered_instances.page(params[:page])
     end
 
     def filtered_instances
       InstanceFilter.new(whitelist_mode? ? { allowed: true } : filter_params).results
     end
 
-    def paginated_instances
-      filtered_instances.page(params[:page])
-    end
-
-    helper_method :paginated_instances
-
-    def ordered_instances
-      paginated_instances.map { |resource| Instance.new(resource) }
-    end
-
     def filter_params
       params.slice(*InstanceFilter::KEYS).permit(*InstanceFilter::KEYS)
     end
diff --git a/app/controllers/admin/ip_blocks_controller.rb b/app/controllers/admin/ip_blocks_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..92b8b0d2b8a260feeda929d228a15465f2d36678
--- /dev/null
+++ b/app/controllers/admin/ip_blocks_controller.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Admin
+  class IpBlocksController < BaseController
+    def index
+      authorize :ip_block, :index?
+
+      @ip_blocks = IpBlock.page(params[:page])
+      @form      = Form::IpBlockBatch.new
+    end
+
+    def new
+      authorize :ip_block, :create?
+
+      @ip_block = IpBlock.new(ip: '', severity: :no_access, expires_in: 1.year)
+    end
+
+    def create
+      authorize :ip_block, :create?
+
+      @ip_block = IpBlock.new(resource_params)
+
+      if @ip_block.save
+        log_action :create, @ip_block
+        redirect_to admin_ip_blocks_path, notice: I18n.t('admin.ip_blocks.created_msg')
+      else
+        render :new
+      end
+    end
+
+    def batch
+      @form = Form::IpBlockBatch.new(form_ip_block_batch_params.merge(current_account: current_account, action: action_from_button))
+      @form.save
+    rescue ActionController::ParameterMissing
+      flash[:alert] = I18n.t('admin.ip_blocks.no_ip_block_selected')
+    rescue Mastodon::NotPermittedError
+      flash[:alert] = I18n.t('admin.custom_emojis.not_permitted')
+    ensure
+      redirect_to admin_ip_blocks_path
+    end
+
+    private
+
+    def resource_params
+      params.require(:ip_block).permit(:ip, :severity, :comment, :expires_in)
+    end
+
+    def action_from_button
+      'delete' if params[:delete]
+    end
+
+    def form_ip_block_batch_params
+      params.require(:form_ip_block_batch).permit(ip_block_ids: [])
+    end
+  end
+end
diff --git a/app/controllers/admin/statuses_controller.rb b/app/controllers/admin/statuses_controller.rb
index 650195034691663baea2e47244abbf5c56da89d0..d7c192f0d6c9ed448d196339421f2f771253f811 100644
--- a/app/controllers/admin/statuses_controller.rb
+++ b/app/controllers/admin/statuses_controller.rb
@@ -14,7 +14,7 @@ module Admin
       @statuses = @account.statuses.where(visibility: [:public, :unlisted])
 
       if params[:media]
-        account_media_status_ids = @account.media_attachments.attached.reorder(nil).select(:status_id).distinct
+        account_media_status_ids = @account.media_attachments.attached.reorder(nil).select(:status_id).group(:status_id)
         @statuses.merge!(Status.where(id: account_media_status_ids))
       end
 
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 045e7dd2666061991c45f00bbb3e4757a42bd718..85f4cc7681a511461b29b42bf54f9b92c8f73ac3 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -40,7 +40,7 @@ class Api::BaseController < ApplicationController
     render json: { error: 'This action is not allowed' }, status: 403
   end
 
-  rescue_from Mastodon::RaceConditionError do
+  rescue_from Mastodon::RaceConditionError, Seahorse::Client::NetworkingError, Stoplight::Error::RedLight do
     render json: { error: 'There was a temporary problem serving your request, please try again' }, status: 503
   end
 
@@ -71,6 +71,7 @@ class Api::BaseController < ApplicationController
 
   def limit_param(default_limit)
     return default_limit unless params[:limit]
+
     [params[:limit].to_i.abs, default_limit * 2].min
   end
 
@@ -95,14 +96,14 @@ class Api::BaseController < ApplicationController
   def require_user!
     if !current_user
       render json: { error: 'This method requires an authenticated user' }, status: 422
-    elsif current_user.disabled?
-      render json: { error: 'Your login is currently disabled' }, status: 403
     elsif !current_user.confirmed?
       render json: { error: 'Your login is missing a confirmed e-mail address' }, status: 403
     elsif !current_user.approved?
       render json: { error: 'Your login is currently pending approval' }, status: 403
+    elsif !current_user.functional?
+      render json: { error: 'Your login is currently disabled' }, status: 403
     else
-      set_user_activity
+      update_user_sign_in
     end
   end
 
diff --git a/app/controllers/api/v1/accounts/featured_tags_controller.rb b/app/controllers/api/v1/accounts/featured_tags_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..0101fb469b8bfabd4956363d44a918fca56c1e7a
--- /dev/null
+++ b/app/controllers/api/v1/accounts/featured_tags_controller.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class Api::V1::Accounts::FeaturedTagsController < Api::BaseController
+  before_action :set_account
+  before_action :set_featured_tags
+
+  respond_to :json
+
+  def index
+    render json: @featured_tags, each_serializer: REST::FeaturedTagSerializer
+  end
+
+  private
+
+  def set_account
+    @account = Account.find(params[:account_id])
+  end
+
+  def set_featured_tags
+    @featured_tags = @account.suspended? ? [] : @account.featured_tags
+  end
+end
diff --git a/app/controllers/api/v1/accounts/follower_accounts_controller.rb b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
index 2277067c9f45dd35800fd1ec9af3ad41eb463106..a665863ebf4816993aca4fdac80701ca3dd8babc 100644
--- a/app/controllers/api/v1/accounts/follower_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
@@ -25,7 +25,7 @@ class Api::V1::Accounts::FollowerAccountsController < Api::BaseController
   end
 
   def hide_results?
-    (@account.hides_followers? && current_account&.id != @account.id) || (current_account && @account.blocking?(current_account))
+    @account.suspended? || (@account.hides_followers? && current_account&.id != @account.id) || (current_account && @account.blocking?(current_account))
   end
 
   def default_accounts
diff --git a/app/controllers/api/v1/accounts/following_accounts_controller.rb b/app/controllers/api/v1/accounts/following_accounts_controller.rb
index 93d4bd3a4a1efcf1c1ba5c076285f23c3708b356..7d885a212f2c349ad1490f0053f8654ae9bd32da 100644
--- a/app/controllers/api/v1/accounts/following_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/following_accounts_controller.rb
@@ -25,7 +25,7 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController
   end
 
   def hide_results?
-    (@account.hides_following? && current_account&.id != @account.id) || (current_account && @account.blocking?(current_account))
+    @account.suspended? || (@account.hides_following? && current_account&.id != @account.id) || (current_account && @account.blocking?(current_account))
   end
 
   def default_accounts
diff --git a/app/controllers/api/v1/accounts/identity_proofs_controller.rb b/app/controllers/api/v1/accounts/identity_proofs_controller.rb
index 8dad6fee9627488efca4b3b99395ff8b96f8dc8b..4b5f6902c7df95345cbbf3677d977f639b040813 100644
--- a/app/controllers/api/v1/accounts/identity_proofs_controller.rb
+++ b/app/controllers/api/v1/accounts/identity_proofs_controller.rb
@@ -5,7 +5,7 @@ class Api::V1::Accounts::IdentityProofsController < Api::BaseController
   before_action :set_account
 
   def index
-    @proofs = @account.identity_proofs.active
+    @proofs = @account.suspended? ? [] : @account.identity_proofs.active
     render json: @proofs, each_serializer: REST::IdentityProofSerializer
   end
 
diff --git a/app/controllers/api/v1/accounts/lists_controller.rb b/app/controllers/api/v1/accounts/lists_controller.rb
index ccb751f8f7dc64601e6cf3a23427be6ae24a9b70..c92f1f8a08d10ce54f6984a548f229056d71ae7c 100644
--- a/app/controllers/api/v1/accounts/lists_controller.rb
+++ b/app/controllers/api/v1/accounts/lists_controller.rb
@@ -6,7 +6,7 @@ class Api::V1::Accounts::ListsController < Api::BaseController
   before_action :set_account
 
   def index
-    @lists = @account.lists.where(account: current_account)
+    @lists = @account.suspended? ? [] : @account.lists.where(account: current_account)
     render json: @lists, each_serializer: REST::ListSerializer
   end
 
diff --git a/app/controllers/api/v1/accounts/relationships_controller.rb b/app/controllers/api/v1/accounts/relationships_controller.rb
index 1d3992a285770c93eb3c8a10696f2ba6faf8bbd8..503f85c97d79fca46fdf15009a04867e339ede46 100644
--- a/app/controllers/api/v1/accounts/relationships_controller.rb
+++ b/app/controllers/api/v1/accounts/relationships_controller.rb
@@ -5,7 +5,7 @@ class Api::V1::Accounts::RelationshipsController < Api::BaseController
   before_action :require_user!
 
   def index
-    accounts = Account.where(id: account_ids).select('id')
+    accounts = Account.without_suspended.where(id: account_ids).select('id')
     # .where doesn't guarantee that our results are in the same order
     # we requested them, so return the "right" order to the requestor.
     @accounts = accounts.index_by(&:id).values_at(*account_ids).compact
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb
index 114ee0a8244b9b964f2677c7356a08b238c97393..92ccb80615da26ad94dbebf6edccefe7c7c14fa0 100644
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -18,14 +18,10 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
   end
 
   def load_statuses
-    cached_account_statuses
+    @account.suspended? ? [] : cached_account_statuses
   end
 
   def cached_account_statuses
-    cache_collection account_statuses, Status
-  end
-
-  def account_statuses
     statuses = truthy_param?(:pinned) ? pinned_scope : permitted_account_statuses
 
     statuses.merge!(only_media_scope) if truthy_param?(:only_media)
@@ -33,7 +29,12 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
     statuses.merge!(no_reblogs_scope) if truthy_param?(:exclude_reblogs)
     statuses.merge!(hashtag_scope)    if params[:tagged].present?
 
-    statuses.paginate_by_id(limit_param(DEFAULT_STATUSES_LIMIT), params_slice(:max_id, :since_id, :min_id))
+    cache_collection_paginated_by_id(
+      statuses,
+      Status,
+      limit_param(DEFAULT_STATUSES_LIMIT),
+      params_slice(:max_id, :since_id, :min_id)
+    )
   end
 
   def permitted_account_statuses
@@ -41,17 +42,7 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
   end
 
   def only_media_scope
-    Status.where(id: account_media_status_ids)
-  end
-
-  def account_media_status_ids
-    # `SELECT DISTINCT id, updated_at` is too slow, so pluck ids at first, and then select id, updated_at with ids.
-    # Also, Avoid getting slow by not narrowing down by `statuses.account_id`.
-    # When narrowing down by `statuses.account_id`, `index_statuses_20180106` will be used
-    # and the table will be joined by `Merge Semi Join`, so the query will be slow.
-    @account.statuses.joins(:media_attachments).merge(@account.media_attachments).permitted_for(@account, current_account)
-            .paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id])
-            .reorder(id: :desc).distinct(:id).pluck(:id)
+    Status.joins(:media_attachments).merge(@account.media_attachments.reorder(nil)).group(:id)
   end
 
   def pinned_scope
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 0080faf33071c5d36cfd7949c03f2da70e681407..3e66ff212eba9b9127f38ab25453a4b2ae900b77 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -9,7 +9,6 @@ class Api::V1::AccountsController < Api::BaseController
 
   before_action :require_user!, except: [:show, :create]
   before_action :set_account, except: [:create]
-  before_action :check_account_suspension, only: [:show]
   before_action :check_enabled_registrations, only: [:create]
 
   skip_before_action :require_authenticated_user!, only: :create
@@ -21,7 +20,7 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def create
-    token    = AppSignUpService.new.call(doorkeeper_token.application, account_params)
+    token    = AppSignUpService.new.call(doorkeeper_token.application, request.remote_ip, account_params)
     response = Doorkeeper::OAuth::TokenResponse.new(token)
 
     headers.merge!(response.headers)
@@ -31,9 +30,8 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def follow
-    FollowService.new.call(current_user.account, @account, reblogs: truthy_param?(:reblogs), with_rate_limit: true)
-
-    options = @account.locked? || current_user.account.silenced? ? {} : { following_map: { @account.id => { reblogs: truthy_param?(:reblogs) } }, requested_map: { @account.id => false } }
+    follow  = FollowService.new.call(current_user.account, @account, reblogs: params.key?(:reblogs) ? truthy_param?(:reblogs) : nil, notify: params.key?(:notify) ? truthy_param?(:notify) : nil, with_rate_limit: true)
+    options = @account.locked? || current_user.account.silenced? ? {} : { following_map: { @account.id => { reblogs: follow.show_reblogs?, notify: follow.notify? } }, requested_map: { @account.id => false } }
 
     render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships(options)
   end
@@ -44,7 +42,7 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def mute
-    MuteService.new.call(current_user.account, @account, notifications: truthy_param?(:notifications))
+    MuteService.new.call(current_user.account, @account, notifications: truthy_param?(:notifications), duration: (params[:duration] || 0))
     render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships
   end
 
@@ -73,10 +71,6 @@ class Api::V1::AccountsController < Api::BaseController
     AccountRelationshipsPresenter.new([@account.id], current_user.account_id, options)
   end
 
-  def check_account_suspension
-    gone if @account.suspended?
-  end
-
   def account_params
     params.permit(:username, :email, :password, :agreement, :locale, :reason)
   end
diff --git a/app/controllers/api/v1/admin/accounts_controller.rb b/app/controllers/api/v1/admin/accounts_controller.rb
index c35ea5ab254ffe77f33f193ec9febb3818fae72b..63cc521ed0119912d5f6b9149bb03a0b2b5c2470 100644
--- a/app/controllers/api/v1/admin/accounts_controller.rb
+++ b/app/controllers/api/v1/admin/accounts_controller.rb
@@ -22,6 +22,7 @@ class Api::V1::Admin::AccountsController < Api::BaseController
     active
     pending
     disabled
+    sensitized
     silenced
     suspended
     username
@@ -58,7 +59,20 @@ class Api::V1::Admin::AccountsController < Api::BaseController
 
   def reject
     authorize @account.user, :reject?
-    SuspendAccountService.new.call(@account, reserve_email: false, reserve_username: false)
+    DeleteAccountService.new.call(@account, reserve_email: false, reserve_username: false)
+    render json: @account, serializer: REST::Admin::AccountSerializer
+  end
+
+  def destroy
+    authorize @account, :destroy?
+    Admin::AccountDeletionWorker.perform_async(@account.id)
+    render json: @account, serializer: REST::Admin::AccountSerializer
+  end
+
+  def unsensitive
+    authorize @account, :unsensitive?
+    @account.unsensitize!
+    log_action :unsensitive, @account
     render json: @account, serializer: REST::Admin::AccountSerializer
   end
 
@@ -72,6 +86,7 @@ class Api::V1::Admin::AccountsController < Api::BaseController
   def unsuspend
     authorize @account, :unsuspend?
     @account.unsuspend!
+    Admin::UnsuspensionWorker.perform_async(@account.id)
     log_action :unsuspend, @account
     render json: @account, serializer: REST::Admin::AccountSerializer
   end
@@ -79,7 +94,7 @@ class Api::V1::Admin::AccountsController < Api::BaseController
   private
 
   def set_accounts
-    @accounts = filtered_accounts.order(id: :desc).includes(user: [:invite_request, :invite]).paginate_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+    @accounts = filtered_accounts.order(id: :desc).includes(user: [:invite_request, :invite]).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
 
   def set_account
diff --git a/app/controllers/api/v1/admin/reports_controller.rb b/app/controllers/api/v1/admin/reports_controller.rb
index 1d48d3160fc7b28e54bf5f1932ddd53ef3ef1aac..c8f4cd8d80c828cf94e32df107720a81733ab19a 100644
--- a/app/controllers/api/v1/admin/reports_controller.rb
+++ b/app/controllers/api/v1/admin/reports_controller.rb
@@ -63,7 +63,7 @@ class Api::V1::Admin::ReportsController < Api::BaseController
   private
 
   def set_reports
-    @reports = filtered_reports.order(id: :desc).with_accounts.paginate_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+    @reports = filtered_reports.order(id: :desc).with_accounts.to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
 
   def set_report
diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb
index a2baeef900cbf6a84aceef8d871948d781e62ba6..586cdfca9d4e6b71be8a25debf30389a33ff3f80 100644
--- a/app/controllers/api/v1/blocks_controller.rb
+++ b/app/controllers/api/v1/blocks_controller.rb
@@ -18,6 +18,8 @@ class Api::V1::BlocksController < Api::BaseController
 
   def paginated_blocks
     @paginated_blocks ||= Block.eager_load(target_account: :account_stat)
+                               .joins(:target_account)
+                               .merge(Account.without_suspended)
                                .where(account: current_account)
                                .paginate_by_max_id(
                                  limit_param(DEFAULT_ACCOUNTS_LIMIT),
diff --git a/app/controllers/api/v1/bookmarks_controller.rb b/app/controllers/api/v1/bookmarks_controller.rb
index c15212f0a91dd4be00891f91dd3ebf0f1d7fa1a8..aa3fb88f08f19267b896dbb8d9b196f8699a9c4e 100644
--- a/app/controllers/api/v1/bookmarks_controller.rb
+++ b/app/controllers/api/v1/bookmarks_controller.rb
@@ -17,14 +17,11 @@ class Api::V1::BookmarksController < Api::BaseController
   end
 
   def cached_bookmarks
-    cache_collection(
-      Status.reorder(nil).joins(:bookmarks).merge(results),
-      Status
-    )
+    cache_collection(results.map(&:status), Status)
   end
 
   def results
-    @_results ||= account_bookmarks.paginate_by_id(
+    @_results ||= account_bookmarks.eager_load(:status).to_a_paginated_by_id(
       limit_param(DEFAULT_STATUSES_LIMIT),
       params_slice(:max_id, :since_id, :min_id)
     )
diff --git a/app/controllers/api/v1/conversations_controller.rb b/app/controllers/api/v1/conversations_controller.rb
index bc801337945d6d1019caad248a5518317a36f5b5..6c7583403758e2e2877b58c563a0a5ed60fd675f 100644
--- a/app/controllers/api/v1/conversations_controller.rb
+++ b/app/controllers/api/v1/conversations_controller.rb
@@ -32,7 +32,7 @@ class Api::V1::ConversationsController < Api::BaseController
 
   def paginated_conversations
     AccountConversation.where(account: current_account)
-                       .paginate_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+                       .to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
 
   def insert_pagination_headers
diff --git a/app/controllers/api/v1/crypto/encrypted_messages_controller.rb b/app/controllers/api/v1/crypto/encrypted_messages_controller.rb
index c764915e578e19dbd249fdcf503b7c8827079e6a..68cf4384f79bd0c5d2f0389f67f021b4a3628146 100644
--- a/app/controllers/api/v1/crypto/encrypted_messages_controller.rb
+++ b/app/controllers/api/v1/crypto/encrypted_messages_controller.rb
@@ -26,7 +26,7 @@ class Api::V1::Crypto::EncryptedMessagesController < Api::BaseController
   end
 
   def set_encrypted_messages
-    @encrypted_messages = @current_device.encrypted_messages.paginate_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+    @encrypted_messages = @current_device.encrypted_messages.to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
 
   def insert_pagination_headers
diff --git a/app/controllers/api/v1/endorsements_controller.rb b/app/controllers/api/v1/endorsements_controller.rb
index c87dbc4ce836a7de5d70b5ed170d2415da2ff98e..9e80f468a780251ba20c3726597bd5c6c2abfe6b 100644
--- a/app/controllers/api/v1/endorsements_controller.rb
+++ b/app/controllers/api/v1/endorsements_controller.rb
@@ -25,7 +25,7 @@ class Api::V1::EndorsementsController < Api::BaseController
   end
 
   def endorsed_accounts
-    current_account.endorsed_accounts.includes(:account_stat)
+    current_account.endorsed_accounts.includes(:account_stat).without_suspended
   end
 
   def insert_pagination_headers
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
index 3e242905da753f466229cae40f9c36a24b4fb913..21836bc170cbbc7915cd188c84e90e2163ab83e0 100644
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -17,14 +17,11 @@ class Api::V1::FavouritesController < Api::BaseController
   end
 
   def cached_favourites
-    cache_collection(
-      Status.reorder(nil).joins(:favourites).merge(results),
-      Status
-    )
+    cache_collection(results.map(&:status), Status)
   end
 
   def results
-    @_results ||= account_favourites.paginate_by_id(
+    @_results ||= account_favourites.eager_load(:status).to_a_paginated_by_id(
       limit_param(DEFAULT_STATUSES_LIMIT),
       params_slice(:max_id, :since_id, :min_id)
     )
diff --git a/app/controllers/api/v1/featured_tags/suggestions_controller.rb b/app/controllers/api/v1/featured_tags/suggestions_controller.rb
index 8c1b81a0f007add18175283368216c494d09500c..75545d3c7f7930546e13d4d6421840f29831b860 100644
--- a/app/controllers/api/v1/featured_tags/suggestions_controller.rb
+++ b/app/controllers/api/v1/featured_tags/suggestions_controller.rb
@@ -3,15 +3,15 @@
 class Api::V1::FeaturedTags::SuggestionsController < Api::BaseController
   before_action -> { doorkeeper_authorize! :read, :'read:accounts' }, only: :index
   before_action :require_user!
-  before_action :set_most_used_tags, only: :index
+  before_action :set_recently_used_tags, only: :index
 
   def index
-    render json: @most_used_tags, each_serializer: REST::TagSerializer
+    render json: @recently_used_tags, each_serializer: REST::TagSerializer
   end
 
   private
 
-  def set_most_used_tags
-    @most_used_tags = Tag.most_used(current_account).where.not(id: current_account.featured_tags).limit(10)
+  def set_recently_used_tags
+    @recently_used_tags = Tag.recently_used(current_account).where.not(id: current_account.featured_tags).limit(10)
   end
 end
diff --git a/app/controllers/api/v1/follow_requests_controller.rb b/app/controllers/api/v1/follow_requests_controller.rb
index 0ee6e531f07a4abacea52ccae938a14fdd92deb1..b34c76f29e97e12b421193b607800175b5952d3e 100644
--- a/app/controllers/api/v1/follow_requests_controller.rb
+++ b/app/controllers/api/v1/follow_requests_controller.rb
@@ -13,7 +13,7 @@ class Api::V1::FollowRequestsController < Api::BaseController
 
   def authorize
     AuthorizeFollowService.new.call(account, current_account)
-    NotifyService.new.call(current_account, Follow.find_by(account: account, target_account: current_account))
+    NotifyService.new.call(current_account, :follow, Follow.find_by(account: account, target_account: current_account))
     render json: account, serializer: REST::RelationshipSerializer, relationships: relationships
   end
 
@@ -37,7 +37,7 @@ class Api::V1::FollowRequestsController < Api::BaseController
   end
 
   def default_accounts
-    Account.includes(:follow_requests, :account_stat).references(:follow_requests)
+    Account.without_suspended.includes(:follow_requests, :account_stat).references(:follow_requests)
   end
 
   def paginated_follow_requests
diff --git a/app/controllers/api/v1/instances/peers_controller.rb b/app/controllers/api/v1/instances/peers_controller.rb
index 9fa4409357b62dc526889f44d6ef777d320b59af..2877fec52d8020bf55878662c6a03093cab2e48c 100644
--- a/app/controllers/api/v1/instances/peers_controller.rb
+++ b/app/controllers/api/v1/instances/peers_controller.rb
@@ -8,7 +8,7 @@ class Api::V1::Instances::PeersController < Api::BaseController
 
   def index
     expires_in 1.day, public: true
-    render_with_cache(expires_in: 1.day) { Account.remote.domains }
+    render_with_cache(expires_in: 1.day) { Instance.where.not(domain: DomainBlock.select(:domain)).pluck(:domain) }
   end
 
   private
diff --git a/app/controllers/api/v1/lists/accounts_controller.rb b/app/controllers/api/v1/lists/accounts_controller.rb
index 23078263e7abdd70843a62906245afd35774fb3b..b66ea9bfe609d8b988fdce90bfcf070830b292b9 100644
--- a/app/controllers/api/v1/lists/accounts_controller.rb
+++ b/app/controllers/api/v1/lists/accounts_controller.rb
@@ -37,9 +37,9 @@ class Api::V1::Lists::AccountsController < Api::BaseController
 
   def load_accounts
     if unlimited?
-      @list.accounts.includes(:account_stat).all
+      @list.accounts.without_suspended.includes(:account_stat).all
     else
-      @list.accounts.includes(:account_stat).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
+      @list.accounts.without_suspended.includes(:account_stat).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
     end
   end
 
diff --git a/app/controllers/api/v1/lists_controller.rb b/app/controllers/api/v1/lists_controller.rb
index 054172bee3aa64e25a19751bda99d814854bdc61..e5ac45fefb3bd3d479e619d0a603089060cdc79f 100644
--- a/app/controllers/api/v1/lists_controller.rb
+++ b/app/controllers/api/v1/lists_controller.rb
@@ -38,6 +38,6 @@ class Api::V1::ListsController < Api::BaseController
   end
 
   def list_params
-    params.permit(:title)
+    params.permit(:title, :replies_policy)
   end
 end
diff --git a/app/controllers/api/v1/mutes_controller.rb b/app/controllers/api/v1/mutes_controller.rb
index 65439fe9bc1505e9005b1d8719ab4b1483df1541..fd52511d7eb0497d018551d61233a7a5b1d33666 100644
--- a/app/controllers/api/v1/mutes_controller.rb
+++ b/app/controllers/api/v1/mutes_controller.rb
@@ -7,7 +7,7 @@ class Api::V1::MutesController < Api::BaseController
 
   def index
     @accounts = load_accounts
-    render json: @accounts, each_serializer: REST::AccountSerializer
+    render json: @accounts, each_serializer: REST::MutedAccountSerializer
   end
 
   private
@@ -18,6 +18,8 @@ class Api::V1::MutesController < Api::BaseController
 
   def paginated_mutes
     @paginated_mutes ||= Mute.eager_load(:target_account)
+                             .joins(:target_account)
+                             .merge(Account.without_suspended)
                              .where(account: current_account)
                              .paginate_by_max_id(
                                limit_param(DEFAULT_ACCOUNTS_LIMIT),
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb
index 8ac22776500b9bdaaccf30a83b561391313f9e40..522c35ba5483e5fb89f0c1003dc2519e7ecb2b94 100644
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@@ -14,7 +14,7 @@ class Api::V1::NotificationsController < Api::BaseController
   end
 
   def show
-    @notification = current_account.notifications.find(params[:id])
+    @notification = current_account.notifications.without_suspended.find(params[:id])
     render json: @notification, serializer: REST::NotificationSerializer
   end
 
@@ -31,18 +31,16 @@ class Api::V1::NotificationsController < Api::BaseController
   private
 
   def load_notifications
-    cache_collection paginated_notifications, Notification
-  end
-
-  def paginated_notifications
-    browserable_account_notifications.paginate_by_id(
+    cache_collection_paginated_by_id(
+      browserable_account_notifications,
+      Notification,
       limit_param(DEFAULT_NOTIFICATIONS_LIMIT),
       params_slice(:max_id, :since_id, :min_id)
     )
   end
 
   def browserable_account_notifications
-    current_account.notifications.browserable(exclude_types, from_account)
+    current_account.notifications.without_suspended.browserable(exclude_types, from_account)
   end
 
   def target_statuses_from_notifications
diff --git a/app/controllers/api/v1/push/subscriptions_controller.rb b/app/controllers/api/v1/push/subscriptions_controller.rb
index d34b333eb3ae8a3bfd423c6ac25d5b0e576bed1a..0918c61e972747c4ded6fbfc599cbacf3659bd20 100644
--- a/app/controllers/api/v1/push/subscriptions_controller.rb
+++ b/app/controllers/api/v1/push/subscriptions_controller.rb
@@ -52,6 +52,6 @@ class Api::V1::Push::SubscriptionsController < Api::BaseController
   def data_params
     return {} if params[:data].blank?
 
-    params.require(:data).permit(alerts: [:follow, :follow_request, :favourite, :reblog, :mention, :poll])
+    params.require(:data).permit(alerts: [:follow, :follow_request, :favourite, :reblog, :mention, :poll, :status])
   end
 end
diff --git a/app/controllers/api/v1/scheduled_statuses_controller.rb b/app/controllers/api/v1/scheduled_statuses_controller.rb
index 9950296f3bc8f72b2ccd9930144daf4e6d630aa9..f90642a7389d7a540621ff8b03ac68952a4357c5 100644
--- a/app/controllers/api/v1/scheduled_statuses_controller.rb
+++ b/app/controllers/api/v1/scheduled_statuses_controller.rb
@@ -32,7 +32,7 @@ class Api::V1::ScheduledStatusesController < Api::BaseController
   private
 
   def set_statuses
-    @statuses = current_account.scheduled_statuses.paginate_by_id(limit_param(DEFAULT_STATUSES_LIMIT), params_slice(:max_id, :since_id, :min_id))
+    @statuses = current_account.scheduled_statuses.to_a_paginated_by_id(limit_param(DEFAULT_STATUSES_LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
 
   def set_status
diff --git a/app/controllers/api/v1/statuses/bookmarks_controller.rb b/app/controllers/api/v1/statuses/bookmarks_controller.rb
index 3954af3c9bf2f16e9dd9574f7884c88e221c1889..19963c002ad3d46043052f6afc17d85ce9060b4d 100644
--- a/app/controllers/api/v1/statuses/bookmarks_controller.rb
+++ b/app/controllers/api/v1/statuses/bookmarks_controller.rb
@@ -5,7 +5,7 @@ class Api::V1::Statuses::BookmarksController < Api::BaseController
 
   before_action -> { doorkeeper_authorize! :write, :'write:bookmarks' }
   before_action :require_user!
-  before_action :set_status
+  before_action :set_status, only: [:create]
 
   def create
     current_account.bookmarks.find_or_create_by!(account: current_account, status: @status)
@@ -13,10 +13,20 @@ class Api::V1::Statuses::BookmarksController < Api::BaseController
   end
 
   def destroy
-    bookmark = current_account.bookmarks.find_by(status: @status)
+    bookmark = current_account.bookmarks.find_by(status_id: params[:status_id])
+
+    if bookmark
+      @status = bookmark.status
+    else
+      @status = Status.find(params[:status_id])
+      authorize @status, :show?
+    end
+
     bookmark&.destroy!
 
     render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_account.id, bookmarks_map: { @status.id => false })
+  rescue Mastodon::NotPermittedError
+    not_found
   end
 
   private
diff --git a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
index 8229786d6cccaba018e9535b1be0be87533ce192..2b614a83756a251f94371e414733ba8539fc2c0f 100644
--- a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
@@ -22,6 +22,7 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::BaseController
 
   def default_accounts
     Account
+      .without_suspended
       .includes(:favourites, :account_stat)
       .references(:favourites)
       .where(favourites: { status_id: @status.id })
diff --git a/app/controllers/api/v1/statuses/favourites_controller.rb b/app/controllers/api/v1/statuses/favourites_controller.rb
index 7afa822ed8740c2a1cd9b732fb673b015fa6fb3e..2e21ce6a06180122a98f159fa05079bb9117eb12 100644
--- a/app/controllers/api/v1/statuses/favourites_controller.rb
+++ b/app/controllers/api/v1/statuses/favourites_controller.rb
@@ -5,7 +5,7 @@ class Api::V1::Statuses::FavouritesController < Api::BaseController
 
   before_action -> { doorkeeper_authorize! :write, :'write:favourites' }
   before_action :require_user!
-  before_action :set_status
+  before_action :set_status, only: [:create]
 
   def create
     FavouriteService.new.call(current_account, @status)
@@ -13,8 +13,19 @@ class Api::V1::Statuses::FavouritesController < Api::BaseController
   end
 
   def destroy
-    UnfavouriteWorker.perform_async(current_account.id, @status.id)
+    fav = current_account.favourites.find_by(status_id: params[:status_id])
+
+    if fav
+      @status = fav.status
+      UnfavouriteWorker.perform_async(current_account.id, @status.id)
+    else
+      @status = Status.find(params[:status_id])
+      authorize @status, :show?
+    end
+
     render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_account.id, favourites_map: { @status.id => false })
+  rescue Mastodon::NotPermittedError
+    not_found
   end
 
   private
diff --git a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
index 6c9e49d903a4124770b81a21b64668873c796ab7..24db30fcc015d9e018b73afea62eba8c4a222c62 100644
--- a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
@@ -21,7 +21,7 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::BaseController
   end
 
   def default_accounts
-    Account.includes(:statuses, :account_stat).references(:statuses)
+    Account.without_suspended.includes(:statuses, :account_stat).references(:statuses)
   end
 
   def paginated_statuses
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 03bbd59affb4c5df8bb2db23be4fb670fbf74989..eb828e9420ffca244a6127183ef3fb049963993b 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -59,6 +59,7 @@ class Api::V1::StatusesController < Api::BaseController
 
     @status.discard
     RemovalWorker.perform_async(@status.id, redraft: true)
+    @status.account.statuses_count = @status.account.statuses_count - 1
 
     render json: @status, serializer: REST::StatusSerializer, source_requested: true
   end
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb
index c6e7854d93008fc328a1f8f6757cdd3176385eb6..d253b744f99bf9d24ff29369b3f4e307cbec1217 100644
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@@ -16,30 +16,29 @@ class Api::V1::Timelines::PublicController < Api::BaseController
   end
 
   def load_statuses
-    cached_public_statuses
+    cached_public_statuses_page
   end
 
-  def cached_public_statuses
-    cache_collection public_statuses, Status
+  def cached_public_statuses_page
+    cache_collection(public_statuses, Status)
   end
 
   def public_statuses
-    statuses = public_timeline_statuses.paginate_by_id(
+    public_feed.get(
       limit_param(DEFAULT_STATUSES_LIMIT),
-      params_slice(:max_id, :since_id, :min_id)
+      params[:max_id],
+      params[:since_id],
+      params[:min_id]
     )
-
-    if truthy_param?(:only_media)
-      # `SELECT DISTINCT id, updated_at` is too slow, so pluck ids at first, and then select id, updated_at with ids.
-      status_ids = statuses.joins(:media_attachments).distinct(:id).pluck(:id)
-      statuses.where(id: status_ids)
-    else
-      statuses
-    end
   end
 
-  def public_timeline_statuses
-    Status.as_public_timeline(current_account, truthy_param?(:remote) ? :remote : truthy_param?(:local))
+  def public_feed
+    PublicFeed.new(
+      current_account,
+      local: truthy_param?(:local),
+      remote: truthy_param?(:remote),
+      only_media: truthy_param?(:only_media)
+    )
   end
 
   def insert_pagination_headers
diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb
index 2d6ad5a80c5bc3fc09ec8020cf112027cdf3c6ab..64a1db58df3ae76094012d1789ad0d3b1c97a84f 100644
--- a/app/controllers/api/v1/timelines/tag_controller.rb
+++ b/app/controllers/api/v1/timelines/tag_controller.rb
@@ -20,30 +20,29 @@ class Api::V1::Timelines::TagController < Api::BaseController
   end
 
   def cached_tagged_statuses
-    cache_collection tagged_statuses, Status
+    @tag.nil? ? [] : cache_collection(tag_timeline_statuses, Status)
   end
 
-  def tagged_statuses
-    if @tag.nil?
-      []
-    else
-      statuses = tag_timeline_statuses.paginate_by_id(
-        limit_param(DEFAULT_STATUSES_LIMIT),
-        params_slice(:max_id, :since_id, :min_id)
-      )
-
-      if truthy_param?(:only_media)
-        # `SELECT DISTINCT id, updated_at` is too slow, so pluck ids at first, and then select id, updated_at with ids.
-        status_ids = statuses.joins(:media_attachments).distinct(:id).pluck(:id)
-        statuses.where(id: status_ids)
-      else
-        statuses
-      end
-    end
+  def tag_timeline_statuses
+    tag_feed.get(
+      limit_param(DEFAULT_STATUSES_LIMIT),
+      params[:max_id],
+      params[:since_id],
+      params[:min_id]
+    )
   end
 
-  def tag_timeline_statuses
-    HashtagQueryService.new.call(@tag, params.slice(:any, :all, :none), current_account, truthy_param?(:local))
+  def tag_feed
+    TagFeed.new(
+      @tag,
+      current_account,
+      any: params[:any],
+      all: params[:all],
+      none: params[:none],
+      local: truthy_param?(:local),
+      remote: truthy_param?(:remote),
+      only_media: truthy_param?(:only_media)
+    )
   end
 
   def insert_pagination_headers
diff --git a/app/controllers/api/web/push_subscriptions_controller.rb b/app/controllers/api/web/push_subscriptions_controller.rb
index 7916b82fa081535f5d692a1f0639c944d834114b..1dce3e70f2aec090499e8debba0745dec3a17879 100644
--- a/app/controllers/api/web/push_subscriptions_controller.rb
+++ b/app/controllers/api/web/push_subscriptions_controller.rb
@@ -22,6 +22,7 @@ class Api::Web::PushSubscriptionsController < Api::Web::BaseController
         reblog: alerts_enabled,
         mention: alerts_enabled,
         poll: alerts_enabled,
+        status: alerts_enabled,
       },
     }
 
@@ -57,6 +58,6 @@ class Api::Web::PushSubscriptionsController < Api::Web::BaseController
   end
 
   def data_params
-    @data_params ||= params.require(:data).permit(alerts: [:follow, :follow_request, :favourite, :reblog, :mention, :poll])
+    @data_params ||= params.require(:data).permit(alerts: [:follow, :follow_request, :favourite, :reblog, :mention, :poll, :status])
   end
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 973db6aca97654a173468715f42a86959251eec1..44616d6e5ee45e35a8609946126d5fd9cfe2f38c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -28,7 +28,7 @@ class ApplicationController < ActionController::Base
   rescue_from ActiveRecord::RecordNotFound, with: :not_found
   rescue_from Mastodon::NotPermittedError, with: :forbidden
   rescue_from HTTP::Error, OpenSSL::SSL::SSLError, with: :internal_server_error
-  rescue_from Mastodon::RaceConditionError, with: :service_unavailable
+  rescue_from Mastodon::RaceConditionError, Seahorse::Client::NetworkingError, Stoplight::Error::RedLight, with: :service_unavailable
   rescue_from Mastodon::RateLimitExceededError, with: :too_many_requests
 
   before_action :store_current_location, except: :raise_not_found, unless: :devise_controller?
@@ -55,7 +55,7 @@ class ApplicationController < ActionController::Base
   end
 
   def store_current_location
-    store_location_for(:user, request.url) unless request.format == :json
+    store_location_for(:user, request.url) unless [:json, :rss].include?(request.format&.to_sym)
   end
 
   def require_admin!
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb
index d319662486a87babafd7e6946566054741139bcc..a3114ab2532aad6a9b201b5f0ee6ad8f15163bf3 100644
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@@ -2,6 +2,7 @@
 
 class Auth::RegistrationsController < Devise::RegistrationsController
   include Devise::Controllers::Rememberable
+  include RegistrationSpamConcern
 
   layout :determine_layout
 
@@ -13,6 +14,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
   before_action :set_body_classes, only: [:new, :create, :edit, :update]
   before_action :require_not_suspended!, only: [:update]
   before_action :set_cache_headers, only: [:edit, :update]
+  before_action :set_registration_form_time, only: :new
 
   skip_before_action :require_functional!, only: [:edit, :update]
 
@@ -45,16 +47,17 @@ class Auth::RegistrationsController < Devise::RegistrationsController
   def build_resource(hash = nil)
     super(hash)
 
-    resource.locale             = I18n.locale
-    resource.invite_code        = params[:invite_code] if resource.invite_code.blank?
-    resource.current_sign_in_ip = request.remote_ip
+    resource.locale                 = I18n.locale
+    resource.invite_code            = params[:invite_code] if resource.invite_code.blank?
+    resource.registration_form_time = session[:registration_form_time]
+    resource.sign_up_ip             = request.remote_ip
 
     resource.build_account if resource.account.nil?
   end
 
   def configure_sign_up_params
     devise_parameter_sanitizer.permit(:sign_up) do |u|
-      u.permit({ account_attributes: [:username], invite_request_attributes: [:text] }, :email, :password, :password_confirmation, :invite_code, :agreement)
+      u.permit({ account_attributes: [:username], invite_request_attributes: [:text] }, :email, :password, :password_confirmation, :invite_code, :agreement, :website, :confirm_password)
     end
   end
 
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
index 1fd755334b359e3bfdaeaf018636ace9100e69c8..13d158c67613a8ed9f0ab8b450eff2e31db6d271 100644
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@ -7,6 +7,7 @@ class Auth::SessionsController < Devise::SessionsController
 
   skip_before_action :require_no_authentication, only: [:create]
   skip_before_action :require_functional!
+  skip_before_action :update_user_sign_in
 
   include TwoFactorAuthenticationConcern
   include SignInTokenAuthenticationConcern
@@ -24,6 +25,7 @@ class Auth::SessionsController < Devise::SessionsController
 
   def create
     super do |resource|
+      resource.update_sign_in!(request, new_sign_in: true)
       remember_me(resource)
       flash.delete(:notice)
     end
@@ -37,11 +39,27 @@ class Auth::SessionsController < Devise::SessionsController
     store_location_for(:user, tmp_stored_location) if continue_after?
   end
 
+  def webauthn_options
+    user = find_user
+
+    if user.webauthn_enabled?
+      options_for_get = WebAuthn::Credential.options_for_get(
+        allow: user.webauthn_credentials.pluck(:external_id)
+      )
+
+      session[:webauthn_challenge] = options_for_get.challenge
+
+      render json: options_for_get, status: :ok
+    else
+      render json: { error: t('webauthn_credentials.not_enabled') }, status: :unauthorized
+    end
+  end
+
   protected
 
   def find_user
     if session[:attempt_user_id]
-      User.find(session[:attempt_user_id])
+      User.find_by(id: session[:attempt_user_id])
     else
       user   = User.authenticate_with_ldap(user_params) if Devise.ldap_authentication
       user ||= User.authenticate_with_pam(user_params) if Devise.pam_authentication
@@ -51,7 +69,7 @@ class Auth::SessionsController < Devise::SessionsController
   end
 
   def user_params
-    params.require(:user).permit(:email, :password, :otp_attempt, :sign_in_token_attempt)
+    params.require(:user).permit(:email, :password, :otp_attempt, :sign_in_token_attempt, credential: {})
   end
 
   def after_sign_in_path_for(resource)
@@ -74,6 +92,7 @@ class Auth::SessionsController < Devise::SessionsController
 
   def require_no_authentication
     super
+
     # Delete flash message that isn't entirely useful and may be confusing in
     # most cases because /web doesn't display/clear flash messages.
     flash.delete(:alert) if flash[:alert] == I18n.t('devise.failure.already_authenticated')
@@ -91,13 +110,30 @@ class Auth::SessionsController < Devise::SessionsController
 
   def home_paths(resource)
     paths = [about_path]
+
     if single_user_mode? && resource.is_a?(User)
       paths << short_account_path(username: resource.account)
     end
+
     paths
   end
 
   def continue_after?
     truthy_param?(:continue)
   end
+
+  def restart_session
+    clear_attempt_from_session
+    redirect_to new_user_session_path, alert: I18n.t('devise.failure.timeout')
+  end
+
+  def set_attempt_session(user)
+    session[:attempt_user_id]         = user.id
+    session[:attempt_user_updated_at] = user.updated_at.to_s
+  end
+
+  def clear_attempt_from_session
+    session.delete(:attempt_user_id)
+    session.delete(:attempt_user_updated_at)
+  end
 end
diff --git a/app/controllers/concerns/account_owned_concern.rb b/app/controllers/concerns/account_owned_concern.rb
index 460f71f65faf8da8f90d00ef4a36d4c9960ece43..62e379846a6a62c616a8cd879e2b89acc70de493 100644
--- a/app/controllers/concerns/account_owned_concern.rb
+++ b/app/controllers/concerns/account_owned_concern.rb
@@ -29,6 +29,24 @@ module AccountOwnedConcern
   end
 
   def check_account_suspension
-    expires_in(3.minutes, public: true) && gone if @account.suspended?
+    if @account.suspended_permanently?
+      permanent_suspension_response
+    elsif @account.suspended? && !skip_temporary_suspension_response?
+      temporary_suspension_response
+    end
+  end
+
+  def skip_temporary_suspension_response?
+    false
+  end
+
+  def permanent_suspension_response
+    expires_in(3.minutes, public: true)
+    gone
+  end
+
+  def temporary_suspension_response
+    expires_in(3.minutes, public: true)
+    forbidden
   end
 end
diff --git a/app/controllers/concerns/cache_concern.rb b/app/controllers/concerns/cache_concern.rb
index c7d25ae00c85e019093284d5ef288bdd8c9ef068..abbdb410a59fb8d7fd626c4272b72061c23a0c05 100644
--- a/app/controllers/concerns/cache_concern.rb
+++ b/app/controllers/concerns/cache_concern.rb
@@ -47,4 +47,8 @@ module CacheConcern
 
     raw.map { |item| cached_keys_with_value[item.id] || uncached[item.id] }.compact
   end
+
+  def cache_collection_paginated_by_id(raw, klass, limit, options)
+    cache_collection raw.cache_ids.to_a_paginated_by_id(limit, options), klass
+  end
 end
diff --git a/app/controllers/concerns/challengable_concern.rb b/app/controllers/concerns/challengable_concern.rb
index b29d90b3cc32d62c0d66e49d139ff44d6aee4841..2995a25e096296218adf23d244cf09d265119371 100644
--- a/app/controllers/concerns/challengable_concern.rb
+++ b/app/controllers/concerns/challengable_concern.rb
@@ -32,7 +32,6 @@ module ChallengableConcern
     if params.key?(:form_challenge)
       if challenge_passed?
         session[:challenge_passed_at] = Time.now.utc
-        return
       else
         flash.now[:alert] = I18n.t('challenge.invalid_password')
         render_challenge
diff --git a/app/controllers/concerns/export_controller_concern.rb b/app/controllers/concerns/export_controller_concern.rb
index bfe990c827d1bf9cf085e05553fc1b375a372b84..24cfc7a01248325e39db739b61b53f8745bce813 100644
--- a/app/controllers/concerns/export_controller_concern.rb
+++ b/app/controllers/concerns/export_controller_concern.rb
@@ -5,7 +5,6 @@ module ExportControllerConcern
 
   included do
     before_action :authenticate_user!
-    before_action :require_not_suspended!
     before_action :load_export
 
     skip_before_action :require_functional!
@@ -30,8 +29,4 @@ module ExportControllerConcern
   def export_filename
     "#{controller_name}.csv"
   end
-
-  def require_not_suspended!
-    forbidden if current_account.suspended?
-  end
 end
diff --git a/app/controllers/concerns/registration_spam_concern.rb b/app/controllers/concerns/registration_spam_concern.rb
new file mode 100644
index 0000000000000000000000000000000000000000..af434c985a0c962dd208f5d7316b85281b057acb
--- /dev/null
+++ b/app/controllers/concerns/registration_spam_concern.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module RegistrationSpamConcern
+  extend ActiveSupport::Concern
+
+  def set_registration_form_time
+    session[:registration_form_time] = Time.now.utc
+  end
+end
diff --git a/app/controllers/concerns/sign_in_token_authentication_concern.rb b/app/controllers/concerns/sign_in_token_authentication_concern.rb
index 91f813acc3508c06d88de491734290d6a92a6ab2..3c95a4afd2cf664cd465c0a40f2e3b9683bf3f7f 100644
--- a/app/controllers/concerns/sign_in_token_authentication_concern.rb
+++ b/app/controllers/concerns/sign_in_token_authentication_concern.rb
@@ -18,7 +18,9 @@ module SignInTokenAuthenticationConcern
   def authenticate_with_sign_in_token
     user = self.resource = find_user
 
-    if user_params[:sign_in_token_attempt].present? && session[:attempt_user_id]
+    if user.present? && session[:attempt_user_id].present? && session[:attempt_user_updated_at] != user.updated_at.to_s
+      restart_session
+    elsif user_params.key?(:sign_in_token_attempt) && session[:attempt_user_id]
       authenticate_with_sign_in_token_attempt(user)
     elsif user.present? && user.external_or_valid_password?(user_params[:password])
       prompt_for_sign_in_token(user)
@@ -27,7 +29,7 @@ module SignInTokenAuthenticationConcern
 
   def authenticate_with_sign_in_token_attempt(user)
     if valid_sign_in_token_attempt?(user)
-      session.delete(:attempt_user_id)
+      clear_attempt_from_session
       remember_me(user)
       sign_in(user)
     else
@@ -42,10 +44,10 @@ module SignInTokenAuthenticationConcern
       UserMailer.sign_in_token(user, request.remote_ip, request.user_agent, Time.now.utc.to_s).deliver_later!
     end
 
-    set_locale do
-      session[:attempt_user_id] = user.id
-      @body_classes = 'lighter'
-      render :sign_in_token
-    end
+    set_attempt_session(user)
+
+    @body_classes = 'lighter'
+
+    set_locale { render :sign_in_token }
   end
 end
diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb
index 10efbf2e0b8befbc997294d4076c06c8732338ed..fc3978fbbdd4f31099a7891fc4522bf816c8725e 100644
--- a/app/controllers/concerns/signature_verification.rb
+++ b/app/controllers/concerns/signature_verification.rb
@@ -7,6 +7,44 @@ module SignatureVerification
 
   include DomainControlHelper
 
+  EXPIRATION_WINDOW_LIMIT = 12.hours
+  CLOCK_SKEW_MARGIN       = 1.hour
+
+  class SignatureVerificationError < StandardError; end
+
+  class SignatureParamsParser < Parslet::Parser
+    rule(:token)         { match("[0-9a-zA-Z!#$%&'*+.^_`|~-]").repeat(1).as(:token) }
+    rule(:quoted_string) { str('"') >> (qdtext | quoted_pair).repeat.as(:quoted_string) >> str('"') }
+    # qdtext and quoted_pair are not exactly according to spec but meh
+    rule(:qdtext)        { match('[^\\\\"]') }
+    rule(:quoted_pair)   { str('\\') >> any }
+    rule(:bws)           { match('\s').repeat }
+    rule(:param)         { (token.as(:key) >> bws >> str('=') >> bws >> (token | quoted_string).as(:value)).as(:param) }
+    rule(:comma)         { bws >> str(',') >> bws }
+    # Old versions of node-http-signature add an incorrect "Signature " prefix to the header
+    rule(:buggy_prefix)  { str('Signature ') }
+    rule(:params)        { buggy_prefix.maybe >> (param >> (comma >> param).repeat).as(:params) }
+    root(:params)
+  end
+
+  class SignatureParamsTransformer < Parslet::Transform
+    rule(params: subtree(:p)) do
+      (p.is_a?(Array) ? p : [p]).each_with_object({}) { |(key, val), h| h[key] = val }
+    end
+
+    rule(param: { key: simple(:key), value: simple(:val) }) do
+      [key, val]
+    end
+
+    rule(quoted_string: simple(:string)) do
+      string.to_s
+    end
+
+    rule(token: simple(:string)) do
+      string.to_s
+    end
+  end
+
   def require_signature!
     render plain: signature_verification_failure_reason, status: signature_verification_failure_code unless signed_request_account
   end
@@ -24,72 +62,41 @@ module SignatureVerification
   end
 
   def signature_key_id
-    raw_signature    = request.headers['Signature']
-    signature_params = {}
-
-    raw_signature.split(',').each do |part|
-      parsed_parts = part.match(/([a-z]+)="([^"]+)"/i)
-      next if parsed_parts.nil? || parsed_parts.size != 3
-      signature_params[parsed_parts[1]] = parsed_parts[2]
-    end
-
     signature_params['keyId']
+  rescue SignatureVerificationError
+    nil
   end
 
   def signed_request_account
     return @signed_request_account if defined?(@signed_request_account)
 
-    unless signed_request?
-      @signature_verification_failure_reason = 'Request not signed'
-      @signed_request_account = nil
-      return
-    end
-
-    if request.headers['Date'].present? && !matches_time_window?
-      @signature_verification_failure_reason = 'Signed request date outside acceptable time window'
-      @signed_request_account = nil
-      return
-    end
-
-    raw_signature    = request.headers['Signature']
-    signature_params = {}
-
-    raw_signature.split(',').each do |part|
-      parsed_parts = part.match(/([a-z]+)="([^"]+)"/i)
-      next if parsed_parts.nil? || parsed_parts.size != 3
-      signature_params[parsed_parts[1]] = parsed_parts[2]
-    end
+    raise SignatureVerificationError, 'Request not signed' unless signed_request?
+    raise SignatureVerificationError, 'Incompatible request signature. keyId and signature are required' if missing_required_signature_parameters?
+    raise SignatureVerificationError, 'Unsupported signature algorithm (only rsa-sha256 and hs2019 are supported)' unless %w(rsa-sha256 hs2019).include?(signature_algorithm)
+    raise SignatureVerificationError, 'Signed request date outside acceptable time window' unless matches_time_window?
 
-    if incompatible_signature?(signature_params)
-      @signature_verification_failure_reason = 'Incompatible request signature'
-      @signed_request_account = nil
-      return
-    end
+    verify_signature_strength!
+    verify_body_digest!
 
     account = account_from_key_id(signature_params['keyId'])
 
-    if account.nil?
-      @signature_verification_failure_reason = "Public key not found for key #{signature_params['keyId']}"
-      @signed_request_account = nil
-      return
-    end
+    raise SignatureVerificationError, "Public key not found for key #{signature_params['keyId']}" if account.nil?
 
     signature             = Base64.decode64(signature_params['signature'])
-    compare_signed_string = build_signed_string(signature_params['headers'])
+    compare_signed_string = build_signed_string
 
     return account unless verify_signature(account, signature, compare_signed_string).nil?
 
     account = stoplight_wrap_request { account.possibly_stale? ? account.refresh! : account_refresh_key(account) }
 
-    if account.nil?
-      @signature_verification_failure_reason = "Public key not found for key #{signature_params['keyId']}"
-      @signed_request_account = nil
-      return
-    end
+    raise SignatureVerificationError, "Public key not found for key #{signature_params['keyId']}" if account.nil?
 
     return account unless verify_signature(account, signature, compare_signed_string).nil?
 
-    @signature_verification_failure_reason = "Verification failed for #{account.username}@#{account.domain} #{account.uri}"
+    @signature_verification_failure_reason = "Verification failed for #{account.username}@#{account.domain} #{account.uri} using rsa-sha256 (RSASSA-PKCS1-v1_5 with SHA-256)"
+    @signed_request_account = nil
+  rescue SignatureVerificationError => e
+    @signature_verification_failure_reason = e.message
     @signed_request_account = nil
   end
 
@@ -99,8 +106,42 @@ module SignatureVerification
 
   private
 
+  def signature_params
+    @signature_params ||= begin
+      raw_signature = request.headers['Signature']
+      tree          = SignatureParamsParser.new.parse(raw_signature)
+      SignatureParamsTransformer.new.apply(tree)
+    end
+  rescue Parslet::ParseFailed
+    raise SignatureVerificationError, 'Error parsing signature parameters'
+  end
+
+  def signature_algorithm
+    signature_params.fetch('algorithm', 'hs2019')
+  end
+
+  def signed_headers
+    signature_params.fetch('headers', signature_algorithm == 'hs2019' ? '(created)' : 'date').downcase.split(' ')
+  end
+
+  def verify_signature_strength!
+    raise SignatureVerificationError, 'Mastodon requires the Date header or (created) pseudo-header to be signed' unless signed_headers.include?('date') || signed_headers.include?('(created)')
+    raise SignatureVerificationError, 'Mastodon requires the Digest header or (request-target) pseudo-header to be signed' unless signed_headers.include?(Request::REQUEST_TARGET) || signed_headers.include?('digest')
+    raise SignatureVerificationError, 'Mastodon requires the Host header to be signed when doing a GET request' if request.get? && !signed_headers.include?('host')
+    raise SignatureVerificationError, 'Mastodon requires the Digest header to be signed when doing a POST request' if request.post? && !signed_headers.include?('digest')
+  end
+
+  def verify_body_digest!
+    return unless signed_headers.include?('digest')
+
+    digests = request.headers['Digest'].split(',').map { |digest| digest.split('=', 2) }.map { |key, value| [key.downcase, value] }
+    sha256  = digests.assoc('sha-256')
+    raise SignatureVerificationError, "Mastodon only supports SHA-256 in Digest header. Offered algorithms: #{digests.map(&:first).join(', ')}" if sha256.nil?
+    raise SignatureVerificationError, "Invalid Digest value. Computed SHA-256 digest: #{body_digest}; given: #{sha256[1]}" if body_digest != sha256[1]
+  end
+
   def verify_signature(account, signature, compare_signed_string)
-    if account.keypair.public_key.verify(OpenSSL::Digest::SHA256.new, signature, compare_signed_string)
+    if account.keypair.public_key.verify(OpenSSL::Digest.new('SHA256'), signature, compare_signed_string)
       @signed_request_account = account
       @signed_request_account
     end
@@ -108,14 +149,20 @@ module SignatureVerification
     nil
   end
 
-  def build_signed_string(signed_headers)
-    signed_headers = 'date' if signed_headers.blank?
-
-    signed_headers.downcase.split(' ').map do |signed_header|
+  def build_signed_string
+    signed_headers.map do |signed_header|
       if signed_header == Request::REQUEST_TARGET
         "#{Request::REQUEST_TARGET}: #{request.method.downcase} #{request.path}"
-      elsif signed_header == 'digest'
-        "digest: #{body_digest}"
+      elsif signed_header == '(created)'
+        raise SignatureVerificationError, 'Invalid pseudo-header (created) for rsa-sha256' unless signature_algorithm == 'hs2019'
+        raise SignatureVerificationError, 'Pseudo-header (created) used but corresponding argument missing' if signature_params['created'].blank?
+
+        "(created): #{signature_params['created']}"
+      elsif signed_header == '(expires)'
+        raise SignatureVerificationError, 'Invalid pseudo-header (expires) for rsa-sha256' unless signature_algorithm == 'hs2019'
+        raise SignatureVerificationError, 'Pseudo-header (expires) used but corresponding argument missing' if signature_params['expires'].blank?
+
+        "(expires): #{signature_params['expires']}"
       else
         "#{signed_header}: #{request.headers[to_header_name(signed_header)]}"
       end
@@ -123,26 +170,40 @@ module SignatureVerification
   end
 
   def matches_time_window?
+    created_time = nil
+    expires_time = nil
+
     begin
-      time_sent = Time.httpdate(request.headers['Date'])
+      if signature_algorithm == 'hs2019' && signature_params['created'].present?
+        created_time = Time.at(signature_params['created'].to_i).utc
+      elsif request.headers['Date'].present?
+        created_time = Time.httpdate(request.headers['Date']).utc
+      end
+
+      expires_time = Time.at(signature_params['expires'].to_i).utc if signature_params['expires'].present?
     rescue ArgumentError
       return false
     end
 
-    (Time.now.utc - time_sent).abs <= 12.hours
+    expires_time ||= created_time + 5.minutes unless created_time.nil?
+    expires_time = [expires_time, created_time + EXPIRATION_WINDOW_LIMIT].min unless created_time.nil?
+
+    return false if created_time.present? && created_time > Time.now.utc + CLOCK_SKEW_MARGIN
+    return false if expires_time.present? && Time.now.utc > expires_time + CLOCK_SKEW_MARGIN
+
+    true
   end
 
   def body_digest
-    "SHA-256=#{Digest::SHA256.base64digest(request_body)}"
+    @body_digest ||= Digest::SHA256.base64digest(request_body)
   end
 
   def to_header_name(name)
     name.split(/-/).map(&:capitalize).join('-')
   end
 
-  def incompatible_signature?(signature_params)
-    signature_params['keyId'].blank? ||
-      signature_params['signature'].blank?
+  def missing_required_signature_parameters?
+    signature_params['keyId'].blank? || signature_params['signature'].blank?
   end
 
   def account_from_key_id(key_id)
diff --git a/app/controllers/concerns/two_factor_authentication_concern.rb b/app/controllers/concerns/two_factor_authentication_concern.rb
index daafe56f4602d4cab477359ccf968c38e7ef30c0..4d4ccf49c8ce67d8f9778563f9190335d98b9edd 100644
--- a/app/controllers/concerns/two_factor_authentication_concern.rb
+++ b/app/controllers/concerns/two_factor_authentication_concern.rb
@@ -8,7 +8,23 @@ module TwoFactorAuthenticationConcern
   end
 
   def two_factor_enabled?
-    find_user&.otp_required_for_login?
+    find_user&.two_factor_enabled?
+  end
+
+  def valid_webauthn_credential?(user, webauthn_credential)
+    user_credential = user.webauthn_credentials.find_by!(external_id: webauthn_credential.id)
+
+    begin
+      webauthn_credential.verify(
+        session[:webauthn_challenge],
+        public_key: user_credential.public_key,
+        sign_count: user_credential.sign_count
+      )
+
+      user_credential.update!(sign_count: webauthn_credential.sign_count)
+    rescue WebAuthn::Error
+      false
+    end
   end
 
   def valid_otp_attempt?(user)
@@ -21,16 +37,33 @@ module TwoFactorAuthenticationConcern
   def authenticate_with_two_factor
     user = self.resource = find_user
 
-    if user_params[:otp_attempt].present? && session[:attempt_user_id]
-      authenticate_with_two_factor_attempt(user)
+    if user.present? && session[:attempt_user_id].present? && session[:attempt_user_updated_at] != user.updated_at.to_s
+      restart_session
+    elsif user.webauthn_enabled? && user_params.key?(:credential) && session[:attempt_user_id]
+      authenticate_with_two_factor_via_webauthn(user)
+    elsif user_params.key?(:otp_attempt) && session[:attempt_user_id]
+      authenticate_with_two_factor_via_otp(user)
     elsif user.present? && user.external_or_valid_password?(user_params[:password])
       prompt_for_two_factor(user)
     end
   end
 
-  def authenticate_with_two_factor_attempt(user)
+  def authenticate_with_two_factor_via_webauthn(user)
+    webauthn_credential = WebAuthn::Credential.from_get(user_params[:credential])
+
+    if valid_webauthn_credential?(user, webauthn_credential)
+      clear_attempt_from_session
+      remember_me(user)
+      sign_in(user)
+      render json: { redirect_path: root_path }, status: :ok
+    else
+      render json: { error: t('webauthn_credentials.invalid_credential') }, status: :unprocessable_entity
+    end
+  end
+
+  def authenticate_with_two_factor_via_otp(user)
     if valid_otp_attempt?(user)
-      session.delete(:attempt_user_id)
+      clear_attempt_from_session
       remember_me(user)
       sign_in(user)
     else
@@ -40,10 +73,18 @@ module TwoFactorAuthenticationConcern
   end
 
   def prompt_for_two_factor(user)
-    set_locale do
-      session[:attempt_user_id] = user.id
-      @body_classes = 'lighter'
-      render :two_factor
+    set_attempt_session(user)
+
+    @body_classes     = 'lighter'
+    @webauthn_enabled = user.webauthn_enabled?
+    @scheme_type      = begin
+      if user.webauthn_enabled? && user_params[:otp_attempt].blank?
+        'webauthn'
+      else
+        'totp'
+      end
     end
+
+    set_locale { render :two_factor }
   end
 end
diff --git a/app/controllers/concerns/user_tracking_concern.rb b/app/controllers/concerns/user_tracking_concern.rb
index be10705fcc1d8b69bfef7ae672ae5b1494513bdb..efda37fae75cb7649b960c1748dc173c81c0a260 100644
--- a/app/controllers/concerns/user_tracking_concern.rb
+++ b/app/controllers/concerns/user_tracking_concern.rb
@@ -6,14 +6,13 @@ module UserTrackingConcern
   UPDATE_SIGN_IN_HOURS = 24
 
   included do
-    before_action :set_user_activity
+    before_action :update_user_sign_in
   end
 
   private
 
-  def set_user_activity
-    return unless user_needs_sign_in_update?
-    current_user.update_tracked_fields!(request)
+  def update_user_sign_in
+    current_user.update_sign_in!(request) if user_needs_sign_in_update?
   end
 
   def user_needs_sign_in_update?
diff --git a/app/controllers/filters_controller.rb b/app/controllers/filters_controller.rb
index 63d9d9cd37244fe81d84db26b413f7040c4ec0ec..79a1ab02b1fb7fbe7b03a0bc3b5b3d30221f609a 100644
--- a/app/controllers/filters_controller.rb
+++ b/app/controllers/filters_controller.rb
@@ -9,7 +9,7 @@ class FiltersController < ApplicationController
   before_action :set_body_classes
 
   def index
-    @filters = current_account.custom_filters
+    @filters = current_account.custom_filters.order(:phrase)
   end
 
   def new
diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb
index ab0749963403544d7324c44743ecd4fd4a0fef16..ff4df2adfca9c1ad9fc8cd6f96f07b0a7e42084c 100644
--- a/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@@ -52,6 +52,14 @@ class FollowerAccountsController < ApplicationController
     account_followers_url(@account, page: page) unless page.nil?
   end
 
+  def next_page_url
+    page_url(follows.next_page) if follows.respond_to?(:next_page)
+  end
+
+  def prev_page_url
+    page_url(follows.prev_page) if follows.respond_to?(:prev_page)
+  end
+
   def collection_presenter
     if page_requested?
       ActivityPub::CollectionPresenter.new(
@@ -60,8 +68,8 @@ class FollowerAccountsController < ApplicationController
         size: @account.followers_count,
         items: follows.map { |f| ActivityPub::TagManager.instance.uri_for(f.account) },
         part_of: account_followers_url(@account),
-        next: page_url(follows.next_page),
-        prev: page_url(follows.prev_page)
+        next: next_page_url,
+        prev: prev_page_url
       )
     else
       ActivityPub::CollectionPresenter.new(
diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb
index 918bdac0a826e14d9818c0865149709095245d84..6bb95c4549838dda91c395b537a3a37e95c46b89 100644
--- a/app/controllers/following_accounts_controller.rb
+++ b/app/controllers/following_accounts_controller.rb
@@ -52,6 +52,14 @@ class FollowingAccountsController < ApplicationController
     account_following_index_url(@account, page: page) unless page.nil?
   end
 
+  def next_page_url
+    page_url(follows.next_page) if follows.respond_to?(:next_page)
+  end
+
+  def prev_page_url
+    page_url(follows.prev_page) if follows.respond_to?(:prev_page)
+  end
+
   def collection_presenter
     if page_requested?
       ActivityPub::CollectionPresenter.new(
@@ -60,8 +68,8 @@ class FollowingAccountsController < ApplicationController
         size: @account.following_count,
         items: follows.map { |f| ActivityPub::TagManager.instance.uri_for(f.target_account) },
         part_of: account_following_index_url(@account),
-        next: page_url(follows.next_page),
-        prev: page_url(follows.prev_page)
+        next: next_page_url,
+        prev: prev_page_url
       )
     else
       ActivityPub::CollectionPresenter.new(
diff --git a/app/controllers/instance_actors_controller.rb b/app/controllers/instance_actors_controller.rb
index 6f02d6a358f00cea153da012ad0f7a11de9fafea..4b074ca19267fcf214e7b058d6a8f988e8ab95b8 100644
--- a/app/controllers/instance_actors_controller.rb
+++ b/app/controllers/instance_actors_controller.rb
@@ -17,6 +17,6 @@ class InstanceActorsController < ApplicationController
   end
 
   def restrict_fields_to
-    %i(id type preferred_username inbox public_key endpoints url manually_approves_followers)
+    %i(id type preferred_username inbox outbox public_key endpoints url manually_approves_followers)
   end
 end
diff --git a/app/controllers/oauth/authorized_applications_controller.rb b/app/controllers/oauth/authorized_applications_controller.rb
index fb8389034b9b20cffeab89b0579000db992bdf7e..45151cdd7754d016121379410abdea4df3d25925 100644
--- a/app/controllers/oauth/authorized_applications_controller.rb
+++ b/app/controllers/oauth/authorized_applications_controller.rb
@@ -5,6 +5,7 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio
 
   before_action :store_current_location
   before_action :authenticate_resource_owner!
+  before_action :require_not_suspended!, only: :destroy
   before_action :set_body_classes
 
   skip_before_action :require_functional!
@@ -25,4 +26,8 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio
   def store_current_location
     store_location_for(:user, request.url)
   end
+
+  def require_not_suspended!
+    forbidden if current_account.suspended?
+  end
 end
diff --git a/app/controllers/relationships_controller.rb b/app/controllers/relationships_controller.rb
index 0835758f2dfac88d9f81f4870085eeba3707e093..96cce55e9e4f6ecf30066d16f169113086a2607b 100644
--- a/app/controllers/relationships_controller.rb
+++ b/app/controllers/relationships_controller.rb
@@ -5,6 +5,7 @@ class RelationshipsController < ApplicationController
 
   before_action :authenticate_user!
   before_action :set_accounts, only: :show
+  before_action :set_relationships, only: :show
   before_action :set_body_classes
 
   helper_method :following_relationship?, :followed_by_relationship?, :mutual_relationship?
@@ -28,6 +29,10 @@ class RelationshipsController < ApplicationController
     @accounts = RelationshipFilter.new(current_account, filter_params).results.page(params[:page]).per(40)
   end
 
+  def set_relationships
+    @relationships = AccountRelationshipsPresenter.new(@accounts.pluck(:id), current_user.account_id)
+  end
+
   def form_account_batch_params
     params.require(:form_account_batch).permit(:action, account_ids: [])
   end
@@ -49,7 +54,9 @@ class RelationshipsController < ApplicationController
   end
 
   def action_from_button
-    if params[:unfollow]
+    if params[:follow]
+      'follow'
+    elsif params[:unfollow]
       'unfollow'
     elsif params[:remove_from_followers]
       'remove_from_followers'
diff --git a/app/controllers/settings/aliases_controller.rb b/app/controllers/settings/aliases_controller.rb
index b7c9a409d1f8d7fb18adadbfcce531118d9c8a31..a421b8ede312920d3bc969917c418b358a0f13a2 100644
--- a/app/controllers/settings/aliases_controller.rb
+++ b/app/controllers/settings/aliases_controller.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 class Settings::AliasesController < Settings::BaseController
-  layout 'admin'
+  skip_before_action :require_functional!
 
-  before_action :authenticate_user!
+  before_action :require_not_suspended!
   before_action :set_aliases, except: :destroy
   before_action :set_alias, only: :destroy
 
diff --git a/app/controllers/settings/applications_controller.rb b/app/controllers/settings/applications_controller.rb
index ed3f82a8e06e693e8107c0fbdf2211d7ec48a3a0..d3ac268d862018095561f295c222ff169e25d6c2 100644
--- a/app/controllers/settings/applications_controller.rb
+++ b/app/controllers/settings/applications_controller.rb
@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 class Settings::ApplicationsController < Settings::BaseController
-  layout 'admin'
-
-  before_action :authenticate_user!
   before_action :set_application, only: [:show, :update, :destroy, :regenerate]
   before_action :prepare_scopes, only: [:create, :update]
 
diff --git a/app/controllers/settings/base_controller.rb b/app/controllers/settings/base_controller.rb
index 3c404cfff20b308de7c997e2efb8e3d782acdbe0..8311538a5694419f6c5676ebd323837b5f933531 100644
--- a/app/controllers/settings/base_controller.rb
+++ b/app/controllers/settings/base_controller.rb
@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 class Settings::BaseController < ApplicationController
+  layout 'admin'
+
+  before_action :authenticate_user!
   before_action :set_body_classes
   before_action :set_cache_headers
 
@@ -13,4 +16,8 @@ class Settings::BaseController < ApplicationController
   def set_cache_headers
     response.headers['Cache-Control'] = 'no-cache, no-store, max-age=0, must-revalidate'
   end
+
+  def require_not_suspended!
+    forbidden if current_account.suspended?
+  end
 end
diff --git a/app/controllers/settings/deletes_controller.rb b/app/controllers/settings/deletes_controller.rb
index 15a59c999dffe219c06b7e2099ee1fe4fb2875db..7b8f8d20788d9f20bde77755ea7136b064b56444 100644
--- a/app/controllers/settings/deletes_controller.rb
+++ b/app/controllers/settings/deletes_controller.rb
@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
 class Settings::DeletesController < Settings::BaseController
-  layout 'admin'
+  skip_before_action :require_functional!
 
-  before_action :check_enabled_deletion
-  before_action :authenticate_user!
   before_action :require_not_suspended!
-
-  skip_before_action :require_functional!
+  before_action :check_enabled_deletion
 
   def show
     @confirmation = Form::DeleteConfirmation.new
@@ -45,8 +42,8 @@ class Settings::DeletesController < Settings::BaseController
   end
 
   def destroy_account!
-    current_account.suspend!
-    Admin::SuspensionWorker.perform_async(current_user.account_id, true)
+    current_account.suspend!(origin: :local)
+    AccountDeletionWorker.perform_async(current_user.account_id)
     sign_out
   end
 end
diff --git a/app/controllers/settings/exports/blocked_accounts_controller.rb b/app/controllers/settings/exports/blocked_accounts_controller.rb
index 2092104e01d1d147103d52de5f2b03b7213e042f..2190caa3619e6c4df92452101f651bfa715a7e17 100644
--- a/app/controllers/settings/exports/blocked_accounts_controller.rb
+++ b/app/controllers/settings/exports/blocked_accounts_controller.rb
@@ -2,7 +2,7 @@
 
 module Settings
   module Exports
-    class BlockedAccountsController < ApplicationController
+    class BlockedAccountsController < BaseController
       include ExportControllerConcern
 
       def index
diff --git a/app/controllers/settings/exports/blocked_domains_controller.rb b/app/controllers/settings/exports/blocked_domains_controller.rb
index 6676ce340148f9488398f78612d311f59bec2c29..bee4b2431e374e6e651ea3da4b9f4f13b34d9521 100644
--- a/app/controllers/settings/exports/blocked_domains_controller.rb
+++ b/app/controllers/settings/exports/blocked_domains_controller.rb
@@ -2,7 +2,7 @@
 
 module Settings
   module Exports
-    class BlockedDomainsController < ApplicationController
+    class BlockedDomainsController < BaseController
       include ExportControllerConcern
 
       def index
diff --git a/app/controllers/settings/exports/bookmarks_controller.rb b/app/controllers/settings/exports/bookmarks_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c12e2f147ac0cf73d9c75923efc8a07caf530133
--- /dev/null
+++ b/app/controllers/settings/exports/bookmarks_controller.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Settings
+  module Exports
+    class BookmarksController < BaseController
+      include ExportControllerConcern
+
+      def index
+        send_export_file
+      end
+
+      private
+
+      def export_data
+        @export.to_bookmarks_csv
+      end
+    end
+  end
+end
diff --git a/app/controllers/settings/exports/following_accounts_controller.rb b/app/controllers/settings/exports/following_accounts_controller.rb
index 74281ddca267ac298be567d1f25d2c85ec07b870..acefcb15da67aa1ce340e7340dab4585046b34fe 100644
--- a/app/controllers/settings/exports/following_accounts_controller.rb
+++ b/app/controllers/settings/exports/following_accounts_controller.rb
@@ -2,7 +2,7 @@
 
 module Settings
   module Exports
-    class FollowingAccountsController < ApplicationController
+    class FollowingAccountsController < BaseController
       include ExportControllerConcern
 
       def index
diff --git a/app/controllers/settings/exports/lists_controller.rb b/app/controllers/settings/exports/lists_controller.rb
index cf5a9de44b33bd3bd3c1cea91fbc4a79a345a9c1..bc65f56a0eff651ccea131cc42151fc9ab026e93 100644
--- a/app/controllers/settings/exports/lists_controller.rb
+++ b/app/controllers/settings/exports/lists_controller.rb
@@ -2,7 +2,7 @@
 
 module Settings
   module Exports
-    class ListsController < ApplicationController
+    class ListsController < BaseController
       include ExportControllerConcern
 
       def index
diff --git a/app/controllers/settings/exports/muted_accounts_controller.rb b/app/controllers/settings/exports/muted_accounts_controller.rb
index e511619ca6ab7aeb8fa01ebbd204f173a50c9028..50b7bf1f7911924618bf1a97c723fe8d032ee532 100644
--- a/app/controllers/settings/exports/muted_accounts_controller.rb
+++ b/app/controllers/settings/exports/muted_accounts_controller.rb
@@ -2,7 +2,7 @@
 
 module Settings
   module Exports
-    class MutedAccountsController < ApplicationController
+    class MutedAccountsController < BaseController
       include ExportControllerConcern
 
       def index
diff --git a/app/controllers/settings/exports_controller.rb b/app/controllers/settings/exports_controller.rb
index 0e93d07a9b2d509aa1738c855f4e2df49764af53..30138d29ed6412ab3c39f67b3f9b44cd207f92eb 100644
--- a/app/controllers/settings/exports_controller.rb
+++ b/app/controllers/settings/exports_controller.rb
@@ -3,11 +3,6 @@
 class Settings::ExportsController < Settings::BaseController
   include Authorization
 
-  layout 'admin'
-
-  before_action :authenticate_user!
-  before_action :require_not_suspended!
-
   skip_before_action :require_functional!
 
   def show
@@ -16,8 +11,6 @@ class Settings::ExportsController < Settings::BaseController
   end
 
   def create
-    raise Mastodon::NotPermittedError unless user_signed_in?
-
     backup = nil
 
     RedisLock.acquire(lock_options) do |lock|
@@ -37,8 +30,4 @@ class Settings::ExportsController < Settings::BaseController
   def lock_options
     { redis: Redis.current, key: "backup:#{current_user.id}" }
   end
-
-  def require_not_suspended!
-    forbidden if current_account.suspended?
-  end
 end
diff --git a/app/controllers/settings/featured_tags_controller.rb b/app/controllers/settings/featured_tags_controller.rb
index 3a3241425d6066e0876e71c24ca0076be9028247..e805527d07c63ad3b95ee18b0465a408d587234f 100644
--- a/app/controllers/settings/featured_tags_controller.rb
+++ b/app/controllers/settings/featured_tags_controller.rb
@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
 class Settings::FeaturedTagsController < Settings::BaseController
-  layout 'admin'
-
-  before_action :authenticate_user!
   before_action :set_featured_tags, only: :index
   before_action :set_featured_tag, except: [:index, :create]
-  before_action :set_most_used_tags, only: :index
+  before_action :set_recently_used_tags, only: :index
 
   def index
     @featured_tag = FeaturedTag.new
@@ -20,7 +17,7 @@ class Settings::FeaturedTagsController < Settings::BaseController
       redirect_to settings_featured_tags_path
     else
       set_featured_tags
-      set_most_used_tags
+      set_recently_used_tags
 
       render :index
     end
@@ -41,8 +38,8 @@ class Settings::FeaturedTagsController < Settings::BaseController
     @featured_tags = current_account.featured_tags.order(statuses_count: :desc).reject(&:new_record?)
   end
 
-  def set_most_used_tags
-    @most_used_tags = Tag.most_used(current_account).where.not(id: @featured_tags.map(&:id)).limit(10)
+  def set_recently_used_tags
+    @recently_used_tags = Tag.recently_used(current_account).where.not(id: @featured_tags.map(&:id)).limit(10)
   end
 
   def featured_tag_params
diff --git a/app/controllers/settings/identity_proofs_controller.rb b/app/controllers/settings/identity_proofs_controller.rb
index 3a90b7c4df04117b6228478c6c579a905a4e7ff6..bf2899da66fc4424b0d72abbd7617f4d78822371 100644
--- a/app/controllers/settings/identity_proofs_controller.rb
+++ b/app/controllers/settings/identity_proofs_controller.rb
@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 class Settings::IdentityProofsController < Settings::BaseController
-  layout 'admin'
-
-  before_action :authenticate_user!
   before_action :check_required_params, only: :new
 
   def index
diff --git a/app/controllers/settings/imports_controller.rb b/app/controllers/settings/imports_controller.rb
index 7b8c4ae235050acd1df905df0cf0299b7c81b6fe..d4516526eee037b8a70c5c05e1aa53806041a60c 100644
--- a/app/controllers/settings/imports_controller.rb
+++ b/app/controllers/settings/imports_controller.rb
@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 class Settings::ImportsController < Settings::BaseController
-  layout 'admin'
-
-  before_action :authenticate_user!
   before_action :set_account
 
   def show
diff --git a/app/controllers/settings/migration/redirects_controller.rb b/app/controllers/settings/migration/redirects_controller.rb
index 97193ade02d58dbd941484850ea514c6bc3a6d62..6d469f3842c77fbe1c3c19584dbbb044e3f6e40c 100644
--- a/app/controllers/settings/migration/redirects_controller.rb
+++ b/app/controllers/settings/migration/redirects_controller.rb
@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
 class Settings::Migration::RedirectsController < Settings::BaseController
-  layout 'admin'
+  skip_before_action :require_functional!
 
-  before_action :authenticate_user!
   before_action :require_not_suspended!
 
-  skip_before_action :require_functional!
-
   def new
     @redirect = Form::Redirect.new
   end
@@ -38,8 +35,4 @@ class Settings::Migration::RedirectsController < Settings::BaseController
   def resource_params
     params.require(:form_redirect).permit(:acct, :current_password, :current_username)
   end
-
-  def require_not_suspended!
-    forbidden if current_account.suspended?
-  end
 end
diff --git a/app/controllers/settings/migrations_controller.rb b/app/controllers/settings/migrations_controller.rb
index 68304bb513f3a62afd7e13a4dfb862b11d6770a0..62603aba819783eb6d41d344a19d5331b0d0583b 100644
--- a/app/controllers/settings/migrations_controller.rb
+++ b/app/controllers/settings/migrations_controller.rb
@@ -1,15 +1,12 @@
 # frozen_string_literal: true
 
 class Settings::MigrationsController < Settings::BaseController
-  layout 'admin'
+  skip_before_action :require_functional!
 
-  before_action :authenticate_user!
   before_action :require_not_suspended!
   before_action :set_migrations
   before_action :set_cooldown
 
-  skip_before_action :require_functional!
-
   def show
     @migration = current_account.migrations.build
   end
@@ -44,8 +41,4 @@ class Settings::MigrationsController < Settings::BaseController
   def on_cooldown?
     @cooldown.present?
   end
-
-  def require_not_suspended!
-    forbidden if current_account.suspended?
-  end
 end
diff --git a/app/controllers/settings/pictures_controller.rb b/app/controllers/settings/pictures_controller.rb
index df2a6eed3ec13e92264c7873d21f664aefa9203a..58a4325307f3b42c028e14e71b9061c3fd982ad7 100644
--- a/app/controllers/settings/pictures_controller.rb
+++ b/app/controllers/settings/pictures_controller.rb
@@ -2,14 +2,17 @@
 
 module Settings
   class PicturesController < BaseController
-    before_action :authenticate_user!
     before_action :set_account
     before_action :set_picture
 
     def destroy
       if valid_picture?
-        msg = I18n.t('generic.changes_saved_msg') if UpdateAccountService.new.call(@account, { @picture => nil, "#{@picture}_remote_url" => '' })
-        redirect_to settings_profile_path, notice: msg, status: 303
+        if UpdateAccountService.new.call(@account, { @picture => nil, "#{@picture}_remote_url" => '' })
+          ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
+          redirect_to settings_profile_path, notice: I18n.t('generic.changes_saved_msg'), status: 303
+        else
+          redirect_to settings_profile_path
+        end
       else
         bad_request
       end
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index bac9b329d4658bf1382411c97053166312d19988..32b5d79487b7411c7a08071e6e1832db76cd038d 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
 class Settings::PreferencesController < Settings::BaseController
-  layout 'admin'
-
-  before_action :authenticate_user!
-
   def show; end
 
   def update
@@ -47,6 +43,7 @@ class Settings::PreferencesController < Settings::BaseController
       :setting_display_media,
       :setting_expand_spoilers,
       :setting_reduce_motion,
+      :setting_disable_swiping,
       :setting_system_font_ui,
       :setting_noindex,
       :setting_theme,
diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb
index 19a7ce157f0a782c6b62ac22f39878d01f8c266b..0c15447a6c134315d079a4df8ada0e07831f46c8 100644
--- a/app/controllers/settings/profiles_controller.rb
+++ b/app/controllers/settings/profiles_controller.rb
@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 class Settings::ProfilesController < Settings::BaseController
-  layout 'admin'
-
-  before_action :authenticate_user!
   before_action :set_account
 
   def show
diff --git a/app/controllers/settings/sessions_controller.rb b/app/controllers/settings/sessions_controller.rb
index df5ace80368ccc1f0c210c1b7fb1ad388cf5dfed..ee2fc5dc80f2b50d9b6f88b2c0dcfc932aed222a 100644
--- a/app/controllers/settings/sessions_controller.rb
+++ b/app/controllers/settings/sessions_controller.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 class Settings::SessionsController < Settings::BaseController
-  before_action :authenticate_user!
-  before_action :set_session, only: :destroy
-
   skip_before_action :require_functional!
 
+  before_action :require_not_suspended!
+  before_action :set_session, only: :destroy
+
   def destroy
     @session.destroy!
     flash[:notice] = I18n.t('sessions.revoke_success')
diff --git a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
index ef4df33390aff8403b0b63f8bc2881ed28a0063a..1a0afe58b05490da8daa1f914894fdb22323e197 100644
--- a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
@@ -5,31 +5,31 @@ module Settings
     class ConfirmationsController < BaseController
       include ChallengableConcern
 
-      layout 'admin'
+      skip_before_action :require_functional!
 
-      before_action :authenticate_user!
       before_action :require_challenge!
       before_action :ensure_otp_secret
 
-      skip_before_action :require_functional!
-
       def new
         prepare_two_factor_form
       end
 
       def create
-        if current_user.validate_and_consume_otp!(confirmation_params[:otp_attempt])
+        if current_user.validate_and_consume_otp!(confirmation_params[:otp_attempt], otp_secret: session[:new_otp_secret])
           flash.now[:notice] = I18n.t('two_factor_authentication.enabled_success')
 
           current_user.otp_required_for_login = true
+          current_user.otp_secret = session[:new_otp_secret]
           @recovery_codes = current_user.generate_otp_backup_codes!
           current_user.save!
 
           UserMailer.two_factor_enabled(current_user).deliver_later!
 
+          session.delete(:new_otp_secret)
+
           render 'settings/two_factor_authentication/recovery_codes/index'
         else
-          flash.now[:alert] = I18n.t('two_factor_authentication.wrong_code')
+          flash.now[:alert] = I18n.t('otp_authentication.wrong_code')
           prepare_two_factor_form
           render :new
         end
@@ -43,12 +43,15 @@ module Settings
 
       def prepare_two_factor_form
         @confirmation = Form::TwoFactorConfirmation.new
-        @provision_url = current_user.otp_provisioning_uri(current_user.email, issuer: Rails.configuration.x.local_domain)
+        @new_otp_secret = session[:new_otp_secret]
+        @provision_url = current_user.otp_provisioning_uri(current_user.email,
+                                                           otp_secret: @new_otp_secret,
+                                                           issuer: Rails.configuration.x.local_domain)
         @qrcode = RQRCode::QRCode.new(@provision_url)
       end
 
       def ensure_otp_secret
-        redirect_to settings_two_factor_authentication_path unless current_user.otp_secret
+        redirect_to settings_otp_authentication_path if session[:new_otp_secret].blank?
       end
     end
   end
diff --git a/app/controllers/settings/two_factor_authentication/otp_authentication_controller.rb b/app/controllers/settings/two_factor_authentication/otp_authentication_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..cbba842a980d0709548ee6dc9fc149aa3cc73bd1
--- /dev/null
+++ b/app/controllers/settings/two_factor_authentication/otp_authentication_controller.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Settings
+  module TwoFactorAuthentication
+    class OtpAuthenticationController < BaseController
+      include ChallengableConcern
+
+      skip_before_action :require_functional!
+
+      before_action :verify_otp_not_enabled, only: [:show]
+      before_action :require_challenge!, only: [:create]
+
+      def show
+        @confirmation = Form::TwoFactorConfirmation.new
+      end
+
+      def create
+        session[:new_otp_secret] = User.generate_otp_secret(32)
+
+        redirect_to new_settings_two_factor_authentication_confirmation_path
+      end
+
+      private
+
+      def confirmation_params
+        params.require(:form_two_factor_confirmation).permit(:otp_attempt)
+      end
+
+      def verify_otp_not_enabled
+        redirect_to settings_two_factor_authentication_methods_path if current_user.otp_enabled?
+      end
+
+      def acceptable_code?
+        current_user.validate_and_consume_otp!(confirmation_params[:otp_attempt]) ||
+          current_user.invalidate_otp_backup_code!(confirmation_params[:otp_attempt])
+      end
+    end
+  end
+end
diff --git a/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb b/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
index 0c4f5bff762c591c8c4d14f56de5671edbffc0d8..6ec53224d384c35e7aa8c4504bd6c07c664e1563 100644
--- a/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
@@ -5,13 +5,10 @@ module Settings
     class RecoveryCodesController < BaseController
       include ChallengableConcern
 
-      layout 'admin'
+      skip_before_action :require_functional!
 
-      before_action :authenticate_user!
       before_action :require_challenge!, on: :create
 
-      skip_before_action :require_functional!
-
       def create
         @recovery_codes = current_user.generate_otp_backup_codes!
         current_user.save!
diff --git a/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb b/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..1c557092ba53b7cedfc4e0e8a181b330c5a0fe4f
--- /dev/null
+++ b/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+module Settings
+  module TwoFactorAuthentication
+    class WebauthnCredentialsController < BaseController
+      skip_before_action :require_functional!
+
+      before_action :require_otp_enabled
+      before_action :require_webauthn_enabled, only: [:index, :destroy]
+
+      def new; end
+
+      def index; end
+
+      def options
+        current_user.update(webauthn_id: WebAuthn.generate_user_id) unless current_user.webauthn_id
+
+        options_for_create = WebAuthn::Credential.options_for_create(
+          user: {
+            name: current_user.account.username,
+            display_name: current_user.account.username,
+            id: current_user.webauthn_id,
+          },
+          exclude: current_user.webauthn_credentials.pluck(:external_id)
+        )
+
+        session[:webauthn_challenge] = options_for_create.challenge
+
+        render json: options_for_create, status: :ok
+      end
+
+      def create
+        webauthn_credential = WebAuthn::Credential.from_create(params[:credential])
+
+        if webauthn_credential.verify(session[:webauthn_challenge])
+          user_credential = current_user.webauthn_credentials.build(
+            external_id: webauthn_credential.id,
+            public_key: webauthn_credential.public_key,
+            nickname: params[:nickname],
+            sign_count: webauthn_credential.sign_count
+          )
+
+          if user_credential.save
+            flash[:success] = I18n.t('webauthn_credentials.create.success')
+            status = :ok
+
+            if current_user.webauthn_credentials.size == 1
+              UserMailer.webauthn_enabled(current_user).deliver_later!
+            else
+              UserMailer.webauthn_credential_added(current_user, user_credential).deliver_later!
+            end
+          else
+            flash[:error] = I18n.t('webauthn_credentials.create.error')
+            status = :internal_server_error
+          end
+        else
+          flash[:error] = t('webauthn_credentials.create.error')
+          status = :unauthorized
+        end
+
+        render json: { redirect_path: settings_two_factor_authentication_methods_path }, status: status
+      end
+
+      def destroy
+        credential = current_user.webauthn_credentials.find_by(id: params[:id])
+        if credential
+          credential.destroy
+          if credential.destroyed?
+            flash[:success] = I18n.t('webauthn_credentials.destroy.success')
+
+            if current_user.webauthn_credentials.empty?
+              UserMailer.webauthn_disabled(current_user).deliver_later!
+            else
+              UserMailer.webauthn_credential_deleted(current_user, credential).deliver_later!
+            end
+          else
+            flash[:error] = I18n.t('webauthn_credentials.destroy.error')
+          end
+        else
+          flash[:error] = I18n.t('webauthn_credentials.destroy.error')
+        end
+        redirect_to settings_two_factor_authentication_methods_path
+      end
+
+      private
+
+      def require_otp_enabled
+        unless current_user.otp_enabled?
+          flash[:error] = t('webauthn_credentials.otp_required')
+          redirect_to settings_two_factor_authentication_methods_path
+        end
+      end
+
+      def require_webauthn_enabled
+        unless current_user.webauthn_enabled?
+          flash[:error] = t('webauthn_credentials.not_enabled')
+          redirect_to settings_two_factor_authentication_methods_path
+        end
+      end
+    end
+  end
+end
diff --git a/app/controllers/settings/two_factor_authentication_methods_controller.rb b/app/controllers/settings/two_factor_authentication_methods_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..205933ea81482eb8371b743544302dcd959cf48e
--- /dev/null
+++ b/app/controllers/settings/two_factor_authentication_methods_controller.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Settings
+  class TwoFactorAuthenticationMethodsController < BaseController
+    include ChallengableConcern
+
+    skip_before_action :require_functional!
+
+    before_action :require_challenge!, only: :disable
+    before_action :require_otp_enabled
+
+    def index; end
+
+    def disable
+      current_user.disable_two_factor!
+      UserMailer.two_factor_disabled(current_user).deliver_later!
+
+      redirect_to settings_otp_authentication_path, flash: { notice: I18n.t('two_factor_authentication.disabled_success') }
+    end
+
+    private
+
+    def require_otp_enabled
+      redirect_to settings_otp_authentication_path unless current_user.otp_enabled?
+    end
+  end
+end
diff --git a/app/controllers/settings/two_factor_authentications_controller.rb b/app/controllers/settings/two_factor_authentications_controller.rb
deleted file mode 100644
index 9118a79332c4ef6b50d7c9345b9dc669e5e8bf41..0000000000000000000000000000000000000000
--- a/app/controllers/settings/two_factor_authentications_controller.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Settings
-  class TwoFactorAuthenticationsController < BaseController
-    include ChallengableConcern
-
-    layout 'admin'
-
-    before_action :authenticate_user!
-    before_action :verify_otp_required, only: [:create]
-    before_action :require_challenge!, only: [:create]
-
-    skip_before_action :require_functional!
-
-    def show
-      @confirmation = Form::TwoFactorConfirmation.new
-    end
-
-    def create
-      current_user.otp_secret = User.generate_otp_secret(32)
-      current_user.save!
-      redirect_to new_settings_two_factor_authentication_confirmation_path
-    end
-
-    def destroy
-      if acceptable_code?
-        current_user.otp_required_for_login = false
-        current_user.save!
-        UserMailer.two_factor_disabled(current_user).deliver_later!
-        redirect_to settings_two_factor_authentication_path
-      else
-        flash.now[:alert] = I18n.t('two_factor_authentication.wrong_code')
-        @confirmation = Form::TwoFactorConfirmation.new
-        render :show
-      end
-    end
-
-    private
-
-    def confirmation_params
-      params.require(:form_two_factor_confirmation).permit(:otp_attempt)
-    end
-
-    def verify_otp_required
-      redirect_to settings_two_factor_authentication_path if current_user.otp_required_for_login?
-    end
-
-    def acceptable_code?
-      current_user.validate_and_consume_otp!(confirmation_params[:otp_attempt]) ||
-        current_user.invalidate_otp_backup_code!(confirmation_params[:otp_attempt])
-    end
-  end
-end
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 6426a7d695260faad5db9f5907a8642f321eab64..6616ba107c83f3d4836582b68ecf3940ac1d4e70 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -10,8 +10,9 @@ class TagsController < ApplicationController
 
   before_action :require_signature!, if: -> { request.format == :json && authorized_fetch_mode? }
   before_action :authenticate_user!, if: :whitelist_mode?
-  before_action :set_tag
   before_action :set_local
+  before_action :set_tag
+  before_action :set_statuses
   before_action :set_body_classes
   before_action :set_instance_presenter
 
@@ -25,20 +26,11 @@ class TagsController < ApplicationController
 
       format.rss do
         expires_in 0, public: true
-
-        limit     = params[:limit].present? ? [params[:limit].to_i, PAGE_SIZE_MAX].min : PAGE_SIZE
-        @statuses = HashtagQueryService.new.call(@tag, filter_params, nil, @local).limit(limit)
-        @statuses = cache_collection(@statuses, Status)
-
         render xml: RSS::TagSerializer.render(@tag, @statuses)
       end
 
       format.json do
         expires_in 3.minutes, public: public_fetch_mode?
-
-        @statuses = HashtagQueryService.new.call(@tag, filter_params, current_account, @local).paginate_by_max_id(PAGE_SIZE, params[:max_id])
-        @statuses = cache_collection(@statuses, Status)
-
         render json: collection_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json'
       end
     end
@@ -54,6 +46,15 @@ class TagsController < ApplicationController
     @local = truthy_param?(:local)
   end
 
+  def set_statuses
+    case request.format&.to_sym
+    when :json
+      @statuses = cache_collection(TagFeed.new(@tag, current_account, local: @local).get(PAGE_SIZE, params[:max_id], params[:since_id], params[:min_id]), Status)
+    when :rss
+      @statuses = cache_collection(TagFeed.new(@tag, nil, local: @local).get(limit_param), Status)
+    end
+  end
+
   def set_body_classes
     @body_classes = 'with-modals'
   end
@@ -62,16 +63,16 @@ class TagsController < ApplicationController
     @instance_presenter = InstancePresenter.new
   end
 
+  def limit_param
+    params[:limit].present? ? [params[:limit].to_i, PAGE_SIZE_MAX].min : PAGE_SIZE
+  end
+
   def collection_presenter
     ActivityPub::CollectionPresenter.new(
-      id: tag_url(@tag, filter_params),
+      id: tag_url(@tag),
       type: :ordered,
       size: @tag.statuses.count,
       items: @statuses.map { |s| ActivityPub::TagManager.instance.uri_for(s) }
     )
   end
-
-  def filter_params
-    params.slice(:any, :all, :none).permit(:any, :all, :none)
-  end
 end
diff --git a/app/controllers/well_known/webfinger_controller.rb b/app/controllers/well_known/webfinger_controller.rb
index 9de9db6ba8c1b4448b2982df71d9211b33169f2a..0227f722a77c6d90846ed05e558555a9b9277325 100644
--- a/app/controllers/well_known/webfinger_controller.rb
+++ b/app/controllers/well_known/webfinger_controller.rb
@@ -35,7 +35,7 @@ module WellKnown
     end
 
     def check_account_suspension
-      expires_in(3.minutes, public: true) && gone if @account.suspended?
+      expires_in(3.minutes, public: true) && gone if @account.suspended_permanently?
     end
 
     def bad_request
diff --git a/app/helpers/admin/action_logs_helper.rb b/app/helpers/admin/action_logs_helper.rb
index 8e398c3b2696271d3f2e8ebe1f70d0e33369c13f..0f3ca36e2df0f0c2d060c439c12cebed19006743 100644
--- a/app/helpers/admin/action_logs_helper.rb
+++ b/app/helpers/admin/action_logs_helper.rb
@@ -29,6 +29,8 @@ module Admin::ActionLogsHelper
       link_to record.target_account.acct, admin_account_path(record.target_account_id)
     when 'Announcement'
       link_to truncate(record.text), edit_admin_announcement_path(record.id)
+    when 'IpBlock'
+      "#{record.ip}/#{record.ip.prefix} (#{I18n.t("simple_form.labels.ip_block.severities.#{record.severity}")})"
     end
   end
 
@@ -48,6 +50,8 @@ module Admin::ActionLogsHelper
       end
     when 'Announcement'
       truncate(attributes['text'].is_a?(Array) ? attributes['text'].last : attributes['text'])
+    when 'IpBlock'
+      "#{attributes['ip']}/#{attributes['ip'].prefix} (#{I18n.t("simple_form.labels.ip_block.severities.#{attributes['severity']}")})"
     end
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 716df0baccd97e45e9f70c9ef44e6beffac42f42..bf5742d34f2ff4107c2d6d73db99482e83cd274c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -7,6 +7,13 @@ module ApplicationHelper
     follow
   ).freeze
 
+  RTL_LOCALES = %i(
+    ar
+    fa
+    he
+    ku
+  ).freeze
+
   def active_nav_class(*paths)
     paths.any? { |path| current_page?(path) } ? 'active' : ''
   end
@@ -44,7 +51,7 @@ module ApplicationHelper
   end
 
   def locale_direction
-    if [:ar, :fa, :he].include?(I18n.locale)
+    if RTL_LOCALES.include?(I18n.locale)
       'rtl'
     else
       'ltr'
@@ -89,6 +96,16 @@ module ApplicationHelper
     end
   end
 
+  def interrelationships_icon(relationships, account_id)
+    if relationships.following[account_id] && relationships.followed_by[account_id]
+      fa_icon('exchange', title: I18n.t('relationships.mutual'), class: 'fa-fw active passive')
+    elsif relationships.following[account_id]
+      fa_icon(locale_direction == 'ltr' ? 'arrow-right' : 'arrow-left', title: I18n.t('relationships.following'), class: 'fa-fw active')
+    elsif relationships.followed_by[account_id]
+      fa_icon(locale_direction == 'ltr' ? 'arrow-left' : 'arrow-right', title: I18n.t('relationships.followers'), class: 'fa-fw passive')
+    end
+  end
+
   def custom_emoji_tag(custom_emoji, animate = true)
     if animate
       image_tag(custom_emoji.image.url, class: 'emojione', alt: ":#{custom_emoji.shortcode}:")
@@ -162,6 +179,8 @@ module ApplicationHelper
     end
 
     json = ActiveModelSerializers::SerializableResource.new(InitialStatePresenter.new(state_params), serializer: InitialStateSerializer).to_json
+    # rubocop:disable Rails/OutputSafety
     content_tag(:script, json_escape(json).html_safe, id: 'initial-state', type: 'application/json')
+    # rubocop:enable Rails/OutputSafety
   end
 end
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 87718dc0584363997f67f974d0815a4ab463a897..5b39497b6bda4d42c28f46746ecbe2efbee588a0 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -40,6 +40,7 @@ module SettingsHelper
     kk: 'ÒšÐ°Ð·Ð°Ò›ÑˆÐ°',
     kn: 'à²•à²¨à³à²¨à²¡',
     ko: 'í•œêµì–´',
+    ku: 'Ø³Û†Ø±Ø§Ù†ÛŒ',
     lt: 'LietuviÅ³',
     lv: 'LatvieÅ¡u',
     mk: 'ÐœÐ°ÐºÐµÐ´Ð¾Ð½ÑÐºÐ¸',
@@ -56,6 +57,8 @@ module SettingsHelper
     pt: 'PortuguÃªs',
     ro: 'RomÃ¢nÄƒ',
     ru: 'Ð ÑƒÑÑÐºÐ¸Ð¹',
+    sa: 'à¤¸à¤‚à¤¸à¥à¤•à¥ƒà¤¤à¤®à¥',
+    sc: 'Sardu',
     sk: 'SlovenÄina',
     sl: 'SlovenÅ¡Äina',
     sq: 'Shqip',
@@ -69,6 +72,7 @@ module SettingsHelper
     uk: 'Ð£ÐºÑ€Ð°Ñ—Ð½ÑÑŒÐºÐ°',
     ur: 'Ø§ÙØ±Ø¯ÙÙˆ',
     vi: 'Tiáº¿ng Viá»‡t',
+    zgh: 'âµœâ´°âµŽâ´°âµ£âµ‰âµ–âµœ',
     'zh-CN': 'ç®€ä½“ä¸æ–‡',
     'zh-HK': 'ç¹é«”ä¸æ–‡ï¼ˆé¦™æ¸¯ï¼‰',
     'zh-TW': 'ç¹é«”ä¸æ–‡ï¼ˆè‡ºç£ï¼‰',
diff --git a/app/helpers/statuses_helper.rb b/app/helpers/statuses_helper.rb
index a51597cf353e013c159ed61c0728c9d017f12150..1f654f34fc9fe6eddeb5813f695828a65a54b56a 100644
--- a/app/helpers/statuses_helper.rb
+++ b/app/helpers/statuses_helper.rb
@@ -4,8 +4,12 @@ module StatusesHelper
   EMBEDDED_CONTROLLER = 'statuses'
   EMBEDDED_ACTION = 'embed'
 
-  def link_to_more(url)
-    link_to t('statuses.show_more'), url, class: 'load-more load-gap'
+  def link_to_newer(url)
+    link_to t('statuses.show_newer'), url, class: 'load-more load-gap'
+  end
+
+  def link_to_older(url)
+    link_to t('statuses.show_older'), url, class: 'load-more load-gap'
   end
 
   def nothing_here(extra_classes = '')
@@ -88,22 +92,6 @@ module StatusesHelper
     end
   end
 
-  def rtl_status?(status)
-    status.local? ? rtl?(status.text) : rtl?(strip_tags(status.text))
-  end
-
-  def rtl?(text)
-    text = simplified_text(text)
-    rtl_words = text.scan(/[\p{Hebrew}\p{Arabic}\p{Syriac}\p{Thaana}\p{Nko}]+/m)
-
-    if rtl_words.present?
-      total_size = text.size.to_f
-      rtl_size(rtl_words) / total_size > 0.3
-    else
-      false
-    end
-  end
-
   def fa_visibility_icon(status)
     case status.visibility
     when 'public'
@@ -117,6 +105,14 @@ module StatusesHelper
     end
   end
 
+  def sensitized?(status, account)
+    if !account.nil? && account.id == status.account_id
+      status.sensitive
+    else
+      status.account.sensitized? || status.sensitive
+    end
+  end
+
   private
 
   def simplified_text(text)
@@ -131,10 +127,6 @@ module StatusesHelper
     end
   end
 
-  def rtl_size(words)
-    words.reduce(0) { |acc, elem| acc + elem.size }.to_f
-  end
-
   def embedded_view?
     params[:controller] == EMBEDDED_CONTROLLER && params[:action] == EMBEDDED_ACTION
   end
diff --git a/app/helpers/webfinger_helper.rb b/app/helpers/webfinger_helper.rb
index ab7ca469811f12e44d87550abc9ea10ddc97a09b..482f4e19eabef0e0a1bbbd43fddf63fb1fd9ed54 100644
--- a/app/helpers/webfinger_helper.rb
+++ b/app/helpers/webfinger_helper.rb
@@ -1,38 +1,7 @@
 # frozen_string_literal: true
 
-# Monkey-patch on monkey-patch.
-# Because it conflicts with the request.rb patch.
-class HTTP::Timeout::PerOperationOriginal < HTTP::Timeout::PerOperation
-  def connect(socket_class, host, port, nodelay = false)
-    ::Timeout.timeout(@connect_timeout, HTTP::TimeoutError) do
-      @socket = socket_class.open(host, port)
-      @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1) if nodelay
-    end
-  end
-end
-
 module WebfingerHelper
   def webfinger!(uri)
-    hidden_service_uri = /\.(onion|i2p)(:\d+)?$/.match(uri)
-
-    raise Mastodon::HostValidationError, 'Instance does not support hidden service connections' if !Rails.configuration.x.access_to_hidden_service && hidden_service_uri
-
-    opts = {
-      ssl: !hidden_service_uri,
-
-      headers: {
-        'User-Agent': Mastodon::Version.user_agent,
-      },
-
-      timeout_class: HTTP::Timeout::PerOperationOriginal,
-
-      timeout_options: {
-        write_timeout: 10,
-        connect_timeout: 5,
-        read_timeout: 10,
-      },
-    }
-
-    Goldfinger::Client.new(uri, opts.merge(Rails.configuration.x.http_client_proxy)).finger
+    Webfinger.new(uri).perform
   end
 end
diff --git a/app/javascript/mastodon/actions/accounts.js b/app/javascript/mastodon/actions/accounts.js
index cb2c682a45ba1844073736de6784485fbab076c8..58b636602609718a41453f3ec0a310ba20b280c4 100644
--- a/app/javascript/mastodon/actions/accounts.js
+++ b/app/javascript/mastodon/actions/accounts.js
@@ -1,6 +1,5 @@
 import api, { getLinks } from '../api';
-import openDB from '../storage/db';
-import { importAccount, importFetchedAccount, importFetchedAccounts } from './importer';
+import { importFetchedAccount, importFetchedAccounts } from './importer';
 
 export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';
 export const ACCOUNT_FETCH_SUCCESS = 'ACCOUNT_FETCH_SUCCESS';
@@ -74,45 +73,13 @@ export const FOLLOW_REQUEST_REJECT_REQUEST = 'FOLLOW_REQUEST_REJECT_REQUEST';
 export const FOLLOW_REQUEST_REJECT_SUCCESS = 'FOLLOW_REQUEST_REJECT_SUCCESS';
 export const FOLLOW_REQUEST_REJECT_FAIL    = 'FOLLOW_REQUEST_REJECT_FAIL';
 
-function getFromDB(dispatch, getState, index, id) {
-  return new Promise((resolve, reject) => {
-    const request = index.get(id);
-
-    request.onerror = reject;
-
-    request.onsuccess = () => {
-      if (!request.result) {
-        reject();
-        return;
-      }
-
-      dispatch(importAccount(request.result));
-      resolve(request.result.moved && getFromDB(dispatch, getState, index, request.result.moved));
-    };
-  });
-}
-
 export function fetchAccount(id) {
   return (dispatch, getState) => {
     dispatch(fetchRelationships([id]));
-
-    if (getState().getIn(['accounts', id], null) !== null) {
-      return;
-    }
-
     dispatch(fetchAccountRequest(id));
 
-    openDB().then(db => getFromDB(
-      dispatch,
-      getState,
-      db.transaction('accounts', 'read').objectStore('accounts').index('id'),
-      id,
-    ).then(() => db.close(), error => {
-      db.close();
-      throw error;
-    })).catch(() => api(getState).get(`/api/v1/accounts/${id}`).then(response => {
+    api(getState).get(`/api/v1/accounts/${id}`).then(response => {
       dispatch(importFetchedAccount(response.data));
-    })).then(() => {
       dispatch(fetchAccountSuccess());
     }).catch(error => {
       dispatch(fetchAccountFail(id, error));
@@ -142,14 +109,14 @@ export function fetchAccountFail(id, error) {
   };
 };
 
-export function followAccount(id, reblogs = true) {
+export function followAccount(id, options = { reblogs: true }) {
   return (dispatch, getState) => {
     const alreadyFollowing = getState().getIn(['relationships', id, 'following']);
     const locked = getState().getIn(['accounts', id, 'locked'], false);
 
     dispatch(followAccountRequest(id, locked));
 
-    api(getState).post(`/api/v1/accounts/${id}/follow`, { reblogs }).then(response => {
+    api(getState).post(`/api/v1/accounts/${id}/follow`, options).then(response => {
       dispatch(followAccountSuccess(response.data, alreadyFollowing));
     }).catch(error => {
       dispatch(followAccountFail(error, locked));
@@ -290,11 +257,11 @@ export function unblockAccountFail(error) {
 };
 
 
-export function muteAccount(id, notifications) {
+export function muteAccount(id, notifications, duration=0) {
   return (dispatch, getState) => {
     dispatch(muteAccountRequest(id));
 
-    api(getState).post(`/api/v1/accounts/${id}/mute`, { notifications }).then(response => {
+    api(getState).post(`/api/v1/accounts/${id}/mute`, { notifications, duration }).then(response => {
       // Pass in entire statuses map so we can use it to filter stuff in different parts of the reducers
       dispatch(muteAccountSuccess(response.data, getState().get('statuses')));
     }).catch(error => {
diff --git a/app/javascript/mastodon/actions/app.js b/app/javascript/mastodon/actions/app.js
index 414968f7de47cfef7cf1abe27742efc03ed92959..c817c87080a005ef3b922bf663746fefd2e8b430 100644
--- a/app/javascript/mastodon/actions/app.js
+++ b/app/javascript/mastodon/actions/app.js
@@ -8,3 +8,10 @@ export const focusApp = () => ({
 export const unfocusApp = () => ({
   type: APP_UNFOCUS,
 });
+
+export const APP_LAYOUT_CHANGE = 'APP_LAYOUT_CHANGE';
+
+export const changeLayout = layout => ({
+  type: APP_LAYOUT_CHANGE,
+  layout,
+});
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 20341f9ec0e2425bb71631d9c9888ba842b0a1d8..891403969e2f1d640aed67cce864d5e5b0cbd7f3 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -152,9 +152,7 @@ export function submitCompose(routerHistory) {
         'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
       },
     }).then(function (response) {
-      if (response.data.visibility === 'direct' && getState().getIn(['conversations', 'mounted']) <= 0 && routerHistory) {
-        routerHistory.push('/timelines/direct');
-      } else if (routerHistory && routerHistory.location.pathname === '/statuses/new' && window.history.state) {
+      if (routerHistory && routerHistory.location.pathname === '/statuses/new' && window.history.state) {
         routerHistory.goBack();
       }
 
@@ -163,7 +161,6 @@ export function submitCompose(routerHistory) {
 
       // To make the app more responsive, immediately push the status
       // into the columns
-
       const insertIfOnline = timelineId => {
         const timeline = getState().getIn(['timelines', timelineId]);
 
@@ -179,6 +176,7 @@ export function submitCompose(routerHistory) {
       if (response.data.in_reply_to_id === null && response.data.visibility === 'public') {
         insertIfOnline('community');
         insertIfOnline('public');
+        insertIfOnline(`account:${response.data.account.id}`);
       }
     }).catch(function (error) {
       dispatch(submitComposeFail(error));
diff --git a/app/javascript/mastodon/actions/lists.js b/app/javascript/mastodon/actions/lists.js
index d736bacef4805770713765b24ca29cae1a5d7598..5ab9224363fe6f61a6291e3d3567712b0d7b26bc 100644
--- a/app/javascript/mastodon/actions/lists.js
+++ b/app/javascript/mastodon/actions/lists.js
@@ -150,10 +150,10 @@ export const createListFail = error => ({
   error,
 });
 
-export const updateList = (id, title, shouldReset) => (dispatch, getState) => {
+export const updateList = (id, title, shouldReset, replies_policy) => (dispatch, getState) => {
   dispatch(updateListRequest(id));
 
-  api(getState).put(`/api/v1/lists/${id}`, { title }).then(({ data }) => {
+  api(getState).put(`/api/v1/lists/${id}`, { title, replies_policy }).then(({ data }) => {
     dispatch(updateListSuccess(data));
 
     if (shouldReset) {
diff --git a/app/javascript/mastodon/actions/markers.js b/app/javascript/mastodon/actions/markers.js
index 37d1ddccfeecae8414a202d4a61c43e3d3aadde6..16a3df8f6381c6c7f1ca6d2a47cb9e72122a3fae 100644
--- a/app/javascript/mastodon/actions/markers.js
+++ b/app/javascript/mastodon/actions/markers.js
@@ -1,8 +1,10 @@
 import api from '../api';
 import { debounce } from 'lodash';
 import compareId from '../compare_id';
-import { showAlertForError } from './alerts';
 
+export const MARKERS_FETCH_REQUEST = 'MARKERS_FETCH_REQUEST';
+export const MARKERS_FETCH_SUCCESS = 'MARKERS_FETCH_SUCCESS';
+export const MARKERS_FETCH_FAIL    = 'MARKERS_FETCH_FAIL';
 export const MARKERS_SUBMIT_SUCCESS = 'MARKERS_SUBMIT_SUCCESS';
 
 export const synchronouslySubmitMarkers = () => (dispatch, getState) => {
@@ -26,15 +28,19 @@ export const synchronouslySubmitMarkers = () => (dispatch, getState) => {
       },
       body: JSON.stringify(params),
     });
+
     return;
   } else if (navigator && navigator.sendBeacon) {
     // Failing that, we can use sendBeacon, but we have to encode the data as
     // FormData for DoorKeeper to recognize the token.
     const formData = new FormData();
+
     formData.append('bearer_token', accessToken);
+
     for (const [id, value] of Object.entries(params)) {
       formData.append(`${id}[last_read_id]`, value.last_read_id);
     }
+
     if (navigator.sendBeacon('/api/v1/markers', formData)) {
       return;
     }
@@ -57,8 +63,8 @@ export const synchronouslySubmitMarkers = () => (dispatch, getState) => {
 const _buildParams = (state) => {
   const params = {};
 
-  const lastHomeId         = state.getIn(['timelines', 'home', 'items', 0]);
-  const lastNotificationId = state.getIn(['notifications', 'items', 0, 'id']);
+  const lastHomeId         = state.getIn(['timelines', 'home', 'items']).find(item => item !== null);
+  const lastNotificationId = state.getIn(['notifications', 'lastReadId']);
 
   if (lastHomeId && compareId(lastHomeId, state.getIn(['markers', 'home'])) > 0) {
     params.home = {
@@ -82,11 +88,9 @@ const debouncedSubmitMarkers = debounce((dispatch, getState) => {
     return;
   }
 
-  api().post('/api/v1/markers', params).then(() => {
+  api(getState).post('/api/v1/markers', params).then(() => {
     dispatch(submitMarkersSuccess(params));
-  }).catch(error => {
-    dispatch(showAlertForError(error));
-  });
+  }).catch(() => {});
 }, 300000, { leading: true, trailing: true });
 
 export function submitMarkersSuccess({ home, notifications }) {
@@ -97,6 +101,48 @@ export function submitMarkersSuccess({ home, notifications }) {
   };
 };
 
-export function submitMarkers() {
-  return (dispatch, getState) => debouncedSubmitMarkers(dispatch, getState);
+export function submitMarkers(params = {}) {
+  const result = (dispatch, getState) => debouncedSubmitMarkers(dispatch, getState);
+
+  if (params.immediate === true) {
+    debouncedSubmitMarkers.flush();
+  }
+
+  return result;
+};
+
+export const fetchMarkers = () => (dispatch, getState) => {
+  const params = { timeline: ['notifications'] };
+
+  dispatch(fetchMarkersRequest());
+
+  api(getState).get('/api/v1/markers', { params }).then(response => {
+    dispatch(fetchMarkersSuccess(response.data));
+  }).catch(error => {
+    dispatch(fetchMarkersFail(error));
+  });
+};
+
+export function fetchMarkersRequest() {
+  return {
+    type: MARKERS_FETCH_REQUEST,
+    skipLoading: true,
+  };
+};
+
+export function fetchMarkersSuccess(markers) {
+  return {
+    type: MARKERS_FETCH_SUCCESS,
+    markers,
+    skipLoading: true,
+  };
+};
+
+export function fetchMarkersFail(error) {
+  return {
+    type: MARKERS_FETCH_FAIL,
+    error,
+    skipLoading: true,
+    skipAlert: true,
+  };
 };
diff --git a/app/javascript/mastodon/actions/mutes.js b/app/javascript/mastodon/actions/mutes.js
index 9f645faee17bbf50579e26c7b001f057e0e68543..d8874f353f42c43cd9a88aa9aecd3089977eb4d8 100644
--- a/app/javascript/mastodon/actions/mutes.js
+++ b/app/javascript/mastodon/actions/mutes.js
@@ -13,6 +13,7 @@ export const MUTES_EXPAND_FAIL    = 'MUTES_EXPAND_FAIL';
 
 export const MUTES_INIT_MODAL = 'MUTES_INIT_MODAL';
 export const MUTES_TOGGLE_HIDE_NOTIFICATIONS = 'MUTES_TOGGLE_HIDE_NOTIFICATIONS';
+export const MUTES_CHANGE_DURATION = 'MUTES_CHANGE_DURATION';
 
 export function fetchMutes() {
   return (dispatch, getState) => {
@@ -104,3 +105,12 @@ export function toggleHideNotifications() {
     dispatch({ type: MUTES_TOGGLE_HIDE_NOTIFICATIONS });
   };
 }
+
+export function changeMuteDuration(duration) {
+  return dispatch => {
+    dispatch({
+      type: MUTES_CHANGE_DURATION,
+      duration,
+    });
+  };
+}
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index a26844f84821d34ec783fd74b3c61cdd58dfd9ca..3464ac995979d3a3395ad65421e490f4c11fd146 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -16,6 +16,7 @@ import { getFiltersRegex } from '../selectors';
 import { usePendingItems as preferPendingItems } from 'mastodon/initial_state';
 import compareId from 'mastodon/compare_id';
 import { searchTextFromRawStatus } from 'mastodon/actions/importer/normalizer';
+import { requestNotificationPermission } from '../utils/notifications';
 
 export const NOTIFICATIONS_UPDATE      = 'NOTIFICATIONS_UPDATE';
 export const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP';
@@ -33,6 +34,12 @@ export const NOTIFICATIONS_LOAD_PENDING = 'NOTIFICATIONS_LOAD_PENDING';
 export const NOTIFICATIONS_MOUNT   = 'NOTIFICATIONS_MOUNT';
 export const NOTIFICATIONS_UNMOUNT = 'NOTIFICATIONS_UNMOUNT';
 
+
+export const NOTIFICATIONS_MARK_AS_READ = 'NOTIFICATIONS_MARK_AS_READ';
+
+export const NOTIFICATIONS_SET_BROWSER_SUPPORT    = 'NOTIFICATIONS_SET_BROWSER_SUPPORT';
+export const NOTIFICATIONS_SET_BROWSER_PERMISSION = 'NOTIFICATIONS_SET_BROWSER_PERMISSION';
+
 defineMessages({
   mention: { id: 'notification.mention', defaultMessage: '{name} mentioned you' },
   group: { id: 'notifications.group', defaultMessage: '{count} notifications' },
@@ -59,7 +66,7 @@ export function updateNotifications(notification, intlMessages, intlLocale) {
 
     let filtered = false;
 
-    if (notification.type === 'mention') {
+    if (['mention', 'status'].includes(notification.type)) {
       const dropRegex   = filters[0];
       const regex       = filters[1];
       const searchIndex = searchTextFromRawStatus(notification.status);
@@ -232,3 +239,47 @@ export const mountNotifications = () => ({
 export const unmountNotifications = () => ({
   type: NOTIFICATIONS_UNMOUNT,
 });
+
+
+export const markNotificationsAsRead = () => ({
+  type: NOTIFICATIONS_MARK_AS_READ,
+});
+
+// Browser support
+export function setupBrowserNotifications() {
+  return dispatch => {
+    dispatch(setBrowserSupport('Notification' in window));
+    if ('Notification' in window) {
+      dispatch(setBrowserPermission(Notification.permission));
+    }
+
+    if ('Notification' in window && 'permissions' in navigator) {
+      navigator.permissions.query({ name: 'notifications' }).then((status) => {
+        status.onchange = () => dispatch(setBrowserPermission(Notification.permission));
+      }).catch(console.warn);
+    }
+  };
+}
+
+export function requestBrowserPermission(callback = noOp) {
+  return dispatch => {
+    requestNotificationPermission((permission) => {
+      dispatch(setBrowserPermission(permission));
+      callback(permission);
+    });
+  };
+};
+
+export function setBrowserSupport (value) {
+  return {
+    type: NOTIFICATIONS_SET_BROWSER_SUPPORT,
+    value,
+  };
+}
+
+export function setBrowserPermission (value) {
+  return {
+    type: NOTIFICATIONS_SET_BROWSER_PERMISSION,
+    value,
+  };
+}
diff --git a/app/javascript/mastodon/actions/onboarding.js b/app/javascript/mastodon/actions/onboarding.js
index a1dd3a731eddc1ceda9a76d05ed5f7feff7bf74f..42d8ea33fdd79d9593e95445952db842eebf7c10 100644
--- a/app/javascript/mastodon/actions/onboarding.js
+++ b/app/javascript/mastodon/actions/onboarding.js
@@ -1,8 +1,21 @@
 import { changeSetting, saveSettings } from './settings';
+import { requestBrowserPermission } from './notifications';
 
 export const INTRODUCTION_VERSION = 20181216044202;
 
 export const closeOnboarding = () => dispatch => {
   dispatch(changeSetting(['introductionVersion'], INTRODUCTION_VERSION));
   dispatch(saveSettings());
+
+  dispatch(requestBrowserPermission((permission) => {
+    if (permission === 'granted') {
+      dispatch(changeSetting(['notifications', 'alerts', 'follow'], true));
+      dispatch(changeSetting(['notifications', 'alerts', 'favourite'], true));
+      dispatch(changeSetting(['notifications', 'alerts', 'reblog'], true));
+      dispatch(changeSetting(['notifications', 'alerts', 'mention'], true));
+      dispatch(changeSetting(['notifications', 'alerts', 'poll'], true));
+      dispatch(changeSetting(['notifications', 'alerts', 'status'], true));
+      dispatch(saveSettings());
+    }
+  }));
 };
diff --git a/app/javascript/mastodon/actions/picture_in_picture.js b/app/javascript/mastodon/actions/picture_in_picture.js
new file mode 100644
index 0000000000000000000000000000000000000000..4085cb59e0097f326624ad8d7214e3f70205d3d7
--- /dev/null
+++ b/app/javascript/mastodon/actions/picture_in_picture.js
@@ -0,0 +1,38 @@
+// @ts-check
+
+export const PICTURE_IN_PICTURE_DEPLOY = 'PICTURE_IN_PICTURE_DEPLOY';
+export const PICTURE_IN_PICTURE_REMOVE = 'PICTURE_IN_PICTURE_REMOVE';
+
+/**
+ * @typedef MediaProps
+ * @property {string} src
+ * @property {boolean} muted
+ * @property {number} volume
+ * @property {number} currentTime
+ * @property {string} poster
+ * @property {string} backgroundColor
+ * @property {string} foregroundColor
+ * @property {string} accentColor
+ */
+
+/**
+ * @param {string} statusId
+ * @param {string} accountId
+ * @param {string} playerType
+ * @param {MediaProps} props
+ * @return {object}
+ */
+export const deployPictureInPicture = (statusId, accountId, playerType, props) => ({
+  type: PICTURE_IN_PICTURE_DEPLOY,
+  statusId,
+  accountId,
+  playerType,
+  props,
+});
+
+/*
+ * @return {object}
+ */
+export const removePictureInPicture = () => ({
+  type: PICTURE_IN_PICTURE_REMOVE,
+});
diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js
index 5640201c621f0f494afb96d731ace606a899c69b..3fc7c07023d6274aabf2ec955266a862aef2e5e0 100644
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -1,9 +1,7 @@
 import api from '../api';
-import openDB from '../storage/db';
-import { evictStatus } from '../storage/modifier';
 
 import { deleteFromTimelines } from './timelines';
-import { importFetchedStatus, importFetchedStatuses, importAccount, importStatus } from './importer';
+import { importFetchedStatus, importFetchedStatuses, importFetchedAccount } from './importer';
 import { ensureComposeIsVisible } from './compose';
 
 export const STATUS_FETCH_REQUEST = 'STATUS_FETCH_REQUEST';
@@ -40,48 +38,6 @@ export function fetchStatusRequest(id, skipLoading) {
   };
 };
 
-function getFromDB(dispatch, getState, accountIndex, index, id) {
-  return new Promise((resolve, reject) => {
-    const request = index.get(id);
-
-    request.onerror = reject;
-
-    request.onsuccess = () => {
-      const promises = [];
-
-      if (!request.result) {
-        reject();
-        return;
-      }
-
-      dispatch(importStatus(request.result));
-
-      if (getState().getIn(['accounts', request.result.account], null) === null) {
-        promises.push(new Promise((accountResolve, accountReject) => {
-          const accountRequest = accountIndex.get(request.result.account);
-
-          accountRequest.onerror = accountReject;
-          accountRequest.onsuccess = () => {
-            if (!request.result) {
-              accountReject();
-              return;
-            }
-
-            dispatch(importAccount(accountRequest.result));
-            accountResolve();
-          };
-        }));
-      }
-
-      if (request.result.reblog && getState().getIn(['statuses', request.result.reblog], null) === null) {
-        promises.push(getFromDB(dispatch, getState, accountIndex, index, request.result.reblog));
-      }
-
-      resolve(Promise.all(promises));
-    };
-  });
-}
-
 export function fetchStatus(id) {
   return (dispatch, getState) => {
     const skipLoading = getState().getIn(['statuses', id], null) !== null;
@@ -94,23 +50,10 @@ export function fetchStatus(id) {
 
     dispatch(fetchStatusRequest(id, skipLoading));
 
-    openDB().then(db => {
-      const transaction = db.transaction(['accounts', 'statuses'], 'read');
-      const accountIndex = transaction.objectStore('accounts').index('id');
-      const index = transaction.objectStore('statuses').index('id');
-
-      return getFromDB(dispatch, getState, accountIndex, index, id).then(() => {
-        db.close();
-      }, error => {
-        db.close();
-        throw error;
-      });
-    }).then(() => {
-      dispatch(fetchStatusSuccess(skipLoading));
-    }, () => api(getState).get(`/api/v1/statuses/${id}`).then(response => {
+    api(getState).get(`/api/v1/statuses/${id}`).then(response => {
       dispatch(importFetchedStatus(response.data));
       dispatch(fetchStatusSuccess(skipLoading));
-    })).catch(error => {
+    }).catch(error => {
       dispatch(fetchStatusFail(id, error, skipLoading));
     });
   };
@@ -152,9 +95,9 @@ export function deleteStatus(id, routerHistory, withRedraft = false) {
     dispatch(deleteStatusRequest(id));
 
     api(getState).delete(`/api/v1/statuses/${id}`).then(response => {
-      evictStatus(id);
       dispatch(deleteStatusSuccess(id));
       dispatch(deleteFromTimelines(id));
+      dispatch(importFetchedAccount(response.data.account));
 
       if (withRedraft) {
         dispatch(redraft(status, response.data.text));
diff --git a/app/javascript/mastodon/actions/streaming.js b/app/javascript/mastodon/actions/streaming.js
index d998fcac48023831e29d8ae04dea3c72b6b76e9e..beb5c6a4a9de6cb52e844fcc6315c082cdb5e0c9 100644
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@@ -1,3 +1,5 @@
+// @ts-check
+
 import { connectStream } from '../stream';
 import {
   updateTimeline,
@@ -19,24 +21,59 @@ import { getLocale } from '../locales';
 
 const { messages } = getLocale();
 
-export function connectTimelineStream (timelineId, path, pollingRefresh = null, accept = null) {
+/**
+ * @param {number} max
+ * @return {number}
+ */
+const randomUpTo = max =>
+  Math.floor(Math.random() * Math.floor(max));
 
-  return connectStream (path, pollingRefresh, (dispatch, getState) => {
+/**
+ * @param {string} timelineId
+ * @param {string} channelName
+ * @param {Object.<string, string>} params
+ * @param {Object} options
+ * @param {function(Function, Function): void} [options.fallback]
+ * @param {function(object): boolean} [options.accept]
+ * @return {function(): void}
+ */
+export const connectTimelineStream = (timelineId, channelName, params = {}, options = {}) =>
+  connectStream(channelName, params, (dispatch, getState) => {
     const locale = getState().getIn(['meta', 'locale']);
 
+    let pollingId;
+
+    /**
+     * @param {function(Function, Function): void} fallback
+     */
+    const useFallback = fallback => {
+      fallback(dispatch, () => {
+        pollingId = setTimeout(() => useFallback(fallback), 20000 + randomUpTo(20000));
+      });
+    };
+
     return {
       onConnect() {
         dispatch(connectTimeline(timelineId));
+
+        if (pollingId) {
+          clearTimeout(pollingId);
+          pollingId = null;
+        }
       },
 
       onDisconnect() {
         dispatch(disconnectTimeline(timelineId));
+
+        if (options.fallback) {
+          pollingId = setTimeout(() => useFallback(options.fallback), randomUpTo(40000));
+        }
       },
 
       onReceive (data) {
         switch(data.event) {
         case 'update':
-          dispatch(updateTimeline(timelineId, JSON.parse(data.payload), accept));
+          dispatch(updateTimeline(timelineId, JSON.parse(data.payload), options.accept));
           break;
         case 'delete':
           dispatch(deleteFromTimelines(data.payload));
@@ -63,17 +100,59 @@ export function connectTimelineStream (timelineId, path, pollingRefresh = null,
       },
     };
   });
-}
 
+/**
+ * @param {Function} dispatch
+ * @param {function(): void} done
+ */
 const refreshHomeTimelineAndNotification = (dispatch, done) => {
   dispatch(expandHomeTimeline({}, () =>
     dispatch(expandNotifications({}, () =>
       dispatch(fetchAnnouncements(done))))));
 };
 
-export const connectUserStream      = () => connectTimelineStream('home', 'user', refreshHomeTimelineAndNotification);
-export const connectCommunityStream = ({ onlyMedia } = {}) => connectTimelineStream(`community${onlyMedia ? ':media' : ''}`, `public:local${onlyMedia ? ':media' : ''}`);
-export const connectPublicStream    = ({ onlyMedia, onlyRemote } = {}) => connectTimelineStream(`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, `public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`);
-export const connectHashtagStream   = (id, tag, local, accept) => connectTimelineStream(`hashtag:${id}${local ? ':local' : ''}`, `hashtag${local ? ':local' : ''}&tag=${tag}`, null, accept);
-export const connectDirectStream    = () => connectTimelineStream('direct', 'direct');
-export const connectListStream      = id => connectTimelineStream(`list:${id}`, `list&list=${id}`);
+/**
+ * @return {function(): void}
+ */
+export const connectUserStream = () =>
+  connectTimelineStream('home', 'user', {}, { fallback: refreshHomeTimelineAndNotification });
+
+/**
+ * @param {Object} options
+ * @param {boolean} [options.onlyMedia]
+ * @return {function(): void}
+ */
+export const connectCommunityStream = ({ onlyMedia } = {}) =>
+  connectTimelineStream(`community${onlyMedia ? ':media' : ''}`, `public:local${onlyMedia ? ':media' : ''}`);
+
+/**
+ * @param {Object} options
+ * @param {boolean} [options.onlyMedia]
+ * @param {boolean} [options.onlyRemote]
+ * @return {function(): void}
+ */
+export const connectPublicStream = ({ onlyMedia, onlyRemote } = {}) =>
+  connectTimelineStream(`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, `public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`);
+
+/**
+ * @param {string} columnId
+ * @param {string} tagName
+ * @param {boolean} onlyLocal
+ * @param {function(object): boolean} accept
+ * @return {function(): void}
+ */
+export const connectHashtagStream = (columnId, tagName, onlyLocal, accept) =>
+  connectTimelineStream(`hashtag:${columnId}${onlyLocal ? ':local' : ''}`, `hashtag${onlyLocal ? ':local' : ''}`, { tag: tagName }, { accept });
+
+/**
+ * @return {function(): void}
+ */
+export const connectDirectStream = () =>
+  connectTimelineStream('direct', 'direct');
+
+/**
+ * @param {string} listId
+ * @return {function(): void}
+ */
+export const connectListStream = listId =>
+  connectTimelineStream(`list:${listId}`, 'list', { list: listId });
diff --git a/app/javascript/mastodon/blurhash.js b/app/javascript/mastodon/blurhash.js
new file mode 100644
index 0000000000000000000000000000000000000000..5adcc3e77021e17091e4cae9737be5e2f6bd37a6
--- /dev/null
+++ b/app/javascript/mastodon/blurhash.js
@@ -0,0 +1,112 @@
+const DIGIT_CHARACTERS = [
+  '0',
+  '1',
+  '2',
+  '3',
+  '4',
+  '5',
+  '6',
+  '7',
+  '8',
+  '9',
+  'A',
+  'B',
+  'C',
+  'D',
+  'E',
+  'F',
+  'G',
+  'H',
+  'I',
+  'J',
+  'K',
+  'L',
+  'M',
+  'N',
+  'O',
+  'P',
+  'Q',
+  'R',
+  'S',
+  'T',
+  'U',
+  'V',
+  'W',
+  'X',
+  'Y',
+  'Z',
+  'a',
+  'b',
+  'c',
+  'd',
+  'e',
+  'f',
+  'g',
+  'h',
+  'i',
+  'j',
+  'k',
+  'l',
+  'm',
+  'n',
+  'o',
+  'p',
+  'q',
+  'r',
+  's',
+  't',
+  'u',
+  'v',
+  'w',
+  'x',
+  'y',
+  'z',
+  '#',
+  '$',
+  '%',
+  '*',
+  '+',
+  ',',
+  '-',
+  '.',
+  ':',
+  ';',
+  '=',
+  '?',
+  '@',
+  '[',
+  ']',
+  '^',
+  '_',
+  '{',
+  '|',
+  '}',
+  '~',
+];
+
+export const decode83 = (str) => {
+  let value = 0;
+  let c, digit;
+
+  for (let i = 0; i < str.length; i++) {
+    c = str[i];
+    digit = DIGIT_CHARACTERS.indexOf(c);
+    value = value * 83 + digit;
+  }
+
+  return value;
+};
+
+export const intToRGB = int => ({
+  r: Math.max(0, (int >> 16)),
+  g: Math.max(0, (int >> 8) & 255),
+  b: Math.max(0, (int & 255)),
+});
+
+export const getAverageFromBlurhash = blurhash => {
+  if (!blurhash) {
+    return null;
+  }
+
+  return intToRGB(decode83(blurhash.slice(2, 6)));
+};
diff --git a/app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap b/app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap
index 5c04e09799f022cf9a30a19bc841dcc9731b0360..86fbba917b7391c33fd29b051d6a9b93e334c899 100644
--- a/app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap
+++ b/app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap
@@ -4,13 +4,6 @@ exports[`<Button /> adds class "button-secondary" if props.secondary given 1`] =
 <button
   className="button button-secondary"
   onClick={[Function]}
-  style={
-    Object {
-      "height": "36px",
-      "lineHeight": "36px",
-      "padding": "0 16px",
-    }
-  }
 />
 `;
 
@@ -18,13 +11,6 @@ exports[`<Button /> renders a button element 1`] = `
 <button
   className="button"
   onClick={[Function]}
-  style={
-    Object {
-      "height": "36px",
-      "lineHeight": "36px",
-      "padding": "0 16px",
-    }
-  }
 />
 `;
 
@@ -33,13 +19,6 @@ exports[`<Button /> renders a disabled attribute if props.disabled given 1`] = `
   className="button"
   disabled={true}
   onClick={[Function]}
-  style={
-    Object {
-      "height": "36px",
-      "lineHeight": "36px",
-      "padding": "0 16px",
-    }
-  }
 />
 `;
 
@@ -47,13 +26,6 @@ exports[`<Button /> renders class="button--block" if props.block given 1`] = `
 <button
   className="button button--block"
   onClick={[Function]}
-  style={
-    Object {
-      "height": "36px",
-      "lineHeight": "36px",
-      "padding": "0 16px",
-    }
-  }
 />
 `;
 
@@ -61,13 +33,6 @@ exports[`<Button /> renders the children 1`] = `
 <button
   className="button"
   onClick={[Function]}
-  style={
-    Object {
-      "height": "36px",
-      "lineHeight": "36px",
-      "padding": "0 16px",
-    }
-  }
 >
   <p>
     children
@@ -79,13 +44,6 @@ exports[`<Button /> renders the given text 1`] = `
 <button
   className="button"
   onClick={[Function]}
-  style={
-    Object {
-      "height": "36px",
-      "lineHeight": "36px",
-      "padding": "0 16px",
-    }
-  }
 >
   foo
 </button>
@@ -95,13 +53,6 @@ exports[`<Button /> renders the props.text instead of children 1`] = `
 <button
   className="button"
   onClick={[Function]}
-  style={
-    Object {
-      "height": "36px",
-      "lineHeight": "36px",
-      "padding": "0 16px",
-    }
-  }
 >
   foo
 </button>
diff --git a/app/javascript/mastodon/components/account.js b/app/javascript/mastodon/components/account.js
index 2705a6001341bff0ad06bbfd060fe0c42f5248ca..0e40ee1d6a5543d6e28f1fdeae28fb0e898a1978 100644
--- a/app/javascript/mastodon/components/account.js
+++ b/app/javascript/mastodon/components/account.js
@@ -8,6 +8,7 @@ import IconButton from './icon_button';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { me } from '../initial_state';
+import RelativeTimestamp from './relative_timestamp';
 
 const messages = defineMessages({
   follow: { id: 'account.follow', defaultMessage: 'Follow' },
@@ -107,11 +108,17 @@ class Account extends ImmutablePureComponent {
       }
     }
 
+    let mute_expires_at;
+    if (account.get('mute_expires_at')) {
+      mute_expires_at =  <div><RelativeTimestamp timestamp={account.get('mute_expires_at')} futureDate /></div>;
+    }
+
     return (
       <div className='account'>
         <div className='account__wrapper'>
           <Permalink key={account.get('id')} className='account__display-name' title={account.get('acct')} href={account.get('url')} to={`/accounts/${account.get('id')}`}>
             <div className='account__avatar-wrapper'><Avatar account={account} size={36} /></div>
+            {mute_expires_at}
             <DisplayName account={account} />
           </Permalink>
 
diff --git a/app/javascript/mastodon/components/animated_number.js b/app/javascript/mastodon/components/animated_number.js
index f3127c88ef1a485f287adaa7a77f06a9488e7ac3..fbe948c5b02371dc824951e78e13478b2a601f4e 100644
--- a/app/javascript/mastodon/components/animated_number.js
+++ b/app/javascript/mastodon/components/animated_number.js
@@ -5,10 +5,21 @@ import TransitionMotion from 'react-motion/lib/TransitionMotion';
 import spring from 'react-motion/lib/spring';
 import { reduceMotion } from 'mastodon/initial_state';
 
+const obfuscatedCount = count => {
+  if (count < 0) {
+    return 0;
+  } else if (count <= 1) {
+    return count;
+  } else {
+    return '1+';
+  }
+};
+
 export default class AnimatedNumber extends React.PureComponent {
 
   static propTypes = {
     value: PropTypes.number.isRequired,
+    obfuscate: PropTypes.bool,
   };
 
   state = {
@@ -36,11 +47,11 @@ export default class AnimatedNumber extends React.PureComponent {
   }
 
   render () {
-    const { value } = this.props;
+    const { value, obfuscate } = this.props;
     const { direction } = this.state;
 
     if (reduceMotion) {
-      return <FormattedNumber value={value} />;
+      return obfuscate ? obfuscatedCount(value) : <FormattedNumber value={value} />;
     }
 
     const styles = [{
@@ -54,7 +65,7 @@ export default class AnimatedNumber extends React.PureComponent {
         {items => (
           <span className='animated-number'>
             {items.map(({ key, data, style }) => (
-              <span key={key} style={{ position: (direction * style.y) > 0 ? 'absolute' : 'static', transform: `translateY(${style.y * 100}%)` }}><FormattedNumber value={data} /></span>
+              <span key={key} style={{ position: (direction * style.y) > 0 ? 'absolute' : 'static', transform: `translateY(${style.y * 100}%)` }}>{obfuscate ? obfuscatedCount(data) : <FormattedNumber value={data} />}</span>
             ))}
           </span>
         )}
diff --git a/app/javascript/mastodon/components/autosuggest_emoji.js b/app/javascript/mastodon/components/autosuggest_emoji.js
index ce4383a607f609568921920ba454702153d53c1a..4937e4d9845f4d46221fe002f2936d91460efe62 100644
--- a/app/javascript/mastodon/components/autosuggest_emoji.js
+++ b/app/javascript/mastodon/components/autosuggest_emoji.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import unicodeMapping from '../features/emoji/emoji_unicode_mapping_light';
-
-const assetHost = process.env.CDN_HOST || '';
+import { assetHost } from 'mastodon/utils/config';
 
 export default class AutosuggestEmoji extends React.PureComponent {
 
diff --git a/app/javascript/mastodon/components/autosuggest_input.js b/app/javascript/mastodon/components/autosuggest_input.js
index 6d2035add0184c51dfa1a4522240e8fe4845c781..5187f95c847f487cf0fa01067ba8e5d3aa70b150 100644
--- a/app/javascript/mastodon/components/autosuggest_input.js
+++ b/app/javascript/mastodon/components/autosuggest_input.js
@@ -4,7 +4,6 @@ import AutosuggestEmoji from './autosuggest_emoji';
 import AutosuggestHashtag from './autosuggest_hashtag';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
-import { isRtl } from '../rtl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import classNames from 'classnames';
 import { List as ImmutableList } from 'immutable';
@@ -189,11 +188,6 @@ export default class AutosuggestInput extends ImmutablePureComponent {
   render () {
     const { value, suggestions, disabled, placeholder, onKeyUp, autoFocus, className, id, maxLength } = this.props;
     const { suggestionsHidden } = this.state;
-    const style = { direction: 'ltr' };
-
-    if (isRtl(value)) {
-      style.direction = 'rtl';
-    }
 
     return (
       <div className='autosuggest-input'>
@@ -212,7 +206,7 @@ export default class AutosuggestInput extends ImmutablePureComponent {
             onKeyUp={onKeyUp}
             onFocus={this.onFocus}
             onBlur={this.onBlur}
-            style={style}
+            dir='auto'
             aria-autocomplete='list'
             id={id}
             className={className}
diff --git a/app/javascript/mastodon/components/autosuggest_textarea.js b/app/javascript/mastodon/components/autosuggest_textarea.js
index 58ec4f6eb66fb2356591e2587ae465c0b10596d2..08b9cd80bbf7aaaec010887e64e638195b9afc59 100644
--- a/app/javascript/mastodon/components/autosuggest_textarea.js
+++ b/app/javascript/mastodon/components/autosuggest_textarea.js
@@ -4,7 +4,6 @@ import AutosuggestEmoji from './autosuggest_emoji';
 import AutosuggestHashtag from './autosuggest_hashtag';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
-import { isRtl } from '../rtl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import Textarea from 'react-textarea-autosize';
 import classNames from 'classnames';
@@ -195,11 +194,6 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
   render () {
     const { value, suggestions, disabled, placeholder, onKeyUp, autoFocus, children } = this.props;
     const { suggestionsHidden } = this.state;
-    const style = { direction: 'ltr' };
-
-    if (isRtl(value)) {
-      style.direction = 'rtl';
-    }
 
     return [
       <div className='compose-form__autosuggest-wrapper' key='autosuggest-wrapper'>
@@ -220,7 +214,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
               onFocus={this.onFocus}
               onBlur={this.onBlur}
               onPaste={this.onPaste}
-              style={style}
+              dir='auto'
               aria-autocomplete='list'
             />
           </label>
diff --git a/app/javascript/mastodon/components/button.js b/app/javascript/mastodon/components/button.js
index eb8dd7dc8eb9c9501c0ce0be83e33f41d5c35c81..85b2d78ca9ee69702320ef7ad58063c915cfae2b 100644
--- a/app/javascript/mastodon/components/button.js
+++ b/app/javascript/mastodon/components/button.js
@@ -10,17 +10,11 @@ export default class Button extends React.PureComponent {
     disabled: PropTypes.bool,
     block: PropTypes.bool,
     secondary: PropTypes.bool,
-    size: PropTypes.number,
     className: PropTypes.string,
     title: PropTypes.string,
-    style: PropTypes.object,
     children: PropTypes.node,
   };
 
-  static defaultProps = {
-    size: 36,
-  };
-
   handleClick = (e) => {
     if (!this.props.disabled) {
       this.props.onClick(e);
@@ -36,13 +30,6 @@ export default class Button extends React.PureComponent {
   }
 
   render () {
-    const style = {
-      padding: `0 ${this.props.size / 2.25}px`,
-      height: `${this.props.size}px`,
-      lineHeight: `${this.props.size}px`,
-      ...this.props.style,
-    };
-
     const className = classNames('button', this.props.className, {
       'button-secondary': this.props.secondary,
       'button--block': this.props.block,
@@ -54,7 +41,6 @@ export default class Button extends React.PureComponent {
         disabled={this.props.disabled}
         onClick={this.handleClick}
         ref={this.setRef}
-        style={style}
         title={this.props.title}
       >
         {this.props.text || this.props.children}
diff --git a/app/javascript/mastodon/components/column.js b/app/javascript/mastodon/components/column.js
index 55e3bfd5e0b4312e4cf8ade94b8a0556971f4810..239824a4fec593385804cc05602376c242bde1ff 100644
--- a/app/javascript/mastodon/components/column.js
+++ b/app/javascript/mastodon/components/column.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import detectPassiveEvents from 'detect-passive-events';
+import { supportsPassiveEvents } from 'detect-passive-events';
 import { scrollTop } from '../scroll';
 
 export default class Column extends React.PureComponent {
@@ -35,9 +35,9 @@ export default class Column extends React.PureComponent {
 
   componentDidMount () {
     if (this.props.bindToDocument) {
-      document.addEventListener('wheel', this.handleWheel,  detectPassiveEvents.hasSupport ? { passive: true } : false);
+      document.addEventListener('wheel', this.handleWheel, supportsPassiveEvents ? { passive: true } : false);
     } else {
-      this.node.addEventListener('wheel', this.handleWheel,  detectPassiveEvents.hasSupport ? { passive: true } : false);
+      this.node.addEventListener('wheel', this.handleWheel, supportsPassiveEvents ? { passive: true } : false);
     }
   }
 
diff --git a/app/javascript/mastodon/components/column_header.js b/app/javascript/mastodon/components/column_header.js
index 1bb583583a35585e105a1547be383a1a9264ee80..236e922969d770f866111de9affa27cf5d560400 100644
--- a/app/javascript/mastodon/components/column_header.js
+++ b/app/javascript/mastodon/components/column_header.js
@@ -34,6 +34,7 @@ class ColumnHeader extends React.PureComponent {
     onMove: PropTypes.func,
     onClick: PropTypes.func,
     appendContent: PropTypes.node,
+    collapseIssues: PropTypes.bool,
   };
 
   state = {
@@ -83,7 +84,7 @@ class ColumnHeader extends React.PureComponent {
   }
 
   render () {
-    const { title, icon, active, children, pinned, multiColumn, extraButton, showBackButton, intl: { formatMessage }, placeholder, appendContent } = this.props;
+    const { title, icon, active, children, pinned, multiColumn, extraButton, showBackButton, intl: { formatMessage }, placeholder, appendContent, collapseIssues } = this.props;
     const { collapsed, animating } = this.state;
 
     const wrapperClassName = classNames('column-header__wrapper', {
@@ -145,7 +146,20 @@ class ColumnHeader extends React.PureComponent {
     }
 
     if (children || (multiColumn && this.props.onPin)) {
-      collapseButton = <button className={collapsibleButtonClassName} title={formatMessage(collapsed ? messages.show : messages.hide)} aria-label={formatMessage(collapsed ? messages.show : messages.hide)} aria-pressed={collapsed ? 'false' : 'true'} onClick={this.handleToggleClick}><Icon id='sliders' /></button>;
+      collapseButton = (
+        <button
+          className={collapsibleButtonClassName}
+          title={formatMessage(collapsed ? messages.show : messages.hide)}
+          aria-label={formatMessage(collapsed ? messages.show : messages.hide)}
+          aria-pressed={collapsed ? 'false' : 'true'}
+          onClick={this.handleToggleClick}
+        >
+          <i className='icon-with-badge'>
+            <Icon id='sliders' />
+            {collapseIssues && <i className='icon-with-badge__issue-badge' />}
+          </i>
+        </button>
+      );
     }
 
     const hasTitle = icon && title;
diff --git a/app/javascript/mastodon/components/dropdown_menu.js b/app/javascript/mastodon/components/dropdown_menu.js
index 4734e0f3fc4a6c09729984e3bd0af272ce58c527..c6b4b118736ed9420dce19b649257c0a99494e88 100644
--- a/app/javascript/mastodon/components/dropdown_menu.js
+++ b/app/javascript/mastodon/components/dropdown_menu.js
@@ -5,9 +5,9 @@ import IconButton from './icon_button';
 import Overlay from 'react-overlays/lib/Overlay';
 import Motion from '../features/ui/util/optional_motion';
 import spring from 'react-motion/lib/spring';
-import detectPassiveEvents from 'detect-passive-events';
+import { supportsPassiveEvents } from 'detect-passive-events';
 
-const listenerOptions = detectPassiveEvents.hasSupport ? { passive: true } : false;
+const listenerOptions = supportsPassiveEvents ? { passive: true } : false;
 let id = 0;
 
 class DropdownMenu extends React.PureComponent {
@@ -205,7 +205,7 @@ export default class Dropdown extends React.PureComponent {
 
   handleClose = () => {
     if (this.activeElement) {
-      this.activeElement.focus();
+      this.activeElement.focus({ preventScroll: true });
       this.activeElement = null;
     }
     this.props.onClose(this.state.id);
diff --git a/app/javascript/mastodon/components/error_boundary.js b/app/javascript/mastodon/components/error_boundary.js
index ca3012276bc4b0f664662539e8f122dd98ae9ba7..ca4a2cfe14bed1d06b704db422bce6783929c444 100644
--- a/app/javascript/mastodon/components/error_boundary.js
+++ b/app/javascript/mastodon/components/error_boundary.js
@@ -66,17 +66,31 @@ export default class ErrorBoundary extends React.PureComponent {
   }
 
   render() {
-    const { hasError, copied } = this.state;
+    const { hasError, copied, errorMessage } = this.state;
 
     if (!hasError) {
       return this.props.children;
     }
 
+    const likelyBrowserAddonIssue = errorMessage && errorMessage.includes('NotFoundError');
+
     return (
       <div className='error-boundary'>
         <div>
-          <p className='error-boundary__error'><FormattedMessage id='error.unexpected_crash.explanation' defaultMessage='Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.' /></p>
-          <p><FormattedMessage id='error.unexpected_crash.next_steps' defaultMessage='Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.' /></p>
+          <p className='error-boundary__error'>
+            { likelyBrowserAddonIssue ? (
+              <FormattedMessage id='error.unexpected_crash.explanation_addons' defaultMessage='This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.' />
+            ) : (
+              <FormattedMessage id='error.unexpected_crash.explanation' defaultMessage='Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.' />
+            )}
+          </p>
+          <p>
+            { likelyBrowserAddonIssue ? (
+              <FormattedMessage id='error.unexpected_crash.next_steps_addons' defaultMessage='Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.' />
+            ) : (
+              <FormattedMessage id='error.unexpected_crash.next_steps' defaultMessage='Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.' />
+            )}
+          </p>
           <p className='error-boundary__footer'>Mastodon v{version} Â· <a href={source_url} rel='noopener noreferrer' target='_blank'><FormattedMessage id='errors.unexpected_crash.report_issue' defaultMessage='Report issue' /></a> Â· <button onClick={this.handleCopyStackTrace} className={copied ? 'copied' : ''}><FormattedMessage id='errors.unexpected_crash.copy_stacktrace' defaultMessage='Copy stacktrace to clipboard' /></button></p>
         </div>
       </div>
diff --git a/app/javascript/mastodon/components/gifv.js b/app/javascript/mastodon/components/gifv.js
index 83cfae49c494d752759db8b969d5b4ef2b4c3889..b775e52005b417f9f1b3f09edd94a77be2c3878b 100644
--- a/app/javascript/mastodon/components/gifv.js
+++ b/app/javascript/mastodon/components/gifv.js
@@ -54,8 +54,6 @@ export default class GIFV extends React.PureComponent {
 
         <video
           src={src}
-          width={width}
-          height={height}
           role='button'
           tabIndex='0'
           aria-label={alt}
diff --git a/app/javascript/mastodon/components/icon_button.js b/app/javascript/mastodon/components/icon_button.js
index fd715bc3c83ac83fadc5fb9de2fee1b74fdff3d5..7ec39198a4cb4854de7a473af79e599a735e37c3 100644
--- a/app/javascript/mastodon/components/icon_button.js
+++ b/app/javascript/mastodon/components/icon_button.js
@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import Icon from 'mastodon/components/icon';
+import AnimatedNumber from 'mastodon/components/animated_number';
 
 export default class IconButton extends React.PureComponent {
 
@@ -24,6 +25,8 @@ export default class IconButton extends React.PureComponent {
     animate: PropTypes.bool,
     overlay: PropTypes.bool,
     tabIndex: PropTypes.string,
+    counter: PropTypes.number,
+    obfuscateCount: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -97,6 +100,8 @@ export default class IconButton extends React.PureComponent {
       pressed,
       tabIndex,
       title,
+      counter,
+      obfuscateCount,
     } = this.props;
 
     const {
@@ -111,8 +116,13 @@ export default class IconButton extends React.PureComponent {
       activate,
       deactivate,
       overlayed: overlay,
+      'icon-button--with-counter': typeof counter !== 'undefined',
     });
 
+    if (typeof counter !== 'undefined') {
+      style.width = 'auto';
+    }
+
     return (
       <button
         aria-label={title}
@@ -128,7 +138,7 @@ export default class IconButton extends React.PureComponent {
         tabIndex={tabIndex}
         disabled={disabled}
       >
-        <Icon id={icon} fixedWidth aria-hidden='true' />
+        <Icon id={icon} fixedWidth aria-hidden='true' /> {typeof counter !== 'undefined' && <span className='icon-button__counter'><AnimatedNumber value={counter} obfuscate={obfuscateCount} /></span>}
       </button>
     );
   }
diff --git a/app/javascript/mastodon/components/icon_with_badge.js b/app/javascript/mastodon/components/icon_with_badge.js
index 7851eb4be99704f66379ef6084668e17ee5b0d8c..4214eccfde9405c38ac9a6fb1ae65214f7b2866d 100644
--- a/app/javascript/mastodon/components/icon_with_badge.js
+++ b/app/javascript/mastodon/components/icon_with_badge.js
@@ -4,16 +4,18 @@ import Icon from 'mastodon/components/icon';
 
 const formatNumber = num => num > 40 ? '40+' : num;
 
-const IconWithBadge = ({ id, count, className }) => (
+const IconWithBadge = ({ id, count, issueBadge, className }) => (
   <i className='icon-with-badge'>
     <Icon id={id} fixedWidth className={className} />
     {count > 0 && <i className='icon-with-badge__badge'>{formatNumber(count)}</i>}
+    {issueBadge && <i className='icon-with-badge__issue-badge' />}
   </i>
 );
 
 IconWithBadge.propTypes = {
   id: PropTypes.string.isRequired,
   count: PropTypes.number.isRequired,
+  issueBadge: PropTypes.bool,
   className: PropTypes.string,
 };
 
diff --git a/app/javascript/mastodon/components/intersection_observer_article.js b/app/javascript/mastodon/components/intersection_observer_article.js
index 124b34b02f9eca53e8986073a2683de8a463efde..2d87f19b53525b6f602d7d19db7013c32db328a1 100644
--- a/app/javascript/mastodon/components/intersection_observer_article.js
+++ b/app/javascript/mastodon/components/intersection_observer_article.js
@@ -2,10 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import scheduleIdleTask from '../features/ui/util/schedule_idle_task';
 import getRectFromEntry from '../features/ui/util/get_rect_from_entry';
-import { is } from 'immutable';
 
-// Diff these props in the "rendered" state
-const updateOnPropsForRendered = ['id', 'index', 'listLength'];
 // Diff these props in the "unrendered" state
 const updateOnPropsForUnrendered = ['id', 'index', 'listLength', 'cachedHeight'];
 
@@ -33,9 +30,12 @@ export default class IntersectionObserverArticle extends React.Component {
       // If we're going from rendered to unrendered (or vice versa) then update
       return true;
     }
-    // Otherwise, diff based on props
-    const propsToDiff = isUnrendered ? updateOnPropsForUnrendered : updateOnPropsForRendered;
-    return !propsToDiff.every(prop => is(nextProps[prop], this.props[prop]));
+    // If we are and remain hidden, diff based on props
+    if (isUnrendered) {
+      return !updateOnPropsForUnrendered.every(prop => nextProps[prop] === this.props[prop]);
+    }
+    // Else, assume the children have changed
+    return true;
   }
 
   componentDidMount () {
diff --git a/app/javascript/mastodon/components/modal_root.js b/app/javascript/mastodon/components/modal_root.js
index 6297b5e2938f694d2d9e4b65c947d52f909792e1..26344528ea79c4f8151d92e7c0fc91de824d0e72 100644
--- a/app/javascript/mastodon/components/modal_root.js
+++ b/app/javascript/mastodon/components/modal_root.js
@@ -1,19 +1,21 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import 'wicg-inert';
+import { multiply } from 'color-blend';
 
 export default class ModalRoot extends React.PureComponent {
 
   static propTypes = {
     children: PropTypes.node,
     onClose: PropTypes.func.isRequired,
+    backgroundColor: PropTypes.shape({
+      r: PropTypes.number,
+      g: PropTypes.number,
+      b: PropTypes.number,
+    }),
   };
 
-  state = {
-    revealed: !!this.props.children,
-  };
-
-  activeElement = this.state.revealed ? document.activeElement : null;
+  activeElement = this.props.children ? document.activeElement : null;
 
   handleKeyUp = (e) => {
     if ((e.key === 'Escape' || e.key === 'Esc' || e.keyCode === 27)
@@ -53,8 +55,6 @@ export default class ModalRoot extends React.PureComponent {
       this.activeElement = document.activeElement;
 
       this.getSiblings().forEach(sibling => sibling.setAttribute('inert', true));
-    } else if (!nextProps.children) {
-      this.setState({ revealed: false });
     }
   }
 
@@ -68,14 +68,7 @@ export default class ModalRoot extends React.PureComponent {
       Promise.resolve().then(() => {
         this.activeElement.focus({ preventScroll: true });
         this.activeElement = null;
-      }).catch((error) => {
-        console.error(error);
-      });
-    }
-    if (this.props.children) {
-      requestAnimationFrame(() => {
-        this.setState({ revealed: true });
-      });
+      }).catch(console.error);
     }
   }
 
@@ -94,7 +87,6 @@ export default class ModalRoot extends React.PureComponent {
 
   render () {
     const { children, onClose } = this.props;
-    const { revealed } = this.state;
     const visible = !!children;
 
     if (!visible) {
@@ -103,10 +95,16 @@ export default class ModalRoot extends React.PureComponent {
       );
     }
 
+    let backgroundColor = null;
+
+    if (this.props.backgroundColor) {
+      backgroundColor = multiply({ ...this.props.backgroundColor, a: 1 }, { r: 0, g: 0, b: 0, a: 0.7 });
+    }
+
     return (
-      <div className='modal-root' ref={this.setRef} style={{ opacity: revealed ? 1 : 0 }}>
+      <div className='modal-root' ref={this.setRef}>
         <div style={{ pointerEvents: visible ? 'auto' : 'none' }}>
-          <div role='presentation' className='modal-root__overlay' onClick={onClose} />
+          <div role='presentation' className='modal-root__overlay' onClick={onClose} style={{ backgroundColor: backgroundColor ? `rgba(${backgroundColor.r}, ${backgroundColor.g}, ${backgroundColor.b}, 0.7)` : null }} />
           <div role='dialog' className='modal-root__container'>{children}</div>
         </div>
       </div>
diff --git a/app/javascript/mastodon/components/picture_in_picture_placeholder.js b/app/javascript/mastodon/components/picture_in_picture_placeholder.js
new file mode 100644
index 0000000000000000000000000000000000000000..19d15c18b16e379250a7193a7f04f2b0b444d2cf
--- /dev/null
+++ b/app/javascript/mastodon/components/picture_in_picture_placeholder.js
@@ -0,0 +1,69 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Icon from 'mastodon/components/icon';
+import { removePictureInPicture } from 'mastodon/actions/picture_in_picture';
+import { connect } from 'react-redux';
+import { debounce } from 'lodash';
+import { FormattedMessage } from 'react-intl';
+
+export default @connect()
+class PictureInPicturePlaceholder extends React.PureComponent {
+
+  static propTypes = {
+    width: PropTypes.number,
+    dispatch: PropTypes.func.isRequired,
+  };
+
+  state = {
+    width: this.props.width,
+    height: this.props.width && (this.props.width / (16/9)),
+  };
+
+  handleClick = () => {
+    const { dispatch } = this.props;
+    dispatch(removePictureInPicture());
+  }
+
+  setRef = c => {
+    this.node = c;
+
+    if (this.node) {
+      this._setDimensions();
+    }
+  }
+
+  _setDimensions () {
+    const width  = this.node.offsetWidth;
+    const height = width / (16/9);
+
+    this.setState({ width, height });
+  }
+
+  componentDidMount () {
+    window.addEventListener('resize', this.handleResize, { passive: true });
+  }
+
+  componentWillUnmount () {
+    window.removeEventListener('resize', this.handleResize);
+  }
+
+  handleResize = debounce(() => {
+    if (this.node) {
+      this._setDimensions();
+    }
+  }, 250, {
+    trailing: true,
+  });
+
+  render () {
+    const { height } = this.state;
+
+    return (
+      <div ref={this.setRef} className='picture-in-picture-placeholder' style={{ height }} role='button' tabIndex='0' onClick={this.handleClick}>
+        <Icon id='window-restore' />
+        <FormattedMessage id='picture_in_picture.restore' defaultMessage='Put it back' />
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 174e401b7250c6f40b7b3f4c2a2266f6a48278e5..295e83f5819607cf5ada9250c30741d2e9fdb9b8 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -17,6 +17,7 @@ import { HotKeys } from 'react-hotkeys';
 import classNames from 'classnames';
 import Icon from 'mastodon/components/icon';
 import { displayMedia } from '../initial_state';
+import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
 
 // We use the component (and not the container) since we do not want
 // to use the progress bar to show download progress
@@ -95,6 +96,11 @@ class Status extends ImmutablePureComponent {
     cacheMediaWidth: PropTypes.func,
     cachedMediaWidth: PropTypes.number,
     scrollKey: PropTypes.string,
+    deployPictureInPicture: PropTypes.func,
+    pictureInPicture: ImmutablePropTypes.contains({
+      inUse: PropTypes.bool,
+      available: PropTypes.bool,
+    }),
   };
 
   // Avoid checking props that are functions (and whose equality will always
@@ -104,6 +110,8 @@ class Status extends ImmutablePureComponent {
     'account',
     'muted',
     'hidden',
+    'unread',
+    'pictureInPicture',
   ];
 
   state = {
@@ -184,8 +192,13 @@ class Status extends ImmutablePureComponent {
     return <div className='audio-player' style={{ height: '110px' }} />;
   }
 
-  handleOpenVideo = (media, options) => {
-    this.props.onOpenVideo(media, options);
+  handleOpenVideo = (options) => {
+    const status = this._properStatus();
+    this.props.onOpenVideo(status.get('id'), status.getIn(['media_attachments', 0]), options);
+  }
+
+  handleOpenMedia = (media, index) => {
+    this.props.onOpenMedia(this._properStatus().get('id'), media, index);
   }
 
   handleHotkeyOpenMedia = e => {
@@ -195,16 +208,21 @@ class Status extends ImmutablePureComponent {
     e.preventDefault();
 
     if (status.get('media_attachments').size > 0) {
-      if (status.getIn(['media_attachments', 0, 'type']) === 'audio') {
-        // TODO: toggle play/paused?
-      } else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
-        onOpenVideo(status.getIn(['media_attachments', 0]), { startTime: 0 });
+      if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
+        onOpenVideo(status.get('id'), status.getIn(['media_attachments', 0]), { startTime: 0 });
       } else {
-        onOpenMedia(status.get('media_attachments'), 0);
+        onOpenMedia(status.get('id'), status.get('media_attachments'), 0);
       }
     }
   }
 
+  handleDeployPictureInPicture = (type, mediaProps) => {
+    const { deployPictureInPicture } = this.props;
+    const status = this._properStatus();
+
+    deployPictureInPicture(status, type, mediaProps);
+  }
+
   handleHotkeyReply = e => {
     e.preventDefault();
     this.props.onReply(this._properStatus(), this.context.router.history);
@@ -265,7 +283,7 @@ class Status extends ImmutablePureComponent {
     let media = null;
     let statusAvatar, prepend, rebloggedByText;
 
-    const { intl, hidden, featured, otherAccounts, unread, showThread, scrollKey } = this.props;
+    const { intl, hidden, featured, otherAccounts, unread, showThread, scrollKey, pictureInPicture } = this.props;
 
     let { status, account, ...other } = this.props;
 
@@ -336,7 +354,9 @@ class Status extends ImmutablePureComponent {
       status  = status.get('reblog');
     }
 
-    if (status.get('media_attachments').size > 0) {
+    if (pictureInPicture.get('inUse')) {
+      media = <PictureInPicturePlaceholder width={this.props.cachedMediaWidth} />;
+    } else if (status.get('media_attachments').size > 0) {
       if (this.props.muted) {
         media = (
           <AttachmentList
@@ -361,6 +381,7 @@ class Status extends ImmutablePureComponent {
                 width={this.props.cachedMediaWidth}
                 height={110}
                 cacheWidth={this.props.cacheMediaWidth}
+                deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
               />
             )}
           </Bundle>
@@ -373,6 +394,7 @@ class Status extends ImmutablePureComponent {
             {Component => (
               <Component
                 preview={attachment.get('preview_url')}
+                frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
                 blurhash={attachment.get('blurhash')}
                 src={attachment.get('url')}
                 alt={attachment.get('description')}
@@ -382,6 +404,7 @@ class Status extends ImmutablePureComponent {
                 sensitive={status.get('sensitive')}
                 onOpenVideo={this.handleOpenVideo}
                 cacheWidth={this.props.cacheMediaWidth}
+                deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
                 visible={this.state.showMedia}
                 onToggleVisibility={this.handleToggleMediaVisibility}
               />
@@ -396,7 +419,7 @@ class Status extends ImmutablePureComponent {
                 media={status.get('media_attachments')}
                 sensitive={status.get('sensitive')}
                 height={110}
-                onOpenMedia={this.props.onOpenMedia}
+                onOpenMedia={this.handleOpenMedia}
                 cacheWidth={this.props.cacheMediaWidth}
                 defaultWidth={this.props.cachedMediaWidth}
                 visible={this.state.showMedia}
@@ -409,7 +432,7 @@ class Status extends ImmutablePureComponent {
     } else if (status.get('spoiler_text').length === 0 && status.get('card')) {
       media = (
         <Card
-          onOpenMedia={this.props.onOpenMedia}
+          onOpenMedia={this.handleOpenMedia}
           card={status.get('card')}
           compact
           cacheWidth={this.props.cacheMediaWidth}
@@ -438,14 +461,16 @@ class Status extends ImmutablePureComponent {
 
     return (
       <HotKeys handlers={handlers}>
-        <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), read: unread === false, focusable: !this.props.muted })} tabIndex={this.props.muted ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText)} ref={this.handleRef}>
+        <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), unread, focusable: !this.props.muted })} tabIndex={this.props.muted ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText)} ref={this.handleRef}>
           {prepend}
 
-          <div className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), muted: this.props.muted, read: unread === false })} data-id={status.get('id')}>
+          <div className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), muted: this.props.muted })} data-id={status.get('id')}>
             <div className='status__expand' onClick={this.handleExpandClick} role='presentation' />
             <div className='status__info'>
-              <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'><RelativeTimestamp timestamp={status.get('created_at')} /></a>
-              <span className='status__visibility-icon'><Icon id={visibilityIcon.icon} title={visibilityIcon.text} /></span>
+              <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
+                <span className='status__visibility-icon'><Icon id={visibilityIcon.icon} title={visibilityIcon.text} /></span>
+                <RelativeTimestamp timestamp={status.get('created_at')} />
+              </a>
 
               <a onClick={this.handleAccountClick} data-id={status.getIn(['account', 'id'])} href={status.getIn(['account', 'url'])} title={status.getIn(['account', 'acct'])} className='status__display-name' target='_blank' rel='noopener noreferrer'>
                 <div className='status__avatar'>
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 231c517e9880f621fd087357b4c9f169937827a2..66b5a17ac22c70c77a082ce275278f08f3121452 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -7,6 +7,7 @@ import DropdownMenuContainer from '../containers/dropdown_menu_container';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { me, isStaff } from '../initial_state';
+import classNames from 'classnames';
 
 const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
@@ -20,7 +21,7 @@ const messages = defineMessages({
   more: { id: 'status.more', defaultMessage: 'More' },
   replyAll: { id: 'status.replyAll', defaultMessage: 'Reply to thread' },
   reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
-  reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost to original audience' },
+  reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
@@ -42,16 +43,6 @@ const messages = defineMessages({
   unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
 });
 
-const obfuscatedCount = count => {
-  if (count < 0) {
-    return 0;
-  } else if (count <= 1) {
-    return count;
-  } else {
-    return '1+';
-  }
-};
-
 const mapStateToProps = (state, { status }) => ({
   relationship: state.getIn(['relationships', status.getIn(['account', 'id'])]),
 });
@@ -328,9 +319,10 @@ class StatusActionBar extends ImmutablePureComponent {
 
     return (
       <div className='status__action-bar'>
-        <div className='status__action-bar__counter'><IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /><span className='status__action-bar__counter__label' >{obfuscatedCount(status.get('replies_count'))}</span></div>
-        <IconButton className='status__action-bar-button' disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} />
+        <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
+        <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} />
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
+
         {shareButton}
 
         <div className='status__action-bar-dropdown'>
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 3200f2d82f6d7f81043b4ae38994fd7d94ecf4f4..185a2a663f9875f2c856016b1be1328decf45a50 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
-import { isRtl } from '../rtl';
 import { FormattedMessage } from 'react-intl';
 import Permalink from './permalink';
 import classnames from 'classnames';
@@ -186,17 +185,12 @@ export default class StatusContent extends React.PureComponent {
 
     const content = { __html: status.get('contentHtml') };
     const spoilerContent = { __html: status.get('spoilerHtml') };
-    const directionStyle = { direction: 'ltr' };
     const classNames = classnames('status__content', {
       'status__content--with-action': this.props.onClick && this.context.router,
       'status__content--with-spoiler': status.get('spoiler_text').length > 0,
       'status__content--collapsed': renderReadMore,
     });
 
-    if (isRtl(status.get('search_index'))) {
-      directionStyle.direction = 'rtl';
-    }
-
     const showThreadButton = (
       <button className='status__content__read-more-button' onClick={this.props.onClick}>
         <FormattedMessage id='status.show_thread' defaultMessage='Show thread' />
@@ -225,7 +219,7 @@ export default class StatusContent extends React.PureComponent {
       }
 
       return (
-        <div className={classNames} ref={this.setRef} tabIndex='0' style={directionStyle} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
+        <div className={classNames} ref={this.setRef} tabIndex='0' onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
           <p style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}>
             <span dangerouslySetInnerHTML={spoilerContent} />
             {' '}
@@ -234,7 +228,7 @@ export default class StatusContent extends React.PureComponent {
 
           {mentionsPlaceholder}
 
-          <div tabIndex={!hidden ? 0 : null} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''}`} style={directionStyle} dangerouslySetInnerHTML={content} />
+          <div tabIndex={!hidden ? 0 : null} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''}`} dangerouslySetInnerHTML={content} />
 
           {!hidden && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
 
@@ -243,8 +237,8 @@ export default class StatusContent extends React.PureComponent {
       );
     } else if (this.props.onClick) {
       const output = [
-        <div className={classNames} ref={this.setRef} tabIndex='0' style={directionStyle} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} key='status-content'>
-          <div className='status__content__text status__content__text--visible' style={directionStyle} dangerouslySetInnerHTML={content} />
+        <div className={classNames} ref={this.setRef} tabIndex='0' onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} key='status-content'>
+          <div className='status__content__text status__content__text--visible' dangerouslySetInnerHTML={content} />
 
           {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
 
@@ -259,8 +253,8 @@ export default class StatusContent extends React.PureComponent {
       return output;
     } else {
       return (
-        <div className={classNames} ref={this.setRef} tabIndex='0' style={directionStyle}>
-          <div className='status__content__text status__content__text--visible' style={directionStyle} dangerouslySetInnerHTML={content} />
+        <div className={classNames} ref={this.setRef} tabIndex='0'>
+          <div className='status__content__text status__content__text--visible' dangerouslySetInnerHTML={content} />
 
           {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
 
diff --git a/app/javascript/mastodon/containers/media_container.js b/app/javascript/mastodon/containers/media_container.js
index ba55ecbc7ba8f42227066f48e74685c1e60915f4..52fdc9294b89c16a16210ee9b390dbba5f6dfb24 100644
--- a/app/javascript/mastodon/containers/media_container.js
+++ b/app/javascript/mastodon/containers/media_container.js
@@ -2,7 +2,7 @@ import React, { PureComponent, Fragment } from 'react';
 import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import { IntlProvider, addLocaleData } from 'react-intl';
-import { List as ImmutableList, fromJS } from 'immutable';
+import { fromJS } from 'immutable';
 import { getLocale } from 'mastodon/locales';
 import { getScrollbarWidth } from 'mastodon/utils/scrollbar';
 import MediaGallery from 'mastodon/components/media_gallery';
@@ -30,6 +30,8 @@ export default class MediaContainer extends PureComponent {
     media: null,
     index: null,
     time: null,
+    backgroundColor: null,
+    options: null,
   };
 
   handleOpenMedia = (media, index) => {
@@ -39,20 +41,32 @@ export default class MediaContainer extends PureComponent {
     this.setState({ media, index });
   }
 
-  handleOpenVideo = (video, time) => {
-    const media = ImmutableList([video]);
+  handleOpenVideo = (options) => {
+    const { components } = this.props;
+    const { media } = JSON.parse(components[options.componetIndex].getAttribute('data-props'));
+    const mediaList = fromJS(media);
 
     document.body.classList.add('with-modals--active');
     document.documentElement.style.marginRight = `${getScrollbarWidth()}px`;
 
-    this.setState({ media, time });
+    this.setState({ media: mediaList, options });
   }
 
   handleCloseMedia = () => {
     document.body.classList.remove('with-modals--active');
     document.documentElement.style.marginRight = 0;
 
-    this.setState({ media: null, index: null, time: null });
+    this.setState({
+      media: null,
+      index: null,
+      time: null,
+      backgroundColor: null,
+      options: null,
+    });
+  }
+
+  setBackgroundColor = color => {
+    this.setState({ backgroundColor: color });
   }
 
   render () {
@@ -73,6 +87,7 @@ export default class MediaContainer extends PureComponent {
               ...(hashtag ? { hashtag: fromJS(hashtag) } : {}),
 
               ...(componentName === 'Video' ? {
+                componetIndex: i,
                 onOpenVideo: this.handleOpenVideo,
               } : {
                 onOpenMedia: this.handleOpenMedia,
@@ -85,13 +100,16 @@ export default class MediaContainer extends PureComponent {
             );
           })}
 
-          <ModalRoot onClose={this.handleCloseMedia}>
+          <ModalRoot backgroundColor={this.state.backgroundColor} onClose={this.handleCloseMedia}>
             {this.state.media && (
               <MediaModal
                 media={this.state.media}
                 index={this.state.index || 0}
-                time={this.state.time}
+                currentTime={this.state.options?.startTime}
+                autoPlay={this.state.options?.autoPlay}
+                volume={this.state.options?.defaultVolume}
                 onClose={this.handleCloseMedia}
+                onChangeBackgroundColor={this.setBackgroundColor}
               />
             )}
           </ModalRoot>
diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js
index decf7279f9a8553e57c574d731f89564fab86165..d6bcb897349a8202ae914fbf404ebe13e2dd9342 100644
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import Status from '../components/status';
-import { makeGetStatus } from '../selectors';
+import { makeGetStatus, makeGetPictureInPicture } from '../selectors';
 import {
   replyCompose,
   mentionCompose,
@@ -37,6 +37,7 @@ import { initMuteModal } from '../actions/mutes';
 import { initBlockModal } from '../actions/blocks';
 import { initReport } from '../actions/reports';
 import { openModal } from '../actions/modal';
+import { deployPictureInPicture } from '../actions/picture_in_picture';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import { boostModal, deleteModal } from '../initial_state';
 import { showAlertForError } from '../actions/alerts';
@@ -53,9 +54,11 @@ const messages = defineMessages({
 
 const makeMapStateToProps = () => {
   const getStatus = makeGetStatus();
+  const getPictureInPicture = makeGetPictureInPicture();
 
   const mapStateToProps = (state, props) => ({
     status: getStatus(state, props),
+    pictureInPicture: getPictureInPicture(state, props),
   });
 
   return mapStateToProps;
@@ -146,12 +149,12 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(mentionCompose(account, router));
   },
 
-  onOpenMedia (media, index) {
-    dispatch(openModal('MEDIA', { media, index }));
+  onOpenMedia (statusId, media, index) {
+    dispatch(openModal('MEDIA', { statusId, media, index }));
   },
 
-  onOpenVideo (media, options) {
-    dispatch(openModal('VIDEO', { media, options }));
+  onOpenVideo (statusId, media, options) {
+    dispatch(openModal('VIDEO', { statusId, media, options }));
   },
 
   onBlock (status) {
@@ -207,6 +210,10 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(unblockDomain(domain));
   },
 
+  deployPictureInPicture (status, type, mediaProps) {
+    dispatch(deployPictureInPicture(status.get('id'), status.getIn(['account', 'id']), type, mediaProps));
+  },
+
 });
 
 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Status));
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js
index 9613b0b9edcc46fba73818c684d4d742f1478662..b47ebed62e1327b4f832fcd41b508171ae79c92f 100644
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@@ -7,6 +7,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { autoPlayGif, me, isStaff } from 'mastodon/initial_state';
 import classNames from 'classnames';
 import Icon from 'mastodon/components/icon';
+import IconButton from 'mastodon/components/icon_button';
 import Avatar from 'mastodon/components/avatar';
 import { counterRenderer } from 'mastodon/components/common_counter';
 import ShortNumber from 'mastodon/components/short_number';
@@ -35,6 +36,8 @@ const messages = defineMessages({
   unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
   hideReblogs: { id: 'account.hide_reblogs', defaultMessage: 'Hide boosts from @{name}' },
   showReblogs: { id: 'account.show_reblogs', defaultMessage: 'Show boosts from @{name}' },
+  enableNotifications: { id: 'account.enable_notifications', defaultMessage: 'Notify me when @{name} posts' },
+  disableNotifications: { id: 'account.disable_notifications', defaultMessage: 'Stop notifying me when @{name} posts' },
   pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
   follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
@@ -66,6 +69,17 @@ class Header extends ImmutablePureComponent {
     identity_props: ImmutablePropTypes.list,
     onFollow: PropTypes.func.isRequired,
     onBlock: PropTypes.func.isRequired,
+    onMention: PropTypes.func.isRequired,
+    onDirect: PropTypes.func.isRequired,
+    onReblogToggle: PropTypes.func.isRequired,
+    onNotifyToggle: PropTypes.func.isRequired,
+    onReport: PropTypes.func.isRequired,
+    onMute: PropTypes.func.isRequired,
+    onBlockDomain: PropTypes.func.isRequired,
+    onUnblockDomain: PropTypes.func.isRequired,
+    onEndorseToggle: PropTypes.func.isRequired,
+    onAddToList: PropTypes.func.isRequired,
+    onEditAccountNote: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
     domain: PropTypes.string.isRequired,
   };
@@ -130,8 +144,11 @@ class Header extends ImmutablePureComponent {
       return null;
     }
 
+    const suspended = account.get('suspended');
+
     let info        = [];
     let actionBtn   = '';
+    let bellBtn     = '';
     let lockedIcon  = '';
     let menu        = [];
 
@@ -147,13 +164,17 @@ class Header extends ImmutablePureComponent {
       info.push(<span key='domain_blocked' className='relationship-tag'><FormattedMessage id='account.domain_blocked' defaultMessage='Domain blocked' /></span>);
     }
 
+    if (account.getIn(['relationship', 'requested']) || account.getIn(['relationship', 'following'])) {
+      bellBtn = <IconButton icon='bell-o' size={24} active={account.getIn(['relationship', 'notifying'])} title={intl.formatMessage(account.getIn(['relationship', 'notifying']) ? messages.disableNotifications : messages.enableNotifications, { name: account.get('username') })} onClick={this.props.onNotifyToggle} />;
+    }
+
     if (me !== account.get('id')) {
       if (!account.get('relationship')) { // Wait until the relationship is loaded
         actionBtn = '';
       } else if (account.getIn(['relationship', 'requested'])) {
-        actionBtn = <Button className='logo-button' text={intl.formatMessage(messages.cancel_follow_request)} title={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} />;
+        actionBtn = <Button className={classNames('logo-button', { 'button--with-bell': bellBtn !== '' })} text={intl.formatMessage(messages.cancel_follow_request)} title={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} />;
       } else if (!account.getIn(['relationship', 'blocking'])) {
-        actionBtn = <Button disabled={account.getIn(['relationship', 'blocked_by'])} className={classNames('logo-button', { 'button--destructive': account.getIn(['relationship', 'following']) })} text={intl.formatMessage(account.getIn(['relationship', 'following']) ? messages.unfollow : messages.follow)} onClick={this.props.onFollow} />;
+        actionBtn = <Button disabled={account.getIn(['relationship', 'blocked_by'])} className={classNames('logo-button', { 'button--destructive': account.getIn(['relationship', 'following']), 'button--with-bell': bellBtn !== '' })} text={intl.formatMessage(account.getIn(['relationship', 'following']) ? messages.unfollow : messages.follow)} onClick={this.props.onFollow} />;
       } else if (account.getIn(['relationship', 'blocking'])) {
         actionBtn = <Button className='logo-button' text={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.props.onBlock} />;
       }
@@ -258,7 +279,7 @@ class Header extends ImmutablePureComponent {
       <div className={classNames('account__header', { inactive: !!account.get('moved') })} ref={this.setRef}>
         <div className='account__header__image'>
           <div className='account__header__info'>
-            {info}
+            {!suspended && info}
           </div>
 
           <img src={autoPlayGif ? account.get('header') : account.get('header_static')} alt='' className='parallax' />
@@ -272,11 +293,14 @@ class Header extends ImmutablePureComponent {
 
             <div className='spacer' />
 
-            <div className='account__header__tabs__buttons'>
-              {actionBtn}
+            {!suspended && (
+              <div className='account__header__tabs__buttons'>
+                {actionBtn}
+                {bellBtn}
 
-              <DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' />
-            </div>
+                <DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' />
+              </div>
+            )}
           </div>
 
           <div className='account__header__tabs__name'>
@@ -288,7 +312,7 @@ class Header extends ImmutablePureComponent {
 
           <div className='account__header__extra'>
             <div className='account__header__bio'>
-              { (fields.size > 0 || identity_proofs.size > 0) && (
+              {(fields.size > 0 || identity_proofs.size > 0) && (
                 <div className='account__header__fields'>
                   {identity_proofs.map((proof, i) => (
                     <dl key={i}>
@@ -314,33 +338,35 @@ class Header extends ImmutablePureComponent {
                 </div>
               )}
 
-              {account.get('id') !== me && <AccountNoteContainer account={account} />}
+              {account.get('id') !== me && !suspended && <AccountNoteContainer account={account} />}
 
               {account.get('note').length > 0 && account.get('note') !== '<p></p>' && <div className='account__header__content' dangerouslySetInnerHTML={content} />}
             </div>
 
-            <div className='account__header__extra__links'>
-              <NavLink isActive={this.isStatusesPageActive} activeClassName='active' to={`/accounts/${account.get('id')}`} title={intl.formatNumber(account.get('statuses_count'))}>
-                <ShortNumber
-                  value={account.get('statuses_count')}
-                  renderer={counterRenderer('statuses')}
-                />
-              </NavLink>
-
-              <NavLink exact activeClassName='active' to={`/accounts/${account.get('id')}/following`} title={intl.formatNumber(account.get('following_count'))}>
-                <ShortNumber
-                  value={account.get('following_count')}
-                  renderer={counterRenderer('following')}
-                />
-              </NavLink>
-
-              <NavLink exact activeClassName='active' to={`/accounts/${account.get('id')}/followers`} title={intl.formatNumber(account.get('followers_count'))}>
-                <ShortNumber
-                  value={account.get('followers_count')}
-                  renderer={counterRenderer('followers')}
-                />
-              </NavLink>
-            </div>
+            {!suspended && (
+              <div className='account__header__extra__links'>
+                <NavLink isActive={this.isStatusesPageActive} activeClassName='active' to={`/accounts/${account.get('id')}`} title={intl.formatNumber(account.get('statuses_count'))}>
+                  <ShortNumber
+                    value={account.get('statuses_count')}
+                    renderer={counterRenderer('statuses')}
+                  />
+                </NavLink>
+
+                <NavLink exact activeClassName='active' to={`/accounts/${account.get('id')}/following`} title={intl.formatNumber(account.get('following_count'))}>
+                  <ShortNumber
+                    value={account.get('following_count')}
+                    renderer={counterRenderer('following')}
+                  />
+                </NavLink>
+
+                <NavLink exact activeClassName='active' to={`/accounts/${account.get('id')}/followers`} title={intl.formatNumber(account.get('followers_count'))}>
+                  <ShortNumber
+                    value={account.get('followers_count')}
+                    renderer={counterRenderer('followers')}
+                  />
+                </NavLink>
+              </div>
+            )}
           </div>
         </div>
       </div>
diff --git a/app/javascript/mastodon/features/account_gallery/components/media_item.js b/app/javascript/mastodon/features/account_gallery/components/media_item.js
index c9a7af7f77929f611dcf4288d4a506c016594a7c..ba7ec46a3307c313658c09e117babe10f8da922f 100644
--- a/app/javascript/mastodon/features/account_gallery/components/media_item.js
+++ b/app/javascript/mastodon/features/account_gallery/components/media_item.js
@@ -122,7 +122,7 @@ export default class MediaItem extends ImmutablePureComponent {
         <div className='media-gallery__gifv'>
           {content}
 
-          <span className='media-gallery__gifv__label'>{label}</span>
+          {label && <span className='media-gallery__gifv__label'>{label}</span>}
         </div>
       );
     }
diff --git a/app/javascript/mastodon/features/account_gallery/index.js b/app/javascript/mastodon/features/account_gallery/index.js
index fc5aead4868fabbaab9b7176dc39cb1d69c9f16a..015a6a6d7067dc700d35d8928bf9c30f7ad0caad 100644
--- a/app/javascript/mastodon/features/account_gallery/index.js
+++ b/app/javascript/mastodon/features/account_gallery/index.js
@@ -15,12 +15,15 @@ import { ScrollContainer } from 'react-router-scroll-4';
 import LoadMore from 'mastodon/components/load_more';
 import MissingIndicator from 'mastodon/components/missing_indicator';
 import { openModal } from 'mastodon/actions/modal';
+import { FormattedMessage } from 'react-intl';
 
 const mapStateToProps = (state, props) => ({
   isAccount: !!state.getIn(['accounts', props.params.accountId]),
   attachments: getAccountGallery(state, props.params.accountId),
   isLoading: state.getIn(['timelines', `account:${props.params.accountId}:media`, 'isLoading']),
   hasMore: state.getIn(['timelines', `account:${props.params.accountId}:media`, 'hasMore']),
+  suspended: state.getIn(['accounts', props.params.accountId, 'suspended'], false),
+  blockedBy: state.getIn(['relationships', props.params.accountId, 'blocked_by'], false),
 });
 
 class LoadMoreMedia extends ImmutablePureComponent {
@@ -56,6 +59,8 @@ class AccountGallery extends ImmutablePureComponent {
     isLoading: PropTypes.bool,
     hasMore: PropTypes.bool,
     isAccount: PropTypes.bool,
+    blockedBy: PropTypes.bool,
+    suspended: PropTypes.bool,
     multiColumn: PropTypes.bool,
   };
 
@@ -100,15 +105,18 @@ class AccountGallery extends ImmutablePureComponent {
   }
 
   handleOpenMedia = attachment => {
+    const { dispatch } = this.props;
+    const statusId = attachment.getIn(['status', 'id']);
+
     if (attachment.get('type') === 'video') {
-      this.props.dispatch(openModal('VIDEO', { media: attachment, status: attachment.get('status'), options: { autoPlay: true } }));
+      dispatch(openModal('VIDEO', { media: attachment, statusId, options: { autoPlay: true } }));
     } else if (attachment.get('type') === 'audio') {
-      this.props.dispatch(openModal('AUDIO', { media: attachment, status: attachment.get('status'), options: { autoPlay: true } }));
+      dispatch(openModal('AUDIO', { media: attachment, statusId, options: { autoPlay: true } }));
     } else {
       const media = attachment.getIn(['status', 'media_attachments']);
       const index = media.findIndex(x => x.get('id') === attachment.get('id'));
 
-      this.props.dispatch(openModal('MEDIA', { media, index, status: attachment.get('status') }));
+      dispatch(openModal('MEDIA', { media, index, statusId }));
     }
   }
 
@@ -119,7 +127,7 @@ class AccountGallery extends ImmutablePureComponent {
   }
 
   render () {
-    const { attachments, shouldUpdateScroll, isLoading, hasMore, isAccount, multiColumn } = this.props;
+    const { attachments, shouldUpdateScroll, isLoading, hasMore, isAccount, multiColumn, blockedBy, suspended } = this.props;
     const { width } = this.state;
 
     if (!isAccount) {
@@ -144,6 +152,14 @@ class AccountGallery extends ImmutablePureComponent {
       loadOlder = <LoadMore visible={!isLoading} onClick={this.handleLoadOlder} />;
     }
 
+    let emptyMessage;
+
+    if (suspended) {
+      emptyMessage = <FormattedMessage id='empty_column.account_suspended' defaultMessage='Account suspended' />;
+    } else if (blockedBy) {
+      emptyMessage = <FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' />;
+    }
+
     return (
       <Column>
         <ColumnBackButton multiColumn={multiColumn} />
@@ -152,15 +168,21 @@ class AccountGallery extends ImmutablePureComponent {
           <div className='scrollable scrollable--flex' onScroll={this.handleScroll}>
             <HeaderContainer accountId={this.props.params.accountId} />
 
-            <div role='feed' className='account-gallery__container' ref={this.handleRef}>
-              {attachments.map((attachment, index) => attachment === null ? (
-                <LoadMoreMedia key={'more:' + attachments.getIn(index + 1, 'id')} maxId={index > 0 ? attachments.getIn(index - 1, 'id') : null} onLoadMore={this.handleLoadMore} />
-              ) : (
-                <MediaItem key={attachment.get('id')} attachment={attachment} displayWidth={width} onOpenMedia={this.handleOpenMedia} />
-              ))}
-
-              {loadOlder}
-            </div>
+            {(suspended || blockedBy) ? (
+              <div className='empty-column-indicator'>
+                {emptyMessage}
+              </div>
+            ) : (
+              <div role='feed' className='account-gallery__container' ref={this.handleRef}>
+                {attachments.map((attachment, index) => attachment === null ? (
+                  <LoadMoreMedia key={'more:' + attachments.getIn(index + 1, 'id')} maxId={index > 0 ? attachments.getIn(index - 1, 'id') : null} onLoadMore={this.handleLoadMore} />
+                ) : (
+                  <MediaItem key={attachment.get('id')} attachment={attachment} displayWidth={width} onOpenMedia={this.handleOpenMedia} />
+                ))}
+
+                {loadOlder}
+              </div>
+            )}
 
             {isLoading && attachments.size === 0 && (
               <div className='scrollable__append'>
diff --git a/app/javascript/mastodon/features/account_timeline/components/header.js b/app/javascript/mastodon/features/account_timeline/components/header.js
index 4e1b27466b249d5c482b431ac83a3b59b80f885a..6b52defe4a0d2c945fc88567edb0dfa17ed6a987 100644
--- a/app/javascript/mastodon/features/account_timeline/components/header.js
+++ b/app/javascript/mastodon/features/account_timeline/components/header.js
@@ -23,7 +23,6 @@ export default class Header extends ImmutablePureComponent {
     onUnblockDomain: PropTypes.func.isRequired,
     onEndorseToggle: PropTypes.func.isRequired,
     onAddToList: PropTypes.func.isRequired,
-    onEditAccountNote: PropTypes.func.isRequired,
     hideTabs: PropTypes.bool,
     domain: PropTypes.string.isRequired,
   };
@@ -56,6 +55,10 @@ export default class Header extends ImmutablePureComponent {
     this.props.onReblogToggle(this.props.account);
   }
 
+  handleNotifyToggle = () => {
+    this.props.onNotifyToggle(this.props.account);
+  }
+
   handleMute = () => {
     this.props.onMute(this.props.account);
   }
@@ -107,6 +110,7 @@ export default class Header extends ImmutablePureComponent {
           onMention={this.handleMention}
           onDirect={this.handleDirect}
           onReblogToggle={this.handleReblogToggle}
+          onNotifyToggle={this.handleNotifyToggle}
           onReport={this.handleReport}
           onMute={this.handleMute}
           onBlockDomain={this.handleBlockDomain}
diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.js b/app/javascript/mastodon/features/account_timeline/containers/header_container.js
index 8728b48068a9baa4ddde47f01cbd4ed39fde8798..e12019547ec5ed0a3e2daf09ed4a9a3789e8f427 100644
--- a/app/javascript/mastodon/features/account_timeline/containers/header_container.js
+++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.js
@@ -76,9 +76,9 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
 
   onReblogToggle (account) {
     if (account.getIn(['relationship', 'showing_reblogs'])) {
-      dispatch(followAccount(account.get('id'), false));
+      dispatch(followAccount(account.get('id'), { reblogs: false }));
     } else {
-      dispatch(followAccount(account.get('id'), true));
+      dispatch(followAccount(account.get('id'), { reblogs: true }));
     }
   },
 
@@ -90,6 +90,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
+  onNotifyToggle (account) {
+    if (account.getIn(['relationship', 'notifying'])) {
+      dispatch(followAccount(account.get('id'), { notify: false }));
+    } else {
+      dispatch(followAccount(account.get('id'), { notify: true }));
+    }
+  },
+
   onReport (account) {
     dispatch(initReport(account));
   },
diff --git a/app/javascript/mastodon/features/account_timeline/index.js b/app/javascript/mastodon/features/account_timeline/index.js
index 5ea907a1f11fd6c4799c333d4cdc5c594e5695f6..fa4239d6f5f4aad1e899b9b86f71acc7ff8cbeaf 100644
--- a/app/javascript/mastodon/features/account_timeline/index.js
+++ b/app/javascript/mastodon/features/account_timeline/index.js
@@ -15,6 +15,8 @@ import { FormattedMessage } from 'react-intl';
 import { fetchAccountIdentityProofs } from '../../actions/identity_proofs';
 import MissingIndicator from 'mastodon/components/missing_indicator';
 import TimelineHint from 'mastodon/components/timeline_hint';
+import { me } from 'mastodon/initial_state';
+import { connectTimeline, disconnectTimeline } from 'mastodon/actions/timelines';
 
 const emptyList = ImmutableList();
 
@@ -29,6 +31,7 @@ const mapStateToProps = (state, { params: { accountId }, withReplies = false })
     featuredStatusIds: withReplies ? ImmutableList() : state.getIn(['timelines', `account:${accountId}:pinned`, 'items'], emptyList),
     isLoading: state.getIn(['timelines', `account:${path}`, 'isLoading']),
     hasMore: state.getIn(['timelines', `account:${path}`, 'hasMore']),
+    suspended: state.getIn(['accounts', accountId, 'suspended'], false),
     blockedBy: state.getIn(['relationships', accountId, 'blocked_by'], false),
   };
 };
@@ -55,34 +58,55 @@ class AccountTimeline extends ImmutablePureComponent {
     withReplies: PropTypes.bool,
     blockedBy: PropTypes.bool,
     isAccount: PropTypes.bool,
+    suspended: PropTypes.bool,
     remote: PropTypes.bool,
     remoteUrl: PropTypes.string,
     multiColumn: PropTypes.bool,
   };
 
   componentWillMount () {
-    const { params: { accountId }, withReplies } = this.props;
+    const { params: { accountId }, withReplies, dispatch } = this.props;
 
-    this.props.dispatch(fetchAccount(accountId));
-    this.props.dispatch(fetchAccountIdentityProofs(accountId));
+    dispatch(fetchAccount(accountId));
+    dispatch(fetchAccountIdentityProofs(accountId));
 
     if (!withReplies) {
-      this.props.dispatch(expandAccountFeaturedTimeline(accountId));
+      dispatch(expandAccountFeaturedTimeline(accountId));
     }
 
-    this.props.dispatch(expandAccountTimeline(accountId, { withReplies }));
+    dispatch(expandAccountTimeline(accountId, { withReplies }));
+
+    if (accountId === me) {
+      dispatch(connectTimeline(`account:${me}`));
+    }
   }
 
   componentWillReceiveProps (nextProps) {
+    const { dispatch } = this.props;
+
     if ((nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) || nextProps.withReplies !== this.props.withReplies) {
-      this.props.dispatch(fetchAccount(nextProps.params.accountId));
-      this.props.dispatch(fetchAccountIdentityProofs(nextProps.params.accountId));
+      dispatch(fetchAccount(nextProps.params.accountId));
+      dispatch(fetchAccountIdentityProofs(nextProps.params.accountId));
 
       if (!nextProps.withReplies) {
-        this.props.dispatch(expandAccountFeaturedTimeline(nextProps.params.accountId));
+        dispatch(expandAccountFeaturedTimeline(nextProps.params.accountId));
       }
 
-      this.props.dispatch(expandAccountTimeline(nextProps.params.accountId, { withReplies: nextProps.params.withReplies }));
+      dispatch(expandAccountTimeline(nextProps.params.accountId, { withReplies: nextProps.params.withReplies }));
+    }
+
+    if (nextProps.params.accountId === me && this.props.params.accountId !== me) {
+      dispatch(connectTimeline(`account:${me}`));
+    } else if (this.props.params.accountId === me && nextProps.params.accountId !== me) {
+      dispatch(disconnectTimeline(`account:${me}`));
+    }
+  }
+
+  componentWillUnmount () {
+    const { dispatch, params: { accountId } } = this.props;
+
+    if (accountId === me) {
+      dispatch(disconnectTimeline(`account:${me}`));
     }
   }
 
@@ -91,7 +115,7 @@ class AccountTimeline extends ImmutablePureComponent {
   }
 
   render () {
-    const { shouldUpdateScroll, statusIds, featuredStatusIds, isLoading, hasMore, blockedBy, isAccount, multiColumn, remote, remoteUrl } = this.props;
+    const { shouldUpdateScroll, statusIds, featuredStatusIds, isLoading, hasMore, blockedBy, suspended, isAccount, multiColumn, remote, remoteUrl } = this.props;
 
     if (!isAccount) {
       return (
@@ -112,7 +136,9 @@ class AccountTimeline extends ImmutablePureComponent {
 
     let emptyMessage;
 
-    if (blockedBy) {
+    if (suspended) {
+      emptyMessage = <FormattedMessage id='empty_column.account_suspended' defaultMessage='Account suspended' />;
+    } else if (blockedBy) {
       emptyMessage = <FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' />;
     } else if (remote && statusIds.isEmpty()) {
       emptyMessage = <RemoteHint url={remoteUrl} />;
@@ -131,7 +157,7 @@ class AccountTimeline extends ImmutablePureComponent {
           alwaysPrepend
           append={remoteMessage}
           scrollKey='account_timeline'
-          statusIds={blockedBy ? emptyList : statusIds}
+          statusIds={(suspended || blockedBy) ? emptyList : statusIds}
           featuredStatusIds={featuredStatusIds}
           isLoading={isLoading}
           hasMore={hasMore}
diff --git a/app/javascript/mastodon/features/audio/index.js b/app/javascript/mastodon/features/audio/index.js
index 1ab1c3117d7cd47c1efdd286be53ee8d7466fb9e..c47f55dd1ea8a42b1cbadec17c3062c585d9a5ce 100644
--- a/app/javascript/mastodon/features/audio/index.js
+++ b/app/javascript/mastodon/features/audio/index.js
@@ -37,7 +37,11 @@ class Audio extends React.PureComponent {
     backgroundColor: PropTypes.string,
     foregroundColor: PropTypes.string,
     accentColor: PropTypes.string,
+    currentTime: PropTypes.number,
     autoPlay: PropTypes.bool,
+    volume: PropTypes.number,
+    muted: PropTypes.bool,
+    deployPictureInPicture: PropTypes.func,
   };
 
   state = {
@@ -64,6 +68,19 @@ class Audio extends React.PureComponent {
     }
   }
 
+  _pack() {
+    return {
+      src: this.props.src,
+      volume: this.audio.volume,
+      muted: this.audio.muted,
+      currentTime: this.audio.currentTime,
+      poster: this.props.poster,
+      backgroundColor: this.props.backgroundColor,
+      foregroundColor: this.props.foregroundColor,
+      accentColor: this.props.accentColor,
+    };
+  }
+
   _setDimensions () {
     const width  = this.player.offsetWidth;
     const height = this.props.fullscreen ? this.player.offsetHeight : (width / (16/9));
@@ -112,9 +129,17 @@ class Audio extends React.PureComponent {
   componentWillUnmount () {
     window.removeEventListener('scroll', this.handleScroll);
     window.removeEventListener('resize', this.handleResize);
+
+    if (!this.state.paused && this.audio && this.props.deployPictureInPicture) {
+      this.props.deployPictureInPicture('audio', this._pack());
+    }
   }
 
   togglePlay = () => {
+    if (!this.audioContext) {
+      this._initAudioContext();
+    }
+
     if (this.state.paused) {
       this.setState({ paused: false }, () => this.audio.play());
     } else {
@@ -133,10 +158,6 @@ class Audio extends React.PureComponent {
   handlePlay = () => {
     this.setState({ paused: false });
 
-    if (this.canvas && !this.audioContext) {
-      this._initAudioContext();
-    }
-
     if (this.audioContext && this.audioContext.state === 'suspended') {
       this.audioContext.resume();
     }
@@ -225,7 +246,7 @@ class Audio extends React.PureComponent {
   handleTimeUpdate = () => {
     this.setState({
       currentTime: this.audio.currentTime,
-      duration: Math.floor(this.audio.duration),
+      duration: this.audio.duration,
     });
   }
 
@@ -248,7 +269,13 @@ class Audio extends React.PureComponent {
     const inView = (top <= (window.innerHeight || document.documentElement.clientHeight)) && (top + height >= 0);
 
     if (!this.state.paused && !inView) {
-      this.setState({ paused: true }, () => this.audio.pause());
+      this.audio.pause();
+
+      if (this.props.deployPictureInPicture) {
+        this.props.deployPictureInPicture('audio', this._pack());
+      }
+
+      this.setState({ paused: true });
     }
   }, 150, { trailing: true });
 
@@ -261,16 +288,29 @@ class Audio extends React.PureComponent {
   }
 
   handleLoadedData = () => {
-    const { autoPlay } = this.props;
+    const { autoPlay, currentTime, volume, muted } = this.props;
+
+    if (currentTime) {
+      this.audio.currentTime = currentTime;
+    }
+
+    if (volume !== undefined) {
+      this.audio.volume = volume;
+    }
+
+    if (muted !== undefined) {
+      this.audio.muted = muted;
+    }
 
     if (autoPlay) {
-      this.audio.play();
+      this.togglePlay();
     }
   }
 
   _initAudioContext () {
-    const context  = new AudioContext();
-    const source   = context.createMediaElementSource(this.audio);
+    const AudioContext = window.AudioContext || window.webkitAudioContext;
+    const context      = new AudioContext();
+    const source       = context.createMediaElementSource(this.audio);
 
     this.visualizer.setAudioContext(context, source);
     source.connect(context.destination);
@@ -346,13 +386,59 @@ class Audio extends React.PureComponent {
     return this.props.foregroundColor || '#ffffff';
   }
 
+  seekBy (time) {
+    const currentTime = this.audio.currentTime + time;
+
+    if (!isNaN(currentTime)) {
+      this.setState({ currentTime }, () => {
+        this.audio.currentTime = currentTime;
+      });
+    }
+  }
+
+  handleAudioKeyDown = e => {
+    // On the audio element or the seek bar, we can safely use the space bar
+    // for playback control because there are no buttons to press
+
+    if (e.key === ' ') {
+      e.preventDefault();
+      e.stopPropagation();
+      this.togglePlay();
+    }
+  }
+
+  handleKeyDown = e => {
+    switch(e.key) {
+    case 'k':
+      e.preventDefault();
+      e.stopPropagation();
+      this.togglePlay();
+      break;
+    case 'm':
+      e.preventDefault();
+      e.stopPropagation();
+      this.toggleMute();
+      break;
+    case 'j':
+      e.preventDefault();
+      e.stopPropagation();
+      this.seekBy(-10);
+      break;
+    case 'l':
+      e.preventDefault();
+      e.stopPropagation();
+      this.seekBy(10);
+      break;
+    }
+  }
+
   render () {
     const { src, intl, alt, editable, autoPlay } = this.props;
     const { paused, muted, volume, currentTime, duration, buffer, dragging } = this.state;
-    const progress = (currentTime / duration) * 100;
+    const progress = Math.min((currentTime / duration) * 100, 100);
 
     return (
-      <div className={classNames('audio-player', { editable })} ref={this.setPlayerRef} style={{ backgroundColor: this._getBackgroundColor(), color: this._getForegroundColor(), width: '100%', height: this.props.fullscreen ? '100%' : (this.state.height || this.props.height) }} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
+      <div className={classNames('audio-player', { editable })} ref={this.setPlayerRef} style={{ backgroundColor: this._getBackgroundColor(), color: this._getForegroundColor(), width: '100%', height: this.props.fullscreen ? '100%' : (this.state.height || this.props.height) }} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave} tabIndex='0' onKeyDown={this.handleKeyDown}>
         <audio
           src={src}
           ref={this.setAudioRef}
@@ -366,12 +452,14 @@ class Audio extends React.PureComponent {
 
         <canvas
           role='button'
+          tabIndex='0'
           className='audio-player__canvas'
           width={this.state.width}
           height={this.state.height}
           style={{ width: '100%', position: 'absolute', top: 0, left: 0 }}
           ref={this.setCanvasRef}
           onClick={this.togglePlay}
+          onKeyDown={this.handleAudioKeyDown}
           title={alt}
           aria-label={alt}
         />
@@ -392,20 +480,21 @@ class Audio extends React.PureComponent {
             className={classNames('video-player__seek__handle', { active: dragging })}
             tabIndex='0'
             style={{ left: `${progress}%`, backgroundColor: this._getAccentColor() }}
+            onKeyDown={this.handleAudioKeyDown}
           />
         </div>
 
         <div className='video-player__controls active'>
           <div className='video-player__buttons-bar'>
             <div className='video-player__buttons left'>
-              <button type='button' title={intl.formatMessage(paused ? messages.play : messages.pause)} aria-label={intl.formatMessage(paused ? messages.play : messages.pause)} onClick={this.togglePlay}><Icon id={paused ? 'play' : 'pause'} fixedWidth /></button>
-              <button type='button' title={intl.formatMessage(muted ? messages.unmute : messages.mute)} aria-label={intl.formatMessage(muted ? messages.unmute : messages.mute)} onClick={this.toggleMute}><Icon id={muted ? 'volume-off' : 'volume-up'} fixedWidth /></button>
+              <button type='button' title={intl.formatMessage(paused ? messages.play : messages.pause)} aria-label={intl.formatMessage(paused ? messages.play : messages.pause)} className='player-button' onClick={this.togglePlay}><Icon id={paused ? 'play' : 'pause'} fixedWidth /></button>
+              <button type='button' title={intl.formatMessage(muted ? messages.unmute : messages.mute)} aria-label={intl.formatMessage(muted ? messages.unmute : messages.mute)} className='player-button' onClick={this.toggleMute}><Icon id={muted ? 'volume-off' : 'volume-up'} fixedWidth /></button>
 
               <div className={classNames('video-player__volume', { active: this.state.hovered })} ref={this.setVolumeRef} onMouseDown={this.handleVolumeMouseDown}>
                 <div className='video-player__volume__current' style={{ width: `${volume * 100}%`, backgroundColor: this._getAccentColor() }} />
 
                 <span
-                  className={classNames('video-player__volume__handle')}
+                  className='video-player__volume__handle'
                   tabIndex='0'
                   style={{ left: `${volume * 100}%`, backgroundColor: this._getAccentColor() }}
                 />
@@ -414,12 +503,14 @@ class Audio extends React.PureComponent {
               <span className='video-player__time'>
                 <span className='video-player__time-current'>{formatTime(Math.floor(currentTime))}</span>
                 <span className='video-player__time-sep'>/</span>
-                <span className='video-player__time-total'>{formatTime(this.state.duration || Math.floor(this.props.duration))}</span>
+                <span className='video-player__time-total'>{formatTime(Math.floor(this.state.duration || this.props.duration))}</span>
               </span>
             </div>
 
             <div className='video-player__buttons right'>
-              <button type='button' title={intl.formatMessage(messages.download)} aria-label={intl.formatMessage(messages.download)} onClick={this.handleDownload}><Icon id='download' fixedWidth /></button>
+              <a title={intl.formatMessage(messages.download)} aria-label={intl.formatMessage(messages.download)} className='video-player__download__icon player-button' href={this.props.src} download>
+                <Icon id={'download'} fixedWidth />
+              </a>
             </div>
           </div>
         </div>
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index 47e189251c9f0d1ab8babe42b69576002db3bfc1..8af806ec437b8d0b748c0ca566e50c38f3a495ff 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -77,6 +77,18 @@ class ComposeForm extends ImmutablePureComponent {
     }
   }
 
+  getFulltextForCharacterCounting = () => {
+    return [this.props.spoiler? this.props.spoilerText: '', countableText(this.props.text)].join('');
+  }
+
+  canSubmit = () => {
+    const { isSubmitting, isChangingUpload, isUploading, anyMedia } = this.props;
+    const fulltext = this.getFulltextForCharacterCounting();
+    const isOnlyWhitespace = fulltext.length !== 0 && fulltext.trim().length === 0;
+
+    return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > 500 || (isOnlyWhitespace && !anyMedia));
+  }
+
   handleSubmit = () => {
     if (this.props.text !== this.autosuggestTextarea.textarea.value) {
       // Something changed the text inside the textarea (e.g. browser extensions like Grammarly)
@@ -84,11 +96,7 @@ class ComposeForm extends ImmutablePureComponent {
       this.props.onChange(this.autosuggestTextarea.textarea.value);
     }
 
-    // Submit disabled:
-    const { isSubmitting, isChangingUpload, isUploading, anyMedia } = this.props;
-    const fulltext = [this.props.spoilerText, countableText(this.props.text)].join('');
-
-    if (isSubmitting || isUploading || isChangingUpload || length(fulltext) > 500 || (fulltext.length !== 0 && fulltext.trim().length === 0 && !anyMedia)) {
+    if (!this.canSubmit()) {
       return;
     }
 
@@ -178,10 +186,8 @@ class ComposeForm extends ImmutablePureComponent {
   }
 
   render () {
-    const { intl, onPaste, showSearch, anyMedia } = this.props;
+    const { intl, onPaste, showSearch } = this.props;
     const disabled = this.props.isSubmitting;
-    const text     = [this.props.spoilerText, countableText(this.props.text)].join('');
-    const disabledButton = disabled || this.props.isUploading || this.props.isChangingUpload || length(text) > 500 || (text.length !== 0 && text.trim().length === 0 && !anyMedia);
     let publishText = '';
 
     if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
@@ -243,11 +249,11 @@ class ComposeForm extends ImmutablePureComponent {
             <PrivacyDropdownContainer />
             <SpoilerButtonContainer />
           </div>
-          <div className='character-counter__wrapper'><CharacterCounter max={500} text={text} /></div>
+          <div className='character-counter__wrapper'><CharacterCounter max={500} text={this.getFulltextForCharacterCounting()} /></div>
         </div>
 
         <div className='compose-form__publish'>
-          <div className='compose-form__publish-button-wrapper'><Button text={publishText} onClick={this.handleSubmit} disabled={disabledButton} block /></div>
+          <div className='compose-form__publish-button-wrapper'><Button text={publishText} onClick={this.handleSubmit} disabled={!this.canSubmit()} block /></div>
         </div>
       </div>
     );
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
index 360a7af6ab9fcaa5d7d4debfd604d72b192c7f50..dc4f480609e9cc46fa93a3c33d42d8d61bd1b8bc 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -5,8 +5,9 @@ import { EmojiPicker as EmojiPickerAsync } from '../../ui/util/async-components'
 import Overlay from 'react-overlays/lib/Overlay';
 import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import detectPassiveEvents from 'detect-passive-events';
+import { supportsPassiveEvents } from 'detect-passive-events';
 import { buildCustomEmojis, categoriesFromEmojis } from '../../emoji/emoji';
+import { assetHost } from 'mastodon/utils/config';
 
 const messages = defineMessages({
   emoji: { id: 'emoji_button.label', defaultMessage: 'Insert emoji' },
@@ -25,11 +26,10 @@ const messages = defineMessages({
   flags: { id: 'emoji_button.flags', defaultMessage: 'Flags' },
 });
 
-const assetHost = process.env.CDN_HOST || '';
 let EmojiPicker, Emoji; // load asynchronously
 
 const backgroundImageFn = () => `${assetHost}/emoji/sheet_10.png`;
-const listenerOptions = detectPassiveEvents.hasSupport ? { passive: true } : false;
+const listenerOptions = supportsPassiveEvents ? { passive: true } : false;
 
 class ModifierPickerMenu extends React.PureComponent {
 
@@ -315,7 +315,7 @@ class EmojiPickerDropdown extends React.PureComponent {
 
         this.setState({ loading: false });
       }).catch(() => {
-        this.setState({ loading: false });
+        this.setState({ loading: false, active: false });
       });
     }
 
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
index 96028e0421f164fbf399babe2bdcd7daa195d610..309f462903d97a475e933e1c2c08dc3cb96df25d 100644
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
@@ -5,7 +5,7 @@ import IconButton from '../../../components/icon_button';
 import Overlay from 'react-overlays/lib/Overlay';
 import Motion from '../../ui/util/optional_motion';
 import spring from 'react-motion/lib/spring';
-import detectPassiveEvents from 'detect-passive-events';
+import { supportsPassiveEvents } from 'detect-passive-events';
 import classNames from 'classnames';
 import Icon from 'mastodon/components/icon';
 
@@ -21,7 +21,7 @@ const messages = defineMessages({
   change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
 });
 
-const listenerOptions = detectPassiveEvents.hasSupport ? { passive: true } : false;
+const listenerOptions = supportsPassiveEvents ? { passive: true } : false;
 
 class PrivacyDropdownMenu extends React.PureComponent {
 
@@ -179,7 +179,7 @@ class PrivacyDropdown extends React.PureComponent {
     } else {
       const { top } = target.getBoundingClientRect();
       if (this.state.open && this.activeElement) {
-        this.activeElement.focus();
+        this.activeElement.focus({ preventScroll: true });
       }
       this.setState({ placement: top * 2 < innerHeight ? 'bottom' : 'top' });
       this.setState({ open: !this.state.open });
@@ -220,7 +220,7 @@ class PrivacyDropdown extends React.PureComponent {
 
   handleClose = () => {
     if (this.state.open && this.activeElement) {
-      this.activeElement.focus();
+      this.activeElement.focus({ preventScroll: true });
     }
     this.setState({ open: false });
   }
diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.js b/app/javascript/mastodon/features/compose/components/reply_indicator.js
index 66dc8574216de32ff3c5b3a6061a1f24fff0b513..85638389324e26c4ca2caa8e40edbe31a515a342 100644
--- a/app/javascript/mastodon/features/compose/components/reply_indicator.js
+++ b/app/javascript/mastodon/features/compose/components/reply_indicator.js
@@ -6,7 +6,6 @@ import IconButton from '../../../components/icon_button';
 import DisplayName from '../../../components/display_name';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import { isRtl } from '../../../rtl';
 import AttachmentList from 'mastodon/components/attachment_list';
 
 const messages = defineMessages({
@@ -45,9 +44,6 @@ class ReplyIndicator extends ImmutablePureComponent {
     }
 
     const content = { __html: status.get('contentHtml') };
-    const style   = {
-      direction: isRtl(status.get('search_index')) ? 'rtl' : 'ltr',
-    };
 
     return (
       <div className='reply-indicator'>
@@ -60,7 +56,7 @@ class ReplyIndicator extends ImmutablePureComponent {
           </a>
         </div>
 
-        <div className='reply-indicator__content' style={style} dangerouslySetInnerHTML={content} />
+        <div className='reply-indicator__content' dangerouslySetInnerHTML={content} />
 
         {status.get('media_attachments').size > 0 && (
           <AttachmentList
diff --git a/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js b/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js
index 7073f76c2e8f81f81189f7003e22edc5f882594e..1bcce57310a86a7422f1bfd7641bd355874ec028 100644
--- a/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js
@@ -6,13 +6,20 @@ import { changeComposeSensitivity } from 'mastodon/actions/compose';
 import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
 
 const messages = defineMessages({
-  marked: { id: 'compose_form.sensitive.marked', defaultMessage: 'Media is marked as sensitive' },
-  unmarked: { id: 'compose_form.sensitive.unmarked', defaultMessage: 'Media is not marked as sensitive' },
+  marked: {
+    id: 'compose_form.sensitive.marked',
+    defaultMessage: '{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}',
+  },
+  unmarked: {
+    id: 'compose_form.sensitive.unmarked',
+    defaultMessage: '{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}',
+  },
 });
 
 const mapStateToProps = state => ({
   active: state.getIn(['compose', 'sensitive']),
   disabled: state.getIn(['compose', 'spoiler']),
+  mediaCount: state.getIn(['compose', 'media_attachments']).size,
 });
 
 const mapDispatchToProps = dispatch => ({
@@ -28,16 +35,17 @@ class SensitiveButton extends React.PureComponent {
   static propTypes = {
     active: PropTypes.bool,
     disabled: PropTypes.bool,
+    mediaCount: PropTypes.number,
     onClick: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
   };
 
   render () {
-    const { active, disabled, onClick, intl } = this.props;
+    const { active, disabled, mediaCount, onClick, intl } = this.props;
 
     return (
       <div className='compose-form__sensitive-button'>
-        <label className={classNames('icon-button', { active })} title={intl.formatMessage(active ? messages.marked : messages.unmarked)}>
+        <label className={classNames('icon-button', { active })} title={intl.formatMessage(active ? messages.marked : messages.unmarked, { count: mediaCount })}>
           <input
             name='mark-sensitive'
             type='checkbox'
@@ -48,7 +56,11 @@ class SensitiveButton extends React.PureComponent {
 
           <span className={classNames('checkbox', { active })} />
 
-          <FormattedMessage id='compose_form.sensitive.hide' defaultMessage='Mark media as sensitive' />
+          <FormattedMessage
+            id='compose_form.sensitive.hide'
+            defaultMessage='{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}'
+            values={{ count: mediaCount }}
+          />
         </label>
       </div>
     );
diff --git a/app/javascript/mastodon/features/compose/containers/warning_container.js b/app/javascript/mastodon/features/compose/containers/warning_container.js
index 8200a319f736e64f31cc51beb0a366d5dfa87fc8..bf0660ea9dfeb62c2e2e84ee4e0184bdc1c229dd 100644
--- a/app/javascript/mastodon/features/compose/containers/warning_container.js
+++ b/app/javascript/mastodon/features/compose/containers/warning_container.js
@@ -5,7 +5,30 @@ import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import { me } from '../../../initial_state';
 
-const APPROX_HASHTAG_RE = /(?:^|[^\/\)\w])#(\w*[a-zA-ZÂ·]\w*)/i;
+const buildHashtagRE = () => {
+  try {
+    const HASHTAG_SEPARATORS = '_\\u00b7\\u200c';
+    const ALPHA = '\\p{L}\\p{M}';
+    const WORD = '\\p{L}\\p{M}\\p{N}\\p{Pc}';
+    return new RegExp(
+      '(?:^|[^\\/\\)\\w])#((' +
+      '[' + WORD + '_]' +
+      '[' + WORD + HASHTAG_SEPARATORS + ']*' +
+      '[' + ALPHA + HASHTAG_SEPARATORS + ']' +
+      '[' + WORD + HASHTAG_SEPARATORS +']*' +
+      '[' + WORD + '_]' +
+      ')|(' +
+      '[' + WORD + '_]*' +
+      '[' + ALPHA + ']' +
+      '[' + WORD + '_]*' +
+      '))', 'iu',
+    );
+  } catch {
+    return /(?:^|[^\/\)\w])#(\w*[a-zA-ZÂ·]\w*)/i;
+  }
+};
+
+const APPROX_HASHTAG_RE = buildHashtagRE();
 
 const mapStateToProps = state => ({
   needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', me, 'locked']),
diff --git a/app/javascript/mastodon/features/emoji/emoji.js b/app/javascript/mastodon/features/emoji/emoji.js
index f7d3cfd08ad582ab50ab7624a29ef610380369be..4e37f3a809165de77a039fb082ddc6baaadbf9a3 100644
--- a/app/javascript/mastodon/features/emoji/emoji.js
+++ b/app/javascript/mastodon/features/emoji/emoji.js
@@ -1,18 +1,17 @@
 import { autoPlayGif } from '../../initial_state';
 import unicodeMapping from './emoji_unicode_mapping_light';
+import { assetHost } from 'mastodon/utils/config';
 import Trie from 'substring-trie';
 
 const trie = new Trie(Object.keys(unicodeMapping));
 
-const assetHost = process.env.CDN_HOST || '';
-
 // Convert to file names from emojis. (For different variation selector emojis)
 const emojiFilenames = (emojis) => {
   return emojis.map(v => unicodeMapping[v].filename);
 };
 
 // Emoji requiring extra borders depending on theme
-const darkEmoji = emojiFilenames(['ðŸŽ±', 'ðŸœ', 'âš«', 'ðŸ–¤', 'â¬›', 'â—¼ï¸', 'â—¾', 'â—¼ï¸', 'âœ’ï¸', 'â–ªï¸', 'ðŸ’£', 'ðŸŽ³', 'ðŸ“·', 'ðŸ“¸', 'â™£ï¸', 'ðŸ•¶ï¸', 'âœ´ï¸', 'ðŸ”Œ', 'ðŸ’‚â€â™€ï¸', 'ðŸ“½ï¸', 'ðŸ³', 'ðŸ¦', 'ðŸ’‚', 'ðŸ”ª', 'ðŸ•³ï¸', 'ðŸ•¹ï¸', 'ðŸ•‹', 'ðŸ–Šï¸', 'ðŸ–‹ï¸', 'ðŸ’‚â€â™‚ï¸', 'ðŸŽ¤', 'ðŸŽ“', 'ðŸŽ¥', 'ðŸŽ¼', 'â™ ï¸', 'ðŸŽ©', 'ðŸ¦ƒ', 'ðŸ“¼', 'ðŸ“¹', 'ðŸŽ®', 'ðŸƒ', 'ðŸ´']);
+const darkEmoji = emojiFilenames(['ðŸŽ±', 'ðŸœ', 'âš«', 'ðŸ–¤', 'â¬›', 'â—¼ï¸', 'â—¾', 'â—¼ï¸', 'âœ’ï¸', 'â–ªï¸', 'ðŸ’£', 'ðŸŽ³', 'ðŸ“·', 'ðŸ“¸', 'â™£ï¸', 'ðŸ•¶ï¸', 'âœ´ï¸', 'ðŸ”Œ', 'ðŸ’‚â€â™€ï¸', 'ðŸ“½ï¸', 'ðŸ³', 'ðŸ¦', 'ðŸ’‚', 'ðŸ”ª', 'ðŸ•³ï¸', 'ðŸ•¹ï¸', 'ðŸ•‹', 'ðŸ–Šï¸', 'ðŸ–‹ï¸', 'ðŸ’‚â€â™‚ï¸', 'ðŸŽ¤', 'ðŸŽ“', 'ðŸŽ¥', 'ðŸŽ¼', 'â™ ï¸', 'ðŸŽ©', 'ðŸ¦ƒ', 'ðŸ“¼', 'ðŸ“¹', 'ðŸŽ®', 'ðŸƒ', 'ðŸ´', 'ðŸž', 'ðŸ•º']);
 const lightEmoji = emojiFilenames(['ðŸ‘½', 'âš¾', 'ðŸ”', 'â˜ï¸', 'ðŸ’¨', 'ðŸ•Šï¸', 'ðŸ‘€', 'ðŸ¥', 'ðŸ‘»', 'ðŸ', 'â•', 'â”', 'â›¸ï¸', 'ðŸŒ©ï¸', 'ðŸ”Š', 'ðŸ”‡', 'ðŸ“ƒ', 'ðŸŒ§ï¸', 'ðŸ', 'ðŸš', 'ðŸ™', 'ðŸ“', 'ðŸ‘', 'ðŸ’€', 'â˜ ï¸', 'ðŸŒ¨ï¸', 'ðŸ”‰', 'ðŸ”ˆ', 'ðŸ’¬', 'ðŸ’', 'ðŸ', 'ðŸ³ï¸', 'âšª', 'â¬œ', 'â—½', 'â—»ï¸', 'â–«ï¸']);
 
 const emojiFilename = (filename) => {
diff --git a/app/javascript/mastodon/features/getting_started/components/announcements.js b/app/javascript/mastodon/features/getting_started/components/announcements.js
index 1896994daf013bb0efdcb6e1f30d4288dae3dfa4..5bc3abac665129c21081e9bdee4d68ce2ea16d2e 100644
--- a/app/javascript/mastodon/features/getting_started/components/announcements.js
+++ b/app/javascript/mastodon/features/getting_started/components/announcements.js
@@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
 import IconButton from 'mastodon/components/icon_button';
 import Icon from 'mastodon/components/icon';
 import { defineMessages, injectIntl, FormattedMessage, FormattedDate } from 'react-intl';
-import { autoPlayGif, reduceMotion } from 'mastodon/initial_state';
+import { autoPlayGif, reduceMotion, disableSwiping } from 'mastodon/initial_state';
 import elephantUIPlane from 'mastodon/../images/elephant_ui_plane.svg';
 import { mascot } from 'mastodon/initial_state';
 import unicodeMapping from 'mastodon/features/emoji/emoji_unicode_mapping_light';
@@ -15,6 +15,7 @@ import EmojiPickerDropdown from 'mastodon/features/compose/containers/emoji_pick
 import AnimatedNumber from 'mastodon/components/animated_number';
 import TransitionMotion from 'react-motion/lib/TransitionMotion';
 import spring from 'react-motion/lib/spring';
+import { assetHost } from 'mastodon/utils/config';
 
 const messages = defineMessages({
   close: { id: 'lightbox.close', defaultMessage: 'Close' },
@@ -153,8 +154,6 @@ class Content extends ImmutablePureComponent {
 
 }
 
-const assetHost = process.env.CDN_HOST || '';
-
 class Emoji extends React.PureComponent {
 
   static propTypes = {
@@ -397,7 +396,7 @@ class Announcements extends ImmutablePureComponent {
   _markAnnouncementAsRead () {
     const { dismissAnnouncement, announcements } = this.props;
     const { index } = this.state;
-    const announcement = announcements.get(index);
+    const announcement = announcements.get(announcements.size - 1 - index);
     if (!announcement.get('read')) dismissAnnouncement(announcement.get('id'));
   }
 
@@ -436,8 +435,9 @@ class Announcements extends ImmutablePureComponent {
                 removeReaction={this.props.removeReaction}
                 intl={intl}
                 selected={index === idx}
+                disabled={disableSwiping}
               />
-            ))}
+            )).reverse()}
           </ReactSwipeableViews>
 
           {announcements.size > 1 && (
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index d9838e1c7390b178115a952a4e786a2af58dd1ae..1b9994612904498ecae80b3c5136334c138258df 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -10,7 +10,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { me, profile_directory, showTrends } from '../../initial_state';
 import { fetchFollowRequests } from 'mastodon/actions/accounts';
 import { List as ImmutableList } from 'immutable';
-import NavigationBar from '../compose/components/navigation_bar';
+import NavigationContainer from '../compose/containers/navigation_container';
 import Icon from 'mastodon/components/icon';
 import LinkFooter from 'mastodon/features/ui/components/link_footer';
 import TrendsContainer from './containers/trends_container';
@@ -40,6 +40,7 @@ const messages = defineMessages({
 
 const mapStateToProps = state => ({
   myAccount: state.getIn(['accounts', me]),
+  columns: state.getIn(['settings', 'columns']),
   unreadFollowRequests: state.getIn(['user_lists', 'follow_requests', 'items'], ImmutableList()).size,
 });
 
@@ -89,60 +90,66 @@ class GettingStarted extends ImmutablePureComponent {
   }
 
   render () {
-    const { intl, myAccount, multiColumn, unreadFollowRequests } = this.props;
+    const { intl, myAccount, columns, multiColumn, unreadFollowRequests } = this.props;
 
     const navItems = [];
-    let i = 1;
     let height = (multiColumn) ? 0 : 60;
 
     if (multiColumn) {
       navItems.push(
-        <ColumnSubheading key={i++} text={intl.formatMessage(messages.discover)} />,
-        <ColumnLink key={i++} icon='users' text={intl.formatMessage(messages.community_timeline)} to='/timelines/public/local' />,
-        <ColumnLink key={i++} icon='globe' text={intl.formatMessage(messages.public_timeline)} to='/timelines/public' />,
+        <ColumnSubheading key='header-discover' text={intl.formatMessage(messages.discover)} />,
+        <ColumnLink key='community_timeline' icon='users' text={intl.formatMessage(messages.community_timeline)} to='/timelines/public/local' />,
+        <ColumnLink key='public_timeline' icon='globe' text={intl.formatMessage(messages.public_timeline)} to='/timelines/public' />,
       );
 
       height += 34 + 48*2;
 
       if (profile_directory) {
         navItems.push(
-          <ColumnLink key={i++} icon='address-book' text={intl.formatMessage(messages.profile_directory)} to='/directory' />,
+          <ColumnLink key='directory' icon='address-book' text={intl.formatMessage(messages.profile_directory)} to='/directory' />,
         );
 
         height += 48;
       }
 
       navItems.push(
-        <ColumnSubheading key={i++} text={intl.formatMessage(messages.personal)} />,
+        <ColumnSubheading key='header-personal' text={intl.formatMessage(messages.personal)} />,
       );
 
       height += 34;
     } else if (profile_directory) {
       navItems.push(
-        <ColumnLink key={i++} icon='address-book' text={intl.formatMessage(messages.profile_directory)} to='/directory' />,
+        <ColumnLink key='directory' icon='address-book' text={intl.formatMessage(messages.profile_directory)} to='/directory' />,
       );
 
       height += 48;
     }
 
+    if (multiColumn && !columns.find(item => item.get('id') === 'HOME')) {
+      navItems.push(
+        <ColumnLink key='home' icon='home' text={intl.formatMessage(messages.home_timeline)} to='/timelines/home' />,
+      );
+      height += 48;
+    }
+
     navItems.push(
-      <ColumnLink key={i++} icon='envelope' text={intl.formatMessage(messages.direct)} to='/timelines/direct' />,
-      <ColumnLink key={i++} icon='bookmark' text={intl.formatMessage(messages.bookmarks)} to='/bookmarks' />,
-      <ColumnLink key={i++} icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
-      <ColumnLink key={i++} icon='list-ul' text={intl.formatMessage(messages.lists)} to='/lists' />,
+      <ColumnLink key='direct' icon='envelope' text={intl.formatMessage(messages.direct)} to='/timelines/direct' />,
+      <ColumnLink key='bookmark' icon='bookmark' text={intl.formatMessage(messages.bookmarks)} to='/bookmarks' />,
+      <ColumnLink key='favourites' icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
+      <ColumnLink key='lists' icon='list-ul' text={intl.formatMessage(messages.lists)} to='/lists' />,
     );
 
     height += 48*4;
 
     if (myAccount.get('locked') || unreadFollowRequests > 0) {
-      navItems.push(<ColumnLink key={i++} icon='user-plus' text={intl.formatMessage(messages.follow_requests)} badge={badgeDisplay(unreadFollowRequests, 40)} to='/follow_requests' />);
+      navItems.push(<ColumnLink key='follow_requests' icon='user-plus' text={intl.formatMessage(messages.follow_requests)} badge={badgeDisplay(unreadFollowRequests, 40)} to='/follow_requests' />);
       height += 48;
     }
 
     if (!multiColumn) {
       navItems.push(
-        <ColumnSubheading key={i++} text={intl.formatMessage(messages.settings_subheading)} />,
-        <ColumnLink key={i++} icon='gears' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' />,
+        <ColumnSubheading key='header-settings' text={intl.formatMessage(messages.settings_subheading)} />,
+        <ColumnLink key='preferences' icon='gears' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' />,
       );
 
       height += 34 + 48;
@@ -161,7 +168,7 @@ class GettingStarted extends ImmutablePureComponent {
 
         <div className='getting-started'>
           <div className='getting-started__wrapper' style={{ height }}>
-            {!multiColumn && <NavigationBar account={myAccount} />}
+            {!multiColumn && <NavigationContainer />}
             {navItems}
           </div>
 
diff --git a/app/javascript/mastodon/features/introduction/index.js b/app/javascript/mastodon/features/introduction/index.js
index 754477bb992dfc56520a36d01dd4f08b19b4c8f3..5820750a4ee0bd6427719f9fb316eecb42c9e19f 100644
--- a/app/javascript/mastodon/features/introduction/index.js
+++ b/app/javascript/mastodon/features/introduction/index.js
@@ -9,6 +9,7 @@ import screenHello from '../../../images/screen_hello.svg';
 import screenFederation from '../../../images/screen_federation.svg';
 import screenInteractions from '../../../images/screen_interactions.svg';
 import logoTransparent from '../../../images/logo_transparent.svg';
+import { disableSwiping } from 'mastodon/initial_state';
 
 const FrameWelcome = ({ domain, onNext }) => (
   <div className='introduction__frame'>
@@ -171,7 +172,7 @@ class Introduction extends React.PureComponent {
 
     return (
       <div className='introduction'>
-        <ReactSwipeableViews index={currentIndex} onChangeIndex={this.handleSwipe} className='introduction__pager'>
+        <ReactSwipeableViews index={currentIndex} onChangeIndex={this.handleSwipe} disabled={disableSwiping} className='introduction__pager'>
           {pages.map((page, i) => (
             <div key={i} className={classNames('introduction__frame-wrapper', { 'active': i === currentIndex })}>{page}</div>
           ))}
diff --git a/app/javascript/mastodon/features/list_timeline/index.js b/app/javascript/mastodon/features/list_timeline/index.js
index f3205b2bff196466c48c5982dd6bc30367563cc8..02b01824735342dfe9f30f300bf41f0b51a1769c 100644
--- a/app/javascript/mastodon/features/list_timeline/index.js
+++ b/app/javascript/mastodon/features/list_timeline/index.js
@@ -10,15 +10,19 @@ import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
 import { connectListStream } from '../../actions/streaming';
 import { expandListTimeline } from '../../actions/timelines';
-import { fetchList, deleteList } from '../../actions/lists';
+import { fetchList, deleteList, updateList } from '../../actions/lists';
 import { openModal } from '../../actions/modal';
 import MissingIndicator from '../../components/missing_indicator';
 import LoadingIndicator from '../../components/loading_indicator';
 import Icon from 'mastodon/components/icon';
+import RadioButton from 'mastodon/components/radio_button';
 
 const messages = defineMessages({
   deleteMessage: { id: 'confirmations.delete_list.message', defaultMessage: 'Are you sure you want to permanently delete this list?' },
   deleteConfirm: { id: 'confirmations.delete_list.confirm', defaultMessage: 'Delete' },
+  followed:   { id: 'lists.replies_policy.followed', defaultMessage: 'Any followed user' },
+  none:    { id: 'lists.replies_policy.none', defaultMessage: 'No one' },
+  list:  { id: 'lists.replies_policy.list', defaultMessage: 'Members of the list' },
 });
 
 const mapStateToProps = (state, props) => ({
@@ -131,11 +135,18 @@ class ListTimeline extends React.PureComponent {
     }));
   }
 
+  handleRepliesPolicyChange = ({ target }) => {
+    const { dispatch } = this.props;
+    const { id } = this.props.params;
+    dispatch(updateList(id, undefined, false, target.value));
+  }
+
   render () {
-    const { shouldUpdateScroll, hasUnread, columnId, multiColumn, list } = this.props;
+    const { shouldUpdateScroll, hasUnread, columnId, multiColumn, list, intl } = this.props;
     const { id } = this.props.params;
     const pinned = !!columnId;
     const title  = list ? list.get('title') : id;
+    const replies_policy = list ? list.get('replies_policy') : undefined;
 
     if (typeof list === 'undefined') {
       return (
@@ -166,7 +177,7 @@ class ListTimeline extends React.PureComponent {
           pinned={pinned}
           multiColumn={multiColumn}
         >
-          <div className='column-header__links'>
+          <div className='column-settings__row column-header__links'>
             <button className='text-btn column-header__setting-btn' tabIndex='0' onClick={this.handleEditClick}>
               <Icon id='pencil' /> <FormattedMessage id='lists.edit' defaultMessage='Edit list' />
             </button>
@@ -175,6 +186,19 @@ class ListTimeline extends React.PureComponent {
               <Icon id='trash' /> <FormattedMessage id='lists.delete' defaultMessage='Delete list' />
             </button>
           </div>
+
+          { replies_policy !== undefined && (
+            <div role='group' aria-labelledby={`list-${id}-replies-policy`}>
+              <span id={`list-${id}-replies-policy`} className='column-settings__section'>
+                <FormattedMessage id='lists.replies_policy.title' defaultMessage='Show replies to:' />
+              </span>
+              <div className='column-settings__row'>
+                { ['none', 'list', 'followed'].map(policy => (
+                  <RadioButton name='order' value={policy} label={intl.formatMessage(messages[policy])} checked={replies_policy === policy} onChange={this.handleRepliesPolicyChange} />
+                ))}
+              </div>
+            </div>
+          )}
         </ColumnHeader>
 
         <StatusListContainer
diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.js b/app/javascript/mastodon/features/notifications/components/column_settings.js
index 8bd03fbdab26ef2a05be45d9238106e2824ab849..8339a367ebc72509d49aed36b8c9c38dd504d6b7 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.js
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { FormattedMessage } from 'react-intl';
 import ClearColumnButton from './clear_column_button';
+import GrantPermissionButton from './grant_permission_button';
 import SettingToggle from './setting_toggle';
 
 export default class ColumnSettings extends React.PureComponent {
@@ -12,6 +13,10 @@ export default class ColumnSettings extends React.PureComponent {
     pushSettings: ImmutablePropTypes.map.isRequired,
     onChange: PropTypes.func.isRequired,
     onClear: PropTypes.func.isRequired,
+    onRequestNotificationPermission: PropTypes.func,
+    alertsEnabled: PropTypes.bool,
+    browserSupport: PropTypes.bool,
+    browserPermission: PropTypes.bool,
   };
 
   onPushChange = (path, checked) => {
@@ -19,7 +24,7 @@ export default class ColumnSettings extends React.PureComponent {
   }
 
   render () {
-    const { settings, pushSettings, onChange, onClear } = this.props;
+    const { settings, pushSettings, onChange, onClear, alertsEnabled, browserSupport, browserPermission, onRequestNotificationPermission } = this.props;
 
     const filterShowStr = <FormattedMessage id='notifications.column_settings.filter_bar.show' defaultMessage='Show' />;
     const filterAdvancedStr = <FormattedMessage id='notifications.column_settings.filter_bar.advanced' defaultMessage='Display all categories' />;
@@ -32,6 +37,20 @@ export default class ColumnSettings extends React.PureComponent {
 
     return (
       <div>
+        {alertsEnabled && browserSupport && browserPermission === 'denied' && (
+          <div className='column-settings__row column-settings__row--with-margin'>
+            <span className='warning-hint'><FormattedMessage id='notifications.permission_denied' defaultMessage='Desktop notifications are unavailable due to previously denied browser permissions request' /></span>
+          </div>
+        )}
+
+        {alertsEnabled && browserSupport && browserPermission === 'default' && (
+          <div className='column-settings__row column-settings__row--with-margin'>
+            <span className='warning-hint'>
+              <FormattedMessage id='notifications.permission_required' defaultMessage='Desktop notifications are unavailable because the required permission has not been granted.' /> <GrantPermissionButton onClick={onRequestNotificationPermission} />
+            </span>
+          </div>
+        )}
+
         <div className='column-settings__row'>
           <ClearColumnButton onClick={onClear} />
         </div>
@@ -40,6 +59,7 @@ export default class ColumnSettings extends React.PureComponent {
           <span id='notifications-filter-bar' className='column-settings__section'>
             <FormattedMessage id='notifications.column_settings.filter_bar.category' defaultMessage='Quick filter bar' />
           </span>
+
           <div className='column-settings__row'>
             <SettingToggle id='show-filter-bar' prefix='notifications' settings={settings} settingPath={['quickFilter', 'show']} onChange={onChange} label={filterShowStr} />
             <SettingToggle id='show-filter-bar' prefix='notifications' settings={settings} settingPath={['quickFilter', 'advanced']} onChange={onChange} label={filterAdvancedStr} />
@@ -50,7 +70,7 @@ export default class ColumnSettings extends React.PureComponent {
           <span id='notifications-follow' className='column-settings__section'><FormattedMessage id='notifications.column_settings.follow' defaultMessage='New followers:' /></span>
 
           <div className='column-settings__row'>
-            <SettingToggle prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'follow']} onChange={onChange} label={alertStr} />
+            <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'follow']} onChange={onChange} label={alertStr} />
             {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'follow']} onChange={this.onPushChange} label={pushStr} />}
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'follow']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'follow']} onChange={onChange} label={soundStr} />
@@ -61,7 +81,7 @@ export default class ColumnSettings extends React.PureComponent {
           <span id='notifications-follow-request' className='column-settings__section'><FormattedMessage id='notifications.column_settings.follow_request' defaultMessage='New follow requests:' /></span>
 
           <div className='column-settings__row'>
-            <SettingToggle prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'follow_request']} onChange={onChange} label={alertStr} />
+            <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'follow_request']} onChange={onChange} label={alertStr} />
             {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'follow_request']} onChange={this.onPushChange} label={pushStr} />}
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'follow_request']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'follow_request']} onChange={onChange} label={soundStr} />
@@ -72,7 +92,7 @@ export default class ColumnSettings extends React.PureComponent {
           <span id='notifications-favourite' className='column-settings__section'><FormattedMessage id='notifications.column_settings.favourite' defaultMessage='Favourites:' /></span>
 
           <div className='column-settings__row'>
-            <SettingToggle prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'favourite']} onChange={onChange} label={alertStr} />
+            <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'favourite']} onChange={onChange} label={alertStr} />
             {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'favourite']} onChange={this.onPushChange} label={pushStr} />}
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'favourite']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'favourite']} onChange={onChange} label={soundStr} />
@@ -83,7 +103,7 @@ export default class ColumnSettings extends React.PureComponent {
           <span id='notifications-mention' className='column-settings__section'><FormattedMessage id='notifications.column_settings.mention' defaultMessage='Mentions:' /></span>
 
           <div className='column-settings__row'>
-            <SettingToggle prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'mention']} onChange={onChange} label={alertStr} />
+            <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'mention']} onChange={onChange} label={alertStr} />
             {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'mention']} onChange={this.onPushChange} label={pushStr} />}
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'mention']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'mention']} onChange={onChange} label={soundStr} />
@@ -94,7 +114,7 @@ export default class ColumnSettings extends React.PureComponent {
           <span id='notifications-reblog' className='column-settings__section'><FormattedMessage id='notifications.column_settings.reblog' defaultMessage='Boosts:' /></span>
 
           <div className='column-settings__row'>
-            <SettingToggle prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'reblog']} onChange={onChange} label={alertStr} />
+            <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'reblog']} onChange={onChange} label={alertStr} />
             {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'reblog']} onChange={this.onPushChange} label={pushStr} />}
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'reblog']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'reblog']} onChange={onChange} label={soundStr} />
@@ -105,12 +125,23 @@ export default class ColumnSettings extends React.PureComponent {
           <span id='notifications-poll' className='column-settings__section'><FormattedMessage id='notifications.column_settings.poll' defaultMessage='Poll results:' /></span>
 
           <div className='column-settings__row'>
-            <SettingToggle prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'poll']} onChange={onChange} label={alertStr} />
+            <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'poll']} onChange={onChange} label={alertStr} />
             {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'poll']} onChange={this.onPushChange} label={pushStr} />}
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'poll']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'poll']} onChange={onChange} label={soundStr} />
           </div>
         </div>
+
+        <div role='group' aria-labelledby='notifications-status'>
+          <span id='notifications-status' className='column-settings__section'><FormattedMessage id='notifications.column_settings.status' defaultMessage='New toots:' /></span>
+
+          <div className='column-settings__row'>
+            <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'status']} onChange={onChange} label={alertStr} />
+            {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'status']} onChange={this.onPushChange} label={pushStr} />}
+            <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'status']} onChange={onChange} label={showStr} />
+            <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'status']} onChange={onChange} label={soundStr} />
+          </div>
+        </div>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/notifications/components/filter_bar.js b/app/javascript/mastodon/features/notifications/components/filter_bar.js
index 2fd28d832678d3425477b6549904504ae5ae4991..368eb0b7e6c0fa5afcfd730c23dc2757e5ba988e 100644
--- a/app/javascript/mastodon/features/notifications/components/filter_bar.js
+++ b/app/javascript/mastodon/features/notifications/components/filter_bar.js
@@ -9,6 +9,7 @@ const tooltips = defineMessages({
   boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Boosts' },
   polls: { id: 'notifications.filter.polls', defaultMessage: 'Poll results' },
   follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' },
+  statuses: { id: 'notifications.filter.statuses', defaultMessage: 'Updates from people you follow' },
 });
 
 export default @injectIntl
@@ -87,6 +88,13 @@ class FilterBar extends React.PureComponent {
         >
           <Icon id='tasks' fixedWidth />
         </button>
+        <button
+          className={selectedFilter === 'status' ? 'active' : ''}
+          onClick={this.onClick('status')}
+          title={intl.formatMessage(tooltips.statuses)}
+        >
+          <Icon id='home' fixedWidth />
+        </button>
         <button
           className={selectedFilter === 'follow' ? 'active' : ''}
           onClick={this.onClick('follow')}
diff --git a/app/javascript/mastodon/features/notifications/components/grant_permission_button.js b/app/javascript/mastodon/features/notifications/components/grant_permission_button.js
new file mode 100644
index 0000000000000000000000000000000000000000..798e4c7872b24d1eeb9a263bbd39dad4b92d5994
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/grant_permission_button.js
@@ -0,0 +1,19 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormattedMessage } from 'react-intl';
+
+export default class GrantPermissionButton extends React.PureComponent {
+
+  static propTypes = {
+    onClick: PropTypes.func.isRequired,
+  };
+
+  render () {
+    return (
+      <button className='text-btn column-header__permission-btn' tabIndex='0' onClick={this.props.onClick}>
+        <FormattedMessage id='notifications.grant_permission' defaultMessage='Grant permission.' />
+      </button>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/notifications/components/notification.js b/app/javascript/mastodon/features/notifications/components/notification.js
index 74065e5e2686e421f4349934f4c93a4fa8c5e0b3..94fdbd6f4539f23d8cc3712afd8613dae96bc6a0 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.js
+++ b/app/javascript/mastodon/features/notifications/components/notification.js
@@ -10,6 +10,7 @@ import AccountContainer from 'mastodon/containers/account_container';
 import FollowRequestContainer from '../containers/follow_request_container';
 import Icon from 'mastodon/components/icon';
 import Permalink from 'mastodon/components/permalink';
+import classNames from 'classnames';
 
 const messages = defineMessages({
   favourite: { id: 'notification.favourite', defaultMessage: '{name} favourited your status' },
@@ -17,6 +18,7 @@ const messages = defineMessages({
   ownPoll: { id: 'notification.own_poll', defaultMessage: 'Your poll has ended' },
   poll: { id: 'notification.poll', defaultMessage: 'A poll you have voted in has ended' },
   reblog: { id: 'notification.reblog', defaultMessage: '{name} boosted your status' },
+  status: { id: 'notification.status', defaultMessage: '{name} just posted' },
 });
 
 const notificationForScreenReader = (intl, message, timestamp) => {
@@ -49,6 +51,7 @@ class Notification extends ImmutablePureComponent {
     updateScrollBottom: PropTypes.func,
     cacheMediaWidth: PropTypes.func,
     cachedMediaWidth: PropTypes.number,
+    unread: PropTypes.bool,
   };
 
   handleMoveUp = () => {
@@ -113,11 +116,11 @@ class Notification extends ImmutablePureComponent {
   }
 
   renderFollow (notification, account, link) {
-    const { intl } = this.props;
+    const { intl, unread } = this.props;
 
     return (
       <HotKeys handlers={this.getHandlers()}>
-        <div className='notification notification-follow focusable' tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.follow, { name: account.get('acct') }), notification.get('created_at'))}>
+        <div className={classNames('notification notification-follow focusable', { unread })} tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.follow, { name: account.get('acct') }), notification.get('created_at'))}>
           <div className='notification__message'>
             <div className='notification__favourite-icon-wrapper'>
               <Icon id='user-plus' fixedWidth />
@@ -135,11 +138,11 @@ class Notification extends ImmutablePureComponent {
   }
 
   renderFollowRequest (notification, account, link) {
-    const { intl } = this.props;
+    const { intl, unread } = this.props;
 
     return (
       <HotKeys handlers={this.getHandlers()}>
-        <div className='notification notification-follow-request focusable' tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage({ id: 'notification.follow_request', defaultMessage: '{name} has requested to follow you' }, { name: account.get('acct') }), notification.get('created_at'))}>
+        <div className={classNames('notification notification-follow-request focusable', { unread })} tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage({ id: 'notification.follow_request', defaultMessage: '{name} has requested to follow you' }, { name: account.get('acct') }), notification.get('created_at'))}>
           <div className='notification__message'>
             <div className='notification__favourite-icon-wrapper'>
               <Icon id='user' fixedWidth />
@@ -169,16 +172,17 @@ class Notification extends ImmutablePureComponent {
         updateScrollBottom={this.props.updateScrollBottom}
         cachedMediaWidth={this.props.cachedMediaWidth}
         cacheMediaWidth={this.props.cacheMediaWidth}
+        unread={this.props.unread}
       />
     );
   }
 
   renderFavourite (notification, link) {
-    const { intl } = this.props;
+    const { intl, unread } = this.props;
 
     return (
       <HotKeys handlers={this.getHandlers()}>
-        <div className='notification notification-favourite focusable' tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.favourite, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
+        <div className={classNames('notification notification-favourite focusable', { unread })} tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.favourite, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
           <div className='notification__message'>
             <div className='notification__favourite-icon-wrapper'>
               <Icon id='star' className='star-icon' fixedWidth />
@@ -206,11 +210,11 @@ class Notification extends ImmutablePureComponent {
   }
 
   renderReblog (notification, link) {
-    const { intl } = this.props;
+    const { intl, unread } = this.props;
 
     return (
       <HotKeys handlers={this.getHandlers()}>
-        <div className='notification notification-reblog focusable' tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.reblog, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
+        <div className={classNames('notification notification-reblog focusable', { unread })} tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.reblog, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
           <div className='notification__message'>
             <div className='notification__favourite-icon-wrapper'>
               <Icon id='retweet' fixedWidth />
@@ -237,14 +241,46 @@ class Notification extends ImmutablePureComponent {
     );
   }
 
+  renderStatus (notification, link) {
+    const { intl, unread } = this.props;
+
+    return (
+      <HotKeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-status focusable', { unread })} tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.status, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
+          <div className='notification__message'>
+            <div className='notification__favourite-icon-wrapper'>
+              <Icon id='home' fixedWidth />
+            </div>
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.status' defaultMessage='{name} just posted' values={{ name: link }} />
+            </span>
+          </div>
+
+          <StatusContainer
+            id={notification.get('status')}
+            account={notification.get('account')}
+            muted
+            withDismiss
+            hidden={this.props.hidden}
+            getScrollPosition={this.props.getScrollPosition}
+            updateScrollBottom={this.props.updateScrollBottom}
+            cachedMediaWidth={this.props.cachedMediaWidth}
+            cacheMediaWidth={this.props.cacheMediaWidth}
+          />
+        </div>
+      </HotKeys>
+    );
+  }
+
   renderPoll (notification, account) {
-    const { intl } = this.props;
+    const { intl, unread } = this.props;
     const ownPoll  = me === account.get('id');
     const message  = ownPoll ? intl.formatMessage(messages.ownPoll) : intl.formatMessage(messages.poll);
 
     return (
       <HotKeys handlers={this.getHandlers()}>
-        <div className='notification notification-poll focusable' tabIndex='0' aria-label={notificationForScreenReader(intl, message, notification.get('created_at'))}>
+        <div className={classNames('notification notification-poll focusable', { unread })} tabIndex='0' aria-label={notificationForScreenReader(intl, message, notification.get('created_at'))}>
           <div className='notification__message'>
             <div className='notification__favourite-icon-wrapper'>
               <Icon id='tasks' fixedWidth />
@@ -292,6 +328,8 @@ class Notification extends ImmutablePureComponent {
       return this.renderFavourite(notification, link);
     case 'reblog':
       return this.renderReblog(notification, link);
+    case 'status':
+      return this.renderStatus(notification, link);
     case 'poll':
       return this.renderPoll(notification, account);
     }
diff --git a/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.js b/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.js
new file mode 100644
index 0000000000000000000000000000000000000000..df9b7fb1b82561e44161d1446f21b80ba42873d4
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.js
@@ -0,0 +1,48 @@
+import React from 'react';
+import Icon from 'mastodon/components/icon';
+import Button from 'mastodon/components/button';
+import IconButton from 'mastodon/components/icon_button';
+import { requestBrowserPermission } from 'mastodon/actions/notifications';
+import { changeSetting } from 'mastodon/actions/settings';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+
+const messages = defineMessages({
+  close: { id: 'lightbox.close', defaultMessage: 'Close' },
+});
+
+export default @connect()
+@injectIntl
+class NotificationsPermissionBanner extends React.PureComponent {
+
+  static propTypes = {
+    dispatch: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+  };
+
+  handleClick = () => {
+    this.props.dispatch(requestBrowserPermission());
+  }
+
+  handleClose = () => {
+    this.props.dispatch(changeSetting(['notifications', 'dismissPermissionBanner'], true));
+  }
+
+  render () {
+    const { intl } = this.props;
+
+    return (
+      <div className='notifications-permission-banner'>
+        <div className='notifications-permission-banner__close'>
+          <IconButton icon='times' onClick={this.handleClose} title={intl.formatMessage(messages.close)} />
+        </div>
+
+        <h2><FormattedMessage id='notifications_permission_banner.title' defaultMessage='Never miss a thing' /></h2>
+        <p><FormattedMessage id='notifications_permission_banner.how_to_control' defaultMessage="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." values={{ icon: <Icon id='sliders' /> }} /></p>
+        <Button onClick={this.handleClick}><FormattedMessage id='notifications_permission_banner.enable' defaultMessage='Enable desktop notifications' /></Button>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/notifications/components/setting_toggle.js b/app/javascript/mastodon/features/notifications/components/setting_toggle.js
index e6f593ef89f606375cb88e0ca82f26045ffcb232..c4c8bffbe3240f9ce8f2124e71dcaaf93d3f33d6 100644
--- a/app/javascript/mastodon/features/notifications/components/setting_toggle.js
+++ b/app/javascript/mastodon/features/notifications/components/setting_toggle.js
@@ -12,6 +12,7 @@ export default class SettingToggle extends React.PureComponent {
     label: PropTypes.node.isRequired,
     onChange: PropTypes.func.isRequired,
     defaultValue: PropTypes.bool,
+    disabled: PropTypes.bool,
   }
 
   onChange = ({ target }) => {
@@ -19,12 +20,12 @@ export default class SettingToggle extends React.PureComponent {
   }
 
   render () {
-    const { prefix, settings, settingPath, label, defaultValue } = this.props;
+    const { prefix, settings, settingPath, label, defaultValue, disabled } = this.props;
     const id = ['setting-toggle', prefix, ...settingPath].filter(Boolean).join('-');
 
     return (
       <div className='setting-toggle'>
-        <Toggle id={id} checked={settings.getIn(settingPath, defaultValue)} onChange={this.onChange} onKeyDown={this.onKeyDown} />
+        <Toggle disabled={disabled} id={id} checked={settings.getIn(settingPath, defaultValue)} onChange={this.onChange} onKeyDown={this.onKeyDown} />
         <label htmlFor={id} className='setting-toggle__label'>{label}</label>
       </div>
     );
diff --git a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
index a67f262953f6a6c2ef6b6b93a1cfee1698825f89..9a70bd4f36136c215e2f7017e0959474b26ef899 100644
--- a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
@@ -3,28 +3,55 @@ import { defineMessages, injectIntl } from 'react-intl';
 import ColumnSettings from '../components/column_settings';
 import { changeSetting } from '../../../actions/settings';
 import { setFilter } from '../../../actions/notifications';
-import { clearNotifications } from '../../../actions/notifications';
+import { clearNotifications, requestBrowserPermission } from '../../../actions/notifications';
 import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
 import { openModal } from '../../../actions/modal';
+import { showAlert } from '../../../actions/alerts';
 
 const messages = defineMessages({
   clearMessage: { id: 'notifications.clear_confirmation', defaultMessage: 'Are you sure you want to permanently clear all your notifications?' },
   clearConfirm: { id: 'notifications.clear', defaultMessage: 'Clear notifications' },
+  permissionDenied: { id: 'notifications.permission_denied_alert', defaultMessage: 'Desktop notifications can\'t be enabled, as browser permission has been denied before' },
 });
 
 const mapStateToProps = state => ({
   settings: state.getIn(['settings', 'notifications']),
   pushSettings: state.get('push_notifications'),
+  alertsEnabled: state.getIn(['settings', 'notifications', 'alerts']).includes(true),
+  browserSupport: state.getIn(['notifications', 'browserSupport']),
+  browserPermission: state.getIn(['notifications', 'browserPermission']),
 });
 
 const mapDispatchToProps = (dispatch, { intl }) => ({
 
   onChange (path, checked) {
     if (path[0] === 'push') {
-      dispatch(changePushNotifications(path.slice(1), checked));
+      if (checked && typeof window.Notification !== 'undefined' && Notification.permission !== 'granted') {
+        dispatch(requestBrowserPermission((permission) => {
+          if (permission === 'granted') {
+            dispatch(changePushNotifications(path.slice(1), checked));
+          } else {
+            dispatch(showAlert(undefined, messages.permissionDenied));
+          }
+        }));
+      } else {
+        dispatch(changePushNotifications(path.slice(1), checked));
+      }
     } else if (path[0] === 'quickFilter') {
       dispatch(changeSetting(['notifications', ...path], checked));
       dispatch(setFilter('all'));
+    } else if (path[0] === 'alerts' && checked && typeof window.Notification !== 'undefined' && Notification.permission !== 'granted') {
+      if (checked && typeof window.Notification !== 'undefined' && Notification.permission !== 'granted') {
+        dispatch(requestBrowserPermission((permission) => {
+          if (permission === 'granted') {
+            dispatch(changeSetting(['notifications', ...path], checked));
+          } else {
+            dispatch(showAlert(undefined, messages.permissionDenied));
+          }
+        }));
+      } else {
+        dispatch(changeSetting(['notifications', ...path], checked));
+      }
     } else {
       dispatch(changeSetting(['notifications', ...path], checked));
     }
@@ -38,6 +65,10 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }));
   },
 
+  onRequestNotificationPermission () {
+    dispatch(requestBrowserPermission());
+  },
+
 });
 
 export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(ColumnSettings));
diff --git a/app/javascript/mastodon/features/notifications/index.js b/app/javascript/mastodon/features/notifications/index.js
index d16a0f33a4e1fb984ac649738533d14a43af3090..108470c9a71377face79f9a1ebe97a58c2c27da2 100644
--- a/app/javascript/mastodon/features/notifications/index.js
+++ b/app/javascript/mastodon/features/notifications/index.js
@@ -4,7 +4,15 @@ import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import Column from '../../components/column';
 import ColumnHeader from '../../components/column_header';
-import { expandNotifications, scrollTopNotifications, loadPending, mountNotifications, unmountNotifications } from '../../actions/notifications';
+import {
+  expandNotifications,
+  scrollTopNotifications,
+  loadPending,
+  mountNotifications,
+  unmountNotifications,
+  markNotificationsAsRead,
+} from '../../actions/notifications';
+import { submitMarkers } from '../../actions/markers';
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
 import NotificationContainer from './containers/notification_container';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
@@ -15,15 +23,25 @@ import { List as ImmutableList } from 'immutable';
 import { debounce } from 'lodash';
 import ScrollableList from '../../components/scrollable_list';
 import LoadGap from '../../components/load_gap';
+import Icon from 'mastodon/components/icon';
+import compareId from 'mastodon/compare_id';
+import NotificationsPermissionBanner from './components/notifications_permission_banner';
 
 const messages = defineMessages({
   title: { id: 'column.notifications', defaultMessage: 'Notifications' },
+  markAsRead : { id: 'notifications.mark_as_read', defaultMessage: 'Mark every notification as read' },
+});
+
+const getExcludedTypes = createSelector([
+  state => state.getIn(['settings', 'notifications', 'shows']),
+], (shows) => {
+  return ImmutableList(shows.filter(item => !item).keys());
 });
 
 const getNotifications = createSelector([
   state => state.getIn(['settings', 'notifications', 'quickFilter', 'show']),
   state => state.getIn(['settings', 'notifications', 'quickFilter', 'active']),
-  state => ImmutableList(state.getIn(['settings', 'notifications', 'shows']).filter(item => !item).keys()),
+  getExcludedTypes,
   state => state.getIn(['notifications', 'items']),
 ], (showFilterBar, allowedType, excludedTypes, notifications) => {
   if (!showFilterBar || allowedType === 'all') {
@@ -32,7 +50,7 @@ const getNotifications = createSelector([
     // we need to turn it off for FilterBar in order not to block ourselves from seeing a specific category
     return notifications.filterNot(item => item !== null && excludedTypes.includes(item.get('type')));
   }
-  return notifications.filter(item => item !== null && allowedType === item.get('type'));
+  return notifications.filter(item => item === null || allowedType === item.get('type'));
 });
 
 const mapStateToProps = state => ({
@@ -42,6 +60,9 @@ const mapStateToProps = state => ({
   isUnread: state.getIn(['notifications', 'unread']) > 0 || state.getIn(['notifications', 'pendingItems']).size > 0,
   hasMore: state.getIn(['notifications', 'hasMore']),
   numPending: state.getIn(['notifications', 'pendingItems'], ImmutableList()).size,
+  lastReadId: state.getIn(['notifications', 'readMarkerId']),
+  canMarkAsRead: state.getIn(['notifications', 'readMarkerId']) !== '0' && getNotifications(state).some(item => item !== null && compareId(item.get('id'), state.getIn(['notifications', 'readMarkerId'])) > 0),
+  needsNotificationPermission: state.getIn(['settings', 'notifications', 'alerts']).includes(true) && state.getIn(['notifications', 'browserSupport']) && state.getIn(['notifications', 'browserPermission']) === 'default' && !state.getIn(['settings', 'notifications', 'dismissPermissionBanner']),
 });
 
 export default @connect(mapStateToProps)
@@ -60,6 +81,9 @@ class Notifications extends React.PureComponent {
     multiColumn: PropTypes.bool,
     hasMore: PropTypes.bool,
     numPending: PropTypes.number,
+    lastReadId: PropTypes.string,
+    canMarkAsRead: PropTypes.bool,
+    needsNotificationPermission: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -146,8 +170,13 @@ class Notifications extends React.PureComponent {
     }
   }
 
+  handleMarkAsRead = () => {
+    this.props.dispatch(markNotificationsAsRead());
+    this.props.dispatch(submitMarkers({ immediate: true }));
+  };
+
   render () {
-    const { intl, notifications, shouldUpdateScroll, isLoading, isUnread, columnId, multiColumn, hasMore, numPending, showFilterBar } = this.props;
+    const { intl, notifications, shouldUpdateScroll, isLoading, isUnread, columnId, multiColumn, hasMore, numPending, showFilterBar, lastReadId, canMarkAsRead, needsNotificationPermission } = this.props;
     const pinned = !!columnId;
     const emptyMessage = <FormattedMessage id='empty_column.notifications' defaultMessage="You don't have any notifications yet. Interact with others to start the conversation." />;
 
@@ -174,6 +203,7 @@ class Notifications extends React.PureComponent {
           accountId={item.get('account')}
           onMoveUp={this.handleMoveUp}
           onMoveDown={this.handleMoveDown}
+          unread={lastReadId !== '0' && compareId(item.get('id'), lastReadId) > 0}
         />
       ));
     } else {
@@ -190,6 +220,8 @@ class Notifications extends React.PureComponent {
         showLoading={isLoading && notifications.size === 0}
         hasMore={hasMore}
         numPending={numPending}
+        prepend={needsNotificationPermission && <NotificationsPermissionBanner />}
+        alwaysPrepend
         emptyMessage={emptyMessage}
         onLoadMore={this.handleLoadOlder}
         onLoadPending={this.handleLoadPending}
@@ -202,6 +234,21 @@ class Notifications extends React.PureComponent {
       </ScrollableList>
     );
 
+    let extraButton = null;
+
+    if (canMarkAsRead) {
+      extraButton = (
+        <button
+          aria-label={intl.formatMessage(messages.markAsRead)}
+          title={intl.formatMessage(messages.markAsRead)}
+          onClick={this.handleMarkAsRead}
+          className='column-header__button'
+        >
+          <Icon id='check' />
+        </button>
+      );
+    }
+
     return (
       <Column bindToDocument={!multiColumn} ref={this.setColumnRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
@@ -213,6 +260,7 @@ class Notifications extends React.PureComponent {
           onClick={this.handleHeaderClick}
           pinned={pinned}
           multiColumn={multiColumn}
+          extraButton={extraButton}
         >
           <ColumnSettingsContainer />
         </ColumnHeader>
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.js b/app/javascript/mastodon/features/picture_in_picture/components/footer.js
new file mode 100644
index 0000000000000000000000000000000000000000..1b1ec6d5434b8b5e015745843f9009846ad82aed
--- /dev/null
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.js
@@ -0,0 +1,159 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import PropTypes from 'prop-types';
+import IconButton from 'mastodon/components/icon_button';
+import classNames from 'classnames';
+import { me, boostModal } from 'mastodon/initial_state';
+import { defineMessages, injectIntl } from 'react-intl';
+import { replyCompose } from 'mastodon/actions/compose';
+import { reblog, favourite, unreblog, unfavourite } from 'mastodon/actions/interactions';
+import { makeGetStatus } from 'mastodon/selectors';
+import { openModal } from 'mastodon/actions/modal';
+
+const messages = defineMessages({
+  reply: { id: 'status.reply', defaultMessage: 'Reply' },
+  replyAll: { id: 'status.replyAll', defaultMessage: 'Reply to thread' },
+  reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
+  reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
+  cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
+  cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
+  favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
+  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
+  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
+  open: { id: 'status.open', defaultMessage: 'Expand this status' },
+});
+
+const makeMapStateToProps = () => {
+  const getStatus = makeGetStatus();
+
+  const mapStateToProps = (state, { statusId }) => ({
+    status: getStatus(state, { id: statusId }),
+    askReplyConfirmation: state.getIn(['compose', 'text']).trim().length !== 0,
+  });
+
+  return mapStateToProps;
+};
+
+export default @connect(makeMapStateToProps)
+@injectIntl
+class Footer extends ImmutablePureComponent {
+
+  static contextTypes = {
+    router: PropTypes.object,
+  };
+
+  static propTypes = {
+    statusId: PropTypes.string.isRequired,
+    status: ImmutablePropTypes.map.isRequired,
+    intl: PropTypes.object.isRequired,
+    dispatch: PropTypes.func.isRequired,
+    askReplyConfirmation: PropTypes.bool,
+    withOpenButton: PropTypes.bool,
+    onClose: PropTypes.func,
+  };
+
+  _performReply = () => {
+    const { dispatch, status, onClose } = this.props;
+    const { router } = this.context;
+
+    if (onClose) {
+      onClose();
+    }
+
+    dispatch(replyCompose(status, router.history));
+  };
+
+  handleReplyClick = () => {
+    const { dispatch, askReplyConfirmation, intl } = this.props;
+
+    if (askReplyConfirmation) {
+      dispatch(openModal('CONFIRM', {
+        message: intl.formatMessage(messages.replyMessage),
+        confirm: intl.formatMessage(messages.replyConfirm),
+        onConfirm: this._performReply,
+      }));
+    } else {
+      this._performReply();
+    }
+  };
+
+  handleFavouriteClick = () => {
+    const { dispatch, status } = this.props;
+
+    if (status.get('favourited')) {
+      dispatch(unfavourite(status));
+    } else {
+      dispatch(favourite(status));
+    }
+  };
+
+  _performReblog = () => {
+    const { dispatch, status } = this.props;
+    dispatch(reblog(status));
+  }
+
+  handleReblogClick = e => {
+    const { dispatch, status } = this.props;
+
+    if (status.get('reblogged')) {
+      dispatch(unreblog(status));
+    } else if ((e && e.shiftKey) || !boostModal) {
+      this._performReblog();
+    } else {
+      dispatch(openModal('BOOST', { status, onReblog: this._performReblog }));
+    }
+  };
+
+  handleOpenClick = e => {
+    const { router } = this.context;
+
+    if (e.button !== 0 || !router) {
+      return;
+    }
+
+    const { status } = this.props;
+
+    router.history.push(`/statuses/${status.get('id')}`);
+  }
+
+  render () {
+    const { status, intl, withOpenButton } = this.props;
+
+    const publicStatus  = ['public', 'unlisted'].includes(status.get('visibility'));
+    const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility') === 'private';
+
+    let replyIcon, replyTitle;
+
+    if (status.get('in_reply_to_id', null) === null) {
+      replyIcon = 'reply';
+      replyTitle = intl.formatMessage(messages.reply);
+    } else {
+      replyIcon = 'reply-all';
+      replyTitle = intl.formatMessage(messages.replyAll);
+    }
+
+    let reblogTitle = '';
+
+    if (status.get('reblogged')) {
+      reblogTitle = intl.formatMessage(messages.cancel_reblog_private);
+    } else if (publicStatus) {
+      reblogTitle = intl.formatMessage(messages.reblog);
+    } else if (reblogPrivate) {
+      reblogTitle = intl.formatMessage(messages.reblog_private);
+    } else {
+      reblogTitle = intl.formatMessage(messages.cannot_reblog);
+    }
+
+    return (
+      <div className='picture-in-picture__footer'>
+        <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
+        <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} counter={status.get('reblogs_count')} />
+        <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={status.get('favourites_count')} />
+        {withOpenButton && <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.open)} icon='external-link' onClick={this.handleOpenClick} />}
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/header.js b/app/javascript/mastodon/features/picture_in_picture/components/header.js
new file mode 100644
index 0000000000000000000000000000000000000000..7dd199b75256278129a2076120be8e60f0449620
--- /dev/null
+++ b/app/javascript/mastodon/features/picture_in_picture/components/header.js
@@ -0,0 +1,47 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import PropTypes from 'prop-types';
+import IconButton from 'mastodon/components/icon_button';
+import { Link } from 'react-router-dom';
+import Avatar from 'mastodon/components/avatar';
+import DisplayName from 'mastodon/components/display_name';
+import { defineMessages, injectIntl } from 'react-intl';
+
+const messages = defineMessages({
+  close: { id: 'lightbox.close', defaultMessage: 'Close' },
+});
+
+const mapStateToProps = (state, { accountId }) => ({
+  account: state.getIn(['accounts', accountId]),
+});
+
+export default @connect(mapStateToProps)
+@injectIntl
+class Header extends ImmutablePureComponent {
+
+  static propTypes = {
+    accountId: PropTypes.string.isRequired,
+    statusId: PropTypes.string.isRequired,
+    account: ImmutablePropTypes.map.isRequired,
+    onClose: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+  };
+
+  render () {
+    const { account, statusId, onClose, intl } = this.props;
+
+    return (
+      <div className='picture-in-picture__header'>
+        <Link to={`/statuses/${statusId}`} className='picture-in-picture__header__account'>
+          <Avatar account={account} size={36} />
+          <DisplayName account={account} />
+        </Link>
+
+        <IconButton icon='times' onClick={onClose} title={intl.formatMessage(messages.close)} />
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/picture_in_picture/index.js b/app/javascript/mastodon/features/picture_in_picture/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..1e59fbcd3376c46589d8ff2421dcd463e0c7313a
--- /dev/null
+++ b/app/javascript/mastodon/features/picture_in_picture/index.js
@@ -0,0 +1,85 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+import Video from 'mastodon/features/video';
+import Audio from 'mastodon/features/audio';
+import { removePictureInPicture } from 'mastodon/actions/picture_in_picture';
+import Header from './components/header';
+import Footer from './components/footer';
+
+const mapStateToProps = state => ({
+  ...state.get('picture_in_picture'),
+});
+
+export default @connect(mapStateToProps)
+class PictureInPicture extends React.Component {
+
+  static propTypes = {
+    statusId: PropTypes.string,
+    accountId: PropTypes.string,
+    type: PropTypes.string,
+    src: PropTypes.string,
+    muted: PropTypes.bool,
+    volume: PropTypes.number,
+    currentTime: PropTypes.number,
+    poster: PropTypes.string,
+    backgroundColor: PropTypes.string,
+    foregroundColor: PropTypes.string,
+    accentColor: PropTypes.string,
+    dispatch: PropTypes.func.isRequired,
+  };
+
+  handleClose = () => {
+    const { dispatch } = this.props;
+    dispatch(removePictureInPicture());
+  }
+
+  render () {
+    const { type, src, currentTime, accountId, statusId } = this.props;
+
+    if (!currentTime) {
+      return null;
+    }
+
+    let player;
+
+    if (type === 'video') {
+      player = (
+        <Video
+          src={src}
+          currentTime={this.props.currentTime}
+          volume={this.props.volume}
+          muted={this.props.muted}
+          autoPlay
+          inline
+          alwaysVisible
+        />
+      );
+    } else if (type === 'audio') {
+      player = (
+        <Audio
+          src={src}
+          currentTime={this.props.currentTime}
+          volume={this.props.volume}
+          muted={this.props.muted}
+          poster={this.props.poster}
+          backgroundColor={this.props.backgroundColor}
+          foregroundColor={this.props.foregroundColor}
+          accentColor={this.props.accentColor}
+          autoPlay
+        />
+      );
+    }
+
+    return (
+      <div className='picture-in-picture'>
+        <Header accountId={accountId} statusId={statusId} onClose={this.handleClose} />
+
+        {player}
+
+        <Footer statusId={statusId} />
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 1c5d5ca0cae570389df7ae157644ea6962115315..d7d504bc57f8e51794beca7ea58efd6e14d8fa56 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -6,6 +6,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
 import { defineMessages, injectIntl } from 'react-intl';
 import { me, isStaff } from '../../../initial_state';
+import classNames from 'classnames';
 
 const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
@@ -14,7 +15,7 @@ const messages = defineMessages({
   mention: { id: 'status.mention', defaultMessage: 'Mention @{name}' },
   reply: { id: 'status.reply', defaultMessage: 'Reply' },
   reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
-  reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost to original audience' },
+  reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
@@ -273,7 +274,7 @@ class ActionBar extends React.PureComponent {
     return (
       <div className='detailed-status__action-bar'>
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /></div>
-        <div className='detailed-status__button'><IconButton disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
+        <div className='detailed-status__button' ><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
         {shareButton}
         <div className='detailed-status__button'><IconButton className='bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index b1ae0b2cc14afe87ae4d29f655a3bb46907b2126..043a749ede24bec317d69fb2a8874e906f84b49d 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -15,6 +15,7 @@ import scheduleIdleTask from '../../ui/util/schedule_idle_task';
 import classNames from 'classnames';
 import Icon from 'mastodon/components/icon';
 import AnimatedNumber from 'mastodon/components/animated_number';
+import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
 
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
@@ -40,6 +41,10 @@ class DetailedStatus extends ImmutablePureComponent {
     domain: PropTypes.string.isRequired,
     compact: PropTypes.bool,
     showMedia: PropTypes.bool,
+    pictureInPicture: ImmutablePropTypes.contains({
+      inUse: PropTypes.bool,
+      available: PropTypes.bool,
+    }),
     onToggleMediaVisibility: PropTypes.func,
   };
 
@@ -56,8 +61,8 @@ class DetailedStatus extends ImmutablePureComponent {
     e.stopPropagation();
   }
 
-  handleOpenVideo = (media, options) => {
-    this.props.onOpenVideo(media, options);
+  handleOpenVideo = (options) => {
+    this.props.onOpenVideo(this.props.status.getIn(['media_attachments', 0]), options);
   }
 
   handleExpandedToggle = () => {
@@ -100,7 +105,7 @@ class DetailedStatus extends ImmutablePureComponent {
   render () {
     const status = (this.props.status && this.props.status.get('reblog')) ? this.props.status.get('reblog') : this.props.status;
     const outerStyle = { boxSizing: 'border-box' };
-    const { intl, compact } = this.props;
+    const { intl, compact, pictureInPicture } = this.props;
 
     if (!status) {
       return null;
@@ -116,7 +121,9 @@ class DetailedStatus extends ImmutablePureComponent {
       outerStyle.height = `${this.state.height}px`;
     }
 
-    if (status.get('media_attachments').size > 0) {
+    if (pictureInPicture.get('inUse')) {
+      media = <PictureInPicturePlaceholder />;
+    } else if (status.get('media_attachments').size > 0) {
       if (status.getIn(['media_attachments', 0, 'type']) === 'audio') {
         const attachment = status.getIn(['media_attachments', 0]);
 
@@ -138,6 +145,7 @@ class DetailedStatus extends ImmutablePureComponent {
         media = (
           <Video
             preview={attachment.get('preview_url')}
+            frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
             blurhash={attachment.get('blurhash')}
             src={attachment.get('url')}
             alt={attachment.get('description')}
diff --git a/app/javascript/mastodon/features/status/containers/detailed_status_container.js b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
index 6d5c33240e1a9d668e972de6858406beb5a185c3..0ac4519c89839d6f41140425452bae225d2491bc 100644
--- a/app/javascript/mastodon/features/status/containers/detailed_status_container.js
+++ b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import DetailedStatus from '../components/detailed_status';
-import { makeGetStatus } from '../../../selectors';
+import { makeGetStatus, makeGetPictureInPicture } from '../../../selectors';
 import {
   replyCompose,
   mentionCompose,
@@ -40,10 +40,12 @@ const messages = defineMessages({
 
 const makeMapStateToProps = () => {
   const getStatus = makeGetStatus();
+  const getPictureInPicture = makeGetPictureInPicture();
 
   const mapStateToProps = (state, props) => ({
     status: getStatus(state, props),
     domain: state.getIn(['meta', 'domain']),
+    pictureInPicture: getPictureInPicture(state, props),
   });
 
   return mapStateToProps;
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index 179df53a16de226ed883ea58056b5f459672fe47..09822f372a474c74e4d12705ff20e9f087dfca2d 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -43,7 +43,7 @@ import {
 import { initMuteModal } from '../../actions/mutes';
 import { initBlockModal } from '../../actions/blocks';
 import { initReport } from '../../actions/reports';
-import { makeGetStatus } from '../../selectors';
+import { makeGetStatus, makeGetPictureInPicture } from '../../selectors';
 import { ScrollContainer } from 'react-router-scroll-4';
 import ColumnBackButton from '../../components/column_back_button';
 import ColumnHeader from '../../components/column_header';
@@ -72,6 +72,7 @@ const messages = defineMessages({
 
 const makeMapStateToProps = () => {
   const getStatus = makeGetStatus();
+  const getPictureInPicture = makeGetPictureInPicture();
 
   const getAncestorsIds = createSelector([
     (_, { id }) => id,
@@ -129,11 +130,12 @@ const makeMapStateToProps = () => {
 
   const mapStateToProps = (state, props) => {
     const status = getStatus(state, { id: props.params.statusId });
-    let ancestorsIds = Immutable.List();
+
+    let ancestorsIds   = Immutable.List();
     let descendantsIds = Immutable.List();
 
     if (status) {
-      ancestorsIds = getAncestorsIds(state, { id: status.get('in_reply_to_id') });
+      ancestorsIds   = getAncestorsIds(state, { id: status.get('in_reply_to_id') });
       descendantsIds = getDescendantsIds(state, { id: status.get('id') });
     }
 
@@ -143,6 +145,7 @@ const makeMapStateToProps = () => {
       descendantsIds,
       askReplyConfirmation: state.getIn(['compose', 'text']).trim().length !== 0,
       domain: state.getIn(['meta', 'domain']),
+      pictureInPicture: getPictureInPicture(state, { id: props.params.statusId }),
     };
   };
 
@@ -167,6 +170,10 @@ class Status extends ImmutablePureComponent {
     askReplyConfirmation: PropTypes.bool,
     multiColumn: PropTypes.bool,
     domain: PropTypes.string.isRequired,
+    pictureInPicture: ImmutablePropTypes.contains({
+      inUse: PropTypes.bool,
+      available: PropTypes.bool,
+    }),
   };
 
   state = {
@@ -274,22 +281,20 @@ class Status extends ImmutablePureComponent {
   }
 
   handleOpenMedia = (media, index) => {
-    this.props.dispatch(openModal('MEDIA', { media, index }));
+    this.props.dispatch(openModal('MEDIA', { statusId: this.props.status.get('id'), media, index }));
   }
 
   handleOpenVideo = (media, options) => {
-    this.props.dispatch(openModal('VIDEO', { media, options }));
+    this.props.dispatch(openModal('VIDEO', { statusId: this.props.status.get('id'), media, options }));
   }
 
   handleHotkeyOpenMedia = e => {
-    const status = this._properStatus();
+    const { status } = this.props;
 
     e.preventDefault();
 
     if (status.get('media_attachments').size > 0) {
-      if (status.getIn(['media_attachments', 0, 'type']) === 'audio') {
-        // TODO: toggle play/paused?
-      } else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
+      if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
         this.handleOpenVideo(status.getIn(['media_attachments', 0]), { startTime: 0 });
       } else {
         this.handleOpenMedia(status.get('media_attachments'), 0);
@@ -492,7 +497,7 @@ class Status extends ImmutablePureComponent {
 
   render () {
     let ancestors, descendants;
-    const { shouldUpdateScroll, status, ancestorsIds, descendantsIds, intl, domain, multiColumn } = this.props;
+    const { shouldUpdateScroll, status, ancestorsIds, descendantsIds, intl, domain, multiColumn, pictureInPicture } = this.props;
     const { fullscreen } = this.state;
 
     if (status === null) {
@@ -550,6 +555,7 @@ class Status extends ImmutablePureComponent {
                   domain={domain}
                   showMedia={this.state.showMedia}
                   onToggleMediaVisibility={this.handleToggleMediaVisibility}
+                  pictureInPicture={pictureInPicture}
                 />
 
                 <ActionBar
diff --git a/app/javascript/mastodon/features/ui/components/audio_modal.js b/app/javascript/mastodon/features/ui/components/audio_modal.js
index a80776b2232bc59c1de824effd4532aeb625117a..0676bd9cf1ce2499a7c59114d86d1579e2978fa5 100644
--- a/app/javascript/mastodon/features/ui/components/audio_modal.js
+++ b/app/javascript/mastodon/features/ui/components/audio_modal.js
@@ -4,13 +4,11 @@ import PropTypes from 'prop-types';
 import Audio from 'mastodon/features/audio';
 import { connect } from 'react-redux';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import { FormattedMessage } from 'react-intl';
 import { previewState } from './video_modal';
-import classNames from 'classnames';
-import Icon from 'mastodon/components/icon';
+import Footer from 'mastodon/features/picture_in_picture/components/footer';
 
-const mapStateToProps = (state, { status }) => ({
-  account: state.getIn(['accounts', status.get('account')]),
+const mapStateToProps = (state, { statusId }) => ({
+  accountStaticAvatar: state.getIn(['accounts', state.getIn(['statuses', statusId, 'account']), 'avatar_static']),
 });
 
 export default @connect(mapStateToProps)
@@ -18,12 +16,13 @@ class AudioModal extends ImmutablePureComponent {
 
   static propTypes = {
     media: ImmutablePropTypes.map.isRequired,
-    status: ImmutablePropTypes.map,
+    statusId: PropTypes.string.isRequired,
+    accountStaticAvatar: PropTypes.string.isRequired,
     options: PropTypes.shape({
       autoPlay: PropTypes.bool,
     }),
-    account: ImmutablePropTypes.map,
     onClose: PropTypes.func.isRequired,
+    onChangeBackgroundColor: PropTypes.func.isRequired,
   };
 
   static contextTypes = {
@@ -52,15 +51,8 @@ class AudioModal extends ImmutablePureComponent {
     }
   }
 
-  handleStatusClick = e => {
-    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
-      e.preventDefault();
-      this.context.router.history.push(`/statuses/${this.props.status.get('id')}`);
-    }
-  }
-
   render () {
-    const { media, status, account } = this.props;
+    const { media, accountStaticAvatar, statusId, onClose } = this.props;
     const options = this.props.options || {};
 
     return (
@@ -71,7 +63,7 @@ class AudioModal extends ImmutablePureComponent {
             alt={media.get('description')}
             duration={media.getIn(['meta', 'original', 'duration'], 0)}
             height={150}
-            poster={media.get('preview_url') || account.get('avatar_static')}
+            poster={media.get('preview_url') || accountStaticAvatar}
             backgroundColor={media.getIn(['meta', 'colors', 'background'])}
             foregroundColor={media.getIn(['meta', 'colors', 'foreground'])}
             accentColor={media.getIn(['meta', 'colors', 'accent'])}
@@ -79,11 +71,9 @@ class AudioModal extends ImmutablePureComponent {
           />
         </div>
 
-        {status && (
-          <div className={classNames('media-modal__meta')}>
-            <a href={status.get('url')} onClick={this.handleStatusClick}><Icon id='comments' /> <FormattedMessage id='lightbox.view_context' defaultMessage='View context' /></a>
-          </div>
-        )}
+        <div className='media-modal__overlay'>
+          {statusId && <Footer statusId={statusId} withOpenButton onClose={onClose} />}
+        </div>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.js b/app/javascript/mastodon/features/ui/components/boost_modal.js
index 00c0481f3a598708bb17b25c91e0cedc498e7526..963bb5dc4b5188a5b31af17dc7dfe2708d545bc2 100644
--- a/app/javascript/mastodon/features/ui/components/boost_modal.js
+++ b/app/javascript/mastodon/features/ui/components/boost_modal.js
@@ -75,9 +75,10 @@ class BoostModal extends ImmutablePureComponent {
           <div className={classNames('status', `status-${status.get('visibility')}`, 'light')}>
             <div className='boost-modal__status-header'>
               <div className='boost-modal__status-time'>
-                <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'><RelativeTimestamp timestamp={status.get('created_at')} /></a>
+                <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
+                  <span className='status__visibility-icon'><Icon id={visibilityIcon.icon} title={visibilityIcon.text} /></span>
+                  <RelativeTimestamp timestamp={status.get('created_at')} /></a>
               </div>
-              <span className='status__visibility-icon'><Icon id={visibilityIcon.icon} title={visibilityIcon.text} /></span>
 
               <a onClick={this.handleAccountClick} href={status.getIn(['account', 'url'])} className='status__display-name'>
                 <div className='status__avatar'>
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index 9b03cf26d274a79388f53a1709c6e50c3696fd79..6837450eb583ecbc6491b3fc46238fcc6f235cff 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -8,6 +8,8 @@ import ReactSwipeableViews from 'react-swipeable-views';
 import TabsBar, { links, getIndex, getLink } from './tabs_bar';
 import { Link } from 'react-router-dom';
 
+import { disableSwiping } from 'mastodon/initial_state';
+
 import BundleContainer from '../containers/bundle_container';
 import ColumnLoading from './column_loading';
 import DrawerLoading from './drawer_loading';
@@ -29,7 +31,7 @@ import Icon from 'mastodon/components/icon';
 import ComposePanel from './compose_panel';
 import NavigationPanel from './navigation_panel';
 
-import detectPassiveEvents from 'detect-passive-events';
+import { supportsPassiveEvents } from 'detect-passive-events';
 import { scrollRight } from '../../../scroll';
 
 const componentMap = {
@@ -73,12 +75,14 @@ class ColumnsArea extends ImmutablePureComponent {
   }
 
   componentWillReceiveProps() {
-    this.setState({ shouldAnimate: false });
+    if (typeof this.pendingIndex !== 'number' && this.lastIndex !== getIndex(this.context.router.history.location.pathname)) {
+      this.setState({ shouldAnimate: false });
+    }
   }
 
   componentDidMount() {
     if (!this.props.singleColumn) {
-      this.node.addEventListener('wheel', this.handleWheel,  detectPassiveEvents.hasSupport ? { passive: true } : false);
+      this.node.addEventListener('wheel', this.handleWheel, supportsPassiveEvents ? { passive: true } : false);
     }
 
     this.lastIndex   = getIndex(this.context.router.history.location.pathname);
@@ -95,10 +99,15 @@ class ColumnsArea extends ImmutablePureComponent {
 
   componentDidUpdate(prevProps) {
     if (this.props.singleColumn !== prevProps.singleColumn && !this.props.singleColumn) {
-      this.node.addEventListener('wheel', this.handleWheel,  detectPassiveEvents.hasSupport ? { passive: true } : false);
+      this.node.addEventListener('wheel', this.handleWheel, supportsPassiveEvents ? { passive: true } : false);
+    }
+
+    const newIndex = getIndex(this.context.router.history.location.pathname);
+
+    if (this.lastIndex !== newIndex) {
+      this.lastIndex = newIndex;
+      this.setState({ shouldAnimate: true });
     }
-    this.lastIndex = getIndex(this.context.router.history.location.pathname);
-    this.setState({ shouldAnimate: true });
   }
 
   componentWillUnmount () {
@@ -185,7 +194,7 @@ class ColumnsArea extends ImmutablePureComponent {
       const floatingActionButton = shouldHideFAB(this.context.router.history.location.pathname) ? null : <Link key='floating-action-button' to='/statuses/new' className='floating-action-button' aria-label={intl.formatMessage(messages.publish)}><Icon id='pencil' /></Link>;
 
       const content = columnIndex !== -1 ? (
-        <ReactSwipeableViews key='content' hysteresis={0.2} threshold={15} index={columnIndex} onChangeIndex={this.handleSwipe} onTransitionEnd={this.handleAnimationEnd} animateTransitions={shouldAnimate} springConfig={{ duration: '400ms', delay: '0s', easeFunction: 'ease' }} style={{ height: '100%' }}>
+        <ReactSwipeableViews key='content' hysteresis={0.2} threshold={15} index={columnIndex} onChangeIndex={this.handleSwipe} onTransitionEnd={this.handleAnimationEnd} animateTransitions={shouldAnimate} springConfig={{ duration: '400ms', delay: '0s', easeFunction: 'ease' }} style={{ height: '100%' }} disabled={disableSwiping}>
           {links.map(this.renderView)}
         </ReactSwipeableViews>
       ) : (
diff --git a/app/javascript/mastodon/features/ui/components/focal_point_modal.js b/app/javascript/mastodon/features/ui/components/focal_point_modal.js
index 7348d9599a888ade7484f6ea604c6cde7082d1a8..578375a7f4929d9a70a5c36224eaafbe74ba6856 100644
--- a/app/javascript/mastodon/features/ui/components/focal_point_modal.js
+++ b/app/javascript/mastodon/features/ui/components/focal_point_modal.js
@@ -18,6 +18,11 @@ import { length } from 'stringz';
 import { Tesseract as fetchTesseract } from 'mastodon/features/ui/util/async-components';
 import GIFV from 'mastodon/components/gifv';
 import { me } from 'mastodon/initial_state';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import tesseractCorePath from 'tesseract.js-core/tesseract-core.wasm.js';
+// eslint-disable-next-line import/extensions
+import tesseractWorkerPath from 'tesseract.js/dist/worker.min.js';
+import { assetHost } from 'mastodon/utils/config';
 
 const messages = defineMessages({
   close: { id: 'lightbox.close', defaultMessage: 'Close' },
@@ -48,8 +53,6 @@ const removeExtraLineBreaks = str => str.replace(/\n\n/g, '******')
   .replace(/\n/g, ' ')
   .replace(/\*\*\*\*\*\*/g, '\n\n');
 
-const assetHost = process.env.CDN_HOST || '';
-
 class ImageLoader extends React.PureComponent {
 
   static propTypes = {
@@ -104,6 +107,7 @@ class FocalPointModal extends ImmutablePureComponent {
     dirty: false,
     progress: 0,
     loading: true,
+    ocrStatus: '',
   };
 
   componentWillMount () {
@@ -219,11 +223,18 @@ class FocalPointModal extends ImmutablePureComponent {
 
     this.setState({ detecting: true });
 
-    fetchTesseract().then(({ TesseractWorker }) => {
-      const worker = new TesseractWorker({
-        workerPath: `${assetHost}/packs/ocr/worker.min.js`,
-        corePath: `${assetHost}/packs/ocr/tesseract-core.wasm.js`,
-        langPath: `${assetHost}/ocr/lang-data`,
+    fetchTesseract().then(({ createWorker }) => {
+      const worker = createWorker({
+        workerPath: tesseractWorkerPath,
+        corePath: tesseractCorePath,
+        langPath: assetHost,
+        logger: ({ status, progress }) => {
+          if (status === 'recognizing text') {
+            this.setState({ ocrStatus: 'detecting', progress });
+          } else {
+            this.setState({ ocrStatus: 'preparing', progress });
+          }
+        },
       });
 
       let media_url = media.get('url');
@@ -236,12 +247,18 @@ class FocalPointModal extends ImmutablePureComponent {
         }
       }
 
-      worker.recognize(media_url)
-        .progress(({ progress }) => this.setState({ progress }))
-        .finally(() => worker.terminate())
-        .then(({ text }) => this.setState({ description: removeExtraLineBreaks(text), dirty: true, detecting: false }))
-        .catch(() => this.setState({ detecting: false }));
-    }).catch(() => this.setState({ detecting: false }));
+      (async () => {
+        await worker.load();
+        await worker.loadLanguage('eng');
+        await worker.initialize('eng');
+        const { data: { text } } = await worker.recognize(media_url);
+        this.setState({ description: removeExtraLineBreaks(text), dirty: true, detecting: false });
+        await worker.terminate();
+      })();
+    }).catch((e) => {
+      console.error(e);
+      this.setState({ detecting: false });
+    });
   }
 
   handleThumbnailChange = e => {
@@ -261,7 +278,7 @@ class FocalPointModal extends ImmutablePureComponent {
 
   render () {
     const { media, intl, account, onClose, isUploadingThumbnail } = this.props;
-    const { x, y, dragging, description, dirty, detecting, progress } = this.state;
+    const { x, y, dragging, description, dirty, detecting, progress, ocrStatus } = this.state;
 
     const width  = media.getIn(['meta', 'original', 'width']) || null;
     const height = media.getIn(['meta', 'original', 'height']) || null;
@@ -282,6 +299,13 @@ class FocalPointModal extends ImmutablePureComponent {
       descriptionLabel = <FormattedMessage id='upload_form.description' defaultMessage='Describe for the visually impaired' />;
     }
 
+    let ocrMessage = '';
+    if (ocrStatus === 'detecting') {
+      ocrMessage = <FormattedMessage id='upload_modal.analyzing_picture' defaultMessage='Analyzing pictureâ€¦' />;
+    } else {
+      ocrMessage = <FormattedMessage id='upload_modal.preparing_ocr' defaultMessage='Preparing OCRâ€¦' />;
+    }
+
     return (
       <div className='modal-root__modal report-modal' style={{ maxWidth: 960 }}>
         <div className='report-modal__target'>
@@ -333,7 +357,7 @@ class FocalPointModal extends ImmutablePureComponent {
               />
 
               <div className='setting-text__modifiers'>
-                <UploadProgress progress={progress * 100} active={detecting} icon='file-text-o' message={<FormattedMessage id='upload_modal.analyzing_picture' defaultMessage='Analyzing pictureâ€¦' />} />
+                <UploadProgress progress={progress * 100} active={detecting} icon='file-text-o' message={ocrMessage} />
               </div>
             </div>
 
@@ -364,6 +388,7 @@ class FocalPointModal extends ImmutablePureComponent {
             {media.get('type') === 'video' && (
               <Video
                 preview={media.get('preview_url')}
+                frameRate={media.getIn(['meta', 'original', 'frame_rate'])}
                 blurhash={media.get('blurhash')}
                 src={media.get('url')}
                 detailed
diff --git a/app/javascript/mastodon/features/ui/components/image_loader.js b/app/javascript/mastodon/features/ui/components/image_loader.js
index 5e1cf75af79aad303c4a5be2edcd239c97b77de5..c6f16a79237e44ee6cd205e5e2196045c3bbe222 100644
--- a/app/javascript/mastodon/features/ui/components/image_loader.js
+++ b/app/javascript/mastodon/features/ui/components/image_loader.js
@@ -13,6 +13,7 @@ export default class ImageLoader extends React.PureComponent {
     width: PropTypes.number,
     height: PropTypes.number,
     onClick: PropTypes.func,
+    zoomButtonHidden: PropTypes.bool,
   }
 
   static defaultProps = {
@@ -151,6 +152,9 @@ export default class ImageLoader extends React.PureComponent {
             alt={alt}
             src={src}
             onClick={onClick}
+            width={width}
+            height={height}
+            zoomButtonHidden={this.props.zoomButtonHidden}
           />
         )}
       </div>
diff --git a/app/javascript/mastodon/features/ui/components/media_modal.js b/app/javascript/mastodon/features/ui/components/media_modal.js
index d7f97f210c9e0879965c483df85de601859f1b5c..08da1033042b6458b226e3adbbc9d6f9ed732c08 100644
--- a/app/javascript/mastodon/features/ui/components/media_modal.js
+++ b/app/javascript/mastodon/features/ui/components/media_modal.js
@@ -4,12 +4,15 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import Video from 'mastodon/features/video';
 import classNames from 'classnames';
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import IconButton from 'mastodon/components/icon_button';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import ImageLoader from './image_loader';
 import Icon from 'mastodon/components/icon';
 import GIFV from 'mastodon/components/gifv';
+import { disableSwiping } from 'mastodon/initial_state';
+import Footer from 'mastodon/features/picture_in_picture/components/footer';
+import { getAverageFromBlurhash } from 'mastodon/blurhash';
 
 const messages = defineMessages({
   close: { id: 'lightbox.close', defaultMessage: 'Close' },
@@ -24,10 +27,14 @@ class MediaModal extends ImmutablePureComponent {
 
   static propTypes = {
     media: ImmutablePropTypes.list.isRequired,
-    status: ImmutablePropTypes.map,
+    statusId: PropTypes.string,
     index: PropTypes.number.isRequired,
     onClose: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
+    onChangeBackgroundColor: PropTypes.func.isRequired,
+    currentTime: PropTypes.number,
+    autoPlay: PropTypes.bool,
+    volume: PropTypes.number,
   };
 
   static contextTypes = {
@@ -37,23 +44,40 @@ class MediaModal extends ImmutablePureComponent {
   state = {
     index: null,
     navigationHidden: false,
+    zoomButtonHidden: false,
   };
 
   handleSwipe = (index) => {
     this.setState({ index: index % this.props.media.size });
   }
 
+  handleTransitionEnd = () => {
+    this.setState({
+      zoomButtonHidden: false,
+    });
+  }
+
   handleNextClick = () => {
-    this.setState({ index: (this.getIndex() + 1) % this.props.media.size });
+    this.setState({
+      index: (this.getIndex() + 1) % this.props.media.size,
+      zoomButtonHidden: true,
+    });
   }
 
   handlePrevClick = () => {
-    this.setState({ index: (this.props.media.size + this.getIndex() - 1) % this.props.media.size });
+    this.setState({
+      index: (this.props.media.size + this.getIndex() - 1) % this.props.media.size,
+      zoomButtonHidden: true,
+    });
   }
 
   handleChangeIndex = (e) => {
     const index = Number(e.currentTarget.getAttribute('data-index'));
-    this.setState({ index: index % this.props.media.size });
+
+    this.setState({
+      index: index % this.props.media.size,
+      zoomButtonHidden: true,
+    });
   }
 
   handleKeyDown = (e) => {
@@ -83,6 +107,25 @@ class MediaModal extends ImmutablePureComponent {
         this.props.onClose();
       });
     }
+
+    this._sendBackgroundColor();
+  }
+
+  componentDidUpdate (prevProps, prevState) {
+    if (prevState.index !== this.state.index) {
+      this._sendBackgroundColor();
+    }
+  }
+
+  _sendBackgroundColor () {
+    const { media, onChangeBackgroundColor } = this.props;
+    const index = this.getIndex();
+    const blurhash = media.getIn([index, 'blurhash']);
+
+    if (blurhash) {
+      const backgroundColor = getAverageFromBlurhash(blurhash);
+      onChangeBackgroundColor(backgroundColor);
+    }
   }
 
   componentWillUnmount () {
@@ -95,6 +138,8 @@ class MediaModal extends ImmutablePureComponent {
         this.context.router.history.goBack();
       }
     }
+
+    this.props.onChangeBackgroundColor(null);
   }
 
   getIndex () {
@@ -110,30 +155,19 @@ class MediaModal extends ImmutablePureComponent {
   handleStatusClick = e => {
     if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
       e.preventDefault();
-      this.context.router.history.push(`/statuses/${this.props.status.get('id')}`);
+      this.context.router.history.push(`/statuses/${this.props.statusId}`);
     }
   }
 
   render () {
-    const { media, status, intl, onClose } = this.props;
+    const { media, statusId, intl, onClose } = this.props;
     const { navigationHidden } = this.state;
 
     const index = this.getIndex();
-    let pagination = [];
 
     const leftNav  = media.size > 1 && <button tabIndex='0' className='media-modal__nav media-modal__nav--left' onClick={this.handlePrevClick} aria-label={intl.formatMessage(messages.previous)}><Icon id='chevron-left' fixedWidth /></button>;
     const rightNav = media.size > 1 && <button tabIndex='0' className='media-modal__nav  media-modal__nav--right' onClick={this.handleNextClick} aria-label={intl.formatMessage(messages.next)}><Icon id='chevron-right' fixedWidth /></button>;
 
-    if (media.size > 1) {
-      pagination = media.map((item, i) => {
-        const classes = ['media-modal__button'];
-        if (i === index) {
-          classes.push('media-modal__button--active');
-        }
-        return (<li className='media-modal__page-dot' key={i}><button tabIndex='0' className={classes.join(' ')} onClick={this.handleChangeIndex} data-index={i}>{i + 1}</button></li>);
-      });
-    }
-
     const content = media.map((image) => {
       const width  = image.getIn(['meta', 'original', 'width']) || null;
       const height = image.getIn(['meta', 'original', 'height']) || null;
@@ -148,10 +182,11 @@ class MediaModal extends ImmutablePureComponent {
             alt={image.get('description')}
             key={image.get('url')}
             onClick={this.toggleNavigation}
+            zoomButtonHidden={this.state.zoomButtonHidden}
           />
         );
       } else if (image.get('type') === 'video') {
-        const { time } = this.props;
+        const { currentTime, autoPlay, volume } = this.props;
 
         return (
           <Video
@@ -160,7 +195,10 @@ class MediaModal extends ImmutablePureComponent {
             src={image.get('url')}
             width={image.get('width')}
             height={image.get('height')}
-            startTime={time || 0}
+            frameRate={image.getIn(['meta', 'original', 'frame_rate'])}
+            currentTime={currentTime || 0}
+            autoPlay={autoPlay || false}
+            volume={volume || 1}
             onCloseVideo={onClose}
             detailed
             alt={image.get('description')}
@@ -200,18 +238,26 @@ class MediaModal extends ImmutablePureComponent {
       'media-modal__navigation--hidden': navigationHidden,
     });
 
+    let pagination;
+
+    if (media.size > 1) {
+      pagination = media.map((item, i) => (
+        <button key={i} className={classNames('media-modal__page-dot', { active: i === index })} data-index={i} onClick={this.handleChangeIndex}>
+          {i + 1}
+        </button>
+      ));
+    }
+
     return (
       <div className='modal-root__modal media-modal'>
-        <div
-          className='media-modal__closer'
-          role='presentation'
-          onClick={onClose}
-        >
+        <div className='media-modal__closer' role='presentation' onClick={onClose} >
           <ReactSwipeableViews
             style={swipeableViewsStyle}
             containerStyle={containerStyle}
             onChangeIndex={this.handleSwipe}
+            onTransitionEnd={this.handleTransitionEnd}
             index={index}
+            disabled={disableSwiping}
           >
             {content}
           </ReactSwipeableViews>
@@ -223,15 +269,10 @@ class MediaModal extends ImmutablePureComponent {
           {leftNav}
           {rightNav}
 
-          {status && (
-            <div className={classNames('media-modal__meta', { 'media-modal__meta--shifted': media.size > 1 })}>
-              <a href={status.get('url')} onClick={this.handleStatusClick}><Icon id='comments' /> <FormattedMessage id='lightbox.view_context' defaultMessage='View context' /></a>
-            </div>
-          )}
-
-          <ul className='media-modal__pagination'>
-            {pagination}
-          </ul>
+          <div className='media-modal__overlay'>
+            {pagination && <ul className='media-modal__pagination'>{pagination}</ul>}
+            {statusId && <Footer statusId={statusId} withOpenButton onClose={onClose} />}
+          </div>
         </div>
       </div>
     );
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.js b/app/javascript/mastodon/features/ui/components/modal_root.js
index 5cf70a0cc2d7b880e660e1f1c2ea9125960f237b..3403830e41fca2ecd5d9f24cfd0320afe2d07efe 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.js
+++ b/app/javascript/mastodon/features/ui/components/modal_root.js
@@ -45,6 +45,10 @@ export default class ModalRoot extends React.PureComponent {
     onClose: PropTypes.func.isRequired,
   };
 
+  state = {
+    backgroundColor: null,
+  };
+
   getSnapshotBeforeUpdate () {
     return { visible: !!this.props.type };
   }
@@ -59,6 +63,10 @@ export default class ModalRoot extends React.PureComponent {
     }
   }
 
+  setBackgroundColor = color => {
+    this.setState({ backgroundColor: color });
+  }
+
   renderLoading = modalId => () => {
     return ['MEDIA', 'VIDEO', 'BOOST', 'CONFIRM', 'ACTIONS'].indexOf(modalId) === -1 ? <ModalLoading /> : null;
   }
@@ -71,13 +79,14 @@ export default class ModalRoot extends React.PureComponent {
 
   render () {
     const { type, props, onClose } = this.props;
+    const { backgroundColor } = this.state;
     const visible = !!type;
 
     return (
-      <Base onClose={onClose}>
+      <Base backgroundColor={backgroundColor} onClose={onClose}>
         {visible && (
           <BundleContainer fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading(type)} error={this.renderError} renderDelay={200}>
-            {(SpecificComponent) => <SpecificComponent {...props} onClose={onClose} />}
+            {(SpecificComponent) => <SpecificComponent {...props} onChangeBackgroundColor={this.setBackgroundColor} onClose={onClose} />}
           </BundleContainer>
         )}
       </Base>
diff --git a/app/javascript/mastodon/features/ui/components/mute_modal.js b/app/javascript/mastodon/features/ui/components/mute_modal.js
index 852830c3c2c93fd7c87de88e029db557bda9b3e1..d8d8e68c384dbc22233721cd1361581a901f4166 100644
--- a/app/javascript/mastodon/features/ui/components/mute_modal.js
+++ b/app/javascript/mastodon/features/ui/components/mute_modal.js
@@ -1,25 +1,32 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
-import { injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import Toggle from 'react-toggle';
 import Button from '../../../components/button';
 import { closeModal } from '../../../actions/modal';
 import { muteAccount } from '../../../actions/accounts';
-import { toggleHideNotifications } from '../../../actions/mutes';
+import { toggleHideNotifications, changeMuteDuration } from '../../../actions/mutes';
 
+const messages = defineMessages({
+  minutes: { id: 'intervals.full.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}}' },
+  hours: { id: 'intervals.full.hours', defaultMessage: '{number, plural, one {# hour} other {# hours}}' },
+  days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
+  indefinite: { id: 'mute_modal.indefinite', defaultMessage: 'Indefinite' },
+});
 
 const mapStateToProps = state => {
   return {
     account: state.getIn(['mutes', 'new', 'account']),
     notifications: state.getIn(['mutes', 'new', 'notifications']),
+    muteDuration: state.getIn(['mutes', 'new', 'duration']),
   };
 };
 
 const mapDispatchToProps = dispatch => {
   return {
-    onConfirm(account, notifications) {
-      dispatch(muteAccount(account.get('id'), notifications));
+    onConfirm(account, notifications, muteDuration) {
+      dispatch(muteAccount(account.get('id'), notifications, muteDuration));
     },
 
     onClose() {
@@ -29,6 +36,10 @@ const mapDispatchToProps = dispatch => {
     onToggleNotifications() {
       dispatch(toggleHideNotifications());
     },
+
+    onChangeMuteDuration(e) {
+      dispatch(changeMuteDuration(e.target.value));
+    },
   };
 };
 
@@ -43,6 +54,8 @@ class MuteModal extends React.PureComponent {
     onConfirm: PropTypes.func.isRequired,
     onToggleNotifications: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
+    muteDuration: PropTypes.number.isRequired,
+    onChangeMuteDuration: PropTypes.func.isRequired,
   };
 
   componentDidMount() {
@@ -51,7 +64,7 @@ class MuteModal extends React.PureComponent {
 
   handleClick = () => {
     this.props.onClose();
-    this.props.onConfirm(this.props.account, this.props.notifications);
+    this.props.onConfirm(this.props.account, this.props.notifications, this.props.muteDuration);
   }
 
   handleCancel = () => {
@@ -66,8 +79,12 @@ class MuteModal extends React.PureComponent {
     this.props.onToggleNotifications();
   }
 
+  changeMuteDuration = (e) => {
+    this.props.onChangeMuteDuration(e);
+  }
+
   render () {
-    const { account, notifications } = this.props;
+    const { account, notifications, muteDuration, intl } = this.props;
 
     return (
       <div className='modal-root__modal mute-modal'>
@@ -91,6 +108,21 @@ class MuteModal extends React.PureComponent {
               <FormattedMessage id='mute_modal.hide_notifications' defaultMessage='Hide notifications from this user?' />
             </label>
           </div>
+          <div>
+            <span><FormattedMessage id='mute_modal.duration' defaultMessage='Duration' />: </span>
+
+            {/* eslint-disable-next-line jsx-a11y/no-onchange */}
+            <select value={muteDuration} onChange={this.changeMuteDuration}>
+              <option value={0}>{intl.formatMessage(messages.indefinite)}</option>
+              <option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option>
+              <option value={1800}>{intl.formatMessage(messages.minutes, { number: 30 })}</option>
+              <option value={3600}>{intl.formatMessage(messages.hours, { number: 1 })}</option>
+              <option value={21600}>{intl.formatMessage(messages.hours, { number: 6 })}</option>
+              <option value={86400}>{intl.formatMessage(messages.days, { number: 1 })}</option>
+              <option value={259200}>{intl.formatMessage(messages.days, { number: 3 })}</option>
+              <option value={604800}>{intl.formatMessage(messages.days, { number: 7 })}</option>
+            </select>
+          </div>
         </div>
 
         <div className='mute-modal__action-bar'>
diff --git a/app/javascript/mastodon/features/ui/components/video_modal.js b/app/javascript/mastodon/features/ui/components/video_modal.js
index e28bd5b4915dbb6f246016e66ce9e8ce5a3c513b..2f13a175a1d1c279d719713991fb802568e64cb2 100644
--- a/app/javascript/mastodon/features/ui/components/video_modal.js
+++ b/app/javascript/mastodon/features/ui/components/video_modal.js
@@ -3,9 +3,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import Video from 'mastodon/features/video';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import { FormattedMessage } from 'react-intl';
-import classNames from 'classnames';
-import Icon from 'mastodon/components/icon';
+import Footer from 'mastodon/features/picture_in_picture/components/footer';
+import { getAverageFromBlurhash } from 'mastodon/blurhash';
 
 export const previewState = 'previewVideoModal';
 
@@ -13,13 +12,14 @@ export default class VideoModal extends ImmutablePureComponent {
 
   static propTypes = {
     media: ImmutablePropTypes.map.isRequired,
-    status: ImmutablePropTypes.map,
+    statusId: PropTypes.string,
     options: PropTypes.shape({
       startTime: PropTypes.number,
       autoPlay: PropTypes.bool,
       defaultVolume: PropTypes.number,
     }),
     onClose: PropTypes.func.isRequired,
+    onChangeBackgroundColor: PropTypes.func.isRequired,
   };
 
   static contextTypes = {
@@ -27,36 +27,35 @@ export default class VideoModal extends ImmutablePureComponent {
   };
 
   componentDidMount () {
-    if (this.context.router) {
-      const history = this.context.router.history;
+    const { router } = this.context;
+    const { media, onChangeBackgroundColor, onClose } = this.props;
 
-      history.push(history.location.pathname, previewState);
+    if (router) {
+      router.history.push(router.history.location.pathname, previewState);
+      this.unlistenHistory = router.history.listen(() => onClose());
+    }
+
+    const backgroundColor = getAverageFromBlurhash(media.get('blurhash'));
 
-      this.unlistenHistory = history.listen(() => {
-        this.props.onClose();
-      });
+    if (backgroundColor) {
+      onChangeBackgroundColor(backgroundColor);
     }
   }
 
   componentWillUnmount () {
-    if (this.context.router) {
+    const { router } = this.context;
+
+    if (router) {
       this.unlistenHistory();
 
-      if (this.context.router.history.location.state === previewState) {
-        this.context.router.history.goBack();
+      if (router.history.location.state === previewState) {
+        router.history.goBack();
       }
     }
   }
 
-  handleStatusClick = e => {
-    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
-      e.preventDefault();
-      this.context.router.history.push(`/statuses/${this.props.status.get('id')}`);
-    }
-  }
-
   render () {
-    const { media, status, onClose } = this.props;
+    const { media, statusId, onClose } = this.props;
     const options = this.props.options || {};
 
     return (
@@ -64,22 +63,21 @@ export default class VideoModal extends ImmutablePureComponent {
         <div className='video-modal__container'>
           <Video
             preview={media.get('preview_url')}
+            frameRate={media.getIn(['meta', 'original', 'frame_rate'])}
             blurhash={media.get('blurhash')}
             src={media.get('url')}
-            startTime={options.startTime}
+            currentTime={options.startTime}
             autoPlay={options.autoPlay}
-            defaultVolume={options.defaultVolume}
+            volume={options.defaultVolume}
             onCloseVideo={onClose}
             detailed
             alt={media.get('description')}
           />
         </div>
 
-        {status && (
-          <div className={classNames('media-modal__meta')}>
-            <a href={status.get('url')} onClick={this.handleStatusClick}><Icon id='comments' /> <FormattedMessage id='lightbox.view_context' defaultMessage='View context' /></a>
-          </div>
-        )}
+        <div className='media-modal__overlay'>
+          {statusId && <Footer statusId={statusId} withOpenButton onClose={onClose} />}
+        </div>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/ui/components/zoomable_image.js b/app/javascript/mastodon/features/ui/components/zoomable_image.js
index 3f6562bc991bdeb45f8fcd44f0bd800317f401c3..1cf263cb9003d5b081e141145b7105de1b62108c 100644
--- a/app/javascript/mastodon/features/ui/components/zoomable_image.js
+++ b/app/javascript/mastodon/features/ui/components/zoomable_image.js
@@ -1,8 +1,16 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import IconButton from 'mastodon/components/icon_button';
+import { defineMessages, injectIntl } from 'react-intl';
+
+const messages = defineMessages({
+  compress: { id: 'lightbox.compress', defaultMessage: 'Compress image view box' },
+  expand: { id: 'lightbox.expand', defaultMessage: 'Expand image view box' },
+});
 
 const MIN_SCALE = 1;
 const MAX_SCALE = 4;
+const NAV_BAR_HEIGHT = 66;
 
 const getMidpoint = (p1, p2) => ({
   x: (p1.clientX + p2.clientX) / 2,
@@ -14,7 +22,77 @@ const getDistance = (p1, p2) =>
 
 const clamp = (min, max, value) => Math.min(max, Math.max(min, value));
 
-export default class ZoomableImage extends React.PureComponent {
+// Normalizing mousewheel speed across browsers
+// copy from: https://github.com/facebookarchive/fixed-data-table/blob/master/src/vendor_upstream/dom/normalizeWheel.js
+const normalizeWheel = event => {
+  // Reasonable defaults
+  const PIXEL_STEP = 10;
+  const LINE_HEIGHT = 40;
+  const PAGE_HEIGHT = 800;
+
+  let sX = 0,
+    sY = 0, // spinX, spinY
+    pX = 0,
+    pY = 0; // pixelX, pixelY
+
+  // Legacy
+  if ('detail' in event) {
+    sY = event.detail;
+  }
+  if ('wheelDelta' in event) {
+    sY = -event.wheelDelta / 120;
+  }
+  if ('wheelDeltaY' in event) {
+    sY = -event.wheelDeltaY / 120;
+  }
+  if ('wheelDeltaX' in event) {
+    sX = -event.wheelDeltaX / 120;
+  }
+
+  // side scrolling on FF with DOMMouseScroll
+  if ('axis' in event && event.axis === event.HORIZONTAL_AXIS) {
+    sX = sY;
+    sY = 0;
+  }
+
+  pX = sX * PIXEL_STEP;
+  pY = sY * PIXEL_STEP;
+
+  if ('deltaY' in event) {
+    pY = event.deltaY;
+  }
+  if ('deltaX' in event) {
+    pX = event.deltaX;
+  }
+
+  if ((pX || pY) && event.deltaMode) {
+    if (event.deltaMode === 1) { // delta in LINE units
+      pX *= LINE_HEIGHT;
+      pY *= LINE_HEIGHT;
+    } else { // delta in PAGE units
+      pX *= PAGE_HEIGHT;
+      pY *= PAGE_HEIGHT;
+    }
+  }
+
+  // Fall-back if spin cannot be determined
+  if (pX && !sX) {
+    sX = (pX < 1) ? -1 : 1;
+  }
+  if (pY && !sY) {
+    sY = (pY < 1) ? -1 : 1;
+  }
+
+  return {
+    spinX: sX,
+    spinY: sY,
+    pixelX: pX,
+    pixelY: pY,
+  };
+};
+
+export default @injectIntl
+class ZoomableImage extends React.PureComponent {
 
   static propTypes = {
     alt: PropTypes.string,
@@ -22,6 +100,8 @@ export default class ZoomableImage extends React.PureComponent {
     width: PropTypes.number,
     height: PropTypes.number,
     onClick: PropTypes.func,
+    zoomButtonHidden: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
   }
 
   static defaultProps = {
@@ -32,6 +112,26 @@ export default class ZoomableImage extends React.PureComponent {
 
   state = {
     scale: MIN_SCALE,
+    zoomMatrix: {
+      type: null, // 'width' 'height'
+      fullScreen: null, // bool
+      rate: null, // full screen scale rate
+      clientWidth: null,
+      clientHeight: null,
+      offsetWidth: null,
+      offsetHeight: null,
+      clientHeightFixed: null,
+      scrollTop: null,
+      scrollLeft: null,
+      translateX: null,
+      translateY: null,
+    },
+    zoomState: 'expand', // 'expand' 'compress'
+    navigationHidden: false,
+    dragPosition: { top: 0, left: 0, x: 0, y: 0 },
+    dragged: false,
+    lockScroll: { x: 0, y: 0 },
+    lockTranslate: { x: 0, y: 0 },
   }
 
   removers = [];
@@ -49,17 +149,105 @@ export default class ZoomableImage extends React.PureComponent {
     // https://www.chromestatus.com/features/5093566007214080
     this.container.addEventListener('touchmove', handler, { passive: false });
     this.removers.push(() => this.container.removeEventListener('touchend', handler));
+
+    handler = this.mouseDownHandler;
+    this.container.addEventListener('mousedown', handler);
+    this.removers.push(() => this.container.removeEventListener('mousedown', handler));
+
+    handler = this.mouseWheelHandler;
+    this.container.addEventListener('wheel', handler);
+    this.removers.push(() => this.container.removeEventListener('wheel', handler));
+    // Old Chrome
+    this.container.addEventListener('mousewheel', handler);
+    this.removers.push(() => this.container.removeEventListener('mousewheel', handler));
+    // Old Firefox
+    this.container.addEventListener('DOMMouseScroll', handler);
+    this.removers.push(() => this.container.removeEventListener('DOMMouseScroll', handler));
+
+    this.initZoomMatrix();
   }
 
   componentWillUnmount () {
     this.removeEventListeners();
   }
 
+  componentDidUpdate () {
+    this.setState({ zoomState: this.state.scale >= this.state.zoomMatrix.rate ? 'compress' : 'expand' });
+
+    if (this.state.scale === MIN_SCALE) {
+      this.container.style.removeProperty('cursor');
+    }
+  }
+
+  UNSAFE_componentWillReceiveProps () {
+    // reset when slide to next image
+    if (this.props.zoomButtonHidden) {
+      this.setState({
+        scale: MIN_SCALE,
+        lockTranslate: { x: 0, y: 0 },
+      }, () => {
+        this.container.scrollLeft = 0;
+        this.container.scrollTop = 0;
+      });
+    }
+  }
+
   removeEventListeners () {
     this.removers.forEach(listeners => listeners());
     this.removers = [];
   }
 
+  mouseWheelHandler = e => {
+    e.preventDefault();
+
+    const event = normalizeWheel(e);
+
+    if (this.state.zoomMatrix.type === 'width') {
+      // full width, scroll vertical
+      this.container.scrollTop = Math.max(this.container.scrollTop + event.pixelY, this.state.lockScroll.y);
+    } else {
+      // full height, scroll horizontal
+      this.container.scrollLeft = Math.max(this.container.scrollLeft + event.pixelY, this.state.lockScroll.x);
+    }
+
+    // lock horizontal scroll
+    this.container.scrollLeft = Math.max(this.container.scrollLeft + event.pixelX, this.state.lockScroll.x);
+  }
+
+  mouseDownHandler = e => {
+    this.container.style.cursor = 'grabbing';
+    this.container.style.userSelect = 'none';
+
+    this.setState({ dragPosition: {
+      left: this.container.scrollLeft,
+      top: this.container.scrollTop,
+      // Get the current mouse position
+      x: e.clientX,
+      y: e.clientY,
+    } });
+
+    this.image.addEventListener('mousemove', this.mouseMoveHandler);
+    this.image.addEventListener('mouseup', this.mouseUpHandler);
+  }
+
+  mouseMoveHandler = e => {
+    const dx = e.clientX - this.state.dragPosition.x;
+    const dy = e.clientY - this.state.dragPosition.y;
+
+    this.container.scrollLeft = Math.max(this.state.dragPosition.left - dx, this.state.lockScroll.x);
+    this.container.scrollTop = Math.max(this.state.dragPosition.top - dy, this.state.lockScroll.y);
+
+    this.setState({ dragged: true });
+  }
+
+  mouseUpHandler = () => {
+    this.container.style.cursor = 'grab';
+    this.container.style.removeProperty('user-select');
+
+    this.image.removeEventListener('mousemove', this.mouseMoveHandler);
+    this.image.removeEventListener('mouseup', this.mouseUpHandler);
+  }
+
   handleTouchStart = e => {
     if (e.touches.length !== 2) return;
 
@@ -80,7 +268,8 @@ export default class ZoomableImage extends React.PureComponent {
 
     const distance = getDistance(...e.touches);
     const midpoint = getMidpoint(...e.touches);
-    const scale = clamp(MIN_SCALE, MAX_SCALE, this.state.scale * distance / this.lastDistance);
+    const _MAX_SCALE = Math.max(MAX_SCALE, this.state.zoomMatrix.rate);
+    const scale = clamp(MIN_SCALE, _MAX_SCALE, this.state.scale * distance / this.lastDistance);
 
     this.zoom(scale, midpoint);
 
@@ -89,7 +278,7 @@ export default class ZoomableImage extends React.PureComponent {
   }
 
   zoom(nextScale, midpoint) {
-    const { scale } = this.state;
+    const { scale, zoomMatrix } = this.state;
     const { scrollLeft, scrollTop } = this.container;
 
     // math memo:
@@ -104,14 +293,105 @@ export default class ZoomableImage extends React.PureComponent {
     this.setState({ scale: nextScale }, () => {
       this.container.scrollLeft = nextScrollLeft;
       this.container.scrollTop = nextScrollTop;
+      // reset the translateX/Y constantly
+      if (nextScale < zoomMatrix.rate) {
+        this.setState({
+          lockTranslate: {
+            x: zoomMatrix.fullScreen ? 0 : zoomMatrix.translateX * ((nextScale - MIN_SCALE) / (zoomMatrix.rate - MIN_SCALE)),
+            y: zoomMatrix.fullScreen ? 0 : zoomMatrix.translateY * ((nextScale - MIN_SCALE) / (zoomMatrix.rate - MIN_SCALE)),
+          },
+        });
+      }
     });
   }
 
   handleClick = e => {
     // don't propagate event to MediaModal
     e.stopPropagation();
+    const dragged = this.state.dragged;
+    this.setState({ dragged: false });
+    if (dragged) return;
     const handler = this.props.onClick;
     if (handler) handler();
+    this.setState({ navigationHidden: !this.state.navigationHidden });
+  }
+
+  handleMouseDown = e => {
+    e.preventDefault();
+  }
+
+  initZoomMatrix = () => {
+    const { width, height } = this.props;
+    const { clientWidth, clientHeight } = this.container;
+    const { offsetWidth, offsetHeight } = this.image;
+    const clientHeightFixed = clientHeight - NAV_BAR_HEIGHT;
+
+    const type = width / height < clientWidth / clientHeightFixed ? 'width' : 'height';
+    const fullScreen = type === 'width' ?  width > clientWidth : height > clientHeightFixed;
+    const rate = type === 'width' ? Math.min(clientWidth, width) / offsetWidth : Math.min(clientHeightFixed, height) / offsetHeight;
+    const scrollTop = type === 'width' ?  (clientHeight - offsetHeight) / 2 - NAV_BAR_HEIGHT : (clientHeightFixed - offsetHeight) / 2;
+    const scrollLeft = (clientWidth - offsetWidth) / 2;
+    const translateX = type === 'width' ? (width - offsetWidth) / (2 * rate) : 0;
+    const translateY = type === 'height' ? (height - offsetHeight) / (2 * rate) : 0;
+
+    this.setState({
+      zoomMatrix: {
+        type: type,
+        fullScreen: fullScreen,
+        rate: rate,
+        clientWidth: clientWidth,
+        clientHeight: clientHeight,
+        offsetWidth: offsetWidth,
+        offsetHeight: offsetHeight,
+        clientHeightFixed: clientHeightFixed,
+        scrollTop: scrollTop,
+        scrollLeft: scrollLeft,
+        translateX: translateX,
+        translateY: translateY,
+      },
+    });
+  }
+
+  handleZoomClick = e => {
+    e.preventDefault();
+    e.stopPropagation();
+
+    const { scale, zoomMatrix } = this.state;
+
+    if ( scale >= zoomMatrix.rate ) {
+      this.setState({
+        scale: MIN_SCALE,
+        lockScroll: {
+          x: 0,
+          y: 0,
+        },
+        lockTranslate: {
+          x: 0,
+          y: 0,
+        },
+      }, () => {
+        this.container.scrollLeft = 0;
+        this.container.scrollTop = 0;
+      });
+    } else {
+      this.setState({
+        scale: zoomMatrix.rate,
+        lockScroll: {
+          x: zoomMatrix.scrollLeft,
+          y: zoomMatrix.scrollTop,
+        },
+        lockTranslate: {
+          x: zoomMatrix.fullScreen ? 0 : zoomMatrix.translateX,
+          y: zoomMatrix.fullScreen ? 0 : zoomMatrix.translateY,
+        },
+      }, () => {
+        this.container.scrollLeft = zoomMatrix.scrollLeft;
+        this.container.scrollTop = zoomMatrix.scrollTop;
+      });
+    }
+
+    this.container.style.cursor = 'grab';
+    this.container.style.removeProperty('user-select');
   }
 
   setContainerRef = c => {
@@ -123,29 +403,47 @@ export default class ZoomableImage extends React.PureComponent {
   }
 
   render () {
-    const { alt, src } = this.props;
-    const { scale } = this.state;
-    const overflow = scale === 1 ? 'hidden' : 'scroll';
+    const { alt, src, width, height, intl } = this.props;
+    const { scale, lockTranslate } = this.state;
+    const overflow = scale === MIN_SCALE ? 'hidden' : 'scroll';
+    const zoomButtonShouldHide = this.state.navigationHidden || this.props.zoomButtonHidden || this.state.zoomMatrix.rate <= MIN_SCALE ? 'media-modal__zoom-button--hidden' : '';
+    const zoomButtonTitle = this.state.zoomState === 'compress' ? intl.formatMessage(messages.compress) : intl.formatMessage(messages.expand);
 
     return (
-      <div
-        className='zoomable-image'
-        ref={this.setContainerRef}
-        style={{ overflow }}
-      >
-        <img
-          role='presentation'
-          ref={this.setImageRef}
-          alt={alt}
-          title={alt}
-          src={src}
+      <React.Fragment>
+        <IconButton
+          className={`media-modal__zoom-button ${zoomButtonShouldHide}`}
+          title={zoomButtonTitle}
+          icon={this.state.zoomState}
+          onClick={this.handleZoomClick}
+          size={40}
           style={{
-            transform: `scale(${scale})`,
-            transformOrigin: '0 0',
+            fontSize: '30px', /* Fontawesome's fa-compress fa-expand is larger than fa-close */
           }}
-          onClick={this.handleClick}
         />
-      </div>
+        <div
+          className='zoomable-image'
+          ref={this.setContainerRef}
+          style={{ overflow }}
+        >
+          <img
+            role='presentation'
+            ref={this.setImageRef}
+            alt={alt}
+            title={alt}
+            src={src}
+            width={width}
+            height={height}
+            style={{
+              transform: `scale(${scale}) translate(-${lockTranslate.x}px, -${lockTranslate.y}px)`,
+              transformOrigin: '0 0',
+            }}
+            draggable={false}
+            onClick={this.handleClick}
+            onMouseDown={this.handleMouseDown}
+          />
+        </div>
+      </React.Fragment>
     );
   }
 
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index 553cb33659d573271e5965b5a108768c32063da1..507ac1df1468a239733afd703fa42a0eae77f107 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -8,19 +8,20 @@ import PropTypes from 'prop-types';
 import NotificationsContainer from './containers/notifications_container';
 import LoadingBarContainer from './containers/loading_bar_container';
 import ModalContainer from './containers/modal_container';
-import { isMobile } from '../../is_mobile';
+import { layoutFromWindow } from 'mastodon/is_mobile';
 import { debounce } from 'lodash';
 import { uploadCompose, resetCompose, changeComposeSpoilerness } from '../../actions/compose';
 import { expandHomeTimeline } from '../../actions/timelines';
 import { expandNotifications } from '../../actions/notifications';
 import { fetchFilters } from '../../actions/filters';
 import { clearHeight } from '../../actions/height_cache';
-import { focusApp, unfocusApp } from 'mastodon/actions/app';
-import { synchronouslySubmitMarkers } from 'mastodon/actions/markers';
+import { focusApp, unfocusApp, changeLayout } from 'mastodon/actions/app';
+import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'mastodon/actions/markers';
 import { WrappedSwitch, WrappedRoute } from './util/react_router_helpers';
 import UploadArea from './components/upload_area';
 import ColumnsAreaContainer from './containers/columns_area_container';
 import DocumentTitle from './components/document_title';
+import PictureInPicture from 'mastodon/features/picture_in_picture';
 import {
   Compose,
   Status,
@@ -51,7 +52,7 @@ import {
   Search,
   Directory,
 } from './util/async-components';
-import { me, forceSingleColumn } from '../../initial_state';
+import { me } from '../../initial_state';
 import { previewState as previewMediaState } from './components/media_modal';
 import { previewState as previewVideoState } from './components/video_modal';
 
@@ -64,6 +65,7 @@ const messages = defineMessages({
 });
 
 const mapStateToProps = state => ({
+  layout: state.getIn(['meta', 'layout']),
   isComposing: state.getIn(['compose', 'is_composing']),
   hasComposingText: state.getIn(['compose', 'text']).trim().length !== 0,
   hasMediaAttachments: state.getIn(['compose', 'media_attachments']).size > 0,
@@ -109,17 +111,11 @@ class SwitchingColumnsArea extends React.PureComponent {
   static propTypes = {
     children: PropTypes.node,
     location: PropTypes.object,
-    onLayoutChange: PropTypes.func.isRequired,
-  };
-
-  state = {
-    mobile: isMobile(window.innerWidth),
+    mobile: PropTypes.bool,
   };
 
   componentWillMount () {
-    window.addEventListener('resize', this.handleResize, { passive: true });
-
-    if (this.state.mobile || forceSingleColumn) {
+    if (this.props.mobile) {
       document.body.classList.toggle('layout-single-column', true);
       document.body.classList.toggle('layout-multiple-columns', false);
     } else {
@@ -128,44 +124,21 @@ class SwitchingColumnsArea extends React.PureComponent {
     }
   }
 
-  componentDidUpdate (prevProps, prevState) {
+  componentDidUpdate (prevProps) {
     if (![this.props.location.pathname, '/'].includes(prevProps.location.pathname)) {
       this.node.handleChildrenContentChange();
     }
 
-    if (prevState.mobile !== this.state.mobile && !forceSingleColumn) {
-      document.body.classList.toggle('layout-single-column', this.state.mobile);
-      document.body.classList.toggle('layout-multiple-columns', !this.state.mobile);
+    if (prevProps.mobile !== this.props.mobile) {
+      document.body.classList.toggle('layout-single-column', this.props.mobile);
+      document.body.classList.toggle('layout-multiple-columns', !this.props.mobile);
     }
   }
 
-  componentWillUnmount () {
-    window.removeEventListener('resize', this.handleResize);
-  }
-
   shouldUpdateScroll (_, { location }) {
     return location.state !== previewMediaState && location.state !== previewVideoState;
   }
 
-  handleLayoutChange = debounce(() => {
-    // The cached heights are no longer accurate, invalidate
-    this.props.onLayoutChange();
-  }, 500, {
-    trailing: true,
-  })
-
-  handleResize = () => {
-    const mobile = isMobile(window.innerWidth);
-
-    if (mobile !== this.state.mobile) {
-      this.handleLayoutChange.cancel();
-      this.props.onLayoutChange();
-      this.setState({ mobile });
-    } else {
-      this.handleLayoutChange();
-    }
-  }
-
   setRef = c => {
     if (c) {
       this.node = c.getWrappedInstance();
@@ -173,13 +146,11 @@ class SwitchingColumnsArea extends React.PureComponent {
   }
 
   render () {
-    const { children } = this.props;
-    const { mobile } = this.state;
-    const singleColumn = forceSingleColumn || mobile;
-    const redirect = singleColumn ? <Redirect from='/' to='/timelines/home' exact /> : <Redirect from='/' to='/getting-started' exact />;
+    const { children, mobile } = this.props;
+    const redirect = mobile ? <Redirect from='/' to='/timelines/home' exact /> : <Redirect from='/' to='/getting-started' exact />;
 
     return (
-      <ColumnsAreaContainer ref={this.setRef} singleColumn={singleColumn}>
+      <ColumnsAreaContainer ref={this.setRef} singleColumn={mobile}>
         <WrappedSwitch>
           {redirect}
           <WrappedRoute path='/getting-started' component={GettingStarted} content={children} />
@@ -243,6 +214,7 @@ class UI extends React.PureComponent {
     location: PropTypes.object,
     intl: PropTypes.object.isRequired,
     dropdownMenuIsOpen: PropTypes.bool,
+    layout: PropTypes.string.isRequired,
   };
 
   state = {
@@ -265,17 +237,13 @@ class UI extends React.PureComponent {
 
   handleWindowFocus = () => {
     this.props.dispatch(focusApp());
+    this.props.dispatch(submitMarkers({ immediate: true }));
   }
 
   handleWindowBlur = () => {
     this.props.dispatch(unfocusApp());
   }
 
-  handleLayoutChange = () => {
-    // The cached heights are no longer accurate, invalidate
-    this.props.dispatch(clearHeight());
-  }
-
   handleDragEnter = (e) => {
     e.preventDefault();
 
@@ -349,10 +317,28 @@ class UI extends React.PureComponent {
     }
   }
 
-  componentWillMount () {
+  handleLayoutChange = debounce(() => {
+    this.props.dispatch(clearHeight()); // The cached heights are no longer accurate, invalidate
+  }, 500, {
+    trailing: true,
+  });
+
+  handleResize = () => {
+    const layout = layoutFromWindow();
+
+    if (layout !== this.props.layout) {
+      this.handleLayoutChange.cancel();
+      this.props.dispatch(changeLayout(layout));
+    } else {
+      this.handleLayoutChange();
+    }
+  }
+
+  componentDidMount () {
     window.addEventListener('focus', this.handleWindowFocus, false);
     window.addEventListener('blur', this.handleWindowBlur, false);
     window.addEventListener('beforeunload', this.handleBeforeUnload, false);
+    window.addEventListener('resize', this.handleResize, { passive: true });
 
     document.addEventListener('dragenter', this.handleDragEnter, false);
     document.addEventListener('dragover', this.handleDragOver, false);
@@ -364,19 +350,14 @@ class UI extends React.PureComponent {
       navigator.serviceWorker.addEventListener('message', this.handleServiceWorkerPostMessage);
     }
 
-    if (typeof window.Notification !== 'undefined' && Notification.permission === 'default') {
-      window.setTimeout(() => Notification.requestPermission(), 120 * 1000);
-    }
-
+    this.props.dispatch(fetchMarkers());
     this.props.dispatch(expandHomeTimeline());
     this.props.dispatch(expandNotifications());
 
     setTimeout(() => this.props.dispatch(fetchFilters()), 500);
-  }
 
-  componentDidMount () {
     this.hotkeys.__mousetrap__.stopCallback = (e, element) => {
-      return ['TEXTAREA', 'SELECT', 'INPUT'].includes(element.tagName) && !e.altKey;
+      return ['TEXTAREA', 'SELECT', 'INPUT'].includes(element.tagName);
     };
   }
 
@@ -384,6 +365,7 @@ class UI extends React.PureComponent {
     window.removeEventListener('focus', this.handleWindowFocus);
     window.removeEventListener('blur', this.handleWindowBlur);
     window.removeEventListener('beforeunload', this.handleBeforeUnload);
+    window.removeEventListener('resize', this.handleResize);
 
     document.removeEventListener('dragenter', this.handleDragEnter);
     document.removeEventListener('dragover', this.handleDragOver);
@@ -514,7 +496,7 @@ class UI extends React.PureComponent {
 
   render () {
     const { draggingOver } = this.state;
-    const { children, isComposing, location, dropdownMenuIsOpen } = this.props;
+    const { children, isComposing, location, dropdownMenuIsOpen, layout } = this.props;
 
     const handlers = {
       help: this.handleHotkeyToggleHelp,
@@ -541,10 +523,11 @@ class UI extends React.PureComponent {
     return (
       <HotKeys keyMap={keyMap} handlers={handlers} ref={this.setHotkeysRef} attach={window} focused>
         <div className={classNames('ui', { 'is-composing': isComposing })} ref={this.setRef} style={{ pointerEvents: dropdownMenuIsOpen ? 'none' : null }}>
-          <SwitchingColumnsArea location={location} onLayoutChange={this.handleLayoutChange}>
+          <SwitchingColumnsArea location={location} mobile={layout === 'mobile' || layout === 'single-column'}>
             {children}
           </SwitchingColumnsArea>
 
+          {layout !== 'mobile' && <PictureInPicture />}
           <NotificationsContainer />
           <LoadingBarContainer className='loading-bar' />
           <ModalContainer />
diff --git a/app/javascript/mastodon/features/video/index.js b/app/javascript/mastodon/features/video/index.js
index 99dcdca2216321aacaaab112226f7b5c4e883c3b..d8a6c4f502b4ed2065945013e464291a59a607d6 100644
--- a/app/javascript/mastodon/features/video/index.js
+++ b/app/javascript/mastodon/features/video/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import { fromJS, is } from 'immutable';
+import { is } from 'immutable';
 import { throttle, debounce } from 'lodash';
 import classNames from 'classnames';
 import { isFullscreen, requestFullscreen, exitFullscreen } from '../ui/util/fullscreen';
@@ -99,25 +99,33 @@ class Video extends React.PureComponent {
 
   static propTypes = {
     preview: PropTypes.string,
+    frameRate: PropTypes.string,
     src: PropTypes.string.isRequired,
     alt: PropTypes.string,
     width: PropTypes.number,
     height: PropTypes.number,
     sensitive: PropTypes.bool,
-    startTime: PropTypes.number,
+    currentTime: PropTypes.number,
     onOpenVideo: PropTypes.func,
     onCloseVideo: PropTypes.func,
     detailed: PropTypes.bool,
     inline: PropTypes.bool,
     editable: PropTypes.bool,
+    alwaysVisible: PropTypes.bool,
     cacheWidth: PropTypes.func,
     visible: PropTypes.bool,
     onToggleVisibility: PropTypes.func,
+    deployPictureInPicture: PropTypes.func,
     intl: PropTypes.object.isRequired,
     blurhash: PropTypes.string,
-    link: PropTypes.node,
     autoPlay: PropTypes.bool,
-    defaultVolume: PropTypes.number,
+    volume: PropTypes.number,
+    muted: PropTypes.bool,
+    componetIndex: PropTypes.number,
+  };
+
+  static defaultProps = {
+    frameRate: 25,
   };
 
   state = {
@@ -195,7 +203,7 @@ class Video extends React.PureComponent {
   handleTimeUpdate = () => {
     this.setState({
       currentTime: this.video.currentTime,
-      duration: Math.floor(this.video.duration),
+      duration:this.video.duration,
     });
   }
 
@@ -263,6 +271,81 @@ class Video extends React.PureComponent {
     }
   }, 15);
 
+  seekBy (time) {
+    const currentTime = this.video.currentTime + time;
+
+    if (!isNaN(currentTime)) {
+      this.setState({ currentTime }, () => {
+        this.video.currentTime = currentTime;
+      });
+    }
+  }
+
+  handleVideoKeyDown = e => {
+    // On the video element or the seek bar, we can safely use the space bar
+    // for playback control because there are no buttons to press
+
+    if (e.key === ' ') {
+      e.preventDefault();
+      e.stopPropagation();
+      this.togglePlay();
+    }
+  }
+
+  handleKeyDown = e => {
+    const frameTime = 1 / this.getFrameRate();
+
+    switch(e.key) {
+    case 'k':
+      e.preventDefault();
+      e.stopPropagation();
+      this.togglePlay();
+      break;
+    case 'm':
+      e.preventDefault();
+      e.stopPropagation();
+      this.toggleMute();
+      break;
+    case 'f':
+      e.preventDefault();
+      e.stopPropagation();
+      this.toggleFullscreen();
+      break;
+    case 'j':
+      e.preventDefault();
+      e.stopPropagation();
+      this.seekBy(-10);
+      break;
+    case 'l':
+      e.preventDefault();
+      e.stopPropagation();
+      this.seekBy(10);
+      break;
+    case ',':
+      e.preventDefault();
+      e.stopPropagation();
+      this.seekBy(-frameTime);
+      break;
+    case '.':
+      e.preventDefault();
+      e.stopPropagation();
+      this.seekBy(frameTime);
+      break;
+    }
+
+    // If we are in fullscreen mode, we don't want any hotkeys
+    // interacting with the UI that's not visible
+
+    if (this.state.fullscreen) {
+      e.preventDefault();
+      e.stopPropagation();
+
+      if (e.key === 'Escape') {
+        exitFullscreen();
+      }
+    }
+  }
+
   togglePlay = () => {
     if (this.state.paused) {
       this.setState({ paused: false }, () => this.video.play());
@@ -297,6 +380,15 @@ class Video extends React.PureComponent {
     document.removeEventListener('webkitfullscreenchange', this.handleFullscreenChange, true);
     document.removeEventListener('mozfullscreenchange', this.handleFullscreenChange, true);
     document.removeEventListener('MSFullscreenChange', this.handleFullscreenChange, true);
+
+    if (!this.state.paused && this.video && this.props.deployPictureInPicture) {
+      this.props.deployPictureInPicture('video', {
+        src: this.props.src,
+        currentTime: this.video.currentTime,
+        muted: this.video.muted,
+        volume: this.video.volume,
+      });
+    }
   }
 
   componentWillReceiveProps (nextProps) {
@@ -328,7 +420,18 @@ class Video extends React.PureComponent {
     const inView = (top <= (window.innerHeight || document.documentElement.clientHeight)) && (top + height >= 0);
 
     if (!this.state.paused && !inView) {
-      this.setState({ paused: true }, () => this.video.pause());
+      this.video.pause();
+
+      if (this.props.deployPictureInPicture) {
+        this.props.deployPictureInPicture('video', {
+          src: this.props.src,
+          currentTime: this.video.currentTime,
+          muted: this.video.muted,
+          volume: this.video.volume,
+        });
+      }
+
+      this.setState({ paused: true });
     }
   }, 150, { trailing: true })
 
@@ -361,15 +464,21 @@ class Video extends React.PureComponent {
   }
 
   handleLoadedData = () => {
-    if (this.props.startTime) {
-      this.video.currentTime = this.props.startTime;
+    const { currentTime, volume, muted, autoPlay } = this.props;
+
+    if (currentTime) {
+      this.video.currentTime = currentTime;
+    }
+
+    if (volume !== undefined) {
+      this.video.volume = volume;
     }
 
-    if (this.props.defaultVolume !== undefined) {
-      this.video.volume = this.props.defaultVolume;
+    if (muted !== undefined) {
+      this.video.muted = muted;
     }
 
-    if (this.props.autoPlay) {
+    if (autoPlay) {
       this.video.play();
     }
   }
@@ -387,25 +496,14 @@ class Video extends React.PureComponent {
   }
 
   handleOpenVideo = () => {
-    const { src, preview, width, height, alt } = this.props;
-
-    const media = fromJS({
-      type: 'video',
-      url: src,
-      preview_url: preview,
-      description: alt,
-      width,
-      height,
-    });
+    this.video.pause();
 
-    const options = {
+    this.props.onOpenVideo({
       startTime: this.video.currentTime,
       autoPlay: !this.state.paused,
       defaultVolume: this.state.volume,
-    };
-
-    this.video.pause();
-    this.props.onOpenVideo(media, options);
+      componetIndex: this.props.componetIndex,
+    });
   }
 
   handleCloseVideo = () => {
@@ -413,10 +511,21 @@ class Video extends React.PureComponent {
     this.props.onCloseVideo();
   }
 
+  getFrameRate () {
+    if (this.props.frameRate && isNaN(this.props.frameRate)) {
+      // The frame rate is returned as a fraction string so we
+      // need to convert it to a number
+
+      return this.props.frameRate.split('/').reduce((p, c) => p / c);
+    }
+
+    return this.props.frameRate;
+  }
+
   render () {
-    const { preview, src, inline, startTime, onOpenVideo, onCloseVideo, intl, alt, detailed, sensitive, link, editable, blurhash } = this.props;
+    const { preview, src, inline, onOpenVideo, onCloseVideo, intl, alt, detailed, sensitive, editable, blurhash } = this.props;
     const { containerWidth, currentTime, duration, volume, buffer, dragging, paused, fullscreen, hovered, muted, revealed } = this.state;
-    const progress = (currentTime / duration) * 100;
+    const progress = Math.min((currentTime / duration) * 100, 100);
     const playerStyle = {};
 
     let { width, height } = this.props;
@@ -430,7 +539,7 @@ class Video extends React.PureComponent {
 
     let preload;
 
-    if (startTime || fullscreen || dragging) {
+    if (this.props.currentTime || fullscreen || dragging) {
       preload = 'auto';
     } else if (detailed) {
       preload = 'metadata';
@@ -455,6 +564,7 @@ class Video extends React.PureComponent {
         onMouseEnter={this.handleMouseEnter}
         onMouseLeave={this.handleMouseLeave}
         onClick={this.handleClickRoot}
+        onKeyDown={this.handleKeyDown}
         tabIndex={0}
       >
         <Blurhash
@@ -478,6 +588,7 @@ class Video extends React.PureComponent {
           height={height}
           volume={volume}
           onClick={this.togglePlay}
+          onKeyDown={this.handleVideoKeyDown}
           onPlay={this.handlePlay}
           onPause={this.handlePause}
           onLoadedData={this.handleLoadedData}
@@ -500,13 +611,14 @@ class Video extends React.PureComponent {
               className={classNames('video-player__seek__handle', { active: dragging })}
               tabIndex='0'
               style={{ left: `${progress}%` }}
+              onKeyDown={this.handleVideoKeyDown}
             />
           </div>
 
           <div className='video-player__buttons-bar'>
             <div className='video-player__buttons left'>
-              <button type='button' title={intl.formatMessage(paused ? messages.play : messages.pause)} aria-label={intl.formatMessage(paused ? messages.play : messages.pause)} onClick={this.togglePlay} autoFocus={detailed}><Icon id={paused ? 'play' : 'pause'} fixedWidth /></button>
-              <button type='button' title={intl.formatMessage(muted ? messages.unmute : messages.mute)} aria-label={intl.formatMessage(muted ? messages.unmute : messages.mute)} onClick={this.toggleMute}><Icon id={muted ? 'volume-off' : 'volume-up'} fixedWidth /></button>
+              <button type='button' title={intl.formatMessage(paused ? messages.play : messages.pause)} aria-label={intl.formatMessage(paused ? messages.play : messages.pause)} className='player-button' onClick={this.togglePlay} autoFocus={detailed}><Icon id={paused ? 'play' : 'pause'} fixedWidth /></button>
+              <button type='button' title={intl.formatMessage(muted ? messages.unmute : messages.mute)} aria-label={intl.formatMessage(muted ? messages.unmute : messages.mute)} className='player-button' onClick={this.toggleMute}><Icon id={muted ? 'volume-off' : 'volume-up'} fixedWidth /></button>
 
               <div className={classNames('video-player__volume', { active: this.state.hovered })} onMouseDown={this.handleVolumeMouseDown} ref={this.setVolumeRef}>
                 <div className='video-player__volume__current' style={{ width: `${volume * 100}%` }} />
@@ -522,18 +634,16 @@ class Video extends React.PureComponent {
                 <span className='video-player__time'>
                   <span className='video-player__time-current'>{formatTime(Math.floor(currentTime))}</span>
                   <span className='video-player__time-sep'>/</span>
-                  <span className='video-player__time-total'>{formatTime(duration)}</span>
+                  <span className='video-player__time-total'>{formatTime(Math.floor(duration))}</span>
                 </span>
               )}
-
-              {link && <span className='video-player__link'>{link}</span>}
             </div>
 
             <div className='video-player__buttons right'>
-              {(!onCloseVideo && !editable && !fullscreen) && <button type='button' title={intl.formatMessage(messages.hide)} aria-label={intl.formatMessage(messages.hide)} onClick={this.toggleReveal}><Icon id='eye-slash' fixedWidth /></button>}
-              {(!fullscreen && onOpenVideo) && <button type='button' title={intl.formatMessage(messages.expand)} aria-label={intl.formatMessage(messages.expand)} onClick={this.handleOpenVideo}><Icon id='expand' fixedWidth /></button>}
-              {onCloseVideo && <button type='button' title={intl.formatMessage(messages.close)} aria-label={intl.formatMessage(messages.close)} onClick={this.handleCloseVideo}><Icon id='compress' fixedWidth /></button>}
-              <button type='button' title={intl.formatMessage(fullscreen ? messages.exit_fullscreen : messages.fullscreen)} aria-label={intl.formatMessage(fullscreen ? messages.exit_fullscreen : messages.fullscreen)} onClick={this.toggleFullscreen}><Icon id={fullscreen ? 'compress' : 'arrows-alt'} fixedWidth /></button>
+              {(!onCloseVideo && !editable && !fullscreen && !this.props.alwaysVisible) && <button type='button' title={intl.formatMessage(messages.hide)} aria-label={intl.formatMessage(messages.hide)} className='player-button' onClick={this.toggleReveal}><Icon id='eye-slash' fixedWidth /></button>}
+              {(!fullscreen && onOpenVideo) && <button type='button' title={intl.formatMessage(messages.expand)} aria-label={intl.formatMessage(messages.expand)} className='player-button' onClick={this.handleOpenVideo}><Icon id='expand' fixedWidth /></button>}
+              {onCloseVideo && <button type='button' title={intl.formatMessage(messages.close)} aria-label={intl.formatMessage(messages.close)} className='player-button' onClick={this.handleCloseVideo}><Icon id='compress' fixedWidth /></button>}
+              <button type='button' title={intl.formatMessage(fullscreen ? messages.exit_fullscreen : messages.fullscreen)} aria-label={intl.formatMessage(fullscreen ? messages.exit_fullscreen : messages.fullscreen)} className='player-button' onClick={this.toggleFullscreen}><Icon id={fullscreen ? 'compress' : 'arrows-alt'} fixedWidth /></button>
             </div>
           </div>
         </div>
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index 1134c55db42c4080f5e87dd406bf7d5bfaeb9b75..80d43907d30b82388295e180b074a83d22c93c01 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -25,5 +25,6 @@ export const usePendingItems = getMeta('use_pending_items');
 export const showTrends = getMeta('trends');
 export const title = getMeta('title');
 export const cropImages = getMeta('crop_images');
+export const disableSwiping = getMeta('disable_swiping');
 
 export default initialState;
diff --git a/app/javascript/mastodon/is_mobile.js b/app/javascript/mastodon/is_mobile.js
index f96df1ebbc6705956b19413fa11ca9437e02e9f4..2926eb4b1717be68b93b80bf45c519c7617c63b8 100644
--- a/app/javascript/mastodon/is_mobile.js
+++ b/app/javascript/mastodon/is_mobile.js
@@ -1,27 +1,32 @@
-import detectPassiveEvents from 'detect-passive-events';
+import { supportsPassiveEvents } from 'detect-passive-events';
+import { forceSingleColumn } from 'mastodon/initial_state';
 
 const LAYOUT_BREAKPOINT = 630;
 
-export function isMobile(width) {
-  return width <= LAYOUT_BREAKPOINT;
+export const isMobile = width => width <= LAYOUT_BREAKPOINT;
+
+export const layoutFromWindow = () => {
+  if (isMobile(window.innerWidth)) {
+    return 'mobile';
+  } else if (forceSingleColumn) {
+    return 'single-column';
+  } else {
+    return 'multi-column';
+  }
 };
 
 const iOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
 
 let userTouching = false;
-let listenerOptions = detectPassiveEvents.hasSupport ? { passive: true } : false;
+let listenerOptions = supportsPassiveEvents ? { passive: true } : false;
 
-function touchListener() {
+const touchListener = () => {
   userTouching = true;
   window.removeEventListener('touchstart', touchListener, listenerOptions);
-}
+};
 
 window.addEventListener('touchstart', touchListener, listenerOptions);
 
-export function isUserTouching() {
-  return userTouching;
-}
+export const isUserTouching = () => userTouching;
 
-export function isIOS() {
-  return iOS;
-};
+export const isIOS = () => iOS;
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 548471edfd88b8108db61bd30498328b1d8b98ae..4d43a2720e110ab2f7d41ec0d478483a5ba87f29 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "ØªØµÙØ Ø§Ù„Ù…Ø²ÙŠØ¯ Ø¹Ù„Ù‰ Ø§Ù„Ù…Ù„Ù Ø§Ù„ØªØ¹Ø±ÙŠÙÙŠ Ø§Ù„Ø£ØµÙ„ÙŠ",
   "account.cancel_follow_request": "Ø¥Ù„ØºØ§Ø¡ Ø·Ù„Ø¨ Ø§Ù„Ù…ØªØ§Ø¨ÙŽØ¹Ø©",
   "account.direct": "Ø±Ø³Ø§Ù„Ø© Ø®Ø§ØµØ© Ø¥Ù„Ù‰ @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Ø§Ù„Ù†Ø·Ø§Ù‚ Ù…Ø®ÙÙŠ",
   "account.edit_profile": "ØªØ¹Ø¯ÙŠÙ„ Ø§Ù„Ù…Ù„Ù Ø§Ù„Ø´Ø®ØµÙŠ",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Ø£ÙˆØµÙ Ø¨Ù‡ Ø¹Ù„Ù‰ ØµÙØØªÙƒ",
   "account.follow": "ØªØ§Ø¨ÙØ¹",
   "account.followers": "Ù…ÙØªØ§Ø¨ÙØ¹ÙˆÙ†",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Ù†ØªØ§Ø¦Ø¬ Ø§Ù„Ø¨ØØ«",
   "emoji_button.symbols": "Ø±Ù…ÙˆØ²",
   "emoji_button.travel": "Ø§Ù„Ø£Ù…Ø§ÙƒÙ† ÙˆØ§Ù„Ø³ÙØ±",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Ù„ÙŠØ³ Ù‡Ù†Ø§Ùƒ ØªØ¨ÙˆÙŠÙ‚Ø§Øª!",
   "empty_column.account_unavailable": "Ø§Ù„Ù…Ù„Ù Ø§Ù„ØªØ¹Ø±ÙŠÙÙŠ ØºÙŠØ± Ù…ØªÙˆÙØ±",
   "empty_column.blocks": "Ù„Ù… ØªÙ‚Ù… Ø¨ØØ¸Ø± Ø£ÙŠ Ù…Ø³ØªØ®Ø¯ÙÙ… Ø¨Ø¹Ø¯.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Ù„Ù… ØªØªÙ„Ù‚ Ø£ÙŠ Ø¥Ø´Ø¹Ø§Ø± Ø¨Ø¹Ø¯Ù. ØªÙØ§Ø¹Ù„ Ù…Ø¹ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† Ø§Ù„Ø¢Ø®Ø±ÙŠÙ† Ù„Ø¥Ù†Ø´Ø§Ø¡ Ù…ØØ§Ø¯Ø«Ø©.",
   "empty_column.public": "Ù„Ø§ ÙŠÙˆØ¬Ø¯ Ø£ÙŠ Ø´ÙŠØ¡ Ù‡Ù†Ø§! Ù‚Ù… Ø¨Ù†Ø´Ø± Ø´ÙŠØ¡ Ù…Ø§ Ù„Ù„Ø¹Ø§Ù…Ø©ØŒ Ø£Ùˆ Ø§ØªØ¨Ø¹ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† Ø§Ù„Ø¢Ø®Ø±ÙŠÙ† Ø§Ù„Ù…ØªÙˆØ§Ø¬Ø¯ÙŠÙ† Ø¹Ù„Ù‰ Ø§Ù„Ø®ÙˆØ§Ø¯Ù… Ø§Ù„Ø£Ø®Ø±Ù‰ Ù„Ù…Ù„Ø¡ Ø®ÙŠØ· Ø§Ù„Ù…ØØ§Ø¯Ø«Ø§Øª",
   "error.unexpected_crash.explanation": "Ù†Ø¸Ø±Ø§ Ù„ÙˆØ¬ÙˆØ¯ Ø®Ø·Ø£ ÙÙŠ Ø§Ù„ØªØ¹Ù„ÙŠÙ…Ø§Øª Ø§Ù„Ø¨Ø±Ù…Ø¬ÙŠØ© Ø£Ùˆ Ù…Ø´ÙƒÙ„Ø© ØªÙˆØ§ÙÙ‚ Ù…Ø¹ Ø§Ù„Ù…ØªØµÙÙ‘ØØŒ ØªØ¹Ø°Ø± Ø¹Ø±Ø¶ Ù‡Ø°Ù‡ Ø§Ù„ØµÙØØ© Ø¨Ø´ÙƒÙ„ ØµØÙŠØ.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "ØØ§ÙˆÙ„ Ø¥Ø¹Ø§Ø¯Ø© Ø¥Ù†Ø¹Ø§Ø´ Ø§Ù„ØµÙØØ©. Ø¥Ù† Ù„Ù… ØªÙØÙ„Ù‘ Ø§Ù„Ù…Ø´ÙƒÙ„Ø© ØŒ ÙŠÙ…ÙƒÙ†Ùƒ Ø¯Ø§Ø¦Ù…Ù‹Ø§ Ø§Ø³ØªØ®Ø¯Ø§Ù… Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ø¹Ø¨Ø± Ù…ØªØµÙÙ‘Ø Ø¢Ø®Ø± Ø£Ùˆ ØªØ·Ø¨ÙŠÙ‚ Ø£ØµÙ„ÙŠ.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Ø§Ù†Ø³Ø® ØªØªØ¨Ø¹ Ø§Ù„Ø§Ø±ØªØ¨Ø§Ø·Ø§Øª Ø¥Ù„Ù‰ Ø§Ù„ØØ§ÙØ¸Ø©",
   "errors.unexpected_crash.report_issue": "Ø§Ù„Ø¥Ø¨Ù„Ø§Øº Ø¹Ù† Ø®Ù„Ù„",
   "follow_request.authorize": "ØªØ±Ø®ÙŠØµ",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "Ù„Ø¥Ù„ØºØ§Ø¡ Ø§Ù„ØªØ±ÙƒÙŠØ² Ø¹Ù„Ù‰ ØÙ‚Ù„ Ø§Ù„Ù†Øµ Ø£Ùˆ Ù†Ø§ÙØ°Ø© Ø§Ù„Ø¨ØØ«",
   "keyboard_shortcuts.up": "Ù„Ù„Ø§Ù†ØªÙ‚Ø§Ù„ Ø¥Ù„Ù‰ Ø£Ø¹Ù„Ù‰ Ø§Ù„Ù‚Ø§Ø¦Ù…Ø©",
   "lightbox.close": "Ø¥ØºÙ„Ø§Ù‚",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Ø§Ù„ØªØ§Ù„ÙŠ",
   "lightbox.previous": "Ø§Ù„Ø¹ÙˆØ¯Ø©",
-  "lightbox.view_context": "Ø§Ø¹Ø±Ø¶ Ø§Ù„Ø³ÙŠØ§Ù‚",
   "lists.account.add": "Ø£Ø¶Ù Ø¥Ù„Ù‰ Ø§Ù„Ù‚Ø§Ø¦Ù…Ø©",
   "lists.account.remove": "Ø§ØØ°Ù Ù…Ù† Ø§Ù„Ù‚Ø§Ø¦Ù…Ø©",
   "lists.delete": "Ø§ØØ°Ù Ø§Ù„Ù‚Ø§Ø¦Ù…Ø©",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "ØªØ¹Ø¯ÙŠÙ„ Ø§Ù„Ø¹Ù†ÙˆØ§Ù†",
   "lists.new.create": "Ø¥Ù†Ø´Ø§Ø¡ Ù‚Ø§Ø¦Ù…Ø©",
   "lists.new.title_placeholder": "Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø©",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Ø¥Ø¨ØØ« ÙÙŠ Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„ØØ³Ø§Ø¨Ø§Øª Ø§Ù„ØªÙŠ ØªÙØªØ§Ø¨ÙØ¹Ù‡Ø§",
   "lists.subheading": "Ù‚ÙˆØ§Ø¦Ù…Ùƒ",
   "load_pending": "{count, plural, one {# Ø¹Ù†ØµØ± Ø¬Ø¯ÙŠØ¯} other {# Ø¹Ù†Ø§ØµØ± Ø¬Ø¯ÙŠØ¯Ø©}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Ø¹Ø±Ø¶ / Ø¥Ø®ÙØ§Ø¡",
   "missing_indicator.label": "ØºÙŠØ± Ù…ÙˆØ¬ÙˆØ¯",
   "missing_indicator.sublabel": "ØªØ¹Ø°Ø± Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ Ù‡Ø°Ø§ Ø§Ù„Ù…ÙˆØ±Ø¯",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Ù‡Ù„ ØªÙˆØ¯ Ø¥Ø®ÙØ§Ø¡ Ø§Ù„Ø¥Ø®Ø·Ø§Ø±Ø§Øª Ø§Ù„Ù‚Ø§Ø¯Ù…Ø© Ù…Ù† Ù‡Ø°Ø§ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… ØŸ",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "ØªØ·Ø¨ÙŠÙ‚Ø§Øª Ø§Ù„Ø£Ø¬Ù‡Ø²Ø© Ø§Ù„Ù…ØÙ…ÙˆÙ„Ø©",
   "navigation_bar.blocks": "Ø§Ù„ØØ³Ø§Ø¨Ø§Øª Ø§Ù„Ù…ØØ¬ÙˆØ¨Ø©",
   "navigation_bar.bookmarks": "Ø§Ù„ÙÙˆØ§ØµÙ„ Ø§Ù„Ù…Ø±Ø¬Ø¹ÙŠØ©",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Ø§Ù†ØªÙ‡Ù‰ Ø§Ø³ØªØ·Ù„Ø§Ø¹Ùƒ Ù„Ù„Ø±Ø£ÙŠ",
   "notification.poll": "Ù„Ù‚Ø¯ Ø¥Ù†ØªÙ‡Ø§ ØªØµÙˆÙŠØª Ø´Ø§Ø±ÙƒØª ÙÙŠÙ‡",
   "notification.reblog": "{name} Ù‚Ø§Ù… Ø¨ØªØ±Ù‚ÙŠØ© ØªØ¨ÙˆÙŠÙ‚Ùƒ",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Ø§Ù…Ø³Ø Ø§Ù„Ø¥Ø®Ø·Ø§Ø±Ø§Øª",
   "notifications.clear_confirmation": "Ø£Ù…ØªØ£ÙƒØ¯ Ù…Ù† Ø£Ù†Ùƒ ØªÙˆØ¯ Ù…Ø³Ø Ø¬Ù„ Ø§Ù„Ø¥Ø®Ø·Ø§Ø±Ø§Øª Ø§Ù„Ø®Ø§ØµØ© Ø¨Ùƒ Ùˆ Ø§Ù„Ù…ØªÙ„Ù‚Ø§Ø© Ø¥Ù„Ù‰ ØØ¯ Ø§Ù„Ø¢Ù† ØŸ",
   "notifications.column_settings.alert": "Ø¥Ø´Ø¹Ø§Ø±Ø§Øª Ø³Ø·Ø Ø§Ù„Ù…ÙƒØªØ¨",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Ø§Ù„ØªØ±Ù‚ÙŠÙ‘Ø§Øª:",
   "notifications.column_settings.show": "Ø§Ø¹Ø±ÙØ¶Ù‡Ø§ ÙÙŠ Ø¹Ù…ÙˆØ¯",
   "notifications.column_settings.sound": "Ø£ØµØ¯Ø± ØµÙˆØªØ§",
+  "notifications.column_settings.status": "ØªØ¨ÙˆÙŠÙ‚Ø§Øª Ø¬Ø¯ÙŠØ¯Ø©:",
   "notifications.filter.all": "Ø§Ù„ÙƒÙ„",
   "notifications.filter.boosts": "Ø§Ù„ØªØ±Ù‚ÙŠØ§Øª",
   "notifications.filter.favourites": "Ø§Ù„Ù…ÙØ¶Ù„Ø©",
   "notifications.filter.follows": "ÙŠØªØ§Ø¨ÙØ¹",
   "notifications.filter.mentions": "Ø§Ù„Ø¥Ø´Ø§Ø±Ø§Øª",
   "notifications.filter.polls": "Ù†ØªØ§Ø¦Ø¬ Ø§Ø³ØªØ·Ù„Ø§Ø¹ Ø§Ù„Ø±Ø£ÙŠ",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} Ø¥Ø´Ø¹Ø§Ø±Ø§Øª",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Ø§Ù†ØªÙ‡Ù‰",
   "poll.refresh": "ØªØØ¯ÙŠØ«",
   "poll.total_people": "{count, plural, one {# Ø´Ø®Øµ} two {# Ø´Ø®ØµÙŠÙ†} few {# Ø£Ø´Ø®Ø§Øµ} many {# Ø£Ø´Ø®Ø§Øµ} other {# Ø£Ø´Ø®Ø§Øµ}}",
@@ -430,7 +454,7 @@
   "units.short.million": "{count}  Ù…Ù„ÙŠÙˆÙ†",
   "units.short.thousand": "{count}  Ø£Ù„Ù",
   "upload_area.title": "Ø§Ø³ØØ¨ Ø«Ù… Ø£ÙÙ„Øª Ù„Ù„Ø±ÙØ¹",
-  "upload_button.label": "Ø¥Ø¶Ø§ÙØ© ÙˆØ³Ø§Ø¦Ø· ({formats})",
+  "upload_button.label": "Ø¥Ø¶Ø§ÙØ© ÙˆØ³Ø§Ø¦Ø·",
   "upload_error.limit": "Ù„Ù‚Ø¯ ØªÙ… Ø¨Ù„ÙˆØº Ø§Ù„ØØ¯ Ø§Ù„Ø£Ù‚ØµÙ‰ Ø§Ù„Ù…Ø³Ù…ÙˆØ Ø¨Ù‡ Ù„Ø¥Ø±Ø³Ø§Ù„ Ø§Ù„Ù…Ù„ÙØ§Øª.",
   "upload_error.poll": "Ù„Ø§ ÙŠÙ…ÙƒÙ† Ø¥Ø¯Ø±Ø§Ø¬ Ù…Ù„ÙØ§Øª ÙÙŠ Ø§Ø³ØªØ·Ù„Ø§Ø¹Ø§Øª Ø§Ù„Ø±Ø£ÙŠ.",
   "upload_form.audio_description": "ÙˆØµÙ Ù„Ù„Ø£Ø´Ø®Ø§Øµ Ø°ÙŠ Ù‚ÙØµØ± Ø§Ù„Ø³Ù…Ø¹",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Ø§ÙƒØªØ´Ù Ø§Ù„Ù†Øµ Ù…ÙÙ† Ø§Ù„ØµÙˆØ±Ø©",
   "upload_modal.edit_media": "ØªØ¹Ø¯ÙŠÙ„ Ø§Ù„ÙˆØ³Ø§Ø¦Ø·",
   "upload_modal.hint": "Ø§Ø¶ØºØ· Ø£Ùˆ Ø§Ø³ØØ¨ Ø§Ù„Ø¯Ø§Ø¦Ø±Ø© Ø¹Ù„Ù‰ Ø®Ø§Ù†Ø© Ø§Ù„Ù…Ø¹Ø§ÙŠÙ†Ø© Ù„Ø§Ø®ØªÙŠØ§Ø± Ù†Ù‚Ø·Ø© Ø§Ù„ØªØ±ÙƒÙŠØ² Ø§Ù„ØªÙŠ Ø³ØªÙØ¹Ø±ÙŽØ¶ Ø¯Ø§Ø¦Ù…Ù‹Ø§ Ø¹Ù„Ù‰ ÙƒÙ„ Ø§Ù„Ù…ØµØºØ±Ø§Øª.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Ù…Ø¹Ø§ÙŠÙ†Ø© ({ratio})",
   "upload_progress.label": "ÙŠØ±ÙØ¹...",
   "video.close": "Ø¥ØºÙ„Ø§Ù‚ Ø§Ù„ÙÙŠØ¯ÙŠÙˆ",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 6c6232262effd0d5bef91e9e0a317e7be1451ff0..4f5fec8b1fe2331f3f0ee92988cae126ff14ec7e 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Encaboxar la solicitÃº de siguimientu",
   "account.direct": "Unviar un mensaxe direutu a @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Dominiu anubrÃu",
   "account.edit_profile": "Editar el perfil",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Destacar nel perfil",
   "account.follow": "Siguir",
   "account.followers": "Siguidores",
@@ -96,9 +98,9 @@
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
   "compose_form.publish": "Barritar",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "El testu nun va anubrise darrera d'una alvertencia",
   "compose_form.spoiler.unmarked": "El testu nun va anubrise",
   "compose_form.spoiler_placeholder": "Escribi equÃ l'alvertencia",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "SÃmbolos",
   "emoji_button.travel": "Viaxes y llugares",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Â¡EquÃ nun hai barritos!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "EntÃ¡ nun bloquiesti a nunengÃºn usuariu.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "EntÃ¡ nun tienes nunengÃºn avisu. InteractÃºa con otros p'aniciar la conversaciÃ³n.",
   "empty_column.public": "Â¡EquÃ nun hai nada! Escribi daquÃ© pÃºblico o sigui a usuarios d'otros sirvidores pa rellenar esto",
   "error.unexpected_crash.explanation": "Pola mor d'un fallu nel cÃ³digu o un problema de compatibilidÃ¡ del restolador, esta pÃ¡xina nun pudo amosase correutamente.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "Autorizar",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "pa desenfocar l'Ã¡rea de composiciÃ³n/gueta",
   "keyboard_shortcuts.up": "pa xubir na llista",
   "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Siguiente",
   "lightbox.previous": "Previous",
-  "lightbox.view_context": "View context",
   "lists.account.add": "Amestar a la llista",
   "lists.account.remove": "Desaniciar de la llista",
   "lists.delete": "Desaniciar la llista",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Change title",
   "lists.new.create": "Add list",
   "lists.new.title_placeholder": "TÃtulu nuevu de la llista",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Guetar ente la xente que sigues",
   "lists.subheading": "Les tos llistes",
   "load_pending": "{count, plural, one {# elementu nuevu} other {# elementos nuevos}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Alternar la visibilidÃ¡",
   "missing_indicator.label": "Nun s'alcontrÃ³",
   "missing_indicator.sublabel": "Esti recursu nun pudo alcontrase",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Â¿Anubrir los avisos d'esti usuariu?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Aplicaciones pa mÃ³viles",
   "navigation_bar.blocks": "Usuarios bloquiaos",
   "navigation_bar.bookmarks": "Marcadores",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "FinÃ³ una encuesta na que votesti",
   "notification.reblog": "{name} compartiÃ³'l to estÃ¡u",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Llimpiar avisos",
   "notifications.clear_confirmation": "Â¿De xuru que quies llimpiar dafechu tolos avisos?",
   "notifications.column_settings.alert": "Avisos d'escritoriu",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Barritos compartÃos:",
   "notifications.column_settings.show": "Amosar en columna",
   "notifications.column_settings.sound": "Reproducir un sonÃu",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "Too",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Menciones",
   "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} avisos",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "AcabÃ³",
   "poll.refresh": "Refresh",
   "poll.total_people": "{count, plural, one {# persona} other {# persones}}",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Deteutar el testu de la semeya",
   "upload_modal.edit_media": "EdiciÃ³n",
   "upload_modal.hint": "Calca o arrastra'l cÃrculu de la previsualizaciÃ³n pa escoyer el puntu d'enfoque que va amosase siempres en toles miniatures.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "PrevisualizaciÃ³n ({ratio})",
   "upload_progress.label": "Xubiendoâ€¦",
   "video.close": "Zarrar el videu",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 16520dbad5281e86a265472334eb917e481910f2..4778d66182807a5f900bdd060203ab49a2e8fd3d 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "ÐžÑ‚ÐºÐ°Ð¶Ð¸ Ð¸ÑÐºÐ°Ð½ÐµÑ‚Ð¾ Ð·Ð° ÑÐ»ÐµÐ´Ð²Ð°Ð½Ðµ",
   "account.direct": "Direct Message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Ð¡ÐºÑ€Ð¸Ñ‚ Ð´Ð¾Ð¼ÐµÐ¹Ð½",
   "account.edit_profile": "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð°Ð¹ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ð° ÑÐ¸",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Ð¥Ð°Ñ€Ð°ÐºÑ‚ÐµÑ€Ð¸ÑÑ‚Ð¸ÐºÐ° Ð½Ð° Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ð°",
   "account.follow": "ÐŸÐ¾ÑÐ»ÐµÐ´Ð²Ð°Ð¹",
   "account.followers": "ÐŸÐ¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸",
@@ -96,9 +98,9 @@
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
   "compose_form.publish": "Ð Ð°Ð·Ð´ÑƒÐ¼Ð°Ð¹",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "Content warning",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No toots here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other instances to fill it up",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "Authorize",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
-  "lightbox.view_context": "View context",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Change title",
   "lists.new.create": "Add list",
   "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Search among people you follow",
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} ÑÐ¿Ð¾Ð´ÐµÐ»Ð¸ Ñ‚Ð²Ð¾ÑÑ‚Ð° Ð¿ÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.alert": "Ð”ÐµÑÐºÑ‚Ð¾Ð¿ Ð¸Ð·Ð²ÐµÑÑ‚Ð¸Ñ",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÑÐ½Ð¸Ñ:",
   "notifications.column_settings.show": "ÐŸÐ¾ÐºÐ°Ð¶Ð¸ Ð² ÐºÐ¾Ð»Ð¾Ð½Ð°",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Closed",
   "poll.refresh": "Refresh",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -389,7 +413,7 @@
   "status.pinned": "Pinned toot",
   "status.read_more": "Read more",
   "status.reblog": "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÑÐ½Ðµ",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} ÑÐ¿Ð¾Ð´ÐµÐ»Ð¸",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploadingâ€¦",
   "video.close": "Close video",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 7de1a10221b2470daabdfb69b116a5fac84d298b..9b73c35971a933177dc0552597c1b25b537b869a 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -1,22 +1,24 @@
 {
-  "account.account_note_header": "Note",
+  "account.account_note_header": "à¦¨à§‹à¦Ÿ",
   "account.add_or_remove_from_list": "à¦¤à¦¾à¦²à¦¿à¦•à¦¾à¦¤à§‡ à¦¯à§à¦•à§à¦¤ à¦¬à¦¾ à¦…à¦ªà¦¸à¦¾à¦°à¦£ à¦•à¦°à§à¦¨",
   "account.badges.bot": "à¦¬à¦Ÿ",
-  "account.badges.group": "Group",
+  "account.badges.group": "à¦—à§à¦°à§à¦ª",
   "account.block": "@{name} à¦•à§‡ à¦¬à§à¦²à¦• à¦•à¦°à§à¦¨",
   "account.block_domain": "{domain} à¦¥à§‡à¦•à§‡ à¦¸à¦¬ à¦†à¦¡à¦¼à¦¾à¦² à¦•à¦°à§à¦¨",
   "account.blocked": "à¦…à¦¬à¦°à§à¦¦à§à¦§",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "à¦®à§‚à¦² à¦ªà§à¦°à§‹à¦«à¦¾à¦‡à¦²à¦Ÿà¦¿à¦¤à§‡ à¦†à¦°à¦“ à¦¬à§à¦°à¦¾à¦‰à¦œ à¦•à¦°à§à¦¨",
   "account.cancel_follow_request": "à¦…à¦¨à§à¦¸à¦°à¦£ à¦…à¦¨à§à¦°à§‹à¦§ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°à§à¦¨",
   "account.direct": "@{name} à¦•à§‡ à¦¸à¦°à¦¾à¦¸à¦°à¦¿ à¦¬à¦¾à¦°à§à¦¤à¦¾",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "à¦¡à§‹à¦®à§‡à¦¨ à¦—à§‹à¦ªà¦¨ à¦•à¦°à§à¦¨",
   "account.edit_profile": "à¦ªà§à¦°à§‹à¦«à¦¾à¦‡à¦² à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨ à¦•à¦°à§à¦¨",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "à¦¨à¦¿à¦œà§‡à¦° à¦ªà¦¾à¦¤à¦¾à§Ÿ à¦¦à§‡à¦–à¦¾à¦¨",
   "account.follow": "à¦…à¦¨à§à¦¸à¦°à¦£ à¦•à¦°à§à¦¨",
   "account.followers": "à¦…à¦¨à§à¦¸à¦°à¦£à¦•à¦¾à¦°à§€",
   "account.followers.empty": "à¦à¦‡ à¦¸à¦¦à¦¸à§à¦¯à¦•à§‡ à¦à¦–à¦¨à§‹ à¦•à§‡à¦‰ à¦…à¦¨à§à¦¸à¦°à¦£ à¦•à¦°à§‡ à¦¨à¦¾à¥¤.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers_counter": "{count, plural,one {{counter} à¦œà¦¨ à¦…à¦¨à§à¦¸à¦°à¦£à¦•à¦¾à¦°à§€ } other {{counter} à¦œà¦¨ à¦…à¦¨à§à¦¸à¦°à¦£à¦•à¦¾à¦°à§€}}",
+  "account.following_counter": "{count, plural,one {{counter} à¦œà¦¨à¦•à§‡ à¦…à¦¨à§à¦¸à¦°à¦£} other {{counter} à¦œà¦¨à¦•à§‡ à¦…à¦¨à§à¦¸à¦°à¦£}}",
   "account.follows.empty": "à¦à¦‡ à¦¸à¦¦à¦¸à§à¦¯ à¦•à¦¾à¦“à¦•à§‡ à¦à¦–à¦¨à§‹ à¦…à¦¨à§à¦¸à¦°à¦£ à¦•à¦°à§‡à¦¨ à¦¨à¦¾.",
   "account.follows_you": "à¦†à¦ªà¦¨à¦¾à¦•à§‡ à¦…à¦¨à§à¦¸à¦°à¦£ à¦•à¦°à§‡",
   "account.hide_reblogs": "@{name}'à¦° à¦¸à¦®à¦°à§à¦¥à¦¨à¦—à§à¦²à¦¿ à¦²à§à¦•à¦¿à§Ÿà§‡ à¦«à§‡à¦²à§à¦¨",
@@ -36,19 +38,19 @@
   "account.requested": "à¦…à¦¨à§à¦®à¦¤à¦¿à¦° à¦…à¦ªà§‡à¦•à§à¦·à¦¾à¥¤ à¦…à¦¨à§à¦¸à¦°à¦£ à¦•à¦°à¦¾à¦° à¦…à¦¨à§à¦°à§‹à¦§ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°à¦¤à§‡ à¦à¦–à¦¾à¦¨à§‡ à¦•à§à¦²à¦¿à¦• à¦•à¦°à§à¦¨",
   "account.share": "@{name} à¦° à¦ªà§à¦°à§‹à¦«à¦¾à¦‡à¦² à¦…à¦¨à§à¦¯à¦¦à§‡à¦° à¦¦à§‡à¦–à¦¾à¦¨",
   "account.show_reblogs": "@{name} à¦° à¦¸à¦®à¦°à§à¦¥à¦¨à¦—à§à¦²à§‹ à¦¦à§‡à¦–à¦¾à¦¨",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural,one {{counter} à¦Ÿà§à¦Ÿ} other {{counter} à¦Ÿà§à¦Ÿ}}",
   "account.unblock": "@{name} à¦° à¦•à¦¾à¦°à§à¦¯à¦•à¦²à¦¾à¦ª à¦¦à§‡à¦–à§à¦¨",
   "account.unblock_domain": "{domain} à¦•à§‡ à¦†à¦¬à¦¾à¦° à¦¦à§‡à¦–à§à¦¨",
   "account.unendorse": "à¦†à¦ªà¦¨à¦¾à¦° à¦¨à¦¿à¦œà§‡à¦° à¦ªà¦¾à¦¤à¦¾à§Ÿ à¦à¦Ÿà¦¾ à¦¦à§‡à¦–à¦¬à§‡à¦¨ à¦¨à¦¾",
   "account.unfollow": "à¦…à¦¨à§à¦¸à¦°à¦£ à¦¨à¦¾ à¦•à¦°à¦¤à§‡",
   "account.unmute": "@{name} à¦° à¦•à¦¾à¦°à§à¦¯à¦•à¦²à¦¾à¦ª à¦†à¦¬à¦¾à¦° à¦¦à§‡à¦–à§à¦¨",
   "account.unmute_notifications": "@{name} à¦° à¦ªà§à¦°à¦œà§à¦žà¦¾à¦ªà¦¨ à¦¦à§‡à¦–à§à¦¨",
-  "account_note.placeholder": "Click to add a note",
+  "account_note.placeholder": "à¦¨à§‹à¦Ÿ à¦¯à§‹à¦— à¦•à¦°à¦¤à§‡ à¦•à§à¦²à¦¿à¦• à¦•à¦°à§à¦¨",
   "alert.rate_limited.message": "{retry_time, time, medium} -à¦à¦° à¦ªà¦°à§‡ à¦†à¦¬à¦¾à¦° à¦ªà§à¦°à¦šà§‡à¦·à§à¦Ÿà¦¾ à¦•à¦°à§à¦¨à¥¤",
   "alert.rate_limited.title": "à¦¹à¦¾à¦° à¦¸à§€à¦®à¦¿à¦¤",
   "alert.unexpected.message": "à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦…à¦ªà§à¦°à¦¤à§à¦¯à¦¾à¦¶à¦¿à¦¤.",
   "alert.unexpected.title": "à¦“à¦¹à§‹!",
-  "announcement.announcement": "Announcement",
+  "announcement.announcement": "à¦˜à§‹à¦·à¦£à¦¾",
   "autosuggest_hashtag.per_week": "à¦ªà§à¦°à¦¤à¦¿ à¦¸à¦ªà§à¦¤à¦¾à¦¹à§‡ {count}",
   "boost_modal.combo": "à¦ªà¦°à§‡à¦°à¦¬à¦¾à¦° à¦†à¦ªà¦¨à¦¿ {combo} à¦Ÿà¦¿à¦ªà¦²à§‡ à¦à¦Ÿà¦¿ à¦†à¦° à¦†à¦¸à¦¬à§‡ à¦¨à¦¾",
   "bundle_column_error.body": "à¦à¦‡ à¦…à¦‚à¦¶à¦Ÿà¦¿ à¦¦à§‡à¦–à¦¤à§‡ à¦¯à§‡à§Ÿà§‡ à¦•à§‹à¦¨à§‹ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¹à§Ÿà§‡à¦›à§‡à¥¤.",
@@ -58,7 +60,7 @@
   "bundle_modal_error.message": "à¦à¦‡ à¦…à¦‚à¦¶à¦Ÿà¦¿ à¦¦à§‡à¦–à¦¾à¦¤à§‡ à¦¯à§‡à§Ÿà§‡ à¦•à§‹à¦¨à§‹ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¹à§Ÿà§‡à¦›à§‡à¥¤.",
   "bundle_modal_error.retry": "à¦†à¦¬à¦¾à¦° à¦šà§‡à¦·à§à¦Ÿà¦¾ à¦•à¦°à§à¦¨",
   "column.blocks": "à¦¯à¦¾à¦¦à§‡à¦° à¦¬à§à¦²à¦• à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡",
-  "column.bookmarks": "Bookmarks",
+  "column.bookmarks": "à¦¬à§à¦•à¦®à¦¾à¦°à§à¦•",
   "column.community": "à¦¸à§à¦¥à¦¾à¦¨à§€à¦¯à¦¼ à¦¸à¦®à§Ÿà¦¸à¦¾à¦°à¦¿",
   "column.direct": "à¦¸à¦°à¦¾à¦¸à¦°à¦¿ à¦²à§‡à¦–à¦¾",
   "column.directory": "à¦ªà§à¦°à§‹à¦«à¦¾à¦‡à¦² à¦¬à§à¦°à¦¾à¦‰à¦œ à¦•à¦°à§à¦¨",
@@ -79,9 +81,9 @@
   "column_header.show_settings": "à¦¸à§‡à¦Ÿà¦¿à¦‚ à¦¦à§‡à¦–à¦¾à¦¨",
   "column_header.unpin": "à¦ªà¦¿à¦¨ à¦–à§à¦²à§à¦¨",
   "column_subheading.settings": "à¦¸à§‡à¦Ÿà¦¿à¦‚",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "à¦¶à§à¦§à§à¦®à¦¾à¦¤à§à¦° à¦¸à§à¦¥à¦¾à¦¨à§€à§Ÿ",
   "community.column_settings.media_only": "à¦¶à§à¦§à§à¦®à¦¾à¦¤à§à¦° à¦›à¦¬à¦¿ à¦¬à¦¾ à¦à¦¿à¦¡à¦¿à¦“",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "à¦¶à§à¦§à§à¦®à¦¾à¦¤à§à¦° à¦¦à§‚à¦°à¦¬à¦°à§à¦¤à§€",
   "compose_form.direct_message_warning": "à¦¶à§à¦§à§à¦®à¦¾à¦¤à§à¦° à¦¯à¦¾à¦¦à§‡à¦°à¦•à§‡ à¦‰à¦²à§à¦²à§‡à¦– à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡ à¦¤à¦¾à¦¦à§‡à¦°à¦•à§‡à¦‡ à¦à¦‡ à¦Ÿà§à¦Ÿà¦Ÿà¦¿ à¦ªà¦¾à¦ à¦¾à¦¨à§‹ à¦¹à¦¬à§‡ à¥¤",
   "compose_form.direct_message_warning_learn_more": "à¦†à¦°à§‹ à¦œà¦¾à¦¨à§à¦¨",
   "compose_form.hashtag_warning": "à¦•à§‹à¦¨à§‹ à¦¹à§à¦¯à¦¾à¦¶à¦Ÿà§à¦¯à¦¾à¦—à§‡à¦° à¦à§‡à¦¤à¦°à§‡ à¦à¦‡ à¦Ÿà§à¦Ÿà¦Ÿà¦¿ à¦¥à¦¾à¦•à¦¬à§‡à¦¨à¦¾ à¦•à¦¾à¦°à¦£ à¦à¦Ÿà¦¿ à¦¤à¦¾à¦²à¦¿à¦•à¦¾à¦¬à¦¹à¦¿à¦°à§à¦à§‚à¦¤à¥¤ à¦¶à§à¦§à§à¦®à¦¾à¦¤à§à¦° à¦ªà§à¦°à¦•à¦¾à¦¶à§à¦¯ à¦ à§‹à¦Ÿà¦—à§à¦²à§‹ à¦¹à§à¦¯à¦¾à¦¶à¦Ÿà§à¦¯à¦¾à¦—à§‡à¦° à¦à§‡à¦¤à¦°à§‡ à¦–à§à¦à¦œà§‡ à¦ªà¦¾à¦“à§Ÿà¦¾ à¦¯à¦¾à¦¬à§‡à¥¤",
@@ -92,8 +94,8 @@
   "compose_form.poll.duration": "à¦à§‹à¦Ÿà¦—à§à¦°à¦¹à¦¨à§‡à¦° à¦¸à¦®à§Ÿ",
   "compose_form.poll.option_placeholder": "à¦¬à¦¿à¦•à¦²à§à¦ª {number}",
   "compose_form.poll.remove_option": "à¦à¦‡ à¦¬à¦¿à¦•à¦²à§à¦ªà¦Ÿà¦¿ à¦®à§à¦›à§‡ à¦«à§‡à¦²à§à¦¨",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "à¦à¦•à¦¾à¦§à¦¿à¦• à¦ªà¦›à¦¨à§à¦¦ à¦…à¦¨à§à¦®à¦¤à¦¿ à¦¦à§‡à¦“à§Ÿà¦¾à¦° à¦œà¦¨à§à¦¯ à¦ªà§‹à¦² à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨ à¦•à¦°à§à¦¨",
+  "compose_form.poll.switch_to_single": "à¦à¦•à¦Ÿà¦¿ à¦à¦•à¦• à¦ªà¦›à¦¨à§à¦¦à§‡à¦° à¦…à¦¨à§à¦®à¦¤à¦¿ à¦¦à§‡à¦“à§Ÿà¦¾à¦° à¦œà¦¨à§à¦¯ à¦ªà§‹à¦² à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨ à¦•à¦°à§à¦¨",
   "compose_form.publish": "à¦Ÿà§à¦Ÿ",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "à¦à¦‡ à¦›à¦¬à¦¿ à¦¬à¦¾ à¦à¦¿à¦¡à¦¿à¦“à¦Ÿà¦¿ à¦¸à¦‚à¦¬à§‡à¦¦à¦¨à¦¶à§€à¦² à¦¹à¦¿à¦¸à§‡à¦¬à§‡ à¦šà¦¿à¦¹à§à¦¨à¦¿à¦¤ à¦•à¦°à¦¤à§‡",
@@ -147,10 +149,11 @@
   "emoji_button.search_results": "à¦–à§‹à¦à¦œà¦¾à¦° à¦«à¦²à¦¾à¦«à¦²",
   "emoji_button.symbols": "à¦ªà§à¦°à¦¤à§€à¦•",
   "emoji_button.travel": "à¦à§à¦°à¦®à¦£ à¦à¦¬à¦‚ à¦¸à§à¦¥à¦¾à¦¨",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "à¦à¦–à¦¾à¦¨à§‡ à¦•à§‹à¦¨à§‹ à¦Ÿà§à¦Ÿ à¦¨à§‡à¦‡!",
   "empty_column.account_unavailable": "à¦¨à¦¿à¦œà¦¸à§à¦¬ à¦ªà¦¾à¦¤à¦¾ à¦¨à§‡à¦‡",
   "empty_column.blocks": "à¦†à¦ªà¦¨à¦¿ à¦•à§‹à¦¨à§‹ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦¦à§‡à¦° à¦¬à§à¦²à¦• à¦•à¦°à§‡à¦¨ à¦¨à¦¿à¥¤",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
+  "empty_column.bookmarked_statuses": "à¦†à¦ªà¦¨à¦¾à¦° à¦•à¦¾à¦›à§‡ à¦à¦–à¦¨à¦“ à¦•à§‹à¦¨à¦“ à¦¬à§à¦•à¦®à¦¾à¦°à§à¦•à¦¡ à¦Ÿà§à¦Ÿ à¦¨à§‡à¦‡à¥¤ à¦†à¦ªà¦¨à¦¿ à¦¯à¦–à¦¨ à¦à¦•à¦Ÿà¦¿ à¦¬à§à¦•à¦®à¦¾à¦°à§à¦• à¦•à¦°à§‡à¦¨, à¦à¦Ÿà¦¿ à¦à¦–à¦¾à¦¨à§‡ à¦ªà§à¦°à¦¦à¦°à§à¦¶à¦¿à¦¤ à¦¹à¦¬à§‡à¥¤",
   "empty_column.community": "à¦¸à§à¦¥à¦¾à¦¨à§€à¦¯à¦¼ à¦¸à¦®à§Ÿà¦°à§‡à¦–à¦¾à¦¤à§‡ à¦•à¦¿à¦›à§ à¦¨à§‡à¦‡à¥¤ à¦ªà§à¦°à¦•à¦¾à¦¶à§à¦¯à¦à¦¾à¦¬à§‡ à¦•à¦¿à¦›à§ à¦²à¦¿à¦–à§‡ à¦²à§‡à¦–à¦¾à¦²à§‡à¦–à¦¿à¦° à¦‰à¦¦à§à¦¬à§‹à¦§à¦¨ à¦•à¦°à§‡ à¦«à§‡à¦²à§à¦¨!",
   "empty_column.direct": "à¦†à¦ªà¦¨à¦¾à¦° à¦•à¦¾à¦›à§‡ à¦¸à¦°à¦¾à¦¸à¦°à¦¿ à¦ªà¦¾à¦ à¦¾à¦¨à§‹ à¦•à§‹à¦¨à§‹ à¦²à§‡à¦–à¦¾ à¦¨à§‡à¦‡à¥¤ à¦¯à¦¦à¦¿ à¦•à§‡à¦“ à¦ªà¦¾à¦ à¦¾à§Ÿ, à¦¸à§‡à¦Ÿà¦¾ à¦à¦–à¦¾à¦¨à§‡ à¦¦à§‡à¦–à¦¾ à¦¯à¦¾à¦¬à§‡à¥¤",
   "empty_column.domain_blocks": "à¦à¦–à¦¨à¦“ à¦•à§‹à¦¨à¦“ à¦²à§à¦•à¦¾à¦¨à§‹ à¦¡à§‹à¦®à§‡à¦¨ à¦¨à§‡à¦‡à¥¤",
@@ -166,13 +169,15 @@
   "empty_column.notifications": "à¦†à¦ªà¦¨à¦¾à¦° à¦à¦–à¦¨à§‹ à¦•à§‹à¦¨à§‹ à¦ªà§à¦°à¦œà§à¦žà¦¾à¦ªà¦¨ à¦¨à§‡à¦‡à¥¤ à¦•à¦¥à§‹à¦ªà¦•à¦¥à¦¨ à¦¶à§à¦°à§ à¦•à¦°à¦¤à§‡,  à¦…à¦¨à§à¦¯à¦¦à§‡à¦° à¦¸à¦¾à¦¥à§‡ à¦®à§‡à¦²à¦¾à¦®à§‡à¦¶à¦¾ à¦•à¦°à¦¤à§‡ à¦ªà¦¾à¦°à§‡à¦¨à¥¤",
   "empty_column.public": "à¦à¦–à¦¾à¦¨à§‡ à¦à¦–à¦¨à§‹ à¦•à¦¿à¦›à§ à¦¨à§‡à¦‡! à¦ªà§à¦°à¦•à¦¾à¦¶à§à¦¯ à¦à¦¾à¦¬à§‡ à¦•à¦¿à¦›à§ à¦²à¦¿à¦–à§à¦¨ à¦¬à¦¾ à¦…à¦¨à§à¦¯ à¦¸à¦¾à¦°à§à¦à¦¾à¦° à¦¥à§‡à¦•à§‡ à¦•à¦¾à¦“à¦•à§‡ à¦…à¦¨à§à¦¸à¦°à¦£ à¦•à¦°à§‡ à¦à¦‡ à¦œà¦¾à§Ÿà¦—à¦¾ à¦à¦°à§‡ à¦«à§‡à¦²à§à¦¨",
   "error.unexpected_crash.explanation": "à¦†à¦®à¦¾à¦¦à§‡à¦° à¦•à§‹à¦¡ à¦¬à¦¾ à¦¬à§à¦°à¦¾à¦‰à¦œà¦¾à¦°à§‡à¦° à¦¸à¦¾à¦®à¦žà§à¦œà¦¸à§à¦¯ à¦‡à¦¸à§à¦¯à§à¦¤à§‡ à¦à¦•à¦Ÿà¦¿ à¦¬à¦¾à¦—à§‡à¦° à¦•à¦¾à¦°à¦£à§‡ à¦à¦‡ à¦ªà§ƒà¦·à§à¦ à¦¾à¦Ÿà¦¿ à¦¸à¦ à¦¿à¦•à¦à¦¾à¦¬à§‡ à¦ªà§à¦°à¦¦à¦°à§à¦¶à¦¿à¦¤ à¦•à¦°à¦¾ à¦¯à¦¾à§Ÿ à¦¨à¦¿à¥¤",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "à¦ªà¦¾à¦¤à¦¾à¦Ÿà¦¿ à¦°à¦¿à¦«à§à¦°à§‡à¦¶ à¦•à¦°à§‡ à¦šà§‡à¦·à§à¦Ÿà¦¾ à¦•à¦°à§à¦¨à¥¤ à¦¤à¦¬à§à¦“ à¦¯à¦¦à¦¿ à¦¨à¦¾ à¦¹à§Ÿ, à¦¤à¦¬à§‡ à¦†à¦ªà¦¨à¦¿ à¦…à¦¨à§à¦¯ à¦à¦•à¦Ÿà¦¿ à¦¬à§à¦°à¦¾à¦‰à¦œà¦¾à¦° à¦…à¦¥à¦¬à¦¾ à¦†à¦ªà¦¨à¦¾à¦° à¦¡à¦¿à¦à¦¾à¦‡à¦¸à§‡à¦° à¦œà¦¨à§à¦¯à§‡ à¦à¦ªà§‡à¦° à¦®à¦¾à¦§à§à¦¯à¦®à§‡ à¦®à¦¾à¦¸à§à¦Ÿà¦¡à¦¨ à¦¬à§à¦¯à¦¾à¦¬à¦¹à¦¾à¦° à¦•à¦°à¦¤à§‡ à¦ªà¦¾à¦°à¦¬à§‡à¦¨à¥¤.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "à¦¸à§à¦Ÿà§‡à¦•à¦Ÿà§à¦°à§‡à¦¸ à¦•à§à¦²à¦¿à¦ªà¦¬à§‹à¦°à§à¦¡à§‡ à¦•à¦ªà¦¿ à¦•à¦°à§à¦¨",
   "errors.unexpected_crash.report_issue": "à¦¸à¦®à¦¸à§à¦¯à¦¾à¦° à¦ªà§à¦°à¦¤à¦¿à¦¬à§‡à¦¦à¦¨ à¦•à¦°à§à¦¨",
   "follow_request.authorize": "à¦…à¦¨à§à¦®à¦¤à¦¿ à¦¦à¦¿à¦¨",
   "follow_request.reject": "à¦ªà§à¦°à¦¤à§à¦¯à¦¾à¦–à§à¦¯à¦¾à¦¨ à¦•à¦°à§à¦¨",
-  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
-  "generic.saved": "Saved",
+  "follow_requests.unlocked_explanation": "à¦†à¦ªà¦¨à¦¾à¦° à¦…à§à¦¯à¦¾à¦•à¦¾à¦‰à¦¨à§à¦Ÿà¦Ÿà¦¿ à¦²à¦• à¦¨à¦¾ à¦¥à¦¾à¦•à¦²à§‡à¦“, {domain} à¦•à¦°à§à¦®à§€à¦°à¦¾ à¦à§‡à¦¬à§‡à¦›à¦¿à¦²à§‡à¦¨ à¦¯à§‡ à¦†à¦ªà¦¨à¦¿ à¦à¦‡ à¦…à§à¦¯à¦¾à¦•à¦¾à¦‰à¦¨à§à¦Ÿà¦—à§à¦²à¦¿ à¦¥à§‡à¦•à§‡ à¦®à§à¦¯à¦¾à¦¨à§à¦¯à¦¼à¦¾à¦²à¦¿ à¦…à¦¨à§à¦¸à¦°à¦£à§‡à¦° à¦…à¦¨à§à¦°à§‹à¦§à¦—à§à¦²à¦¿ à¦ªà¦°à§à¦¯à¦¾à¦²à§‹à¦šà¦¨à¦¾ à¦•à¦°à¦¤à§‡ à¦šà¦¾à¦‡à¦¤à§‡ à¦ªà¦¾à¦°à§‡à¦¨à¥¤",
+  "generic.saved": "à¦¸à¦‚à¦°à¦•à§à¦·à¦£ à¦¹à§Ÿà§‡à¦›à§‡",
   "getting_started.developers": "à¦¤à§ˆà¦°à¦¿à¦•à¦¾à¦°à¦•à¦¦à§‡à¦° à¦œà¦¨à§à¦¯",
   "getting_started.directory": "à¦¨à¦¿à¦œà¦¸à§à¦¬-à¦ªà¦¾à¦¤à¦¾à¦—à§à¦²à¦¿à¦° à¦¤à¦¾à¦²à¦¿à¦•à¦¾",
   "getting_started.documentation": "à¦¨à¦¥à¦¿à¦ªà¦¤à§à¦°",
@@ -193,8 +198,8 @@
   "home.column_settings.basic": "à¦¸à¦¾à¦§à¦¾à¦°à¦£",
   "home.column_settings.show_reblogs": "à¦¸à¦®à¦°à§à¦¥à¦¨à¦—à§à¦²à§‹ à¦¦à§‡à¦–à¦¾à¦¨",
   "home.column_settings.show_replies": "à¦®à¦¤à¦¾à¦®à¦¤ à¦¦à§‡à¦–à¦¾à¦¨",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
+  "home.hide_announcements": "à¦˜à§‹à¦·à¦£à¦¾ à¦²à§à¦•à¦¾à¦¨",
+  "home.show_announcements": "à¦˜à§‹à¦·à¦£à¦¾ à¦¦à§‡à¦–à¦¾à¦¨",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# à¦˜à¦Ÿà¦¾} other {# à¦˜à¦Ÿà¦¾}}",
   "intervals.full.minutes": "{number, plural, one {# à¦®à¦¿à¦¨à¦¿à¦Ÿ} other {# à¦®à¦¿à¦¨à¦¿à¦Ÿ}}",
@@ -236,13 +241,13 @@
   "keyboard_shortcuts.muted": "à¦¬à¦¨à§à¦§ à¦•à¦°à¦¾ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦¦à§‡à¦° à¦¤à¦¾à¦²à¦¿à¦•à¦¾ à¦–à§à¦²à¦¤à§‡",
   "keyboard_shortcuts.my_profile": "à¦†à¦ªà¦¨à¦¾à¦° à¦¨à¦¿à¦œà§‡à¦° à¦ªà¦¾à¦¤à¦¾ à¦¦à§‡à¦–à¦¤à§‡",
   "keyboard_shortcuts.notifications": "à¦ªà§à¦°à¦œà§à¦žà¦¾à¦ªà¦¨à§‡à¦° à¦•à¦²à¦¾à¦® à¦–à§à¦²à¦¤à§‡",
-  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.open_media": "à¦®à¦¿à¦¡à¦¿à§Ÿà¦¾ à¦–à¦²à¦¾à¦° à¦œà¦¨à§à¦¯",
   "keyboard_shortcuts.pinned": "à¦ªà¦¿à¦¨ à¦¦à§‡à¦“à§Ÿà¦¾ à¦Ÿà§à¦Ÿà§‡à¦° à¦¤à¦¾à¦²à¦¿à¦•à¦¾ à¦–à§à¦²à¦¤à§‡",
   "keyboard_shortcuts.profile": "à¦²à§‡à¦–à¦•à§‡à¦° à¦ªà¦¾à¦¤à¦¾ à¦¦à§‡à¦–à¦¤à§‡",
   "keyboard_shortcuts.reply": "à¦®à¦¤à¦¾à¦®à¦¤ à¦¦à¦¿à¦¤à§‡",
   "keyboard_shortcuts.requests": "à¦…à¦¨à§à¦¸à¦°à¦£ à¦…à¦¨à§à¦°à§‹à¦§à§‡à¦° à¦¤à¦¾à¦²à¦¿à¦•à¦¾ à¦¦à§‡à¦–à¦¤à§‡",
   "keyboard_shortcuts.search": "à¦–à§‹à¦à¦œà¦¾à¦° à¦…à¦‚à¦¶à§‡ à¦«à§‹à¦•à¦¾à¦¸ à¦•à¦°à¦¤à§‡",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "CW à¦•à§à¦·à§‡à¦¤à§à¦° à¦¦à§‡à¦–à¦¾à¦¬à¦¾à¦°/à¦²à§à¦•à¦¬à¦¾à¦° à¦œà¦¨à§à¦¯",
   "keyboard_shortcuts.start": "\"à¦ªà§à¦°à¦¥à¦® à¦¶à§à¦°à§à¦°\" à¦•à¦²à¦¾à¦® à¦¬à§‡à¦° à¦•à¦°à¦¤à§‡",
   "keyboard_shortcuts.toggle_hidden": "CW à¦²à§‡à¦–à¦¾ à¦¦à§‡à¦–à¦¤à§‡ à¦¬à¦¾ à¦²à§à¦•à¦¾à¦¤à§‡",
   "keyboard_shortcuts.toggle_sensitivity": "à¦à¦¿à¦¡à¦¿à¦“/à¦›à¦¬à¦¿ à¦¦à§‡à¦–à¦¤à§‡ à¦¬à¦¾ à¦¬à¦¨à§à¦§ à¦•à¦°à¦¤à§‡",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "à¦²à§‡à¦–à¦¾ à¦¬à¦¾ à¦–à§‹à¦à¦œà¦¾à¦° à¦œà¦¾à§Ÿà¦—à¦¾à§Ÿ à¦«à§‹à¦•à¦¾à¦¸ à¦¨à¦¾ à¦•à¦°à¦¤à§‡",
   "keyboard_shortcuts.up": "à¦¤à¦¾à¦²à¦¿à¦•à¦¾à¦° à¦‰à¦ªà¦°à§‡à¦° à¦¦à¦¿à¦•à§‡ à¦¯à§‡à¦¤à§‡",
   "lightbox.close": "à¦¬à¦¨à§à¦§",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "à¦ªà¦°à¦¬à¦°à§à¦¤à§€",
   "lightbox.previous": "à¦ªà§‚à¦°à§à¦¬à¦¬à¦°à§à¦¤à§€",
-  "lightbox.view_context": "à¦ªà§à¦°à¦¸à¦™à§à¦—à¦Ÿà¦¿ à¦¦à§‡à¦–à¦¤à§‡",
   "lists.account.add": "à¦¤à¦¾à¦²à¦¿à¦•à¦¾à¦¤à§‡ à¦¯à§à¦•à§à¦¤ à¦•à¦°à¦¤à§‡",
   "lists.account.remove": "à¦¤à¦¾à¦²à¦¿à¦•à¦¾ à¦¥à§‡à¦•à§‡ à¦¬à¦¾à¦¦ à¦¦à¦¿à¦¤à§‡",
   "lists.delete": "à¦¤à¦¾à¦²à¦¿à¦•à¦¾ à¦®à§à¦›à§‡ à¦«à§‡à¦²à¦¤à§‡",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "à¦¶à¦¿à¦°à§‹à¦¨à¦¾à¦® à¦¸à¦®à§à¦ªà¦¾à¦¦à¦¨à¦¾ à¦•à¦°à¦¤à§‡",
   "lists.new.create": "à¦¤à¦¾à¦²à¦¿à¦•à¦¾à¦¤à§‡ à¦¯à§à¦•à§à¦¤ à¦•à¦°à¦¤à§‡",
   "lists.new.title_placeholder": "à¦¤à¦¾à¦²à¦¿à¦•à¦¾à¦° à¦¨à¦¤à§à¦¨ à¦¶à¦¿à¦°à§‹à¦¨à¦¾à¦® à¦¦à¦¿à¦¤à§‡",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "à¦¯à¦¾à¦¦à§‡à¦° à¦…à¦¨à§à¦¸à¦°à¦£ à¦•à¦°à§‡à¦¨ à¦¤à¦¾à¦¦à§‡à¦° à¦à§‡à¦¤à¦°à§‡ à¦–à§à¦à¦œà§à¦¨",
   "lists.subheading": "à¦†à¦ªà¦¨à¦¾à¦° à¦¤à¦¾à¦²à¦¿à¦•à¦¾",
   "load_pending": "{count, plural, one {# à¦¨à¦¤à§à¦¨ à¦œà¦¿à¦¨à¦¿à¦¸} other {# à¦¨à¦¤à§à¦¨ à¦œà¦¿à¦¨à¦¿à¦¸}}",
@@ -267,10 +277,12 @@
   "media_gallery.toggle_visible": "à¦¦à§ƒà¦¶à§à¦¯à¦¤à¦¾à¦° à¦…à¦¬à¦¸à§à¦¥à¦¾ à¦¬à¦¦à¦²à¦¾à¦¨",
   "missing_indicator.label": "à¦–à§à¦à¦œà§‡ à¦ªà¦¾à¦“à§Ÿà¦¾ à¦¯à¦¾à§Ÿà¦¨à¦¿",
   "missing_indicator.sublabel": "à¦œà¦¿à¦¨à¦¿à¦¸à¦Ÿà¦¾ à¦–à§à¦à¦œà§‡ à¦ªà¦¾à¦“à§Ÿà¦¾ à¦¯à¦¾à§Ÿà¦¨à¦¿",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "à¦à¦‡ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦° à¦ªà§à¦°à¦œà§à¦žà¦¾à¦ªà¦¨ à¦¬à¦¨à§à¦§ à¦•à¦°à¦¬à§‡à¦¨ ?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "à¦®à§‹à¦¬à¦¾à¦‡à¦²à§‡à¦° à¦†à¦ªà§à¦ª",
   "navigation_bar.blocks": "à¦¬à¦¨à§à¦§ à¦•à¦°à¦¾ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€",
-  "navigation_bar.bookmarks": "Bookmarks",
+  "navigation_bar.bookmarks": "à¦¬à§à¦•à¦®à¦¾à¦°à§à¦•",
   "navigation_bar.community_timeline": "à¦¸à§à¦¥à¦¾à¦¨à§€à¦¯à¦¼ à¦¸à¦®à§Ÿà¦°à§‡à¦–à¦¾",
   "navigation_bar.compose": "à¦¨à¦¤à§à¦¨ à¦Ÿà§à¦Ÿ à¦²à¦¿à¦–à§à¦¨",
   "navigation_bar.direct": "à¦¸à¦°à¦¾à¦¸à¦°à¦¿ à¦²à§‡à¦–à¦¾à¦—à§à¦²à¦¿",
@@ -293,11 +305,12 @@
   "navigation_bar.security": "à¦¨à¦¿à¦°à¦¾à¦ªà¦¤à§à¦¤à¦¾",
   "notification.favourite": "{name} à¦†à¦ªà¦¨à¦¾à¦° à¦•à¦¾à¦°à§à¦¯à¦•à§à¦°à¦® à¦ªà¦›à¦¨à§à¦¦ à¦•à¦°à§‡à¦›à§‡à¦¨",
   "notification.follow": "{name} à¦†à¦ªà¦¨à¦¾à¦•à§‡ à¦…à¦¨à§à¦¸à¦°à¦£ à¦•à¦°à§‡à¦›à§‡à¦¨",
-  "notification.follow_request": "{name} has requested to follow you",
+  "notification.follow_request": "{name} à¦†à¦ªà¦¨à¦¾à¦•à§‡ à¦…à¦¨à§à¦¸à¦°à¦£ à¦•à¦°à¦¾à¦° à¦œà¦¨à§à¦¯ à¦…à¦¨à§à¦°à¦§ à¦•à¦°à§‡à¦›à§‡",
   "notification.mention": "{name} à¦†à¦ªà¦¨à¦¾à¦•à§‡ à¦‰à¦²à§à¦²à§‡à¦– à¦•à¦°à§‡à¦›à§‡à¦¨",
   "notification.own_poll": "à¦†à¦ªà¦¨à¦¾à¦° à¦ªà§‹à¦² à¦¶à§‡à¦· à¦¹à¦¯à¦¼à§‡à¦›à§‡",
   "notification.poll": "à¦†à¦ªà¦¨à¦¿ à¦à§‹à¦Ÿ à¦¦à¦¿à§Ÿà§‡à¦›à¦¿à¦²à§‡à¦¨ à¦à¦®à¦¨ à¦à¦•  à¦¨à¦¿à¦°à§à¦¬à¦¾à¦šà¦¨à§‡à¦° à¦à§‹à¦Ÿà§‡à¦° à¦¸à¦®à§Ÿ à¦¶à§‡à¦· à¦¹à§Ÿà§‡à¦›à§‡",
   "notification.reblog": "{name} à¦†à¦ªà¦¨à¦¾à¦° à¦•à¦¾à¦°à§à¦¯à¦•à§à¦°à¦®à§‡ à¦¸à¦®à¦°à§à¦¥à¦¨ à¦¦à§‡à¦–à¦¿à§Ÿà§‡à¦›à§‡à¦¨",
+  "notification.status": "{name} just posted",
   "notifications.clear": "à¦ªà§à¦°à¦œà§à¦žà¦¾à¦ªà¦¨à¦—à§à¦²à§‹ à¦®à§à¦›à§‡ à¦«à§‡à¦²à¦¤à§‡",
   "notifications.clear_confirmation": "à¦†à¦ªà¦¨à¦¿ à¦•à¦¿ à¦¨à¦¿à¦°à§à¦šà¦¿à¦¤ à¦ªà§à¦°à¦œà§à¦žà¦¾à¦ªà¦¨à¦—à§à¦²à§‹ à¦®à§à¦›à§‡ à¦«à§‡à¦²à¦¤à§‡ à¦šà¦¾à¦¨ ?",
   "notifications.column_settings.alert": "à¦•à¦®à§à¦ªà¦¿à¦‰à¦Ÿà¦¾à¦°à§‡ à¦ªà§à¦°à¦œà§à¦žà¦¾à¦ªà¦¨à¦—à§à¦²à¦¿",
@@ -306,20 +319,31 @@
   "notifications.column_settings.filter_bar.category": "à¦¸à¦‚à¦•à§à¦·à¦¿à¦ªà§à¦¤ à¦›à¦¾à¦à¦•à¦¨à¦¿ à¦…à¦‚à¦¶",
   "notifications.column_settings.filter_bar.show": "à¦¦à§‡à¦–à¦¾à¦¨à§‹",
   "notifications.column_settings.follow": "à¦¨à¦¤à§à¦¨ à¦…à¦¨à§à¦¸à¦°à¦£à¦•à¦¾à¦°à§€à¦°à¦¾:",
-  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.follow_request": "à¦…à¦¨à§à¦¸à¦°à¦£à§‡à¦° à¦…à¦¨à§à¦°à§‹à¦§à¦—à§à¦²à¦¿:",
   "notifications.column_settings.mention": "à¦ªà§à¦°à¦œà§à¦žà¦¾à¦ªà¦¨à¦—à§à¦²à§‹:",
   "notifications.column_settings.poll": "à¦¨à¦¿à¦°à§à¦¬à¦¾à¦šà¦¨à§‡à¦° à¦«à¦²à¦¾à¦«à¦²:",
   "notifications.column_settings.push": "à¦ªà§à¦¶ à¦ªà§à¦°à¦œà§à¦žà¦¾à¦ªà¦¨à¦—à§à¦²à¦¿",
   "notifications.column_settings.reblog": "à¦¸à¦®à¦°à§à¦¥à¦¨à¦—à§à¦²à§‹:",
   "notifications.column_settings.show": "à¦•à¦²à¦¾à¦®à§‡ à¦¦à§‡à¦–à¦¾à¦¨à§‹",
   "notifications.column_settings.sound": "à¦¶à¦¬à§à¦¦ à¦¬à¦¾à¦œà¦¾à¦¨à§‹",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "à¦¸à¦¬",
   "notifications.filter.boosts": "à¦¸à¦®à¦°à§à¦¥à¦¨à¦—à§à¦²à§‹",
   "notifications.filter.favourites": "à¦ªà¦›à¦¨à§à¦¦à§‡à¦° à¦—à§à¦²à§‹",
   "notifications.filter.follows": "à¦…à¦¨à§à¦¸à¦°à¦£à§‡à¦°",
   "notifications.filter.mentions": "à¦‰à¦²à§à¦²à§‡à¦–à¦¿à¦¤",
   "notifications.filter.polls": "à¦¨à¦¿à¦°à§à¦¬à¦¾à¦šà¦¨à§‡à¦° à¦«à¦²à¦¾à¦«à¦²",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} à¦ªà§à¦°à¦œà§à¦žà¦¾à¦ªà¦¨",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "à¦¬à¦¨à§à¦§",
   "poll.refresh": "à¦¬à¦¦à¦²à§‡à¦›à§‡ à¦•à¦¿à¦¨à¦¾ à¦¦à§‡à¦–à¦¤à§‡",
   "poll.total_people": "{count, plural, one {# à¦¬à§à¦¯à¦•à§à¦¤à¦¿} other {# à¦¬à§à¦¯à¦•à§à¦¤à¦¿}}",
@@ -345,7 +369,7 @@
   "relative_time.just_now": "à¦à¦–à¦¨",
   "relative_time.minutes": "{number}à¦®à¦¿à¦ƒ",
   "relative_time.seconds": "{number} à¦¸à§‡à¦•à§‡à¦¨à§à¦¡",
-  "relative_time.today": "today",
+  "relative_time.today": "à¦†à¦œ",
   "reply_indicator.cancel": "à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°à¦¤à§‡",
   "report.forward": "à¦à¦Ÿà¦¾ à¦†à¦°à§‹ à¦ªà¦¾à¦ à¦¾à¦¨ {target} à¦¤à§‡",
   "report.forward_hint": "à¦à¦‡ à¦¨à¦¿à¦¬à¦¨à§à¦§à¦¨à¦Ÿà¦¿ à¦…à¦¨à§à¦¯ à¦à¦•à¦Ÿà¦¿ à¦¸à¦¾à¦°à§à¦à¦¾à¦°à§‡à¥¤ à¦…à¦ªà§à¦°à¦•à¦¾à¦¶à¦¿à¦¤à¦¨à¦¾à¦®à¦¾à¦à¦¾à¦¬à§‡ à¦°à¦¿à¦ªà§‹à¦°à§à¦Ÿà§‡à¦° à¦•à¦ªà¦¿ à¦¸à§‡à¦–à¦¾à¦¨à§‡à¦“ à¦•à¦¿ à¦ªà¦¾à¦ à¦¾à¦¤à§‡ à¦šà¦¾à¦¨ ?",
@@ -368,7 +392,7 @@
   "status.admin_account": "@{name} à¦° à¦œà¦¨à§à¦¯ à¦ªà¦°à¦¿à¦šà¦¾à¦²à¦¨à¦¾à¦° à¦‡à¦¨à§à¦Ÿà¦¾à¦°à¦«à§‡à¦¸à§‡ à¦¢à§à¦•à§à¦¨",
   "status.admin_status": "à¦¯à¦¾à§Ÿ à¦²à§‡à¦–à¦¾à¦Ÿà¦¿ à¦ªà¦°à¦¿à¦šà¦¾à¦²à¦¨à¦¾à¦° à¦‡à¦¨à§à¦Ÿà¦¾à¦°à¦«à§‡à¦¸à§‡ à¦–à§à¦²à§à¦¨",
   "status.block": "@{name} à¦•à§‡ à¦¬à§à¦²à¦• à¦•à¦°à§à¦¨",
-  "status.bookmark": "Bookmark",
+  "status.bookmark": "à¦¬à§à¦•à¦®à¦¾à¦°à§à¦•",
   "status.cancel_reblog_private": "à¦¸à¦®à¦°à§à¦¥à¦¨ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°à¦¤à§‡",
   "status.cannot_reblog": "à¦à¦Ÿà¦¿à¦¤à§‡ à¦¸à¦®à¦°à§à¦¥à¦¨ à¦¦à§‡à¦“à§Ÿà¦¾ à¦¯à¦¾à¦¬à§‡à¦¨à¦¾",
   "status.copy": "à¦²à§‡à¦–à¦¾à¦Ÿà¦¿à¦° à¦²à¦¿à¦‚à¦• à¦•à¦ªà¦¿ à¦•à¦°à¦¤à§‡",
@@ -393,7 +417,7 @@
   "status.reblogged_by": "{name} à¦¸à¦®à¦°à§à¦¥à¦¨ à¦¦à¦¿à§Ÿà§‡à¦›à§‡",
   "status.reblogs.empty": "à¦à¦–à¦¨à§‹ à¦•à§‡à¦“ à¦à¦Ÿà¦¾à¦¤à§‡ à¦¸à¦®à¦°à§à¦¥à¦¨ à¦¦à§‡à§Ÿà¦¨à¦¿à¥¤ à¦¯à¦–à¦¨ à¦•à§‡à¦“ à¦¦à§‡à§Ÿ, à¦¸à§‡à¦Ÿà¦¾ à¦¤à¦–à¦¨ à¦à¦–à¦¾à¦¨à§‡ à¦¦à§‡à¦–à¦¾ à¦¯à¦¾à¦¬à§‡à¥¤",
   "status.redraft": "à¦®à§à¦›à§‡ à¦†à¦¬à¦¾à¦° à¦¨à¦¤à§à¦¨ à¦•à¦°à§‡ à¦²à¦¿à¦–à¦¤à§‡",
-  "status.remove_bookmark": "Remove bookmark",
+  "status.remove_bookmark": "à¦¬à§à¦•à¦®à¦¾à¦°à§à¦• à¦¸à¦°à¦¾à¦¨",
   "status.reply": "à¦®à¦¤à¦¾à¦®à¦¤ à¦œà¦¾à¦¨à¦¾à¦¤à§‡",
   "status.replyAll": "à¦²à§‡à¦–à¦¾à¦¯à§à¦•à§à¦¤ à¦¸à¦¬à¦¾à¦° à¦•à¦¾à¦›à§‡ à¦®à¦¤à¦¾à¦®à¦¤ à¦œà¦¾à¦¨à¦¾à¦¤à§‡",
   "status.report": "@{name} à¦•à§‡ à¦°à¦¿à¦ªà§‹à¦°à§à¦Ÿ à¦•à¦°à¦¤à§‡",
@@ -419,33 +443,34 @@
   "time_remaining.minutes": "{number, plural, one {# à¦®à¦¿à¦¨à¦¿à¦Ÿ} other {# à¦®à¦¿à¦¨à¦¿à¦Ÿ}} à¦¬à¦¾à¦•à¦¿ à¦†à¦›à§‡",
   "time_remaining.moments": "à¦¸à¦®à§Ÿ à¦¬à¦¾à¦•à¦¿ à¦†à¦›à§‡",
   "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} à¦¬à¦¾à¦•à¦¿ à¦†à¦›à§‡",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "timeline_hint.remote_resource_not_displayed": "à¦…à¦¨à§à¦¯ à¦¸à¦¾à¦°à§à¦à¦¾à¦°à¦—à§à¦²à¦¿ à¦¥à§‡à¦•à§‡ {resource} à¦¦à§‡à¦–à¦¾à¦šà§à¦›à§‡ à¦¨à¦¾à¥¤ ",
+  "timeline_hint.resources.followers": "à¦…à¦¨à§à¦¸à¦°à¦•à¦¾à¦°à§€à¦°à¦¾",
+  "timeline_hint.resources.follows": "à¦…à¦¨à§à¦¸à¦°à¦£ à¦•à¦°à§‡",
+  "timeline_hint.resources.statuses": "à¦ªà§à¦°à¦¨à§‹ à¦Ÿà§à¦Ÿà¦—à§à¦²à¦¿",
+  "trends.counter_by_accounts": "{count, plural,one {{counter} à¦œà¦¨ à¦¬à§à¦¯à¦•à§à¦¤à¦¿} other {{counter} à¦œà¦¨ à¦²à§‹à¦•}} à¦•à¦¥à¦¾ à¦¬à¦²à¦›à§‡",
   "trends.trending_now": "à¦¬à¦°à§à¦¤à¦®à¦¾à¦¨à§‡ à¦œà¦¨à¦ªà§à¦°à¦¿à§Ÿ",
   "ui.beforeunload": "à¦¯à§‡ à¦ªà¦°à§à¦¯à¦¨à§à¦¤ à¦à¦Ÿà¦¾ à¦²à§‡à¦–à¦¾ à¦¹à§Ÿà§‡à¦›à§‡, à¦®à¦¾à¦¸à§à¦Ÿà¦¾à¦¡à¦¨ à¦¥à§‡à¦•à§‡ à¦šà¦²à§‡ à¦—à§‡à¦²à§‡ à¦à¦Ÿà¦¾ à¦®à§à¦›à§‡ à¦¯à¦¾à¦¬à§‡à¥¤",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
+  "units.short.billion": "{count}à¦¬à¦¿à¦²à¦¿à§Ÿà¦¨",
+  "units.short.million": "{count}à¦®à¦¿à¦²à¦¿à¦“à¦¨",
+  "units.short.thousand": "{count}à¦¹à¦¾à¦œà¦¾à¦°",
   "upload_area.title": "à¦Ÿà§‡à¦¨à§‡ à¦à¦–à¦¾à¦¨à§‡ à¦›à§‡à§œà§‡ à¦¦à¦¿à¦²à§‡ à¦à¦–à¦¾à¦¨à§‡ à¦¯à§à¦•à§à¦¤ à¦•à¦°à¦¾ à¦¯à¦¾à¦¬à§‡",
   "upload_button.label": "à¦›à¦¬à¦¿ à¦¬à¦¾ à¦à¦¿à¦¡à¦¿à¦“ à¦¯à§à¦•à§à¦¤ à¦•à¦°à¦¤à§‡ (à¦à¦¸à¦¬ à¦§à¦°à¦£à§‡à¦°: JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "à¦¯à¦¾ à¦¯à§à¦•à§à¦¤ à¦•à¦°à¦¤à§‡ à¦šà¦¾à¦šà§à¦›à§‡à¦¨ à¦¸à§‡à¦Ÿà¦¿ à¦¬à§‡à¦¶à¦¿ à¦¬à§œ, à¦à¦–à¦¾à¦¨à¦•à¦¾à¦° à¦¸à¦°à§à¦¬à¦¾à¦§à¦¿à¦•à§‡à¦° à¦®à§‡à¦®à§‹à¦°à¦¿à¦° à¦‰à¦ªà¦°à§‡ à¦šà¦²à§‡ à¦—à§‡à¦›à§‡à¥¤",
   "upload_error.poll": "à¦¨à¦¿à¦°à§à¦¬à¦¾à¦šà¦¨à¦•à§à¦·à§‡à¦¤à§à¦°à§‡ à¦•à§‹à¦¨à§‹ à¦«à¦¾à¦‡à¦² à¦¯à§à¦•à§à¦¤ à¦•à¦°à¦¾ à¦¯à¦¾à¦¬à§‡à¦¨à¦¾à¥¤",
-  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_form.audio_description": "à¦¶à§à¦°à¦¬à¦£à¦¶à¦•à§à¦¤à¦¿ à¦²à§‹à¦•à¦¦à§‡à¦° à¦œà¦¨à§à¦¯ à¦¬à¦°à§à¦£à¦¨à¦¾ à¦•à¦°à§à¦¨",
   "upload_form.description": "à¦¯à¦¾à¦°à¦¾ à¦¦à§‡à¦–à¦¤à§‡ à¦ªà¦¾à§Ÿà¦¨à¦¾ à¦¤à¦¾à¦¦à§‡à¦° à¦œà¦¨à§à¦¯ à¦à¦Ÿà¦¾ à¦¬à¦°à§à¦£à¦¨à¦¾ à¦•à¦°à¦¤à§‡",
   "upload_form.edit": "à¦¸à¦®à§à¦ªà¦¾à¦¦à¦¨",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "à¦¥à¦¾à¦®à§à¦¬à¦¨à§‡à¦² à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨ à¦•à¦°à§à¦¨",
   "upload_form.undo": "à¦®à§à¦›à§‡ à¦«à§‡à¦²à¦¤à§‡",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_form.video_description": "à¦¶à§à¦°à¦¬à¦£à¦¶à¦•à§à¦¤à¦¿ à¦¹à§à¦°à¦¾à¦¸ à¦¬à¦¾ à¦šà¦¾à¦•à§à¦·à§à¦· à¦ªà§à¦°à¦¤à¦¿à¦¬à¦¨à§à¦§à§€ à¦¬à§à¦¯à¦•à§à¦¤à¦¿à¦¦à§‡à¦° à¦œà¦¨à§à¦¯ à¦¬à¦°à§à¦£à¦¨à¦¾ à¦•à¦°à§à¦¨",
   "upload_modal.analyzing_picture": "à¦šà¦¿à¦¤à§à¦° à¦¬à¦¿à¦¶à§à¦²à§‡à¦·à¦£ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡â€¦",
   "upload_modal.apply": "à¦ªà§à¦°à§Ÿà§‹à¦— à¦•à¦°à§à¦¨",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "à¦›à¦¬à¦¿ à¦¨à¦¿à¦°à§à¦¬à¦¾à¦šà¦¨ à¦•à¦°à§à¦¨",
   "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
   "upload_modal.detect_text": "à¦›à¦¬à¦¿ à¦¥à§‡à¦•à§‡ à¦ªà¦¾à¦ à§à¦¯ à¦¸à¦¨à¦¾à¦•à§à¦¤ à¦•à¦°à§à¦¨",
   "upload_modal.edit_media": "à¦®à¦¿à¦¡à¦¿à¦¯à¦¼à¦¾ à¦¸à¦®à§à¦ªà¦¾à¦¦à¦¨à¦¾ à¦•à¦°à§à¦¨",
   "upload_modal.hint": "à¦à¦•à¦Ÿà¦¿ à¦¦à§ƒà¦¶à§à¦¯à¦®à¦¾à¦¨ à¦ªà§Ÿà§‡à¦¨à§à¦Ÿ à¦¨à¦¿à¦°à§à¦¬à¦¾à¦šà¦¨ à¦•à¦°à§à¦¨ à¦•à§à¦²à¦¿à¦• à¦…à¦¥à¦¬à¦¾ à¦Ÿà¦¾à¦¨à¦¾à¦° à¦®à¦¾à¦§à§à¦¯à¦®à§‡ à¦¯à§‡à¦Ÿà¦¿ à¦¸à¦¬à¦®à§Ÿ à¦¸à¦¬ à¦¥à¦¾à¦®à§à¦¬à¦¨à§‡à¦²à§‡ à¦¦à§‡à¦–à¦¾ à¦¯à¦¾à¦¬à§‡à¥¤",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "à¦ªà§‚à¦°à§à¦¬à¦°à§‚à¦ª({ratio})",
   "upload_progress.label": "à¦¯à§à¦•à§à¦¤ à¦•à¦°à¦¤à§‡ à¦ªà¦¾à¦ à¦¾à¦¨à§‹ à¦¹à¦šà§à¦›à§‡...",
   "video.close": "à¦à¦¿à¦¡à¦¿à¦“à¦Ÿà¦¿ à¦¬à¦¨à§à¦§ à¦•à¦°à¦¤à§‡",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index e0be9d1a2c34f298a33c7bd5570aa0227e9c10b4..84c5f452399141233e4ac597216546bc861bfd7e 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "NullaÃ± ar bedadenn heuliaÃ±",
   "account.direct": "Kas ur gemennadenn da @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domani berzet",
   "account.edit_profile": "AozaÃ± ar profil",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Lakaat war-wel war ar profil",
   "account.follow": "HeuliaÃ±",
   "account.followers": "HeulierÂ·ezedÂ·ien",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Disoc'hoÃ¹ an enklask",
   "emoji_button.symbols": "ArouezioÃ¹",
   "emoji_button.travel": "Lec'hioÃ¹ ha BeajoÃ¹",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Toud ebet amaÃ±!",
   "empty_column.account_unavailable": "Profil dihegerz",
   "empty_column.blocks": "N'eus ket bet berzet implijerÂ·ez ganeoc'h c'hoazh.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "N'ho peus kemenn ebet c'hoazh. Grit gant implijerÂ·ezedÂ·ien all evit loc'haÃ± ar gomz.",
   "empty_column.public": "N'eus netra amaÃ±! Skrivit un dra bennak foran pe heuilhit implijerÂ·ienÂ·ezed eus dafariadoÃ¹ all evit leuniaÃ±",
   "error.unexpected_crash.explanation": "Abalamour d'ur beug en hor c'hod pe d'ur gudenn geverlec'hded n'hallomp ket skrammaÃ± ar bajenn-maÃ± en un doare dereat.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Klaskit azbevaat ar bajenn. Ma n'a ket en-dro e c'hallit klask ober gant Mastodon dre ur merdeer disheÃ±vel pe dre an arload genidik.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "EilaÃ± ar roudoÃ¹ diveugaÃ± er golver",
   "errors.unexpected_crash.report_issue": "DanevellaÃ± ur fazi",
   "follow_request.authorize": "Aotren",
@@ -245,14 +250,15 @@
   "keyboard_shortcuts.spoilers": "to show/hide CW field",
   "keyboard_shortcuts.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
-  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
+  "keyboard_shortcuts.toggle_sensitivity": "da guzhat/ziguzhat ur media",
   "keyboard_shortcuts.toot": "da gregiÃ± gant un toud nevez-flamm",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "SerriÃ±",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Da-heul",
   "lightbox.previous": "A-raok",
-  "lightbox.view_context": "Diskouez ar c'hemperzh",
   "lists.account.add": "OuzhpennaÃ± d'al listenn",
   "lists.account.remove": "Lemel kuit eus al listenn",
   "lists.delete": "Dilemel al listenn",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "CheÃ±ch an titl",
   "lists.new.create": "OuzhpennaÃ± ul listenn",
   "lists.new.title_placeholder": "Titl nevez al listenn",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Search among people you follow",
   "lists.subheading": "Ho listennoÃ¹",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Toggle visibility",
   "missing_indicator.label": "Digavet",
   "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "ArloadoÃ¹ pellgomz",
   "navigation_bar.blocks": "ImplijerÂ·ezedÂ·ien berzet",
   "navigation_bar.bookmarks": "SinedoÃ¹",
@@ -292,12 +304,13 @@
   "navigation_bar.public_timeline": "Red-amzer kevreet",
   "navigation_bar.security": "Diogelroez",
   "notification.favourite": "{name} favourited your status",
-  "notification.follow": "{name} followed you",
+  "notification.follow": "heuliaÃ± a ra {name} ac'hanoc'h",
   "notification.follow_request": "{name} has requested to follow you",
   "notification.mention": "{name} mentioned you",
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
   "notifications.clear": "SkarzhaÃ± ar c'hemennoÃ¹",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.alert": "KemennoÃ¹ war ar burev",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "SkignadennoÃ¹:",
   "notifications.column_settings.show": "Diskouez er bann",
   "notifications.column_settings.sound": "SeniÃ±",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "Pep tra",
   "notifications.filter.boosts": "SkignadennoÃ¹",
   "notifications.filter.favourites": "MuiaÃ±-karet",
   "notifications.filter.follows": "HeuliaÃ±",
   "notifications.filter.mentions": "MenegoÃ¹",
   "notifications.filter.polls": "Disoc'hoÃ¹ ar sontadegoÃ¹",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} a gemennoÃ¹",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Serret",
   "poll.refresh": "Azbevaat",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -389,7 +413,7 @@
   "status.pinned": "Toud spilhennet",
   "status.read_more": "Lenn muioc'h",
   "status.reblog": "SkignaÃ±",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
@@ -430,7 +454,7 @@
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "Drag & drop to upload",
-  "upload_button.label": "OuzhpennaÃ± ur media ({formats})",
+  "upload_button.label": "OuzhpennaÃ± ur media",
   "upload_error.limit": "File upload limit exceeded.",
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "DinoiÃ± testenn diouzh ar skeudenn",
   "upload_modal.edit_media": "Embann ar media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Rakwel ({ratio})",
   "upload_progress.label": "O pellgargaÃ±...",
   "video.close": "SerriÃ± ar video",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 04a37fc0308b5fefd422c792153d87e03b7ceab0..13e9e885b76d96386e87edbabec715c49214ffc3 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -1,5 +1,5 @@
 {
-  "account.account_note_header": "La teva nota per a @{name}",
+  "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Afegir o Treure de les llistes",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grup",
@@ -9,14 +9,16 @@
   "account.browse_more_on_origin_server": "Navega mÃ©s en el perfil original",
   "account.cancel_follow_request": "AnulÂ·la la solÂ·licitud de seguiment",
   "account.direct": "Missatge directe @{name}",
+  "account.disable_notifications": "Deixa de notificar-me els tuts de @{name}",
   "account.domain_blocked": "Domini ocult",
   "account.edit_profile": "Edita el perfil",
+  "account.enable_notifications": "Notificaâ€™m els tuts de @{name}",
   "account.endorse": "Recomana en el teu perfil",
   "account.follow": "Segueix",
   "account.followers": "Seguidors",
   "account.followers.empty": "Encara ningÃº no segueix aquest usuari.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidors}}",
-  "account.following_counter": "{count, plural, one {} other {{counter} Seguint}}",
+  "account.following_counter": "{count, plural, other {{counter} Seguint}}",
   "account.follows.empty": "Aquest usuari encara no segueix a ningÃº.",
   "account.follows_you": "Et segueix",
   "account.hide_reblogs": "Amaga els impulsos de @{name}",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Resultats de la cerca",
   "emoji_button.symbols": "SÃmbols",
   "emoji_button.travel": "Viatges i Llocs",
+  "empty_column.account_suspended": "Compte suspÃ¨s",
   "empty_column.account_timeline": "No hi ha tuts aquÃ!",
   "empty_column.account_unavailable": "Perfil no disponible",
   "empty_column.blocks": "Encara no has bloquejat cap usuari.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Encara no tens notificacions. Interactua amb altres per iniciar la conversa.",
   "empty_column.public": "No hi ha res aquÃ! Escriu pÃºblicament alguna cosa o manualment segueix usuaris d'altres servidors per omplir-ho",
   "error.unexpected_crash.explanation": "A causa d'un bug en el nostre codi o un problema de compatibilitat del navegador, aquesta pÃ gina podria no ser mostrada correctament.",
-  "error.unexpected_crash.next_steps": "Prova recarregant la pÃ gina. Si aixÃ² no ajuda, encara podries ser capaÃ§ d'utilitzar Mastodon a travÃ©s d'un navegador diferent o amb una app nativa.",
+  "error.unexpected_crash.explanation_addons": "Aquesta pÃ gina podria no mostrar-se correctament. Aquest error Ã©s possiblement causat per una extensiÃ³ del navegador o per eienes automÃ tiques de traducciÃ³.",
+  "error.unexpected_crash.next_steps": "Prova recarregant la pÃ gina. Si aixÃ² no ajuda, encara podries ser capaÃ§ d'utilitzar Mastodon a travÃ©s d'un navegador diferent o amb una aplicaciÃ³ nativa.",
+  "error.unexpected_crash.next_steps_addons": "Prova de desactivar-les i refrescant la pÃ gina. Si aixÃ² no ajuda, encara pots ser capaÃ§ dâ€™utilitzar Mastodon amb un altre navegador o aplicaciÃ³ nativa.",
   "errors.unexpected_crash.copy_stacktrace": "CÃ²pia stacktrace al porta-retalls",
   "errors.unexpected_crash.report_issue": "Informa d'un problema",
   "follow_request.authorize": "Autoritzar",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "descentrar l'Ã rea de composiciÃ³ de text/cerca",
   "keyboard_shortcuts.up": "moure amunt en la llista",
   "lightbox.close": "Tancar",
+  "lightbox.compress": "Quadre de visualitzaciÃ³ dâ€™imatge comprimida",
+  "lightbox.expand": "Amplia el quadre de visualitzaciÃ³ de lâ€™imatge",
   "lightbox.next": "SegÃ¼ent",
   "lightbox.previous": "Anterior",
-  "lightbox.view_context": "Veure el context",
   "lists.account.add": "Afegir a la llista",
   "lists.account.remove": "Treure de la llista",
   "lists.delete": "Esborrar llista",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Canvi de tÃtol",
   "lists.new.create": "Afegir llista",
   "lists.new.title_placeholder": "Nova llista",
+  "lists.replies_policy.followed": "Qualsevol usuari seguit",
+  "lists.replies_policy.list": "Membres de la llista",
+  "lists.replies_policy.none": "NingÃº",
+  "lists.replies_policy.title": "Mostra respostes a:",
   "lists.search": "Cercar entre les persones que segueixes",
   "lists.subheading": "Les teves llistes",
   "load_pending": "{count, plural, one {# element nou} other {# elements nous}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Alternar visibilitat",
   "missing_indicator.label": "No trobat",
   "missing_indicator.sublabel": "Aquest recurs no pot ser trobat",
+  "mute_modal.duration": "Durada",
   "mute_modal.hide_notifications": "Amagar notificacions d'aquest usuari?",
+  "mute_modal.indefinite": "Indefinit",
   "navigation_bar.apps": "Apps mÃ²bils",
   "navigation_bar.blocks": "Usuaris bloquejats",
   "navigation_bar.bookmarks": "Marcadors",
@@ -298,6 +310,7 @@
   "notification.own_poll": "La teva enquesta ha finalitzat",
   "notification.poll": "Ha finalitzat una enquesta en la que has votat",
   "notification.reblog": "{name} ha impulsat el teu estat",
+  "notification.status": "ha publicat {name}",
   "notifications.clear": "Netejar notificacions",
   "notifications.clear_confirmation": "EstÃ s segur que vols esborrar permanentment totes les teves notificacions?",
   "notifications.column_settings.alert": "Notificacions d'escriptori",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Impulsos:",
   "notifications.column_settings.show": "Mostra en la columna",
   "notifications.column_settings.sound": "Reproduir so",
+  "notifications.column_settings.status": "Nous tuts:",
   "notifications.filter.all": "Tots",
   "notifications.filter.boosts": "Impulsos",
   "notifications.filter.favourites": "Favorits",
   "notifications.filter.follows": "Seguiments",
   "notifications.filter.mentions": "Mencions",
   "notifications.filter.polls": "Resultats de l'enquesta",
+  "notifications.filter.statuses": "Actualitzacions de gent que segueixes",
+  "notifications.grant_permission": "Concedir permÃs.",
   "notifications.group": "{count} notificacions",
+  "notifications.mark_as_read": "Marca cada notificaciÃ³ com a llegida",
+  "notifications.permission_denied": "No sâ€™ha pogut activar les notificacions dâ€™escriptori perquÃ¨ sâ€™ha denegat el permÃs.",
+  "notifications.permission_denied_alert": "No es poden activar les notificacions del escriptori perquÃ¨ el permÃs del navegador ha estat denegat abans",
+  "notifications.permission_required": "Les notificacions d'escriptori no estan disponibles perquÃ¨ el permÃs requerit no ha estat concedit.",
+  "notifications_permission_banner.enable": "Activar les notificacions dâ€™escriptori",
+  "notifications_permission_banner.how_to_control": "Per a rebre notificacions quan Mastodon no estÃ  obert cal activar les notificacions dâ€™escriptori. Pots controlar amb precisiÃ³ quins tipus dâ€™interaccions generen notificacions dâ€™escriptori desprÃ©s dâ€™activar el botÃ³ {icon} de dalt.",
+  "notifications_permission_banner.title": "Mai et perdis res",
+  "picture_in_picture.restore": "Retornaâ€™l",
   "poll.closed": "Finalitzada",
   "poll.refresh": "Actualitza",
   "poll.total_people": "{count, plural, one {# persona} other {# persones}}",
@@ -442,10 +466,11 @@
   "upload_modal.analyzing_picture": "Analitzant imatgeâ€¦",
   "upload_modal.apply": "Aplica",
   "upload_modal.choose_image": "Tria imatge",
-  "upload_modal.description_placeholder": "Uns salts rÃ pids de guineu marrÃ³ sobre el gos gandul",
+  "upload_modal.description_placeholder": "Jove xef, porti whisky amb quinze glaÃ§ons dâ€™hidrogen, coi!",
   "upload_modal.detect_text": "Detecta el text de l'imatge",
   "upload_modal.edit_media": "Editar multimÃ¨dia",
   "upload_modal.hint": "Fes clic o arrossega el cercle en la previsualitzaciÃ³ per escollir el punt focal que sempre serÃ  visible de totes les miniatures.",
+  "upload_modal.preparing_ocr": "Preparant OCRâ€¦",
   "upload_modal.preview_label": "Previsualitza ({ratio})",
   "upload_progress.label": "Pujant...",
   "video.close": "Tancar el vÃdeo",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 1bd9cda0b5a8093f1bdedb417a8decfc5961ef06..43e1f6c104a3e6e0798f0c7b8569361c3b1c657e 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -1,5 +1,5 @@
 {
-  "account.account_note_header": "A vostra nota per @{name}",
+  "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Aghjunghje o toglie da e liste",
   "account.badges.bot": "Bot",
   "account.badges.group": "Gruppu",
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Vede di piÃ¹ nant'Ã  u prufile uriginale",
   "account.cancel_follow_request": "AnnullÃ  a dumanda d'abbunamentu",
   "account.direct": "Missaghju direttu @{name}",
+  "account.disable_notifications": "Ã™n mi nutificate piÃ¹ quandu @{name} pubblica qualcosa",
   "account.domain_blocked": "Duminiu piattatu",
   "account.edit_profile": "MudificÃ  u prufile",
+  "account.enable_notifications": "Nutificate mi quandu @{name} pubblica qualcosa",
   "account.endorse": "FÃ  figurÃ  nant'Ã  u prufilu",
   "account.follow": "SiguitÃ ",
   "account.followers": "Abbunati",
@@ -96,9 +98,9 @@
   "compose_form.poll.switch_to_single": "CambiÃ  u scandagliu per Ã¹n accittÃ  ch'una scelta",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "IndicÃ  u media cum'Ã¨ sensibile",
-  "compose_form.sensitive.marked": "Media indicatu cum'Ã¨ sensibile",
-  "compose_form.sensitive.unmarked": "Media micca indicatu cum'Ã¨ sensibile",
+  "compose_form.sensitive.hide": "{count, plural, one {IndicÃ  u media cum'Ã¨ sensibile} other {IndicÃ  i media cum'Ã¨ sensibili}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media indicatu cum'Ã¨ sensibile} other {Media indicati cum'Ã¨ sensibili}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media micca indicatu cum'Ã¨ sensibile} other {Media micca indicati cum'Ã¨ sensibili}}",
   "compose_form.spoiler.marked": "Testu piattatu daret'Ã  un'avertimentu",
   "compose_form.spoiler.unmarked": "Testu micca piattatu",
   "compose_form.spoiler_placeholder": "Scrive u vostr'avertimentu quÃ¬",
@@ -132,7 +134,7 @@
   "directory.new_arrivals": "Ultimi arrivi",
   "directory.recently_active": "AttivitÃ  ricente",
   "embed.instructions": "IntegrÃ  stu statutu Ã  u vostru situ cÃ¹ u codice quÃ¬ sottu.",
-  "embed.preview": "AssumiglierÃ  Ã  qualcosa cusÃ¬:",
+  "embed.preview": "HÃ  da parÃ¨ Ã  quessa:",
   "emoji_button.activity": "AttivitÃ ",
   "emoji_button.custom": "Persunalizati",
   "emoji_button.flags": "Bandere",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Risultati di a cerca",
   "emoji_button.symbols": "Simbuli",
   "emoji_button.travel": "Lochi Ã¨ Viaghju",
+  "empty_column.account_suspended": "Contu suspesu",
   "empty_column.account_timeline": "Nisun statutu quÃ¬!",
   "empty_column.account_unavailable": "Prufile micca dispunibule",
   "empty_column.blocks": "Per avÃ  Ã¹n avete bluccatu manc'un utilizatore.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Ã™n avete ancu nisuna nutificazione. Interact with others to start the conversation.",
   "empty_column.public": "Ã™n c'hÃ¨ nunda quÃ¬! Scrivete qualcosa in pubblicu o seguitate utilizatori d'altri servori per empie a linea pubblica",
   "error.unexpected_crash.explanation": "In ragione d'un bug indÃ¨ u nostru codice o un prublemu di cumpatibilitÃ  cÃ¹ quessu navigatore, sta pagina Ã¹n hÃ¨ micca pussuta esse affissata currettamente.",
+  "error.unexpected_crash.explanation_addons": "Sta pagina Ã¹n hÃ¨ micca pussuta esse affissata currettamente, prubabilmente per via d'un'estenzione di navigatore o d'un lugiziale di traduzione.",
   "error.unexpected_crash.next_steps": "Pruvate d'attualizÃ  sta pagina. S'ellu persiste u prublemu, pudete forse sempre accede Ã  Mastodon dapoi un'alltru navigatore o applicazione.",
+  "error.unexpected_crash.next_steps_addons": "Pruvate di disattivÃ  quelli Ã¨ poi attualizÃ  sta pagina. S'ellu persiste u prublemu, pudete forse sempre accede Ã  Mastodon dapoi un'alltru navigatore o applicazione.",
   "errors.unexpected_crash.copy_stacktrace": "CupiÃ  stacktrace nant'Ã  u fermacarta",
   "errors.unexpected_crash.report_issue": "PalisÃ  prublemu",
   "follow_request.authorize": "AuturizÃ ",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "Ã¹n fucalizÃ  piÃ¹ l'area di testu",
   "keyboard_shortcuts.up": "cullÃ  indÃ¨ a lista",
   "lightbox.close": "ChjudÃ ",
+  "lightbox.compress": "Cumprime a finestra d'affissera di i ritratti",
+  "lightbox.expand": "IngrandÃ  a finestra d'affissera di i ritratti",
   "lightbox.next": "Siguente",
   "lightbox.previous": "Pricidente",
-  "lightbox.view_context": "Vede u cuntestu",
   "lists.account.add": "Aghjunghje Ã  a lista",
   "lists.account.remove": "Toglie di a lista",
   "lists.delete": "Toglie a lista",
@@ -260,14 +266,20 @@
   "lists.edit.submit": "CambiÃ  u titulu",
   "lists.new.create": "Aghjunghje",
   "lists.new.title_placeholder": "Titulu di a lista",
+  "lists.replies_policy.followed": "Tutti i vostri abbunamenti",
+  "lists.replies_policy.list": "Membri di a lista",
+  "lists.replies_policy.none": "Nimu",
+  "lists.replies_policy.title": "Vede e risposte Ã :",
   "lists.search": "CircÃ  indÃ¨ i vostr'abbunamenti",
   "lists.subheading": "E vo liste",
   "load_pending": "{count, plural, one {# entrata nova} other {# entrate nove}}",
   "loading_indicator.label": "Caricamentu...",
-  "media_gallery.toggle_visible": "CambiÃ  a visibilitÃ ",
+  "media_gallery.toggle_visible": "PiattÃ  {number, plural, one {ritrattu} other {ritratti}}",
   "missing_indicator.label": "Micca trovu",
   "missing_indicator.sublabel": "Ã™n era micca pussivule di truvÃ  sta risorsa",
+  "mute_modal.duration": "Durata",
   "mute_modal.hide_notifications": "PiattÃ  nutificazione da st'utilizatore?",
+  "mute_modal.indefinite": "Indifinita",
   "navigation_bar.apps": "Applicazione per u telefuninu",
   "navigation_bar.blocks": "Utilizatori bluccati",
   "navigation_bar.bookmarks": "Segnalibri",
@@ -298,6 +310,7 @@
   "notification.own_poll": "U vostru scandagliu hÃ¨ compiu",
   "notification.poll": "Un scandagliu induve avete vutatu hÃ¨ finitu",
   "notification.reblog": "{name} hÃ  spartutu u vostru statutu",
+  "notification.status": "{name} hÃ  appena pubblicatu",
   "notifications.clear": "PurgÃ  e nutificazione",
   "notifications.clear_confirmation": "Site sicuruÂ·a che vulete toglie tutte ste nutificazione?",
   "notifications.column_settings.alert": "Nutificazione nant'Ã  l'urdinatore",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Spartere:",
   "notifications.column_settings.show": "MustrÃ  indÃ¨ a colonna",
   "notifications.column_settings.sound": "SunÃ ",
+  "notifications.column_settings.status": "Statuti novi:",
   "notifications.filter.all": "Tuttu",
   "notifications.filter.boosts": "Spartere",
   "notifications.filter.favourites": "Favuriti",
   "notifications.filter.follows": "Abbunamenti",
   "notifications.filter.mentions": "Minzione",
   "notifications.filter.polls": "Risultati di u scandagliu",
+  "notifications.filter.statuses": "Messe Ã  ghjornu di e persone chÃ¬ siguitate",
+  "notifications.grant_permission": "AuturizÃ .",
   "notifications.group": "{count} nutificazione",
+  "notifications.mark_as_read": "MarcÃ  tutte e nutificazione cum'Ã¨ lette",
+  "notifications.permission_denied": "Ã™n si po micca attivÃ  e nutificazione desktop perchÃ¨ l'auturizazione hÃ¨ stata ricusata",
+  "notifications.permission_denied_alert": "Ã™n pudete micca attivÃ  e nutificazione nant'Ã  l'urdinatore, perchÃ¨ avete digiÃ  ricusatu a dumanda d'auturizazione di u navigatore",
+  "notifications.permission_required": "Ã™n si po micca attivÃ  e nutificazione desktop perchÃ¨ a l'auturizazione richiesta Ã¹n hÃ¨ micca stata data.",
+  "notifications_permission_banner.enable": "AttivÃ  e nutificazione nant'Ã  l'urdinatore",
+  "notifications_permission_banner.how_to_control": "Per riceve nutificazione quandu Mastodon Ã¹n hÃ¨ micca aperta, attivate e nutificazione nant'Ã  l'urdinatore. Pudete decide quali tippi d'interazione anu da mandÃ  ste nutificazione cÃ¹ u buttone {icon} quÃ¬ sopra quandu saranu attivate.",
+  "notifications_permission_banner.title": "Ã™n mancate mai nunda",
+  "picture_in_picture.restore": "Rimette in piazza",
   "poll.closed": "Chjosu",
   "poll.refresh": "AttualizÃ ",
   "poll.total_people": "{count, plural, one {# persona} other {# persone}}",
@@ -352,7 +376,7 @@
   "report.hint": "U signalamentu sarÃ  mandatu Ã  i muderatori di u servore. Pudete spiegÃ  perchÃ¨ avete palisatu stu contu quÃ¬ sottu:",
   "report.placeholder": "Altri cummenti",
   "report.submit": "MandÃ ",
-  "report.target": "Signalamentu",
+  "report.target": "Signalamentu di {target}",
   "search.placeholder": "CircÃ ",
   "search_popout.search_format": "Ricerca avanzata",
   "search_popout.tips.full_text": "I testi simplici rimandanu i statuti ch'avete scritti, aghjunti Ã  i vostri favuriti, spartuti o induve quelli site mintuvatuÂ·a, Ã¨ ancu i cugnomi, nomi pubblichi Ã¨ hashtag chÃ¬ currispondenu.",
@@ -430,7 +454,7 @@
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "Drag & drop per caricÃ  un fugliale",
-  "upload_button.label": "Aghjunghje un media ({formats})",
+  "upload_button.label": "Aghjunghje un media",
   "upload_error.limit": "Limita di caricamentu di fugliali trapassata.",
   "upload_error.poll": "Ã™n si pÃ² micca caricÃ  fugliali cÃ¹ i scandagli.",
   "upload_form.audio_description": "Discrizzione per i ciochi",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "DitettÃ  testu da u ritrattu",
   "upload_modal.edit_media": "CambiÃ  media",
   "upload_modal.hint": "Cliccate o sguillate u chjerchju nant'Ã  a vista per sceglie u puntu fucale chÃ¬ sarÃ  sempre in vista indÃ¨ tutte e miniature.",
+  "upload_modal.preparing_ocr": "Priparazione di l'OCRâ€¦",
   "upload_modal.preview_label": "Vista ({ratio})",
   "upload_progress.label": "Caricamentu...",
   "video.close": "ChjudÃ  a video",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 0ddd18de898a72c1f54a05f11abf394397cb09d8..76df857d833d45e605433c0deed754f4c9adf94f 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -1,5 +1,5 @@
 {
-  "account.account_note_header": "Note",
+  "account.account_note_header": "PoznÃ¡mka",
   "account.add_or_remove_from_list": "PÅ™idat nebo odstranit ze seznamÅ¯",
   "account.badges.bot": "Robot",
   "account.badges.group": "Skupina",
@@ -9,13 +9,15 @@
   "account.browse_more_on_origin_server": "VÃce na pÅ¯vodnÃm profilu",
   "account.cancel_follow_request": "ZruÅ¡it Å¾Ã¡dost o sledovÃ¡nÃ",
   "account.direct": "Poslat uÅ¾ivateli @{name} pÅ™Ãmou zprÃ¡vu",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "DomÃ©na skryta",
   "account.edit_profile": "Upravit profil",
+  "account.enable_notifications": "OznÃ¡mit mÄ› na pÅ™ÃspÄ›vky @{name}",
   "account.endorse": "ZvÃ½raznit na profilu",
   "account.follow": "Sledovat",
   "account.followers": "SledujÃcÃ",
   "account.followers.empty": "Tohoto uÅ¾ivatele jeÅ¡tÄ› nikdo nesleduje.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.followers_counter": "{count, plural, one {{counter} sledujÃcÃ} few {{counter} sledujÃcÃ} many {{counter} sledujÃcÃch} other {{counter} sledujÃcÃch}}",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "Tento uÅ¾ivatel jeÅ¡tÄ› nikoho nesleduje.",
   "account.follows_you": "Sleduje vÃ¡s",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "VÃ½sledky hledÃ¡nÃ",
   "emoji_button.symbols": "Symboly",
   "emoji_button.travel": "CestovÃ¡nÃ a mÃsta",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Nejsou tu Å¾Ã¡dnÃ© tooty!",
   "empty_column.account_unavailable": "Profil nedostupnÃ½",
   "empty_column.blocks": "JeÅ¡tÄ› jste nezablokovali Å¾Ã¡dnÃ©ho uÅ¾ivatele.",
@@ -166,13 +169,15 @@
   "empty_column.notifications": "JeÅ¡tÄ› nemÃ¡te Å¾Ã¡dnÃ¡ oznÃ¡menÃ. ZaÄnÄ›te s nÄ›kÃ½m konverzaci.",
   "empty_column.public": "Tady nic nenÃ! NapiÅ¡te nÄ›co veÅ™ejnÄ›, nebo zaÄnÄ›te ruÄnÄ› sledovat uÅ¾ivatele z jinÃ½ch serverÅ¯, aby tu nÄ›co pÅ™ibylo",
   "error.unexpected_crash.explanation": "KvÅ¯li chybÄ› v naÅ¡em kÃ³du nebo problÃ©mu s kompatibilitou prohlÃÅ¾eÄe nemohla bÃ½t tato strÃ¡nka naÄtena sprÃ¡vnÄ›.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Zkuste strÃ¡nku naÄÃst znovu. Pokud to nepomÅ¯Å¾e, zkuste Mastodon pouÅ¾Ãvat pomocÃ jinÃ©ho prohlÃÅ¾eÄe nebo nativnÃ aplikace.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "ZkopÃrovat stacktrace do schrÃ¡nky",
   "errors.unexpected_crash.report_issue": "NahlÃ¡sit problÃ©m",
   "follow_request.authorize": "Autorizovat",
   "follow_request.reject": "OdmÃtnout",
   "follow_requests.unlocked_explanation": "PÅ™estoÅ¾e vÃ¡Å¡ ÃºÄet nenÃ uzamÄen, {domain} si myslÃ, Å¾e budete chtÃt nÃ¡sledujÃcÃ poÅ¾adavky na sledovÃ¡nÃ zkontrolovat ruÄnÄ›.",
-  "generic.saved": "Saved",
+  "generic.saved": "UloÅ¾eno",
   "getting_started.developers": "VÃ½vojÃ¡Å™i",
   "getting_started.directory": "AdresÃ¡Å™ profilÅ¯",
   "getting_started.documentation": "Dokumentace",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "zruÅ¡enÃ zamÄ›Å™enÃ na psacÃ prostor/hledÃ¡nÃ",
   "keyboard_shortcuts.up": "posunutÃ nahoru v seznamu",
   "lightbox.close": "ZavÅ™Ãt",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "DalÅ¡Ã",
   "lightbox.previous": "PÅ™edchozÃ",
-  "lightbox.view_context": "Zobrazit kontext",
   "lists.account.add": "PÅ™idat do seznamu",
   "lists.account.remove": "Odebrat ze seznamu",
   "lists.delete": "Smazat seznam",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "ZmÄ›nit nÃ¡zev",
   "lists.new.create": "PÅ™idat seznam",
   "lists.new.title_placeholder": "NÃ¡zev novÃ©ho seznamu",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Hledejte mezi lidmi, kterÃ© sledujete",
   "lists.subheading": "VaÅ¡e seznamy",
   "load_pending": "{count, plural, one {# novÃ¡ poloÅ¾ka} few {# novÃ© poloÅ¾ky} many {# novÃ½ch poloÅ¾ek} other {# novÃ½ch poloÅ¾ek}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "PÅ™epnout viditelnost",
   "missing_indicator.label": "Nenalezeno",
   "missing_indicator.sublabel": "Tento zdroj se nepodaÅ™ilo najÃt",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "SkrÃ½t oznÃ¡menÃ od tohoto uÅ¾ivatele?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "MobilnÃ aplikace",
   "navigation_bar.blocks": "BlokovanÃ uÅ¾ivatelÃ©",
   "navigation_bar.bookmarks": "ZÃ¡loÅ¾ky",
@@ -298,6 +310,7 @@
   "notification.own_poll": "VaÅ¡e anketa skonÄila",
   "notification.poll": "Anketa, ve kterÃ© jste hlasovali, skonÄila",
   "notification.reblog": "UÅ¾ivatel {name} boostnul vÃ¡Å¡ toot",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Smazat oznÃ¡menÃ",
   "notifications.clear_confirmation": "Opravdu chcete trvale smazat vÅ¡echna vaÅ¡e oznÃ¡menÃ?",
   "notifications.column_settings.alert": "OznÃ¡menÃ na poÄÃtaÄi",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Boosty:",
   "notifications.column_settings.show": "Zobrazit ve sloupci",
   "notifications.column_settings.sound": "PÅ™ehrÃ¡t zvuk",
+  "notifications.column_settings.status": "NovÃ© tooty:",
   "notifications.filter.all": "VÅ¡e",
   "notifications.filter.boosts": "Boosty",
   "notifications.filter.favourites": "OblÃbenÃ",
   "notifications.filter.follows": "SledovÃ¡nÃ",
   "notifications.filter.mentions": "ZmÃnky",
   "notifications.filter.polls": "VÃ½sledky anket",
+  "notifications.filter.statuses": "Aktuality od lidÃ, kterÃ© sledujete",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} oznÃ¡menÃ",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "UzavÅ™eno",
   "poll.refresh": "Obnovit",
   "poll.total_people": "{count, plural, one {# ÄlovÄ›k} few {# lidÃ©} many {# lidÃ} other {# lidÃ}}",
@@ -430,13 +454,13 @@
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "Nahrajte pÅ™etaÅ¾enÃm",
-  "upload_button.label": "PÅ™idat mÃ©dia ({formats})",
+  "upload_button.label": "PÅ™idat mÃ©dia",
   "upload_error.limit": "Byl pÅ™ekroÄen limit nahranÃ½ch souborÅ¯.",
   "upload_error.poll": "U anket nenÃ nahrÃ¡vÃ¡nÃ souborÅ¯ povoleno.",
   "upload_form.audio_description": "Popis pro sluchovÄ› postiÅ¾enÃ©",
   "upload_form.description": "Popis pro zrakovÄ› postiÅ¾enÃ©",
   "upload_form.edit": "Upravit",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "ZmÄ›nit miniaturu",
   "upload_form.undo": "Smazat",
   "upload_form.video_description": "Popis pro sluchovÄ› Äi zrakovÄ› postiÅ¾enÃ©",
   "upload_modal.analyzing_picture": "Analyzuji obrÃ¡zekâ€¦",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detekovat text z obrÃ¡zku",
   "upload_modal.edit_media": "Upravit mÃ©dia",
   "upload_modal.hint": "KliknutÃm na nebo pÅ™etÃ¡hnutÃm kruhu na nÃ¡hledu vyberte oblast, kterÃ¡ bude na vÅ¡ech nÃ¡hledech vÅ¾dy zobrazen.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "NÃ¡hled ({ratio})",
   "upload_progress.label": "NahrÃ¡vÃ¡nÃâ€¦",
   "video.close": "ZavÅ™Ãt video",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 312a0f97a270662f787ac5eec26a32b0ea2bf9c6..b3c1947b40925991c60c478144f1c2e092bf9eb7 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -1,22 +1,24 @@
 {
-  "account.account_note_header": "Note",
+  "account.account_note_header": "Nodyn",
   "account.add_or_remove_from_list": "Ychwanegu neu Dileu o'r rhestrau",
   "account.badges.bot": "Bot",
   "account.badges.group": "GrÅµp",
   "account.block": "Blocio @{name}",
   "account.block_domain": "Cuddio popeth rhag {domain}",
   "account.blocked": "Blociwyd",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Pori mwy ar y proffil gwreiddiol",
   "account.cancel_follow_request": "Canslo cais dilyn",
   "account.direct": "Neges breifat @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Parth wedi ei guddio",
   "account.edit_profile": "Golygu proffil",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Arddangos ar fy mhroffil",
   "account.follow": "Dilyn",
   "account.followers": "Dilynwyr",
   "account.followers.empty": "Nid oes neb yn dilyn y defnyddiwr hwn eto.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers_counter": "{count, plural, one {{counter} Ddilynwr} other {{counter} o Ddilynwyr}}",
+  "account.following_counter": "{count, plural, one {{counter} yn Dilyn} other {{counter} yn Dilyn}}",
   "account.follows.empty": "Nid yw'r defnyddiwr hwn yn dilyn unrhyw un eto.",
   "account.follows_you": "Yn eich dilyn chi",
   "account.hide_reblogs": "Cuddio bwstiau o @{name}",
@@ -36,14 +38,14 @@
   "account.requested": "Aros am gymeradwyaeth. Cliciwch er mwyn canslo cais dilyn",
   "account.share": "Rhannwch broffil @{name}",
   "account.show_reblogs": "Dangos bwstiau o @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, one {{counter} DÅµt} other {{counter} o DÅµtiau}}",
   "account.unblock": "Dadflocio @{name}",
   "account.unblock_domain": "Dadguddio {domain}",
   "account.unendorse": "Peidio a'i arddangos ar fy mhroffil",
   "account.unfollow": "Dad-ddilyn",
   "account.unmute": "Dad-dawelu @{name}",
   "account.unmute_notifications": "Dad-dawelu hysbysiadau o @{name}",
-  "account_note.placeholder": "Click to add a note",
+  "account_note.placeholder": "Clicio i ychwanegu nodyn",
   "alert.rate_limited.message": "Ceisiwch eto ar Ã´l {retry_time, time, medium}.",
   "alert.rate_limited.title": "Cyfradd gyfyngedig",
   "alert.unexpected.message": "Digwyddodd gwall annisgwyl.",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Canlyniadau chwilio",
   "emoji_button.symbols": "Symbolau",
   "emoji_button.travel": "Teithio & Llefydd",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Dim tÅµtiau fama!",
   "empty_column.account_unavailable": "Proffil ddim ar gael",
   "empty_column.blocks": "Nid ydych wedi blocio unrhyw ddefnyddwyr eto.",
@@ -166,13 +169,15 @@
   "empty_column.notifications": "Nid oes gennych unrhyw hysbysiadau eto. Rhyngweithiwch ac 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",
   "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": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "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_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "CopÃ¯o'r olrhain stac i'r clipfwrdd",
   "errors.unexpected_crash.report_issue": "Rhoi gwybod am broblem",
   "follow_request.authorize": "Caniatau",
   "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.",
-  "generic.saved": "Saved",
+  "generic.saved": "Wedi'i Gadw",
   "getting_started.developers": "Datblygwyr",
   "getting_started.directory": "Cyfeiriadur proffil",
   "getting_started.documentation": "Dogfennaeth",
@@ -242,7 +247,7 @@
   "keyboard_shortcuts.reply": "i ateb",
   "keyboard_shortcuts.requests": "i agor rhestr ceisiadau dilyn",
   "keyboard_shortcuts.search": "i ffocysu chwilio",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "i ddangos/cuddio'r maes CW",
   "keyboard_shortcuts.start": "i agor colofn \"dechrau arni\"",
   "keyboard_shortcuts.toggle_hidden": "i ddangos/cuddio testun tu Ã´l i CW",
   "keyboard_shortcuts.toggle_sensitivity": "i ddangos/gyddio cyfryngau",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "i ddad-ffocysu ardal cyfansoddi testun/chwilio",
   "keyboard_shortcuts.up": "i symud yn uwch yn y rhestr",
   "lightbox.close": "Cau",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Nesaf",
   "lightbox.previous": "Blaenorol",
-  "lightbox.view_context": "Gweld cyd-destyn",
   "lists.account.add": "Ychwanegwch at restr",
   "lists.account.remove": "Dileu o'r rhestr",
   "lists.delete": "Dileu rhestr",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Newid teitl",
   "lists.new.create": "Ychwanegu rhestr",
   "lists.new.title_placeholder": "Teitl rhestr newydd",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Chwilio ymysg pobl yr ydych yn ei ddilyn",
   "lists.subheading": "Eich rhestrau",
   "load_pending": "{count, plural, one {# eitem newydd} other {# eitemau newydd}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Toglo gwelededd",
   "missing_indicator.label": "Heb ei ganfod",
   "missing_indicator.sublabel": "Ni ellid canfod yr adnodd hwn",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Cuddio hysbysiadau rhag y defnyddiwr hwn?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Apiau symudol",
   "navigation_bar.blocks": "Defnyddwyr wedi eu blocio",
   "navigation_bar.bookmarks": "Tudalnodau",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Mae eich pÃ´l wedi diweddu",
   "notification.poll": "Mae pleidlais rydych wedi pleidleisio ynddi wedi dod i ben",
   "notification.reblog": "Hysbysebodd {name} eich tÅµt",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Clirio hysbysiadau",
   "notifications.clear_confirmation": "Ydych chi'n sicr eich bod am glirio'ch holl hysbysiadau am byth?",
   "notifications.column_settings.alert": "Hysbysiadau bwrdd gwaith",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Hybiadau:",
   "notifications.column_settings.show": "Dangos yn y golofn",
   "notifications.column_settings.sound": "Chwarae sain",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "Pob",
   "notifications.filter.boosts": "Hybiadau",
   "notifications.filter.favourites": "Ffefrynnau",
   "notifications.filter.follows": "Yn dilyn",
   "notifications.filter.mentions": "Crybwylliadau",
   "notifications.filter.polls": "Canlyniadau pleidlais",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} o hysbysiadau",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Ar gau",
   "poll.refresh": "Adnewyddu",
   "poll.total_people": "{count, plural, one {# berson} other {# o bobl}}",
@@ -419,16 +443,16 @@
   "time_remaining.minutes": "{number, plural, one {# funud} other {# o funudau}} ar Ã´l",
   "time_remaining.moments": "Munudau ar Ã´l",
   "time_remaining.seconds": "{number, plural, one {# eiliad} other {# o eiliadau}} ar Ã´l",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "timeline_hint.remote_resource_not_displayed": "ni chaiff {resource} o gweinyddion eraill ei ddangos.",
+  "timeline_hint.resources.followers": "Dilynwyr",
+  "timeline_hint.resources.follows": "Yn dilyn",
+  "timeline_hint.resources.statuses": "TÅµtiau henach",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} berson} other {{counter} o bobl}}",
   "trends.trending_now": "Yn tueddu nawr",
   "ui.beforeunload": "Mi fyddwch yn colli eich drafft os gadewch Mastodon.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
+  "units.short.billion": "{count}biliwn",
+  "units.short.million": "{count}miliwn",
+  "units.short.thousand": "{count}mil",
   "upload_area.title": "Llusgwch & gollwing i uwchlwytho",
   "upload_button.label": "Ychwanegwch gyfryngau (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Wedi mynd heibio'r uchafswm terfyn uwchlwytho.",
@@ -436,16 +460,17 @@
   "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.edit": "Golygu",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "Newid mÃ¢n-lun",
   "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.apply": "Gweithredu",
-  "upload_modal.choose_image": "Choose image",
+  "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.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Rhagolwg ({ratio})",
   "upload_progress.label": "Uwchlwytho...",
   "video.close": "Cau fideo",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index a0fb354e6692f3900cb1425eaab94688fd43d395..7c4b3e4ef350bafa9bcb82aa68e1c28919a318d7 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -6,16 +6,18 @@
   "account.block": "Bloker @{name}",
   "account.block_domain": "Skjul alt fra {domain}",
   "account.blocked": "Blokeret",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Gennemse mere pÃ¥ den oprindelige profil",
   "account.cancel_follow_request": "AnnullÃ©r fÃ¸lgeranmodning",
   "account.direct": "Send en direkte besked til @{name}",
+  "account.disable_notifications": "Stop med at give mig besked nÃ¥r @{name} lÃ¦gger noget op",
   "account.domain_blocked": "DomÃ¦net er blevet skjult",
   "account.edit_profile": "Rediger profil",
+  "account.enable_notifications": "Giv mig besked nÃ¥r @{name} lÃ¦gger noget op",
   "account.endorse": "FremhÃ¦v pÃ¥ profil",
   "account.follow": "FÃ¸lg",
   "account.followers": "FÃ¸lgere",
   "account.followers.empty": "Der er endnu ingen der fÃ¸lger denne bruger.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.followers_counter": "{count, plural, one {{counter} FÃ¸lger} other {{counter} FÃ¸lgere}}",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "Denne bruger fÃ¸lger endnu ikke nogen.",
   "account.follows_you": "FÃ¸lger dig",
@@ -48,7 +50,7 @@
   "alert.rate_limited.title": "GradsbegrÃ¦nset",
   "alert.unexpected.message": "Der opstod en uventet fejl.",
   "alert.unexpected.title": "Ups!",
-  "announcement.announcement": "Announcement",
+  "announcement.announcement": "BekendtgÃ¸relse",
   "autosuggest_hashtag.per_week": "{count} per uge",
   "boost_modal.combo": "Du kan trykke {combo} for at springe dette over nÃ¦ste gang",
   "bundle_column_error.body": "Noget gik galt under indlÃ¦sningen af dette komponent.",
@@ -79,9 +81,9 @@
   "column_header.show_settings": "Vis indstillinger",
   "column_header.unpin": "FastgÃ¸r ikke lÃ¦ngere",
   "column_subheading.settings": "Indstillinger",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Kun lokalt",
   "community.column_settings.media_only": "Kun medie",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Kun fjernt",
   "compose_form.direct_message_warning": "Dette trut vil kun blive sendt til de nÃ¦vnte brugere.",
   "compose_form.direct_message_warning_learn_more": "LÃ¦r mere",
   "compose_form.hashtag_warning": "Dette trut vil ikke blive vist under noget hashtag da det ikke er listet. Kun offentlige trut kan blive vist under sÃ¸gninger med hashtags.",
@@ -92,8 +94,8 @@
   "compose_form.poll.duration": "Afstemningens varighed",
   "compose_form.poll.option_placeholder": "Valgmulighed {number}",
   "compose_form.poll.remove_option": "Fjern denne valgmulighed",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Ã†ndre afstemning for at tillade flere valg",
+  "compose_form.poll.switch_to_single": "Ã†ndre afstemning for at tillade et enkelt valg",
   "compose_form.publish": "Trut",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "MarkÃ©r medie som fÃ¸lsomt",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "SÃ¸geresultater",
   "emoji_button.symbols": "Symboler",
   "emoji_button.travel": "Rejser & steder",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Ingen bidrag her!",
   "empty_column.account_unavailable": "Profil utilgÃ¦ngelig",
   "empty_column.blocks": "Du har ikke blokeret nogen endnu.",
@@ -166,13 +169,15 @@
   "empty_column.notifications": "Du har endnu ingen notifikationer. Tag ud og bland dig med folkemÃ¦ngden for at starte samtalen.",
   "empty_column.public": "Der er ikke noget at se her! Skriv noget offentligt eller start ud med manuelt at fÃ¸lge brugere fra andre server for at udfylde tomrummet",
   "error.unexpected_crash.explanation": "PÃ¥ grund af en fejl i vores kode, eller en browser kompatibilitetsfejl, sÃ¥ kunne siden ikke vises korrekt.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "PrÃ¸v at genindlÃ¦s siden. Hvis dette ikke hjÃ¦lper, sÃ¥ forsÃ¸g venligst, at tilgÃ¥ Mastodon via en anden browser eller app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "KopiÃ©r stack trace til udklipsholderen",
   "errors.unexpected_crash.report_issue": "RapportÃ©r problem",
   "follow_request.authorize": "Godkend",
   "follow_request.reject": "Afvis",
-  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
-  "generic.saved": "Saved",
+  "follow_requests.unlocked_explanation": "Selvom din konto ikke er lÃ¥st, troede {domain} -personalet, at du mÃ¥ske vil gennemgÃ¥ dine anmodninger manuelt.",
+  "generic.saved": "Gemt",
   "getting_started.developers": "Udviklere",
   "getting_started.directory": "Profilliste",
   "getting_started.documentation": "Dokumentation",
@@ -193,8 +198,8 @@
   "home.column_settings.basic": "GrundlÃ¦ggende",
   "home.column_settings.show_reblogs": "Vis fremhÃ¦velser",
   "home.column_settings.show_replies": "Vis svar",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
+  "home.hide_announcements": "Skjul bekendtgÃ¸relser",
+  "home.show_announcements": "Vis bekendtgÃ¸relser",
   "intervals.full.days": "{number, plural, one {# dag} other {# dage}}",
   "intervals.full.hours": "{number, plural, one {# time} other {# timer}}",
   "intervals.full.minutes": "{number, plural, one {# minut} other {# minutter}}",
@@ -236,13 +241,13 @@
   "keyboard_shortcuts.muted": "for at Ã¥bne listen over dÃ¦mpede brugere",
   "keyboard_shortcuts.my_profile": "for at Ã¥bne din profil",
   "keyboard_shortcuts.notifications": "for at Ã¥bne notifikations kolonnen",
-  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.open_media": "for at Ã¥bne medier",
   "keyboard_shortcuts.pinned": "for at Ã¥bne listen over fastgjorte trut",
   "keyboard_shortcuts.profile": "til profil af Ã¥ben forfatter",
   "keyboard_shortcuts.reply": "for at svare",
   "keyboard_shortcuts.requests": "for at Ã¥bne listen over fÃ¸lgeranmodninger",
   "keyboard_shortcuts.search": "for at fokusere sÃ¸gningen",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "for at vise/skjule CW-felt",
   "keyboard_shortcuts.start": "for at Ã¥bne \"kom igen\" kolonnen",
   "keyboard_shortcuts.toggle_hidden": "for at vise/skjule tekst bag CW",
   "keyboard_shortcuts.toggle_sensitivity": "for at vise/skjule medier",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "for at fjerne fokus fra skriveomrÃ¥de/sÃ¸gning",
   "keyboard_shortcuts.up": "for at bevÃ¦ge dig op ad listen",
   "lightbox.close": "Luk",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "NÃ¦ste",
   "lightbox.previous": "Forrige",
-  "lightbox.view_context": "Vis kontekst",
   "lists.account.add": "TilfÃ¸j til liste",
   "lists.account.remove": "Fjern fra liste",
   "lists.delete": "Slet liste",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Skift titel",
   "lists.new.create": "TilfÃ¸j liste",
   "lists.new.title_placeholder": "Ny liste titel",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Vis svar til:",
   "lists.search": "SÃ¸g iblandt folk du fÃ¸lger",
   "lists.subheading": "Dine lister",
   "load_pending": "{count, plural, one {# nyt punkt} other {# nye punkter}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Ã†ndre synlighed",
   "missing_indicator.label": "Ikke fundet",
   "missing_indicator.sublabel": "Denne ressource kunne ikke blive fundet",
+  "mute_modal.duration": "Varighed",
   "mute_modal.hide_notifications": "Skjul notifikationer fra denne bruger?",
+  "mute_modal.indefinite": "Uendeligt",
   "navigation_bar.apps": "Mobil apps",
   "navigation_bar.blocks": "Blokerede brugere",
   "navigation_bar.bookmarks": "BogmÃ¦rker",
@@ -293,11 +305,12 @@
   "navigation_bar.security": "Sikkerhed",
   "notification.favourite": "{name} favoriserede din status",
   "notification.follow": "{name} fulgte dig",
-  "notification.follow_request": "{name} has requested to follow you",
+  "notification.follow_request": "{name} har anmodet om at fÃ¸lge dig",
   "notification.mention": "{name} nÃ¦vnte dig",
   "notification.own_poll": "Din afstemning er afsluttet",
   "notification.poll": "En afstemning, du stemte i, er slut",
   "notification.reblog": "{name} boostede din status",
+  "notification.status": "{name} har lige lagt noget op",
   "notifications.clear": "Ryd notifikationer",
   "notifications.clear_confirmation": "Er du sikker pÃ¥, du vil rydde alle dine notifikationer permanent?",
   "notifications.column_settings.alert": "Skrivebordsnotifikationer",
@@ -306,20 +319,31 @@
   "notifications.column_settings.filter_bar.category": "Hurtigfilter",
   "notifications.column_settings.filter_bar.show": "Vis",
   "notifications.column_settings.follow": "Nye fÃ¸lgere:",
-  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.follow_request": "Nye fÃ¸lgeranmodninger:",
   "notifications.column_settings.mention": "Statusser der nÃ¦vner dig:",
   "notifications.column_settings.poll": "Afstemningsresultat:",
   "notifications.column_settings.push": "Pushnotifikationer",
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Vis i kolonne",
   "notifications.column_settings.sound": "Afspil lyd",
+  "notifications.column_settings.status": "Nye toots:",
   "notifications.filter.all": "Alle",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favoritter",
   "notifications.filter.follows": "FÃ¸lger",
   "notifications.filter.mentions": "Statusser der nÃ¦vner dig",
   "notifications.filter.polls": "Afstemningsresultat",
+  "notifications.filter.statuses": "Opdateringer fra personer, du fÃ¸lger",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notifikationer",
+  "notifications.mark_as_read": "MarkÃ©r alle notifikationer som lÃ¦st",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "AktivÃ©r skrivebordsmeddelelser",
+  "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.title": "GÃ¥ aldrig glip af noget",
+  "picture_in_picture.restore": "SÃ¦t den tilbage",
   "poll.closed": "Lukket",
   "poll.refresh": "OpdatÃ©r",
   "poll.total_people": "{count, plural, one {# person} other {# personer}}",
@@ -419,10 +443,10 @@
   "time_remaining.minutes": "{number, plural, one {# minut} other {# minutter}} tilbage",
   "time_remaining.moments": "FÃ¥ Ã¸jeblikke tilbage",
   "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekunder}} tilbage",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
+  "timeline_hint.remote_resource_not_displayed": "{resource} fra andre servere vises ikke.",
+  "timeline_hint.resources.followers": "FÃ¸lgere",
+  "timeline_hint.resources.follows": "FÃ¸lger",
+  "timeline_hint.resources.statuses": "Ã†ldre toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
   "trends.trending_now": "Hot lige nu",
   "ui.beforeunload": "Din kladde vil gÃ¥ tabt hvis du forlader Mastodon.",
@@ -433,19 +457,20 @@
   "upload_button.label": "TilfÃ¸j medie (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "UploadgrÃ¦nse overskredet.",
   "upload_error.poll": "Filupload ikke tilladt sammen med afstemninger.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_form.audio_description": "Beskriv for personer med hÃ¸retab",
   "upload_form.description": "Beskriv for svagtseende",
   "upload_form.edit": "RedigÃ©r",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "Slet",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_form.video_description": "Beskriv for personer med hÃ¸retab eller nedsat syn",
   "upload_modal.analyzing_picture": "Analyserer billedeâ€¦",
   "upload_modal.apply": "Anvend",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "VÃ¦lg billede",
   "upload_modal.description_placeholder": "En hurtig brun rÃ¦v hopper over den dovne hund",
   "upload_modal.detect_text": "Find tekst i billede pÃ¥ automatisk vis",
   "upload_modal.edit_media": "RedigÃ©r medie",
   "upload_modal.hint": "Klik eller trÃ¦k cirklen pÃ¥ billedet for at vÃ¦lge et fokuspunkt.",
+  "upload_modal.preparing_ocr": "Forbereder OCRâ€¦",
   "upload_modal.preview_label": "ForhÃ¥ndsvisning ({ratio})",
   "upload_progress.label": "Uploader...",
   "video.close": "Luk video",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index d0274b077ddb6a4dd866c180616b1e2fe8c161ce..1c177302985a0918796fa3d904519d44180e6d8e 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -1,16 +1,18 @@
 {
-  "account.account_note_header": "Deine Notiz fÃ¼r @{name}",
+  "account.account_note_header": "Notiz",
   "account.add_or_remove_from_list": "HinzufÃ¼gen oder Entfernen von Listen",
   "account.badges.bot": "Bot",
   "account.badges.group": "Gruppe",
   "account.block": "@{name} blockieren",
-  "account.block_domain": "Alles von {domain} blockieren",
+  "account.block_domain": "Alles von {domain} verstecken",
   "account.blocked": "Blockiert",
   "account.browse_more_on_origin_server": "Mehr auf dem Originalprofil durchsuchen",
   "account.cancel_follow_request": "Folgeanfrage abbrechen",
   "account.direct": "Direktnachricht an @{name}",
+  "account.disable_notifications": "HÃ¶re auf mich zu benachrichtigen wenn @{name} etwas postet",
   "account.domain_blocked": "Domain versteckt",
   "account.edit_profile": "Profil bearbeiten",
+  "account.enable_notifications": "Benachrichtige mich wenn @{name} etwas postet",
   "account.endorse": "Auf Profil hervorheben",
   "account.follow": "Folgen",
   "account.followers": "Folgende",
@@ -38,12 +40,12 @@
   "account.show_reblogs": "Von @{name} geteilte BeitrÃ¤ge anzeigen",
   "account.statuses_counter": "{count, plural, one {{counter} Beitrag} other {{counter} BeitrÃ¤ge}}",
   "account.unblock": "@{name} entblocken",
-  "account.unblock_domain": "Blockieren von {domain} beenden",
+  "account.unblock_domain": "{domain} wieder anzeigen",
   "account.unendorse": "Nicht auf Profil hervorheben",
   "account.unfollow": "Entfolgen",
   "account.unmute": "@{name} nicht mehr stummschalten",
   "account.unmute_notifications": "Benachrichtigungen von @{name} einschalten",
-  "account_note.placeholder": "Kein Kommentar angegeben",
+  "account_note.placeholder": "Notiz durch Klicken hinzufÃ¼gen",
   "alert.rate_limited.message": "Bitte versuche es nach {retry_time, time, medium}.",
   "alert.rate_limited.title": "Anfragelimit Ã¼berschritten",
   "alert.unexpected.message": "Ein unerwarteter Fehler ist aufgetreten.",
@@ -62,7 +64,7 @@
   "column.community": "Lokale Zeitleiste",
   "column.direct": "Direktnachrichten",
   "column.directory": "Profile durchsuchen",
-  "column.domain_blocks": "Versteckte Domains",
+  "column.domain_blocks": "Blockierte Domains",
   "column.favourites": "Favoriten",
   "column.follow_requests": "Folgeanfragen",
   "column.home": "Startseite",
@@ -94,11 +96,11 @@
   "compose_form.poll.remove_option": "Wahl entfernen",
   "compose_form.poll.switch_to_multiple": "Umfrage Ã¤ndern, um mehrere Optionen zu erlauben",
   "compose_form.poll.switch_to_single": "Umfrage Ã¤ndern, um eine einzige Wahl zu erlauben",
-  "compose_form.publish": "Beitrag",
+  "compose_form.publish": "TrÃ¶t",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Medien als heikel markieren",
-  "compose_form.sensitive.marked": "Medien sind als heikel markiert",
-  "compose_form.sensitive.unmarked": "Medien sind nicht als heikel markiert",
+  "compose_form.sensitive.hide": "Medien als NSFW markieren",
+  "compose_form.sensitive.marked": "Medien sind als NSFW markiert",
+  "compose_form.sensitive.unmarked": "Medien sind nicht als NSFW markiert",
   "compose_form.spoiler.marked": "Text ist hinter einer Warnung versteckt",
   "compose_form.spoiler.unmarked": "Text ist nicht versteckt",
   "compose_form.spoiler_placeholder": "Inhaltswarnung",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Suchergebnisse",
   "emoji_button.symbols": "Symbole",
   "emoji_button.travel": "Reisen und Orte",
+  "empty_column.account_suspended": "Konto gesperrt",
   "empty_column.account_timeline": "Keine BeitrÃ¤ge!",
   "empty_column.account_unavailable": "Konto nicht verfÃ¼gbar",
   "empty_column.blocks": "Du hast keine Profile blockiert.",
@@ -165,8 +168,10 @@
   "empty_column.mutes": "Du hast keine Profile stummgeschaltet.",
   "empty_column.notifications": "Du hast noch keine Mitteilungen. Interagiere mit anderen, um ins GesprÃ¤ch zu kommen.",
   "empty_column.public": "Hier ist nichts zu sehen! Schreibe etwas Ã¶ffentlich oder folge Profilen von anderen Servern, um die Zeitleiste aufzufÃ¼llen",
-  "error.unexpected_crash.explanation": "Aufgrund eines Fehlers in unserem Code oder einer Browser-InkompatibilitÃ¤t konnte diese Seite nicht korrekt angezeigt werden.",
+  "error.unexpected_crash.explanation": "Aufgrund eines Fehlers in unserem Code oder einer BrowsereinkompatibilitÃ¤t konnte diese Seite nicht korrekt angezeigt werden.",
+  "error.unexpected_crash.explanation_addons": "Diese Seite konnte nicht korrekt angezeigt werden. Dieser Fehler wird wahrscheinlich durch ein Browser-Add-on oder automatische Ãœbersetzungswerkzeuge verursacht.",
   "error.unexpected_crash.next_steps": "Versuche die Seite zu aktualisieren. Wenn das nicht hilft, kannst du Mastodon Ã¼ber einen anderen Browser oder eine native App verwenden.",
+  "error.unexpected_crash.next_steps_addons": "Versuche sie zu deaktivieren und lade dann die Seite neu. Wenn das Problem weiterhin besteht, solltest du Mastodon Ã¼ber einen anderen Browser oder eine native App nutzen.",
   "errors.unexpected_crash.copy_stacktrace": "Fehlerlog in die Zwischenablage kopieren",
   "errors.unexpected_crash.report_issue": "Problem melden",
   "follow_request.authorize": "Erlauben",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "Textfeld/die Suche nicht mehr fokussieren",
   "keyboard_shortcuts.up": "sich in der Liste hinauf bewegen",
   "lightbox.close": "SchlieÃŸen",
+  "lightbox.compress": "Bildansicht komprimieren",
+  "lightbox.expand": "Bildansicht erweitern",
   "lightbox.next": "Weiter",
   "lightbox.previous": "ZurÃ¼ck",
-  "lightbox.view_context": "Beitrag sehen",
   "lists.account.add": "Zur Liste hinzufÃ¼gen",
   "lists.account.remove": "Von der Liste entfernen",
   "lists.delete": "Liste lÃ¶schen",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Titel Ã¤ndern",
   "lists.new.create": "Liste hinzufÃ¼gen",
   "lists.new.title_placeholder": "Neuer Titel der Liste",
+  "lists.replies_policy.followed": "Jeder gefolgte Benutzer",
+  "lists.replies_policy.list": "Mitglieder der Liste",
+  "lists.replies_policy.none": "Niemand",
+  "lists.replies_policy.title": "Antworten anzeigen fÃ¼r:",
   "lists.search": "Suche nach Leuten denen du folgst",
   "lists.subheading": "Deine Listen",
   "load_pending": "{count, plural, one {# neuer Beitrag} other {# neue BeitrÃ¤ge}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Sichtbarkeit umschalten",
   "missing_indicator.label": "Nicht gefunden",
   "missing_indicator.sublabel": "Die Ressource konnte nicht gefunden werden",
+  "mute_modal.duration": "Dauer",
   "mute_modal.hide_notifications": "Benachrichtigungen von diesem Account verbergen?",
+  "mute_modal.indefinite": "Unbestimmt",
   "navigation_bar.apps": "Mobile Apps",
   "navigation_bar.blocks": "Blockierte Profile",
   "navigation_bar.bookmarks": "Lesezeichen",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Deine Umfrage ist beendet",
   "notification.poll": "Eine Umfrage in der du abgestimmt hast ist vorbei",
   "notification.reblog": "{name} hat deinen Beitrag geteilt",
+  "notification.status": "{name} hat gerade etwas gepostet",
   "notifications.clear": "Mitteilungen lÃ¶schen",
   "notifications.clear_confirmation": "Bist du dir sicher, dass du alle Mitteilungen lÃ¶schen mÃ¶chtest?",
   "notifications.column_settings.alert": "Desktop-Benachrichtigungen",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Geteilte BeitrÃ¤ge:",
   "notifications.column_settings.show": "In der Spalte anzeigen",
   "notifications.column_settings.sound": "Ton abspielen",
+  "notifications.column_settings.status": "Neue BeitrÃ¤ge:",
   "notifications.filter.all": "Alle",
   "notifications.filter.boosts": "Geteilte BeitrÃ¤ge",
   "notifications.filter.favourites": "Favorisierungen",
   "notifications.filter.follows": "Folgt",
   "notifications.filter.mentions": "ErwÃ¤hnungen",
   "notifications.filter.polls": "Ergebnisse der Umfrage",
+  "notifications.filter.statuses": "Updates von Personen, denen du folgst",
+  "notifications.grant_permission": "Zugriff gewÃ¤hrt.",
   "notifications.group": "{count} Benachrichtigungen",
+  "notifications.mark_as_read": "Alle Benachrichtigungen als gelesen markieren",
+  "notifications.permission_denied": "Desktop-Benachrichtigungen kÃ¶nnen nicht aktiviert werden, da die Berechtigung verweigert wurde.",
+  "notifications.permission_denied_alert": "Desktop-Benachrichtigungen kÃ¶nnen nicht aktiviert werden, da die Browser-Berechtigung zuvor verweigert wurde",
+  "notifications.permission_required": "Desktop-Benachrichtigungen sind nicht verfÃ¼gbar, da die erforderliche Berechtigung nicht erteilt wurde.",
+  "notifications_permission_banner.enable": "Aktiviere Desktop-Benachrichtigungen",
+  "notifications_permission_banner.how_to_control": "Um Benachrichtigungen zu erhalten, wenn Mastodon nicht geÃ¶ffnet ist, aktiviere die Desktop-Benachrichtigungen. Du kannst genau bestimmen, welche Arten von Interaktionen Desktop-Benachrichtigungen Ã¼ber die {icon} -Taste erzeugen, sobald diese aktiviert sind.",
+  "notifications_permission_banner.title": "Verpasse nie etwas",
+  "picture_in_picture.restore": "ZurÃ¼cksetzen",
   "poll.closed": "Geschlossen",
   "poll.refresh": "Aktualisieren",
   "poll.total_people": "{count, plural, one {# Person} other {# Personen}}",
@@ -357,7 +381,7 @@
   "search_popout.search_format": "Fortgeschrittenes Suchformat",
   "search_popout.tips.full_text": "Einfache Texteingabe gibt BeitrÃ¤ge, die du geschrieben, favorisiert und geteilt hast zurÃ¼ck. AuÃŸerdem auch BeitrÃ¤ge in denen du erwÃ¤hnt wurdest, aber auch passende Nutzernamen, Anzeigenamen oder Hashtags.",
   "search_popout.tips.hashtag": "Hashtag",
-  "search_popout.tips.status": "Beitrag",
+  "search_popout.tips.status": "TrÃ¶t",
   "search_popout.tips.text": "Einfache Texteingabe gibt Anzeigenamen, Benutzernamen und Hashtags zurÃ¼ck",
   "search_popout.tips.user": "Nutzer",
   "search_results.accounts": "Personen",
@@ -397,7 +421,7 @@
   "status.reply": "Antworten",
   "status.replyAll": "Allen antworten",
   "status.report": "@{name} melden",
-  "status.sensitive_warning": "Heikle Inhalte",
+  "status.sensitive_warning": "NSFW",
   "status.share": "Teilen",
   "status.show_less": "Weniger anzeigen",
   "status.show_less_all": "Alle Inhaltswarnungen zuklappen",
@@ -430,7 +454,7 @@
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "Zum Hochladen hereinziehen",
-  "upload_button.label": "Mediendatei hinzufÃ¼gen ({formats})",
+  "upload_button.label": "Mediendatei hinzufÃ¼gen",
   "upload_error.limit": "Dateiupload-Limit erreicht.",
   "upload_error.poll": "Dateiuploads sind in Kombination mit Umfragen nicht erlaubt.",
   "upload_form.audio_description": "Beschreibe die Audiodatei fÃ¼r Menschen mit HÃ¶rschÃ¤digungen",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Text aus Bild erkennen",
   "upload_modal.edit_media": "Medien bearbeiten",
   "upload_modal.hint": "Klicke oder ziehe den Kreis auf die Vorschau, um den Brennpunkt auszuwÃ¤hlen, der immer auf allen Vorschaubilder angezeigt wird.",
+  "upload_modal.preparing_ocr": "Vorbereitung von OCRâ€¦",
   "upload_modal.preview_label": "Vorschau ({ratio})",
   "upload_progress.label": "Wird hochgeladen â€¦",
   "video.close": "Video schlieÃŸen",
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index bd9ebbc0de960103a878c6da02eacc409f2ce5b4..d9ebf0a4c5c4f28ed829294b5cdf99a0ee3f212e 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -167,10 +167,18 @@
   },
   {
     "descriptors": [
+      {
+        "defaultMessage": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
+        "id": "error.unexpected_crash.explanation_addons"
+      },
       {
         "defaultMessage": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
         "id": "error.unexpected_crash.explanation"
       },
+      {
+        "defaultMessage": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+        "id": "error.unexpected_crash.next_steps_addons"
+      },
       {
         "defaultMessage": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
         "id": "error.unexpected_crash.next_steps"
@@ -265,6 +273,15 @@
     ],
     "path": "app/javascript/mastodon/components/missing_indicator.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Put it back",
+        "id": "picture_in_picture.restore"
+      }
+    ],
+    "path": "app/javascript/mastodon/components/picture_in_picture_placeholder.json"
+  },
   {
     "descriptors": [
       {
@@ -421,7 +438,7 @@
         "id": "status.reblog"
       },
       {
-        "defaultMessage": "Boost to original audience",
+        "defaultMessage": "Boost with original visibility",
         "id": "status.reblog_private"
       },
       {
@@ -633,6 +650,19 @@
     ],
     "path": "app/javascript/mastodon/containers/status_container.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Account suspended",
+        "id": "empty_column.account_suspended"
+      },
+      {
+        "defaultMessage": "Profile unavailable",
+        "id": "empty_column.account_unavailable"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/account_gallery/index.json"
+  },
   {
     "descriptors": [
       {
@@ -686,6 +716,10 @@
         "defaultMessage": "Older toots",
         "id": "timeline_hint.resources.statuses"
       },
+      {
+        "defaultMessage": "Account suspended",
+        "id": "empty_column.account_suspended"
+      },
       {
         "defaultMessage": "Profile unavailable",
         "id": "empty_column.account_unavailable"
@@ -796,6 +830,14 @@
         "defaultMessage": "Show boosts from @{name}",
         "id": "account.show_reblogs"
       },
+      {
+        "defaultMessage": "Notify me when @{name} posts",
+        "id": "account.enable_notifications"
+      },
+      {
+        "defaultMessage": "Stop notifying me when @{name} posts",
+        "id": "account.disable_notifications"
+      },
       {
         "defaultMessage": "Pinned toots",
         "id": "navigation_bar.pins"
@@ -1305,15 +1347,15 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Media is marked as sensitive",
+        "defaultMessage": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
         "id": "compose_form.sensitive.marked"
       },
       {
-        "defaultMessage": "Media is not marked as sensitive",
+        "defaultMessage": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
         "id": "compose_form.sensitive.unmarked"
       },
       {
-        "defaultMessage": "Mark media as sensitive",
+        "defaultMessage": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
         "id": "compose_form.sensitive.hide"
       }
     ],
@@ -2125,6 +2167,18 @@
         "defaultMessage": "Delete",
         "id": "confirmations.delete_list.confirm"
       },
+      {
+        "defaultMessage": "Any followed user",
+        "id": "lists.replies_policy.followed"
+      },
+      {
+        "defaultMessage": "No one",
+        "id": "lists.replies_policy.none"
+      },
+      {
+        "defaultMessage": "Members of the list",
+        "id": "lists.replies_policy.list"
+      },
       {
         "defaultMessage": "Edit list",
         "id": "lists.edit"
@@ -2133,6 +2187,10 @@
         "defaultMessage": "Delete list",
         "id": "lists.delete"
       },
+      {
+        "defaultMessage": "Show replies to:",
+        "id": "lists.replies_policy.title"
+      },
       {
         "defaultMessage": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
         "id": "empty_column.list"
@@ -2218,6 +2276,14 @@
         "defaultMessage": "Push notifications",
         "id": "notifications.column_settings.push"
       },
+      {
+        "defaultMessage": "Desktop notifications are unavailable due to previously denied browser permissions request",
+        "id": "notifications.permission_denied"
+      },
+      {
+        "defaultMessage": "Desktop notifications are unavailable because the required permission has not been granted.",
+        "id": "notifications.permission_required"
+      },
       {
         "defaultMessage": "Quick filter bar",
         "id": "notifications.column_settings.filter_bar.category"
@@ -2245,6 +2311,10 @@
       {
         "defaultMessage": "Poll results:",
         "id": "notifications.column_settings.poll"
+      },
+      {
+        "defaultMessage": "New toots:",
+        "id": "notifications.column_settings.status"
       }
     ],
     "path": "app/javascript/mastodon/features/notifications/components/column_settings.json"
@@ -2271,6 +2341,10 @@
         "defaultMessage": "Follows",
         "id": "notifications.filter.follows"
       },
+      {
+        "defaultMessage": "Updates from people you follow",
+        "id": "notifications.filter.statuses"
+      },
       {
         "defaultMessage": "All",
         "id": "notifications.filter.all"
@@ -2291,6 +2365,15 @@
     ],
     "path": "app/javascript/mastodon/features/notifications/components/follow_request.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Grant permission.",
+        "id": "notifications.grant_permission"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/notifications/components/grant_permission_button.json"
+  },
   {
     "descriptors": [
       {
@@ -2313,6 +2396,10 @@
         "defaultMessage": "{name} boosted your status",
         "id": "notification.reblog"
       },
+      {
+        "defaultMessage": "{name} just posted",
+        "id": "notification.status"
+      },
       {
         "defaultMessage": "{name} has requested to follow you",
         "id": "notification.follow_request"
@@ -2320,6 +2407,27 @@
     ],
     "path": "app/javascript/mastodon/features/notifications/components/notification.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Close",
+        "id": "lightbox.close"
+      },
+      {
+        "defaultMessage": "Never miss a thing",
+        "id": "notifications_permission_banner.title"
+      },
+      {
+        "defaultMessage": "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.",
+        "id": "notifications_permission_banner.how_to_control"
+      },
+      {
+        "defaultMessage": "Enable desktop notifications",
+        "id": "notifications_permission_banner.enable"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/notifications/components/notifications_permission_banner.json"
+  },
   {
     "descriptors": [
       {
@@ -2329,6 +2437,10 @@
       {
         "defaultMessage": "Clear notifications",
         "id": "notifications.clear"
+      },
+      {
+        "defaultMessage": "Desktop notifications can't be enabled, as browser permission has been denied before",
+        "id": "notifications.permission_denied_alert"
       }
     ],
     "path": "app/javascript/mastodon/features/notifications/containers/column_settings_container.json"
@@ -2339,6 +2451,10 @@
         "defaultMessage": "Notifications",
         "id": "column.notifications"
       },
+      {
+        "defaultMessage": "Mark every notification as read",
+        "id": "notifications.mark_as_read"
+      },
       {
         "defaultMessage": "You don't have any notifications yet. Interact with others to start the conversation.",
         "id": "empty_column.notifications"
@@ -2346,6 +2462,60 @@
     ],
     "path": "app/javascript/mastodon/features/notifications/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Reply",
+        "id": "status.reply"
+      },
+      {
+        "defaultMessage": "Reply to thread",
+        "id": "status.replyAll"
+      },
+      {
+        "defaultMessage": "Boost",
+        "id": "status.reblog"
+      },
+      {
+        "defaultMessage": "Boost with original visibility",
+        "id": "status.reblog_private"
+      },
+      {
+        "defaultMessage": "Unboost",
+        "id": "status.cancel_reblog_private"
+      },
+      {
+        "defaultMessage": "This post cannot be boosted",
+        "id": "status.cannot_reblog"
+      },
+      {
+        "defaultMessage": "Favourite",
+        "id": "status.favourite"
+      },
+      {
+        "defaultMessage": "Reply",
+        "id": "confirmations.reply.confirm"
+      },
+      {
+        "defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+        "id": "confirmations.reply.message"
+      },
+      {
+        "defaultMessage": "Expand this status",
+        "id": "status.open"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/picture_in_picture/components/footer.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Close",
+        "id": "lightbox.close"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/picture_in_picture/components/header.json"
+  },
   {
     "descriptors": [
       {
@@ -2421,7 +2591,7 @@
         "id": "status.reblog"
       },
       {
-        "defaultMessage": "Boost to original audience",
+        "defaultMessage": "Boost with original visibility",
         "id": "status.reblog_private"
       },
       {
@@ -2619,15 +2789,6 @@
     ],
     "path": "app/javascript/mastodon/features/status/index.json"
   },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "View context",
-        "id": "lightbox.view_context"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/audio_modal.json"
-  },
   {
     "descriptors": [
       {
@@ -2785,6 +2946,14 @@
         "defaultMessage": "Describe for the visually impaired",
         "id": "upload_form.description"
       },
+      {
+        "defaultMessage": "Analyzing pictureâ€¦",
+        "id": "upload_modal.analyzing_picture"
+      },
+      {
+        "defaultMessage": "Preparing OCRâ€¦",
+        "id": "upload_modal.preparing_ocr"
+      },
       {
         "defaultMessage": "Edit media",
         "id": "upload_modal.edit_media"
@@ -2797,10 +2966,6 @@
         "defaultMessage": "Change thumbnail",
         "id": "upload_form.thumbnail"
       },
-      {
-        "defaultMessage": "Analyzing pictureâ€¦",
-        "id": "upload_modal.analyzing_picture"
-      },
       {
         "defaultMessage": "Detect text from picture",
         "id": "upload_modal.detect_text"
@@ -2887,16 +3052,28 @@
       {
         "defaultMessage": "Next",
         "id": "lightbox.next"
-      },
-      {
-        "defaultMessage": "View context",
-        "id": "lightbox.view_context"
       }
     ],
     "path": "app/javascript/mastodon/features/ui/components/media_modal.json"
   },
   {
     "descriptors": [
+      {
+        "defaultMessage": "{number, plural, one {# minute} other {# minutes}}",
+        "id": "intervals.full.minutes"
+      },
+      {
+        "defaultMessage": "{number, plural, one {# hour} other {# hours}}",
+        "id": "intervals.full.hours"
+      },
+      {
+        "defaultMessage": "{number, plural, one {# day} other {# days}}",
+        "id": "intervals.full.days"
+      },
+      {
+        "defaultMessage": "Indefinite",
+        "id": "mute_modal.indefinite"
+      },
       {
         "defaultMessage": "Are you sure you want to mute {name}?",
         "id": "confirmations.mute.message"
@@ -2909,6 +3086,10 @@
         "defaultMessage": "Hide notifications from this user?",
         "id": "mute_modal.hide_notifications"
       },
+      {
+        "defaultMessage": "Duration",
+        "id": "mute_modal.duration"
+      },
       {
         "defaultMessage": "Cancel",
         "id": "confirmation_modal.cancel"
@@ -3039,11 +3220,15 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "View context",
-        "id": "lightbox.view_context"
+        "defaultMessage": "Compress image view box",
+        "id": "lightbox.compress"
+      },
+      {
+        "defaultMessage": "Expand image view box",
+        "id": "lightbox.expand"
       }
     ],
-    "path": "app/javascript/mastodon/features/ui/components/video_modal.json"
+    "path": "app/javascript/mastodon/features/ui/components/zoomable_image.json"
   },
   {
     "descriptors": [
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 74b3e1c9a03e80bbba99b151f89c42c931c61b3c..7b73731659ad305d697fd0315c35f4a5adcb2900 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -9,14 +9,16 @@
   "account.browse_more_on_origin_server": "Î”ÎµÏ‚ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ± ÏƒÏ„Î¿ Î±ÏÏ‡Î¹ÎºÏŒ Ï€ÏÎ¿Ï†Î¯Î»",
   "account.cancel_follow_request": "Î‘ÎºÏÏÏ‰ÏƒÎ· Î±Î¹Ï„Î®Î¼Î±Ï„Î¿Ï‚ Ï€Î±ÏÎ±ÎºÎ¿Î»Î¿ÏÎ¸Î·ÏƒÎ·Ï‚",
   "account.direct": "Î ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÏŒ Î¼Î®Î½Ï…Î¼Î± Ï€ÏÎ¿Ï‚ @{name}",
+  "account.disable_notifications": "Î”Î¹Î±ÎºÎ¿Ï€Î® ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ‰Î½ Î³Î¹Î± Ï„Î¹Ï‚ Î´Î·Î¼Î¿ÏƒÎ¹ÎµÏÏƒÎµÎ¹Ï‚ Ï„Î¿Ï…/Ï„Î·Ï‚ @{name}",
   "account.domain_blocked": "ÎšÏÏ…Î¼Î¼ÎÎ½Î¿Ï‚ Ï„Î¿Î¼ÎÎ±Ï‚",
   "account.edit_profile": "Î•Ï€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î± Ï€ÏÎ¿Ï†Î¯Î»",
+  "account.enable_notifications": "ÎˆÎ½Î±ÏÎ¾Î· ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ‰Î½ Î³Î¹Î± Ï„Î¹Ï‚ Î´Î·Î¼Î¿ÏƒÎ¹ÎµÏÏƒÎµÎ¹Ï‚ Ï„Î¿Ï…/Ï„Î·Ï‚ @{name}",
   "account.endorse": "Î ÏÎ¿Î²Î¿Î»Î® ÏƒÏ„Î¿ Ï€ÏÎ¿Ï†Î¯Î»",
   "account.follow": "Î‘ÎºÎ¿Î»Î¿ÏÎ¸Î·ÏƒÎµ",
   "account.followers": "Î‘ÎºÏŒÎ»Î¿Ï…Î¸Î¿Î¹",
   "account.followers.empty": "ÎšÎ±Î½ÎµÎ¯Ï‚ Î´ÎµÎ½ Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯ Î±Ï…Ï„ÏŒ Ï„Î¿Î½ Ï‡ÏÎ®ÏƒÏ„Î· Î±ÎºÏŒÎ¼Î±.",
   "account.followers_counter": "{count, plural, one {{counter} Î‘ÎºÏŒÎ»Î¿Ï…Î¸Î¿Ï‚} other {{counter} Î‘ÎºÏŒÎ»Î¿Ï…Î¸Î¿Î¹}}",
-  "account.following_counter": "{count, plural, one {} other {{counter} Î‘ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯}}",
+  "account.following_counter": "{count, plural, other {{counter} Î‘ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯}}",
   "account.follows.empty": "Î‘Ï…Ï„ÏŒÏ‚ Î¿ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ Î´ÎµÎ½ Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯ ÎºÎ±Î½ÎÎ½Î±Î½ Î±ÎºÏŒÎ¼Î±.",
   "account.follows_you": "Î£Îµ Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯",
   "account.hide_reblogs": "Î‘Ï€ÏŒÎºÏÏ…ÏˆÎ· Ï€ÏÎ¿Ï‰Î¸Î®ÏƒÎµÏ‰Î½ Î±Ï€ÏŒ @{name}",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Î‘Ï€Î¿Ï„ÎµÎ»ÎÏƒÎ¼Î±Ï„Î± Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·Ï‚",
   "emoji_button.symbols": "Î£ÏÎ¼Î²Î¿Î»Î±",
   "emoji_button.travel": "Î¤Î±Î¾Î¯Î´Î¹Î± & Î¤Î¿Ï€Î¿Î¸ÎµÏƒÎ¯ÎµÏ‚",
+  "empty_column.account_suspended": "Î›Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ ÏƒÎµ Î±Î½Î±ÏƒÏ„Î¿Î»Î®",
   "empty_column.account_timeline": "Î”ÎµÎ½ ÎÏ‡ÎµÎ¹ Ï„Î¿Ï…Ï„ ÎµÎ´ÏŽ!",
   "empty_column.account_unavailable": "ÎœÎ· Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î¿ Ï€ÏÎ¿Ï†Î¯Î»",
   "empty_column.blocks": "Î”ÎµÎ½ ÎÏ‡ÎµÎ¹Ï‚ Î±Ï€Î¿ÎºÎ»ÎµÎ¯ÏƒÎµÎ¹ ÎºÎ±Î½ÎÎ½Î±Î½ Ï‡ÏÎ®ÏƒÏ„Î· Î±ÎºÏŒÎ¼Î±.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Î”ÎµÎ½ ÎÏ‡ÎµÎ¹Ï‚ ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ Î±ÎºÏŒÎ¼Î±. Î‘Î»Î»Î·Î»ÎµÏ€Î¯Î´ÏÎ±ÏƒÎµ Î¼Îµ Î¬Î»Î»Î¿Ï…Ï‚ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Î³Î¹Î± Î½Î± Î¾ÎµÎºÎ¹Î½Î®ÏƒÎµÎ¹Ï‚ Ï„Î·Î½ ÎºÎ¿Ï…Î²ÎÎ½Ï„Î±.",
   "empty_column.public": "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Ï„Î¯Ï€Î¿Ï„Î± ÎµÎ´ÏŽ! Î“ÏÎ¬ÏˆÎµ ÎºÎ¬Ï„Î¹ Î´Î·Î¼ÏŒÏƒÎ¹Î¿, Î® Î±ÎºÎ¿Î»Î¿ÏÎ¸Î·ÏƒÎµ Ï‡ÎµÎ¹ÏÎ¿ÎºÎ¯Î½Î·Ï„Î± Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Î±Ï€ÏŒ Î¬Î»Î»Î¿Ï…Ï‚ ÎºÏŒÎ¼Î²Î¿Ï…Ï‚ Î³Î¹Î± Î½Î± Ï„Î· Î³ÎµÎ¼Î¯ÏƒÎµÎ¹Ï‚",
   "error.unexpected_crash.explanation": "Î•Î¯Ï„Îµ Î»ÏŒÎ³Ï‰ Î»Î¬Î¸Î¿Ï…Ï‚ ÏƒÏ„Î¿Î½ ÎºÏŽÎ´Î¹ÎºÎ¬ Î¼Î±Ï‚ Î® Î»ÏŒÎ³Ï‰ Î±ÏƒÏ…Î¼Î²Î±Ï„ÏŒÏ„Î·Ï„Î±Ï‚ Î¼Îµ Ï„Î¿Î½ browser, Î· ÏƒÎµÎ»Î¯Î´Î± Î´Îµ Î¼Ï€ÏŒÏÎµÏƒÎµ Î½Î± ÎµÎ¼Ï†Î±Î½Î¹ÏƒÏ„ÎµÎ¯ ÏƒÏ‰ÏƒÏ„Î¬.",
+  "error.unexpected_crash.explanation_addons": "Î— ÏƒÎµÎ»Î¯Î´Î± Î´ÎµÎ½ Î¼Ï€ÏŒÏÎµÏƒÎµ Î½Î± ÎµÎ¼Ï†Î±Î½Î¹ÏƒÏ„ÎµÎ¯ ÏƒÏ‰ÏƒÏ„Î¬. Î¤Î¿ Ï€ÏÏŒÎ²Î»Î·Î¼Î± Î¿Ï†ÎµÎ¯Î»ÎµÏ„Î±Î¹ Ï€Î¹Î¸Î±Î½ÏŒÎ½ ÏƒÎµ ÎºÎ¬Ï€Î¿Î¹Î± ÎµÏ€ÎÎºÏ„Î±ÏƒÎ· Ï„Î¿Ï… Ï†Ï…Î»Î»Î¿Î¼ÎµÏ„ÏÎ·Ï„Î® (browser extension) Î® ÏƒÎµ ÎºÎ¬Ï€Î¿Î¹Î¿ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î¿ ÎµÏÎ³Î±Î»ÎµÎ¯Î¿ Î¼ÎµÏ„Î¬Ï†ÏÎ±ÏƒÎ·Ï‚.",
   "error.unexpected_crash.next_steps": "Î”Î¿ÎºÎ¯Î¼Î±ÏƒÎµ Î½Î± Î±Î½Î±Î½ÎµÏŽÏƒÎµÎ¹Ï‚ Ï„Î· ÏƒÎµÎ»Î¯Î´Î±. Î‘Î½ Î±Ï…Ï„ÏŒ Î´Îµ Î²Î¿Î·Î¸Î®ÏƒÎµÎ¹, Î¯ÏƒÏ‰Ï‚ Î½Î± Î¼Ï€Î¿ÏÎÏƒÎµÎ¹Ï‚ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ Ï„Î¿ Mastodon Î¼ÎÏƒÏ‰ Î´Î¹Î±Ï†Î¿ÏÎµÏ„Î¹ÎºÎ¿Ï browser Î® ÎºÎ¬Ï€Î¿Î¹Î±Ï‚ ÎµÏ†Î±ÏÎ¼Î¿Î³Î®Ï‚.",
+  "error.unexpected_crash.next_steps_addons": "Î”Î¿ÎºÎ¯Î¼Î±ÏƒÎµ Î½Î± Ï„Î± Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ ÎºÎ±Î¹ Î±Î½Î±Î½ÎÏ‰ÏƒÎµ Ï„Î· ÏƒÎµÎ»Î¯Î´Î±. Î‘Î½ Î±Ï…Ï„ÏŒ Î´ÎµÎ½ Î²Î¿Î·Î¸Î®ÏƒÎµÎ¹, Î¯ÏƒÏ‰Ï‚ Î½Î± Î¼Ï€Î¿ÏÎÏƒÎµÎ¹Ï‚ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ Ï„Î¿ Mastodon Î¼ÎÏƒÏ‰ Î´Î¹Î±Ï†Î¿ÏÎµÏ„Î¹ÎºÎ¿Ï Ï†Ï…Î»Î»Î¿Î¼ÎµÏ„ÏÎ·Ï„Î® Î® ÎºÎ¬Ï€Î¿Î¹Î±Ï‚ ÎµÏ†Î±ÏÎ¼Î¿Î³Î®Ï‚.",
   "errors.unexpected_crash.copy_stacktrace": "Î‘Î½Ï„Î¹Î³ÏÎ±Ï†Î® Î¼Î·Î½Ï…Î¼Î¬Ï„Ï‰Î½ ÎºÏŽÎ´Î¹ÎºÎ± ÏƒÏ„Î¿ Ï€ÏÏŒÏ‡ÎµÎ¹ÏÎ¿",
   "errors.unexpected_crash.report_issue": "Î‘Î½Î±Ï†Î¿ÏÎ¬ Ï€ÏÎ¿Î²Î»Î®Î¼Î±Ï„Î¿Ï‚",
   "follow_request.authorize": "Î•Î½ÎÎºÏÎ¹Î½Îµ",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "Î±Ï€Î¿-ÎµÏƒÏ„Î¯Î±ÏƒÎ· Ï„Î¿Ï… Ï€ÎµÎ´Î¯Î¿Ï… ÏƒÏÎ½Î¸ÎµÏƒÎ·Ï‚/Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·Ï‚",
   "keyboard_shortcuts.up": "ÎºÎ¯Î½Î·ÏƒÎ· Ï€ÏÎ¿Ï‚ Ï„Î·Î½ ÎºÎ¿ÏÏ…Ï†Î® Ï„Î·Ï‚ Î»Î¯ÏƒÏ„Î±Ï‚",
   "lightbox.close": "ÎšÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿",
+  "lightbox.compress": "Î£Ï…Î¼Ï€Î¯ÎµÏƒÎ· Ï€Î»Î±Î¹ÏƒÎ¯Î¿Ï… ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚ ÎµÎ¹ÎºÏŒÎ½Î±Ï‚",
+  "lightbox.expand": "Î‘Î½Î¬Ï€Ï„Ï…Î¾Î· Ï€Î»Î±Î¹ÏƒÎ¯Î¿Ï… ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚ ÎµÎ¹ÎºÏŒÎ½Î±Ï‚",
   "lightbox.next": "Î•Ï€ÏŒÎ¼ÎµÎ½Î¿",
   "lightbox.previous": "Î ÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î¿",
-  "lightbox.view_context": "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï€Î»Î±Î¹ÏƒÎ¯Î¿Ï…",
   "lists.account.add": "Î ÏÏŒÏƒÎ¸ÎµÏƒÎµ ÏƒÏ„Î· Î»Î¯ÏƒÏ„Î±",
   "lists.account.remove": "Î’Î³Î¬Î»Îµ Î±Ï€ÏŒ Ï„Î· Î»Î¯ÏƒÏ„Î±",
   "lists.delete": "Î”Î¹Î±Î³ÏÎ±Ï†Î® Î»Î¯ÏƒÏ„Î±Ï‚",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Î‘Î»Î»Î±Î³Î® Ï„Î¯Ï„Î»Î¿Ï…",
   "lists.new.create": "Î ÏÎ¿ÏƒÎ¸Î®ÎºÎ· Î»Î¯ÏƒÏ„Î±Ï‚",
   "lists.new.title_placeholder": "Î¤Î¯Ï„Î»Î¿Ï‚ Î½ÎÎ±Ï‚ Î»Î¯ÏƒÏ„Î±",
+  "lists.replies_policy.followed": "ÎŸÏ€Î¿Î¹Î¿ÏƒÎ´Î®Ï€Î¿Ï„Îµ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ Ï€Î¿Ï… Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯Ï‚",
+  "lists.replies_policy.list": "ÎœÎÎ»Î· Ï„Î·Ï‚ Î»Î¯ÏƒÏ„Î±Ï‚",
+  "lists.replies_policy.none": "ÎšÎ±Î½ÎÎ½Î±Ï‚",
+  "lists.replies_policy.title": "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Î±Ï€Î±Î½Ï„Î®ÏƒÎµÏ‰Î½ ÏƒÎµ:",
   "lists.search": "Î‘Î½Î±Î¶Î®Ï„Î·ÏƒÎµ Î¼ÎµÏ„Î±Î¾Ï Ï„Ï‰Î½ Î±Î½Î¸ÏÏŽÏ€Ï‰Î½ Ï€Î¿Ï… Î±ÎºÎ¿Ï…Î»Î¿Ï…Î¸ÎµÎ¯Ï‚",
   "lists.subheading": "ÎŸÎ¹ Î»Î¯ÏƒÏ„ÎµÏ‚ ÏƒÎ¿Ï…",
   "load_pending": "{count, plural, one {# Î½ÎÎ¿} other {# Î½ÎÎ±}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Î•Î½Î±Î»Î»Î±Î³Î® Î¿ÏÎ±Ï„ÏŒÏ„Î·Ï„Î±Ï‚",
   "missing_indicator.label": "Î”Îµ Î²ÏÎÎ¸Î·ÎºÎµ",
   "missing_indicator.sublabel": "Î‘Î´ÏÎ½Î±Ï„Î· Î· ÎµÏÏÎµÏƒÎ· Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Ï€ÏŒÏÎ¿Ï…",
+  "mute_modal.duration": "Î”Î¹Î¬ÏÎºÎµÎ¹Î±",
   "mute_modal.hide_notifications": "Î‘Ï€ÏŒÎºÏÏ…ÏˆÎ· ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ‰Î½ Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î·;",
+  "mute_modal.indefinite": "Î‘ÏŒÏÎ¹ÏƒÏ„Î·",
   "navigation_bar.apps": "Î•Ï†Î±ÏÎ¼Î¿Î³ÎÏ‚ Ï†Î¿ÏÎ·Ï„ÏŽÎ½ ÏƒÏ…ÏƒÎºÎµÏ…ÏŽÎ½",
   "navigation_bar.blocks": "Î‘Ï€Î¿ÎºÎ»ÎµÎ¹ÏƒÎ¼ÎÎ½Î¿Î¹ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚",
   "navigation_bar.bookmarks": "Î£ÎµÎ»Î¹Î´Î¿Î´ÎµÎ¯ÎºÏ„ÎµÏ‚",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Î— ÏˆÎ·Ï†Î¿Ï†Î¿ÏÎ¯Î± ÏƒÎ¿Ï… ÎÎ»Î·Î¾Îµ",
   "notification.poll": "Î¤ÎµÎ»ÎµÎ¯Ï‰ÏƒÎµ Î¼Î¹Î± Î±Ï€ÏŒ Ï„Î¹Ï‚ ÏˆÎ·Ï†Î¿Ï†Î¿ÏÎ¯ÎµÏ‚ Ï€Î¿Ï… ÏƒÏ…Î¼Î¼ÎµÏ„ÎµÎ¯Ï‡ÎµÏ‚",
   "notification.reblog": "ÎŸ/Î— {name} Ï€ÏÎ¿ÏŽÎ¸Î·ÏƒÎµ Ï„Î·Î½ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ® ÏƒÎ¿Ï…",
+  "notification.status": "ÎŸ/Î— {name} Î¼ÏŒÎ»Î¹Ï‚ ÎÎ³ÏÎ±ÏˆÎµ ÎºÎ¬Ï„Î¹",
   "notifications.clear": "ÎšÎ±Î¸Î±ÏÎ¹ÏƒÎ¼ÏŒÏ‚ ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ‰Î½",
   "notifications.clear_confirmation": "Î£Î¯Î³Î¿Ï…ÏÎ± Î¸ÎÎ»ÎµÎ¹Ï‚ Î½Î± ÎºÎ±Î¸Î±ÏÎ¯ÏƒÎµÎ¹Ï‚ ÏŒÎ»ÎµÏ‚ Ï„Î¹Ï‚ ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ ÏƒÎ¿Ï…;",
   "notifications.column_settings.alert": "Î•Î¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ ÎµÏ€Î¹Ï†Î¬Î½ÎµÎ¹Î±Ï‚ ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Î ÏÎ¿Ï‰Î¸Î®ÏƒÎµÎ¹Ï‚:",
   "notifications.column_settings.show": "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎµ ÏƒÎµ ÏƒÏ„Î®Î»Î·",
   "notifications.column_settings.sound": "Î—Ï‡Î·Ï„Î¹ÎºÎ® ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·",
+  "notifications.column_settings.status": "ÎÎÎ± Ï„Î¿Ï…Ï„:",
   "notifications.filter.all": "ÎŒÎ»ÎµÏ‚",
   "notifications.filter.boosts": "Î ÏÎ¿Ï‰Î¸Î®ÏƒÎµÎ¹Ï‚",
   "notifications.filter.favourites": "Î‘Î³Î±Ï€Î·Î¼ÎÎ½Î±",
   "notifications.filter.follows": "Î‘ÎºÏŒÎ»Î¿Ï…Î¸Î¿Î¹",
   "notifications.filter.mentions": "Î‘Î½Î±Ï†Î¿ÏÎÏ‚",
   "notifications.filter.polls": "Î‘Ï€Î¿Ï„ÎµÎ»ÎÏƒÎ¼Î±Ï„Î± ÏˆÎ·Ï†Î¿Ï†Î¿ÏÎ¯Î±Ï‚",
+  "notifications.filter.statuses": "Î•Î½Î·Î¼ÎµÏÏŽÏƒÎµÎ¹Ï‚ Î±Ï€ÏŒ ÏŒÏƒÎ¿Ï…Ï‚ Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯Ï‚",
+  "notifications.grant_permission": "Î§Î¿ÏÎ®Î³Î·ÏƒÎ· Î¬Î´ÎµÎ¹Î±Ï‚.",
   "notifications.group": "{count} ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚",
+  "notifications.mark_as_read": "Î£Î·Î¼ÎµÎ¯Ï‰ÏƒÎµ ÏŒÎ»ÎµÏ‚ Ï„Î¹Ï‚ ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ Ï‰Ï‚ Î±Î½Î±Î³Î½Ï‰ÏƒÎ¼ÎÎ½ÎµÏ‚",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "ÎŸÎ¹ ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼ÎµÏ‚ ÎµÏ€ÎµÎ¹Î´Î® Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î´Î¿Î¸ÎµÎ¯ Î· Î±Ï€Î±Î¹Ï„Î¿ÏÎ¼ÎµÎ½Î· Î¬Î´ÎµÎ¹Î±.",
+  "notifications_permission_banner.enable": "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ‰Î½ ÎµÏ€Î¹Ï†Î¬Î½ÎµÎ¹Î±Ï‚ ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚",
+  "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.title": "ÎœÎ· Ï‡Î¬ÏƒÎµÏ„Îµ Ï„Î¯Ï€Î¿Ï„Î±",
+  "picture_in_picture.restore": "Î•Ï€Î±Î½Î±Ï†Î¿ÏÎ¬",
   "poll.closed": "ÎšÎ»ÎµÎ¹ÏƒÏ„Î®",
   "poll.refresh": "Î‘Î½Î±Î½ÎÏ‰ÏƒÎ·",
   "poll.total_people": "{count, plural, one {# Î¬Ï„Î¿Î¼Î¿} other {# Î¬Ï„Î¿Î¼Î±}}",
@@ -388,7 +412,7 @@
   "status.pin": "ÎšÎ±ÏÏ†Î¯Ï„ÏƒÏ‰ÏƒÎµ ÏƒÏ„Î¿ Ï€ÏÎ¿Ï†Î¯Î»",
   "status.pinned": "ÎšÎ±ÏÏ†Î¹Ï„ÏƒÏ‰Î¼ÎÎ½Î¿ Ï„Î¿Ï…Ï„",
   "status.read_more": "Î ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ±",
-  "status.reblog": "Î ÏÎ¿ÏŽÎ¸Î·ÏƒÎµ",
+  "status.reblog": "Î ÏÎ¿ÏŽÎ¸Î·ÏƒÎ·",
   "status.reblog_private": "Î ÏÎ¿ÏŽÎ¸Î·ÏƒÎµ ÏƒÏ„Î¿Ï…Ï‚ Î±ÏÏ‡Î¹ÎºÎ¿ÏÏ‚ Ï€Î±ÏÎ±Î»Î®Ï€Ï„ÎµÏ‚",
   "status.reblogged_by": "{name} Ï€ÏÎ¿ÏŽÎ¸Î·ÏƒÎµ",
   "status.reblogs.empty": "ÎšÎ±Î½ÎµÎ¯Ï‚ Î´ÎµÎ½ Ï€ÏÎ¿ÏŽÎ¸Î·ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ Ï„Î¿Ï…Ï„ Î±ÎºÏŒÎ¼Î±. ÎœÏŒÎ»Î¹Ï‚ Ï„Î¿ ÎºÎ¬Î½ÎµÎ¹ ÎºÎ¬Ï€Î¿Î¹Î±, Î¸Î± ÎµÎ¼Ï†Î±Î½Î¹ÏƒÏ„Î¿ÏÎ½ ÎµÎ´ÏŽ.",
@@ -430,7 +454,7 @@
   "units.short.million": "{count}Î•",
   "units.short.thousand": "{count}Î§",
   "upload_area.title": "Drag & drop Î³Î¹Î± Î½Î± Î±Î½ÎµÎ²Î¬ÏƒÎµÎ¹Ï‚",
-  "upload_button.label": "Î ÏÏŒÏƒÎ¸ÎµÏƒÎµ Ï€Î¿Î»Ï…Î¼ÎÏƒÎ± ({formats})",
+  "upload_button.label": "Î ÏÏŒÏƒÎ¸ÎµÏƒÎµ Ï€Î¿Î»Ï…Î¼ÎÏƒÎ±",
   "upload_error.limit": "Î¥Ï€ÎÏÎ²Î±ÏƒÎ· Î¿ÏÎ¯Î¿Ï… Î¼ÎµÎ³ÎÎ¸Î¿Ï…Ï‚ Î±Î½ÎµÎ²Î±ÏƒÎ¼ÎÎ½Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½.",
   "upload_error.poll": "Î£Ï„Î¹Ï‚ Î´Î·Î¼Î¿ÏƒÎºÎ¿Ï€Î®ÏƒÎµÎ¹Ï‚ Î´ÎµÎ½ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Î· Î¼ÎµÏ„Î±Ï†ÏŒÏÏ„Ï‰ÏƒÎ· Î±ÏÏ‡ÎµÎ¯Î¿Ï….",
   "upload_form.audio_description": "Î ÎµÏÎ¹Î³ÏÎ±Ï†Î® Î³Î¹Î± Î¬Ï„Î¿Î¼Î± Î¼Îµ Ï€ÏÎ¿Î²Î»Î®Î¼Î±Ï„Î± Î±ÎºÎ¿Î®Ï‚",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Î‘Î½Î±Î³Î½ÏŽÏÎ¹ÏƒÎ· ÎºÎµÎ¹Î¼ÎÎ½Î¿Ï… Î±Ï€ÏŒ Ï„Î·Î½ ÎµÎ¹ÎºÏŒÎ½Î±",
   "upload_modal.edit_media": "Î•Ï€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î± Î Î¿Î»Ï…Î¼ÎÏƒÏ‰Î½",
   "upload_modal.hint": "ÎšÎ¬Î½Îµ ÎºÎ»Î¹Îº Î® ÏƒÎµÎ¯ÏÎµ Ï„Î¿Î½ ÎºÏÎºÎ»Î¿ ÏƒÏ„Î·Î½ Ï€ÏÎ¿ÎµÏ€Î¹ÏƒÎºÏŒÏ€Î·ÏƒÎ· Î³Î¹Î± Î½Î± ÎµÏ€Î¹Î»ÎÎ¾ÎµÎ¹Ï‚ Ï„Î¿ ÏƒÎ·Î¼ÎµÎ¯Î¿ ÎµÏƒÏ„Î¯Î±ÏƒÎ·Ï‚ Ï€Î¿Ï… Î¸Î± ÎµÎ¯Î½Î±Î¹ Ï€Î¬Î½Ï„Î± ÎµÎ¼Ï†Î±Î½ÎÏ‚ ÏƒÎµ ÏŒÎ»ÎµÏ‚ Ï„Î¹Ï‚ Î¼Î¹ÎºÏÎ¿Î³ÏÎ±Ï†Î¯ÎµÏ‚.",
+  "upload_modal.preparing_ocr": "Î ÏÎ¿ÎµÏ„Î¿Î¹Î¼Î±ÏƒÎ¯Î± Î±Î½Î±Î³Î½ÏŽÏÎ¹ÏƒÎ·Ï‚ ÎºÎµÎ¹Î¼ÎÎ½Î¿Ï…â€¦",
   "upload_modal.preview_label": "Î ÏÎ¿ÎµÏ€Î¹ÏƒÎºÏŒÏ€Î·ÏƒÎ· ({ratio})",
   "upload_progress.label": "Î‘Î½ÎµÎ²Î±Î¯Î½ÎµÎ¹...",
   "video.close": "ÎšÎ»ÎµÎ¯ÏƒÎµ Ï„Î¿ Î²Î¯Î½Ï„ÎµÎ¿",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 381ff028bbaabd510dc2fb095e9c2152048a1386..3f8d3724929462886e0e1372494d3f5ce1062e9d 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Cancel follow request",
   "account.direct": "Direct message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain blocked",
   "account.edit_profile": "Edit profile",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
   "account.follow": "Follow",
   "account.followers": "Followers",
@@ -96,9 +98,9 @@
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "Write your warning here",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No toots here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "Authorize",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
-  "lightbox.view_context": "View context",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Change title",
   "lists.new.create": "Add list",
   "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Search among people you follow",
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your toot",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.alert": "Desktop notifications",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Closed",
   "poll.refresh": "Refresh",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -389,7 +413,7 @@
   "status.pinned": "Pinned toot",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploading...",
   "video.close": "Close video",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 88608339277959192a4979d8d4c8d2aea28091b5..5cff6c5af688c694e3411ba68f0164ddc465ac24 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -4,19 +4,21 @@
   "account.badges.bot": "Roboto",
   "account.badges.group": "Grupo",
   "account.block": "Bloki @{name}",
-  "account.block_domain": "KaÅi Ä‰ion de {domain}",
+  "account.block_domain": "Bloki {domain}",
   "account.blocked": "Blokita",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Rigardi pli al la originala profilo",
   "account.cancel_follow_request": "Nuligi peton de sekvado",
   "account.direct": "Rekte mesaÄi @{name}",
-  "account.domain_blocked": "Domajno kaÅita",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.domain_blocked": "Domajno blokita",
   "account.edit_profile": "Redakti profilon",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Montri en profilo",
   "account.follow": "Sekvi",
   "account.followers": "Sekvantoj",
   "account.followers.empty": "AnkoraÅ neniu sekvas tiun uzanton.",
   "account.followers_counter": "{count, plural, one{{counter} Sekvanto} other {{counter} Sekvantoj}}",
-  "account.following_counter": "{count, plural, other{{counter} Sekvi}}",
+  "account.following_counter": "{count, plural, one {{counter} Sekvato} other {{counter} Sekvatoj}}",
   "account.follows.empty": "Tiu uzanto ankoraÅ ne sekvas iun.",
   "account.follows_you": "Sekvas vin",
   "account.hide_reblogs": "KaÅi diskonigojn de @{name}",
@@ -36,14 +38,14 @@
   "account.requested": "Atendo de aprobo. Alklaku por nuligi peton de sekvado",
   "account.share": "Diskonigi la profilon de @{name}",
   "account.show_reblogs": "Montri diskonigojn de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Tooto} other {{counter} Tootoj}}",
+  "account.statuses_counter": "{count, plural, one {{counter} MesaÄo} other {{counter} MesaÄoj}}",
   "account.unblock": "Malbloki @{name}",
-  "account.unblock_domain": "MalkaÅi {domain}",
+  "account.unblock_domain": "Malbloki {domain}",
   "account.unendorse": "Ne montri en profilo",
   "account.unfollow": "Ne plu sekvi",
   "account.unmute": "Malsilentigi @{name}",
   "account.unmute_notifications": "Malsilentigi sciigojn de @{name}",
-  "account_note.placeholder": "Click to add a note",
+  "account_note.placeholder": "Alklaku por aldoni noton",
   "alert.rate_limited.message": "Bonvolu reprovi post {retry_time, time, medium}.",
   "alert.rate_limited.title": "MesaÄkvante limigita",
   "alert.unexpected.message": "Neatendita eraro okazis.",
@@ -62,7 +64,7 @@
   "column.community": "Loka tempolinio",
   "column.direct": "Rektaj mesaÄoj",
   "column.directory": "Trarigardi profilojn",
-  "column.domain_blocks": "KaÅitaj domajnoj",
+  "column.domain_blocks": "Blokitaj domajnoj",
   "column.favourites": "Stelumoj",
   "column.follow_requests": "Petoj de sekvado",
   "column.home": "Hejmo",
@@ -110,7 +112,7 @@
   "confirmations.delete.message": "Äˆu vi certas, ke vi volas forigi Ä‰i tiun mesaÄon?",
   "confirmations.delete_list.confirm": "Forigi",
   "confirmations.delete_list.message": "Äˆu vi certas, ke vi volas porÄ‰iame forigi Ä‰i tiun liston?",
-  "confirmations.domain_block.confirm": "KaÅi la tutan domajnon",
+  "confirmations.domain_block.confirm": "Bloki la tutan domajnon",
   "confirmations.domain_block.message": "Äˆu vi vere, vere certas, ke vi volas tute bloki {domain}? Plej ofte, trafa blokado kaj silentigado sufiÄ‰as kaj preferindas. Vi ne vidos enhavon de tiu domajno en publika tempolinio aÅ en viaj sciigoj. Viaj sekvantoj de tiu domajno estos forigitaj.",
   "confirmations.logout.confirm": "Elsaluti",
   "confirmations.logout.message": "Äˆu vi certas ke vi volas elsaluti?",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "SerÄ‰aj rezultoj",
   "emoji_button.symbols": "Simboloj",
   "emoji_button.travel": "VojaÄoj kaj lokoj",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Neniu mesaÄo Ä‰i tie!",
   "empty_column.account_unavailable": "Profilo ne disponebla",
   "empty_column.blocks": "Vi ankoraÅ ne blokis uzanton.",
@@ -166,12 +169,14 @@
   "empty_column.notifications": "Vi ankoraÅ ne havas sciigojn. Interagu kun aliaj por komenci konversacion.",
   "empty_column.public": "Estas nenio Ä‰i tie! Publike skribu ion, aÅ mane sekvu uzantojn de aliaj serviloj por plenigi la publikan tempolinion",
   "error.unexpected_crash.explanation": "Pro eraro en nia kodo, aÅ problemo de kongruo en via retumilo, Ä‰i tiu paÄo ne povis esti montrata Äuste.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Provu refreÅigi la paÄon. Se tio ne helpas, vi ankoraÅ povus uzi Mastodon per malsama retumilo aÅ operaciuma aplikajo.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Kopii stakspuron en tondujo",
   "errors.unexpected_crash.report_issue": "Raporti problemon",
   "follow_request.authorize": "Rajtigi",
   "follow_request.reject": "Rifuzi",
-  "follow_requests.unlocked_explanation": "137/5000\nKvankam via konto ne estas Ålosita, la dungitaro de {domain} opiniis, ke vi eble volus revizii petojn de sekvadon el Ä‰i tiuj kontoj permane.",
+  "follow_requests.unlocked_explanation": "Kvankam via konto ne estas Ålosita, la dungitaro de {domain} opiniis, ke vi eble volus revizii petojn de sekvadon el Ä‰i tiuj kontoj permane.",
   "generic.saved": "Konservita",
   "getting_started.developers": "Programistoj",
   "getting_started.directory": "Profilujo",
@@ -232,7 +237,7 @@
   "keyboard_shortcuts.hotkey": "Rapidklavo",
   "keyboard_shortcuts.legend": "montri Ä‰i tiun noton",
   "keyboard_shortcuts.local": "malfermi la lokan tempolinion",
-  "keyboard_shortcuts.mention": "por mencii la aÅtoron",
+  "keyboard_shortcuts.mention": "mencii la aÅtoron",
   "keyboard_shortcuts.muted": "malfermi la liston de silentigitaj uzantoj",
   "keyboard_shortcuts.my_profile": "malfermi vian profilon",
   "keyboard_shortcuts.notifications": "malfermi la kolumnon de sciigoj",
@@ -242,7 +247,7 @@
   "keyboard_shortcuts.reply": "respondi",
   "keyboard_shortcuts.requests": "malfermi la liston de petoj de sekvado",
   "keyboard_shortcuts.search": "enfokusigi la serÄ‰ilon",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "montri/kaÅi la kampon de enhava averto",
   "keyboard_shortcuts.start": "malfermi la kolumnon Â«por komenciÂ»",
   "keyboard_shortcuts.toggle_hidden": "montri/kaÅi tekston malantaÅ enhava averto",
   "keyboard_shortcuts.toggle_sensitivity": "montri/kaÅi aÅdovidaÄµojn",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "malenfokusigi la tekstujon aÅ la serÄ‰ilon",
   "keyboard_shortcuts.up": "iri supren en la listo",
   "lightbox.close": "Fermi",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Sekva",
   "lightbox.previous": "AntaÅa",
-  "lightbox.view_context": "Vidi kuntekston",
   "lists.account.add": "Aldoni al la listo",
   "lists.account.remove": "Forigi de la listo",
   "lists.delete": "Forigi la liston",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "ÅœanÄi titolon",
   "lists.new.create": "Aldoni liston",
   "lists.new.title_placeholder": "Titolo de la nova listo",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Montri respondon al:",
   "lists.search": "SerÄ‰i inter la homoj, kiujn vi sekvas",
   "lists.subheading": "Viaj listoj",
   "load_pending": "{count,plural, one {# nova elemento} other {# novaj elementoj}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Baskuligi videblecon",
   "missing_indicator.label": "Ne trovita",
   "missing_indicator.sublabel": "Äˆi tiu elemento ne estis trovita",
+  "mute_modal.duration": "DaÅro",
   "mute_modal.hide_notifications": "Äˆu vi volas kaÅi la sciigojn de Ä‰i tiu uzanto?",
+  "mute_modal.indefinite": "Nedifinita",
   "navigation_bar.apps": "Telefonaj aplikaÄµoj",
   "navigation_bar.blocks": "Blokitaj uzantoj",
   "navigation_bar.bookmarks": "Legosignoj",
@@ -275,7 +287,7 @@
   "navigation_bar.compose": "Skribi novan mesaÄon",
   "navigation_bar.direct": "Rektaj mesaÄoj",
   "navigation_bar.discover": "Esplori",
-  "navigation_bar.domain_blocks": "KaÅitaj domajnoj",
+  "navigation_bar.domain_blocks": "Blokitaj domajnoj",
   "navigation_bar.edit_profile": "Redakti profilon",
   "navigation_bar.favourites": "Stelumoj",
   "navigation_bar.filters": "Silentigitaj vortoj",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Via balotenketo finiÄitis",
   "notification.poll": "Partoprenita balotenketo finiÄis",
   "notification.reblog": "{name} diskonigis vian mesaÄon",
+  "notification.status": "{name} Äµus afiÅita",
   "notifications.clear": "ForviÅi sciigojn",
   "notifications.clear_confirmation": "Äˆu vi certas, ke vi volas porÄ‰iame forviÅi Ä‰iujn viajn sciigojn?",
   "notifications.column_settings.alert": "Retumilaj sciigoj",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Diskonigoj:",
   "notifications.column_settings.show": "Montri en kolumno",
   "notifications.column_settings.sound": "Eligi sonon",
+  "notifications.column_settings.status": "Novaj mesaÄoj:",
   "notifications.filter.all": "Äˆiuj",
   "notifications.filter.boosts": "Diskonigoj",
   "notifications.filter.favourites": "Stelumoj",
   "notifications.filter.follows": "Sekvoj",
   "notifications.filter.mentions": "Mencioj",
   "notifications.filter.polls": "Balotenketaj rezultoj",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} sciigoj",
+  "notifications.mark_as_read": "Marki Ä‰iujn sciigojn legita",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Ebligi retumilajn sciigojn",
+  "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.title": "Neniam preterlasas iun ajn",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Finita",
   "poll.refresh": "Aktualigi",
   "poll.total_people": "{count, plural, one {# homo} other {# homoj}}",
@@ -329,13 +353,13 @@
   "poll_button.add_poll": "Aldoni balotenketon",
   "poll_button.remove_poll": "Forigi balotenketon",
   "privacy.change": "Agordi mesaÄan privatecon",
-  "privacy.direct.long": "AfiÅi nur al menciitaj uzantoj",
+  "privacy.direct.long": "Videbla nur al menciitaj uzantoj",
   "privacy.direct.short": "Rekta",
-  "privacy.private.long": "AfiÅi nur al sekvantoj",
-  "privacy.private.short": "Nur por sekvantoj",
-  "privacy.public.long": "AfiÅi en publikaj tempolinioj",
+  "privacy.private.long": "Videbla nur al viaj sekvantoj",
+  "privacy.private.short": "Nur al sekvantoj",
+  "privacy.public.long": "Videbla al Ä‰iuj, afiÅita en publikaj tempolinioj",
   "privacy.public.short": "Publika",
-  "privacy.unlisted.long": "Ne afiÅi en publikaj tempolinioj",
+  "privacy.unlisted.long": "Videbla al Ä‰iuj, sed ne en publikaj tempolinioj",
   "privacy.unlisted.short": "Nelistigita",
   "refresh": "RefreÅigu",
   "regeneration_indicator.label": "Åœargadoâ€¦",
@@ -422,11 +446,11 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
   "timeline_hint.resources.followers": "Sekvantoj",
   "timeline_hint.resources.follows": "Sekvatoj",
-  "timeline_hint.resources.statuses": "Pli malnovaj tootoj",
+  "timeline_hint.resources.statuses": "Pli malnovaj mesaÄoj",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persono} other {{counter} personoj}} parolante",
   "trends.trending_now": "Nunaj furoraÄµoj",
   "ui.beforeunload": "Via malneto perdiÄos se vi eliras de Mastodon.",
-  "units.short.billion": "{count}B",
+  "units.short.billion": "{count}Md",
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "Altreni kaj lasi por alÅuti",
@@ -441,11 +465,12 @@
   "upload_form.video_description": "Priskribi por homoj kiuj malfacile aÅdi aÅ vidi",
   "upload_modal.analyzing_picture": "Bilda analizadoâ€¦",
   "upload_modal.apply": "Apliki",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "Elekti bildon",
   "upload_modal.description_placeholder": "LaÅ Ludoviko Zamenhof bongustas freÅa Ä‰eÄ¥a manÄaÄµo kun spicoj",
   "upload_modal.detect_text": "Detekti tekston de la bildo",
   "upload_modal.edit_media": "Redakti aÅdovidaÄµon",
   "upload_modal.hint": "Klaku aÅ trenu la cirklon en la antaÅvidilo por elekti la fokuspunkton kiu Ä‰iam videblos en Ä‰iuj etigitaj bildoj.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "AntaÅvido ({ratio})",
   "upload_progress.label": "AlÅutadoâ€¦",
   "video.close": "Fermi la videon",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index fda38645541c06bf3f3e797c9d0ecdcd6e4c38f7..434382e204a7d6a08515c844a6f679f0c236168a 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -1,16 +1,18 @@
 {
-  "account.account_note_header": "Tu nota para @{name}",
+  "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Agregar o quitar de las listas",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupo",
   "account.block": "Bloquear a @{name}",
-  "account.block_domain": "Ocultar todo de {domain}",
+  "account.block_domain": "Bloquear dominio {domain}",
   "account.blocked": "Bloqueado",
   "account.browse_more_on_origin_server": "Explorar mÃ¡s en el perfil original",
   "account.cancel_follow_request": "Cancelar la solicitud de seguimiento",
   "account.direct": "Mensaje directo a @{name}",
-  "account.domain_blocked": "Dominio oculto",
+  "account.disable_notifications": "Dejar de notificarme cuando @{name} tootee",
+  "account.domain_blocked": "Dominio bloqueado",
   "account.edit_profile": "Editar perfil",
+  "account.enable_notifications": "Notificarme cuando @{name} tootee",
   "account.endorse": "Destacar en el perfil",
   "account.follow": "Seguir",
   "account.followers": "Seguidores",
@@ -25,27 +27,27 @@
   "account.locked_info": "El estado de privacidad de esta cuenta estÃ¡ establecido como bloqueado. El propietario manualmente revisa quiÃ©n puede seguirle.",
   "account.media": "Medios",
   "account.mention": "Mencionar a @{name}",
-  "account.moved_to": "{name} se ha muÃ³ a:",
+  "account.moved_to": "{name} se ha mudÃ³ a:",
   "account.mute": "Silenciar a @{name}",
   "account.mute_notifications": "Silenciar notificaciones de @{name}",
   "account.muted": "Silenciado",
   "account.never_active": "Nunca",
   "account.posts": "Toots",
-  "account.posts_with_replies": "Toots con respuestas",
+  "account.posts_with_replies": "Toots y respuestas",
   "account.report": "Denunciar a @{name}",
-  "account.requested": "Esperando aprobaciÃ³n. HacÃ© clic para cancelar la solicitud de seguimiento.",
+  "account.requested": "Esperando aprobaciÃ³n. HacÃ© clic para cancelar la solicitud de seguimiento",
   "account.share": "Compartir el perfil de @{name}",
   "account.show_reblogs": "Mostrar retoots de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Desbloquear a @{name}",
-  "account.unblock_domain": "Mostrar {domain}",
+  "account.unblock_domain": "Desbloquear dominio {domain}",
   "account.unendorse": "No destacar en el perfil",
   "account.unfollow": "Dejar de seguir",
   "account.unmute": "Dejar de silenciar a @{name}",
   "account.unmute_notifications": "Dejar de silenciar las notificaciones de @{name}",
-  "account_note.placeholder": "No se ofreciÃ³ ningÃºn comentario",
+  "account_note.placeholder": "HacÃ© clic par agregar una nota",
   "alert.rate_limited.message": "Por favor, reintentÃ¡ despuÃ©s de las {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Tarifa limitada",
+  "alert.rate_limited.title": "AcciÃ³n limitada",
   "alert.unexpected.message": "OcurriÃ³ un error.",
   "alert.unexpected.title": "Â¡Epa!",
   "announcement.announcement": "Anuncio",
@@ -62,7 +64,7 @@
   "column.community": "LÃnea temporal local",
   "column.direct": "Mensajes directos",
   "column.directory": "Explorar perfiles",
-  "column.domain_blocks": "Dominios ocultos",
+  "column.domain_blocks": "Dominios bloqueados",
   "column.favourites": "Favoritos",
   "column.follow_requests": "Solicitudes de seguimiento",
   "column.home": "Principal",
@@ -85,19 +87,19 @@
   "compose_form.direct_message_warning": "Este toot sÃ³lo serÃ¡ enviado a los usuarios mencionados.",
   "compose_form.direct_message_warning_learn_more": "AprendÃ© mÃ¡s",
   "compose_form.hashtag_warning": "Este toot no se mostrarÃ¡ bajo hashtags porque no es pÃºblico. SÃ³lo los toots pÃºblicos se pueden buscar por hashtag.",
-  "compose_form.lock_disclaimer": "Tu cuenta no estÃ¡ {locked}. Todos pueden seguirte para ver tus toots marcados como \"sÃ³lo para seguidores\".",
+  "compose_form.lock_disclaimer": "Tu cuenta no estÃ¡ {locked}. Todos pueden seguirte para ver tus toots marcados como \"SÃ³lo para seguidores\".",
   "compose_form.lock_disclaimer.lock": "bloqueada",
   "compose_form.placeholder": "Â¿QuÃ© onda?",
   "compose_form.poll.add_option": "AgregÃ¡ una opciÃ³n",
   "compose_form.poll.duration": "DuraciÃ³n de la encuesta",
   "compose_form.poll.option_placeholder": "OpciÃ³n {number}",
-  "compose_form.poll.remove_option": "QuitÃ¡ esta opciÃ³n",
+  "compose_form.poll.remove_option": "Quitar esta opciÃ³n",
   "compose_form.poll.switch_to_multiple": "Cambiar encuesta para permitir opciones mÃºltiples",
   "compose_form.poll.switch_to_single": "Cambiar encuesta para permitir una sola opciÃ³n",
   "compose_form.publish": "Tootear",
   "compose_form.publish_loud": "Â¡{publish}!",
   "compose_form.sensitive.hide": "Marcar medio como sensible",
-  "compose_form.sensitive.marked": "El medio se marcÃ³ como sensible",
+  "compose_form.sensitive.marked": "{count, plural, one {El medio estÃ¡ marcado como sensible} other {Los medios estÃ¡n marcados como sensibles}}",
   "compose_form.sensitive.unmarked": "El medio no estÃ¡ marcado como sensible",
   "compose_form.spoiler.marked": "El texto estÃ¡ oculto detrÃ¡s de la advertencia",
   "compose_form.spoiler.unmarked": "El texto no estÃ¡ oculto",
@@ -107,10 +109,10 @@
   "confirmations.block.confirm": "Bloquear",
   "confirmations.block.message": "Â¿EstÃ¡s seguro que querÃ©s bloquear a {name}?",
   "confirmations.delete.confirm": "Eliminar",
-  "confirmations.delete.message": "Â¿EstÃ¡s seguro que querÃ©s eliminar este estado?",
+  "confirmations.delete.message": "Â¿EstÃ¡s seguro que querÃ©s eliminar este toot?",
   "confirmations.delete_list.confirm": "Eliminar",
   "confirmations.delete_list.message": "Â¿EstÃ¡s seguro que querÃ©s eliminar permanentemente esta lista?",
-  "confirmations.domain_block.confirm": "Ocultar dominio entero",
+  "confirmations.domain_block.confirm": "Bloquear dominio entero",
   "confirmations.domain_block.message": "Â¿EstÃ¡s completamente seguro que querÃ©s bloquear el {domain} entero? En la mayorÃa de los casos, unos cuantos bloqueos y silenciados puntuales son suficientes y preferibles. No vas a ver contenido de ese dominio en ninguna de tus lÃneas temporales o en tus notificaciones. Tus seguidores de ese dominio serÃ¡n quitados.",
   "confirmations.logout.confirm": "Cerrar sesiÃ³n",
   "confirmations.logout.message": "Â¿EstÃ¡s seguro que querÃ©s cerrar la sesiÃ³n?",
@@ -118,19 +120,19 @@
   "confirmations.mute.explanation": "Se ocultarÃ¡n los mensajes de esta cuenta y los mensajes de otras cuentas que mencionen a Ã©sta, pero todavÃa esta cuenta podrÃ¡ ver tus mensajes o seguirte.",
   "confirmations.mute.message": "Â¿EstÃ¡s seguro que querÃ©s silenciar a {name}?",
   "confirmations.redraft.confirm": "Eliminar toot original y editarlo",
-  "confirmations.redraft.message": "Â¿EstÃ¡s seguro que querÃ©s eliminar este estado y volver a editarlo? Se perderÃ¡n las veces marcadas como favoritos y los retoots, y las respuestas a la publicaciÃ³n original quedarÃ¡n huÃ©rfanas.",
+  "confirmations.redraft.message": "Â¿EstÃ¡s seguro que querÃ©s eliminar este toot y volver a editarlo? Se perderÃ¡n las veces marcadas como favoritos y los retoots, y las respuestas a la publicaciÃ³n original quedarÃ¡n huÃ©rfanas.",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Responder ahora sobreescribirÃ¡ el mensaje que estÃ¡s redactando actualmente. Â¿EstÃ¡s seguro que querÃ©s seguir?",
   "confirmations.unfollow.confirm": "Dejar de seguir",
   "confirmations.unfollow.message": "Â¿EstÃ¡s seguro que querÃ©s dejar de seguir a {name}?",
   "conversation.delete": "Eliminar conversaciÃ³n",
-  "conversation.mark_as_read": "Marcar como leÃdo",
+  "conversation.mark_as_read": "Marcar como leÃda",
   "conversation.open": "Ver conversaciÃ³n",
   "conversation.with": "Con {names}",
   "directory.federated": "Desde fediverso conocido",
   "directory.local": "SÃ³lo de {domain}",
   "directory.new_arrivals": "ReciÃ©n llegados",
-  "directory.recently_active": "Recientemente activo",
+  "directory.recently_active": "Recientemente activos",
   "embed.instructions": "InsertÃ¡ este toot a tu sitio web copiando el cÃ³digo de abajo.",
   "embed.preview": "AsÃ es cÃ³mo se verÃ¡:",
   "emoji_button.activity": "Actividad",
@@ -143,17 +145,18 @@
   "emoji_button.objects": "Objetos",
   "emoji_button.people": "Gente",
   "emoji_button.recent": "Usados frecuentemente",
-  "emoji_button.search": "Buscarâ€¦",
+  "emoji_button.search": "Buscar...",
   "emoji_button.search_results": "Resultados de bÃºsqueda",
   "emoji_button.symbols": "SÃmbolos",
   "emoji_button.travel": "Viajes y lugares",
-  "empty_column.account_timeline": "Â¡No hay toots aquÃ!",
+  "empty_column.account_suspended": "Cuenta suspendida",
+  "empty_column.account_timeline": "Â¡No hay toots acÃ¡!",
   "empty_column.account_unavailable": "Perfil no disponible",
   "empty_column.blocks": "TodavÃa no bloqueaste a ningÃºn usuario.",
-  "empty_column.bookmarked_statuses": "TodavÃa no tenÃ©s toots guardados en marcadores. Cuando guardÃ©s uno en marcadores, se mostrarÃ¡ acÃ¡.",
+  "empty_column.bookmarked_statuses": "TodavÃa no tenÃ©s toots guardados en \"Marcadores\". Cuando guardÃ©s uno en \"Marcadores\", se mostrarÃ¡ acÃ¡.",
   "empty_column.community": "La lÃnea temporal local estÃ¡ vacÃa. Â¡EscribÃ algo en modo pÃºblico para que se empiece a correr la bola!",
   "empty_column.direct": "TodavÃa no tenÃ©s ningÃºn mensaje directo. Cuando enviÃ©s o recibÃ¡s uno, se mostrarÃ¡ acÃ¡.",
-  "empty_column.domain_blocks": "TodavÃa no hay dominios ocultos.",
+  "empty_column.domain_blocks": "TodavÃa no hay dominios bloqueados.",
   "empty_column.favourited_statuses": "TodavÃa no tenÃ©s toots favoritos. Cuando marquÃ©s uno como favorito, se mostrarÃ¡ acÃ¡.",
   "empty_column.favourites": "TodavÃa nadie marcÃ³ este toot como favorito. Cuando alguien lo haga, se mostrarÃ¡ acÃ¡.",
   "empty_column.follow_requests": "TodavÃa no tenÃ©s ninguna solicitud de seguimiento. Cuando recibÃ¡s una, se mostrarÃ¡ acÃ¡.",
@@ -161,12 +164,14 @@
   "empty_column.home": "Â¡Tu lÃnea temporal principal estÃ¡ vacÃa! VisitÃ¡ {public} o usÃ¡ la bÃºsqueda para comenzar y encontrar a otros usuarios.",
   "empty_column.home.public_timeline": "la lÃnea temporal pÃºblica",
   "empty_column.list": "TodavÃa no hay nada en esta lista. Cuando miembros de esta lista envÃen nuevos toots, se mostrarÃ¡n acÃ¡.",
-  "empty_column.lists": "TodavÃa no tienes ninguna lista. Cuando creÃ©s una, se mostrarÃ¡ 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.",
   "empty_column.notifications": "TodavÃa no tenÃ©s ninguna notificaciÃ³n. InteractuÃ¡ con otros para iniciar la conversaciÃ³n.",
-  "empty_column.public": "Â¡Naranja! EscribÃ algo pÃºblicamente, o seguÃ usuarios manualmente de otros servidores para ir llenando esta lÃnea temporal.",
+  "empty_column.public": "Â¡Naranja! EscribÃ algo pÃºblicamente, o seguÃ usuarios manualmente de otros servidores para ir llenando esta lÃnea temporal",
   "error.unexpected_crash.explanation": "Debido a un error en nuestro cÃ³digo o a un problema de compatibilidad con el navegador web, esta pÃ¡gina no se pudo mostrar correctamente.",
+  "error.unexpected_crash.explanation_addons": "No se pudo mostrar correctamente esta pÃ¡gina. Este error probablemente es causado por un complemento del navegador web o por herramientas de traducciÃ³n automÃ¡tica.",
   "error.unexpected_crash.next_steps": "IntentÃ¡ recargar la pÃ¡gina. Si eso no ayuda, podÃ©s usar Mastodon a travÃ©s de un navegador web diferente o aplicaciÃ³n nativa.",
+  "error.unexpected_crash.next_steps_addons": "IntentÃ¡ deshabilitarlos y recargÃ¡ la pÃ¡gina. Si eso no ayuda, podÃ©s usar Mastodon a travÃ©s de un navegador web diferente o aplicaciÃ³n nativa.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar stacktrace al portapapeles",
   "errors.unexpected_crash.report_issue": "Informar problema",
   "follow_request.authorize": "Autorizar",
@@ -177,9 +182,9 @@
   "getting_started.directory": "Directorio de perfiles",
   "getting_started.documentation": "DocumentaciÃ³n",
   "getting_started.heading": "IntroducciÃ³n",
-  "getting_started.invite": "Invitar usuarios",
+  "getting_started.invite": "Invitar gente",
   "getting_started.open_source_notice": "Mastodon es software libre. PodÃ©s contribuir o informar errores en {github}.",
-  "getting_started.security": "Seguridad",
+  "getting_started.security": "ConfiguraciÃ³n de la cuenta",
   "getting_started.terms": "TÃ©rminos del servicio",
   "hashtag.column_header.tag_mode.all": "y {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
@@ -199,31 +204,31 @@
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
   "introduction.federation.action": "Siguiente",
-  "introduction.federation.federated.headline": "Federado",
+  "introduction.federation.federated.headline": "Federada",
   "introduction.federation.federated.text": "Los toots pÃºblicos de otros servidores del fediverso aparecerÃ¡n en la lÃnea temporal federada.",
   "introduction.federation.home.headline": "Principal",
-  "introduction.federation.home.text": "Los toots de las personas que seguÃs aparecerÃ¡n en tu lÃnea temporal principal. Â¡PodÃ©s seguir a cualquiera en cualquier servidor!",
+  "introduction.federation.home.text": "Los toots de las cuentas que seguÃs aparecerÃ¡n en tu lÃnea temporal principal. Â¡PodÃ©s seguir a cualquiera en cualquier servidor!",
   "introduction.federation.local.headline": "Local",
-  "introduction.federation.local.text": "Los toots pÃºblicos de las personas en el mismo servidor aparecerÃ¡n en la lÃnea temporal local.",
+  "introduction.federation.local.text": "Los toots pÃºblicos de las cuentas en el mismo servidor aparecerÃ¡n en la lÃnea temporal local.",
   "introduction.interactions.action": "Â¡Terminar tutorial!",
-  "introduction.interactions.favourite.headline": "Favorito",
+  "introduction.interactions.favourite.headline": "Favoritos",
   "introduction.interactions.favourite.text": "PodÃ©s guardar un toot para mÃ¡s tarde, y hacerle saber al autor que te gustÃ³, marcÃ¡ndolo como favorito.",
   "introduction.interactions.reblog.headline": "Retootear",
-  "introduction.interactions.reblog.text": "PodÃ©s compartir los toots de otras personas con tus seguidores retooteando los mismos.",
+  "introduction.interactions.reblog.text": "PodÃ©s compartir los toots de otras cuentas con tus seguidores retooteando los mismos.",
   "introduction.interactions.reply.headline": "Responder",
-  "introduction.interactions.reply.text": "PodÃ©s responder a tus propios toots y los de otras personas, que se encadenarÃ¡n juntos en una conversaciÃ³n.",
+  "introduction.interactions.reply.text": "PodÃ©s responder a tus propios toots y los de otras cuentas, que se encadenarÃ¡n juntos en una conversaciÃ³n.",
   "introduction.welcome.action": "Â¡Dale!",
   "introduction.welcome.headline": "Primeros pasos",
   "introduction.welcome.text": "Â¡Bienvenido al fediverso! En unos pocos minutos, vas a poder transmitir mensajes y hablar con tus amigos a travÃ©s de una amplia variedad de servidores. Pero este servidor, {domain}, es especial: aloja tu perfil, asÃ que acordate de su nombre.",
   "keyboard_shortcuts.back": "para volver",
   "keyboard_shortcuts.blocked": "para abrir la lista de usuarios bloqueados",
   "keyboard_shortcuts.boost": "para retootear",
-  "keyboard_shortcuts.column": "para enfocar un estado en una de las columnas",
+  "keyboard_shortcuts.column": "para enfocar un toot en una de las columnas",
   "keyboard_shortcuts.compose": "para enfocar el Ã¡rea de texto de redacciÃ³n",
   "keyboard_shortcuts.description": "DescripciÃ³n",
   "keyboard_shortcuts.direct": "para abrir columna de mensajes directos",
   "keyboard_shortcuts.down": "para bajar en la lista",
-  "keyboard_shortcuts.enter": "para abrir el estado",
+  "keyboard_shortcuts.enter": "para abrir el toot",
   "keyboard_shortcuts.favourite": "para marcar como favorito",
   "keyboard_shortcuts.favourites": "para abrir la lista de favoritos",
   "keyboard_shortcuts.federated": "para abrir la lÃnea temporal federada",
@@ -233,11 +238,11 @@
   "keyboard_shortcuts.legend": "para mostrar este texto",
   "keyboard_shortcuts.local": "para abrir la lÃnea temporal local",
   "keyboard_shortcuts.mention": "para mencionar al autor",
-  "keyboard_shortcuts.muted": "abrir la lista de usuarios silenciados",
+  "keyboard_shortcuts.muted": "para abrir la lista de usuarios silenciados",
   "keyboard_shortcuts.my_profile": "para abrir tu perfil",
   "keyboard_shortcuts.notifications": "para abrir la columna de notificaciones",
-  "keyboard_shortcuts.open_media": "para abrir archivos de medios",
-  "keyboard_shortcuts.pinned": "para abrir lista de toots fijados",
+  "keyboard_shortcuts.open_media": "para abrir los archivos de medios",
+  "keyboard_shortcuts.pinned": "para abrir la lista de toots fijados",
   "keyboard_shortcuts.profile": "para abrir el perfil del autor",
   "keyboard_shortcuts.reply": "para responder",
   "keyboard_shortcuts.requests": "para abrir la lista de solicitudes de seguimiento",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "para quitar el enfoque del Ã¡rea de texto de redacciÃ³n o de bÃºsqueda",
   "keyboard_shortcuts.up": "para subir en la lista",
   "lightbox.close": "Cerrar",
+  "lightbox.compress": "Comprimir cuadro de vista de imagen",
+  "lightbox.expand": "Expandir cuadro de vista de imagen",
   "lightbox.next": "Siguiente",
   "lightbox.previous": "Anterior",
-  "lightbox.view_context": "Ver contexto",
   "lists.account.add": "Agregar a lista",
   "lists.account.remove": "Quitar de lista",
   "lists.delete": "Eliminar lista",
@@ -260,14 +266,20 @@
   "lists.edit.submit": "Cambiar tÃtulo",
   "lists.new.create": "Agregar lista",
   "lists.new.title_placeholder": "Nuevo tÃtulo de lista",
+  "lists.replies_policy.followed": "Cualquier cuenta seguida",
+  "lists.replies_policy.list": "Miembros de la lista",
+  "lists.replies_policy.none": "Nadie",
+  "lists.replies_policy.title": "Mostrar respuestas a:",
   "lists.search": "Buscar entre la gente que seguÃs",
   "lists.subheading": "Tus listas",
   "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
-  "loading_indicator.label": "Cargandoâ€¦",
-  "media_gallery.toggle_visible": "Cambiar visibilidad",
+  "loading_indicator.label": "Cargando...",
+  "media_gallery.toggle_visible": "Ocultar {number, plural, one {imagen} other {imÃ¡genes}}",
   "missing_indicator.label": "No se encontrÃ³",
   "missing_indicator.sublabel": "No se encontrÃ³ este recurso",
+  "mute_modal.duration": "DuraciÃ³n",
   "mute_modal.hide_notifications": "Â¿QuerÃ©s ocultar las notificaciones de este usuario?",
+  "mute_modal.indefinite": "Indefinida",
   "navigation_bar.apps": "Aplicaciones mÃ³viles",
   "navigation_bar.blocks": "Usuarios bloqueados",
   "navigation_bar.bookmarks": "Marcadores",
@@ -275,12 +287,12 @@
   "navigation_bar.compose": "Redactar un nuevo toot",
   "navigation_bar.direct": "Mensajes directos",
   "navigation_bar.discover": "Descubrir",
-  "navigation_bar.domain_blocks": "Dominios ocultos",
+  "navigation_bar.domain_blocks": "Dominios bloqueados",
   "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
   "navigation_bar.follow_requests": "Solicitudes de seguimiento",
-  "navigation_bar.follows_and_followers": "Personas seguidas y seguidores",
+  "navigation_bar.follows_and_followers": "Cuentas seguidas y seguidores",
   "navigation_bar.info": "Acerca de este servidor",
   "navigation_bar.keyboard_shortcuts": "Atajos",
   "navigation_bar.lists": "Listas",
@@ -291,13 +303,14 @@
   "navigation_bar.preferences": "ConfiguraciÃ³n",
   "navigation_bar.public_timeline": "LÃnea temporal federada",
   "navigation_bar.security": "Seguridad",
-  "notification.favourite": "{name} marcÃ³ tu estado como favorito",
+  "notification.favourite": "{name} marcÃ³ tu toot como favorito",
   "notification.follow": "{name} te empezÃ³ a seguir",
   "notification.follow_request": "{name} solicitÃ³ seguirte",
   "notification.mention": "{name} te mencionÃ³",
   "notification.own_poll": "Tu encuesta finalizÃ³",
   "notification.poll": "FinalizÃ³ una encuesta en la que votaste",
   "notification.reblog": "{name} retooteÃ³ tu estado",
+  "notification.status": "{name} acaba de tootear",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "Â¿EstÃ¡s seguro que querÃ©s limpiar todas tus notificaciones permanentemente?",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Retoots:",
   "notifications.column_settings.show": "Mostrar en columna",
   "notifications.column_settings.sound": "Reproducir sonido",
+  "notifications.column_settings.status": "Nuevos toots:",
   "notifications.filter.all": "Todas",
   "notifications.filter.boosts": "Retoots",
   "notifications.filter.favourites": "Favoritos",
   "notifications.filter.follows": "Seguidores",
   "notifications.filter.mentions": "Menciones",
-  "notifications.filter.polls": "Resultados de la encuesta",
+  "notifications.filter.polls": "Resultados de encuesta",
+  "notifications.filter.statuses": "Actualizaciones de cuentas que seguÃs",
+  "notifications.grant_permission": "Conceder permiso.",
   "notifications.group": "{count} notificaciones",
+  "notifications.mark_as_read": "Marcar cada notificaciÃ³n como leÃda",
+  "notifications.permission_denied": "Las notificaciones de escritorio no estÃ¡n disponibles, debido a una solicitud de permiso del navegador web previamente denegada",
+  "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado antes",
+  "notifications.permission_required": "Las notificaciones de escritorio no estÃ¡n disponibles porque no se concediÃ³ el permiso requerido.",
+  "notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
+  "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no estÃ¡ abierto, habilitÃ¡ las notificaciones de escritorio. PodÃ©s controlar con precisiÃ³n quÃ© tipos de interacciones generan notificaciones de escritorio a travÃ©s del botÃ³n {icon} de arriba, una vez que estÃ©n habilitadas.",
+  "notifications_permission_banner.title": "No te pierdas nada",
+  "picture_in_picture.restore": "Restaurar",
   "poll.closed": "Cerrada",
   "poll.refresh": "Refrescar",
   "poll.total_people": "{count, plural, one {# persona} other {# personas}}",
@@ -328,14 +352,14 @@
   "poll.voted": "Votaste esta opciÃ³n",
   "poll_button.add_poll": "Agregar una encuesta",
   "poll_button.remove_poll": "Quitar encuesta",
-  "privacy.change": "Configurar privacidad de estado",
-  "privacy.direct.long": "Enviar toot sÃ³lo a los usuarios mencionados",
+  "privacy.change": "Configurar privacidad de toot",
+  "privacy.direct.long": "Visible sÃ³lo a los usuarios mencionados",
   "privacy.direct.short": "Directo",
-  "privacy.private.long": "Enviar toot sÃ³lo a los seguidores",
+  "privacy.private.long": "Visible sÃ³lo a los seguidores",
   "privacy.private.short": "SÃ³lo a seguidores",
-  "privacy.public.long": "Enviar toot a las lÃneas temporales pÃºblicas",
+  "privacy.public.long": "Visible para todos, mostrado en las lÃneas temporales pÃºblicas",
   "privacy.public.short": "PÃºblico",
-  "privacy.unlisted.long": "No enviar toot a las lÃneas temporales pÃºblicas",
+  "privacy.unlisted.long": "Visible para todos, pero no en las lÃneas temporales pÃºblicas",
   "privacy.unlisted.short": "No listado",
   "refresh": "Refrescar",
   "regeneration_indicator.label": "Cargandoâ€¦",
@@ -355,28 +379,28 @@
   "report.target": "Denunciando a {target}",
   "search.placeholder": "Buscar",
   "search_popout.search_format": "Formato de bÃºsqueda avanzada",
-  "search_popout.tips.full_text": "Las bÃºsquedas de texto simple devuelven los estados que escribiste, los marcados como favoritos, los retooteados o en los que te mencionaron, asÃ como nombres usuarios, nombres mostrados y etiquetas.",
+  "search_popout.tips.full_text": "Las bÃºsquedas de texto simple devuelven los toots que escribiste, los marcados como favoritos, los retooteados o en los que te mencionaron, asÃ como nombres de usuarios, nombres mostrados y etiquetas.",
   "search_popout.tips.hashtag": "etiqueta",
-  "search_popout.tips.status": "estado",
+  "search_popout.tips.status": "toot",
   "search_popout.tips.text": "Las bÃºsquedas de texto simple devuelven nombres de usuarios, nombres mostrados y etiquetas que coincidan",
   "search_popout.tips.user": "usuario",
   "search_results.accounts": "Gente",
   "search_results.hashtags": "Etiquetas",
   "search_results.statuses": "Toots",
-  "search_results.statuses_fts_disabled": "No se puede buscar toots por contenido en este servidor de Mastodon.",
+  "search_results.statuses_fts_disabled": "No se pueden buscar toots por contenido en este servidor de Mastodon.",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
   "status.admin_account": "Abrir interface de moderaciÃ³n para @{name}",
-  "status.admin_status": "Abrir este estado en la interface de moderaciÃ³n",
+  "status.admin_status": "Abrir este toot en la interface de moderaciÃ³n",
   "status.block": "Bloquear a @{name}",
-  "status.bookmark": "Marcador",
+  "status.bookmark": "Marcar",
   "status.cancel_reblog_private": "Quitar retoot",
   "status.cannot_reblog": "No se puede retootear este toot",
-  "status.copy": "Copiar enlace al estado",
+  "status.copy": "Copiar enlace al toot",
   "status.delete": "Eliminar",
   "status.detailed_status": "Vista de conversaciÃ³n detallada",
   "status.direct": "Mensaje directo a @{name}",
   "status.embed": "Insertar",
-  "status.favourite": "Favorito",
+  "status.favourite": "Marcar como favorito",
   "status.filtered": "Filtrado",
   "status.load_more": "Cargar mÃ¡s",
   "status.media_hidden": "Medios ocultos",
@@ -384,10 +408,10 @@
   "status.more": "MÃ¡s",
   "status.mute": "Silenciar a @{name}",
   "status.mute_conversation": "Silenciar conversaciÃ³n",
-  "status.open": "Expandir este estado",
+  "status.open": "Expandir este toot",
   "status.pin": "Fijar en el perfil",
   "status.pinned": "Toot fijado",
-  "status.read_more": "Leer mÃ¡s",
+  "status.read_more": "LeÃ© mÃ¡s",
   "status.reblog": "Retootear",
   "status.reblog_private": "Retootear a la audiencia original",
   "status.reblogged_by": "{name} retooteÃ³",
@@ -409,7 +433,7 @@
   "status.unpin": "Dejar de fijar",
   "suggestions.dismiss": "Descartar sugerencia",
   "suggestions.header": "Es posible que te intereseâ€¦",
-  "tabs_bar.federated_timeline": "Federado",
+  "tabs_bar.federated_timeline": "Federada",
   "tabs_bar.home": "Principal",
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "Notificaciones",
@@ -430,15 +454,15 @@
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}mil",
   "upload_area.title": "Para subir, arrastrÃ¡ y soltÃ¡",
-  "upload_button.label": "Agregar medios ({formats})",
+  "upload_button.label": "AgregÃ¡ imÃ¡genes o un archivo de audio o video",
   "upload_error.limit": "Se excediÃ³ el lÃmite de subida de archivos.",
   "upload_error.poll": "No se permite la subida de archivos en encuestas.",
-  "upload_form.audio_description": "Describir para personas con problemas auditivos",
-  "upload_form.description": "Agregar descripciÃ³n para los usuarios con dificultades visuales",
+  "upload_form.audio_description": "AgregÃ¡ una descripciÃ³n para personas con dificultades auditivas",
+  "upload_form.description": "AgregÃ¡ una descripciÃ³n para personas con dificultades visuales",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
   "upload_form.undo": "Eliminar",
-  "upload_form.video_description": "Describir para personas con problemas auditivos o visuales",
+  "upload_form.video_description": "AgregÃ¡ una descripciÃ³n para personas con dificultades auditivas o visuales",
   "upload_modal.analyzing_picture": "Analizando imagenâ€¦",
   "upload_modal.apply": "Aplicar",
   "upload_modal.choose_image": "Elegir imagen",
@@ -446,12 +470,13 @@
   "upload_modal.detect_text": "Detectar texto de la imagen",
   "upload_modal.edit_media": "Editar medio",
   "upload_modal.hint": "HacÃ© clic o arrastrÃ¡ el cÃrculo en la previsualizaciÃ³n para elegir el punto focal que siempre estarÃ¡ a la vista en todas las miniaturas.",
+  "upload_modal.preparing_ocr": "Preparando OCRâ€¦",
   "upload_modal.preview_label": "PrevisualizaciÃ³n ({ratio})",
-  "upload_progress.label": "Subiendoâ€¦",
+  "upload_progress.label": "Subiendo...",
   "video.close": "Cerrar video",
   "video.download": "Descargar archivo",
   "video.exit_fullscreen": "Salir de pantalla completa",
-  "video.expand": "Expandir vÃdeo",
+  "video.expand": "Expandir video",
   "video.fullscreen": "Pantalla completa",
   "video.hide": "Ocultar video",
   "video.mute": "Silenciar sonido",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index c0615d7579c7eaae9d1de460edda99456bb065ce..dfad44c6d68f63c9bcca11ede0e9958fbb9c374f 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Ver mÃ¡s en el perfil original",
   "account.cancel_follow_request": "Cancelar la solicitud de seguimiento",
   "account.direct": "Mensaje directo a @{name}",
+  "account.disable_notifications": "Dejar de notificarme cuando @{name} publique algo",
   "account.domain_blocked": "Dominio oculto",
   "account.edit_profile": "Editar perfil",
+  "account.enable_notifications": "Notificarme cuando @{name} publique algo",
   "account.endorse": "Mostrar en perfil",
   "account.follow": "Seguir",
   "account.followers": "Seguidores",
@@ -118,7 +120,7 @@
   "confirmations.mute.explanation": "Esto esconderÃ¡ las publicaciones de ellos y en las que los has mencionado, pero les permitirÃ¡ ver tus mensajes y seguirte.",
   "confirmations.mute.message": "Â¿EstÃ¡s seguro de que quieres silenciar a {name}?",
   "confirmations.redraft.confirm": "Borrar y volver a borrador",
-  "confirmations.redraft.message": "EstÃ¡s seguro de que quieres borrar este estado y volverlo a borrador? PerderÃ¡s todas las respuestas, impulsos y favoritos asociados a Ã©l, y las respuestas a la publicaciÃ³n original quedarÃ¡n huÃ©rfanos.",
+  "confirmations.redraft.message": "Â¿EstÃ¡s seguro de que quieres eliminar este toot y convertirlo en borrador? PerderÃ¡s todas las respuestas, retoots y favoritos asociados a Ã©l, y las respuestas a la publicaciÃ³n original quedarÃ¡n huÃ©rfanas.",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Responder sobrescribirÃ¡ el mensaje que estÃ¡s escribiendo. Â¿EstÃ¡s seguro de que deseas continuar?",
   "confirmations.unfollow.confirm": "Dejar de seguir",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Resultados de bÃºsqueda",
   "emoji_button.symbols": "SÃmbolos",
   "emoji_button.travel": "Viajes y lugares",
+  "empty_column.account_suspended": "Cuenta suspendida",
   "empty_column.account_timeline": "Â¡No hay toots aquÃ!",
   "empty_column.account_unavailable": "Perfil no disponible",
   "empty_column.blocks": "AÃºn no has bloqueado a ningÃºn usuario.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "No tienes ninguna notificaciÃ³n aÃºn. InteractÃºa con otros para empezar una conversaciÃ³n.",
   "empty_column.public": "Â¡No hay nada aquÃ! Escribe algo pÃºblicamente, o sigue usuarios de otras instancias manualmente para llenarlo",
   "error.unexpected_crash.explanation": "Debido a un error en nuestro cÃ³digo o a un problema de compatibilidad con el navegador, esta pÃ¡gina no se ha podido mostrar correctamente.",
+  "error.unexpected_crash.explanation_addons": "No se pudo mostrar correctamente esta pÃ¡gina. Este error probablemente fue causado por un complemento del navegador web o por herramientas de traducciÃ³n automÃ¡tica.",
   "error.unexpected_crash.next_steps": "Intenta actualizar la pÃ¡gina. Si eso no ayuda, es posible que puedas usar Mastodon a travÃ©s de otro navegador o aplicaciÃ³n nativa.",
+  "error.unexpected_crash.next_steps_addons": "Intenta deshabilitarlos y recarga la pÃ¡gina. Si eso no ayuda, podrÃas usar Mastodon a travÃ©s de un navegador web diferente o aplicaciÃ³n nativa.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar el seguimiento de pila en el portapapeles",
   "errors.unexpected_crash.report_issue": "Informar de un problema/error",
   "follow_request.authorize": "Autorizar",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "para retirar el foco de la caja de redacciÃ³n/bÃºsqueda",
   "keyboard_shortcuts.up": "para ir hacia arriba en la lista",
   "lightbox.close": "Cerrar",
+  "lightbox.compress": "Comprimir cuadro de visualizaciÃ³n de imagen",
+  "lightbox.expand": "Expandir cuadro de visualizaciÃ³n de imagen",
   "lightbox.next": "Siguiente",
   "lightbox.previous": "Anterior",
-  "lightbox.view_context": "Ver contexto",
   "lists.account.add": "AÃ±adir a lista",
   "lists.account.remove": "Quitar de lista",
   "lists.delete": "Borrar lista",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Cambiar tÃtulo",
   "lists.new.create": "AÃ±adir lista",
   "lists.new.title_placeholder": "TÃtulo de la nueva lista",
+  "lists.replies_policy.followed": "Cualquier usuario seguido",
+  "lists.replies_policy.list": "Miembros de la lista",
+  "lists.replies_policy.none": "Nadie",
+  "lists.replies_policy.title": "Mostrar respuestas a:",
   "lists.search": "Buscar entre la gente a la que sigues",
   "lists.subheading": "Tus listas",
   "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Cambiar visibilidad",
   "missing_indicator.label": "No encontrado",
   "missing_indicator.sublabel": "No se encontrÃ³ este recurso",
+  "mute_modal.duration": "DuraciÃ³n",
   "mute_modal.hide_notifications": "Ocultar notificaciones de este usuario?",
+  "mute_modal.indefinite": "Indefinida",
   "navigation_bar.apps": "Aplicaciones mÃ³viles",
   "navigation_bar.blocks": "Usuarios bloqueados",
   "navigation_bar.bookmarks": "Marcadores",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta en la que has votado ha terminado",
   "notification.reblog": "{name} ha retooteado tu estado",
+  "notification.status": "{name} acaba de publicar",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "Â¿Seguro que quieres limpiar permanentemente todas tus notificaciones?",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Retoots:",
   "notifications.column_settings.show": "Mostrar en columna",
   "notifications.column_settings.sound": "Reproducir sonido",
+  "notifications.column_settings.status": "Nuevos toots:",
   "notifications.filter.all": "Todos",
   "notifications.filter.boosts": "Retoots",
   "notifications.filter.favourites": "Favoritos",
   "notifications.filter.follows": "Seguidores",
   "notifications.filter.mentions": "Menciones",
   "notifications.filter.polls": "Resultados de la votaciÃ³n",
+  "notifications.filter.statuses": "Actualizaciones de gente a la que sigues",
+  "notifications.grant_permission": "Conceder permiso.",
   "notifications.group": "{count} notificaciones",
+  "notifications.mark_as_read": "Marcar todas las notificaciones como leÃdas",
+  "notifications.permission_denied": "No se pueden habilitar las notificaciones de escritorio ya que se denegÃ³ el permiso.",
+  "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado anteriormente",
+  "notifications.permission_required": "Las notificaciones de escritorio no estÃ¡n disponibles porque no se ha concedido el permiso requerido.",
+  "notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
+  "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no estÃ© abierto, habilite las notificaciones de escritorio. Puedes controlar con precisiÃ³n quÃ© tipos de interacciones generan notificaciones de escritorio a travÃ©s del botÃ³n {icon} de arriba una vez que estÃ©n habilitadas.",
+  "notifications_permission_banner.title": "Nunca te pierdas nada",
+  "picture_in_picture.restore": "Restaurar",
   "poll.closed": "Cerrada",
   "poll.refresh": "Actualizar",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -357,7 +381,7 @@
   "search_popout.search_format": "Formato de bÃºsqueda avanzada",
   "search_popout.tips.full_text": "BÃºsquedas de texto recuperan posts que has escrito, marcado como favoritos, retooteado o en los que has sido mencionado, asÃ como usuarios, nombres y hashtags.",
   "search_popout.tips.hashtag": "etiqueta",
-  "search_popout.tips.status": "estado",
+  "search_popout.tips.status": "toot",
   "search_popout.tips.text": "El texto simple devuelve correspondencias de nombre, usuario y hashtag",
   "search_popout.tips.user": "usuario",
   "search_results.accounts": "Gente",
@@ -368,8 +392,8 @@
   "status.admin_account": "Abrir interfaz de moderaciÃ³n para @{name}",
   "status.admin_status": "Abrir este estado en la interfaz de moderaciÃ³n",
   "status.block": "Bloquear a @{name}",
-  "status.bookmark": "Marcador",
-  "status.cancel_reblog_private": "Des-impulsar",
+  "status.bookmark": "AÃ±adir marcador",
+  "status.cancel_reblog_private": "Eliminar retoot",
   "status.cannot_reblog": "Este toot no puede retootearse",
   "status.copy": "Copiar enlace al estado",
   "status.delete": "Borrar",
@@ -391,7 +415,7 @@
   "status.reblog": "Retootear",
   "status.reblog_private": "Implusar a la audiencia original",
   "status.reblogged_by": "Retooteado por {name}",
-  "status.reblogs.empty": "Nadie impulsÃ³ este toot todavÃa. Cuando alguien lo haga, aparecerÃ¡ aqui.",
+  "status.reblogs.empty": "Nadie retooteÃ³ este toot todavÃa. Cuando alguien lo haga, aparecerÃ¡ aquÃ.",
   "status.redraft": "Borrar y volver a borrador",
   "status.remove_bookmark": "Eliminar marcador",
   "status.reply": "Responder",
@@ -403,7 +427,7 @@
   "status.show_less_all": "Mostrar menos para todo",
   "status.show_more": "Mostrar mÃ¡s",
   "status.show_more_all": "Mostrar mÃ¡s para todo",
-  "status.show_thread": "Ver hilo",
+  "status.show_thread": "Mostrar hilo",
   "status.uncached_media_warning": "No disponible",
   "status.unmute_conversation": "Dejar de silenciar conversaciÃ³n",
   "status.unpin": "Dejar de fijar",
@@ -426,9 +450,9 @@
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} hablando",
   "trends.trending_now": "Tendencia ahora",
   "ui.beforeunload": "Tu borrador se perderÃ¡ si sales de Mastodon.",
-  "units.short.billion": "{count}MM",
+  "units.short.billion": "{count}B",
   "units.short.million": "{count}M",
-  "units.short.thousand": "{count}mil",
+  "units.short.thousand": "{count}K",
   "upload_area.title": "Arrastra y suelta para subir",
   "upload_button.label": "Subir multimedia (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "LÃmite de subida de archivos excedido.",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detectar texto de la imagen",
   "upload_modal.edit_media": "Editar multimedia",
   "upload_modal.hint": "Haga clic o arrastre el cÃrculo en la vista previa para elegir el punto focal que siempre estarÃ¡ a la vista en todas las miniaturas.",
+  "upload_modal.preparing_ocr": "Preparando OCRâ€¦",
   "upload_modal.preview_label": "Vista previa ({ratio})",
   "upload_progress.label": "Subiendoâ€¦",
   "video.close": "Cerrar video",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 558fe38de259012796fcb3ad141c3840eac671ab..54f4159fe3982125fc11d6c5a9e1e708ea1f2d96 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "TÃ¼hista jÃ¤lgimistaotlus",
   "account.direct": "OtsesÃµnum @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domeen peidetud",
   "account.edit_profile": "Muuda profiili",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Too profiilil esile",
   "account.follow": "JÃ¤lgi",
   "account.followers": "JÃ¤lgijad",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Otsitulemused",
   "emoji_button.symbols": "SÃ¼mbolid",
   "emoji_button.travel": "Reisimine & Kohad",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Siin tuute ei ole!",
   "empty_column.account_unavailable": "Profiil pole saadaval",
   "empty_column.blocks": "Sa ei ole veel Ã¼htegi kasutajat blokeerinud.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Teil ei ole veel teateid. Suhelge teistega alustamaks vestlust.",
   "empty_column.public": "Siin pole midagi! Kirjuta midagi avalikut vÃµi jÃ¤lgi ise kasutajaid tÃ¤itmaks seda ruumi",
   "error.unexpected_crash.explanation": "Meie poolse probleemi vÃµi veebilehitseja Ã¼hilduvus probleemi tÃµttu ei suutnud me Teile seda lehekÃ¼lge korrektselt nÃ¤idata.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Proovige lehekÃ¼lge uuesti avada. Kui see ei aita, vÃµite proovida kasutada Mastodoni mÃµne muu veebilehitseja vÃµi Ã¤ppi kaudu.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Kopeeri stacktrace lÃµikelauale",
   "errors.unexpected_crash.report_issue": "Teavita veast",
   "follow_request.authorize": "Autoriseeri",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "tekstiala/otsingu koostamise mittefokuseerimiseks",
   "keyboard_shortcuts.up": "liikumaks nimistus Ã¼les",
   "lightbox.close": "Sulge",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "JÃ¤rgmine",
   "lightbox.previous": "Eelmine",
-  "lightbox.view_context": "Vaata konteksti",
   "lists.account.add": "Lisa nimistusse",
   "lists.account.remove": "Eemalda nimistust",
   "lists.delete": "Kustuta nimistu",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Muuda pealkiri",
   "lists.new.create": "Lisa nimistu",
   "lists.new.title_placeholder": "Uus nimistu pealkiri",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Otsi Teie poolt jÃ¤lgitavate inimese hulgast",
   "lists.subheading": "Teie nimistud",
   "load_pending": "{count, plural, one {# uus kirje} other {# uut kirjet}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "LÃ¼lita nÃ¤htavus",
   "missing_indicator.label": "Ei leitud",
   "missing_indicator.sublabel": "Seda ressurssi ei leitud",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Kas peita teated sellelt kasutajalt?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobiilrakendused",
   "navigation_bar.blocks": "Blokeeritud kasutajad",
   "navigation_bar.bookmarks": "JÃ¤rjehoidjad",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Teie kÃ¼sitlus on lÃµppenud",
   "notification.poll": "KÃ¼sitlus, milles osalesite, on lÃµppenud",
   "notification.reblog": "{name} upitas Teie staatust",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Puhasta teated",
   "notifications.clear_confirmation": "Olete kindel, et soovite pÃ¼sivalt kÃµik oma teated eemaldada?",
   "notifications.column_settings.alert": "TÃ¶Ã¶lauateated",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Upitused:",
   "notifications.column_settings.show": "Kuva tulbas",
   "notifications.column_settings.sound": "MÃ¤ngi heli",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "KÃµik",
   "notifications.filter.boosts": "Upitused",
   "notifications.filter.favourites": "Lemmikud",
   "notifications.filter.follows": "JÃ¤lgib",
   "notifications.filter.mentions": "Mainimised",
   "notifications.filter.polls": "KÃ¼sitluse tulemused",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} teated",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Suletud",
   "poll.refresh": "VÃ¤rskenda",
   "poll.total_people": "{count, plural,one {# inimene} other {# inimest}}",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Tuvasta teksti pildilt",
   "upload_modal.edit_media": "Muuda meediat",
   "upload_modal.hint": "Vajuta vÃµi tÃµmba ringi eelvaatel, et valida fookuspunkti, mis on alati nÃ¤htaval kÃµikidel eelvaadetel.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Eelvaade ({ratio})",
   "upload_progress.label": "Laeb Ã¼les....",
   "video.close": "Sulge video",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 09471ff2ab42975a89d0482cf94cf6ffbe15bbb8..80119dc003b0761861037ef43b234043ac6ad0bb 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Ezeztatu jarraitzeko eskaria",
   "account.direct": "Mezu zuzena @{name}(r)i",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Ezkutatutako domeinua",
   "account.edit_profile": "Aldatu profila",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Nabarmendu profilean",
   "account.follow": "Jarraitu",
   "account.followers": "Jarraitzaileak",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Bilaketaren emaitzak",
   "emoji_button.symbols": "Sinboloak",
   "emoji_button.travel": "Bidaiak eta tokiak",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Ez dago tootik hemen!",
   "empty_column.account_unavailable": "Profila ez dago eskuragarri",
   "empty_column.blocks": "Ez duzu erabiltzailerik blokeatu oraindik.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Ez duzu jakinarazpenik oraindik. Jarri besteekin harremanetan elkarrizketa abiatzeko.",
   "empty_column.public": "Ez dago ezer hemen! Idatzi zerbait publikoki edo jarraitu eskuz beste zerbitzari batzuetako erabiltzaileak hau betetzen joateko",
   "error.unexpected_crash.explanation": "Gure kodean arazoren bat dela eta, edo nabigatzailearekin bateragarritasun arazoren bat dela eta, orri hau ezin izan da ongi bistaratu.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Saiatu orria berritzen. Horrek ez badu laguntzen, agian Mastodon erabiltzeko aukera duzu oraindik ere beste nabigatzaile bat edo aplikazio natibo bat erabilita.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Kopiatu irteera arbelera",
   "errors.unexpected_crash.report_issue": "Eman arazoaren berri",
   "follow_request.authorize": "Baimendu",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "testua konposatzeko area / bilaketatik fokua kentzea",
   "keyboard_shortcuts.up": "zerrendan gora mugitzea",
   "lightbox.close": "Itxi",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Hurrengoa",
   "lightbox.previous": "Aurrekoa",
-  "lightbox.view_context": "Ikusi testuingurua",
   "lists.account.add": "Gehitu zerrendara",
   "lists.account.remove": "Kendu zerrendatik",
   "lists.delete": "Ezabatu zerrenda",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Aldatu izenburua",
   "lists.new.create": "Gehitu zerrenda",
   "lists.new.title_placeholder": "Zerrenda berriaren izena",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Bilatu jarraitzen dituzun pertsonen artean",
   "lists.subheading": "Zure zerrendak",
   "load_pending": "{count, plural, one {eleentuberri #} other {# elementu berri}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Txandakatu ikusgaitasuna",
   "missing_indicator.label": "Ez aurkitua",
   "missing_indicator.sublabel": "Baliabide hau ezin izan da aurkitu",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Ezkutatu erabiltzaile honen jakinarazpenak?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mugikorrerako aplikazioak",
   "navigation_bar.blocks": "Blokeatutako erabiltzaileak",
   "navigation_bar.bookmarks": "Laster-markak",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Zure inkesta amaitu da",
   "notification.poll": "Zuk erantzun duzun inkesta bat bukatu da",
   "notification.reblog": "{name}(e)k bultzada eman dio zure mezuari",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Garbitu jakinarazpenak",
   "notifications.clear_confirmation": "Ziur zure jakinarazpen guztiak behin betirako garbitu nahi dituzula?",
   "notifications.column_settings.alert": "Mahaigaineko jakinarazpenak",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Bultzadak:",
   "notifications.column_settings.show": "Erakutsi zutabean",
   "notifications.column_settings.sound": "Jo soinua",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "Denak",
   "notifications.filter.boosts": "Bultzadak",
   "notifications.filter.favourites": "Gogokoak",
   "notifications.filter.follows": "Jarraipenak",
   "notifications.filter.mentions": "Aipamenak",
   "notifications.filter.polls": "Inkestaren emaitza",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} jakinarazpen",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Itxita",
   "poll.refresh": "Berritu",
   "poll.total_people": "{count, plural, one {pertsona #} other {# pertsona}}",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Antzeman testua iruditik",
   "upload_modal.edit_media": "Editatu media",
   "upload_modal.hint": "Sakatu eta jaregin aurrebistako zirkulua iruditxoetan beti ikusgai egongo den puntu fokala hautatzeko.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Aurreikusi ({ratio})",
   "upload_progress.label": "Igotzen...",
   "video.close": "Itxi bideoa",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 6685b2ccb1ec1597257462f6aa2f465aacabcdbe..b062ec18b1ae9db3f2a770e205ae5e221bf8ae2f 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -4,13 +4,15 @@
   "account.badges.bot": "Ø±Ø¨Ø§Øª",
   "account.badges.group": "Ú¯Ø±ÙˆÙ‡",
   "account.block": "Ù…Ø³Ø¯ÙˆØ¯Ø³Ø§Ø²ÛŒ @{name}",
-  "account.block_domain": "Ù†Ù‡ÙØªÙ† Ù‡Ù…Ù‡ Ú†ÛŒØ² Ø§Ø² {domain}",
+  "account.block_domain": "Ø¨Ø³ØªÙ† Ø¯Ø§Ù…Ù†Ù‡ {domain}",
   "account.blocked": "Ù…Ø³Ø¯ÙˆØ¯",
   "account.browse_more_on_origin_server": "Ù…Ø±ÙˆØ± Ø¨ÛŒØ´â€ŒØªØ± Ø±ÙˆÛŒ Ù†Ù…Ø§ÛŒÙ‡Ù” Ø§ØµÙ„ÛŒ",
   "account.cancel_follow_request": "Ù„ØºÙˆ Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ù¾ÛŒÚ¯ÛŒØ±ÛŒ",
   "account.direct": "Ù¾ÛŒØ§Ù… Ø®ØµÙˆØµÛŒ Ø¨Ù‡ @{name}",
-  "account.domain_blocked": "Ø¯Ø§Ù…Ù†Ù‡Ù” Ù†Ù‡ÙØªÙ‡",
+  "account.disable_notifications": "Ø¢Ú¯Ø§Ù‡ÛŒ Ø¨Ù‡ Ù…Ù† Ù‡Ù†Ú¯Ø§Ù… ÙØ±Ø³ØªØ§Ø¯Ù†â€ŒÙ‡Ø§ÛŒ @{name} Ù¾Ø§ÛŒØ§Ù† ÛŒØ§Ø¨Ø¯",
+  "account.domain_blocked": "Ø¯Ø§Ù…Ù†Ù‡ Ø¨Ø³ØªÙ‡ Ø´Ø¯",
   "account.edit_profile": "ÙˆÛŒØ±Ø§ÛŒØ´ Ù†Ù…Ø§ÛŒÙ‡",
+  "account.enable_notifications": "Ø¢Ú¯Ø§Ù‡ÛŒ Ù‡Ù†Ú¯Ø§Ù… Ø§Ø±Ø³Ø§Ù„â€ŒÙ‡Ø§ÛŒ @{name}",
   "account.endorse": "Ù…Ø¹Ø±Ù‘ÙÛŒ Ø¯Ø± Ù†Ù…Ø§ÛŒÙ‡",
   "account.follow": "Ù¾ÛŒ Ø¨Ú¯ÛŒØ±ÛŒØ¯",
   "account.followers": "Ù¾ÛŒâ€ŒÚ¯ÛŒØ±Ø§Ù†",
@@ -38,7 +40,7 @@
   "account.show_reblogs": "Ù†Ù…Ø§ÛŒØ´ Ø¨Ø§Ø²Ø¨ÙˆÙ‚â€ŒÙ‡Ø§ÛŒ @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Ø¨ÙˆÙ‚} other {{counter} Ø¨ÙˆÙ‚}}",
   "account.unblock": "Ø±ÙØ¹ Ø§Ù†Ø³Ø¯Ø§Ø¯ @{name}",
-  "account.unblock_domain": "Ø±ÙØ¹ Ù†Ù‡ÙØªÙ† {domain}",
+  "account.unblock_domain": "Ú¯Ø´ÙˆØ¯Ù† Ø¯Ø§Ù…Ù†Ù‡ {domain}",
   "account.unendorse": "Ù…Ø¹Ø±Ù‘ÙÛŒ Ù†Ú©Ø±Ø¯Ù† Ø¯Ø± Ù†Ù…Ø§ÛŒÙ‡",
   "account.unfollow": "Ù¾Ø§ÛŒØ§Ù† Ù¾ÛŒÚ¯ÛŒØ±ÛŒ",
   "account.unmute": "Ø±ÙØ¹ Ø®Ù…ÙˆØ´ÛŒ @{name}",
@@ -62,7 +64,7 @@
   "column.community": "Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ù…ØÙ„ÛŒ",
   "column.direct": "Ù¾ÛŒØ§Ù…â€ŒÙ‡Ø§ÛŒ Ø®ØµÙˆØµÛŒ",
   "column.directory": "Ù…Ø±ÙˆØ± Ù†Ù…Ø§ÛŒÙ‡â€ŒÙ‡Ø§",
-  "column.domain_blocks": "Ø¯Ø§Ù…Ù†Ù‡â€ŒÙ‡Ø§ÛŒ Ù†Ù‡ÙØªÙ‡",
+  "column.domain_blocks": "Ø¯Ø§Ù…Ù†Ù‡â€ŒÙ‡Ø§ÛŒ Ø¨Ø³ØªÙ‡",
   "column.favourites": "Ù¾Ø³Ù†Ø¯ÛŒØ¯Ù‡â€ŒÙ‡Ø§",
   "column.follow_requests": "Ø¯Ø±Ø®ÙˆØ§Ø³Øªâ€ŒÙ‡Ø§ÛŒ Ù¾ÛŒÚ¯ÛŒØ±ÛŒ",
   "column.home": "Ø®Ø§Ù†Ù‡",
@@ -78,8 +80,8 @@
   "column_header.pin": "Ø«Ø§Ø¨Øªâ€ŒÚ©Ø±Ø¯Ù†",
   "column_header.show_settings": "Ù†Ù…Ø§ÛŒØ´ ØªÙ†Ø¸ÛŒÙ…Ø§Øª",
   "column_header.unpin": "Ø±Ù‡Ø§Ú©Ø±Ø¯Ù†",
-  "column_subheading.settings": "ØªÙ†Ø¸ÛŒÙ…Ø§Øª",
-  "community.column_settings.local_only": "ØªÙ†Ù‡Ø§ Ø¨ÙˆÙ…ÛŒ",
+  "column_subheading.settings": "Ø³Ø§Ù…Ø§Ù†Ø¯Ù‡ÛŒ",
+  "community.column_settings.local_only": "ÙÙ‚Ø· Ù…ØÙ„Ù‘ÛŒ",
   "community.column_settings.media_only": "ÙÙ‚Ø· Ø±Ø³Ø§Ù†Ù‡",
   "community.column_settings.remote_only": "ØªÙ†Ù‡Ø§ Ø¯ÙˆØ±Ø¯Ø³Øª",
   "compose_form.direct_message_warning": "Ø§ÛŒÙ† Ø¨ÙˆÙ‚ ØªÙ†Ù‡Ø§ Ø¨Ù‡ Ú©Ø§Ø±Ø¨Ø±Ø§Ù†ÛŒ Ú©Ù‡ Ø§Ø² Ø¢Ù†â€ŒÙ‡Ø§ Ù†Ø§Ù… Ø¨Ø±Ø¯Ù‡ Ø´Ø¯Ù‡ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯.",
@@ -96,7 +98,7 @@
   "compose_form.poll.switch_to_single": "ØªØ¨Ø¯ÛŒÙ„ Ø¨Ù‡ Ù†Ø¸Ø±Ø³Ù†Ø¬ÛŒ ØªÚ©â€ŒÚ¯Ø²ÛŒÙ†Ù‡â€ŒØ§ÛŒ",
   "compose_form.publish": "Ø¨ÙˆÙ‚",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Ø¹Ù„Ø§Ù…Øªâ€ŒÚ¯Ø°Ø§Ø±ÛŒ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ØØ³Ø§Ø³",
+  "compose_form.sensitive.hide": "Ø¹Ù„Ø§Ù…Øªâ€ŒÚ¯Ø°Ø§Ø±ÛŒ Ø±Ø³Ø§Ù†Ù‡ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ØØ³Ø§Ø³",
   "compose_form.sensitive.marked": "Ø±Ø³Ø§Ù†Ù‡ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ØØ³Ø§Ø³ Ø¹Ù„Ø§Ù…Øªâ€ŒÚ¯Ø°Ø§Ø±ÛŒ Ø´Ø¯Ù‡",
   "compose_form.sensitive.unmarked": "Ø±Ø³Ø§Ù†Ù‡ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ØØ³Ø§Ø³ Ø¹Ù„Ø§Ù…Øªâ€ŒÚ¯Ø°Ø§Ø±ÛŒ Ù†Ø´Ø¯Ù‡",
   "compose_form.spoiler.marked": "Ù†ÙˆØ´ØªÙ‡ Ù¾Ø´Øª Ù‡Ø´Ø¯Ø§Ø± Ù¾Ù†Ù‡Ø§Ù† Ø§Ø³Øª",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Ù†ØªØ§ÛŒØ¬ Ø¬Ø³ØªØ¬Ùˆ",
   "emoji_button.symbols": "Ù†Ù…Ø§Ø¯Ù‡Ø§",
   "emoji_button.travel": "Ø³ÙØ± Ùˆ Ù…Ú©Ø§Ù†",
+  "empty_column.account_suspended": "ØØ³Ø§Ø¨ Ù…Ø¹Ù„Ù‚ Ø´Ø¯",
   "empty_column.account_timeline": "Ù‡ÛŒÚ† Ø¨ÙˆÙ‚ÛŒ Ø§ÛŒÙ†â€ŒØ¬Ø§ Ù†ÛŒØ³Øª!",
   "empty_column.account_unavailable": "Ù†Ù…Ø§ÛŒÙ‡Ù” Ù…ÙˆØ¬ÙˆØ¯ Ù†ÛŒØ³Øª",
   "empty_column.blocks": "Ù‡Ù†ÙˆØ² Ú©Ø³ÛŒ Ø±Ø§ Ù…Ø³Ø¯ÙˆØ¯ Ù†Ú©Ø±Ø¯Ù‡â€ŒØ§ÛŒØ¯.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Ù‡Ù†ÙˆØ² Ù‡ÛŒÚ† Ø§Ø¹Ù„Ø§Ù†ÛŒ Ù†Ø¯Ø§Ø±ÛŒØ¯. Ø¨Ù‡ Ø¯ÛŒÚ¯Ø±Ø§Ù† ÙˆØ§Ú©Ù†Ø´ Ù†Ø´Ø§Ù† Ø¯Ù‡ÛŒØ¯ ØªØ§ Ú¯ÙØªÚ¯Ùˆ Ø¢ØºØ§Ø² Ø´ÙˆØ¯.",
   "empty_column.public": "Ø§ÛŒÙ†â€ŒØ¬Ø§ Ù‡Ù†ÙˆØ² Ú†ÛŒØ²ÛŒ Ù†ÛŒØ³Øª! Ø®ÙˆØ¯ØªØ§Ù† Ú†ÛŒØ²ÛŒ Ø¨Ù†ÙˆÛŒØ³ÛŒØ¯ ÛŒØ§ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ú©Ø§Ø±Ø³Ø§Ø²Ù‡Ø§ÛŒ Ø¯ÛŒÚ¯Ø± Ø±Ø§ Ù¾ÛŒ Ø¨Ú¯ÛŒØ±ÛŒØ¯ ØªØ§ Ø§ÛŒÙ†â€ŒØ¬Ø§ Ù¾Ø± Ø´ÙˆØ¯",
   "error.unexpected_crash.explanation": "Ø¨Ù‡ Ø®Ø§Ø·Ø± Ø§Ø´Ú©Ø§Ù„ÛŒ Ø¯Ø± Ú©Ø¯Ù‡Ø§ÛŒ Ù…Ø§ ÛŒØ§ Ù†Ø§Ø³Ø§Ø²Ú¯Ø§Ø±ÛŒ Ø¨Ø§ Ù…Ø±ÙˆØ±Ú¯Ø± Ø´Ù…Ø§ØŒ Ø§ÛŒÙ† ØµÙØÙ‡ Ø¨Ù‡ Ø¯Ø±Ø³ØªÛŒ Ù†Ù…Ø§ÛŒØ´ Ù†ÛŒØ§ÙØª.",
+  "error.unexpected_crash.explanation_addons": "Ø§ÛŒÙ† ØµÙØÙ‡ Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ø¯Ø±Ø³Øª Ù†Ø´Ø§Ù† Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯. Ø§ØØªÙ…Ø§Ù„Ø§Ù‹ Ø§ÛŒÙ† Ø®Ø·Ø§ Ù†Ø§Ø´ÛŒ Ø§Ø² ÛŒÚ© Ø§ÙØ²ÙˆÙ†Ù‡Ù” Ù…Ø±ÙˆØ±Ú¯Ø± ÛŒØ§ Ø§Ø¨Ø²Ø§Ø± ØªØ±Ø¬Ù…Ù‡Ù” Ø®ÙˆØ¯Ú©Ø§Ø± Ø§Ø³Øª.",
   "error.unexpected_crash.next_steps": "Ù„Ø·ÙØ§Ù‹ ØµÙØÙ‡ Ø±Ø§ Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ø¨Ø§Ø² Ú©Ù†ÛŒØ¯. Ø§Ú¯Ø± Ú©Ù…Ú©ÛŒ Ù†Ú©Ø±Ø¯ØŒ Ø´Ø§ÛŒØ¯ Ù‡Ù…Ú†Ù†Ø§Ù† Ø¨ØªÙˆØ§Ù†ÛŒØ¯ Ø¨Ø§ Ù…Ø§Ø³ØªÙˆØ¯ÙˆÙ† Ø§Ø² Ø±Ø§Ù‡ ÛŒÚ© Ù…Ø±ÙˆØ±Ú¯Ø± Ø¯ÛŒÚ¯Ø± ÛŒØ§ Ø¨Ø§ ÛŒÚ©ÛŒ Ø§Ø² Ø§Ù¾â€ŒÙ‡Ø§ÛŒ Ø¢Ù† Ú©Ø§Ø± Ú©Ù†ÛŒØ¯.",
+  "error.unexpected_crash.next_steps_addons": "Ù„Ø·ÙØ§Ù‹ Ø§Ø² Ú©Ø§Ø±Ø´Ø§Ù† Ø§Ù†Ø¯Ø§Ø®ØªÙ‡ Ùˆ ØµÙØÙ‡ Ø±Ø§ Ù†ÙˆØ³Ø§Ø²ÛŒ Ú©Ù†ÛŒØ¯. Ø§Ú¯Ø± Ú©Ù…Ú©ÛŒ Ù†Ú©Ø±Ø¯ØŒ Ø´Ø§ÛŒØ¯ Ù‡Ù…Ú†Ù†Ø§Ù† Ø¨ØªÙˆØ§Ù†ÛŒØ¯ Ø¨Ø§ Ù…Ø±ÙˆØ±Ú¯Ø±ÛŒ Ø¯ÛŒÚ¯Ø± ÛŒØ§ Ø¨Ø§ Ú©Ø§Ø±Ù‡â€ŒØ§ÛŒ Ø¨ÙˆÙ…ÛŒ Ø§Ø² Ù…Ø§Ø³ØªÙˆØ¯ÙˆÙ† Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ù†ÛŒØ¯.",
   "errors.unexpected_crash.copy_stacktrace": "Ø±ÙˆÙ†ÙˆØ´Øª Ø§Ø² Ø¬Ø²Ø¦ÛŒØ§Øª Ø§Ø´Ú©Ø§Ù„",
   "errors.unexpected_crash.report_issue": "Ú¯Ø²Ø§Ø±Ø´ Ù…Ø´Ú©Ù„",
   "follow_request.authorize": "Ø§Ø¬Ø§Ø²Ù‡ Ø¯Ù‡ÛŒØ¯",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "Ø¨Ø±Ø§ÛŒ Ø¨Ø±Ø¯Ø§Ø´ØªÙ† ØªÙ…Ø±Ú©Ø² Ø§Ø² Ù†ÙˆØ´ØªÙ†/Ø¬Ø³ØªØ¬Ùˆ",
   "keyboard_shortcuts.up": "Ø¨Ø±Ø§ÛŒ Ø¨Ø§Ù„Ø§ Ø±ÙØªÙ† Ø¯Ø± ÙÙ‡Ø±Ø³Øª",
   "lightbox.close": "Ø¨Ø³ØªÙ†",
+  "lightbox.compress": "ÙØ´Ø±Ø¯Ù‡â€ŒØ³Ø§Ø²ÛŒ Ø¬Ø¹Ø¨Ù‡ Ù†Ù…Ø§ÛŒØ´ ØªØµÙˆÛŒØ±",
+  "lightbox.expand": "Ú¯Ø³ØªØ±Ø´ Ø¬Ø¹Ø¨Ù‡ Ù†Ù…Ø§ÛŒØ´ ØªØµÙˆÛŒØ±",
   "lightbox.next": "Ø¨Ø¹Ø¯ÛŒ",
   "lightbox.previous": "Ù‚Ø¨Ù„ÛŒ",
-  "lightbox.view_context": "Ù†Ù…Ø§ÛŒØ´ Ú¯ÙØªÚ¯Ùˆ",
   "lists.account.add": "Ø§ÙØ²ÙˆØ¯Ù† Ø¨Ù‡ ÙÙ‡Ø±Ø³Øª",
   "lists.account.remove": "Ø¨Ø±Ø¯Ø§Ø´ØªÙ† Ø§Ø² ÙÙ‡Ø±Ø³Øª",
   "lists.delete": "ØØ°Ù ÙÙ‡Ø±Ø³Øª",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "ØªØºÛŒÛŒØ± Ø¹Ù†ÙˆØ§Ù†",
   "lists.new.create": "Ø§ÙØ²ÙˆØ¯Ù† ÙÙ‡Ø±Ø³Øª",
   "lists.new.title_placeholder": "Ø¹Ù†ÙˆØ§Ù† ÙÙ‡Ø±Ø³Øª ØªØ§Ø²Ù‡",
+  "lists.replies_policy.followed": "Ù‡Ø± Ú©Ø§Ø±Ø¨Ø± Ù¾ÛŒÚ¯Ø±ÙØªÙ‡",
+  "lists.replies_policy.list": "Ø§Ø¹Ø¶Ø§ÛŒ ÙÙ‡Ø±Ø³Øª",
+  "lists.replies_policy.none": "Ù‡ÛŒÚ† Ú©Ø¯Ø§Ù…",
+  "lists.replies_policy.title": "Ù†Ù…Ø§ÛŒØ´ Ù¾Ø§Ø³Ø®â€ŒÙ‡Ø§ Ø¨Ù‡:",
   "lists.search": "Ø¨ÛŒÙ† Ú©Ø³Ø§Ù†ÛŒ Ú©Ù‡ Ù¾ÛŒ Ù…ÛŒâ€ŒÚ¯ÛŒØ±ÛŒØ¯ Ø¨Ú¯Ø±Ø¯ÛŒØ¯",
   "lists.subheading": "ÙÙ‡Ø±Ø³Øªâ€ŒÙ‡Ø§ÛŒ Ø´Ù…Ø§",
   "load_pending": "{count, plural, one {# Ù…ÙˆØ±Ø¯ ØªØ§Ø²Ù‡} other {# Ù…ÙˆØ±Ø¯ ØªØ§Ø²Ù‡}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "ØªØºÛŒÛŒØ± ÙˆØ¶Ø¹ÛŒØª Ù†Ù…Ø§ÛŒØ§Ù†ÛŒ",
   "missing_indicator.label": "Ù¾ÛŒØ¯Ø§ Ù†Ø´Ø¯",
   "missing_indicator.sublabel": "Ø§ÛŒÙ† Ù…Ù†Ø¨Ø¹ Ù¾ÛŒØ¯Ø§ Ù†Ø´Ø¯",
+  "mute_modal.duration": "Ù…Ø¯Øª Ø²Ù…Ø§Ù†",
   "mute_modal.hide_notifications": "Ø§Ø¹Ù„Ø§Ù†â€ŒÙ‡Ø§ÛŒ Ø§ÛŒÙ† Ú©Ø§Ø±Ø¨Ø± Ù¾Ù†Ù‡Ø§Ù† Ø´ÙˆØ¯ØŸ",
+  "mute_modal.indefinite": "Ù†Ø§Ù…Ø¹Ù„ÙˆÙ…",
   "navigation_bar.apps": "Ø§Ù¾â€ŒÙ‡Ø§ÛŒ Ù…ÙˆØ¨Ø§ÛŒÙ„",
   "navigation_bar.blocks": "Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ù…Ø³Ø¯ÙˆØ¯Ø´Ø¯Ù‡",
   "navigation_bar.bookmarks": "Ù†Ø´Ø§Ù†Ú©â€ŒÙ‡Ø§",
@@ -275,7 +287,7 @@
   "navigation_bar.compose": "Ù†ÙˆØ´ØªÙ† Ø¨ÙˆÙ‚ ØªØ§Ø²Ù‡",
   "navigation_bar.direct": "Ù¾ÛŒØ§Ù…â€ŒÙ‡Ø§ÛŒ Ù…Ø³ØªÙ‚ÛŒÙ…",
   "navigation_bar.discover": "Ú¯Ø´Øª Ùˆ Ú¯Ø°Ø§Ø±",
-  "navigation_bar.domain_blocks": "Ø¯Ø§Ù…Ù†Ù‡â€ŒÙ‡Ø§ÛŒ Ù†Ù‡ÙØªÙ‡",
+  "navigation_bar.domain_blocks": "Ø¯Ø§Ù…Ù†Ù‡â€ŒÙ‡Ø§ÛŒ Ø¨Ø³ØªÙ‡",
   "navigation_bar.edit_profile": "ÙˆÛŒØ±Ø§ÛŒØ´ Ù†Ù…Ø§ÛŒÙ‡",
   "navigation_bar.favourites": "Ù¾Ø³Ù†Ø¯ÛŒØ¯Ù‡â€ŒÙ‡Ø§",
   "navigation_bar.filters": "ÙˆØ§Ú˜Ú¯Ø§Ù† Ø®Ù…ÙˆØ´",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Ù†Ø¸Ø±Ø³Ù†Ø¬ÛŒ Ø´Ù…Ø§ Ø¨Ù‡ Ù¾Ø§ÛŒØ§Ù† Ø±Ø³ÛŒØ¯",
   "notification.poll": "Ù†Ø¸Ø±Ø³Ù†Ø¬ÛŒâ€ŒØ§ÛŒ Ú©Ù‡ Ø¯Ø± Ø¢Ù† Ø±Ø£ÛŒ Ø¯Ø§Ø¯ÛŒØ¯ Ø¨Ù‡ Ù¾Ø§ÛŒØ§Ù† Ø±Ø³ÛŒØ¯Ù‡ Ø§Ø³Øª",
   "notification.reblog": "â€«{name}â€¬ ÙˆØ¶Ø¹ÛŒØªØªØ§Ù† Ø±Ø§ ØªÙ‚ÙˆÛŒØª Ú©Ø±Ø¯",
+  "notification.status": "{name} Ú†ÛŒØ²ÛŒ ÙØ±Ø³ØªØ§Ø¯",
   "notifications.clear": "Ù¾Ø§Ú©â€ŒÚ©Ø±Ø¯Ù† Ø§Ø¹Ù„Ø§Ù†â€ŒÙ‡Ø§",
   "notifications.clear_confirmation": "Ù…Ø·Ù…Ø¦Ù†ÛŒØ¯ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ù‡Ù…Ù‡Ù” Ø§Ø¹Ù„Ø§Ù†â€ŒÙ‡Ø§ÛŒØªØ§Ù† Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ù‡Ù…ÛŒØ´Ù‡ Ù¾Ø§Ú© Ú©Ù†ÛŒØ¯ØŸ",
   "notifications.column_settings.alert": "Ø§Ø¹Ù„Ø§Ù†â€ŒÙ‡Ø§ÛŒ Ù…ÛŒØ²Ú©Ø§Ø±",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Ø¨Ø§Ø²Ø¨ÙˆÙ‚â€ŒÙ‡Ø§:",
   "notifications.column_settings.show": "Ù†Ù…Ø§ÛŒØ´ Ø¯Ø± Ø³ØªÙˆÙ†",
   "notifications.column_settings.sound": "Ù¾Ø®Ø´ ØµØ¯Ø§",
+  "notifications.column_settings.status": "Ø¨ÙˆÙ‚â€ŒÙ‡Ø§ÛŒ Ø¬Ø¯ÛŒØ¯:",
   "notifications.filter.all": "Ù‡Ù…Ù‡",
   "notifications.filter.boosts": "Ø¨Ø§Ø²Ø¨ÙˆÙ‚â€ŒÙ‡Ø§",
   "notifications.filter.favourites": "Ù¾Ø³Ù†Ø¯Ù‡Ø§",
   "notifications.filter.follows": "Ù¾ÛŒÚ¯ÛŒØ±ÛŒâ€ŒÙ‡Ø§",
   "notifications.filter.mentions": "Ù†Ø§Ù…â€ŒØ¨Ø±Ø¯Ù†â€ŒÙ‡Ø§",
   "notifications.filter.polls": "Ù†ØªØ§ÛŒØ¬ Ù†Ø¸Ø±Ø³Ù†Ø¬ÛŒ",
+  "notifications.filter.statuses": "Ø¨Ù‡â€ŒØ±ÙˆØ² Ø±Ø³Ø§Ù†ÛŒâ€ŒÙ‡Ø§ Ø§Ø² Ú©Ø³Ø§Ù†ÛŒ Ú©Ù‡ Ù¾ÛŒâ€ŒÚ¯ÛŒØ±Ø´Ø§Ù†ÛŒØ¯",
+  "notifications.grant_permission": "Ø§Ø¹Ø·Ø§ÛŒ Ù…Ø¬ÙˆØ².",
   "notifications.group": "{count} Ø§Ø¹Ù„Ø§Ù†",
+  "notifications.mark_as_read": "Ù†Ø´Ø§Ù†Ù‡â€ŒÚ¯Ø°Ø§Ø±ÛŒ Ù‡Ù…Ù‡Ù” Ø¢Ú¯Ø§Ù‡ÛŒâ€ŒÙ‡Ø§ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† Ø®ÙˆØ§Ù†Ø¯Ù‡â€ŒØ´Ø¯Ù‡",
+  "notifications.permission_denied": "Ø¢Ú¯Ø§Ù‡ÛŒâ€ŒÙ‡Ø§ÛŒ Ù…ÛŒØ²Ú©Ø§Ø± Ø¨Ù‡ Ø¯Ù„ÛŒÙ„ Ø±Ø¯ Ú©Ø±Ø¯Ù† Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø§Ø¬Ø§Ø²Ù‡Ù” Ù¾ÛŒØ´ÛŒÙ† Ù…Ø±ÙˆØ±Ú¯Ø±ØŒ Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù†ÛŒØ³ØªÙ†Ø¯",
+  "notifications.permission_denied_alert": "Ø§Ø² Ø¢Ù†â€ŒØ¬Ø§ Ú©Ù‡ Ù¾ÛŒØ´ Ø§Ø² Ø§ÛŒÙ† Ø§Ø¬Ø§Ø²Ù‡Ù” Ù…Ø±ÙˆØ±Ú¯Ø± Ø±Ø¯ Ø´Ø¯Ù‡ Ø§Ø³ØªØŒ Ø¢Ú¯Ø§Ù‡ÛŒâ€ŒÙ‡Ø§ÛŒ Ù…ÛŒØ²Ú©Ø§Ø± Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ù†Ø¯ Ø¨Ù‡ Ú©Ø§Ø± Ø¨ÛŒÙØªÙ†Ø¯",
+  "notifications.permission_required": "Ø§Ø¹Ù„Ø§Ù†â€ŒÙ‡Ø§ÛŒ Ù…ÛŒØ²Ú©Ø§Ø± Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù†ÛŒØ³ØªÙ†Ø¯ Ø²ÛŒØ±Ø§ Ù†ÛŒØ§Ø²Ù…Ù†Ø¯ Ù…Ø¬ÙˆØ²ÛŒ Ù‡Ø³ØªÙ†Ø¯ Ú©Ù‡ Ø§Ø¹Ø·Ø§ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª.",
+  "notifications_permission_banner.enable": "Ø¨Ù‡ Ú©Ø§Ø± Ø§Ù†Ø¯Ø§Ø®ØªÙ† Ø¢Ú¯Ø§Ù‡ÛŒâ€ŒÙ‡Ø§ÛŒ Ù…ÛŒØ²Ú©Ø§Ø±",
+  "notifications_permission_banner.how_to_control": "Ø§Ú¯Ø± Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ ØØªÛŒ Ø²Ù…Ø§Ù†ÛŒ Ú©Ù‡ Ù…Ø§Ø³ØªÙˆØ¯ÙˆÙ† Ø¨Ø§Ø² Ù†ÛŒØ³Øª Ø§Ø¹Ù„Ø§Ù†â€ŒÙ‡Ø§ Ù†Ù…Ø§ÛŒØ´ ÛŒØ§Ø¨Ù†Ø¯ØŒ Ø§Ø¹Ù„Ø§Ù†â€ŒÙ‡Ø§ÛŒ Ù…ÛŒØ²Ú©Ø§Ø± Ø±Ø§ ÙØ¹Ø§Ù„ Ú©Ù†ÛŒØ¯. Ø¨Ù‡ Ù…ØØ¶ ÙØ¹Ø§Ù„ Ø´Ø¯Ù† Ø§Ø² Ø·Ø±ÛŒÙ‚ Ø¯Ú©Ù…Ù‡ {icon} Ø¨Ø§Ù„Ø§ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ø¨Ù‡ Ø¯Ù‚Øª Ú©Ù†ØªØ±Ù„ Ú©Ù†ÛŒØ¯ Ú©Ù‡ Ú†Ù‡ Ù†ÙˆØ¹ Ø§Ø² ØªØ¹Ø§Ù…Ù„â€ŒÙ‡Ø§ Ø¨Ø§Ø¹Ø« ØµØ§Ø¯Ø± Ø´Ø¯Ù† Ø§Ø¹Ù„Ø§Ù†â€ŒÙ‡Ø§ Ø´ÙˆÙ†Ø¯.",
+  "notifications_permission_banner.title": "Ù‡Ø±Ú¯Ø² Ú†ÛŒØ²ÛŒ Ø±Ø§ Ø§Ø² Ø¯Ø³Øª Ù†Ø¯Ù‡ÛŒØ¯",
+  "picture_in_picture.restore": "Ø¨Ø±Ú¯Ø±Ø¯Ø§Ù†Ø¯Ù†",
   "poll.closed": "Ù¾Ø§ÛŒØ§Ù†â€ŒÛŒØ§ÙØªÙ‡",
   "poll.refresh": "Ø¨Ù‡â€ŒØ±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ",
   "poll.total_people": "{count, plural, one {# Ù†ÙØ±} other {# Ù†ÙØ±}}",
@@ -389,7 +413,7 @@
   "status.pinned": "Ø¨ÙˆÙ‚ Ø«Ø§Ø¨Øª",
   "status.read_more": "Ø¨ÛŒØ´ØªØ± Ø¨Ø®ÙˆØ§Ù†ÛŒØ¯",
   "status.reblog": "Ø¨Ø§Ø²Ø¨ÙˆÙ‚ÛŒØ¯Ù†",
-  "status.reblog_private": "Ø¨Ø§Ø²Ø¨ÙˆÙ‚ Ø¨Ù‡ Ù…Ø®Ø§Ø·Ø¨Ø§Ù† Ø§ÙˆÙ„ÛŒÙ‡",
+  "status.reblog_private": "ØªÙ‚ÙˆÛŒØª Ø¨Ø±Ø§ÛŒ Ù…Ø®Ø§Ø·Ø¨Ø§Ù† Ù†Ø®Ø³ØªÛŒÙ†",
   "status.reblogged_by": "â€«{name}â€¬ Ø¨Ø§Ø²Ø¨ÙˆÙ‚ÛŒØ¯",
   "status.reblogs.empty": "Ù‡Ù†ÙˆØ² Ù‡ÛŒÚ† Ú©Ø³ÛŒ Ø§ÛŒÙ† Ø¨ÙˆÙ‚ Ø±Ø§ Ø¨Ø§Ø²Ù†Ø¨ÙˆÙ‚ÛŒØ¯Ù‡ Ø§Ø³Øª. ÙˆÙ‚ØªÛŒ Ú©Ø³ÛŒ Ú†Ù†ÛŒÙ† Ú©Ø§Ø±ÛŒ Ú©Ù†Ø¯ØŒ Ø§ÛŒÙ†â€ŒØ¬Ø§ Ù†Ù…Ø§ÛŒØ´ Ø®ÙˆØ§Ù‡Ø¯ ÛŒØ§ÙØª.",
   "status.redraft": "Ù¾Ø§Ú©â€ŒÚ©Ø±Ø¯Ù† Ùˆ Ø¨Ø§Ø²Ù†ÙˆÛŒØ³ÛŒ",
@@ -398,7 +422,7 @@
   "status.replyAll": "Ù¾Ø§Ø³Ø® Ø¨Ù‡ Ø±Ø´ØªÙ‡",
   "status.report": "Ú¯Ø²Ø§Ø±Ø´ @{name}",
   "status.sensitive_warning": "Ù…ØØªÙˆØ§ÛŒ ØØ³Ø§Ø³",
-  "status.share": "Ù‡Ù…â€ŒØ±Ø³Ø§Ù†ÛŒ",
+  "status.share": "Ù‡Ù…Ø±Ø³Ø§Ù†ÛŒ",
   "status.show_less": "Ù†Ù…Ø§ÛŒØ´ Ú©Ù…ØªØ±",
   "status.show_less_all": "Ù†Ù…Ø§ÛŒØ´ Ú©Ù…ØªØ± Ù‡Ù…Ù‡",
   "status.show_more": "Ù†Ù…Ø§ÛŒØ´ Ø¨ÛŒØ´ØªØ±",
@@ -430,7 +454,7 @@
   "units.short.million": "{count}Ù…ÛŒÙ„ÛŒÙˆÙ†",
   "units.short.thousand": "{count}Ù‡Ø²Ø§Ø±",
   "upload_area.title": "Ø¨Ø±Ø§ÛŒ Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ø¨Ù‡ Ø§ÛŒÙ†â€ŒØ¬Ø§ Ø¨Ú©Ø´ÛŒØ¯",
-  "upload_button.label": "Ø§ÙØ²ÙˆØ¯Ù† Ø±Ø³Ø§Ù†Ù‡ ({formats})",
+  "upload_button.label": "Ø§ÙØ²ÙˆØ¯Ù† Ø±Ø³Ø§Ù†Ù‡",
   "upload_error.limit": "Ø§Ø² ØØ¯ Ù…Ø¬Ø§Ø² Ø¨Ø§Ú¯Ø°Ø§Ø±ÛŒ Ù¾Ø±ÙˆÙ†Ø¯Ù‡ ÙØ±Ø§ØªØ± Ø±ÙØªÛŒØ¯.",
   "upload_error.poll": "Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø¯Ø± Ù†Ø¸Ø±Ø³Ù†Ø¬ÛŒâ€ŒÙ‡Ø§ Ù…Ø¬Ø§Ø² Ù†ÛŒØ³Øª.",
   "upload_form.audio_description": "Ø¨Ø±Ø§ÛŒ Ù†Ø§Ø´Ù†ÙˆØ§ÛŒØ§Ù† ØªÙˆØµÛŒÙØ´ Ú©Ù†ÛŒØ¯",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "ØªØ´Ø®ÛŒØµ Ù…ØªÙ† Ø¯Ø±ÙˆÙ† Ø¹Ú©Ø³",
   "upload_modal.edit_media": "ÙˆÛŒØ±Ø§ÛŒØ´ Ø±Ø³Ø§Ù†Ù‡",
   "upload_modal.hint": "ØØªÛŒ Ø§Ú¯Ø± ØªØµÙˆÛŒØ± Ø¨Ø±ÛŒØ¯Ù‡ ÛŒØ§ Ú©ÙˆÚ†Ú© Ø´ÙˆØ¯ØŒ Ù†Ù‚Ø·Ù‡Ù” Ú©Ø§Ù†ÙˆÙ†ÛŒ Ø¢Ù† Ù‡Ù…ÛŒØ´Ù‡ Ø¯ÛŒØ¯Ù‡ Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯. Ù†Ù‚Ø·Ù‡Ù” Ú©Ø§Ù†ÙˆÙ†ÛŒ Ø±Ø§ Ø¨Ø§ Ú©Ù„ÛŒÚ© ÛŒØ§ Ø¬Ø§Ø¨Ù‡â€ŒØ¬Ø§ Ú©Ø±Ø¯Ù† Ø¢Ù† ØªÙ†Ø¸ÛŒÙ… Ú©Ù†ÛŒØ¯.",
+  "upload_modal.preparing_ocr": "Ø¯Ø± ØØ§Ù„ Ø¢Ù…Ø§Ø¯Ù‡ Ø³Ø§Ø²ÛŒ OCRâ€¦",
   "upload_modal.preview_label": "Ù¾ÛŒØ´â€ŒÙ†Ù…Ø§ÛŒØ´ ({ratio})",
   "upload_progress.label": "Ø¯Ø± ØØ§Ù„ Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒâ€¦",
   "video.close": "Ø¨Ø³ØªÙ† ÙˆÛŒØ¯ÛŒÙˆ",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 44589aa4afb3e9a8424289e62ef860a577d539d4..8916d4339d992076fae7fe581d6e412e203248b6 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -1,16 +1,18 @@
 {
-  "account.account_note_header": "Note",
+  "account.account_note_header": "Muistiinpanot",
   "account.add_or_remove_from_list": "LisÃ¤Ã¤ tai poista listoilta",
   "account.badges.bot": "Botti",
   "account.badges.group": "RyhmÃ¤",
   "account.block": "EstÃ¤ @{name}",
   "account.block_domain": "Piilota kaikki sisÃ¤ltÃ¶ verkkotunnuksesta {domain}",
   "account.blocked": "Estetty",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Selaile lisÃ¤Ã¤ alkuperÃ¤isellÃ¤ palvelimella",
   "account.cancel_follow_request": "Peruuta seurauspyyntÃ¶",
   "account.direct": "Viesti kÃ¤yttÃ¤jÃ¤lle @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Verkko-osoite piilotettu",
   "account.edit_profile": "Muokkaa profiilia",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Suosittele profiilissasi",
   "account.follow": "Seuraa",
   "account.followers": "Seuraajaa",
@@ -43,7 +45,7 @@
   "account.unfollow": "Lakkaa seuraamasta",
   "account.unmute": "Poista kÃ¤yttÃ¤jÃ¤n @{name} mykistys",
   "account.unmute_notifications": "Poista mykistys kÃ¤yttÃ¤jÃ¤n @{name} ilmoituksilta",
-  "account_note.placeholder": "Click to add a note",
+  "account_note.placeholder": "LisÃ¤Ã¤ muistiinpano napsauttamalla",
   "alert.rate_limited.message": "YritÃ¤ uudestaan {retry_time, time, medium} jÃ¤lkeen.",
   "alert.rate_limited.title": "MÃ¤Ã¤rÃ¤Ã¤ rajoitettu",
   "alert.unexpected.message": "Tapahtui odottamaton virhe.",
@@ -79,7 +81,7 @@
   "column_header.show_settings": "NÃ¤ytÃ¤ asetukset",
   "column_header.unpin": "Poista kiinnitys",
   "column_subheading.settings": "Asetukset",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Vain paikalliset",
   "community.column_settings.media_only": "Vain media",
   "community.column_settings.remote_only": "Remote only",
   "compose_form.direct_message_warning": "TÃ¤mÃ¤ tuuttaus nÃ¤kyy vain mainituille kÃ¤yttÃ¤jille.",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Hakutulokset",
   "emoji_button.symbols": "Symbolit",
   "emoji_button.travel": "Matkailu",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Ei ole 'toots' tÃ¤Ã¤llÃ¤!",
   "empty_column.account_unavailable": "Profiilia ei lÃ¶ydy",
   "empty_column.blocks": "Et ole vielÃ¤ estÃ¤nyt yhtÃ¤Ã¤n kÃ¤yttÃ¤jÃ¤Ã¤.",
@@ -166,13 +169,15 @@
   "empty_column.notifications": "Sinulle ei ole vielÃ¤ ilmoituksia. Aloita keskustelu juttelemalla muille.",
   "empty_column.public": "TÃ¤Ã¤llÃ¤ ei ole mitÃ¤Ã¤n! Saat sisÃ¤ltÃ¶Ã¤, kun kirjoitat jotain julkisesti tai kÃ¤yt seuraamassa muiden instanssien kÃ¤yttÃ¤jiÃ¤",
   "error.unexpected_crash.explanation": "Sivua ei voi nÃ¤yttÃ¤Ã¤ oikein, johtuen bugista tai ongelmasta selaimen yhteensopivuudessa.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Kokeile pÃ¤ivittÃ¤Ã¤ sivu. Jos tÃ¤mÃ¤ ei auta, saatat yhÃ¤ pystyÃ¤ kÃ¤yttÃ¤mÃ¤Ã¤n Mastodonia toisen selaimen tai sovelluksen kautta.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Kopioi stacktrace leikepÃ¶ydÃ¤lle",
   "errors.unexpected_crash.report_issue": "Ilmoita ongelmasta",
   "follow_request.authorize": "Valtuuta",
   "follow_request.reject": "HylkÃ¤Ã¤",
   "follow_requests.unlocked_explanation": "Vaikka tilisi ei ole lukittu, {domain} yllÃ¤pitÃ¤jien mielestÃ¤ haluat tarkistaa nÃ¤iden tilien seurauspyynnÃ¶t manuaalisesti.",
-  "generic.saved": "Saved",
+  "generic.saved": "Tallennettu",
   "getting_started.developers": "KehittÃ¤jille",
   "getting_started.directory": "Profiilihakemisto",
   "getting_started.documentation": "Documentaatio",
@@ -242,7 +247,7 @@
   "keyboard_shortcuts.reply": "vastaa",
   "keyboard_shortcuts.requests": "avaa lista seurauspyynnÃ¶istÃ¤",
   "keyboard_shortcuts.search": "siirry hakukenttÃ¤Ã¤n",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "nÃ¤yttÃ¤Ã¤ksesi/piilottaaksesi CW kentÃ¤n",
   "keyboard_shortcuts.start": "avaa \"Aloitus\" -sarake",
   "keyboard_shortcuts.toggle_hidden": "nÃ¤ytÃ¤/piilota sisÃ¤ltÃ¶varoituksella merkitty teksti",
   "keyboard_shortcuts.toggle_sensitivity": "nÃ¤ytÃ¤/piilota media",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "siirry pois tekstikentÃ¤stÃ¤ tai hakukentÃ¤stÃ¤",
   "keyboard_shortcuts.up": "siirry listassa ylÃ¶spÃ¤in",
   "lightbox.close": "Sulje",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Seuraava",
   "lightbox.previous": "Edellinen",
-  "lightbox.view_context": "NÃ¤ytÃ¤ kontekstissa",
   "lists.account.add": "LisÃ¤Ã¤ listaan",
   "lists.account.remove": "Poista listasta",
   "lists.delete": "Poista lista",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Vaihda otsikko",
   "lists.new.create": "LisÃ¤Ã¤ lista",
   "lists.new.title_placeholder": "Uuden listan nimi",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Etsi seuraamistasi henkilÃ¶istÃ¤",
   "lists.subheading": "Omat listat",
   "load_pending": "{count, plural, one {# uusi kappale} other {# uutta kappaletta}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "SÃ¤Ã¤dÃ¤ nÃ¤kyvyyttÃ¤",
   "missing_indicator.label": "Ei lÃ¶ytynyt",
   "missing_indicator.sublabel": "TÃ¤tÃ¤ resurssia ei lÃ¶ytynyt",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Piilota tÃ¤ltÃ¤ kÃ¤yttÃ¤jÃ¤ltÃ¤ tulevat ilmoitukset?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobiilisovellukset",
   "navigation_bar.blocks": "Estetyt kÃ¤yttÃ¤jÃ¤t",
   "navigation_bar.bookmarks": "Kirjanmerkit",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Kyselysi on pÃ¤Ã¤ttynyt",
   "notification.poll": "Kysely, johon osallistuit, on pÃ¤Ã¤ttynyt",
   "notification.reblog": "{name} buustasi tilaasi",
+  "notification.status": "{name} just posted",
   "notifications.clear": "TyhjennÃ¤ ilmoitukset",
   "notifications.clear_confirmation": "Haluatko varmasti poistaa kaikki ilmoitukset pysyvÃ¤sti?",
   "notifications.column_settings.alert": "TyÃ¶pÃ¶ytÃ¤ilmoitukset",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Buustit:",
   "notifications.column_settings.show": "NÃ¤ytÃ¤ sarakkeessa",
   "notifications.column_settings.sound": "Ã„Ã¤nimerkki",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "Kaikki",
   "notifications.filter.boosts": "Buustit",
   "notifications.filter.favourites": "Suosikit",
   "notifications.filter.follows": "Seuraa",
   "notifications.filter.mentions": "Maininnat",
   "notifications.filter.polls": "Kyselyn tulokset",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} ilmoitusta",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Suljettu",
   "poll.refresh": "PÃ¤ivitÃ¤",
   "poll.total_people": "{count, plural, one {# henkilÃ¶} other {# henkilÃ¶Ã¤}}",
@@ -420,15 +444,15 @@
   "time_remaining.moments": "Hetki jÃ¤ljellÃ¤",
   "time_remaining.seconds": "{number, plural, one {# sekunti} other {# sekuntia}} jÃ¤ljellÃ¤",
   "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
+  "timeline_hint.resources.followers": "Seuraajat",
+  "timeline_hint.resources.follows": "Seuraa",
+  "timeline_hint.resources.statuses": "Vanhemmat tuuttaukset",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
   "trends.trending_now": "Suosittua nyt",
   "ui.beforeunload": "Luonnos hÃ¤viÃ¤Ã¤, jos poistut Mastodonista.",
   "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
+  "units.short.million": "{count}m",
+  "units.short.thousand": "{count}k",
   "upload_area.title": "Lataa raahaamalla ja pudottamalla tÃ¤hÃ¤n",
   "upload_button.label": "LisÃ¤Ã¤ mediaa",
   "upload_error.limit": "Tiedostolatauksien raja ylitetty.",
@@ -436,16 +460,17 @@
   "upload_form.audio_description": "Kuvaile kuulovammaisille",
   "upload_form.description": "Anna kuvaus nÃ¤kÃ¶rajoitteisia varten",
   "upload_form.edit": "Muokkaa",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "Vaihda pikkukuva",
   "upload_form.undo": "Peru",
   "upload_form.video_description": "Kuvaile kuulo- tai nÃ¤kÃ¶vammaisille",
   "upload_modal.analyzing_picture": "Analysoidaan kuvaaâ€¦",
   "upload_modal.apply": "KÃ¤ytÃ¤",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "Valitse kuva",
   "upload_modal.description_placeholder": "ErÃ¤Ã¤nÃ¤ jÃ¤Ã¤tÃ¤vÃ¤nÃ¤ ja pimeÃ¤nÃ¤ yÃ¶nÃ¤ gorilla ratkaisi sudokun kahdessa minuutissa",
   "upload_modal.detect_text": "Tunnista teksti kuvasta",
   "upload_modal.edit_media": "Muokkaa mediaa",
   "upload_modal.hint": "Klikkaa tai vedÃ¤ ympyrÃ¤ esikatselussa valitaksesi keskipiste, joka nÃ¤kyy aina pienoiskuvissa.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Esikatselu ({ratio})",
   "upload_progress.label": "Ladataan...",
   "video.close": "Sulje video",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 6376ca35112714dabeff88e203b15723b773041d..214f3aeea687d9507831a72ebdaf64c6dda2a9a0 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Parcourir davantage sur le profil original",
   "account.cancel_follow_request": "Annuler la demande de suivi",
   "account.direct": "Envoyer un message direct Ã  @{name}",
+  "account.disable_notifications": "ArrÃªter de me notifier quand @{name} publie",
   "account.domain_blocked": "Domaine bloquÃ©",
   "account.edit_profile": "Modifier le profil",
+  "account.enable_notifications": "Me notifier quand @{name} publie",
   "account.endorse": "Recommander sur le profil",
   "account.follow": "Suivre",
   "account.followers": "AbonnÃ©Â·eÂ·s",
@@ -97,7 +99,7 @@
   "compose_form.publish": "Pouet",
   "compose_form.publish_loud": "{publish}â€¯!",
   "compose_form.sensitive.hide": "Marquer le mÃ©dia comme sensible",
-  "compose_form.sensitive.marked": "MÃ©dia marquÃ© comme sensible",
+  "compose_form.sensitive.marked": "{count, plural, one {Le mÃ©dia est marquÃ© comme sensible} other {Les mÃ©dias sont marquÃ©s comme sensibles}}",
   "compose_form.sensitive.unmarked": "Le mÃ©dia nâ€™est pas marquÃ© comme sensible",
   "compose_form.spoiler.marked": "Le texte est cachÃ© derriÃ¨re un avertissement",
   "compose_form.spoiler.unmarked": "Le texte nâ€™est pas cachÃ©",
@@ -147,13 +149,14 @@
   "emoji_button.search_results": "RÃ©sultats de la recherche",
   "emoji_button.symbols": "Symboles",
   "emoji_button.travel": "Lieux & Voyages",
+  "empty_column.account_suspended": "Compte suspendu",
   "empty_column.account_timeline": "Aucun pouet ici !",
   "empty_column.account_unavailable": "Profil non disponible",
   "empty_column.blocks": "Vous nâ€™avez bloquÃ© aucunÂ·e utilisateurÂ·rice pour le moment.",
   "empty_column.bookmarked_statuses": "Vous n'avez pas de pouets enregistrÃ©s comme marque-pages pour le moment. Lorsque vous en ajouterez un, il apparaÃ®tra ici.",
   "empty_column.community": "Le fil public local est vide. Ã‰crivez donc quelque chose pour le remplirâ€¯!",
   "empty_column.direct": "Vous nâ€™avez pas encore de messages directs. Lorsque vous en enverrez ou recevrez un, il sâ€™affichera ici.",
-  "empty_column.domain_blocks": "Il nâ€™y a aucun domaine cachÃ© pour le moment.",
+  "empty_column.domain_blocks": "Il nâ€™y a aucun domaine bloquÃ© pour le moment.",
   "empty_column.favourited_statuses": "Vous nâ€™avez aucun pouet favoris pour le moment. Lorsque vous en mettrez un en favori, il apparaÃ®tra ici.",
   "empty_column.favourites": "Personne nâ€™a encore mis ce pouet en favori. Lorsque quelquâ€™un le fera, il apparaÃ®tra ici.",
   "empty_column.follow_requests": "Vous nâ€™avez pas encore de demande de suivi. Lorsque vous en recevrez une, elle apparaÃ®tra ici.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Vous nâ€™avez pas encore de notification. Interagissez avec dâ€™autres personnes pour dÃ©buter la conversation.",
   "empty_column.public": "Il nâ€™y a rien iciâ€¯! Ã‰crivez quelque chose publiquement, ou bien suivez manuellement des personnes dâ€™autres serveurs pour remplir le fil public",
   "error.unexpected_crash.explanation": "En raison dâ€™un bug dans notre code ou dâ€™un problÃ¨me de compatibilitÃ© avec votre navigateur, cette page nâ€™a pas pu Ãªtre affichÃ©e correctement.",
+  "error.unexpected_crash.explanation_addons": "Cette page nâ€™a pas pu Ãªtre affichÃ©e correctement. Cette erreur est probablement causÃ©e par une extension de navigateur ou des outils de traduction automatique.",
   "error.unexpected_crash.next_steps": "Essayez de rafraÃ®chir la page. Si cela nâ€™aide pas, vous pouvez toujours utiliser Mastodon via un autre navigateur ou une application native.",
+  "error.unexpected_crash.next_steps_addons": "Essayez de les dÃ©sactiver et de rafraÃ®chir la page. Si cela ne vous aide pas, vous pouvez toujours utiliser Mastodon via un autre navigateur ou une application native.",
   "errors.unexpected_crash.copy_stacktrace": "Copier la trace d'appels dans le presse-papier",
   "errors.unexpected_crash.report_issue": "Signaler le problÃ¨me",
   "follow_request.authorize": "Accepter",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "quitter la zone de rÃ©daction/recherche",
   "keyboard_shortcuts.up": "remonter dans la liste",
   "lightbox.close": "Fermer",
+  "lightbox.compress": "Compresser la fenÃªtre de visualisation des images",
+  "lightbox.expand": "Agrandir la fenÃªtre de visualisation des images",
   "lightbox.next": "Suivant",
   "lightbox.previous": "PrÃ©cÃ©dent",
-  "lightbox.view_context": "Voir le contexte",
   "lists.account.add": "Ajouter Ã  la liste",
   "lists.account.remove": "Supprimer de la liste",
   "lists.delete": "Supprimer la liste",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Modifier le titre",
   "lists.new.create": "Ajouter une liste",
   "lists.new.title_placeholder": "Titre de la nouvelle liste",
+  "lists.replies_policy.followed": "Nâ€™importe quelÂ·le utilisateurÂ·rice suiviÂ·e",
+  "lists.replies_policy.list": "Membres de la liste",
+  "lists.replies_policy.none": "Personne",
+  "lists.replies_policy.title": "Afficher les rÃ©ponses Ã  :",
   "lists.search": "Rechercher parmi les gens que vous suivez",
   "lists.subheading": "Vos listes",
   "load_pending": "{count, plural, one {# nouvel Ã©lÃ©ment} other {# nouveaux Ã©lÃ©ments}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Intervertir la visibilitÃ©",
   "missing_indicator.label": "Non trouvÃ©",
   "missing_indicator.sublabel": "Ressource introuvable",
+  "mute_modal.duration": "DurÃ©e",
   "mute_modal.hide_notifications": "Masquer les notifications de cette personneâ€¯?",
+  "mute_modal.indefinite": "IndÃ©finie",
   "navigation_bar.apps": "Applications mobiles",
   "navigation_bar.blocks": "Comptes bloquÃ©s",
   "navigation_bar.bookmarks": "Marque-pages",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Votre sondage est terminÃ©",
   "notification.poll": "Un sondage auquel vous avez participÃ© vient de se terminer",
   "notification.reblog": "{name} a partagÃ© votre statut",
+  "notification.status": "{name} vient de publier",
   "notifications.clear": "Effacer les notifications",
   "notifications.clear_confirmation": "Voulez-vous vraiment effacer toutes vos notificationsâ€¯?",
   "notifications.column_settings.alert": "Notifications du navigateur",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Partagesâ€¯:",
   "notifications.column_settings.show": "Afficher dans la colonne",
   "notifications.column_settings.sound": "Ã‰mettre un son",
+  "notifications.column_settings.status": "Nouveaux pouets :",
   "notifications.filter.all": "Tout",
   "notifications.filter.boosts": "Partages",
   "notifications.filter.favourites": "Favoris",
   "notifications.filter.follows": "AbonnÃ©s",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "RÃ©sultats des sondages",
+  "notifications.filter.statuses": "Mises Ã  jour des personnes que vous suivez",
+  "notifications.grant_permission": "Accorder lâ€™autorisation.",
   "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Marquer toutes les notifications comme lues",
+  "notifications.permission_denied": "Impossible dâ€™activer les notifications de bureau car lâ€™autorisation a Ã©tÃ© refusÃ©e.",
+  "notifications.permission_denied_alert": "Les notifications de bureau ne peuvent pas Ãªtre activÃ©es, car lâ€™autorisation du navigateur a Ã©tÃ© refusÃ©e avant",
+  "notifications.permission_required": "Les notifications de bureau ne sont pas disponibles car lâ€™autorisation requise nâ€™a pas Ã©tÃ© accordÃ©e.",
+  "notifications_permission_banner.enable": "Activer les notifications de bureau",
+  "notifications_permission_banner.how_to_control": "Pour recevoir des notifications lorsque Mastodon nâ€™est pas ouvert, activez les notifications du bureau. Vous pouvez contrÃ´ler prÃ©cisÃ©ment quels types dâ€™interactions gÃ©nÃ¨rent des notifications de bureau via le bouton {icon} ci-dessus une fois quâ€™elles sont activÃ©es.",
+  "notifications_permission_banner.title": "Toujours au courant",
+  "picture_in_picture.restore": "Remettre en place",
   "poll.closed": "FermÃ©",
   "poll.refresh": "Actualiser",
   "poll.total_people": "{count, plural, one {# personne} other {# personnes}}",
@@ -414,8 +438,8 @@
   "tabs_bar.local_timeline": "Fil public local",
   "tabs_bar.notifications": "Notifications",
   "tabs_bar.search": "Chercher",
-  "time_remaining.days": "{number, plural, one {# day} other {# days}} restants",
-  "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} restantes",
+  "time_remaining.days": "{number, plural, one {# jour} other {# jours}} restantÂ·s",
+  "time_remaining.hours": "{number, plural, one {# heure} other {# heures}} restantes",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} restantes",
   "time_remaining.moments": "Encore quelques instants",
   "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} restantes",
@@ -423,14 +447,14 @@
   "timeline_hint.resources.followers": "Les abonnÃ©s",
   "timeline_hint.resources.follows": "Les abonnements",
   "timeline_hint.resources.statuses": "Les anciens pouets",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} personne} other {{counter} personnes}} en parleÂ·nt",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} personne en parle} other {{counter} personnes en parlent}}",
   "trends.trending_now": "Tendance en ce moment",
   "ui.beforeunload": "Votre brouillon sera perdu si vous quittez Mastodon.",
-  "units.short.billion": "{count}B",
+  "units.short.billion": "{count}Md",
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "Glissez et dÃ©posez pour envoyer",
-  "upload_button.label": "Joindre un mÃ©dia ({formats})",
+  "upload_button.label": "Ajouter des images, une vidÃ©o ou un fichier audio",
   "upload_error.limit": "Taille maximale d'envoi de fichier dÃ©passÃ©e.",
   "upload_error.poll": "Lâ€™envoi de fichiers nâ€™est pas autorisÃ© avec les sondages.",
   "upload_form.audio_description": "DÃ©crire pour les personnes ayant des difficultÃ©s dâ€™audition",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "DÃ©tecter le texte de lâ€™image",
   "upload_modal.edit_media": "Modifier le mÃ©dia",
   "upload_modal.hint": "Cliquez ou faites glisser le cercle sur lâ€™aperÃ§u pour choisir le point focal qui sera toujours visible sur toutes les miniatures.",
+  "upload_modal.preparing_ocr": "PrÃ©paration de lâ€™OCRâ€¦",
   "upload_modal.preview_label": "AperÃ§u ({ratio})",
   "upload_progress.label": "Envoi en coursâ€¦",
   "video.close": "Fermer la vidÃ©o",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 5de7b27a50b6ce91d66d35304cc85246d36154a3..928742dd711ca3747ca8bd909d012898aa18ccf2 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Cancel follow request",
   "account.direct": "Direct message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Edit profile",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
   "account.follow": "Follow",
   "account.followers": "Followers",
@@ -96,9 +98,9 @@
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "Write your warning here",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No toots here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "Authorize",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
-  "lightbox.view_context": "View context",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Change title",
   "lists.new.create": "Add list",
   "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Search among people you follow",
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.alert": "Desktop notifications",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Closed",
   "poll.refresh": "Refresh",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -389,7 +413,7 @@
   "status.pinned": "Pinned toot",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploading...",
   "video.close": "Close video",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index e0180a0839e33134955e9d723c6ed3dd068bd55c..854e31554f1c76452178aa117943c2fb9c97b537 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -1,5 +1,5 @@
 {
-  "account.account_note_header": "A tÃºa nota para @{name}",
+  "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Engadir ou eliminar das listaxes",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupo",
@@ -9,14 +9,16 @@
   "account.browse_more_on_origin_server": "Busca mÃ¡is no perfil orixinal",
   "account.cancel_follow_request": "Desbotar solicitude de seguimento",
   "account.direct": "Mensaxe directa @{name}",
+  "account.disable_notifications": "Deixar de notificarme cando @{name} publica",
   "account.domain_blocked": "Dominio agochado",
   "account.edit_profile": "Editar perfil",
+  "account.enable_notifications": "Noficarme cando @{name} publique",
   "account.endorse": "Amosar no perfil",
   "account.follow": "Seguir",
   "account.followers": "Seguidoras",
   "account.followers.empty": "AÃnda ninguÃ©n segue esta usuaria.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidora} other {{counter} Seguidoras}}",
-  "account.following_counter": "{count, plural, one {} other {{counter} Seguindo}}",
+  "account.following_counter": "{count, plural, one {{counter} Seguindo} other {{counter} Seguindo}}",
   "account.follows.empty": "Esta usuaria aÃnda non segue a ninguÃ©n.",
   "account.follows_you": "SÃ©guete",
   "account.hide_reblogs": "Agochar repeticiÃ³ns de @{name}",
@@ -43,10 +45,10 @@
   "account.unfollow": "Deixar de seguir",
   "account.unmute": "Deixar de silenciar a @{name}",
   "account.unmute_notifications": "Deixar de silenciar as notificaciÃ³ns de @{name}",
-  "account_note.placeholder": "Sen comentarios",
+  "account_note.placeholder": "Preme para engadir nota",
   "alert.rate_limited.message": "TÃ©ntao novamente apÃ³s {retry_time, time, medium}.",
   "alert.rate_limited.title": "LÃmite de intentos",
-  "alert.unexpected.message": "Ocorreu un erro non agardado.",
+  "alert.unexpected.message": "Aconteceu un fallo non agardado.",
   "alert.unexpected.title": "Vaites!",
   "announcement.announcement": "Anuncio",
   "autosuggest_hashtag.per_week": "{count} por semana",
@@ -71,7 +73,7 @@
   "column.notifications": "NotificaciÃ³ns",
   "column.pins": "Toots fixados",
   "column.public": "CronoloxÃa federada",
-  "column_back_button.label": "Voltar",
+  "column_back_button.label": "Volver",
   "column_header.hide_settings": "Agochar axustes",
   "column_header.moveLeft_settings": "Mover columna cara a esquerda",
   "column_header.moveRight_settings": "Mover columna cara a dereita",
@@ -96,9 +98,9 @@
   "compose_form.poll.switch_to_single": "Mudar a enquisa para permitir unha soa escolla",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Marcar coma contido multimedia sensÃbel",
-  "compose_form.sensitive.marked": "Contido multimedia marcado coma sensÃbel",
-  "compose_form.sensitive.unmarked": "Contido multimedia non marcado coma sensÃbel",
+  "compose_form.sensitive.hide": "{count, plural, one {Marca multimedia como sensible} other {Marca multimedia como sensibles}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Multimedia marcado como sensible} other {Multimedia marcados como sensibles}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "O texto estÃ¡ agochado tras un aviso",
   "compose_form.spoiler.unmarked": "O texto non estÃ¡ agochado",
   "compose_form.spoiler_placeholder": "Escribe o teu aviso aquÃ",
@@ -107,7 +109,7 @@
   "confirmations.block.confirm": "Bloquear",
   "confirmations.block.message": "Tes a certeza de querer bloquear a {name}?",
   "confirmations.delete.confirm": "Eliminar",
-  "confirmations.delete.message": "Tes a certeza de querer eliminar este estado?",
+  "confirmations.delete.message": "Tes a certeza de querer eliminar este toot?",
   "confirmations.delete_list.confirm": "Eliminar",
   "confirmations.delete_list.message": "Tes a certeza de querer eliminar de xeito permanente esta listaxe?",
   "confirmations.domain_block.confirm": "Agochar dominio enteiro",
@@ -118,7 +120,7 @@
   "confirmations.mute.explanation": "Isto agocharÃ¡ as publicaciÃ³ns delas ou nas que as mencionen, mais permitirÃ¡ que vexan as tÃºas publicaciÃ³ns e sexan seguidoras tÃºas.",
   "confirmations.mute.message": "Tes a certeza de querer acalar a {name}?",
   "confirmations.redraft.confirm": "Eliminar e reescribir",
-  "confirmations.redraft.message": "Tes a certeza de querer eliminar este estado e reescribilo? PerderÃ¡s os compartidos e favoritos, e as respostas Ã¡ publicaciÃ³n orixinal ficarÃ¡n orfas.",
+  "confirmations.redraft.message": "Tes a certeza de querer eliminar este toot e reescribilo? PerderÃ¡s os compartidos e favoritos, e as respostas Ã¡ publicaciÃ³n orixinal ficarÃ¡n orfas.",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Responder agora sobrescribirÃ¡ a mensaxe que estÃ¡s a compor. Tes a certeza de que queres continuar?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
@@ -131,7 +133,7 @@
   "directory.local": "SÃ³ de {domain}",
   "directory.new_arrivals": "RecÃ©n chegadas",
   "directory.recently_active": "Activas recentemente",
-  "embed.instructions": "Engade este estado Ã³ teu sitio web copiando o seguinte cÃ³digo.",
+  "embed.instructions": "Engade este toot Ã³ teu sitio web copiando o seguinte cÃ³digo.",
   "embed.preview": "AsÃ serÃ¡ mostrado:",
   "emoji_button.activity": "Actividade",
   "emoji_button.custom": "Personalizado",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Resultados da procura",
   "emoji_button.symbols": "SÃmbolos",
   "emoji_button.travel": "Viaxes e Lugares",
+  "empty_column.account_suspended": "Conta suspendida",
   "empty_column.account_timeline": "Non hai toots aquÃ!",
   "empty_column.account_unavailable": "Perfil non dispoÃ±ible",
   "empty_column.blocks": "AÃnda non bloqueaches a ningÃºn usuaria.",
@@ -160,13 +163,15 @@
   "empty_column.hashtag": "AÃnda non hai nada con este cancelo.",
   "empty_column.home": "A tÃºa cronoloxÃa inicial estÃ¡ baleira! Visita {public} ou emprega a procura para atopar outras usuarias.",
   "empty_column.home.public_timeline": "a cronoloxÃa pÃºblica",
-  "empty_column.list": "AÃnda non hai nada nesta listaxe. Cando os usuarios incluÃdas na listaxe publiquen mensaxes, amosaranse aquÃ.",
+  "empty_column.list": "AÃnda non hai nada nesta listaxe. Cando as usuarias incluÃdas na listaxe publiquen mensaxes, amosaranse aquÃ.",
   "empty_column.lists": "AÃnda non tes listaxes. Cando crees unha, amosarase aquÃ.",
   "empty_column.mutes": "AÃnda non silenciaches a ningÃºnha usuaria.",
   "empty_column.notifications": "AÃnda non tes notificaciÃ³ns. InteractÃºa con outras para comezar unha conversa.",
   "empty_column.public": "Nada por aquÃ! Escribe algo de xeito pÃºblico, ou segue de xeito manual usuarias doutros servidores para ir enchÃ©ndoo",
   "error.unexpected_crash.explanation": "Debido a un erro no noso cÃ³digo ou a unha compatilidade co teu navegador, esta pÃ¡xina non pode ser amosada correctamente.",
+  "error.unexpected_crash.explanation_addons": "Non se puido mostrar correctamente a pÃ¡xina. Habitualmente este erro estÃ¡ causado por algÃºn engadido do navegador ou ferramentas de traduciÃ³n automÃ¡tica.",
   "error.unexpected_crash.next_steps": "Tenta actualizar a pÃ¡xina. Se esto non axuda podes tamÃ©n empregar Mastodon noutro navegador ou aplicaciÃ³n nativa.",
+  "error.unexpected_crash.next_steps_addons": "Intenta desactivalas e actualiza a pÃ¡xina. Se isto non funciona, podes seguir usando Mastodon nun navegador diferente ou aplicaciÃ³n nativa.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar trazas (stacktrace) Ã³ portapapeis",
   "errors.unexpected_crash.report_issue": "Informar sobre un problema",
   "follow_request.authorize": "Autorizar",
@@ -215,15 +220,15 @@
   "introduction.welcome.action": "Imos!",
   "introduction.welcome.headline": "Primeiros pasos",
   "introduction.welcome.text": "Benvida Ã³ fediverso! Nun intre poderÃ¡s difundir mensaxes e falar coas tÃºas amizades nun grande nÃºmero de servidores. Mais este servidor, {domain}, Ã© especialâ€”hospeda o teu perfil, por iso lÃ©mbra o seu nome.",
-  "keyboard_shortcuts.back": "para voltar atrÃ¡s",
+  "keyboard_shortcuts.back": "para volver atrÃ¡s",
   "keyboard_shortcuts.blocked": "abrir lista de usuarias bloqueadas",
   "keyboard_shortcuts.boost": "promover",
-  "keyboard_shortcuts.column": "para destacar un estado nunha das columnas",
+  "keyboard_shortcuts.column": "para destacar un toot nunha das columnas",
   "keyboard_shortcuts.compose": "para destacar a Ã¡rea de escritura",
   "keyboard_shortcuts.description": "DescriciÃ³n",
   "keyboard_shortcuts.direct": "para abrir a columna de mensaxes directas",
   "keyboard_shortcuts.down": "para mover cara abaixo na listaxe",
-  "keyboard_shortcuts.enter": "para abrir estado",
+  "keyboard_shortcuts.enter": "para abrir toot",
   "keyboard_shortcuts.favourite": "para engadir a favoritos",
   "keyboard_shortcuts.favourites": "para abrir a listaxe dos favoritos",
   "keyboard_shortcuts.federated": "para abrir a cronoloxÃa federada",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "para deixar de destacar a Ã¡rea de escritura/procura",
   "keyboard_shortcuts.up": "para mover cara arriba na listaxe",
   "lightbox.close": "Fechar",
+  "lightbox.compress": "Comprimir a caixa de vista da imaxe",
+  "lightbox.expand": "Expandir a caixa de vista da imaxe",
   "lightbox.next": "Seguinte",
   "lightbox.previous": "Anterior",
-  "lightbox.view_context": "Ollar contexto",
   "lists.account.add": "Engadir Ã¡ listaxe",
   "lists.account.remove": "Eliminar da listaxe",
   "lists.delete": "Eliminar listaxe",
@@ -260,14 +266,20 @@
   "lists.edit.submit": "Mudar o tÃtulo",
   "lists.new.create": "Engadir listaxe",
   "lists.new.title_placeholder": "TÃtulo da nova listaxe",
+  "lists.replies_policy.followed": "Toda usuaria seguida",
+  "lists.replies_policy.list": "Membros da lista",
+  "lists.replies_policy.none": "NinguÃ©n",
+  "lists.replies_policy.title": "Mostrar respostas a:",
   "lists.search": "Procurar entre as persoas que segues",
   "lists.subheading": "As tÃºas listaxes",
   "load_pending": "{count, plural, one {# novo elemento} other {# novos elementos}}",
   "loading_indicator.label": "Estase a cargar...",
-  "media_gallery.toggle_visible": "Trocar visibilidade",
+  "media_gallery.toggle_visible": "Agochar {number, plural, one {imaxe} other {imaxes}}",
   "missing_indicator.label": "Non atopado",
   "missing_indicator.sublabel": "Este recurso non foi atopado",
+  "mute_modal.duration": "DuraciÃ³n",
   "mute_modal.hide_notifications": "Agochar notificaciÃ³ns desta usuaria?",
+  "mute_modal.indefinite": "Indefinida",
   "navigation_bar.apps": "AplicaciÃ³ns mÃ³biles",
   "navigation_bar.blocks": "Usuarias bloqueadas",
   "navigation_bar.bookmarks": "Marcadores",
@@ -291,13 +303,14 @@
   "navigation_bar.preferences": "Preferencias",
   "navigation_bar.public_timeline": "CronoloxÃa federada",
   "navigation_bar.security": "Seguranza",
-  "notification.favourite": "{name} marcou o teu estado coma favorito",
+  "notification.favourite": "{name} marcou o teu toot coma favorito",
   "notification.follow": "{name} comezou a seguirte",
   "notification.follow_request": "{name} solicitou seguirte",
   "notification.mention": "{name} mencionoute",
   "notification.own_poll": "A tÃºa enquisa rematou",
   "notification.poll": "Unha enquisa na que votaches rematou",
-  "notification.reblog": "{name} compartiu o teu estado",
+  "notification.reblog": "{name} compartiu o teu toot",
+  "notification.status": "{name} publicou",
   "notifications.clear": "Limpar notificaciÃ³ns",
   "notifications.clear_confirmation": "Tes a certeza de querer limpar de xeito permanente todas as tÃºas notificaciÃ³ns?",
   "notifications.column_settings.alert": "NotificaciÃ³ns de escritorio",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "PromociÃ³ns:",
   "notifications.column_settings.show": "Amosar en columna",
   "notifications.column_settings.sound": "Reproducir son",
+  "notifications.column_settings.status": "Novos toots:",
   "notifications.filter.all": "Todo",
   "notifications.filter.boosts": "Compartidos",
   "notifications.filter.favourites": "Favoritos",
   "notifications.filter.follows": "Seguimentos",
   "notifications.filter.mentions": "MenciÃ³ns",
   "notifications.filter.polls": "Resultados da enquisa",
+  "notifications.filter.statuses": "ActualizaciÃ³ns de xente Ã¡ que segues",
+  "notifications.grant_permission": "Conceder permiso.",
   "notifications.group": "{count} notificaciÃ³ns",
+  "notifications.mark_as_read": "Marcar todas as notificaciÃ³ns como lidas",
+  "notifications.permission_denied": "Non se activaron as notificaciÃ³ns de escritorio porque se denegou o permiso",
+  "notifications.permission_denied_alert": "Non se poden activar as notificaciÃ³ns de escritorio, xa que o permiso para o navegador foi denegado previamente",
+  "notifications.permission_required": "As notificaciÃ³ns de escritorio non estÃ¡n dispoÃ±ibles porque non se concedeu o permiso necesario.",
+  "notifications_permission_banner.enable": "Activar notificaciÃ³ns de escritorio",
+  "notifications_permission_banner.how_to_control": "Activa as notificaciÃ³ns de escritorio para recibir notificaciÃ³ns mentras Mastodon non estÃ¡ aberto. Podes controlar de xeito preciso o tipo de interacciÃ³ns que crean as notificaciÃ³ns de escritorio a travÃ©s da {icon} superior unha vez estÃ¡n activadas.",
+  "notifications_permission_banner.title": "Non perder nada",
+  "picture_in_picture.restore": "Devolver",
   "poll.closed": "Pechado",
   "poll.refresh": "Actualizar",
   "poll.total_people": "{count, plural,one {# persoa} other {# persoas}}",
@@ -338,7 +362,7 @@
   "privacy.unlisted.long": "Non publicar nas cronoloxÃas pÃºblicas",
   "privacy.unlisted.short": "Non listado",
   "refresh": "Actualizar",
-  "regeneration_indicator.label": "Cargandoâ€¦",
+  "regeneration_indicator.label": "Estase a cargarâ€¦",
   "regeneration_indicator.sublabel": "Estase a preparar a tÃºa cronoloxÃa de inicio!",
   "relative_time.days": "{number}d",
   "relative_time.hours": "{number}h",
@@ -355,9 +379,9 @@
   "report.target": "Denunciar a {target}",
   "search.placeholder": "Procurar",
   "search_popout.search_format": "Formato de procura avanzada",
-  "search_popout.tips.full_text": "Texto simple devolve estados que ti escribiches, promoviches, marcaches favoritos, ou foches mencionada, asÃ como nomes de usuaria coincidentes, nomes pÃºblicos e cancelos.",
+  "search_popout.tips.full_text": "Texto simple devolve toots que ti escribiches, promoviches, marcaches favoritos, ou foches mencionada, asÃ como nomes de usuaria coincidentes, nomes pÃºblicos e cancelos.",
   "search_popout.tips.hashtag": "cancelo",
-  "search_popout.tips.status": "estado",
+  "search_popout.tips.status": "toot",
   "search_popout.tips.text": "Texto simple devolve coincidencias con nomes pÃºblicos, nomes de usuaria e cancelos",
   "search_popout.tips.user": "usuaria",
   "search_results.accounts": "Persoas",
@@ -366,12 +390,12 @@
   "search_results.statuses_fts_disabled": "Procurar toots polo seu contido non estÃ¡ activado neste servidor do Mastodon.",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
   "status.admin_account": "Abrir interface de moderaciÃ³n para @{name}",
-  "status.admin_status": "Abrir este estado na interface de moderaciÃ³n",
+  "status.admin_status": "Abrir este toot na interface de moderaciÃ³n",
   "status.block": "Bloquear a @{name}",
   "status.bookmark": "Marcar",
   "status.cancel_reblog_private": "Desfacer compartido",
   "status.cannot_reblog": "Esta publicaciÃ³n non pode ser promovida",
-  "status.copy": "Copiar ligazÃ³n Ã³ estado",
+  "status.copy": "Copiar ligazÃ³n Ã³ toot",
   "status.delete": "Eliminar",
   "status.detailed_status": "Vista detallada da conversa",
   "status.direct": "Mensaxe directa a @{name}",
@@ -384,12 +408,12 @@
   "status.more": "MÃ¡is",
   "status.mute": "Silenciar @{name}",
   "status.mute_conversation": "Silenciar conversa",
-  "status.open": "Expandir este estado",
+  "status.open": "Expandir este toot",
   "status.pin": "Fixar no perfil",
   "status.pinned": "Toot fixado",
   "status.read_more": "Ler mÃ¡is",
   "status.reblog": "Promover",
-  "status.reblog_private": "Compartir Ã¡ audiencia orixinal",
+  "status.reblog_private": "Compartir coa audiencia orixinal",
   "status.reblogged_by": "{name} promoveu",
   "status.reblogs.empty": "AÃnda ninguÃ©n promoveu este toot. Cando alguÃ©n o faga, amosarase aquÃ.",
   "status.redraft": "Eliminar e reescribir",
@@ -430,7 +454,7 @@
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "Arrastra e solta para subir",
-  "upload_button.label": "Engadir multimedia ({formats})",
+  "upload_button.label": "Engadir imaxes, un vÃdeo ou ficheiro de audio",
   "upload_error.limit": "LÃmite mÃ¡ximo do ficheiro a subir excedido.",
   "upload_error.poll": "Non se poden subir ficheiros nas enquisas.",
   "upload_form.audio_description": "Describir para persoas con problemas auditivos",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detectar texto na imaxe",
   "upload_modal.edit_media": "Editar multimedia",
   "upload_modal.hint": "Preme ou arrastra o cÃrculo na vista previa para escoller o punto focal que sempre estarÃ¡ Ã¡ vista en todas as miniaturas.",
+  "upload_modal.preparing_ocr": "Preparando OCRâ€¦",
   "upload_modal.preview_label": "Vista previa ({ratio})",
   "upload_progress.label": "Estase a subir...",
   "video.close": "Pechar vÃdeo",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 91fce039f5bb07a4b55cd8407cd5eb54e7d0b730..123b2e85541a7f89107fee68cb77c621eab7906f 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "×”×ž×©×š ×œ×’×œ×•×© ×‘×¤×¨×•×¤×™×œ ×”×ž×§×•×¨×™",
   "account.cancel_follow_request": "×‘×˜×œ ×‘×§×©×ª ×ž×¢×§×‘",
   "account.direct": "Direct Message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "×”×“×•×ž×™×™×Ÿ ×—×¡×•×™",
   "account.edit_profile": "×¢×¨×™×›×ª ×¤×¨×•×¤×™×œ",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "×”×¦×’ ×‘×¤×¨×•×¤×™×œ",
   "account.follow": "×ž×¢×§×‘",
   "account.followers": "×¢×•×§×‘×™×",
@@ -96,9 +98,9 @@
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
   "compose_form.publish": "×œ×œ×—×•×©",
   "compose_form.publish_loud": "×œ×—×¦×¨×¥!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "××–×”×¨×ª ×ª×•×›×Ÿ",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "×ª×•×¦××•×ª ×—×™×¤×•×©",
   "emoji_button.symbols": "×¡×ž×œ×™×",
   "emoji_button.travel": "×˜×™×•×œ×™× ×•××ª×¨×™×",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No toots here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "××™×Ÿ ×”×ª×¨××•×ª ×¢×“×™×™×Ÿ. ×™××œ×œ×”, ×”×’×™×¢ ×”×–×ž×Ÿ ×œ×”×ª×—×™×œ ×œ×”×ª×¢×¨×‘×‘.",
   "empty_column.public": "××™×Ÿ ×¤×” ×›×œ×•×! ×›×“×™ ×œ×ž×œ× ××ª ×”×˜×•×¨ ×”×–×” ××¤×©×¨ ×œ×›×ª×•×‘ ×ž×©×”×•, ××• ×œ×”×ª×—×™×œ ×œ×¢×§×•×‘ ××—×¨×™ ×× ×©×™× ×ž×§×”×™×œ×•×ª ××—×¨×•×ª",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "×§×‘×œ×”",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "×œ×¦××ª ×ž×ª×™×‘×ª ×—×™×‘×•×¨/×—×™×¤×•×©",
   "keyboard_shortcuts.up": "×œ× ×•×¢ ×‘×ž×¢×œ×” ×”×¨×©×™×ž×”",
   "lightbox.close": "×¡×’×™×¨×”",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "×”×œ××”",
   "lightbox.previous": "×”×§×•×“×",
-  "lightbox.view_context": "View context",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Change title",
   "lists.new.create": "Add list",
   "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Search among people you follow",
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "× ×¨××”\\×‘×œ×ª×™ × ×¨××”",
   "missing_indicator.label": "×œ× × ×ž×¦×",
   "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "×œ×”×¡×ª×™×¨ ×”×•×“×¢×•×ª ×ž×—×©×‘×•×Ÿ ×–×”?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "×—×¡×™×ž×•×ª",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "×—×¦×¨×•×¦×š ×”×•×“×”×“ ×¢×œ ×™×“×™ {name}",
+  "notification.status": "{name} just posted",
   "notifications.clear": "×”×¡×¨×ª ×”×ª×¨××•×ª",
   "notifications.clear_confirmation": "×œ×”×¡×™×¨ ××ª ×›×œ ×”×”×ª×¨××•×ª? ×‘×˜×•×—?",
   "notifications.column_settings.alert": "×”×ª×¨××•×ª ×œ×©×•×œ×—×Ÿ ×”×¢×‘×•×“×”",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "×”×“×”×•×“×™×:",
   "notifications.column_settings.show": "×”×¦×’×” ×‘×˜×•×¨",
   "notifications.column_settings.sound": "×©×ž×¢ ×ž×•×¤×¢×œ",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Closed",
   "poll.refresh": "Refresh",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -389,7 +413,7 @@
   "status.pinned": "Pinned toot",
   "status.read_more": "Read more",
   "status.reblog": "×”×“×”×•×“",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "×”×•×“×”×“ ×¢×œ ×™×“×™ {name}",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "×¢×•×œ×”...",
   "video.close": "×¡×’×™×¨×ª ×•×™×“××•",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index ff207d6406f64eb305435f56e88ecd0feed96182..7e0fe4e7a723fedea6f1b884b7359bf311f14442 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -1,22 +1,24 @@
 {
-  "account.account_note_header": "Note",
+  "account.account_note_header": "à¤Ÿà¤¿à¤ªà¥à¤ªà¤£à¤¿à¤¯à¤¾à¤",
   "account.add_or_remove_from_list": "à¤¸à¥‚à¤šà¥€ à¤®à¥‡à¤‚ à¤œà¥‹à¤¡à¤¼à¥‡à¤‚ à¤¯à¤¾ à¤¹à¤Ÿà¤¾à¤",
   "account.badges.bot": "à¤¬à¥‰à¤Ÿ",
-  "account.badges.group": "Group",
+  "account.badges.group": "à¤¸à¤®à¥‚à¤¹",
   "account.block": "@{name} à¤•à¥‹ à¤¬à¥à¤²à¥‰à¤• à¤•à¤°à¥‡à¤‚",
   "account.block_domain": "{domain} à¤•à¥‡ à¤¸à¤¾à¤°à¥€ à¤šà¥€à¤œà¤¼à¥‡ à¤›à¥à¤ªà¤¾à¤à¤‚",
   "account.blocked": "à¤¬à¥à¤²à¥‰à¤•",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "à¤®à¥‚à¤² à¤ªà¥à¤°à¥‹à¤«à¤¼à¤¾à¤‡à¤² à¤ªà¤° à¤…à¤§à¤¿à¤• à¤¬à¥à¤°à¤¾à¤‰à¤œà¤¼ à¤•à¤°à¥‡à¤‚",
   "account.cancel_follow_request": "à¥žà¥‰à¤²à¥‹ à¤°à¤¿à¤•à¥à¤µà¥‡à¤¸à¥à¤Ÿ à¤°à¤¦à¥à¤¦ à¤•à¤°à¥‡à¤‚",
   "account.direct": "à¤ªà¥à¤°à¤¤à¥à¤¯à¤•à¥à¤· à¤¸à¤‚à¤¦à¥‡à¤¶ @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "à¤›à¤¿à¤ªà¤¾ à¤¹à¥à¤† à¤¡à¥‹à¤®à¥‡à¤¨",
   "account.edit_profile": "à¤ªà¥à¤°à¥‹à¤«à¤¼à¤¾à¤‡à¤² à¤¸à¤‚à¤ªà¤¾à¤¦à¤¿à¤¤ à¤•à¤°à¥‡à¤‚",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "à¤ªà¥à¤°à¥‹à¤«à¤¼à¤¾à¤‡à¤² à¤ªà¤° à¤¦à¤¿à¤–à¤¾à¤",
   "account.follow": "à¤«à¥‰à¤²à¥‹ à¤•à¤°à¥‡à¤‚",
   "account.followers": "à¤«à¥‰à¤²à¥‹à¤µà¤°",
   "account.followers.empty": "à¤•à¥‹à¤ˆ à¤à¥€ à¤‡à¤¸ à¤¯à¥‚à¥›à¤°à¥ à¤•à¥‹ à¥žà¥‰à¤²à¥‹ à¤¨à¤¹à¥€à¤‚ à¤•à¤°à¤¤à¤¾ à¤¹à¥ˆ",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers_counter": "{count, plural, one {{counter} à¤…à¤¨à¥à¤—à¤¾à¤®à¥€} other {{counter} à¤¸à¤®à¤°à¥à¤¥à¤•}}",
+  "account.following_counter": "{count, plural, one {{counter} à¤¨à¤¿à¤®à¥à¤¨à¤²à¤¿à¤–à¤¿à¤¤} other {{counter} à¤¨à¤¿à¤®à¥à¤¨à¤²à¤¿à¤–à¤¿à¤¤}}",
   "account.follows.empty": "à¤¯à¤¹ à¤¯à¥‚à¥›à¤°à¥ à¤…à¤à¥€ à¤¤à¤• à¤•à¤¿à¤¸à¥€ à¤•à¥‹ à¤«à¥‰à¤²à¥‹ à¤¨à¤¹à¥€à¤‚ à¤•à¤°à¤¤à¤¾ à¤¹à¥ˆà¥¤",
   "account.follows_you": "à¤†à¤ªà¤•à¥‹ à¤«à¥‰à¤²à¥‹ à¤•à¤°à¤¤à¤¾ à¤¹à¥ˆ",
   "account.hide_reblogs": "@{name} à¤•à¥‡ à¤¬à¥‚à¤¸à¥à¤Ÿ à¤›à¥à¤ªà¤¾à¤à¤‚",
@@ -36,19 +38,19 @@
   "account.requested": "à¤®à¤‚à¤œà¥‚à¤°à¥€ à¤•à¤¾ à¤‡à¤‚à¤¤à¤œà¤¾à¤°à¥¤ à¤«à¥‰à¤²à¥‹ à¤°à¤¿à¤•à¥à¤µà¥‡à¤¸à¥à¤Ÿ à¤•à¥‹ à¤°à¤¦à¥à¤¦ à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤ à¤•à¥à¤²à¤¿à¤• à¤•à¤°à¥‡à¤‚",
   "account.share": "@{name} à¤•à¥€ à¤ªà¥à¤°à¥‹à¤«à¤¾à¤‡à¤² à¤¶à¥‡à¤¯à¤° à¤•à¤°à¥‡",
   "account.show_reblogs": "@{name} à¤•à¥‡ à¤¬à¥‚à¤¸à¥à¤Ÿ à¤¦à¤¿à¤–à¤¾à¤",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, one {{counter} à¤à¥‹à¤‚à¤ªà¥‚} other {{counter} à¤à¥‹à¤‚à¤ªà¥‚}}",
   "account.unblock": "@{name} à¤•à¥‹ à¤…à¤¨à¤¬à¥à¤²à¥‰à¤• à¤•à¤°à¥‡à¤‚",
   "account.unblock_domain": "{domain} à¤¦à¤¿à¤–à¤¾à¤",
   "account.unendorse": "à¤ªà¥à¤°à¥‹à¤«à¤¼à¤¾à¤‡à¤² à¤ªà¤° à¤¨ à¤¦à¤¿à¤–à¤¾à¤",
   "account.unfollow": "à¤…à¤¨à¤«à¥‰à¤²à¥‹ à¤•à¤°à¥‡à¤‚",
   "account.unmute": "à¤…à¤¨à¤®à¥à¤¯à¥‚à¤Ÿ @{name}",
   "account.unmute_notifications": "@{name} à¤•à¥‡ à¤¨à¥‹à¤Ÿà¤¿à¤«à¤¿à¤•à¥‡à¤¶à¤¨ à¤…à¤¨à¤®à¥à¤¯à¥‚à¤Ÿ à¤•à¤°à¥‡",
-  "account_note.placeholder": "Click to add a note",
+  "account_note.placeholder": "à¤¨à¥‹à¤Ÿà¥à¤¸ à¤œà¥‹à¤¡à¤¼à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤ à¤•à¥à¤²à¤¿à¤• à¤•à¤°à¥‡à¤‚",
   "alert.rate_limited.message": "à¤•à¥ƒà¤ªà¥à¤¯à¤¾ {retry_time, time, medium} à¤•à¥‡ à¤¬à¤¾à¤¦ à¤¦à¥à¤¬à¤¾à¤°à¤¾ à¤•à¥‹à¤¶à¤¿à¤¶ à¤•à¤°à¥‡à¤‚",
   "alert.rate_limited.title": "à¤¸à¥€à¤®à¤¿à¤¤ à¤¦à¤°",
   "alert.unexpected.message": "à¤à¤• à¤…à¤ªà¥à¤°à¤¤à¥à¤¯à¤¾à¤¶à¤¿à¤¤ à¤¤à¥à¤°à¥à¤Ÿà¤¿ à¤¹à¥à¤ˆ à¤¹à¥ˆ!",
   "alert.unexpected.title": "à¤‰à¤«à¤¼!",
-  "announcement.announcement": "Announcement",
+  "announcement.announcement": "à¤˜à¥‹à¤·à¤£à¤¾",
   "autosuggest_hashtag.per_week": "{count} à¤¹à¤° à¤¸à¤ªà¥à¤¤à¤¾à¤¹",
   "boost_modal.combo": "à¤…à¤—à¤²à¥€ à¤¬à¤¾à¤° à¤¸à¥à¤•à¤¿à¤ª à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤ à¤†à¤ª {combo} à¤¦à¤¬à¤¾ à¤¸à¤•à¤¤à¥‡ à¤¹à¥ˆ",
   "bundle_column_error.body": "à¤‡à¤¸ à¤•à¥‰à¤®à¥à¤ªà¥‹à¤¨à¥‡à¤¨à¥à¤Ÿ à¤•à¥‹ à¤²à¥‹à¤¡ à¤•à¤°à¤¤à¥‡ à¤µà¤•à¥à¤¤ à¤•à¥à¤› à¤—à¤²à¤¤ à¤¹à¥‹ à¤—à¤¯à¤¾",
@@ -58,7 +60,7 @@
   "bundle_modal_error.message": "à¤‡à¤¸ à¤•à¥‰à¤®à¥à¤ªà¥‹à¤¨à¥‡à¤¨à¥à¤Ÿ à¤•à¥‹ à¤²à¥‹à¤¡ à¤•à¤°à¤¤à¥‡ à¤µà¤•à¥à¤¤ à¤•à¥à¤› à¤—à¤²à¤¤ à¤¹à¥‹ à¤—à¤¯à¤¾",
   "bundle_modal_error.retry": "à¤¦à¥à¤¬à¤¾à¤°à¤¾ à¤•à¥‹à¤¶à¤¿à¤¶ à¤•à¤°à¥‡à¤‚",
   "column.blocks": "à¤¬à¥à¤²à¥‰à¤•à¥à¤¡ à¤¯à¥‚à¥›à¤°à¥à¤¸",
-  "column.bookmarks": "Bookmarks",
+  "column.bookmarks": "à¤ªà¥à¤¸à¥à¤¤à¤•à¤šà¤¿à¤¹à¥à¤¨:",
   "column.community": "à¤²à¥‹à¤•à¤² à¤Ÿà¤¾à¤‡à¤®à¥à¤²à¤¾à¤‡à¤¨",
   "column.direct": "à¤¸à¥€à¤§à¤¾ à¤¸à¤‚à¤¦à¥‡à¤¶",
   "column.directory": "à¤ªà¥à¤°à¥‹à¤«à¤¾à¤‡à¤²à¥à¤¸ à¤–à¥‹à¤œà¥‡à¤‚",
@@ -79,9 +81,9 @@
   "column_header.show_settings": "à¤¸à¥‡à¤Ÿà¤¿à¤‚à¤—à¥à¤¸ à¤¦à¤¿à¤–à¤¾à¤à¤",
   "column_header.unpin": "à¤…à¤¨à¤ªà¤¿à¤¨",
   "column_subheading.settings": "à¤¸à¥‡à¤Ÿà¤¿à¤‚à¤—à¥à¤¸",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "à¤¸à¥à¤¥à¤¾à¤¨à¥€à¤¯ à¤¹à¥€",
   "community.column_settings.media_only": "à¤¸à¤¿à¤°à¥à¤«à¤¼ à¤®à¥€à¤¡à¤¿à¤¯à¤¾",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "à¤•à¥‡à¤µà¤² à¤¸à¥à¤¦à¥‚à¤°",
   "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "à¤”à¤° à¤œà¤¾à¤¨à¥‡à¤‚",
   "compose_form.hashtag_warning": "à¤¯à¤¹ à¤Ÿà¥‚à¤Ÿà¥ à¤•à¤¿à¤¸à¥€ à¤à¥€ à¤¹à¥ˆà¤¶à¤Ÿà¥ˆà¤— à¤•à¥‡ à¤¤à¤¹à¤¤ à¤¸à¥‚à¤šà¥€à¤¬à¤¦à¥à¤§ à¤¨à¤¹à¥€à¤‚ à¤¹à¥‹à¤—à¤¾ à¤•à¥à¤¯à¥‹à¤‚à¤•à¤¿ à¤¯à¤¹ à¤…à¤¨à¤²à¤¿à¤¸à¥à¤Ÿà¥‡à¤¡ à¤¹à¥ˆà¥¤ à¤¹à¥ˆà¤¶à¤Ÿà¥ˆà¤— à¤¦à¥à¤µà¤¾à¤°à¤¾ à¤•à¥‡à¤µà¤² à¤¸à¤¾à¤°à¥à¤µà¤œà¤¨à¤¿à¤• à¤Ÿà¥‚à¤Ÿà¥à¤¸ à¤–à¥‹à¤œà¥‡ à¤œà¤¾ à¤¸à¤•à¤¤à¥‡ à¤¹à¥ˆà¤‚à¥¤",
@@ -92,8 +94,8 @@
   "compose_form.poll.duration": "à¤šà¥à¤¨à¤¾à¤µ à¤•à¥€ à¤…à¤µà¤§à¤¿",
   "compose_form.poll.option_placeholder": "à¤•à¥à¤² à¤µà¤¿à¤•à¤²à¥à¤ª {number}",
   "compose_form.poll.remove_option": "à¤‡à¤¸ à¤µà¤¿à¤•à¤²à¥à¤ª à¤•à¥‹ à¤¹à¤Ÿà¤¾à¤à¤",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "à¤•à¤ˆ à¤µà¤¿à¤•à¤²à¥à¤ªà¥‹à¤‚ à¤•à¥€ à¤…à¤¨à¥à¤®à¤¤à¤¿ à¤¦à¥‡à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤ à¤ªà¥‹à¤² à¤¬à¤¦à¤²à¥‡à¤‚",
+  "compose_form.poll.switch_to_single": "à¤à¤• à¤¹à¥€ à¤µà¤¿à¤•à¤²à¥à¤ª à¤•à¥‡ à¤²à¤¿à¤ à¤…à¤¨à¥à¤®à¤¤à¤¿ à¤¦à¥‡à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤ à¤ªà¥‹à¤² à¤¬à¤¦à¤²à¥‡à¤‚",
   "compose_form.publish": "à¤Ÿà¥‚à¤Ÿà¥",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "à¤®à¥€à¤¡à¤¿à¤¯à¤¾ à¤•à¥‹ à¤¸à¤‚à¤µà¥‡à¤¦à¤¨à¤¶à¥€à¤² à¤•à¥‡ à¤°à¥‚à¤ª à¤®à¥‡à¤‚ à¤šà¤¿à¤¹à¥à¤¨à¤¿à¤¤ à¤•à¤°à¥‡à¤‚",
@@ -147,10 +149,11 @@
   "emoji_button.search_results": "à¤–à¥‹à¤œ à¤ªà¤°à¤¿à¤£à¤¾à¤®",
   "emoji_button.symbols": "à¤ªà¥à¤°à¤¤à¥€à¤•",
   "emoji_button.travel": "à¤¯à¤¾à¤¤à¥à¤°à¤¾ à¤à¤µà¤‚ à¤¸à¥à¤¥à¤¾à¤¨",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "à¤¸à¤¨à¥à¤¨à¤¾à¤Ÿà¤¾! à¤¯à¤¹à¤¾à¤‚ à¤•à¥‹à¤ˆ à¤Ÿà¥‚à¤Ÿà¥à¤¸ à¤¨à¤¹à¥€à¤‚!",
   "empty_column.account_unavailable": "à¤ªà¥à¤°à¥‹à¤«à¤¾à¤‡à¤² à¤‰à¤ªà¤²à¤¬à¥à¤§ à¤¨à¤¹à¥€à¤‚",
   "empty_column.blocks": "à¤†à¤ª à¤…à¤à¥€ à¤¤à¤• à¤•à¤¿à¤¸à¥€ à¤à¥€ à¤¯à¥‚à¤œà¤° à¤•à¥‡ à¤¦à¥à¤µà¤¾à¤°à¤¾ à¤¬à¥à¤²à¥‰à¤•à¥à¤¡ à¤¨à¤¹à¥€à¤‚ à¤¹à¥‹à¥¤",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
+  "empty_column.bookmarked_statuses": "à¤†à¤ªà¤•à¥‡ à¤ªà¤¾à¤¸ à¤…à¤à¥€ à¤¤à¤• à¤•à¥‹à¤ˆ à¤¬à¥à¤•à¤®à¤¾à¤°à¥à¤• à¤¨à¤¹à¥€à¤‚ à¤¹à¥ˆà¥¤ à¤œà¤¬ à¤†à¤ª à¤à¤• à¤¬à¥à¤•à¤®à¤¾à¤°à¥à¤• à¤•à¤°à¤¤à¥‡ à¤¹à¥ˆà¤‚, à¤¤à¥‹ à¤¯à¤¹ à¤¯à¤¹à¤¾à¤‚ à¤¦à¤¿à¤–à¤¾à¤ˆ à¤¦à¥‡à¤—à¤¾à¥¤",
   "empty_column.community": "à¤²à¥‹à¤•à¤² à¤Ÿà¤¾à¤‡à¤®à¥à¤²à¤¾à¤‡à¤¨ à¤–à¤¾à¤²à¥€ à¤¹à¥ˆ, à¤•à¥à¤› à¤¦à¥‡à¤–à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤¯à¥‡ à¤¸à¤¾à¤°à¥à¤µà¤œà¤¨à¤¿à¤• à¤°à¥‚à¤ª à¤¸à¥‡ à¤•à¥à¤› à¤²à¤¿à¤–à¥‡à¤‚!",
   "empty_column.direct": "à¤†à¤ªà¤•à¥‡ à¤ªà¤¾à¤¸ à¤•à¥‹à¤ˆ à¤¸à¥€à¤§à¤¾ à¤¸à¤¨à¥à¤¦à¥‡à¤¶ à¤¨à¤¹à¥€à¤‚ à¤¹à¥ˆ, à¤œà¤¬ à¤†à¤ª à¤•à¥‹à¤ˆ à¤à¥‡à¤œà¥‡à¤‚à¤—à¥‡ à¤ªà¥à¤°à¤¾à¤ªà¥à¤¤ à¤•à¤°à¥‡à¤‚à¤—à¥‡ à¤¤à¥‹ à¤¯à¤¹à¤¾à¤ à¤¦à¤¿à¤–à¥‡à¤—à¤¾à¥¤",
   "empty_column.domain_blocks": "à¤…à¤à¥€ à¤¤à¤• à¤•à¥‹à¤ˆ à¤›à¥à¤ªà¤¾ à¤¹à¥à¤† à¤¡à¥‹à¤®à¥‡à¤¨ à¤¨à¤¹à¥€à¤‚ à¤¹à¥ˆà¥¤",
@@ -161,17 +164,19 @@
   "empty_column.home": "à¤†à¤ªà¤•à¥€ à¤®à¥à¤–à¥à¤¯ à¤•à¤¾à¤²à¤•à¥à¤°à¤® à¤…à¤à¥€ à¤–à¤²à¥€ à¤¹à¥ˆ. à¤…à¤¨à¥à¤¯ à¤‰à¤ªà¤¯à¥‹à¤—à¤•à¤°à¥à¤¤à¤¾à¤“à¤‚ à¤¸à¥‡ à¤®à¤¿à¤²à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤ à¤”à¤° à¤…à¤ªà¤¨à¥€ à¤—à¤¤à¤¿à¤µà¤¿à¤§à¤¿à¤¯à¤¾à¤‚ à¤¶à¥à¤°à¥‚ à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤ à¤¯à¤¾ à¤¤à¥‹ {public} à¤ªà¤° à¤œà¤¾à¤à¤‚ à¤¯à¤¾ à¤–à¥‹à¤œ à¤•à¤¾ à¤‰à¤ªà¤¯à¥‹à¤— à¤•à¤°à¥‡à¤‚à¥¤",
   "empty_column.home.public_timeline": "à¤¸à¤¾à¤°à¥à¤µà¤œà¤¨à¤¿à¤• à¤•à¤¾à¤²à¤•à¥à¤°à¤®",
   "empty_column.list": "à¤¯à¤¹ à¤¸à¥‚à¤šà¥€ à¤…à¤à¥€ à¤–à¤¾à¤²à¥€ à¤¹à¥ˆ. à¤œà¤¬ à¤‡à¤¸à¤•à¥‡ à¤¸à¤¦à¤¸à¥à¤¯ à¤•à¥‹à¤ˆ à¤…à¤à¤¿à¤µà¥à¤¯à¤•à¥à¤¤à¤¿ à¤¦à¥‡à¤‚à¤—à¥‡, à¤¤à¥‹ à¤µà¥‹ à¤¯à¤¹à¤¾à¤‚ à¤¦à¤¿à¤–à¤¾à¤ˆ à¤¦à¥‡à¤‚à¤—à¥€.",
-  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
-  "empty_column.mutes": "You haven't muted any users yet.",
-  "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
-  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
-  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "empty_column.lists": "à¤†à¤ªà¤•à¥‡ à¤ªà¤¾à¤¸ à¤…à¤à¥€ à¤¤à¤• à¤•à¥‹à¤ˆ à¤¸à¥‚à¤šà¥€ à¤¨à¤¹à¥€à¤‚ à¤¹à¥ˆà¥¤ à¤œà¤¬ à¤†à¤ª à¤à¤• à¤¬à¤¨à¤¾à¤¤à¥‡ à¤¹à¥ˆà¤‚, à¤¤à¥‹ à¤¯à¤¹ à¤¯à¤¹à¤¾à¤‚ à¤¦à¤¿à¤–à¤¾à¤ˆ à¤¦à¥‡à¤—à¤¾à¥¤",
+  "empty_column.mutes": "à¤†à¤ªà¤¨à¥‡ à¤…à¤à¥€ à¤¤à¤• à¤•à¤¿à¤¸à¥€ à¤à¥€ à¤‰à¤ªà¤¯à¥‹à¤—à¤•à¤°à¥à¤¤à¤¾ à¤•à¥‹ à¤®à¥à¤¯à¥‚à¤Ÿ à¤¨à¤¹à¥€à¤‚ à¤•à¤¿à¤¯à¤¾ à¤¹à¥ˆà¥¤",
+  "empty_column.notifications": "à¤†à¤ªà¤•à¥‡ à¤ªà¤¾à¤¸ à¤…à¤à¥€ à¤¤à¤• à¤•à¥‹à¤ˆ à¤¸à¥‚à¤šà¤¨à¤¾ à¤¨à¤¹à¥€à¤‚ à¤¹à¥ˆà¥¤ à¤¬à¤¾à¤¤à¤šà¥€à¤¤ à¤¶à¥à¤°à¥‚ à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤ à¤¦à¥‚à¤¸à¤°à¥‹à¤‚ à¤•à¥‡ à¤¸à¤¾à¤¥ à¤¬à¤¾à¤¤à¤šà¥€à¤¤ à¤•à¤°à¥‡à¤‚à¥¤",
+  "empty_column.public": "à¤¯à¤¹à¤¾à¤‚ à¤•à¥à¤› à¤¨à¤¹à¥€à¤‚ à¤¹à¥ˆ! à¤¸à¤¾à¤°à¥à¤µà¤œà¤¨à¤¿à¤• à¤°à¥‚à¤ª à¤¸à¥‡ à¤•à¥à¤› à¤²à¤¿à¤–à¥‡à¤‚, à¤¯à¤¾ à¤‡à¤¸à¥‡ à¤à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤ à¤…à¤¨à¥à¤¯ à¤¸à¤°à¥à¤µà¤° à¤¸à¥‡ à¤‰à¤ªà¤¯à¥‹à¤—à¤•à¤°à¥à¤¤à¤¾à¤“à¤‚ à¤•à¤¾ à¤®à¥ˆà¤¨à¥à¤¯à¥à¤…à¤² à¤°à¥‚à¤ª à¤¸à¥‡ à¤…à¤¨à¥à¤¸à¤°à¤£ à¤•à¤°à¥‡à¤‚",
+  "error.unexpected_crash.explanation": "à¤¹à¤®à¤¾à¤°à¥‡ à¤•à¥‹à¤¡ à¤¯à¤¾ à¤¬à¥à¤°à¤¾à¤‰à¤œà¤¼à¤° à¤¸à¤‚à¤—à¤¤à¤¤à¤¾ à¤¸à¤®à¤¸à¥à¤¯à¤¾ à¤®à¥‡à¤‚ à¤¬à¤— à¤•à¥‡ à¤•à¤¾à¤°à¤£, à¤¯à¤¹ à¤ªà¥ƒà¤·à¥à¤  à¤¸à¤¹à¥€ à¤¢à¤‚à¤— à¤¸à¥‡ à¤ªà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ à¤¨à¤¹à¥€à¤‚ à¤¹à¥‹ à¤¸à¤•à¤¾à¥¤",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "errors.unexpected_crash.copy_stacktrace": "à¤¸à¥à¤Ÿà¥ˆà¤•à¤Ÿà¥à¤°à¥‡à¤¸ à¤•à¥‹ à¤•à¥à¤²à¤¿à¤ªà¤¬à¥‹à¤°à¥à¤¡ à¤ªà¤° à¤•à¥‰à¤ªà¥€ à¤•à¤°à¥‡à¤‚",
   "errors.unexpected_crash.report_issue": "à¤¸à¤®à¤¸à¥à¤¯à¤¾ à¤¸à¥‚à¤šà¤¿à¤¤ à¤•à¤°à¥‡à¤‚",
   "follow_request.authorize": "à¤…à¤§à¤¿à¤•à¤¾à¤° à¤¦à¥‡à¤‚",
   "follow_request.reject": "à¤…à¤¸à¥à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¥‡à¤‚",
-  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "follow_requests.unlocked_explanation": "à¤¹à¤¾à¤²à¤¾à¤à¤•à¤¿ à¤†à¤ªà¤•à¤¾ à¤–à¤¾à¤¤à¤¾ à¤²à¥‰à¤• à¤¨à¤¹à¥€à¤‚ à¤¹à¥ˆ, à¤«à¤¿à¤° à¤à¥€ {domain} à¤¡à¥‹à¤®à¥‡à¤¨ à¤¸à¥à¤Ÿà¤¾à¤« à¤¨à¥‡ à¤¸à¥‹à¤šà¤¾ à¤•à¤¿ à¤†à¤ª à¤‡à¤¨ à¤–à¤¾à¤¤à¥‹à¤‚ à¤•à¥‡ à¤®à¥ˆà¤¨à¥à¤¯à¥à¤…à¤² à¤…à¤¨à¥à¤°à¥‹à¤§à¥‹à¤‚ à¤•à¥€ à¤¸à¤®à¥€à¤•à¥à¤·à¤¾ à¤•à¤°à¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆà¤‚à¥¤",
   "generic.saved": "Saved",
   "getting_started.developers": "à¤¡à¥‡à¤µà¥…à¤²à¤ªà¤°à¥à¤¸",
   "getting_started.directory": "à¤ªà¥à¤°à¥‹à¤«à¤¼à¤¾à¤‡à¤² à¤¨à¤¿à¤°à¥à¤¦à¥‡à¤¶à¤¿à¤•à¤¾",
@@ -193,31 +198,31 @@
   "home.column_settings.basic": "à¤¬à¥à¤¨à¤¿à¤¯à¤¾à¤¦à¥€",
   "home.column_settings.show_reblogs": "à¤¬à¥‚à¤¸à¥à¤Ÿ à¤¦à¤¿à¤–à¤¾à¤",
   "home.column_settings.show_replies": "à¤œà¤µà¤¾à¤¬à¥‹à¤‚ à¤•à¥‹ à¤¦à¤¿à¤–à¤¾à¤",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
+  "home.hide_announcements": "à¤˜à¥‹à¤·à¤£à¤¾à¤à¤ à¤›à¤¿à¤ªà¤¾à¤à¤",
+  "home.show_announcements": "à¤˜à¥‹à¤·à¤£à¤¾à¤à¤‚ à¤¦à¤¿à¤–à¤¾à¤à¤‚",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
   "introduction.federation.action": "à¤…à¤—à¤²à¤¾",
   "introduction.federation.federated.headline": "à¥žà¥‡à¤¡à¤°à¥‡à¤Ÿà¥‡à¤¡",
-  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.federated.text": "à¤®à¤¹à¤¾à¤¸à¤‚à¤˜ à¤•à¥‡ à¤…à¤¨à¥à¤¯ à¤¸à¤°à¥à¤µà¤°à¥‹à¤‚ à¤¸à¥‡ à¤¸à¤¾à¤°à¥à¤µà¤œà¤¨à¤¿à¤• à¤ªà¤¦ à¤¸à¤‚à¤˜à¤Ÿà¤¿à¤¤ à¤¸à¤®à¤¯-à¤¸à¥€à¤®à¤¾ à¤®à¥‡à¤‚ à¤¦à¤¿à¤–à¤¾à¤ˆ à¤¦à¥‡à¤‚à¤—à¥‡à¥¤",
   "introduction.federation.home.headline": "à¤¹à¥‹à¤®",
-  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.home.text": "à¤†à¤ªà¤•à¥‡ à¤¦à¥à¤µà¤¾à¤°à¤¾ à¤…à¤¨à¥à¤¸à¤°à¤£ à¤•à¤¿à¤ à¤œà¤¾à¤¨à¥‡ à¤µà¤¾à¤²à¥‡ à¤²à¥‹à¤—à¥‹à¤‚ à¤•à¥‡ à¤ªà¥‹à¤¸à¥à¤Ÿ à¤†à¤ªà¤•à¥‡ à¤¹à¥‹à¤® à¤«à¥€à¤¡ à¤®à¥‡à¤‚ à¤¦à¤¿à¤–à¤¾à¤ˆ à¤¦à¥‡à¤‚à¤—à¥‡à¥¤ à¤†à¤ª à¤•à¤¿à¤¸à¥€ à¤à¥€ à¤¸à¤°à¥à¤µà¤° à¤ªà¤° à¤•à¤¿à¤¸à¥€ à¤•à¥‹ à¤à¥€ à¤«à¥‰à¤²à¥‹ à¤•à¤° à¤¸à¤•à¤¤à¥‡ à¤¹à¥ˆà¤‚!",
   "introduction.federation.local.headline": "à¤²à¥‹à¤•à¤²",
   "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
   "introduction.interactions.action": "Finish toot-orial!",
   "introduction.interactions.favourite.headline": "à¤ªà¤¸à¤‚à¤¦à¥€à¤¦à¤¾",
-  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.favourite.text": "à¤†à¤ª à¤¬à¤¾à¤¦ à¤®à¥‡à¤‚ à¤‡à¤¸à¤•à¥‡ à¤²à¤¿à¤ à¤à¤• à¤Ÿà¥‹à¤Ÿ à¤•à¥‹ à¤¬à¤šà¤¾ à¤¸à¤•à¤¤à¥‡ à¤¹à¥ˆà¤‚, à¤”à¤° à¤²à¥‡à¤–à¤• à¤•à¥‹ à¤¯à¤¹ à¤¬à¤¤à¤¾ à¤¦à¥‡à¤‚ à¤•à¤¿ à¤†à¤ªà¤•à¥‹ à¤¯à¤¹ à¤ªà¤¸à¤‚à¤¦ à¤†à¤¯à¤¾, à¤‡à¤¸à¥‡ à¤«à¥‡à¤µà¤° à¤•à¤°à¤•à¥‡à¥¤",
   "introduction.interactions.reblog.headline": "à¤¬à¥‚à¤¸à¥à¤Ÿ",
   "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
   "introduction.interactions.reply.headline": "à¤œà¤µà¤¾à¤¬",
   "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
   "introduction.welcome.action": "à¤†à¤‡à¤ à¤¶à¥à¤°à¥‚ à¤•à¤°à¤¤à¥‡ à¤¹à¥ˆà¤‚!",
   "introduction.welcome.headline": "à¤ªà¤¹à¤²à¥‡ à¤•à¤¦à¤®",
-  "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is specialâ€”it hosts your profile, so remember its name.",
-  "keyboard_shortcuts.back": "to navigate back",
-  "keyboard_shortcuts.blocked": "to open blocked users list",
-  "keyboard_shortcuts.boost": "to boost",
+  "introduction.welcome.text": "à¤«à¥‡à¤¡à¤µà¤°à¥à¤¸ à¤®à¥‡à¤‚ à¤†à¤ªà¤•à¤¾ à¤¸à¥à¤µà¤¾à¤—à¤¤ à¤¹à¥ˆ! à¤•à¥à¤› à¤¹à¥€ à¤•à¥à¤·à¤£à¥‹à¤‚ à¤®à¥‡à¤‚, à¤†à¤ª à¤¸à¤‚à¤¦à¥‡à¤¶à¥‹à¤‚ à¤•à¥‹ à¤ªà¥à¤°à¤¸à¤¾à¤°à¤¿à¤¤ à¤•à¤°à¤¨à¥‡ à¤”à¤° à¤…à¤ªà¤¨à¥‡ à¤¦à¥‹à¤¸à¥à¤¤à¥‹à¤‚ à¤¸à¥‡ à¤µà¤¿à¤¸à¥à¤¤à¥ƒà¤¤ à¤¸à¤°à¥à¤µà¤° à¤ªà¤° à¤¬à¤¾à¤¤ à¤•à¤°à¤¨à¥‡ à¤®à¥‡à¤‚ à¤¸à¤•à¥à¤·à¤® à¤¹à¥‹à¤‚à¤—à¥‡à¥¤ à¤²à¥‡à¤•à¤¿à¤¨ à¤¯à¤¹ à¤¸à¤°à¥à¤µà¤°, {domain}, à¤µà¤¿à¤¶à¥‡à¤· à¤¹à¥ˆ - à¤¯à¤¹ à¤†à¤ªà¤•à¥€ à¤ªà¥à¤°à¥‹à¤«à¤¼à¤¾à¤‡à¤² à¤•à¥‹ à¤¹à¥‹à¤¸à¥à¤Ÿ à¤•à¤°à¤¤à¤¾ à¤¹à¥ˆ, à¤‡à¤¸à¤²à¤¿à¤ à¤‡à¤¸à¤•à¤¾ à¤¨à¤¾à¤® à¤¯à¤¾à¤¦ à¤°à¤–à¥‡à¤‚à¥¤",
+  "keyboard_shortcuts.back": "à¤µà¤¾à¤ªà¤¸ à¤œà¤¾à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤",
+  "keyboard_shortcuts.blocked": "à¤…à¤µà¤°à¥à¤¦à¥à¤§ à¤‰à¤ªà¤¯à¥‹à¤—à¤•à¤°à¥à¤¤à¤¾à¤“à¤‚ à¤•à¥€ à¤¸à¥‚à¤šà¥€ à¤–à¥‹à¤²à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤",
+  "keyboard_shortcuts.boost": "à¤¬à¤¢à¤¼à¤¾à¤µà¤¾ à¤¦à¥‡à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "à¤•à¤‚à¤ªà¥‹à¥› à¤Ÿà¥‡à¤•à¥à¤¸à¥à¤Ÿ-à¤à¤°à¤¿à¤¯à¤¾ à¤ªà¤° à¤§à¥à¤¯à¤¾à¤¨ à¤•à¥‡à¤‚à¤¦à¥à¤°à¤¿à¤¤ à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤",
   "keyboard_shortcuts.description": "à¤µà¤¿à¤µà¤°à¤£",
@@ -249,42 +254,49 @@
   "keyboard_shortcuts.toot": "to start a brand new toot",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
-  "lightbox.close": "Close",
-  "lightbox.next": "Next",
-  "lightbox.previous": "Previous",
-  "lightbox.view_context": "View context",
+  "lightbox.close": "à¤¬à¤‚à¤¦ à¤•à¤°à¥‡à¤‚",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
+  "lightbox.next": "à¤…à¤—à¤²à¤¾",
+  "lightbox.previous": "à¤ªà¤¿à¤›à¤²à¤¾",
   "lists.account.add": "Add to list",
-  "lists.account.remove": "Remove from list",
-  "lists.delete": "Delete list",
-  "lists.edit": "Edit list",
+  "lists.account.remove": "à¤¸à¥‚à¤šà¥€ à¤¸à¥‡ à¤¨à¤¿à¤•à¤¾à¤²à¥‡à¤‚",
+  "lists.delete": "à¤¸à¥‚à¤šà¥€ à¤¹à¤Ÿà¤¾à¤à¤",
+  "lists.edit": "à¤¸à¥‚à¤šà¥€ à¤¸à¤‚à¤ªà¤¾à¤¦à¤¿à¤¤ à¤•à¤°à¥‡à¤‚",
   "lists.edit.submit": "Change title",
-  "lists.new.create": "Add list",
-  "lists.new.title_placeholder": "New list title",
+  "lists.new.create": "à¤¸à¥‚à¤šà¥€ à¤œà¥‹à¤¡à¤¼à¥‡à¤‚",
+  "lists.new.title_placeholder": "à¤¨à¤¯à¥‡ à¤¸à¥‚à¤šà¥€ à¤•à¤¾ à¤¶à¥€à¤°à¥à¤·à¤•",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Search among people you follow",
-  "lists.subheading": "Your lists",
+  "lists.subheading": "à¤†à¤ªà¤•à¥€ à¤¸à¥‚à¤šà¤¿à¤¯à¤¾à¤",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "à¤²à¥‹à¤¡ à¤¹à¥‹ à¤°à¤¹à¤¾ à¤¹à¥ˆ...",
   "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
   "missing_indicator.label": "à¤¨à¤¹à¥€à¤‚ à¤®à¤¿à¤²à¤¾",
   "missing_indicator.sublabel": "à¤¯à¤¹ à¤¸à¤‚à¤¸à¤¾à¤§à¤¨ à¤¨à¤¹à¥€à¤‚ à¤®à¤¿à¤² à¤¸à¤•à¤¾à¥¤",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "à¤®à¥‹à¤¬à¤¾à¤‡à¤² à¤à¤ªà¥à¤²à¤¿à¤•à¥‡à¤¶à¤‚à¤¸",
   "navigation_bar.blocks": "à¤¬à¥à¤²à¥‰à¤•à¥à¤¡ à¤¯à¥‚à¥›à¤°à¥à¤¸",
-  "navigation_bar.bookmarks": "Bookmarks",
+  "navigation_bar.bookmarks": "à¤ªà¥à¤¸à¥à¤¤à¤•à¤šà¤¿à¤¹à¥à¤¨:",
   "navigation_bar.community_timeline": "à¤²à¥‹à¤•à¤² à¤Ÿà¤¾à¤‡à¤®à¥à¤²à¤¾à¤‡à¤¨",
   "navigation_bar.compose": "à¤¨à¤¯à¤¾ à¤Ÿà¥‚à¤Ÿà¥ à¤²à¤¿à¤–à¥‡à¤‚",
-  "navigation_bar.direct": "Direct messages",
-  "navigation_bar.discover": "Discover",
+  "navigation_bar.direct": "à¤¸à¥€à¤§à¤¾ à¤¸à¤‚à¤¦à¥‡à¤¶",
+  "navigation_bar.discover": "à¤–à¥‹à¤œà¥‡à¤‚",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.edit_profile": "à¤ªà¥à¤°à¥‹à¤«à¤¼à¤¾à¤‡à¤² à¤¸à¤‚à¤ªà¤¾à¤¦à¤¿à¤¤ à¤•à¤°à¥‡à¤‚",
   "navigation_bar.favourites": "Favourites",
   "navigation_bar.filters": "Muted words",
-  "navigation_bar.follow_requests": "Follow requests",
+  "navigation_bar.follow_requests": "à¤…à¤¨à¥à¤¸à¤°à¤£ à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤…à¤¨à¥à¤°à¥‹à¤§",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "About this server",
+  "navigation_bar.info": "à¤‡à¤¸ à¤¸à¤°à¥à¤µà¤° à¤•à¥‡ à¤¬à¤¾à¤°à¥‡ à¤®à¥‡à¤‚",
   "navigation_bar.keyboard_shortcuts": "Hotkeys",
-  "navigation_bar.lists": "Lists",
-  "navigation_bar.logout": "Logout",
+  "navigation_bar.lists": "à¤¸à¥‚à¤šà¤¿à¤¯à¤¾à¤",
+  "navigation_bar.logout": "à¤¬à¤¾à¤¹à¤° à¤œà¤¾à¤",
   "navigation_bar.mutes": "Muted users",
   "navigation_bar.personal": "Personal",
   "navigation_bar.pins": "Pinned toots",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.alert": "Desktop notifications",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "à¤¬à¥‚à¤¸à¥à¤Ÿ:",
   "notifications.column_settings.show": "à¤•à¥‰à¤²à¤® à¤®à¥‡à¤‚ à¤¦à¤¿à¤–à¤¾à¤à¤",
   "notifications.column_settings.sound": "à¤§à¥à¤µà¤¨à¤¿ à¤šà¤²à¤¾à¤à¤",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "à¤¸à¤à¥€",
   "notifications.filter.boosts": "à¤¬à¥‚à¤¸à¥à¤Ÿ",
   "notifications.filter.favourites": "à¤ªà¤¸à¤‚à¤¦à¥€à¤¦à¤¾",
   "notifications.filter.follows": "à¤«à¥‰à¤²à¥‹",
   "notifications.filter.mentions": "à¤‰à¤²à¥à¤²à¥‡à¤–",
   "notifications.filter.polls": "à¤šà¥à¤¨à¤¾à¤µ à¤ªà¤°à¤¿à¤£à¤¾à¤®",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} à¤¸à¥‚à¤šà¤¨à¤¾à¤à¤",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "à¤¬à¤‚à¤¦ à¤•à¤° à¤¦à¤¿à¤¯à¤¾",
   "poll.refresh": "à¤°à¥€à¤«à¥à¤°à¥‡à¤¶ à¤•à¤°à¥‡à¤‚",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -389,7 +413,7 @@
   "status.pinned": "Pinned toot",
   "status.read_more": "Read more",
   "status.reblog": "à¤¬à¥‚à¤¸à¥à¤Ÿ",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "à¤®à¥€à¤¡à¤¿à¤¯à¤¾ à¤®à¥‡à¤‚ à¤¸à¤‚à¤¶à¥‹à¤§à¤¨ à¤•à¤°à¥‡à¤‚",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "à¤…à¤ªà¤²à¥‹à¤¡à¤¿à¤‚à¤—...",
   "video.close": "Close video",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 7179bc5364092161cc228c70bf02503a5fb226bd..f1b78eda42581490e4a5810b3e97fdd4f1622e45 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -1,366 +1,390 @@
 {
-  "account.account_note_header": "Note",
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.account_note_header": "BiljeÅ¡ka",
+  "account.add_or_remove_from_list": "Dodaj ili ukloni s liste",
   "account.badges.bot": "Bot",
-  "account.badges.group": "Group",
+  "account.badges.group": "Grupa",
   "account.block": "Blokiraj @{name}",
-  "account.block_domain": "Sakrij sve sa {domain}",
-  "account.blocked": "Blocked",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Cancel follow request",
-  "account.direct": "Direct Message @{name}",
-  "account.domain_blocked": "Domain hidden",
+  "account.block_domain": "Blokiraj domenu {domain}",
+  "account.blocked": "Blokirano",
+  "account.browse_more_on_origin_server": "Pogledajte viÅ¡e na izvornom profilu",
+  "account.cancel_follow_request": "OtkaÅ¾i zahtjev za praÄ‡enje",
+  "account.direct": "PoÅ¡alji poruku @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.domain_blocked": "Domena je blokirana",
   "account.edit_profile": "Uredi profil",
-  "account.endorse": "Feature on profile",
-  "account.follow": "Slijedi",
-  "account.followers": "Sljedbenici",
-  "account.followers.empty": "No one follows this user yet.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
-  "account.follows.empty": "This user doesn't follow anyone yet.",
-  "account.follows_you": "te slijedi",
-  "account.hide_reblogs": "Hide boosts from @{name}",
-  "account.last_status": "Last active",
-  "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.enable_notifications": "Notify me when @{name} posts",
+  "account.endorse": "Istakni na profilu",
+  "account.follow": "Prati",
+  "account.followers": "Pratitelji",
+  "account.followers.empty": "Nitko joÅ¡ ne prati korisnika/cu.",
+  "account.followers_counter": "{count, plural, one {{counter} pratitelj} other {{counter} pratitelja}}",
+  "account.following_counter": "{count, plural, one {{counter} praÄ‡eni} few{{counter} praÄ‡ena} other {{counter} praÄ‡enih}}",
+  "account.follows.empty": "Korisnik/ca joÅ¡ ne prati nikoga.",
+  "account.follows_you": "Prati te",
+  "account.hide_reblogs": "Sakrij boostove od @{name}",
+  "account.last_status": "Posljednja aktivnost",
+  "account.link_verified_on": "VlasniÅ¡tvo ove poveznice provjereno je {date}",
+  "account.locked_info": "Status privatnosti ovog raÄuna postavljen je na zakljuÄano. Vlasnik ruÄno pregledava tko ih moÅ¾e pratiti.",
+  "account.media": "Medijski sadrÅ¾aj",
   "account.mention": "Spomeni @{name}",
-  "account.moved_to": "{name} has moved to:",
+  "account.moved_to": "RaÄun {name} je premjeÅ¡ten na:",
   "account.mute": "UtiÅ¡aj @{name}",
-  "account.mute_notifications": "Mute notifications from @{name}",
-  "account.muted": "Muted",
-  "account.never_active": "Never",
-  "account.posts": "Postovi",
-  "account.posts_with_replies": "Toots with replies",
+  "account.mute_notifications": "UtiÅ¡aj obavijesti od @{name}",
+  "account.muted": "UtiÅ¡ano",
+  "account.never_active": "Nikad",
+  "account.posts": "Tootovi",
+  "account.posts_with_replies": "Tootovi i odgovori",
   "account.report": "Prijavi @{name}",
-  "account.requested": "ÄŒeka pristanak",
-  "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.requested": "ÄŒekanje na potvrdu. Kliknite za otkazivanje zahtjeva za praÄ‡enje",
+  "account.share": "Podijeli profil @{name}",
+  "account.show_reblogs": "PrikaÅ¾i boostove od @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} toot} other {{counter} toota}}",
   "account.unblock": "Deblokiraj @{name}",
-  "account.unblock_domain": "PoniÅ¡ti sakrivanje {domain}",
-  "account.unendorse": "Don't feature on profile",
-  "account.unfollow": "Prestani slijediti",
+  "account.unblock_domain": "Deblokiraj domenu {domain}",
+  "account.unendorse": "Ne istiÄi na profilu",
+  "account.unfollow": "Prestani pratiti",
   "account.unmute": "PoniÅ¡ti utiÅ¡avanje @{name}",
-  "account.unmute_notifications": "Unmute notifications from @{name}",
-  "account_note.placeholder": "Click to add a note",
-  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Rate limited",
-  "alert.unexpected.message": "An unexpected error occurred.",
-  "alert.unexpected.title": "Oops!",
-  "announcement.announcement": "Announcement",
-  "autosuggest_hashtag.per_week": "{count} per week",
-  "boost_modal.combo": "MoÅ¾eÅ¡ pritisnuti {combo} kako bi ovo preskoÄio sljedeÄ‡i put",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
-  "bundle_column_error.retry": "Try again",
-  "bundle_column_error.title": "Network error",
-  "bundle_modal_error.close": "Close",
-  "bundle_modal_error.message": "Something went wrong while loading this component.",
-  "bundle_modal_error.retry": "Try again",
+  "account.unmute_notifications": "Ne utiÅ¡avaj obavijesti od @{name}",
+  "account_note.placeholder": "Kliknite za dodavanje biljeÅ¡ke",
+  "alert.rate_limited.message": "Molimo pokuÅ¡ajte nakon {retry_time, time, medium}.",
+  "alert.rate_limited.title": "OgraniÄenje uÄestalosti",
+  "alert.unexpected.message": "Dogodila se neoÄekivana greÅ¡ka.",
+  "alert.unexpected.title": "Ups!",
+  "announcement.announcement": "Najava",
+  "autosuggest_hashtag.per_week": "{count} tjedno",
+  "boost_modal.combo": "MoÅ¾ete pritisnuti {combo} kako biste preskoÄili ovo sljedeÄ‡i put",
+  "bundle_column_error.body": "NeÅ¡to je poÅ¡lo po zlu tijekom uÄitavanja ove komponente.",
+  "bundle_column_error.retry": "PokuÅ¡ajte ponovno",
+  "bundle_column_error.title": "GreÅ¡ka mreÅ¾e",
+  "bundle_modal_error.close": "Zatvori",
+  "bundle_modal_error.message": "NeÅ¡to je poÅ¡lo po zlu tijekom uÄitavanja ove komponente.",
+  "bundle_modal_error.retry": "PokuÅ¡ajte ponovno",
   "column.blocks": "Blokirani korisnici",
-  "column.bookmarks": "Bookmarks",
-  "column.community": "Lokalni timeline",
-  "column.direct": "Direct messages",
-  "column.directory": "Browse profiles",
-  "column.domain_blocks": "Hidden domains",
+  "column.bookmarks": "KnjiÅ¾ne oznake",
+  "column.community": "Lokalna vremenska crta",
+  "column.direct": "Izravne poruke",
+  "column.directory": "Pregledavanje profila",
+  "column.domain_blocks": "Blokirane domene",
   "column.favourites": "Favoriti",
-  "column.follow_requests": "Zahtjevi za slijeÄ‘enje",
-  "column.home": "Dom",
-  "column.lists": "Lists",
+  "column.follow_requests": "Zahtjevi za praÄ‡enje",
+  "column.home": "PoÄetna",
+  "column.lists": "Liste",
   "column.mutes": "UtiÅ¡ani korisnici",
-  "column.notifications": "Notifikacije",
-  "column.pins": "Pinned toot",
-  "column.public": "Federalni timeline",
+  "column.notifications": "Obavijesti",
+  "column.pins": "PrikvaÄeni tootovi",
+  "column.public": "Federalna vremenska crta",
   "column_back_button.label": "Natrag",
-  "column_header.hide_settings": "Hide settings",
-  "column_header.moveLeft_settings": "Move column to the left",
-  "column_header.moveRight_settings": "Move column to the right",
-  "column_header.pin": "Pin",
-  "column_header.show_settings": "Show settings",
-  "column_header.unpin": "Unpin",
+  "column_header.hide_settings": "Sakrij postavke",
+  "column_header.moveLeft_settings": "Pomakni stupac ulijevo",
+  "column_header.moveRight_settings": "Pomakni stupac udesno",
+  "column_header.pin": "PrikvaÄi",
+  "column_header.show_settings": "PrikaÅ¾i postavke",
+  "column_header.unpin": "OtkvaÄi",
   "column_subheading.settings": "Postavke",
-  "community.column_settings.local_only": "Local only",
-  "community.column_settings.media_only": "Media only",
-  "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
-  "compose_form.direct_message_warning_learn_more": "Learn more",
-  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
-  "compose_form.lock_disclaimer": "Tvoj raÄun nije {locked}. Svatko te moÅ¾e slijediti kako bi vidio postove namijenjene samo tvojim sljedbenicima.",
+  "community.column_settings.local_only": "Samo lokalno",
+  "community.column_settings.media_only": "Samo medijski sadrÅ¾aj",
+  "community.column_settings.remote_only": "Samo udaljeno",
+  "compose_form.direct_message_warning": "Ovaj toot bit Ä‡e poslan samo spomenutim korisnicima.",
+  "compose_form.direct_message_warning_learn_more": "Saznajte viÅ¡e",
+  "compose_form.hashtag_warning": "Ovaj toot neÄ‡e biti prikazan ni pod jednim hashtagom jer je postavljen kao neprikazan. Samo javni tootovi mogu biti pretraÅ¾ivani pomoÄ‡i hashtagova.",
+  "compose_form.lock_disclaimer": "VaÅ¡ raÄun nije {locked}. Svatko Vas moÅ¾e pratiti kako bi vidjeli objave namijenjene VaÅ¡im pratiteljima.",
   "compose_form.lock_disclaimer.lock": "zakljuÄan",
   "compose_form.placeholder": "Å to ti je na umu?",
-  "compose_form.poll.add_option": "Add a choice",
-  "compose_form.poll.duration": "Poll duration",
-  "compose_form.poll.option_placeholder": "Choice {number}",
-  "compose_form.poll.remove_option": "Remove this choice",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Toot",
+  "compose_form.poll.add_option": "Dodaj opciju",
+  "compose_form.poll.duration": "Trajanje ankete",
+  "compose_form.poll.option_placeholder": "Opcija {number}",
+  "compose_form.poll.remove_option": "Ukloni ovu opciju",
+  "compose_form.poll.switch_to_multiple": "OmoguÄ‡i viÅ¡estruki odabir opcija ankete",
+  "compose_form.poll.switch_to_single": "OmoguÄ‡i odabir samo jedne opcije ankete",
+  "compose_form.publish": "Tootni",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
-  "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "Upozorenje o sadrÅ¾aju",
+  "compose_form.sensitive.hide": "OznaÄi medijski sadrÅ¾aj kao osjetljiv",
+  "compose_form.sensitive.marked": "Medijski sadrÅ¾aj oznaÄen je kao osjetljiv",
+  "compose_form.sensitive.unmarked": "Medijski sadrÅ¾aj nije oznaÄen kao osjetljiv",
+  "compose_form.spoiler.marked": "Tekst je skriven iza upozorenja",
+  "compose_form.spoiler.unmarked": "Tekst nije skriven",
+  "compose_form.spoiler_placeholder": "Ovdje upiÅ¡ite upozorenje",
   "confirmation_modal.cancel": "OtkaÅ¾i",
-  "confirmations.block.block_and_report": "Block & Report",
+  "confirmations.block.block_and_report": "Blokiraj i prijavi",
   "confirmations.block.confirm": "Blokiraj",
-  "confirmations.block.message": "Å½eliÅ¡ li sigurno blokirati {name}?",
+  "confirmations.block.message": "Sigurno Å¾elite blokirati {name}?",
   "confirmations.delete.confirm": "ObriÅ¡i",
-  "confirmations.delete.message": "Å½eliÅ¡ li stvarno obrisati ovaj status?",
-  "confirmations.delete_list.confirm": "Delete",
-  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
-  "confirmations.domain_block.confirm": "Sakrij cijelu domenu",
-  "confirmations.domain_block.message": "Jesi li zaista, zaista siguran da Å¾eliÅ¡ potpuno blokirati {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
-  "confirmations.logout.confirm": "Log out",
-  "confirmations.logout.message": "Are you sure you want to log out?",
+  "confirmations.delete.message": "Stvarno Å¾elite obrisati ovaj toot?",
+  "confirmations.delete_list.confirm": "ObriÅ¡i",
+  "confirmations.delete_list.message": "Jeste li sigurni da Å¾elite trajno obrisati ovu listu?",
+  "confirmations.domain_block.confirm": "Blokiraj cijelu domenu",
+  "confirmations.domain_block.message": "Jeste li zaista, zaista sigurni da Å¾elite blokirati cijelu domenu {domain}? U veÄ‡ini sluÄajeva dovoljno je i preferirano nekoliko ciljanih blokiranja ili utiÅ¡avanja. NeÄ‡ete vidjeti sadrÅ¾aj s te domene ni u kojim javnim vremenskim crtama ili VaÅ¡im obavijestima. VaÅ¡i pratitelji s te domene bit Ä‡e uklonjeni.",
+  "confirmations.logout.confirm": "Odjavi se",
+  "confirmations.logout.message": "Jeste li sigurni da se Å¾elite odjaviti?",
   "confirmations.mute.confirm": "UtiÅ¡aj",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
-  "confirmations.mute.message": "Jesi li siguran da Å¾eliÅ¡ utiÅ¡ati {name}?",
-  "confirmations.redraft.confirm": "Delete & redraft",
-  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.",
-  "confirmations.reply.confirm": "Reply",
+  "confirmations.mute.explanation": "Ovo Ä‡e sakriti njihove objave i objave koje ih spominju, ali i dalje Ä‡e im dopuÅ¡tati da vide VaÅ¡e objave i da Vas prate.",
+  "confirmations.mute.message": "Jeste li sigurni da Å¾elite utiÅ¡ati {name}?",
+  "confirmations.redraft.confirm": "IzbriÅ¡i i ponovno uredi",
+  "confirmations.redraft.message": "Jeste li sigurni da Å¾elite izbrisati ovaj toot i ponovno ga urediti? Favoriti i boostovi bit Ä‡e izgubljeni, a odgovori na izvornu objavu bit Ä‡e odvojeni.",
+  "confirmations.reply.confirm": "Odgovori",
   "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
-  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.confirm": "Prestani pratiti",
   "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
-  "conversation.delete": "Delete conversation",
-  "conversation.mark_as_read": "Mark as read",
-  "conversation.open": "View conversation",
-  "conversation.with": "With {names}",
+  "conversation.delete": "IzbriÅ¡i razgovor",
+  "conversation.mark_as_read": "OznaÄi kao proÄitano",
+  "conversation.open": "PrikaÅ¾i razgovor",
+  "conversation.with": "S {names}",
   "directory.federated": "From known fediverse",
-  "directory.local": "From {domain} only",
+  "directory.local": "Samo iz {domain}",
   "directory.new_arrivals": "New arrivals",
-  "directory.recently_active": "Recently active",
+  "directory.recently_active": "Nedavno aktivni",
   "embed.instructions": "Embed this status on your website by copying the code below.",
-  "embed.preview": "Here is what it will look like:",
+  "embed.preview": "Evo kako Ä‡e izgledati:",
   "emoji_button.activity": "Aktivnost",
-  "emoji_button.custom": "Custom",
+  "emoji_button.custom": "PrilagoÄ‘eno",
   "emoji_button.flags": "Zastave",
-  "emoji_button.food": "Hrana & PiÄ‡e",
-  "emoji_button.label": "Umetni smajlije",
+  "emoji_button.food": "Hrana i piÄ‡e",
+  "emoji_button.label": "Umetni emotikone",
   "emoji_button.nature": "Priroda",
-  "emoji_button.not_found": "No emojos!! (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
-  "emoji_button.objects": "Objekti",
+  "emoji_button.not_found": "Nema emotikona!! (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
+  "emoji_button.objects": "Predmeti",
   "emoji_button.people": "Ljudi",
-  "emoji_button.recent": "Frequently used",
+  "emoji_button.recent": "ÄŒesto koriÅ¡teno",
   "emoji_button.search": "TraÅ¾i...",
-  "emoji_button.search_results": "Search results",
+  "emoji_button.search_results": "Rezultati pretraÅ¾ivanja",
   "emoji_button.symbols": "Simboli",
-  "emoji_button.travel": "Putovanja & Mjesta",
-  "empty_column.account_timeline": "No toots here!",
-  "empty_column.account_unavailable": "Profile unavailable",
-  "empty_column.blocks": "You haven't blocked any users yet.",
+  "emoji_button.travel": "Putovanje i mjesta",
+  "empty_column.account_suspended": "RaÄun je suspendiran",
+  "empty_column.account_timeline": "Ovdje nema tootova!",
+  "empty_column.account_unavailable": "Profil nije dostupan",
+  "empty_column.blocks": "JoÅ¡ niste blokirali nikoga.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
-  "empty_column.community": "Lokalni timeline je prazan. NapiÅ¡i neÅ¡to javno kako bi pokrenuo stvari!",
+  "empty_column.community": "Lokalna vremenska crta je prazna. NapiÅ¡ite neÅ¡to javno da biste pokrenuli stvari!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
-  "empty_column.domain_blocks": "There are no hidden domains yet.",
+  "empty_column.domain_blocks": "JoÅ¡ nema blokiranih domena.",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
   "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
   "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "empty_column.hashtag": "JoÅ¡ ne postoji niÅ¡ta s ovim hashtagom.",
-  "empty_column.home": "JoÅ¡ ne slijediÅ¡ nikoga. Posjeti {public} ili koristi traÅ¾ilicu kako bi poÄeo i upoznao druge korisnike.",
-  "empty_column.home.public_timeline": "javni timeline",
-  "empty_column.list": "There is nothing in this list yet.",
+  "empty_column.home": "VaÅ¡a poÄetna vremenska crta je prazna! Posjetite {public} ili koristite traÅ¾ilicu kako biste zapoÄeli i upoznali druge korisnike.",
+  "empty_column.home.public_timeline": "javnu vremensku crtu",
+  "empty_column.list": "Na ovoj listi joÅ¡ nema niÄega. Kada Älanovi ove liste objave nove tootove, oni Ä‡e se pojaviti ovdje.",
   "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
-  "empty_column.mutes": "You haven't muted any users yet.",
-  "empty_column.notifications": "JoÅ¡ nemaÅ¡ notifikacija. Komuniciraj sa drugima kako bi zapoÄeo razgovor.",
-  "empty_column.public": "Ovdje nema niÅ¡ta! NapiÅ¡i neÅ¡to javno, ili ruÄno slijedi korisnike sa drugih instanci kako bi popunio",
+  "empty_column.mutes": "Niste utiÅ¡ali nijednog korisnika.",
+  "empty_column.notifications": "JoÅ¡ nemate obavijesti. Komunicirajte s drugima kako biste zapoÄeli razgovor.",
+  "empty_column.public": "Ovdje nema niÅ¡ta! NapiÅ¡ite neÅ¡to javno ili ruÄno pratite korisnike s drugi posluÅ¾itelja da biste ovo popunili",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
-  "errors.unexpected_crash.report_issue": "Report issue",
+  "errors.unexpected_crash.report_issue": "Prijavi problem",
   "follow_request.authorize": "Autoriziraj",
   "follow_request.reject": "Odbij",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
-  "generic.saved": "Saved",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
+  "generic.saved": "Spremljeno",
+  "getting_started.developers": "Razvijatelji",
+  "getting_started.directory": "Direktorij profila",
+  "getting_started.documentation": "Dokumentacija",
   "getting_started.heading": "PoÄnimo",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "Mastodon je softver otvorenog koda. MoÅ¾eÅ¡ pridonijeti ili prijaviti probleme na GitHubu  {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.select.no_options_message": "No suggestions found",
-  "hashtag.column_settings.select.placeholder": "Enter hashtagsâ€¦",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "getting_started.invite": "Pozovi ljude",
+  "getting_started.open_source_notice": "Mastodon je softver otvorenog kÃ´da. MoÅ¾ete pridonijeti ili prijaviti probleme na GitHubu na {github}.",
+  "getting_started.security": "Postavke raÄuna",
+  "getting_started.terms": "Uvjeti pruÅ¾anja usluga",
+  "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 prijedlozi",
+  "hashtag.column_settings.select.placeholder": "Unesite hashtagoveâ€¦",
+  "hashtag.column_settings.tag_mode.all": "Sve navedeno",
+  "hashtag.column_settings.tag_mode.any": "Bilo koji navedeni",
+  "hashtag.column_settings.tag_mode.none": "Nijedan navedeni",
+  "hashtag.column_settings.tag_toggle": "UkljuÄi dodatne oznake za ovaj stupac",
   "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "PokaÅ¾i boostove",
   "home.column_settings.show_replies": "PokaÅ¾i odgovore",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
-  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
-  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
-  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
-  "introduction.federation.action": "Next",
-  "introduction.federation.federated.headline": "Federated",
-  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
-  "introduction.federation.home.headline": "Home",
-  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
-  "introduction.federation.local.headline": "Local",
-  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
-  "introduction.interactions.action": "Finish toot-orial!",
-  "introduction.interactions.favourite.headline": "Favourite",
-  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
-  "introduction.interactions.reblog.headline": "Boost",
-  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
-  "introduction.interactions.reply.headline": "Reply",
-  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
-  "introduction.welcome.action": "Let's go!",
-  "introduction.welcome.headline": "First steps",
-  "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is specialâ€”it hosts your profile, so remember its name.",
-  "keyboard_shortcuts.back": "to navigate back",
-  "keyboard_shortcuts.blocked": "to open blocked users list",
-  "keyboard_shortcuts.boost": "to boost",
-  "keyboard_shortcuts.column": "to focus a status in one of the columns",
-  "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "to open direct messages column",
-  "keyboard_shortcuts.down": "to move down in the list",
-  "keyboard_shortcuts.enter": "to open status",
-  "keyboard_shortcuts.favourite": "to favourite",
-  "keyboard_shortcuts.favourites": "to open favourites list",
-  "keyboard_shortcuts.federated": "to open federated timeline",
-  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.home": "to open home timeline",
-  "keyboard_shortcuts.hotkey": "Hotkey",
-  "keyboard_shortcuts.legend": "to display this legend",
-  "keyboard_shortcuts.local": "to open local timeline",
-  "keyboard_shortcuts.mention": "to mention author",
-  "keyboard_shortcuts.muted": "to open muted users list",
-  "keyboard_shortcuts.my_profile": "to open your profile",
-  "keyboard_shortcuts.notifications": "to open notifications column",
-  "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "to open pinned toots list",
-  "keyboard_shortcuts.profile": "to open author's profile",
-  "keyboard_shortcuts.reply": "to reply",
-  "keyboard_shortcuts.requests": "to open follow requests list",
-  "keyboard_shortcuts.search": "to focus search",
+  "home.hide_announcements": "Sakrij najave",
+  "home.show_announcements": "PrikaÅ¾i najave",
+  "intervals.full.days": "{number, plural, one {# dan} other {# dana}}",
+  "intervals.full.hours": "{number, plural, one {# sat} few {# sata} other {# sati}}",
+  "intervals.full.minutes": "{number, plural, one {# minuta} few {# minute} other {# minuta}}",
+  "introduction.federation.action": "SljedeÄ‡e",
+  "introduction.federation.federated.headline": "Federalno",
+  "introduction.federation.federated.text": "Javne objave s drugih posluÅ¾itelja fediverzuma prikazat Ä‡e se u federalnoj vremenskoj crti.",
+  "introduction.federation.home.headline": "PoÄetna",
+  "introduction.federation.home.text": "Objave ljudi koje pratite prikazat Ä‡e se na VaÅ¡oj poÄetnoj stranici. MoÅ¾ete pratiti bilo koga na bilo kojem posluÅ¾itelju!",
+  "introduction.federation.local.headline": "Lokalno",
+  "introduction.federation.local.text": "Javne objave ljudi na istom posluÅ¾itelju prikazat Ä‡e se u lokalnoj vremenskoj crti.",
+  "introduction.interactions.action": "DovrÅ¡i tutorijal!",
+  "introduction.interactions.favourite.headline": "Favoriti",
+  "introduction.interactions.favourite.text": "Toot moÅ¾ete spremiti za kasnije i javiti njegovom autoru da Vam se sviÄ‘a tako Å¡to ga oznaÄite kao favorit.",
+  "introduction.interactions.reblog.headline": "Boostanje",
+  "introduction.interactions.reblog.text": "TuÄ‘e tootove moÅ¾ete dijeliti sa svojim pratiteljima tako Å¡to ih boostate.",
+  "introduction.interactions.reply.headline": "Odgovaranje",
+  "introduction.interactions.reply.text": "MoÅ¾ete odgovoriti na tuÄ‘e i svoje tootove, Äime Ä‡e se oni povezati u razgovor.",
+  "introduction.welcome.action": "Krenimo!",
+  "introduction.welcome.headline": "Prvi koraci",
+  "introduction.welcome.text": "Dobro doÅ¡li na fediverzum! Za nekoliko trenutaka moÄ‡i Ä‡ete dijeliti poruke i razgovara sa svojim prijateljima kroz Å¡iroki raspon posluÅ¾itelja. Ali ovaj posluÅ¾itelj, {domain}, je poseban â€” on sadrÅ¾i VaÅ¡ profil, pa zapamtite njegovo ime.",
+  "keyboard_shortcuts.back": "za vraÄ‡anje natrag",
+  "keyboard_shortcuts.blocked": "za otvaranje liste blokiranih korisnika",
+  "keyboard_shortcuts.boost": "za boostanje",
+  "keyboard_shortcuts.column": "za fokusiranje na toot u jednom od stupaca",
+  "keyboard_shortcuts.compose": "za fokusiranje na tekstualni okvir za stvaranje",
+  "keyboard_shortcuts.description": "Opis",
+  "keyboard_shortcuts.direct": "za otvaranje stupca s izravnim porukama",
+  "keyboard_shortcuts.down": "za pomak dolje na listi",
+  "keyboard_shortcuts.enter": "za otvaranje toota",
+  "keyboard_shortcuts.favourite": "za oznaÄavanje favoritom",
+  "keyboard_shortcuts.favourites": "za otvaranje liste favorita",
+  "keyboard_shortcuts.federated": "za otvaranje federalne vremenske crte",
+  "keyboard_shortcuts.heading": "TipkovniÄki preÄaci",
+  "keyboard_shortcuts.home": "za otvaranje poÄetne vremenske crte",
+  "keyboard_shortcuts.hotkey": "TipkovniÄki preÄac",
+  "keyboard_shortcuts.legend": "za prikaz ove legende",
+  "keyboard_shortcuts.local": "za otvaranje lokalne vremenske crte",
+  "keyboard_shortcuts.mention": "za spominjanje autora",
+  "keyboard_shortcuts.muted": "za otvaranje liste utiÅ¡anih korisnika",
+  "keyboard_shortcuts.my_profile": "za otvaranje VaÅ¡eg profila",
+  "keyboard_shortcuts.notifications": "za otvaranje stupca s obavijestima",
+  "keyboard_shortcuts.open_media": "za otvaranje medijskog sadrÅ¾aja",
+  "keyboard_shortcuts.pinned": "za otvaranje liste prikvaÄenih tootova",
+  "keyboard_shortcuts.profile": "za otvaranje autorovog profila",
+  "keyboard_shortcuts.reply": "za odgovaranje",
+  "keyboard_shortcuts.requests": "za otvaranje liste zahtjeva za praÄ‡enje",
+  "keyboard_shortcuts.search": "za fokusiranje na traÅ¾ilicu",
   "keyboard_shortcuts.spoilers": "to show/hide CW field",
   "keyboard_shortcuts.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
-  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
-  "keyboard_shortcuts.toot": "to start a brand new toot",
+  "keyboard_shortcuts.toggle_sensitivity": "za prikaz/sakrivanje medijskog sadrÅ¾aja",
+  "keyboard_shortcuts.toot": "za zapoÄinjanje novog toota",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Zatvori",
-  "lightbox.next": "Next",
-  "lightbox.previous": "Previous",
-  "lightbox.view_context": "View context",
-  "lists.account.add": "Add to list",
-  "lists.account.remove": "Remove from list",
-  "lists.delete": "Delete list",
-  "lists.edit": "Edit list",
-  "lists.edit.submit": "Change title",
-  "lists.new.create": "Add list",
-  "lists.new.title_placeholder": "New list title",
-  "lists.search": "Search among people you follow",
-  "lists.subheading": "Your lists",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
+  "lightbox.next": "SljedeÄ‡e",
+  "lightbox.previous": "Prethodno",
+  "lists.account.add": "Dodaj na listu",
+  "lists.account.remove": "Ukloni s liste",
+  "lists.delete": "IzbriÅ¡i listu",
+  "lists.edit": "Uredi listu",
+  "lists.edit.submit": "Promijeni naslov",
+  "lists.new.create": "Dodaj listu",
+  "lists.new.title_placeholder": "Naziv nove liste",
+  "lists.replies_policy.followed": "Bilo koji praÄ‡eni korisnik",
+  "lists.replies_policy.list": "ÄŒlanovi liste",
+  "lists.replies_policy.none": "Nitko",
+  "lists.replies_policy.title": "Show replies to:",
+  "lists.search": "TraÅ¾i meÄ‘u praÄ‡enim ljudima",
+  "lists.subheading": "VaÅ¡e liste",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
-  "loading_indicator.label": "UÄitavam...",
-  "media_gallery.toggle_visible": "Preklopi vidljivost",
-  "missing_indicator.label": "Nije naÄ‘en",
+  "loading_indicator.label": "UÄitavanje...",
+  "media_gallery.toggle_visible": "Sakrij {number, plural, one {sliku} other {slike}}",
+  "missing_indicator.label": "Nije pronaÄ‘eno",
   "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Trajanje",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
-  "navigation_bar.apps": "Mobile apps",
+  "mute_modal.indefinite": "Indefinite",
+  "navigation_bar.apps": "Mobilne aplikacije",
   "navigation_bar.blocks": "Blokirani korisnici",
   "navigation_bar.bookmarks": "Bookmarks",
-  "navigation_bar.community_timeline": "Lokalni timeline",
+  "navigation_bar.community_timeline": "Lokalna vremenska crta",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
-  "navigation_bar.discover": "Discover",
-  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.direct": "Izravne poruke",
+  "navigation_bar.discover": "IstraÅ¾ivanje",
+  "navigation_bar.domain_blocks": "Blokirane domene",
   "navigation_bar.edit_profile": "Uredi profil",
   "navigation_bar.favourites": "Favoriti",
-  "navigation_bar.filters": "Muted words",
-  "navigation_bar.follow_requests": "Zahtjevi za slijeÄ‘enje",
-  "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "ViÅ¡e informacija",
-  "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
-  "navigation_bar.lists": "Lists",
+  "navigation_bar.filters": "UtiÅ¡ane rijeÄi",
+  "navigation_bar.follow_requests": "Zahtjevi za praÄ‡enje",
+  "navigation_bar.follows_and_followers": "PraÄ‡eni i pratitelji",
+  "navigation_bar.info": "O ovom posluÅ¾itelju",
+  "navigation_bar.keyboard_shortcuts": "TipkovniÄki preÄaci",
+  "navigation_bar.lists": "Liste",
   "navigation_bar.logout": "Odjavi se",
   "navigation_bar.mutes": "UtiÅ¡ani korisnici",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Pinned toots",
+  "navigation_bar.personal": "Osobno",
+  "navigation_bar.pins": "PrikvaÄeni tootovi",
   "navigation_bar.preferences": "Postavke",
-  "navigation_bar.public_timeline": "Federalni timeline",
-  "navigation_bar.security": "Security",
-  "notification.favourite": "{name} je lajkao tvoj status",
-  "notification.follow": "{name} te sada slijedi",
-  "notification.follow_request": "{name} has requested to follow you",
-  "notification.mention": "{name} te je spomenuo",
-  "notification.own_poll": "Your poll has ended",
-  "notification.poll": "A poll you have voted in has ended",
-  "notification.reblog": "{name} je podigao tvoj status",
-  "notifications.clear": "OÄisti notifikacije",
-  "notifications.clear_confirmation": "Å½eliÅ¡ li zaista obrisati sve svoje notifikacije?",
-  "notifications.column_settings.alert": "Desktop notifikacije",
+  "navigation_bar.public_timeline": "Federalna vremenska crta",
+  "navigation_bar.security": "Sigurnost",
+  "notification.favourite": "{name} je favorizirao/la VaÅ¡ toot",
+  "notification.follow": "{name} Vas je poÄeo/la pratiti",
+  "notification.follow_request": "{name} zatraÅ¾io/la je da Vas prati",
+  "notification.mention": "{name} Vas je spomenuo",
+  "notification.own_poll": "VaÅ¡a anketa je zavrÅ¡ila",
+  "notification.poll": "Anketa u kojoj ste glasali je zavrÅ¡ila",
+  "notification.reblog": "{name} je boostao/la VaÅ¡ status",
+  "notification.status": "{name} just posted",
+  "notifications.clear": "OÄisti obavijesti",
+  "notifications.clear_confirmation": "Å½elite li zaista trajno oÄistiti sve VaÅ¡e obavijesti?",
+  "notifications.column_settings.alert": "Obavijesti radne povrÅ¡ine",
   "notifications.column_settings.favourite": "Favoriti:",
-  "notifications.column_settings.filter_bar.advanced": "Display all categories",
-  "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
-  "notifications.column_settings.follow": "Novi sljedbenici:",
-  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.filter_bar.advanced": "PrikaÅ¾i sve kategorije",
+  "notifications.column_settings.filter_bar.category": "Brza traka filtera",
+  "notifications.column_settings.filter_bar.show": "PrikaÅ¾i",
+  "notifications.column_settings.follow": "Novi pratitelji:",
+  "notifications.column_settings.follow_request": "Novi zahtjevi za praÄ‡enje:",
   "notifications.column_settings.mention": "Spominjanja:",
-  "notifications.column_settings.poll": "Poll results:",
-  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.poll": "Rezultati anketa:",
+  "notifications.column_settings.push": "Push obavijesti",
   "notifications.column_settings.reblog": "Boostovi:",
   "notifications.column_settings.show": "PrikaÅ¾i u stupcu",
   "notifications.column_settings.sound": "Sviraj zvuk",
-  "notifications.filter.all": "All",
-  "notifications.filter.boosts": "Boosts",
-  "notifications.filter.favourites": "Favourites",
-  "notifications.filter.follows": "Follows",
-  "notifications.filter.mentions": "Mentions",
-  "notifications.filter.polls": "Poll results",
-  "notifications.group": "{count} notifications",
-  "poll.closed": "Closed",
-  "poll.refresh": "Refresh",
-  "poll.total_people": "{count, plural, one {# person} other {# people}}",
-  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
-  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
-  "poll_button.add_poll": "Add a poll",
-  "poll_button.remove_poll": "Remove poll",
-  "privacy.change": "Podesi status privatnosti",
-  "privacy.direct.long": "PrikaÅ¾i samo spomenutim korisnicima",
-  "privacy.direct.short": "Direktno",
-  "privacy.private.long": "PrikaÅ¾i samo sljedbenicima",
-  "privacy.private.short": "Privatno",
-  "privacy.public.long": "Postaj na javne timeline",
+  "notifications.column_settings.status": "New toots:",
+  "notifications.filter.all": "Sve",
+  "notifications.filter.boosts": "Boostovi",
+  "notifications.filter.favourites": "Favoriti",
+  "notifications.filter.follows": "PraÄ‡enja",
+  "notifications.filter.mentions": "Spominjanja",
+  "notifications.filter.polls": "Rezultati anketa",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
+  "notifications.group": "{count} obavijesti",
+  "notifications.mark_as_read": "OznaÄi sve obavijesti kao proÄitane",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
+  "poll.closed": "ZavrÅ¡eno",
+  "poll.refresh": "OsvjeÅ¾i",
+  "poll.total_people": "{count, plural, one {# osoba} few {# osobe} other {# osoba}}",
+  "poll.total_votes": "{count, plural, one {# glas} few {# glasa} other {# glasova}}",
+  "poll.vote": "Glasaj",
+  "poll.voted": "Vi ste glasali za ovaj odgovor",
+  "poll_button.add_poll": "Dodaj anketu",
+  "poll_button.remove_poll": "Ukloni anketu",
+  "privacy.change": "Podesi privatnost toota",
+  "privacy.direct.long": "Vidljivo samo spomenutim korisnicima",
+  "privacy.direct.short": "Izravno",
+  "privacy.private.long": "Vidljivo samo pratiteljima",
+  "privacy.private.short": "Samo pratitelji",
+  "privacy.public.long": "Vidljivo svima, prikazano u javim vremenskim crtama",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.long": "Ne prikazuj u javnim timelineovima",
-  "privacy.unlisted.short": "Unlisted",
-  "refresh": "Refresh",
-  "regeneration_indicator.label": "Loadingâ€¦",
-  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "privacy.unlisted.long": "Vidljivo svima, ali se ne prikazuje u javnim vremenskim crtama",
+  "privacy.unlisted.short": "Neprikazano",
+  "refresh": "OsvjeÅ¾i",
+  "regeneration_indicator.label": "UÄitavanjeâ€¦",
+  "regeneration_indicator.sublabel": "Priprema se VaÅ¡a poÄetna stranica!",
   "relative_time.days": "{number}d",
   "relative_time.hours": "{number}h",
-  "relative_time.just_now": "now",
+  "relative_time.just_now": "sada",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
-  "relative_time.today": "today",
+  "relative_time.today": "danas",
   "reply_indicator.cancel": "OtkaÅ¾i",
-  "report.forward": "Forward to {target}",
-  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.forward": "Proslijedi {target}",
+  "report.forward_hint": "RaÄun je s drugog posluÅ¾itelja. Poslati anonimiziranu kopiju prijave i tamo?",
+  "report.hint": "Prijava bit Ä‡e poslana moderatorima posluÅ¾itelja. Ispod moÅ¾ete dati objaÅ¡njenje zaÅ¡to prijavljujete ovaj raÄun:",
   "report.placeholder": "Dodatni komentari",
   "report.submit": "PoÅ¡alji",
-  "report.target": "Prijavljivanje",
+  "report.target": "Prijavljivanje korisnika {target}",
   "search.placeholder": "TraÅ¾i",
-  "search_popout.search_format": "Advanced search format",
+  "search_popout.search_format": "Format naprednog pretraÅ¾ivanja",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "status",
+  "search_popout.tips.status": "toot",
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
-  "search_popout.tips.user": "user",
-  "search_results.accounts": "People",
+  "search_popout.tips.user": "korisnik",
+  "search_results.accounts": "Ljudi",
   "search_results.hashtags": "Hashtags",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
@@ -370,92 +394,93 @@
   "status.block": "Block @{name}",
   "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Unboost",
-  "status.cannot_reblog": "Ovaj post ne moÅ¾e biti boostan",
+  "status.cannot_reblog": "Ova objava ne moÅ¾e biti boostana",
   "status.copy": "Copy link to status",
   "status.delete": "ObriÅ¡i",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
   "status.embed": "Embed",
-  "status.favourite": "OznaÄi omiljenim",
+  "status.favourite": "OznaÄi favoritom",
   "status.filtered": "Filtered",
   "status.load_more": "UÄitaj viÅ¡e",
-  "status.media_hidden": "Sakriven media sadrÅ¾aj",
+  "status.media_hidden": "Sakriven medijski sadrÅ¾aj",
   "status.mention": "Spomeni @{name}",
   "status.more": "More",
   "status.mute": "Mute @{name}",
   "status.mute_conversation": "UtiÅ¡aj razgovor",
-  "status.open": "ProÅ¡iri ovaj status",
+  "status.open": "ProÅ¡iri ovaj toot",
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned toot",
-  "status.read_more": "Read more",
-  "status.reblog": "Podigni",
-  "status.reblog_private": "Boost to original audience",
-  "status.reblogged_by": "{name} je podigao",
-  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
-  "status.redraft": "Delete & re-draft",
-  "status.remove_bookmark": "Remove bookmark",
+  "status.read_more": "ProÄitajte viÅ¡e",
+  "status.reblog": "Boostaj",
+  "status.reblog_private": "Boostaj s izvornom vidljivoÅ¡Ä‡u",
+  "status.reblogged_by": "{name} je boostao/la",
+  "status.reblogs.empty": "Nitko joÅ¡ nije boostao ovaj toot. Kada netko to uÄini, ovdje Ä‡e biti prikazani.",
+  "status.redraft": "IzbriÅ¡i i ponovno uredi",
+  "status.remove_bookmark": "Ukloni knjiÅ¾nu oznaku",
   "status.reply": "Odgovori",
-  "status.replyAll": "Odgovori na temu",
+  "status.replyAll": "Odgovori na niz",
   "status.report": "Prijavi @{name}",
   "status.sensitive_warning": "Osjetljiv sadrÅ¾aj",
-  "status.share": "Share",
+  "status.share": "Podijeli",
   "status.show_less": "PokaÅ¾i manje",
   "status.show_less_all": "Show less for all",
   "status.show_more": "PokaÅ¾i viÅ¡e",
   "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
-  "status.uncached_media_warning": "Not available",
+  "status.show_thread": "PrikaÅ¾i nit",
+  "status.uncached_media_warning": "Nije dostupno",
   "status.unmute_conversation": "PoniÅ¡ti utiÅ¡avanje razgovora",
-  "status.unpin": "Unpin from profile",
-  "suggestions.dismiss": "Dismiss suggestion",
-  "suggestions.header": "You might be interested inâ€¦",
-  "tabs_bar.federated_timeline": "Federalni",
-  "tabs_bar.home": "Dom",
+  "status.unpin": "OtkvaÄi s profila",
+  "suggestions.dismiss": "Odbaci prijedlog",
+  "suggestions.header": "MoÅ¾da Vas zanimaâ€¦",
+  "tabs_bar.federated_timeline": "Federalno",
+  "tabs_bar.home": "PoÄetna",
   "tabs_bar.local_timeline": "Lokalno",
-  "tabs_bar.notifications": "Notifikacije",
-  "tabs_bar.search": "Search",
-  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
-  "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
-  "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
+  "tabs_bar.notifications": "Obavijesti",
+  "tabs_bar.search": "TraÅ¾i",
+  "time_remaining.days": "{number, plural, one {preostao # dan} other {preostalo # dana}}",
+  "time_remaining.hours": "{number, plural, one {preostao # sat} few {preostalo # sata} other {preostalo # sati}}",
+  "time_remaining.minutes": "{number, plural, one {preostala # minuta} few {preostale # minute} other {preostalo # minuta}}",
   "time_remaining.moments": "Moments remaining",
-  "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
+  "time_remaining.seconds": "{number, plural, one {preostala # sekunda} few {preostale # sekunde} other {preostalo # sekundi}}",
+  "timeline_hint.remote_resource_not_displayed": "{resource} s drugih posluÅ¾itelja nisu prikazani.",
+  "timeline_hint.resources.followers": "Pratitelji",
+  "timeline_hint.resources.follows": "PraÄ‡enja",
+  "timeline_hint.resources.statuses": "Stariji tootovi",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
-  "trends.trending_now": "Trending now",
-  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
-  "upload_area.title": "Povuci i spusti kako bi uploadao",
-  "upload_button.label": "Dodaj media",
-  "upload_error.limit": "File upload limit exceeded.",
-  "upload_error.poll": "File upload not allowed with polls.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
-  "upload_form.description": "Describe for the visually impaired",
-  "upload_form.edit": "Edit",
-  "upload_form.thumbnail": "Change thumbnail",
-  "upload_form.undo": "PoniÅ¡ti",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
-  "upload_modal.analyzing_picture": "Analyzing pictureâ€¦",
-  "upload_modal.apply": "Apply",
-  "upload_modal.choose_image": "Choose image",
+  "trends.trending_now": "Popularno",
+  "ui.beforeunload": "VaÅ¡a skica bit Ä‡e izgubljena ako napustite Mastodon.",
+  "units.short.billion": "{count} mlrd.",
+  "units.short.million": "{count} mil.",
+  "units.short.thousand": "{count} tis.",
+  "upload_area.title": "Povucite i ispustite za prijenos",
+  "upload_button.label": "Dodajte slike, video ili audio datoteku",
+  "upload_error.limit": "OgraniÄenje prijenosa datoteka je prekoraÄeno.",
+  "upload_error.poll": "Prijenos datoteka nije dopuÅ¡ten kod anketa.",
+  "upload_form.audio_description": "OpiÅ¡ite za ljude sa slabim sluhom",
+  "upload_form.description": "OpiÅ¡ite za ljude sa slabim vidom",
+  "upload_form.edit": "Uredi",
+  "upload_form.thumbnail": "Promijeni pretpregled",
+  "upload_form.undo": "ObriÅ¡i",
+  "upload_form.video_description": "OpiÅ¡ite za ljude sa slabim sluhom ili vidom",
+  "upload_modal.analyzing_picture": "Analiza slikeâ€¦",
+  "upload_modal.apply": "Primijeni",
+  "upload_modal.choose_image": "Odaberite sliku",
   "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
-  "upload_modal.detect_text": "Detect text from picture",
-  "upload_modal.edit_media": "Edit media",
+  "upload_modal.detect_text": "Detektiraj tekst sa slike",
+  "upload_modal.edit_media": "UreÄ‘ivanje medija",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
-  "upload_progress.label": "Uploadam...",
-  "video.close": "Close video",
-  "video.download": "Download file",
-  "video.exit_fullscreen": "Exit full screen",
-  "video.expand": "Expand video",
-  "video.fullscreen": "Full screen",
-  "video.hide": "Hide video",
-  "video.mute": "Mute sound",
-  "video.pause": "Pause",
-  "video.play": "Play",
-  "video.unmute": "Unmute sound"
+  "upload_progress.label": "PrenoÅ¡enje...",
+  "video.close": "Zatvori video",
+  "video.download": "Preuzmi datoteku",
+  "video.exit_fullscreen": "IzaÄ‘i iz cijelog zaslona",
+  "video.expand": "ProÅ¡iri video",
+  "video.fullscreen": "Cijeli zaslon",
+  "video.hide": "Sakrij video",
+  "video.mute": "UtiÅ¡aj zvuk",
+  "video.pause": "Pauziraj",
+  "video.play": "Reproduciraj",
+  "video.unmute": "UkljuÄi zvuk"
 }
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 713abba5f72dd86978370560511655aac29e1dfe..a0ae7305cfbae88580ac9b13d77ff225f03ead60 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -1,5 +1,5 @@
 {
-  "account.account_note_header": "MegjegyzÃ©s @{name} fiÃ³khoz",
+  "account.account_note_header": "FeljegyzÃ©s",
   "account.add_or_remove_from_list": "HozzÃ¡adÃ¡s vagy eltÃ¡volÃtÃ¡s a listÃ¡rÃ³l",
   "account.badges.bot": "Bot",
   "account.badges.group": "Csoport",
@@ -9,14 +9,16 @@
   "account.browse_more_on_origin_server": "TovÃ¡bbi bÃ¶ngÃ©szÃ©s az eredeti profilon",
   "account.cancel_follow_request": "KÃ¶vetÃ©si kÃ©relem tÃ¶rlÃ©se",
   "account.direct": "KÃ¶zvetlen Ã¼zenet @{name} szÃ¡mÃ¡ra",
+  "account.disable_notifications": "Ne figyelmeztess, ha @{name} tÃ¼lkÃ¶l",
   "account.domain_blocked": "Rejtett domain",
   "account.edit_profile": "Profil szerkesztÃ©se",
+  "account.enable_notifications": "Figyelmeztess, ha @{name} tÃ¼lkÃ¶l",
   "account.endorse": "KiemelÃ©s a profilodon",
   "account.follow": "KÃ¶vetÃ©s",
   "account.followers": "KÃ¶vetÅ‘",
   "account.followers.empty": "Ezt a felhasznÃ¡lÃ³t mÃ©g senki sem kÃ¶veti.",
   "account.followers_counter": "{count, plural, one {{counter} KÃ¶vetÅ‘} other {{counter} KÃ¶vetÅ‘}}",
-  "account.following_counter": "{count, plural, one {} other {{counter} KÃ¶vetett}}",
+  "account.following_counter": "{count, plural, other {{counter} KÃ¶vetett}}",
   "account.follows.empty": "Ez a felhasznÃ¡lÃ³ mÃ©g senkit sem kÃ¶vet.",
   "account.follows_you": "KÃ¶vet tÃ©ged",
   "account.hide_reblogs": "@{name} megtolÃ¡sainak nÃ©mÃtÃ¡sa",
@@ -43,7 +45,7 @@
   "account.unfollow": "KÃ¶vetÃ©s vÃ©ge",
   "account.unmute": "@{name} nÃ©mÃtÃ¡s feloldÃ¡sa",
   "account.unmute_notifications": "@{name} nÃ©mÃtott Ã©rtesÃtÃ©seinek feloldÃ¡sa",
-  "account_note.placeholder": "Nincs megjegyzÃ©s",
+  "account_note.placeholder": "Klikk a feljegyzÃ©shez",
   "alert.rate_limited.message": "PrÃ³bÃ¡ld Ãºjra {retry_time, time, medium} utÃ¡n.",
   "alert.rate_limited.title": "ForgalomkorlÃ¡tozÃ¡s",
   "alert.unexpected.message": "VÃ¡ratlan hiba tÃ¶rtÃ©nt.",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "KeresÃ©si talÃ¡latok",
   "emoji_button.symbols": "SzimbÃ³lumok",
   "emoji_button.travel": "UtazÃ¡s Ã©s Helyek",
+  "empty_column.account_suspended": "FiÃ³k felfÃ¼ggesztve",
   "empty_column.account_timeline": "Itt nincs tÃ¼lkÃ¶lÃ©s!",
   "empty_column.account_unavailable": "A profil nem Ã©rhetÅ‘ el",
   "empty_column.blocks": "MÃ©g senkit sem tiltottÃ¡l le.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Jelenleg nincsenek Ã©rtesÃtÃ©seid. LÃ©pj kapcsolatba mÃ¡sokkal, hogy elindÃtsd a beszÃ©lgetÃ©st.",
   "empty_column.public": "Jelenleg itt nincs semmi! Ãrj valamit nyilvÃ¡nosan vagy kÃ¶vess mÃ¡s szervereken levÅ‘ felhasznÃ¡lÃ³kat, hogy megtÃ¶ltsd",
   "error.unexpected_crash.explanation": "Egy hiba vagy bÃ¶ngÃ©szÅ‘ inkompatibilitÃ¡s miatt ez az oldal nem jelenÃthetÅ‘ meg rendesen.",
+  "error.unexpected_crash.explanation_addons": "Ezt az oldalt nem lehet helyesen megjelenÃteni. Ezt a hibÃ¡t valÃ³szÃnÅ±leg egy bÃ¶ngÃ©szÅ‘ beÃ©pÃ¼lÅ‘ vagy egy automatikus fordÃtÃ³ okozza.",
   "error.unexpected_crash.next_steps": "PrÃ³bÃ¡ld frissÃteni az oldalt. Ha ez nem segÃt, egy mÃ¡sik bÃ¶ngÃ©szÅ‘n vagy appon keresztÃ¼l mÃ©g mindig hasznÃ¡lhatod a Mastodont.",
+  "error.unexpected_crash.next_steps_addons": "PrÃ³bÃ¡ld letiltani Å‘ket Ã©s frissÃteni az oldalt. Ha ez nem segÃt, egy mÃ¡sik bÃ¶ngÃ©szÅ‘n vagy appon keresztÃ¼l mÃ©g mindig hasznÃ¡lhatod a Mastodont.",
   "errors.unexpected_crash.copy_stacktrace": "VeremkiÃratÃ¡s vÃ¡gÃ³lapra mÃ¡solÃ¡sa",
   "errors.unexpected_crash.report_issue": "ProblÃ©ma jelentÃ©se",
   "follow_request.authorize": "EngedÃ©lyezÃ©s",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "tÃ¼lk szerkesztÃ©s/keresÃ©s fÃ³kuszpontbÃ³l valÃ³ kivÃ©tele",
   "keyboard_shortcuts.up": "felfelÃ© mozdÃtÃ¡s a listÃ¡ban",
   "lightbox.close": "BezÃ¡rÃ¡s",
+  "lightbox.compress": "KÃ©pnÃ©zet Ã¶sszecsukÃ¡sa",
+  "lightbox.expand": "KÃ©pnÃ©zet kinagyÃtÃ¡sa",
   "lightbox.next": "KÃ¶vetkezÅ‘",
   "lightbox.previous": "ElÅ‘zÅ‘",
-  "lightbox.view_context": "Kontextus megtekintÃ©se",
   "lists.account.add": "HozzÃ¡adÃ¡s a listÃ¡hoz",
   "lists.account.remove": "EltÃ¡volÃtÃ¡s a listÃ¡bÃ³l",
   "lists.delete": "Lista tÃ¶rlÃ©se",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "CÃm megvÃ¡ltoztatÃ¡sa",
   "lists.new.create": "Lista hozzÃ¡adÃ¡sa",
   "lists.new.title_placeholder": "Ãšj lista cÃme",
+  "lists.replies_policy.followed": "BÃ¡rmely kÃ¶vetett felhasznÃ¡lÃ³",
+  "lists.replies_policy.list": "A lista tagjai",
+  "lists.replies_policy.none": "Senki",
+  "lists.replies_policy.title": "Nekik mutassuk a vÃ¡laszokat:",
   "lists.search": "KeresÃ©s a kÃ¶vetett szemÃ©lyek kÃ¶zÃ¶tt",
   "lists.subheading": "ListÃ¡id",
   "load_pending": "{count, plural, one {# Ãºj elem} other {# Ãºj elem}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "LÃ¡thatÃ³sÃ¡g Ã¡llÃtÃ¡sa",
   "missing_indicator.label": "Nincs talÃ¡lat",
   "missing_indicator.sublabel": "Ez az erÅ‘forrÃ¡s nem talÃ¡lhatÃ³",
+  "mute_modal.duration": "IdÅ‘tartam",
   "mute_modal.hide_notifications": "RejtsÃ¼k el a felhasznÃ¡lÃ³tÃ³l szÃ¡rmazÃ³ Ã©rtesÃtÃ©seket?",
+  "mute_modal.indefinite": "HatÃ¡rozatlan",
   "navigation_bar.apps": "Mobil appok",
   "navigation_bar.blocks": "Letiltott felhasznÃ¡lÃ³k",
   "navigation_bar.bookmarks": "KÃ¶nyvjelzÅ‘k",
@@ -298,6 +310,7 @@
   "notification.own_poll": "A szavazÃ¡sod vÃ©get Ã©rt",
   "notification.poll": "Egy szavazÃ¡s, melyben rÃ©szt vettÃ©l, vÃ©get Ã©rt",
   "notification.reblog": "{name} megtolta a tÃ¼lkÃ¶det",
+  "notification.status": "{name} tÃ¼lkÃ¶lt egyet",
   "notifications.clear": "Ã‰rtesÃtÃ©sek tÃ¶rlÃ©se",
   "notifications.clear_confirmation": "Biztos, hogy vÃ©glegesen tÃ¶rÃ¶lni akarod az Ã¶sszes Ã©rtesÃtÃ©sed?",
   "notifications.column_settings.alert": "Asztali Ã©rtesÃtÃ©sek",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "MegtolÃ¡sok:",
   "notifications.column_settings.show": "Oszlopban mutatÃ¡s",
   "notifications.column_settings.sound": "Hang lejÃ¡tszÃ¡sa",
+  "notifications.column_settings.status": "Ãšj tÃ¼lkÃ¶k:",
   "notifications.filter.all": "Mind",
   "notifications.filter.boosts": "MegtolÃ¡sok",
   "notifications.filter.favourites": "Kedvencnek jelÃ¶lÃ©sek",
   "notifications.filter.follows": "KÃ¶vetÃ©sek",
   "notifications.filter.mentions": "MegemlÃtÃ©sek",
   "notifications.filter.polls": "SzavazÃ¡sok eredmÃ©nyei",
+  "notifications.filter.statuses": "FrissÃtÃ©sek azoktÃ³l, akiket kÃ¶vetsz",
+  "notifications.grant_permission": "EngedÃ©ly megadÃ¡sa.",
   "notifications.group": "{count} Ã©rtesÃtÃ©s",
+  "notifications.mark_as_read": "Minden Ã©rtesÃtÃ©s olvasottnak jelÃ¶lÃ©se",
+  "notifications.permission_denied": "Nem tudjuk engedÃ©lyezni az asztali Ã©rtesÃtÃ©seket, mert az engedÃ©lyt megtagadtÃ¡k.",
+  "notifications.permission_denied_alert": "Az asztali Ã©rtesÃtÃ©sek nem engedÃ©lyezhetÅ‘ek, mert az engedÃ©lyt megtagadtÃ¡k a bÃ¶ngÃ©szÅ‘ben",
+  "notifications.permission_required": "Az asztali Ã©rtesÃtÃ©sek nem elÃ©rhetÅ‘ek, mert a szÃ¼ksÃ©ges engedÃ©lyt nem adtad meg.",
+  "notifications_permission_banner.enable": "Asztali Ã©rtesÃtÃ©sek engedÃ©lyezÃ©se",
+  "notifications_permission_banner.how_to_control": "Ahhoz, hogy Ã©rtesÃtÃ©seket kapj akkor, amikor a Mastodon nincs megnyitva, engedÃ©lyezd az asztali Ã©rtesÃtÃ©seket. Pontosan be tudod Ã¡llÃtani, hogy milyen interakciÃ³krÃ³l Ã©rtesÃ¼lj a fenti {icon} gombon keresztÃ¼l, ha egyszer mÃ¡r engedÃ©lyezted Å‘ket.",
+  "notifications_permission_banner.title": "Soha ne mulassz el semmit",
+  "picture_in_picture.restore": "VisszarakÃ¡s",
   "poll.closed": "LezÃ¡rva",
   "poll.refresh": "FrissÃtÃ©s",
   "poll.total_people": "{count, plural, one {# szemÃ©ly} other {# szemÃ©ly}}",
@@ -430,7 +454,7 @@
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "HÃºzd ide a feltÃ¶ltÃ©shez",
-  "upload_button.label": "MÃ©dia hozzÃ¡adÃ¡sa ({formats})",
+  "upload_button.label": "MÃ©dia hozzÃ¡adÃ¡sa",
   "upload_error.limit": "TÃºllÃ©pted a fÃ¡jlfeltÃ¶ltÃ©si korlÃ¡tot.",
   "upload_error.poll": "SzavazÃ¡snÃ¡l nem lehet fÃ¡jlt feltÃ¶lteni.",
   "upload_form.audio_description": "Ãrja le a hallÃ¡ssÃ©rÃ¼ltek szÃ¡mÃ¡ra",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "SzÃ¶veg felismerÃ©se a kÃ©prÅ‘l",
   "upload_modal.edit_media": "MÃ©dia szerkesztÃ©se",
   "upload_modal.hint": "Kattints vagy hÃºzd a kÃ¶rt az elÅ‘nÃ©zetben arra a fÃ³kuszpontra, mely minden megjelenÃtett bÃ©lyegkÃ©pen lÃ¡thatÃ³ kell, legyen.",
+  "upload_modal.preparing_ocr": "OCR elÅ‘kÃ©szÃtÃ©seâ€¦",
   "upload_modal.preview_label": "ElÅ‘nÃ©zet ({ratio})",
   "upload_progress.label": "FeltÃ¶ltÃ©s...",
   "video.close": "VideÃ³ bezÃ¡rÃ¡sa",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 29810cd9fc7cbdc49748c5dbeb30ad5d845a0de1..5cdba58e8cce689cec3c2f87504eda9f45462e87 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -1,22 +1,24 @@
 {
-  "account.account_note_header": "Note",
+  "account.account_note_header": "Ô³Ö€Õ¡Õ¼Õ¸Ö‚Õ´",
   "account.add_or_remove_from_list": "Ô±Ö‚Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ Õ¯Õ¡Õ´ Õ°Õ¥Õ¼Õ¡ÖÕ¶Õ¥Õ¬ ÖÕ¡Õ¶Õ¯Õ¥Ö€Õ«Ö",
   "account.badges.bot": "Ô²Õ¸Õ¿",
   "account.badges.group": "Ô½Õ¸Ö‚Õ´Õ¢",
   "account.block": "Ô±Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬ @{name}ÖŠÕ«Õ¶",
   "account.block_domain": "Ô¹Õ¡Ö„ÖÕ¶Õ¥Õ¬ Õ¡Õ´Õ§Õ¶Õ¨ Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¡Õ¬ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ«ÖÕ {domain}",
   "account.blocked": "Ô±Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ¡Õ® Õ§",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Ô´Õ«Õ¿Õ¥Õ¬ Õ¡Ö‚Õ¥Õ¬Õ«Õ¶ Õ«Ö€Õ¡Õ¯Õ¡Õ¶ ÕºÖ€Õ¸Ö†Õ«Õ¬Õ¸Ö‚Õ´",
   "account.cancel_follow_request": "Õ¹Õ¥Õ²Õ¡Ö€Õ¯Õ¥Õ¬ Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡ÕµÖÕ¨",
   "account.direct": "Õ†Õ¡Õ´Õ¡Õ¯ Õ£Ö€Õ¥Õ¬ @{name} -Õ«Õ¶",
+  "account.disable_notifications": "Ô¾Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¡Õ¶Õ»Õ¡Õ¿Õ¥Õ¬ @{name} Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€",
   "account.domain_blocked": "ÕÕ«Ö€Õ¸ÕµÕ©Õ¨ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ¡Õ® Õ§",
   "account.edit_profile": "Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ§Õ»Õ¨",
+  "account.enable_notifications": "Ô¾Õ¡Õ¶Õ¸Ö‚ÖÕ¥Õ¬ Õ«Õ¶Õ± @{name} Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ´Õ¡Õ½Õ«Õ¶",
   "account.endorse": "Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ§Õ»Õ¸Ö‚Õ´",
   "account.follow": "Õ€Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬",
   "account.followers": "Õ€Õ¥Õ¿Õ¥Ö‚Õ¸Õ²Õ¶Õ¥Ö€",
   "account.followers.empty": "Ô±ÕµÕ½ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ»Õ¨ Õ¤Õ¥Õ¼ Õ¸Õ¹ Õ´Õ§Õ¯ Õ¹Õ« Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´Ö‰",
-  "account.followers_counter": "{count, plural, one {{counter} Õ€Õ¥Õ¿Ö‡Õ¸Ö€Õ¤} other {{counter} Õ€Õ¥Õ¿Ö‡Õ¸Ö€Õ¤Õ¶Õ¥Ö€}}",
-  "account.following_counter": "{count, plural, one {} other {{counter} Õ€Õ¥Õ¿Ö‡Õ¸Ö‚Õ´ Õ¥Õ¶}}",
+  "account.followers_counter": "{count, plural, one {{counter} Õ€Õ¥Õ¿Õ¥Ö‚Õ¸Ö€Õ¤} other {{counter} Õ€Õ¥Õ¿Õ¥Ö‚Õ¸Ö€Õ¤Õ¶Õ¥Ö€}}",
+  "account.following_counter": "{count, plural, other {{counter} Õ€Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶}}",
   "account.follows.empty": "Ô±ÕµÕ½ Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¨ Õ¤Õ¥Õ¼ Õ¸Õ¹ Õ´Õ§Õ¯Õ« Õ¹Õ« Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´Ö‰",
   "account.follows_you": "Õ€Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´ Õ§ Ö„Õ¥Õ¦",
   "account.hide_reblogs": "Ô¹Õ¡Ö„ÖÕ¶Õ¥Õ¬ @{name}ÖŠÕ« Õ¿Õ¡Ö€Õ¡Õ®Õ¡Õ®Õ¶Õ¥Ö€Õ¨",
@@ -43,7 +45,7 @@
   "account.unfollow": "Ô±ÕºÕ¡Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬",
   "account.unmute": "Ô±ÕºÕ¡Õ¬Õ¼Õ¥ÖÕ¶Õ¥Õ¬ @{name}ÖŠÕ«Õ¶",
   "account.unmute_notifications": "Õ„Õ«Õ¡ÖÕ¶Õ¥Õ¬ Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ @{name}ÖŠÕ«Ö",
-  "account_note.placeholder": "Click to add a note",
+  "account_note.placeholder": "ÕÕ¥Õ²Õ´Õ§Õ›Ö„ Õ£Ö€Õ¡Õ¼Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€\n",
   "alert.rate_limited.message": "Õ“Õ¸Ö€Õ±Õ§Ö„  Õ¸Ö€Õ¸Õ· ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯ Õ¡Õ¶ÖÕ {retry_time, time, medium}Ö‰",
   "alert.rate_limited.title": "Ô³Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ« ÕµÕ¡Õ³Õ¡ÕÕ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ£Õ¥Ö€Õ¡Õ¦Õ¡Õ¶ÖÕ¸Ö‚Õ´ Õ§ Õ©Õ¸ÕµÕ¬Õ¡Õ¿Ö€Õ¥Õ¬Õ«Õ¶",
   "alert.unexpected.message": "Ô±Õ¶Õ½ÕºÕ¡Õ½Õ¥Õ¬Õ« Õ½ÕÕ¡Õ¬ Õ¿Õ¥Õ²Õ« Õ¸Ö‚Õ¶Õ¥ÖÕ¡Ö‚Ö‰",
@@ -55,9 +57,9 @@
   "bundle_column_error.retry": "Ô¿Ö€Õ¯Õ«Õ¶ ÖƒÕ¸Ö€Õ±Õ¥Õ¬",
   "bundle_column_error.title": "Õ‘Õ¡Õ¶ÖÕ¡ÕµÕ«Õ¶ Õ½ÕÕ¡Õ¬",
   "bundle_modal_error.close": "Õ“Õ¡Õ¯Õ¥Õ¬",
-  "bundle_modal_error.message": "Ô±ÕµÕ½ Õ¢Õ¡Õ²Õ¡Õ¤Ö€Õ«Õ¹Õ¨ Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬Õ¸Ö‚ Õ¨Õ¶Õ©Õ¡ÖÖ„Õ¸Ö‚Õ´ Õ«Õ¶Õ¹ÖŠÕ¸Ö€ Õ¢Õ¡Õ¶ ÕÕ¡ÖƒÕ¡Õ¶Õ¾Õ¥ÖÖ‰",
+  "bundle_modal_error.message": "Ô±ÕµÕ½ Õ¢Õ¡Õ²Õ¡Õ¤Ö€Õ«Õ¹Õ¨ Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬Õ¸Ö‚ Õ¨Õ¶Õ©Õ¡ÖÖ„Õ¸Ö‚Õ´ Õ«Õ¶Õ¹ÖŠÕ¸Ö€ Õ¢Õ¡Õ¶ ÕÕ¡ÖƒÕ¡Õ¶Õ¸Ö‚Õ¥ÖÖ‰",
   "bundle_modal_error.retry": "Ô¿Ö€Õ¯Õ«Õ¶ ÖƒÕ¸Ö€Õ±Õ¥Õ¬",
-  "column.blocks": "Ô±Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¾Õ¡Õ® Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€Õ¥Ö€",
+  "column.blocks": "Ô±Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ¡Õ® Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€",
   "column.bookmarks": "Ô·Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€",
   "column.community": "ÕÕ¥Õ²Õ¡Õ¯Õ¡Õ¶ Õ°Õ¸Õ½Ö„",
   "column.direct": "Õ€Õ¡Õ½ÖÕ§Õ¡Õ£Ö€Õ¸Ö‚Õ¡Õ® Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€",
@@ -67,27 +69,27 @@
   "column.follow_requests": "Õ€Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡ÕµÖÕ¥Ö€",
   "column.home": "Õ€Õ«Õ´Õ¶Õ¡Õ¯Õ¡Õ¶",
   "column.lists": "Õ‘Õ¡Õ¶Õ¯Õ¥Ö€",
-  "column.mutes": "Ô¼Õ¼Õ¥ÖÖ€Õ¡Õ® Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€Õ¥Ö€",
+  "column.mutes": "Ô¼Õ¼Õ¥ÖÖ€Õ¡Õ® Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€",
   "column.notifications": "Ô¾Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€",
-  "column.pins": "Ô±Õ´Ö€Õ¡ÖÕ¾Õ¡Õ® Õ©Õ©Õ¥Ö€",
+  "column.pins": "Ô±Õ´Ö€Õ¡ÖÕ¸Ö‚Õ¡Õ® Õ©Õ©Õ¥Ö€",
   "column.public": "Ô´Õ¡Õ·Õ¶Õ¡ÕµÕ«Õ¶ Õ°Õ¸Õ½Ö„",
   "column_back_button.label": "ÔµÕ¿",
-  "column_header.hide_settings": "Ô¹Õ¡Ö„ÖÕ¶Õ¥Õ¬ Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨",
+  "column_header.hide_settings": "Ô¹Õ¡Ö„ÖÕ¶Õ¥Õ¬ Õ¯Õ¡Ö€Õ£Õ¡Ö‚Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨",
   "column_header.moveLeft_settings": "ÕÕ¥Õ²Õ¡Õ·Õ¡Ö€ÕªÕ¥Õ¬ Õ½Õ«Ö‚Õ¶Õ¨ Õ±Õ¡Õ",
   "column_header.moveRight_settings": "ÕÕ¥Õ²Õ¡Õ·Õ¡Ö€ÕªÕ¥Õ¬ Õ½Õ«Ö‚Õ¶Õ¨ Õ¡Õ»",
   "column_header.pin": "Ô±Õ´Ö€Õ¡ÖÕ¶Õ¥Õ¬",
-  "column_header.show_settings": "Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨",
+  "column_header.show_settings": "Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ Õ¯Õ¡Ö€Õ£Õ¡Ö‚Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨",
   "column_header.unpin": "Õ€Õ¡Õ¶Õ¥Õ¬",
-  "column_subheading.settings": "Ô¿Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€",
-  "community.column_settings.local_only": "Õ„Õ«Õ¡ÕµÕ¶ Õ¶Õ¥Ö€Ö„Õ«Õ¶",
-  "community.column_settings.media_only": "Media only",
-  "community.column_settings.remote_only": "Õ„Õ«Õ¡ÕµÕ¶ Õ°Õ¥Õ¼Õ¡Õ¯Õ¡",
-  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
-  "compose_form.direct_message_warning_learn_more": "Ô»Õ´Õ¡Õ¶Õ¡Õ¬ Õ¡Õ¾Õ¥Õ¬Õ«Õ¶",
-  "compose_form.hashtag_warning": "Ô±ÕµÕ½ Õ©Õ¸Ö‚Õ©Õ¨ Õ¹Õ« Õ°Õ¡Õ·Õ¾Õ¡Õ¼Õ¾Õ« Õ¸Ö€Õ¥Ö‚Õ§ ÕºÕ«Õ¿Õ¡Õ¯Õ« Õ¿Õ¡Õ¯, Ö„Õ¡Õ¶Õ¦Õ« Õ¡ÕµÕ¶ Õ®Õ¡Õ®Õ¸Ö‚Õ¯ Õ§Ö‰ Õ„Õ«Õ¡ÕµÕ¶ Õ°Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¡ÕµÕ«Õ¶ Õ©Õ©Õ¥Ö€Õ¨ Õ°Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€ Õ§ Õ¸Ö€Õ¸Õ¶Õ¥Õ¬ ÕºÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€Õ¸Õ¾Ö‰",
+  "column_subheading.settings": "Ô¿Õ¡Ö€Õ£Õ¡Ö‚Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€",
+  "community.column_settings.local_only": "Õ„Õ«Õ¡ÕµÕ¶ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡Õ¶",
+  "community.column_settings.media_only": "Õ„Õ«Õ¡ÕµÕ¶ Õ´Õ¥Õ¤Õ«Õ¡",
+  "community.column_settings.remote_only": "Õ„Õ«Õ¡ÕµÕ¶ Õ°Õ¥Õ¼Õ¡Õ¯Õ¡Õµ",
+  "compose_form.direct_message_warning": "Ô±ÕµÕ½ Õ©Õ¸Ö‚Õ©Õ¨ Õ¿Õ¥Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ¯Õ¨ Õ¬Õ«Õ¶Õ« Õ´Õ«Õ¡ÕµÕ¶ Õ¶Õ·Õ¸Ö‚Õ¡Õ® Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€Õ«Õ¶Ö‰",
+  "compose_form.direct_message_warning_learn_more": "Ô»Õ´Õ¡Õ¶Õ¡Õ¬ Õ¡Ö‚Õ¥Õ¬Õ«Õ¶",
+  "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}",
@@ -109,16 +111,16 @@
   "confirmations.delete.confirm": "Õ‹Õ¶Õ»Õ¥Õ¬",
   "confirmations.delete.message": "ÕŽÕ½Õ¿Õ¡ÕžÕ° Õ¥Õ½, Õ¸Ö€ Õ¸Ö‚Õ¦Õ¸Ö‚Õ´ Õ¥Õ½ Õ»Õ¶Õ»Õ¥Õ¬ Õ¡ÕµÕ½ Õ©Õ¸Ö‚Õ©Õ¨Ö‰",
   "confirmations.delete_list.confirm": "Õ‹Õ¶Õ»Õ¥Õ¬",
-  "confirmations.delete_list.message": "ÕŽÕ½Õ¿Õ¡ÕžÕ° Õ¥Õ½, Õ¸Ö€ Õ¸Ö‚Õ¦Õ¸Ö‚Õ´ Õ¥Õ½ Õ´Õ·Õ¿Õ¡ÕºÕ¥Õ½ Õ»Õ¶Õ»Õ¥Õ¬ Õ¡ÕµÕ½ ÖÕ¡Õ¶Õ¯Õ¨Ö‰",
+  "confirmations.delete_list.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.explanation": "ÕÕ¡ Õ©Õ¡Ö„ÖÕ¶Õ¥Õ¬Õ¸Ö‚ Õ¡ Õ«Ö€Õ¥Õ¶Ö Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¶, Õ«Õ¶Õ¹ÕºÕ§Õ½ Õ¶Õ¡Õ¥Ö‚ Õ«Ö€Õ¥Õ¶Ö Õ¶Õ·Õ¸Õ² Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¶, Õ¢Õ¡ÕµÖ Õ«Ö€Õ¥Õ¶Ö„ Õ´Õ«Õ¥Ö‚Õ¶Õ¸ÕµÕ¶ Õ§ Õ¯Õ¨ Õ¯Õ¡Ö€Õ¸Õ²Õ¡Õ¶Õ¡Õ¶ Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬ Õ±Õ¥Õ¦ Õ¥Ö‚ Õ¿Õ¥Õ½Õ¶Õ¥Õ¬ Õ±Õ¥Ö€ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨Ö‰",
   "confirmations.mute.message": "ÕŽÕ½Õ¿Õ¡ÕžÕ° Õ¥Õ½, Õ¸Ö€ Õ¸Ö‚Õ¦Õ¸Ö‚Õ´ Õ¥Õ½ {name}ÖŠÕ«Õ¶ Õ¬Õ¼Õ¥ÖÕ¶Õ¥Õ¬Ö‰",
   "confirmations.redraft.confirm": "Õ‹Õ¶Õ»Õ¥Õ¬ Õ¥Ö‚ ÕÕ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬ Õ¶Õ¸Ö€Õ«Ö",
-  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.",
+  "confirmations.redraft.message": "ÕŽÕ½Õ¿Õ¡Õ° Õ¥ÕžÕ½, Õ¸Ö€ ÖÕ¡Õ¶Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ¥Õ½ Õ»Õ¶Õ»Õ¥Õ¬ Õ¥Ö‚ Õ¾Õ¥Ö€Õ¡ÕÕ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬ Õ¡ÕµÕ½ Õ©Õ¸Ö‚Õ©Õ¨Ö‰ Ô´Õ¸Ö‚ Õ¯Õ¨ Õ¯Õ¸Ö€ÖÕ¶Õ¥Õ½ Õ¡ÕµÕ½ Õ£Ö€Õ¡Õ¼Õ´Õ¡Õ¶ Õ¢Õ¸Õ¬Õ¸Ö€ ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¶Õ¥Ö€Õ¨, Õ¿Õ¡Ö€Õ¡Õ®Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¥Ö‚ Õ°Õ¡Ö‚Õ¡Õ¶Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨Ö‰",
   "confirmations.reply.confirm": "ÕŠÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¥Õ¬",
   "confirmations.reply.message": "Ô±ÕµÕ½ ÕºÕ¡Õ°Õ«Õ¶ ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¥Õ¬Õ¨ Õ¯Õ¨ Õ¹Õ¥Õ²Õ¡Ö€Õ¯Õ« Õ±Õ¥Ö€Õ Õ¡ÕµÕ½ ÕºÕ¡Õ°Õ«Õ¶ Õ¡Õ¶Õ¡Ö‚Õ¡Ö€Õ¿ Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨Ö‰ Õ€Õ¡Õ´Õ¸Õ¦Õ¸Ö‚Õ¡ÕžÕ® Õ§Ö„Ö‰",
   "confirmations.unfollow.confirm": "Ô±ÕºÕ¡Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬",
@@ -126,70 +128,73 @@
   "conversation.delete": "Õ‹Õ¶Õ»Õ¥Õ¬ ÕÖ…Õ½Õ¡Õ¯ÖÕ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨",
   "conversation.mark_as_read": "Õ†Õ·Õ¥Õ¬ Õ¸Ö€ÕºÕ§Õ½ Õ¨Õ¶Õ©Õ¥Ö€ÖÕ¸Ö‚Õ¡Õ®",
   "conversation.open": "Ô´Õ«Õ¿Õ¥Õ¬ ÕÖ…Õ½Õ¡Õ¯ÖÕ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨",
-  "conversation.with": "{names}ÖŠÕ¥Ö€Õ« Õ°Õ¥Õ¿",
+  "conversation.with": "{names}-Õ« Õ°Õ¥Õ¿",
   "directory.federated": "Õ…Õ¡ÕµÕ¿Õ¶Õ« Õ¤Õ¡Õ·Õ¶Õ¥Õ¦Õ¥Ö€Ö„Õ«Ö",
   "directory.local": "{domain} Õ¿Õ«Ö€Õ¸ÕµÕ©Õ«Ö Õ´Õ«Õ¡ÕµÕ¶",
   "directory.new_arrivals": "Õ†Õ¸Ö€Õ¥Õ¯Õ¶Õ¥Ö€",
   "directory.recently_active": "ÕŽÕ¥Ö€Õ»Õ¥Ö€Õ½ Õ¡Õ¯Õ¿Õ«Ö‚",
   "embed.instructions": "Ô±ÕµÕ½ Õ©Õ¸Ö‚Õ©Õ¨ Ö„Õ¸ Õ¯Õ¡ÕµÖ„Õ¸Ö‚Õ´ Õ¶Õ¥Ö€Õ¤Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ ÕºÕ¡Õ¿Õ³Õ§Õ¶Õ¥Õ¬ Õ¶Õ¥Ö€Ö„Õ«Õ¶Õ¡Õ¶Õ¡Õ¬ Õ¯Õ¸Õ¤Õ¨Ö‰",
-  "embed.preview": "Ô±Õ°Õ¡, Õ©Õ¥ Õ«Õ¶Õ¹ Õ¿Õ¥Õ½Ö„ Õ¯Õ¸Ö‚Õ¶Õ¥Õ¶Õ¡ Õ¡ÕµÕ¶Õ",
+  "embed.preview": "Ô±Õ°Õ¡Õµ, Õ©Õ§ Õ«Õ¶Õ¹ Õ¿Õ¥Õ½Ö„ Õ¯Õ¨ Õ¸Ö‚Õ¶Õ¥Õ¶Õ¡Õµ Õ¡ÕµÕ¶Õ",
   "emoji_button.activity": "Ô¶Õ¢Õ¡Õ²Õ´Õ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€",
-  "emoji_button.custom": "Õ€Õ¡Õ¿Õ¸Ö‚Õ¯",
-  "emoji_button.flags": "Ô´Ö€Õ¸Õ·Õ¶Õ¥Ö€",
+  "emoji_button.custom": "Õ…Õ¡Õ¿Õ¸Ö‚Õ¯",
+  "emoji_button.flags": "Ô´Ö€Ö…Õ·Õ¶Õ¥Ö€",
   "emoji_button.food": "Ô¿Õ¥Ö€Õ¸Ö‚ÕÕ¸Ö‚Õ´",
-  "emoji_button.label": "Ô·Õ´Õ¸Õ»Õ« Õ¡Õ¾Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬",
+  "emoji_button.label": "Ô·Õ´Õ¸Õ»Õ« Õ¡Ö‚Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬",
   "emoji_button.nature": "Ô²Õ¶Õ¸Ö‚Õ©Õ«Ö‚Õ¶",
-  "emoji_button.not_found": "Õ†Õ´Õ¡Õ¶ Õ§Õ´Õ¸Õ»Õ«Õ¶Õ¥Ö€ Õ¤Õ¥Õ¼ Õ¹Õ¥Õ¶ Õ°Õ¡ÕµÕ¿Õ¶Õ¡Õ¢Õ¥Ö€Õ¾Õ¥Õ¬Ö‰ (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
+  "emoji_button.not_found": "Õ†Õ´Õ¡Õ¶ Õ§Õ´Õ¸Õ»Õ«Õ¶Õ¥Ö€ Õ¤Õ¥Õ¼ Õ¹Õ¥Õ¶ ÕµÕ¡ÕµÕ¿Õ¶Õ¡Õ¢Õ¥Ö€Õ¸Ö‚Õ¥Õ¬Ö‰ (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
   "emoji_button.objects": "Ô±Õ¼Õ¡Ö€Õ¯Õ¡Õ¶Õ¥Ö€",
   "emoji_button.people": "Õ„Õ¡Ö€Õ¤Õ«Õ¯",
-  "emoji_button.recent": "Õ€Õ¡Õ³Õ¡Õ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¾Õ¸Õ²",
+  "emoji_button.recent": "Õ…Õ¡Õ³Õ¡Õ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ¸Õ²",
   "emoji_button.search": "ÕˆÖ€Õ¸Õ¶Õ¥Õ¬â€¦",
   "emoji_button.search_results": "ÕˆÖ€Õ¸Õ¶Õ´Õ¡Õ¶ Õ¡Ö€Õ¤Õ«Ö‚Õ¶Ö„Õ¶Õ¥Ö€",
   "emoji_button.symbols": "Õ†Õ·Õ¡Õ¶Õ¶Õ¥Ö€",
   "emoji_button.travel": "ÕˆÖ‚Õ²Õ¥Ö‚Õ¸Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¥Ö‚ Õ¿Õ¥Õ²Õ¡Õ¶Ö„Õ¶Õ¥Ö€",
+  "empty_column.account_suspended": "Õ€Õ¡Õ·Õ«Ö‚Õ¨ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ¡Õ® Õ§",
   "empty_column.account_timeline": "Ô±ÕµÕ½Õ¿Õ¥Õ² Õ©Õ©Õ¥Ö€ Õ¹Õ¯Õ¡Õ›Õ¶Ö‰",
   "empty_column.account_unavailable": "Ô±Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ§Õ»Õ¨ Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ¹Õ«",
   "empty_column.blocks": "Ô´Õ¸Ö‚ Õ¤Õ¥Õ¼ Õ¸Õ¹ Õ´Õ§Õ¯Õ« Õ¹Õ¥Õ½ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬Ö‰",
-  "empty_column.bookmarked_statuses": "Ô´Õ¸Ö‚ Õ¤Õ¥Õ¼ Õ¹Õ¸Ö‚Õ¶Õ¥Õ½ Õ¸Ö€Õ¥Ö‚Õ§ Õ§Õ»Õ¡Õ¶Õ·Ö‚Õ¡Õ® Õ©Õ¸Ö‚Õ©Ö‰ ÔµÖ€Õ¢ Õ§Õ»Õ¡Õ¶Õ·Õ¥Õ½, Õ¤Ö€Õ¡Õ¶Ö„ Õ¯Õ¥Ö€Õ¥Ö‚Õ¡Õ¶ Õ¡ÕµÕ½Õ¿Õ¥Õ²Ö‰",
-  "empty_column.community": "ÕÕ¥Õ²Õ¡Õ¯Õ¡Õ¶ Õ°Õ¸Õ½Ö„Õ¨ Õ¤Õ¡Õ¿Õ¡Õ›Ö€Õ¯ Õ§Ö‰ Õ€Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¡ÕµÕ«Õ¶ Õ´Õ« Õ¢Õ¡Õ¶ Õ£Ö€Õ«Ö€ Õ·Õ¡Ö€ÕªÕ«Õ¹Õ¨ ÕÕ¸Õ¤ Õ¿Õ¡Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰",
+  "empty_column.bookmarked_statuses": "Ô´Õ¸Ö‚ Õ¤Õ¥Õ¼ Õ¹Õ¸Ö‚Õ¶Õ¥Õ½ Õ¸Ö€Õ¥Ö‚Õ§ Õ§Õ»Õ¡Õ¶Õ·Ö‚Õ¡Õ® Õ©Õ¸Ö‚Õ©Ö‰ ÔµÖ€Õ¢ Õ§Õ»Õ¡Õ¶Õ·Õ¥Õ½, Õ¤Ö€Õ¡Õ¶Ö„ Õ¯Õ¨ Õ¥Ö€Õ¥Ö‚Õ¡Õ¶ Õ¡ÕµÕ½Õ¿Õ¥Õ²Ö‰",
+  "empty_column.community": "ÕÕ¥Õ²Õ¡Õ¯Õ¡Õ¶ Õ°Õ¸Õ½Ö„Õ¨ Õ¤Õ¡Õ¿Õ¡Ö€Õ¯ Õ§Ö‰ Õ€Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¡ÕµÕ«Õ¶ Õ´Õ« Õ¢Õ¡Õ¶ Õ£Ö€Õ«Õ›Ö€ Õ·Õ¡Ö€ÕªÕ«Õ¹Õ¨ Õ£Õ¸Ö€Õ®Õ¡Ö€Õ¯Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰",
   "empty_column.direct": "Ô´Õ¸Ö‚ Õ¤Õ¥Õ¼ Õ¹Õ¸Ö‚Õ¶Õ¥Õ½ Õ¸Õ¹ Õ´Õ« Õ°Õ¡Õ½ÖÕ§Õ¡Õ£Ö€Õ¸Ö‚Õ¡Õ® Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Ö‰ ÔµÖ€Õ¢ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¥Õ½ Õ¯Õ¡Õ´ Õ½Õ¿Õ¡Õ¶Õ¡Õ½ Õ¸Ö€Õ¥Ö‚Õ§ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ¶Õ¡Õ´Õ¡Õ¯, Õ¡ÕµÕ¶ Õ¡ÕµÕ½Õ¿Õ¥Õ² Õ¯Õ¥Ö€Õ¥Ö‚Õ¡ÕµÖ‰",
   "empty_column.domain_blocks": "Ô¹Õ¡Ö„ÖÕ¸Ö‚Õ¡Õ® Õ¿Õ«Ö€Õ¸ÕµÕ©Õ¶Õ¥Ö€ Õ¤Õ¥Õ¼ Õ¹Õ¯Õ¡Õ¶Ö‰",
   "empty_column.favourited_statuses": "Ô´Õ¸Ö‚ Õ¤Õ¥Õ¼ Õ¹Õ¸Ö‚Õ¶Õ¥Õ½ Õ¸Ö€Õ¥Ö‚Õ§ Õ°Õ¡Ö‚Õ¡Õ¶Õ¡Õ® Õ©Õ¸Ö‚Õ©Ö‰ ÔµÖ€Õ¢ Õ°Õ¡Ö‚Õ¡Õ¶Õ¥Õ½, Õ¤Ö€Õ¡Õ¶Ö„ Õ¯Õ¥Ö€Õ¥Ö‚Õ¡Õ¶ Õ¡ÕµÕ½Õ¿Õ¥Õ²Ö‰",
   "empty_column.favourites": "Ô±ÕµÕ½ Õ©Õ¸Ö‚Õ©Õ¨ Õ¸Õ¹ Õ´Õ§Õ¯ Õ¤Õ¥Õ¼ Õ¹Õ« Õ°Õ¡Ö‚Õ¡Õ¶Õ¥Õ¬Ö‰ Õ€Õ¡Ö‚Õ¡Õ¶Õ¸Õ²Õ¶Õ¥Ö€Õ¨ Õ¯Õ¥Ö€Õ¥Ö‚Õ¡Õ¶ Õ¡ÕµÕ½Õ¿Õ¥Õ², Õ¥Ö€Õ¢ Õ¶Õ·Õ¥Õ¶ Õ©Õ¸Ö‚Õ©Õ¨ Õ°Õ¡Ö‚Õ¡Õ¶Õ¡Õ®Ö‰",
   "empty_column.follow_requests": "Ô´Õ¸Ö‚ Õ¤Õ¥Õ¼ Õ¹Õ¸Ö‚Õ¶Õ¥Õ½ Õ¸Ö€Õ¥Ö‚Õ§ Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬Õ¸Ö‚ ÕµÕ¡ÕµÕ¿Ö‰ Ô²Õ¸Õ¬Õ¸Ö€ Õ¶Õ´Õ¡Õ¶ ÕµÕ¡ÕµÕ¿Õ¥Ö€Õ¨ Õ¯Õ¨ ÕµÕ¡ÕµÕ¿Õ¶Õ¸Ö‚Õ¥Õ¶ Õ¡ÕµÕ½Õ¿Õ¥Õ²Ö‰",
-  "empty_column.hashtag": "Ô±ÕµÕ½ ÕºÕ«Õ¿Õ¡Õ¯Õ¸Õ¾ Õ¤Õ¥Õ¼ Õ¸Õ¹Õ«Õ¶Õ¹ Õ¹Õ¯Õ¡Ö‰",
-  "empty_column.home": "Õ”Õ¸ Õ°Õ«Õ´Õ¶Õ¡Õ¯Õ¡Õ¶ Õ°Õ¸Õ½Ö„Õ¨ Õ¤Õ¡Õ¿Õ¡Õ›Ö€Õ¯ Õ§Ö‰ Ô±ÕµÖÕ¥Õ¬Õ«Õ›Ö€ {public}Õ¨ Õ¯Õ¡Õ´ Ö…Õ£Õ¿Õ¾Õ«Ö€ Õ¸Ö€Õ¸Õ¶Õ¸Ö‚Õ´Õ«ÖÕ Õ¡ÕµÕ¬ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö Õ°Õ¡Õ¶Õ¤Õ«ÕºÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰",
+  "empty_column.hashtag": "Ô±ÕµÕ½ ÕºÕ«Õ¿Õ¡Õ¯Õ¸Õ¾ Õ¤Õ¥Õ¼ Õ¸Õ¹Õ«Õ¶Õ¹ Õ¹Õ¯Õ¡ÕµÖ‰",
+  "empty_column.home": "Õ”Õ¸ Õ°Õ«Õ´Õ¶Õ¡Õ¯Õ¡Õ¶ Õ°Õ¸Õ½Ö„Õ¨ Õ¤Õ¡Õ¿Õ¡Ö€Õ¯ Õ§Ö‰ Ô±ÕµÖÕ¥Õ¬Õ«Õ›Ö€ {public}Õ¨ Õ¯Õ¡Õ´ Ö…Õ£Õ¿Õ¸Ö‚Õ«Ö€ Õ¸Ö€Õ¸Õ¶Õ¸Ö‚Õ´Õ«ÖÕ Õ¡ÕµÕ¬ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö Õ°Õ¡Õ¶Õ¤Õ«ÕºÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰",
   "empty_column.home.public_timeline": "Õ°Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¡ÕµÕ«Õ¶ Õ°Õ¸Õ½Ö„",
-  "empty_column.list": "Ô±ÕµÕ½ ÖÕ¡Õ¶Õ¯Õ¸Ö‚Õ´ Õ¤Õ¥Õ¼ Õ¸Õ¹Õ«Õ¶Õ¹ Õ¹Õ¯Õ¡Ö‰ ÔµÖ€Õ¢ ÖÕ¡Õ¶Õ¯Õ« Õ¡Õ¶Õ¤Õ¡Õ´Õ¶Õ¥Ö€Õ«Ö Õ¸Ö€Õ¥Ö‚Õ§ Õ´Õ¥Õ¯Õ¨ Õ¶Õ¸Ö€ Õ©Õ¸Ö‚Õ© Õ£Ö€Õ«, Õ¡ÕµÕ¶ Õ¯Õ°Õ¡ÕµÕ¿Õ¶Õ¾Õ« Õ¡ÕµÕ½Õ¿Õ¥Õ²Ö‰",
-  "empty_column.lists": "Ô´Õ¸Ö‚Ö„ Õ¤Õ¥Õ¼ Õ¹Õ¸Ö‚Õ¶Õ¥Ö„ Õ½Õ¿Õ¥Õ²Õ®Õ¡Õ® ÖÕ¡Õ¶Õ¯Ö‰ Õ‘Õ¡Õ¶Õ¯ Õ½Õ¿Õ¥Õ²Õ®Õ¥Õ¬Õ¸Ö‚Õ¶ ÕºÕ¥Õ½ Õ¡ÕµÕ¶ Õ¯Õ°Õ¡ÕµÕ¿Õ¶Õ¾Õ« Õ¡ÕµÕ½Õ¿Õ¥Õ²Ö‰",
-  "empty_column.mutes": "Ô±Õ¼Õ¡ÕµÕªÕ´ Õ¸Õ¹ Õ¸Ö„Õ« Õ¹Õ¥Ö„ Õ¬Õ¼Õ¥ÖÖ€Õ¥Õ¬Ö‰",
+  "empty_column.list": "Ô±ÕµÕ½ ÖÕ¡Õ¶Õ¯Õ¸Ö‚Õ´ Õ¤Õ¥Õ¼ Õ¸Õ¹Õ«Õ¶Õ¹ Õ¹Õ¯Õ¡ÕµÖ‰ ÔµÖ€Õ¢ ÖÕ¡Õ¶Õ¯Õ« Õ¡Õ¶Õ¤Õ¡Õ´Õ¶Õ¥Ö€Õ«Ö Õ¸Ö€Õ¥Ö‚Õ§ Õ´Õ¥Õ¯Õ¨ Õ¶Õ¸Ö€ Õ©Õ¸Ö‚Õ© Õ£Ö€Õ«, Õ¡ÕµÕ¶ Õ¯Õ¨ ÕµÕ¡ÕµÕ¿Õ¶Õ¸Ö‚Õ« Õ¡ÕµÕ½Õ¿Õ¥Õ²Ö‰",
+  "empty_column.lists": "Ô´Õ¸Ö‚Ö„ Õ¤Õ¥Õ¼ Õ¹Õ¸Ö‚Õ¶Õ§Ö„ Õ½Õ¿Õ¥Õ²Õ®Õ¡Õ® ÖÕ¡Õ¶Õ¯Ö‰ Õ‘Õ¡Õ¶Õ¯ Õ½Õ¿Õ¥Õ²Õ®Õ¥Õ¬Õ¸Ö‚Õ¶ ÕºÕ§Õ½ Õ¡ÕµÕ¶ Õ¯Õ¨ ÕµÕ¡ÕµÕ¿Õ¶Õ¸Ö‚Õ« Õ¡ÕµÕ½Õ¿Õ¥Õ²Ö‰",
+  "empty_column.mutes": "Ô±Õ¼Õ¡ÕµÕªÕ´ Õ¸Õ¹ Õ¸Ö„Õ« Õ¹Õ§Ö„ Õ¬Õ¼Õ¥ÖÖ€Õ¥Õ¬Ö‰",
   "empty_column.notifications": "ÕˆÕ¹ Õ´Õ« Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´ Õ¤Õ¥Õ¼ Õ¹Õ¸Ö‚Õ¶Õ¥Õ½Ö‰ Ô²Õ¦Õ«Ö€ Õ´Õ«Ö‚Õ½Õ¶Õ¥Ö€Õ«Õ¶Õ ÕÖ…Õ½Õ¡Õ¯ÖÕ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ½Õ¯Õ½Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰",
   "empty_column.public": "Ô±ÕµÕ½Õ¿Õ¥Õ² Õ¢Õ¡Õ¶ Õ¹Õ¯Õ¡Õ›ÕµÖ‰ Õ€Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¡ÕµÕ«Õ¶ Õ´Õ« Õ¢Õ¡Õ¶ Õ£Ö€Õ«Ö€ Õ¯Õ¡Õ´ Õ°Õ¥Õ¿Õ¥Ö‚Õ«Ö€ Õ¡ÕµÕ¬ Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ¶Õ¥Ö€Õ«Ö Õ§Õ¡Õ¯Õ¶Õ¥Ö€Õ«Õ Õ¡ÕµÕ¶ Õ¬ÖÕ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰",
   "error.unexpected_crash.explanation": "Õ„Õ¥Ö€ Õ®Ö€Õ¡Õ£Ö€Õ¡Õ¯Õ¡Õ¦Õ´Õ¸Ö‚Õ´ Õ¾Ö€Õ«ÕºÕ¡Õ¯Õ« Õ¯Õ¡Õ´ Õ¤Õ«Õ¿Õ¡Ö€Õ¯Õ¹Õ« Õ¡Õ¶Õ°Õ¡Õ´Õ¡Õ¿Õ¥Õ²Õ¥Õ¬Õ«Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¸Õ¾ Õ¡ÕµÕ½ Õ§Õ»Õ¨ Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¬Õ«Õ¡Ö€ÕªÕ§Ö„ ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ¸Ö‚Õ¥Õ¬Ö‰",
-  "error.unexpected_crash.next_steps": "Õ“Õ¸Ö€Õ±Õ«Ö€ Õ©Õ¡Ö€Õ´Õ¡ÖÕ¶Õ¥Õ¬ Õ§Õ»Õ¨Ö‰ ÔµÕ©Õ¥ Õ¤Õ¡ Õ¹Ö…Õ£Õ¶Õ« Õ¡ÕºÕ¡ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ Ö…Õ£Õ¿Õ¾Õ¥Õ¬ Õ„Õ¡Õ½Õ¿Õ¡Õ¤Õ¸Õ¶Õ«Ö Õ¸Ö‚Ö€Õ«Õ· Õ¤Õ«Õ¿Õ¡Ö€Õ¯Õ«Õ¹Õ¸Õ¾ Õ¯Õ¡Õ´ Õ°Õ¡Õ¾Õ¥Õ¬Õ¾Õ¡Õ®Õ¸Õ¾Ö‰",
+  "error.unexpected_crash.explanation_addons": "Ô±ÕµÕ½ Õ§Õ»Õ« Õ³Õ«Õ·Õ¿ ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ¸Ö‚Õ´Õ¨ Õ¹Õ« Õ½Õ¿Õ¡ÖÕ¸Ö‚Õ´Ö‰ Ô½Õ¡ÖƒÕ¡Õ¶Õ¸Ö‚Õ´Õ¨ Õ°Õ¡Ö‚Õ¡Õ¶Õ¡Õ¢Õ¡Ö€ Õ¡Õ¼Õ¡Õ»Õ¡ÖÕ¥Õ¬ Õ§ Õ¤Õ«Õ¿Õ¡Ö€Õ¯Õ«Õ¹Õ« ÕµÕ¡Õ¾Õ¥Õ¬Õ¾Õ¡Õ®Õ«Ö Õ¯Õ¡Õ´ Õ¡Õ¼ÖÕ¡Õ¶Ö Õ©Õ¡Ö€Õ£Õ´Õ¡Õ¶Õ«Õ¹Õ«ÖÖ‰",
+  "error.unexpected_crash.next_steps": "Õ“Õ¸Ö€Õ±Õ«Ö€ Õ©Õ¡Ö€Õ´Õ¡ÖÕ¶Õ¥Õ¬ Õ§Õ»Õ¨Ö‰ ÔµÕ©Õ§ Õ¤Õ¡ Õ¹Ö…Õ£Õ¶Õ« Õ¡ÕºÕ¡ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ Ö…Õ£Õ¿Õ¸Ö‚Õ¥Õ¬ Õ„Õ¡Õ½Õ¿Õ¡Õ¤Õ¸Õ¶Õ«Ö Õ¸Ö‚Ö€Õ«Õ· Õ¤Õ«Õ¿Õ¡Ö€Õ¯Õ«Õ¹Õ¸Õ¾ Õ¯Õ¡Õ´ ÕµÕ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Õ¸Õ¾Ö‰",
+  "error.unexpected_crash.next_steps_addons": "Õ“Õ¸Ö€Õ±Õ«Ö€ Õ¡Õ¶Õ»Õ¡Õ¿Õ¥Õ¬ ÕµÕ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Õ¶Õ¥Ö€Õ¨ Õ¥Ö‚ Õ©Õ¡Ö€Õ´Õ¡ÖÕ¶Õ¥Õ¬ Õ§Õ»Õ¨Ö‰ ÔµÕ©Õ¥ Õ¤Õ¡ Õ¹Ö…Õ£Õ¶Õ«, Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ Ö…Õ£Õ¿Õ¸Ö‚Õ¥Õ¬ Õ„Õ¡Õ½Õ¿Õ¡Õ¤Õ¸Õ¶Õ«Ö Õ¡ÕµÕ¬ Õ¤Õ«Õ¿Õ¡Ö€Õ¯Õ«Õ¹Õ¸Õ¾ Õ¯Õ¡Õ´ ÕµÕ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Õ¸Õ¾Ö‰",
   "errors.unexpected_crash.copy_stacktrace": "ÕŠÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Õ¬ Õ½Õ©Õ¡Ö„Õ©Ö€Õ¥ÕµÕ½Õ¨ Õ½Õ¥Õ²Õ´Õ¡Õ¿Õ¡ÕÕ¿Õ¡Õ¯Õ«Õ¶",
   "errors.unexpected_crash.report_issue": "Ô¶Õ¥Õ¯Õ¸Ö‚ÖÕ¥Õ¬ ÕÕ¶Õ¤Ö€Õ« Õ´Õ¡Õ½Õ«Õ¶",
-  "follow_request.authorize": "ÕŽÕ¡Õ¾Õ¥Ö€Õ¡ÖÕ¶Õ¥Õ¬",
+  "follow_request.authorize": "ÕŽÕ¡Ö‚Õ¥Ö€Õ¡ÖÕ¶Õ¥Õ¬",
   "follow_request.reject": "Õ„Õ¥Ö€ÕªÕ¥Õ¬",
-  "follow_requests.unlocked_explanation": "Ô±ÕµÕ½ Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¨ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¾Õ¡Õ® Õ§ Õ°Õ¡Õ·Õ¾Õ«Ö, Õ¸Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€ {domain}-Õ« Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¦Õ´Õ¨ Õ´Õ«Õ¡ÖÖ€Õ¥Õ¬ Õ§ Õ±Õ¥Õ¼Ö„Õ¸Õ¾ Õ½Õ¿Õ¸Ö‚Õ£Õ¸Ö‚Õ´Ö‰",
-  "generic.saved": "ÕŠÕ¡Õ°ÕºÕ¡Õ¶Õ¾Õ¡Õ® Õ§",
+  "follow_requests.unlocked_explanation": "Ô±ÕµÕ½ Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¨ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¸Ö‚Õ¡Õ® Õ§ Õ°Õ¡Õ·Õ¸Ö‚Õ«Ö, Õ¸Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€ {domain}-Õ« Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¦Õ´Õ¨ Õ´Õ«Õ¡ÖÖ€Õ¥Õ¬ Õ§ Õ±Õ¥Õ¼Ö„Õ¸Õ¾ Õ½Õ¿Õ¸Ö‚Õ£Õ¸Ö‚Õ´Ö‰",
+  "generic.saved": "ÕŠÕ¡Õ°ÕºÕ¡Õ¶Õ¸Ö‚Õ¡Õ® Õ§",
   "getting_started.developers": "Õ„Õ·Õ¡Õ¯Õ¸Õ²Õ¶Õ¥Ö€",
   "getting_started.directory": "Õ•Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€Õ« Õ·Õ¿Õ¥Õ´Õ¡Ö€Õ¡Õ¶",
   "getting_started.documentation": "Õ“Õ¡Õ½Õ¿Õ¡Õ©Õ²Õ©Õ¥Ö€",
-  "getting_started.heading": "Ô»Õ¶Õ¹ÕºÕ¥Õ½ Õ½Õ¯Õ½Õ¥Õ¬",
+  "getting_started.heading": "Ô»Õ¶Õ¹ÕºÕ§Õ½ Õ½Õ¯Õ½Õ¥Õ¬",
   "getting_started.invite": "Õ€Ö€Õ¡Ö‚Õ«Ö€Õ¥Õ¬ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö",
-  "getting_started.open_source_notice": "Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶Õ¨ Õ¢Õ¡Ö Õ¥Õ¬Õ¡Õ¿Õ¥Ö„Õ½Õ¿Õ¸Õ¾ Õ®Ö€Õ¡Õ£Ö€Õ¡Õ¯Õ¡Õ¦Õ´ Õ§Ö‰ Ô¿Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ¶Õ¥Ö€Õ¤Ö€Õ¸Ö‚Õ´ Õ¡Õ¶Õ¥Õ¬ Õ¯Õ¡Õ´ Õ¾Ö€Õ¥ÕºÕ¶Õ¥Ö€ Õ¦Õ¥Õ¯Õ¸Ö‚ÖÕ¥Õ¬ Ô³Õ«Õ©Õ€Õ¡Õ¢Õ¸Ö‚Õ´Õ {github}Ö‰",
+  "getting_started.open_source_notice": "Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶Õ¨ Õ¢Õ¡Ö Õ¥Õ¬Õ¡Õ¿Õ¥Ö„Õ½Õ¿Õ¸Õ¾ Õ®Ö€Õ¡Õ£Ö€Õ¡Õ¯Õ¡Õ¦Õ´ Õ§Ö‰ Ô¿Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ¶Õ¥Ö€Õ¤Ö€Õ¸Ö‚Õ´ Õ¡Õ¶Õ¥Õ¬ Õ¯Õ¡Õ´ Õ¾Ö€Õ§ÕºÕ¶Õ¥Ö€ Õ¦Õ¥Õ¯Õ¸Ö‚ÖÕ¥Õ¬ Ô³Õ«Õ©Õ€Õ¡Õ¢Õ¸Ö‚Õ´Õ {github}Ö‰",
   "getting_started.security": "Õ€Õ¡Õ·Õ¸Ö‚Õ« Õ¯Õ¡Ö€Õ£Õ¡Ö‚Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€",
   "getting_started.terms": "Ô¾Õ¡Õ¼Õ¡ÕµÕ¸Ö‚Õ©Õ¥Õ¡Õ¶ ÕºÕ¡ÕµÕ´Õ¡Õ¶Õ¶Õ¥Ö€Õ¨",
   "hashtag.column_header.tag_mode.all": "Õ¥Ö‚ {additional}",
   "hashtag.column_header.tag_mode.any": "Õ¯Õ¡Õ´ {additional}",
   "hashtag.column_header.tag_mode.none": "Õ¡Õ¼Õ¡Õ¶Ö {additional}",
   "hashtag.column_settings.select.no_options_message": "Ô±Õ¼Õ¡Õ»Õ¡Ö€Õ¯Õ¶Õ¥Ö€ Õ¹Õ¯Õ¡Õ¶",
-  "hashtag.column_settings.select.placeholder": "Ô±Õ¾Õ¥Õ¬Õ¡ÖÖ€Õ¸Ö‚ Õ°Õ¥Õ·Õ©Õ¥Õ£Õ¥Ö€â€¦",
+  "hashtag.column_settings.select.placeholder": "Ô±Ö‚Õ¥Õ¬Õ¡ÖÖ€Õ¸Ö‚ ÕºÕ«Õ¿Õ¯Õ¶Õ¥Ö€â€¦",
   "hashtag.column_settings.tag_mode.all": "Ô²Õ¸Õ¬Õ¸Ö€Õ¨",
   "hashtag.column_settings.tag_mode.any": "Õ‘Õ¡Õ¶Õ¯Õ¡ÖÕ¡Õ®Õ¨",
   "hashtag.column_settings.tag_mode.none": "ÕˆÕ¹ Õ´Õ¥Õ¯Õ¨",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.column_settings.tag_toggle": "Õ†Õ¥Ö€Õ¡Õ¼Õ¥Õ¬ Õ¬Ö€Õ¡ÖÕ¸Ö‚ÖÕ«Õ¹ ÕºÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€Õ¨ Õ¡ÕµÕ½ Õ½Õ«Ö‚Õ¶Õ¡Õ¯Õ¸Ö‚Õ´ ",
   "home.column_settings.basic": "Õ€Õ«Õ´Õ¶Õ¡Õ¯Õ¡Õ¶",
   "home.column_settings.show_reblogs": "Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ Õ¿Õ¡Ö€Õ¡Õ®Õ¡Õ®Õ¶Õ¥Ö€Õ¨",
   "home.column_settings.show_replies": "Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¶Õ¥Ö€Õ¨",
@@ -197,17 +202,17 @@
   "home.show_announcements": "Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ ÕµÕ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¨",
   "intervals.full.days": "{number, plural, one {# Ö…Ö€} other {# Ö…Ö€}}",
   "intervals.full.hours": "{number, plural, one {# ÕªÕ¡Õ´} other {# ÕªÕ¡Õ´}}",
-  "intervals.full.minutes": "{number, plural, one {# Ö€Õ¸ÕºÕ¥} other {# Ö€Õ¸ÕºÕ¥}}",
-  "introduction.federation.action": "Õ€Õ¡Õ»Õ¸Ö€Õ¤",
+  "intervals.full.minutes": "{number, plural, one {# Ö€Õ¸ÕºÕ§} other {# Ö€Õ¸ÕºÕ§}}",
+  "introduction.federation.action": "Õ…Õ¡Õ»Õ¸Ö€Õ¤",
   "introduction.federation.federated.headline": "Ô´Õ¡Õ·Õ¶Õ¡ÕµÕ«Õ¶",
   "introduction.federation.federated.text": "Ô´Õ¡Õ·Õ¶Õ¥Õ¦Õ¥Ö€Ö„Õ« Õ°Õ¡Ö€Õ¥Ö‚Õ¡Õ¶ Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ¶Õ¥Ö€Õ« Õ°Õ¡Õ¶Ö€Õ¡ÕµÕ«Õ¶ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¯Õ¨ ÕµÕ¡ÕµÕ¿Õ¶Õ¸Ö‚Õ¥Õ¶ Õ¤Õ¡Õ·Õ¶Õ¡ÕµÕ«Õ¶ Õ°Õ¸Õ½Ö„Õ¸Ö‚Õ´Ö‰",
   "introduction.federation.home.headline": "Õ€Õ«Õ´Õ¶Õ¡Õ¯Õ¡Õ¶",
   "introduction.federation.home.text": "Ô±ÕµÕ¶ Õ¡Õ¶Õ±Õ¡Õ¶Ö Õ©Õ©Õ¥Ö€Õ¨ Õ¸Ö‚Õ´ Õ°Õ¥Õ¿Ö‡Õ¸Ö‚Õ´ Õ¥Õ½, Õ¯Õ¨ ÕµÕ¡ÕµÕ¿Õ¶Õ¸Ö‚Õ¥Õ¶ Õ°Õ«Õ´Õ¶Õ¡Õ¯Õ¡Õ¶ Õ°Õ¸Õ½Ö„Õ¸Ö‚Õ´Ö‰ Ô´Õ¸Ö‚ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬ ÖÕ¡Õ¶Õ¯Õ¡ÖÕ¡Õ® Õ¡Õ¶Õ±Õ« ÖÕ¡Õ¶Õ¯Õ¡ÖÕ¡Õ® Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ«ÖÖ‰",
   "introduction.federation.local.headline": "ÕÕ¥Õ²Õ¡ÕµÕ«Õ¶",
   "introduction.federation.local.text": "ÕÕ¥Õ²Õ¡Õ¯Õ¡Õ¶ Õ°Õ¸Õ½Ö„Õ¸Ö‚Õ´ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ¿Õ¥Õ½Õ¶Õ¥Õ¬ Ö„Õ¸ Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ« Õ¢Õ¸Õ¬Õ¸Ö€ Õ°Õ¡Õ¶Ö€Õ¡ÕµÕ«Õ¶ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨Ö‰",
-  "introduction.interactions.action": "Finish toot-orial!",
+  "introduction.interactions.action": "Ô±Ö‚Õ¡Ö€Õ¿Õ¥Õ¬ Õ©Õ©Õ« Õ¤Õ¡Õ½Õ¨Õ¶Õ©Õ¡ÖÕ¨",
   "introduction.interactions.favourite.headline": "Õ†Õ¡ÕÕ¨Õ¶Õ¿Ö€Õ¥Õ¬Õ«",
-  "introduction.interactions.favourite.text": "Õ“Õ¸ÕÕ¡Õ¶ÖÕ«Ö€ Õ°Õ¥Õ²Õ«Õ¶Õ¡Õ¯Õ«Õ¶ Õ¸Ö€ Ö„Õ¥Õ¦ Õ¤Õ¸Ö‚Ö€ Õ§ Õ¥Õ¯Õ¥Õ¬ Õ«Ö€ Õ©Õ¸Ö‚Õ©Õ¨ Õ°Õ¡Õ¾Õ¡Õ¶Õ¥Õ¬Õ¸Õ¾ Õ¡ÕµÕ¶Ö‰",
+  "introduction.interactions.favourite.text": "Õ“Õ¸ÕÕ¡Õ¶ÖÕ«Ö€ Õ°Õ¥Õ²Õ«Õ¶Õ¡Õ¯Õ«Õ¶ Õ¸Ö€ Ö„Õ¥Õ¦ Õ¤Õ¸Ö‚Ö€ Õ§ Õ¥Õ¯Õ¥Õ¬ Õ«Ö€ Õ©Õ¸Ö‚Õ©Õ¨ Õ°Õ¡Ö‚Õ¡Õ¶Õ¥Õ¬Õ¸Õ¾ Õ¡ÕµÕ¶Ö‰",
   "introduction.interactions.reblog.headline": "ÕÕ¡Ö€Õ¡Õ®Õ¥Õ¬",
   "introduction.interactions.reblog.text": "Ô¿Õ«Õ½Õ«Ö€ Õ¡ÕµÕ¬ Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€Õ« Õ©Õ¸Ö‚Õ©Õ¥Ö€Õ¨ Ö„Õ¸ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Õ²Õ¶Õ¥Ö€Õ« Õ°Õ¥Õ¿ Õ¿Õ¡Ö€Õ¡Õ®Õ¥Õ¬Õ¸Õ¾ Õ¤Ö€Õ¡Õ¶Ö„ Ö„Õ¸ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ§Õ»Õ¸Ö‚Õ´Ö‰",
   "introduction.interactions.reply.headline": "ÕŠÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¥Õ¬",
@@ -215,25 +220,25 @@
   "introduction.welcome.action": "Ô³Õ¶Õ¡ÖÕ«ÕœÕ¶Ö„Ö‰",
   "introduction.welcome.headline": "Ô±Õ¼Õ¡Õ»Õ«Õ¶ Ö„Õ¡ÕµÕ¬Õ¥Ö€",
   "introduction.welcome.text": "Ô´Õ¡Õ·Õ¶Õ¥Õ¦Õ¥Ö€Ö„Õ¨ Õ¸Õ²Õ»Õ¸Ö‚Õ¶Õ¸Ö‚Õ´ Õ§ Õ±Õ¥Õ¦Ö‰ Õ‡Õ¸Ö‚Õ¿Õ¸Õ¾ Õ¯Õ¨ Õ¯Õ¡Ö€Õ¸Õ²Õ¡Õ¶Õ¡Õ½ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¥Õ¬ Õ¶Õ¡Õ´Õ¡Õ¯Õ¶Õ¥Ö€ Õ¸Ö‚ Õ·ÖƒÕ¸Ö‚Õ¥Õ¬ Õ¿Õ¡Ö€Õ¢Õ¥Ö€ Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ¶Õ¥Ö€Õ« Õ¨Õ¶Õ¯Õ¥Ö€Õ¶Õ¥Ö€Õ«Õ¤ Õ°Õ¥Õ¿Ö‰ Ô²Õ¡ÕµÖ Õ´Õ¿Õ¡ÕºÕ¡Õ°Õ«Ö€ {domain} Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ¨, Õ¡ÕµÕ¶ Õ«Ö‚Ö€Õ¡ÕµÕ¡Õ¿Õ¸Ö‚Õ¯ Õ§, Õ¡ÕµÕ½Õ¿Õ¥Õ² Õ§ ÕºÕ¡Õ°Ö‚Õ¸Ö‚Õ´ Ö„Õ¸ Õ°Õ¡Õ·Õ«Ö‚Õ¨Ö‰",
-  "keyboard_shortcuts.back": "Õ¥Õ¿ Õ¶Õ¡Õ¾Õ¡Ö€Õ¯Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
-  "keyboard_shortcuts.blocked": "Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¾Õ¡Õ® Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€Õ¥Ö€Õ« ÖÕ¡Õ¶Õ¯Õ¨ Õ¢Õ¡ÖÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
+  "keyboard_shortcuts.back": "Õ¥Õ¿ Õ¶Õ¡Ö‚Õ¡Ö€Õ¯Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
+  "keyboard_shortcuts.blocked": "Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ¡Õ® Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€Õ« ÖÕ¡Õ¶Õ¯Õ¨ Õ¢Õ¡ÖÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
   "keyboard_shortcuts.boost": "Õ¿Õ¡Ö€Õ¡Õ®Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
   "keyboard_shortcuts.column": "Õ½Õ«Ö‚Õ¶Õ¥Ö€Õ«Ö Õ´Õ§Õ¯Õ« Õ¾Ö€Õ¡Õµ Õ½Õ¥Ö‚Õ¥Õ¼Õ¸Ö‚Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
-  "keyboard_shortcuts.compose": "Õ·Õ¡Ö€Õ¡Õ¤Ö€Õ´Õ¡Õ¶ Õ¿Õ«Ö€Õ¸Ö‚ÕµÕ©Õ«Õ¶ Õ½Õ¥Ö‚Õ¥Õ¼Õ¾Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
+  "keyboard_shortcuts.compose": "Õ·Õ¡Ö€Õ¡Õ¤Ö€Õ´Õ¡Õ¶ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ«Õ¶ Õ½Õ¥Ö‚Õ¥Õ¼Õ¸Ö‚Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
   "keyboard_shortcuts.description": "Õ†Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶",
-  "keyboard_shortcuts.direct": "Õ°Õ¡Õ½ÖÕ¥Õ¡Õ£Ö€Õ¾Õ¡Õ® Õ£Ö€Õ¾Õ¡Õ®Ö„Õ¶Õ¥Ö€Õ« Õ°Õ¸Õ½Ö„Õ¨ Õ¢Õ¡ÖÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
-  "keyboard_shortcuts.down": "ÖÕ¡Õ¶Õ¯Õ¸Õ¾ Õ¶Õ¥Ö€Ö„Õ¥Ö‚ Õ·Õ¡Ö€ÕªÕ¾Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
+  "keyboard_shortcuts.direct": "Õ°Õ¡Õ½ÖÕ§Õ¡Õ£Ö€Õ¸Ö‚Õ¡Õ® Õ£Ö€Õ¸Ö‚Õ¡Õ®Ö„Õ¶Õ¥Ö€Õ« Õ°Õ¸Õ½Ö„Õ¨ Õ¢Õ¡ÖÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
+  "keyboard_shortcuts.down": "ÖÕ¡Õ¶Õ¯Õ¸Õ¾ Õ¶Õ¥Ö€Ö„Õ¥Ö‚ Õ·Õ¡Ö€ÕªÕ¸Ö‚Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
   "keyboard_shortcuts.enter": "Õ©Õ¸Ö‚Õ©Õ¨ Õ¢Õ¡ÖÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
-  "keyboard_shortcuts.favourite": "Õ°Õ¡Õ¾Õ¡Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
+  "keyboard_shortcuts.favourite": "Õ°Õ¡Ö‚Õ¡Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
   "keyboard_shortcuts.favourites": "Õ§Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€Õ« ÖÕ¸Ö‚ÖÕ¡Õ¯Õ¨ Õ¢Õ¡ÖÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
   "keyboard_shortcuts.federated": "Õ¤Õ¡Õ·Õ¶Õ¡ÕµÕ«Õ¶ Õ°Õ¸Õ½Ö„Õ«Õ¶ Õ¡Õ¶ÖÕ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
   "keyboard_shortcuts.heading": "ÕÕ¿Õ¥Õ²Õ¶Õ¡Õ·Õ¡Ö€Õ« Õ¯Õ¡Ö€Õ³Õ¡Õ¿Õ¶Õ¥Ö€",
   "keyboard_shortcuts.home": "Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ°Õ¸Õ½Ö„Õ«Õ¶ Õ¡Õ¶ÖÕ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
-  "keyboard_shortcuts.hotkey": "Õ€Õ¡Õ¿Õ¸Ö‚Õ¯ Õ½Õ¿Õ¥Õ²Õ¶",
+  "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": "ÖÕ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ Õ´Õ¥Õ¤Õ«Õ¡Õ¶",
@@ -242,34 +247,41 @@
   "keyboard_shortcuts.reply": "ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
   "keyboard_shortcuts.requests": "Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡ÕµÖÕ¥Ö€Õ« ÖÕ¡Õ¶Õ¯Õ¨ Õ¤Õ«Õ¿Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
   "keyboard_shortcuts.search": "Õ¸Ö€Õ¸Õ¶Õ´Õ¡Õ¶ Õ¤Õ¡Õ·Õ¿Õ«Õ¶ Õ½Õ¥Ö‚Õ¥Õ¼Õ¾Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "Õ¸Ö€ÕºÕ§Õ½Õ¦Õ« ÖÕ¸Ö‚ÖÕ¡Õ¤Ö€Õ¸Ö‚Õ«/Õ©Õ¡Ö„ÖÕ¸Ö‚Õ« CW Õ¤Õ¡Õ·Õ¿Õ¨",
   "keyboard_shortcuts.start": "Â«Õ½Õ¯Õ½Õ¥Õ¬Â» Õ½Õ«Ö‚Õ¶Õ¡Õ¯Õ¨ Õ¢Õ¡ÖÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
   "keyboard_shortcuts.toggle_hidden": "CWÖŠÕ« Õ¥Õ¿Õ¥Ö‚Õ« Õ¿Õ¥Ö„Õ½Õ¿Õ¨ ÖÕ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ÖŠÕ©Õ¡Ö„ÖÕ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
   "keyboard_shortcuts.toggle_sensitivity": "Õ´Õ¥Õ¤Õ«Õ¡Õ¶ ÖÕ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ÖŠÕ©Õ¡Ö„ÖÕ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
   "keyboard_shortcuts.toot": "Õ©Õ¡Ö€Õ´ Õ©Õ¸Ö‚Õ© Õ½Õ¯Õ½Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
-  "keyboard_shortcuts.unfocus": "Õ¿Õ¥Ö„Õ½Õ¿Õ«/Õ¸Ö€Õ¸Õ¶Õ´Õ¡Õ¶ Õ¿Õ«Ö€Õ¸Ö‚ÕµÕ©Õ«Ö Õ¡ÕºÕ¡Õ½Õ¥Ö‚Õ¥Õ¼Õ¾Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
-  "keyboard_shortcuts.up": "ÖÕ¡Õ¶Õ¯Õ¸Õ¾ Õ¾Õ¥Ö€Õ¥Ö‚ Õ·Õ¡Ö€ÕªÕ¾Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
+  "keyboard_shortcuts.unfocus": "Õ¿Õ¥Ö„Õ½Õ¿Õ«/Õ¸Ö€Õ¸Õ¶Õ´Õ¡Õ¶ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ«Ö Õ¡ÕºÕ¡Õ½Õ¥Ö‚Õ¥Õ¼Õ¸Ö‚Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
+  "keyboard_shortcuts.up": "ÖÕ¡Õ¶Õ¯Õ¸Õ¾ Õ¾Õ¥Ö€Õ¥Ö‚ Õ·Õ¡Ö€ÕªÕ¸Ö‚Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
   "lightbox.close": "Õ“Õ¡Õ¯Õ¥Õ¬",
-  "lightbox.next": "Õ€Õ¡Õ»Õ¸Ö€Õ¤",
+  "lightbox.compress": "Õ“Õ¡Õ¯Õ¥Õ¬ ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ« Õ¤Õ«Õ¿Õ´Õ¡Õ¶ ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ¨",
+  "lightbox.expand": "Ô²Õ¡ÖÕ¥Õ¬ ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ« Õ¤Õ«Õ¿Õ´Õ¡Õ¶ ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ¨",
+  "lightbox.next": "Õ…Õ¡Õ»Õ¸Ö€Õ¤",
   "lightbox.previous": "Õ†Õ¡ÕÕ¸Ö€Õ¤",
-  "lightbox.view_context": "ÕÕ¥Õ½Õ¶Õ¥Õ¬ Õ¥Õ¶Õ©Õ¡Õ¿Õ¥Ö„Õ½Õ¿Õ¨",
-  "lists.account.add": "Ô±Õ¾Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ ÖÕ¡Õ¶Õ¯Õ«Õ¶",
+  "lists.account.add": "Ô±Ö‚Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ ÖÕ¡Õ¶Õ¯Õ«Õ¶",
   "lists.account.remove": "Õ€Õ¡Õ¶Õ¥Õ¬ ÖÕ¡Õ¶Õ¯Õ«Ö",
   "lists.delete": "Õ‹Õ¶Õ»Õ¥Õ¬ ÖÕ¡Õ¶Õ¯Õ¨",
   "lists.edit": "Õ“Õ¸ÖƒÕ¸ÕÕ¥Õ¬ ÖÕ¡Õ¶Õ¯Õ¨",
   "lists.edit.submit": "Õ“Õ¸ÕÕ¥Õ¬ Õ¾Õ¥Ö€Õ¶Õ¡Õ£Õ«Ö€Õ¨",
-  "lists.new.create": "Ô±Õ¾Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ ÖÕ¡Õ¶Õ¯",
+  "lists.new.create": "Ô±Ö‚Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ ÖÕ¡Õ¶Õ¯",
   "lists.new.title_placeholder": "Õ†Õ¸Ö€ ÖÕ¡Õ¶Õ¯Õ« Õ¾Õ¥Ö€Õ¶Õ¡Õ£Õ«Ö€",
-  "lists.search": "Õ“Õ¶Õ¿Ö€Õ¥Õ¬ Ö„Õ¸ Õ°Õ¥Õ¿Õ¥Ö‚Õ¡Õ® Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö Õ´Õ¥Õ»",
+  "lists.replies_policy.followed": "Õ‘Õ¡Õ¶Õ¯Õ¡ÖÕ¡Õ® Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Õ² Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€",
+  "lists.replies_policy.list": "Õ‘Õ¡Õ¶Õ¯Õ« Õ¡Õ¶Õ¤Õ¡Õ´Õ¶Õ¥Ö€",
+  "lists.replies_policy.none": "ÕˆÕ¹ Õ¸Ö„",
+  "lists.replies_policy.title": "Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¶Õ¥Ö€Õ¨Õ",
+  "lists.search": "Õ“Õ¶Õ¿Ö€Õ¥Õ¬ Ö„Õ¸ Õ°Õ¥Õ¿Õ¥Ö‚Õ¡Õ® Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö Õ´Õ§Õ»",
   "lists.subheading": "Õ”Õ¸ ÖÕ¡Õ¶Õ¯Õ¥Ö€Õ¨",
   "load_pending": "{count, plural, one {# Õ¶Õ¸Ö€ Õ¶Õ«Ö‚Õ©} other {# Õ¶Õ¸Ö€ Õ¶Õ«Ö‚Õ©}}",
-  "loading_indicator.label": "Ô²Õ¥Õ¼Õ¶Õ¾Õ¸Ö‚Õ´ Õ§â€¦",
+  "loading_indicator.label": "Ô²Õ¥Õ¼Õ¶Ö‚Õ¸Ö‚Õ´ Õ§â€¦",
   "media_gallery.toggle_visible": "Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬/Õ©Õ¡Ö„ÖÕ¶Õ¥Õ¬",
-  "missing_indicator.label": "Õ‰Õ£Õ¿Õ¶Õ¾Õ¥Ö",
+  "missing_indicator.label": "Õ‰Õ£Õ¿Õ¶Õ¸Ö‚Õ¥Ö",
   "missing_indicator.sublabel": "ÕŠÕ¡Õ·Õ¡Ö€Õ¨ Õ¹Õ« Õ£Õ¿Õ¶Ö‚Õ¸Ö‚Õ´",
+  "mute_modal.duration": "ÕÕ¥Ö‚Õ¸Õ²Õ¸Ö‚Õ©Õ«Ö‚Õ¶",
   "mute_modal.hide_notifications": "Ô¹Õ¡Ö„ÖÕ¶Õ¥ÕžÕ¬ ÖÕ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¶ Õ¡ÕµÕ½ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ»Õ«ÖÖ‰",
+  "mute_modal.indefinite": "Ô±Õ¶ÕªÕ¡Õ´Õ¯Õ§Õ¿",
   "navigation_bar.apps": "Ô´Õ«Ö‚Ö€Õ¡Õ¯Õ«Ö€ ÕµÕ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Õ¶Õ¥Ö€",
-  "navigation_bar.blocks": "Ô±Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¾Õ¡Õ® Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€Õ¥Ö€",
+  "navigation_bar.blocks": "Ô±Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ¡Õ® Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€",
   "navigation_bar.bookmarks": "Ô·Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€",
   "navigation_bar.community_timeline": "ÕÕ¥Õ²Õ¡Õ¯Õ¡Õ¶ Õ°Õ¸Õ½Ö„",
   "navigation_bar.compose": "Ô³Ö€Õ¥Õ¬ Õ¶Õ¸Ö€ Õ©Õ¸Ö‚Õ©",
@@ -285,22 +297,23 @@
   "navigation_bar.keyboard_shortcuts": "ÕÕ¿Õ¥Õ²Õ¶Õ¡Õ·Õ¡Ö€Õ« Õ¯Õ¡Ö€Õ³Õ¡Õ¿Õ¶Õ¥Ö€",
   "navigation_bar.lists": "Õ‘Õ¡Õ¶Õ¯Õ¥Ö€",
   "navigation_bar.logout": "Ô´Õ¸Ö‚Ö€Õ½ Õ£Õ¡Õ¬",
-  "navigation_bar.mutes": "Ô¼Õ¼Õ¥ÖÖ€Õ¡Õ® Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€Õ¥Ö€",
+  "navigation_bar.mutes": "Ô¼Õ¼Õ¥ÖÖ€Õ¡Õ® Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€",
   "navigation_bar.personal": "Ô±Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶",
-  "navigation_bar.pins": "Ô±Õ´Ö€Õ¡ÖÕ¾Õ¡Õ® Õ©Õ©Õ¥Ö€",
+  "navigation_bar.pins": "Ô±Õ´Ö€Õ¡ÖÕ¸Ö‚Õ¡Õ® Õ©Õ©Õ¥Ö€",
   "navigation_bar.preferences": "Õ†Õ¡ÕÕ¡ÕºÕ¡Õ¿Õ¸Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€",
   "navigation_bar.public_timeline": "Ô´Õ¡Õ·Õ¶Õ¡ÕµÕ«Õ¶ Õ°Õ¸Õ½Ö„",
   "navigation_bar.security": "Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ«Ö‚Õ¶",
-  "notification.favourite": "{name} Õ°Õ¡Õ¾Õ¡Õ¶Õ¥Ö Õ©Õ¸Ö‚Õ©Õ¤",
+  "notification.favourite": "{name} Õ°Õ¡Ö‚Õ¡Õ¶Õ¥Ö Õ©Õ¸Ö‚Õ©Õ¤",
   "notification.follow": "{name} Õ½Õ¯Õ½Õ¥Ö Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬ Ö„Õ¥Õ¦",
   "notification.follow_request": "{name} Ö„Õ¥Õ¦ Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡ÕµÖ Õ§ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¥Õ¬",
   "notification.mention": "{name} Õ¶Õ·Õ¥Ö Ö„Õ¥Õ¦",
   "notification.own_poll": "Õ€Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¤ Õ¡Ö‚Õ¡Ö€Õ¿Õ¸Ö‚Õ¥Ö",
   "notification.poll": "Õ€Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¨, Õ¸Ö‚Ö€ Õ¤Õ¸Ö‚ Ö„Õ¸Ö‚Õ§Õ¡Ö€Õ¯Õ¥Õ¬ Õ¥Õ½, Õ¡Ö‚Õ¡Ö€Õ¿Õ¸Ö‚Õ¥ÖÖ‰",
   "notification.reblog": "{name} Õ¿Õ¡Ö€Õ¡Õ®Õ¥Ö Õ©Õ¸Ö‚Õ©Õ¤",
+  "notification.status": "{name} Õ°Õ¥Õ¶Ö Õ¶Õ¸Ö€ Õ©Õ©Õ¥Ö",
   "notifications.clear": "Õ„Õ¡Ö„Ö€Õ¥Õ¬ Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨",
-  "notifications.clear_confirmation": "ÕŽÕ½Õ¿Õ¡ÕžÕ° Õ¥Õ½, Õ¸Ö€ Õ¸Ö‚Õ¦Õ¸Ö‚Õ´ Õ¥Õ½ Õ´Õ·Õ¿Õ¡ÕºÕ¥Õ½ Õ´Õ¡Ö„Ö€Õ¥Õ¬ Ö„Õ¸ Õ¢Õ¸Õ¬Õ¸Ö€ Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨Ö‰",
-  "notifications.column_settings.alert": "Ô±Õ·ÕÕ¡Õ¿Õ¡Õ¿Õ«Ö€Õ¸Ö‚ÕµÕ©Õ« Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€",
+  "notifications.clear_confirmation": "ÕŽÕ½Õ¿Õ¡ÕžÕ° Õ¥Õ½, Õ¸Ö€ Õ¸Ö‚Õ¦Õ¸Ö‚Õ´ Õ¥Õ½ Õ´Õ·Õ¿Õ¡ÕºÕ§Õ½ Õ´Õ¡Ö„Ö€Õ¥Õ¬ Ö„Õ¸ Õ¢Õ¸Õ¬Õ¸Ö€ Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨Ö‰",
+  "notifications.column_settings.alert": "Ô±Õ·ÕÕ¡Õ¿Õ¡Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€",
   "notifications.column_settings.favourite": "Õ€Õ¡Ö‚Õ¡Õ¶Õ¡Õ®Õ¶Õ¥Ö€Õ«ÖÕ",
   "notifications.column_settings.filter_bar.advanced": "Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€ Õ¯Õ¡Õ¿Õ¥Õ£Õ¸Ö€Õ«Õ¡Õ¶Õ¥Ö€Õ¨",
   "notifications.column_settings.filter_bar.category": "Ô±Ö€Õ¡Õ£ Õ¦Õ¿Õ´Õ¡Õ¶ Õ¾Õ¡Õ°Õ¡Õ¶Õ¡Õ¯",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "ÕÕ¡Ö€Õ¡Õ®Õ¡Õ®Õ¶Õ¥Ö€Õ«ÖÕ",
   "notifications.column_settings.show": "Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ Õ½Õ«Ö‚Õ¶Õ¸Ö‚Õ´",
   "notifications.column_settings.sound": "ÕÕ¡ÕµÕ¶ Õ°Õ¡Õ¶Õ¥Õ¬",
+  "notifications.column_settings.status": "Õ†Õ¸Ö€ Õ©Õ©Õ¥Ö€Ö‰",
   "notifications.filter.all": "Ô²Õ¸Õ¬Õ¸Ö€Õ¨",
   "notifications.filter.boosts": "ÕÕ¡Ö€Õ¡Õ®Õ¡Õ®Õ¶Õ¥Ö€Õ¨",
   "notifications.filter.favourites": "Õ€Õ¡Ö‚Õ¡Õ¶Õ¡Õ®Õ¶Õ¥Ö€Õ¨",
   "notifications.filter.follows": "Õ€Õ¥Õ¿Õ¥Ö‚Õ¡Õ®Õ¶Õ¥Ö€Õ¨",
   "notifications.filter.mentions": "Õ†Õ·Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨",
   "notifications.filter.polls": "Õ€Õ¡Ö€ÖÕ´Õ¡Õ¶ Õ¡Ö€Õ¤Õ«Ö‚Õ¶Ö„Õ¶Õ¥Ö€Õ¨",
+  "notifications.filter.statuses": "Ô¹Õ¡Ö€Õ´Õ¡ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ«Ö",
+  "notifications.grant_permission": "Ô¹Õ¸ÕµÕ¬Õ¡Õ¿Ö€Õ¥Õ¬Ö‰",
   "notifications.group": "{count} Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´",
+  "notifications.mark_as_read": "Õ€Õ¡Õ´Õ¡Ö€Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€ Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¨Õ¶Õ©Õ¥Ö€ÖÕ¡Õ®",
+  "notifications.permission_denied": "Ô±Õ·ÕÕ¡Õ¿Õ¡Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¶ Õ¡Õ¶Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ¥Õ¶Õ Õ¤Õ«Õ¿Õ¡Ö€Õ¯Õ¹Õ« Õ¶Õ¡ÕÕ¯Õ«Õ¶Õ¸Ö‚Õ´ Õ´Õ¥Ö€ÕªÕ¸Ö‚Õ¡Õ® Õ©Õ¸ÕµÕ¬Õ¿Õ¸Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ« Õ°Õ¡ÕµÖÕ´Õ¡Õ¶ Õ°Õ¥Õ¿Õ¥Ö‚Õ¡Õ¶Ö„Õ¸Õ¾",
+  "notifications.permission_denied_alert": "Ô±Õ·ÕÕ¡Õ¿Õ¡Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¹Õ¥Õ¶ Õ¯Õ¡Ö€Õ¸Õ² Õ´Õ«Õ¡ÖÕ¸Ö‚Õ¥Õ¬, Ö„Õ¡Õ¶Õ« Õ¸Ö€ Õ¤Õ«Õ¿Õ¡Ö€Õ¯Õ¹Õ« Õ©Õ¸ÕµÕ¬Õ¿Õ¸Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¶Õ¡ÕÕ¯Õ«Õ¶Õ¸Ö‚Õ´ Õ´Õ¥Ö€ÕªÕ¸Ö‚Õ¥Õ¬ Õ¥Õ¶",
+  "notifications.permission_required": "Ô±Õ·ÕÕ¡Õ¿Õ¡Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¶ Õ¡Õ¶Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ¥Õ¶, Ö„Õ¡Õ¶Õ« Õ¸Ö€ Õ¡Õ¶Õ°Ö€Õ¡ÕªÕ¥Õ·Õ¿ Õ©Õ¸ÕµÕ¬Õ¿Õ¸Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¢Õ¡ÖÕ¡Õ¯Õ¡ÕµÕ¸Ö‚Õ´ Õ¥Õ¶Ö‰",
+  "notifications_permission_banner.enable": "Õ„Õ«Õ¡ÖÕ¶Õ¥Õ¬ Õ¤Õ«Õ¿Õ¡Ö€Õ¯Õ¹Õ«Ö Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨",
+  "notifications_permission_banner.how_to_control": "Ô¾Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€ Õ½Õ¿Õ¡Õ¶Õ¡Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€, Õ¥Ö€Õ¢ Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶Õ¨ Õ¢Õ¡Ö Õ¹Õ§Õ Õ¡Õ¯Õ¿Õ«Ö‚Õ¡ÖÖ€Õ¸Ö‚ Õ¡Õ·ÕÕ¡Õ¿Õ¡Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨Ö‰ Ô´Õ¸Ö‚ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ³Õ·Õ£Ö€Õ¿Ö…Ö€Õ§Õ¶ Õ¾Õ¥Ö€Õ¡Õ°Õ½Õ¯Õ¥Õ¬ Õ©Õ§ Õ«Õ¶Õ¹ÕºÕ«Õ½Õ« ÖƒÕ¸ÕÕ£Õ¸Ö€Õ®Õ¡Õ¯ÖÕ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€ Õ¡Õ¼Õ¡Õ»Õ¡Õ¶Õ¡Õ¶ Õ¡Õ·ÕÕ¡Õ¿Õ¡Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ«ÖÕ {icon}Õ« Õ¯Õ¸Õ³Õ¡Õ¯Õ¸Õ¾Õ Õ¡ÕµÕ¶ Õ¡Õ¯Õ¿Õ«Ö‚Õ¡ÖÕ¶Õ¥Õ¬Õ¸Ö‚Ö ÕµÕ¥Õ¿Õ¸ÕµÖ‰",
+  "notifications_permission_banner.title": "ÕˆÕ¹Õ«Õ¶Õ¹ Õ¢Õ¡Ö Õ´Õ« Õ©Õ¸Õ²",
+  "picture_in_picture.restore": "Õ…Õ¥Õ¿ Õ¢Õ¥Ö€Õ¥Õ¬",
   "poll.closed": "Õ“Õ¡Õ¯",
   "poll.refresh": "Ô¹Õ¡Ö€Õ´Õ¡ÖÕ¶Õ¥Õ¬",
   "poll.total_people": "{count, plural, one {# Õ°Õ¸Õ£Õ«} other {# Õ°Õ¸Õ£Õ«}}",
@@ -329,8 +353,8 @@
   "poll_button.add_poll": "Ô±Ö‚Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´",
   "poll_button.remove_poll": "Õ€Õ¥Õ¼Õ¡ÖÕ¶Õ¥Õ¬ Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¨",
   "privacy.change": "Ô¿Õ¡Ö€Õ£Õ¡Ö‚Õ¸Ö€Õ¥Õ¬ Õ©Õ©Õ« Õ£Õ¡Õ²Õ¿Õ¶Õ«Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨",
-  "privacy.direct.long": "Ô¹Õ©Õ¥Õ¬ Õ´Õ«Õ¡ÕµÕ¶ Õ¶Õ·Õ¾Õ¡Õ® Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€",
-  "privacy.direct.short": "Õ€Õ¡Õ½ÖÕ¥Õ¡Õ£Ö€Õ¾Õ¡Õ®",
+  "privacy.direct.long": "Ô¹Õ©Õ¥Õ¬ Õ´Õ«Õ¡ÕµÕ¶ Õ¶Õ·Õ¸Ö‚Õ¡Õ® Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€",
+  "privacy.direct.short": "Õ€Õ¡Õ½ÖÕ§Õ¡Õ£Ö€Õ¸Ö‚Õ¡Õ®",
   "privacy.private.long": "Ô¹Õ©Õ¥Õ¬ Õ´Õ«Õ¡ÕµÕ¶ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Õ²Õ¶Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€",
   "privacy.private.short": "Õ„Õ«Õ¡ÕµÕ¶ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Õ²Õ¶Õ¥Ö€Õ«Õ¶",
   "privacy.public.long": "Ô¹Õ©Õ¥Õ¬ Õ°Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¡ÕµÕ«Õ¶ Õ°Õ¸Õ½Ö„Õ¥Ö€Õ¸Ö‚Õ´",
@@ -349,17 +373,17 @@
   "reply_indicator.cancel": "Õ‰Õ¥Õ²Õ¡Ö€Õ¯Õ¥Õ¬",
   "report.forward": "Õ“Õ¸ÕÕ¡Õ¶ÖÕ¥Õ¬ {target}ÖŠÕ«Õ¶",
   "report.forward_hint": "Ô±ÕµÕ½ Õ°Õ¡Õ·Õ«Ö‚ Õ¡ÕµÕ¬ Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ«Ö Õ§Ö‰ ÕˆÖ‚Õ²Õ¡Ö€Õ¯Õ¥ÕžÕ´ Õ¡ÕµÕ¶Õ¿Õ¥Õ² Õ§Õ¬ Õ¡ÕµÕ½ Õ¢Õ¸Õ²Õ¸Ö„Õ« Õ¡Õ¶Õ¸Õ¶Õ«Õ´ ÕºÕ¡Õ¿Õ³Õ§Õ¶Õ¨Ö‰",
-  "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.hint": "Ô±ÕµÕ½ Õ¦Õ¥Õ¯Õ¸ÕµÖÕ¨ Õ¯Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¸Ö‚Õ« Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ« Õ´Õ¸Õ¤Õ¥Ö€Õ¡Õ¿Õ¸Ö€Õ¶Õ¥Ö€Õ«Õ¶Ö‰ Õ†Õ¥Ö€Ö„Õ¥Ö‚Õ¸Ö‚Õ´ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ¿Ö€Õ¡Õ´Õ¡Õ¤Ö€Õ¥Õ¬ Õ¢Õ¡ÖÕ¡Õ¿Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶, Õ©Õ§ Õ«Õ¶Õ¹Õ¸Ö‚ Õ¥Õ½ Õ¦Õ¥Õ¯Õ¸Ö‚ÖÕ¸Ö‚Õ´ Õ¡ÕµÕ½ Õ°Õ¡Õ·Õ¸Ö‚Õ« Õ´Õ¡Õ½Õ«Õ¶â€¤",
   "report.placeholder": "Ô¼Ö€Õ¡ÖÕ¸Ö‚ÖÕ«Õ¹ Õ´Õ¥Õ¯Õ¶Õ¡Õ¢Õ¡Õ¶Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€",
   "report.submit": "ÕˆÖ‚Õ²Õ¡Ö€Õ¯Õ¥Õ¬",
   "report.target": "Ô²Õ¸Õ²Õ¸Ö„Õ¥Õ¬ {target}ÖŠÕ« Õ´Õ¡Õ½Õ«Õ¶",
   "search.placeholder": "Õ“Õ¶Õ¿Ö€Õ¥Õ¬",
-  "search_popout.search_format": "Õ“Õ¶Õ¿Ö€Õ¥Õ¬Õ¸Ö‚ Õ¡Õ¼Õ¡Õ»Õ¡Õ¤Õ¥Õ´ Õ±Õ¥Ö‚",
+  "search_popout.search_format": "Õ“Õ¶Õ¿Ö€Õ¥Õ¬Õ¸Ö‚ Õ¡Õ¼Õ¡Õ»Õ¡Õ¤Õ§Õ´ Õ±Õ¥Ö‚",
   "search_popout.tips.full_text": "ÕŠÕ¡Ö€Õ¦ Õ¿Õ¥Ö„Õ½Õ¿Õ¨ Õ¾Õ¥Ö€Õ¡Õ¤Õ¡Ö€Õ±Õ¶Õ¸Ö‚Õ´ Õ§ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¤, Õ°Õ¡Ö‚Õ¡Õ¶Õ¡Õ®Õ¶Õ¥Ö€Õ¤, Õ¿Õ¡Ö€Õ¡Õ®Õ¡Õ®Õ¶Õ¥Ö€Õ¤, Õ¸Ö€Õ¿Õ¥Õ² Õ¥Õ½ Õ¶Õ·Õ¸Ö‚Õ¡Õ® Õ¥Õ²Õ¥Õ¬, Õ«Õ¶Õ¹ÕºÕ§Õ½ Õ¶Õ¡Õ¥Ö‚ Õ¶Õ´Õ¡Õ¶ Ö…Õ£Õ¿Õ¡Õ¶Õ¸Ö‚Õ¶Õ¶Õ¥Ö€, Õ¡Õ¶Õ¸Ö‚Õ¶Õ¶Õ¥Ö€ Õ¥Ö‚ ÕºÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€Ö‰",
   "search_popout.tips.hashtag": "ÕºÕ«Õ¿Õ¡Õ¯",
   "search_popout.tips.status": "Õ©Õ¸Ö‚Õ©",
-  "search_popout.tips.text": "Õ€Õ¡Õ½Õ¡Ö€Õ¡Õ¯ Õ¿Õ¥Ö„Õ½Õ¿Õ¨ Õ¯Õ¾Õ¥Ö€Õ¡Õ¤Õ¡Ö€Õ±Õ¶Õ« Õ°Õ¡Õ´Õ¨Õ¶Õ¯Õ¶Õ¸Õ² Õ¡Õ¶Õ¸Ö‚Õ¶Õ¶Õ¥Ö€, Ö…Õ£Õ¿Õ¡Õ¶Õ¸Ö‚Õ¶Õ¶Õ¥Ö€ Õ¸Ö‚ ÕºÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€",
-  "search_popout.tips.user": "Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€",
+  "search_popout.tips.text": "Õ€Õ¡Õ½Õ¡Ö€Õ¡Õ¯ Õ¿Õ¥Ö„Õ½Õ¿Õ¨ Õ¯Õ¨ Õ¾Õ¥Ö€Õ¡Õ¤Õ¡Ö€Õ±Õ¶Õ« Õ°Õ¡Õ´Õ¨Õ¶Õ¯Õ¶Õ¸Õ² Õ¡Õ¶Õ¸Ö‚Õ¶Õ¶Õ¥Ö€, Ö…Õ£Õ¿Õ¡Õ¶Õ¸Ö‚Õ¶Õ¶Õ¥Ö€ Õ¸Ö‚ ÕºÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€",
+  "search_popout.tips.user": "Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€",
   "search_results.accounts": "Õ„Õ¡Ö€Õ¤Õ«Õ¯",
   "search_results.hashtags": "ÕŠÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€",
   "search_results.statuses": "Ô¹Õ©Õ¥Ö€",
@@ -370,24 +394,24 @@
   "status.block": "Ô±Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬ @{name}ÖŠÕ«Õ¶",
   "status.bookmark": "Ô·Õ»Õ¡Õ¶Õ«Õ·",
   "status.cancel_reblog_private": "Ô±ÕºÕ¡Õ¿Õ¡Ö€Õ¡Õ®Õ¥Õ¬",
-  "status.cannot_reblog": "Ô±ÕµÕ½ Õ©Õ¸Ö‚Õ©Õ¨ Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¿Õ¡Ö€Õ¡Õ®Õ¾Õ¥Õ¬",
-  "status.copy": "ÕŠÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Õ¬ Õ£Ö€Õ¡Õ¼Õ´Õ¡Õ¶ Õ°Õ²Õ¸Ö‚Õ´Õ¨",
+  "status.cannot_reblog": "Ô±ÕµÕ½ Õ©Õ¸Ö‚Õ©Õ¨ Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¿Õ¡Ö€Õ¡Õ®Õ¸Ö‚Õ¥Õ¬",
+  "status.copy": "ÕŠÕ¡Õ¿Õ³Õ§Õ¶Õ¥Õ¬ Õ£Ö€Õ¡Õ¼Õ´Õ¡Õ¶ ÕµÕ²Õ¸Ö‚Õ´Õ¨",
   "status.delete": "Õ‹Õ¶Õ»Õ¥Õ¬",
-  "status.detailed_status": "Õ‡Õ²Õ©Õ¡ÕµÕ« Õ¨Õ¶Õ¤Õ¬Õ¡ÕµÕ¶Õ¾Õ¡Õ® Õ¤Õ«Õ¿Õ¸Ö‚Õ´",
+  "status.detailed_status": "Õ‡Õ²Õ©Õ¡ÕµÕ« Õ¨Õ¶Õ¤Õ¬Õ¡ÕµÕ¶Õ¸Ö‚Õ¡Õ® Õ¤Õ«Õ¿Õ¸Ö‚Õ´",
   "status.direct": "Õ†Õ¡Õ´Õ¡Õ¯ Õ£Ö€Õ¥Õ¬ {name} -Õ«Õ¶",
   "status.embed": "Õ†Õ¥Ö€Õ¤Õ¶Õ¥Õ¬",
-  "status.favourite": "Õ€Õ¡Õ¾Õ¡Õ¶Õ¥Õ¬",
-  "status.filtered": "Ô¶Õ¿Õ¾Õ¡Õ®",
-  "status.load_more": "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬ Õ¡Õ¾Õ¥Õ¬Õ«Õ¶",
+  "status.favourite": "Õ€Õ¡Ö‚Õ¡Õ¶Õ¥Õ¬",
+  "status.filtered": "Ô¶Õ¿Õ¸Ö‚Õ¡Õ®",
+  "status.load_more": "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬ Õ¡Ö‚Õ¥Õ¬Õ«Õ¶",
   "status.media_hidden": "Õ´Õ¥Õ¤Õ«Õ¡Õ¢Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ©Õ¡Ö„ÖÕ¸Ö‚Õ¡Õ® Õ§",
   "status.mention": "Õ†Õ·Õ¥Õ¬ @{name}ÖŠÕ«Õ¶",
-  "status.more": "Ô±Õ¾Õ¥Õ¬Õ«Õ¶",
+  "status.more": "Ô±Ö‚Õ¥Õ¬Õ«Õ¶",
   "status.mute": "Ô¼Õ¼Õ¥ÖÕ¶Õ¥Õ¬ @{name}ÖŠÕ«Õ¶",
   "status.mute_conversation": "Ô¼Õ¼Õ¥ÖÕ¶Õ¥Õ¬ ÕÖ…Õ½Õ¡Õ¯ÖÕ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨",
   "status.open": "Ô¸Õ¶Õ¤Õ¡Ö€Õ±Õ¡Õ¯Õ¥Õ¬ Õ¡ÕµÕ½ Õ©Õ¸Ö‚Õ©Õ¨",
   "status.pin": "Ô±Õ´Ö€Õ¡ÖÕ¶Õ¥Õ¬ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ§Õ»Õ¸Ö‚Õ´",
-  "status.pinned": "Ô±Õ´Ö€Õ¡ÖÕ¾Õ¡Õ® Õ©Õ¸Ö‚Õ©",
-  "status.read_more": "Ô¿Õ¡Ö€Õ¤Õ¡Õ¬ Õ¡Õ¾Õ¥Õ¬Õ«Õ¶",
+  "status.pinned": "Ô±Õ´Ö€Õ¡ÖÕ¸Ö‚Õ¡Õ® Õ©Õ¸Ö‚Õ©",
+  "status.read_more": "Ô¿Õ¡Ö€Õ¤Õ¡Õ¬ Õ¡Ö‚Õ¥Õ¬Õ«Õ¶",
   "status.reblog": "ÕÕ¡Ö€Õ¡Õ®Õ¥Õ¬",
   "status.reblog_private": "ÕÕ¡Ö€Õ¡Õ®Õ¥Õ¬ Õ½Õ¥ÖƒÕ¡Õ¯Õ¡Õ¶ Õ¬Õ½Õ¡Ö€Õ¡Õ¶Õ«Õ¶",
   "status.reblogged_by": "{name} Õ¿Õ¡Ö€Õ¡Õ®Õ¥Õ¬ Õ§",
@@ -395,20 +419,20 @@
   "status.redraft": "Õ‹Õ¶Õ»Õ¥Õ¬ Õ¥Ö‚ Õ¾Õ¥Ö€Õ¡Õ¯Õ¡Õ¦Õ´Õ¥Õ¬",
   "status.remove_bookmark": "Õ€Õ¥Õ¼Õ¡ÖÕ¶Õ¥Õ¬ Õ§Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€Õ«Ö",
   "status.reply": "ÕŠÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¥Õ¬",
-  "status.replyAll": "ÕŠÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¥Õ¬ Õ©Õ¥Õ¬Õ«Õ¶",
+  "status.replyAll": "ÕŠÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¥Õ¬ Õ·Õ²Õ©Õ¡ÕµÕ«Õ¶",
   "status.report": "Ô²Õ¸Õ²Õ¸Ö„Õ¥Õ¬ @{name}ÖŠÕ«Ö",
   "status.sensitive_warning": "Ô¿Õ¡Õ½Õ¯Õ¡Õ®Õ¥Õ¬Õ« Õ¢Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸Ö‚Õ©Õ«Ö‚Õ¶",
-  "status.share": "Ô¿Õ«Õ½Õ¾Õ¥Õ¬",
+  "status.share": "Ô¿Õ«Õ½Õ¸Ö‚Õ¥Õ¬",
   "status.show_less": "ÕŠÕ¡Õ¯Õ¡Õ½",
   "status.show_less_all": "Ô¹Õ¡Ö„ÖÕ¶Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€ Õ¶Õ¡ÕÕ¡Õ¦Õ£Õ¸Ö‚Õ·Õ¡ÖÕ¶Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨",
-  "status.show_more": "Ô±Õ¾Õ¥Õ¬Õ«Õ¶",
+  "status.show_more": "Ô±Ö‚Õ¥Õ¬Õ«Õ¶",
   "status.show_more_all": "Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€ Õ¶Õ¡ÕÕ¡Õ¦Õ£Õ¸Ö‚Õ·Õ¡ÖÕ¶Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨",
   "status.show_thread": "Ô²Õ¡ÖÕ¥Õ¬ Õ·Õ²Õ©Õ¡Õ¶",
   "status.uncached_media_warning": "Ô±Õ¶Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ«",
   "status.unmute_conversation": "Ô±ÕºÕ¡Õ¬Õ¼Õ¥ÖÕ¶Õ¥Õ¬ ÕÖ…Õ½Õ¡Õ¯ÖÕ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨",
   "status.unpin": "Õ€Õ¡Õ¶Õ¥Õ¬ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ§Õ»Õ«Ö",
   "suggestions.dismiss": "Ô±Õ¶Õ¿Õ¥Õ½Õ¥Õ¬ Õ¡Õ¼Õ¡Õ»Õ¡Ö€Õ¯Õ¨",
-  "suggestions.header": "Õ„Õ«Õ£Õ¸Ö‚ÖÕ¥ Ö„Õ¥Õ¦ Õ°Õ¥Õ¿Õ¡Ö„Ö€Ö„Ö€Õ«â€¦",
+  "suggestions.header": "Õ„Õ«Õ£Õ¸Ö‚ÖÕ§ Ö„Õ¥Õ¦ Õ°Õ¥Õ¿Õ¡Ö„Ö€Ö„Ö€Õ«â€¦",
   "tabs_bar.federated_timeline": "Ô´Õ¡Õ·Õ¶Õ¡ÕµÕ«Õ¶",
   "tabs_bar.home": "Õ€Õ«Õ´Õ¶Õ¡Õ¯Õ¡Õ¶",
   "tabs_bar.local_timeline": "ÕÕ¥Õ²Õ¡Õ¯Õ¡Õ¶",
@@ -416,46 +440,47 @@
   "tabs_bar.search": "Õ“Õ¶Õ¿Ö€Õ¥Õ¬",
   "time_remaining.days": "{number, plural, one {Õ´Õ¶Õ¡Ö # Ö…Ö€} other {Õ´Õ¶Õ¡Ö # Ö…Ö€}}",
   "time_remaining.hours": "{number, plural, one {# ÕªÕ¡Õ´} other {# ÕªÕ¡Õ´}} Õ¡Õ¶Ö",
-  "time_remaining.minutes": "{number, plural, one {# Ö€Õ¸ÕºÕ¥} other {# Ö€Õ¸ÕºÕ¥}} Õ¡Õ¶Ö",
+  "time_remaining.minutes": "{number, plural, one {# Ö€Õ¸ÕºÕ§} other {# Ö€Õ¸ÕºÕ§}} Õ¡Õ¶Ö",
   "time_remaining.moments": "Õ„Õ¶Õ¡ÖÕ¥Õ¬ Õ§ Õ´Õ« Ö„Õ¡Õ¶Õ« Õ¾Õ¡Ö€Õ¯Õ¥Õ¡Õ¶",
   "time_remaining.seconds": "{number, plural, one {# Õ¾Õ¡Ö€Õ¯Õ¥Õ¡Õ¶} other {# Õ¾Õ¡Ö€Õ¯Õ¥Õ¡Õ¶}} Õ¡Õ¶Ö",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
+  "timeline_hint.remote_resource_not_displayed": "{resource} Õ¡ÕµÕ¬ Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ«Õ¹Õ¶Õ¥Ö€Õ«Ö Õ¹Õ¥Õ¶ ÖÕ¸Ö‚ÖÕ¡Õ¤Ö€Õ¾Õ¥Õ¬:",
   "timeline_hint.resources.followers": "Õ€Õ¥Õ¿Ö‡Õ¸Ö€Õ¤Õ¶Õ¥Ö€",
-  "timeline_hint.resources.follows": "Õ€Õ¥Õ¿Ö‡Õ¥Õ¬",
+  "timeline_hint.resources.follows": "Õ€Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬",
   "timeline_hint.resources.statuses": "Õ€Õ«Õ¶ Õ©Õ¸Ö‚Õ©Õ¥Ö€",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} Õ´Õ¡Ö€Õ¤} other {{counter} Õ´Õ¡Ö€Õ¤Õ«Õ¯}} ÕÕ¸Õ½Õ¸Ö‚Õ´ Õ¥Õ¶",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} Õ´Õ¡Ö€Õ¤} other {{counter} Õ´Õ¡Ö€Õ¤Õ«Õ¯}} ÕÖ…Õ½Õ¸Ö‚Õ´ Õ¥Õ¶",
   "trends.trending_now": "Ô±ÕµÕªÕ´ Õ¡Ö€Õ¤Õ«Õ¡Õ¯Õ¡Õ¶",
-  "ui.beforeunload": "Õ”Õ¸ Õ½Õ¥Ö‚Õ¡Õ£Õ«Ö€Õ¨ Õ¯Õ¯Õ¸Ö€Õ«, Õ¥Õ©Õ¥ Õ¬Ö„Õ¥Õ½ Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶Õ¨Ö‰",
+  "ui.beforeunload": "Õ”Õ¸ Õ½Õ¥Ö‚Õ¡Õ£Õ«Ö€Õ¨ Õ¯Õ¨ Õ¯Õ¸Ö€Õ«, Õ¥Õ©Õ§ Õ¬Ö„Õ¥Õ½ Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶Õ¨Ö‰",
   "units.short.billion": "{count}Õ´Õ¬Ö€Õ¤",
   "units.short.million": "{count}Õ´Õ¬Õ¶",
   "units.short.thousand": "{count}Õ€Õ¡Õ¦.",
   "upload_area.title": "Õ”Õ¡Õ·Õ«Ö€ Õ¸Ö‚ Õ¶Õ¥Õ¿Õ«Ö€Õ Õ¾Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
-  "upload_button.label": "Ô±Õ¾Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ Õ´Õ¥Õ¤Õ«Õ¡",
-  "upload_error.limit": "Õ–Õ¡ÕµÕ¬Õ« Õ¾Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ´Õ¡Õ¶ Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¡Õ¹Õ¡ÖƒÕ¨ Õ£Õ¥Ö€Õ¡Õ¦Õ¡Õ¶ÖÕ¾Õ¡Õ® Õ§Ö‰",
+  "upload_button.label": "Ô±Ö‚Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ Õ´Õ¥Õ¤Õ«Õ¡",
+  "upload_error.limit": "Õ†Õ«Õ·Ö„Õ« Õ¾Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ´Õ¡Õ¶ Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¡Õ¹Õ¡ÖƒÕ¨ Õ£Õ¥Ö€Õ¡Õ¦Õ¡Õ¶ÖÕ¸Ö‚Õ¡Õ® Õ§Ö‰",
   "upload_error.poll": "Õ€Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ°Õ¥Õ¿ Õ¶Õ«Õ·Ö„ Õ¯ÖÕ¥Õ¬ Õ°Õ¶Õ¡Ö€Õ¡Ö‚Õ¸Ö€ Õ¹Õ§Ö‰",
   "upload_form.audio_description": "Õ†Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ«Ö€ Õ±Õ¡ÕµÕ¶Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¢Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ¬Õ½Õ¸Õ²Õ¡Õ¯Õ¡Õ¶ ÕÕ¶Õ¤Õ«Ö€Õ¶Õ¥Ö€Õ¸Õ¾ Õ¡Õ¶Õ±Õ¡Õ¶Ö Õ°Õ¡Õ´Õ¡Ö€",
   "upload_form.description": "Õ†Õ¯Õ¡Ö€Õ¡Õ£Õ«Ö€Õ Õ¿Õ¥Õ½Õ¸Õ²Õ¡Õ¯Õ¡Õ¶ ÕÕ¶Õ¤Õ«Ö€Õ¶Õ¥Ö€ Õ¸Ö‚Õ¶Õ¥ÖÕ¸Õ²Õ¶Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€",
   "upload_form.edit": "Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬",
-  "upload_form.thumbnail": "Change thumbnail",
-  "upload_form.undo": "Õ€Õ¥Õ¿Õ¡Ö€Õ¯Õ¥Õ¬",
+  "upload_form.thumbnail": "Õ“Õ¸ÕÕ¥Õ¬ ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ¡Õ¯Õ¨",
+  "upload_form.undo": "Õ…Õ¥Õ¿Õ¡Ö€Õ¯Õ¥Õ¬",
   "upload_form.video_description": "Õ†Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ«Ö€ Õ¿Õ¥Õ½Õ¡Õ¶Õ«Ö‚Õ©Õ¨ Õ¬Õ½Õ¸Õ²Õ¡Õ¯Õ¡Õ¶ Õ¯Õ¡Õ´ Õ¿Õ¥Õ½Õ¸Õ²Õ¡Õ¯Õ¡Õ¶ ÕÕ¶Õ¤Õ«Ö€Õ¶Õ¥Ö€Õ¸Õ¾ Õ¡Õ¶Õ±Õ¡Õ¶Ö Õ°Õ¡Õ´Õ¡Ö€",
   "upload_modal.analyzing_picture": "Ô¼Õ¸Ö‚Õ½Õ¡Õ¶Õ¯Õ¡Ö€Õ« Õ¾Õ¥Ö€Õ¬Õ¸Ö‚Õ®Õ¸Ö‚Õ´â€¦",
   "upload_modal.apply": "Ô¿Õ«Ö€Õ¡Õ¼Õ¥Õ¬",
   "upload_modal.choose_image": "Ô¸Õ¶Õ¿Ö€Õ¥Õ¬ Õ¶Õ¯Õ¡Ö€",
-  "upload_modal.description_placeholder": "Ô²Õ¥Õ¬ Õ¤Õ²ÕµÕ¡Õ¯Õ« Õ±Õ¡Õ ÕªÕ¡Õ´Õ¶ Ö…Ö† Õ¡Õ¦Õ£Õ¸Ö‚Õ©ÕµÕ¡Õ¶Õ¨ ÖÕºÕ¡Õ°Õ¡Õ¶Õ» Õ¹Õ³Õ·Õ¿Õ¡Õ® Õ¾Õ¶Õ¡Õ½ Õ§Ö€ Õ¥Ö‚ ÖƒÕ¡Õ¼Ö„Ö‰",
-  "upload_modal.detect_text": "Õ€Õ¡ÕµÕ¿Õ¶Õ¢Õ¥Ö€Õ¥Õ¬ Õ¿Õ¥Ö„Õ½Õ¿Õ¨ Õ¶Õ¯Õ¡Ö€Õ«Ö",
+  "upload_modal.description_placeholder": "Ô²Õ¥Õ¬ Õ¤Õ²Õ¥Õ¡Õ¯Õ« Õ±Õ¡Õ ÕªÕ¡Õ´Õ¶ Ö…Ö† Õ¡Õ¦Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶Õ¨ ÖÕºÕ¡Õ°Õ¡Õ¶Õ» Õ¹Õ³Õ·Õ¿Õ¡Õ® Õ¾Õ¶Õ¡Õ½ Õ§Ö€ Õ¥Ö‚ ÖƒÕ¡Õ¼Ö„Ö‰",
+  "upload_modal.detect_text": "Õ…Õ¡ÕµÕ¿Õ¶Õ¡Õ¢Õ¥Ö€Õ¥Õ¬ Õ¿Õ¥Ö„Õ½Õ¿Õ¨ Õ¶Õ¯Õ¡Ö€Õ«Ö",
   "upload_modal.edit_media": "Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬ Õ´Õ¥Õ¤Õ«Õ¡Õ¶",
   "upload_modal.hint": "ÕÕ¥Õ²Õ´Õ§Ö„ Õ¥Ö‚ Õ¿Õ¥Õ²Õ¡Õ·Õ¡Ö€ÕªÕ§Ö„ Õ¶Õ¡ÕÕ¡Õ¤Õ«Õ¿Õ´Õ¡Õ¶ Õ·Ö€Õ»Õ¡Õ¶Õ¡Õ¯Õ¨Õ Õ¸Ö€ Õ¨Õ¶Õ¿Ö€Õ§Ö„ Õ´Õ¡Õ¶Ö€Õ¡ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ¸Ö‚Õ´ Õ´Õ«Õ·Õ¿ Õ¿Õ¥Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ¯Õ§Õ¿Õ¨Ö‰",
+  "upload_modal.preparing_ocr": "Ô³Ö€Õ¡Õ³Õ¡Õ¶Õ¡Õ¹Õ´Õ¡Õ¶ Õ¶Õ¡ÕÕ¡ÕºÕ¡Õ¿Ö€Õ¡Õ½Õ¿Õ¸Ö‚Õ´â€¦",
   "upload_modal.preview_label": "Õ†Õ¡ÕÕ¡Õ¤Õ«Õ¿Õ¸Ö‚Õ´ ({ratio})",
   "upload_progress.label": "ÕŽÕ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¾Õ¸Ö‚Õ´ Õ§â€¦",
   "video.close": "Õ“Õ¡Õ¯Õ¥Õ¬  Õ¿Õ¥Õ½Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨",
-  "video.download": "Õ†Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ Ö†Õ¡ÕµÕ¬Õ¨",
+  "video.download": "Õ†Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ Õ¶Õ«Õ·Ö„Õ¨",
   "video.exit_fullscreen": "Ô±Õ¶Õ»Õ¡Õ¿Õ¥Õ¬ Õ¬Õ«Õ¡Õ§Õ¯Ö€Õ¡Õ¶ Õ¤Õ«Õ¿Õ¸Ö‚Õ´Õ¨",
   "video.expand": "Ô¸Õ¶Õ¤Õ¡Ö€Õ±Õ¡Õ¯Õ¥Õ¬ Õ¿Õ¥Õ½Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨",
   "video.fullscreen": "Ô¼Õ«Õ¡Õ§Õ¯Ö€Õ¡Õ¶",
   "video.hide": "Ô¹Õ¡Ö„ÖÕ¶Õ¥Õ¬ Õ¿Õ¥Õ½Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨",
   "video.mute": "Ô¼Õ¼Õ¥ÖÕ¶Õ¥Õ¬ Õ±Õ¡ÕµÕ¶Õ¨",
   "video.pause": "Ô´Õ¡Õ¤Õ¡Ö€ Õ¿Õ¡Õ¬",
-  "video.play": "Õ†Õ¾Õ¡Õ£Õ¥Õ¬",
+  "video.play": "Õ†Õ¸Ö‚Õ¡Õ£Õ¥Õ¬",
   "video.unmute": "Õ„Õ«Õ¡ÖÕ¶Õ¥Õ¬ Õ±Õ¡ÕµÕ¶Õ¨"
 }
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 91ad76e0394761571bbfebb6775512f40ea2d8d3..24f100b6ab21b30fb91f36a7e32cae480a824480 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -1,22 +1,24 @@
 {
-  "account.account_note_header": "Note",
+  "account.account_note_header": "Catatan",
   "account.add_or_remove_from_list": "Tambah atau Hapus dari daftar",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grup",
   "account.block": "Blokir @{name}",
   "account.block_domain": "Sembunyikan segalanya dari {domain}",
   "account.blocked": "Terblokir",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Lihat lebih lanjut diprofil asli",
   "account.cancel_follow_request": "Batalkan permintaan ikuti",
   "account.direct": "Direct Message @{name}",
+  "account.disable_notifications": "Berhenti memberitahu saya ketika @{name} memposting",
   "account.domain_blocked": "Domain disembunyikan",
   "account.edit_profile": "Ubah profil",
+  "account.enable_notifications": "Beritahu saya saat @{name} memposting",
   "account.endorse": "Tampilkan di profil",
   "account.follow": "Ikuti",
   "account.followers": "Pengikut",
   "account.followers.empty": "Tidak ada satupun yang mengkuti pengguna ini saat ini.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers_counter": "{count, plural, other {{counter} Pengikut}}",
+  "account.following_counter": "{count, plural, other {{counter} Mengikuti}}",
   "account.follows.empty": "Pengguna ini belum mengikuti siapapun.",
   "account.follows_you": "Mengikuti anda",
   "account.hide_reblogs": "Sembunyikan boosts dari @{name}",
@@ -36,14 +38,14 @@
   "account.requested": "Menunggu persetujuan. Klik untuk membatalkan permintaan",
   "account.share": "Bagikan profil @{name}",
   "account.show_reblogs": "Tampilkan boost dari @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, other {{counter} Toot}}",
   "account.unblock": "Hapus blokir @{name}",
-  "account.unblock_domain": "Tampilkan {domain}",
+  "account.unblock_domain": "Buka blokir domain {domain}",
   "account.unendorse": "Jangan tampilkan di profil",
   "account.unfollow": "Berhenti mengikuti",
   "account.unmute": "Berhenti membisukan @{name}",
   "account.unmute_notifications": "Munculkan notifikasi dari @{name}",
-  "account_note.placeholder": "Click to add a note",
+  "account_note.placeholder": "Klik untuk menambah catatan",
   "alert.rate_limited.message": "Tolong ulangi setelah {retry_time, time, medium}.",
   "alert.rate_limited.title": "Batasan tingkat",
   "alert.unexpected.message": "Terjadi kesalahan yang tidak terduga.",
@@ -79,9 +81,9 @@
   "column_header.show_settings": "Tampilkan pengaturan",
   "column_header.unpin": "Lepaskan",
   "column_subheading.settings": "Pengaturan",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Hanya lokal",
   "community.column_settings.media_only": "Hanya media",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Hanya jarak jauh",
   "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "Pelajari selengkapnya",
   "compose_form.hashtag_warning": "Toot ini tidak akan ada dalam daftar tagar manapun karena telah di set sebagai tidak terdaftar. Hanya postingan publik yang bisa dicari dengan tagar.",
@@ -96,9 +98,9 @@
   "compose_form.poll.switch_to_single": "Ubah japat menjadi pilihan tunggal",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Tandai sebagai media sensitif",
-  "compose_form.sensitive.marked": "Sumber ini telah ditandai sebagai sumber sensitif.",
-  "compose_form.sensitive.unmarked": "Sumber ini tidak ditandai sebagai sumber sensitif",
+  "compose_form.sensitive.hide": "{count, plural, other {Tandai media sebagai sensitif}}",
+  "compose_form.sensitive.marked": "{count, plural, other {Media ini ditandai sebagai sensitif}}",
+  "compose_form.sensitive.unmarked": "{count, plural, other {Media ini tidak ditandai sebagai sensitif}}",
   "compose_form.spoiler.marked": "Teks disembunyikan dibalik peringatan",
   "compose_form.spoiler.unmarked": "Teks tidak tersembunyi",
   "compose_form.spoiler_placeholder": "Peringatan konten",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Hasil pencarian",
   "emoji_button.symbols": "Simbol",
   "emoji_button.travel": "Tempat Wisata",
+  "empty_column.account_suspended": "Akun ditangguhkan",
   "empty_column.account_timeline": "Tidak ada toot di sini!",
   "empty_column.account_unavailable": "Profil tidak tersedia",
   "empty_column.blocks": "Anda belum memblokir siapapun.",
@@ -166,13 +169,15 @@
   "empty_column.notifications": "Anda tidak memiliki notifikasi apapun. Berinteraksi dengan orang lain untuk memulai percakapan.",
   "empty_column.public": "Tidak ada apapun disini! Tulis sesuatu, atau ikuti pengguna lain dari server lain untuk mengisi ini",
   "error.unexpected_crash.explanation": "Karena kutu pada kode kami atau isu kompatibilitas peramban, halaman tak dapat ditampilkan dengan benar.",
+  "error.unexpected_crash.explanation_addons": "Halaman ini tidak dapat ditampilkan dengan benar. Kesalahan ini mungkin disebabkan pengaya peramban atau alat terjemahan otomatis.",
   "error.unexpected_crash.next_steps": "Coba segarkan halaman. Jika tak membantu, Anda masih bisa memakai Mastodon dengan peramban berbeda atau aplikasi native.",
+  "error.unexpected_crash.next_steps_addons": "Coba nonaktifkan mereka lalu segarkan halaman. Jika tak membantu, Anda masih bisa memakai Mastodon dengan peramban berbeda atau aplikasi murni.",
   "errors.unexpected_crash.copy_stacktrace": "Salin stacktrace ke papan klip",
   "errors.unexpected_crash.report_issue": "Laporkan masalah",
   "follow_request.authorize": "Izinkan",
   "follow_request.reject": "Tolak",
   "follow_requests.unlocked_explanation": "Meskipun akun Anda tidak dikunci, staf {domain} menyarankan Anda untuk meninjau permintaan mengikuti dari akun-akun ini secara manual.",
-  "generic.saved": "Saved",
+  "generic.saved": "Disimpan",
   "getting_started.developers": "Pengembang",
   "getting_started.directory": "Direktori profil",
   "getting_started.documentation": "Dokumentasi",
@@ -242,7 +247,7 @@
   "keyboard_shortcuts.reply": "balas",
   "keyboard_shortcuts.requests": "buka daftar permintaan ikuti",
   "keyboard_shortcuts.search": "untuk fokus mencari",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "untuk menampilkan/menyembunyikan bidang CW",
   "keyboard_shortcuts.start": "buka kolom \"memulai\"",
   "keyboard_shortcuts.toggle_hidden": "tampilkan/sembunyikan teks di belakang CW",
   "keyboard_shortcuts.toggle_sensitivity": "tampilkan/sembunyikan media",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "untuk tidak fokus pada area teks/pencarian",
   "keyboard_shortcuts.up": "untuk memindah ke atas pada daftar",
   "lightbox.close": "Tutup",
+  "lightbox.compress": "Kompres kotak tampilan gambar",
+  "lightbox.expand": "Besarkan kotak tampilan gambar",
   "lightbox.next": "Selanjutnya",
   "lightbox.previous": "Sebelumnya",
-  "lightbox.view_context": "Lihat konteks",
   "lists.account.add": "Tambah ke daftar",
   "lists.account.remove": "Hapus dari daftar",
   "lists.delete": "Hapus daftar",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Ubah judul",
   "lists.new.create": "Tambah daftar",
   "lists.new.title_placeholder": "Judul daftar baru",
+  "lists.replies_policy.followed": "Siapapun pengguna yang diikuti",
+  "lists.replies_policy.list": "Anggota di daftar tersebut",
+  "lists.replies_policy.none": "Tidak ada satu pun",
+  "lists.replies_policy.title": "Tampilkan balasan ke:",
   "lists.search": "Cari di antara orang yang Anda ikuti",
   "lists.subheading": "Daftar Anda",
   "load_pending": "{count, plural, other {# item baru}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Tampil/Sembunyikan",
   "missing_indicator.label": "Tidak ditemukan",
   "missing_indicator.sublabel": "Sumber daya tak bisa ditemukan",
+  "mute_modal.duration": "Durasi",
   "mute_modal.hide_notifications": "Sembunyikan notifikasi dari pengguna ini?",
+  "mute_modal.indefinite": "Tak terbatas",
   "navigation_bar.apps": "Aplikasi mobile",
   "navigation_bar.blocks": "Pengguna diblokir",
   "navigation_bar.bookmarks": "Markah",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Japat Anda telah berakhir",
   "notification.poll": "Japat yang Anda ikuti telah berakhir",
   "notification.reblog": "{name} mem-boost status anda",
+  "notification.status": "{name} baru saja memposting",
   "notifications.clear": "Hapus notifikasi",
   "notifications.clear_confirmation": "Apa anda yakin hendak menghapus semua notifikasi anda?",
   "notifications.column_settings.alert": "Notifikasi desktop",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Boost:",
   "notifications.column_settings.show": "Tampilkan dalam kolom",
   "notifications.column_settings.sound": "Mainkan suara",
+  "notifications.column_settings.status": "Toot baru:",
   "notifications.filter.all": "Semua",
   "notifications.filter.boosts": "Boost",
   "notifications.filter.favourites": "Favorit",
   "notifications.filter.follows": "Diikuti",
   "notifications.filter.mentions": "Sebutan",
   "notifications.filter.polls": "Hasil japat",
+  "notifications.filter.statuses": "Pembaruan dari orang yang Anda ikuti",
+  "notifications.grant_permission": "Setujui izin.",
   "notifications.group": "{count} notifikasi",
+  "notifications.mark_as_read": "Tandai setiap notifikasi sebagai sudah dibaca",
+  "notifications.permission_denied": "Tidak dapat mengaktifkan notifikasi desktop karena izin ditolak.",
+  "notifications.permission_denied_alert": "Notifikasi desktop tidak dapat diaktifkan karena izin peramban telah ditolak sebelumnya",
+  "notifications.permission_required": "Notifikasi desktop tidak tersedia karena izin yang dibutuhkan belum disetujui.",
+  "notifications_permission_banner.enable": "Aktifkan notifikasi desktop",
+  "notifications_permission_banner.how_to_control": "Untuk menerima notifikasi saat Mastodon terbuka, aktifkan notifikasi desktop. Anda dapat mengendalikan tipe interaksi mana yang ditampilkan notifikasi desktop melalui tombol {icon} di atas saat sudah aktif.",
+  "notifications_permission_banner.title": "Jangan lewatkan apapun",
+  "picture_in_picture.restore": "Taruh kembali",
   "poll.closed": "Ditutup",
   "poll.refresh": "Segarkan",
   "poll.total_people": "{count, plural, other {# orang}}",
@@ -343,7 +367,7 @@
   "relative_time.days": "{number}h",
   "relative_time.hours": "{number}j",
   "relative_time.just_now": "sekarang",
-  "relative_time.minutes": "{number}b",
+  "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}d",
   "relative_time.today": "hari ini",
   "reply_indicator.cancel": "Batal",
@@ -419,16 +443,16 @@
   "time_remaining.minutes": "{number, plural, other {# menit}} tersisa",
   "time_remaining.moments": "Momen tersisa",
   "time_remaining.seconds": "{number, plural, other {# detik}} tersisa",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "timeline_hint.remote_resource_not_displayed": "{resource} dari server lain tidak ditampilkan.",
+  "timeline_hint.resources.followers": "Pengikut",
+  "timeline_hint.resources.follows": "Ikuti",
+  "timeline_hint.resources.statuses": "Toot lama",
+  "trends.counter_by_accounts": "{count, plural, other {{counter} orang}} berbicara",
   "trends.trending_now": "Sedang tren sekarang",
   "ui.beforeunload": "Naskah anda akan hilang jika anda keluar dari Mastodon.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
+  "units.short.billion": "{count}M",
+  "units.short.million": "{count}Jt",
+  "units.short.thousand": "{count}Rb",
   "upload_area.title": "Seret & lepaskan untuk mengunggah",
   "upload_button.label": "Tambahkan media",
   "upload_error.limit": "Batas unggah berkas terlampaui.",
@@ -436,16 +460,17 @@
   "upload_form.audio_description": "Penjelasan untuk orang dengan gangguan pendengaran",
   "upload_form.description": "Deskripsikan untuk mereka yang tidak bisa melihat dengan jelas",
   "upload_form.edit": "Sunting",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "Ubah gambar kecil",
   "upload_form.undo": "Undo",
   "upload_form.video_description": "Penjelasan untuk orang dengan gangguan pendengaran atau penglihatan",
   "upload_modal.analyzing_picture": "Analisis gambarâ€¦",
   "upload_modal.apply": "Terapkan",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "Pilih gambar",
   "upload_modal.description_placeholder": "Muharjo seorang xenofobia universal yang takut pada warga jazirah, contohnya Qatar",
   "upload_modal.detect_text": "Deteksi teks pada gambar",
   "upload_modal.edit_media": "Sunting media",
   "upload_modal.hint": "Klik atau seret lingkaran pada pratinjau untuk memilih titik fokus yang akan ditampilkan pada semua gambar kecil.",
+  "upload_modal.preparing_ocr": "Menyiapkan OCRâ€¦",
   "upload_modal.preview_label": "Pratinjau ({ratio})",
   "upload_progress.label": "Mengunggah...",
   "video.close": "Tutup video",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index e79bee21da7e5d50e4281b7f54621f9f0976131c..998799b9faa1fb8a91e39143f063cccf7c1d9472 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Cancel follow request",
   "account.direct": "Direct Message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Modifikar profilo",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
   "account.follow": "Sequar",
   "account.followers": "Sequanti",
@@ -96,9 +98,9 @@
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
   "compose_form.publish": "Siflar",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "Averto di kontenajo",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No toots here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Tu havas ankore nula savigo. Komunikez kun altri por debutar la konverso.",
   "empty_column.public": "Esas nulo hike! Skribez ulo publike, o manuale sequez uzeri de altra instaluri por plenigar ol.",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "Yurizar",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Klozar",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
-  "lightbox.view_context": "View context",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Change title",
   "lists.new.create": "Add list",
   "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Search among people you follow",
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Chanjar videbleso",
   "missing_indicator.label": "Ne trovita",
   "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blokusita uzeri",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} repetis tua mesajo",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Efacar savigi",
   "notifications.clear_confirmation": "Ka tu esas certa, ke tu volas efacar omna tua savigi?",
   "notifications.column_settings.alert": "Surtabla savigi",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Repeti:",
   "notifications.column_settings.show": "Montrar en kolumno",
   "notifications.column_settings.sound": "Plear sono",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Closed",
   "poll.refresh": "Refresh",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -389,7 +413,7 @@
   "status.pinned": "Pinned toot",
   "status.read_more": "Read more",
   "status.reblog": "Repetar",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} repetita",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Kargante...",
   "video.close": "Close video",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 72d8fefaf611980101691b057a1edf2c27b45747..d90156835f9683eb7045076cddb88945b9dc68ba 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -9,14 +9,16 @@
   "account.browse_more_on_origin_server": "SkoÃ°a nÃ¡nari upplÃ½singar Ã¡ notandasniÃ°inu",
   "account.cancel_follow_request": "HÃ¦tta viÃ° beiÃ°ni um aÃ° fylgjast meÃ°",
   "account.direct": "Bein skilaboÃ° til @{name}",
+  "account.disable_notifications": "HÃ¦tta aÃ° lÃ¡ta mig vita Ã¾egar @{name} sendir inn",
   "account.domain_blocked": "LÃ©n faliÃ°",
   "account.edit_profile": "Breyta notandasniÃ°i",
+  "account.enable_notifications": "LÃ¡ta mig vita Ã¾egar @{name} sendir inn",
   "account.endorse": "Birta Ã¡ notandasniÃ°i",
   "account.follow": "Fylgjast meÃ°",
   "account.followers": "Fylgjendur",
   "account.followers.empty": "EnnÃ¾Ã¡ fylgist enginn meÃ° Ã¾essum notanda.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers_counter": "{count, plural, one {{counter} fylgjandi} other {{counter} fylgjendur}}",
+  "account.following_counter": "{count, plural, one {{counter} fylgist meÃ°} other {{counter} fylgjast meÃ°}}",
   "account.follows.empty": "Ãžessi notandi fylgist ennÃ¾Ã¡ ekki meÃ° neinum.",
   "account.follows_you": "Fylgir Ã¾Ã©r",
   "account.hide_reblogs": "Fela endurbirtingar fyrir @{name}",
@@ -36,7 +38,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} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, one {{counter} tÃst} other {{counter} tÃst}}",
   "account.unblock": "AflÃ©tta Ãºtilokun af @{name}",
   "account.unblock_domain": "HÃ¦tta aÃ° fela {domain}",
   "account.unendorse": "Ekki birta Ã¡ notandasniÃ°i",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "LeitarniÃ°urstÃ¶Ã°ur",
   "emoji_button.symbols": "TÃ¡kn",
   "emoji_button.travel": "FerÃ°alÃ¶g og staÃ°ir",
+  "empty_column.account_suspended": "NotandaaÃ°gangur Ã biÃ°",
   "empty_column.account_timeline": "Engin tÃst hÃ©r!",
   "empty_column.account_unavailable": "NotandasniÃ° ekki tiltÃ¦kt",
   "empty_column.blocks": "ÃžÃº hefur ekki ennÃ¾Ã¡ ÃºtilokaÃ° neina notendur.",
@@ -166,13 +169,15 @@
   "empty_column.notifications": "ÃžÃº ert ekki ennÃ¾Ã¡ meÃ° neinar tilkynningar. Vertu Ã samskiptum viÃ° aÃ°ra til aÃ° umrÃ¦Ã°ur fari af staÃ°.",
   "empty_column.public": "ÃžaÃ° er ekkert hÃ©r! SkrifaÃ°u eitthvaÃ° opinberlega, eÃ°a fylgstu meÃ° notendum Ã¡ Ã¶Ã°rum netÃ¾jÃ³num til aÃ° fylla upp Ã Ã¾etta",
   "error.unexpected_crash.explanation": "Vegna villu Ã kÃ³Ã°anum okkar eÃ°a samhÃ¦fnivandamÃ¡la Ã vafra er ekki hÃ¦gt aÃ° birta Ã¾essa sÃÃ°u svo vel sÃ©.",
+  "error.unexpected_crash.explanation_addons": "Ekki er hÃ¦gt aÃ° birta Ã¾essa sÃÃ°u rÃ©tt. Ãžetta er lÃklega af vÃ¶ldum forritsviÃ°bÃ³tar Ã vafranum eÃ°a sjÃ¡lfvirkra Ã¾Ã½Ã°ainaverkfÃ¦ra.",
   "error.unexpected_crash.next_steps": "PrÃ³faÃ°u aÃ° endurlesa sÃÃ°una. Ef Ã¾aÃ° hjÃ¡lpar ekki til, mÃ¡ samt vera aÃ° Ã¾Ãº getir notaÃ° Mastodon Ã gegnum annan vafra eÃ°a forrit.",
+  "error.unexpected_crash.next_steps_addons": "PrÃ³faÃ°u aÃ° gera Ã¾au Ã³virk og svo endurlesa sÃÃ°una. Ef Ã¾aÃ° hjÃ¡lpar ekki til, mÃ¡ samt vera aÃ° Ã¾Ãº getir notaÃ° Mastodon Ã gegnum annan vafra eÃ°a forrit.",
   "errors.unexpected_crash.copy_stacktrace": "Afrita rakningarupplÃ½singar (stacktrace) Ã¡ klippispjald",
   "errors.unexpected_crash.report_issue": "Tilkynna vandamÃ¡l",
   "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.",
-  "generic.saved": "Saved",
+  "generic.saved": "VistaÃ°",
   "getting_started.developers": "Forritarar",
   "getting_started.directory": "NotandasniÃ°amappa",
   "getting_started.documentation": "HjÃ¡lparskjÃ¶l",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "aÃ° taka virkni Ãºr textainnsetningarreit eÃ°a leit",
   "keyboard_shortcuts.up": "aÃ° fara ofar Ã listanum",
   "lightbox.close": "Loka",
+  "lightbox.compress": "Ãžjappa myndskoÃ°unarreit",
+  "lightbox.expand": "Fletta Ãºt myndskoÃ°unarreit",
   "lightbox.next": "NÃ¦sta",
   "lightbox.previous": "Fyrra",
-  "lightbox.view_context": "SkoÃ°a samhengi",
   "lists.account.add": "BÃ¦ta Ã¡ lista",
   "lists.account.remove": "FjarlÃ¦gja af lista",
   "lists.delete": "EyÃ°a lista",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Breyta titli",
   "lists.new.create": "BÃ¦ta viÃ° lista",
   "lists.new.title_placeholder": "Titill Ã¡ nÃ½jum lista",
+  "lists.replies_policy.followed": "Allra notenda sem fylgst er meÃ°",
+  "lists.replies_policy.list": "MeÃ°lima listans",
+  "lists.replies_policy.none": "Engra",
+  "lists.replies_policy.title": "SÃ½na svÃ¶r til:",
   "lists.search": "Leita meÃ°al Ã¾eirra sem Ã¾Ãº fylgist meÃ°",
   "lists.subheading": "Listarnir Ã¾Ãnir",
   "load_pending": "{count, plural, one {# nÃ½tt atriÃ°i} other {# nÃ½ atriÃ°i}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "VÃxla sÃ½nileika",
   "missing_indicator.label": "Fannst ekki",
   "missing_indicator.sublabel": "TilfangiÃ° fannst ekki",
+  "mute_modal.duration": "Lengd",
   "mute_modal.hide_notifications": "Fela tilkynningar frÃ¡ Ã¾essum notanda?",
+  "mute_modal.indefinite": "Ã“endanlegt",
   "navigation_bar.apps": "FarsÃmaforrit",
   "navigation_bar.blocks": "ÃštilokaÃ°ir notendur",
   "navigation_bar.bookmarks": "BÃ³kamerki",
@@ -298,6 +310,7 @@
   "notification.own_poll": "KÃ¶nnuninni Ã¾inni er lokiÃ°",
   "notification.poll": "KÃ¶nnun sem Ã¾Ãº tÃ³kst Ã¾Ã¡tt Ã er lokiÃ°",
   "notification.reblog": "{name} endurbirti stÃ¶Ã°ufÃ¦rsluna Ã¾Ãna",
+  "notification.status": "{name} sendi inn rÃ©tt Ã Ã¾essu",
   "notifications.clear": "Hreinsa tilkynningar",
   "notifications.clear_confirmation": "Ertu viss um aÃ° Ã¾Ãº viljir endanlega eyÃ°a Ã¶llum tilkynningunum Ã¾Ãnum?",
   "notifications.column_settings.alert": "Tilkynningar Ã¡ skjÃ¡borÃ°i",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Endurbirtingar:",
   "notifications.column_settings.show": "SÃ½na Ã dÃ¡lki",
   "notifications.column_settings.sound": "Spila hljÃ³Ã°",
+  "notifications.column_settings.status": "NÃ½ tÃst:",
   "notifications.filter.all": "Allt",
   "notifications.filter.boosts": "Endurbirtingar",
   "notifications.filter.favourites": "EftirlÃ¦ti",
   "notifications.filter.follows": "Fylgist meÃ°",
   "notifications.filter.mentions": "TilvÃsanir",
   "notifications.filter.polls": "NiÃ°urstÃ¶Ã°ur kÃ¶nnunar",
+  "notifications.filter.statuses": "UppfÃ¦rslur frÃ¡ fÃ³lki sem Ã¾Ãº fylgist meÃ°",
+  "notifications.grant_permission": "Veita heimild.",
   "notifications.group": "{count} tilkynningar",
+  "notifications.mark_as_read": "Merkja allar tilkynningar sem lesnar",
+  "notifications.permission_denied": "Tilkynningar Ã¡ skjÃ¡borÃ°i eru ekki aÃ°gengilegar megna Ã¡Ã°ur hafnaÃ°ra beiÃ°na fyrir vafra",
+  "notifications.permission_denied_alert": "Ekki var hÃ¦gt aÃ° virkja tilkynningar Ã¡ skjÃ¡borÃ°i, Ã¾ar sem heimildum fyrir vafra var Ã¡Ã°ur hafnaÃ°",
+  "notifications.permission_required": "Tilkynningar Ã¡ skjÃ¡borÃ°i eru ekki aÃ°gengilegar Ã¾ar sem nauÃ°synlegar heimildir hafa ekki veriÃ° veittar.",
+  "notifications_permission_banner.enable": "Virkja tilkynningar Ã¡ skjÃ¡borÃ°i",
+  "notifications_permission_banner.how_to_control": "Til aÃ° taka Ã¡ mÃ³ti tilkynningum Ã¾egar Mastodon er ekki opiÃ°, skaltu virkja tilkynningar Ã¡ skjÃ¡borÃ°i. Ãžegar Ã¾Ã¦r eru orÃ°nar virkar geturÃ°u stÃ½rt nÃ¡kvÃ¦mlega hverskonar atvik framleiÃ°a tilkynningar meÃ° Ã¾vÃ aÃ° nota {icon}-hnappinn hÃ©r fyrir ofan.",
+  "notifications_permission_banner.title": "Aldrei missa af neinu",
+  "picture_in_picture.restore": "Setja til baka",
   "poll.closed": "LokaÃ°",
   "poll.refresh": "Endurlesa",
   "poll.total_people": "{count, plural, one {# aÃ°ili} other {# aÃ°ilar}}",
@@ -423,29 +447,30 @@
   "timeline_hint.resources.followers": "Fylgjendur",
   "timeline_hint.resources.follows": "Fylgist meÃ°",
   "timeline_hint.resources.statuses": "Eldri tÃst",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} aÃ°ili} other {{counter} aÃ°ilar}} tala",
   "trends.trending_now": "Ã umrÃ¦Ã°unni nÃºna",
   "ui.beforeunload": "DrÃ¶gin tapast ef Ã¾Ãº ferÃ° Ãºt Ãºr Mastodon.",
   "units.short.billion": "{count}B",
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "DragÃ°u-og-slepptu hÃ©r til aÃ° senda inn",
-  "upload_button.label": "BÃ¦ta viÃ° ({formats}) myndskrÃ¡",
+  "upload_button.label": "BÃ¦ta viÃ° myndum, myndskeiÃ°i eÃ°a hljÃ³Ã°skrÃ¡",
   "upload_error.limit": "FÃ³r yfir takmÃ¶rk Ã¡ innsendingum skrÃ¡a.",
   "upload_error.poll": "Innsending skrÃ¡a er ekki leyfÃ° Ã kÃ¶nnunum.",
   "upload_form.audio_description": "LÃ½stu Ã¾essu fyrir heyrnarskerta",
   "upload_form.description": "LÃ½stu Ã¾essu fyrir sjÃ³nskerta",
   "upload_form.edit": "Breyta",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "Skipta um smÃ¡mynd",
   "upload_form.undo": "EyÃ°a",
   "upload_form.video_description": "LÃ½stu Ã¾essu fyrir fÃ³lk sem heyrir illa eÃ°a er meÃ° skerta sjÃ³n",
   "upload_modal.analyzing_picture": "Greini myndâ€¦",
   "upload_modal.apply": "Virkja",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "Veldu mynd",
   "upload_modal.description_placeholder": "Ã–llum dÃ½runum Ã skÃ³ginum Ã¾Ã¦tti bezt aÃ° vera vinir",
   "upload_modal.detect_text": "Skynja texta Ãºr mynd",
   "upload_modal.edit_media": "Breyta myndskrÃ¡",
   "upload_modal.hint": "Smelltu eÃ°a dragÃ°u til hringinn Ã¡ forskoÃ°uninni til aÃ° velja miÃ°punktinn sem verÃ°ur alltaf sÃ½nilegastur Ã¡ Ã¶llum smÃ¡myndum.",
+  "upload_modal.preparing_ocr": "UndirbÃ½ OCR-ljÃ³slesturâ€¦",
   "upload_modal.preview_label": "ForskoÃ°un ({ratio})",
   "upload_progress.label": "Er aÃ° senda inn...",
   "video.close": "Loka myndskeiÃ°i",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 077f61e4802f862ec8c9a6b55c214fc59ce97894..b63b231aeac842ac49b79ab48d0e10db4c5ce9e8 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -1,16 +1,18 @@
 {
-  "account.account_note_header": "La tua nota per @{name}",
-  "account.add_or_remove_from_list": "Aggiungi o Rimuovi dagli elenchi",
+  "account.account_note_header": "Le tue note sull'utente",
+  "account.add_or_remove_from_list": "Aggiungi o togli dalle liste",
   "account.badges.bot": "Bot",
   "account.badges.group": "Gruppo",
   "account.block": "Blocca @{name}",
   "account.block_domain": "Blocca dominio {domain}",
-  "account.blocked": "Bloccato",
-  "account.browse_more_on_origin_server": "Naviga di piÃ¹ sul profilo originale",
+  "account.blocked": "Bloccat*",
+  "account.browse_more_on_origin_server": "Sfoglia ulteriormente sul profilo originale",
   "account.cancel_follow_request": "Annulla richiesta di seguirti",
   "account.direct": "Messaggio diretto a @{name}",
+  "account.disable_notifications": "Smetti di avvisarmi quando @{name} pubblica un post",
   "account.domain_blocked": "Dominio bloccato",
   "account.edit_profile": "Modifica profilo",
+  "account.enable_notifications": "Avvisami quando @{name} pubblica un post",
   "account.endorse": "Mostra sul profilo",
   "account.follow": "Segui",
   "account.followers": "Seguaci",
@@ -19,7 +21,7 @@
   "account.following_counter": "{count, plural, other {{counter} Seguiti}}",
   "account.follows.empty": "Questo utente non segue ancora nessuno.",
   "account.follows_you": "Ti segue",
-  "account.hide_reblogs": "Nascondi incrementi da @{name}",
+  "account.hide_reblogs": "Nascondi condivisioni da @{name}",
   "account.last_status": "Ultima attivitÃ ",
   "account.link_verified_on": "La proprietÃ  di questo link Ã¨ stata controllata il {date}",
   "account.locked_info": "Lo stato di privacy del profilo Ã¨ impostato a bloccato. Il proprietario revisiona manualmente chi lo puÃ² seguire.",
@@ -28,14 +30,14 @@
   "account.moved_to": "{name} si Ã¨ trasferito su:",
   "account.mute": "Silenzia @{name}",
   "account.mute_notifications": "Silenzia notifiche da @{name}",
-  "account.muted": "Silenziato",
+  "account.muted": "Silenziat*",
   "account.never_active": "Mai",
   "account.posts": "Toot",
   "account.posts_with_replies": "Toot e risposte",
   "account.report": "Segnala @{name}",
   "account.requested": "In attesa di approvazione. Clicca per annullare la richiesta di seguire",
   "account.share": "Condividi il profilo di @{name}",
-  "account.show_reblogs": "Mostra incrementi da @{name}",
+  "account.show_reblogs": "Mostra condivisioni da @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toot}}",
   "account.unblock": "Sblocca @{name}",
   "account.unblock_domain": "Sblocca il dominio {domain}",
@@ -43,9 +45,9 @@
   "account.unfollow": "Smetti di seguire",
   "account.unmute": "Non silenziare @{name}",
   "account.unmute_notifications": "Non silenziare le notifiche da @{name}",
-  "account_note.placeholder": "Nessun commento fornito",
+  "account_note.placeholder": "Clicca per aggiungere una nota",
   "alert.rate_limited.message": "Sei pregato di riprovare tra {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Intervallo limitato",
+  "alert.rate_limited.title": "Limitazione per eccesso di richieste",
   "alert.unexpected.message": "Si Ã¨ verificato un errore inatteso.",
   "alert.unexpected.title": "Oops!",
   "announcement.announcement": "Annuncio",
@@ -59,9 +61,9 @@
   "bundle_modal_error.retry": "Riprova",
   "column.blocks": "Utenti bloccati",
   "column.bookmarks": "Segnalibri",
-  "column.community": "Fuso orario locale",
+  "column.community": "Timeline locale",
   "column.direct": "Messaggi diretti",
-  "column.directory": "Naviga profili",
+  "column.directory": "Sfoglia profili",
   "column.domain_blocks": "Domini bloccati",
   "column.favourites": "Preferiti",
   "column.follow_requests": "Richieste di seguirti",
@@ -70,7 +72,7 @@
   "column.mutes": "Utenti silenziati",
   "column.notifications": "Notifiche",
   "column.pins": "Toot in evidenza",
-  "column.public": "Fuso orario federato",
+  "column.public": "Timeline federata",
   "column_back_button.label": "Indietro",
   "column_header.hide_settings": "Nascondi impostazioni",
   "column_header.moveLeft_settings": "Sposta colonna a sinistra",
@@ -111,13 +113,13 @@
   "confirmations.delete_list.confirm": "Cancella",
   "confirmations.delete_list.message": "Sei sicuro di voler cancellare definitivamente questa lista?",
   "confirmations.domain_block.confirm": "Blocca l'intero dominio",
-  "confirmations.domain_block.message": "Sei davvero, davvero sicuro di voler bloccare l'intero {domain}? In molti casi pochi blocchi di destinazione o muti sono sufficienti e preferibili. Non vedrai il contenuto da quel dominio in alcuna linea temporale pubblica o nelle tue notifiche. i tuoi seguaci saranno rimossi da quel dominio.",
+  "confirmations.domain_block.message": "Sei davvero, davvero sicuro di voler bloccare l'intero {domain}? In molti casi pochi blocchi di destinazione o muti sono sufficienti e preferibili. Non vedrai il contenuto da quel dominio in alcuna timeline pubblica o nelle tue notifiche. i tuoi seguaci saranno rimossi da quel dominio.",
   "confirmations.logout.confirm": "Disconnettiti",
   "confirmations.logout.message": "Sei sicuro di volerti disconnettere?",
   "confirmations.mute.confirm": "Silenzia",
   "confirmations.mute.explanation": "Questo nasconderÃ  i post da loro ed i post che li menzionano, ma consentirÃ  ancora loro di vedere i tuoi post e di seguirti.",
   "confirmations.mute.message": "Sei sicuro di voler silenziare {name}?",
-  "confirmations.redraft.confirm": "Cancella e rivali",
+  "confirmations.redraft.confirm": "Cancella e riscrivi",
   "confirmations.redraft.message": "Sei sicuro di voler eliminare questo toot e riscriverlo? I preferiti e gli incrementi saranno persi e le risposte al post originale saranno perse.",
   "confirmations.reply.confirm": "Rispondi",
   "confirmations.reply.message": "Rispondere ora sovrascriverÃ  il messaggio che stai correntemente componendo. Sei sicuro di voler procedere?",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Risultati della ricerca",
   "emoji_button.symbols": "Simboli",
   "emoji_button.travel": "Viaggi & Luoghi",
+  "empty_column.account_suspended": "Account sospeso",
   "empty_column.account_timeline": "Nessun toot qui!",
   "empty_column.account_unavailable": "Profilo non disponibile",
   "empty_column.blocks": "Non hai ancora bloccato alcun utente.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Non hai ancora nessuna notifica. Interagisci con altri per iniziare conversazioni.",
   "empty_column.public": "Qui non c'Ã¨ nulla! Scrivi qualcosa pubblicamente, o aggiungi utenti da altri server per riempire questo spazio",
   "error.unexpected_crash.explanation": "A causa di un bug nel nostro codice o di un problema di compatibilitÃ  del browser, questa pagina non puÃ² essere visualizzata correttamente.",
+  "error.unexpected_crash.explanation_addons": "Questa pagina non puÃ² essere visualizzata correttamente. Questo errore Ã¨ probabilmente causato da un componente aggiuntivo del browser o da strumenti di traduzione automatica.",
   "error.unexpected_crash.next_steps": "Prova ad aggiornare la pagina. Se non funziona, potresti ancora essere in grado di utilizzare Mastodon attraverso un browser diverso o un'app nativa.",
+  "error.unexpected_crash.next_steps_addons": "Prova a disabilitarli e ad aggiornare la pagina. Se questo non funziona, potresti ancora essere in grado di utilizzare Mastodon attraverso un browser o un'app diversi.",
   "errors.unexpected_crash.copy_stacktrace": "Copia stacktrace negli appunti",
   "errors.unexpected_crash.report_issue": "Segnala il problema",
   "follow_request.authorize": "Autorizza",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "per uscire dall'area di composizione o dalla ricerca",
   "keyboard_shortcuts.up": "per spostarsi in alto nella lista",
   "lightbox.close": "Chiudi",
+  "lightbox.compress": "Comprimi casella di visualizzazione immagine",
+  "lightbox.expand": "Espandi casella di visualizzazione immagine",
   "lightbox.next": "Successivo",
   "lightbox.previous": "Precedente",
-  "lightbox.view_context": "Mostra contesto",
   "lists.account.add": "Aggiungi alla lista",
   "lists.account.remove": "Togli dalla lista",
   "lists.delete": "Elimina lista",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Cambia titolo",
   "lists.new.create": "Aggiungi lista",
   "lists.new.title_placeholder": "Titolo della nuova lista",
+  "lists.replies_policy.followed": "Qualsiasi utente seguito",
+  "lists.replies_policy.list": "Iscritti alla lista",
+  "lists.replies_policy.none": "Nessuno",
+  "lists.replies_policy.title": "Mostra risposte a:",
   "lists.search": "Cerca tra le persone che segui",
   "lists.subheading": "Le tue liste",
   "load_pending": "{count, plural, one {# nuovo oggetto} other {# nuovi oggetti}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Imposta visibilitÃ ",
   "missing_indicator.label": "Non trovato",
   "missing_indicator.sublabel": "Risorsa non trovata",
+  "mute_modal.duration": "Durata",
   "mute_modal.hide_notifications": "Nascondere le notifiche da quest'utente?",
+  "mute_modal.indefinite": "Per sempre",
   "navigation_bar.apps": "App per dispositivi mobili",
   "navigation_bar.blocks": "Utenti bloccati",
   "navigation_bar.bookmarks": "Segnalibri",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Il tuo sondaggio Ã¨ terminato",
   "notification.poll": "Un sondaggio in cui hai votato Ã¨ terminato",
   "notification.reblog": "{name} ha condiviso il tuo post",
+  "notification.status": "{name} ha appena pubblicato un post",
   "notifications.clear": "Cancella notifiche",
   "notifications.clear_confirmation": "Vuoi davvero cancellare tutte le notifiche?",
   "notifications.column_settings.alert": "Notifiche desktop",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Post condivisi:",
   "notifications.column_settings.show": "Mostra in colonna",
   "notifications.column_settings.sound": "Riproduci suono",
+  "notifications.column_settings.status": "Nuovi toot:",
   "notifications.filter.all": "Tutti",
   "notifications.filter.boosts": "Condivisioni",
   "notifications.filter.favourites": "Apprezzati",
   "notifications.filter.follows": "Seguaci",
   "notifications.filter.mentions": "Menzioni",
   "notifications.filter.polls": "Risultati del sondaggio",
+  "notifications.filter.statuses": "Aggiornamenti dalle persone che segui",
+  "notifications.grant_permission": "Dai il permesso.",
   "notifications.group": "{count} notifiche",
+  "notifications.mark_as_read": "Segna tutte le notifiche come lette",
+  "notifications.permission_denied": "Impossibile abilitare le notifiche sul desktop perchÃ© il permesso Ã¨ stato negato.",
+  "notifications.permission_denied_alert": "Le notifiche sul desktop non possono essere abilitate, poichÃ© il permesso nel browser Ã¨ stato negato in precedenza",
+  "notifications.permission_required": "Le notifiche desktop non sono disponibili perchÃ© l'autorizzazione richiesta non Ã¨ stata concessa.",
+  "notifications_permission_banner.enable": "Abilita le notifiche sul desktop",
+  "notifications_permission_banner.how_to_control": "Per ricevere notifiche quando Mastodon non Ã¨ aperto, abilita le notifiche desktop. Puoi controllare con precisione quali tipi di interazioni generano notifiche desktop tramite il pulsante {icon} qui sopra, dopo averle abilitate.",
+  "notifications_permission_banner.title": "Non perderti mai nulla",
+  "picture_in_picture.restore": "Riportalo indietro",
   "poll.closed": "Chiuso",
   "poll.refresh": "Aggiorna",
   "poll.total_people": "{count, plural, one {# persona} other {# persone}}",
@@ -426,7 +450,7 @@
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} persone}} ne parlaÂ·no",
   "trends.trending_now": "Di tendenza ora",
   "ui.beforeunload": "La bozza andrÃ  persa se esci da Mastodon.",
-  "units.short.billion": "{count}B",
+  "units.short.billion": "{count}G",
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "Trascina per caricare",
@@ -446,8 +470,9 @@
   "upload_modal.detect_text": "Rileva testo dall'immagine",
   "upload_modal.edit_media": "Modifica media",
   "upload_modal.hint": "Clicca o trascina il cerchio sull'anteprima per scegliere il punto focale che sarÃ  sempre visualizzato su tutte le miniature.",
+  "upload_modal.preparing_ocr": "Preparazione OCRâ€¦",
   "upload_modal.preview_label": "Anteprima ({ratio})",
-  "upload_progress.label": "Sto caricando...",
+  "upload_progress.label": "Invio in corso...",
   "video.close": "Chiudi video",
   "video.download": "Scarica file",
   "video.exit_fullscreen": "Esci da modalitÃ  a schermo intero",
@@ -456,6 +481,6 @@
   "video.hide": "Nascondi video",
   "video.mute": "Silenzia suono",
   "video.pause": "Pausa",
-  "video.play": "Avvia",
+  "video.play": "Riproduci",
   "video.unmute": "Riattiva suono"
 }
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 7c0ac99d13d478d818fb4c943bfacd5c1f8a07c3..012f88a6836e102dbd74c629e598b2c6b79c9417 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "ãƒªãƒ¢ãƒ¼ãƒˆã§è¡¨ç¤º",
   "account.cancel_follow_request": "ãƒ•ã‚©ãƒãƒ¼ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’å–ã‚Šæ¶ˆã™",
   "account.direct": "@{name}ã•ã‚“ã«ãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸",
+  "account.disable_notifications": "@{name} ã®æŠ•ç¨¿æ™‚ã®é€šçŸ¥ã‚’åœæ¢",
   "account.domain_blocked": "ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯ä¸",
   "account.edit_profile": "ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ç·¨é›†",
+  "account.enable_notifications": "@{name} ã®æŠ•ç¨¿æ™‚ã«é€šçŸ¥",
   "account.endorse": "ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã§ç´¹ä»‹ã™ã‚‹",
   "account.follow": "ãƒ•ã‚©ãƒãƒ¼",
   "account.followers": "ãƒ•ã‚©ãƒãƒ¯ãƒ¼",
@@ -36,7 +38,7 @@
   "account.requested": "ãƒ•ã‚©ãƒãƒ¼æ‰¿èªå¾…ã¡ã§ã™ã€‚ã‚¯ãƒªãƒƒã‚¯ã—ã¦ã‚ãƒ£ãƒ³ã‚»ãƒ«",
   "account.share": "@{name}ã•ã‚“ã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’å…±æœ‰ã™ã‚‹",
   "account.show_reblogs": "@{name}ã•ã‚“ã‹ã‚‰ã®ãƒ–ãƒ¼ã‚¹ãƒˆã‚’è¡¨ç¤º",
-  "account.statuses_counter": "{counter} ãƒˆã‚¥ãƒ¼ãƒˆ",
+  "account.statuses_counter": "{counter} æŠ•ç¨¿",
   "account.unblock": "@{name}ã•ã‚“ã®ãƒ–ãƒãƒƒã‚¯ã‚’è§£é™¤",
   "account.unblock_domain": "{domain}ã®ãƒ–ãƒãƒƒã‚¯ã‚’è§£é™¤",
   "account.unendorse": "ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‹ã‚‰å¤–ã™",
@@ -99,8 +101,8 @@
   "compose_form.sensitive.hide": "ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’é–²è¦§æ³¨æ„ã«ã™ã‚‹",
   "compose_form.sensitive.marked": "ãƒ¡ãƒ‡ã‚£ã‚¢ã«é–²è¦§æ³¨æ„ãŒè¨å®šã•ã‚Œã¦ã„ã¾ã™",
   "compose_form.sensitive.unmarked": "ãƒ¡ãƒ‡ã‚£ã‚¢ã«é–²è¦§æ³¨æ„ãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“",
-  "compose_form.spoiler.marked": "é–²è¦§æ³¨æ„ãŒè¨å®šã•ã‚Œã¦ã„ã¾ã™",
-  "compose_form.spoiler.unmarked": "é–²è¦§æ³¨æ„ãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“",
+  "compose_form.spoiler.marked": "æœ¬æ–‡ã¯è¦å‘Šã®å¾Œã‚ã«éš ã•ã‚Œã¾ã™",
+  "compose_form.spoiler.unmarked": "æœ¬æ–‡ã¯éš ã•ã‚Œã¦ã„ã¾ã›ã‚“",
   "compose_form.spoiler_placeholder": "ã“ã“ã«è¦å‘Šã‚’æ›¸ã„ã¦ãã ã•ã„",
   "confirmation_modal.cancel": "ã‚ãƒ£ãƒ³ã‚»ãƒ«",
   "confirmations.block.block_and_report": "ãƒ–ãƒãƒƒã‚¯ã—é€šå ±",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "æ¤œç´¢çµæžœ",
   "emoji_button.symbols": "è¨˜å·",
   "emoji_button.travel": "æ—…è¡Œã¨å ´æ‰€",
+  "empty_column.account_suspended": "ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯åœæ¢ã•ã‚Œã¦ã„ã¾ã™",
   "empty_column.account_timeline": "ãƒˆã‚¥ãƒ¼ãƒˆãŒã‚ã‚Šã¾ã›ã‚“ï¼",
   "empty_column.account_unavailable": "ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã¯åˆ©ç”¨ã§ãã¾ã›ã‚“",
   "empty_column.blocks": "ã¾ã èª°ã‚‚ãƒ–ãƒãƒƒã‚¯ã—ã¦ã„ã¾ã›ã‚“ã€‚",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "ã¾ã é€šçŸ¥ãŒã‚ã‚Šã¾ã›ã‚“ã€‚ä»–ã®äººã¨ãµã‚Œåˆã£ã¦ä¼šè©±ã‚’å§‹ã‚ã¾ã—ã‚‡ã†ã€‚",
   "empty_column.public": "ã“ã“ã«ã¯ã¾ã ä½•ã‚‚ã‚ã‚Šã¾ã›ã‚“ï¼ å…¬é–‹ã§ä½•ã‹ã‚’æŠ•ç¨¿ã—ãŸã‚Šã€ä»–ã®ã‚µãƒ¼ãƒãƒ¼ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’ãƒ•ã‚©ãƒãƒ¼ã—ãŸã‚Šã—ã¦ã„ã£ã±ã„ã«ã—ã¾ã—ã‚‡ã†",
   "error.unexpected_crash.explanation": "ä¸å…·åˆã‹ãƒ–ãƒ©ã‚¦ã‚¶ã®äº’æ›æ€§å•é¡Œã®ãŸã‚ã€ã“ã®ãƒšãƒ¼ã‚¸ã‚’æ£ã—ãè¡¨ç¤ºã§ãã¾ã›ã‚“ã§ã—ãŸã€‚",
+  "error.unexpected_crash.explanation_addons": "ã“ã®ãƒšãƒ¼ã‚¸ã¯æ£ã—ãè¡¨ç¤ºã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ã“ã®ã‚¨ãƒ©ãƒ¼ã¯ãƒ–ãƒ©ã‚¦ã‚¶ã®ã‚¢ãƒ‰ã‚ªãƒ³ã‚„è‡ªå‹•ç¿»è¨³ãƒ„ãƒ¼ãƒ«ã«ã‚ˆã£ã¦å¼•ãèµ·ã“ã•ã‚Œã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚",
   "error.unexpected_crash.next_steps": "ãƒšãƒ¼ã‚¸ã®å†èªã¿è¾¼ã¿ã‚’ãŠè©¦ã—ãã ã•ã„ã€‚ãã‚Œã§ã‚‚è§£æ±ºã—ãªã„å ´åˆã€åˆ¥ã®ãƒ–ãƒ©ã‚¦ã‚¶ã‹ã‚¢ãƒ—ãƒªã‚’ä½¿ãˆã°ä½¿ç”¨ã§ãã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚",
+  "error.unexpected_crash.next_steps_addons": "ãã‚Œã‚‰ã‚’ç„¡åŠ¹åŒ–ã—ã¦ã‹ã‚‰ãƒªãƒãƒ¼ãƒ‰ã‚’ãŠè©¦ã—ãã ã•ã„ã€‚ãã‚Œã§ã‚‚è§£æ±ºã—ãªã„å ´åˆã€ä»–ã®ãƒ–ãƒ©ã‚¦ã‚¶ã‚„ã‚¢ãƒ—ãƒªã§ Mastodon ã‚’ãŠè©¦ã—ãã ã•ã„ã€‚",
   "errors.unexpected_crash.copy_stacktrace": "ã‚¹ã‚¿ãƒƒã‚¯ãƒˆãƒ¬ãƒ¼ã‚¹ã‚’ã‚¯ãƒªãƒƒãƒ—ãƒœãƒ¼ãƒ‰ã«ã‚³ãƒ”ãƒ¼",
   "errors.unexpected_crash.report_issue": "å•é¡Œã‚’å ±å‘Š",
   "follow_request.authorize": "è¨±å¯",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "ãƒˆã‚¥ãƒ¼ãƒˆå…¥åŠ›æ¬„ãƒ»æ¤œç´¢æ¬„ã‹ã‚‰é›¢ã‚Œã‚‹",
   "keyboard_shortcuts.up": "ã‚«ãƒ©ãƒ å†…ä¸€ã¤ä¸Šã«ç§»å‹•",
   "lightbox.close": "é–‰ã˜ã‚‹",
+  "lightbox.compress": "ç”»åƒãƒ“ãƒ¥ãƒ¼ãƒœãƒƒã‚¯ã‚¹ã‚’é–‰ã˜ã‚‹",
+  "lightbox.expand": "ç”»åƒãƒ“ãƒ¥ãƒ¼ãƒœãƒƒã‚¯ã‚¹ã‚’é–‹ã",
   "lightbox.next": "æ¬¡",
   "lightbox.previous": "å‰",
-  "lightbox.view_context": "ãƒˆã‚¥ãƒ¼ãƒˆã‚’è¡¨ç¤º",
   "lists.account.add": "ãƒªã‚¹ãƒˆã«è¿½åŠ ",
   "lists.account.remove": "ãƒªã‚¹ãƒˆã‹ã‚‰å¤–ã™",
   "lists.delete": "ãƒªã‚¹ãƒˆã‚’å‰Šé™¤",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "ã‚¿ã‚¤ãƒˆãƒ«ã‚’å¤‰æ›´",
   "lists.new.create": "ãƒªã‚¹ãƒˆã‚’ä½œæˆ",
   "lists.new.title_placeholder": "æ–°è¦ãƒªã‚¹ãƒˆå",
+  "lists.replies_policy.followed": "ãƒ•ã‚©ãƒãƒ¼ä¸ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼å…¨å“¡",
+  "lists.replies_policy.list": "ãƒªã‚¹ãƒˆã®ãƒ¡ãƒ³ãƒãƒ¼",
+  "lists.replies_policy.none": "è¡¨ç¤ºã—ãªã„",
+  "lists.replies_policy.title": "ãƒªãƒ—ãƒ©ã‚¤ã‚’è¡¨ç¤º:",
   "lists.search": "ãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„ã‚‹äººã®ä¸ã‹ã‚‰æ¤œç´¢",
   "lists.subheading": "ã‚ãªãŸã®ãƒªã‚¹ãƒˆ",
   "load_pending": "{count} ä»¶ã®æ–°ç€",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’éš ã™",
   "missing_indicator.label": "è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“",
   "missing_indicator.sublabel": "è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ",
+  "mute_modal.duration": "ãƒŸãƒ¥ãƒ¼ãƒˆã™ã‚‹æœŸé–“",
   "mute_modal.hide_notifications": "ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‹ã‚‰ã®é€šçŸ¥ã‚’éš ã—ã¾ã™ã‹ï¼Ÿ",
+  "mute_modal.indefinite": "ç„¡æœŸé™",
   "navigation_bar.apps": "ã‚¢ãƒ—ãƒª",
   "navigation_bar.blocks": "ãƒ–ãƒãƒƒã‚¯ã—ãŸãƒ¦ãƒ¼ã‚¶ãƒ¼",
   "navigation_bar.bookmarks": "ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯",
@@ -298,6 +310,7 @@
   "notification.own_poll": "ã‚¢ãƒ³ã‚±ãƒ¼ãƒˆãŒçµ‚äº†ã—ã¾ã—ãŸ",
   "notification.poll": "ã‚¢ãƒ³ã‚±ãƒ¼ãƒˆãŒçµ‚äº†ã—ã¾ã—ãŸ",
   "notification.reblog": "{name}ã•ã‚“ãŒã‚ãªãŸã®ãƒˆã‚¥ãƒ¼ãƒˆã‚’ãƒ–ãƒ¼ã‚¹ãƒˆã—ã¾ã—ãŸ",
+  "notification.status": "{name}ã•ã‚“ãŒãƒˆã‚¥ãƒ¼ãƒˆã—ã¾ã—ãŸ",
   "notifications.clear": "é€šçŸ¥ã‚’æ¶ˆåŽ»",
   "notifications.clear_confirmation": "æœ¬å½“ã«é€šçŸ¥ã‚’æ¶ˆåŽ»ã—ã¾ã™ã‹ï¼Ÿ",
   "notifications.column_settings.alert": "ãƒ‡ã‚¹ã‚¯ãƒˆãƒƒãƒ—é€šçŸ¥",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "ãƒ–ãƒ¼ã‚¹ãƒˆ:",
   "notifications.column_settings.show": "ã‚«ãƒ©ãƒ ã«è¡¨ç¤º",
   "notifications.column_settings.sound": "é€šçŸ¥éŸ³ã‚’å†ç”Ÿ",
+  "notifications.column_settings.status": "æ–°ã—ã„ãƒˆã‚¥ãƒ¼ãƒˆ:",
   "notifications.filter.all": "ã™ã¹ã¦",
   "notifications.filter.boosts": "ãƒ–ãƒ¼ã‚¹ãƒˆ",
   "notifications.filter.favourites": "ãŠæ°—ã«å…¥ã‚Š",
   "notifications.filter.follows": "ãƒ•ã‚©ãƒãƒ¼",
   "notifications.filter.mentions": "è¿”ä¿¡",
   "notifications.filter.polls": "ã‚¢ãƒ³ã‚±ãƒ¼ãƒˆçµæžœ",
+  "notifications.filter.statuses": "ãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„ã‚‹äººã®æ–°ç€æƒ…å ±",
+  "notifications.grant_permission": "æ¨©é™ã®ä»˜ä¸Ž",
   "notifications.group": "{count} ä»¶ã®é€šçŸ¥",
+  "notifications.mark_as_read": "ã™ã¹ã¦æ—¢èªã«ã™ã‚‹",
+  "notifications.permission_denied": "ãƒ–ãƒ©ã‚¦ã‚¶ã®é€šçŸ¥ãŒæ‹’å¦ã•ã‚Œã¦ã„ã‚‹ãŸã‚ãƒ‡ã‚¹ã‚¯ãƒˆãƒƒãƒ—é€šçŸ¥ã¯åˆ©ç”¨ã§ãã¾ã›ã‚“",
+  "notifications.permission_denied_alert": "ãƒ–ãƒ©ã‚¦ã‚¶ã®é€šçŸ¥ãŒæ‹’å¦ã•ã‚Œã¦ã„ã‚‹ãŸã‚ãƒ‡ã‚¹ã‚¯ãƒˆãƒƒãƒ—é€šçŸ¥ã‚’æœ‰åŠ¹ã«ã§ãã¾ã›ã‚“",
+  "notifications.permission_required": "å¿…è¦ãªæ¨©é™ãŒä»˜ä¸Žã•ã‚Œã¦ã„ãªã„ãŸã‚ã€ãƒ‡ã‚¹ã‚¯ãƒˆãƒƒãƒ—é€šçŸ¥ã¯åˆ©ç”¨ã§ãã¾ã›ã‚“ã€‚",
+  "notifications_permission_banner.enable": "ãƒ‡ã‚¹ã‚¯ãƒˆãƒƒãƒ—é€šçŸ¥ã‚’æœ‰åŠ¹ã«ã™ã‚‹",
+  "notifications_permission_banner.how_to_control": "Mastodon ã‚’é–‰ã˜ã¦ã„ã‚‹é–“ã§ã‚‚é€šçŸ¥ã‚’å—ä¿¡ã™ã‚‹ã«ã¯ãƒ‡ã‚¹ã‚¯ãƒˆãƒƒãƒ—é€šçŸ¥ã‚’æœ‰åŠ¹ã«ã—ã¦ãã ã•ã„ã€‚æœ‰åŠ¹ã«ã™ã‚‹ã¨ä¸Šã® {icon} ãƒœã‚¿ãƒ³ã‹ã‚‰é€šçŸ¥ã®å†…å®¹ã‚’ç´°ã‹ãã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚ºã§ãã¾ã™ã€‚",
+  "notifications_permission_banner.title": "ãŠè¦‹é€ƒã—ãªã",
+  "picture_in_picture.restore": "å…ƒã«æˆ»ã™",
   "poll.closed": "çµ‚äº†",
   "poll.refresh": "æ›´æ–°",
   "poll.total_people": "{count}äºº",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "ç”»åƒã‹ã‚‰ãƒ†ã‚ã‚¹ãƒˆã‚’æ¤œå‡º",
   "upload_modal.edit_media": "ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’ç·¨é›†",
   "upload_modal.hint": "ã‚µãƒ ãƒã‚¤ãƒ«ã®ç„¦ç‚¹ã«ã—ãŸã„å ´æ‰€ã‚’ã‚¯ãƒªãƒƒã‚¯ã™ã‚‹ã‹å††å½¢ã®æž ã‚’ãã®å ´æ‰€ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ãã ã•ã„ã€‚",
+  "upload_modal.preparing_ocr": "OCR ã®æº–å‚™ä¸â€¦",
   "upload_modal.preview_label": "ãƒ—ãƒ¬ãƒ“ãƒ¥ãƒ¼ ({ratio})",
   "upload_progress.label": "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ä¸...",
   "video.close": "å‹•ç”»ã‚’é–‰ã˜ã‚‹",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 0051fee1fed6a863bc1d30c066b3af5e2e7da322..ad3b1b033d303ec882c4250080ffffa2c431dc6e 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Cancel follow request",
   "account.direct": "áƒžáƒ˜áƒ áƒ“áƒáƒžáƒ˜áƒ áƒ˜ áƒ¬áƒ”áƒ áƒ˜áƒšáƒ˜ @{name}-áƒ¡",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "áƒ“áƒáƒ›áƒ”áƒœáƒ˜ áƒ“áƒáƒ›áƒáƒšáƒ£áƒšáƒ˜áƒ",
   "account.edit_profile": "áƒžáƒ áƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ áƒªáƒ•áƒšáƒ˜áƒšáƒ”áƒ‘áƒ",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "áƒ’áƒáƒ›áƒáƒ áƒ©áƒ”áƒ•áƒ áƒžáƒ áƒáƒ¤áƒ˜áƒšáƒ–áƒ”",
   "account.follow": "áƒ’áƒáƒ§áƒáƒšáƒ",
   "account.followers": "áƒ›áƒ˜áƒ›áƒ“áƒ”áƒ•áƒ áƒ”áƒ‘áƒ˜",
@@ -96,7 +98,7 @@
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
   "compose_form.publish": "áƒ¢áƒ£áƒ¢áƒ˜",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "áƒ›áƒ”áƒ“áƒ˜áƒ áƒ›áƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜áƒ áƒ›áƒ’áƒ áƒ«áƒœáƒáƒ‘áƒ˜áƒáƒ áƒ”áƒ“",
   "compose_form.sensitive.unmarked": "áƒ›áƒ”áƒ“áƒ˜áƒ áƒáƒ áƒáƒ áƒ›áƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜ áƒ›áƒ’áƒ áƒ«áƒœáƒáƒ‘áƒ˜áƒáƒ áƒ”áƒ“",
   "compose_form.spoiler.marked": "áƒ’áƒáƒ¤áƒ áƒ—áƒ®áƒ˜áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ£áƒ™áƒáƒœ áƒ¢áƒ”áƒ¥áƒ¡áƒ¢áƒ˜ áƒ“áƒáƒ›áƒáƒšáƒ£áƒšáƒ˜áƒ",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "áƒ«áƒ”áƒ‘áƒœáƒ˜áƒ¡ áƒ¨áƒ”áƒ“áƒ”áƒ’áƒ”áƒ‘áƒ˜",
   "emoji_button.symbols": "áƒ¡áƒ˜áƒ›áƒ‘áƒáƒšáƒáƒ”áƒ‘áƒ˜",
   "emoji_button.travel": "áƒ›áƒáƒ’áƒ–áƒáƒ£áƒ áƒáƒ‘áƒ áƒ“áƒ áƒáƒ“áƒ’áƒ˜áƒšáƒ”áƒ‘áƒ˜",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No toots here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "áƒ¯áƒ”áƒ  áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜ áƒáƒ  áƒ’áƒáƒ¥áƒ•áƒ—. áƒ¡áƒáƒ£áƒ‘áƒ áƒ˜áƒ¡ áƒ“áƒáƒ¡áƒáƒ¬áƒ§áƒ”áƒ‘áƒáƒ“ áƒ˜áƒ£áƒ áƒ—áƒ˜áƒ”áƒ áƒ—áƒ¥áƒ›áƒ”áƒ“áƒ”áƒ— áƒ¡áƒ®áƒ•áƒ”áƒ‘áƒ—áƒáƒœ.",
   "empty_column.public": "áƒáƒ¥ áƒáƒ áƒáƒ¤áƒ”áƒ áƒ˜áƒ! áƒ¨áƒ”áƒ¡áƒáƒ•áƒ¡áƒ”áƒ‘áƒáƒ“, áƒ“áƒáƒ¬áƒ”áƒ áƒ”áƒ— áƒ áƒáƒ˜áƒ›áƒ” áƒ¦áƒ˜áƒáƒ“ áƒáƒœ áƒ®áƒ”áƒšáƒ˜áƒ— áƒ’áƒáƒ°áƒ§áƒ”áƒ•áƒ˜áƒ— áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ¡ áƒ¡áƒ®áƒ•áƒ áƒ˜áƒœáƒ¡áƒ¢áƒáƒœáƒªáƒ˜áƒ”áƒ‘áƒ˜áƒ¡áƒ’áƒáƒœ",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "áƒáƒ•áƒ¢áƒáƒ áƒ˜áƒ–áƒáƒªáƒ˜áƒ",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "áƒ¨áƒ”áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ¢áƒ”áƒ¥áƒ¡áƒ¢-áƒáƒ áƒ”áƒáƒ–áƒ” áƒ¤áƒáƒ™áƒ£áƒ¡áƒ˜áƒ¡ áƒ›áƒáƒ¡áƒáƒ¨áƒáƒ áƒ”áƒ‘áƒšáƒáƒ“",
   "keyboard_shortcuts.up": "áƒ¡áƒ˜áƒáƒ¨áƒ˜ áƒ–áƒ”áƒ›áƒáƒ— áƒ’áƒáƒ“áƒáƒ¡áƒáƒáƒ“áƒ’áƒ˜áƒšáƒ”áƒ‘áƒšáƒáƒ“",
   "lightbox.close": "áƒ“áƒáƒ®áƒ£áƒ áƒ•áƒ",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜",
   "lightbox.previous": "áƒ¬áƒ˜áƒœáƒ",
-  "lightbox.view_context": "View context",
   "lists.account.add": "áƒ¡áƒ˜áƒáƒ¨áƒ˜ áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ",
   "lists.account.remove": "áƒ¡áƒ˜áƒ˜áƒ“áƒáƒœ áƒáƒ›áƒáƒ¨áƒšáƒ",
   "lists.delete": "áƒ¡áƒ˜áƒ˜áƒ¡ áƒ¬áƒáƒ¨áƒšáƒ",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Change title",
   "lists.new.create": "áƒ¡áƒ˜áƒ˜áƒ¡ áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ",
   "lists.new.title_placeholder": "áƒáƒ®áƒáƒšáƒ˜ áƒ¡áƒ˜áƒ˜áƒ¡ áƒ¡áƒáƒ—áƒáƒ£áƒ áƒ˜",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "áƒ«áƒ”áƒ‘áƒœáƒ áƒáƒ“áƒáƒ›áƒ˜áƒáƒœáƒ”áƒ‘áƒ¡ áƒ¨áƒáƒ áƒ˜áƒ¡ áƒ áƒáƒ›áƒ”áƒšáƒ—áƒáƒª áƒ›áƒ˜áƒ°áƒ§áƒ•áƒ”áƒ‘áƒ˜áƒ—",
   "lists.subheading": "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¡áƒ˜áƒ”áƒ‘áƒ˜",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "áƒ®áƒ˜áƒšáƒ•áƒáƒ“áƒáƒ‘áƒ˜áƒ¡ áƒ©áƒáƒ áƒ—áƒ•áƒ",
   "missing_indicator.label": "áƒáƒ áƒáƒ áƒœáƒáƒžáƒáƒ•áƒœáƒ˜",
   "missing_indicator.sublabel": "áƒáƒ› áƒ áƒ”áƒ¡áƒ£áƒ áƒ¡áƒ˜áƒ¡ áƒžáƒáƒ•áƒœáƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "áƒ“áƒáƒ•áƒ›áƒáƒšáƒáƒ— áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜ áƒáƒ› áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡áƒ’áƒáƒœ?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "áƒ“áƒáƒ‘áƒšáƒáƒ™áƒ˜áƒšáƒ˜ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ˜",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name}-áƒ›áƒ áƒ“áƒáƒ‘áƒ£áƒ¡áƒ¢áƒ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ˜",
+  "notification.status": "{name} just posted",
   "notifications.clear": "áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒáƒ¡áƒ£áƒ¤áƒ—áƒáƒ•áƒ”áƒ‘áƒ",
   "notifications.clear_confirmation": "áƒ“áƒáƒ áƒ¬áƒ›áƒ£áƒœáƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ®áƒáƒ áƒ—, áƒ’áƒ¡áƒ£áƒ áƒ— áƒ¡áƒáƒ›áƒ£áƒ“áƒáƒ›áƒáƒ“ áƒ¬áƒáƒ¨áƒáƒšáƒáƒ— áƒ§áƒ•áƒ”áƒšáƒ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ?",
   "notifications.column_settings.alert": "áƒ“áƒ”áƒ¡áƒ™áƒ¢áƒáƒž áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "áƒ‘áƒ£áƒ¡áƒ¢áƒ”áƒ‘áƒ˜:",
   "notifications.column_settings.show": "áƒ’áƒáƒ›áƒáƒ©áƒœáƒ“áƒ”áƒ¡ áƒ¡áƒ•áƒ”áƒ¢áƒ¨áƒ˜",
   "notifications.column_settings.sound": "áƒ®áƒ›áƒ˜áƒ¡ áƒ“áƒáƒ™áƒ•áƒ áƒ",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Closed",
   "poll.refresh": "Refresh",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "áƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ”áƒ‘áƒ...",
   "video.close": "áƒ•áƒ˜áƒ“áƒ”áƒáƒ¡ áƒ“áƒáƒ®áƒ£áƒ áƒ•áƒ",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 05f72596b53758b7ef9bc145d8384679b8e2c085..cf9860f1e1698ca27b996cd5d1119e7fc04744d8 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -1,5 +1,5 @@
 {
-  "account.account_note_header": "Tazmilt-ikÂ·im i @{name}",
+  "account.account_note_header": "Tazmilt",
   "account.add_or_remove_from_list": "Rnu neÉ£ kkes seg tebdarin",
   "account.badges.bot": "Aá¹›ubut",
   "account.badges.group": "Agraw",
@@ -9,14 +9,16 @@
   "account.browse_more_on_origin_server": "Snirem ugar deg umeÉ£nu aneáº“li",
   "account.cancel_follow_request": "Sefsex asuter n uá¸far",
   "account.direct": "Izen usrid i @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "TaÉ£ult yeffren",
   "account.edit_profile": "áº’reg amaÉ£nu",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Welleh fell-as deg umaÉ£nu-inek",
   "account.follow": "á¸Œfer",
   "account.followers": "Imeá¸faren",
   "account.followers.empty": "Ar tura, ulac yiwen i yeá¹á¹afaá¹›en amseqdac-agi.",
   "account.followers_counter": "{count, plural, one {{count} n umeá¸far} other {{count} n imeá¸faren}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.following_counter": "{count, plural, one {{counter} yeá¹á¹afaren} aá¸far {{counter} wayeá¸}}",
   "account.follows.empty": "Ar tura, amseqdac-agi ur yeá¹á¹afaá¹› yiwen.",
   "account.follows_you": "Yeá¹á¹afaá¹›-ik",
   "account.hide_reblogs": "Ffer ayen i ibeá¹á¹u @{name}",
@@ -36,7 +38,7 @@
   "account.requested": "Di laÉ›á¸il ad yettwaqbel. Ssit i wakken ad yefsex usuter n uá¸far",
   "account.share": "Bá¸u amaÉ£nu n @{name}",
   "account.show_reblogs": "Ssken-d inebá¸a n @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, one {{counter} ajewwaq} other {{counter} ijewwaqen}}",
   "account.unblock": "Serreá¸¥ i @{name}",
   "account.unblock_domain": "Ssken-d {domain}",
   "account.unendorse": "Ur ttwellih ara fell-as deg umaÉ£nu-inek",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Igemmaá¸ n unadi",
   "emoji_button.symbols": "Izamulen",
   "emoji_button.travel": "Imeá¸qan d Yinigen",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Ulac tijewwaqin dagi!",
   "empty_column.account_unavailable": "Ur nufi ara amaÉ£nu-ayi",
   "empty_column.blocks": "Ur tesá¸¥ebseá¸ ula yiwen n umseqdac ar tura.",
@@ -166,8 +169,10 @@
   "empty_column.notifications": "Ulac É£ur-k tilÉ£a. Sedmer akked yemdanen-nniá¸en akken ad tebduá¸ adiwenni.",
   "empty_column.public": "Ulac kra da! Aru kra, neÉ£ á¸feá¹› imdanen i yellan deg yiqeddacen-nniá¸en akken ad d-teÄÄar tsuddemt tazayezt",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Smiren asebter-a, ma ur yekkis ara wugur, áº“er d akken tzemreá¸ ad tesqedceá¸ Maá¹£á¹udun deg yiminig-nniá¸en neÉ£ deg usnas anaá¹£li.",
-  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "errors.unexpected_crash.copy_stacktrace": "NÉ£el stacktrace É£ef wafus",
   "errors.unexpected_crash.report_issue": "Mmel ugur",
   "follow_request.authorize": "Ssireg",
   "follow_request.reject": "Agi",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "i tulin É£er d asawen n tebdart",
   "lightbox.close": "Mdel",
+  "lightbox.compress": "á¸¤emmeáº“ tamnaá¸t n uskan n tugna",
+  "lightbox.expand": "SimeÉ£er tamnaá¸t n uskan n tugna",
   "lightbox.next": "Î“er zdat",
   "lightbox.previous": "Î“er deffir",
-  "lightbox.view_context": "áº’er amnaá¸",
   "lists.account.add": "Rnu É£er tebdart",
   "lists.account.remove": "Kkes seg tebdart",
   "lists.delete": "Kkes tabdart",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Beddel azwel",
   "lists.new.create": "Rnu tabdart",
   "lists.new.title_placeholder": "Azwel amaynut n tebdart",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Ssken-d tiririyin i:",
   "lists.search": "Nadi gar yemdanen i teá¹á¹afaá¹›eá¸",
   "lists.subheading": "Tibdarin-ikÂ·im",
   "load_pending": "{count, plural, one {# n uferdis amaynut} other {# n yiferdisen imaynuten}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Ffer {number, plural, one {tugna} other {tugniwin}}",
   "missing_indicator.label": "Ulac-it",
   "missing_indicator.sublabel": "Ur nufi ara aÉ£balu-a",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "TebÉ£iá¸ ad teffreá¸ talÉ£utin n umseqdac-a?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Isnasen izirazen",
   "navigation_bar.blocks": "Imseqdacen yettusá¸¥ebsen",
   "navigation_bar.bookmarks": "Ticraá¸",
@@ -295,9 +307,10 @@
   "notification.follow": "{name} yeá¹á¹afaá¹›-ik",
   "notification.follow_request": "{name} yessuter-d ad k-yeá¸feá¹›",
   "notification.mention": "{name} yebder-ik-id",
-  "notification.own_poll": "Your poll has ended",
+  "notification.own_poll": "Tafrant-ikÂ·im tfuk",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} yebá¸a tajewwiqt-ik i tikelt-nniá¸en",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Sfeá¸ tilÉ£a",
   "notifications.clear_confirmation": "TebÉ£iá¸ s tidet ad tekkseá¸ akk tilÉ£a-inekÂ·em i lebda?",
   "notifications.column_settings.alert": "TilÉ£a n tnarit",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "SeÇ§hed:",
   "notifications.column_settings.show": "Ssken-d tilÉ£a deg ujgu",
   "notifications.column_settings.sound": "Rmed imesli",
+  "notifications.column_settings.status": "Tiáº“enáº“unin timaynutin:",
   "notifications.filter.all": "Akk",
   "notifications.filter.boosts": "SeÇ§hed",
   "notifications.filter.favourites": "Ismenyifen",
   "notifications.filter.follows": "Yeá¹afaá¹›",
   "notifications.filter.mentions": "Abdar",
   "notifications.filter.polls": "Igemmaá¸ n usenqed",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} n tilÉ£a",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "D awezÉ£i ad yili wermad n yilÉ£a n tnarit axateá¹› turagt tettwagdel.",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Ifukk",
   "poll.refresh": "Smiren",
   "poll.total_people": "{count, plural, one {# n wemdan} other {# n yemdanen}}",
@@ -328,7 +352,7 @@
   "poll.voted": "TdeÉ£á¹›eá¸ É£ef tririt-ayi",
   "poll_button.add_poll": "Rnu asenqed",
   "poll_button.remove_poll": "Kkes asenqed",
-  "privacy.change": "Adjust status privacy",
+  "privacy.change": "Seggem tabaá¸nit n yizen",
   "privacy.direct.long": "Bá¸u gar yimseqdacen i tbedreá¸ kan",
   "privacy.direct.short": "Usrid",
   "privacy.private.long": "Bá¸u i yimeá¸faá¹›en-ik kan",
@@ -389,8 +413,8 @@
   "status.pinned": "Tijewwiqin yettwasentá¸en",
   "status.read_more": "Issin ugar",
   "status.reblog": "Bá¸u",
-  "status.reblog_private": "Boost to original audience",
-  "status.reblogged_by": "{name} boosted",
+  "status.reblog_private": "Boost with original visibility",
+  "status.reblogged_by": "Yebá¸a-tt {name}",
   "status.reblogs.empty": "Ula yiwen ur yebá¸i tajewwiqt-agi ar tura. Ticki yebá¸a-tt yiwen, ad d-iban da.",
   "status.redraft": "Kkes tÉ›iwdeá¸ tira",
   "status.remove_bookmark": "Kkes tacreá¸t",
@@ -417,20 +441,20 @@
   "time_remaining.days": "Mazal {number, plural, one {# n wass} other {# n wussan}}",
   "time_remaining.hours": "Mazal {number, plural, one {# n usrag} other {# n yesragen}}",
   "time_remaining.minutes": "Mazal {number, plural, one {# n tesdat} other {# n tesdatin}}",
-  "time_remaining.moments": "Moments remaining",
+  "time_remaining.moments": "Akuden i d-yeqqimen",
   "time_remaining.seconds": "Mazal {number, plural, one {# n tasint} other {# n tsinin}} id yugran",
   "timeline_hint.remote_resource_not_displayed": "{resource} seg yiqeddacen-nniá¸en ur d-ttwaskanent ara.",
   "timeline_hint.resources.followers": "Imeá¸faá¹›en",
   "timeline_hint.resources.follows": "TÂ·Yeá¹afaá¹›",
   "timeline_hint.resources.statuses": "Tijewwaqin tiqdimin",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} amdan} imdanen {{counter} wiyaá¸}} yettmeslayen",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Arewway-ikÂ·im ad iruá¸¥ ma yella tefeÉ£-d deg Maá¹£á¹udun.",
   "units.short.billion": "{count}B",
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "Zuá¸¥eb rnu sers i tasalyt",
-  "upload_button.label": "Rnu taÉ£walt ({formats})",
+  "upload_button.label": "Rnu taÉ£walt",
   "upload_error.limit": "Asali n ufaylu iÎµedda talast.",
   "upload_error.poll": "Ur ittusireg ara usali n ufaylu s tefranin.",
   "upload_form.audio_description": "Glem-d i yemdanen i yesÉ›an ugur deg tmesliwt",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Sefru-d aá¸ris seg tugna",
   "upload_modal.edit_media": "áº’reg taÉ£walt",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Aheyyi n OCRâ€¦",
   "upload_modal.preview_label": "Taskant ({ratio})",
   "upload_progress.label": "Asali iteddu...",
   "video.close": "Mdel tabidyutt",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 322c15fff69dcc89506497b778b57319bbfd1417..04a0f9140ec0c7533fca4a90c3b5ebeb49371022 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -1,22 +1,24 @@
 {
-  "account.account_note_header": "Note",
+  "account.account_note_header": "Ð–Ð°Ð·Ð±Ð°",
   "account.add_or_remove_from_list": "Ð¢Ñ–Ð·Ñ–Ð¼Ð³Ðµ Ò›Ð¾ÑÑƒ Ð½ÐµÐ¼ÐµÑÐµ Ð¶Ð¾ÑŽ",
   "account.badges.bot": "Ð‘Ð¾Ñ‚",
-  "account.badges.group": "Group",
+  "account.badges.group": "Ð¢Ð¾Ð¿",
   "account.block": "Ð‘Ò±Ò“Ð°Ñ‚Ñ‚Ð°Ñƒ @{name}",
   "account.block_domain": "Ð”Ð¾Ð¼ÐµÐ½Ð´ÐµÐ³Ñ– Ð±Ð°Ñ€Ð»Ñ‹Ò“Ñ‹Ð½ Ð±Ò±Ò“Ð°Ñ‚Ñ‚Ð° {domain}",
   "account.blocked": "Ð‘Ò±Ò“Ð°Ñ‚Ñ‚Ð°Ð»Ð´Ñ‹",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Ð¢Ð¾Ð»Ñ‹Ò“Ñ‹Ñ€Ð°Ò› Ð¾Ñ€Ð¸Ð³Ð¸Ð½Ð°Ð» Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ–Ð½Ð´Ðµ Ò›Ð°Ñ€Ð°",
   "account.cancel_follow_request": "Ð–Ð°Ð·Ñ‹Ð»ÑƒÒ“Ð° ÑÒ±Ñ€Ð°Ð½Ñ‹Ð¼Ð´Ñ‹ Ò›Ð°Ð¹Ñ‚Ð°Ñ€Ñƒ",
   "account.direct": "Ð–ÐµÐºÐµ Ñ…Ð°Ñ‚ @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Ð”Ð¾Ð¼ÐµÐ½ Ð¶Ð°Ð±Ñ‹Ò›",
   "account.edit_profile": "ÐŸÑ€Ð¾Ñ„Ð¸Ð»ÑŒÐ´Ñ– Ó©Ò£Ð´ÐµÑƒ",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "ÐŸÑ€Ð¾Ñ„Ð¸Ð»ÑŒÐ´Ðµ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÐµÑƒ",
   "account.follow": "Ð–Ð°Ð·Ñ‹Ð»Ñƒ",
   "account.followers": "ÐžÒ›Ñ‹Ñ€Ð¼Ð°Ð½Ð´Ð°Ñ€",
   "account.followers.empty": "Ó˜Ð»Ñ– ÐµÑˆÐºÑ–Ð¼ Ð¶Ð°Ð·Ñ‹Ð»Ð¼Ð°Ò“Ð°Ð½.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers_counter": "{count, plural, one {{counter} ÐžÒ›Ñ‹Ñ€Ð¼Ð°Ð½} other {{counter} ÐžÒ›Ñ‹Ñ€Ð¼Ð°Ð½}}",
+  "account.following_counter": "{count, plural, one {{counter} Ð–Ð°Ð·Ñ‹Ð»Ñ‹Ð¼} other {{counter} Ð–Ð°Ð·Ñ‹Ð»Ñ‹Ð¼}}",
   "account.follows.empty": "Ð•ÑˆÐºÑ–Ð¼Ð³Ðµ Ð¶Ð°Ð·Ñ‹Ð»Ð¼Ð°Ð¿Ñ‚Ñ‹.",
   "account.follows_you": "Ð¡Ñ–Ð·Ð³Ðµ Ð¶Ð°Ð·Ñ‹Ð»Ñ‹Ð¿Ñ‚Ñ‹",
   "account.hide_reblogs": "@{name} Ð°Ñ‚Ñ‚Ñ‹ Ò›Ð¾Ð»Ð´Ð°Ð½ÑƒÑˆÑ‹Ð½Ñ‹Ò£ Ó™Ñ€ÐµÐºÐµÑ‚Ñ‚ÐµÑ€Ñ–Ð½ Ð¶Ð°ÑÑ‹Ñ€Ñƒ",
@@ -36,19 +38,19 @@
   "account.requested": "Ð Ð°ÑÑ‚Ð°ÑƒÑ‹Ð½ ÐºÒ¯Ñ‚Ñ–Ò£Ñ–Ð·. Ð–Ð°Ð·Ñ‹Ð»ÑƒÐ´Ð°Ð½ Ð±Ð°Ñ Ñ‚Ð°Ñ€Ñ‚Ñƒ Ò¯ÑˆÑ–Ð½ Ð±Ð°ÑÑ‹Ò£Ñ‹Ð·",
   "account.share": "@{name} Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ–Ð½ Ð±Ó©Ð»Ñ–ÑÑƒ\"",
   "account.show_reblogs": "@{name} Ð±Ó©Ð»Ñ–ÑÐºÐµÐ½Ð´ÐµÑ€Ñ–Ð½ ÐºÓ©Ñ€ÑÐµÑ‚Ñƒ",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, one {{counter} ÐŸÐ¾ÑÑ‚} other {{counter} ÐŸÐ¾ÑÑ‚}}",
   "account.unblock": "Ð‘Ò±Ò“Ð°Ñ‚Ñ‚Ð°Ð½ ÑˆÑ‹Ò“Ð°Ñ€Ñƒ @{name}",
   "account.unblock_domain": "Ð‘Ò±Ò“Ð°Ñ‚Ñ‚Ð°Ð½ ÑˆÑ‹Ò“Ð°Ñ€Ñƒ {domain}",
   "account.unendorse": "ÐŸÑ€Ð¾Ñ„Ð¸Ð»ÑŒÐ´Ðµ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÐµÐ¼ÐµÑƒ",
   "account.unfollow": "ÐžÒ›Ñ‹Ð¼Ð°Ñƒ",
   "account.unmute": "@{name} ÐµÑÐºÐµÑ€Ñ‚Ð¿ÐµÐ»ÐµÑ€Ñ–Ð½ Ò›Ð¾ÑÑƒ",
   "account.unmute_notifications": "@{name} ÐµÑÐºÐµÑ€Ñ‚Ð¿ÐµÐ»ÐµÑ€Ñ–Ð½ ÐºÓ©Ñ€ÑÐµÑ‚Ñƒ",
-  "account_note.placeholder": "Click to add a note",
+  "account_note.placeholder": "Ð–Ð°Ð·Ð±Ð° Ò›Ð°Ð»Ð´Ñ‹Ñ€Ñƒ Ò¯ÑˆÑ–Ð½ Ð±Ð°Ñ",
   "alert.rate_limited.message": "ÒšÐ°Ð¹Ñ‚Ð°Ð´Ð°Ð½ ÐºÓ©Ñ€Ñ–Ò£Ñ–Ð·  {retry_time, time, medium} ÐºÐµÐ¹Ñ–Ð½.",
   "alert.rate_limited.title": "Ð‘Ð°Ò“Ð°Ð»Ð°Ñƒ ÑˆÐµÐºÑ‚ÐµÑƒÐ»Ñ–",
   "alert.unexpected.message": "Ð‘Ñ–Ñ€ Ð½Ó™Ñ€ÑÐµ Ð´Ò±Ñ€Ñ‹Ñ Ð±Ð¾Ð»Ð¼Ð°Ð´Ñ‹.",
   "alert.unexpected.title": "Ó¨Ð¹!",
-  "announcement.announcement": "Announcement",
+  "announcement.announcement": "Ð¥Ð°Ð±Ð°Ñ€Ð»Ð°Ð½Ð´Ñ‹Ñ€Ñƒ",
   "autosuggest_hashtag.per_week": "{count} Ð°Ð¿Ñ‚Ð°ÑÑ‹Ð½Ð°",
   "boost_modal.combo": "ÐšÐµÐ»ÐµÑÑ–Ð´Ðµ Ó©Ñ‚ÐºÑ–Ð·Ñ–Ð¿ Ð¶Ñ–Ð±ÐµÑ€Ñƒ Ò¯ÑˆÑ–Ð½ Ð±Ð°ÑÑ‹Ò£Ñ‹Ð· {combo}",
   "bundle_column_error.body": "Ð‘Ò±Ð» ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñ‚Ñ– Ð¶Ò¯ÐºÑ‚ÐµÐ³ÐµÐ½ ÐºÐµÐ·Ð´Ðµ Ð±Ñ–Ñ€ Ò›Ð°Ñ‚Ðµ Ð¿Ð°Ð¹Ð´Ð° Ð±Ð¾Ð»Ð´Ñ‹.",
@@ -79,9 +81,9 @@
   "column_header.show_settings": "Ð‘Ð°Ð¿Ñ‚Ð°ÑƒÐ»Ð°Ñ€Ð´Ñ‹ ÐºÓ©Ñ€ÑÐµÑ‚",
   "column_header.unpin": "ÐÐ»Ñ‹Ð¿ Ñ‚Ð°ÑÑ‚Ð°Ñƒ",
   "column_subheading.settings": "Ð‘Ð°Ð¿Ñ‚Ð°ÑƒÐ»Ð°Ñ€",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Ð¢ÐµÐº Ð¶ÐµÑ€Ð³Ñ–Ð»Ñ–ÐºÑ‚Ñ–",
   "community.column_settings.media_only": "Ð¢ÐµÐº Ð¼ÐµÐ´Ð¸Ð°",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Ð¢ÐµÐº ÑÑ‹Ñ€Ñ‚Ò›Ñ‹",
   "compose_form.direct_message_warning": "Ð¢ÐµÐº Ð°Ñ‚Ð°Ð»Ò“Ð°Ð½ Ò›Ð¾Ð»Ð´Ð°Ð½ÑƒÑˆÑ‹Ð»Ð°Ñ€Ò“Ð°.",
   "compose_form.direct_message_warning_learn_more": "ÐšÓ©Ð±Ñ–Ñ€ÐµÐº Ð±Ñ–Ð»Ñƒ",
   "compose_form.hashtag_warning": "Ð‘Ò±Ð» Ð¿Ð¾ÑÑ‚ Ñ–Ð·Ð´ÐµÑƒÐ´Ðµ Ñ…ÑÑˆÑ‚ÐµÐ³Ð¿ÐµÐ½ ÑˆÑ‹Ò›Ð¿Ð°Ð¹Ð´Ñ‹, Ó©Ð¹Ñ‚ÐºÐµÐ½Ñ– Ð¾Ð» Ð±Ó™Ñ€Ñ–Ð½Ðµ Ð°ÑˆÑ‹Ò› ÐµÐ¼ÐµÑ. Ð¢ÐµÐº Ð°ÑˆÑ‹Ò› Ð¶Ð°Ð·Ð±Ð°Ð»Ð°Ñ€Ð´Ñ‹ Ò“Ð°Ð½Ð° Ñ…ÑÑˆÑ‚ÐµÐ³ Ð°Ñ€Ò›Ñ‹Ð»Ñ‹ Ñ–Ð·Ð´ÐµÐ¿ Ñ‚Ð°Ð±ÑƒÒ“Ð° Ð±Ð¾Ð»Ð°Ð´Ñ‹.",
@@ -92,8 +94,8 @@
   "compose_form.poll.duration": "Ð¡Ð°ÑƒÐ°Ð»Ð½Ð°Ð¼Ð° Ð¼ÐµÑ€Ð·Ñ–Ð¼Ñ–",
   "compose_form.poll.option_placeholder": "Ð–Ð°ÑƒÐ°Ð¿ {number}",
   "compose_form.poll.remove_option": "Ð‘Ò±Ð» Ð¶Ð°ÑƒÐ°Ð¿Ñ‚Ñ‹ Ó©ÑˆÑ–Ñ€",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Ð‘Ñ–Ñ€Ð½ÐµÑˆÐµ Ð¶Ð°ÑƒÐ°Ð¿ Ñ‚Ð°Ò£Ð´Ð°Ð¹Ñ‚Ñ‹Ð½Ð´Ð°Ð¹ Ò›Ñ‹Ð»Ñƒ",
+  "compose_form.poll.switch_to_single": "Ð¢ÐµÐº Ð±Ñ–Ñ€ Ð¶Ð°ÑƒÐ°Ð¿ Ñ‚Ð°Ò£Ð´Ð°Ð¹Ñ‚Ñ‹Ð½Ð´Ð°Ð¹ Ò›Ñ‹Ð»Ñƒ",
   "compose_form.publish": "Ð¢Ò¯Ñ€Ñ‚",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Ð¡ÐµÐ·Ñ–Ð¼Ñ‚Ð°Ð» Ñ€ÐµÑ‚Ñ–Ð½Ð´Ðµ Ð±ÐµÐ»Ð³Ñ–Ð»Ðµ",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Ð†Ð·Ð´ÐµÑƒ Ð½Ó™Ñ‚Ð¸Ð¶ÐµÐ»ÐµÑ€Ñ–",
   "emoji_button.symbols": "Ð¢Ð°Ò£Ð±Ð°Ð»Ð°Ñ€",
   "emoji_button.travel": "Ð¡Ð°ÑÑ…Ð°Ñ‚",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Ð–Ð°Ð·Ð±Ð° Ð¶Ð¾Ò› ÐµÑˆÒ›Ð°Ð½Ð´Ð°Ð¹!",
   "empty_column.account_unavailable": "ÐŸÑ€Ð¾Ñ„Ð¸Ð»ÑŒ Ò›Ð¾Ð»Ð¶ÐµÑ‚Ñ–Ð¼Ð´Ñ– ÐµÐ¼ÐµÑ",
   "empty_column.blocks": "Ð•ÑˆÐºÑ–Ð¼Ð´Ñ– Ð±Ò±Ò“Ð°Ñ‚Ñ‚Ð°Ð¼Ð°Ò“Ð°Ð½ÑÑ‹Ð·.",
@@ -166,13 +169,15 @@
   "empty_column.notifications": "Ó˜Ð·Ñ–Ñ€ÑˆÐµ ÐµÑˆÒ›Ð°Ð½Ð´Ð°Ð¹ ÐµÑÐºÐµÑ€Ñ‚Ð¿Ðµ Ð¶Ð¾Ò›. Ð‘Ð°ÑÒ›Ð°Ð»Ð°Ñ€Ð¼ÐµÐ½ Ð°Ñ€Ð°Ð»Ð°ÑÑƒÐ´Ñ‹ Ð±Ð°ÑÑ‚Ð°Ò£Ñ‹Ð· Ð¶Ó™Ð½Ðµ Ð¿Ñ–ÐºÑ–Ñ€Ñ‚Ð°Ð»Ð°ÑÑ‚Ð°Ñ€Ò“Ð° Ò›Ð°Ñ‚Ñ‹ÑÑ‹Ò£Ñ‹Ð·.",
   "empty_column.public": "Ð•ÑˆÑ‚ÐµÒ£Ðµ Ð¶Ð¾Ò› Ð±Ò±Ð» Ð¶ÐµÑ€Ð´Ðµ! Ó¨Ð·Ñ–Ò£Ñ–Ð· Ð±Ð°ÑÑ‚Ð°Ð¿ Ð¶Ð°Ð·Ñ‹Ð¿ ÐºÓ©Ñ€Ñ–Ò£Ñ–Ð· Ð½ÐµÐ¼ÐµÑÐµ Ð±Ð°ÑÒ›Ð°Ð»Ð°Ñ€Ò“Ð° Ð¶Ð°Ð·Ñ‹Ð»Ñ‹Ò£Ñ‹Ð·",
   "error.unexpected_crash.explanation": "ÐšÐ¾Ð´Ñ‚Ð°Ò“Ñ‹ Ð±Ð°Ð³ Ð½ÐµÐ¼ÐµÑÐµ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð´ÐµÐ³Ñ– Ò›Ð°Ñ‚ÐµÐ´ÐµÐ½, Ð±Ò±Ð» Ð±ÐµÑ‚ Ð´Ò±Ñ€Ñ‹Ñ Ð°ÑˆÑ‹Ð»Ð¼Ð°Ð¹ Ñ‚Ò±Ñ€.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Ð‘ÐµÑ‚Ñ‚Ñ– Ð¶Ð°Ò£Ð°Ñ€Ñ‚Ñ‹Ð¿ ÐºÓ©Ñ€Ñ–Ò£Ñ–Ð·. Ð•Ð³ÐµÑ€ Ð±Ò±Ð» ÐºÓ©Ð¼ÐµÐºÑ‚ÐµÑÐ¿ÐµÑÐµ, Mastodon Ð¶ÐµÐ»Ñ–ÑÑ–Ð½ Ð±Ð°ÑÒ›Ð° Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð´ÐµÐ½ Ð½ÐµÐ¼ÐµÑÐµ Ð¼Ð¾Ð±Ð¸Ð»ÑŒ Ò›Ð¾ÑÑ‹Ð¼ÑˆÐ°Ð´Ð°Ð½ Ð°ÑˆÑ‹Ð¿ ÐºÓ©Ñ€Ñ–Ò£Ñ–Ð·.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Ð–Ð¸Ñ‹Ð½Ñ‚Ñ‹Ò›Ñ‚Ñ‹ ÐºÓ©ÑˆÑ–Ñ€Ñ–Ð¿ Ð°Ð» ÐºÐ»Ð¸Ð¿Ð±Ð¾Ñ€Ð´Ò›Ð°",
   "errors.unexpected_crash.report_issue": "ÐœÓ™ÑÐµÐ»ÐµÐ½Ñ– Ñ…Ð°Ð±Ð°Ñ€Ð»Ð°",
   "follow_request.authorize": "ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ñ",
   "follow_request.reject": "ÒšÐ°Ð±Ñ‹Ð»Ð´Ð°Ð¼Ð°Ñƒ",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
-  "generic.saved": "Saved",
+  "generic.saved": "Ð¡Ð°Ò›Ñ‚Ð°Ð»Ð´Ñ‹",
   "getting_started.developers": "Ð–Ð°ÑÐ°ÑƒÑˆÑ‹Ð»Ð°Ñ€ Ñ‚Ð¾Ð±Ñ‹",
   "getting_started.directory": "ÐŸÑ€Ð¾Ñ„Ð¸Ð»ÑŒÐ´ÐµÑ€ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ñ‹",
   "getting_started.documentation": "ÒšÒ±Ð¶Ð°Ñ‚Ñ‚Ð°Ð¼Ð°",
@@ -242,7 +247,7 @@
   "keyboard_shortcuts.reply": "Ð¶Ð°ÑƒÐ°Ð¿ Ð¶Ð°Ð·Ñƒ",
   "keyboard_shortcuts.requests": "Ð¶Ð°Ð·Ñ‹Ð»Ñƒ ÑÒ±Ñ€Ð°Ð½Ñ‹Ð¼Ð´Ð°Ñ€Ñ‹Ð½ Ò›Ð°Ñ€Ð°Ñƒ",
   "keyboard_shortcuts.search": "Ñ–Ð·Ð´ÐµÑƒ",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "CW ÐºÓ©Ñ€ÑÐµÑ‚Ñƒ/Ð¶Ð°Ð±Ñƒ",
   "keyboard_shortcuts.start": "Ð±Ð°ÑÑ‚Ð°Ð¿Ò›Ñ‹ Ð±Ð°Ò“Ð°Ð½Ò“Ð° Ð±Ð°Ñ€Ñƒ",
   "keyboard_shortcuts.toggle_hidden": "Ð¶Ð°Ð±Ñ‹Ò› Ð¼Ó™Ñ‚Ñ–Ð½Ð´Ñ– CW Ð°ÑˆÑƒ/Ð¶Ð°Ð±Ñƒ",
   "keyboard_shortcuts.toggle_sensitivity": "ÐºÓ©Ñ€ÑÐµÑ‚/Ð¶Ð°Ð¿",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "Ð¶Ð°Ð·Ð±Ð° Ò›Ð°Ð»Ð´Ñ‹Ñ€Ñƒ Ð°Ð»Ð°Ò£Ñ‹Ð½Ð°Ð½ ÑˆÑ‹Ò“Ñƒ",
   "keyboard_shortcuts.up": "Ñ‚Ñ–Ð·Ñ–Ð¼Ð´Ðµ Ð¶Ð¾Ò“Ð°Ñ€Ñ‹ ÑˆÑ‹Ò“Ñƒ",
   "lightbox.close": "Ð–Ð°Ð±Ñƒ",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "ÐšÐµÐ»ÐµÑÑ–",
   "lightbox.previous": "ÐÐ»Ð´Ñ‹Ò£Ò“Ñ‹",
-  "lightbox.view_context": "ÐšÐ¾Ð½Ñ‚ÐµÐºÑÑ‚Ñ– ÐºÓ©Ñ€ÑÐµÑ‚",
   "lists.account.add": "Ð¢Ñ–Ð·Ñ–Ð¼Ð³Ðµ Ò›Ð¾ÑÑƒ",
   "lists.account.remove": "Ð¢Ñ–Ð·Ñ–Ð¼Ð½ÐµÐ½ ÑˆÑ‹Ò“Ð°Ñ€Ñƒ",
   "lists.delete": "Ð¢Ñ–Ð·Ñ–Ð¼Ð´Ñ– Ó©ÑˆÑ–Ñ€Ñƒ",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Ð¢Ð°Ò›Ñ‹Ñ€Ñ‹Ð±Ñ‹Ð½ Ó©Ð·Ð³ÐµÑ€Ñ‚Ñƒ",
   "lists.new.create": "Ð¢Ñ–Ð·Ñ–Ð¼ Ò›Ò±Ñ€Ñƒ",
   "lists.new.title_placeholder": "Ð–Ð°Ò£Ð° Ñ‚Ñ–Ð·Ñ–Ð¼ Ð°Ñ‚Ñ‹",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Ð¡Ñ–Ð· Ñ–Ð·Ð´ÐµÐ³ÐµÐ½ Ð°Ð´Ð°Ð¼Ð´Ð°Ñ€ Ð°Ñ€Ð°ÑÑ‹Ð½Ð´Ð° Ñ–Ð·Ð´ÐµÑƒ",
   "lists.subheading": "Ð¢Ñ–Ð·Ñ–Ð¼Ð´ÐµÑ€Ñ–Ò£Ñ–Ð·",
   "load_pending": "{count, plural, one {# Ð¶Ð°Ò£Ð° Ð½Ó™Ñ€ÑÐµ} other {# Ð¶Ð°Ò£Ð° Ð½Ó™Ñ€ÑÐµ}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "ÐšÓ©Ñ€Ñ–Ð½ÑƒÐ´Ñ– Ò›Ð¾ÑÑƒ",
   "missing_indicator.label": "Ð¢Ð°Ð±Ñ‹Ð»Ð¼Ð°Ð´Ñ‹",
   "missing_indicator.sublabel": "Ð‘Ò±Ð» Ñ€ÐµÑÑƒÑ€Ñ Ñ‚Ð°Ð±Ñ‹Ð»Ð¼Ð°Ð´Ñ‹",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Ð‘Ò±Ð» Ò›Ð¾Ð»Ð´Ð°Ð½ÑƒÑˆÑ‹ ÐµÑÐºÐµÑ€Ñ‚Ð¿ÐµÐ»ÐµÑ€Ñ–Ð½ Ð¶Ð°ÑÑ‹Ñ€Ð°Ð¼Ñ‹Ð· Ð±Ð°?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "ÐœÐ¾Ð±Ð¸Ð»ÑŒ Ò›Ð¾ÑÑ‹Ð¼ÑˆÐ°Ð»Ð°Ñ€",
   "navigation_bar.blocks": "Ð‘Ò±Ò“Ð°Ñ‚Ñ‚Ð°Ð»Ò“Ð°Ð½Ð´Ð°Ñ€",
   "navigation_bar.bookmarks": "Ð‘ÐµÑ‚Ð±ÐµÐ»Ð³Ñ–Ð»ÐµÑ€",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Ð¡Ð°ÑƒÐ°Ð»Ð½Ð°Ð¼Ð° Ð°ÑÒ›Ñ‚Ð°Ð»Ð´Ñ‹",
   "notification.poll": "Ð‘Ò±Ð» ÑÐ°ÑƒÐ°Ð»Ð½Ð°Ð¼Ð°Ð½Ñ‹Ò£ Ð¼ÐµÑ€Ð·Ñ–Ð¼Ñ– Ð°ÑÒ›Ñ‚Ð°Ð»Ñ‹Ð¿Ñ‚Ñ‹",
   "notification.reblog": "{name} Ð¶Ð°Ð·Ð±Ð°Ò£Ñ‹Ð·Ð´Ñ‹ Ð±Ó©Ð»Ñ–ÑÑ‚Ñ–",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Ð•ÑÐºÐµÑ€Ñ‚Ð¿ÐµÐ»ÐµÑ€Ð´Ñ– Ñ‚Ð°Ð·Ð°Ñ€Ñ‚",
   "notifications.clear_confirmation": "Ð¨Ñ‹Ð½Ñ‹Ð¼ÐµÐ½ Ð±Ð°Ñ€Ð»Ñ‹Ò› ÐµÑÐºÐµÑ€Ñ‚Ð¿ÐµÐ»ÐµÑ€Ð´Ñ– Ó©ÑˆÑ–Ñ€ÐµÑÑ–Ð· Ð±Ðµ?",
   "notifications.column_settings.alert": "Ò®ÑÑ‚ÐµÐ» ÐµÑÐºÐµÑ€Ñ‚Ð¿ÐµÐ»ÐµÑ€Ñ–",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Ð‘Ó©Ð»Ñ–ÑÑƒÐ»ÐµÑ€:",
   "notifications.column_settings.show": "Ð‘Ð°Ò“Ð°Ð½Ð´Ð° ÐºÓ©Ñ€ÑÐµÑ‚",
   "notifications.column_settings.sound": "Ð”Ñ‹Ð±Ñ‹ÑÑ‹Ð½ Ò›Ð¾Ñ",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "Ð‘Ð°Ñ€Ð»Ñ‹Ò“Ñ‹",
   "notifications.filter.boosts": "Ð‘Ó©Ð»Ñ–ÑÑƒÐ»ÐµÑ€",
   "notifications.filter.favourites": "Ð¢Ð°Ò£Ð´Ð°ÑƒÐ»Ñ‹Ð»Ð°Ñ€",
   "notifications.filter.follows": "Ð–Ð°Ð·Ñ‹Ð»ÑƒÐ»Ð°Ñ€",
   "notifications.filter.mentions": "ÐÑ‚Ð°Ð»Ñ‹Ð¼Ð´Ð°Ñ€",
   "notifications.filter.polls": "Ð¡Ð°ÑƒÐ°Ð»Ð½Ð°Ð¼Ð° Ð½Ó™Ñ‚Ð¸Ð¶ÐµÐ»ÐµÑ€Ñ–",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} ÐµÑÐºÐµÑ€Ñ‚Ð¿Ðµ",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Ð–Ð°Ð±Ñ‹Ò›",
   "poll.refresh": "Ð–Ð°Ò£Ð°Ñ€Ñ‚Ñƒ",
   "poll.total_people": "{count, plural, one {# Ð°Ð´Ð°Ð¼} other {# Ð°Ð´Ð°Ð¼}}",
@@ -419,11 +443,11 @@
   "time_remaining.minutes": "{number, plural, one {# Ð¼Ð¸Ð½ÑƒÑ‚} other {# Ð¼Ð¸Ð½ÑƒÑ‚}}",
   "time_remaining.moments": "ÒšÐ°Ð»Ò“Ð°Ð½ ÑƒÐ°Ò›Ñ‹Ñ‚",
   "time_remaining.seconds": "{number, plural, one {# ÑÐµÐºÑƒÐ½Ð´} other {# ÑÐµÐºÑƒÐ½Ð´}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "timeline_hint.remote_resource_not_displayed": "{resource} Ð±Ð°ÑÒ›Ð° ÑÐµÑ€Ð²ÐµÑ€Ð»ÐµÑ€Ð´Ðµ ÐºÓ©Ñ€ÑÐµÑ‚Ñ–Ð»Ð¼ÐµÐ¹Ð´Ñ–.",
+  "timeline_hint.resources.followers": "ÐžÒ›Ñ‹Ñ€Ð¼Ð°Ð½",
+  "timeline_hint.resources.follows": "Ð–Ð°Ð·Ñ‹Ð»Ñ‹Ð¼",
+  "timeline_hint.resources.statuses": "Ð•ÑÐºÑ– Ð¿Ð¾ÑÑ‚Ñ‚Ð°Ñ€Ñ‹",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} Ð°Ð´Ð°Ð¼} other {{counter} Ð°Ð´Ð°Ð¼}} Ð°Ð¹Ñ‚Ñ‹Ð¿ Ð¶Ð°Ñ‚Ñ‹Ñ€",
   "trends.trending_now": "Ð¢Ñ€ÐµÐ½Ð´ Ñ‚Ð°Ò›Ñ‹Ñ€Ñ‹Ð¿Ñ‚Ð°Ñ€",
   "ui.beforeunload": "Mastodon Ð¶ÐµÐ»Ñ–ÑÑ–Ð½ÐµÐ½ ÑˆÑ‹Ò›ÑÐ°Ò£Ñ‹Ð·, Ð½Ð¾Ð±Ð°Ð¹Ñ‹Ò£Ñ‹Ð· ÑÐ°Ò›Ñ‚Ð°Ð»Ð¼Ð°Ð¹Ð´Ñ‹.",
   "units.short.billion": "{count}B",
@@ -436,16 +460,17 @@
   "upload_form.audio_description": "Ð•ÑÑ‚Ñƒ Ò›Ð°Ð±Ñ–Ð»ÐµÑ‚Ñ– Ð½Ð°ÑˆÐ°Ñ€ Ð°Ð´Ð°Ð¼Ð´Ð°Ñ€Ò“Ð° ÑÐ¸Ð¿Ð°Ñ‚Ñ‚Ð°Ð¼Ð° Ð±ÐµÑ€Ñ–Ò£Ñ–Ð·",
   "upload_form.description": "ÐšÓ©Ñ€Ñƒ Ò›Ð°Ð±Ñ–Ð»ÐµÑ‚Ñ– Ð½Ð°ÑˆÐ°Ñ€ Ð°Ð´Ð°Ð¼Ð´Ð°Ñ€ Ò¯ÑˆÑ–Ð½ ÑÐ¸Ð¿Ð°Ñ‚Ñ‚Ð°Ò£Ñ‹Ð·",
   "upload_form.edit": "Ð¢Ò¯Ð·ÐµÑ‚Ñƒ",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "Ð¡ÑƒÑ€ÐµÑ‚Ñ‚Ñ– Ó©Ð·Ð³ÐµÑ€Ñ‚Ñƒ",
   "upload_form.undo": "Ó¨ÑˆÑ–Ñ€Ñƒ",
   "upload_form.video_description": "Ð•ÑÑ‚Ñƒ Ð½ÐµÐ¼ÐµÑÐµ ÐºÓ©Ñ€Ñƒ Ò›Ð°Ð±Ñ–Ð»ÐµÑ‚Ñ– Ð½Ð°ÑˆÐ°Ñ€ Ð°Ð´Ð°Ð¼Ð´Ð°Ñ€Ò“Ð° ÑÐ¸Ð¿Ð°Ñ‚Ñ‚Ð°Ð¼Ð° Ð±ÐµÑ€Ñ–Ò£Ñ–Ð·",
   "upload_modal.analyzing_picture": "Ð¡ÑƒÑ€ÐµÑ‚Ñ‚Ñ– Ð°Ð½Ð°Ð»Ð¸Ð· Ð¶Ð°ÑÐ°Ñƒâ€¦",
   "upload_modal.apply": "ÒšÐ¾Ð»Ð´Ð°Ð½Ñƒ",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "Ð¡ÑƒÑ€ÐµÑ‚ Ñ‚Ð°Ò£Ð´Ð°Ñƒ",
   "upload_modal.description_placeholder": "Ð©ÑƒÑ‡Ð¸Ð½ÑÐº ÑÑŠÐµÐ·Ñ–Ð½Ð´ÐµÐ³Ñ– Ó©Ñ€Ñ‚ Ð¿Ðµ? Ð’Ð°Ð³Ð¾Ð½-Ò¯Ð¹, Ð°ÑÑ€Ð¾Ð¼Ð¾Ð±Ð¸Ð»ÑŒ Ò»Ó™Ð¼ Ò±ÑˆÐ°Ò› Ñ„ÑŽÐ·ÐµÐ»ÑÐ¶Ñ‹ Ñ†ÐµÑ…Ñ–Ð½ÐµÐ½ Ò“Ð¾Ð¹",
   "upload_modal.detect_text": "Ð¡ÑƒÑ€ÐµÑ‚Ñ‚ÐµÐ½ Ð¼Ó™Ñ‚Ñ–Ð½ Ð°Ð½Ñ‹Ò›Ñ‚Ð°Ñƒ",
   "upload_modal.edit_media": "ÐœÐµÐ´Ð¸Ð°Ñ„Ð°Ð¹Ð»Ð´Ñ‹ Ó©Ò£Ð´ÐµÑƒ",
   "upload_modal.hint": "ÐÐ»Ð´Ñ‹Ð½-Ð°Ð»Ð° Ò›Ð°Ñ€Ð°Ñƒ ÑˆÐµÒ£Ð±ÐµÑ€Ñ–Ð½ Ð±Ð°ÑÑ‹Ò£Ñ‹Ð· Ð½ÐµÐ¼ÐµÑÐµ ÑÒ¯Ð¹Ñ€ÐµÒ£Ñ–Ð·, Ð±Ð°Ñ€Ð»Ñ‹Ò› Ð½Ð¾Ð±Ð°Ð¹Ð»Ð°Ñ€Ð´Ð° ÐºÓ©Ñ€Ñ–Ð½ÐµÑ‚Ñ–Ð½ Ñ„Ð¾ÐºÑƒÑÑ‚Ñ‹ Ñ‚Ð°Ò£Ð´Ð°Ñƒ Ò¯ÑˆÑ–Ð½.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "ÐŸÑ€ÐµÐ²ÑŒÑŽ ({ratio})",
   "upload_progress.label": "Ð–Ò¯ÐºÑ‚ÐµÐ¿ Ð¶Ð°Ñ‚Ñ‹Ñ€...",
   "video.close": "Ð’Ð¸Ð´ÐµÐ¾Ð½Ñ‹ Ð¶Ð°Ð±Ñƒ",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index e9618e0f2e91cae8ed9bdc402197b2d04f0f9176..a5025bb72cbf6c795aa9dbdade9bd881629a89fb 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -1,19 +1,21 @@
 {
-  "account.account_note_header": "Note",
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.account_note_header": "à²Ÿà²¿à²ªà³à²ªà²£à²¿",
+  "account.add_or_remove_from_list": "à²ªà²Ÿà³à²Ÿà²¿à²—à³† à²¸à³‡à²°à²¿à²¸à³ à²…à²¥à²µ à²ªà²Ÿà³à²Ÿà²¿à²¯à²¿à²‚à²¦ à²¤à³†à²—à³†à²¦à³à²¹à²¾à²•à³",
   "account.badges.bot": "Bot",
-  "account.badges.group": "Group",
+  "account.badges.group": "à²—à³à²‚à²ªà³",
   "account.block": "Block @{name}",
   "account.block_domain": "Hide everything from {domain}",
   "account.blocked": "Blocked",
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Cancel follow request",
   "account.direct": "Direct message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Edit profile",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
-  "account.follow": "Follow",
-  "account.followers": "Followers",
+  "account.follow": "à²¹à²¿à²‚à²¬à²¾à²²à²¿à²¸à²¿",
+  "account.followers": "à²¹à²¿à²‚à²¬à²¾à²²à²•à²°à³",
   "account.followers.empty": "No one follows this user yet.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
@@ -30,7 +32,7 @@
   "account.mute_notifications": "Mute notifications from @{name}",
   "account.muted": "Muted",
   "account.never_active": "Never",
-  "account.posts": "Toots",
+  "account.posts": "à²Ÿà³‚à²Ÿà³â€Œà²—à²³à³",
   "account.posts_with_replies": "Toots and replies",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval",
@@ -47,12 +49,12 @@
   "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "An unexpected error occurred.",
-  "alert.unexpected.title": "Oops!",
+  "alert.unexpected.title": "à²…à²¯à³à²¯à³‹!",
   "announcement.announcement": "Announcement",
   "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.body": "Something went wrong while loading this component.",
-  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.retry": "à²®à²°à²³à²¿ à²ªà³à²°à²¯à²¤à³à²¨à²¿à²¸à²¿",
   "bundle_column_error.title": "Network error",
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
@@ -96,9 +98,9 @@
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "Write your warning here",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No toots here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "Authorize",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
-  "lightbox.view_context": "View context",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Change title",
   "lists.new.create": "Add list",
   "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Search among people you follow",
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.alert": "Desktop notifications",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Closed",
   "poll.refresh": "Refresh",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -389,7 +413,7 @@
   "status.pinned": "Pinned toot",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploadingâ€¦",
   "video.close": "Close video",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 78209fb0e8334e110580bfb86612504cf401f3a3..10f7eabcf89d6c4765c9e23e6174697dfb2985f3 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -1,5 +1,5 @@
 {
-  "account.account_note_header": "@{name} ì— ëŒ€í•œ ë…¸íŠ¸",
+  "account.account_note_header": "ë…¸íŠ¸",
   "account.add_or_remove_from_list": "ë¦¬ìŠ¤íŠ¸ì— ì¶”ê°€ í˜¹ì€ ì‚ì œ",
   "account.badges.bot": "ë´‡",
   "account.badges.group": "ê·¸ë£¹",
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "ì›ë³¸ í”„ë¡œí•„ì—ì„œ ë” íƒìƒ‰í•˜ê¸°",
   "account.cancel_follow_request": "íŒ”ë¡œìš° ìš”ì² ì·¨ì†Œ",
   "account.direct": "@{name}ì˜ ë‹¤ì´ë ‰íŠ¸ ë©”ì‹œì§€",
+  "account.disable_notifications": "@{name} ì˜ ê²Œì‹œë¬¼ ì•Œë¦¼ ë„ê¸°",
   "account.domain_blocked": "ë„ë©”ì¸ ìˆ¨ê²¨ì§",
   "account.edit_profile": "í”„ë¡œí•„ íŽ¸ì§‘",
+  "account.enable_notifications": "@{name} ì˜ ê²Œì‹œë¬¼ ì•Œë¦¼ ì¼œê¸°",
   "account.endorse": "í”„ë¡œí•„ì— ë³´ì´ê¸°",
   "account.follow": "íŒ”ë¡œìš°",
   "account.followers": "íŒ”ë¡œì›Œ",
@@ -43,7 +45,7 @@
   "account.unfollow": "íŒ”ë¡œìš° í•´ì œ",
   "account.unmute": "ë®¤íŠ¸ í•´ì œ",
   "account.unmute_notifications": "@{name}ì˜ ì•Œë¦¼ ë®¤íŠ¸ í•´ì œ",
-  "account_note.placeholder": "ìž‘ì„±ëœ ëŒ“ê¸€ì´ ì—†ìŒ",
+  "account_note.placeholder": "í´ë¦í•´ì„œ ë…¸íŠ¸ ì¶”ê°€",
   "alert.rate_limited.message": "{retry_time, time, medium}ì— ë‹¤ì‹œ ì‹œë„í•´ ì£¼ì„¸ìš”.",
   "alert.rate_limited.title": "ë¹ˆë„ ì œí•œ",
   "alert.unexpected.message": "ì˜ˆì¸¡í•˜ì§€ ëª»í•œ ì—ëŸ¬ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤.",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "ê²€ìƒ‰ ê²°ê³¼",
   "emoji_button.symbols": "ê¸°í˜¸",
   "emoji_button.travel": "ì—¬í–‰ê³¼ ìž¥ì†Œ",
+  "empty_column.account_suspended": "ê³„ì • ì •ì§€ë¨",
   "empty_column.account_timeline": "ì—¬ê¸´ íˆ¿ì´ ì—†ì–´ìš”!",
   "empty_column.account_unavailable": "í”„ë¡œí•„ ì‚¬ìš© ë¶ˆê°€",
   "empty_column.blocks": "ì•„ì§ ì•„ë¬´ë„ ì°¨ë‹¨í•˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "ì•„ì§ ì•Œë¦¼ì´ ì—†ìŠµë‹ˆë‹¤. ë‹¤ë¥¸ ì‚¬ëžŒê³¼ ëŒ€í™”ë¥¼ ì‹œìž‘í•´ ë³´ì„¸ìš”.",
   "empty_column.public": "ì—¬ê¸°ì—” ì•„ì§ ì•„ë¬´ ê²ƒë„ ì—†ìŠµë‹ˆë‹¤! ê³µê°œì ìœ¼ë¡œ ë¬´ì–¸ê°€ í¬ìŠ¤íŒ…í•˜ê±°ë‚˜, ë‹¤ë¥¸ ì„œë²„ì˜ ìœ ì €ë¥¼ íŒ”ë¡œìš° í•´ì„œ ì±„ì›Œë³´ì„¸ìš”",
   "error.unexpected_crash.explanation": "ë²„ê·¸ í˜¹ì€ ë¸Œë¼ìš°ì € í˜¸í™˜ì„± ë¬¸ì œë¡œ ì´ íŽ˜ì´ì§€ë¥¼ ì˜¬ë°”ë¥´ê²Œ í‘œì‹œí•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤.",
+  "error.unexpected_crash.explanation_addons": "ì´ íŽ˜ì´ì§€ëŠ” ì˜¬ë°”ë¥´ê²Œ ë³´ì—¬ì§ˆ ìˆ˜ ì—†ìŠµë‹ˆë‹¤. ë¸Œë¼ìš°ì € ì• ë“œì˜¨ì´ë‚˜ ìžë™ ë²ˆì— ë„êµ¬ ë“±ìœ¼ë¡œ ì¸í•´ ë°œìƒëœ ì—ëŸ¬ì¼ ìˆ˜ ìžˆìŠµë‹ˆë‹¤.",
   "error.unexpected_crash.next_steps": "íŽ˜ì´ì§€ë¥¼ ìƒˆë¡œê³ ì¹¨ í•´ë³´ì„¸ìš”. ê·¸ëž˜ë„ í•´ê²°ë˜ì§€ ì•ŠëŠ” ê²½ìš°, ë‹¤ë¥¸ ë¸Œë¼ìš°ì €ë‚˜ ë„¤ì´í‹°ë¸Œ ì•±ìœ¼ë¡œë„ ë§ˆìŠ¤í† ëˆì„ ì´ìš©í•˜ì‹¤ ìˆ˜ ìžˆìŠµë‹ˆë‹¤.",
+  "error.unexpected_crash.next_steps_addons": "ê·¸ê²ƒë“¤ì„ ë„ê³  íŽ˜ì´ì§€ë¥¼ ìƒˆë¡œê³ ì¹¨ í•´ë³´ì„¸ìš”. ê·¸ëž˜ë„ í•´ê²°ë˜ì§€ ì•ŠëŠ” ê²½ìš°, ë‹¤ë¥¸ ë¸Œë¼ìš°ì €ë‚˜ ë„¤ì´í‹°ë¸Œ ì•±ìœ¼ë¡œë„ ë§ˆìŠ¤í† ëˆì„ ì´ìš©í•˜ì‹¤ ìˆ˜ ìžˆìŠµë‹ˆë‹¤.",
   "errors.unexpected_crash.copy_stacktrace": "ì—ëŸ¬ ë‚´ìš©ì„ í´ë¦½ë³´ë“œì— ë³µì‚¬",
   "errors.unexpected_crash.report_issue": "ë¬¸ì œ ì‹ ê³ ",
   "follow_request.authorize": "í—ˆê°€",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "ìž‘ì„±ì°½ì—ì„œ í¬ì»¤ìŠ¤ í•´ì œ",
   "keyboard_shortcuts.up": "ë¦¬ìŠ¤íŠ¸ì—ì„œ ìœ„ë¡œ ì´ë™",
   "lightbox.close": "ë‹«ê¸°",
+  "lightbox.compress": "ì´ë¯¸ì§€ ë°•ìŠ¤ ì••ì¶•",
+  "lightbox.expand": "ì´ë¯¸ì§€ ë°•ìŠ¤ í™•ìž¥",
   "lightbox.next": "ë‹¤ìŒ",
   "lightbox.previous": "ì´ì „",
-  "lightbox.view_context": "ê²Œì‹œë¬¼ ë³´ê¸°",
   "lists.account.add": "ë¦¬ìŠ¤íŠ¸ì— ì¶”ê°€",
   "lists.account.remove": "ë¦¬ìŠ¤íŠ¸ì—ì„œ ì œê±°",
   "lists.delete": "ë¦¬ìŠ¤íŠ¸ ì‚ì œ",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "ì œëª© ìˆ˜ì •",
   "lists.new.create": "ë¦¬ìŠ¤íŠ¸ ì¶”ê°€",
   "lists.new.title_placeholder": "ìƒˆ ë¦¬ìŠ¤íŠ¸ì˜ ì´ë¦„",
+  "lists.replies_policy.followed": "íŒ”ë¡œìš° í•œ ì‚¬ìš©ìž ëˆ„êµ¬ë‚˜",
+  "lists.replies_policy.list": "ë¦¬ìŠ¤íŠ¸ì˜ êµ¬ì„±ì›ë“¤",
+  "lists.replies_policy.none": "ì•„ë¬´ë„ ì—†ìŒ",
+  "lists.replies_policy.title": "ë‹µê¸€ í‘œì‹œ:",
   "lists.search": "íŒ”ë¡œìš° ì¤‘ì¸ ì‚¬ëžŒë“¤ ì¤‘ì—ì„œ ì°¾ê¸°",
   "lists.subheading": "ë‹¹ì‹ ì˜ ë¦¬ìŠ¤íŠ¸",
   "load_pending": "{count}ê°œì˜ ìƒˆ í•ëª©",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "í‘œì‹œ ì „í™˜",
   "missing_indicator.label": "ì°¾ì„ ìˆ˜ ì—†ìŠµë‹ˆë‹¤",
   "missing_indicator.sublabel": "ì´ ë¦¬ì†ŒìŠ¤ë¥¼ ì°¾ì„ ìˆ˜ ì—†ì—ˆìŠµë‹ˆë‹¤",
+  "mute_modal.duration": "ê¸°ê°„",
   "mute_modal.hide_notifications": "ì´ ì‚¬ìš©ìžë¡œë¶€í„°ì˜ ì•Œë¦¼ì„ ìˆ¨ê¸°ì‹œê² ìŠµë‹ˆê¹Œ?",
+  "mute_modal.indefinite": "ë¬´ê¸°í•œ",
   "navigation_bar.apps": "ëª¨ë°”ì¼ ì•±",
   "navigation_bar.blocks": "ì°¨ë‹¨í•œ ì‚¬ìš©ìž",
   "navigation_bar.bookmarks": "ë³´ê´€í•¨",
@@ -291,13 +303,14 @@
   "navigation_bar.preferences": "ì‚¬ìš©ìž ì„¤ì •",
   "navigation_bar.public_timeline": "ì—°í•© íƒ€ìž„ë¼ì¸",
   "navigation_bar.security": "ë³´ì•ˆ",
-  "notification.favourite": "{name}ë‹˜ì´ ì¦ê²¨ì°¾ê¸° í–ˆìŠµë‹ˆë‹¤",
-  "notification.follow": "{name}ë‹˜ì´ ë‚˜ë¥¼ íŒ”ë¡œìš° í–ˆìŠµë‹ˆë‹¤",
-  "notification.follow_request": "{name}ë‹˜ì´ íŒ”ë¡œìš° ìš”ì²ì„ ë³´ëƒˆìŠµë‹ˆë‹¤",
-  "notification.mention": "{name}ë‹˜ì´ ë‹µê¸€ì„ ë³´ëƒˆìŠµë‹ˆë‹¤",
+  "notification.favourite": "{name} ë‹˜ì´ ì¦ê²¨ì°¾ê¸° í–ˆìŠµë‹ˆë‹¤",
+  "notification.follow": "{name} ë‹˜ì´ ë‚˜ë¥¼ íŒ”ë¡œìš° í–ˆìŠµë‹ˆë‹¤",
+  "notification.follow_request": "{name} ë‹˜ì´ íŒ”ë¡œìš° ìš”ì²ì„ ë³´ëƒˆìŠµë‹ˆë‹¤",
+  "notification.mention": "{name} ë‹˜ì´ ë‹µê¸€ì„ ë³´ëƒˆìŠµë‹ˆë‹¤",
   "notification.own_poll": "ë‚´ íˆ¬í‘œê°€ ëë‚¬ìŠµë‹ˆë‹¤",
   "notification.poll": "ë‹¹ì‹ ì´ ì°¸ì—¬ í•œ íˆ¬í‘œê°€ ì¢…ë£Œë˜ì—ˆìŠµë‹ˆë‹¤",
-  "notification.reblog": "{name}ë‹˜ì´ ë¶€ìŠ¤íŠ¸ í–ˆìŠµë‹ˆë‹¤",
+  "notification.reblog": "{name} ë‹˜ì´ ë¶€ìŠ¤íŠ¸ í–ˆìŠµë‹ˆë‹¤",
+  "notification.status": "{name} ë‹˜ì´ ë°©ê¸ˆ ê²Œì‹œë¬¼ì„ ì˜¬ë ¸ìŠµë‹ˆë‹¤",
   "notifications.clear": "ì•Œë¦¼ ì§€ìš°ê¸°",
   "notifications.clear_confirmation": "ì •ë§ë¡œ ì•Œë¦¼ì„ ì‚ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ?",
   "notifications.column_settings.alert": "ë°ìŠ¤í¬íƒ‘ ì•Œë¦¼",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "ë¶€ìŠ¤íŠ¸:",
   "notifications.column_settings.show": "ì»¬ëŸ¼ì— í‘œì‹œ",
   "notifications.column_settings.sound": "íš¨ê³¼ìŒ ìž¬ìƒ",
+  "notifications.column_settings.status": "ìƒˆ íˆ¿:",
   "notifications.filter.all": "ëª¨ë‘",
   "notifications.filter.boosts": "ë¶€ìŠ¤íŠ¸",
   "notifications.filter.favourites": "ì¦ê²¨ì°¾ê¸°",
   "notifications.filter.follows": "íŒ”ë¡œìš°",
   "notifications.filter.mentions": "ë©˜ì…˜",
   "notifications.filter.polls": "íˆ¬í‘œ ê²°ê³¼",
+  "notifications.filter.statuses": "íŒ”ë¡œìš° í•˜ëŠ” ì‚¬ëžŒë“¤ì˜ ìµœì‹  ê²Œì‹œë¬¼",
+  "notifications.grant_permission": "ê¶Œí•œ ë¶€ì—¬.",
   "notifications.group": "{count} ê°œì˜ ì•Œë¦¼",
+  "notifications.mark_as_read": "ëª¨ë“  ì•Œë¦¼ì„ ì½ì€ ìƒíƒœë¡œ í‘œì‹œ",
+  "notifications.permission_denied": "ê¶Œí•œì´ ê±°ë¶€ë˜ì—ˆê¸° ë•Œë¬¸ì— ë°ìŠ¤í¬íƒ‘ ì•Œë¦¼ì„ í™œì„±í™”í•  ìˆ˜ ì—†ìŒ",
+  "notifications.permission_denied_alert": "ì´ì „ì— ë¸Œë¼ìš°ì € ê¶Œí•œì´ ê±°ë¶€ë˜ì—ˆê¸° ë•Œë¬¸ì—, ë°ìŠ¤í¬íƒ‘ ì•Œë¦¼ì´ í™œì„±í™” ë  ìˆ˜ ì—†ìŠµë‹ˆë‹¤.",
+  "notifications.permission_required": "í•„ìš”í•œ ê¶Œí•œì´ ìŠ¹ì¸ë˜ì§€ ì•Šì•„ ë°ìŠ¤í¬íƒ‘ ì•Œë¦¼ì„ ì‚¬ìš©í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤.",
+  "notifications_permission_banner.enable": "ë°ìŠ¤í¬íƒ‘ ì•Œë¦¼ í™œì„±í™”",
+  "notifications_permission_banner.how_to_control": "ë§ˆìŠ¤í† ëˆì´ ì—´ë ¤ ìžˆì§€ ì•Šì„ ë•Œì—ë„ ì•Œë¦¼ì„ ë°›ìœ¼ë ¤ë©´, ë°ìŠ¤í¬íƒ‘ ì•Œë¦¼ì„ í™œì„±í™” í•˜ì„¸ìš”. ë‹¹ì‹ ì€ ì–´ë–¤ ì¢…ë¥˜ì˜ ë°˜ì‘ì´ ë°ìŠ¤í¬íƒ‘ ì•Œë¦¼ì„ ë°œìƒí•  ì§€ë¥¼ {icon} ë²„íŠ¼ì„ í†µí•´ ì„¸ì„¸í•˜ê²Œ ì„¤ì •í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤.",
+  "notifications_permission_banner.title": "ì•„ë¬´ê²ƒë„ ë†“ì¹˜ì§€ ë§ˆì„¸ìš”",
+  "picture_in_picture.restore": "ë‹¤ì‹œ ë„£ê¸°",
   "poll.closed": "ë§ˆê°ë¨",
   "poll.refresh": "ìƒˆë¡œê³ ì¹¨",
   "poll.total_people": "{count}ëª…",
@@ -390,7 +414,7 @@
   "status.read_more": "ë” ë³´ê¸°",
   "status.reblog": "ë¶€ìŠ¤íŠ¸",
   "status.reblog_private": "ì›ëž˜ì˜ ìˆ˜ì‹ ìžë“¤ì—ê²Œ ë¶€ìŠ¤íŠ¸",
-  "status.reblogged_by": "{name}ë‹˜ì´ ë¶€ìŠ¤íŠ¸ í–ˆìŠµë‹ˆë‹¤",
+  "status.reblogged_by": "{name} ë‹˜ì´ ë¶€ìŠ¤íŠ¸ í–ˆìŠµë‹ˆë‹¤",
   "status.reblogs.empty": "ì•„ì§ ì•„ë¬´ë„ ì´ íˆ¿ì„ ë¶€ìŠ¤íŠ¸í•˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤. ë¶€ìŠ¤íŠ¸ í•œ ì‚¬ëžŒë“¤ì´ ì—¬ê¸°ì— í‘œì‹œ ë©ë‹ˆë‹¤.",
   "status.redraft": "ì§€ìš°ê³  ë‹¤ì‹œ ì“°ê¸°",
   "status.remove_bookmark": "ë³´ê´€í•œ íˆ¿ ì‚ì œ",
@@ -419,16 +443,16 @@
   "time_remaining.minutes": "{number} ë¶„ ë‚¨ìŒ",
   "time_remaining.moments": "ë‚¨ì€ ì‹œê°„",
   "time_remaining.seconds": "{number} ì´ˆ ë‚¨ìŒ",
-  "timeline_hint.remote_resource_not_displayed": "ë‹¤ë¥¸ ì„œë²„ì˜ {resource}ëŠ” ë³´ì—¬ì§€ì§€ ì•ŠìŠµë‹ˆë‹¤.",
+  "timeline_hint.remote_resource_not_displayed": "ë‹¤ë¥¸ ì„œë²„ì˜ {resource} í‘œì‹œëŠ” í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤.",
   "timeline_hint.resources.followers": "íŒ”ë¡œì›Œ",
   "timeline_hint.resources.follows": "íŒ”ë¡œìš°",
   "timeline_hint.resources.statuses": "ì´ì „ íˆ¿",
   "trends.counter_by_accounts": "{counter} ëª…ì´ ë§í•˜ëŠ” ì¤‘",
   "trends.trending_now": "ì§€ê¸ˆ ìœ í–‰ì¤‘",
   "ui.beforeunload": "ì§€ê¸ˆ ë‚˜ê°€ë©´ ì €ìž¥ë˜ì§€ ì•Šì€ í•ëª©ì„ ìžƒê²Œ ë©ë‹ˆë‹¤.",
-  "units.short.billion": "{count}ì‹ì–µ",
-  "units.short.million": "{count}ë°±ë§Œ",
-  "units.short.thousand": "{count}ì²œ",
+  "units.short.billion": "{count}B",
+  "units.short.million": "{count}B",
+  "units.short.thousand": "{count}K",
   "upload_area.title": "ë“œëž˜ê·¸ & ë“œë¡ìœ¼ë¡œ ì—…ë¡œë“œ",
   "upload_button.label": "ë¯¸ë””ì–´ ì¶”ê°€ (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "íŒŒì¼ ì—…ë¡œë“œ ì œí•œì— ë„ë‹¬í–ˆìŠµë‹ˆë‹¤.",
@@ -436,16 +460,17 @@
   "upload_form.audio_description": "ì²ê° ìž¥ì• ì¸ì„ ìœ„í•œ ì„¤ëª…",
   "upload_form.description": "ì‹œê°ìž¥ì• ì¸ì„ ìœ„í•œ ì„¤ëª…",
   "upload_form.edit": "íŽ¸ì§‘",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "ì¸ë„¤ì¼ ë³€ê²½",
   "upload_form.undo": "ì‚ì œ",
   "upload_form.video_description": "ì²ê°, ì‹œê° ìž¥ì• ì¸ì„ ìœ„í•œ ì„¤ëª…",
   "upload_modal.analyzing_picture": "ì´ë¯¸ì§€ ë¶„ì„ ì¤‘â€¦",
   "upload_modal.apply": "ì ìš©",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "ì´ë¯¸ì§€ ì„ íƒ",
   "upload_modal.description_placeholder": "ë‹¤ëžŒì¥ í—Œ ì³‡ë°”í€´ íƒ€ê³ íŒŒ",
   "upload_modal.detect_text": "ì´ë¯¸ì§€ì—ì„œ í…ìŠ¤íŠ¸ ì¶”ì¶œ",
   "upload_modal.edit_media": "ë¯¸ë””ì–´ íŽ¸ì§‘",
   "upload_modal.hint": "ë¯¸ë¦¬ë³´ê¸°ë¥¼ í´ë¦í•˜ê±°ë‚˜ ë“œëž˜ê·¸ í•´ì„œ í¬ì»¬ í¬ì¸íŠ¸ë¥¼ ë§žì¶”ì„¸ìš”. ì´ ì ì€ ì¸ë„¤ì¼ì— í•ìƒ ë³´ì—¬ì§ˆ ë¶€ë¶„ì„ ë‚˜íƒ€ëƒ…ë‹ˆë‹¤.",
+  "upload_modal.preparing_ocr": "OCR ì¤€ë¹„ ì¤‘â€¦",
   "upload_modal.preview_label": "ë¯¸ë¦¬ë³´ê¸° ({ratio})",
   "upload_progress.label": "ì—…ë¡œë“œ ì¤‘...",
   "video.close": "ë™ì˜ìƒ ë‹«ê¸°",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index e5d833fe87465898b1831bb4ceb749f69e1f8e65..3c359d2229d79d3d0b4e33e4a3f439519d065542 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -1,461 +1,486 @@
 {
-  "account.account_note_header": "Note",
-  "account.add_or_remove_from_list": "Add or Remove from lists",
-  "account.badges.bot": "Bot",
-  "account.badges.group": "Group",
-  "account.block": "Block @{name}",
-  "account.block_domain": "Block domain {domain}",
-  "account.blocked": "Blocked",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Cancel follow request",
-  "account.direct": "Direct message @{name}",
-  "account.domain_blocked": "Domain blocked",
-  "account.edit_profile": "Edit profile",
-  "account.endorse": "Feature on profile",
-  "account.follow": "Follow",
-  "account.followers": "Followers",
-  "account.followers.empty": "No one follows this user yet.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.account_note_header": "ØªÛŽØ¨ÛŒÙ†ÛŒ    ",
+  "account.add_or_remove_from_list": "Ø²ÛŒØ§Ø¯Ú©Ø±Ø¯Ù† ÛŒØ§Ù† Ø³Ú•ÛŒÙ†Û•ÙˆÛ• Ù„Û• Ù¾ÛŽØ±Ø³ØªÛ•Ú©Ø§Ù†",
+  "account.badges.bot": "Ø¨ÙˆØª",
+  "account.badges.group": "Ú¯Ø±ÙˆÙˆÙ¾",
+  "account.block": "Ø¨Ù„Û†Ú©ÛŒ @{name}",
+  "account.block_domain": "Ø¨Ù„Û†Ú©ÛŒ Ù‡Û•Ù…ÙˆÙˆ Ø´ØªÛŽÚ© Ù„Û• {domain}",
+  "account.blocked": "Ø¨Ù„Û†Ú©Ú©Ø±Ø§",
+  "account.browse_more_on_origin_server": "Ú¯Û•Ú•Ø§Ù†ÛŒ ÙØ±Û•ØªØ± Ù„Û• Ø³Û•Ø± Ù¾Ø±Û†ÙØ§ÛŒÙ„ÛŒ Ø³Û•Ø±Û•Ú©ÛŒ",
+  "account.cancel_follow_request": "Ø¨Û•ØªØ§ÚµÚ©Ø±Ø¯Ù†ÛŒ Ø¯Ø§ÙˆØ§ÛŒ Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙ†",
+  "account.direct": "Ù¾Û•ÛŒØ§Ù…ÛŒ ØªØ§ÛŒØ¨Û•Øª Ø¨Û• @{name}",
+  "account.disable_notifications": "Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û• Ù…Û•Ù†ÛŽØ±Û• Ø¨Û†Ù… Ú©Ø§ØªÛŽÚ© @{name} Ù¾Û†Ø³Øª Ø¯Û•Ú©Ø±ÛŽØª",
+  "account.domain_blocked": "Ø¯Û†Ù…Û•ÛŒÙ† Ù‚Û•Ù¾Ø§ØªÚ©Ø±Ø§",
+  "account.edit_profile": "Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„",
+  "account.enable_notifications": "Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±Ù… Ø¨Ú©Û•ÙˆÛ• Ú©Ø§ØªÛŽÚ© @{name} Ø¨Ø§Ø¨Û•ØªÛ•Ú©Ø§Ù†",
+  "account.endorse": "Ù†Ø§Ø³Ø§Ù†Ø¯Ù† Ù„Û• Ù¾Ø±Û†ÙØ§ÛŒÙ„",
+  "account.follow": "Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙ†",
+  "account.followers": "Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆÙˆØ§Ù†",
+  "account.followers.empty": "Ú©Û•Ø³ÛŽÚ© Ø´ÙˆÛŽÙ† Ø¦Û•Ù… Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Û• Ù†Û•Ú©Û•ÙˆØªÙˆÙˆÛ•",
+  "account.followers_counter": "{count, plural, one {{counter} Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆÙˆ} other {{counter} Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆÙˆ}}",
   "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.hide_reblogs": "Hide boosts from @{name}",
-  "account.last_status": "Last active",
-  "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 moved to:",
-  "account.mute": "Mute @{name}",
-  "account.mute_notifications": "Mute notifications from @{name}",
-  "account.muted": "Muted",
-  "account.never_active": "Never",
-  "account.posts": "Toots",
-  "account.posts_with_replies": "Toots and replies",
-  "account.report": "Report @{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": "Unblock domain {domain}",
-  "account.unendorse": "Don't feature on profile",
-  "account.unfollow": "Unfollow",
-  "account.unmute": "Unmute @{name}",
-  "account.unmute_notifications": "Unmute notifications from @{name}",
-  "account_note.placeholder": "Click to add a note",
-  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Rate limited",
-  "alert.unexpected.message": "An unexpected error occurred.",
-  "alert.unexpected.title": "Oops!",
-  "announcement.announcement": "Announcement",
-  "autosuggest_hashtag.per_week": "{count} per week",
-  "boost_modal.combo": "You can press {combo} to skip this next time",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
-  "bundle_column_error.retry": "Try again",
-  "bundle_column_error.title": "Network error",
-  "bundle_modal_error.close": "Close",
-  "bundle_modal_error.message": "Something went wrong while loading this component.",
-  "bundle_modal_error.retry": "Try again",
-  "column.blocks": "Blocked users",
-  "column.bookmarks": "Bookmarks",
-  "column.community": "Local timeline",
-  "column.direct": "Direct messages",
-  "column.directory": "Browse profiles",
-  "column.domain_blocks": "Blocked domains",
-  "column.favourites": "Favourites",
-  "column.follow_requests": "Follow requests",
-  "column.home": "Home",
-  "column.lists": "Lists",
-  "column.mutes": "Muted users",
-  "column.notifications": "Notifications",
-  "column.pins": "Pinned toot",
-  "column.public": "Federated timeline",
-  "column_back_button.label": "Back",
-  "column_header.hide_settings": "Hide settings",
-  "column_header.moveLeft_settings": "Move column to the left",
-  "column_header.moveRight_settings": "Move column to the right",
-  "column_header.pin": "Pin",
-  "column_header.show_settings": "Show settings",
-  "column_header.unpin": "Unpin",
-  "column_subheading.settings": "Settings",
-  "community.column_settings.local_only": "Local only",
-  "community.column_settings.media_only": "Media only",
-  "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
-  "compose_form.direct_message_warning_learn_more": "Learn more",
-  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
-  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
-  "compose_form.lock_disclaimer.lock": "locked",
-  "compose_form.placeholder": "What is on your mind?",
-  "compose_form.poll.add_option": "Add a choice",
-  "compose_form.poll.duration": "Poll duration",
-  "compose_form.poll.option_placeholder": "Choice {number}",
-  "compose_form.poll.remove_option": "Remove this choice",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Toot",
+  "account.follows.empty": "Ø¦Û•Ù… Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Û• ØªØ§ Ø¦ÛŽØ³ØªØ§ Ø´ÙˆÛŽÙ† Ú©Û•Ø³ Ù†Û•Ú©Û•ÙˆØªÙˆÙˆÛ•.",
+  "account.follows_you": "Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆÙˆÛ•Ú©Ø§Ù†Øª",
+  "account.hide_reblogs": "Ø¯Ø§Ø´Ø§Ø±Ø¯Ù†ÛŒ Ø¨ÙˆÙˆØ³ØªÛ•Ú©Ø§Ù† Ù„Û• @{name}",
+  "account.last_status": "Ø¯ÙˆØ§ÛŒÛŒÙ† Ú†Ø§Ù„Ø§Ú©ÛŒ",
+  "account.link_verified_on": "Ø®Ø§ÙˆÛ•Ù†Ø¯Ø§Ø±ÛŒÛ•ØªÛŒ Ø¦Û•Ù… Ù„ÛŒÙ†Ú©Û• Ù„Û• {date} Ú†ÛŽÚ© Ú©Ø±Ø§ÙˆÛ•",
+  "account.locked_info": "ØªØ§ÛŒØ¨Û•ØªÙ…Û•Ù†Ø¯ÛŒ Ø¦Û•Ù… Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒÛ• Ú•ÛŒÚ©Ø®Ø±Ø§ÙˆÛ• Ø¨Û† Ù‚ÙˆÙÚµØ¯Ø±Ø§ÙˆÛ•. Ø®Ø§ÙˆÛ•Ù†Û•Ú©Û• Ø¨Û• Ø¯Û•Ø³ØªÛŒ Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ• Ø¯Û•Ú©Ø§Øª Ú©Û• Ú©ÛŽ Ø¯Û•ØªÙˆØ§Ù†ÛŽØª Ø´ÙˆÛŽÙ†ÛŒØ§Ù† Ø¨Ú©Û•ÙˆÛŽØª.",
+  "account.media": "Ù…ÛŒØ¯ÛŒØ§",
+  "account.mention": "Ø¦Ø§Ù…Ø§Ú˜Û• @{name}",
+  "account.moved_to": "{name} Ú¯ÙˆØ§Ø³ØªØ±Ø§ÛŒÛ•ÙˆÛ• Ø¨Û†:",
+  "account.mute": "Ø¨ÛŽØ¯Û•Ù†Ú¯Ú©Ø±Ø¯Ù† @{name}",
+  "account.mute_notifications": "Ù‡Û†Ø´ÛŒØ§Ø±Ú©Û•Ø±Û•ÙˆÛ•Ú©Ø§Ù† Ù„Ø§Ø¨Ø¨Û• Ù„Û• @{name}",
+  "account.muted": "Ø¨ÛŽ Ø¯Û•Ù†Ú¯",
+  "account.never_active": "Ù‡Û•Ø±Ú¯ÛŒØ²",
+  "account.posts": "ØªÙˆØªØ³",
+  "account.posts_with_replies": "ØªÙˆØªØ³ Ùˆ ÙˆÛ•ÚµØ§Ù…Û•Ú©Ø§Ù†",
+  "account.report": "Ú¯ÙˆØ²Ø§Ø±Ø´Øª @{name}",
+  "account.requested": "Ú†Ø§ÙˆÛ•Ú•ÛŽÛŒ Ú•Û•Ø²Ø§Ù…Û•Ù†Ø¯ÛŒÙ†. Ú©Ø±ØªÛ• Ø¨Ú©Û• Ø¨Û† Ù‡Û•ÚµÙˆÛ•Ø´Ø§Ù†Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒ Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙ†",
+  "account.share": "Ù¾Ø±Û†ÙØ§ÛŒÙ„ÛŒ @{name} Ù‡Ø§ÙˆØ¨Û•Ø´ Ø¨Ú©Û•",
+  "account.show_reblogs": "Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ø¨Û•Ø±Ø²Ú©Ø±Ø¯Ù†Û•ÙˆÛ•Ú©Ø§Ù† Ù„Û• @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.unblock": "@{name} Ù„Ø§Ø¨Ø¨Û•",
+  "account.unblock_domain": "Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø¯Û†Ù…Û•ÛŒÙ†ÛŒ {domain}",
+  "account.unendorse": "ØªØ§ÛŒØ¨Û•ØªÙ…Û•Ù†Ø¯ÛŒ Ù„Û•Ø³Û•Ø± Ù¾Ø±Û†ÙØ§ÛŒÙ„Û•Ú©Û• Ù†ÛŒÛ•",
+  "account.unfollow": "Ø¨Û•Ø¯ÙˆØ§Ø¯Ø§Ù†Û•Ú†Ùˆ",
+  "account.unmute": "Ø¨ÛŽØ¯Û•Ù†Ú¯Ú©Ø±Ø¯Ù†ÛŒ @{name}",
+  "account.unmute_notifications": "Ø¨ÛŽØ¯Û•Ù†Ú¯Ú©Ø±Ø¯Ù†ÛŒ Ù‡Û†Ø´ÛŒØ§Ø±ÛŒÛŒÛ•Ú©Ø§Ù† Ù„Û• @{name}",
+  "account_note.placeholder": "Ú©Ø±ØªÛ•Ø¨Ú©Û• Ø¨Û† Ø²ÛŒØ§Ø¯Ú©Ø±Ø¯Ù†ÛŒ ØªÛŽØ¨ÛŒÙ†ÛŒ",
+  "alert.rate_limited.message": "ØªÚ©Ø§ÛŒÛ• Ù‡Û•ÙˆÚµØ¨Ø¯Û•Ø±Û•ÙˆÛ• Ø¯ÙˆØ§ÛŒ {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Ú•ÛŽÚ˜Û•ÛŒ Ø³Ù†ÙˆÙˆØ±Ø¯Ø§Ø±",
+  "alert.unexpected.message": "Ù‡Û•ÚµÛ•ÛŒÛ•Ú©ÛŒ Ú†Ø§ÙˆÛ•Ú•ÙˆØ§Ù† Ù†Û•Ú©Ø±Ø§Ùˆ Ú•ÙˆÙˆÛŒØ¯Ø§.",
+  "alert.unexpected.title": "ØªÛ•ØØØ!",
+  "announcement.announcement": "Ø¨Ø§Ù†Ú¯Û•ÙˆØ§Ø²",
+  "autosuggest_hashtag.per_week": "{count} Ù‡Û•Ø±Ù‡Û•ÙØªÛ•",
+  "boost_modal.combo": "Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø¯Û•Ø³Øª Ø¨Ù†ÛŽÛŒ Ø¨Û• Ø³Û•Ø± {combo} Ø¨Û† Ø¨Ø§Ø²Ø¯Ø§Ù† Ù„Û• Ø¬Ø§Ø±ÛŒ Ø¯Ø§Ù‡Ø§ØªÙˆÙˆ",
+  "bundle_column_error.body": "Ù‡Û•ÚµÛ•ÛŒÛ•Ú© Ú•ÙˆÙˆÛŒØ¯Ø§ Ù„Û•Ú©Ø§ØªÛŒ Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†ÛŒ Ø¦Û•Ù… Ù¾ÛŽÚ©Ù‡Ø§ØªÛ•ÛŒÛ•.",
+  "bundle_column_error.retry": "Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ù‡Û•ÙˆÚµØ¨Ø¯Û•",
+  "bundle_column_error.title": "Ù‡Û•ÚµÙŠÛŒ ØªÛ†Ú•",
+  "bundle_modal_error.close": "Ø¯Ø§Ø®Ø³ØªÙ†",
+  "bundle_modal_error.message": "Ù‡Û•ÚµÛ•ÛŒÛ•Ú© Ú•ÙˆÙˆÛŒØ¯Ø§ Ù„Û•Ú©Ø§ØªÛŒ Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†ÛŒ Ø¦Û•Ù… Ù¾ÛŽÚ©Ù‡Ø§ØªÛ•ÛŒÛ•.",
+  "bundle_modal_error.retry": "Ø¯ÙˆÙˆØ¨Ø§Ø±Û• ØªØ§Ù‚ÛŒ Ø¨Ú©Û•ÙˆÛ•",
+  "column.blocks": "Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Û• Ø¨Ù„Û†Ú©Ú©Ø±Ø§ÙˆÛ•Ú©Ø§Ù†",
+  "column.bookmarks": "Ù†ÛŒØ´Ø§Ù†Û•Ú©Ø§Ù†",
+  "column.community": "Ù‡ÛŽÚµÛŒ Ú©Ø§ØªÛŒ Ù†Ø§ÙˆØ®Û†ÛŒÛŒ",
+  "column.direct": "Ù†Ø§Ù…Û• Ú•Ø§Ø³ØªÛ•ÙˆØ®Û†Ú©Ø§Ù†",
+  "column.directory": "Ú¯Û•Ú•Ø§Ù† Ù„Û• Ù¾Ø±Û†ÙØ§ÛŒÙ„Û•Ú©Ø§Ù†",
+  "column.domain_blocks": "Ø¯Û†Ù…Û•ÛŒÙ†Û• Ø¯Ø§Ø®Ø±Ø§ÙˆÛ•Ú©Ø§Ù†",
+  "column.favourites": "Ø¯ÚµØ®ÙˆØ§Ø²ØªØ±ÛŒÙ†Û•Ú©Ø§Ù†",
+  "column.follow_requests": "Ø¨Û•Ø¯ÙˆØ§Ø¯Ø§Ú†ÙˆÛŒ Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒÛ•Ú©Ø§Ù† Ø¨Ú©Û•",
+  "column.home": "Ø³Û•Ø±Û•ØªØ§",
+  "column.lists": "Ù¾ÛŽØ±Ø³Øª",
+  "column.mutes": "Ø¨ÛŽØ¯Û•Ù†Ú¯Ú©Ø±Ø¯Ù†ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†",
+  "column.notifications": "Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒÛŒÛ•Ú©Ø§Ù†",
+  "column.pins": "ØªÙˆÙˆØªØ³ÛŒ Ú†Û•Ø³Ù¾Ø§Ùˆ",
+  "column.public": "Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ Ù‡Û•Ù…ÙˆÙˆØ´ÙˆÛŽÙ†ÛŽÚ©",
+  "column_back_button.label": "Ø¯ÙˆØ§ÙˆÛ•",
+  "column_header.hide_settings": "Ø´Ø§Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ú•ÛŽÚ©Ø®Ø³ØªÙ†Û•Ú©Ø§Ù†",
+  "column_header.moveLeft_settings": "Ø³ØªÙˆÙˆÙ† Ø¨Ú¯ÙˆÛŽØ²Û•Ø±Û•ÙˆÛ• Ø¨Û† Ù„Ø§ÛŒ Ú†Û•Ù¾",
+  "column_header.moveRight_settings": "Ø¬ÙˆÙˆÙ„Ø§Ù†Ø¯Ù†ÛŒ Ø¦Û•Ø³ØªÙˆÙˆÙ† Ø¨Û† Ù„Ø§ÛŒ Ú•Ø§Ø³Øª",
+  "column_header.pin": "Ø³Ù†Ø¬Ø§Ù‚",
+  "column_header.show_settings": "Ù†ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ø±ÛŽÚ©Ø®Ø³ØªÙ†Û•Ú©Ø§Ù†",
+  "column_header.unpin": "Ø³Ù†Ø¬Ø§Ù‚ Ù†Û•Ú©Ø±Ø¯Ù†",
+  "column_subheading.settings": "Ø±ÛŽÚ©Ø®Ø³ØªÙ†Û•Ú©Ø§Ù†",
+  "community.column_settings.local_only": "ØªÛ•Ù†Ù‡Ø§ Ø®Û†Ù…Ø§ÚµÛŒ",
+  "community.column_settings.media_only": "ØªÛ•Ù†Ù‡Ø§ Ù…ÛŒØ¯ÛŒØ§",
+  "community.column_settings.remote_only": "ØªÛ•Ù†Ù‡Ø§ Ø¨Û† Ø¯ÙˆÙˆØ±",
+  "compose_form.direct_message_warning": "Ø¦Û•Ù… ØªÙˆØªÛ• ØªÛ•Ù†ÛŒØ§ Ø¨Û† Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†ÛŒ Ù†Ø§ÙˆØ¨Ø±Ø§Ùˆ Ø¯Û•Ù†ÛŽØ±Ø¯Ø±ÛŽØª.",
+  "compose_form.direct_message_warning_learn_more": "Ø²ÛŒØ§ØªØ± ÙÛŽØ±Ø¨Ù‡",
+  "compose_form.hashtag_warning": "Ø¦Û•Ù… ØªÙˆØªÛ• Ù„Û• Ú˜ÛŽØ± Ù‡ÛŒÚ† Ù‡Ø§Ø´ØªØ§Ú¯ÛŒÛŒÛ•Ú© Ø¯Ø§ Ù†Ø§Ú©Ø±ÛŽØª ÙˆÛ•Ú© Ø¦Û•ÙˆÛ•ÛŒ Ù„Û• Ù„ÛŒØ³ØªÛ•Ú©Û•Ø¯Ø§ Ù†Û•Ø±ÛŒØ²Ø±Ø§ÙˆÛ•. ØªÛ•Ù†Ù‡Ø§ ØªÙˆØªÛŒ Ú¯Ø´ØªÛŒ Ø¯Û•ØªÙˆØ§Ù†Ø±ÛŽØª Ø¨Û• Ù‡Ø§Ø´ØªØ§Ú¯ÛŒ Ø¨Ú¯Û•Ú•ÛŽØª.",
+  "compose_form.lock_disclaimer": "Ù‡Û•Ú˜Ù…ÛŽØ±Û•Ú©Û•ÛŒ Ù„Û• ØØ§ÚµÛ•ØªÛŒ {locked}. Ù‡Û•Ø± Ú©Û•Ø³ÛŽÚ© Ø¯Û•ØªÙˆØ§Ù†ÛŽØª Ø´ÙˆÛŽÙ†Øª Ø¨Ú©Û•ÙˆÛŽØª Ø¨Û† Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ø¨Ø§Ø¨Û•ØªÛ•Ú©Ø§Ù†ÛŒ ØªÛ•Ù†Ù‡Ø§ Ø¯ÙˆØ§ÛŒØ®Û†ÛŒ.",
+  "compose_form.lock_disclaimer.lock": "Ù‚ÙÚµ Ø¯Ø±Ø§ÙˆÛ•",
+  "compose_form.placeholder": "Ú†ÛŒ Ù„Û• Ù…ÛŽØ´Ú©ØªØ¯Ø§ÛŒÛ•?",
+  "compose_form.poll.add_option": "Ø²ÛŒØ§Ø¯Ú©Ø±Ø¯Ù†ÛŒ Ù‡Û•ÚµØ¨Ú˜Ø§Ø±Ø¯Û•ÛŒÛ•Ú©",
+  "compose_form.poll.duration": "Ù…Ø§ÙˆÛ•ÛŒ Ú•Ø§Ù¾Ø±Ø³ÛŒ",
+  "compose_form.poll.option_placeholder": "Ù‡Û•ÚµØ¨Ú˜Ø§Ø±Ø¯Ù† {number}",
+  "compose_form.poll.remove_option": "Ù„Ø§Ø¨Ø±Ø¯Ù†ÛŒ Ø¦Û•Ù… Ù‡Û•ÚµØ¨Ú˜Ø§Ø±Ø¯Û•ÛŒÛ•",
+  "compose_form.poll.switch_to_multiple": "Ú•Ø§Ù¾Ø±Ø³ÛŒ Ø¨Ú¯Û†Ú•Û• Ø¨Û† Ú•ÛŽÚ¯Û•Ø¯Ø§Ù† Ø¨Û• Ú†Û•Ù†Ø¯ Ù‡Û•ÚµØ¨Ú˜Ø§Ø±Ø¯Ù†ÛŽÚ©",
+  "compose_form.poll.switch_to_single": "Ú¯Û†Ú•ÛŒÙ†ÛŒ Ú•Ø§Ù¾Ø±Ø³ÛŒ Ø¨Û† Ú•ÛŽÚ¯Û•Ø¯Ø§Ù† Ø¨Û• ØªØ§Ú©Û• Ù‡Û•ÚµØ¨Ú˜Ø§Ø±Ø¯Ù†ÛŽÚ©",
+  "compose_form.publish": "ØªÙˆØª",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
-  "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "Write your warning here",
-  "confirmation_modal.cancel": "Cancel",
-  "confirmations.block.block_and_report": "Block & Report",
-  "confirmations.block.confirm": "Block",
-  "confirmations.block.message": "Are you sure you want to block {name}?",
-  "confirmations.delete.confirm": "Delete",
-  "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.delete_list.confirm": "Delete",
-  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
-  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
-  "confirmations.logout.confirm": "Log out",
-  "confirmations.logout.message": "Are you sure you want to log out?",
-  "confirmations.mute.confirm": "Mute",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
-  "confirmations.mute.message": "Are you sure you want to mute {name}?",
-  "confirmations.redraft.confirm": "Delete & redraft",
-  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
-  "confirmations.reply.confirm": "Reply",
-  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
-  "confirmations.unfollow.confirm": "Unfollow",
-  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
-  "conversation.delete": "Delete conversation",
-  "conversation.mark_as_read": "Mark as read",
-  "conversation.open": "View conversation",
-  "conversation.with": "With {names}",
-  "directory.federated": "From known fediverse",
-  "directory.local": "From {domain} only",
-  "directory.new_arrivals": "New arrivals",
-  "directory.recently_active": "Recently active",
-  "embed.instructions": "Embed this status on your website by copying the code below.",
-  "embed.preview": "Here is what it will look like:",
-  "emoji_button.activity": "Activity",
-  "emoji_button.custom": "Custom",
-  "emoji_button.flags": "Flags",
-  "emoji_button.food": "Food & Drink",
-  "emoji_button.label": "Insert emoji",
-  "emoji_button.nature": "Nature",
-  "emoji_button.not_found": "No emojos!! (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
-  "emoji_button.objects": "Objects",
-  "emoji_button.people": "People",
-  "emoji_button.recent": "Frequently used",
-  "emoji_button.search": "Search...",
-  "emoji_button.search_results": "Search results",
-  "emoji_button.symbols": "Symbols",
-  "emoji_button.travel": "Travel & Places",
-  "empty_column.account_timeline": "No toots here!",
-  "empty_column.account_unavailable": "Profile unavailable",
-  "empty_column.blocks": "You haven't blocked any users yet.",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
-  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
-  "empty_column.domain_blocks": "There are no blocked domains yet.",
-  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
-  "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
-  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
-  "empty_column.hashtag": "There is nothing in this hashtag yet.",
-  "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
-  "empty_column.home.public_timeline": "the public timeline",
-  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
-  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
-  "empty_column.mutes": "You haven't muted any users yet.",
-  "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
-  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
-  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
-  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
-  "errors.unexpected_crash.report_issue": "Report issue",
-  "follow_request.authorize": "Authorize",
-  "follow_request.reject": "Reject",
-  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
-  "generic.saved": "Saved",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
-  "getting_started.heading": "Getting started",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.select.no_options_message": "No suggestions found",
-  "hashtag.column_settings.select.placeholder": "Enter hashtagsâ€¦",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
-  "home.column_settings.basic": "Basic",
-  "home.column_settings.show_reblogs": "Show boosts",
-  "home.column_settings.show_replies": "Show replies",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
-  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
-  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
-  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
-  "introduction.federation.action": "Next",
-  "introduction.federation.federated.headline": "Federated",
-  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
-  "introduction.federation.home.headline": "Home",
-  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
-  "introduction.federation.local.headline": "Local",
-  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
-  "introduction.interactions.action": "Finish toot-orial!",
-  "introduction.interactions.favourite.headline": "Favourite",
-  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
-  "introduction.interactions.reblog.headline": "Boost",
-  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
-  "introduction.interactions.reply.headline": "Reply",
-  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
-  "introduction.welcome.action": "Let's go!",
-  "introduction.welcome.headline": "First steps",
-  "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is specialâ€”it hosts your profile, so remember its name.",
-  "keyboard_shortcuts.back": "to navigate back",
-  "keyboard_shortcuts.blocked": "to open blocked users list",
-  "keyboard_shortcuts.boost": "to boost",
-  "keyboard_shortcuts.column": "to focus a status in one of the columns",
-  "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "to open direct messages column",
-  "keyboard_shortcuts.down": "to move down in the list",
-  "keyboard_shortcuts.enter": "to open status",
-  "keyboard_shortcuts.favourite": "to favourite",
-  "keyboard_shortcuts.favourites": "to open favourites list",
-  "keyboard_shortcuts.federated": "to open federated timeline",
-  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.home": "to open home timeline",
-  "keyboard_shortcuts.hotkey": "Hotkey",
-  "keyboard_shortcuts.legend": "to display this legend",
-  "keyboard_shortcuts.local": "to open local timeline",
-  "keyboard_shortcuts.mention": "to mention author",
-  "keyboard_shortcuts.muted": "to open muted users list",
-  "keyboard_shortcuts.my_profile": "to open your profile",
-  "keyboard_shortcuts.notifications": "to open notifications column",
-  "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "to open pinned toots list",
-  "keyboard_shortcuts.profile": "to open author's profile",
-  "keyboard_shortcuts.reply": "to reply",
-  "keyboard_shortcuts.requests": "to open follow requests list",
-  "keyboard_shortcuts.search": "to focus search",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "to open \"get started\" column",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
-  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
-  "keyboard_shortcuts.toot": "to start a brand new toot",
-  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
-  "keyboard_shortcuts.up": "to move up in the list",
-  "lightbox.close": "Close",
-  "lightbox.next": "Next",
-  "lightbox.previous": "Previous",
-  "lightbox.view_context": "View context",
-  "lists.account.add": "Add to list",
-  "lists.account.remove": "Remove from list",
-  "lists.delete": "Delete list",
-  "lists.edit": "Edit list",
-  "lists.edit.submit": "Change title",
-  "lists.new.create": "Add list",
-  "lists.new.title_placeholder": "New list title",
-  "lists.search": "Search among people you follow",
-  "lists.subheading": "Your lists",
+  "compose_form.sensitive.hide": "Ù†ÛŒØ´Ø§Ù†Ú©Ø±Ø¯Ù†ÛŒ Ù…ÛŒØ¯ÛŒØ§ ÙˆÛ•Ú© Ù‡Û•Ø³ØªÛŒØ§Ø±",
+  "compose_form.sensitive.marked": "ÙˆØ§Ø¯Û•ÛŒ Ú©Û†ØªØ§ÛŒÛŒ",
+  "compose_form.sensitive.unmarked": "Ù…ÛŒØ¯ÛŒØ§ ÙˆÛ•Ú© Ù‡Û•Ø³ØªÛŒØ§Ø± Ù†ÛŒØ´Ø§Ù† Ù†Û•Ú©Ø±Ø§ÙˆÛ•",
+  "compose_form.spoiler.marked": "Ø¯Û•Ù‚ Ù„Û• Ù¾Ø´Øª Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒØ¯Ø§ Ø´Ø§Ø±Ø§ÙˆÛ•ØªÛ•ÙˆÛ•",
+  "compose_form.spoiler.unmarked": "Ø¯Û•Ù‚ Ø´Ø§Ø±Ø§ÙˆÛ• Ù†ÛŒÛŒÛ•",
+  "compose_form.spoiler_placeholder": "Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒÛ•Ú©Û•Øª Ù„ÛŽØ±Û• Ø¨Ù†ÙˆÙˆØ³Û•",
+  "confirmation_modal.cancel": "Ù‡Û•ÚµÙˆÛ•Ø´Ø§Ù†Ø¯Ù†Û•ÙˆÙ‡",
+  "confirmations.block.block_and_report": "Ø¨Ù„Û†Ú© & Ú¯ÙˆØ²Ø§Ø±Ø´Øª",
+  "confirmations.block.confirm": "Ø¨Ù„Û†Ú©",
+  "confirmations.block.message": "Ø¦Ø§ÛŒØ§ Ø¯ÚµÙ†ÛŒØ§ÛŒØª Ù„Û•ÙˆÛ•ÛŒ Ø¯Û•ØªÛ•ÙˆÛŽØª {name} Ø¨Ù„Û†Ú© Ø¨Ú©Û•ÛŒØª?",
+  "confirmations.delete.confirm": "Ø³Ú•ÛŒÙ†Û•ÙˆÛ•",
+  "confirmations.delete.message": "Ø¦Ø§ÛŒØ§ Ø¯ÚµÙ†ÛŒØ§ÛŒØª Ù„Û•ÙˆÛ•ÛŒ Ø¯Û•ØªÛ•ÙˆÛŽØª Ø¦Û•Ù… ØªÙˆØªÛ• Ø¨Ø³Ú•ÛŒØªÛ•ÙˆÛ•?",
+  "confirmations.delete_list.confirm": "Ø³Ú•ÛŒÙ†Û•ÙˆÛ•",
+  "confirmations.delete_list.message": "Ø¦Ø§ÛŒØ§ Ø¯ÚµÙ†ÛŒØ§ÛŒØª Ù„Û•ÙˆÛ•ÛŒ Ø¯Û•ØªÛ•ÙˆÛŽØª Ø¨Û• Ù‡Û•Ù…ÛŒØ´Û•ÛŒÛŒ Ø¦Û•Ù… Ù„ÛŒØ³ØªÛ• Ø¨Ø³Ú•ÛŒØªÛ•ÙˆÛ•?",
+  "confirmations.domain_block.confirm": "Ø¨Ù„Û†Ú©Ú©Ø±Ø¯Ù†ÛŒ Ù‡Û•Ù…ÙˆÙˆ Ø¯Û†Ù…Û•ÛŒÙ†Û•Ú©Û•",
+  "confirmations.domain_block.message": "Ø¦Ø§ÛŒØ§ Ø¨Û•Ú•Ø§Ø³ØªÛŒØŒ Ø¨Û•Ú•Ø§Ø³ØªÛŒ ØªÛ† Ø¯Û•ØªÛ•ÙˆÛŽØª Ù‡Û•Ù…ÙˆÙˆ {domain} Ø¨Ù„Û†Ú© Ø¨Ú©Û•ÛŒØªØŸ Ù„Û• Ø²Û†Ø±Ø¨Û•ÛŒ ØØ§ÚµÛ•ØªÛ•Ú©Ø§Ù†Ø¯Ø§ Ú†Û•Ù†Ø¯ Ø¨Ù„Û†Ú©ÛŽÚ©ÛŒ Ø¦Ø§Ù…Ø§Ù†Ø¬Ø¯Ø§Ø± ÛŒØ§Ù† Ø¨ÛŽØ¯Û•Ù†Ú¯Û•Ú©Ø§Ù† Ù¾ÛŽÙˆÛŒØ³Øª Ùˆ Ù¾Û•Ø³Û•Ù†Ø¯Ù†. ØªÛ† Ù†Ø§ÙˆÛ•Ú•Û†Ú© ÛŽÚ© Ù†Ø§Ø¨ÛŒÙ†ÛŒØª Ù„Û• Ø¯Û†Ù…Û•ÛŒÙ†Û•Ú©Û• Ù„Û• Ù‡ÛŒÚ† Ù‡ÛŽÚµÛŒ Ú©Ø§ØªÛŒ Ú¯Ø´ØªÛŒ ÛŒØ§Ù† Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù†Øª. Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ ØªÛ† Ù„Û•Ùˆ Ø¯Û†Ù…Û•ÛŒÙ†Û•ÙˆÛ• Ù„Ø§Ø¯Û•Ø¨Ø±ÛŽÙ†.",
+  "confirmations.logout.confirm": "Ú†ÙˆÙˆÙ†Û• Ø¯Û•Ø±Û•ÙˆÛ•",
+  "confirmations.logout.message": "Ø¦Ø§ÛŒØ§ Ø¯ÚµÙ†ÛŒØ§ÛŒØª Ù„Û•ÙˆÛ•ÛŒ Ø¯Û•ØªÛ•ÙˆÛŽØª Ø¨Ú†ÛŒØªÛ• Ø¯Û•Ø±Û•ÙˆÛ•?",
+  "confirmations.mute.confirm": "Ø¨ÛŽØ¯Û•Ù†Ú¯",
+  "confirmations.mute.explanation": "Ø¦Û•Ù…Û•Ø´ Ø¯Û•Ø¨ÛŽØªÛ• Ù‡Û†ÛŒ Ø´Ø§Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù¾Û†Ø³ØªÛ•Ú©Ø§Ù† ÛŒØ§Ù† Ø¦Û•Ùˆ Ø¨Ø§Ø¨Û•ØªØ§Ù†Û•ÛŒ Ú©Û• Ø¦Ø§Ù…Ø§Ú˜Û•ÛŒØ§Ù† Ù¾ÛŽ Ø¯Û•Ú©Ø§Øª ØŒ Ø¨Û•ÚµØ§Ù… Ù‡ÛŽØ´ØªØ§ Ú•ÛŽÚ¯Û•ÛŒØ§Ù† Ù¾ÛŽ Ø¯Û•Ø¯Ø§Øª Ú©Û• Ù¾Û†Ø³ØªÛ•Ú©Ø§Ù†ØªØ§Ù† Ø¨Ø¨ÛŒÙ†Ù† Ùˆ Ø´ÙˆÛŽÙ†ØªØ§Ù† Ø¨Ú©Û•ÙˆÙ†.",
+  "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.mark_as_read": "Ù†ÛŒØ´Ø§Ù†Û•Ú©Ø±Ø¯Ù† ÙˆÛ•Ú© Ø®ÙˆÛŽÙ†Ø¯Ø±Ø§ÙˆÛ•",
+  "conversation.open": "Ù†ÛŒØ´Ø§Ù†Ø¯Ø§Ù† Ú¯ÙØªÙˆÚ¯Û†",
+  "conversation.with": "Ù„Û•Ú¯Û•Úµ{names}",
+  "directory.federated": "Ù„Û• Ú•Ø§Ú˜Û•Ú©Ø§Ù†ÛŒ Ù†Ø§Ø³Ø±Ø§Ùˆ",
+  "directory.local": "ØªÛ•Ù†Ù‡Ø§ Ù„Û• {domain}",
+  "directory.new_arrivals": "ØªØ§Ø²Û• Ú¯Û•ÛŒØ´ØªÙ†Û•Ú©Ø§Ù†",
+  "directory.recently_active": "Ø¨Û•Ù… Ø¯ÙˆØ§ÛŒÛŒØ§Ù†Û• Ú†Ø§Ù„Ø§Ú©Û•",
+  "embed.instructions": "Ø¦Û•Ù… ØªÙˆØªÛ• Ø¨Ù†Ú†ÛŒÙ† Ø¨Ú©Û• Ù„Û•Ø³Û•Ø± ÙˆÛŽØ¨ Ø³Ø§ÛŒØªÛ•Ú©Û•Øª Ø¨Û• Ú©Û†Ù¾ÛŒÚ©Ø±Ø¯Ù†ÛŒ Ú©Û†Ø¯Û•Ú©Û•ÛŒ Ø®ÙˆØ§Ø±Û•ÙˆÛ•.",
+  "embed.preview": "Ø¦Û•Ù…Û• Ø¦Û•Ùˆ Ø´ØªÛ•ÛŒÛ• Ú©Û• Ù„Û• Ø´ÛŽÙˆÛ•ÛŒ Ø®Û†ÛŒ Ø¯Û•Ú†ÛŽØª:",
+  "emoji_button.activity": "Ú†Ø§Ù„Ø§Ú©ÛŒ",
+  "emoji_button.custom": "Ø¦Ø§Ø³Ø§ÛŒÛŒ",
+  "emoji_button.flags": "Ø¦Ø§ÚµØ§Ú©Ø§Ù†",
+  "emoji_button.food": "Ø®ÙˆØ§Ø±Ø¯Ù†& Ø®ÙˆØ§Ø±Ø¯Ù†Û•ÙˆÛ•",
+  "emoji_button.label": "Ø¦ÛŒÙ…Û†Ø¬ÛŒ Ø¨Ú©Û•Ù†ÛŽÙˆ",
+  "emoji_button.nature": "Ø³Ø±ÙˆØ´Øª",
+  "emoji_button.not_found": "Ø¨ÛŽ Ø¦ÛŒÙ…Û†Ø¬ÛŒ! (â•¯Â°â–¡Â°)â•¯( â”»â”â”»",
+  "emoji_button.objects": "Ø¦Ø§Ù…Ø§Ù†Ø¬Û•Ú©Ø§Ù†",
+  "emoji_button.people": "Ø®Û•ÚµÚ©",
+  "emoji_button.recent": "Ø²Û†Ø±Ø¬Ø§Ø± Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø±Ø§ÙˆÛ•",
+  "emoji_button.search": "Ú¯Û•Ú•Ø§Ù†...",
+  "emoji_button.search_results": "Ø¦Û•Ù†Ø¬Ø§Ù…Û•Ú©Ø§Ù†ÛŒ Ú¯Û•Ú•Ø§Ù†",
+  "emoji_button.symbols": "Ù‡ÛŽÙ…Ø§Ú©Ø§Ù†",
+  "emoji_button.travel": "Ú¯Û•Ø´Øª & Ø´ÙˆÛŽÙ†Û•Ú©Ø§Ù†",
+  "empty_column.account_suspended": "Account suspended",
+  "empty_column.account_timeline": "Ù„ÛŽØ±Û• Ù‡ÛŒÚ† ØªÙˆØªÛ•Ú© Ù†ÛŒÛŒÛ•!",
+  "empty_column.account_unavailable": "Ù¾Ø±Û†ÙØ§ÛŒÙ„ Ø¨Û•Ø±Ø¯Û•Ø³Øª Ù†ÛŒÛ•",
+  "empty_column.blocks": "ØªÛ† Ù‡ÛŽØ´ØªØ§ Ù‡ÛŒÚ† Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŽÚ©Øª Ø¨Ù„Û†Ú© Ù†Û•Ú©Ø±Ø¯ÙˆÙˆÛ•.",
+  "empty_column.bookmarked_statuses": "ØªÛ† Ù‡ÛŽØ´ØªØ§ Ù‡ÛŒÚ† ØªÙˆØªÛŽÚ©ÛŒ Ø¯ÛŒØ§Ø±ÛŒÚ©Ø±Ø§ÙˆØª Ù†ÛŒÛ• Ú©Ø§ØªÛŽÚ© Ù†ÛŒØ´Ø§Ù†Û•ÛŒÛ•Ú© Ù†ÛŒØ´Ø§Ù† Ø¯Û•Ú©Û•ÛŒØªØŒ Ù„ÛŽØ±Û• Ø¯Û•Ø±Ø¦Û•Ú©Û•ÙˆÛŒØª.",
+  "empty_column.community": "Ù‡ÛŽÚµÛŒ Ú©Ø§ØªÛŒ Ù†Ø§ÙˆØ®Û†ÛŒÛŒ Ø¨Û•ØªØ§ÚµÛ•. Ø´ØªÛŽÚ© Ø¨Û• Ø¦Ø§Ø´Ú©Ø±Ø§ Ø¨Ù†ÙˆÙˆØ³Û• Ø¨Û† Ø¦Û•ÙˆÛ•ÛŒ ØªÛ†Ù¾Û•Ú©Û• Ø¨Ø³ÙˆÙˆÚ•ÛŽØª!",
+  "empty_column.direct": "ØªÛ† Ù‡ÛŒÚ† Ù†Ø§Ù…Û•ÛŒ Ú•Ø§Ø³ØªÛ•ÙˆØ®Û†Øª Ù†ÛŒÛ• ØªØ§ Ø¦ÛŽØ³ØªØ§. Ú©Ø§ØªÛŽÚ© Ø¯Ø§Ù†Û•ÛŒÛ•Ú© Ø¯Û•Ù†ÛŽØ±ÛŒØª ÛŒØ§Ù† ÙˆÛ•Ø±Øª Ø¯Û•Ú¯Ø±ÛŽØªØŒ Ù„ÛŽØ±Û• Ù¾ÛŒØ´Ø§Ù† Ø¯Û•Ø¯Ø§Øª.",
+  "empty_column.domain_blocks": "Ù‡ÛŽØ´ØªØ§ Ù‡ÛŒÚ† Ø¯Û†Ù…Û•ÛŒÙ†ÛŽÚ©ÛŒ Ø¨Ù„Û†Ú© Ú©Ø±Ø§Ùˆ Ù†ÛŒÛŒÛ•.",
+  "empty_column.favourited_statuses": "ØªÛ† Ù‡ÛŽØ´ØªØ§ Ù‡ÛŒÚ† ØªÙˆØªÛŽÚ©ÛŒ Ø¯ÚµØ®ÙˆØ§Ø²Øª Ù†ÛŒÛŒÛ•ØŒ Ú©Ø§ØªÛŽÚ© ØÛ•Ø²Øª Ù„Û• Ø¯Ø§Ù†Û•ÛŒÛ•Ú©ÛŒ Ø¨Ø§Ø´Û•ØŒ Ù„ÛŽØ±Û• Ø¯Û•Ø±Ø¦Û•Ú©Û•ÙˆÛŒØª.",
+  "empty_column.favourites": "Ú©Û•Ø³ Ø¦Û•Ù… ØªÙˆØªÛ•ÛŒ Ø¯ÚµØ®ÙˆØ§Ø² Ù†Û•Ú©Ø±Ø¯ÙˆÙˆÛ•ØŒÚ©Ø§ØªÛŽÚ© Ú©Û•Ø³ÛŽÚ© ÙˆØ§ Ø¨Ú©Ø§ØªØŒ Ù„ÛŽØ±Û• Ø¯Û•Ø±Ø¦Û•Ú©Û•ÙˆÙ†.",
+  "empty_column.follow_requests": "ØªÛ† Ù‡ÛŽØ´ØªØ§ Ù‡ÛŒÚ† Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒÛŒÛ•Ú©ÛŒ Ø¨Û•Ø¯ÙˆØ§Ø¯Ø§Ú†ÙˆÙˆØª Ù†ÛŒÛ•. Ú©Ø§ØªÛŽÚ© ÛŒÛ•Ú©ÛŽÚ©Øª Ø¨Û† Ù‡Ø§ØªØŒ Ù„ÛŽØ±Û• Ø¯Û•Ø±Ø¦Û•Ú©Û•ÙˆÛŒØª.",
+  "empty_column.hashtag": "Ù‡ÛŽØ´ØªØ§ Ù‡ÛŒÚ† Ø´ØªÛŽÚ© Ù„Û•Ù… Ù‡Ø§Ø´ØªØ§Ú¯Û•Ø¯Ø§ Ù†ÛŒÛŒÛ•.",
+  "empty_column.home": "ØªØ§ÛŒÙ… Ù„Ø§ÛŒÙ†ÛŒ Ù…Ø§ÚµÛ•ÙˆÛ•Øª Ø¨Û•ØªØ§ÚµÛ•! Ø³Û•Ø±Ø¯Ø§Ù†ÛŒ {public} Ø¨Ú©Û• ÛŒØ§Ù† Ú¯Û•Ú•Ø§Ù† Ø¨Û•Ú©Ø§Ø±Ø¨ÛŽÙ†Û• Ø¨Û† Ø¯Û•Ø³ØªÙ¾ÛŽÚ©Ø±Ø¯Ù† Ùˆ Ø¨ÛŒÙ†ÛŒÙ†ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†ÛŒ ØªØ±.",
+  "empty_column.home.public_timeline": "Ù‡ÛŽÚµÛŒ Ú©Ø§ØªÛŒ Ú¯Ø´ØªÛŒ",
+  "empty_column.list": "Ù‡ÛŽØ´ØªØ§ Ù‡ÛŒÚ† Ø´ØªÛŽÚ© Ù„Û•Ù… Ù„ÛŒØ³ØªÛ•Ø¯Ø§ Ù†ÛŒÛŒÛ•. Ú©Ø§ØªÛŽÚ© Ø¦Û•Ù†Ø¯Ø§Ù…Ø§Ù†ÛŒ Ø¦Û•Ù… Ù„ÛŒØ³ØªÛ• Ø¯Û•Ù†Ú¯ÛŒ Ù†ÙˆÛŽ Ø¨ÚµØ§ÙˆØ¯Û•Ú©Û•Ù†ØŒ Ù„ÛŽØ±Û• Ø¯Û•Ø±Ø¯Û•Ú©Û•ÙˆÙ†.",
+  "empty_column.lists": "ØªÛ† Ù‡ÛŽØ´ØªØ§ Ù‡ÛŒÚ† Ù„ÛŒØ³ØªØª Ø¯Ø±ÙˆØ³Øª Ù†Û•Ú©Ø±Ø¯ÙˆÙˆÛ•ØŒ Ú©Ø§ØªÛŽÚ© Ø¯Ø§Ù†Û•ÛŒÛ•Ú© Ø¯Ø±ÙˆØ³Øª Ø¯Û•Ú©Û•ÛŒØªØŒ Ù„ÛŽØ±Û• Ù¾ÛŒØ´Ø§Ù† Ø¯Û•Ø¯Ø±ÛŽØª.",
+  "empty_column.mutes": "ØªÛ† Ù‡ÛŽØ´ØªØ§ Ù‡ÛŒÚ† Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŽÚ©Øª Ø¨ÛŽØ¯Û•Ù†Ú¯ Ù†Û•Ú©Ø±Ø¯ÙˆÙˆÛ•.",
+  "empty_column.notifications": "ØªÛ† Ù‡ÛŽØ´ØªØ§ Ù‡ÛŒÚ† Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…ÛŽÚ©Øª Ù†ÛŒÛ•. Ú†Ø§Ù„Ø§Ú©ÛŒ Ù„Û•Ú¯Û•Úµ Ú©Û•Ø³Ø§Ù†ÛŒ Ø¯ÛŒÚ©Û• Ø¨Ú©Û• Ø¨Û† Ø¯Û•Ø³ØªÙ¾ÛŽÚ©Ø±Ø¯Ù†ÛŒ Ú¯ÙØªÙˆÚ¯Û†Ú©Û•.",
+  "empty_column.public": "Ù„ÛŽØ±Û• Ù‡ÛŒÚ† Ù†ÛŒÛŒÛ•! Ø´ØªÛŽÚ© Ø¨Û• Ø¦Ø§Ø´Ú©Ø±Ø§ Ø¨Ù†ÙˆÙˆØ³Û•(Ø¨Û•Ú¯Ø´ØªÛŒ)ØŒ ÛŒØ§Ù† Ø¨Û• Ø¯Û•Ø³ØªÛŒ Ø´ÙˆÛŽÙ† Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù† Ø¨Ú©Û•ÙˆÛ• Ù„Û• Ú•Ø§Ú˜Û•Ú©Ø§Ù†ÛŒ ØªØ±Û•ÙˆÛ• Ø¨Û† Ù¾Ú•Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ",
+  "error.unexpected_crash.explanation": "Ø¨Û•Ù‡Û†ÛŒ Ø¨ÙˆÙˆÙ†ÛŒ Ú©ÛŽØ´Û• Ù„Û• Ú©Û†Ø¯Û•Ú©Û•Ù…Ø§Ù† ÛŒØ§Ù† Ú©ÛŽØ´Û•ÛŒ Ú¯ÙˆÙ†Ø¬Ø§Ù†ÛŒ ÙˆÛŽØ¨Ú¯Û•Ú•Û•Ú©Û•ØŒ Ø¦Û•Ù… Ù„Ø§Ù¾Û•Ú•Û•ÛŒÛ• Ø¨Û• Ø¯Ø±ÙˆØ³ØªÛŒ Ù¾ÛŒØ´Ø§Ù† Ù†Ø§Ø¯Ø±ÛŽØª.",
+  "error.unexpected_crash.explanation_addons": "Ø¦Û•Ù… Ù„Ø§Ù¾Û•Ú•Û•ÛŒÛ• Ù†Ø§ØªÙˆØ§Ù†Ø±ÛŽØª Ø¨Û• Ø¯Ø±ÙˆØ³ØªÛŒ Ù¾ÛŒØ´Ø§Ù† Ø¨Ø¯Ø±ÛŽØª. Ø¦Û•Ù… Ù‡Û•ÚµÛ•ÛŒÛ• Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ø¨Û•Ù‡Û†ÛŒ Ø¦Ø§Ù…ÛŽØ±ÛŒ ÙˆÛ•Ø±Ú¯ÛŽÚ•Ø§Ù†ÛŒ Ø®Û†Ú©Ø§Ø± ÛŒØ§Ù† Ø²ÛŒØ§Ø¯Ú©Ø±Ø§ÙˆÛŒ ÙˆÛŽØ¨Ú¯Û•Ú•Û•ÙˆÛ• Ø¨ÛŽØª.",
+  "error.unexpected_crash.next_steps": "Ù‡Û•ÙˆÚµØ¯Û• Ù„Ø§Ù¾Û•Ú•Û•Ú©Û• ØªØ§Ø²Û• Ø¨Ú©Û•ÙˆÛ•. Ø¦Û•Ú¯Û•Ø± Ø¦Û•Ù…Û• ÛŒØ§Ø±Ù…Û•ØªÛŒØ¯Û•Ø± Ù†Û•Ø¨ÙˆÙˆØŒ Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ù‡ÛŽØ´ØªØ§ Ø¨ØªÙˆØ§Ù†ÛŒØª Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† Ø¨Û•Ú©Ø§Ø±Ø¨ÛŽÙ†ÛŒØª Ù„Û• Ú•ÛŽÚ¯Û•ÛŒ ÙˆÛŽØ¨Ú¯Û•Ú•Û•Ú©Û•ÛŒØ§Ù† Ú©Ø§Ø±Ø¨Û•Ø±Ù†Ø§Ù…Û•ÛŒ Ú•Û•Ø³Û•Ù†.",
+  "error.unexpected_crash.next_steps_addons": "Ù‡Û•ÙˆÚµØ¯Û• Ù„Û•Ú©Ø§Ø±ÛŒØ§Ù† Ø¨Ø®Û•ÛŒØª Ùˆ Ù„Ø§Ù¾Û•Ú•Û•Ú©Û• ØªØ§Ø²Û• Ø¨Ú©Û•ÙˆÛ•. Ø¦Û•Ú¯Û•Ø± Ø¦Û•Ù…Û• ÛŒØ§Ø±Ù…Û•ØªÛŒØ¯Û•Ø± Ù†Û•Ø¨ÙˆÙˆØŒ Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ù‡ÛŽØ´ØªØ§ Ø¨ØªÙˆØ§Ù†ÛŒØª Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† Ø¨Û•Ú©Ø§Ø±Ø¨ÛŽÙ†ÛŒØª Ù„Û• Ú•ÛŽÚ¯Û•ÛŒ ÙˆÛŽØ¨Ú¯Û•Ú•Û•Ú©Ø§Ù†ÛŒ Ø¯ÛŒÚ©Û• ÛŒØ§Ù† Ù†Û•Ø±Ù…Û•Ú©Ø§Ù„Ø§Ú©Ø§Ù†ÛŒ Ø¦Û•Ø³ÚµÛŒ.",
+  "errors.unexpected_crash.copy_stacktrace": "Ú©Û†Ù¾ÛŒÚ©Ø±Ø¯Ù†ÛŒ Ø³ØªÛŽÚ©ØªØ±Ø§Ø³ÛŒ Ø¨Û† Ú©Ù„ÛŒÙ¾ Ø¨Û†Ø±Ø¯",
+  "errors.unexpected_crash.report_issue": "Ú©ÛŽØ´Û•ÛŒ Ú¯ÙˆØ²Ø§Ø±Ø´Øª",
+  "follow_request.authorize": "Ø¯Ù‡â€ŒØ³Ù‡â€ŒÚµØ§ØªÙ¾ÛŽØ¯Ø±Ø§Ùˆ",
+  "follow_request.reject": "Ú•Û•ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ•",
+  "follow_requests.unlocked_explanation": "Ù‡Û•Ø±Ú†Û•Ù†Ø¯Û• Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ø¯Ø§Ø®Ø±Ø§Ùˆ Ù†ÛŒÛŒÛ•ØŒ Ø³ØªØ§ÙÛŒ {domain} ÙˆØ§ Ø¨ÛŒØ±ÛŒØ§Ù† Ú©Ø±Ø¯Û•ÙˆÛ• Ú©Û• Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ø¨ØªØ§Ù†Û•ÙˆÛŽØª Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ• Ø¨Û• Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒÛ•Ú©Ø§Ù†ÛŒ Ø¦Û•Ù… Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ø¯Ø§ Ø¨Ú©Û•Ù† Ø¨Û• Ø¯Û•Ø³ØªÛŒ.",
+  "generic.saved": "Ù¾Ø§Ø´Ú©Û•ÙˆØªÚ©Ø±Ø§",
+  "getting_started.developers": "Ù¾Û•Ø±Û•Ù¾ÛŽØ¯Û•Ø±Ø§Ù†",
+  "getting_started.directory": "Ù¾Û•Ú•Û•ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„",
+  "getting_started.documentation": "Ø¨Û•ÚµÚ¯Û•Ù†Ø§Ù…Û•",
+  "getting_started.heading": "Ø¯Û•Ø³Øª Ù¾ÛŽÚ©Ø±Ø¯Ù†",
+  "getting_started.invite": "Ø¨Ø§Ù†Ú¯Ù‡ÛŽØ´ØªÚ©Ø±Ø¯Ù†ÛŒ Ø®Û•ÚµÚ©",
+  "getting_started.open_source_notice": "Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† Ù†Û•Ø±Ù…Û•Ú©Ø§Ù„Ø§ÛŒÛ•Ú©ÛŒ Ø³Û•Ø±Ú†Ø§ÙˆÛ•ÛŒ Ú©Ø±Ø§ÙˆÛ•ÛŒÛ•. Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø¨Û•Ø´Ø¯Ø§Ø±ÛŒ Ø¨Ú©Û•ÛŒØª ÛŒØ§Ù† Ú¯ÙˆØ²Ø§Ø±Ø´Øª Ø¨Ú©Û•ÛŒØª Ù„Û•Ø³Û•Ø± Ú©ÛŽØ´Û•Ú©Ø§Ù†ÛŒ Ù„Û• Ù¾Û•Ú•Û•ÛŒ Ú¯ÛŒØªÙ‡Ø§Ø¨ {github}.",
+  "getting_started.security": "Ú•ÛŽÚ©Ø®Ø³ØªÙ†Û•Ú©Ø§Ù†ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•",
+  "getting_started.terms": "Ù…Û•Ø±Ø¬Û•Ú©Ø§Ù†ÛŒ Ø®Ø²Ù…Û•ØªÚ¯ÙˆØ²Ø§Ø±ÛŒ",
+  "hashtag.column_header.tag_mode.all": "Ùˆ {additional}",
+  "hashtag.column_header.tag_mode.any": "ÛŒØ§ {additional}",
+  "hashtag.column_header.tag_mode.none": "Ø¨Û•Ø¨ÛŽ {additional}",
+  "hashtag.column_settings.select.no_options_message": "Ù‡ÛŒÚ† Ù¾ÛŽØ´Ù†ÛŒØ§Ø±ÛŽÚ© Ù†Û•Ø¯Û†Ø²Ø±Ø§ÛŒÛ•ÙˆÛ•",
+  "hashtag.column_settings.select.placeholder": "Ù‡Ø§Ø´ØªØ§Ú¯ÛŒ ØªÛŽØ¨Ù†ÙˆÙˆØ³Û•â€¦",
+  "hashtag.column_settings.tag_mode.all": "Ù‡Û•Ù…ÙˆÙˆ Ø¦Û•Ù…Ø§Ù†Û•",
+  "hashtag.column_settings.tag_mode.any": "Ù‡Û•Ø± Ú©Ø§Ù… Ù„Û•Ù…Ø§Ù†Û•",
+  "hashtag.column_settings.tag_mode.none": "Ù‡ÛŒÚ† Ú©Ø§Ù… Ù„Û•Ù…Ø§Ù†Û•",
+  "hashtag.column_settings.tag_toggle": "ØªØ§Ú¯ÛŒ Ø²ÛŒØ§Ø¯Û• ÛŒ Ø¦Û•Ù… Ø³ØªÙˆÙˆÙ†Û• Ù„Û•Ø®Û† Ø¨Ù†ÙˆÙˆØ³Û•",
+  "home.column_settings.basic": "Ø¨Ù†Û•Ú•Û•ØªÛŒ",
+  "home.column_settings.show_reblogs": "Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ø¨Û•Ù‡ÛŽØ²Ú©Ø±Ø¯Ù†",
+  "home.column_settings.show_replies": "ÙˆÛ•ÚµØ§Ù…Ø¯Ø§Ù†Û•ÙˆÛ•Ú©Ø§Ù† Ù¾ÛŒØ´Ø§Ù† Ø¨Ø¯Û•",
+  "home.hide_announcements": "Ø´Ø§Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø±Ø§Ú¯Û•ÛŒÛ•Ù†Ø±Ø§ÙˆÛ•Ú©Ø§Ù†",
+  "home.show_announcements": "Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ø±Ø§Ú¯Û•ÛŒÛ•Ù†Ø±Ø§ÙˆÛ•Ú©Ø§Ù†",
+  "intervals.full.days": "{number, plural, one {# Ú•Û†Ú˜} other {# Ú•Û†Ú˜Û•Ú©}}",
+  "intervals.full.hours": "{number, plural, one {# Ú©Ø§Øª} other {# Ú©Ø§Øª}}",
+  "intervals.full.minutes": "{number, plural, one {# Ø®ÙˆÙ„Û•Ú©} other {# Ø®ÙˆÙ„Û•Ú©}}",
+  "introduction.federation.action": "Ø¯Ø§Ù‡Ø§ØªÙˆÙˆ",
+  "introduction.federation.federated.headline": "Ú¯Ø´ØªÛŒ",
+  "introduction.federation.federated.text": "Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ• Ú¯Ø´ØªÛŒÛ•Ú©Ø§Ù† Ù„Û• Ø®Ø²Ù…Û•ØªÚ¯ÙˆØ²Ø§Ø±ÛŒÛ•Ú©Ø§Ù†ÛŒ ØªØ±ÛŒ Ø¬ÛŒÙ‡Ø§Ù†ÛŒ Ø¯Û•Ø±Ø¦Û•Ú©Û•ÙˆÙ† Ù„Û• Ù‡ÛŽÚµÛŒ Ú¯Ø´ØªÛŒ.",
+  "introduction.federation.home.headline": "Ø³Û•Ø±Û•ØªØ§",
+  "introduction.federation.home.text": "Ø¦Û•Ùˆ Ø¨Ø§Ø¨Û•ØªØ§Ù†Û•ÛŒ Ú©Û• Ø¨Û•Ø´ÙˆÛŽÙ†ÛŒØ§Ù† Ø¯Û•Ú©Û•ÙˆÛŒØª Ù„Û• Ù¾Û•Ú•Û•ÛŒ Ú˜ÙˆÙˆØ±Û•Ú©Û•Øª Ø¯Û•Ø±Ø¯Û•Ú©Û•ÙˆÛŽØª. Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø´ÙˆÛŽÙ† Ù‡Û•Ù…ÙˆÙˆ Ú©Û•Ø³ÛŽÚ© Ø¨Ú©Û•ÙˆÛŒØª Ù„Û•Ø³Û•Ø± Ù‡Û•Ø± Ú•Ø§Ú˜Û•ÛŒÛ•Ú©!",
+  "introduction.federation.local.headline": "Ù†Ø§ÙˆØ®Û†ÛŒÛŒ",
+  "introduction.federation.local.text": "Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ• Ú¯Ø´ØªÛŒÛ•Ú©Ø§Ù† Ù„Û• Ø®Û•ÚµÚ© Ù„Û•Ø³Û•Ø± Ù‡Û•Ù…Ø§Ù† Ú•Ø§Ú˜Û• ÙˆÛ•Ú© ØªÛ† Ø¯Û•Ø±Ø¯Û•Ú©Û•ÙˆÙ† Ù„Û• Ù‡ÛŽÚµÛŒ Ú©Ø§ØªÛŒ Ù†Ø§ÙˆØ®Û†ÛŒÛŒ.",
+  "introduction.interactions.action": "Ø®ÙˆÛŽÙ†Ø¯Ù†ÛŒ ØªÛ•ÙˆØ§ÙˆØ¨Ú©Û•!",
+  "introduction.interactions.favourite.headline": "Ø¯ÚµØ®ÙˆØ§Ø²",
+  "introduction.interactions.favourite.text": "Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ù¾Ø§Ø´ØªØ±ØªÙˆØªÛŽÚ© Ù¾Ø§Ø´Û•Ú©Û•ÙˆØª Ø¨Ú©Û•ÛŒØªØŒ Ø¨Ø§ Ù†ÙˆÙˆØ³Û•Ø± Ø¨Ø²Ø§Ù†ÛŽØª Ú©Û• ØªÛ† ØÛ•Ø²Øª Ù„ÛŽ Ø¨ÙˆÙˆØŒ Ø¨Û• Ø¦Ø§Ø±Û•Ø²ÙˆÙˆÛŒ Ø®Û†Øª.",
+  "introduction.interactions.reblog.headline": "Ø¨Û•Ù‡ÛŽØ²Ú©Ø±Ø¯Ù†",
+  "introduction.interactions.reblog.text": "Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø¯Û•Ù†Ú¯ÛŒ Ú©Û•Ø³Ø§Ù†ÛŒ ØªØ± Ù‡Ø§ÙˆØ¨Û•Ø´ Ø¨Ú©Û•ÛŒØª Ù„Û•Ú¯Û•Úµ Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ Ø®Û†Øª Ø¨Û• Ø¨Û•Ù‡ÛŽØ²Ú©Ø±Ø¯Ù†ÛŒØ§Ù†.",
+  "introduction.interactions.reply.headline": "ÙˆÛ•ÚµØ§Ù…",
+  "introduction.interactions.reply.text": "Ø¯Û•ØªÙˆØ§Ù†ÛŒØª ÙˆÛ•ÚµØ§Ù…ÛŒ Ú©Û•Ø³Ø§Ù†ÛŒ ØªØ± Ùˆ ØªÙˆØªÛ•Ú©Ø§Ù†ÛŒ Ø®Û†Øª Ø¨Ø¯Û•ÙˆÛ•ØŒ Ú©Û• Ù„Û• Ú¯ÙØªÙˆÚ¯Û†ÛŒÛ•Ú©Ø¯Ø§ Ø¨Û• ÛŒÛ•Ú©Û•ÙˆÛ• Ø²Ù†Ø¬ÛŒØ±ÛŒØ§Ù† Ø¯Û•Ú©Ø§Øª.",
+  "introduction.welcome.action": "Ø¨Ø§ Ø¨Ú•Û†ÛŒÙ†!",
+  "introduction.welcome.headline": "Ù‡Û•Ù†Ú¯Ø§ÙˆÛŒ ÛŒÛ•Ú©Û•Ù…",
+  "introduction.welcome.text": "Ø¨Û•Ø®ÛŽØ±Ø¨ÛŽÛŒØª Ø¨Û†ØªÛ†Ú•Û•Ú©Û†Ù…Û•ÚµÛ•ÛŒÛŒÛ•Ú©Ø§Ù†ÛŒ Ú†Ø±Ø¨ÙˆÙˆÛ•! Ù„Û• Ú†Û•Ù†Ø¯ Ø³Ø§ØªÛŽÚ©ÛŒ Ú©Û•Ù…Ø¯Ø§ Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ù¾Û•ÛŒØ§Ù…Û•Ú©Ø§Ù† Ù¾Û•Ø®Ø´ Ø¨Ú©Û•ÛŒØª Ùˆ Ù„Û•Ú¯Û•Úµ Ù‡Ø§ÙˆÚ•ÛŽÚ©Ø§Ù†Øª Ù„Û• Ù†Ø§Ùˆ Ú†Û•Ù†Ø¯ÛŒÙ† Ø¬Û†Ø± Ù„Û• Ú•Ø§Ú˜Û•Ú©Ø§Ù† Ù‚Ø³Û• Ø¨Ú©Û•ÛŒØª.. Ø¨Û•ÚµØ§Ù… Ø¦Û•Ù… Ú•Ø§Ú˜Ø§Ù†Û•ØŒ {domain}ØŒ Ø¬ÛŒØ§ÙˆØ²Û• Ù„Û•Ú¯Û•Úµ Ø¦Û•ÙˆØ§Ù†ÛŒ Ø¯ÛŒÚ©Û• Ø¨Û† Ø¦Û•ÙˆÛ• Ú©Û• Ù…ÛŒÙˆØ§Ù†Ø¯Ø§Ø±ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„Û•Ú©Û•Øª Ø¯Û•Ú©Ø§Ù†ØŒ Ø¨Û†ÛŒÛ• Ù†Ø§ÙˆÛ•Ú©Û•ÛŒØª Ù„Û•Ø¨ÛŒØ±Ø¨ÛŽØª.",
+  "keyboard_shortcuts.back": "Ø¨Û† Ú¯Û•Ú•Ø§Ù†Û•ÙˆÛ•",
+  "keyboard_shortcuts.blocked": "Ø¨Û† Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù„ÛŒØ³ØªÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Û• Ø¨Ù„Û†Ú©Ú©Ø±Ø§ÙˆÛ•Ú©Ø§Ù†",
+  "keyboard_shortcuts.boost": "Ø¨Û† Ø¨Û•Ù‡ÛŽØ²Ú©Ø±Ø¯Ù†",
+  "keyboard_shortcuts.column": "Ø¨Û† Ø¦Û•ÙˆÛ•ÛŒ ØªÛŒØ´Ú© Ø¨Ø®Ø§ØªÛ• Ø³Û•Ø± ØªÙˆØªÛŽÚ© Ù„Û• ÛŒÛ•Ú©ÛŽÚ© Ù„Û• Ø³ØªÙˆÙˆÙ†Û•Ú©Ø§Ù†",
+  "keyboard_shortcuts.compose": "Ø¨Û† Ø³Û•Ø±Ù†Ø¬Ø¯Ø§Ù† Ø¨Û• Ù†ÙˆÙˆØ³ÛŒÙ†ÛŒ Ù†Ø§ÙˆÚ†Û•ÛŒ Ø¯Û•Ù‚",
+  "keyboard_shortcuts.description": "ÙˆÙ‡â€ŒØ³Ù",
+  "keyboard_shortcuts.direct": "Ø¨Û† Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø³ØªÙˆÙˆÙ†ÛŒ Ù†Ø§Ù…Û• Ú•Ø§Ø³ØªÛ•ÙˆØ®Û†Ú©Ø§Ù†",
+  "keyboard_shortcuts.down": "Ø¨Û† Ú†ÙˆÙˆÙ†Û• Ø®ÙˆØ§Ø±Û•ÙˆÛ• Ù„Û• Ù„ÛŒØ³ØªÛ•Ú©Û•Ø¯Ø§",
+  "keyboard_shortcuts.enter": "Ø¨Û† Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ ØªÙˆØª",
+  "keyboard_shortcuts.favourite": "Ø¨Û† Ø¯ÚµØ®ÙˆØ§Ø²",
+  "keyboard_shortcuts.favourites": "Ø¨Û† Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù„ÛŒØ³ØªÛŒ Ø¯ÚµØ®ÙˆØ§Ø²Û•Ú©Ø§Ù†",
+  "keyboard_shortcuts.federated": "Ø¨Û† Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ Ù‡Û•Ù…ÙˆÙˆØ´ÙˆÛŽÙ†",
+  "keyboard_shortcuts.heading": "Ù‚Ù‡â€ŒØ¯Ø¨Ú•Û•Ú©Ø§Ù†ÛŒ ØªÛ•Ø®ØªÛ•Ú©Ù„ÛŒÙ„",
+  "keyboard_shortcuts.home": "Ø¨Û† Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù‡ÛŽÚµÛŒ Ú©Ø§ØªÛŒ Ù…Ø§ÚµÛ•ÙˆÛ•",
+  "keyboard_shortcuts.hotkey": "Ù‡Û†ØªÚ©Û•ÛŒ",
+  "keyboard_shortcuts.legend": "Ø¨Û† Ù†ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ø¦Û•Ù… Ù†ÛŒØ´Ø§Ù†Û•",
+  "keyboard_shortcuts.local": "Ø¨Û† Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ Ø®Û†Ù…Ø§ÚµÛŒ",
+  "keyboard_shortcuts.mention": "Ù†Û† Ù†Ø§ÙˆØ¨Ø±Ø¯Ù† Ù„Û• Ù†ÙˆÙˆØ³Û•Ø±",
+  "keyboard_shortcuts.muted": "Ø¨Û† Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù¾ÛŽØ±Ø³ØªÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†ÛŒ Ø¨ÛŽØ¯Û•Ù†Ú¯",
+  "keyboard_shortcuts.my_profile": "Ø¨Û† Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÚµ",
+  "keyboard_shortcuts.notifications": "Ø¨Û† Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø³ØªÙˆÙˆÙ†ÛŒ Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù†",
+  "keyboard_shortcuts.open_media": "Ø¨Û† Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù…ÛŒØ¯ÛŒØ§",
+  "keyboard_shortcuts.pinned": "Ø¨Û† Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù„ÛŒØ³ØªÛŒ ØªÙˆØªÛ•Ú©Ø§Ù†ÛŒ Ú†Û•Ø³Ù¾ÛŽÙ†Ø±Ø§Ùˆ",
+  "keyboard_shortcuts.profile": "Ø¨Û† Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÚµÛŒ Ù†ÙˆÙˆØ³Û•Ø±",
+  "keyboard_shortcuts.reply": "Ø¨Û† ÙˆÛ•ÚµØ§Ù…Ø¯Ø§Ù†Û•ÙˆÛ•",
+  "keyboard_shortcuts.requests": "Ø¨Û† Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù„ÛŒØ³ØªÛŒ Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒÛ•Ú©Ø§Ù†ÛŒ Ø¨Û•Ø¯ÙˆØ§Ø¯Ø§",
+  "keyboard_shortcuts.search": "Ø¨Û† Ø¬Û•Ø®ØªÚ©Ø±Ø¯Ù† Ù„Û•Ø³Û•Ø± Ú¯Û•Ú•Ø§Ù†",
+  "keyboard_shortcuts.spoilers": "Ø¨Û† Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†/Ø´Ø§Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø®Ø§Ù†Û•ÛŒ CW",
+  "keyboard_shortcuts.start": "Ø¨Û† Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø³ØªÙˆÙˆÙ†ÛŒ \"Ø¯Û•Ø³Øª Ù¾ÛŽØ¨Ú©Û•\"",
+  "keyboard_shortcuts.toggle_hidden": "Ø¨Û† Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†/Ø´Ø§Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø¯Û•Ù‚ Ù„Û• Ù¾Ø´Øª CW",
+  "keyboard_shortcuts.toggle_sensitivity": "Ø¨Û† Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†/Ø´Ø§Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù…ÛŒØ¯ÛŒØ§",
+  "keyboard_shortcuts.toot": "Ø¨Û† Ø¯Û•Ø³Øª Ú©Ø±Ø¯Ù† Ø¨Û• Ø¨Ø±Ø§Ù†Ø¯ÛŽÚ©ÛŒ ØªØ§Ø²Û•",
+  "keyboard_shortcuts.unfocus": "Ø¨Û† Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯Ù†ÛŒ Ù†Ø§ÙˆÚ†Û•ÛŒ Ø¯Û•Ù‚/Ú¯Û•Ú•Ø§Ù†",
+  "keyboard_shortcuts.up": "Ø¨Û† Ø¦Û•ÙˆÛ•ÛŒ Ù„Û• Ù„ÛŒØ³ØªÛ•Ú©Û•Ø¯Ø§ Ø¨Ú•Û†ÛŒØª",
+  "lightbox.close": "Ø¯Ø§Ø¨Ø®Û•",
+  "lightbox.compress": "Ø³Ù†Ø¯ÙˆÙ‚ÛŒ Ù†ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ ÙˆÛŽÙ†Û• Ø¨Ù¾Û•Ø³ØªÛŽÙ†Û•",
+  "lightbox.expand": "ÙØ±Ø§ÙˆØ§Ù†Ú©Ø±Ø¯Ù†ÛŒ Ø³Ù†Ø¯ÙˆÙ‚ÛŒ Ø¨ÛŒÙ†ÛŒÙ†ÛŒ ÙˆÛŽÙ†Û•",
+  "lightbox.next": "Ø¯Ø§Ù‡Ø§ØªÙˆÙˆ",
+  "lightbox.previous": "Ù¾ÛŽØ´ÙˆÙˆ",
+  "lists.account.add": "Ø²ÛŒØ§Ø¯Ú©Ø±Ø¯Ù† Ø¨Û† Ù„ÛŒØ³Øª",
+  "lists.account.remove": "Ù„Ø§Ø¨Ø±Ø¯Ù† Ù„Û• Ù„ÛŒØ³Øª",
+  "lists.delete": "Ø³Ú•ÛŒÙ†Û•ÙˆÛ•ÛŒ Ù„ÛŒØ³Øª",
+  "lists.edit": "Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒ Ù„ÛŒØ³Øª",
+  "lists.edit.submit": "Ú¯Û†Ú•ÛŒÙ†ÛŒ Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†",
+  "lists.new.create": "Ø²ÛŒØ§Ø¯Ú©Ø±Ø¯Ù†ÛŒ Ù„ÛŒØ³Øª",
+  "lists.new.title_placeholder": "Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ù„ÛŒØ³ØªÛŒ Ù†ÙˆÛŽ",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ ÙˆÛ•ÚµØ§Ù…Û•Ú©Ø§Ù† Ø¨Û†:",
+  "lists.search": "Ø¨Ú¯Û•Ú•ÛŽ Ù„Û•Ù†Ø§Ùˆ Ø¦Û•Ùˆ Ú©Û•Ø³Ø§Ù†Û•ÛŒ Ú©Û• Ø´ÙˆÛŽÙ†ÛŒØ§Ù† Ú©Û•ÙˆØªÙˆÛŒØª",
+  "lists.subheading": "Ù„ÛŒØ³ØªÛ•Ú©Ø§Ù†Øª",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
-  "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
-  "missing_indicator.label": "Not found",
-  "missing_indicator.sublabel": "This resource could not be found",
-  "mute_modal.hide_notifications": "Hide notifications from this user?",
-  "navigation_bar.apps": "Mobile apps",
-  "navigation_bar.blocks": "Blocked users",
-  "navigation_bar.bookmarks": "Bookmarks",
-  "navigation_bar.community_timeline": "Local timeline",
-  "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
-  "navigation_bar.discover": "Discover",
-  "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Edit profile",
-  "navigation_bar.favourites": "Favourites",
-  "navigation_bar.filters": "Muted words",
-  "navigation_bar.follow_requests": "Follow requests",
-  "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "About this server",
-  "navigation_bar.keyboard_shortcuts": "Hotkeys",
-  "navigation_bar.lists": "Lists",
-  "navigation_bar.logout": "Logout",
-  "navigation_bar.mutes": "Muted users",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Pinned toots",
-  "navigation_bar.preferences": "Preferences",
-  "navigation_bar.public_timeline": "Federated timeline",
-  "navigation_bar.security": "Security",
-  "notification.favourite": "{name} favourited your status",
-  "notification.follow": "{name} followed you",
-  "notification.follow_request": "{name} has requested to follow you",
-  "notification.mention": "{name} mentioned you",
-  "notification.own_poll": "Your poll has ended",
-  "notification.poll": "A poll you have voted in has ended",
-  "notification.reblog": "{name} boosted your status",
-  "notifications.clear": "Clear notifications",
-  "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
-  "notifications.column_settings.alert": "Desktop notifications",
-  "notifications.column_settings.favourite": "Favourites:",
-  "notifications.column_settings.filter_bar.advanced": "Display all categories",
-  "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
-  "notifications.column_settings.follow": "New followers:",
-  "notifications.column_settings.follow_request": "New follow requests:",
-  "notifications.column_settings.mention": "Mentions:",
-  "notifications.column_settings.poll": "Poll results:",
-  "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.reblog": "Boosts:",
-  "notifications.column_settings.show": "Show in column",
-  "notifications.column_settings.sound": "Play sound",
-  "notifications.filter.all": "All",
-  "notifications.filter.boosts": "Boosts",
-  "notifications.filter.favourites": "Favourites",
-  "notifications.filter.follows": "Follows",
-  "notifications.filter.mentions": "Mentions",
-  "notifications.filter.polls": "Poll results",
-  "notifications.group": "{count} notifications",
-  "poll.closed": "Closed",
-  "poll.refresh": "Refresh",
-  "poll.total_people": "{count, plural, one {# person} other {# people}}",
-  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
-  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
-  "poll_button.add_poll": "Add a poll",
-  "poll_button.remove_poll": "Remove poll",
-  "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Visible for mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Visible for followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all, shown in public timelines",
-  "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but not in public timelines",
-  "privacy.unlisted.short": "Unlisted",
-  "refresh": "Refresh",
-  "regeneration_indicator.label": "Loadingâ€¦",
-  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
-  "relative_time.days": "{number}d",
-  "relative_time.hours": "{number}h",
-  "relative_time.just_now": "now",
-  "relative_time.minutes": "{number}m",
-  "relative_time.seconds": "{number}s",
-  "relative_time.today": "today",
-  "reply_indicator.cancel": "Cancel",
-  "report.forward": "Forward to {target}",
-  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
-  "report.placeholder": "Additional comments",
-  "report.submit": "Submit",
-  "report.target": "Report {target}",
-  "search.placeholder": "Search",
-  "search_popout.search_format": "Advanced search format",
-  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
-  "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "status",
-  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
-  "search_popout.tips.user": "user",
-  "search_results.accounts": "People",
-  "search_results.hashtags": "Hashtags",
-  "search_results.statuses": "Toots",
-  "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
-  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
-  "status.admin_account": "Open moderation interface for @{name}",
-  "status.admin_status": "Open this status in the moderation interface",
-  "status.block": "Block @{name}",
-  "status.bookmark": "Bookmark",
-  "status.cancel_reblog_private": "Unboost",
-  "status.cannot_reblog": "This post cannot be boosted",
-  "status.copy": "Copy link to status",
-  "status.delete": "Delete",
-  "status.detailed_status": "Detailed conversation view",
-  "status.direct": "Direct message @{name}",
-  "status.embed": "Embed",
-  "status.favourite": "Favourite",
-  "status.filtered": "Filtered",
-  "status.load_more": "Load more",
-  "status.media_hidden": "Media hidden",
-  "status.mention": "Mention @{name}",
-  "status.more": "More",
-  "status.mute": "Mute @{name}",
-  "status.mute_conversation": "Mute conversation",
-  "status.open": "Expand this status",
-  "status.pin": "Pin on profile",
-  "status.pinned": "Pinned toot",
-  "status.read_more": "Read more",
-  "status.reblog": "Boost",
-  "status.reblog_private": "Boost to original audience",
-  "status.reblogged_by": "{name} boosted",
-  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
-  "status.redraft": "Delete & re-draft",
-  "status.remove_bookmark": "Remove bookmark",
-  "status.reply": "Reply",
-  "status.replyAll": "Reply to thread",
-  "status.report": "Report @{name}",
-  "status.sensitive_warning": "Sensitive content",
-  "status.share": "Share",
-  "status.show_less": "Show less",
-  "status.show_less_all": "Show less for all",
-  "status.show_more": "Show more",
-  "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
-  "status.uncached_media_warning": "Not available",
-  "status.unmute_conversation": "Unmute conversation",
-  "status.unpin": "Unpin from profile",
-  "suggestions.dismiss": "Dismiss suggestion",
-  "suggestions.header": "You might be interested inâ€¦",
-  "tabs_bar.federated_timeline": "Federated",
-  "tabs_bar.home": "Home",
-  "tabs_bar.local_timeline": "Local",
-  "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Search",
-  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
-  "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
-  "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
-  "time_remaining.moments": "Moments remaining",
-  "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
-  "trends.trending_now": "Trending now",
-  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
-  "upload_area.title": "Drag & drop to upload",
-  "upload_button.label": "Add images, a video or an audio file",
-  "upload_error.limit": "File upload limit exceeded.",
-  "upload_error.poll": "File upload not allowed with polls.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
-  "upload_form.description": "Describe for the visually impaired",
-  "upload_form.edit": "Edit",
-  "upload_form.thumbnail": "Change thumbnail",
-  "upload_form.undo": "Delete",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
-  "upload_modal.analyzing_picture": "Analyzing pictureâ€¦",
-  "upload_modal.apply": "Apply",
-  "upload_modal.choose_image": "Choose image",
-  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
-  "upload_modal.detect_text": "Detect text from picture",
-  "upload_modal.edit_media": "Edit media",
-  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
-  "upload_modal.preview_label": "Preview ({ratio})",
-  "upload_progress.label": "Uploadingâ€¦",
-  "video.close": "Close video",
-  "video.download": "Download file",
-  "video.exit_fullscreen": "Exit full screen",
-  "video.expand": "Expand video",
-  "video.fullscreen": "Full screen",
-  "video.hide": "Hide video",
-  "video.mute": "Mute sound",
-  "video.pause": "Pause",
-  "video.play": "Play",
-  "video.unmute": "Unmute sound"
+  "loading_indicator.label": "Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†...",
+  "media_gallery.toggle_visible": "Ø´Ø§Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ {number, plural, one {image} other {images}}",
+  "missing_indicator.label": "Ù†Û•Ø¯Û†Ø²Ø±Ø§ÛŒÛ•ÙˆÛ•",
+  "missing_indicator.sublabel": "Ø¦Û•Ùˆ Ø³Û•Ø±Ú†Ø§ÙˆÛ•ÛŒÛ• Ù†Ø§Ø¯Û†Ø²Ø±ÛŽØªÛ•ÙˆÛ•",
+  "mute_modal.duration": "Ù…Ø§ÙˆÛ•",
+  "mute_modal.hide_notifications": "Ø´Ø§Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù† Ù„Û•Ù… Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Û•ØŸ ",
+  "mute_modal.indefinite": "Ù†Ø§Ø¯ÛŒØ§Ø±",
+  "navigation_bar.apps": "Ø¨Û•Ø±Ù†Ø§Ù…Û•ÛŒ Ù…Û†Ø¨Ø§ÛŒÙ„",
+  "navigation_bar.blocks": "Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Û• Ø¨Ù„Û†Ú©Ú©Ø±Ø§ÙˆÛ•Ú©Ø§Ù†",
+  "navigation_bar.bookmarks": "Ù†ÛŒØ´Ø§Ù†Ú©Ø±Ø§ÙˆÛ•Ú©Ø§Ù†",
+  "navigation_bar.community_timeline": "Ø¯Û•Ù…Ù†Ø§Ù…Û•ÛŒ Ù†Ø§ÙˆØ®Û†ÛŒÛŒ",
+  "navigation_bar.compose": "Ù†ÙˆÙˆØ³ÛŒÙ†ÛŒ ØªÙˆØªÛŒ Ù†ÙˆÛŽ",
+  "navigation_bar.direct": "Ù†Ø§Ù…Û• Ú•Ø§Ø³ØªÛ•ÙˆØ®Û†Ú©Ø§Ù†",
+  "navigation_bar.discover": "Ø¯Û†Ø²ÛŒÙ†Û•ÙˆÛ•",
+  "navigation_bar.domain_blocks": "Ø¯Û†Ù…Û•ÛŒÙ†Û• Ø¨Ù„Û†Ú© Ú©Ø±Ø§ÙˆÛ•Ú©Ø§Ù†",
+  "navigation_bar.edit_profile": "Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„ Ø¨Ú©Û•",
+  "navigation_bar.favourites": "Ø¯ÚµØ®ÙˆØ§Ø²Û•Ú©Ø§Ù†",
+  "navigation_bar.filters": "ÙˆØ´Û• Ú©Ù¾Û•Ú©Ø§Ù†",
+  "navigation_bar.follow_requests": "Ø¨Û•Ø¯ÙˆØ§Ø¯Ø§Ú†ÙˆÛŒ Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒÛ•Ú©Ø§Ù† Ø¨Ú©Û•",
+  "navigation_bar.follows_and_followers": "Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆÙˆ Ùˆ Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†",
+  "navigation_bar.info": "Ø¯Û•Ø±Ø¨Ø§Ø±Û•ÛŒ Ø¦Û•Ù… Ú•Ø§Ú˜Û•",
+  "navigation_bar.keyboard_shortcuts": "Ù‡Û†ØªÚ©Û•ÛŒ",
+  "navigation_bar.lists": "Ù„ÛŒØ³ØªÛ•Ú©Ø§Ù†",
+  "navigation_bar.logout": "Ø¯Û•Ø±Ú†ÙˆÙˆÙ†",
+  "navigation_bar.mutes": "Ú©Ù¾Ú©Ø±Ø¯Ù†ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†",
+  "navigation_bar.personal": "Ú©Û•Ø³ÛŒ",
+  "navigation_bar.pins": "ØªÙˆØªÛŒ Ú†Û•Ø³Ù¾Ø§Ùˆ",
+  "navigation_bar.preferences": "Ù¾Û•Ø³Û•Ù†Ø¯Û•Ú©Ø§Ù†",
+  "navigation_bar.public_timeline": "Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ Ù‡Û•Ù…ÙˆÙˆØ´ÙˆÛŽÙ†ÛŽÚ©",
+  "navigation_bar.security": "Ø¦Ø§Ø³Ø§ÛŒØ´",
+  "notification.favourite": "{name} Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•Ú©Û•ØªÛŒ Ù¾Û•Ø³Û•Ù†Ø¯ Ú©Ø±Ø¯",
+  "notification.follow": "{name} Ø¯ÙˆØ§ÛŒ ØªÛ† Ú©Û•ÙˆØª",
+  "notification.follow_request": "{name} Ø¯Ø§ÙˆØ§ÛŒ Ú©Ø±Ø¯ÙˆÙˆÛ• Ú©Û• Ø´ÙˆÛŽÙ†Øª Ø¨Ú©Û•ÙˆÛŽØª",
+  "notification.mention": "{name} Ø¨Ø§Ø³ÛŒ Ø¦ÛŽÙˆÛ•ÛŒ Ú©Ø±Ø¯",
+  "notification.own_poll": "Ú•Ø§Ù¾Ø±Ø³ÛŒÛ•Ú©Û•Øª Ú©Û†ØªØ§ÛŒÛŒ Ù‡Ø§Øª",
+  "notification.poll": "Ú•Ø§Ù¾Ø±Ø³ÛŒÛŒÛ•Ú© Ú©Û• Ø¯Û•Ù†Ú¯ÛŒ Ù¾ÛŽØ¯Ø§ÙˆÛŒØª Ú©Û†ØªØ§ÛŒÛŒ Ù‡Ø§Øª",
+  "notification.reblog": "{name} Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•Ú©Û•ØªÛŒ Ø¯ÙˆÙˆØ¨Ø§Ø±Û• ØªÙˆØªØ§Ù†Ø¯",
+  "notification.status": "{name} ØªØ§Ø²Û• Ø¨ÚµØ§ÙˆÚ©Ø±Ø§ÛŒÛ•ÙˆÛ•",
+  "notifications.clear": "Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù† Ø¨Ø³Ú•ÛŒÛ•ÙˆÛ•",
+  "notifications.clear_confirmation": "Ø¦Ø§ÛŒØ§ Ø¯ÚµÙ†ÛŒØ§ÛŒØª Ù„Û•ÙˆÛ•ÛŒ Ø¯Û•ØªÛ•ÙˆÛŽØª Ø¨Û• Ù‡Û•Ù…ÛŒØ´Û•ÛŒÛŒ Ù‡Û•Ù…ÙˆÙˆ Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù†Øª Ø¨Ø³Ú•ÛŒØªÛ•ÙˆÛ•?",
+  "notifications.column_settings.alert": "Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù†ÛŒ Ù¾ÛŒØ´Ø§Ù†Ú¯Û•Ø±Ø± Ú•ÙˆÙ…ÛŽØ²ÛŒ",
+  "notifications.column_settings.favourite": "Ø¯ÚµØ®ÙˆØ§Ø²ØªØ±ÛŒÙ†:",
+  "notifications.column_settings.filter_bar.advanced": "Ù‡Û•Ù…ÙˆÙˆ Ù¾Û†Ù„Û•Ú©Ø§Ù† Ù¾ÛŒØ´Ø§Ù† Ø¨Ø¯Û•",
+  "notifications.column_settings.filter_bar.category": "Ø´Ø±ÛŒØªÛŒ Ù¾Ø§ÚµÛŽÙˆÛ•Ø±ÛŒ Ø®ÛŽØ±Ø§",
+  "notifications.column_settings.filter_bar.show": "Ù†ÛŒØ´Ø§Ù†Ø¯Ø§Ù†",
+  "notifications.column_settings.follow": "Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ Ù†ÙˆÛŽ:",
+  "notifications.column_settings.follow_request": "Ø´ÙˆÛŒÙ†Ú©Û•ÙˆØªÙ†ÛŒ Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒ Ù†ÙˆÛŽ:",
+  "notifications.column_settings.mention": "Ø¦Ø§Ù…Ø§Ú˜Û•Ú©Ø§Ù†:",
+  "notifications.column_settings.poll": "Ø¦Û•Ù†Ø¬Ø§Ù…Û•Ú©Ø§Ù†ÛŒ Ú•Ø§Ù¾Ø±Ø³ÛŒ:",
+  "notifications.column_settings.push": "Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù† Ù¾Ø§Úµ Ø¨Ù†ÛŽ",
+  "notifications.column_settings.reblog": "Ø¯ÙˆÙˆØ¨Ø§Ø±Û•ØªÙˆØªÛ•Ú©Ø§Ù†:",
+  "notifications.column_settings.show": "Ù„Û• Ø³ØªÙˆÙˆÙ†Ø¯Ø§ Ù¾ÛŒØ´Ø§Ù† Ø¨Ø¯Û•",
+  "notifications.column_settings.sound": "Ù„ÛŽØ¯Ø§Ù†ÛŒ Ø¯Û•Ù†Ú¯",
+  "notifications.column_settings.status": "ØªÙˆØªÛ•Ú©Ø§Ù†ÛŒ Ù†ÙˆÛŽ:",
+  "notifications.filter.all": "Ù‡Û•Ù…ÙˆÙˆ",
+  "notifications.filter.boosts": "Ø¯ÙˆÙˆØ¨Ø§Ø±Û•ØªÙˆØªÛ•Ú©Ø§Ù†",
+  "notifications.filter.favourites": "Ø¯ÚµØ®ÙˆØ§Ø²Û•Ú©Ø§Ù†",
+  "notifications.filter.follows": "Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙ†",
+  "notifications.filter.mentions": "Ø¦Ø§Ù…Ø§Ú˜Û•Ú©Ø§Ù†",
+  "notifications.filter.polls": "Ø¦Û•Ù†Ø¬Ø§Ù…Û•Ú©Ø§Ù†ÛŒ Ú•Ø§Ù¾Ø±Ø³ÛŒ",
+  "notifications.filter.statuses": "Ù†ÙˆÛŽÚ©Ø±Ø¯Ù†Û•ÙˆÛ•Ú©Ø§Ù† Ø¦Û•Ùˆ Ú©Û•Ø³Ø§Ù†Û•ÛŒ Ú©Û• Ù¾Û•ÛŒÚ•Û•ÙˆÛŒ Ø¯Û•Ú©Û•ÛŒØª",
+  "notifications.grant_permission": "Grant permission.",
+  "notifications.group": "{count} Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•",
+  "notifications.mark_as_read": "Ù‡Û•Ù…ÙˆÙˆ Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù† ÙˆÛ•Ú© Ø®ÙˆÛŽÙ†Ø¯Ø±Ø§ÙˆÛ•ØªÛ•ÙˆÛ• Ù†ÛŒØ´Ø§Ù† Ø¨Ú©Û•",
+  "notifications.permission_denied": "Ù†Ø§ØªÙˆØ§Ù†Ø±ÛŽØª Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù†ÛŒ Ø¯ÛŽØ³Ú©ØªÛ†Ù¾ Ú†Ø§Ù„Ø§Ú© Ø¨Ú©Ø±ÛŽØª ÙˆÛ•Ú© Ú•ÛŽÙ¾ÛŽØ¯Ø§Ù† Ú•Û•ØªÚ©Ø±Ø§ÛŒÛ•ÙˆÛ•.",
+  "notifications.permission_denied_alert": "Ù†Ø§ØªÙˆØ§Ù†Ø±ÛŽØª Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù†ÛŒ Ø¯ÛŽØ³Ú©ØªÛ†Ù¾ Ú†Ø§Ù„Ø§Ú© Ø¨Ú©Ø±ÛŽØªØŒ Ú†ÙˆÙ†Ú©Û• Ù¾ÛŽØ´ØªØ± Ù…Û†ÚµÛ•ØªÛŒ ÙˆÛŽØ¨Ú¯Û•Ú• Ú•Û•ØªÚ©Ø±Ø§ÛŒÛ•ÙˆÛ•",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Ú†Ø§Ù„Ø§Ú©Ú©Ø±Ø¯Ù†ÛŒ Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù†ÛŒ Ø¯ÛŽØ³Ú©ØªÛ†Ù¾",
+  "notifications_permission_banner.how_to_control": "Ø¨Û† ÙˆÛ•Ø±Ú¯Ø±ØªÙ†ÛŒ Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù† Ú©Ø§ØªÛŽÚ© Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† Ù†Û•Ú©Ø±Ø§ÙˆÛ•ÛŒÛ•ØŒ Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù†ÛŒ Ø¯ÛŽØ³Ú©ØªÛ†Ù¾ Ú†Ø§Ù„Ø§Ú© Ø¨Ú©Û•. Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø¨Û• ÙˆØ±Ø¯ÛŒ Ú©Û†Ù†ØªØ±Û†ÚµÛŒ Ø¬Û†Ø±ÛŒ Ú©Ø§Ø±Ù„ÛŽÚ©Û•Ú©Ø§Ù† Ø¨Ú©Û•ÛŒØª Ú©Û• Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù†ÛŒ Ø¯ÛŽØ³Ú©ØªÛ†Ù¾ Ø¯Ø±ÙˆØ³Øª Ø¯Û•Ú©Û•Ù† Ù„Û• Ú•ÛŽÚ¯Û•ÛŒ Ø¯ÙˆÚ¯Ù…Û•ÛŒ {icon} Ù„Û•Ø³Û•Ø±Û•ÙˆÛ• Ú©Ø§ØªÛŽÚ© Ú†Ø§Ù„Ø§Ú© Ø¯Û•Ú©Ø±ÛŽÙ†.",
+  "notifications_permission_banner.title": "Ù‡Û•Ø±Ú¯ÛŒØ² Ø´ØªÛŽÚ© Ù„Û• Ø¯Û•Ø³Øª Ù…Û•Ø¯Û•",
+  "picture_in_picture.restore": "Ø¨ÛŒÚ¯Û•Ú•ÛŽÙ†Û•ÙˆÛ•",
+  "poll.closed": "Ø¯Ø§Ø¨Ø®Û•",
+  "poll.refresh": "Ù†ÙˆÛŽÚ©Ø±Ø¯Ù†Û•ÙˆÛ•",
+  "poll.total_people": "{count, plural, one {# Ø®Û•ÚµÚ©} other {# Ø®Û•ÚµÚ©}}",
+  "poll.total_votes": "{count, plural, one {# Ø¯Û•Ù†Ú¯} other {# Ø¯Û•Ù†Ú¯}}\n",
+  "poll.vote": "Ø¯Û•Ù†Ú¯",
+  "poll.voted": "ØªÛ† Ø¯Û•Ù†Ú¯Øª Ø¨Û•Ùˆ ÙˆÛ•ÚµØ§Ù…Û• Ø¯Ø§",
+  "poll_button.add_poll": "Ú•Ø§Ù¾Ø±Ø³ÛŒÛŒÛ•Ú© Ø²ÛŒØ§Ø¯ Ø¨Ú©Û•",
+  "poll_button.remove_poll": "Ø¯Ù‡â€ŒÙ†Ú¯Ø¯Ø§Ù† Ø¨Ø³Ú•Ù‡â€ŒÙˆÙ‡â€Œâ€Œ",
+  "privacy.change": "Ú•ÛŽÚ©Ø®Ø³ØªÙ†ÛŒ ØªØ§ÛŒØ¨Û•ØªÙ…Û•Ù†Ø¯ÛŒ ØªÙˆØª",
+  "privacy.direct.long": "ØªÛ•Ù†ÛŒØ§ Ø¨Û† Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†ÛŒ Ù†Ø§ÙˆØ¨Ø±Ø§Ùˆ",
+  "privacy.direct.short": "Ú•Ø§Ø³ØªÛ•ÙˆØ®Û†",
+  "privacy.private.long": "Ø¨ÛŒÙ†Ø±Ø§Ùˆ ØªÛ•Ù†Ù‡Ø§ Ø¨Û† Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†",
+  "privacy.private.short": "ØªÛ•Ù†Ù‡Ø§ Ø¨Û† Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†",
+  "privacy.public.long": "Ø¨Û† Ù‡Û•Ù…ÙˆÙˆØ§Ù† Ø¯ÛŒØ§Ø±Ø¨ÛŽØªØŒ Ù„Û• Ù‡ÛŽÚµÛŒ Ú©Ø§ØªÛŒ Ú¯Ø´ØªÛŒ Ø¯Ø§ Ù†ÛŒØ´Ø§Ù† Ø¯Û•Ø¯Ø±ÛŽØª",
+  "privacy.public.short": "Ú¯Ø´ØªÛŒ",
+  "privacy.unlisted.long": "Ø¨Û† Ù‡Û•Ù…ÙˆÙˆØ§Ù† Ø¯ÛŒØ§Ø±Û•ØŒ Ø¨Û•ÚµØ§Ù… Ù„Û• Ù‡ÛŽÚµÛŒ Ú©Ø§ØªÛŒ Ú¯Ø´ØªÛŒØ¯Ø§ Ù†Ø§",
+  "privacy.unlisted.short": "Ù„Û• Ù„ÛŒØ³Øª Ù†Û•Ú©Ø±Ø§Ùˆ",
+  "refresh": "Ù†ÙˆÛŽÚ©Ø±Ø¯Ù†Û•ÙˆÛ•",
+  "regeneration_indicator.label": "Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†â€¦",
+  "regeneration_indicator.sublabel": "Ú•Ø§Ú¯Û•ÛŒÛ•Ù†Û•Ø±ÛŒ Ù…Ø§ÚµÛ•ÙˆÛ•Øª Ø¦Ø§Ù…Ø§Ø¯Û• Ø¯Û•Ú©Ø±ÛŽØª!",
+  "relative_time.days": "{number}Ú•Û†Ú˜",
+  "relative_time.hours": "{number}Ú©Ø§Øª",
+  "relative_time.just_now": "Ø¦ÛŽØ³ØªØ§",
+  "relative_time.minutes": "{number}Ú©Ø§Øª",
+  "relative_time.seconds": "{number}Ú©Ø§Øª",
+  "relative_time.today": "Ø¦ÛŒÙ…Ú•Û†",
+  "reply_indicator.cancel": "Ù‡Û•ÚµÙˆÛ•Ø´Ø§Ù†Ø¯Ù†Û•ÙˆÙ‡",
+  "report.forward": "Ù†Ø§Ø±Ø¯Ù† Ø¨Û† {target}",
+  "report.forward_hint": "Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û• Ù„Û• Ú•Ø§Ú˜Û•ÛŒÛ•Ú©ÛŒ ØªØ±Û•. Ú•ÙˆÙ†ÙˆÙˆØ³ÛŽÚ©ÛŒ Ù†Û•Ù†Ø§Ø³Ø±Ø§Ùˆ Ø¨Ù†ÛŽØ±Û• Ø¨Û† Ú¯ÙˆØ²Ø§Ø±Ø´Øª Ù„Û•ÙˆÛŽ?",
+  "report.hint": "Ú¯ÙˆØ²Ø§Ø±Ø´ØªÛ•Ú©Û• Ø¯Û•Ù†ÛŽØ±Ø¯Ø±ÛŽØª Ø¨Û† Ø¨Û•Ø±Ù¾Ø±Ø³Ø§Ù†ÛŒ Ú•Ø§Ú˜Û•Ú©Û•Øª. Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ú•ÙˆÙˆÙ†Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒÛ•Ú© Ù¾ÛŽØ´Ú©Û•Ø´ Ø¨Ú©Û•ÛŒØª Ú©Û• Ø¨Û†Ú†ÛŒ Ø¦Û•Ù… Ù‡Û•Ú˜Ù…Ø§Ø±Û• Ù„Û• Ø®ÙˆØ§Ø±Û•ÙˆÛ• Ú¯ÙˆØ²Ø§Ø±Ø´ Ø¯Û•Ú©Û•ÛŒØª:",
+  "report.placeholder": "Ø³Û•Ø±Ù†Ø¬Û•Ú©Ø§Ù†ÛŒ Ø²ÛŒØ§ØªØ±",
+  "report.submit": "Ù†Ø§Ø±Ø¯Ù†",
+  "report.target": "Ú¯ÙˆØ²Ø§Ø±Ø´ØªÚ©Ø±Ø¯Ù†ÛŒ{target}",
+  "search.placeholder": "Ú¯Û•Ú•Ø§Ù†",
+  "search_popout.search_format": "Ø´ÛŽÙˆÛ•ÛŒ Ú¯Û•Ú•Ø§Ù†ÛŒ Ù¾ÛŽØ´Ú©Û•ÙˆØªÙˆÙˆ",
+  "search_popout.tips.full_text": "Ú¯Û•Ú•Ø§Ù†ÛŽÚ©ÛŒ Ø¯Û•Ù‚ÛŒ Ø³Ø§Ø¯Û• Ø¯Û•ØªÙˆØ§Ù†ÛŽØª ØªÙˆØªÛ•Ú©Ø§Ù†ÛŒ Ø¦ÛŽÙˆÛ• Ú©Û•ØŒ Ù†ÙˆÙˆØ³ÛŒÙˆØªØ§Ù†Û•ØŒÙ¾Û•Ø³Û•Ù†ØªØ§Ù† Ú©Ø±Ø¯ÙˆÙˆÛ•ØŒ Ø¯ÙˆÙˆØ¨Ø§Ø±Û•ØªØ§Ù†Ú©Ø±Ø¯ÙˆÙˆÛ•ØŒ ÛŒØ§Ù† Ø¦Û•Ùˆ ØªÙˆØªØ§Ù†Û• Ú©Û• Ø¨Ø§Ø³ÛŒ Ø¦ÛŽÙˆÛ•ÛŒ ØªÛŽØ¯Ø§ Ú©Ø±Ø§ÙˆÛ• Ù¾Û•ÛŒØ¯Ø§ Ø¯Û•Ú©Ø§. Ù‡Û•Ø±ÙˆÛ•Ù‡Ø§ Ù†Ø§ÙˆÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†ØŒ Ù†Ø§ÙˆÛŒ Ù¾ÛŒØ´Ø§Ù†Ø¯Ø±Ø§Ùˆ Ùˆ Ù‡Û•Ø´ØªÛ•Ú¯Û•Ú©Ø§Ù†ÛŒØ´ Ù„Û• Ø®Û† Ø¯Û•Ú¯Ø±ÛŽØª.",
+  "search_popout.tips.hashtag": "Ù‡Û•Ø´ØªØ§Ú¯",
+  "search_popout.tips.status": "ØªÙˆØª",
+  "search_popout.tips.text": "Ø¯Û•Ù‚ÛŒ Ø³Ø§Ø¯Û• Ù‡Û•ÚµØ¯Û•Ø³ÛŽ Ø¨Û• Ú¯Û•Ú•Ø§Ù†Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù‡Ø§ÙˆØªØ§ÛŒÛŒ Ù†Ø§ÙˆÛŒ Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ØŒ Ù†Ø§ÙˆÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø± Ùˆ Ù‡Ø§Ø´ØªØ§Ú¯Û•Ú©Ø§Ù†",
+  "search_popout.tips.user": "Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±",
+  "search_results.accounts": "Ø®Û•ÚµÚ©",
+  "search_results.hashtags": "Ù‡Û•Ø´ØªØ§Ú¯",
+  "search_results.statuses": "ØªÙˆØªÛ•Ú©Ø§Ù†",
+  "search_results.statuses_fts_disabled": "Ú¯Û•Ú•Ø§Ù†ÛŒ ØªÙˆØªÛ•Ú©Ø§Ù† Ø¨Û• Ù†Ø§ÙˆÛ•Ú•Û†Ú©ÛŒØ§Ù† Ù„Û•Ø³Û•Ø± Ø¦Û•Ù… Ú•Ø§Ú˜Û•ÛŒ Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† Ú†Ø§Ù„Ø§Ú© Ù†Û•Ú©Ø±Ø§ÙˆÛ•.",
+  "search_results.total": "{count, number} {count, plural, one {Ø¯Û•Ø±Ø¦Û•Ù†Ø¬Ø§Ù…} other {Ø¯Û•Ø±Ø¦Û•Ù†Ø¬Ø§Ù…}}",
+  "status.admin_account": "Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù…ÛŒØ§Ù†Ú•Û•ÙˆÛŒ Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Û•Ø± Ø¨Û† @{name}",
+  "status.admin_status": "Ø¦Û•Ù… ØªÙˆØªÛ• Ø¨Ú©Û•ÙˆÛ• Ù„Û• Ù†Ø§Ùˆ Ú•ÙˆÙˆÚ©Ø§Ø±ÛŒ Ø¨Û•Ú•ÛŒÙˆÛ•Ø¨Û•Ø±",
+  "status.block": "Ø¨Ù„Û†Ú©ÛŒ @{name}",
+  "status.bookmark": "Ù†ÛŒØ´Ø§Ù†Ù‡",
+  "status.cancel_reblog_private": "Ø¨ÛŽØ¨Û•Ù‡ÛŽØ²Ú©Ø±Ø¯Ù†",
+  "status.cannot_reblog": "Ø¦Û•Ù… Ø¨Ø§Ø¨Û•ØªÛ• Ù†Ø§ØªÙˆØ§Ù†Ø±ÛŽØª Ø¨Û•Ø±Ø²Ø¨Ú©Ø±ÛŽØªÛ•ÙˆÛ•",
+  "status.copy": "Ú•ÙˆÙˆÙ†ÙˆÙˆØ³ÛŒ Ø¨Û•Ø³ØªÛ•Ø± Ø¨Û† ØªÙˆØª",
+  "status.delete": "Ø³Ú•ÛŒÙ†Û•ÙˆÛ•",
+  "status.detailed_status": "Ú•ÙˆØ§Ù†Ú¯Û•ÛŒ Ú¯ÙØªÙˆÚ¯Û† Ø¨Û• ÙˆØ±Ø¯Û•Ú©Ø§Ø±ÛŒ",
+  "status.direct": "Ù¾Û•ÛŒØ§Ù…ÛŒ Ú•Ø§Ø³ØªÛ•ÙˆØ®Û† @{name}",
+  "status.embed": "Ù†ÛŒØ´ØªÛ•Ø¬ÛŽ Ø¨Ú©Û•",
+  "status.favourite": "Ø¯ÚµØ®ÙˆØ§Ø²",
+  "status.filtered": "Ù¾Ø§ÚµØ§ÙˆØªÙ†",
+  "status.load_more": "Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†ÛŒ Ø²ÛŒØ§ØªØ±",
+  "status.media_hidden": "Ù…ÛŒØ¯ÛŒØ§ÛŒ Ø´Ø§Ø±Ø§ÙˆÛ•",
+  "status.mention": "Ù†Ø§ÙˆØ¨Ù†ÛŽ @{name}",
+  "status.more": "Ø²ÛŒØ§ØªØ±",
+  "status.mute": "Ø¨ÛŽØ¯Û•Ù†Ú¯Ú©Ø±Ø¯Ù† @{name}",
+  "status.mute_conversation": "Ú¯ÙØªÙˆÚ¯Û†ÛŒ Ø¨ÛŽØ¯Û•Ù†Ú¯",
+  "status.open": "Ø¦Û•Ù… ØªÙˆØªÛ• ÙØ±Ø§ÙˆØ§Ù† Ø¨Ú©Û•",
+  "status.pin": "Ù„Ú©Ø§Ù†Ø¯Ù† Ù„Û•Ø³Û•Ø± Ù¾Ø±Û†ÙØ§ÛŒÙ„",
+  "status.pinned": "ØªÙˆØªÛŒ Ú†Û•Ø³Ù¾Ú©Ø±Ø§Ùˆ",
+  "status.read_more": "Ø²ÛŒØ§ØªØ± Ø¨Ø®ÙˆÛŽÙ†Û•ÙˆÛ•",
+  "status.reblog": "Ø¨Û•Ù‡ÛŽØ²Ú©Ø±Ø¯Ù†",
+  "status.reblog_private": "Ø¨Û•Ù‡ÛŽØ²Ú©Ø±Ø¯Ù† Ø¨Û† Ø¨ÛŒÙ†Û•Ø±Ø§Ù†ÛŒ Ø³Û•Ø±Û•ØªØ§ÛŒÛŒ",
+  "status.reblogged_by": "{name} ØªÙˆØªÛŒ Ú©Ø±Ø¯Û•ÙˆÛ•",
+  "status.reblogs.empty": "Ú©Û•Ø³ Ø¦Û•Ù… ØªÙˆØªÛ•ÛŒ Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ù†Û•ØªÙˆØªØ§Ù†Ø¯ÙˆÛ• ØŒÚ©Ø§ØªÛŽÚ© Ú©Û•Ø³ÛŽÚ© ÙˆØ§ Ø¨Ú©Ø§ØªØŒ Ù„ÛŽØ±Û• Ø¯Û•Ø±Ø¦Û•Ú©Û•ÙˆÙ†.",
+  "status.redraft": "Ø³Ú•ÛŒÙ†Û•ÙˆÛ•ÛŒ Ùˆ Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ú•Û•Ø´Ù†ÙˆÙˆØ³",
+  "status.remove_bookmark": "Ù„Ø§Ø¨Ø±Ø¯Ù†ÛŒ Ù†ÛŒØ´Ø§Ù†Ù‡",
+  "status.reply": "ÙˆÛ•ÚµØ§Ù…",
+  "status.replyAll": "Ø¨Û• Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ• ÙˆÛ•ÚµØ§Ù… Ø¨Ø¯Û•ÙˆÛ•",
+  "status.report": "Ú¯ÙˆØ²Ø§Ø±Ø´Øª @{name}",
+  "status.sensitive_warning": "Ù†Ø§ÙˆÛ•Ú•Û†Ú©ÛŒ Ù‡Û•Ø³ØªÛŒØ§Ø±",
+  "status.share": "Ù‡Ø§ÙˆØ¨Û•Ø´ Ú©Ø±Ø¯Ù†",
+  "status.show_less": "Ú©Û•Ù…ØªØ± Ù†ÛŒØ´Ø§Ù† Ø¨Ø¯Û•",
+  "status.show_less_all": "Ú©Û•Ù…ØªØ± Ù†ÛŒØ´Ø§Ù† Ø¨Ø¯Û• Ø¨Û† Ù‡Û•Ù…ÙˆÙˆÛŒ",
+  "status.show_more": "Ø²ÛŒØ§ØªØ± Ù¾ÛŒØ´Ø§Ù† Ø¨Ø¯Û•",
+  "status.show_more_all": "Ø²ÛŒØ§ØªØ± Ù†ÛŒØ´Ø§Ù† Ø¨Ø¯Û• Ø¨Û† Ù‡Û•Ù…ÙˆÙˆÛŒ",
+  "status.show_thread": "Ù†ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ú¯ÙØªÙˆÚ¯Û†",
+  "status.uncached_media_warning": "Ø¨Û•Ø±Ø¯Û•Ø³Øª Ù†ÛŒÛ•",
+  "status.unmute_conversation": "Ú¯ÙØªÙˆÚ¯Û†ÛŒ Ø¨ÛŽØ¯Û•Ù†Ú¯",
+  "status.unpin": "Ù„Ø§Ø¨Ø±Ø¯Ù† Ù„Û• Ù¾Ø±Û†ÙØ§ÛŒÙ„",
+  "suggestions.dismiss": "Ú•Û•ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù¾ÛŽØ´Ù†ÛŒØ§Ø±",
+  "suggestions.header": "Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• ØÛ•Ø²Øª Ù„Û•Ù…Û•Ø´ Ø¨ÛŽØªâ€¦",
+  "tabs_bar.federated_timeline": "Ú¯Ø´ØªÛŒ",
+  "tabs_bar.home": "Ø³Û•Ø±Û•ØªØ§",
+  "tabs_bar.local_timeline": "Ù†Ø§ÙˆØ®Û†ÛŒÛŒ",
+  "tabs_bar.notifications": "Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒÛŒÛ•Ú©Ø§Ù†",
+  "tabs_bar.search": "Ú¯Û•Ú•Ø§Ù†",
+  "time_remaining.days": "{number, plural, one {# Ú•Û†Ú˜} other {# Ú•Û†Ú˜}} Ù…Ø§ÙˆÛ•",
+  "time_remaining.hours": "{number, plural, one {# Ú©Ø§Øª} other {# Ú©Ø§Øª}} Ù…Ø§ÙˆÛ•",
+  "time_remaining.minutes": "{number, plural, one {# Ø®Û†Ù„Û•Ú©} other {# Ø®ÙˆÙ„Û•Ú©}} Ù…Ø§ÙˆÛ•",
+  "time_remaining.moments": "Ø¦Û•Ùˆ Ø³Ø§ØªØ§Ù†Û•ÛŒ Ù…Ø§ÙˆÙ†Û•ØªÛ•ÙˆÛ•",
+  "time_remaining.seconds": "{number, plural, one {# Ú†Ø±Ú©Û•} other {# Ú†Ø±Ú©Û•}} Ù…Ø§ÙˆÛ•",
+  "timeline_hint.remote_resource_not_displayed": "{resource} Ù„Û• Ú•Ø§Ú˜Û•Ú©Ø§Ù†ÛŒ ØªØ±Û•ÙˆÛ• Ù¾ÛŒØ´Ø§Ù† Ù†Ø§Ø¯Ø±ÛŽØª.",
+  "timeline_hint.resources.followers": "Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆÙˆØ§Ù†",
+  "timeline_hint.resources.follows": "Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙ†",
+  "timeline_hint.resources.statuses": "ØªÙˆØªÛŒ Ú©Û†Ù†",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} Ú©Û•Ø³} other {{counter} Ú©Û•Ø³}} Ú¯ÙØªÙˆÚ¯Û† Ø¯Û•Ú©Ø§",
+  "trends.trending_now": "Ú¯Û†Ú¯Ø±Ø§Ù†",
+  "ui.beforeunload": "Ú•Û•Ø´Ù†ÙˆÙˆØ³Û•Ú©Û•Øª Ù„Û• Ø¯Û•Ø³Øª Ø¯Û•Ú†ÛŽØª Ø¦Û•Ú¯Û•Ø± Ù„Û• Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† Ø¨Ú•Û†ÛŒØª.",
+  "units.short.billion": "{count}Ù…Ù„ÛŒØ§Ø±",
+  "units.short.million": "{count}Ù…Ù„ÛŒÛ†Ù†",
+  "units.short.thousand": "{count}Ù‡Û•Ø²Ø§Ø±",
+  "upload_area.title": "Ú•Ø§Ú©ÛŽØ´Ø§Ù† & Ø¯Ø§Ù†Ø§Ù† Ø¨Û† Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†",
+  "upload_button.label": "Ø²ÛŒØ§Ø¯Ú©Ø±Ø¯Ù†ÛŒ ÙˆÛŽÙ†Û•Ú©Ø§Ù†ØŒ Ú¤ÛŒØ¯ÛŒÛ†ÛŒÛ•Ú© ÛŒØ§Ù† ÙØ§ÛŒÙ„ÛŽÚ©ÛŒ Ø¯Û•Ù†Ú¯ÛŒ",
+  "upload_error.limit": "Ø³Ù†ÙˆÙˆØ±ÛŒ Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†ÛŒ ÙØ§ÛŒÙ„ ØªÛŽÙ¾Û•Ú•ÛŒÙˆÛ•.",
+  "upload_error.poll": "Ù¾Û•Ú•Ú¯Û•Ú©Û• Ú•ÛŽÛŒ Ù¾ÛŽÙ†Û•Ø¯Ø±Ø§ÙˆÛ• Ø¨Û• Ú•Ø§Ù¾Ø±Ø³ÛŒ Ø¨Ø§Ø±Ø¨Ú©Ø±ÛŽØª.",
+  "upload_form.audio_description": "Ø¨Û† Ø¦Û•Ùˆ Ú©Û•Ø³Ø§Ù†Û•ÛŒ Ú©Û• Ú¯ÙˆÛŽ Ø¨ÛŒØ³ØªÛŒØ§Ù† Ù‡Û•ÛŒÛ• ÙˆÛ•Ø³Ù Ø¯Û•Ú©Ø§Øª",
+  "upload_form.description": "ÙˆÛ•Ø³Ù Ø¨Ú©Û• Ø¨Û† Ú©Û•Ù…Ø¨ÛŒÙ†Ø§ÛŒØ§Ù†",
+  "upload_form.edit": "Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒ",
+  "upload_form.thumbnail": "Ú¯Û†Ú•Ø§Ù†ÛŒ ÙˆÛŒÙ†Û†Ú†Ú©Û•",
+  "upload_form.undo": "Ø³Ú•ÛŒÙ†Û•ÙˆÛ•",
+  "upload_form.video_description": "Ø¨Û† Ú©Û•Ù… Ø¨ÛŒÙ†Ø§ÛŒØ§Ù† Ùˆ Ú©Û•Ù… Ø¨ÛŒØ³ØªØ§Ù† ÙˆÛ•Ø³ÙÛŒ Ø¨Ú©Û•",
+  "upload_modal.analyzing_picture": "Ø´ÛŒÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ ÙˆÛŽÙ†Û•â€¦",
+  "upload_modal.apply": "Ø¬ÛŽØ¨Û•Ø¬ÛŽ Ú©Ø±Ø¯Ù†",
+  "upload_modal.choose_image": "ÙˆÛŽÙ†Û• Ù‡Û•ÚµØ¨Ú˜ÛŽØ±Û•",
+  "upload_modal.description_placeholder": "Ø¨Û• Ø¯Úµ Ú©Û•ÛŒÙ† Ø¨Ø§ Ø¨Û• Ù†Û•Ø´Ø¦Û•ÛŒ Ù…Û•ÛŒ ØºÙˆØ¨Ø§Ø±ÛŒ Ù…ÛŒØÙ†Û•ØªÛŒ Ø¯ÙˆÙ†ÛŒØ§",
+  "upload_modal.detect_text": "Ø¯Û•Ù‚ÛŒ ÙˆÛŽÙ†Û•Ú©Û• Ø¨Ø¯Û†Ø²ÛŒÛ•ÙˆÛ•",
+  "upload_modal.edit_media": "Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒÚ©Ø±Ø¯Ù†ÛŒ Ù…ÛŒØ¯ÛŒØ§",
+  "upload_modal.hint": "Ú¯Û•Ø± ÙˆÛŽÙ†Û• Ú†Ú©Û†Ù„Û• ÛŒØ§Ù† Ø¨Ú•Ø§ÙˆÛ•Ø¨ÛŽØªØŒ Ø®Ø§ÚµÛŒ Ù†Ø§ÙˆÛ•Ù†Ø¯ÛŒ Ø¯ÛŒØ§Ø± Ø¯Û•Ú©Û•ÙˆÛŽØª. Ø®Ø§ÚµÛŒ Ù†Ø§ÙˆÛ•Ù†Ø¯ÛŒ ÙˆÛŽÙ†Û• Ø¨Û• Ú©Ø±ØªÛ• ÛŒØ§Ù† Ø¬ÛŽØ¨Û•Ø¬ÛŒÚ©Ø±Ø¯Ù†ÛŒ Ø±ÛŽÚ©Ø¨Ø®Û•Ù†.",
+  "upload_modal.preparing_ocr": "Ø¦Ø§Ù…Ø§Ø¯Û•Ú©Ø±Ø¯Ù†ÛŒ OCRâ€¦",
+  "upload_modal.preview_label": "Ù¾ÛŽØ´Ø¨ÛŒÙ†ÛŒ ({ratio})",
+  "upload_progress.label": "Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†...",
+  "video.close": "Ø¯Ø§Ø®Ø³ØªÙ†ÛŒ Ú¤ÛŒØ¯ÛŒÛ†",
+  "video.download": "Ø¯Ø§Ú¯Ø±ØªÙ†ÛŒ ÙØ§ÛŒÙ„",
+  "video.exit_fullscreen": "Ø¯Û•Ø±Ú†ÙˆÙˆÙ† Ù„Û• Ù¾Ú• Ø´Ø§Ø´Û•",
+  "video.expand": "Ú¤ÛŒØ¯ÛŒÛ†ÙØ±Ø§ÙˆØ§Ù† Ø¨Ú©Û•",
+  "video.fullscreen": "Ù¾Ú•Ù¾ÛŒØ´Ø§Ù†Ú¯Û•Ø±",
+  "video.hide": "Ø´Ø§Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ú¤ÛŒØ¯ÛŒÛ†",
+  "video.mute": "Ø¯Û•Ù†Ú¯ÛŒ Ú©Ù¾",
+  "video.pause": "ÙˆÛ•Ø³ØªØ§Ù†",
+  "video.play": "Ù¾Û•Ø®Ø´Ú©Ø±Ø¯Ù†",
+  "video.unmute": "Ø¯Û•Ù†Ú¯ Ù„Ø§Ø¨Ø¯Û•"
 }
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index e9618e0f2e91cae8ed9bdc402197b2d04f0f9176..46dc0975db7a67aa32a01a0ade413167416b76fe 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Cancel follow request",
   "account.direct": "Direct message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Edit profile",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
   "account.follow": "Follow",
   "account.followers": "Followers",
@@ -96,9 +98,9 @@
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "Write your warning here",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No toots here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "Authorize",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
-  "lightbox.view_context": "View context",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Change title",
   "lists.new.create": "Add list",
   "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Search among people you follow",
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.alert": "Desktop notifications",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Closed",
   "poll.refresh": "Refresh",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -389,7 +413,7 @@
   "status.pinned": "Pinned toot",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploadingâ€¦",
   "video.close": "Close video",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 2812760a658a2a08be243550f943aaecb8ff8d4b..f075731fedc6370e05d3a4c71fa1f0f5af8173aa 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "PÄrlÅ«kot vairÄk sÄkotnÄ“jÄ profilÄ",
   "account.cancel_follow_request": "Atcelt pieprasÄ«jumu",
   "account.direct": "PrivÄtÄ ziÅ†a @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "DomÄ“ns ir paslÄ“pts",
   "account.edit_profile": "Labot profilu",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Izcelts profilÄ",
   "account.follow": "Sekot",
   "account.followers": "SekotÄji",
@@ -96,7 +98,7 @@
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
   "compose_form.publish": "PublicÄ“t",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "MÄ“dijs ir atzÄ«mÄ“ts kÄ sensitÄ«vs",
   "compose_form.sensitive.unmarked": "MÄ“dijs nav atzÄ«mÄ“ts kÄ sensitÄ«vs",
   "compose_form.spoiler.marked": "Teksts ir paslÄ“pts aiz brÄ«dinÄjuma",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "MeklÄ“Å¡anas rezultÄti",
   "emoji_button.symbols": "Simboli",
   "emoji_button.travel": "CeÄ¼oÅ¡ana & Vietas",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Å eit ziÅ†ojumu nav!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "Tu neesi vÄ“l nevienu bloÄ·Ä“jis.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Tev nav paziÅ†ojumu. Iesaisties sarunÄs ar citiem.",
   "empty_column.public": "Å eit nekÄ nav, tukÅ¡ums! Ieraksti kaut ko publiski, vai uzmeklÄ“ un seko kÄdam no citas instances",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "AutorizÄ“t",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
-  "lightbox.view_context": "View context",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Change title",
   "lists.new.create": "Add list",
   "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Search among people you follow",
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.alert": "Desktop notifications",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Closed",
   "poll.refresh": "Refresh",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -389,7 +413,7 @@
   "status.pinned": "Pinned toot",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploadingâ€¦",
   "video.close": "Close video",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index 2bb9a2e2ac7788e8b804c45e394c7d1b78c58c93..6dac40e8b8c5ce2aac34aa52d23954d855805876 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "ÐžÐ´ÐºÐ°Ð¶Ð¸ Ð±Ð°Ñ€Ð°ÑšÐµ Ð·Ð° ÑÐ»ÐµÐ´ÐµÑšÐµ",
   "account.direct": "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð½Ð° Ð¿Ð¾Ñ€Ð°Ð½Ð° @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Ð¡ÐºÑ€Ð¸ÐµÐ½ Ð´Ð¾Ð¼ÐµÐ½",
   "account.edit_profile": "Ð˜Ð·Ð¼ÐµÐ½Ð¸ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "ÐšÐ°Ñ€Ð°ÐºÑ‚ÐµÑ€Ð¸ÑÑ‚Ð¸ÐºÐ¸ Ð½Ð° Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ð¾Ñ‚",
   "account.follow": "Ð¡Ð»ÐµÐ´Ð¸",
   "account.followers": "Ð¡Ð»ÐµÐ´Ð±ÐµÐ½Ð¸Ñ†Ð¸",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Ð ÐµÐ·ÑƒÐ»Ñ‚Ð°Ñ‚Ð¸ Ð¾Ð´ Ð±Ð°Ñ€Ð°ÑšÐµ",
   "emoji_button.symbols": "Ð¡Ð¸Ð¼Ð±Ð¾Ð»Ð¸",
   "emoji_button.travel": "ÐŸÐ°Ñ‚ÑƒÐ²Ð°ÑšÐ° Ð¸ ÐœÐµÑÑ‚Ð°",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No toots here!",
   "empty_column.account_unavailable": "ÐÐµÐ´Ð¾ÑÑ‚Ð°Ð¿ÐµÐ½ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»",
   "empty_column.blocks": "ÐÐµÐ¼Ð°Ñ‚Ðµ ÑÐµÑƒÑˆÑ‚Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð½Ð¾ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "ÐŸÑ€Ð¸Ñ˜Ð°Ð²ÐµÑ‚Ðµ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼",
   "follow_request.authorize": "ÐžÐ´Ð¾Ð±Ñ€Ð¸",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
-  "lightbox.view_context": "View context",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Change title",
   "lists.new.create": "Add list",
   "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Search among people you follow",
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.alert": "Desktop notifications",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Ð‘ÑƒÑÑ‚Ð¾Ð²Ð¸:",
   "notifications.column_settings.show": "ÐŸÑ€Ð¸ÐºÐ°Ð¶Ð¸ Ð²Ð¾ ÐºÐ¾Ð»Ð¾Ð½Ð°",
   "notifications.column_settings.sound": "Ð¡Ð²Ð¸Ñ€Ð¸ Ð·Ð²ÑƒÑ†Ð¸",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "Ð¡Ð¸Ñ‚Ðµ",
   "notifications.filter.boosts": "Ð‘ÑƒÑÑ‚Ð¾Ð²Ð¸",
   "notifications.filter.favourites": "ÐžÐ¼Ð¸Ð»ÐµÐ½Ð¸",
   "notifications.filter.follows": "Ð¡Ð»ÐµÐ´ÐµÑšÐ°",
   "notifications.filter.mentions": "Ð¡Ð¿Ð¾Ð¼Ð½ÑƒÐ²Ð°ÑšÐ°",
   "notifications.filter.polls": "Ð ÐµÐ·ÑƒÐ»Ñ‚Ð°Ñ‚Ð¸ Ð¾Ð´ Ð°Ð½ÐºÐµÑ‚Ð°",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} Ð½Ð¾Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Ð—Ð°Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð¸",
   "poll.refresh": "ÐžÑÐ²ÐµÐ¶Ð¸",
   "poll.total_people": "{count, plural, one {# Ñ‡Ð¾Ð²ÐµÐº} other {# Ð»ÑƒÑ“Ðµ}}",
@@ -389,7 +413,7 @@
   "status.pinned": "Pinned toot",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploadingâ€¦",
   "video.close": "Close video",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 4a390ad70fb57fb06670e1f63a2685a678e1619a..4f44f3800bd8f1368f17f5adf1e9edaf3fcce783 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -2,15 +2,17 @@
   "account.account_note_header": "à´•àµà´±à´¿à´ªàµà´ªàµ",
   "account.add_or_remove_from_list": "à´ªà´Ÿàµà´Ÿà´¿à´•à´¯à´¿àµ½ à´šàµ‡àµ¼à´•àµà´•àµà´•à´¯àµ‹ à´…à´²àµà´²àµ†à´™àµà´•à´¿àµ½ à´®à´¾à´±àµà´±àµà´•à´¯àµ‹ à´šàµ†à´¯àµà´¯àµà´•",
   "account.badges.bot": "à´±àµ‹à´¬àµ‹à´Ÿàµà´Ÿàµ",
-  "account.badges.group": "à´•àµ‚à´Ÿàµà´Ÿà´‚",
-  "account.block": "@{name} à´¨àµ† à´¬àµà´²àµ‹à´•àµà´•àµ à´šàµ†à´¯àµà´¯àµà´•",
+  "account.badges.group": "à´—àµà´°àµ‚à´ªàµà´ªàµ",
+  "account.block": "@{name} -à´¨àµ† à´¤à´Ÿà´¯àµà´•",
   "account.block_domain": "{domain} àµ½ à´¨à´¿à´¨àµà´¨àµà´³àµà´³ à´Žà´²àµà´²à´¾à´‚ à´®à´±à´¯àµà´•àµà´•",
   "account.blocked": "à´¤à´Ÿà´žàµà´žàµ",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "à´¯à´¥à´¾àµ¼à´¤àµà´¥ à´ªàµà´°àµŠà´«àµˆà´²à´¿à´²àµ‡à´•àµà´•àµ à´ªàµ‹à´µàµà´•",
   "account.cancel_follow_request": "à´ªà´¿à´¨àµà´¤àµà´Ÿà´°à´¾à´¨àµà´³àµà´³ à´…à´ªàµ‡à´•àµà´· à´¨à´¿à´°à´¸à´¿à´•àµà´•àµà´•",
   "account.direct": "@{name} à´¨àµ à´¨àµ‡à´°à´¿à´Ÿàµà´Ÿàµ à´®àµ†à´¸àµ‡à´œàµ à´…à´¯à´•àµà´•àµà´•",
+  "account.disable_notifications": "@{name} à´ªàµ‹à´¸àµà´±àµà´±àµà´šàµ†à´¯àµà´¯àµà´¨àµà´¨à´¤àµ à´Žà´¨àµà´¨àµ† à´…à´±à´¿à´¯à´¿à´•àµà´•àµà´¨àµà´¨à´¤àµ à´¨à´¿àµ¼à´¤àµà´¤àµà´•",
   "account.domain_blocked": "à´®àµ‡à´–à´² à´®à´±à´¯àµà´•àµà´•à´ªàµà´ªàµ†à´Ÿàµà´Ÿà´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨àµ",
   "account.edit_profile": "à´ªàµà´°àµŠà´«àµˆàµ½ à´¤à´¿à´°àµà´¤àµà´¤àµà´•",
+  "account.enable_notifications": "@{name} à´ªàµ‹à´¸àµà´±àµà´±àµ à´šàµ†à´¯àµà´¯àµà´®àµà´ªàµ‹àµ¾ à´Žà´¨àµà´¨àµ† à´…à´±à´¿à´¯à´¿à´•àµà´•àµà´•",
   "account.endorse": "à´ªàµà´°àµŠà´«àµˆà´²à´¿àµ½ à´ªàµà´°à´•à´Ÿà´®à´¾à´•àµà´•àµà´•",
   "account.follow": "à´ªà´¿à´¨àµà´¤àµà´Ÿà´°àµà´•",
   "account.followers": "à´ªà´¿à´¨àµà´¤àµà´Ÿà´°àµà´¨àµà´¨à´µàµ¼",
@@ -36,7 +38,7 @@
   "account.requested": "à´…à´¨àµà´µà´¾à´¦à´¤àµà´¤à´¿à´¨à´¾à´¯à´¿ à´•à´¾à´¤àµà´¤à´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨àµ. à´ªà´¿à´¨àµà´¤àµà´Ÿà´°à´¾à´¨àµà´³àµà´³ à´…à´ªàµ‡à´•àµà´· à´±à´¦àµà´¦à´¾à´•àµà´•àµà´µà´¾àµ» à´žàµ†à´•àµà´•àµà´•",
   "account.share": "@{name} à´¨àµà´±àµ† à´ªàµà´°àµŠà´«àµˆàµ½ à´ªà´™àµà´•àµà´µàµ†à´•àµà´•àµà´•",
   "account.show_reblogs": "@{name} àµ½ à´¨à´¿à´¨àµà´¨àµà´³àµà´³ à´¬àµ‚à´¸àµà´±àµà´±àµà´•àµ¾ à´•à´¾à´£à´¿à´•àµà´•àµà´•",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, one {{counter} à´Ÿàµ‚à´Ÿàµà´Ÿàµ} other {{counter} à´Ÿàµ‚à´Ÿàµà´Ÿàµà´•àµ¾}}",
   "account.unblock": "à´¬àµà´²àµ‹à´•àµà´•àµ à´®à´¾à´±àµà´±àµà´• @{name}",
   "account.unblock_domain": "{domain} à´µàµ†à´³à´¿à´ªàµà´ªàµ†à´Ÿàµà´¤àµà´¤àµà´•",
   "account.unendorse": "à´ªàµà´°àµŠà´«àµˆà´²à´¿àµ½ à´ªàµà´°à´•à´Ÿà´®à´¾à´•àµà´•à´¾à´¤à´¿à´°à´¿à´•àµà´•àµà´•",
@@ -65,7 +67,7 @@
   "column.domain_blocks": "à´®à´±à´¯àµà´•àµà´•à´ªàµà´ªàµ†à´Ÿàµà´Ÿ à´®àµ‡à´–à´²à´•àµ¾",
   "column.favourites": "à´ªàµà´°à´¿à´¯à´ªàµà´ªàµ†à´Ÿàµà´Ÿà´µ",
   "column.follow_requests": "à´ªà´¿à´¨àµà´¤àµà´Ÿà´°à´¾à´¨àµà´³àµà´³ à´…à´àµà´¯àµ¼à´¤àµà´¥à´¨à´•àµ¾",
-  "column.home": "à´à´µà´¨à´‚",
+  "column.home": "à´¹àµ‹à´‚",
   "column.lists": "à´ªà´Ÿàµà´Ÿà´¿à´•à´•àµ¾",
   "column.mutes": "à´¨à´¿à´¶à´¬àµà´¦à´®à´¾à´•àµà´•à´ªàµà´ªàµ†à´Ÿàµà´Ÿ à´‰à´ªà´¯àµ‹à´•àµà´¤à´¾à´•àµà´•àµ¾",
   "column.notifications": "à´…à´±à´¿à´¯à´¿à´ªàµà´ªàµà´•àµ¾",
@@ -92,28 +94,28 @@
   "compose_form.poll.duration": "à´¤à´¿à´°à´žàµà´žàµ†à´Ÿàµà´ªàµà´ªà´¿à´¨àµà´±àµ† à´¸à´®à´¯à´¦àµˆàµ¼à´–àµà´¯à´‚",
   "compose_form.poll.option_placeholder": "à´šàµ‹à´¯àµâ€Œà´¸àµ {number}",
   "compose_form.poll.remove_option": "à´ˆ à´¡à´¿à´µàµˆà´¸àµ à´®à´¾à´±àµà´±àµà´•",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "à´µàµ‹à´Ÿàµà´Ÿàµ†à´Ÿàµà´ªàµà´ªà´¿àµ½ à´’à´¨àµà´¨à´¿à´²à´§à´¿à´•à´‚ à´šàµ‹à´¯àµâ€Œà´¸àµà´•àµ¾ à´‰àµ¾à´ªàµà´ªàµ†à´Ÿàµà´¤àµà´•",
+  "compose_form.poll.switch_to_single": "à´µàµ‹à´Ÿàµà´Ÿàµ†à´Ÿàµà´ªàµà´ªà´¿àµ½ à´’à´°àµŠà´±àµà´± à´šàµ‹à´¯àµâ€Œà´¸àµâ€Œ à´®à´¾à´¤àµà´°à´‚ à´†à´•àµà´•àµà´•",
   "compose_form.publish": "à´Ÿàµ‚à´Ÿàµà´Ÿàµ",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+  "compose_form.publish_loud": "{à´ªàµà´°à´¸à´¿à´¦àµà´§àµ€à´•à´°à´¿à´•àµà´•àµà´•}!",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "à´Žà´´àµà´¤àµà´¤àµ à´®àµà´¨àµà´¨à´±à´¿à´¯à´¿à´ªàµà´ªà´¿à´¨à´¾àµ½ à´®à´±à´šàµà´šà´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨àµ",
   "compose_form.spoiler.unmarked": "à´Žà´´àµà´¤àµà´¤àµ à´®à´±à´¯àµà´•àµà´•à´ªàµà´ªàµ†à´Ÿàµà´Ÿà´¿à´Ÿàµà´Ÿà´¿à´²àµà´²",
   "compose_form.spoiler_placeholder": "à´¨à´¿à´™àµà´™à´³àµà´Ÿàµ† à´®àµà´¨àµà´¨à´±à´¿à´¯à´¿à´ªàµà´ªàµ à´‡à´µà´¿à´Ÿàµ† à´Žà´´àµà´¤àµà´•",
   "confirmation_modal.cancel": "à´±à´¦àµà´¦à´¾à´•àµà´•àµà´•",
-  "confirmations.block.block_and_report": "Block & Report",
+  "confirmations.block.block_and_report": "à´¤à´Ÿà´¯àµà´•à´¯àµà´‚ à´±à´¿à´ªàµà´ªàµ‹àµ¼à´Ÿàµà´Ÿàµà´‚ à´šàµ†à´¯àµà´¯àµà´•",
   "confirmations.block.confirm": "à´¤à´Ÿà´¯àµà´•",
-  "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.block.message": "{name} à´¤à´Ÿà´¯à´¾àµ» à´¨à´¿à´™àµà´™àµ¾ à´†à´—àµà´°à´¹à´¿à´•àµà´•àµà´¨àµà´¨àµà´£àµà´Ÿàµ‹?",
   "confirmations.delete.confirm": "à´®à´¾à´¯àµà´•àµà´•àµà´•",
-  "confirmations.delete.message": "Are you sure you want to delete this status?",
+  "confirmations.delete.message": "à´ˆ à´Ÿàµ‚à´Ÿàµà´Ÿàµ à´‡à´²àµà´²à´¾à´¤à´¾à´•àµà´•à´£à´‚ à´Žà´¨àµà´¨àµ à´¨à´¿à´™àµà´™àµ¾à´•àµà´•àµ à´‰à´±à´ªàµà´ªà´¾à´£àµ‹?",
   "confirmations.delete_list.confirm": "à´®à´¾à´¯àµà´•àµà´•àµà´•",
-  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
+  "confirmations.delete_list.message": "à´ˆ à´ªà´Ÿàµà´Ÿà´¿à´• à´Žà´¨àµà´¨àµ†à´¨àµà´¨àµ‡à´•àµà´•àµà´®à´¾à´¯à´¿ à´¨àµ€à´•àµà´•à´‚ à´šàµ†à´¯àµà´¯à´¾àµ» à´¨à´¿à´™àµà´™àµ¾ à´†à´—àµà´°à´¹à´¿à´•àµà´•àµà´¨àµà´¨àµà´£àµà´Ÿàµ‹?",
+  "confirmations.domain_block.confirm": "à´®àµà´´àµà´µàµ» à´¡àµŠà´®àµ†à´¯àµâ€Œà´¨àµà´‚ à´¤à´Ÿà´¯àµà´•",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
   "confirmations.logout.confirm": "à´ªàµà´±à´¤àµà´¤àµà´•à´Ÿà´•àµà´•àµà´•",
-  "confirmations.logout.message": "Are you sure you want to log out?",
+  "confirmations.logout.message": "à´¨à´¿à´™àµà´™àµ¾à´•àµà´•àµ à´²àµ‹à´—àµ à´”à´Ÿàµà´Ÿàµ à´šàµ†à´¯àµà´¯à´£à´®àµ†à´¨àµà´¨àµ à´‰à´±à´ªàµà´ªà´¾à´£àµ‹?",
   "confirmations.mute.confirm": "à´¨à´¿à´¶àµà´¶à´¬àµà´¦à´®à´¾à´•àµà´•àµà´•",
   "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
   "confirmations.mute.message": "Are you sure you want to mute {name}?",
@@ -131,7 +133,7 @@
   "directory.local": "{domain} àµ½ à´¨à´¿à´¨àµà´¨àµ à´®à´¾à´¤àµà´°à´‚",
   "directory.new_arrivals": "à´ªàµà´¤à´¿à´¯ à´µà´°à´µàµà´•àµ¾",
   "directory.recently_active": "à´…à´Ÿàµà´¤àµà´¤à´¿à´Ÿàµ†à´¯à´¾à´¯à´¿ à´¸à´œàµ€à´µà´®à´¾à´¯",
-  "embed.instructions": "Embed this status on your website by copying the code below.",
+  "embed.instructions": "à´šàµà´µà´Ÿàµ†à´¯àµà´³àµà´³ à´•àµ‹à´¡àµ à´ªà´•àµ¼à´¤àµà´¤à´¿à´•àµà´•àµŠà´£àµà´Ÿàµ à´¨à´¿à´™àµà´™à´³àµà´Ÿàµ† à´µàµ†à´¬àµâ€Œà´¸àµˆà´±àµà´±à´¿àµ½ à´ˆ à´Ÿàµ‚à´Ÿàµà´Ÿàµ à´‰àµ¾à´šàµà´šàµ‡àµ¼à´•àµà´•àµà´•.",
   "embed.preview": "à´‡à´¤àµ à´‡à´™àµà´™à´¨àµ† à´•à´¾à´£à´ªàµà´ªàµ†à´Ÿàµà´‚:",
   "emoji_button.activity": "à´ªàµà´°à´µà´°àµâ€à´¤àµà´¤à´¨à´‚",
   "emoji_button.custom": "à´¸àµà´µà´¨àµà´¤à´®à´¾à´¯ à´àµ‡à´¦à´—à´¤à´¿",
@@ -139,7 +141,7 @@
   "emoji_button.food": "à´à´•àµà´·à´£à´µàµà´‚ à´ªà´¾à´¨àµ€à´¯à´µàµà´‚",
   "emoji_button.label": "à´‡à´®àµ‹à´œà´¿ à´šàµ‡àµ¼à´•àµà´•àµà´•",
   "emoji_button.nature": "à´ªàµà´°à´•àµƒà´¤à´¿",
-  "emoji_button.not_found": "No emojos!! (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
+  "emoji_button.not_found": "à´‡à´®àµ‹à´œà´¿ à´ªà´¾à´Ÿà´¿à´²àµà´² (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
   "emoji_button.objects": "à´µà´¸àµà´¤àµà´•àµà´•àµ¾",
   "emoji_button.people": "à´†à´³àµà´•àµ¾",
   "emoji_button.recent": "à´…à´Ÿà´¿à´•àµà´•à´Ÿà´¿ à´‰à´ªà´¯àµ‹à´—à´¿à´•àµà´•àµà´¨àµà´¨à´µ",
@@ -147,26 +149,29 @@
   "emoji_button.search_results": "à´¤à´¿à´°à´šàµà´šà´¿àµ½ à´«à´²à´™àµà´™àµ¾",
   "emoji_button.symbols": "à´šà´¿à´¹àµà´¨à´™àµà´™àµ¾",
   "emoji_button.travel": "à´¯à´¾à´¤àµà´°à´¯àµà´‚ à´¸àµà´¥à´²à´™àµà´™à´³àµà´‚",
+  "empty_column.account_suspended": "à´…à´•àµà´•àµ—à´£àµà´Ÿàµ à´¤à´¾àµ½à´•àµà´•à´¾à´²à´¿à´•à´®à´¾à´¯à´¿ à´¨à´¿àµ¼à´¤àµà´¤à´¿à´µà´šàµà´šàµ",
   "empty_column.account_timeline": "à´‡à´µà´¿à´Ÿàµ† à´Ÿàµ‚à´Ÿàµà´Ÿàµà´•àµ¾ à´‡à´²àµà´²!",
   "empty_column.account_unavailable": "à´ªàµà´°àµŠà´«àµˆàµ½ à´²à´àµà´¯à´®à´²àµà´²",
   "empty_column.blocks": "à´¨à´¿à´™àµà´™àµ¾ à´‡à´¤àµà´µà´°àµ† à´’à´°àµ à´‰à´ªà´¯àµ‹à´•àµà´¤à´¾à´•àµà´•à´³àµ†à´¯àµà´‚ à´¤à´Ÿà´žàµà´žà´¿à´Ÿàµà´Ÿà´¿à´²àµà´².",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
+  "empty_column.bookmarked_statuses": "à´¨à´¿à´™àµà´™àµ¾à´•àµ à´‡à´¤àµà´µà´°àµ† à´…à´Ÿà´¯à´¾à´³à´ªàµà´ªàµ†à´Ÿàµà´¤àµà´¤à´¿à´¯ à´Ÿàµ‚à´Ÿàµà´Ÿàµà´•àµ¾ à´‡à´²àµà´². à´…à´Ÿà´¯à´¾à´³à´ªàµà´ªàµ†à´Ÿàµà´¤àµà´¤à´¿à´¯à´¾àµ½ à´…à´¤àµ à´‡à´µà´¿à´Ÿàµ† à´µà´°àµà´‚.",
   "empty_column.community": "à´ªàµà´°à´¾à´¦àµ‡à´¶à´¿à´•à´®à´¾à´¯ à´¸à´®à´¯à´°àµ‡à´– à´¶àµ‚à´¨àµà´¯à´®à´¾à´£àµ. à´Žà´¨àµà´¤àµ†à´™àµà´•à´¿à´²àµà´‚ à´ªà´°à´¸àµà´¯à´®à´¾à´¯à´¿ à´Žà´´àµà´¤à´¿ à´¤àµà´Ÿà´•àµà´•à´‚ à´•àµà´±à´¿à´•àµà´•àµ!",
   "empty_column.direct": "à´¨à´¿à´™àµà´™àµ¾à´•àµà´•àµ à´‡à´¤àµà´µà´°àµ† à´¨àµ‡à´°à´¿à´Ÿàµà´Ÿàµà´³àµà´³ à´¸à´¨àµà´¦àµ‡à´¶à´™àµà´™àµ¾ à´’à´¨àµà´¨àµà´®à´¿à´²àµà´². à´¨à´¿à´™àµà´™àµ¾ à´…à´™àµà´™à´¨àµ† à´’à´¨àµà´¨àµ à´…à´¯à´•àµà´•àµà´•à´¯àµ‹, à´¨à´¿à´™àµà´™àµ¾à´•àµà´•àµ à´²à´à´¿à´•àµà´•àµà´•à´¯àµ‹ à´šàµ†à´¯àµà´¯àµà´¨àµà´¨à´ªà´•àµà´·à´‚ à´…à´¤à´¿à´µà´¿à´Ÿàµ† à´•à´¾à´£à´ªàµà´ªàµ†à´Ÿàµà´¨àµà´¨à´¤à´¾à´£àµ.",
   "empty_column.domain_blocks": "à´®à´±à´¯àµà´•àµà´•à´ªàµà´ªàµ†à´Ÿàµà´Ÿà´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨ à´®àµ‡à´–à´²à´•àµ¾ à´‡à´¤àµà´µà´°àµ† à´‡à´²àµà´².",
   "empty_column.favourited_statuses": "à´¨à´¿à´™àµà´™àµ¾à´•àµà´•àµ à´‡à´¤àµ à´µà´°àµ† à´’à´°àµ à´ªàµà´°à´¿à´¯à´ªàµà´ªàµ†à´Ÿàµà´Ÿ à´Ÿàµ‚à´Ÿàµà´Ÿàµà´‚ à´‡à´²àµà´². à´¨à´¿à´™àµà´™àµ¾ à´…à´™àµà´™à´¨àµ† à´’à´¨àµà´¨àµ à´ªàµà´°à´¿à´¯à´ªàµà´ªàµ†à´Ÿàµà´¨àµà´¨ à´ªà´•àµà´·à´‚ à´…à´¤à´¿à´µà´¿à´Ÿàµ† à´•à´¾à´£à´ªàµà´ªàµ†à´Ÿàµà´¨àµà´¨à´¤à´¾à´£àµ.",
   "empty_column.favourites": "à´‡à´¤àµà´µà´°àµ† à´†à´°àµà´‚ à´ˆ à´Ÿàµ‚à´Ÿàµà´Ÿàµ à´ªàµà´°à´¿à´¯à´ªàµà´ªàµ†à´Ÿàµà´Ÿà´¤à´¾à´¯à´¿ à´…à´Ÿà´¯à´¾à´³à´ªàµà´ªàµ†à´Ÿàµà´¤àµà´¤à´¿à´¯à´¿à´Ÿàµà´Ÿà´¿à´²àµà´². à´†à´°àµ†à´™àµà´•à´¿à´²àµà´‚ à´…à´™àµà´™à´¨àµ† à´šàµ†à´¯àµà´¯àµà´¨àµà´¨à´ªà´•àµà´·à´‚ à´…à´¤à´¿à´µà´¿à´Ÿàµ† à´•à´¾à´£à´ªàµà´ªàµ†à´Ÿàµà´¨àµà´¨à´¤à´¾à´£àµ.",
   "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
-  "empty_column.hashtag": "There is nothing in this hashtag yet.",
+  "empty_column.hashtag": "à´ˆ à´¹à´¾à´·àµâ€Œà´Ÿà´¾à´—à´¿àµ½ à´‡à´¤àµà´µà´°àµ† à´’à´¨àµà´¨àµà´®à´¿à´²àµà´².",
   "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
-  "empty_column.home.public_timeline": "the public timeline",
+  "empty_column.home.public_timeline": "à´ªàµŠà´¤àµ à´¸à´®à´¯à´°àµ‡à´–",
   "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
   "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
   "empty_column.mutes": "You haven't muted any users yet.",
   "empty_column.notifications": "à´¨à´¿à´™àµà´™àµ¾à´•àµà´•àµ à´‡à´¤àµà´µà´°àµ† à´’à´°àµ à´…à´±à´¿à´¯à´¿à´ªàµà´ªàµà´•à´³àµà´‚ à´‡à´²àµà´². à´®à´±àµà´±àµà´³àµà´³à´µà´°àµà´®à´¾à´¯à´¿ à´‡à´Ÿà´ªàµ†à´Ÿàµà´Ÿàµ à´¸à´‚à´à´¾à´·à´£à´¤àµà´¤à´¿à´¨àµ à´¤àµà´Ÿà´•àµà´•à´‚ à´•àµà´±à´¿à´•àµà´•àµ.",
   "empty_column.public": "à´‡à´µà´¿à´Ÿàµ† à´’à´¨àµà´¨àµà´®à´¿à´²àµà´²à´²àµà´²àµ‹! à´‡à´µà´¿à´Ÿàµ† à´¨à´¿à´±à´¯àµà´•àµà´•à´¾àµ» à´Žà´¨àµà´¤àµ†à´™àµà´•à´¿à´²àµà´‚ à´ªà´°à´¸àµà´¯à´®à´¾à´¯à´¿ à´Žà´´àµà´¤àµà´•à´¯àµ‹ à´®à´±àµà´±àµ à´‰à´ªà´àµ‹à´•àµà´¤à´¾à´•àµà´•à´³àµ† à´ªà´¿à´¨àµà´¤àµà´Ÿà´°àµà´•à´¯àµ‹ à´šàµ†à´¯àµà´¯àµà´•",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "à´ªàµà´°à´¶àµà´¨à´‚ à´…à´±à´¿à´¯à´¿à´•àµà´•àµà´•",
   "follow_request.authorize": "à´šàµà´®à´¤à´²à´ªàµà´ªàµ†à´Ÿàµà´¤àµà´¤àµà´•",
@@ -174,7 +179,7 @@
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
   "generic.saved": "à´¸à´‚à´°à´•àµà´·à´¿à´šàµà´šàµ",
   "getting_started.developers": "à´µà´¿à´•à´¸à´¿à´ªàµà´ªà´¿à´•àµà´•àµà´¨àµà´¨à´µàµ¼",
-  "getting_started.directory": "à´°àµ‚à´ªà´°àµ‡à´– à´¨à´¾à´®à´—àµƒà´¹à´¸àµ‚à´šà´¿",
+  "getting_started.directory": "à´ªàµà´°àµŠà´«àµˆàµ½ à´¡à´¯à´±à´•àµà´Ÿà´±à´¿",
   "getting_started.documentation": "à´°àµ‡à´–à´¾ à´¸à´®à´¾à´¹à´°à´£à´‚",
   "getting_started.heading": "à´¤àµà´Ÿà´•àµà´•à´‚ à´•àµà´±à´¿à´•àµà´•àµà´•",
   "getting_started.invite": "à´†à´³àµà´•à´³àµ† à´•àµà´·à´£à´¿à´•àµà´•àµà´•",
@@ -185,7 +190,7 @@
   "hashtag.column_header.tag_mode.any": "à´…à´²àµà´²àµ†à´™àµà´•à´¿àµ½ {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} à´‡à´²àµà´²à´¾à´¤àµ†",
   "hashtag.column_settings.select.no_options_message": "à´’à´°àµ à´¸àµ‚à´šà´¨à´¯àµà´‚ à´•à´£àµà´Ÿàµ†à´¤àµà´¤à´¿à´¯à´¿à´²àµà´²",
-  "hashtag.column_settings.select.placeholder": "à´šàµ¼à´šàµà´šà´¾à´µà´¿à´·à´¯à´™àµà´™àµ¾ à´Žà´´àµà´¤àµà´•â€¦",
+  "hashtag.column_settings.select.placeholder": "à´¹à´¾à´·àµà´Ÿà´¾à´—àµà´•àµ¾ à´Žà´´àµà´¤àµà´•â€¦",
   "hashtag.column_settings.tag_mode.all": "à´‡à´µà´¯àµ†à´²àµà´²à´¾à´‚",
   "hashtag.column_settings.tag_mode.any": "à´‡à´µà´¯à´¿à´²àµ‡à´¤àµ†à´™àµà´•à´¿à´²àµà´‚",
   "hashtag.column_settings.tag_mode.none": "à´‡à´¤à´¿à´²àµŠà´¨àµà´¨àµà´®à´²àµà´²",
@@ -201,7 +206,7 @@
   "introduction.federation.action": "à´…à´Ÿàµà´¤àµà´¤à´¤àµ",
   "introduction.federation.federated.headline": "à´¸à´‚à´¯àµà´•àµà´¤à´®à´¾à´•àµà´•à´¿à´¯",
   "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
-  "introduction.federation.home.headline": "à´à´µà´¨à´‚",
+  "introduction.federation.home.headline": "à´¹àµ‹à´‚",
   "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
   "introduction.federation.local.headline": "à´ªàµà´°à´¾à´¦àµ‡à´¶à´¿à´•à´‚",
   "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
@@ -217,245 +222,265 @@
   "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is specialâ€”it hosts your profile, so remember its name.",
   "keyboard_shortcuts.back": "à´¤à´¿à´°à´¿à´•àµ† à´ªàµ‹à´•àµà´•",
   "keyboard_shortcuts.blocked": "to open blocked users list",
-  "keyboard_shortcuts.boost": "to boost",
+  "keyboard_shortcuts.boost": "à´¬àµ‚à´¸àµà´±àµà´±àµ à´šàµ†à´¯àµà´¯àµà´•",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
   "keyboard_shortcuts.description": "à´µà´¿à´µà´°à´£à´‚",
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
-  "keyboard_shortcuts.enter": "to open status",
+  "keyboard_shortcuts.enter": "à´Ÿàµ‚à´Ÿàµà´Ÿàµ à´Žà´Ÿàµà´•àµà´•à´¾àµ»",
   "keyboard_shortcuts.favourite": "to favourite",
   "keyboard_shortcuts.favourites": "to open favourites list",
   "keyboard_shortcuts.federated": "to open federated timeline",
   "keyboard_shortcuts.heading": "à´•àµ€à´¬àµ‹àµ¼à´¡àµ à´Žà´³àµà´ªàµà´ªà´µà´´à´¿à´•àµ¾",
-  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.home": "à´¹àµ‹à´‚ à´Ÿàµˆà´‚à´²àµˆàµ» à´¤àµà´±à´•àµà´•àµà´¨àµà´¨à´¤à´¿à´¨àµ",
   "keyboard_shortcuts.hotkey": "Hotkey",
   "keyboard_shortcuts.legend": "to display this legend",
-  "keyboard_shortcuts.local": "to open local timeline",
+  "keyboard_shortcuts.local": "à´ªàµà´°à´¾à´¦àµ‡à´¶à´¿à´• à´¸à´®à´¯à´°àµ‡à´– à´¤àµà´±à´•àµà´•à´¾àµ»",
   "keyboard_shortcuts.mention": "to mention author",
   "keyboard_shortcuts.muted": "to open muted users list",
-  "keyboard_shortcuts.my_profile": "to open your profile",
+  "keyboard_shortcuts.my_profile": "à´¨à´¿à´™àµà´™à´³àµà´Ÿàµ† à´ªàµà´°àµŠà´«àµˆàµ½ à´¤àµà´±à´•àµà´•à´¾àµ»",
   "keyboard_shortcuts.notifications": "to open notifications column",
-  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.open_media": "à´®àµ€à´¡à´¿à´¯ à´¤àµà´±à´•àµà´•à´¾àµ»",
   "keyboard_shortcuts.pinned": "to open pinned toots list",
-  "keyboard_shortcuts.profile": "to open author's profile",
-  "keyboard_shortcuts.reply": "to reply",
+  "keyboard_shortcuts.profile": "à´°à´šà´¯à´¿à´¤à´¾à´µà´¿à´¨àµà´±àµ† à´ªàµà´°àµŠà´«àµˆàµ½ à´¤àµà´±à´•àµà´•àµà´¨àµà´¨à´¤à´¿à´¨àµ",
+  "keyboard_shortcuts.reply": "à´®à´±àµà´ªà´Ÿà´¿ à´…à´¯à´•àµà´•à´¾àµ»",
   "keyboard_shortcuts.requests": "to open follow requests list",
   "keyboard_shortcuts.search": "to focus search",
   "keyboard_shortcuts.spoilers": "to show/hide CW field",
   "keyboard_shortcuts.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
-  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
-  "keyboard_shortcuts.toot": "to start a brand new toot",
+  "keyboard_shortcuts.toggle_sensitivity": "à´®àµ€à´¡à´¿à´¯ à´•à´¾à´£à´¿à´•àµà´•àµà´¨àµà´¨à´¤à´¿à´¨àµà´‚/à´®à´±à´¯àµà´•àµà´•àµà´¨àµà´¨à´¤à´¿à´¨àµà´‚",
+  "keyboard_shortcuts.toot": "à´’à´°àµ à´ªàµà´¤à´¿à´¯ à´Ÿàµ‚à´Ÿàµà´Ÿàµ à´†à´°à´‚à´à´¿à´•àµà´•à´¾àµ»",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
-  "lightbox.close": "Close",
-  "lightbox.next": "Next",
-  "lightbox.previous": "Previous",
-  "lightbox.view_context": "View context",
-  "lists.account.add": "Add to list",
-  "lists.account.remove": "Remove from list",
-  "lists.delete": "Delete list",
-  "lists.edit": "Edit list",
-  "lists.edit.submit": "Change title",
-  "lists.new.create": "Add list",
+  "lightbox.close": "à´…à´Ÿà´¯àµà´•àµà´•àµà´•",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
+  "lightbox.next": "à´…à´Ÿàµà´¤àµà´¤à´¤àµ",
+  "lightbox.previous": "à´ªàµà´±à´•àµ‹à´Ÿàµà´Ÿàµ",
+  "lists.account.add": "à´ªà´Ÿàµà´Ÿà´¿à´•à´¯à´¿à´²àµ‡à´•àµà´•àµ à´šàµ‡àµ¼à´•àµà´•àµà´•",
+  "lists.account.remove": "à´ªà´Ÿàµà´Ÿà´¿à´•à´¯à´¿àµ½ à´¨à´¿à´¨àµà´¨àµ à´’à´´à´¿à´µà´¾à´•àµà´•àµà´•",
+  "lists.delete": "à´ªà´Ÿàµà´Ÿà´¿à´• à´’à´´à´¿à´µà´¾à´•àµà´•àµà´•",
+  "lists.edit": "à´ªà´Ÿàµà´Ÿà´¿à´• à´¤à´¿à´°àµà´¤àµà´¤àµà´•",
+  "lists.edit.submit": "à´¤à´²à´•àµà´•àµ†à´Ÿàµà´Ÿàµ à´®à´¾à´±àµà´±àµà´•",
+  "lists.new.create": "à´ªàµà´¤à´¿à´¯ à´ªà´Ÿàµà´Ÿà´¿à´• à´šàµ‡àµ¼à´•àµà´•àµà´•",
   "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "à´†à´°àµà´®à´¿à´²àµà´²",
+  "lists.replies_policy.title": "à´‡à´¤à´¿à´¨àµà´³àµà´³ à´®à´±àµà´ªà´Ÿà´¿à´•àµ¾ à´•à´¾à´£à´¿à´•àµà´•àµà´•:",
   "lists.search": "Search among people you follow",
-  "lists.subheading": "Your lists",
+  "lists.subheading": "à´Žà´¨àµà´±àµ† à´ªà´Ÿàµà´Ÿà´¿à´•à´•àµ¾",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
-  "loading_indicator.label": "Loading...",
+  "loading_indicator.label": "à´²àµ‡à´¾à´¡à´¿à´‚à´—àµ...",
   "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
-  "missing_indicator.label": "Not found",
+  "missing_indicator.label": "à´•à´¾à´£à´¾à´¨à´¿à´²àµà´²",
   "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "à´•à´¾à´²à´¾à´µà´§à´¿",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
-  "navigation_bar.apps": "Mobile apps",
-  "navigation_bar.blocks": "Blocked users",
-  "navigation_bar.bookmarks": "Bookmarks",
-  "navigation_bar.community_timeline": "Local timeline",
-  "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
-  "navigation_bar.discover": "Discover",
+  "mute_modal.indefinite": "à´…à´¨à´¿à´¶àµà´šà´¿à´¤à´•à´¾à´²",
+  "navigation_bar.apps": "à´®àµŠà´¬àµˆàµ½ à´†à´ªàµà´ªàµà´•àµ¾",
+  "navigation_bar.blocks": "à´¤à´Ÿà´¯à´ªàµà´ªàµ†à´Ÿàµà´Ÿ à´‰à´ªà´¯àµ‹à´•àµà´¤à´¾à´•àµà´•àµ¾",
+  "navigation_bar.bookmarks": "à´¬àµà´•àµà´•àµà´®à´¾àµ¼à´•àµà´•àµà´•àµ¾",
+  "navigation_bar.community_timeline": "à´ªàµà´°à´¾à´¦àµ‡à´¶à´¿à´• à´¸à´®à´¯à´°àµ‡à´–",
+  "navigation_bar.compose": "à´ªàµà´¤à´¿à´¯ à´Ÿàµ‚à´Ÿàµà´Ÿàµ à´Žà´´àµà´¤àµà´•",
+  "navigation_bar.direct": "à´¨àµ‡à´°à´¿à´Ÿàµà´Ÿàµà´³àµà´³ à´¸à´¨àµà´¦àµ‡à´¶à´™àµà´™àµ¾",
+  "navigation_bar.discover": "à´•à´£àµà´Ÿàµ†à´¤àµà´¤àµà´•",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Edit profile",
-  "navigation_bar.favourites": "Favourites",
+  "navigation_bar.edit_profile": "à´ªàµà´°àµŠà´«àµˆàµ½ à´¤à´¿à´°àµà´¤àµà´¤àµà´•",
+  "navigation_bar.favourites": "à´ªàµà´°à´¿à´¯à´ªàµà´ªàµ†à´Ÿàµà´Ÿà´µ",
   "navigation_bar.filters": "Muted words",
-  "navigation_bar.follow_requests": "Follow requests",
+  "navigation_bar.follow_requests": "à´ªà´¿à´¨àµà´¤àµà´Ÿà´°à´¾à´¨àµà´³àµà´³ à´…à´àµà´¯àµ¼à´¤àµà´¥à´¨à´•àµ¾",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "About this server",
+  "navigation_bar.info": "à´ˆ à´¸àµ†àµ¼à´µà´±à´¿à´¨àµ†à´•àµà´•àµà´±à´¿à´šàµà´šàµ",
   "navigation_bar.keyboard_shortcuts": "Hotkeys",
-  "navigation_bar.lists": "Lists",
-  "navigation_bar.logout": "Logout",
-  "navigation_bar.mutes": "Muted users",
+  "navigation_bar.lists": "à´²à´¿à´¸àµà´±àµà´±àµà´•àµ¾",
+  "navigation_bar.logout": "à´²àµ‹à´—àµ—à´Ÿàµà´Ÿàµ",
+  "navigation_bar.mutes": "à´¨à´¿à´¶à´¬àµà´¦à´®à´¾à´•àµà´•à´ªàµà´ªàµ†à´Ÿàµà´Ÿ à´‰à´ªà´¯àµ‹à´•àµà´¤à´¾à´•àµà´•àµ¾",
   "navigation_bar.personal": "Personal",
   "navigation_bar.pins": "Pinned toots",
-  "navigation_bar.preferences": "Preferences",
+  "navigation_bar.preferences": "à´•àµà´°à´®àµ€à´•à´°à´£à´™àµà´™àµ¾",
   "navigation_bar.public_timeline": "Federated timeline",
-  "navigation_bar.security": "Security",
+  "navigation_bar.security": "à´¸àµà´°à´•àµà´·",
   "notification.favourite": "{name} favourited your status",
-  "notification.follow": "{name} followed you",
-  "notification.follow_request": "{name} has requested to follow you",
+  "notification.follow": "{name} à´¨à´¿à´™àµà´™à´³àµ† à´ªà´¿à´¨àµà´¤àµà´Ÿàµ¼à´¨àµà´¨àµ",
+  "notification.follow_request": "{name} à´¨à´¿à´™àµà´™à´³àµ† à´ªà´¿à´¨àµà´¤àµà´Ÿà´°à´¾àµ» à´…à´àµà´¯àµ¼à´¤àµà´¥à´¿à´šàµà´šàµ",
   "notification.mention": "{name} mentioned you",
-  "notification.own_poll": "Your poll has ended",
+  "notification.own_poll": "à´¨à´¿à´™àµà´™à´³àµà´Ÿàµ† à´ªàµ‹àµ¾ à´…à´µà´¸à´¾à´¨à´¿à´šàµà´šàµ",
   "notification.poll": "A poll you have voted in has ended",
-  "notification.reblog": "{name} boosted your status",
-  "notifications.clear": "Clear notifications",
-  "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
-  "notifications.column_settings.alert": "Desktop notifications",
-  "notifications.column_settings.favourite": "Favourites:",
-  "notifications.column_settings.filter_bar.advanced": "Display all categories",
+  "notification.reblog": "{name} à´¨à´¿à´™àµà´™à´³àµà´Ÿàµ† à´ªàµ‹à´¸àµà´±àµà´±àµ à´¬àµ‚à´¸àµà´±àµà´±àµ à´šàµ†à´¯àµà´¤àµ",
+  "notification.status": "{name} à´‡à´ªàµà´ªàµ‹àµ¾ à´ªàµ‹à´¸àµà´±àµà´±àµà´šàµ†à´¯àµâ€Œà´¤àµ",
+  "notifications.clear": "à´…à´±à´¿à´¯à´¿à´ªàµà´ªàµ à´®à´¾à´¯àµà´•àµà´•àµà´•",
+  "notifications.clear_confirmation": "à´¨à´¿à´™àµà´™à´³àµà´Ÿàµ† à´Žà´²àµà´²à´¾ à´…à´±à´¿à´¯à´¿à´ªàµà´ªàµà´•à´³àµà´‚ à´¶à´¾à´¶àµà´µà´¤à´®à´¾à´¯à´¿ à´®à´¾à´¯àµâ€Œà´•àµà´•à´£à´®àµ†à´¨àµà´¨àµ à´¨à´¿à´™àµà´™àµ¾à´•àµà´•àµ à´‰à´±à´ªàµà´ªà´¾à´£àµ‹?",
+  "notifications.column_settings.alert": "à´¡àµ†à´¸àµà´•àµà´Ÿàµ‹à´ªàµà´ªàµ à´…à´±à´¿à´¯à´¿à´ªàµà´ªàµà´•àµ¾",
+  "notifications.column_settings.favourite": "à´ªàµà´°à´¿à´¯à´ªàµà´ªàµ†à´Ÿàµà´Ÿà´µ:",
+  "notifications.column_settings.filter_bar.advanced": "à´Žà´²àµà´²à´¾ à´µà´¿à´à´¾à´—à´™àµà´™à´³àµà´‚ à´ªàµà´°à´¦àµ¼à´¶à´¿à´ªàµà´ªà´¿à´•àµà´•àµà´•",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.filter_bar.show": "à´•à´¾à´£à´¿à´•àµà´•àµà´•",
   "notifications.column_settings.follow": "New followers:",
-  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.follow_request": "à´ªàµà´¤à´¿à´¯ à´ªà´¿à´¨àµà´¤àµà´Ÿà´°àµ½ à´…à´àµà´¯àµ¼à´¤àµà´¥à´¨à´•àµ¾:",
   "notifications.column_settings.mention": "Mentions:",
-  "notifications.column_settings.poll": "Poll results:",
+  "notifications.column_settings.poll": "à´ªàµ‹àµ¾ à´«à´²à´™àµà´™àµ¾:",
   "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.reblog": "Boosts:",
+  "notifications.column_settings.reblog": "à´¬àµ‚à´¸àµà´±àµà´±àµà´•àµ¾:",
   "notifications.column_settings.show": "Show in column",
-  "notifications.column_settings.sound": "Play sound",
-  "notifications.filter.all": "All",
-  "notifications.filter.boosts": "Boosts",
-  "notifications.filter.favourites": "Favourites",
-  "notifications.filter.follows": "Follows",
+  "notifications.column_settings.sound": "à´¶à´¬àµà´¦à´‚ à´ªàµà´²àµ‡ à´šàµ†à´¯àµà´¯àµà´•",
+  "notifications.column_settings.status": "à´ªàµà´¤à´¿à´¯ à´Ÿàµ‚à´Ÿàµà´Ÿàµà´•àµ¾:",
+  "notifications.filter.all": "à´Žà´²àµà´²à´¾à´‚",
+  "notifications.filter.boosts": "à´¬àµ‚à´¸àµà´±àµà´±àµà´•àµ¾",
+  "notifications.filter.favourites": "à´ªàµà´°à´¿à´¯à´ªàµà´ªàµ†à´Ÿàµà´Ÿà´µ",
+  "notifications.filter.follows": "à´ªà´¿à´¨àµà´¤àµà´Ÿà´°àµà´¨àµà´¨àµ",
   "notifications.filter.mentions": "Mentions",
-  "notifications.filter.polls": "Poll results",
-  "notifications.group": "{count} notifications",
-  "poll.closed": "Closed",
-  "poll.refresh": "Refresh",
+  "notifications.filter.polls": "à´ªàµ‹àµ¾ à´«à´²à´™àµà´™àµ¾",
+  "notifications.filter.statuses": "à´¨à´¿à´™àµà´™àµ¾ à´ªà´¿à´¨àµà´¤àµà´Ÿà´°àµà´¨àµà´¨ à´†à´³àµà´•à´³à´¿àµ½ à´¨à´¿à´¨àµà´¨àµà´³àµà´³ à´…à´ªàµâ€Œà´¡àµ‡à´±àµà´±àµà´•àµ¾",
+  "notifications.grant_permission": "à´…à´¨àµà´®à´¤à´¿ à´¨àµ½à´•àµà´•.",
+  "notifications.group": "{count} à´…à´±à´¿à´¯à´¿à´ªàµà´ªàµà´•àµ¾",
+  "notifications.mark_as_read": "à´Žà´²àµà´²à´¾ à´…à´±à´¿à´¯à´¿à´ªàµà´ªàµà´•à´³àµà´‚ à´µà´¾à´¯à´¿à´šàµà´šà´¤à´¾à´¯à´¿ à´…à´Ÿà´¯à´¾à´³à´ªàµà´ªàµ†à´Ÿàµà´¤àµà´¤àµà´•",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "à´¡àµ†à´¸àµà´•àµà´Ÿàµ‹à´ªàµà´ªàµ à´…à´±à´¿à´¯à´¿à´ªàµà´ªàµà´•àµ¾ à´ªàµà´°à´¾à´ªàµà´¤à´®à´¾à´•àµà´•àµà´•",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "à´¤à´¿à´°à´¿à´•àµ† à´µà´¯àµà´•àµà´•àµà´•",
+  "poll.closed": "à´…à´Ÿà´šàµà´šàµ",
+  "poll.refresh": "à´ªàµà´¤àµà´•àµà´•àµà´•",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
   "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
-  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
-  "poll_button.add_poll": "Add a poll",
-  "poll_button.remove_poll": "Remove poll",
-  "privacy.change": "Adjust status privacy",
+  "poll.vote": "à´µàµ‹à´Ÿàµà´Ÿàµ à´šàµ†à´¯àµà´¯àµà´•",
+  "poll.voted": "à´ˆ à´‰à´¤àµà´¤à´°à´¤àµà´¤à´¿à´¨à´¾à´¯à´¿ à´¨à´¿à´™àµà´™àµ¾ à´µàµ‹à´Ÿàµà´Ÿàµ à´šàµ†à´¯àµà´¤àµ",
+  "poll_button.add_poll": "à´’à´°àµ à´ªàµ‹àµ¾ à´šàµ‡àµ¼à´•àµà´•àµà´•",
+  "poll_button.remove_poll": "à´ªàµ‹àµ¾ à´¨àµ€à´•àµà´•à´‚à´šàµ†à´¯àµà´¯àµà´•",
+  "privacy.change": "à´Ÿàµ‚à´Ÿàµà´Ÿàµ à´¸àµà´µà´•à´¾à´°àµà´¯à´¤ à´•àµà´°à´®àµ€à´•à´°à´¿à´•àµà´•àµà´•",
   "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "à´¨àµ‡à´°à´¿à´Ÿàµà´Ÿàµ",
   "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
+  "privacy.private.short": "à´ªà´¿à´¨àµà´¤àµà´Ÿà´°àµà´¨àµà´¨à´µàµ¼à´•àµà´•àµ à´®à´¾à´¤àµà´°à´‚",
   "privacy.public.long": "Post to public timelines",
   "privacy.public.short": "Public",
   "privacy.unlisted.long": "Do not show in public timelines",
   "privacy.unlisted.short": "Unlisted",
-  "refresh": "Refresh",
-  "regeneration_indicator.label": "Loadingâ€¦",
-  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "refresh": "à´ªàµà´¤àµà´•àµà´•àµà´•",
+  "regeneration_indicator.label": "à´²à´àµà´¯à´®à´¾à´•àµà´•àµà´¨àµà´¨àµâ€¦",
+  "regeneration_indicator.sublabel": "à´¨à´¿à´™àµà´™à´³àµà´Ÿàµ† à´¹àµ‹à´‚ à´«àµ€à´¡àµ à´¤à´¯à´¾à´±à´¾à´•àµà´•àµà´¨àµà´¨àµ!",
   "relative_time.days": "{number}d",
   "relative_time.hours": "{number}h",
-  "relative_time.just_now": "now",
+  "relative_time.just_now": "à´‡à´ªàµà´ªàµ‹àµ¾",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
-  "relative_time.today": "today",
-  "reply_indicator.cancel": "Cancel",
+  "relative_time.today": "à´‡à´¨àµà´¨àµ",
+  "reply_indicator.cancel": "à´±à´¦àµà´¦à´¾à´•àµà´•àµà´•",
   "report.forward": "Forward to {target}",
-  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+  "report.forward_hint": "à´ˆ à´…à´•àµà´•àµ—à´£àµà´Ÿàµ à´®à´±àµà´±àµŠà´°àµ à´¸àµ†àµ¼à´µà´±à´¿àµ½ à´¨à´¿à´¨àµà´¨à´¾à´£àµ. à´±à´¿à´ªàµà´ªàµ‹àµ¼à´Ÿàµà´Ÿà´¿à´¨àµà´±àµ† à´…à´œàµà´žà´¾à´¤ à´ªà´•àµ¼à´ªàµà´ªàµ à´…à´µà´¿à´Ÿàµ† à´…à´¯à´¯àµà´•àµà´•à´£àµ‹?",
   "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
-  "report.placeholder": "Additional comments",
-  "report.submit": "Submit",
+  "report.placeholder": "à´•àµ‚à´Ÿàµà´¤àµ½ à´…à´à´¿à´ªàµà´°à´¾à´¯à´™àµà´™àµ¾",
+  "report.submit": "à´¸à´®àµ¼à´ªàµà´ªà´¿à´•àµà´•àµà´•",
   "report.target": "Report {target}",
-  "search.placeholder": "Search",
+  "search.placeholder": "à´¤à´¿à´°à´¯àµà´•",
   "search_popout.search_format": "Advanced search format",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
-  "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "status",
+  "search_popout.tips.hashtag": "à´¹à´¾à´·àµà´Ÿà´¾à´—àµ",
+  "search_popout.tips.status": "à´Ÿàµ‚à´Ÿàµà´Ÿàµ",
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
-  "search_popout.tips.user": "user",
-  "search_results.accounts": "People",
-  "search_results.hashtags": "Hashtags",
-  "search_results.statuses": "Toots",
+  "search_popout.tips.user": "à´‰à´ªà´¯àµ‹à´•àµà´¤à´¾à´µàµ",
+  "search_results.accounts": "à´†à´³àµà´•àµ¾",
+  "search_results.hashtags": "à´¹à´¾à´·àµà´Ÿà´¾à´—àµà´•àµ¾",
+  "search_results.statuses": "à´Ÿàµ‚à´Ÿàµà´Ÿàµà´•àµ¾",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
-  "status.block": "Block @{name}",
-  "status.bookmark": "Bookmark",
+  "status.block": "@{name} -à´¨àµ† à´¤à´Ÿà´¯àµà´•",
+  "status.bookmark": "à´¬àµà´•àµà´•àµà´®à´¾àµ¼à´•àµà´•àµ",
   "status.cancel_reblog_private": "Unboost",
-  "status.cannot_reblog": "This post cannot be boosted",
-  "status.copy": "Copy link to status",
+  "status.cannot_reblog": "à´ˆ à´ªàµ‹à´¸àµà´±àµà´±àµ à´¬àµ‚à´¸àµà´±àµà´šàµ†à´¯àµà´¯à´¾àµ» à´•à´´à´¿à´¯à´¿à´²àµà´²",
+  "status.copy": "à´Ÿàµ‚à´Ÿàµà´Ÿà´¿à´²àµ‡à´•àµà´•àµ à´²à´¿à´™àµà´•àµ à´ªà´•àµ¼à´¤àµà´¤àµà´•",
   "status.delete": "à´®à´¾à´¯àµà´•àµà´•àµà´•",
   "status.detailed_status": "à´µà´¿à´¶à´¦à´®à´¾à´¯ à´¸à´‚à´à´¾à´·à´£ à´•à´¾à´´àµâ€Œà´š",
   "status.direct": "@{name} à´¨àµ à´¨àµ‡à´°à´¿à´Ÿàµà´Ÿàµ à´®àµ†à´¸àµ‡à´œàµ à´…à´¯à´•àµà´•àµà´•",
   "status.embed": "à´‰àµ¾à´šàµà´šàµ‡àµ¼à´•àµà´•àµà´•",
   "status.favourite": "à´ªàµà´°à´¿à´¯à´ªàµà´ªàµ†à´Ÿàµà´Ÿà´¤àµ",
-  "status.filtered": "Filtered",
+  "status.filtered": "à´«à´¿àµ½à´Ÿàµà´Ÿàµ¼ à´šàµ†à´¯àµâ€Œà´¤àµ",
   "status.load_more": "à´•àµ‚à´Ÿàµà´¤àµ½ à´²àµ‹à´¡àµ à´šàµ†à´¯àµà´¯àµà´•",
-  "status.media_hidden": "Media hidden",
+  "status.media_hidden": "à´®àµ€à´¡à´¿à´¯ à´®à´±à´šàµà´šàµ",
   "status.mention": "@{name} à´¸àµ‚à´šà´¿à´ªàµà´ªà´¿à´•àµà´•àµà´•",
-  "status.more": "More",
-  "status.mute": "Mute @{name}",
+  "status.more": "à´•àµ‚à´Ÿàµà´¤àµ½",
+  "status.mute": "@{name}-à´¨àµ† à´¨à´¿à´¶àµà´¶à´¬àµà´¦à´®à´¾à´•àµà´•àµà´•",
   "status.mute_conversation": "Mute conversation",
   "status.open": "Expand this status",
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned toot",
-  "status.read_more": "Read more",
-  "status.reblog": "Boost",
-  "status.reblog_private": "Boost to original audience",
-  "status.reblogged_by": "{name} boosted",
+  "status.read_more": "à´•àµ‚à´Ÿàµà´¤àµ½ à´µà´¾à´¯à´¿à´•àµà´•àµà´•",
+  "status.reblog": "à´¬àµ‚à´¸àµà´±àµà´±àµ",
+  "status.reblog_private": "Boost with original visibility",
+  "status.reblogged_by": "{name} à´¬àµ‚à´¸àµà´±àµà´±àµ à´šàµ†à´¯àµà´¤àµ",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
-  "status.redraft": "Delete & re-draft",
-  "status.remove_bookmark": "Remove bookmark",
-  "status.reply": "Reply",
+  "status.redraft": "à´‡à´²àµà´²à´¾à´¤à´¾à´•àµà´•àµà´• & à´µàµ€à´£àµà´Ÿàµà´‚ à´¡àµà´°à´¾à´«àµà´±àµà´±àµ à´šàµ†à´¯àµà´¯àµà´•",
+  "status.remove_bookmark": "à´¬àµà´•àµà´•àµà´®à´¾àµ¼à´•àµà´•àµ à´¨àµ€à´•àµà´•à´‚à´šàµ†à´¯àµà´¯àµà´•",
+  "status.reply": "à´®à´±àµà´ªà´Ÿà´¿",
   "status.replyAll": "Reply to thread",
-  "status.report": "Report @{name}",
+  "status.report": "@{name}--à´¨àµ† à´±à´¿à´ªàµà´ªàµ‹àµ¼à´Ÿàµà´Ÿàµ à´šàµ†à´¯àµà´¯àµà´•",
   "status.sensitive_warning": "Sensitive content",
-  "status.share": "Share",
-  "status.show_less": "Show less",
+  "status.share": "à´ªà´™àµà´•à´¿à´Ÿàµà´•",
+  "status.show_less": "à´•àµà´±à´šàµà´šàµ à´•à´¾à´£à´¿à´•àµà´•àµà´•",
   "status.show_less_all": "Show less for all",
-  "status.show_more": "Show more",
-  "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
-  "status.uncached_media_warning": "Not available",
+  "status.show_more": "à´•àµ‚à´Ÿàµà´¤à´•àµ½ à´•à´¾à´£à´¿à´•àµà´•àµà´•",
+  "status.show_more_all": "à´Žà´²àµà´²à´¾à´µàµ¼à´•àµà´•àµà´®à´¾à´¯à´¿ à´•àµ‚à´Ÿàµà´¤àµ½ à´•à´¾à´£à´¿à´•àµà´•àµà´•",
+  "status.show_thread": "à´¤àµà´°àµ†à´¡àµ à´•à´¾à´£à´¿à´•àµà´•àµà´•",
+  "status.uncached_media_warning": "à´²à´àµà´¯à´®à´²àµà´²",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
   "suggestions.dismiss": "Dismiss suggestion",
-  "suggestions.header": "You might be interested inâ€¦",
-  "tabs_bar.federated_timeline": "Federated",
-  "tabs_bar.home": "Home",
-  "tabs_bar.local_timeline": "Local",
-  "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Search",
+  "suggestions.header": "à´¨à´¿à´™àµà´™àµ¾à´•àµà´•àµ à´¤à´¾àµ½à´ªàµà´ªà´°àµà´¯à´®àµà´£àµà´Ÿà´¾à´•à´¾à´‚â€¦",
+  "tabs_bar.federated_timeline": "à´¸à´‚à´¯àµà´•àµà´¤à´®à´¾à´•àµà´•à´¿à´¯",
+  "tabs_bar.home": "à´¹àµ‹à´‚",
+  "tabs_bar.local_timeline": "à´ªàµà´°à´¾à´¦àµ‡à´¶à´¿à´•à´‚",
+  "tabs_bar.notifications": "à´…à´±à´¿à´¯à´¿à´ªàµà´ªàµà´•àµ¾",
+  "tabs_bar.search": "à´¤à´¿à´°à´¯àµà´•",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
   "time_remaining.moments": "Moments remaining",
   "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
   "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
+  "timeline_hint.resources.followers": "à´ªà´¿à´¨àµà´¤àµà´Ÿà´°àµà´¨àµà´¨à´µàµ¼",
+  "timeline_hint.resources.follows": "à´ªà´¿à´¨àµà´¤àµà´Ÿà´°àµà´¨àµà´¨àµ",
+  "timeline_hint.resources.statuses": "à´ªà´´à´¯ à´Ÿàµ‚à´Ÿàµà´Ÿàµà´•àµ¾",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
-  "trends.trending_now": "Trending now",
+  "trends.trending_now": "à´‡à´ªàµà´ªàµ‹àµ¾ à´Ÿàµà´°àµ†àµ»à´¡à´¿à´‚à´—àµ",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
+  "units.short.million": "{count}à´¦à´¶à´²à´•àµà´·à´‚",
   "units.short.thousand": "{count}K",
-  "upload_area.title": "Drag & drop to upload",
-  "upload_button.label": "Add images, a video or an audio file",
-  "upload_error.limit": "File upload limit exceeded.",
+  "upload_area.title": "à´…à´ªàµâ€Œà´²àµ‹à´¡àµà´šàµ†à´¯àµà´¯à´¾àµ» à´µà´²à´¿à´šàµà´šà´¿à´Ÿàµà´•",
+  "upload_button.label": "à´‡à´®àµ‡à´œàµà´•àµ¾, à´’à´°àµ à´µàµ€à´¡à´¿à´¯àµ‹ à´…à´²àµà´²àµ†à´™àµà´•à´¿àµ½ à´“à´¡à´¿à´¯àµ‹ à´«à´¯àµ½ à´šàµ‡àµ¼à´•àµà´•àµà´•",
+  "upload_error.limit": "à´«à´¯àµ½ à´…à´ªàµâ€Œà´²àµ‹à´¡àµ à´ªà´°à´¿à´§à´¿ à´•à´µà´¿à´žàµà´žàµ.",
   "upload_error.poll": "File upload not allowed with polls.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
-  "upload_form.description": "Describe for the visually impaired",
-  "upload_form.edit": "Edit",
-  "upload_form.thumbnail": "Change thumbnail",
-  "upload_form.undo": "Delete",
+  "upload_form.audio_description": "à´•àµ‡àµ¾à´µà´¿à´¶à´•àµà´¤à´¿ à´‡à´²àµà´²à´¾à´¤àµà´¤à´µàµ¼à´•àµà´•àµ à´µàµ‡à´£àµà´Ÿà´¿ à´µà´¿à´µà´°à´£à´‚ à´¨àµ½à´•àµ‚",
+  "upload_form.description": "à´•à´¾à´´àµà´šà´¶à´•àµà´¤à´¿ à´‡à´²àµà´²à´¾à´¤àµà´¤à´µàµ¼à´•àµà´•àµ à´µàµ‡à´£àµà´Ÿà´¿ à´µà´¿à´µà´°à´£à´‚ à´¨àµ½à´•àµ‚",
+  "upload_form.edit": "à´¤à´¿à´°àµà´¤àµà´¤àµà´•",
+  "upload_form.thumbnail": "à´²à´˜àµà´šà´¿à´¤àµà´°à´‚ à´®à´¾à´±àµà´±àµà´•",
+  "upload_form.undo": "à´‡à´²àµà´²à´¾à´¤à´¾à´•àµà´•àµà´•",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
-  "upload_modal.analyzing_picture": "Analyzing pictureâ€¦",
-  "upload_modal.apply": "Apply",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.analyzing_picture": "à´šà´¿à´¤àµà´°à´‚ à´µà´¿à´¶à´•à´²à´¨à´‚ à´šàµ†à´¯àµà´¯àµà´¨àµà´¨àµâ€¦",
+  "upload_modal.apply": "à´ªàµà´°à´¯àµ‹à´—à´¿à´•àµà´•àµà´•",
+  "upload_modal.choose_image": "à´šà´¿à´¤àµà´°à´‚ à´¤à´¿à´°à´žàµà´žàµ†à´Ÿàµà´•àµà´•àµà´•",
   "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
   "upload_modal.detect_text": "Detect text from picture",
-  "upload_modal.edit_media": "Edit media",
+  "upload_modal.edit_media": "à´®àµ€à´¡à´¿à´¯ à´¤à´¿à´°àµà´¤àµà´¤àµà´•",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "OCR à´¤à´¯àµà´¯à´¾à´±à´¾à´•àµà´•àµà´¨àµà´¨àµâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploadingâ€¦",
-  "video.close": "Close video",
-  "video.download": "Download file",
-  "video.exit_fullscreen": "Exit full screen",
+  "video.close": "à´µàµ€à´¡à´¿à´¯àµ‹ à´…à´Ÿà´¯àµà´•àµà´•àµà´•",
+  "video.download": "à´«à´¯àµ½ à´¡àµŒàµºà´²àµ‹à´¡àµ à´šàµ†à´¯àµà´¯àµà´•",
+  "video.exit_fullscreen": "à´ªàµ‚àµ¼à´£àµà´£ à´¸àµà´•àµà´°àµ€à´¨à´¿àµ½ à´¨à´¿à´¨àµà´¨àµ à´ªàµà´±à´¤àµà´¤àµà´•à´Ÿà´•àµà´•àµà´•",
   "video.expand": "Expand video",
-  "video.fullscreen": "Full screen",
-  "video.hide": "Hide video",
+  "video.fullscreen": "à´ªàµ‚àµ¼à´£àµà´£ à´¸àµà´•àµà´°àµ€àµ»",
+  "video.hide": "à´µàµ€à´¡à´¿à´¯àµ‹ à´®à´±à´¯àµà´•àµà´•àµà´•",
   "video.mute": "Mute sound",
   "video.pause": "Pause",
-  "video.play": "Play",
+  "video.play": "à´ªàµà´²àµ‡",
   "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 5a93ae851bec0ef18d043c34d1b186ffe8626e60..8559665b9e1483ddd49901d86f14d22a80c6d691 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "à¤…à¤¨à¥à¤¯à¤¾à¤¯à¥€ à¤¹à¥‹à¤£à¥à¤¯à¤¾à¤šà¥€ à¤µà¤¿à¤¨à¤‚à¤¤à¥€ à¤°à¤¦à¥à¤¦ à¤•à¤°à¤¾",
   "account.direct": "à¤¥à¥‡à¤Ÿ à¤¸à¤‚à¤¦à¥‡à¤¶ @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "à¤ªà¥à¤°à¥‹à¤«à¤¾à¤‡à¤² à¤à¤¡à¤¿à¤Ÿ à¤•à¤°à¤¾",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
   "account.follow": "à¤…à¤¨à¥à¤¯à¤¾à¤¯à¥€ à¤µà¥à¤¹à¤¾",
   "account.followers": "à¤…à¤¨à¥à¤¯à¤¾à¤¯à¥€",
@@ -96,9 +98,9 @@
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "Write your warning here",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No toots here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "Authorize",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
-  "lightbox.view_context": "View context",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Change title",
   "lists.new.create": "Add list",
   "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Search among people you follow",
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.alert": "Desktop notifications",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Closed",
   "poll.refresh": "Refresh",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -389,7 +413,7 @@
   "status.pinned": "Pinned toot",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploadingâ€¦",
   "video.close": "Close video",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 5fc777887934798e990fd98a3febbde591c2059b..ec992c67944bb3c1321abf687c762dc86bcef6e7 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Cancel follow request",
   "account.direct": "Direct message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Edit profile",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
   "account.follow": "Follow",
   "account.followers": "Followers",
@@ -96,9 +98,9 @@
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "Write your warning here",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No toots here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other instances to fill it up",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "Authorize",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
-  "lightbox.view_context": "View context",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Change title",
   "lists.new.create": "Add list",
   "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Search among people you follow",
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.alert": "Desktop notifications",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Closed",
   "poll.refresh": "Refresh",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -389,7 +413,7 @@
   "status.pinned": "Pinned toot",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploadingâ€¦",
   "video.close": "Close video",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 73e2b9a1369e2dbf83c01a88f5bee518d2bd2498..e19f0b6d343fca4c44d38c282de9344851037dfc 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -9,14 +9,16 @@
   "account.browse_more_on_origin_server": "Meer op het originele profiel bekijken",
   "account.cancel_follow_request": "Volgverzoek annuleren",
   "account.direct": "@{name} een direct bericht sturen",
+  "account.disable_notifications": "Geef geen melding meer wanneer @{name} toot",
   "account.domain_blocked": "Server verborgen",
   "account.edit_profile": "Profiel bewerken",
+  "account.enable_notifications": "Geef een melding wanneer @{name} toot",
   "account.endorse": "Op profiel weergeven",
   "account.follow": "Volgen",
   "account.followers": "Volgers",
   "account.followers.empty": "Niemand volgt nog deze gebruiker.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers_counter": "{count, plural, one {{counter} volger} other {{counter} volgers}}",
+  "account.following_counter": "{count, plural, one {{counter} volgend} other {{counter} volgend}}",
   "account.follows.empty": "Deze gebruiker volgt nog niemand.",
   "account.follows_you": "Volgt jou",
   "account.hide_reblogs": "Verberg boosts van @{name}",
@@ -36,7 +38,7 @@
   "account.requested": "Wacht op goedkeuring. Klik om het volgverzoek te annuleren",
   "account.share": "Profiel van @{name} delen",
   "account.show_reblogs": "Toon boosts van @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, one {{counter} toot} other {{counter} toots}}",
   "account.unblock": "@{name} deblokkeren",
   "account.unblock_domain": "{domain} niet langer verbergen",
   "account.unendorse": "Niet op profiel weergeven",
@@ -96,9 +98,9 @@
   "compose_form.poll.switch_to_single": "Poll wijzigen om een enkele keuze toe te staan",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Media als gevoelig markeren",
-  "compose_form.sensitive.marked": "Media is als gevoelig gemarkeerd",
-  "compose_form.sensitive.unmarked": "Media is niet als gevoelig gemarkeerd",
+  "compose_form.sensitive.hide": "{count, plural, one {Media als gevoelig markeren} other {Media als gevoelig markeren}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is als gevoelig gemarkeerd} other {Media is als gevoelig gemarkeerd}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is niet als gevoelig gemarkeerd} other {Media is niet als gevoelig gemarkeerd}}",
   "compose_form.spoiler.marked": "Tekst is achter een waarschuwing verborgen",
   "compose_form.spoiler.unmarked": "Tekst is niet verborgen",
   "compose_form.spoiler_placeholder": "Waarschuwingstekst",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Zoekresultaten",
   "emoji_button.symbols": "Symbolen",
   "emoji_button.travel": "Reizen en plekken",
+  "empty_column.account_suspended": "Account opgeschort",
   "empty_column.account_timeline": "Hier zijn geen toots!",
   "empty_column.account_unavailable": "Profiel is niet beschikbaar",
   "empty_column.blocks": "Jij hebt nog geen enkele gebruiker geblokkeerd.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Je hebt nog geen meldingen. Begin met iemand een gesprek.",
   "empty_column.public": "Er is hier helemaal niks! Toot iets in het openbaar of volg mensen van andere servers om het te vullen",
   "error.unexpected_crash.explanation": "Als gevolg van een bug in onze broncode of als gevolg van een compatibiliteitsprobleem met jouw webbrowser, kan deze pagina niet goed worden weergegeven.",
+  "error.unexpected_crash.explanation_addons": "Deze pagina kon niet correct geladen worden. Deze fout wordt waarschijnlijk door een browser-add-on of een automatische vertalingshulpmiddel veroorzaakt.",
   "error.unexpected_crash.next_steps": "Probeer deze pagina te vernieuwen. Wanneer dit niet helpt is het nog steeds mogelijk om Mastodon in een andere webbrowser of mobiele app te gebruiken.",
+  "error.unexpected_crash.next_steps_addons": "Probeer deze uit te schakelen en de pagina te verversen. Wanneer dat niet helpt, kun je Mastodon nog altijd met een andere webbrowser of mobiele app gebruiken.",
   "errors.unexpected_crash.copy_stacktrace": "Stacktrace naar klembord kopiÃ«ren",
   "errors.unexpected_crash.report_issue": "Technisch probleem melden",
   "follow_request.authorize": "Goedkeuren",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "om het tekst- en zoekvak te ontfocussen",
   "keyboard_shortcuts.up": "om omhoog te bewegen in de lijst",
   "lightbox.close": "Sluiten",
+  "lightbox.compress": "Afbeelding passend weergeven",
+  "lightbox.expand": "Afbeelding groot weergeven",
   "lightbox.next": "Volgende",
   "lightbox.previous": "Vorige",
-  "lightbox.view_context": "Context tonen",
   "lists.account.add": "Aan lijst toevoegen",
   "lists.account.remove": "Uit lijst verwijderen",
   "lists.delete": "Lijst verwijderen",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Titel veranderen",
   "lists.new.create": "Lijst toevoegen",
   "lists.new.title_placeholder": "Naam nieuwe lijst",
+  "lists.replies_policy.followed": "Elke gevolgde gebruiker",
+  "lists.replies_policy.list": "Leden van de lijst",
+  "lists.replies_policy.none": "Niemand",
+  "lists.replies_policy.title": "Toon reacties aan:",
   "lists.search": "Zoek naar mensen die je volgt",
   "lists.subheading": "Jouw lijsten",
   "load_pending": "{count, plural, one {# nieuw item} other {# nieuwe items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Media verbergen",
   "missing_indicator.label": "Niet gevonden",
   "missing_indicator.sublabel": "Deze hulpbron kan niet gevonden worden",
+  "mute_modal.duration": "Duur",
   "mute_modal.hide_notifications": "Verberg meldingen van deze persoon?",
+  "mute_modal.indefinite": "Voor onbepaalde tijd",
   "navigation_bar.apps": "Mobiele apps",
   "navigation_bar.blocks": "Geblokkeerde gebruikers",
   "navigation_bar.bookmarks": "Bladwijzers",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Jouw poll is beÃ«indigd",
   "notification.poll": "Een poll waaraan jij hebt meegedaan is beÃ«indigd",
   "notification.reblog": "{name} boostte jouw toot",
+  "notification.status": "{name} heeft zojuist een toot geplaatst",
   "notifications.clear": "Meldingen verwijderen",
   "notifications.clear_confirmation": "Weet je het zeker dat je al jouw meldingen wilt verwijderen?",
   "notifications.column_settings.alert": "Desktopmeldingen",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "In kolom tonen",
   "notifications.column_settings.sound": "Geluid afspelen",
+  "notifications.column_settings.status": "Nieuwe toots:",
   "notifications.filter.all": "Alles",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favorieten",
   "notifications.filter.follows": "Die jij volgt",
   "notifications.filter.mentions": "Vermeldingen",
   "notifications.filter.polls": "Pollresultaten",
+  "notifications.filter.statuses": "Updates van mensen die je volgt",
+  "notifications.grant_permission": "Toestemming geven.",
   "notifications.group": "{count} meldingen",
+  "notifications.mark_as_read": "Markeer elke melding als gelezen",
+  "notifications.permission_denied": "Desktopmeldingen zijn niet beschikbaar omdat een eerdere browsertoestemming werd geweigerd",
+  "notifications.permission_denied_alert": "Desktopmeldingen kunnen niet worden ingeschakeld, omdat een eerdere browsertoestemming werd geweigerd",
+  "notifications.permission_required": "Desktopmeldingen zijn niet beschikbaar omdat de benodigde toestemming niet is verleend.",
+  "notifications_permission_banner.enable": "Desktopmeldingen inschakelen",
+  "notifications_permission_banner.how_to_control": "Om meldingen te ontvangen wanneer Mastodon niet open is. Je kunt precies bepalen welke soort interacties wel of geen desktopmeldingen geven via de bovenstaande {icon} knop.",
+  "notifications_permission_banner.title": "Mis nooit meer iets",
+  "picture_in_picture.restore": "Terugzetten",
   "poll.closed": "Gesloten",
   "poll.refresh": "Vernieuwen",
   "poll.total_people": "{count, plural, one {# persoon} other {# mensen}}",
@@ -423,12 +447,12 @@
   "timeline_hint.resources.followers": "Volgers",
   "timeline_hint.resources.follows": "Volgend",
   "timeline_hint.resources.statuses": "Oudere toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persoon} other {{counter} personen}} zijn aan het praten",
   "trends.trending_now": "Trends",
   "ui.beforeunload": "Je concept zal verloren gaan als je Mastodon verlaat.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
+  "units.short.billion": "{count} mrd.",
+  "units.short.million": "{count} mln.",
+  "units.short.thousand": "{count}k",
   "upload_area.title": "Hiernaar toe slepen om te uploaden",
   "upload_button.label": "Afbeeldingen, een video- of een geluidsbestand toevoegen",
   "upload_error.limit": "Uploadlimiet van bestand overschreden.",
@@ -436,16 +460,17 @@
   "upload_form.audio_description": "Omschrijf dit voor mensen met een auditieve beperking",
   "upload_form.description": "Omschrijf dit voor mensen met een visuele beperking",
   "upload_form.edit": "Bewerken",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "Miniatuurafbeelding wijzigen",
   "upload_form.undo": "Verwijderen",
   "upload_form.video_description": "Omschrijf dit voor mensen met een auditieve of visuele beperking",
   "upload_modal.analyzing_picture": "Afbeelding analyserenâ€¦",
   "upload_modal.apply": "Toepassen",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "Kies een afbeelding",
   "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
   "upload_modal.detect_text": "Tekst in een afbeelding detecteren",
   "upload_modal.edit_media": "Media bewerken",
   "upload_modal.hint": "Klik of sleep de cirkel in de voorvertoning naar een centraal punt dat op elke thumbnail zichtbaar moet blijven.",
+  "upload_modal.preparing_ocr": "OCR voorbereidenâ€¦",
   "upload_modal.preview_label": "Voorvertoning ({ratio})",
   "upload_progress.label": "Uploaden...",
   "video.close": "Video sluiten",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index b567a35330d89d34132f767b3c5475e4a2b1c589..38a95533c7faf5e022727848139dcedecf649c37 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -1,22 +1,24 @@
 {
-  "account.account_note_header": "Note",
+  "account.account_note_header": "Merknad",
   "account.add_or_remove_from_list": "Legg til eller tak vekk frÃ¥ listene",
   "account.badges.bot": "Robot",
   "account.badges.group": "Gruppe",
   "account.block": "Blokker @{name}",
   "account.block_domain": "Skjul alt frÃ¥ {domain}",
   "account.blocked": "Blokkert",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "SjÃ¥ gjennom meir pÃ¥ den opphavlege profilen",
   "account.cancel_follow_request": "Fjern fylgjefÃ¸respurnad",
   "account.direct": "Send melding til @{name}",
+  "account.disable_notifications": "Slutt Ã¥ varsle meg nÃ¥r @{name} legger ut innlegg",
   "account.domain_blocked": "Domenet er gÃ¸ymt",
   "account.edit_profile": "Rediger profil",
+  "account.enable_notifications": "Varsle meg nÃ¥r @{name} legger ut innlegg",
   "account.endorse": "Framhev pÃ¥ profil",
   "account.follow": "Fylg",
   "account.followers": "Fylgjarar",
   "account.followers.empty": "Ingen fylgjer denne brukaren enno.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers_counter": "{count, plural, one {{counter} fylgjar} other {{counter} fylgjarar}}",
+  "account.following_counter": "{count, plural, one {{counter} fylgjar} other {{counter} fylgjar}}",
   "account.follows.empty": "Denne brukaren fylgjer ikkje nokon enno.",
   "account.follows_you": "Fylgjer deg",
   "account.hide_reblogs": "GÃ¸ym fremhevingar frÃ¥ @{name}",
@@ -36,14 +38,14 @@
   "account.requested": "Ventar pÃ¥ samtykke. Klikk for Ã¥ avbryta fylgjefÃ¸respurnaden",
   "account.share": "Del @{name} sin profil",
   "account.show_reblogs": "Vis framhevingar frÃ¥ @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, one {{counter} tut} other {{counter} tut}}",
   "account.unblock": "Slutt Ã¥ blokera @{name}",
   "account.unblock_domain": "Vis {domain}",
   "account.unendorse": "Ikkje framhev pÃ¥ profil",
   "account.unfollow": "Slutt Ã¥ fylgja",
   "account.unmute": "Av-demp @{name}",
   "account.unmute_notifications": "Vis varsel frÃ¥ @{name}",
-  "account_note.placeholder": "Click to add a note",
+  "account_note.placeholder": "Klikk for Ã¥ leggja til merknad",
   "alert.rate_limited.message": "Ver venleg Ã¥ prÃ¸va igjen etter {retry_time, time, medium}.",
   "alert.rate_limited.title": "Begrensa rate",
   "alert.unexpected.message": "Eit uventa problem oppstod.",
@@ -54,7 +56,7 @@
   "bundle_column_error.body": "Noko gjekk gale mens denne komponenten vart lasta ned.",
   "bundle_column_error.retry": "PrÃ¸v igjen",
   "bundle_column_error.title": "Nettverksfeil",
-  "bundle_modal_error.close": "Lukk",
+  "bundle_modal_error.close": "Lat att",
   "bundle_modal_error.message": "Noko gjekk gale under lastinga av denne komponenten.",
   "bundle_modal_error.retry": "PrÃ¸v igjen",
   "column.blocks": "Blokkerte brukarar",
@@ -79,9 +81,9 @@
   "column_header.show_settings": "Vis innstillingar",
   "column_header.unpin": "LÃ¸ys",
   "column_subheading.settings": "Innstillingar",
-  "community.column_settings.local_only": "Kun lokalt",
+  "community.column_settings.local_only": "Berre lokalt",
   "community.column_settings.media_only": "Berre media",
-  "community.column_settings.remote_only": "Kun eksternt",
+  "community.column_settings.remote_only": "Berre eksternt",
   "compose_form.direct_message_warning": "Dette tutet vert berre synleg for nemnde brukarar.",
   "compose_form.direct_message_warning_learn_more": "LÃ¦r meir",
   "compose_form.hashtag_warning": "Dette tutet vert ikkje oppfÃ¸rt under nokon emneknagg sidan det ikkje er oppfÃ¸rt. Berre offentlege tut kan verta sÃ¸kt etter med emneknagg.",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "SÃ¸keresultat",
   "emoji_button.symbols": "Symbol",
   "emoji_button.travel": "Reise & stader",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Ingen tut her!",
   "empty_column.account_unavailable": "Profil ikkje tilgjengelig",
   "empty_column.blocks": "Du har ikkje blokkert nokon brukarar enno.",
@@ -166,13 +169,15 @@
   "empty_column.notifications": "Du har ingen varsel ennÃ¥. Kommuniser med andre for Ã¥ starte samtalen.",
   "empty_column.public": "Det er ingenting her! Skriv noko offentleg, eller fÃ¸lg brukarar frÃ¥ andre tenarar manuelt for Ã¥ fylle det opp",
   "error.unexpected_crash.explanation": "PÃ¥ grunn av ein feil i vÃ¥r kode eller eit nettlesarkompatibilitetsproblem, kunne ikkje denne sida verte vist korrekt.",
+  "error.unexpected_crash.explanation_addons": "Denne siden kunne ikke vises riktig. Denne feilen er sannsynligvis forÃ¥rsaket av en nettleserutvidelse eller automatiske oversettelsesverktÃ¸y.",
   "error.unexpected_crash.next_steps": "PrÃ¸v Ã¥ lasta inn sida pÃ¥ nytt. Om det ikkje hjelper sÃ¥ kan du framleis nytta Mastodon i ein annan nettlesar eller app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Kopier stacktrace til utklippstavla",
   "errors.unexpected_crash.report_issue": "Rapporter problem",
   "follow_request.authorize": "Autoriser",
   "follow_request.reject": "Avvis",
-  "follow_requests.unlocked_explanation": "Selv om kontoen din ikke er lÃ¥st, tror {domain} ansatte at du kanskje vil gjennomgÃ¥ forespÃ¸rsler fra disse kontoene manuelt.",
-  "generic.saved": "Saved",
+  "follow_requests.unlocked_explanation": "SjÃ¸lv om kontoen din ikkje er lÃ¥st tenkte {domain} tilsette at du ville gÃ¥ gjennom fÃ¸respurnadar frÃ¥ desse kontoane manuelt.",
+  "generic.saved": "Lagra",
   "getting_started.developers": "Utviklarar",
   "getting_started.directory": "Profilkatalog",
   "getting_started.documentation": "Dokumentasjon",
@@ -242,7 +247,7 @@
   "keyboard_shortcuts.reply": "for Ã¥ svara",
   "keyboard_shortcuts.requests": "for Ã¥ opna lista med fylgjefÃ¸respurnader",
   "keyboard_shortcuts.search": "for Ã¥ fokusera sÃ¸ket",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "for Ã¥ visa/gÃ¸yma CW-felt",
   "keyboard_shortcuts.start": "for Ã¥ opna \"kom i gang\"-feltet",
   "keyboard_shortcuts.toggle_hidden": "for Ã¥ visa/gÃ¸yma tekst bak innhaldsvarsel",
   "keyboard_shortcuts.toggle_sensitivity": "for Ã¥ visa/gÃ¸yma media",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "for Ã¥ fokusere vekk skrive-/sÃ¸kefeltet",
   "keyboard_shortcuts.up": "for Ã¥ flytta seg opp pÃ¥ lista",
   "lightbox.close": "Lukk att",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Neste",
   "lightbox.previous": "FÃ¸rre",
-  "lightbox.view_context": "SjÃ¥ kontekst",
   "lists.account.add": "Legg til i liste",
   "lists.account.remove": "Fjern frÃ¥ liste",
   "lists.delete": "Slett liste",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Endre tittel",
   "lists.new.create": "Legg til liste",
   "lists.new.title_placeholder": "Ny listetittel",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Vis svar pÃ¥:",
   "lists.search": "SÃ¸k gjennom folk du fÃ¸lgjer",
   "lists.subheading": "Dine lister",
   "load_pending": "{count, plural, one {# nytt element} other {# nye element}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Gjer synleg/usynleg",
   "missing_indicator.label": "Ikkje funne",
   "missing_indicator.sublabel": "Fann ikkje ressursen",
+  "mute_modal.duration": "Varighet",
   "mute_modal.hide_notifications": "GÃ¸yme varsel frÃ¥ denne brukaren?",
+  "mute_modal.indefinite": "PÃ¥ ubestemt tid",
   "navigation_bar.apps": "Mobilappar",
   "navigation_bar.blocks": "Blokkerte brukarar",
   "navigation_bar.bookmarks": "Bokmerke",
@@ -298,6 +310,7 @@
   "notification.own_poll": "RundspÃ¸rjinga di er ferdig",
   "notification.poll": "Ei rundspÃ¸rjing du har rÃ¸ysta i er ferdig",
   "notification.reblog": "{name} framheva statusen din",
+  "notification.status": "{name} la nettopp ut",
   "notifications.clear": "TÃ¸m varsel",
   "notifications.clear_confirmation": "Er du sikker pÃ¥ at du vil fjerna alle varsla dine for alltid?",
   "notifications.column_settings.alert": "Skrivebordsvarsel",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Framhevingar:",
   "notifications.column_settings.show": "Vis i kolonne",
   "notifications.column_settings.sound": "Spel av lyd",
+  "notifications.column_settings.status": "Nye tuter:",
   "notifications.filter.all": "Alle",
   "notifications.filter.boosts": "Framhevingar",
   "notifications.filter.favourites": "Favorittar",
   "notifications.filter.follows": "Fylgjer",
   "notifications.filter.mentions": "Nemningar",
   "notifications.filter.polls": "RÃ¸ysteresultat",
+  "notifications.filter.statuses": "Oppdateringer fra folk du fÃ¸lger",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} varsel",
+  "notifications.mark_as_read": "Merk alle varsler som lest",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Skru pÃ¥ skrivebordsvarsler",
+  "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.title": "Aldri gÃ¥ glipp av noe",
+  "picture_in_picture.restore": "Legg den tilbake",
   "poll.closed": "Lukka",
   "poll.refresh": "Oppdater",
   "poll.total_people": "{count, plural, one {# person} other {# folk}}",
@@ -419,33 +443,34 @@
   "time_remaining.minutes": "{number, plural, one {# minutt} other {# minutt}} igjen",
   "time_remaining.moments": "Kort tid igjen",
   "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekund}} igjen",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "timeline_hint.remote_resource_not_displayed": "{resource} frÃ¥ andre tenarar synest ikkje.",
+  "timeline_hint.resources.followers": "Fylgjarar",
+  "timeline_hint.resources.follows": "Fylgjer",
+  "timeline_hint.resources.statuses": "Eldre tut",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} folk}} pratar",
   "trends.trending_now": "PopulÃ¦rt no",
   "ui.beforeunload": "Kladden din forsvinn om du forlÃ¨t Mastodon no.",
   "units.short.billion": "{count}B",
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "Drag & slepp for Ã¥ lasta opp",
-  "upload_button.label": "Legg til medium ({formats})",
+  "upload_button.label": "Legg til medium",
   "upload_error.limit": "Du har gÃ¥tt over opplastingsgrensa.",
   "upload_error.poll": "Filopplasting ikkje tillate med meiningsmÃ¥lingar.",
   "upload_form.audio_description": "Grei ut for folk med nedsett hÃ¸yrsel",
   "upload_form.description": "Skildr for synshemja",
   "upload_form.edit": "Rediger",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "Bytt miniatyrbilete",
   "upload_form.undo": "Slett",
   "upload_form.video_description": "Greit ut for folk med nedsett hÃ¸yrsel eller syn",
   "upload_modal.analyzing_picture": "Analyserer bileteâ€¦",
   "upload_modal.apply": "Bruk",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "Vel bilete",
   "upload_modal.description_placeholder": "Ein rask brun rev hoppar over den late hunden",
   "upload_modal.detect_text": "Gjenkjenn tekst i biletet",
   "upload_modal.edit_media": "Rediger medium",
   "upload_modal.hint": "Klikk og dra sirkelen pÃ¥ fÃ¸rehandsvisninga for Ã¥ velge fokuspunktet som alltid vil vere synleg pÃ¥ alle miniatyrbileta.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "FÃ¸rehandsvis ({ratio})",
   "upload_progress.label": "Lastar opp...",
   "video.close": "Lukk video",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index a15e96fdc2d193eda23186e415dea345ba585e84..e64bf4a5a4e9c0f5bfbe5ea48ede0be7d9c6a920 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -1,22 +1,24 @@
 {
-  "account.account_note_header": "Note",
+  "account.account_note_header": "Notis",
   "account.add_or_remove_from_list": "Legg til eller fjern fra lister",
   "account.badges.bot": "Bot",
   "account.badges.group": "Gruppe",
   "account.block": "BlokkÃ©r @{name}",
   "account.block_domain": "Skjul alt fra {domain}",
   "account.blocked": "Blokkert",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Bla mer pÃ¥ den opprinnelige profilen",
   "account.cancel_follow_request": "Avbryt fÃ¸lge forespÃ¸rsel",
   "account.direct": "Direct Message @{name}",
+  "account.disable_notifications": "Slutt Ã¥ varsle meg nÃ¥r @{name} legger ut innlegg",
   "account.domain_blocked": "Domenet skjult",
   "account.edit_profile": "Rediger profil",
+  "account.enable_notifications": "Varsle meg nÃ¥r @{name} legger ut innlegg",
   "account.endorse": "Vis frem pÃ¥ profilen",
   "account.follow": "FÃ¸lg",
   "account.followers": "FÃ¸lgere",
   "account.followers.empty": "Ingen fÃ¸lger denne brukeren ennÃ¥.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers_counter": "{count, plural, one {{counter} fÃ¸lger} other {{counter} fÃ¸lgere}}",
+  "account.following_counter": "{count, plural, one {{counter} som fÃ¸lges} other {{counter} som fÃ¸lges}}",
   "account.follows.empty": "Denne brukeren fÃ¸lger ikke noen enda.",
   "account.follows_you": "FÃ¸lger deg",
   "account.hide_reblogs": "Skjul fremhevinger fra @{name}",
@@ -36,14 +38,14 @@
   "account.requested": "Venter pÃ¥ godkjennelse",
   "account.share": "Del @{name}s profil",
   "account.show_reblogs": "Vis boosts fra @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, one {{counter} tut} other {{counter} tuter}}",
   "account.unblock": "Avblokker @{name}",
   "account.unblock_domain": "Vis {domain}",
   "account.unendorse": "Ikke vis frem pÃ¥ profilen",
   "account.unfollow": "AvfÃ¸lg",
   "account.unmute": "Avdemp @{name}",
   "account.unmute_notifications": "Vis varsler fra @{name}",
-  "account_note.placeholder": "Click to add a note",
+  "account_note.placeholder": "Klikk for Ã¥ legge til et notat",
   "alert.rate_limited.message": "Vennligst prÃ¸v igjen etter kl. {retry_time, time, medium}.",
   "alert.rate_limited.title": "Hastighetsbegrenset",
   "alert.unexpected.message": "En uventet feil oppstod.",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "SÃ¸keresultat",
   "emoji_button.symbols": "Symboler",
   "emoji_button.travel": "Reise & steder",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Ingen tuter er her!",
   "empty_column.account_unavailable": "Profilen er utilgjengelig",
   "empty_column.blocks": "Du har ikke blokkert noen brukere enda.",
@@ -166,13 +169,15 @@
   "empty_column.notifications": "Du har ingen varsler ennÃ¥. Kommuniser med andre for Ã¥ begynne samtalen.",
   "empty_column.public": "Det er ingenting her! Skriv noe offentlig, eller fÃ¸lg brukere manuelt fra andre instanser for Ã¥ fylle den opp",
   "error.unexpected_crash.explanation": "PÃ¥ grunn av en bug i koden vÃ¥r eller et nettleserkompatibilitetsproblem, kunne denne siden ikke vises riktig.",
+  "error.unexpected_crash.explanation_addons": "Denne siden kunne ikke vises riktig. Denne feilen er sannsynligvis forÃ¥rsaket av en nettleserutvidelse eller automatiske oversettelsesverktÃ¸y.",
   "error.unexpected_crash.next_steps": "PrÃ¸v Ã¥ oppfriske siden. Dersom det ikke hjelper, vil du kanskje fortsatt kunne bruke Mastodon gjennom en annen nettleser eller app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Kopier stacktrace-en til utklippstavlen",
   "errors.unexpected_crash.report_issue": "Rapporter en feil",
   "follow_request.authorize": "AutorisÃ©r",
   "follow_request.reject": "Avvis",
   "follow_requests.unlocked_explanation": "Selv om kontoen din ikke er lÃ¥st, tror {domain} ansatte at du kanskje vil gjennomgÃ¥ forespÃ¸rsler fra disse kontoene manuelt.",
-  "generic.saved": "Saved",
+  "generic.saved": "Lagret",
   "getting_started.developers": "Utviklere",
   "getting_started.directory": "Profilmappe",
   "getting_started.documentation": "Dokumentasjon",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "Ã¥ ufokusere komponerings-/sÃ¸kefeltet",
   "keyboard_shortcuts.up": "Ã¥ flytte opp i listen",
   "lightbox.close": "Lukk",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Neste",
   "lightbox.previous": "Forrige",
-  "lightbox.view_context": "Vis sammenheng",
   "lists.account.add": "Legg til i listen",
   "lists.account.remove": "Fjern fra listen",
   "lists.delete": "Slett listen",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Endre tittel",
   "lists.new.create": "Ligg til liste",
   "lists.new.title_placeholder": "Ny listetittel",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Vis svar pÃ¥:",
   "lists.search": "SÃ¸k blant personer du fÃ¸lger",
   "lists.subheading": "Dine lister",
   "load_pending": "{count, plural,one {# ny gjenstand} other {# nye gjenstander}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Veksle synlighet",
   "missing_indicator.label": "Ikke funnet",
   "missing_indicator.sublabel": "Denne ressursen ble ikke funnet",
+  "mute_modal.duration": "Varighet",
   "mute_modal.hide_notifications": "Skjul varslinger fra denne brukeren?",
+  "mute_modal.indefinite": "PÃ¥ ubestemt tid",
   "navigation_bar.apps": "Mobilapper",
   "navigation_bar.blocks": "Blokkerte brukere",
   "navigation_bar.bookmarks": "Bokmerker",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Avstemningen din er ferdig",
   "notification.poll": "En avstemning du har stemt pÃ¥ har avsluttet",
   "notification.reblog": "{name} fremhevde din status",
+  "notification.status": "{name} la nettopp ut",
   "notifications.clear": "Fjern varsler",
   "notifications.clear_confirmation": "Er du sikker pÃ¥ at du vil fjerne alle dine varsler permanent?",
   "notifications.column_settings.alert": "Skrivebordsvarslinger",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Fremhevet:",
   "notifications.column_settings.show": "Vis i kolonne",
   "notifications.column_settings.sound": "Spill lyd",
+  "notifications.column_settings.status": "Nye tuter:",
   "notifications.filter.all": "Alle",
   "notifications.filter.boosts": "Fremhevinger",
   "notifications.filter.favourites": "Favoritter",
   "notifications.filter.follows": "FÃ¸lginger",
   "notifications.filter.mentions": "Nevnelser",
   "notifications.filter.polls": "Avstemningsresultater",
+  "notifications.filter.statuses": "Oppdateringer fra folk du fÃ¸lger",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} varslinger",
+  "notifications.mark_as_read": "Merk alle varsler som lest",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Skru pÃ¥ skrivebordsvarsler",
+  "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.title": "Aldri gÃ¥ glipp av noe",
+  "picture_in_picture.restore": "Legg den tilbake",
   "poll.closed": "Lukket",
   "poll.refresh": "Oppdater",
   "poll.total_people": "{count, plural, one {# person} other {# personer}}",
@@ -420,15 +444,15 @@
   "time_remaining.moments": "GjenvÃ¦rende Ã¸yeblikk",
   "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekunder}} igjen",
   "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "timeline_hint.resources.followers": "FÃ¸lgere",
+  "timeline_hint.resources.follows": "FÃ¸lger",
+  "timeline_hint.resources.statuses": "Eldre tuter",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} personer}} snakker",
   "trends.trending_now": "Trender nÃ¥",
   "ui.beforeunload": "Din kladd vil bli forkastet om du forlater Mastodon.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
+  "units.short.billion": "{count}m.ard",
+  "units.short.million": "{count}mill",
+  "units.short.thousand": "{count}T",
   "upload_area.title": "Dra og slipp for Ã¥ laste opp",
   "upload_button.label": "Legg til media",
   "upload_error.limit": "Filopplastingsgrensen er oversteget.",
@@ -436,16 +460,17 @@
   "upload_form.audio_description": "Beskriv det for folk med hÃ¸rselstap",
   "upload_form.description": "Beskriv for synshemmede",
   "upload_form.edit": "Rediger",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "Endre miniatyrbilde",
   "upload_form.undo": "Angre",
   "upload_form.video_description": "Beskriv det for folk med hÃ¸rselstap eller synshemminger",
   "upload_modal.analyzing_picture": "Analyserer bildet â€¦",
   "upload_modal.apply": "Bruk",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "Velg et bilde",
   "upload_modal.description_placeholder": "NÃ¥r du en gang kommer, neste sommer, skal vi atter drikke vin",
   "upload_modal.detect_text": "Oppdag tekst i bildet",
   "upload_modal.edit_media": "Rediger media",
   "upload_modal.hint": "Klikk eller dra sirkelen i forhÃ¥ndsvisningen for Ã¥ velge hovedpunktet som alltid vil bli vist i alle miniatyrbilder.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "ForhÃ¥ndsvisning ({ratio})",
   "upload_progress.label": "Laster opp...",
   "video.close": "Lukk video",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 1aa0193a527b0e66f03ab527d5ee2817e97fbcc7..f56d337d3c1ca7464707cb7bbf84cc905342196b 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -9,14 +9,16 @@
   "account.browse_more_on_origin_server": "Navigar sul perfil original",
   "account.cancel_follow_request": "Anullar la demanda de seguiment",
   "account.direct": "Escriure un MP a @{name}",
+  "account.disable_notifications": "Quitar de mâ€™avisar quand @{name} publica quicÃ²m",
   "account.domain_blocked": "Domeni amagat",
   "account.edit_profile": "Modificar lo perfil",
+  "account.enable_notifications": "Mâ€™avisar quand @{name} publica quicÃ²m",
   "account.endorse": "Mostrar pel perfil",
   "account.follow": "SÃ¨gre",
   "account.followers": "Seguidors",
   "account.followers.empty": "Degun sÃ¨c pas aqueste utilizaire pel moment.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidors}}",
+  "account.following_counter": "{count, plural, one {{counter} Abonaments} other {{counter} Abonaments}}",
   "account.follows.empty": "Aqueste utilizaire sÃ¨c pas degun pel moment.",
   "account.follows_you": "Vos sÃ¨c",
   "account.hide_reblogs": "Rescondre los partatges de @{name}",
@@ -36,7 +38,7 @@
   "account.requested": "Invitacion mandada. Clicatz per anullar",
   "account.share": "Partejar lo perfil a @{name}",
   "account.show_reblogs": "Mostrar los partatges de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, one {{counter} Tut} other {{counter} Tuts}}",
   "account.unblock": "Desblocar @{name}",
   "account.unblock_domain": "Desblocar {domain}",
   "account.unendorse": "Mostrar pas pel perfil",
@@ -85,7 +87,7 @@
   "compose_form.direct_message_warning": "Sols los mencionats poirÃ n veire aqueste tut.",
   "compose_form.direct_message_warning_learn_more": "Ne saber mai",
   "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 monde pÃ²t vos sÃ¨gre e veire los estatuts reservats als seguidors.",
+  "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",
   "compose_form.placeholder": "A de quÃ© pensatzâ€¯?",
   "compose_form.poll.add_option": "Ajustar una causida",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Resultats de recÃ¨rca",
   "emoji_button.symbols": "SimbÃ²ls",
   "emoji_button.travel": "Viatges & lÃ²cs",
+  "empty_column.account_suspended": "Compte suspendut",
   "empty_column.account_timeline": "Cap de tuts aquÃâ€¯!",
   "empty_column.account_unavailable": "Perfil pas disponible",
   "empty_column.blocks": "AvÃ¨tz pas blocat degun pel moment.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "AvÃ¨tz pas encara de notificacions. RespondÃ¨tz a qualquâ€™un per comenÃ§ar una conversacion.",
   "empty_column.public": "I a pas res aquÃâ€¯! EscrivÃ¨tz quicÃ²m de public, o seguÃ¨tz de personas dâ€™autres servidors per garnir lo flux public",
   "error.unexpected_crash.explanation": "A causa dâ€™una avaria dins nÃ²stre cÃ²di o dâ€™un problÃ¨ma de compatibilitat de navegador, aquesta pagina se pÃ²t pas afichar corrÃ¨ctament.",
+  "error.unexpected_crash.explanation_addons": "Aquesta pagina podiÃ¡ pas sâ€™afichar corrÃ¨ctament. Aquesta error arriba sovent a causa dâ€™un modul complementari de navigador o una aisina de traduccion automatica.",
   "error.unexpected_crash.next_steps": "Ensajatz dâ€™actualizar la pagina. Sâ€™aquÃ² cÃ mbia pas res, podÃ¨tz provar dâ€™utilizar Mastodon via un navegador diferent o dâ€™una aplicacion nativa estant.",
+  "error.unexpected_crash.next_steps_addons": "Ensajatz de los desactivar o actualizatz la pagina. Se aquÃ² ajuda pas, podÃ¨tz ensajar dâ€™utilizar Mastodon via un autre navigador o una aplicacion nativa.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar las traÃ§as al quichapapiÃ¨rs",
   "errors.unexpected_crash.report_issue": "Senhalar un problÃ¨ma",
   "follow_request.authorize": "Acceptar",
@@ -177,7 +182,7 @@
   "getting_started.directory": "Annuari de perfils",
   "getting_started.documentation": "Documentacion",
   "getting_started.heading": "Per comenÃ§ar",
-  "getting_started.invite": "Convidar de monde",
+  "getting_started.invite": "Convidar de mond",
   "getting_started.open_source_notice": "Mastodon es un logicial liure. PodÃ¨tz contribuir e mandar vÃ²stres comentaris e rapÃ²rt de bug via {github} sus GitHub.",
   "getting_started.security": "Seguretat",
   "getting_started.terms": "Condicions dâ€™utilizacion",
@@ -202,9 +207,9 @@
   "introduction.federation.federated.headline": "Federat",
   "introduction.federation.federated.text": "Los tuts publics dâ€™autres servidors del fediverse apareisserÃ n dins lo flux dâ€™actualitats.",
   "introduction.federation.home.headline": "AcuÃ¨lh",
-  "introduction.federation.home.text": "Los tuts del monde que seguÃ¨tz apareisserÃ n dins vÃ²stre flux dâ€™acuÃ¨lh. PodÃ¨tz sÃ¨gre de monde ont que siasquen !",
+  "introduction.federation.home.text": "Los tuts del mond que seguÃ¨tz apareisserÃ n dins vÃ²stre flux dâ€™acuÃ¨lh. PodÃ¨tz sÃ¨gre de mond ont que siasquen !",
   "introduction.federation.local.headline": "Local",
-  "introduction.federation.local.text": "Los tuts publics del monde del meteis servidor que vosautres apareisserÃ n dins lo flux local.",
+  "introduction.federation.local.text": "Los tuts publics del mond del meteis servidor que vosautres apareisserÃ n dins lo flux local.",
   "introduction.interactions.action": "Acabar la leiÃ§on !",
   "introduction.interactions.favourite.headline": "Favorit",
   "introduction.interactions.favourite.text": "PodÃ¨tz enregistrar un tut per mai tard, e avisar lâ€™autor que lâ€™avÃ¨tz aimat, en lâ€™ajustant als favorits.",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "quitar lo camp tÃ¨xte/de recÃ¨rca",
   "keyboard_shortcuts.up": "far montar dins la lista",
   "lightbox.close": "Tampar",
+  "lightbox.compress": "FenÃ¨stra de visualizacion dels imatges compressats",
+  "lightbox.expand": "Espandir la fenÃ¨stra de visualizacion dâ€™imatge",
   "lightbox.next": "Seguent",
   "lightbox.previous": "Precedent",
-  "lightbox.view_context": "Veire lo contÃ¨xt",
   "lists.account.add": "Ajustar a la lista",
   "lists.account.remove": "Levar de la lista",
   "lists.delete": "Suprimir la lista",
@@ -260,14 +266,20 @@
   "lists.edit.submit": "Cambiar lo tÃtol",
   "lists.new.create": "Ajustar una lista",
   "lists.new.title_placeholder": "TÃtol de la nÃ²va lista",
-  "lists.search": "Cercar demest lo monde que seguÃ¨tz",
+  "lists.replies_policy.followed": "Quin seguidor que siÃ¡",
+  "lists.replies_policy.list": "Membres de la lista",
+  "lists.replies_policy.none": "Degun",
+  "lists.replies_policy.title": "Mostrar las responsas aâ€¯:",
+  "lists.search": "Cercar demest lo mond que seguÃ¨tz",
   "lists.subheading": "VÃ²stras listas",
   "load_pending": "{count, plural, one {# nÃ²u element} other {# nÃ²u elements}}",
   "loading_indicator.label": "Cargamentâ€¦",
   "media_gallery.toggle_visible": "Modificar la visibilitat",
   "missing_indicator.label": "Pas trobat",
   "missing_indicator.sublabel": "Aquesta ressorsa es pas estada trobada",
+  "mute_modal.duration": "Durada",
   "mute_modal.hide_notifications": "Rescondre las notificacions dâ€™aquesta personaâ€¯?",
+  "mute_modal.indefinite": "Cap de data de fin",
   "navigation_bar.apps": "Aplicacions mobil",
   "navigation_bar.blocks": "Personas blocadas",
   "navigation_bar.bookmarks": "Marcadors",
@@ -298,6 +310,7 @@
   "notification.own_poll": "VÃ²stre sondatge es acabat",
   "notification.poll": "AvÃ¨tz participat a un sondatge que ven de sâ€™acabar",
   "notification.reblog": "{name} a partejat vÃ²stre estatut",
+  "notification.status": "{name} ven de publicar",
   "notifications.clear": "Escafar",
   "notifications.clear_confirmation": "VolÃ¨tz vertadiÃ¨rament escafar totas vÃ²stras las notificacionsâ€¯?",
   "notifications.column_settings.alert": "Notificacions localas",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Partatgesâ€¯:",
   "notifications.column_settings.show": "Mostrar dins la colomna",
   "notifications.column_settings.sound": "Emetre un son",
+  "notifications.column_settings.status": "Tuts novÃ¨lsâ€¯:",
   "notifications.filter.all": "Totas",
   "notifications.filter.boosts": "Partages",
   "notifications.filter.favourites": "Favorits",
   "notifications.filter.follows": "Seguiments",
   "notifications.filter.mentions": "Mencions",
   "notifications.filter.polls": "Resultats del sondatge",
+  "notifications.filter.statuses": "Mesas a jorn del monde que seguissÃ¨tz",
+  "notifications.grant_permission": "Acordar lâ€™autorizacion.",
   "notifications.group": "{count} notificacions",
+  "notifications.mark_as_read": "Marcar totas las notificacions coma legidas",
+  "notifications.permission_denied": "Las notificacion burÃ¨u son pas disponiblas a causa del refÃºs de las demandas dâ€™autorizacion navigador",
+  "notifications.permission_denied_alert": "Las notificacions burÃ¨u son pas activada, per Ã§Ã² que las autorizacions son estadas refusada abans",
+  "notifications.permission_required": "Las notificacions de burÃ¨u son pas indisponiblas perque las permissions requeridas son pas estadas acordadas.",
+  "notifications_permission_banner.enable": "Activar las notificacions burÃ¨u",
+  "notifications_permission_banner.how_to_control": "Per recebre las notificacions de Mastodon quand es pas dobÃ¨rt, activatz las notificacions de burÃ¨u. PodÃ¨tz precisar quin tipe de notificacion generarÃ  una notificacion de burÃ¨u via lo boton {icon} dessÃºs un cÃ²p activadas.",
+  "notifications_permission_banner.title": "Manquetz pas jamai res",
+  "picture_in_picture.restore": "Lo tornar",
   "poll.closed": "Tampat",
   "poll.refresh": "Actualizar",
   "poll.total_people": "{count, plural, one {# persona} other {# personas}}",
@@ -423,7 +447,7 @@
   "timeline_hint.resources.followers": "Seguidors",
   "timeline_hint.resources.follows": "Abonaments",
   "timeline_hint.resources.statuses": "Tuts mai ancians",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persona ne parla} other {{counter} personas ne parlan}}",
   "trends.trending_now": "TendÃ©ncia del moment",
   "ui.beforeunload": "VÃ²stre brolhon serÃ  perdut se quitatz Mastodon.",
   "units.short.billion": "{count}B",
@@ -436,16 +460,17 @@
   "upload_form.audio_description": "Descriure per las personas amb pÃ¨rdas auditivas",
   "upload_form.description": "Descripcion pels mal vesents",
   "upload_form.edit": "Modificar",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "Cambiar la vinheta",
   "upload_form.undo": "Suprimir",
   "upload_form.video_description": "Descriure per las personas amb pÃ¨rdas auditivas o mal vesent",
   "upload_modal.analyzing_picture": "Analisi de lâ€™imatgeâ€¦",
   "upload_modal.apply": "Aplicar",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "Causir un imatge",
   "upload_modal.description_placeholder": "Lo drÃ²lle bilingÃ¼e manja un yaourt de rÃ²cs exagonals e kiwis verds farÃ  un an mai",
   "upload_modal.detect_text": "Detectar lo tÃ¨xt de lâ€™imatge",
   "upload_modal.edit_media": "Modificar lo mÃ¨dia",
   "upload_modal.hint": "Clicatz o lisatz lo cercle de lâ€™apercebut per causir lo ponch que serÃ  totjorn visible dins las vinhetas.",
+  "upload_modal.preparing_ocr": "Preparacion de la ROCâ€¦",
   "upload_modal.preview_label": "Apercebut ({ratio})",
   "upload_progress.label": "MandadÃsâ€¦",
   "video.close": "Tampar la vidÃ¨o",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 4e0230b75815b5b0869d85cbd7f39c2347c24502..0af58e3513b7230f6649345e825d460a9a08d77b 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -1,5 +1,5 @@
 {
-  "account.account_note_header": "Note",
+  "account.account_note_header": "Notatka",
   "account.add_or_remove_from_list": "Dodaj lub usuÅ„ z list",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupa",
@@ -9,14 +9,16 @@
   "account.browse_more_on_origin_server": "Zobacz wiÄ™cej na oryginalnym profilu",
   "account.cancel_follow_request": "Zrezygnuj z proÅ›by o moÅ¼liwoÅ›Ä‡ Å›ledzenia",
   "account.direct": "WyÅ›lij wiadomoÅ›Ä‡ bezpoÅ›redniÄ… do @{name}",
+  "account.disable_notifications": "PrzestaÅ„ powiadamiaÄ‡ mnie o wpisach @{name}",
   "account.domain_blocked": "Ukryto domenÄ™",
   "account.edit_profile": "Edytuj profil",
-  "account.endorse": "Polecaj na profilu",
+  "account.enable_notifications": "Powiadamiaj mnie o wpisach @{name}",
+  "account.endorse": "WyrÃ³Å¼nij na profilu",
   "account.follow": "ÅšledÅº",
   "account.followers": "ÅšledzÄ…cy",
   "account.followers.empty": "Nikt jeszcze nie Å›ledzi tego uÅ¼ytkownika.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers_counter": "{count, plural, one {{counter} Å›ledzÄ…cy} few {{counter} Å›ledzÄ…cych} many {{counter} Å›ledzÄ…cych} other {{counter} Å›ledzÄ…cych}}",
+  "account.following_counter": "{count, plural, one {{counter} Å›ledzony} few {{counter} Å›ledzonych} many {{counter} Å›ledzonych} other {{counter} Å›ledzonych}}",
   "account.follows.empty": "Ten uÅ¼ytkownik nie Å›ledzi jeszcze nikogo.",
   "account.follows_you": "Åšledzi CiÄ™",
   "account.hide_reblogs": "Ukryj podbicia od @{name}",
@@ -36,14 +38,14 @@
   "account.requested": "OczekujÄ…ca proÅ›ba, kliknij aby anulowaÄ‡",
   "account.share": "UdostÄ™pnij profil @{name}",
   "account.show_reblogs": "Pokazuj podbicia od @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, one {{counter} wpis} few {{counter} wpisy} many {{counter} wpisÃ³w} other {{counter} wpisÃ³w}}",
   "account.unblock": "Odblokuj @{name}",
   "account.unblock_domain": "Odblokuj domenÄ™ {domain}",
   "account.unendorse": "PrzestaÅ„ polecaÄ‡",
   "account.unfollow": "PrzestaÅ„ Å›ledziÄ‡",
   "account.unmute": "Cofnij wyciszenie @{name}",
   "account.unmute_notifications": "Cofnij wyciszenie powiadomieÅ„ od @{name}",
-  "account_note.placeholder": "Click to add a note",
+  "account_note.placeholder": "NaciÅ›nij aby dodaÄ‡ notatkÄ™",
   "alert.rate_limited.message": "SprÃ³buj ponownie po {retry_time, time, medium}.",
   "alert.rate_limited.title": "Ograniczony czasowo",
   "alert.unexpected.message": "WystÄ…piÅ‚ nieoczekiwany bÅ‚Ä…d.",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Wyniki wyszukiwania",
   "emoji_button.symbols": "Symbole",
   "emoji_button.travel": "PodrÃ³Å¼e i miejsca",
+  "empty_column.account_suspended": "Konto zawieszone",
   "empty_column.account_timeline": "Brak wpisÃ³w tutaj!",
   "empty_column.account_unavailable": "Profil niedostÄ™pny",
   "empty_column.blocks": "Nie zablokowaÅ‚eÅ›(-aÅ›) jeszcze Å¼adnego uÅ¼ytkownika.",
@@ -166,13 +169,15 @@
   "empty_column.notifications": "Nie masz Å¼adnych powiadomieÅ„. Rozpocznij interakcje z innymi uÅ¼ytkownikami.",
   "empty_column.public": "Tu nic nie ma! Napisz coÅ› publicznie, lub dodaj ludzi z innych serwerÃ³w, aby to wyÅ›wietliÄ‡",
   "error.unexpected_crash.explanation": "W zwiÄ…zku z bÅ‚Ä™dem w naszym kodzie lub braku kompatybilnoÅ›ci przeglÄ…darki, ta strona nie moÅ¼e byÄ‡ poprawnie wyÅ›wietlona.",
+  "error.unexpected_crash.explanation_addons": "Ta strona nie mogÅ‚a zostaÄ‡ poprawnie wyÅ›wietlona. MoÅ¼e to byÄ‡ spowodowane dodatkiem do przeglÄ…darki lub narzÄ™dziem do automatycznego tÅ‚umaczenia.",
   "error.unexpected_crash.next_steps": "SprÃ³buj odÅ›wieÅ¼yÄ‡ stronÄ™. JeÅ›li to nie pomoÅ¼e, wciÄ…Å¼ jesteÅ› w stanie uÅ¼ywaÄ‡ Mastodona przez innÄ… przeglÄ…darkÄ™ lub natywnÄ… aplikacjÄ™.",
+  "error.unexpected_crash.next_steps_addons": "SprÃ³buj je wyÅ‚Ä…czyÄ‡ lub odÅ›wieÅ¼yÄ‡ stronÄ™. JeÅ›li to nie pomoÅ¼e, moÅ¼esz wciÄ…Å¼ korzystaÄ‡ z Mastodona w innej przeglÄ…darce lub natywnej aplikacji.",
   "errors.unexpected_crash.copy_stacktrace": "Skopiuj Å›lad stosu do schowka",
   "errors.unexpected_crash.report_issue": "ZgÅ‚oÅ› problem",
   "follow_request.authorize": "Autoryzuj",
   "follow_request.reject": "OdrzuÄ‡",
   "follow_requests.unlocked_explanation": "Mimo Å¼e Twoje konto nie jest zablokowane, zespÃ³Å‚ {domain} uznaÅ‚ Å¼e moÅ¼esz chcieÄ‡ rÄ™cznie przejrzeÄ‡ proÅ›by o moÅ¼liwoÅ›Ä‡ Å›ledzenia.",
-  "generic.saved": "Saved",
+  "generic.saved": "Zapisano",
   "getting_started.developers": "Dla programistÃ³w",
   "getting_started.directory": "Katalog profilÃ³w",
   "getting_started.documentation": "Dokumentacja",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "aby opuÅ›ciÄ‡ pole wyszukiwania/pisania",
   "keyboard_shortcuts.up": "aby przejÅ›Ä‡ na gÃ³rÄ™ listy",
   "lightbox.close": "Zamknij",
+  "lightbox.compress": "Zmniejsz pole widoku obrazu",
+  "lightbox.expand": "RozwiÅ„ pole widoku obrazu",
   "lightbox.next": "NastÄ™pne",
   "lightbox.previous": "Poprzednie",
-  "lightbox.view_context": "PokaÅ¼ kontekst",
   "lists.account.add": "Dodaj do listy",
   "lists.account.remove": "UsunÄ…Ä‡ z listy",
   "lists.delete": "UsuÅ„ listÄ™",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "ZmieÅ„ tytuÅ‚",
   "lists.new.create": "UtwÃ³rz listÄ™",
   "lists.new.title_placeholder": "WprowadÅº tytuÅ‚ listy",
+  "lists.replies_policy.followed": "Dowolny obserwowany uÅ¼ytkownik",
+  "lists.replies_policy.list": "CzÅ‚onkowie listy",
+  "lists.replies_policy.none": "Nikt",
+  "lists.replies_policy.title": "Pokazuj odpowiedzi dla:",
   "lists.search": "Szukaj wÅ›rÃ³d osÃ³b ktÃ³re Å›ledzisz",
   "lists.subheading": "Twoje listy",
   "load_pending": "{count, plural, one {# nowy przedmiot} other {nowe przedmioty}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "PrzeÅ‚Ä…cz widocznoÅ›Ä‡",
   "missing_indicator.label": "Nie znaleziono",
   "missing_indicator.sublabel": "Nie moÅ¼na odnaleÅºÄ‡ tego zasobu",
+  "mute_modal.duration": "Czas",
   "mute_modal.hide_notifications": "Chcesz ukryÄ‡ powiadomienia od tego uÅ¼ytkownika?",
+  "mute_modal.indefinite": "NieokreÅ›lony",
   "navigation_bar.apps": "Aplikacje mobilne",
   "navigation_bar.blocks": "Zablokowani uÅ¼ytkownicy",
   "navigation_bar.bookmarks": "ZakÅ‚adki",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Twoje gÅ‚osowanie zakoÅ„czyÅ‚o siÄ™",
   "notification.poll": "GÅ‚osowanie w ktÃ³rym braÅ‚eÅ›(-aÅ›) udziaÅ‚ zakoÅ„czyÅ‚a siÄ™",
   "notification.reblog": "{name} podbiÅ‚(a) TwÃ³j wpis",
+  "notification.status": "{name} wÅ‚aÅ›nie utworzyÅ‚(a) wpis",
   "notifications.clear": "WyczyÅ›Ä‡ powiadomienia",
   "notifications.clear_confirmation": "Czy na pewno chcesz bezpowrotnie usunÄ…Ä‡ wszystkie powiadomienia?",
   "notifications.column_settings.alert": "Powiadomienia na pulpicie",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Podbicia:",
   "notifications.column_settings.show": "PokaÅ¼ w kolumnie",
   "notifications.column_settings.sound": "Odtwarzaj dÅºwiÄ™k",
+  "notifications.column_settings.status": "Nowe wpisy:",
   "notifications.filter.all": "Wszystkie",
   "notifications.filter.boosts": "Podbicia",
   "notifications.filter.favourites": "Ulubione",
   "notifications.filter.follows": "Åšledzenia",
   "notifications.filter.mentions": "Wspomienia",
   "notifications.filter.polls": "Wyniki gÅ‚osowania",
+  "notifications.filter.statuses": "Aktualizacje od osÃ³b ktÃ³re obserwujesz",
+  "notifications.grant_permission": "Przyznaj uprawnienia.",
   "notifications.group": "{count, number} {count, plural, one {powiadomienie} few {powiadomienia} many {powiadomieÅ„} more {powiadomieÅ„}}",
+  "notifications.mark_as_read": "Oznacz wszystkie powiadomienia jako przeczytane",
+  "notifications.permission_denied": "Powiadomienia na pulpicie nie sÄ… dostÄ™pne, poniewaÅ¼ wczeÅ›niej nie udzielono uprawnieÅ„ w przeglÄ…darce",
+  "notifications.permission_denied_alert": "Powiadomienia na pulpicie nie mogÄ… zostaÄ‡ wÅ‚Ä…czone, poniewaÅ¼ wczeÅ›niej odmÃ³wiono uprawnieÅ„",
+  "notifications.permission_required": "Powiadomienia na pulpicie nie sÄ… dostÄ™pne, poniewaÅ¼ nie przyznano wymaganego uprawnienia.",
+  "notifications_permission_banner.enable": "WÅ‚Ä…cz powiadomienia na pulpicie",
+  "notifications_permission_banner.how_to_control": "Aby otrzymywaÄ‡ powiadomienia, gdy Mastodon nie jest otwarty, wÅ‚Ä…cz powiadomienia pulpitu. MoÅ¼esz dokÅ‚adnie kontrolowaÄ‡, oktÃ³rych dziaÅ‚aniach bÄ™dziesz powiadomienia na pulpicie za pomocÄ… przycisku {icon} powyÅ¼ej, jeÅ¼eli tylko zostanÄ… wÅ‚Ä…czone.",
+  "notifications_permission_banner.title": "Nie przegap niczego",
+  "picture_in_picture.restore": "OdÅ‚Ã³Å¼",
   "poll.closed": "ZamkniÄ™te",
   "poll.refresh": "OdÅ›wieÅ¼",
   "poll.total_people": "{count, plural, one {# osoba} few {# osoby} many {# osÃ³b} other {# osÃ³b}}",
@@ -423,12 +447,12 @@
   "timeline_hint.resources.followers": "ÅšledzÄ…cy",
   "timeline_hint.resources.follows": "Åšledzeni",
   "timeline_hint.resources.statuses": "Starsze wpisy",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "rozmawiajÄ…: {count, plural, one {{counter} osoba} few {{counter} osoby} many {{counter} osÃ³b} other {{counter} osoby}}",
   "trends.trending_now": "Popularne teraz",
   "ui.beforeunload": "Utracisz tworzony wpis, jeÅ¼eli opuÅ›cisz Mastodona.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
+  "units.short.billion": "{count} mld",
+  "units.short.million": "{count} mln",
+  "units.short.thousand": "{count} tys.",
   "upload_area.title": "PrzeciÄ…gnij i upuÅ›Ä‡ aby wysÅ‚aÄ‡",
   "upload_button.label": "Dodaj zawartoÅ›Ä‡ multimedialnÄ… (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Przekroczono limit plikÃ³w do wysÅ‚ania.",
@@ -436,16 +460,17 @@
   "upload_form.audio_description": "Opisz dla osÃ³b niesÅ‚yszÄ…cych i niedosÅ‚yszÄ…cych",
   "upload_form.description": "WprowadÅº opis dla niewidomych i niedowidzÄ…cych",
   "upload_form.edit": "Edytuj",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "ZmieÅ„ miniaturÄ™",
   "upload_form.undo": "UsuÅ„",
   "upload_form.video_description": "Opisz dla osÃ³b niesÅ‚yszÄ…cych, niedosÅ‚yszÄ…cych, niewidomych i niedowidzÄ…cych",
   "upload_modal.analyzing_picture": "Analizowanie obrazuâ€¦",
   "upload_modal.apply": "Zastosuj",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "Wybierz obraz",
   "upload_modal.description_placeholder": "PchnÄ…Ä‡ w tÄ™ Å‚Ã³dÅº jeÅ¼a lub oÅ›m skrzyÅ„ fig",
-  "upload_modal.detect_text": "Wykryj tekst ze obrazu",
+  "upload_modal.detect_text": "Wykryj tekst z obrazu",
   "upload_modal.edit_media": "Edytuj multimedia",
   "upload_modal.hint": "Kliknij lub przeciÄ…gnij kÃ³Å‚ko na podglÄ…dzie by wybraÄ‡ centralny punkt, ktÃ³ry zawsze bÄ™dzie na widoku na miniaturce.",
+  "upload_modal.preparing_ocr": "Przygotowywanie OCRâ€¦",
   "upload_modal.preview_label": "PodglÄ…d ({ratio})",
   "upload_progress.label": "WysyÅ‚anieâ€¦",
   "video.close": "Zamknij film",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index f494eaaa9c8d241a5377a3917393c4512b0f9f4d..65d5815edce2f193d659ce76605beaf8fa2b6e1f 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Encontre mais no perfil original",
   "account.cancel_follow_request": "Cancelar solicitaÃ§Ã£o para seguir",
   "account.direct": "Enviar toot direto para @{name}",
+  "account.disable_notifications": "Parar de me notificar quando @{name} fizer publicaÃ§Ãµes",
   "account.domain_blocked": "DomÃnio bloqueado",
   "account.edit_profile": "Editar perfil",
+  "account.enable_notifications": "Notificar-me quando @{name} fizer publicaÃ§Ãµes",
   "account.endorse": "Destacar no perfil",
   "account.follow": "Seguir",
   "account.followers": "Seguidores",
@@ -118,7 +120,7 @@
   "confirmations.mute.explanation": "Isso ocultarÃ¡ toots deles e toots mencionando-os, mas ainda permitirÃ¡ que eles vejam seus toots e te sigam.",
   "confirmations.mute.message": "VocÃª tem certeza de que deseja silenciar {name}?",
   "confirmations.redraft.confirm": "Excluir e rascunhar",
-  "confirmations.redraft.message": "Tem certeza que quer excluir este status e re-rascunhÃ¡-lo? Favoritos e boots vÃ£o ser perdidos, e as respostas ao post original vÃ£o ficar Ã³rfÃ£s.",
+  "confirmations.redraft.message": "VocÃª tem certeza de que deseja apagar o toot e usÃ¡-lo como rascunho? Boosts e favoritos serÃ£o perdidos e as respostas ao toot original ficarÃ£o desconectadas.",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Responder agora sobrescreverÃ¡ o toot que vocÃª estÃ¡ compondo. Deseja continuar?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Resultados da pesquisa",
   "emoji_button.symbols": "SÃmbolos",
   "emoji_button.travel": "Viagem & Lugares",
+  "empty_column.account_suspended": "Conta suspensa",
   "empty_column.account_timeline": "Nada aqui!",
   "empty_column.account_unavailable": "Perfil indisponÃvel",
   "empty_column.blocks": "Nada aqui.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Nada aqui. Interaja com outros usuÃ¡rios para comeÃ§ar a conversar.",
   "empty_column.public": "NÃ£o hÃ¡ nada aqui! Escreva algo publicamente, ou siga manualmente usuÃ¡rios de outros servidores para enchÃª-la",
   "error.unexpected_crash.explanation": "Devido a um bug em nosso cÃ³digo ou um problema de compatibilidade de navegador, esta pÃ¡gina nÃ£o pÃ´de ser exibida corretamente.",
+  "error.unexpected_crash.explanation_addons": "Esta pÃ¡gina nÃ£o pÃ´de ser exibida corretamente. Este erro provavelmente Ã© causado por um complemento do navegador ou ferramentas de traduÃ§Ã£o automÃ¡tica.",
   "error.unexpected_crash.next_steps": "Tente atualizar a pÃ¡gina. Se nÃ£o resolver, vocÃª ainda pode conseguir usar o Mastodon por meio de um navegador ou app nativo diferente.",
+  "error.unexpected_crash.next_steps_addons": "Tente desabilitÃ¡-los e atualizar a pÃ¡gina. Se isso nÃ£o ajudar, vocÃª ainda poderÃ¡ usar o Mastodon por meio de um navegador diferente ou de um aplicativo nativo.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar stacktrace para Ã¡rea de transferÃªncia",
   "errors.unexpected_crash.report_issue": "Denunciar problema",
   "follow_request.authorize": "Aprovar",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "para desfocar de Ã¡rea de texto de composiÃ§Ã£o/pesquisa",
   "keyboard_shortcuts.up": "para mover para cima na lista",
   "lightbox.close": "Fechar",
+  "lightbox.compress": "Compactar caixa de visualizaÃ§Ã£o de imagem",
+  "lightbox.expand": "Expandir caixa de visualizaÃ§Ã£o de imagem",
   "lightbox.next": "PrÃ³ximo",
   "lightbox.previous": "Anterior",
-  "lightbox.view_context": "Ver contexto",
   "lists.account.add": "Adicionar Ã  lista",
   "lists.account.remove": "Remover da lista",
   "lists.delete": "Excluir lista",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Renomear",
   "lists.new.create": "Criar lista",
   "lists.new.title_placeholder": "Nome da lista",
+  "lists.replies_policy.followed": "Qualquer usuÃ¡rio seguido",
+  "lists.replies_policy.list": "Membros da lista",
+  "lists.replies_policy.none": "NinguÃ©m",
+  "lists.replies_policy.title": "Mostrar respostas para:",
   "lists.search": "Procurar entre as pessoas que vocÃª segue",
   "lists.subheading": "Suas listas",
   "load_pending": "{count, plural, one {# novo item} other {# novos items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Esconder mÃdia",
   "missing_indicator.label": "NÃ£o encontrado",
   "missing_indicator.sublabel": "Esse recurso nÃ£o pÃ´de ser encontrado",
+  "mute_modal.duration": "DuraÃ§Ã£o",
   "mute_modal.hide_notifications": "Ocultar notificaÃ§Ãµes deste usuÃ¡rio?",
+  "mute_modal.indefinite": "Indefinida",
   "navigation_bar.apps": "Aplicativos",
   "navigation_bar.blocks": "UsuÃ¡rios bloqueados",
   "navigation_bar.bookmarks": "Salvos",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Sua enquete terminou",
   "notification.poll": "Uma enquete que vocÃª votou terminou",
   "notification.reblog": "{name} boostou seu status",
+  "notification.status": "{name} acabou de postar",
   "notifications.clear": "Limpar notificaÃ§Ãµes",
   "notifications.clear_confirmation": "VocÃª tem certeza de que deseja limpar todas as suas notificaÃ§Ãµes?",
   "notifications.column_settings.alert": "NotificaÃ§Ãµes no computador",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Mostrar nas colunas",
   "notifications.column_settings.sound": "Tocar som",
+  "notifications.column_settings.status": "Novos toots:",
   "notifications.filter.all": "Tudo",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favoritos",
   "notifications.filter.follows": "Seguindo",
   "notifications.filter.mentions": "MenÃ§Ãµes",
   "notifications.filter.polls": "Resultados de enquete",
+  "notifications.filter.statuses": "AtualizaÃ§Ãµes de pessoas que vocÃª segue",
+  "notifications.grant_permission": "Conceder permissÃ£o.",
   "notifications.group": "{count} notificaÃ§Ãµes",
+  "notifications.mark_as_read": "Marcar todas as notificaÃ§Ãµes como lidas",
+  "notifications.permission_denied": "NÃ£o Ã© possÃvel habilitar as notificaÃ§Ãµes da Ã¡rea de trabalho pois a permissÃ£o foi negada.",
+  "notifications.permission_denied_alert": "As notificaÃ§Ãµes da Ã¡rea de trabalho nÃ£o podem ser habilitdas pois a permissÃ£o do navegador foi negada antes",
+  "notifications.permission_required": "NotificaÃ§Ãµes da Ã¡rea de trabalho nÃ£o estÃ£o disponÃveis porque a permissÃ£o necessÃ¡ria nÃ£o foi concedida.",
+  "notifications_permission_banner.enable": "Habilitar notificaÃ§Ãµes da Ã¡rea de trabalho",
+  "notifications_permission_banner.how_to_control": "Para receber notificaÃ§Ãµes quando o Mastodon nÃ£o estiver aberto, habilite as notificaÃ§Ãµes da Ã¡rea de trabalho. VocÃª pode controlar precisamente quais tipos de interaÃ§Ãµes geram notificaÃ§Ãµes da Ã¡rea de trabalho atravÃ©s do botÃ£o {icon} acima uma vez habilitadas.",
+  "notifications_permission_banner.title": "Nunca perca nada",
+  "picture_in_picture.restore": "Colocar de volta",
   "poll.closed": "Fechou",
   "poll.refresh": "Atualizar",
   "poll.total_people": "{count, plural, one {# pessoa} other {# pessoas}}",
@@ -392,7 +416,7 @@
   "status.reblog_private": "Boostar para audiÃªncia original",
   "status.reblogged_by": "{name} boostou",
   "status.reblogs.empty": "Nada aqui. Quando alguÃ©m der boost, o autor aparecerÃ¡ aqui.",
-  "status.redraft": "Excluir & re-rascunhar",
+  "status.redraft": "Excluir e rascunhar",
   "status.remove_bookmark": "Remover marcador",
   "status.reply": "Responder",
   "status.replyAll": "Responder a thread",
@@ -425,27 +449,28 @@
   "timeline_hint.resources.statuses": "Toots mais antigos",
   "trends.counter_by_accounts": "{count, plural, one {{counter} pessoa} other {{counter} pessoas}} falando",
   "trends.trending_now": "Em alta no momento",
-  "ui.beforeunload": "Seu rascunho vai ser perdido se vocÃª sair do Mastodon.",
+  "ui.beforeunload": "Seu rascunho serÃ¡ perdido se vocÃª sair do Mastodon.",
   "units.short.billion": "{count} bi",
   "units.short.million": "{count} mi",
   "units.short.thousand": "{count} mil",
   "upload_area.title": "Arraste & solte para fazer upload",
-  "upload_button.label": "Adicionar mÃdia ({formats})",
+  "upload_button.label": "Adicionar mÃdia",
   "upload_error.limit": "Limite de upload de arquivos excedido.",
   "upload_error.poll": "NÃ£o Ã© possÃvel fazer upload de arquivos com enquetes.",
   "upload_form.audio_description": "Descrever para pessoas com deficiÃªncia auditiva",
   "upload_form.description": "Descreva para deficientes visuais",
   "upload_form.edit": "Editar",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "Alterar miniatura",
   "upload_form.undo": "Excluir",
   "upload_form.video_description": "Descreva para pessoas com deficiÃªncia auditiva ou visual",
   "upload_modal.analyzing_picture": "Analisando imagemâ€¦",
   "upload_modal.apply": "Aplicar",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "Escolher imagem",
   "upload_modal.description_placeholder": "Um pequeno jabuti xereta viu dez cegonhas felizes",
   "upload_modal.detect_text": "Detectar texto da imagem",
   "upload_modal.edit_media": "Editar mÃdia",
   "upload_modal.hint": "Clique ou arraste o cÃrculo na prÃ©via para escolher o ponto focal que vai estar sempre visÃvel em todas as thumbnails.",
+  "upload_modal.preparing_ocr": "Preparando OCRâ€¦",
   "upload_modal.preview_label": "PrÃ©via ({ratio})",
   "upload_progress.label": "Fazendo upload...",
   "video.close": "Fechar vÃdeo",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 49fb95885b319bd643a12c5aee2bdf17c01ea49f..dd3b4eba21252e51b24959f9164e6ef7b867ffdf 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -1,36 +1,38 @@
 {
-  "account.account_note_header": "A sua nota para @{name}",
+  "account.account_note_header": "A tua nota para @{name}",
   "account.add_or_remove_from_list": "Adicionar ou remover das listas",
-  "account.badges.bot": "RobÃ´",
+  "account.badges.bot": "Bot",
   "account.badges.group": "Grupo",
   "account.block": "Bloquear @{name}",
   "account.block_domain": "Esconder tudo do domÃnio {domain}",
-  "account.blocked": "Bloqueado",
-  "account.browse_more_on_origin_server": "Encontre mais no perfil original",
-  "account.cancel_follow_request": "Cancelar pedido de seguidor",
-  "account.direct": "Mensagem directa @{name}",
-  "account.domain_blocked": "DomÃnio escondido",
+  "account.blocked": "Bloqueado(a)",
+  "account.browse_more_on_origin_server": "Encontrar mais no perfil original",
+  "account.cancel_follow_request": "Cancelar pedido para seguir",
+  "account.direct": "Enviar mensagem directa para @{name}",
+  "account.disable_notifications": "Parar de me notificar das publicaÃ§Ãµes de @{name}",
+  "account.domain_blocked": "DomÃnio bloqueado",
   "account.edit_profile": "Editar perfil",
-  "account.endorse": "Atributo no perfil",
+  "account.enable_notifications": "Notificar-me das publicaÃ§Ãµes de @{name}",
+  "account.endorse": "Destacar no perfil",
   "account.follow": "Seguir",
   "account.followers": "Seguidores",
   "account.followers.empty": "Ainda ninguÃ©m segue este utilizador.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidores}}",
   "account.following_counter": "{count, plural, other {A seguir {counter}}}",
-  "account.follows.empty": "Este utilizador ainda nÃ£o segue alguÃ©m.",
+  "account.follows.empty": "Este utilizador ainda nÃ£o segue ninguÃ©m.",
   "account.follows_you": "Segue-te",
   "account.hide_reblogs": "Esconder partilhas de @{name}",
   "account.last_status": "Ãšltima atividade",
   "account.link_verified_on": "A posse deste link foi verificada em {date}",
   "account.locked_info": "O estatuto de privacidade desta conta Ã© fechado. O dono revÃª manualmente quem a pode seguir.",
-  "account.media": "Media",
+  "account.media": "MÃ©dia",
   "account.mention": "Mencionar @{name}",
   "account.moved_to": "{name} mudou a sua conta para:",
   "account.mute": "Silenciar @{name}",
   "account.mute_notifications": "Silenciar notificaÃ§Ãµes de @{name}",
   "account.muted": "Silenciada",
   "account.never_active": "Nunca",
-  "account.posts": "PublicaÃ§Ãµes",
+  "account.posts": "Toots",
   "account.posts_with_replies": "PublicaÃ§Ãµes e respostas",
   "account.report": "Denunciar @{name}",
   "account.requested": "A aguardar aprovaÃ§Ã£o. Clique para cancelar o pedido de seguidor",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Resultados da pesquisa",
   "emoji_button.symbols": "SÃmbolos",
   "emoji_button.travel": "Viagens & Lugares",
+  "empty_column.account_suspended": "Conta suspensa",
   "empty_column.account_timeline": "Sem toots por aqui!",
   "empty_column.account_unavailable": "Perfil indisponÃvel",
   "empty_column.blocks": "Ainda nÃ£o bloqueaste qualquer utilizador.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "NÃ£o tens notificaÃ§Ãµes. Interage com outros utilizadores para iniciar uma conversa.",
   "empty_column.public": "NÃ£o hÃ¡ nada aqui! Escreve algo publicamente ou segue outros utilizadores para veres aqui os conteÃºdos pÃºblicos",
   "error.unexpected_crash.explanation": "Devido a um erro no nosso cÃ³digo ou a uma compatilidade com o seu navegador, esta pÃ¡gina nÃ£o pÃ´de ser apresentada correctamente.",
+  "error.unexpected_crash.explanation_addons": "Esta pÃ¡gina nÃ£o pÃ´de ser exibida corretamente. Este erro provavelmente Ã© causado por um complemento do navegador ou ferramentas de traduÃ§Ã£o automÃ¡tica.",
   "error.unexpected_crash.next_steps": "Tente atualizar a pÃ¡gina. Se isso nÃ£o ajudar, pode usar o Mastodon atravÃ©s de um navegador diferente ou uma aplicaÃ§Ã£o nativa.",
+  "error.unexpected_crash.next_steps_addons": "Tente desabilitÃ¡-los e atualizar a pÃ¡gina. Se isso nÃ£o ajudar, vocÃª ainda poderÃ¡ usar o Mastodon por meio de um navegador diferente ou de um aplicativo nativo.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar a stacktrace para o clipboard",
   "errors.unexpected_crash.report_issue": "Reportar problema",
   "follow_request.authorize": "Autorizar",
@@ -202,9 +207,9 @@
   "introduction.federation.federated.headline": "Federada",
   "introduction.federation.federated.text": "PublicaÃ§Ãµes pÃºblicas de outras instÃ¢ncias do fediverso aparecerÃ£o na cronologia federada.",
   "introduction.federation.home.headline": "InÃcio",
-  "introduction.federation.home.text": "As publicaÃ§Ãµes das pessoas que vocÃª segue aparecerÃ£o na sua coluna de inÃcio. VocÃª pode seguir qualquer pessoa em qualquer instÃ¢ncia!",
+  "introduction.federation.home.text": "As publicaÃ§Ãµes das pessoas que segues aparecerÃ£o na tua coluna de inÃcio. Podes seguir qualquer pessoa em qualquer instÃ¢ncia!",
   "introduction.federation.local.headline": "Local",
-  "introduction.federation.local.text": "PublicaÃ§Ãµes pÃºblicas de pessoas na mesma instÃ¢ncia que vocÃª aparecerÃ£o na coluna local.",
+  "introduction.federation.local.text": "PublicaÃ§Ãµes pÃºblicas de pessoas na mesma instÃ¢ncia que tu aparecerÃ£o na coluna local.",
   "introduction.interactions.action": "Terminar o tutorial!",
   "introduction.interactions.favourite.headline": "Favorito",
   "introduction.interactions.favourite.text": "Podes guardar um toot para depois e deixar o autor saber que gostaste dele, marcando-o como favorito.",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "para remover o foco da Ã¡rea de texto/pesquisa",
   "keyboard_shortcuts.up": "para mover para cima na lista",
   "lightbox.close": "Fechar",
+  "lightbox.compress": "Compactar caixa de visualizaÃ§Ã£o de imagem",
+  "lightbox.expand": "Expandir caixa de visualizaÃ§Ã£o de imagem",
   "lightbox.next": "PrÃ³ximo",
   "lightbox.previous": "Anterior",
-  "lightbox.view_context": "Ver contexto",
   "lists.account.add": "Adicionar Ã  lista",
   "lists.account.remove": "Remover da lista",
   "lists.delete": "Remover lista",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Mudar o tÃtulo",
   "lists.new.create": "Adicionar lista",
   "lists.new.title_placeholder": "TÃtulo da nova lista",
+  "lists.replies_policy.followed": "Qualquer utilizador seguido",
+  "lists.replies_policy.list": "Membros da lista",
+  "lists.replies_policy.none": "NinguÃ©m",
+  "lists.replies_policy.title": "Mostrar respostas para:",
   "lists.search": "Pesquisa entre as pessoas que segues",
   "lists.subheading": "As tuas listas",
   "load_pending": "{count, plural, one {# novo item} other {# novos itens}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Alternar visibilidade",
   "missing_indicator.label": "NÃ£o encontrado",
   "missing_indicator.sublabel": "Este recurso nÃ£o foi encontrado",
+  "mute_modal.duration": "DuraÃ§Ã£o",
   "mute_modal.hide_notifications": "Esconder notificaÃ§Ãµes deste utilizador?",
+  "mute_modal.indefinite": "Indefinidamente",
   "navigation_bar.apps": "AplicaÃ§Ãµes mÃ³veis",
   "navigation_bar.blocks": "Utilizadores bloqueados",
   "navigation_bar.bookmarks": "Itens salvos",
@@ -298,9 +310,10 @@
   "notification.own_poll": "A sua votaÃ§Ã£o terminou",
   "notification.poll": "Uma votaÃ§Ã£o em que participaste chegou ao fim",
   "notification.reblog": "{name} partilhou a tua publicaÃ§Ã£o",
+  "notification.status": "{name} acabou de publicar",
   "notifications.clear": "Limpar notificaÃ§Ãµes",
   "notifications.clear_confirmation": "Queres mesmo limpar todas as notificaÃ§Ãµes?",
-  "notifications.column_settings.alert": "NotificaÃ§Ãµes no computador",
+  "notifications.column_settings.alert": "NotificaÃ§Ãµes no ambiente de trabalho",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias",
   "notifications.column_settings.filter_bar.category": "Barra de filtros rÃ¡pidos",
@@ -313,19 +326,30 @@
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Mostrar na coluna",
   "notifications.column_settings.sound": "Reproduzir som",
+  "notifications.column_settings.status": "Novos toots:",
   "notifications.filter.all": "Todas",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favoritos",
   "notifications.filter.follows": "Seguidores",
   "notifications.filter.mentions": "MenÃ§Ãµes",
   "notifications.filter.polls": "VotaÃ§Ãµes",
+  "notifications.filter.statuses": "AtualizaÃ§Ãµes de pessoas que vocÃª segue",
+  "notifications.grant_permission": "Conceder permissÃµes.",
   "notifications.group": "{count} notificaÃ§Ãµes",
+  "notifications.mark_as_read": "Marcar todas as notificaÃ§Ãµes como lidas",
+  "notifications.permission_denied": "NotificaÃ§Ãµes no ambiente de trabalho nÃ£o estÃ£o disponÃveis porque a permissÃ£o, solicitada pelo navegador, foi recusada anteriormente",
+  "notifications.permission_denied_alert": "NotificaÃ§Ãµes no ambinente de trabalho nÃ£o podem ser ativadas, pois a permissÃ£o do navegador foi recusada anteriormente",
+  "notifications.permission_required": "NotificaÃ§Ãµes no ambiente de trabalho nÃ£o estÃ£o disponÃveis porque a permissÃ£o necessÃ¡ria nÃ£o foi concedida.",
+  "notifications_permission_banner.enable": "Ativar notificaÃ§Ãµes no ambiente de trabalho",
+  "notifications_permission_banner.how_to_control": "Para receber notificaÃ§Ãµes quando o Mastodon nÃ£o estiver aberto, ative as notificaÃ§Ãµes no ambiente de trabalho. Depois da sua ativaÃ§Ã£o, pode controlar precisamente quais tipos de interaÃ§Ãµes geram notificaÃ§Ãµes, atravÃ©s do botÃ£o {icon} acima.",
+  "notifications_permission_banner.title": "Nunca perca nada",
+  "picture_in_picture.restore": "ColocÃ¡-lo de volta",
   "poll.closed": "Fechado",
   "poll.refresh": "Recarregar",
   "poll.total_people": "{count, plural, one {# pessoa} other {# pessoas}}",
   "poll.total_votes": "{contar, plural, um {# vote} outro {# votes}}",
   "poll.vote": "Votar",
-  "poll.voted": "VocÃª votou nesta resposta",
+  "poll.voted": "Votaste nesta resposta",
   "poll_button.add_poll": "Adicionar votaÃ§Ã£o",
   "poll_button.remove_poll": "Remover votaÃ§Ã£o",
   "privacy.change": "Ajustar a privacidade da publicaÃ§Ã£o",
@@ -430,7 +454,7 @@
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}m",
   "upload_area.title": "Arraste e solte para enviar",
-  "upload_button.label": "Adicionar media ({formats})",
+  "upload_button.label": "Adicionar media",
   "upload_error.limit": "Limite mÃ¡ximo do ficheiro a carregar excedido.",
   "upload_error.poll": "Carregamento de ficheiros nÃ£o Ã© permitido em votaÃ§Ãµes.",
   "upload_form.audio_description": "Descreva para pessoas com diminuiÃ§Ã£o da acuidade auditiva",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detectar texto na imagem",
   "upload_modal.edit_media": "Editar media",
   "upload_modal.hint": "Clique ou arraste o cÃrculo na prÃ©-visualizaÃ§Ã£o para escolher o ponto focal que serÃ¡ sempre visÃvel em todas as miniaturas.",
+  "upload_modal.preparing_ocr": "A preparar OCRâ€¦",
   "upload_modal.preview_label": "PrÃ©-visualizar ({ratio})",
   "upload_progress.label": "A enviar...",
   "video.close": "Fechar vÃdeo",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 544d6810215dd9cb1f469aae537d0bb15a620c14..a80bfa82251431df6f200bfbc5617621cc9b2b8c 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "CautÄƒ mai multe Ã®n profilul original",
   "account.cancel_follow_request": "AnulaÈ›i cererea de urmÄƒrire",
   "account.direct": "Mesaj direct @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domeniu blocat",
   "account.edit_profile": "EditaÈ›i profilul",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "PromovaÈ›i pe profil",
   "account.follow": "UrmÄƒreÈ™te",
   "account.followers": "UrmÄƒritori",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Rezultatele cÄƒutÄƒrii",
   "emoji_button.symbols": "Simboluri",
   "emoji_button.travel": "CÄƒlÄƒtorii È™i Locuri",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Nicio postare aici!",
   "empty_column.account_unavailable": "Profil indisponibil",
   "empty_column.blocks": "Nu ai blocat nici un utilizator Ã®ncÄƒ.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Nu ai nici o notificare Ã®ncÄƒ. InteracÈ›ioneazÄƒ cu alÈ›ii pentru a Ã®ncepe o conversaÈ›ie.",
   "empty_column.public": "Nu este nimic aici! Scrie ceva public, sau urmÄƒreÈ™te alÈ›i utilizatori din alte instanÈ›e pentru a porni fluxul",
   "error.unexpected_crash.explanation": "Din cauza unei erori Ã®n codul nostru sau a unei probleme de compatibilitate cu navigatorul, aceastÄƒ paginÄƒ nu a putut fi afiÈ™atÄƒ corect.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "ÃŽncercaÈ›i sÄƒ reÃ®mprospÄƒtaÈ›i pagina. DacÄƒ acest lucru nu ajutÄƒ, este posibil sÄƒ mai puteÈ›i folosi site-ul printr-un navigator diferit sau o aplicaÈ›ie nativÄƒ.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "CopiaÈ›i stiva Ã®n clipboard",
   "errors.unexpected_crash.report_issue": "RaportaÈ›i o problemÄƒ",
   "follow_request.authorize": "AutorizeazÄƒ",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "sÄƒ dezactiveze zona de compunere/cÄƒutare",
   "keyboard_shortcuts.up": "sÄƒ mute mai sus Ã®n listÄƒ",
   "lightbox.close": "ÃŽnchide",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "UrmÄƒtorul",
   "lightbox.previous": "Precedentul",
-  "lightbox.view_context": "VizualizaÈ›i contextul",
   "lists.account.add": "AdaugÄƒ Ã®n listÄƒ",
   "lists.account.remove": "EliminÄƒ din listÄƒ",
   "lists.delete": "È˜terge lista",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "SchimbÄƒ titlul",
   "lists.new.create": "AdaugÄƒ listÄƒ",
   "lists.new.title_placeholder": "Titlu pentru noua listÄƒ",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "CautÄƒ printre persoanele pe care le urmÄƒreÈ™ti",
   "lists.subheading": "Listele tale",
   "load_pending": "{count, plural, one {# element nou} other {# elemente noi}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Ascunde media",
   "missing_indicator.label": "Nu a fost gÄƒsit",
   "missing_indicator.sublabel": "AceastÄƒ resursÄƒ nu a putut fi gÄƒsitÄƒ",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Ascunzi notificÄƒrile de la acest utilizator?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "AplicaÈ›ii mobile",
   "navigation_bar.blocks": "Utilizatori blocaÈ›i",
   "navigation_bar.bookmarks": "Marcaje",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Sondajul tÄƒu s-a sfÃ¢rÈ™it",
   "notification.poll": "Un sondaj la care ai votat s-a sfÃ¢rÈ™it",
   "notification.reblog": "{name} a impulsionat postarea ta",
+  "notification.status": "{name} just posted",
   "notifications.clear": "È˜terge notificÄƒrile",
   "notifications.clear_confirmation": "EÈ™ti sigur cÄƒ vrei sÄƒ È™tergi permanent toate notificÄƒrile?",
   "notifications.column_settings.alert": "NotificÄƒri pe desktop",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Impulsuri:",
   "notifications.column_settings.show": "AratÄƒ Ã®n coloanÄƒ",
   "notifications.column_settings.sound": "RedÄƒ sunet",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "Toate",
   "notifications.filter.boosts": "Impulsuri",
   "notifications.filter.favourites": "Favorite",
   "notifications.filter.follows": "UrmÄƒreÈ™te",
   "notifications.filter.mentions": "MenÈ›ionÄƒri",
   "notifications.filter.polls": "Rezultate sondaj",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notificÄƒri",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "ÃŽnchis",
   "poll.refresh": "ReÃ®mprospÄƒteazÄƒ",
   "poll.total_people": "{count, plural, one {# persoanÄƒ} other {# persoane}}",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detectare text din imagine",
   "upload_modal.edit_media": "EditaÈ›i media",
   "upload_modal.hint": "FaceÅ£i clic sau trageÅ£i cercul pe previzualizare pentru a alege punctul focal care va fi Ã®ntotdeauna vizualizat pe toate miniaturile.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Previzualizare ({ratio})",
   "upload_progress.label": "Se ÃŽncarcÄƒ...",
   "video.close": "ÃŽnchide video",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 38d7145250d4b4757a4405b09d537d57be96d21e..2853b3302d56667b3af4dd0c35eec70f91c70c35 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "ÐŸÐ¾ÑÐ¼Ð¾Ñ‚Ñ€ÐµÑ‚ÑŒ Ð¸Ñ… Ð¼Ð¾Ð¶Ð½Ð¾ Ð² Ð¾Ñ€Ð¸Ð³Ð¸Ð½Ð°Ð»ÑŒÐ½Ð¾Ð¼ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ðµ",
   "account.cancel_follow_request": "ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð·Ð°Ð¿Ñ€Ð¾Ñ",
   "account.direct": "ÐÐ°Ð¿Ð¸ÑÐ°Ñ‚ÑŒ @{name}",
+  "account.disable_notifications": "ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚ @{name}",
   "account.domain_blocked": "Ð”Ð¾Ð¼ÐµÐ½ ÑÐºÑ€Ñ‹Ñ‚",
   "account.edit_profile": "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»ÑŒ",
+  "account.enable_notifications": "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ @{name}",
   "account.endorse": "Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ñ‚ÑŒ Ð² Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ðµ",
   "account.follow": "ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒÑÑ",
   "account.followers": "ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ‹",
@@ -96,7 +98,7 @@
   "compose_form.poll.switch_to_single": "ÐŸÐµÑ€ÐµÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð² Ñ€ÐµÐ¶Ð¸Ð¼ Ð²Ñ‹Ð±Ð¾Ñ€Ð° Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¾Ñ‚Ð²ÐµÑ‚Ð°",
   "compose_form.publish": "Ð—Ð°Ð¿Ð¾ÑÑ‚Ð¸Ñ‚ÑŒ",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "ÐžÑ‚Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ Ð¼ÐµÐ´Ð¸Ð°Ñ„Ð°Ð¹Ð» ÐºÐ°Ðº Ð´ÐµÐ»Ð¸ÐºÐ°Ñ‚Ð½Ñ‹Ð¹",
+  "compose_form.sensitive.hide": "{count, plural, one {ÐžÑ‚Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ Ð¼ÐµÐ´Ð¸Ñ„Ð°Ð¹Ð» ÐºÐ°Ðº Ð´ÐµÐ»Ð¸ÐºÐ°Ñ‚Ð½Ñ‹Ð¹} other {ÐžÑ‚Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ Ð¼ÐµÐ´Ð¸Ñ„Ð°Ð¹Ð»Ñ‹ ÐºÐ°Ðº Ð´ÐµÐ»Ð¸ÐºÐ°Ñ‚Ð½Ñ‹Ðµ}}",
   "compose_form.sensitive.marked": "ÐœÐµÐ´Ð¸Ð°Ñ„Ð°Ð¹Ð» Ð¾Ñ‚Ð¼ÐµÑ‡ÐµÐ½ ÐºÐ°Ðº Ð´ÐµÐ»Ð¸ÐºÐ°Ñ‚Ð½Ñ‹Ð¹",
   "compose_form.sensitive.unmarked": "ÐœÐµÐ´Ð¸Ð°Ñ„Ð°Ð¹Ð» Ð½Ðµ Ð¾Ñ‚Ð¼ÐµÑ‡ÐµÐ½ ÐºÐ°Ðº Ð´ÐµÐ»Ð¸ÐºÐ°Ñ‚Ð½Ñ‹Ð¹",
   "compose_form.spoiler.marked": "Ð¢ÐµÐºÑÑ‚ ÑÐºÑ€Ñ‹Ñ‚ Ð·Ð° Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸ÐµÐ¼",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Ð ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ñ‹ Ð¿Ð¾Ð¸ÑÐºÐ°",
   "emoji_button.symbols": "Ð¡Ð¸Ð¼Ð²Ð¾Ð»Ñ‹",
   "emoji_button.travel": "ÐŸÑƒÑ‚ÐµÑˆÐµÑÑ‚Ð²Ð¸Ñ Ð¸ Ð¼ÐµÑÑ‚Ð°",
+  "empty_column.account_suspended": "Ð£Ñ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð°",
   "empty_column.account_timeline": "Ð—Ð´ÐµÑÑŒ Ð½ÐµÑ‚ Ð¿Ð¾ÑÑ‚Ð¾Ð²!",
   "empty_column.account_unavailable": "ÐŸÑ€Ð¾Ñ„Ð¸Ð»ÑŒ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½",
   "empty_column.blocks": "Ð’Ñ‹ ÐµÑ‰Ñ‘ Ð½Ð¸ÐºÐ¾Ð³Ð¾ Ð½Ðµ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð»Ð¸.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Ð£ Ð²Ð°Ñ Ð¿Ð¾ÐºÐ° Ð½ÐµÑ‚ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ð¹. Ð’Ð·Ð°Ð¸Ð¼Ð¾Ð´ÐµÐ¹ÑÑ‚Ð²ÑƒÐ¹Ñ‚Ðµ Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð·Ð°Ð²ÐµÑÑ‚Ð¸ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€.",
   "empty_column.public": "Ð—Ð´ÐµÑÑŒ Ð½Ð¸Ñ‡ÐµÐ³Ð¾ Ð½ÐµÑ‚! ÐžÐ¿ÑƒÐ±Ð»Ð¸ÐºÑƒÐ¹Ñ‚Ðµ Ñ‡Ñ‚Ð¾-Ð½Ð¸Ð±ÑƒÐ´ÑŒ Ð¸Ð»Ð¸ Ð¿Ð¾Ð´Ð¿Ð¸ÑˆÐ¸Ñ‚ÐµÑÑŒ Ð½Ð° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ñ Ð´Ñ€ÑƒÐ³Ð¸Ñ… ÑƒÐ·Ð»Ð¾Ð², Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð·Ð°Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ð»ÐµÐ½Ñ‚Ñƒ",
   "error.unexpected_crash.explanation": "Ð˜Ð·-Ð·Ð° Ð½ÐµÑÐ¾Ð²Ð¼ÐµÑÑ‚Ð¸Ð¼Ð¾Ð³Ð¾ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð° Ð¸Ð»Ð¸ Ð¾ÑˆÐ¸Ð±ÐºÐ¸ Ð² Ð½Ð°ÑˆÐµÐ¼ ÐºÐ¾Ð´Ðµ, ÑÑ‚Ð° ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð°.",
+  "error.unexpected_crash.explanation_addons": "ÐÑ‚Ð° ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð°. Ð¡ÐºÐ¾Ñ€ÐµÐµ Ð²ÑÐµÐ³Ð¾, ÑÑ‚Ð° Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð²Ñ‹Ð·Ð²Ð°Ð½Ð° Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð¸ÐµÐ¼ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð° Ð¸Ð»Ð¸ Ð¸Ð½ÑÑ‚Ñ€ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¾Ð³Ð¾ Ð¿ÐµÑ€ÐµÐ²Ð¾Ð´Ð°.",
   "error.unexpected_crash.next_steps": "ÐŸÐ¾Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ. Ð•ÑÐ»Ð¸ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ð½Ðµ Ð¸ÑÑ‡ÐµÐ·Ð°ÐµÑ‚, Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ Mastodon Ð¸Ð·-Ð¿Ð¾Ð´ Ð´Ñ€ÑƒÐ³Ð¾Ð³Ð¾ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð° Ð¸Ð»Ð¸ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ.",
+  "error.unexpected_crash.next_steps_addons": "ÐŸÐ¾Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ Ð¸Ñ… Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¸ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ. Ð•ÑÐ»Ð¸ ÑÑ‚Ð¾ Ð½Ðµ Ð¿Ð¾Ð¼Ð¾Ð¶ÐµÑ‚, Ð²Ñ‹ Ð¿Ð¾-Ð¿Ñ€ÐµÐ¶Ð½ÐµÐ¼Ñƒ ÑÐ¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²Ð¾Ð¹Ñ‚Ð¸ Ð² Mastodon Ñ‡ÐµÑ€ÐµÐ· Ð´Ñ€ÑƒÐ³Ð¾Ð¹ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€ Ð¸Ð»Ð¸ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ.",
   "errors.unexpected_crash.copy_stacktrace": "Ð¡ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ð¸Ð°Ð³Ð½Ð¾ÑÑ‚Ð¸Ñ‡ÐµÑÐºÑƒÑŽ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ",
   "errors.unexpected_crash.report_issue": "Ð¡Ð¾Ð¾Ð±Ñ‰Ð¸Ñ‚ÑŒ Ð¾ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ðµ",
   "follow_request.authorize": "ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·Ð¾Ð²Ð°Ñ‚ÑŒ",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "ÑƒÐ±Ñ€Ð°Ñ‚ÑŒ Ñ„Ð¾ÐºÑƒÑ Ñ Ð¿Ð¾Ð»Ñ Ð²Ð²Ð¾Ð´Ð°/Ð¿Ð¾Ð¸ÑÐºÐ°",
   "keyboard_shortcuts.up": "Ð²Ð²ÐµÑ€Ñ… Ð¿Ð¾ ÑÐ¿Ð¸ÑÐºÑƒ",
   "lightbox.close": "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ",
+  "lightbox.compress": "Ð¡Ð¶Ð°Ñ‚ÑŒ Ð¾ÐºÐ½Ð¾ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð° Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ð¹",
+  "lightbox.expand": "Ð Ð°Ð·Ð²ÐµÑ€Ð½ÑƒÑ‚ÑŒ Ð¾ÐºÐ½Ð¾ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð° Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ð¹",
   "lightbox.next": "Ð”Ð°Ð»ÐµÐµ",
   "lightbox.previous": "ÐÐ°Ð·Ð°Ð´",
-  "lightbox.view_context": "ÐšÐ¾Ð½Ñ‚ÐµÐºÑÑ‚",
   "lists.account.add": "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ð² ÑÐ¿Ð¸ÑÐ¾Ðº",
   "lists.account.remove": "Ð£Ð±Ñ€Ð°Ñ‚ÑŒ Ð¸Ð· ÑÐ¿Ð¸ÑÐºÐ°",
   "lists.delete": "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ ÑÐ¿Ð¸ÑÐ¾Ðº",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ",
   "lists.new.create": "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ ÑÐ¿Ð¸ÑÐ¾Ðº",
   "lists.new.title_placeholder": "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ°",
+  "lists.replies_policy.followed": "Ð›ÑŽÐ±Ð¾Ð¹ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ð½Ñ‹Ð¹ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ",
+  "lists.replies_policy.list": "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸ Ð² ÑÐ¿Ð¸ÑÐºÐµ",
+  "lists.replies_policy.none": "ÐÐ¸ÐºÐ¾Ð³Ð¾",
+  "lists.replies_policy.title": "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¾Ñ‚Ð²ÐµÑ‚Ñ‹ Ñ‚Ð¾Ð»ÑŒÐºÐ¾:",
   "lists.search": "Ð˜ÑÐºÐ°Ñ‚ÑŒ ÑÑ€ÐµÐ´Ð¸ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¾Ðº",
   "lists.subheading": "Ð’Ð°ÑˆÐ¸ ÑÐ¿Ð¸ÑÐºÐ¸",
   "load_pending": "{count, plural, one {# Ð½Ð¾Ð²Ñ‹Ð¹ ÑÐ»ÐµÐ¼ÐµÐ½Ñ‚} few {# Ð½Ð¾Ð²Ñ‹Ñ… ÑÐ»ÐµÐ¼ÐµÐ½Ñ‚Ð°} other {# Ð½Ð¾Ð²Ñ‹Ñ… ÑÐ»ÐµÐ¼ÐµÐ½Ñ‚Ð¾Ð²}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ/ÑÐºÑ€Ñ‹Ñ‚ÑŒ",
   "missing_indicator.label": "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾",
   "missing_indicator.sublabel": "Ð—Ð°Ð¿Ñ€Ð°ÑˆÐ¸Ð²Ð°ÐµÐ¼Ñ‹Ð¹ Ñ€ÐµÑÑƒÑ€Ñ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½",
+  "mute_modal.duration": "ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ÑÑ‚ÑŒ",
   "mute_modal.hide_notifications": "Ð¡ÐºÑ€Ñ‹Ñ‚ÑŒ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚ ÑÑ‚Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ?",
+  "mute_modal.indefinite": "ÐÐµ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð°",
   "navigation_bar.apps": "ÐœÐ¾Ð±Ð¸Ð»ÑŒÐ½Ñ‹Ðµ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ",
   "navigation_bar.blocks": "Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ¸",
   "navigation_bar.bookmarks": "Ð—Ð°ÐºÐ»Ð°Ð´ÐºÐ¸",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Ð’Ð°Ñˆ Ð¾Ð¿Ñ€Ð¾Ñ Ð·Ð°ÐºÐ¾Ð½Ñ‡Ð¸Ð»ÑÑ",
   "notification.poll": "ÐžÐ¿Ñ€Ð¾Ñ, Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¼ Ð²Ñ‹ Ð¿Ñ€Ð¸Ð½ÑÐ»Ð¸ ÑƒÑ‡Ð°ÑÑ‚Ð¸Ðµ, Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»ÑÑ",
   "notification.reblog": "{name} Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð½ÑƒÐ»(Ð°) Ð²Ð°Ñˆ Ð¿Ð¾ÑÑ‚",
+  "notification.status": "{name} Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ñ‡Ñ‚Ð¾ Ð·Ð°Ð¿Ð¾ÑÑ‚Ð¸Ð»",
   "notifications.clear": "ÐžÑ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ",
   "notifications.clear_confirmation": "Ð’Ñ‹ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹, Ñ‡Ñ‚Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¾Ñ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ Ð²ÑÐµ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ?",
   "notifications.column_settings.alert": "Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð² Ñ„Ð¾Ð½Ðµ",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Ð’Ð°Ñˆ Ð¿Ð¾ÑÑ‚ Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð½ÑƒÐ»Ð¸:",
   "notifications.column_settings.show": "ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚ÑŒ Ð² ÑÐ¿Ð¸ÑÐºÐµ",
   "notifications.column_settings.sound": "ÐŸÑ€Ð¾Ð¸Ð³Ñ€Ñ‹Ð²Ð°Ñ‚ÑŒ Ð·Ð²ÑƒÐº",
+  "notifications.column_settings.status": "ÐÐ¾Ð²Ñ‹Ðµ Ð¿Ð¾ÑÑ‚Ñ‹:",
   "notifications.filter.all": "Ð’ÑÐµ",
   "notifications.filter.boosts": "ÐŸÑ€Ð¾Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ",
   "notifications.filter.favourites": "ÐžÑ‚Ð¼ÐµÑ‚ÐºÐ¸ Â«Ð¸Ð·Ð±Ñ€Ð°Ð½Ð½Ð¾Ð³Ð¾Â»",
   "notifications.filter.follows": "ÐŸÐ¾Ð´Ð¿Ð¸ÑÐºÐ¸",
   "notifications.filter.mentions": "Ð£Ð¿Ð¾Ð¼Ð¸Ð½Ð°Ð½Ð¸Ñ",
   "notifications.filter.polls": "Ð ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ñ‹ Ð¾Ð¿Ñ€Ð¾ÑÐ¾Ð²",
+  "notifications.filter.statuses": "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚ Ð»ÑŽÐ´ÐµÐ¹, Ð½Ð° ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… Ð²Ñ‹ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ‹",
+  "notifications.grant_permission": "Ð”Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ðµ.",
   "notifications.group": "{count} ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð».",
+  "notifications.mark_as_read": "ÐžÑ‚Ð¼ÐµÑ‡Ð°Ñ‚ÑŒ Ð²ÑÐµ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ‹Ð¼Ð¸",
+  "notifications.permission_denied": "Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð½Ð° Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¼ ÑÑ‚Ð¾Ð»Ðµ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹ Ð¸Ð·-Ð·Ð° Ñ€Ð°Ð½ÐµÐµ Ð¾Ñ‚ÐºÐ»Ð¾Ð½Ñ‘Ð½Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ñ€Ð¾ÑÐ° Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ð¹ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð°",
+  "notifications.permission_denied_alert": "Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð½Ð° Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¼ ÑÑ‚Ð¾Ð»Ðµ Ð½Ðµ Ð¼Ð¾Ð³ÑƒÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ñ‹, Ñ‚Ð°Ðº ÐºÐ°Ðº Ñ€Ð°Ð½ÑŒÑˆÐµ Ð±Ñ‹Ð»Ð¾ Ð¾Ñ‚ÐºÐ°Ð·Ð°Ð½Ð¾ Ð² Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ð¸ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð°",
+  "notifications.permission_required": "Ð”ÐµÑÐºÑ‚Ð¾Ð¿ Ð½Ð¾Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹, Ð¿Ð¾Ñ‚Ð¾Ð¼Ñƒ Ñ‡Ñ‚Ð¾ Ñ‚Ñ€ÐµÐ±ÑƒÐµÐ¼Ð¾Ðµ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ðµ Ð½Ðµ Ð±Ñ‹Ð»Ð¾ Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¾.",
+  "notifications_permission_banner.enable": "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð½Ð° Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¼ ÑÑ‚Ð¾Ð»Ðµ",
+  "notifications_permission_banner.how_to_control": "Ð§Ñ‚Ð¾Ð±Ñ‹ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÑŒ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ, ÐºÐ¾Ð³Ð´Ð° ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½ Ð½Ðµ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚, Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ðµ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ³Ð¾ ÑÑ‚Ð¾Ð»Ð°. Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ñ‚Ð¾Ñ‡Ð½Ð¾ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ, ÐºÐ°ÐºÐ¸Ðµ Ñ‚Ð¸Ð¿Ñ‹ Ð²Ð·Ð°Ð¸Ð¼Ð¾Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€ÑƒÑŽÑ‚ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ³Ð¾ ÑÑ‚Ð¾Ð»Ð° Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÐºÐ½Ð¾Ð¿ÐºÐ¸ {icon} Ð²Ñ‹ÑˆÐµ, ÐºÐ¾Ð³Ð´Ð° Ð¾Ð½Ð¸ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ñ‹.",
+  "notifications_permission_banner.title": "ÐÐ¸Ñ‡ÐµÐ³Ð¾ Ð½Ðµ Ð¿Ñ€Ð¾Ð¿ÑƒÑÑ‚Ð¸Ñ‚Ðµ",
+  "picture_in_picture.restore": "Ð’ÐµÑ€Ð½ÑƒÑ‚ÑŒ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾",
   "poll.closed": "Ð—Ð°Ð²ÐµÑ€ÑˆÑ‘Ð½",
   "poll.refresh": "ÐžÐ±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ",
   "poll.total_people": "{count, plural, one {# Ñ‡ÐµÐ»Ð¾Ð²ÐµÐº} few {# Ñ‡ÐµÐ»Ð¾Ð²ÐµÐºÐ°} many {# Ñ‡ÐµÐ»Ð¾Ð²ÐµÐº} other {# Ñ‡ÐµÐ»Ð¾Ð²ÐµÐº}}",
@@ -423,7 +447,7 @@
   "timeline_hint.resources.followers": "Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ¾Ð²",
   "timeline_hint.resources.follows": "Ð¿Ð¾Ð´Ð¿Ð¸ÑÐºÐ¸",
   "timeline_hint.resources.statuses": "Ð¿Ñ€Ð¾ÑˆÐ»Ñ‹Ðµ Ð¿Ð¾ÑÑ‚Ñ‹",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} Ñ‡ÐµÐ»Ð¾Ð²ÐµÐº} many {{counter} Ñ‡ÐµÐ»Ð¾Ð²ÐµÐº} other {{counter} Ñ‡ÐµÐ»Ð¾Ð²ÐµÐºÐ°}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} Ñ‡ÐµÐ»Ð¾Ð²ÐµÐº Ð¾Ð±ÑÑƒÐ¶Ð´Ð°ÐµÑ‚} few {{counter} Ñ‡ÐµÐ»Ð¾Ð²ÐµÐºÐ° Ð¾Ð±ÑÑƒÐ¶Ð´Ð°ÐµÑ‚} many {{counter} Ñ‡ÐµÐ»Ð¾Ð²ÐµÐº Ð¾Ð±ÑÑƒÐ¶Ð´Ð°ÑŽÑ‚} other {{counter} Ð¾Ð±ÑÑƒÐ¶Ð´Ð°ÑŽÑ‚}} ",
   "trends.trending_now": "Ð¡Ð°Ð¼Ð¾Ðµ Ð°ÐºÑ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾Ðµ",
   "ui.beforeunload": "Ð’Ð°Ñˆ Ñ‡ÐµÑ€Ð½Ð¾Ð²Ð¸Ðº Ð±ÑƒÐ´ÐµÑ‚ ÑƒÑ‚ÐµÑ€ÑÐ½, ÐµÑÐ»Ð¸ Ð²Ñ‹ Ð¿Ð¾ÐºÐ¸Ð½ÐµÑ‚Ðµ Mastodon.",
   "units.short.billion": "{count} Ð¼Ð»Ñ€Ð´",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "ÐÐ°Ð¹Ñ‚Ð¸ Ñ‚ÐµÐºÑÑ‚ Ð½Ð° ÐºÐ°Ñ€Ñ‚Ð¸Ð½ÐºÐµ",
   "upload_modal.edit_media": "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»",
   "upload_modal.hint": "ÐÐ°Ð¶Ð¼Ð¸Ñ‚Ðµ Ð¸ Ð¿ÐµÑ€ÐµÑ‚Ð°Ñ‰Ð¸Ñ‚Ðµ ÐºÑ€ÑƒÐ³ Ð² Ð¿Ñ€ÐµÐ´Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ðµ Ð² Ñ‚Ð¾Ñ‡ÐºÑƒ Ñ„Ð¾ÐºÑƒÑÐ°, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð²ÑÐµÐ³Ð´Ð° Ð±ÑƒÐ´ÐµÑ‚ Ð²Ð¸Ð´Ð½Ð° Ð½Ð° ÑÑÐºÐ¸Ð·Ð°Ñ….",
+  "upload_modal.preparing_ocr": "ÐŸÐ¾Ð´Ð³Ð¾Ñ‚Ð¾Ð²ÐºÐ° Ñ€Ð°ÑÐ¿Ð¾Ð·Ð½Ð¾Ð²Ð°Ð½Ð¸Ñâ€¦",
   "upload_modal.preview_label": "ÐŸÑ€ÐµÐ´Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€ ({ratio})",
   "upload_progress.label": "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ°...",
   "video.close": "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ Ð²Ð¸Ð´ÐµÐ¾",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
new file mode 100644
index 0000000000000000000000000000000000000000..4656aa275675d55176212462724774abea006c90
--- /dev/null
+++ b/app/javascript/mastodon/locales/sa.json
@@ -0,0 +1,486 @@
+{
+  "account.account_note_header": "à¤Ÿà¥€à¤•à¤¾",
+  "account.add_or_remove_from_list": "à¤¯à¥à¤œà¥à¤¯à¤¤à¤¾à¤‚ / à¤¨à¤¶à¥à¤¯à¤¤à¤¾à¤‚ à¤¸à¥‚à¤šà¥à¤¯à¤¾à¤ƒ",
+  "account.badges.bot": "à¤¯à¤¨à¥à¤¤à¥à¤°à¤®à¥",
+  "account.badges.group": "à¤¸à¤®à¥‚à¤¹à¤ƒ",
+  "account.block": "à¤…à¤µà¤°à¥à¤§à¥à¤¯à¤¤à¤¾à¤®à¥ @{name}",
+  "account.block_domain": "à¤…à¤µà¤°à¥à¤§à¥à¤¯à¤¤à¤¾à¤‚ à¤ªà¥à¤°à¤¦à¥‡à¤¶à¤ƒ {domain}",
+  "account.blocked": "à¤…à¤µà¤°à¥à¤¦à¥à¤§à¤®à¥",
+  "account.browse_more_on_origin_server": "à¤…à¤§à¤¿à¤•à¤‚ à¤®à¥‚à¤²à¤µà¥à¤¯à¤•à¥à¤¤à¤¿à¤—à¤¤à¤µà¤¿à¤µà¤°à¤£à¥‡ à¤¦à¥ƒà¤¶à¥à¤¯à¤¤à¤¾à¤®à¥",
+  "account.cancel_follow_request": "à¤…à¤¨à¥à¤¸à¤°à¤£à¤¾à¤¨à¥à¤°à¥‹à¤§à¥‹ à¤¨à¤¶à¥à¤¯à¤¤à¤¾à¤®à¥",
+  "account.direct": "à¤ªà¥à¤°à¤¤à¥à¤¯à¤•à¥à¤·à¤¸à¤¨à¥à¤¦à¥‡à¤¶à¤ƒ @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.domain_blocked": "à¤ªà¥à¤°à¤¦à¥‡à¤¶à¥‹ à¤¨à¤¿à¤·à¤¿à¤¦à¥à¤§à¤ƒ",
+  "account.edit_profile": "à¤¸à¤®à¥à¤ªà¤¾à¤¦à¥à¤¯à¤¤à¤¾à¤®à¥",
+  "account.enable_notifications": "Notify me when @{name} posts",
+  "account.endorse": "à¤µà¥à¤¯à¤•à¥à¤¤à¤¿à¤—à¤¤à¤µà¤¿à¤µà¤°à¤£à¥‡ à¤µà¥ˆà¤¶à¤¿à¤·à¥à¤Ÿà¥à¤¯à¤®à¥",
+  "account.follow": "à¤…à¤¨à¥à¤¸à¥à¤°à¤¿à¤¯à¤¤à¤¾à¤®à¥",
+  "account.followers": "à¤…à¤¨à¥à¤¸à¤°à¥à¤¤à¤¾à¤°à¤ƒ",
+  "account.followers.empty": "à¤¨à¤¾à¤½à¤¨à¥à¤¸à¤°à¥à¤¤à¤¾à¤°à¥‹ à¤µà¤°à¥à¤¤à¤¨à¥à¤¤à¥‡",
+  "account.followers_counter": "{count, plural, one {{counter} à¤…à¤¨à¥à¤¸à¤°à¥à¤¤à¤¾} two {{counter} à¤…à¤¨à¥à¤¸à¤°à¥à¤¤à¤¾à¤°à¥Œ} other {{counter} à¤…à¤¨à¥à¤¸à¤°à¥à¤¤à¤¾à¤°à¤ƒ}}",
+  "account.following_counter": "{count, plural, one {{counter} à¤…à¤¨à¥à¤¸à¥ƒà¤¤à¤ƒ} two {{counter} à¤…à¤¨à¥à¤¸à¥ƒà¤¤à¥Œ} other {{counter} à¤…à¤¨à¥à¤¸à¥ƒà¤¤à¤¾à¤ƒ}}",
+  "account.follows.empty": "à¤¨ à¤•à¥‹à¤½à¤ªà¥à¤¯à¤¨à¥à¤¸à¥ƒà¤¤à¥‹ à¤µà¤°à¥à¤¤à¤¤à¥‡",
+  "account.follows_you": "à¤¤à¥à¤µà¤¾à¤®à¤¨à¥à¤¸à¤°à¤¤à¤¿",
+  "account.hide_reblogs": "@{name} à¤®à¤¿à¤¤à¥à¤°à¤¸à¥à¤¯ à¤ªà¥à¤°à¤•à¤¾à¤¶à¤¨à¤¾à¤¨à¤¿ à¤›à¤¿à¤¦à¥à¤¯à¤¨à¥à¤¤à¤¾à¤®à¥",
+  "account.last_status": "à¤—à¤¤à¤¸à¤•à¥à¤°à¤¿à¤¯à¤¤à¤¾",
+  "account.link_verified_on": "à¤…à¤¨à¥à¤¤à¤°à¥à¤œà¤¾à¤²à¤¸à¥à¤¥à¤¾à¤¨à¤¸à¥à¤¯à¤¾à¤¸à¥à¤¯ à¤¸à¥à¤µà¤¾à¤®à¤¿à¤¤à¥à¤µà¤‚ à¤ªà¤°à¥€à¤•à¥à¤·à¤¿à¤¤à¤®à¤¾à¤¸à¥€à¤¤à¥ {date} à¤¦à¤¿à¤¨à¥‡",
+  "account.locked_info": "à¤à¤¤à¤¸à¥à¤¯à¤¾ à¤²à¥‡à¤–à¤¾à¤¯à¤¾à¤ƒ à¤—à¥à¤¹à¥à¤¯à¤¤à¤¾ \"à¤¨à¤¿à¤·à¤¿à¤¦à¥à¤§\"à¤‡à¤¤à¤¿ à¤µà¤°à¥à¤¤à¤¤à¥‡ à¥¤ à¤¸à¥à¤µà¤¾à¤®à¥€ à¤¸à¥à¤µà¤¯à¤žà¥à¤šà¤¿à¤¨à¥‹à¤¤à¤¿ à¤•à¥‹à¤½à¤¨à¥à¤¸à¤°à¥à¤¤à¤¾ à¤à¤µà¤¿à¤¤à¥à¤®à¤°à¥à¤¹à¤¤à¥€à¤¤à¤¿ à¥¤",
+  "account.media": "à¤¸à¤¾à¤®à¤—à¥à¤°à¥€",
+  "account.mention": "à¤‰à¤²à¥à¤²à¤¿à¤–à¥à¤¯à¤¤à¤¾à¤®à¥ @{name}",
+  "account.moved_to": "{name} à¤…à¤¤à¥à¤° à¤ªà¥à¤°à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤à¤®à¥:",
+  "account.mute": "à¤¨à¤¿à¤ƒà¤¶à¤¬à¥à¤¦à¤®à¥ @{name}",
+  "account.mute_notifications": "@{name} à¤¸à¥‚à¤šà¤¨à¤¾à¤ƒ à¤¨à¤¿à¤·à¥à¤•à¥à¤°à¤¿à¤¯à¤¨à¥à¤¤à¤¾à¤®à¥",
+  "account.muted": "à¤¨à¤¿à¤ƒà¤¶à¤¬à¥à¤¦à¤®à¥",
+  "account.never_active": "à¤¨à¥ˆà¤µ à¤•à¤¦à¤¾à¤ªà¤¿",
+  "account.posts": "à¤¦à¥Œà¤¤à¥à¤¯à¤¾à¤¨à¤¿",
+  "account.posts_with_replies": "à¤¦à¥Œà¤¤à¥à¤¯à¤¾à¤¨à¤¿ à¤ªà¥à¤°à¤¤à¥à¤¯à¥à¤¤à¥à¤¤à¤°à¤¾à¤£à¤¿ à¤š",
+  "account.report": "à¤†à¤µà¤¿à¤¦à¥à¤¯à¤¤à¤¾à¤®à¥ @{name}",
+  "account.requested": "à¤¸à¥à¤µà¥€à¤•à¥ƒà¤¤à¤¿à¤ƒ à¤ªà¥à¤°à¤¤à¥€à¤•à¥à¤·à¥à¤¯à¤¤à¥‡ à¥¤ à¤¨à¤¶à¥à¤¯à¤¤à¤¾à¤®à¤¿à¤¤à¥à¤¯à¤¸à¥à¤®à¤¿à¤¨à¥à¤¨à¥à¤¦à¥à¤¯à¤¤à¤¾à¤‚ à¤¨à¤¿à¤°à¤¾à¤•à¤°à¥à¤¤à¥à¤®à¥ à¥¤",
+  "account.share": "@{name} à¤®à¤¿à¤¤à¥à¤°à¤¸à¥à¤¯ à¤µà¤¿à¤µà¤°à¤£à¤‚ à¤µà¤¿à¤à¤¾à¤œà¥à¤¯à¤¤à¤¾à¤®à¥",
+  "account.show_reblogs": "@{name} à¤®à¤¿à¤¤à¥à¤°à¤¸à¥à¤¯ à¤ªà¥à¤°à¤•à¤¾à¤¶à¤¨à¤¾à¤¨à¤¿ à¤¦à¥ƒà¤¶à¥à¤¯à¤¨à¥à¤¤à¤¾à¤®à¥",
+  "account.statuses_counter": "{count, plural, one {{counter} à¤¦à¥Œà¤¤à¥à¤¯à¤®à¥} two {{counter} à¤¦à¥Œà¤¤à¥à¤¯à¥‡} other {{counter} à¤¦à¥Œà¤¤à¥à¤¯à¤¾à¤¨à¤¿}}",
+  "account.unblock": "à¤¨à¤¿à¤·à¥‡à¤§à¤¤à¤¾ à¤¨à¤¶à¥à¤¯à¤¤à¤¾à¤®à¥ @{name}",
+  "account.unblock_domain": "à¤ªà¥à¤°à¤¦à¥‡à¤¶à¤¨à¤¿à¤·à¥‡à¤§à¤¤à¤¾ à¤¨à¤¶à¥à¤¯à¤¤à¤¾à¤®à¥ {domain}",
+  "account.unendorse": "à¤µà¥à¤¯à¤•à¥à¤¤à¤¿à¤—à¤¤à¤µà¤¿à¤µà¤°à¤£à¥‡ à¤®à¤¾ à¤ªà¥à¤°à¤•à¤¾à¤¶à¥à¤¯à¤¤à¤¾à¤®à¥",
+  "account.unfollow": "à¤¨à¤¶à¥à¤¯à¤¤à¤¾à¤®à¤¨à¥à¤¸à¤°à¤£à¤®à¥",
+  "account.unmute": "à¤¸à¤¶à¤¬à¥à¤¦à¤®à¥ @{name}",
+  "account.unmute_notifications": "@{name} à¤¸à¥‚à¤šà¤¨à¤¾à¤ƒ à¤¸à¤•à¥à¤°à¤¿à¤¯à¤¨à¥à¤¤à¤¾à¤®à¥",
+  "account_note.placeholder": "à¤Ÿà¥€à¤•à¤¾à¤¯à¥‹à¤œà¤¨à¤¾à¤°à¥à¤¥à¤‚ à¤¨à¥à¤¦à¥à¤¯à¤¤à¤¾à¤®à¥",
+  "alert.rate_limited.message": "{retry_time, time, medium}. à¤¸à¤®à¤¯à¤¾à¤¤à¥ à¤ªà¤¶à¥à¤šà¤¾à¤¤à¥ à¤ªà¥à¤°à¤¯à¤¤à¤¤à¤¾à¤®à¥",
+  "alert.rate_limited.title": "à¤¸à¥€à¤®à¤¿à¤¤à¤—à¤¤à¤¿à¤ƒ",
+  "alert.unexpected.message": "à¤…à¤¨à¤ªà¥‡à¤•à¥à¤·à¤¿à¤¤à¤¦à¥‹à¤·à¥‹ à¤œà¤¾à¤¤à¤ƒ à¥¤",
+  "alert.unexpected.title": "à¤…à¤°à¥‡ !",
+  "announcement.announcement": "à¤‰à¤¦à¥à¤˜à¥‹à¤·à¤£à¤¾",
+  "autosuggest_hashtag.per_week": "{count} à¤ªà¥à¤°à¤¤à¤¿à¤¸à¤ªà¥à¤¤à¤¾à¤¹à¥‡",
+  "boost_modal.combo": "{combo} à¤…à¤¤à¥à¤° à¤¸à¥à¤ªà¥à¤°à¤·à¥à¤Ÿà¥à¤‚ à¤¶à¤•à¥à¤¯à¤¤à¥‡, à¤¤à¥à¤¯à¤•à¥à¤¤à¥à¤®à¥‡à¤¤à¤®à¤¨à¥à¤¯à¤¸à¥à¤®à¤¿à¤¨à¥ à¤¸à¤®à¤¯à¥‡",
+  "bundle_column_error.body": "à¤µà¤¿à¤·à¤¯à¤¸à¥à¤¯à¤¾à¤½à¤½à¤°à¥‹à¤ªà¤£à¥‡ à¤•à¤¶à¥à¤šà¤¿à¤¦à¥à¤¦à¥‹à¤·à¥‹ à¤œà¤¾à¤¤à¤ƒ",
+  "bundle_column_error.retry": "à¤ªà¥à¤¨à¤ƒ à¤¯à¤¤à¤¤à¤¾à¤®à¥",
+  "bundle_column_error.title": "à¤œà¤¾à¤²à¥‡ à¤¦à¥‹à¤·à¤ƒ",
+  "bundle_modal_error.close": "à¤ªà¤¿à¤§à¥€à¤¯à¤¤à¤¾à¤®à¥",
+  "bundle_modal_error.message": "à¤†à¤°à¥‹à¤ªà¤£à¥‡ à¤•à¤¶à¥à¤šà¤¨ à¤¦à¥‹à¤·à¥‹ à¤œà¤¾à¤¤à¤ƒ",
+  "bundle_modal_error.retry": "à¤ªà¥à¤¨à¤ƒ à¤¯à¤¤à¤¤à¤¾à¤®à¥",
+  "column.blocks": "à¤¨à¤¿à¤·à¤¿à¤¦à¥à¤§à¤à¥‹à¤•à¥à¤¤à¤¾à¤°à¤ƒ",
+  "column.bookmarks": "à¤ªà¥à¤Ÿà¤šà¤¿à¤¹à¥à¤¨à¤¾à¤¨à¤¿",
+  "column.community": "à¤¸à¥à¤¥à¤¾à¤¨à¥€à¤¯à¤¸à¤®à¤¯à¤¤à¤¾à¤²à¤¿à¤•à¤¾",
+  "column.direct": "à¤ªà¥à¤°à¤¤à¥à¤¯à¤•à¥à¤·à¤¸à¤¨à¥à¤¦à¥‡à¤¶à¤¾à¤ƒ",
+  "column.directory": "à¤µà¥à¤¯à¤•à¥à¤¤à¤¿à¤¤à¥à¤µà¤¾à¤¨à¤¿ à¤¦à¥ƒà¤¶à¥à¤¯à¤¨à¥à¤¤à¤¾à¤®à¥",
+  "column.domain_blocks": "à¤¨à¤¿à¤·à¤¿à¤¦à¥à¤§à¤ªà¥à¤°à¤¦à¥‡à¤¶à¤¾à¤ƒ",
+  "column.favourites": "à¤ªà¥à¤°à¤¿à¤¯à¤¾à¤ƒ",
+  "column.follow_requests": "à¤…à¤¨à¥à¤¸à¤°à¤£à¤¾à¤¨à¥à¤°à¥‹à¤§à¤¾à¤ƒ",
+  "column.home": "à¤—à¥ƒà¤¹à¤®à¥",
+  "column.lists": "à¤¸à¥‚à¤šà¤¯à¤ƒ",
+  "column.mutes": "à¤¨à¤¿à¤ƒà¤¶à¤¬à¥à¤¦à¤¾à¤ƒ à¤à¥‹à¤•à¥à¤¤à¤¾à¤°à¤ƒ",
+  "column.notifications": "à¤¸à¥‚à¤šà¤¨à¤¾à¤ƒ",
+  "column.pins": "à¤•à¥€à¤²à¤¿à¤¤à¤¦à¥Œà¤¤à¥à¤¯à¤¾à¤¨à¤¿",
+  "column.public": "à¤¸à¤™à¥à¤˜à¥€à¤¯à¤¸à¤®à¤¯à¤¤à¤¾à¤²à¤¿à¤•à¤¾",
+  "column_back_button.label": "à¤ªà¥‚à¤°à¥à¤µà¤®à¥",
+  "column_header.hide_settings": "à¤µà¤¿à¤¨à¥à¤¯à¤¾à¤¸à¤¾à¤ƒ à¤›à¤¾à¤¦à¥à¤¯à¤¨à¥à¤¤à¤¾à¤®à¥",
+  "column_header.moveLeft_settings": "à¤¸à¥à¤¤à¤®à¥à¤à¥‹ à¤µà¤¾à¤®à¥€ à¤•à¥à¤°à¤¿à¤¯à¤¤à¤¾à¤®à¥",
+  "column_header.moveRight_settings": "à¤¸à¥à¤¤à¤®à¥à¤à¥‹ à¤¦à¤•à¥à¤·à¤¿à¤£à¥€ à¤•à¥à¤°à¤¿à¤¯à¤¤à¤¾à¤®à¥",
+  "column_header.pin": "à¤•à¥€à¤²à¤¯à¤¤à¥",
+  "column_header.show_settings": "à¤µà¤¿à¤¨à¥à¤¯à¤¾à¤¸à¤¾à¤ƒ à¤¦à¥ƒà¤¶à¥à¤¯à¤¨à¥à¤¤à¤¾à¤®à¥",
+  "column_header.unpin": "à¤•à¥€à¤²à¤¨à¤‚ à¤¨à¤¾à¤¶à¤¯",
+  "column_subheading.settings": "à¤µà¤¿à¤¨à¥à¤¯à¤¾à¤¸à¤¾à¤ƒ",
+  "community.column_settings.local_only": "à¤•à¥‡à¤µà¤²à¤‚ à¤¸à¥à¤¥à¤¾à¤¨à¥€à¤¯à¤®à¥",
+  "community.column_settings.media_only": "à¤¸à¤¾à¤®à¤—à¥à¤°à¥€ à¤•à¥‡à¤µà¤²à¤®à¥",
+  "community.column_settings.remote_only": "à¤¦à¤°à¥à¤—à¤®à¤ƒ à¤•à¥‡à¤µà¤²à¤®à¥",
+  "compose_form.direct_message_warning": "à¤¦à¥Œà¤¤à¥à¤¯à¤®à¥‡à¤¤à¤¤à¥à¤•à¥‡à¤µà¤²à¤®à¥à¤²à¥à¤²à¥‡à¤–à¤¿à¤¤à¤œà¤¨à¤¾à¤¨à¤¾à¤‚ à¤•à¥ƒà¤¤à¥‡ à¤µà¤°à¥à¤¤à¤¤à¥‡",
+  "compose_form.direct_message_warning_learn_more": "à¤…à¤§à¤¿à¤•à¤‚ à¤œà¥à¤žà¤¾à¤¯à¤¤à¤¾à¤®à¥",
+  "compose_form.hashtag_warning": "à¤¨ à¤•à¤¸à¥à¤®à¤¿à¤¨à¥à¤¨à¤ªà¤¿ à¤ªà¥à¤°à¤šà¤²à¤¿à¤¤à¤µà¤¸à¥à¤¤à¥à¤·à¥ à¤¸à¥‚à¤šà¤¿à¤¤à¤®à¤¿à¤¦à¤‚ à¤¦à¥Œà¤¤à¥à¤¯à¤®à¥ à¥¤ à¤•à¥‡à¤µà¤²à¤‚ à¤¸à¤¾à¤°à¥à¤µà¤œà¤¨à¤¿à¤•à¤¦à¥Œà¤¤à¥à¤¯à¤¾à¤¨à¤¿ à¤ªà¥à¤°à¤šà¤²à¤¿à¤¤à¤µà¤¸à¥à¤¤à¥à¤šà¤¿à¤¹à¥à¤¨à¥‡à¤¨ à¤…à¤¨à¥à¤µà¥‡à¤·à¤¯à¤¿à¤¤à¥à¤‚ à¤¶à¤•à¥à¤¯à¤¤à¥‡ à¥¤",
+  "compose_form.lock_disclaimer": "à¤¤à¤µ à¤²à¥‡à¤–à¤¾ à¤¨ à¤ªà¥à¤°à¤µà¥‡à¤·à¥à¤Ÿà¥à¤®à¤¶à¤•à¥à¤¯à¤¾ {locked} à¥¤ à¤•à¥‹à¤½à¤ªà¥à¤¯à¤¨à¥à¤¸à¤°à¥à¤¤à¤¾ à¤¤à¥‡ à¤•à¥‡à¤µà¤²à¤®à¤¨à¥à¤¸à¤°à¥à¤¤à¥ƒà¥ƒà¤£à¤¾à¤‚ à¤•à¥ƒà¤¤à¥‡ à¤¸à¥à¤¥à¤¿à¤¤à¤¾à¤¨à¤¿ à¤¦à¥Œà¤¤à¥à¤¯à¤¾à¤¨à¤¿ à¤¦à¥à¤°à¤·à¥à¤Ÿà¥à¤‚ à¤¶à¤•à¥à¤¨à¥‹à¤¤à¤¿ à¥¤",
+  "compose_form.lock_disclaimer.lock": "à¤…à¤µà¤°à¥à¤¦à¥à¤§à¤ƒ",
+  "compose_form.placeholder": "à¤®à¤¨à¤¸à¤¿ à¤¤à¥‡ à¤•à¤¿à¤®à¤¸à¥à¤¤à¤¿?",
+  "compose_form.poll.add_option": "à¤®à¤¤à¤®à¤ªà¤°à¤‚ à¤¯à¥à¤œà¥à¤¯à¤¤à¤¾à¤®à¥",
+  "compose_form.poll.duration": "à¤®à¤¤à¤¦à¤¾à¤¨-à¤¸à¤®à¤¯à¤¾à¤µà¤§à¤¿à¤ƒ",
+  "compose_form.poll.option_placeholder": "à¤®à¤¤à¤®à¥ {number}",
+  "compose_form.poll.remove_option": "à¤®à¤¤à¤®à¥‡à¤¤à¤¨à¥à¤¨à¤¶à¥à¤¯à¤¤à¤¾à¤®à¥",
+  "compose_form.poll.switch_to_multiple": "à¤®à¤¤à¤¦à¤¾à¤¨à¤‚ à¤ªà¤°à¤¿à¤µà¤°à¥à¤¤à¤¯à¤¿à¤¤à¥à¤µà¤¾ à¤¬à¤¹à¥à¤µà¥ˆà¤•à¤²à¥à¤ªà¤¿à¤•à¤®à¤¤à¤¦à¤¾à¤¨à¤‚ à¤•à¥à¤°à¤¿à¤¯à¤¤à¤¾à¤®à¥",
+  "compose_form.poll.switch_to_single": "à¤®à¤¤à¤¦à¤¾à¤¨à¤‚ à¤ªà¤°à¤¿à¤µà¤°à¥à¤¤à¤¯à¤¿à¤¤à¥à¤µà¤¾ à¤¨à¤¿à¤°à¥à¤µà¤¿à¤•à¤²à¥à¤ªà¤®à¤¤à¤¦à¤¾à¤¨à¤‚ à¤•à¥à¤°à¤¿à¤¯à¤¤à¤¾à¤®à¥",
+  "compose_form.publish": "à¤¦à¥Œà¤¤à¥à¤¯à¤®à¥",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.sensitive.hide": "à¤¸à¤‚à¤µà¥‡à¤¦à¤¨à¤¶à¥€à¤²à¤¸à¤¾à¤®à¤—à¥à¤°à¥€à¤¤à¥à¤¯à¤™à¥à¤¯à¤¤à¤¾à¤®à¥",
+  "compose_form.sensitive.marked": "à¤¸à¤‚à¤µà¥‡à¤¦à¤¨à¤¶à¥€à¤²à¤¸à¤¾à¤®à¤—à¥à¤°à¥€à¤¤à¥à¤¯à¤™à¥à¤•à¤¿à¤¤à¤®à¥",
+  "compose_form.sensitive.unmarked": "à¤¸à¤‚à¤µà¥‡à¤¦à¤¨à¤¶à¥€à¤²à¤¸à¤¾à¤®à¤—à¥à¤°à¥€à¤¤à¤¿ à¤¨à¤¾à¤™à¥à¤•à¤¿à¤¤à¤®à¥",
+  "compose_form.spoiler.marked": "à¤ªà¥à¤°à¤šà¥à¤›à¤¾à¤¨à¥à¤¨à¤¾à¤•à¥à¤·à¤°à¤‚ à¤µà¤¿à¤¦à¥à¤¯à¤¤à¥‡",
+  "compose_form.spoiler.unmarked": "à¤…à¤ªà¥à¤°à¤šà¥à¤›à¤¨à¥à¤¨à¤¾à¤•à¥à¤·à¤°à¤‚ à¤µà¤¿à¤¦à¥à¤¯à¤¤à¥‡",
+  "compose_form.spoiler_placeholder": "à¤ªà¥à¤°à¤¤à¥à¤¯à¤¾à¤¦à¥‡à¤¶à¤¸à¥à¤¤à¥‡ à¤²à¤¿à¤–à¥à¤¯à¤¤à¤¾à¤®à¥",
+  "confirmation_modal.cancel": "à¤¨à¤¶à¥à¤¯à¤¤à¤¾à¤®à¥",
+  "confirmations.block.block_and_report": "à¤…à¤µà¤°à¥à¤§à¥à¤¯ à¤†à¤µà¤¿à¤¦à¥à¤¯à¤¤à¤¾à¤®à¥",
+  "confirmations.block.confirm": "à¤¨à¤¿à¤·à¥‡à¤§à¤ƒ",
+  "confirmations.block.message": "à¤¨à¤¿à¤¶à¥à¤šà¤¯à¥‡à¤¨à¤¾à¤½à¤µà¤°à¥‹à¤§à¥‹ à¤µà¤¿à¤§à¥‡à¤¯à¤ƒ {name}?",
+  "confirmations.delete.confirm": "à¤¨à¤¶à¥à¤¯à¤¤à¤¾à¤®à¥",
+  "confirmations.delete.message": "à¤¨à¤¿à¤¶à¥à¤šà¤¯à¥‡à¤¨ à¤¦à¥Œà¤¤à¥à¤¯à¤®à¤¿à¤¦à¤‚ à¤¨à¤¶à¥à¤¯à¤¤à¤¾à¤®à¥?",
+  "confirmations.delete_list.confirm": "à¤¨à¤¶à¥à¤¯à¤¤à¤¾à¤®à¥",
+  "confirmations.delete_list.message": "à¤¸à¥‚à¤šà¤¿à¤°à¤¿à¤¯à¤‚ à¤¨à¤¿à¤¶à¥à¤šà¤¯à¥‡à¤¨ à¤¸à¥à¤¥à¤¾à¤¯à¤¿à¤¤à¥à¤µà¥‡à¤¨ à¤š à¤¨à¤¶à¥à¤¯à¤¤à¤¾à¤®à¥ à¤µà¤¾?",
+  "confirmations.domain_block.confirm": "à¤¨à¤¿à¤·à¤¿à¤¦à¥à¤§à¤ƒ à¤ªà¥à¤°à¤¦à¥‡à¤¶à¤ƒ à¤•à¥à¤°à¤¿à¤¯à¤¤à¤¾à¤®à¥",
+  "confirmations.domain_block.message": "à¤¨à¥‚à¤¨à¤‚ à¤¨à¤¿à¤¶à¥à¤šà¤¯à¥‡à¤¨à¥ˆà¤µ à¤µà¤¿à¤¨à¤·à¥à¤Ÿà¥à¤®à¤¿à¤šà¥à¤›à¤¤à¤¿ à¤ªà¥‚à¤°à¥à¤£à¤ªà¥à¤°à¤¦à¥‡à¤¶à¤®à¥‡à¤µ {domain} ? à¤…à¤§à¤¿à¤•à¤¾à¤‚à¤¶à¤¸à¤¨à¥à¤¦à¤°à¥à¤à¥‡à¤½à¤¸à¥à¤¥à¤¾à¤¯à¤¿à¤¤à¥à¤µà¥‡à¤¨ à¤¨à¤¿à¤·à¥‡à¤§à¤¤à¤¾ à¤¨à¤¿à¤ƒà¤¶à¤¬à¥à¤¦à¤¤à¥à¤µà¤žà¥à¤š à¤ªà¤°à¥à¤¯à¤¾à¤ªà¥à¤¤à¤‚ à¤šà¤¯à¤¨à¥€à¤¯à¤žà¥à¤š à¥¤ à¤¨ à¤¤à¤¸à¥à¤®à¤¾à¤¤à¥ à¤ªà¥à¤°à¤¦à¥‡à¤¶à¤¾à¤¤à¥à¤¸à¤°à¥à¤µà¥‡ à¤µà¤¿à¤·à¤¯à¤¾ à¤¦à¥à¤°à¤·à¥à¤Ÿà¥à¤®à¤¶à¤•à¥à¤¯à¤¾à¤ƒ à¤•à¤¿à¤¸à¥à¤¯à¤¾à¤‚à¤¶à¥à¤šà¤¿à¤¦à¤ªà¤¿ à¤¸à¤°à¥à¤µà¤œà¤¨à¤¿à¤•à¤¸à¤®à¤¯à¤¤à¤¾à¤²à¤¿à¤•à¤¾à¤¯à¤¾à¤‚ à¤µà¤¾ à¤¸à¥à¤µà¥€à¤¯à¤¸à¥‚à¤šà¤¨à¤¾à¤ªà¤Ÿà¤²à¥‡ à¥¤ à¤¸à¤°à¥à¤µà¥‡à¤½à¤¨à¥à¤¸à¤°à¥à¤¤à¤¾à¤°à¤¸à¥à¤¤à¥‡ à¤ªà¥à¤°à¤¦à¥‡à¤¶à¤¾à¤¤à¥ à¤¯à¥‡ à¤¸à¤¨à¥à¤¤à¤¿ à¤¤à¥‡ à¤¨à¤¶à¥à¤¯à¤¨à¥à¤¤à¥‡ à¥¤",
+  "confirmations.logout.confirm": "à¤¬à¤¹à¤¿à¤°à¥à¤—à¤®à¥à¤¯à¤¤à¤¾à¤®à¥",
+  "confirmations.logout.message": "à¤¨à¤¿à¤¶à¥à¤šà¤¯à¥‡à¤¨à¥ˆà¤µ à¤¬à¤¹à¤¿à¤°à¥à¤—à¤®à¤¨à¤‚ à¤µà¤¾à¤žà¥à¤›à¤¿à¤¤à¤®à¥?",
+  "confirmations.mute.confirm": "à¤¨à¤¿à¤ƒà¤¶à¤¬à¥à¤¦à¤®à¥",
+  "confirmations.mute.explanation": "à¤à¤¤à¥‡à¤¨ à¤¤à¥‡à¤·à¤¾à¤‚ à¤ªà¥à¤°à¤•à¤Ÿà¤¨à¤¾à¤¨à¤¿ à¤¤à¤¥à¤¾ à¤š à¤¯à¤¤à¥à¤° à¤¤à¥‡ à¤‰à¤²à¥à¤²à¤¿à¤–à¤¿à¤¤à¤¾à¤ƒ à¤¤à¤¾à¤¨à¤¿ à¤›à¤¾à¤¦à¥à¤¯à¤¨à¥à¤¤à¥‡, à¤•à¤¿à¤¨à¥à¤¤à¥à¤µà¥‡à¤µà¤‚ à¤¸à¤¤à¥à¤¯à¤ªà¤¿ à¤¤à¥‡ à¤¤à¥à¤µà¤¾à¤®à¤¨à¥à¤¸à¤°à¥à¤¤à¥à¤‚ à¤¤à¤¤à¤¶à¥à¤š à¤ªà¥à¤°à¤•à¤Ÿà¤¨à¤¾à¤¨à¤¿ à¤¦à¥à¤°à¤·à¥à¤Ÿà¥à¤‚ à¤¶à¤•à¥à¤¨à¥à¤µà¤¨à¥à¤¤à¤¿ à¥¤",
+  "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.mark_as_read": "à¤ªà¤ à¤¿à¤¤à¤®à¤¿à¤¤à¥à¤¯à¤™à¥à¤•à¥à¤¯à¤¤à¤¾à¤®à¥",
+  "conversation.open": "à¤µà¤¾à¤°à¥à¤¤à¤¾à¤²à¤¾à¤ªà¥‹ à¤¦à¥ƒà¤¶à¥à¤¯à¤¤à¤¾à¤®à¥",
+  "conversation.with": "{names} à¤œà¤¨à¥ˆà¤ƒ à¤¸à¤¾à¤•à¤®à¥",
+  "directory.federated": "à¤¸à¥à¤ªà¤°à¤¿à¤šà¤¿à¤¤à¤‚ Fediverse à¤‡à¤¤à¤¿ à¤¸à¥à¤¥à¤¾à¤¨à¤¾à¤¤à¥",
+  "directory.local": "{domain} à¤ªà¥à¤°à¤¦à¥‡à¤¶à¤¾à¤¤à¥à¤•à¥‡à¤µà¤²à¤®à¥",
+  "directory.new_arrivals": "à¤¨à¤µà¤¾à¤®à¤—à¤®à¤¾à¤ƒ",
+  "directory.recently_active": "à¤¨à¤¾à¤¤à¤¿à¤ªà¥‚à¤°à¥à¤µà¤‚ à¤¸à¤•à¥à¤°à¤¿à¤¯à¤ƒ",
+  "embed.instructions": "à¤¦à¥Œà¤¤à¥à¤¯à¤®à¥‡à¤¤à¤¤à¥ à¤¸à¥à¤µà¥€à¤¯à¤œà¤¾à¤²à¤¸à¥à¤¥à¤¾à¤¨à¥‡ à¤¸à¥à¤¥à¤¾à¤ªà¤¯à¤¿à¤¤à¥à¤®à¤§à¥‹ à¤²à¤¿à¤–à¤¿à¤¤à¥‹ à¤µà¤¿à¤§à¥à¤¯à¤¾à¤¦à¥‡à¤¶à¥‹ à¤¯à¥à¤œà¥à¤¯à¤¤à¤¾à¤®à¥",
+  "embed.preview": "à¤…à¤¤à¥à¤°à¥ˆà¤µà¤‚ à¤¦à¥ƒà¤¶à¥à¤¯à¤¤à¥‡ à¤¤à¤¤à¥:",
+  "emoji_button.activity": "à¤†à¤šà¤°à¤£à¤®à¥",
+  "emoji_button.custom": "à¤¸à¥à¤µà¥€à¤¯à¤¾à¤¨à¥à¤•à¥‚à¤²à¤®à¥",
+  "emoji_button.flags": "à¤§à¥à¤µà¤œà¤¾à¤ƒ",
+  "emoji_button.food": "à¤à¥‹à¤œà¤¨à¤‚ à¤ªà¥‡à¤¯à¤žà¥à¤š",
+  "emoji_button.label": "à¤à¤¾à¤µà¤šà¤¿à¤¹à¥à¤¨à¤‚ à¤¯à¥à¤œà¥à¤¯à¤¤à¤¾à¤®à¥",
+  "emoji_button.nature": "à¤ªà¥à¤°à¤•à¥ƒà¤¤à¤¿à¤ƒ",
+  "emoji_button.not_found": "à¤¨ à¤à¤¾à¤µà¤šà¤¿à¤¹à¥à¤¨à¤¾à¤¨à¤¿ (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
+  "emoji_button.objects": "à¤µà¤¸à¥à¤¤à¥‚à¤¨à¤¿",
+  "emoji_button.people": "à¤œà¤¨à¤¾à¤ƒ",
+  "emoji_button.recent": "à¤†à¤§à¤¿à¤•à¥à¤¯à¥‡à¤¨ à¤ªà¥à¤°à¤¯à¥à¤•à¥à¤¤à¤®à¥",
+  "emoji_button.search": "à¤…à¤¨à¥à¤µà¤¿à¤·à¥à¤¯à¤¤à¤¾à¤®à¥...",
+  "emoji_button.search_results": "à¤…à¤¨à¥à¤µà¥‡à¤·à¤£à¤ªà¤°à¤¿à¤£à¤¾à¤®à¤¾à¤ƒ",
+  "emoji_button.symbols": "à¤šà¤¿à¤¹à¥à¤¨à¤¾à¤¨à¤¿",
+  "emoji_button.travel": "à¤¯à¤¾à¤¤à¥à¤°à¤¾ à¤š à¤¸à¥à¤¥à¤¾à¤¨à¤¾à¤¨à¤¿",
+  "empty_column.account_suspended": "Account suspended",
+  "empty_column.account_timeline": "à¤¨ à¤¦à¥Œà¤¤à¥à¤¯à¤¾à¤¨à¥à¤¯à¤¤à¥à¤°",
+  "empty_column.account_unavailable": "à¤µà¥à¤¯à¤•à¥à¤¤à¤¿à¤¤à¥à¤µà¤‚ à¤¨ à¤ªà¥à¤°à¤¾à¤ªà¥à¤¯à¤¤à¥‡",
+  "empty_column.blocks": "à¤¨à¥ˆà¤•à¥‹à¤½à¤ªà¥à¤¯à¥à¤ªà¤à¥‹à¤•à¥à¤¤à¤¾ à¤¨à¤¿à¤·à¤¿à¤¦à¥à¤§à¥‹ à¤µà¤°à¥à¤¤à¤¤à¥‡",
+  "empty_column.bookmarked_statuses": "à¤¨à¥ˆà¤•à¤®à¤ªà¤¿ à¤ªà¥à¤Ÿà¤šà¤¿à¤¹à¥à¤¨à¤¯à¥à¤•à¥à¤¤à¤¦à¥Œà¤¤à¥à¤¯à¤¾à¤¨à¤¿ à¤¸à¤¨à¥à¤¤à¤¿ à¥¤ à¤¯à¤¦à¤¾ à¤à¤µà¤¿à¤·à¥à¤¯à¤¤à¤¿ à¤¤à¤¦à¤¤à¥à¤° à¤¦à¥ƒà¤¶à¥à¤¯à¤¤à¥‡ à¥¤",
+  "empty_column.community": "à¤¸à¥à¤¥à¤¾à¤¨à¥€à¤¯à¤¸à¤®à¤¯à¤¤à¤¾à¤²à¤¿à¤•à¤¾ à¤°à¤¿à¤•à¥à¤¤à¤¾ à¥¤ à¤¸à¤¾à¤°à¥à¤µà¤œà¤¨à¤¿à¤•à¤¤à¥à¤µà¥‡à¤¨à¤¾à¤½à¤¤à¥à¤° à¤•à¤¿à¤®à¤ªà¤¿ à¤²à¤¿à¤–à¥à¤¯à¤¤à¤¾à¤®à¥ à¥¤",
+  "empty_column.direct": "à¤¨à¥ˆà¤•à¥‹à¤½à¤ªà¤¿ à¤ªà¥à¤°à¤¤à¥à¤¯à¤•à¥à¤·à¤¸à¤¨à¥à¤¦à¥‡à¤¶à¥‹ à¤µà¤°à¥à¤¤à¤¤à¥‡ à¥¤ à¤¯à¤¦à¤¾ à¤ªà¥à¤°à¥‡à¤·à¥à¤¯à¤¤à¥‡ à¤µà¤¾ à¤ªà¥à¤°à¤¾à¤ªà¥à¤¯à¤¤à¥‡à¤½à¤¤à¥à¤° à¤¦à¥ƒà¤¶à¥à¤¯à¤¤à¥‡",
+  "empty_column.domain_blocks": "à¤¨ à¤¨à¤¿à¤·à¤¿à¤¦à¥à¤§à¤ªà¥à¤°à¤¦à¥‡à¤¶à¤¾à¤ƒ à¤¸à¤¨à¥à¤¤à¤¿ à¥¤",
+  "empty_column.favourited_statuses": "à¤¨ à¤ªà¥à¤°à¤¿à¤¯à¤¦à¥Œà¤¤à¥à¤¯à¤¾à¤¨à¤¿ à¤¸à¤¨à¥à¤¤à¤¿ à¥¤ à¤¯à¤¦à¤¾ à¤ªà¥à¤°à¥€à¤¤à¤¿à¤°à¤¿à¤¤à¥à¤¯à¤™à¥à¤•à¥à¤¯à¤¤à¥‡à¤½à¤¤à¥à¤° à¤¦à¥ƒà¤¶à¥à¤¯à¤¤à¥‡ à¥¤",
+  "empty_column.favourites": "à¤¨à¥ˆà¤¤à¤¦à¥à¤¦à¥Œà¤¤à¥à¤¯à¤‚ à¤ªà¥à¤°à¤¿à¤¯à¤®à¤¸à¥à¤¤à¤¿ à¤•à¤¸à¥à¤®à¥ˆ à¤…à¤ªà¤¿ à¥¤ à¤¯à¤¦à¤¾ à¤•à¤¸à¥à¤®à¥ˆ à¤ªà¥à¤°à¤¿à¤¯à¤‚ à¤à¤µà¤¤à¤¿ à¤¤à¤¦à¤¾à¤½à¤¤à¥à¤° à¤¦à¥ƒà¤¶à¥à¤¯à¤¤à¥‡ à¥¤",
+  "empty_column.follow_requests": "à¤¨à¤¾à¤½à¤¨à¥à¤¸à¤°à¤£à¤¾à¤¨à¥à¤°à¥‹à¤§à¤¸à¥à¤¤à¥‡ à¤µà¤°à¥à¤¤à¤¤à¥‡ à¥¤ à¤¯à¤¦à¥ˆà¤•à¥‹ à¤ªà¥à¤°à¤¾à¤ªà¥à¤¯à¤¤à¥‡à¤½à¤¤à¥à¤° à¤¦à¥ƒà¤¶à¥à¤¯à¤¤à¥‡ à¥¤",
+  "empty_column.hashtag": "à¤¨à¤¾à¤½à¤¸à¥à¤®à¤¿à¤¨à¥ à¤ªà¥à¤°à¤šà¤²à¤¿à¤¤à¤µà¤¸à¥à¤¤à¥à¤šà¤¿à¤¹à¥à¤¨à¥‡ à¤•à¤¿à¤®à¤ªà¤¿ à¥¤",
+  "empty_column.home": "à¤—à¥ƒà¤¹à¤¸à¤®à¤¯à¤¤à¤¾à¤²à¤¿à¤•à¤¾ à¤°à¤¿à¤•à¥à¤¤à¤¾à¤½à¤¸à¥à¤¤à¤¿ à¥¤ à¤—à¤®à¥à¤¯à¤¤à¤¾à¤‚ {public} à¤µà¤¾à¤½à¤¨à¥à¤µà¥‡à¤·à¤£à¥ˆà¤ƒ à¤ªà¥à¤°à¤¾à¤°à¤à¥à¤¯à¤¤à¤¾à¤‚ à¤®à¥‡à¤²à¤¨à¤‚ à¤•à¥à¤°à¤¿à¤¯à¤¤à¤¾à¤žà¥à¤š à¥¤",
+  "empty_column.home.public_timeline": "à¤¸à¤¾à¤°à¥à¤µà¤œà¤¨à¤¿à¤•à¤¸à¤®à¤¯à¤¤à¤¾à¤²à¤¿à¤•à¤¾",
+  "empty_column.list": "à¤¨ à¤•à¤¿à¤®à¤ªà¤¿ à¤µà¤°à¥à¤¤à¤¤à¥‡ à¤¸à¥‚à¤šà¥à¤¯à¤¾à¤®à¤¸à¥à¤¯à¤¾à¤®à¥ à¥¤ à¤¯à¤¦à¤¾ à¤¸à¥‚à¤šà¥à¤¯à¤¾à¤ƒ à¤¸à¤¦à¤¸à¥à¤¯à¤¾ à¤¨à¤µà¤¦à¥Œà¤¤à¥à¤¯à¤¾à¤¨à¤¿ à¤ªà¥à¤°à¤•à¤Ÿà¥€à¤•à¥à¤°à¥à¤µà¤¨à¥à¤¤à¤¿ à¤¤à¤¦à¤¾à¤½à¤¤à¥à¤°à¤¾à¤½à¤½à¤¯à¤¾à¤¨à¥à¤¤à¤¿ à¥¤",
+  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
+  "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
+  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
+  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
+  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
+  "errors.unexpected_crash.report_issue": "Report issue",
+  "follow_request.authorize": "Authorize",
+  "follow_request.reject": "Reject",
+  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "generic.saved": "Saved",
+  "getting_started.developers": "Developers",
+  "getting_started.directory": "Profile directory",
+  "getting_started.documentation": "Documentation",
+  "getting_started.heading": "Getting started",
+  "getting_started.invite": "Invite people",
+  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
+  "getting_started.security": "Security",
+  "getting_started.terms": "Terms of service",
+  "hashtag.column_header.tag_mode.all": "and {additional}",
+  "hashtag.column_header.tag_mode.any": "or {additional}",
+  "hashtag.column_header.tag_mode.none": "without {additional}",
+  "hashtag.column_settings.select.no_options_message": "No suggestions found",
+  "hashtag.column_settings.select.placeholder": "Enter hashtagsâ€¦",
+  "hashtag.column_settings.tag_mode.all": "All of these",
+  "hashtag.column_settings.tag_mode.any": "Any of these",
+  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "home.column_settings.basic": "Basic",
+  "home.column_settings.show_reblogs": "Show boosts",
+  "home.column_settings.show_replies": "Show replies",
+  "home.hide_announcements": "Hide announcements",
+  "home.show_announcements": "Show announcements",
+  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
+  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
+  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish toot-orial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is specialâ€”it hosts your profile, so remember its name.",
+  "keyboard_shortcuts.back": "to navigate back",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
+  "keyboard_shortcuts.boost": "to boost",
+  "keyboard_shortcuts.column": "to focus a status in one of the columns",
+  "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.down": "to move down in the list",
+  "keyboard_shortcuts.enter": "to open status",
+  "keyboard_shortcuts.favourite": "to favourite",
+  "keyboard_shortcuts.favourites": "to open favourites list",
+  "keyboard_shortcuts.federated": "to open federated timeline",
+  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.hotkey": "Hotkey",
+  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.local": "to open local timeline",
+  "keyboard_shortcuts.mention": "to mention author",
+  "keyboard_shortcuts.muted": "to open muted users list",
+  "keyboard_shortcuts.my_profile": "to open your profile",
+  "keyboard_shortcuts.notifications": "to open notifications column",
+  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.pinned": "to open pinned toots list",
+  "keyboard_shortcuts.profile": "to open author's profile",
+  "keyboard_shortcuts.reply": "to reply",
+  "keyboard_shortcuts.requests": "to open follow requests list",
+  "keyboard_shortcuts.search": "to focus search",
+  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
+  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
+  "keyboard_shortcuts.toot": "to start a brand new toot",
+  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.up": "to move up in the list",
+  "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
+  "lightbox.next": "Next",
+  "lightbox.previous": "Previous",
+  "lists.account.add": "Add to list",
+  "lists.account.remove": "Remove from list",
+  "lists.delete": "Delete list",
+  "lists.edit": "Edit list",
+  "lists.edit.submit": "Change title",
+  "lists.new.create": "Add list",
+  "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
+  "lists.search": "Search among people you follow",
+  "lists.subheading": "Your lists",
+  "load_pending": "{count, plural, one {# new item} other {# new items}}",
+  "loading_indicator.label": "Loading...",
+  "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
+  "missing_indicator.label": "Not found",
+  "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
+  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
+  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.bookmarks": "Bookmarks",
+  "navigation_bar.community_timeline": "Local timeline",
+  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
+  "navigation_bar.discover": "Discover",
+  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.favourites": "Favourites",
+  "navigation_bar.filters": "Muted words",
+  "navigation_bar.follow_requests": "Follow requests",
+  "navigation_bar.follows_and_followers": "Follows and followers",
+  "navigation_bar.info": "About this server",
+  "navigation_bar.keyboard_shortcuts": "Hotkeys",
+  "navigation_bar.lists": "Lists",
+  "navigation_bar.logout": "Logout",
+  "navigation_bar.mutes": "Muted users",
+  "navigation_bar.personal": "Personal",
+  "navigation_bar.pins": "Pinned toots",
+  "navigation_bar.preferences": "Preferences",
+  "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.security": "Security",
+  "notification.favourite": "{name} favourited your status",
+  "notification.follow": "{name} followed you",
+  "notification.follow_request": "{name} has requested to follow you",
+  "notification.mention": "{name} mentioned you",
+  "notification.own_poll": "Your poll has ended",
+  "notification.poll": "A poll you have voted in has ended",
+  "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
+  "notifications.clear": "Clear notifications",
+  "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.alert": "Desktop notifications",
+  "notifications.column_settings.favourite": "Favourites:",
+  "notifications.column_settings.filter_bar.advanced": "Display all categories",
+  "notifications.column_settings.filter_bar.category": "Quick filter bar",
+  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.follow": "New followers:",
+  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.mention": "Mentions:",
+  "notifications.column_settings.poll": "Poll results:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.reblog": "Boosts:",
+  "notifications.column_settings.show": "Show in column",
+  "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New toots:",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
+  "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
+  "poll.closed": "Closed",
+  "poll.refresh": "Refresh",
+  "poll.total_people": "{count, plural, one {# person} other {# people}}",
+  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+  "poll.vote": "Vote",
+  "poll.voted": "You voted for this answer",
+  "poll_button.add_poll": "Add a poll",
+  "poll_button.remove_poll": "Remove poll",
+  "privacy.change": "Adjust status privacy",
+  "privacy.direct.long": "Visible for mentioned users only",
+  "privacy.direct.short": "Direct",
+  "privacy.private.long": "Visible for followers only",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all, shown in public timelines",
+  "privacy.public.short": "Public",
+  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "privacy.unlisted.short": "Unlisted",
+  "refresh": "Refresh",
+  "regeneration_indicator.label": "Loadingâ€¦",
+  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "relative_time.days": "{number}d",
+  "relative_time.hours": "{number}h",
+  "relative_time.just_now": "now",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
+  "relative_time.today": "today",
+  "reply_indicator.cancel": "Cancel",
+  "report.forward": "Forward to {target}",
+  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.placeholder": "Additional comments",
+  "report.submit": "Submit",
+  "report.target": "Report {target}",
+  "search.placeholder": "Search",
+  "search_popout.search_format": "Advanced search format",
+  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+  "search_popout.tips.hashtag": "hashtag",
+  "search_popout.tips.status": "status",
+  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
+  "search_popout.tips.user": "user",
+  "search_results.accounts": "People",
+  "search_results.hashtags": "Hashtags",
+  "search_results.statuses": "Toots",
+  "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
+  "status.cancel_reblog_private": "Unboost",
+  "status.cannot_reblog": "This post cannot be boosted",
+  "status.copy": "Copy link to status",
+  "status.delete": "Delete",
+  "status.detailed_status": "Detailed conversation view",
+  "status.direct": "Direct message @{name}",
+  "status.embed": "Embed",
+  "status.favourite": "Favourite",
+  "status.filtered": "Filtered",
+  "status.load_more": "Load more",
+  "status.media_hidden": "Media hidden",
+  "status.mention": "Mention @{name}",
+  "status.more": "More",
+  "status.mute": "Mute @{name}",
+  "status.mute_conversation": "Mute conversation",
+  "status.open": "Expand this status",
+  "status.pin": "Pin on profile",
+  "status.pinned": "Pinned toot",
+  "status.read_more": "Read more",
+  "status.reblog": "Boost",
+  "status.reblog_private": "Boost with original visibility",
+  "status.reblogged_by": "{name} boosted",
+  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
+  "status.redraft": "Delete & re-draft",
+  "status.remove_bookmark": "Remove bookmark",
+  "status.reply": "Reply",
+  "status.replyAll": "Reply to thread",
+  "status.report": "Report @{name}",
+  "status.sensitive_warning": "Sensitive content",
+  "status.share": "Share",
+  "status.show_less": "Show less",
+  "status.show_less_all": "Show less for all",
+  "status.show_more": "Show more",
+  "status.show_more_all": "Show more for all",
+  "status.show_thread": "Show thread",
+  "status.uncached_media_warning": "Not available",
+  "status.unmute_conversation": "Unmute conversation",
+  "status.unpin": "Unpin from profile",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested inâ€¦",
+  "tabs_bar.federated_timeline": "Federated",
+  "tabs_bar.home": "Home",
+  "tabs_bar.local_timeline": "Local",
+  "tabs_bar.notifications": "Notifications",
+  "tabs_bar.search": "Search",
+  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
+  "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
+  "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
+  "time_remaining.moments": "Moments remaining",
+  "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
+  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
+  "timeline_hint.resources.followers": "Followers",
+  "timeline_hint.resources.follows": "Follows",
+  "timeline_hint.resources.statuses": "Older toots",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.trending_now": "Trending now",
+  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+  "units.short.billion": "{count}B",
+  "units.short.million": "{count}M",
+  "units.short.thousand": "{count}K",
+  "upload_area.title": "Drag & drop to upload",
+  "upload_button.label": "Add images, a video or an audio file",
+  "upload_error.limit": "File upload limit exceeded.",
+  "upload_error.poll": "File upload not allowed with polls.",
+  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_form.description": "Describe for the visually impaired",
+  "upload_form.edit": "Edit",
+  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.undo": "Delete",
+  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_modal.analyzing_picture": "Analyzing pictureâ€¦",
+  "upload_modal.apply": "Apply",
+  "upload_modal.choose_image": "Choose image",
+  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
+  "upload_modal.detect_text": "Detect text from picture",
+  "upload_modal.edit_media": "Edit media",
+  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
+  "upload_modal.preview_label": "Preview ({ratio})",
+  "upload_progress.label": "Uploadingâ€¦",
+  "video.close": "Close video",
+  "video.download": "Download file",
+  "video.exit_fullscreen": "Exit full screen",
+  "video.expand": "Expand video",
+  "video.fullscreen": "Full screen",
+  "video.hide": "Hide video",
+  "video.mute": "Mute sound",
+  "video.pause": "Pause",
+  "video.play": "Play",
+  "video.unmute": "Unmute sound"
+}
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 30a3e33745b1fff6f40a50827ef7c86932534cc7..e1b4e39987d7bdd79f2d2f51f2365a227105399e 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -1,53 +1,55 @@
 {
-  "account.account_note_header": "Note",
+  "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Agiunghe o boga dae is listas",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupu",
   "account.block": "Bloca @{name}",
-  "account.block_domain": "Bloca domÃ¬niu{domain}",
+  "account.block_domain": "Bloca su domÃ¬niu {domain}",
   "account.blocked": "Blocadu",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Esplora de prus in su profilu originale",
   "account.cancel_follow_request": "Annulla rechesta de sighidura",
   "account.direct": "MessÃ giu deretu a @{name}",
+  "account.disable_notifications": "Non mi notÃ¬fiches prus cando @{name} pÃ¹blichet messÃ gios",
   "account.domain_blocked": "DomÃ¬niu blocadu",
   "account.edit_profile": "ModÃ¬fica profilu",
+  "account.enable_notifications": "NotÃ¬ficaÂ·mi cando @{name} pÃ¹blicat messÃ gios",
   "account.endorse": "CussÃ¬gia in su profilu tuo",
   "account.follow": "Sighi",
   "account.followers": "Sighiduras",
   "account.followers.empty": "Nemos sighit ancora custa persone.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers_counter": "{count, plural, one {{counter} sighidura} other {{counter} sighiduras}}",
+  "account.following_counter": "{count, plural, one {Sighende a {counter}} other {Sighende a {counter}}}",
   "account.follows.empty": "Custa persone non sighit ancora a nemos.",
   "account.follows_you": "Ti sighit",
   "account.hide_reblogs": "Cua is cumpartziduras de @{name}",
   "account.last_status": "Ã™rtima atividade",
-  "account.link_verified_on": "Sa propiedade de custu ligÃ mene est istada controllada su {date}",
-  "account.locked_info": "Sa persone chi tenet sa propiedade revisionat a manu chie dda podet sighire.",
+  "account.link_verified_on": "Sa propiedade de custu ligÃ²ngiu est istada controllada su {date}",
+  "account.locked_info": "S'istadu de riservadesa de custu contu est istadu cunfiguradu comente blocadu. Sa persone chi tenet sa propiedade revisionat a manu chie dda podet sighire.",
   "account.media": "Cuntenutu multimediale",
-  "account.mention": "Mentova @{name}",
-  "account.moved_to": "{name} est istadu trasferidu a:",
-  "account.mute": "Pone @name a sa muda",
-  "account.mute_notifications": "NotÃ¬ficas disativadas dae @{name}",
+  "account.mention": "Mentova a @{name}",
+  "account.moved_to": "{name} at cambiadu a:",
+  "account.mute": "Pone a @{name} a sa muda",
+  "account.mute_notifications": "Disativa is notÃ¬ficas de @{name}",
   "account.muted": "A sa muda",
   "account.never_active": "Mai",
   "account.posts": "Tuts",
   "account.posts_with_replies": "Tuts e rispostas",
   "account.report": "Signala @{name}",
-  "account.requested": "Incarca pro annullare sa rechesta de sighidura",
+  "account.requested": "Abetende s'aprovatzione. Incarca pro annullare sa rechesta de sighidura",
   "account.share": "Cumpartzi su profilu de @{name}",
   "account.show_reblogs": "Ammustra is cumpartziduras de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
-  "account.unblock": "Isbloca @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} tut} other {{counter} tuts}}",
+  "account.unblock": "Isbloca a @{name}",
   "account.unblock_domain": "Isbloca su domÃ¬niu {domain}",
   "account.unendorse": "Non cussiges in su profilu",
   "account.unfollow": "Non sigas prus",
   "account.unmute": "Torra a ativare @{name}",
   "account.unmute_notifications": "Ativa notÃ¬ficas pro @{name}",
-  "account_note.placeholder": "Click to add a note",
+  "account_note.placeholder": "Incarca pro agiÃ¹nghere una nota",
   "alert.rate_limited.message": "TorraÂ·bi a proare a pustis de {retry_time, time, medium}.",
   "alert.rate_limited.title": "MÃ ssimu de rechestas barigadu",
   "alert.unexpected.message": "B'at Ã pidu una faddina.",
-  "alert.unexpected.title": "Oops!",
+  "alert.unexpected.title": "Oh!",
   "announcement.announcement": "AnnÃ¹ntziu",
   "autosuggest_hashtag.per_week": "{count} a sa chida",
   "boost_modal.combo": "Podes incarcare {combo} pro brincare custu sa borta chi benit",
@@ -58,7 +60,7 @@
   "bundle_modal_error.message": "Faddina in su carrigamentu de custu cumponente.",
   "bundle_modal_error.retry": "TorraÂ·bi a proare",
   "column.blocks": "Persones blocadas",
-  "column.bookmarks": "Marcadores",
+  "column.bookmarks": "Sinnalibros",
   "column.community": "LÃ¬nia de tempus locale",
   "column.direct": "MessÃ gios diretos",
   "column.directory": "NÃ viga in is profilos",
@@ -71,7 +73,7 @@
   "column.notifications": "NotÃ¬ficas",
   "column.pins": "Tuts apicados",
   "column.public": "LÃ¬nia de tempus federada",
-  "column_back_button.label": "In segus",
+  "column_back_button.label": "A coa",
   "column_header.hide_settings": "Cua is cunfiguratziones",
   "column_header.moveLeft_settings": "Moe sa colunna a manca",
   "column_header.moveRight_settings": "Moe sa colunna a dereta",
@@ -79,13 +81,13 @@
   "column_header.show_settings": "Ammustra is cunfiguratziones",
   "column_header.unpin": "Boga dae pitzu",
   "column_subheading.settings": "Cunfiguratziones",
-  "community.column_settings.local_only": "Local only",
-  "community.column_settings.media_only": "Multimediale isceti",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.local_only": "Isceti locale",
+  "community.column_settings.media_only": "Isceti multimediale",
+  "community.column_settings.remote_only": "Isceti remotu",
   "compose_form.direct_message_warning": "Custu tut at a Ã¨ssere imbiadu isceti a is persones mentovadas.",
   "compose_form.direct_message_warning_learn_more": "Ã€teras informatziones",
-  "compose_form.hashtag_warning": "Custu tut no at a Ã¨ssere ammustradu in peruna eticheta, dae chi no est listadu.",
-  "compose_form.lock_disclaimer": "Cale si siat persone ti podet sighire pro bÃ¬dere is messÃ gios tuos chi imbies a is chi ti sighint.",
+  "compose_form.hashtag_warning": "Custu tut no at a Ã¨ssere ammustradu in peruna eticheta, dae chi no est listadu. Isceti is tuts pÃ¹blicos podent Ã¨ssere chircados cun etichetas.",
+  "compose_form.lock_disclaimer": "Su contu tuo no est {locked}. Cale si siat persone ti podet sighire pro bÃ¬dere is messÃ gios tuos chi imbies a sa gente chi ti sighit.",
   "compose_form.lock_disclaimer.lock": "blocadu",
   "compose_form.placeholder": "A ite ses pensende?",
   "compose_form.poll.add_option": "Agiunghe unu sÃ¨beru",
@@ -96,10 +98,10 @@
   "compose_form.poll.switch_to_single": "Muda su sondÃ giu pro permÃ¬tere un'optzione isceti",
   "compose_form.publish": "Tut",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Marca mÃ¨dia comente a sensÃ¬bile",
-  "compose_form.sensitive.marked": "MÃ¨dia marcadu comente a sensÃ¬bile",
-  "compose_form.sensitive.unmarked": "MÃ¨dia non marcadu comente a sensÃ¬bile",
-  "compose_form.spoiler.marked": "Su testu est cuadu dae s'avisu",
+  "compose_form.sensitive.hide": "{count, plural, one {Marca elementu multimediale comente a sensÃ¬bile} other {Marca elementos multimediales comente sensÃ¬biles}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Elementu multimediale marcadu comente a sensÃ¬bile} other {Elementos multimediales marcados comente a sensÃ¬biles}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Elementu multimediale non marcadu comente a sensÃ¬bile} other {Elementos multimediales non marcados comente a sensÃ¬biles}}",
+  "compose_form.spoiler.marked": "Su testu est cuadu in fatu de s'avisu",
   "compose_form.spoiler.unmarked": "Su testu no est cuadu",
   "compose_form.spoiler_placeholder": "Iscrie s'avisu tuo inoghe",
   "confirmation_modal.cancel": "Annulla",
@@ -110,24 +112,24 @@
   "confirmations.delete.message": "Seguru chi boles cantzellare custu tut?",
   "confirmations.delete_list.confirm": "Cantzella",
   "confirmations.delete_list.message": "Seguru chi boles cantzellare custa lista in manera permanente?",
-  "confirmations.domain_block.confirm": "Cua totu su domÃ¬niu",
-  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
+  "confirmations.domain_block.confirm": "Bloca totu su domÃ¬niu",
+  "confirmations.domain_block.message": "Boles de seguru, ma a beru a beru, blocare su {domain} intreu? In sa parte manna de is casos pagos blocos o silentziamentos de persones sunt sufitzientes e preferÃ¬biles. No as a bÃ¬dere cuntenutos dae custu domÃ¬niu in peruna lÃ¬nia de tempus pÃ¹blica o in is notÃ¬ficas tuas. Sa gente chi ti sighit dae cussu domÃ¬niu at a Ã¨ssere bogada.",
   "confirmations.logout.confirm": "EssiÂ·nche",
   "confirmations.logout.message": "Seguru chi boles essire?",
   "confirmations.mute.confirm": "A sa muda",
   "confirmations.mute.explanation": "Custu at a cuare is publicatziones issoro e is messÃ gios chi ddos mentovant, ma ant a pÃ²dere bÃ¬dere is messÃ gios tuos e t'ant a pÃ²dere sighire.",
-  "confirmations.mute.message": "Seguru chi boles pÃ²nnere {name} a sa muda?",
+  "confirmations.mute.message": "Seguru chi boles pÃ²nnere a {name} a sa muda?",
   "confirmations.redraft.confirm": "Cantzella e torra a fÃ ghere",
-  "confirmations.redraft.message": "As a pÃ¨rdere is preferidos e is cumpartziduras, e is rispostas a su messÃ giu originale ant a abarrare Ã²rfanas.",
+  "confirmations.redraft.message": "Seguru chi boles cantzellare a torrare a fÃ ghere custu tut? As a pÃ¨rdere is preferidos e is cumpartziduras, e is rispostas a su messÃ giu originale ant a abarrare Ã²rfanas.",
   "confirmations.reply.confirm": "Risponde",
   "confirmations.reply.message": "Rispondende immoe as a subraiscrÃ¬ere su messÃ giu chi ses iscriende. Seguru chi boles sighire?",
   "confirmations.unfollow.confirm": "Non sigas prus",
-  "confirmations.unfollow.message": "Seguru chi non boles sighire prus {name}?",
+  "confirmations.unfollow.message": "Seguru chi non boles sighire prus a {name}?",
   "conversation.delete": "Cantzella arresonada",
   "conversation.mark_as_read": "Signala comente lÃ¨ghidu",
-  "conversation.open": "Bide arresonada",
+  "conversation.open": "Ammsutra arresonada",
   "conversation.with": "Cun {names}",
-  "directory.federated": "Dae unu fediversu connÃ²schidu",
+  "directory.federated": "Dae unu fediversu connotu",
   "directory.local": "Isceti dae {domain}",
   "directory.new_arrivals": "Arribos noos",
   "directory.recently_active": "Ativos dae pagu",
@@ -147,14 +149,15 @@
   "emoji_button.search_results": "Resurtados de sa chirca",
   "emoji_button.symbols": "SÃ¬mbulos",
   "emoji_button.travel": "BiÃ gios e logos",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Perunu tut inoghe!",
   "empty_column.account_unavailable": "Su profilu no est a disponimentu",
-  "empty_column.blocks": "No as isblocadu ancora nemos.",
+  "empty_column.blocks": "No as blocadu ancora nemos.",
   "empty_column.bookmarked_statuses": "Non tenes ancora perunu tut in is marcadores. Cando nd'as a agiÃ¹nghere unu, at a Ã¨ssere ammustradu inoghe.",
   "empty_column.community": "Sa lÃ¬nia de tempus locale est bÃ²ida. Iscrie inoghe pro cumintzare sa festa!",
   "empty_column.direct": "Non tenes ancora perunu messÃ giu deretu. Cando nd'as a imbiare o nd'as a retzire unu, at a Ã¨ssere ammustradu inoghe.",
   "empty_column.domain_blocks": "Non tenes ancora perunu domÃ¬niu blocadu.",
-  "empty_column.favourited_statuses": "Non tenes ancora perunu tut in is marcadores. Cando nd'as a agiÃ¹nghere unu, at a Ã¨ssere ammustradu inoghe.",
+  "empty_column.favourited_statuses": "Non tenes ancora perunu tut in is preferidos. Cando nd'as a agiÃ¹nghere unu, at a Ã¨ssere ammustradu inoghe.",
   "empty_column.favourites": "Nemos at marcadu ancora custu tut comente preferidu. Cando calicunu dd'at a fÃ ghere, at a Ã¨ssere ammustradu inoghe.",
   "empty_column.follow_requests": "Non tenes ancora peruna rechesta de sighidura. Cando nd'as a retzire una, at a Ã¨ssere ammustrada inoghe.",
   "empty_column.hashtag": "Ancora nudda in custa eticheta.",
@@ -166,13 +169,15 @@
   "empty_column.notifications": "Non tenes ancora peruna notÃ¬fica. Chistiona cun una persone pro cumintzare un'arresonada.",
   "empty_column.public": "Nudda inoghe. Iscrie calicuna cosa pÃ¹blica, o sighi Ã teras persones de Ã teros serbidores pro prenare custu ispÃ tziu",
   "error.unexpected_crash.explanation": "A cÃ usa de una faddina in su cÃ²dighe nostru o unu problema de cumpatibilidade de su navigadore, custa pÃ gina diat pÃ²dere no Ã¨ssere ammustrada in manera curreta.",
-  "error.unexpected_crash.next_steps": "Proa de atualizare sa pÃ gina. Si custu non acontza su problema, podes chircare de impreare Mastodon in unu navigadore diferente o in un'aplicatzione nativa.",
+  "error.unexpected_crash.explanation_addons": "Custa pÃ gina diat pÃ²dere no Ã¨ssere ammustrada comente si tocat. Custa faddina est probÃ bile chi dipendat dae un'estensione de su navigadore o dae ainas automÃ ticas de tradutzione.",
+  "error.unexpected_crash.next_steps": "Proa de torrare a carrigare sa pÃ gina. Si custu no acontza su problema, podes chircare de impreare Mastodon in unu navigadore diferente o in un'aplicatzione nativa.",
+  "error.unexpected_crash.next_steps_addons": "Proa a ddos disabilitare e torra a carrigare sa pÃ gina. Si custu no acontzat su problema, podes chircare de impreare Mastodon in unu navigadore diferente o in un'aplicatzione nativa.",
   "errors.unexpected_crash.copy_stacktrace": "CÃ²pia stacktrace in punta de billete",
   "errors.unexpected_crash.report_issue": "Signala unu problema",
   "follow_request.authorize": "Autoriza",
   "follow_request.reject": "Refuda",
   "follow_requests.unlocked_explanation": "Fintzas si su contu tuo no est blocadu, su personale de {domain} at pensadu chi forsis bolias revisionare a manu is rechestas de custos contos.",
-  "generic.saved": "Saved",
+  "generic.saved": "Sarvadu",
   "getting_started.developers": "Iscuadra de isvilupu",
   "getting_started.directory": "DiretÃ²riu de profilos",
   "getting_started.documentation": "Documentatzione",
@@ -195,14 +200,14 @@
   "home.column_settings.show_replies": "Ammustra rispostas",
   "home.hide_announcements": "Cua annÃ¹ntzios",
   "home.show_announcements": "Ammustra annÃ¹ntzios",
-  "intervals.full.days": "{number, plural, one {# die} other {# die}}",
+  "intervals.full.days": "{number, plural, one {# die} other {# dies}}",
   "intervals.full.hours": "{number, plural, one {# ora} other {# oras}}",
   "intervals.full.minutes": "{number, plural, one {# minutu} other {# minutos}}",
   "introduction.federation.action": "Sighi",
   "introduction.federation.federated.headline": "Federada",
   "introduction.federation.federated.text": "Is publicatziones pÃ¹blicas de Ã teros serbidores de su fediversu ant a aparÃ¨ssere in sa lÃ¬nia de tempus federada.",
   "introduction.federation.home.headline": "Printzipale",
-  "introduction.federation.home.text": "Is messÃ gios de gente chi sighis ant a aparÃ¨ssere in lÃ¬nia de tempus printzipale tua. Podes sighire gente de cale si siat serbidore.",
+  "introduction.federation.home.text": "Is messÃ gios de sa gente chi sighis ant a aparÃ¨ssere in sa lÃ¬nia de tempus printzipale tua. Podes sighire gente de cale si siat serbidore!",
   "introduction.federation.local.headline": "Locale",
   "introduction.federation.local.text": "Is publicatziones pÃ¹blicas de sa gente de su prÃ²piu serbidore tuo ant a aparÃ¨ssere in sa lÃ¬nia de tempus locale.",
   "introduction.interactions.action": "Acabba su tutoriale!",
@@ -214,16 +219,16 @@
   "introduction.interactions.reply.text": "Podes rispÃ²ndere a is tuts de Ã tera gente e a is tuos prÃ²pios, e ant a Ã¨ssere unidos in un'arresonada.",
   "introduction.welcome.action": "AjÃ², andamus!",
   "introduction.welcome.headline": "Primos passos",
-  "introduction.welcome.text": "Ti donamus sa benebÃ¨nnida a su fediversu. Dae immoe a pagu, as a pÃ²dere publicare messÃ gios e chistionare cun is amistades tuas in meda serbidores. PerÃ² custu serbidore, {domain}, est ispetziale: allÃ²giat su profilu tuo, duncas regordaÂ·nde si nÃ²mine.",
+  "introduction.welcome.text": "Ti donamus sa benebÃ¨nnida a su fediversu. Dae immoe a pagu, as a pÃ²dere publicare messÃ gios e chistionare cun is amistades tuas in meda serbidores. PerÃ² custu serbidore, {domain}, est ispetziale: allÃ²giat su profilu tuo, duncas regordaÂ·tiÂ·nde su nÃ²mine.",
   "keyboard_shortcuts.back": "pro navigare in segus",
   "keyboard_shortcuts.blocked": "pro abÃ¨rrere sa lista de persones blocadas",
   "keyboard_shortcuts.boost": "pro cumpartzire",
-  "keyboard_shortcuts.column": "pro atzentrare un'istadu in una de is colunnas",
+  "keyboard_shortcuts.column": "pro atzentrare unu tut in una de is colunnas",
   "keyboard_shortcuts.compose": "pro atzentrare in s'Ã rea de cumpositzione de testu",
   "keyboard_shortcuts.description": "Descritzione",
   "keyboard_shortcuts.direct": "pro abÃ¨rrere sa colunna de messÃ gios diretos",
   "keyboard_shortcuts.down": "pro mÃ²ere in bÃ sciu in sa lista",
-  "keyboard_shortcuts.enter": "pro abÃ¨rrere s'istadu",
+  "keyboard_shortcuts.enter": "pro abÃ¨rrere su tut",
   "keyboard_shortcuts.favourite": "pro marcare comente a preferidu",
   "keyboard_shortcuts.favourites": "pro abÃ¨rrere sa lista de preferidos",
   "keyboard_shortcuts.federated": "pro abÃ¨rrere sa lÃ¬nia de tempus federada",
@@ -236,41 +241,48 @@
   "keyboard_shortcuts.muted": "pro abÃ¨rrere sa lista de persones a sa muda",
   "keyboard_shortcuts.my_profile": "pro abÃ¨rrere su profilu tuo",
   "keyboard_shortcuts.notifications": "pro abÃ¨rrere sa colunna de notificatziones",
-  "keyboard_shortcuts.open_media": "pro abÃ¨rrere mÃ¨dia",
+  "keyboard_shortcuts.open_media": "pro abÃ¨rrere elementos multimediales",
   "keyboard_shortcuts.pinned": "pro abÃ¨rrere lista de tuts apicados",
   "keyboard_shortcuts.profile": "pro abÃ¨rrere su profilu de s'autore",
   "keyboard_shortcuts.reply": "pro rispÃ²ndere",
   "keyboard_shortcuts.requests": "pro abÃ¨rrere sa lista de rechestas de sighidura",
   "keyboard_shortcuts.search": "pro atzentrare sa chirca",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "pro ammustrare/cuare su campu AC",
   "keyboard_shortcuts.start": "pro abÃ¨rrere sa colunna \"Cumintza\"",
-  "keyboard_shortcuts.toggle_hidden": "pro ammustrare o cuare testu de is CW",
-  "keyboard_shortcuts.toggle_sensitivity": "pro ammustrare o cuare mÃ¨dias",
+  "keyboard_shortcuts.toggle_hidden": "pro ammustrare o cuare testu de is AC",
+  "keyboard_shortcuts.toggle_sensitivity": "pro ammustrare o cuare elementos multimediales",
   "keyboard_shortcuts.toot": "pro cumintzare a iscrÃ¬ere unu tut nou",
   "keyboard_shortcuts.unfocus": "pro essire de s'Ã rea de cumpositzione de testu o de chirca",
   "keyboard_shortcuts.up": "pro mÃ²ere in susu in sa lista",
   "lightbox.close": "Serra",
+  "lightbox.compress": "Cumprime sa casella de visualizatzione de is immÃ gines",
+  "lightbox.expand": "IsmÃ nnia sa casella de visualizatzione de is immÃ gines",
   "lightbox.next": "Sighi",
   "lightbox.previous": "Pretzedente",
-  "lightbox.view_context": "Bide su cuntestu",
-  "lists.account.add": "AgiÃ¹nghe a sa lista",
+  "lists.account.add": "Agiunghe a sa lista",
   "lists.account.remove": "Boga dae sa lista",
   "lists.delete": "Cantzella sa lista",
   "lists.edit": "ModÃ¬fica sa lista",
   "lists.edit.submit": "Muda su tÃ¬tulu",
   "lists.new.create": "Agiunghe lista",
-  "lists.new.title_placeholder": "Lista noa",
-  "lists.search": "Chircare intre sa gente chi ses sighende",
+  "lists.new.title_placeholder": "TÃ¬tulu de sa lista noa",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Ammustra is rispostas a:",
+  "lists.search": "Chirca intre sa gente chi ses sighende",
   "lists.subheading": "Is listas tuas",
   "load_pending": "{count, plural, one {# elementu nou} other {# elementos noos}}",
   "loading_indicator.label": "Carrighende...",
-  "media_gallery.toggle_visible": "Cua mÃ¨dia",
+  "media_gallery.toggle_visible": "Cua {number, plural, one {immÃ gine} other {immÃ gines}}",
   "missing_indicator.label": "Perunu resurtadu",
   "missing_indicator.sublabel": "Resursa no agatada",
+  "mute_modal.duration": "Durada",
   "mute_modal.hide_notifications": "Boles cuare is notÃ¬ficas de custa persone?",
+  "mute_modal.indefinite": "Indefinida",
   "navigation_bar.apps": "Aplicatziones mÃ²biles",
   "navigation_bar.blocks": "Persones blocadas",
-  "navigation_bar.bookmarks": "Marcadores",
+  "navigation_bar.bookmarks": "Sinnalibros",
   "navigation_bar.community_timeline": "LÃ¬nia de tempus locale",
   "navigation_bar.compose": "Cumpone unu tut nou",
   "navigation_bar.direct": "MessÃ gios diretos",
@@ -278,7 +290,7 @@
   "navigation_bar.domain_blocks": "DomÃ¬nios blocados",
   "navigation_bar.edit_profile": "ModÃ¬fica profilu",
   "navigation_bar.favourites": "Preferidos",
-  "navigation_bar.filters": "ParÃ ulas a sa muda",
+  "navigation_bar.filters": "Faeddos a sa muda",
   "navigation_bar.follow_requests": "Rechestas de sighidura",
   "navigation_bar.follows_and_followers": "Persones chi sighis e chi ti sighint",
   "navigation_bar.info": "Informatziones de su serbidore",
@@ -297,7 +309,8 @@
   "notification.mention": "{name} t'at mentovadu",
   "notification.own_poll": "SondÃ giu acabbadu",
   "notification.poll": "Unu sondÃ giu in su chi as votadu est acabbadu",
-  "notification.reblog": "{name} at cumpartzidu s'istadu tuo",
+  "notification.reblog": "{name} at cumpartzidu su tut tuo",
+  "notification.status": "{name} at publicadu cosa",
   "notifications.clear": "LÃ¬mpia notÃ¬ficas",
   "notifications.clear_confirmation": "Seguru chi boles isboidare in manera permanente totu is notÃ¬ficas tuas?",
   "notifications.column_settings.alert": "NotÃ¬ficas de iscrivania",
@@ -305,25 +318,36 @@
   "notifications.column_settings.filter_bar.advanced": "Ammustra totu is categorias",
   "notifications.column_settings.filter_bar.category": "Barra lestra de filtros",
   "notifications.column_settings.filter_bar.show": "Ammustra",
-  "notifications.column_settings.follow": "Gente noa chi ti sighit:",
-  "notifications.column_settings.follow_request": "Rechesta de sighidura noa:",
+  "notifications.column_settings.follow": "Sighiduras noas:",
+  "notifications.column_settings.follow_request": "Rechestas noas de sighidura:",
   "notifications.column_settings.mention": "Mentovos:",
   "notifications.column_settings.poll": "Resurtados de su sondÃ giu:",
   "notifications.column_settings.push": "NotÃ¬ficas push",
   "notifications.column_settings.reblog": "Cumpartziduras:",
   "notifications.column_settings.show": "Ammustra in sa colunna",
   "notifications.column_settings.sound": "Reprodue unu sonu",
+  "notifications.column_settings.status": "Tuts noos:",
   "notifications.filter.all": "Totus",
   "notifications.filter.boosts": "Cumpartziduras",
   "notifications.filter.favourites": "Preferidos",
   "notifications.filter.follows": "Sighende",
   "notifications.filter.mentions": "Mentovos",
-  "notifications.filter.polls": "Resurtados dae su sondÃ giu",
+  "notifications.filter.polls": "Resurtados de su sondÃ giu",
+  "notifications.filter.statuses": "Atualizatziones dae gente chi sighis",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notÃ¬ficas",
+  "notifications.mark_as_read": "Sinnala Ã²nnia notÃ¬fica comente lÃ¨ghida",
+  "notifications.permission_denied": "Is notÃ¬ficas de iscrivania non sunt a disponimentu pro neghe de rechestas de permissu chi sunt istadas dennegadas in antis",
+  "notifications.permission_denied_alert": "Is notÃ¬ficas de iscrivania non podent Ã¨ssere abilitadas, ca su permissu de su navigadore est istadu dennegadu in antis",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Abilita is notÃ¬ficas de iscrivania",
+  "notifications_permission_banner.how_to_control": "Pro retzire notÃ¬ficas cando Mastodon no est abertu, abilita is notÃ¬ficas de iscrivania. Podes controllare cun pretzisione is castas de interatziones chi ingendrant notÃ¬ficas de iscrivania pro mÃ¨diu de su butone {icon} in subra, cando sunt abilitadas.",
+  "notifications_permission_banner.title": "Non ti perdas mai nudda",
+  "picture_in_picture.restore": "TorraÂ·ddu a ue fiat",
   "poll.closed": "Serradu",
   "poll.refresh": "Atualiza",
-  "poll.total_people": "{count, plurale, one {# persone} other {# persones}}",
-  "poll.total_votes": "{count, plurale, one {# votu} other {# votos}}",
+  "poll.total_people": "{count, plural, one {# persone} other {# persones}}",
+  "poll.total_votes": "{count, plural, one {# votu} other {# votos}}",
   "poll.vote": "Vota",
   "poll.voted": "As votadu custa risposta",
   "poll_button.add_poll": "Agiunghe unu sondÃ giu",
@@ -341,14 +365,14 @@
   "regeneration_indicator.label": "Carrighendeâ€¦",
   "regeneration_indicator.sublabel": "Preparende sa lÃ¬nia de tempus printzipale tua.",
   "relative_time.days": "{number}d",
-  "relative_time.hours": "{number}h",
+  "relative_time.hours": "{number}o",
   "relative_time.just_now": "immoe",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "oe",
   "reply_indicator.cancel": "Annulla",
   "report.forward": "Torra a imbiare a {target}",
-  "report.forward_hint": "Custu contu est de un'Ã teru serbidore. Bi boles imbiare puru una cÃ²pia anÃ²nima de custu informe?",
+  "report.forward_hint": "Custu contu est de un'Ã teru serbidore. Ddi boles imbiare puru una cÃ²pia anÃ²nima de custu informe?",
   "report.hint": "S'informe at a Ã¨ssere imbiadu a sa moderatzione de su serbidore. Podes frunire un'ispiegatzione de sa signalatzione tua de custu contu:",
   "report.placeholder": "Cummentos additzionales",
   "report.submit": "Imbia",
@@ -357,21 +381,21 @@
   "search_popout.search_format": "Formadu de chirca avantzada",
   "search_popout.tips.full_text": "Testu sÃ¨mplitze pro agatare istados chi as iscritu, marcadu comente a preferidos, cumpartzidu o chi t'ant mentovadu, e fintzas nÃ²mines de utente, nÃ²mines visualizados e etichetas chi ddu includent.",
   "search_popout.tips.hashtag": "eticheta",
-  "search_popout.tips.status": "istadu",
+  "search_popout.tips.status": "tut",
   "search_popout.tips.text": "Testu sÃ¨mplitze pro agatare nÃ²mines visualizados, nÃ²mines de utente e etichetas",
   "search_popout.tips.user": "utente",
   "search_results.accounts": "Gente",
   "search_results.hashtags": "Etichetas",
   "search_results.statuses": "Tuts",
   "search_results.statuses_fts_disabled": "Sa chirca de tuts pro su cuntenutu issoro no est abilitada in custu serbidore de Mastodon.",
-  "search_results.total": "{count, number} {count, plurale, one {resurtadu} other {resurtados}}",
+  "search_results.total": "{count, number} {count, plural, one {resurtadu} other {resurtados}}",
   "status.admin_account": "Aberi s'interfache de moderatzione pro @{name}",
   "status.admin_status": "Aberi custu istadu in s'interfache de moderatzione",
   "status.block": "Bloca @{name}",
-  "status.bookmark": "Marcadore",
+  "status.bookmark": "Sinnalibru",
   "status.cancel_reblog_private": "Iscontza sa cumpartzidura",
   "status.cannot_reblog": "Custa publicatzione non podet Ã¨ssere cumpartzida",
-  "status.copy": "CÃ²pia su ligÃ mene a s'istadu tuo",
+  "status.copy": "CÃ²pia su ligÃ²ngiu a su tut tuo",
   "status.delete": "Cantzella",
   "status.detailed_status": "Visualizatzione de detÃ lliu de arresonada",
   "status.direct": "MessÃ giu deretu a @{name}",
@@ -379,24 +403,24 @@
   "status.favourite": "Preferidos",
   "status.filtered": "Filtradu",
   "status.load_more": "CÃ rrigaÂ·nde Ã teros",
-  "status.media_hidden": "MÃ¨dias cuados",
+  "status.media_hidden": "Elementos multimediales cuados",
   "status.mention": "Mentova @{name}",
   "status.more": "Ã€teru",
-  "status.mute": "Pone @name a sa muda",
+  "status.mute": "Pone @{name} a sa muda",
   "status.mute_conversation": "Pone s'arresonada a sa muda",
-  "status.open": "IsmÃ nnia custu istadu",
+  "status.open": "IsmÃ nnia custu tut",
   "status.pin": "Apica in su profilu",
   "status.pinned": "Tut apicadu",
-  "status.read_more": "LÃ¨gheÂ·nde Ã teru",
+  "status.read_more": "LegheÂ·nde Ã teru",
   "status.reblog": "Cumpartzi",
   "status.reblog_private": "Cumpartzi cun is utentes originales",
   "status.reblogged_by": "{name} at cumpartzidu",
-  "status.reblogs.empty": "No one has boosted this toot yet. Cando calicunu dd'at a fÃ ghere, at a Ã¨ssere ammustradu inoghe.",
+  "status.reblogs.empty": "Nemos at ancora cumpartzidu custu tut. Cando calicunu dd'at a fÃ ghere, at a Ã¨ssere ammustradu inoghe.",
   "status.redraft": "Cantzella e torra a iscrÃ¬ere",
-  "status.remove_bookmark": "Boga su marcadore",
+  "status.remove_bookmark": "Boga su sinnalibru",
   "status.reply": "Risponde",
   "status.replyAll": "Risponde a su tema",
-  "status.report": "Signala @{name}",
+  "status.report": "Sinnala @{name}",
   "status.sensitive_warning": "Cuntenutu sensÃ¬bile",
   "status.share": "Cumpartzi",
   "status.show_less": "AmmustraÂ·nde prus pagu",
@@ -406,7 +430,7 @@
   "status.show_thread": "Ammustra su tema",
   "status.uncached_media_warning": "No est a disponimentu",
   "status.unmute_conversation": "Torra a ativare s'arresonada",
-  "status.unpin": "Isbloca dae pitzu de su profilu",
+  "status.unpin": "Boga dae pitzu de su profilu",
   "suggestions.dismiss": "Iscarta cussÃ¬giu",
   "suggestions.header": "Est possÃ¬bile chi tÃ¨ngias interessu inâ€¦",
   "tabs_bar.federated_timeline": "Federada",
@@ -419,33 +443,34 @@
   "time_remaining.minutes": "{number, plural, one {abarrat # minutu} other {abarrant # minutos}}",
   "time_remaining.moments": "Abarrant pagu momentos",
   "time_remaining.seconds": "{number, plural, one {abarrat # segundu} other {abarrant # segundos}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "timeline_hint.remote_resource_not_displayed": "{resource} dae Ã teros serbidores non benint ammustrados.",
+  "timeline_hint.resources.followers": "Sighiduras",
+  "timeline_hint.resources.follows": "Sighende",
+  "timeline_hint.resources.statuses": "Tuts prus betzos",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persone} other {{counter} persones}} chistionende",
   "trends.trending_now": "Est tendÃ¨ntzia immoe",
   "ui.beforeunload": "S'abbotzu tuo at a Ã¨ssere pÃ¨rdidu si essis dae Mastodon.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
+  "units.short.billion": "{count}Mrd",
+  "units.short.million": "{count}Mln",
+  "units.short.thousand": "{count}m",
   "upload_area.title": "Traga pro carrigare",
-  "upload_button.label": "Agiunghe mÃ¨dias ({formats})",
+  "upload_button.label": "Agiunghe immÃ gines, unu vÃ¬deu o unu documentu sonoru",
   "upload_error.limit": "LÃ¬mite de cÃ rriga de archÃ¬vios barigadu.",
   "upload_error.poll": "Non si permitit s'imbiu de archÃ¬vios in is sondÃ gios.",
   "upload_form.audio_description": "Descritzione pro persones cun pÃ¨rdida auditiva",
   "upload_form.description": "Descritzione pro persones cun problemas visuales",
   "upload_form.edit": "ModÃ¬fica",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "CÃ mbia sa miniadura",
   "upload_form.undo": "Cantzella",
   "upload_form.video_description": "Descritzione pro persones cun pÃ¨rdida auditiva o problemas visuales",
   "upload_modal.analyzing_picture": "Analizende immÃ gineâ€¦",
   "upload_modal.apply": "Ã€plica",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "SÃ¨bera un'immÃ gine",
   "upload_modal.description_placeholder": "Su margiane castÃ ngiu brincat lestru a subra de su cane mandrone",
   "upload_modal.detect_text": "Rileva testu de s'immÃ gine",
-  "upload_modal.edit_media": "ModÃ¬fica su mÃ¨dia",
-  "upload_modal.hint": "Incarca o traga su tzÃ¬rculu in sa previsualizatzione pro seberare su puntu focale chi at a Ã¨ssere semper visÃ¬bile in totu is miniaturas.",
+  "upload_modal.edit_media": "ModÃ¬fica elementu multimediale",
+  "upload_modal.hint": "Incarca o traga su tzÃ¬rculu in sa previsualizatzione pro seberare su puntu focale chi at a Ã¨ssere semper visÃ¬bile in totu is miniaduras.",
+  "upload_modal.preparing_ocr": "Ammaniende s'OCRâ€¦",
   "upload_modal.preview_label": "Previsualiza ({ratio})",
   "upload_progress.label": "Carrighende...",
   "video.close": "Serra su vÃ¬deu",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 4e48d53c84fe2a4df83203b83bfbcd53f51786c1..6640d54729a0726e4b45b0e78b24b10cc4c187bc 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "ZruÅ¡ Å¾iadosÅ¥ o sledovanie",
   "account.direct": "Priama sprÃ¡va pre @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "DomÃ©na ukrytÃ¡",
   "account.edit_profile": "Uprav profil",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Zobrazuj na profile",
   "account.follow": "Nasleduj",
   "account.followers": "SledujÃºci",
@@ -43,7 +45,7 @@
   "account.unfollow": "PrestaÅˆ nÃ¡sledovaÅ¥",
   "account.unmute": "PrestaÅˆ ignorovaÅ¥ @{name}",
   "account.unmute_notifications": "ZruÅ¡ stÄºmenie oboznÃ¡menÃ od @{name}",
-  "account_note.placeholder": "Click to add a note",
+  "account_note.placeholder": "Klikni pre vloÅ¾enie poznÃ¡mky",
   "alert.rate_limited.message": "ProsÃm, skÃºs to znova za {retry_time, time, medium}.",
   "alert.rate_limited.title": "Tempo obmedzenÃ©",
   "alert.unexpected.message": "Vyskytla sa neÄakanÃ¡ chyba.",
@@ -79,7 +81,7 @@
   "column_header.show_settings": "UkÃ¡Å¾ nastavenia",
   "column_header.unpin": "Odopni",
   "column_subheading.settings": "Nastavenia",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Iba miestna",
   "community.column_settings.media_only": "Iba mÃ©diÃ¡",
   "community.column_settings.remote_only": "Remote only",
   "compose_form.direct_message_warning": "Tento prÃspevok bude boslanÃ½ iba spomenutÃ½m uÅ¾ÃvateÄ¾om.",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "NÃ¡jdenÃ©",
   "emoji_button.symbols": "Symboly",
   "emoji_button.travel": "Cestovanie a miesta",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "NiesÃº tu Å¾iadne prÃspevky!",
   "empty_column.account_unavailable": "Profil nedostupnÃ½",
   "empty_column.blocks": "EÅ¡te si nikoho nezablokoval/a.",
@@ -166,13 +169,15 @@
   "empty_column.notifications": "EÅ¡te nemÃ¡Å¡ Å¾iadne oznÃ¡menia. ZaÄni komunikovaÅ¥ s ostatnÃ½mi, aby diskusia mohla zaÄaÅ¥.",
   "empty_column.public": "EÅ¡te tu niÄ nie je. NapÃÅ¡ nieÄo verejne, alebo zaÄni sledovaÅ¥ uÅ¾ÃvateÄ¾ov z inÃ½ch serverov, aby tu nieÄo pribudlo",
   "error.unexpected_crash.explanation": "KvÃ´li chybe v naÅ¡om kÃ³de, alebo problÃ©mu s kompatibilitou prehliadaÄa, tÃºto strÃ¡nku nebolo moÅ¾nÃ© zobraziÅ¥ sprÃ¡vne.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "SkÃºs obnoviÅ¥ strÃ¡nku. Ak to nepomÃ´Å¾e, pravdepodobne budeÅ¡ stÃ¡le mÃ´cÅ¥ pouÅ¾ÃvaÅ¥ Mastodon cez inÃ½ prehliadaÄ, alebo natÃvnu aplikÃ¡ciu.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "SkopÃruj stacktrace do schrÃ¡nky",
   "errors.unexpected_crash.report_issue": "NahlÃ¡s problÃ©m",
   "follow_request.authorize": "PovoÄ¾ prÃstup",
   "follow_request.reject": "Odmietni",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
-  "generic.saved": "Saved",
+  "generic.saved": "UloÅ¾enÃ©",
   "getting_started.developers": "VÃ½vojÃ¡ri",
   "getting_started.directory": "Zoznam profilov",
   "getting_started.documentation": "DokumentÃ¡cia",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "nesÃºstreÄ sa na pÃsaciu plochu, alebo hÄ¾adanie",
   "keyboard_shortcuts.up": "posuÅˆ sa vyÅ¡Å¡ie v zozname",
   "lightbox.close": "Zatvor",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "ÄŽalÅ¡ie",
   "lightbox.previous": "PredchÃ¡dzajÃºci",
-  "lightbox.view_context": "UkÃ¡Å¾ kontext",
   "lists.account.add": "Pridaj do zoznamu",
   "lists.account.remove": "Odober zo zoznamu",
   "lists.delete": "VymaÅ¾ list",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "ZmeÅˆ nÃ¡zov",
   "lists.new.create": "Pridaj zoznam",
   "lists.new.title_placeholder": "NÃ¡zov novÃ©ho zoznamu",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "VyhÄ¾adÃ¡vaj medzi uÅ¾ÃvateÄ¾mi, ktorÃ½ch sledujeÅ¡",
   "lists.subheading": "Tvoje zoznamy",
   "load_pending": "{count, plural, one {# novÃ¡ poloÅ¾ka} other {# novÃ½ch poloÅ¾iek}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Zapni/Vypni viditeÄ¾nosÅ¥",
   "missing_indicator.label": "NenÃ¡jdenÃ©",
   "missing_indicator.sublabel": "Tento zdroj sa eÅ¡te nepodarilo nÃ¡jsÅ¥",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Skry oznÃ¡menia od tohto pouÅ¾ÃvateÄ¾a?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "AplikÃ¡cie",
   "navigation_bar.blocks": "BlokovanÃ uÅ¾Ãvatelia",
   "navigation_bar.bookmarks": "ZÃ¡loÅ¾ky",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Tvoja anketa sa skonÄila",
   "notification.poll": "Anketa v ktorej si hlasoval/a sa skonÄila",
   "notification.reblog": "{name} zdieÄ¾al/a tvoj prÃspevok",
+  "notification.status": "{name} just posted",
   "notifications.clear": "VyÄisti oboznÃ¡menia",
   "notifications.clear_confirmation": "Naozaj chceÅ¡ nenÃ¡vratne preÄistiÅ¥ vÅ¡etky tvoje oboznÃ¡menia?",
   "notifications.column_settings.alert": "OboznÃ¡menia na ploche",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Vyzdvihnutia:",
   "notifications.column_settings.show": "UkÃ¡Å¾ v stÄºpci",
   "notifications.column_settings.sound": "Prehraj zvuk",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "VÅ¡etky",
   "notifications.filter.boosts": "Vyzdvihnutia",
   "notifications.filter.favourites": "ObÄ¾ÃºbenÃ©",
   "notifications.filter.follows": "Sledovania",
   "notifications.filter.mentions": "Iba spomenutia",
   "notifications.filter.polls": "VÃ½sledky ankiet",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} oboznÃ¡menÃ",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "UzatvorenÃ¡",
   "poll.refresh": "ObÄerstvi",
   "poll.total_people": "{count, plural, one {# Älovek} few {# Ä¾udia} other {# Ä¾udÃ}}",
@@ -420,9 +444,9 @@
   "time_remaining.moments": "OstÃ¡va uÅ¾ iba chviÄ¾ka",
   "time_remaining.seconds": "OstÃ¡va {number, plural, one {# sekunda} few {# sekÃºnd} many {# sekÃºnd} other {# sekÃºnd}}",
   "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
+  "timeline_hint.resources.followers": "SledujÃºci",
+  "timeline_hint.resources.follows": "NÃ¡sleduje",
+  "timeline_hint.resources.statuses": "StarÅ¡ie prÃspevky",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
   "trends.trending_now": "Teraz populÃ¡rne",
   "ui.beforeunload": "ÄŒo mÃ¡Å¡ rozpÃsanÃ© sa stratÃ, ak opustÃÅ¡ Mastodon.",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Rozpoznaj text z obrÃ¡zka",
   "upload_modal.edit_media": "Uprav mÃ©diÃ¡",
   "upload_modal.hint": "Klikni, alebo potiahni okruh ukÃ¡Å¾ky pre zvolenie z ktorÃ©ho vÃ½chodzieho bodu bude vÅ¾dy v dohÄ¾adne na vÅ¡etkÃ½ch nÃ¡hÄ¾adoch.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "NÃ¡hÄ¾ad ({ratio})",
   "upload_progress.label": "NahrÃ¡va sa...",
   "video.close": "Zavri video",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 71ba0d1b622972753716a533949aa32f9b4cf675..ca29c4455f90a2ed6318cdfe753a67e881d376ed 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Cancel follow request",
   "account.direct": "Neposredno sporoÄilo @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Skrita domena",
   "account.edit_profile": "Uredi profil",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "ZmoÅ¾nost profila",
   "account.follow": "Sledi",
   "account.followers": "Sledilci",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Rezultati iskanja",
   "emoji_button.symbols": "Simboli",
   "emoji_button.travel": "Potovanja in Kraji",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Tukaj ni tutov!",
   "empty_column.account_unavailable": "Profil ni na voljo",
   "empty_column.blocks": "Niste Å¡e blokirali nobenega uporabnika.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Nimate Å¡e nobenih obvestil. PoveÅ¾ite se z drugimi, da zaÄnete pogovor.",
   "empty_column.public": "Tukaj ni niÄesar! Da ga napolnite, napiÅ¡ite nekaj javnega ali pa roÄno sledite uporabnikom iz drugih streÅ¾nikov",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "Overi",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "odfokusiraj obmoÄje za sestavljanje besedila/iskanje",
   "keyboard_shortcuts.up": "premakni se navzgor po seznamu",
   "lightbox.close": "Zapri",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Naslednji",
   "lightbox.previous": "PrejÅ¡nji",
-  "lightbox.view_context": "Poglej kontekst",
   "lists.account.add": "Dodaj na seznam",
   "lists.account.remove": "Odstrani s seznama",
   "lists.delete": "IzbriÅ¡i seznam",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Spremeni naslov",
   "lists.new.create": "Dodaj seznam",
   "lists.new.title_placeholder": "Nov naslov seznama",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "IÅ¡Äi med ljudmi, katerim sledite",
   "lists.subheading": "VaÅ¡i seznami",
   "load_pending": "{count, plural, one {# nov element} other {# novih elementov}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Preklopi vidljivost",
   "missing_indicator.label": "Ni najdeno",
   "missing_indicator.sublabel": "Tega vira ni bilo mogoÄe najti",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Skrij obvestila tega uporabnika?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobilne aplikacije",
   "navigation_bar.blocks": "Blokirani uporabniki",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "Glasovanje, v katerem ste sodelovali, se je konÄalo",
   "notification.reblog": "{name} je spodbudil/a vaÅ¡ status",
+  "notification.status": "{name} just posted",
   "notifications.clear": "PoÄisti obvestila",
   "notifications.clear_confirmation": "Ali ste prepriÄani, da Å¾elite trajno izbrisati vsa vaÅ¡a obvestila?",
   "notifications.column_settings.alert": "Namizna obvestila",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Spodbude:",
   "notifications.column_settings.show": "PrikaÅ¾i v stolpcu",
   "notifications.column_settings.sound": "Predvajaj zvok",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "Vse",
   "notifications.filter.boosts": "Spodbude",
   "notifications.filter.favourites": "Priljubljeni",
   "notifications.filter.follows": "Sledi",
   "notifications.filter.mentions": "Omembe",
   "notifications.filter.polls": "Rezultati glasovanj",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} obvestil",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Zaprto",
   "poll.refresh": "OsveÅ¾i",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -430,7 +454,7 @@
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "Za poÅ¡iljanje povlecite in spustite",
-  "upload_button.label": "Dodaj medije ({formats})",
+  "upload_button.label": "Dodaj medije",
   "upload_error.limit": "Omejitev prenosa datoteke je preseÅ¾ena.",
   "upload_error.poll": "Prenos datoteke z anketami ni dovoljen.",
   "upload_form.audio_description": "Describe for people with hearing loss",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "PoÅ¡iljanje...",
   "video.close": "Zapri video",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 95cadfe25bc47a51094020ca75cfcd512d0fd76d..b45f62cd5e5d8110d801f95278ecb204b5a265f3 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -9,14 +9,16 @@
   "account.browse_more_on_origin_server": "Shfletoni mÃ« tepÃ«r rreth profilit origjinal",
   "account.cancel_follow_request": "Anulo kÃ«rkesÃ«n e ndjekjes",
   "account.direct": "Mesazh i drejtpÃ«rdrejtÃ« pÃ«r @{name}",
+  "account.disable_notifications": "Resht sÃ« njoftuari mua, kur poston @{name}",
   "account.domain_blocked": "PÃ«rkatÃ«sia u bllokua",
   "account.edit_profile": "PÃ«rpunoni profilin",
+  "account.enable_notifications": "NjoftomÃ«, kur poston @{name}",
   "account.endorse": "Pasqyrojeni nÃ« profil",
   "account.follow": "Ndiqeni",
   "account.followers": "NdjekÃ«s",
   "account.followers.empty": "KÃ«tÃ« pÃ«rdorues ende sâ€™e ndjek njeri.",
   "account.followers_counter": "{count, plural, one {{counter} NdjekÃ«s} other {{counter} NdjekÃ«s}}",
-  "account.following_counter": "{count, plural, one {} other {{counter} tÃ« Ndjekur}}",
+  "account.following_counter": "{count, plural, other {{counter} tÃ« Ndjekur}}",
   "account.follows.empty": "Ky pÃ«rdorues ende sâ€™ndjek njeri.",
   "account.follows_you": "Ju ndjek",
   "account.hide_reblogs": "Fshih pÃ«rforcime nga @{name}",
@@ -48,7 +50,7 @@
   "alert.rate_limited.title": "ShpejtÃ«si e kufizuar",
   "alert.unexpected.message": "Ndodhi njÃ« gabim tÃ« papritur.",
   "alert.unexpected.title": "HÃ«m!",
-  "announcement.announcement": "Njoftime",
+  "announcement.announcement": "Njoftim",
   "autosuggest_hashtag.per_week": "{count} pÃ«r javÃ«",
   "boost_modal.combo": "Mund tÃ« shtypni {combo}, qÃ« kjo tÃ« anashkalohet herÃ«s tjetÃ«r",
   "bundle_column_error.body": "DiÃ§ shkoi ters teksa ngarkohej ky pÃ«rbÃ«rÃ«s.",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "PÃ«rfundime kÃ«rkimi",
   "emoji_button.symbols": "Simbole",
   "emoji_button.travel": "UdhÃ«time & Vende",
+  "empty_column.account_suspended": "Llogaria u pezullua",
   "empty_column.account_timeline": "Sâ€™ka mesazhe kÃ«tu!",
   "empty_column.account_unavailable": "Profil jashtÃ« funksionimi",
   "empty_column.blocks": "Sâ€™keni bllokuar ende ndonjÃ« pÃ«rdorues.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Ende sâ€™keni ndonjÃ« njoftim. NdÃ«rveproni me tÃ« tjerÃ«t qÃ« tÃ« nisÃ« biseda.",
   "empty_column.public": "Sâ€™ka gjÃ« kÃ«tu! Shkruani diÃ§ka publikisht, ose ndiqni dorazi pÃ«rdorues prej instancash tÃ« tjera, qÃ« ta mbushni kÃ«tÃ« zonÃ«",
   "error.unexpected_crash.explanation": "PÃ«r shkak tÃ« njÃ« tÃ« mete nÃ« kodin tonÃ« ose tÃ« njÃ« problemi pÃ«rputhshmÃ«rie tÃ« shfletuesit, kjo faqe sâ€™mund tÃ« shfaqet saktÃ«.",
+  "error.unexpected_crash.explanation_addons": "Kjo faqe sâ€™u shfaq dot saktÃ«. Ky gabim ka gjasa tÃ« jetÃ« shkaktuar nga njÃ« shtesÃ« shfletuesi ose njÃ« mjet pÃ«rkthimi tÃ« automatizuar.",
   "error.unexpected_crash.next_steps": "Provoni tÃ« freskoni faqen. NÃ«se kjo sâ€™bÃ«n punÃ«, mundeni ende tÃ« jeni nÃ« gjendje tÃ« pÃ«rdorni Mastodon-in qÃ« nga njÃ« shfletues tjetÃ«r ose nga ndonjÃ« aplikacion origjinal prej projektit.",
+  "error.unexpected_crash.next_steps_addons": "Provoni tâ€™i Ã§aktivizoni dhe tÃ« rifreskoni faqen. NÃ«se kjo sâ€™bÃ«n punÃ«, mundeni prapÃ« tÃ« jeni nÃ« gjendje tÃ« pÃ«rdorni Mastodon-in pÃ«rmes njÃ« shfletuesi tjetÃ«r, apo njÃ« aplikacioni prej Mastodon-it.",
   "errors.unexpected_crash.copy_stacktrace": "Kopjo stacktrace-in nÃ« tÃ« papastÃ«r",
   "errors.unexpected_crash.report_issue": "Raportoni problemin",
   "follow_request.authorize": "Autorizoje",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "pÃ«r heqjen e fokusit nga fusha e hartimit tÃ« mesazheve apo kÃ«rkimeve",
   "keyboard_shortcuts.up": "pÃ«r ngjitje sipÃ«r nÃ«pÃ«r listÃ«",
   "lightbox.close": "Mbylle",
+  "lightbox.compress": "Ngjeshe kuadratin e parjes sÃ« figurave",
+  "lightbox.expand": "Zgjeroje kuadratin e parjes sÃ« figurave",
   "lightbox.next": "Pasuesja",
   "lightbox.previous": "E mÃ«parshmja",
-  "lightbox.view_context": "Shihni kontekstin",
   "lists.account.add": "Shto nÃ« listÃ«",
   "lists.account.remove": "Hiqe nga lista",
   "lists.delete": "Fshije listÃ«n",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Ndryshoni titullin",
   "lists.new.create": "Shtoni listÃ«",
   "lists.new.title_placeholder": "Titull liste tÃ« re",
+  "lists.replies_policy.followed": "Cilido pÃ«rdorues i ndjekur",
+  "lists.replies_policy.list": "AnÃ«tarÃ« tÃ« listÃ«s",
+  "lists.replies_policy.none": "Askush",
+  "lists.replies_policy.title": "Shfaq pÃ«rgjigje pÃ«r:",
   "lists.search": "KÃ«rkoni mes personash qÃ« ndiqni",
   "lists.subheading": "Listat tuaja",
   "load_pending": "{count, plural,one {# objekt i ri }other {# objekte tÃ« rinj }}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Fshihni {number, plural, one {figurÃ«} other {figura}}",
   "missing_indicator.label": "Sâ€™u gjet",
   "missing_indicator.sublabel": "Ky burim sâ€™u gjet dot",
+  "mute_modal.duration": "KohÃ«zgjatje",
   "mute_modal.hide_notifications": "TÃ« kalohen tÃ« fshehura njoftimet prej kÃ«tij pÃ«rdoruesi?",
+  "mute_modal.indefinite": "E pacaktuar",
   "navigation_bar.apps": "Aplikacione pÃ«r celular",
   "navigation_bar.blocks": "PÃ«rdorues tÃ« bllokuar",
   "navigation_bar.bookmarks": "FaqerojtÃ«s",
@@ -298,6 +310,7 @@
   "notification.own_poll": "PyetÃ«sori juaj ka pÃ«rfunduar",
   "notification.poll": "Ka pÃ«rfunduar njÃ« pyetÃ«sor ku keni votuar",
   "notification.reblog": "{name} pÃ«rforcoi mesazhin tuaj",
+  "notification.status": "{name} sapo postoi",
   "notifications.clear": "Spastroji njoftimet",
   "notifications.clear_confirmation": "Jeni i sigurt se doni tÃ« spastrohen pÃ«rgjithmonÃ« krejt njoftimet tuaja?",
   "notifications.column_settings.alert": "Njoftime desktopi",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "PÃ«rforcime:",
   "notifications.column_settings.show": "Shfaq nÃ« shtylla",
   "notifications.column_settings.sound": "Luaj njÃ« tingull",
+  "notifications.column_settings.status": "Mesazhe tÃ« rinj:",
   "notifications.filter.all": "Krejt",
   "notifications.filter.boosts": "PÃ«rforcime",
   "notifications.filter.favourites": "TÃ« parapÃ«lqyer",
   "notifications.filter.follows": "Ndjekje",
   "notifications.filter.mentions": "PÃ«rmendje",
   "notifications.filter.polls": "PÃ«rfundime pyetÃ«sori",
+  "notifications.filter.statuses": "PÃ«rditÃ«sime prej personash qÃ« ndiqni",
+  "notifications.grant_permission": "Akordoji leje.",
   "notifications.group": "{count}s njoftime",
+  "notifications.mark_as_read": "VÃ«ri shenjÃ« Ã§do njoftimi si tÃ« lexuar",
+  "notifications.permission_denied": "Sâ€™mund tÃ« aktivizohen njoftime nÃ« desktop, ngaqÃ« janÃ« mohuar lejet pÃ«r kÃ«tÃ«.",
+  "notifications.permission_denied_alert": "Sâ€™mund tÃ« aktivizohen njoftimet nÃ« desktop, ngaqÃ« lejet e shfletuesit pÃ«r kÃ«tÃ« janÃ« mohuar mÃ« herÃ«t",
+  "notifications.permission_required": "Sâ€™merren dot njoftime desktop, ngaqÃ« sâ€™Ã«shtÃ« akorduar leja pÃ«rkatÃ«se.",
+  "notifications_permission_banner.enable": "Aktivizo njoftime nÃ« desktop",
+  "notifications_permission_banner.how_to_control": "PÃ«r tÃ« marrÃ« njoftime, kur Mastodon-i sâ€™Ã«shtÃ« i hapur, aktivizoni njoftime nÃ« desktop. PÃ«rmes butoni {icon} mÃ« sipÃ«r, mund tÃ« kontrolloni me pÃ«rpikÃ«ri cilat lloje ndÃ«rveprimesh prodhojnÃ« njoftime nÃ« dekstop, pasi tÃ« jenÃ« aktivizuar.",
+  "notifications_permission_banner.title": "Mos tâ€™ju shpÃ«tojÃ« gjÃ«",
+  "picture_in_picture.restore": "Ktheje ku qe",
   "poll.closed": "I mbyllur",
   "poll.refresh": "Rifreskoje",
   "poll.total_people": "{count, plural,one {# person }other {# vetÃ« }}",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Pikase tekstin prej fotoje",
   "upload_modal.edit_media": "PÃ«rpunoni media",
   "upload_modal.hint": "QÃ« tÃ« zgjidhni pikÃ«n vatrore e cila do tÃ« jetÃ« pÃ«rherÃ« e dukshme nÃ« krejt miniaturat, klikojeni ose tÃ«rhiqeni rrethin te paraparja.",
+  "upload_modal.preparing_ocr": "Po pÃ«rgatitet OCR-jaâ€¦",
   "upload_modal.preview_label": "Paraparje ({ratio})",
   "upload_progress.label": "Po ngarkohetâ€¦",
   "video.close": "Mbylle videon",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index d7be7380f5da7ca725c7e9755390f3164f196e88..88c9df59baf1fbcb4560a59862dbf71c89b0eb8e 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Cancel follow request",
   "account.direct": "Direct Message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Izmeni profil",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
   "account.follow": "Zaprati",
   "account.followers": "Pratioca",
@@ -96,9 +98,9 @@
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
   "compose_form.publish": "Tutni",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "Ovde upiÅ¡ite upozorenje",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Rezultati pretrage",
   "emoji_button.symbols": "Simboli",
   "emoji_button.travel": "Putovanja & mesta",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No toots here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Trenutno nemate obaveÅ¡tenja. DruÅ¾ite se malo da zapoÄnete razgovore.",
   "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",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "Odobri",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "da ne budete viÅ¡e na pretrazi/pravljenju novog tuta",
   "keyboard_shortcuts.up": "da se pomerite na gore u listi",
   "lightbox.close": "Zatvori",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "SledeÄ‡i",
   "lightbox.previous": "Prethodni",
-  "lightbox.view_context": "View context",
   "lists.account.add": "Dodaj na listu",
   "lists.account.remove": "Ukloni sa liste",
   "lists.delete": "ObriÅ¡i listu",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Change title",
   "lists.new.create": "Dodaj listu",
   "lists.new.title_placeholder": "Naslov nove liste",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "PretraÅ¾i meÄ‘u ljudima koje pratite",
   "lists.subheading": "VaÅ¡e liste",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "UkljuÄi/iskljuÄi vidljivost",
   "missing_indicator.label": "Nije pronaÄ‘eno",
   "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Sakrij obaveÅ¡tenja od ovog korisnika?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blokirani korisnici",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} je podrÅ¾ao(la) VaÅ¡ status",
+  "notification.status": "{name} just posted",
   "notifications.clear": "OÄisti obaveÅ¡tenja",
   "notifications.clear_confirmation": "Da li ste sigurno da trajno Å¾elite da oÄistite VaÅ¡a obaveÅ¡tenja?",
   "notifications.column_settings.alert": "ObaveÅ¡tenja na radnoj povrÅ¡ini",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "PodrÅ¡ki:",
   "notifications.column_settings.show": "PrikaÅ¾i u koloni",
   "notifications.column_settings.sound": "PuÅ¡taj zvuk",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Closed",
   "poll.refresh": "Refresh",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -389,7 +413,7 @@
   "status.pinned": "Pinned toot",
   "status.read_more": "Read more",
   "status.reblog": "PodrÅ¾i",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} podrÅ¾ao(la)",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Otpremam...",
   "video.close": "Zatvori video",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 7c42f0e8a015e1317eaefa1e2a2390534dc37eca..2509c90856bedf1e99604eb9eb2fa90ce9085787 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "ÐŸÐ¾Ð½Ð¸ÑˆÑ‚Ð¸ Ð·Ð°Ñ…Ñ‚ÐµÐ²Ðµ Ð·Ð° Ð¿Ñ€Ð°Ñ›ÐµÑšÐµ",
   "account.direct": "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð½Ð° Ð¿Ð¾Ñ€ÑƒÐºÐ° @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Ð”Ð¾Ð¼ÐµÐ½ ÑÐ°ÐºÑ€Ð¸Ð²ÐµÐ½",
   "account.edit_profile": "Ð˜Ð·Ð¼ÐµÐ½Ð¸ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "ÐŸÑ€Ð¸ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð½Ð° Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñƒ",
   "account.follow": "Ð—Ð°Ð¿Ñ€Ð°Ñ‚Ð¸",
   "account.followers": "ÐŸÑ€Ð°Ñ‚Ð¸Ð¾Ñ†Ð¸",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Ð ÐµÐ·ÑƒÐ»Ñ‚Ð°Ñ‚Ð¸ Ð¿Ñ€ÐµÑ‚Ñ€Ð°Ð³Ðµ",
   "emoji_button.symbols": "Ð¡Ð¸Ð¼Ð±Ð¾Ð»Ð¸",
   "emoji_button.travel": "ÐŸÑƒÑ‚Ð¾Ð²Ð°ÑšÐ° Ð¸ Ð¼ÐµÑÑ‚Ð°",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "ÐžÐ²Ð´Ðµ Ð½ÐµÐ¼Ð° Ñ‚Ñ€ÑƒÐ±Ð°!",
   "empty_column.account_unavailable": "ÐŸÑ€Ð¾Ñ„Ð¸Ð» Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð°Ð½",
   "empty_column.blocks": "ÐˆÐ¾Ñˆ ÑƒÐ²ÐµÐº Ð½ÐµÐ¼Ð°Ñ‚Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð½Ð¸Ñ… ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ°.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Ð¢Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð½ÐµÐ¼Ð°Ñ‚Ðµ Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ°. Ð”Ñ€ÑƒÐ¶Ð¸Ñ‚Ðµ ÑÐµ Ð¼Ð°Ð»Ð¾ Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ‡Ð½ÐµÑ‚Ðµ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€.",
   "empty_column.public": "ÐžÐ²Ð´Ðµ Ð½ÐµÐ¼Ð° Ð½Ð¸Ñ‡ÐµÐ³Ð°! ÐÐ°Ð¿Ð¸ÑˆÐ¸Ñ‚Ðµ Ð½ÐµÑˆÑ‚Ð¾ Ñ˜Ð°Ð²Ð½Ð¾, Ð¸Ð»Ð¸ Ð½Ð°Ñ’Ð¸Ñ‚Ðµ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐµ ÑÐ° Ð´Ñ€ÑƒÐ³Ð¸Ñ… Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð¸ ÐºÐ¾Ñ˜Ðµ Ñ›ÐµÑ‚Ðµ Ð·Ð°Ð¿Ñ€Ð°Ñ‚Ð¸Ñ‚Ð¸ Ð´Ð° Ð¿Ð¾Ð¿ÑƒÐ½Ð¸Ñ‚Ðµ Ð¾Ð²Ñƒ Ð¿Ñ€Ð°Ð·Ð½Ð¸Ð½Ñƒ",
   "error.unexpected_crash.explanation": "Ð—Ð±Ð¾Ð³ Ð³Ñ€ÐµÑˆÐºÐµ Ñƒ Ð½Ð°ÑˆÐµÐ¼ ÐºÐ¾Ð´Ñƒ Ð¸Ð»Ð¸ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° ÑÐ° ÐºÐ¾Ð¼Ð¿Ð°Ñ‚Ð¸Ð±Ð¸Ð»Ð½Ð¾ÑˆÑ›Ñƒ Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´Ð°Ñ‡Ð°, Ð¾Ð²Ð° ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ð° ÑÐµ Ð½Ð¸Ñ˜Ðµ Ð¼Ð¾Ð³Ð»Ð° Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð½Ð¾ Ð¿Ñ€Ð¸ÐºÐ°Ð·Ð°Ñ‚Ð¸.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "ÐŸÐ¾ÐºÑƒÑˆÐ°Ñ˜Ñ‚Ðµ Ð´Ð° Ð¾ÑÐ²ÐµÐ¶Ð¸Ñ‚Ðµ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ. ÐÐºÐ¾ Ñ‚Ð¾ Ð½Ðµ Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ðµ, Ð¼Ð¾Ð¶Ð´Ð° Ñ›ÐµÑ‚Ðµ Ð¸ Ð´Ð°Ñ™Ðµ Ð¼Ð¾Ñ›Ð¸ Ð´Ð° ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ðµ ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½ Ð¿ÑƒÑ‚ÐµÐ¼ Ð´Ñ€ÑƒÐ³Ð¾Ð³ Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´Ð°Ñ‡Ð° Ð¸Ð»Ð¸ Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ðµ Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ðµ.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "ÐšÐ¾Ð¿Ð¸Ñ€Ð°Ñ˜ \"stacktrace\" Ñƒ ÐºÐ»Ð¸Ð¿Ð±Ð¾Ñ€Ð´",
   "errors.unexpected_crash.report_issue": "ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ð¸ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼",
   "follow_request.authorize": "ÐžÐ´Ð¾Ð±Ñ€Ð¸",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "Ð´Ð° Ð¾Ð´Ñ„Ð¾ÐºÑƒÑÐ¸Ñ€Ð°Ñ‚Ðµ/Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚Ðµ Ð²Ð¸ÑˆÐµ Ð½Ð° Ð¿Ñ€ÐµÑ‚Ñ€Ð°Ð·Ð¸/Ð¿Ñ€Ð°Ð²Ñ™ÐµÑšÑƒ Ð½Ð¾Ð²Ðµ Ñ‚Ñ€ÑƒÐ±Ðµ",
   "keyboard_shortcuts.up": "Ð´Ð° ÑÐµ Ð¿Ð¾Ð¼ÐµÑ€Ð¸Ñ‚Ðµ Ð½Ð° Ð³Ð¾Ñ€Ðµ Ñƒ Ð»Ð¸ÑÑ‚Ð¸",
   "lightbox.close": "Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Ð¡Ð»ÐµÐ´ÐµÑ›Ð¸",
   "lightbox.previous": "ÐŸÑ€ÐµÑ‚Ñ…Ð¾Ð´Ð½Ð¸",
-  "lightbox.view_context": "View context",
   "lists.account.add": "Ð”Ð¾Ð´Ð°Ñ˜ Ð½Ð° Ð»Ð¸ÑÑ‚Ñƒ",
   "lists.account.remove": "Ð£ÐºÐ»Ð¾Ð½Ð¸ ÑÐ° Ð»Ð¸ÑÑ‚Ðµ",
   "lists.delete": "ÐžÐ±Ñ€Ð¸ÑˆÐ¸ Ð»Ð¸ÑÑ‚Ñƒ",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Change title",
   "lists.new.create": "Ð”Ð¾Ð´Ð°Ñ˜ Ð»Ð¸ÑÑ‚Ñƒ",
   "lists.new.title_placeholder": "ÐÐ°ÑÐ»Ð¾Ð² Ð½Ð¾Ð²Ðµ Ð»Ð¸ÑÑ‚Ðµ",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "ÐŸÑ€ÐµÑ‚Ñ€Ð°Ð¶Ð¸ Ð¼ÐµÑ’Ñƒ Ñ™ÑƒÐ´Ð¸Ð¼Ð° ÐºÐ¾Ñ˜Ðµ Ð¿Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ",
   "lists.subheading": "Ð’Ð°ÑˆÐµ Ð»Ð¸ÑÑ‚Ðµ",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Ð£ÐºÑ™ÑƒÑ‡Ð¸/Ð¸ÑÐºÑ™ÑƒÑ‡Ð¸ Ð²Ð¸Ð´Ñ™Ð¸Ð²Ð¾ÑÑ‚",
   "missing_indicator.label": "ÐÐ¸Ñ˜Ðµ Ð¿Ñ€Ð¾Ð½Ð°Ñ’ÐµÐ½Ð¾",
   "missing_indicator.sublabel": "ÐžÐ²Ð°Ñ˜ Ñ€ÐµÑÑƒÑ€Ñ Ð½Ð¸Ñ˜Ðµ Ð¿Ñ€Ð¾Ð½Ð°Ñ’ÐµÐ½",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Ð¡Ð°ÐºÑ€Ð¸Ñ˜ Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ° Ð¾Ð´ Ð¾Ð²Ð¾Ð³ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ°?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "ÐœÐ¾Ð±Ð¸Ð»Ð½Ðµ Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ðµ",
   "navigation_bar.blocks": "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð½Ð¸ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} Ñ˜Ðµ Ð¿Ð¾Ð´Ñ€Ð¶Ð°Ð¾/Ð»Ð° Ð’Ð°Ñˆ ÑÑ‚Ð°Ñ‚ÑƒÑ",
+  "notification.status": "{name} just posted",
   "notifications.clear": "ÐžÑ‡Ð¸ÑÑ‚Ð¸ Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ°",
   "notifications.clear_confirmation": "Ð”Ð° Ð»Ð¸ ÑÑ‚Ðµ ÑÐ¸Ð³ÑƒÑ€Ð½Ð¾ Ð´Ð° Ñ‚Ñ€Ð°Ñ˜Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð¾Ñ‡Ð¸ÑÑ‚Ð¸Ñ‚Ðµ Ð’Ð°ÑˆÐ° Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ°?",
   "notifications.column_settings.alert": "ÐžÐ±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ° Ð½Ð° Ñ€Ð°Ð´Ð½Ð¾Ñ˜ Ð¿Ð¾Ð²Ñ€ÑˆÐ¸Ð½Ð¸",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "ÐŸÐ¾Ð´Ñ€ÑˆÐºÐ¸:",
   "notifications.column_settings.show": "ÐŸÑ€Ð¸ÐºÐ°Ð¶Ð¸ Ñƒ ÐºÐ¾Ð»Ð¾Ð½Ð¸",
   "notifications.column_settings.sound": "ÐŸÑƒÑˆÑ‚Ð°Ñ˜ Ð·Ð²ÑƒÐº",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ°",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Closed",
   "poll.refresh": "Refresh",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð°Ð¼...",
   "video.close": "Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸ Ð²Ð¸Ð´ÐµÐ¾",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index c9251d73c53c596de47eadc50a974bbf19e4e7ca..a75cca8b5e1e81424019b96f01a5f81cecd68313 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -1,22 +1,24 @@
 {
-  "account.account_note_header": "Note",
+  "account.account_note_header": "Anteckning",
   "account.add_or_remove_from_list": "LÃ¤gg till i eller ta bort frÃ¥n listor",
   "account.badges.bot": "Robot",
   "account.badges.group": "Grupp",
   "account.block": "Blockera @{name}",
   "account.block_domain": "DÃ¶lj allt frÃ¥n {domain}",
   "account.blocked": "Blockerad",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "LÃ¤s mer pÃ¥ original profilen",
   "account.cancel_follow_request": "Avbryt fÃ¶ljarfÃ¶rfrÃ¥gan",
   "account.direct": "Skicka ett direktmeddelande till @{name}",
+  "account.disable_notifications": "Sluta meddela mig nÃ¤r @{name} tutar",
   "account.domain_blocked": "DomÃ¤n dold",
   "account.edit_profile": "Redigera profil",
+  "account.enable_notifications": "Meddela mig nÃ¤r @{name} tutar",
   "account.endorse": "Visa pÃ¥ profil",
   "account.follow": "FÃ¶lj",
   "account.followers": "FÃ¶ljare",
   "account.followers.empty": "Ingen fÃ¶ljer denna anvÃ¤ndare Ã¤n.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers_counter": "{count, plural, one {{counter} FÃ¶ljare} other {{counter} FÃ¶ljare}}",
+  "account.following_counter": "{count, plural, one {{counter} FÃ¶ljer} other {{counter} FÃ¶ljer}}",
   "account.follows.empty": "Denna anvÃ¤ndare fÃ¶ljer inte nÃ¥gon Ã¤n.",
   "account.follows_you": "FÃ¶ljer dig",
   "account.hide_reblogs": "DÃ¶lj knuffar frÃ¥n @{name}",
@@ -43,12 +45,12 @@
   "account.unfollow": "Sluta fÃ¶lj",
   "account.unmute": "Sluta tysta @{name}",
   "account.unmute_notifications": "Ã…teraktivera aviseringar frÃ¥n @{name}",
-  "account_note.placeholder": "Click to add a note",
+  "account_note.placeholder": "Klicka fÃ¶r att lÃ¤gga till anteckning",
   "alert.rate_limited.message": "VÃ¤nligen fÃ¶rsÃ¶k igen efter {retry_time, time, medium}.",
   "alert.rate_limited.title": "MÃ¤ngd begrÃ¤nsad",
   "alert.unexpected.message": "Ett ovÃ¤ntat fel uppstod.",
   "alert.unexpected.title": "Hoppsan!",
-  "announcement.announcement": "Announcement",
+  "announcement.announcement": "Meddelande",
   "autosuggest_hashtag.per_week": "{count} per vecka",
   "boost_modal.combo": "Du kan trycka {combo} fÃ¶r att slippa detta nÃ¤sta gÃ¥ng",
   "bundle_column_error.body": "NÃ¥got gick fel medan denna komponent laddades.",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "SÃ¶kresultat",
   "emoji_button.symbols": "Symboler",
   "emoji_button.travel": "Resor & platser",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Inga inlÃ¤gg hÃ¤r!",
   "empty_column.account_unavailable": "Profilen ej tillgÃ¤nglig",
   "empty_column.blocks": "Du har Ã¤nnu ej blockerat nÃ¥gra anvÃ¤ndare.",
@@ -166,13 +169,15 @@
   "empty_column.notifications": "Du har inga meddelanden Ã¤n. Interagera med andra fÃ¶r att starta konversationen.",
   "empty_column.public": "Det finns inget hÃ¤r! Skriv nÃ¥got offentligt, eller fÃ¶lj manuellt anvÃ¤ndarna frÃ¥n andra instanser fÃ¶r att fylla pÃ¥ det",
   "error.unexpected_crash.explanation": "PÃ¥ grund av en bugg i vÃ¥r kod eller kompatiblitetsproblem i webblÃ¤saren kan den hÃ¤r sidan inte visas korrekt.",
+  "error.unexpected_crash.explanation_addons": "Denna sida kunde inte visas korrekt. Detta beror troligen pÃ¥ ett webblÃ¤sartillÃ¤gg eller ett automatiskt Ã¶versÃ¤ttningsverktyg.",
   "error.unexpected_crash.next_steps": "Prova att ladda om sidan. Om det inte hjÃ¤lper kan du fÃ¶rsÃ¶ka anvÃ¤nda Mastodon med en annan webblÃ¤sare eller app.",
+  "error.unexpected_crash.next_steps_addons": "Prova att avaktivera dem och uppdatera sidan. Om detta inte hjÃ¤lper kan du fÃ¶rsÃ¶ka anvÃ¤nda Mastodon med en annan webblÃ¤sare eller en app.",
   "errors.unexpected_crash.copy_stacktrace": "Kopiera stacktrace till urklipp",
   "errors.unexpected_crash.report_issue": "Rapportera problem",
   "follow_request.authorize": "GodkÃ¤nn",
   "follow_request.reject": "Avvisa",
   "follow_requests.unlocked_explanation": "Ã„ven om ditt konto inte Ã¤r lÃ¥st tror {domain} personalen att du kanske vill granska dessa fÃ¶ljares fÃ¶rfrÃ¥gningar manuellt.",
-  "generic.saved": "Saved",
+  "generic.saved": "Sparad",
   "getting_started.developers": "Utvecklare",
   "getting_started.directory": "Profilkatalog",
   "getting_started.documentation": "Dokumentation",
@@ -236,13 +241,13 @@
   "keyboard_shortcuts.muted": "fÃ¶r att Ã¶ppna listan Ã¶ver tystade anvÃ¤ndare",
   "keyboard_shortcuts.my_profile": "fÃ¶r att Ã¶ppna din profil",
   "keyboard_shortcuts.notifications": "fÃ¶r att Ã¶ppna Meddelanden",
-  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.open_media": "Ã¶ppna media",
   "keyboard_shortcuts.pinned": "fÃ¶r att Ã¶ppna NÃ¥lade toots",
   "keyboard_shortcuts.profile": "fÃ¶r att Ã¶ppna skaparens profil",
   "keyboard_shortcuts.reply": "fÃ¶r att svara",
   "keyboard_shortcuts.requests": "fÃ¶r att Ã¶ppna FÃ¶ljfÃ¶rfrÃ¥gningar",
   "keyboard_shortcuts.search": "fÃ¶r att fokusera sÃ¶kfÃ¤ltet",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "visa/dÃ¶lja CW-fÃ¤lt",
   "keyboard_shortcuts.start": "fÃ¶r att Ã¶ppna \"Kom igÃ¥ng\"-kolumnen",
   "keyboard_shortcuts.toggle_hidden": "fÃ¶r att visa/gÃ¶mma text bakom CW",
   "keyboard_shortcuts.toggle_sensitivity": "fÃ¶r att visa/gÃ¶mma media",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "fÃ¶r att avfokusera skrivfÃ¤lt/sÃ¶kfÃ¤lt",
   "keyboard_shortcuts.up": "fÃ¶r att flytta uppÃ¥t i listan",
   "lightbox.close": "StÃ¤ng",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "NÃ¤sta",
   "lightbox.previous": "Tidigare",
-  "lightbox.view_context": "Visa kontext",
   "lists.account.add": "LÃ¤gg till i lista",
   "lists.account.remove": "Ta bort frÃ¥n lista",
   "lists.delete": "Radera lista",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Ã„ndra titel",
   "lists.new.create": "LÃ¤gg till lista",
   "lists.new.title_placeholder": "Ny listrubrik",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "SÃ¶k bland personer du fÃ¶ljer",
   "lists.subheading": "Dina listor",
   "load_pending": "{count, plural, other {# objekt}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "VÃ¤xla synlighet",
   "missing_indicator.label": "Hittades inte",
   "missing_indicator.sublabel": "Den hÃ¤r resursen kunde inte hittas",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "DÃ¶lj aviseringar frÃ¥n denna anvÃ¤ndare?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobilappar",
   "navigation_bar.blocks": "Blockerade anvÃ¤ndare",
   "navigation_bar.bookmarks": "BokmÃ¤rken",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Din rÃ¶stning har avslutats",
   "notification.poll": "En omrÃ¶stning du rÃ¶stat i har avslutats",
   "notification.reblog": "{name} knuffade din status",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Rensa aviseringar",
   "notifications.clear_confirmation": "Ã„r du sÃ¤ker pÃ¥ att du vill rensa alla dina aviseringar permanent?",
   "notifications.column_settings.alert": "Skrivbordsaviseringar",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Knuffar:",
   "notifications.column_settings.show": "Visa i kolumnen",
   "notifications.column_settings.sound": "Spela upp ljud",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "Alla",
   "notifications.filter.boosts": "Knuffar",
   "notifications.filter.favourites": "Favoriter",
   "notifications.filter.follows": "FÃ¶ljer",
   "notifications.filter.mentions": "OmnÃ¤mningar",
   "notifications.filter.polls": "OmrÃ¶stningsresultat",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} aviseringar",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "notifications_permission_banner.how_to_control": "FÃ¶r att ta emot aviseringar nÃ¤r Mastodon inte Ã¤r Ã¶ppet, aktivera skrivbordsaviseringar. NÃ¤r de Ã¤r aktiverade kan du styra exakt vilka typer av interaktioner som aviseras via {icon} -knappen ovan.",
+  "notifications_permission_banner.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "StÃ¤ngd",
   "poll.refresh": "Ladda om",
   "poll.total_people": "{persons, plural, one {# person} other {# personer}}",
@@ -419,11 +443,11 @@
   "time_remaining.minutes": "{minutes, plural, one {1 minut} other {# minuter}} kvar",
   "time_remaining.moments": "Ã…terstÃ¥ende tillfÃ¤llen",
   "time_remaining.seconds": "{hours, plural, one {# sekund} other {# sekunder}} kvar",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "timeline_hint.remote_resource_not_displayed": "{resource} frÃ¥n andra servrar visas inte.",
+  "timeline_hint.resources.followers": "FÃ¶ljare",
+  "timeline_hint.resources.follows": "FÃ¶ljer",
+  "timeline_hint.resources.statuses": "Ã„ldre tutningar",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} personer}} pratar",
   "trends.trending_now": "Trendar nu",
   "ui.beforeunload": "Ditt utkast kommer att fÃ¶rloras om du lÃ¤mnar Mastodon.",
   "units.short.billion": "{count}B",
@@ -433,19 +457,20 @@
   "upload_button.label": "LÃ¤gg till media",
   "upload_error.limit": "FilÃ¶verfÃ¶ringsgrÃ¤nsen Ã¶verskriden.",
   "upload_error.poll": "Filuppladdning tillÃ¥ts inte med omrÃ¶stningar.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_form.audio_description": "Beskriv fÃ¶r personer med hÃ¶rselnedsÃ¤ttning",
   "upload_form.description": "Beskriv fÃ¶r synskadade",
   "upload_form.edit": "Redigera",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "Ã„ndra miniatyr",
   "upload_form.undo": "Ta bort",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_form.video_description": "Beskriv fÃ¶r personer med hÃ¶rsel- eller synnedsÃ¤ttning",
   "upload_modal.analyzing_picture": "Analyserar bildâ€¦",
   "upload_modal.apply": "VerkstÃ¤ll",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "VÃ¤lj bild",
   "upload_modal.description_placeholder": "En snabb brun rÃ¤v hoppar Ã¶ver den lata hunden",
   "upload_modal.detect_text": "UpptÃ¤ck bildens text",
   "upload_modal.edit_media": "Redigera meida",
   "upload_modal.hint": "Klicka eller dra cirkeln pÃ¥ fÃ¶rhandstitten fÃ¶r att vÃ¤lja den fokusering som alltid kommer synas pÃ¥ alla miniatyrer.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "FÃ¶rhandstitt ({ratio})",
   "upload_progress.label": "Laddar upp...",
   "video.close": "StÃ¤ng video",
diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json
index e5d833fe87465898b1831bb4ceb749f69e1f8e65..70f6ab1529e76eb2ac320779468d4f934d169e1a 100644
--- a/app/javascript/mastodon/locales/szl.json
+++ b/app/javascript/mastodon/locales/szl.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Cancel follow request",
   "account.direct": "Direct message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain blocked",
   "account.edit_profile": "Edit profile",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
   "account.follow": "Follow",
   "account.followers": "Followers",
@@ -96,9 +98,9 @@
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "Write your warning here",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No toots here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "Authorize",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
-  "lightbox.view_context": "View context",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Change title",
   "lists.new.create": "Add list",
   "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Search among people you follow",
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.alert": "Desktop notifications",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Closed",
   "poll.refresh": "Refresh",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -389,7 +413,7 @@
   "status.pinned": "Pinned toot",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploadingâ€¦",
   "video.close": "Close video",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 28f03f7811300b8a29537bb1b51dbb4b46bd37d4..8f5f06cc487223f2663b8240e50030887faa4e66 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -1,22 +1,24 @@
 {
-  "account.account_note_header": "Note",
+  "account.account_note_header": "à®•à¯à®±à®¿à®ªà¯à®ªà¯",
   "account.add_or_remove_from_list": "à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à¯à®•à®³à®¿à®²à¯ à®šà¯‡à®°à¯/à®¨à¯€à®•à¯à®•à¯",
   "account.badges.bot": "à®ªà®¾à®Ÿà¯",
   "account.badges.group": "à®•à¯à®´à¯",
   "account.block": "@{name} -à®à®¤à¯ à®¤à®Ÿà¯",
   "account.block_domain": "{domain} à®¯à®¿à®²à¯ à®‡à®°à¯à®¨à¯à®¤à¯ à®µà®°à¯à®®à¯ à®Žà®²à¯à®²à®¾à®µà®±à¯à®±à¯ˆà®¯à¯à®®à¯ à®®à®±à¯ˆ",
   "account.blocked": "à®®à¯à®Ÿà®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "à®®à¯‡à®²à¯à®®à¯ à®‰à®²à®¾à®µ à®šà¯à®¯à®µà®¿à®µà®°à®¤à¯à®¤à®¿à®±à¯à®•à¯à®šà¯ à®šà¯†à®²à¯à®•",
   "account.cancel_follow_request": "à®ªà®¿à®©à¯à®¤à¯Šà®Ÿà®°à¯à®®à¯ à®•à¯‹à®°à®¿à®•à¯à®•à¯ˆà®¯à¯ˆ à®¨à®¿à®°à®¾à®•à®°à®¿",
   "account.direct": "à®¨à¯‡à®°à®Ÿà®¿ à®šà¯†à®¯à¯à®¤à®¿ @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "à®®à®±à¯ˆà®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯ à®¤à®³à®™à¯à®•à®³à¯",
   "account.edit_profile": "à®šà¯à®¯à®µà®¿à®µà®°à®¤à¯à®¤à¯ˆ à®®à®¾à®±à¯à®±à¯",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "à®šà¯à®¯à®µà®¿à®µà®°à®¤à¯à®¤à®¿à®²à¯ à®µà¯†à®³à®¿à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯",
   "account.follow": "à®ªà®¿à®©à¯à®¤à¯Šà®Ÿà®°à¯",
   "account.followers": "à®ªà®¿à®©à¯à®¤à¯Šà®Ÿà®°à¯à®ªà®µà®°à¯à®•à®³à¯",
   "account.followers.empty": "à®‡à®¤à¯à®µà®°à¯ˆ à®¯à®¾à®°à¯à®®à¯ à®‡à®¨à¯à®¤ à®ªà®¯à®©à®°à¯ˆà®ªà¯ à®ªà®¿à®©à¯à®¤à¯Šà®Ÿà®°à®µà®¿à®²à¯à®²à¯ˆ.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers_counter": "{count, plural, one {{counter} à®µà®¾à®šà®•à®°à¯} other {{counter} à®µà®¾à®šà®•à®°à¯à®•à®³à¯}}",
+  "account.following_counter": "{count, plural,one {{counter} à®šà®¨à¯à®¤à®¾} other {{counter} à®šà®¨à¯à®¤à®¾à®•à¯à®•à®³à¯}}",
   "account.follows.empty": "à®‡à®¨à¯à®¤ à®ªà®¯à®©à®°à¯ à®‡à®¤à¯à®µà®°à¯ˆ à®¯à®¾à®°à¯ˆà®¯à¯à®®à¯ à®ªà®¿à®©à¯à®¤à¯Šà®Ÿà®°à®µà®¿à®²à¯à®²à¯ˆ.",
   "account.follows_you": "à®‰à®™à¯à®•à®³à¯ˆà®ªà¯ à®ªà®¿à®©à¯à®¤à¯Šà®Ÿà®°à¯à®•à®¿à®±à®¾à®°à¯",
   "account.hide_reblogs": "à®‡à®°à¯à®¨à¯à®¤à¯ à®Šà®•à¯à®•à®¿à®¯à®¾à®• à®®à®±à¯ˆ @{name}",
@@ -36,14 +38,14 @@
   "account.requested": "à®’à®ªà¯à®ªà¯à®¤à®²à¯à®•à¯à®•à®¾à®•à®•à¯ à®•à®¾à®¤à¯à®¤à®¿à®°à¯à®•à¯à®•à®¿à®±à®¤à¯. à®ªà®¿à®©à¯à®¤à¯Šà®Ÿà®°à¯à®®à¯ à®•à¯‹à®°à®¿à®•à¯à®•à¯ˆà®¯à¯ˆ à®¨à¯€à®•à¯à®• à®…à®´à¯à®¤à¯à®¤à®µà¯à®®à¯",
   "account.share": "@{name} à®‰à®Ÿà¯ˆà®¯ à®µà®¿à®µà®°à®¤à¯à®¤à¯ˆ à®ªà®•à®¿à®°à¯",
   "account.show_reblogs": "à®•à®¾à®Ÿà¯à®Ÿà¯ boosts à®‡à®°à¯à®¨à¯à®¤à¯ @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, one {{counter} à®Ÿà¯‚à®Ÿà¯} other {{counter} à®Ÿà¯‚à®Ÿà¯à®Ÿà¯à®•à®³à¯}}",
   "account.unblock": "@{name} à®®à¯€à®¤à¯ à®¤à®Ÿà¯ˆ à®¨à¯€à®•à¯à®•à¯à®•",
   "account.unblock_domain": "{domain} à® à®•à®¾à®£à¯à®ªà®¿",
   "account.unendorse": "à®šà¯à®¯à®µà®¿à®µà®°à®¤à¯à®¤à®¿à®²à¯ à®‡à®Ÿà®®à¯à®ªà¯†à®± à®µà¯‡à®£à¯à®Ÿà®¾à®®à¯",
   "account.unfollow": "à®ªà®¿à®©à¯à®¤à¯Šà®Ÿà®°à¯à®µà®¤à¯ˆ à®¨à®¿à®±à¯à®¤à¯à®¤à¯à®•",
   "account.unmute": "@{name} à®‡à®©à¯ à®®à¯€à®¤à¯ à®®à¯Œà®©à®¤à¯ à®¤à®Ÿà¯ˆà®¯à¯ˆ à®¨à¯€à®•à¯à®•à¯à®•",
   "account.unmute_notifications": "@{name} à®‡à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®…à®±à®¿à®µà®¿à®ªà¯à®ªà¯à®•à®³à®¿à®©à¯ à®®à¯€à®¤à¯ à®®à¯Œà®©à®¤à¯ à®¤à®Ÿà¯ˆà®¯à¯ˆ à®¨à¯€à®•à¯à®•à¯à®•",
-  "account_note.placeholder": "Click to add a note",
+  "account_note.placeholder": "à®•à¯à®±à®¿à®ªà¯à®ªà¯ à®’à®©à¯à®±à¯ˆ à®šà¯‡à®°à¯à®•à¯à®• à®šà¯Šà®Ÿà¯à®•à¯à®•à®µà¯à®®à¯",
   "alert.rate_limited.message": "{retry_time, time, medium} à®•à¯à®•à¯ à®ªà®¿à®±à®•à¯ à®®à¯€à®£à¯à®Ÿà¯à®®à¯ à®®à¯à®¯à®±à¯à®šà®¿à®•à¯à®•à®µà¯à®®à¯.",
   "alert.rate_limited.title": "à®ªà®¯à®©à¯à®ªà®¾à®Ÿà¯ à®•à®Ÿà¯à®Ÿà¯à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯",
   "alert.unexpected.message": "à®Žà®¤à®¿à®°à¯à®ªà®¾à®°à®¾à®¤ à®ªà®¿à®´à¯ˆ à®à®±à¯à®ªà®Ÿà¯à®Ÿà¯à®µà®¿à®Ÿà¯à®Ÿà®¤à¯.",
@@ -79,9 +81,9 @@
   "column_header.show_settings": "à®…à®®à¯ˆà®ªà¯à®ªà¯à®•à®³à¯ˆà®•à¯ à®•à®¾à®Ÿà¯à®Ÿà¯",
   "column_header.unpin": "à®•à®´à®Ÿà¯à®Ÿà¯",
   "column_subheading.settings": "à®…à®®à¯ˆà®ªà¯à®ªà¯à®•à®³à¯",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "à®…à®°à¯à®•à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®®à®Ÿà¯à®Ÿà¯à®®à¯‡",
   "community.column_settings.media_only": "à®ªà®Ÿà®™à¯à®•à®³à¯ à®®à®Ÿà¯à®Ÿà¯à®®à¯‡",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "à®¤à¯Šà®²à¯ˆà®µà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®®à®Ÿà¯à®Ÿà¯à®®à¯‡",
   "compose_form.direct_message_warning": "à®‡à®¨à¯à®¤ à®Ÿà¯‚à®Ÿà¯ à®‡à®¤à®¿à®²à¯ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³ à®ªà®¯à®©à®°à¯à®•à®³à¯à®•à¯à®•à¯ à®®à®Ÿà¯à®Ÿà¯à®®à¯‡ à®…à®©à¯à®ªà¯à®ªà®ªà¯à®ªà®Ÿà¯à®®à¯.",
   "compose_form.direct_message_warning_learn_more": "à®®à¯‡à®²à¯à®®à¯ à®…à®±à®¿à®¯",
   "compose_form.hashtag_warning": "à®‡à®¤à¯ à®’à®°à¯ à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à®¿à®Ÿà®ªà¯à®ªà®Ÿà®¾à®¤ à®Ÿà¯‚à®Ÿà¯ à®Žà®©à¯à®ªà®¤à®¾à®²à¯ à®Žà®¨à¯à®¤ à®¹à¯‡à®·à¯à®Ÿà¯‡à®•à®¿à®©à¯ à®•à¯€à®´à¯à®®à¯ à®µà®°à®¾à®¤à¯. à®¹à¯‡à®·à¯à®Ÿà¯‡à®•à®¿à®©à¯ à®®à¯‚à®²à®®à¯ à®ªà¯Šà®¤à¯à®µà®¿à®²à¯ à®‰à®³à¯à®³ à®Ÿà¯‚à®Ÿà¯à®Ÿà¯à®•à®³à¯ˆ à®®à®Ÿà¯à®Ÿà¯à®®à¯‡ à®¤à¯‡à®Ÿ à®®à¯à®Ÿà®¿à®¯à¯à®®à¯.",
@@ -127,7 +129,7 @@
   "conversation.mark_as_read": "à®ªà®Ÿà®¿à®•à¯à®•à®ªà®Ÿà¯à®Ÿà®¤à®¾à®•à®•à¯ à®•à¯à®±à®¿",
   "conversation.open": "à®‰à®°à¯ˆà®¯à®¾à®Ÿà®²à¯ˆà®•à¯ à®•à®¾à®Ÿà¯à®Ÿà¯",
   "conversation.with": "{names} à®‰à®Ÿà®©à¯",
-  "directory.federated": "à®†à®²à®®à®°à®¤à¯à®¤à®¿à®©à¯ à®…à®±à®¿à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿà®ªà¯ à®ªà®•à¯à®¤à®¿à®¯à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯",
+  "directory.federated": "à®…à®±à®¿à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿ à®ƒà®ªà¯†à®Ÿà®¿à®µà¯†à®°à¯à®šà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯",
   "directory.local": "{domain} à®•à®³à®¤à¯à®¤à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®®à®Ÿà¯à®Ÿà¯à®®à¯",
   "directory.new_arrivals": "à®ªà¯à®¤à®¿à®¯ à®µà®°à®µà¯",
   "directory.recently_active": "à®šà®±à¯à®±à¯à®®à¯à®©à¯ à®šà¯†à®¯à®²à¯à®ªà®¾à®Ÿà¯à®Ÿà®¿à®²à¯ à®‡à®°à¯à®¨à¯à®¤à®µà®°à¯à®•à®³à¯",
@@ -139,7 +141,7 @@
   "emoji_button.food": "à®‰à®£à®µà¯ à®®à®±à¯à®±à¯à®®à¯ à®ªà®¾à®©à®®à¯",
   "emoji_button.label": "à®Žà®®à¯‹à®œà®¿à®¯à¯ˆ à®‰à®³à¯à®³à®¿à®Ÿà¯",
   "emoji_button.nature": "à®‡à®¯à®±à¯à®•à¯ˆ",
-  "emoji_button.not_found": "à®µà¯‡à®£à¯à®Ÿà®¾à®®à¯ à®Žà®®à¯‹à®œà¯‹à®¸à¯! (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
+  "emoji_button.not_found": "à®Žà®®à¯‹à®œà®¿à®•à¯à®•à®³à¯ à®‡à®²à¯à®²à¯ˆ! (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
   "emoji_button.objects": "à®ªà¯Šà®°à¯à®Ÿà¯à®•à®³à¯",
   "emoji_button.people": "à®®à®•à¯à®•à®³à¯",
   "emoji_button.recent": "à®…à®Ÿà®¿à®•à¯à®•à®Ÿà®¿ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®ªà®µà¯ˆ",
@@ -147,88 +149,91 @@
   "emoji_button.search_results": "à®¤à¯‡à®Ÿà®²à¯ à®®à¯à®Ÿà®¿à®µà¯à®•à®³à¯",
   "emoji_button.symbols": "à®•à¯à®±à®¿à®¯à¯€à®Ÿà¯à®•à®³à¯",
   "emoji_button.travel": "à®šà¯à®±à¯à®±à¯à®²à®¾ à®®à®±à¯à®±à¯à®®à¯ à®‡à®Ÿà®™à¯à®•à®³à¯",
-  "empty_column.account_timeline": "à®‡à®²à¯à®²à¯ˆ toots à®‡à®™à¯à®•à¯‡!",
+  "empty_column.account_suspended": "Account suspended",
+  "empty_column.account_timeline": "à®Ÿà¯‚à®Ÿà¯à®Ÿà¯à®•à®³à¯ à®à®¤à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ!",
   "empty_column.account_unavailable": "à®šà¯à®¯à®µà®¿à®µà®°à®®à¯ à®•à®¿à®Ÿà¯ˆà®•à¯à®•à®µà®¿à®²à¯à®²à¯ˆ",
-  "empty_column.blocks": "à®‡à®¤à¯à®µà®°à¯ˆ à®Žà®¨à¯à®¤ à®ªà®¯à®©à®°à¯à®•à®³à¯à®®à¯ à®¤à®Ÿà¯à®•à¯à®•à®µà®¿à®²à¯à®²à¯ˆ.",
+  "empty_column.blocks": "à®¨à¯€à®™à¯à®•à®³à¯ à®‡à®¤à¯à®µà®°à¯ˆ à®Žà®¨à¯à®¤à®ªà¯ à®ªà®¯à®©à®°à¯à®•à®³à¯ˆà®¯à¯à®®à¯ à®®à¯à®Ÿà®•à¯à®•à®¿à®¯à®¿à®°à¯à®•à¯à®•à®µà®¿à®²à¯à®²à¯ˆ.",
   "empty_column.bookmarked_statuses": "à®‰à®™à¯à®•à®³à®¿à®Ÿà®®à¯ à®…à®Ÿà¯ˆà®¯à®¾à®³à®•à¯à®•à¯à®±à®¿à®¯à®¿à®Ÿà¯à®Ÿ à®Ÿà¯‚à®Ÿà¯à®Ÿà¯à®•à®³à¯ à®Žà®µà¯ˆà®¯à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ. à®…à®Ÿà¯ˆà®¯à®¾à®³à®•à¯à®•à¯à®±à®¿à®¯à®¿à®Ÿà¯à®Ÿ à®ªà®¿à®±à®•à¯ à®…à®µà¯ˆ à®‡à®™à¯à®•à¯‡ à®•à®¾à®Ÿà¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®®à¯.",
-  "empty_column.community": "à®‰à®³à¯à®³à¯‚à®°à¯ à®•à®¾à®²à®•à¯à®•à¯†à®Ÿà¯ à®•à®¾à®²à®¿à®¯à®¾à®• à®‰à®³à¯à®³à®¤à¯. à®ªà®¨à¯à®¤à¯ˆ à®‰à®°à¯à®Ÿà¯à®Ÿà®¿à®•à¯à®•à¯Šà®³à¯à®µà®¤à®±à¯à®•à¯ à®ªà®•à®¿à®°à®™à¯à®•à®®à®¾à®• à®’à®©à¯à®±à¯ˆ à®Žà®´à¯à®¤à¯à®™à¯à®•à®³à¯!",
-  "empty_column.direct": "à®‰à®™à¯à®•à®³à®¿à®Ÿà®®à¯ à®¨à¯‡à®°à®Ÿà®¿à®¯à®¾à®© à®šà¯†à®¯à¯à®¤à®¿à®•à®³à¯ à®Žà®¤à¯à®µà¯à®®à¯ à®‡à®²à¯à®²à¯ˆ. à®¨à¯€à®™à¯à®•à®³à¯ à®’à®©à¯à®±à¯ˆ à®…à®©à¯à®ªà¯à®ªà®¿ à®…à®²à¯à®²à®¤à¯ à®ªà¯†à®±à¯à®®à¯ à®ªà¯‹à®¤à¯, à®…à®¤à¯ à®‡à®™à¯à®•à¯‡ à®•à®¾à®£à¯à®ªà®¿à®•à¯à®•à¯à®®à¯.",
-  "empty_column.domain_blocks": "à®‡à®©à¯à®©à¯à®®à¯ à®®à®±à¯ˆà®¨à¯à®¤ à®•à®³à®™à¯à®•à®³à¯ à®‡à®²à¯à®²à¯ˆ.",
-  "empty_column.favourited_statuses": "à®‡à®¤à¯à®µà®°à¯ˆ à®‰à®™à¯à®•à®³à¯à®•à¯à®•à¯ à®ªà®¿à®Ÿà®¿à®¤à¯à®¤ à®Ÿà¯‹à®Ÿà¯à®Ÿà¯à®•à®³à¯ à®‡à®²à¯à®²à¯ˆ. à®‰à®™à¯à®•à®³à¯à®•à¯à®•à¯ à®ªà®¿à®Ÿà®¿à®¤à¯à®¤ à®’à®°à¯ à®ªà¯‹à®¤à¯, à®…à®¤à¯ à®‡à®™à¯à®•à¯‡ à®•à®¾à®£à¯à®ªà®¿à®•à¯à®•à¯à®®à¯.",
-  "empty_column.favourites": "à®‡à®¤à¯à®µà®°à¯ˆ à®¯à®¾à®°à¯à®®à¯ à®‡à®¨à¯à®¤à®¤à¯ à®¤à®Ÿà¯à®Ÿà¯à®•à¯à®•à¯ à®†à®¤à®°à®µà®¿à®²à¯à®²à¯ˆ. à®¯à®¾à®°à®¾à®µà®¤à¯ à®šà¯†à®¯à¯à®¤à®¾à®²à¯, à®…à®µà®°à¯à®•à®³à¯ à®‡à®™à¯à®•à¯‡ à®•à®¾à®£à¯à®ªà®¾à®°à¯à®•à®³à¯.",
-  "empty_column.follow_requests": "à®‰à®™à¯à®•à®³à¯à®•à¯à®•à¯ à®‡à®©à¯à®©à¯à®®à¯ à®Žà®¨à¯à®¤à®µà¯Šà®°à¯ à®•à¯‹à®°à®¿à®•à¯à®•à¯ˆà®•à®³à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ. à®¨à¯€à®™à¯à®•à®³à¯ à®’à®©à¯à®±à¯ˆà®ªà¯ à®ªà¯†à®±à¯à®±à¯à®•à¯à®•à¯Šà®£à¯à®Ÿà®¾à®²à¯, à®…à®¤à¯ à®‡à®™à¯à®•à¯‡ à®•à®¾à®£à¯à®ªà®¿à®•à¯à®•à¯à®®à¯.",
-  "empty_column.hashtag": "à®‡à®©à¯à®©à¯à®®à¯ à®‡à®¨à¯à®¤ à®¹à¯‡à®¸à¯à®Ÿà¯‡à®•à¯à®•à®¿à®²à¯ à®Žà®¤à¯à®µà¯à®®à¯ à®‡à®²à¯à®²à¯ˆ.",
-  "empty_column.home": "à®‰à®™à¯à®•à®³à¯ à®µà¯€à®Ÿà¯à®Ÿà¯à®•à¯ à®•à®¾à®²à®®à¯ à®•à®¾à®²à®¿à®¯à®¾à®• à®‰à®³à¯à®³à®¤à¯! à®µà®°à¯à®•à¯ˆ {public} à®…à®²à¯à®²à®¤à¯ à®¤à¯Šà®Ÿà®™à¯à®•à¯à®µà®¤à®±à¯à®•à¯ à®¤à¯‡à®Ÿà®²à¯ˆà®ªà¯ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à®¾à®®à¯ à®®à®±à¯à®±à¯à®®à¯ à®ªà®¿à®± à®ªà®¯à®©à®°à¯à®•à®³à¯ˆ à®šà®¨à¯à®¤à®¿à®•à¯à®•à®µà¯à®®à¯.",
-  "empty_column.home.public_timeline": "à®ªà¯Šà®¤à¯ à®•à®¾à®²à®•à¯à®•à¯†à®Ÿà¯",
-  "empty_column.list": "à®‡à®¨à¯à®¤ à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ à®‡à®¤à¯à®µà®°à¯ˆ à®Žà®¤à¯à®µà¯à®®à¯ à®‡à®²à¯à®²à¯ˆ. à®‡à®¨à¯à®¤ à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à®¿à®©à¯ à®‰à®±à¯à®ªà¯à®ªà®¿à®©à®°à¯à®•à®³à¯ à®ªà¯à®¤à®¿à®¯ à®¨à®¿à®²à¯ˆà®•à®³à¯ˆ à®‡à®Ÿà¯à®•à¯ˆà®¯à®¿à®Ÿà¯à®•à¯ˆà®¯à®¿à®²à¯, à®…à®µà¯ˆ à®‡à®™à¯à®•à¯‡ à®¤à¯‹à®©à¯à®±à¯à®®à¯.",
-  "empty_column.lists": "à®‰à®™à¯à®•à®³à¯à®•à¯à®•à¯ à®‡à®¤à¯à®µà®°à¯ˆ à®Žà®¨à¯à®¤ à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ. à®¨à¯€à®™à¯à®•à®³à¯ à®’à®©à¯à®±à¯ˆ à®‰à®°à¯à®µà®¾à®•à¯à®•à®¿à®©à®¾à®²à¯, à®…à®¤à¯ à®‡à®™à¯à®•à¯‡ à®•à®¾à®£à¯à®ªà®¿à®•à¯à®•à¯à®®à¯.",
-  "empty_column.mutes": "à®¨à¯€à®™à¯à®•à®³à¯ à®‡à®¤à¯à®µà®°à¯ˆ à®Žà®¨à¯à®¤ à®ªà®¯à®©à®°à¯à®•à®³à¯ˆà®¯à¯à®®à¯ à®®à¯à®Ÿà®•à¯à®•à®¿à®¯à®¿à®°à¯à®•à¯à®•à®µà®¿à®²à¯à®²à¯ˆ.",
-  "empty_column.notifications": "à®‰à®™à¯à®•à®³à®¿à®Ÿà®®à¯ à®Žà®¨à¯à®¤ à®…à®±à®¿à®µà®¿à®ªà¯à®ªà¯à®•à®³à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ. à®‰à®°à¯ˆà®¯à®¾à®Ÿà®²à¯ˆà®¤à¯ à®¤à¯Šà®Ÿà®™à¯à®• à®ªà®¿à®±à®°à¯à®Ÿà®©à¯ à®¤à¯Šà®Ÿà®°à¯à®ªà¯à®•à¯Šà®³à¯à®³à®µà¯à®®à¯.",
-  "empty_column.public": "à®‡à®™à¯à®•à¯‡ à®Žà®¤à¯à®µà¯à®®à¯ à®‡à®²à¯à®²à¯ˆ! à®ªà®•à®¿à®°à®™à¯à®•à®®à®¾à®• à®’à®©à¯à®±à¯ˆ à®Žà®´à¯à®¤à®µà¯à®®à¯ à®…à®²à¯à®²à®¤à¯ à®®à®±à¯à®± à®¨à®¿à®•à®´à¯à®µà¯à®•à®³à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®ªà®¯à®©à®°à¯à®•à®³à¯ˆ à®…à®¤à¯ˆ à®¨à®¿à®°à®ªà¯à®ªà¯à®µà®¤à®±à¯à®•à¯ à®•à¯ˆà®®à¯à®±à¯ˆà®¯à®¾à®• à®ªà®¿à®©à¯à®ªà®±à¯à®±à®µà¯à®®à¯",
-  "error.unexpected_crash.explanation": "à®®à¯†à®©à¯à®ªà¯Šà®°à¯à®³à¯ à®ªà®´à¯à®¤à¯à®©à®¾à®²à¯‹ à®…à®²à¯à®²à®¤à¯ à®‰à®™à¯à®•à®³à¯ à®‡à®£à¯ˆ à®‰à®²à®¾à®µà®¿à®¯à®¿à®©à¯ à®ªà¯Šà®°à¯à®¨à¯à®¤à®¾à®¤à®©à¯à®®à¯ˆà®¯à®¿à®©à®¾à®²à¯‹ à®‡à®¨à¯à®¤à®ªà¯ à®ªà®•à¯à®•à®¤à¯à®¤à¯ˆ à®šà®°à®¿à®¯à®¾à®•à®•à¯ à®•à®¾à®£à¯à®ªà®¿à®•à¯à®• à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ.",
-  "error.unexpected_crash.next_steps": "à®ªà®•à¯à®•à®¤à¯à®¤à¯ˆ à®ªà¯à®¤à¯à®ªà¯à®ªà®¿à®¤à¯à®¤à¯à®ªà¯ à®ªà®¾à®°à¯à®•à¯à®•à®µà¯à®®à¯. à®µà¯‡à®²à¯ˆ à®šà¯†à®¯à¯à®¯à®µà®¿à®²à¯à®²à¯ˆà®¯à¯†à®©à®¿à®²à¯, à®µà¯‡à®±à¯ à®’à®°à¯ à®‰à®²à®¾à®µà®¿à®¯à®¿à®²à¯ à®‡à®°à¯à®¨à¯à®¤à¯‹ à®…à®²à¯à®²à®¤à¯ à®‰à®™à¯à®•à®³à¯ à®•à®°à¯à®µà®¿à®•à¯à®•à¯ à®ªà¯Šà®°à¯à®¤à¯à®¤à®®à®¾à®© à®µà¯‡à®±à¯ à®šà¯†à®¯à®²à®¿à®¯à®¿à®²à¯ à®‡à®°à¯à®¨à¯à®¤à¯‹ à®®à®šà¯à®Ÿà¯‹à®Ÿà®©à¯ˆà®ªà¯ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯.",
-  "errors.unexpected_crash.copy_stacktrace": "à®ªà®´à¯à®šà¯†à®¯à¯à®¤à®¿à®¯à¯ˆ à®ªà®¿à®Ÿà®¿à®ªà¯à®ªà¯à®ªà¯ à®ªà®²à®•à¯ˆà®•à¯à®•à¯ à®¨à®•à®²à¯ à®Žà®Ÿà¯",
+  "empty_column.community": "à®‰à®™à¯à®•à®³à¯ à®®à®¾à®¸à¯à®Ÿà®Ÿà®¾à®©à¯ à®®à¯à®šà¯à®šà®¨à¯à®¤à®¿à®¯à®¿à®²à¯ à®¯à®¾à®°à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ. à®Žà®¤à¯ˆà®¯à¯‡à®©à¯à®®à¯ à®Žà®´à¯à®¤à®¿ à®†à®Ÿà¯à®Ÿà®¤à¯à®¤à¯ˆà®¤à¯ à®¤à¯à®µà®•à¯à®•à¯à®™à¯à®•à®³à¯!",
+  "empty_column.direct": "à®‰à®™à¯à®•à®³à¯ à®¤à®©à®¿à®ªà¯à®ªà¯†à®Ÿà¯à®Ÿà®¿à®¯à®¿à®²à¯ à®šà¯†à®¯à¯à®¤à®¿à®•à®³à¯ à®à®¤à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ. à®šà¯†à®¯à¯à®¤à®¿à®¯à¯ˆ à®¨à¯€à®™à¯à®•à®³à¯ à®…à®©à¯à®ªà¯à®ªà¯à®®à¯à®ªà¯‹à®¤à¯‹ à®…à®²à¯à®²à®¤à¯ à®ªà¯†à®±à¯à®®à¯à®ªà¯‹à®¤à¯‹, à®…à®¤à¯ à®‡à®™à¯à®•à¯‡ à®•à®¾à®£à¯à®ªà®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®®à¯.",
+  "empty_column.domain_blocks": "à®¤à®Ÿà¯à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®•à¯ à®•à®³à®™à¯à®•à®³à¯ à®‡à®¤à¯à®µà®°à¯ˆ à®‡à®²à¯à®²à¯ˆ.",
+  "empty_column.favourited_statuses": "à®‰à®™à¯à®•à®³à¯à®•à¯à®•à¯à®ªà¯ à®ªà®¿à®Ÿà®¿à®¤à¯à®¤ à®Ÿà¯‚à®Ÿà¯à®Ÿà¯à®•à®³à¯ à®‡à®¤à¯à®µà®°à¯ˆ à®‡à®²à¯à®²à¯ˆ. à®’à®°à¯ à®Ÿà¯‚à®Ÿà¯à®Ÿà®¿à®²à¯ à®¨à¯€à®™à¯à®•à®³à¯ à®µà®¿à®°à¯à®ªà¯à®ªà®•à¯à®•à¯à®±à®¿ à®‡à®Ÿà¯à®Ÿà®¾à®²à¯, à®…à®¤à¯ à®‡à®™à¯à®•à¯‡ à®•à®¾à®£à¯à®ªà®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®®à¯.",
+  "empty_column.favourites": "à®‡à®¨à¯à®¤ à®Ÿà¯‚à®Ÿà¯à®Ÿà®¿à®²à¯ à®‡à®¤à¯à®µà®°à¯ˆ à®¯à®¾à®°à¯à®®à¯ à®µà®¿à®°à¯à®ªà¯à®ªà®•à¯à®•à¯à®±à®¿ à®‡à®Ÿà®µà®¿à®²à¯à®²à¯ˆ. à®¯à®¾à®°à¯‡à®©à¯à®®à¯ à®µà®¿à®°à¯à®®à¯à®ªà®¿à®©à®¾à®²à¯, à®…à®¤à¯ à®‡à®™à¯à®•à¯‡ à®•à®¾à®£à¯à®ªà®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®®à¯.",
+  "empty_column.follow_requests": "à®µà®¾à®šà®•à®°à¯ à®•à¯‹à®°à®¿à®•à¯à®•à¯ˆà®•à®³à¯ à®‡à®¤à¯à®µà®°à¯ˆ à®à®¤à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ. à®¯à®¾à®°à¯‡à®©à¯à®®à¯ à®•à¯‹à®°à®¿à®•à¯à®•à¯ˆà®¯à¯ˆ à®…à®©à¯à®ªà¯à®ªà®¿à®©à®¾à®²à¯, à®…à®¤à¯ à®‡à®™à¯à®•à¯‡ à®•à®¾à®£à¯à®ªà®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®®à¯.",
+  "empty_column.hashtag": "à®‡à®¨à¯à®¤ à®šà®¿à®Ÿà¯à®Ÿà¯ˆà®¯à®¿à®²à¯ à®‡à®¤à¯à®µà®°à¯ˆ à®à®¤à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ.",
+  "empty_column.home": "à®‰à®™à¯à®•à®³à¯ à®®à®¾à®¸à¯à®Ÿà®Ÿà®¾à®©à¯ à®µà¯€à®Ÿà¯à®Ÿà®¿à®²à¯ à®¯à®¾à®°à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ. {public} -à®‡à®²à¯ à®šà¯†à®©à¯à®±à¯ à®ªà®¾à®°à¯à®•à¯à®•à®µà¯à®®à¯, à®…à®²à¯à®²à®¤à¯ à®¤à¯‡à®Ÿà®²à¯ à®•à®°à¯à®µà®¿à®¯à¯ˆà®ªà¯ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®¿à®ªà¯ à®ªà®¿à®± à®ªà®¯à®©à®°à¯à®•à®³à¯ˆà®•à¯ à®•à®£à¯à®Ÿà®Ÿà¯ˆà®¯à®µà¯à®®à¯.",
+  "empty_column.home.public_timeline": "à®ªà¯Šà®¤à¯ à®Ÿà¯ˆà®®à¯à®²à¯ˆà®©à¯",
+  "empty_column.list": "à®‡à®¨à¯à®¤à®ªà¯ à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ à®‡à®¤à¯à®µà®°à¯ˆ à®à®¤à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ. à®‡à®ªà¯à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à®¿à®©à¯ à®‰à®±à¯à®ªà¯à®ªà®¿à®©à®°à¯à®•à®³à¯ à®ªà¯à®¤à®¿à®¯ à®Ÿà¯‚à®Ÿà¯à®Ÿà¯à®•à®³à¯ˆ à®‡à®Ÿà¯à®Ÿà®¾à®²à¯. à®…à®µà¯ˆ à®‡à®™à¯à®•à¯‡ à®•à®¾à®£à¯à®ªà®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®®à¯.",
+  "empty_column.lists": "à®‡à®¤à¯à®µà®°à¯ˆ à®¨à¯€à®™à¯à®•à®³à¯ à®Žà®¨à¯à®¤à®ªà¯ à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à¯ˆà®¯à¯à®®à¯ à®‰à®°à¯à®µà®¾à®•à¯à®•à®µà®¿à®²à¯à®²à¯ˆ. à®‰à®°à¯à®µà®¾à®•à¯à®•à®¿à®©à®¾à®²à¯, à®…à®¤à¯ à®‡à®™à¯à®•à¯‡ à®•à®¾à®£à¯à®ªà®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®®à¯.",
+  "empty_column.mutes": "à®¨à¯€à®™à¯à®•à®³à¯ à®‡à®¤à¯à®µà®°à¯ˆ à®Žà®¨à¯à®¤à®ªà¯ à®ªà®¯à®©à®°à¯à®•à®³à¯ˆà®¯à¯à®®à¯ à®®à¯à®Ÿà®•à¯à®•à®¿à®¯à®¿à®°à¯à®•à¯à®•à®µà®¿à®²à¯à®²à¯ˆ.",
+  "empty_column.notifications": "à®‰à®™à¯à®•à®³à¯à®•à¯à®•à®¾à®• à®Žà®¨à¯à®¤ à®…à®±à®¿à®µà®¿à®ªà¯à®ªà¯à®•à®³à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ. à®‰à®°à¯ˆà®¯à®¾à®Ÿà®²à¯ˆà®¤à¯ à®¤à¯à®µà®™à¯à®• à®ªà®¿à®±à®°à¯ˆà®¤à¯ à®¤à¯Šà®Ÿà®°à¯à®ªà¯à®•à¯Šà®³à¯à®³à®µà¯à®®à¯.",
+  "empty_column.public": "à®‡à®™à¯à®•à¯ à®Žà®¤à¯à®µà¯à®®à¯ à®‡à®²à¯à®²à¯ˆ! à®‡à®µà¯à®µà®¿à®Ÿà®¤à¯à®¤à¯ˆ à®¨à®¿à®°à®ªà¯à®ª à®Žà®¤à¯ˆà®¯à¯‡à®©à¯à®®à¯ à®Žà®´à¯à®¤à®µà¯à®®à¯, à®…à®²à¯à®²à®¤à¯ à®µà¯‡à®±à¯ à®šà®°à¯à®µà®°à¯à®•à®³à®¿à®²à¯ à®‰à®³à¯à®³ à®ªà®¯à®©à®°à¯à®•à®³à¯ˆà®ªà¯ à®ªà®¿à®©à¯à®¤à¯Šà®Ÿà®°à®µà¯à®®à¯",
+  "error.unexpected_crash.explanation": "à®‡à®¨à¯à®¤à®ªà¯ à®ªà®•à¯à®•à®¤à¯à®¤à¯ˆ à®šà®°à®¿à®¯à®¾à®•à®•à¯ à®•à®¾à®£à¯à®ªà®¿à®•à¯à®• à®‡à®¯à®²à®µà®¿à®²à¯à®²à¯ˆ. à®®à¯†à®©à¯à®ªà¯Šà®°à¯à®³à®¿à®²à¯ à®‰à®³à¯à®³ à®ªà®¿à®´à¯ˆà®¯à¯‹ à®…à®²à¯à®²à®¤à¯ à®ªà¯Šà®°à¯à®¨à¯à®¤à®¾à®¤ à®‰à®²à®¾à®µà®¿à®¯à¯‹ à®•à®¾à®°à®£à®®à®¾à®• à®‡à®°à¯à®•à¯à®•à®²à®¾à®®à¯.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
+  "error.unexpected_crash.next_steps": "à®ªà®•à¯à®•à®¤à¯à®¤à¯ˆà®ªà¯ à®ªà¯à®¤à¯à®ªà¯à®ªà®¿à®¤à¯à®¤à¯à®ªà¯ à®ªà®¾à®°à¯à®•à¯à®•à®µà¯à®®à¯. à®…à®ªà¯à®ªà®Ÿà®¿à®¯à¯à®®à¯ à®µà¯‡à®²à¯ˆ à®šà¯†à®¯à¯à®¯à®µà®¿à®²à¯à®²à¯ˆ à®Žà®©à®¿à®²à¯, à®®à®¾à®¸à¯à®Ÿà®Ÿà®¾à®©à¯ˆ à®µà¯‡à®±à¯ à®’à®°à¯ à®‰à®²à®¾à®µà®¿à®¯à®¿à®©à¯ à®®à¯‚à®²à®®à¯‹, à®…à®²à¯à®²à®¤à¯ à®ªà¯Šà®°à¯à®¤à¯à®¤à®®à®¾à®© à®šà¯†à®¯à®²à®¿à®¯à®¿à®©à¯ à®®à¯‚à®²à®®à¯‹ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®¿à®ªà¯ à®ªà®¾à®°à¯à®•à¯à®•à®µà¯à®®à¯.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "errors.unexpected_crash.copy_stacktrace": "Stacktrace-à® clipboard-à®²à¯ à®¨à®•à®²à¯†à®Ÿà¯",
   "errors.unexpected_crash.report_issue": "à®ªà¯à®•à®¾à®°à®³à®¿",
-  "follow_request.authorize": "à®…à®¤à®¿à®•à®¾à®°à®®à®³à®¿",
-  "follow_request.reject": "à®µà®¿à®²à®•à¯à®•à¯",
+  "follow_request.authorize": "à®…à®©à¯à®®à®¤à®¿à®¯à®³à®¿",
+  "follow_request.reject": "à®¨à®¿à®°à®¾à®•à®°à®¿",
   "follow_requests.unlocked_explanation": "à®‰à®™à¯à®•à®³à¯ à®•à®£à®•à¯à®•à¯ à®ªà¯‚à®Ÿà¯à®Ÿà®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ à®Žà®©à¯à®±à®¾à®²à¯à®®à¯, à®‡à®¨à¯à®¤à®•à¯ à®•à®£à®•à¯à®•à¯à®•à®³à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®‰à®™à¯à®•à®³à¯ˆà®ªà¯ à®ªà®¿à®©à¯à®¤à¯Šà®Ÿà®° à®µà®¿à®°à¯à®®à¯à®ªà¯à®®à¯ à®•à¯‹à®°à®¿à®•à¯à®•à¯ˆà®•à®³à¯ˆ à®¨à¯€à®™à¯à®•à®³à¯ à®ªà®°à¯€à®šà¯€à®²à®¿à®ªà¯à®ªà®¤à¯ à®¨à®²à®®à¯ à®Žà®©à¯à®±à¯ {domain} à®Šà®´à®¿à®¯à®°à¯ à®Žà®£à¯à®£à¯à®•à®¿à®±à®¾à®°à¯.",
-  "generic.saved": "Saved",
+  "generic.saved": "à®šà¯‡à®®à®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯",
   "getting_started.developers": "à®‰à®°à¯à®µà®¾à®•à¯à®•à¯à®¨à®°à¯à®•à®³à¯",
-  "getting_started.directory": "à®šà¯à®¯à®µà®¿à®µà®° à®…à®Ÿà¯ˆà®µà¯",
+  "getting_started.directory": "à®ªà®¯à®©à®°à¯à®•à®³à¯",
   "getting_started.documentation": "à®†à®µà®£à®™à¯à®•à®³à¯",
-  "getting_started.heading": "à®¤à¯Šà®Ÿà®™à¯à®•à¯à®¤à®²à¯",
-  "getting_started.invite": "à®¨à®ªà®°à¯à®•à®³à¯ˆ à®…à®´à¯ˆà®•à¯à®•à®µà¯à®®à¯",
-  "getting_started.open_source_notice": "Mastodon à®¤à®¿à®±à®¨à¯à®¤ à®®à¯‚à®² à®®à¯†à®©à¯à®ªà¯Šà®°à¯à®³à¯. GitHub à®‡à®²à¯ à®¨à¯€à®™à¯à®•à®³à¯ à®ªà®™à¯à®•à®³à®¿à®•à¯à®•à®µà¯‹ à®…à®²à¯à®²à®¤à¯ à®ªà¯à®•à®¾à®°à¯ à®…à®³à®¿à®•à¯à®•à®µà¯‹ à®®à¯à®Ÿà®¿à®¯à¯à®®à¯ {github}.",
-  "getting_started.security": "à®ªà®¤à¯à®¤à®¿à®°à®®à¯",
+  "getting_started.heading": "à®®à¯à®¤à®©à¯à®®à¯ˆà®ªà¯ à®ªà®•à¯à®•à®®à¯",
+  "getting_started.invite": "à®¨à®£à¯à®ªà®°à¯à®•à®³à¯ˆ à®…à®´à¯ˆà®•à¯à®•",
+  "getting_started.open_source_notice": "à®®à®¾à®¸à¯à®Ÿà®Ÿà®¾à®©à¯ à®’à®°à¯ open source à®®à¯†à®©à¯à®ªà¯Šà®°à¯à®³à¯ à®†à®•à¯à®®à¯. {github} -à®‡à®©à¯ à®®à¯‚à®²à®®à¯ à®‰à®™à¯à®•à®³à®¾à®²à¯ à®‡à®¤à®¿à®²à¯ à®ªà®™à¯à®•à®³à®¿à®•à¯à®•à®µà¯‹, à®šà®¿à®•à¯à®•à®²à¯à®•à®³à¯ˆà®¤à¯ à®¤à¯†à®°à®¿à®¯à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯‹ à®®à¯à®Ÿà®¿à®¯à¯à®®à¯.",
+  "getting_started.security": "à®•à®£à®•à¯à®•à¯ à®…à®®à¯ˆà®ªà¯à®ªà¯à®•à®³à¯",
   "getting_started.terms": "à®šà¯‡à®µà¯ˆ à®µà®¿à®¤à®¿à®®à¯à®±à¯ˆà®•à®³à¯",
   "hashtag.column_header.tag_mode.all": "à®®à®±à¯à®±à¯à®®à¯ {additional}",
   "hashtag.column_header.tag_mode.any": "à®…à®²à¯à®²à®¤à¯ {additional}",
-  "hashtag.column_header.tag_mode.none": "à®‡à®²à¯à®²à®¾à®®à®²à¯ {additional}",
-  "hashtag.column_settings.select.no_options_message": "à®ªà®°à®¿à®¨à¯à®¤à¯à®°à¯ˆà®•à®³à¯ à®Žà®¤à¯à®µà¯à®®à¯ à®‡à®²à¯à®²à¯ˆ",
-  "hashtag.column_settings.select.placeholder": "à®¹à®¾à®·à¯à®Ÿà¯‡à®•à¯à®•à®³à¯ˆ à®‰à®³à¯à®³à®¿à®Ÿà®µà¯à®®à¯ â€¦",
+  "hashtag.column_header.tag_mode.none": "{additional} à®¤à®µà®¿à®°à¯à®¤à¯à®¤à¯",
+  "hashtag.column_settings.select.no_options_message": "à®ªà®°à®¿à®¨à¯à®¤à¯à®°à¯ˆà®•à®³à¯ à®à®¤à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ",
+  "hashtag.column_settings.select.placeholder": "à®šà®¿à®Ÿà¯à®Ÿà¯ˆà®•à®³à¯ˆ à®‰à®³à¯à®³à®¿à®Ÿà®µà¯à®®à¯â€¦",
   "hashtag.column_settings.tag_mode.all": "à®‡à®µà¯ˆ à®…à®©à¯ˆà®¤à¯à®¤à¯à®®à¯",
-  "hashtag.column_settings.tag_mode.any": "à®‡à®µà¯ˆ à®Žà®¤à¯ˆà®¯à¯à®®à¯",
+  "hashtag.column_settings.tag_mode.any": "à®‡à®µà®±à¯à®±à®¿à®²à¯ à®Žà®µà¯ˆà®¯à¯‡à®©à¯à®®à¯",
   "hashtag.column_settings.tag_mode.none": "à®‡à®µà®±à¯à®±à®¿à®²à¯ à®à®¤à¯à®®à®¿à®²à¯à®²à¯ˆ",
-  "hashtag.column_settings.tag_toggle": "à®‡à®¨à¯à®¤ à®¨à¯†à®Ÿà¯à®µà®°à®¿à®šà¯ˆà®¯à®¿à®²à¯ à®•à¯‚à®Ÿà¯à®¤à®²à¯ à®•à¯à®±à®¿à®šà¯à®šà¯Šà®±à¯à®•à®³à¯ˆ à®šà¯‡à®°à¯à®•à¯à®•à®µà¯à®®à¯",
-  "home.column_settings.basic": "à®…à®Ÿà®¿à®ªà¯à®ªà®Ÿà¯ˆà®¯à®¾à®©",
-  "home.column_settings.show_reblogs": "à®•à®¾à®Ÿà¯à®Ÿà¯ boosts",
-  "home.column_settings.show_replies": "à®ªà®¤à®¿à®²à¯à®•à®³à¯ˆà®•à¯ à®•à®¾à®£à¯à®ªà®¿",
+  "hashtag.column_settings.tag_toggle": "à®‡à®¨à¯à®¤ à®¨à¯†à®Ÿà¯à®µà®°à®¿à®šà¯ˆà®¯à®¿à®²à¯ à®•à¯‚à®Ÿà¯à®¤à®²à¯ à®šà®¿à®Ÿà¯à®Ÿà¯ˆà®•à®³à¯ˆà®šà¯ à®šà¯‡à®°à¯à®•à¯à®•à®µà¯à®®à¯",
+  "home.column_settings.basic": "à®…à®Ÿà®¿à®ªà¯à®ªà®Ÿà¯ˆà®¯à®¾à®©à®µà¯ˆ",
+  "home.column_settings.show_reblogs": "à®ªà®•à®¿à®°à¯à®µà¯à®•à®³à¯ˆà®•à¯ à®•à®¾à®£à¯à®ªà®¿",
+  "home.column_settings.show_replies": "à®®à®±à¯à®®à¯Šà®´à®¿à®•à®³à¯ˆà®•à¯ à®•à®¾à®£à¯à®ªà®¿",
   "home.hide_announcements": "à®…à®±à®¿à®µà®¿à®ªà¯à®ªà¯à®•à®³à¯ˆ à®®à®±à¯ˆ",
   "home.show_announcements": "à®…à®±à®¿à®µà®¿à®ªà¯à®ªà¯à®•à®³à¯ˆà®•à¯ à®•à®¾à®Ÿà¯à®Ÿà¯",
-  "intervals.full.days": "{number, plural, one {# day} à®®à®±à¯à®± {# days}}",
-  "intervals.full.hours": "{number, plural, one {# hour} à®®à®±à¯à®± {# hours}}",
-  "intervals.full.minutes": "{number, plural, one {# minute} à®®à®±à¯à®± {# minutes}}",
-  "introduction.federation.action": "à®…à®Ÿà¯à®¤à¯à®¤",
+  "intervals.full.days": "{number, plural, one {# à®¨à®¾à®³à¯} other {# à®¨à®¾à®Ÿà¯à®•à®³à¯}}",
+  "intervals.full.hours": "{number, plural, one {# à®®à®£à®¿à®¨à¯‡à®°à®®à¯} other {# à®®à®£à®¿à®¨à¯‡à®°à®™à¯à®•à®³à¯}}",
+  "intervals.full.minutes": "{number, plural, one {# à®¨à®¿à®®à®¿à®Ÿà®®à¯} other {# à®¨à®¿à®®à®¿à®Ÿà®™à¯à®•à®³à¯}}",
+  "introduction.federation.action": "à®…à®Ÿà¯à®¤à¯à®¤à¯",
   "introduction.federation.federated.headline": "à®•à¯‚à®Ÿà¯à®Ÿà®®à¯ˆà®¨à¯à®¤",
-  "introduction.federation.federated.text": "à®•à¯‚à®Ÿà¯à®Ÿà®®à¯ˆà®ªà¯à®ªà®¿à®©à¯ à®ªà®¿à®± à®šà¯‡à®µà¯ˆà®¯à®•à®™à¯à®•à®³à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®ªà¯Šà®¤à¯ à®ªà®¤à®¿à®µà¯à®•à®³à¯ à®•à¯‚à®Ÿà¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®Ÿ à®•à®¾à®²à®•à¯à®•à¯†à®Ÿà¯à®µà®¿à®²à¯ à®¤à¯‹à®©à¯à®±à¯à®®à¯.",
+  "introduction.federation.federated.text": "à®ƒà®ªà¯†à®Ÿà®¿à®µà¯†à®°à¯à®šà®¿à®©à¯ à®®à®±à¯à®± à®šà®°à¯à®µà®°à¯à®•à®³à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®‡à®Ÿà®ªà¯à®ªà®Ÿà¯à®®à¯ à®ªà¯Šà®¤à¯à®ªà¯ à®ªà®¤à®¿à®µà¯à®•à®³à¯ à®‡à®¨à¯à®¤ à®®à®¾à®¸à¯à®Ÿà®Ÿà®¾à®©à¯ à®†à®²à®®à®°à®¤à¯à®¤à®¿à®²à¯ à®¤à¯‹à®©à¯à®±à¯à®®à¯.",
   "introduction.federation.home.headline": "à®®à¯à®•à®ªà¯à®ªà¯",
-  "introduction.federation.home.text": "à®¨à¯€à®™à¯à®•à®³à¯ à®ªà®¿à®©à¯à®ªà®±à¯à®±à¯à®®à¯ à®¨à®ªà®°à¯à®•à®³à®¿à®©à¯ à®‡à®Ÿà¯à®•à¯ˆà®•à®³à¯ à®‰à®™à¯à®•à®³à¯ à®µà¯€à®Ÿà¯à®Ÿà¯ à®Šà®Ÿà¯à®Ÿà®¤à¯à®¤à®¿à®²à¯ à®¤à¯‹à®©à¯à®±à¯à®®à¯. à®¨à¯€à®™à¯à®•à®³à¯ à®Žà®¨à¯à®¤ à®šà®°à¯à®µà®°à®¿à®²à¯ à®¯à®¾à®°à¯ˆà®¯à¯à®®à¯ à®ªà®¿à®©à¯à®ªà®±à¯à®± à®®à¯à®Ÿà®¿à®¯à¯à®®à¯!",
+  "introduction.federation.home.text": "à®¨à¯€à®™à¯à®•à®³à¯ à®ªà®¿à®©à¯à®¤à¯Šà®Ÿà®°à¯à®®à¯ à®¨à®ªà®°à¯à®•à®³à®¿à®©à¯ à®‡à®Ÿà¯à®•à¯ˆà®•à®³à¯ à®‰à®™à¯à®•à®³à¯ à®®à®¾à®¸à¯à®Ÿà®Ÿà®¾à®©à¯ à®µà¯€à®Ÿà¯à®Ÿà®¿à®²à¯ à®¤à¯‹à®©à¯à®±à¯à®®à¯. à®‰à®™à¯à®•à®³à®¾à®²à¯ à®Žà®¨à¯à®¤ à®šà®°à¯à®µà®°à®¿à®²à¯ à®‰à®³à¯à®³ à®Žà®µà®°à¯ˆà®¯à¯à®®à¯ à®ªà®¿à®©à¯à®ªà®±à¯à®± à®®à¯à®Ÿà®¿à®¯à¯à®®à¯!",
   "introduction.federation.local.headline": "à®…à®°à¯à®•à®¾à®®à¯ˆ",
-  "introduction.federation.local.text": "à®‰à®³à¯à®³à¯‚à®°à¯ à®šà¯‡à®µà¯ˆà®¯à®•à®¤à¯à®¤à®¿à®²à¯ à®¤à¯‹à®©à¯à®±à¯à®®à¯ à®…à®¤à¯‡ à®šà®°à¯à®µà®°à®¿à®²à¯ à®‰à®³à¯à®³à®µà®°à¯à®•à®³à®¿à®©à¯ à®ªà¯Šà®¤à¯ à®‡à®Ÿà¯à®•à¯ˆà®•à®³à¯.",
-  "introduction.interactions.action": "à®ªà®¯à®¿à®±à¯à®šà®¿ à®®à¯à®Ÿà®¿à®•à¯à®•!",
-  "introduction.interactions.favourite.headline": "à®µà®¿à®°à¯à®ªà¯à®ªà®¤à¯à®¤à¯à®•à¯à®•à¯à®•à®¨à¯à®¤",
-  "introduction.interactions.favourite.text": "à®¨à¯€à®™à¯à®•à®³à¯ à®’à®°à¯ à®•à®¾à®ªà¯à®ªà®¾à®±à¯à®± à®®à¯à®Ÿà®¿à®¯à¯à®®à¯ toot à®ªà®¿à®©à¯à®©à®°à¯, à®®à®±à¯à®±à¯à®®à¯ à®†à®šà®¿à®°à®¿à®¯à®°à¯ à®…à®¤à¯ˆ à®¨à¯€à®™à¯à®•à®³à¯ à®ªà®¿à®Ÿà®¿à®¤à¯à®¤à®¿à®°à¯à®•à¯à®•à®¿à®±à®¤à¯ à®Žà®©à¯à®±à¯, à®…à®¤à¯ˆ à®ªà®¿à®Ÿà®¿à®¤à¯à®¤à®¿à®°à¯à®•à¯à®•à®¿à®±à®¤à¯ à®Žà®©à¯à®±à¯ à®¤à¯†à®°à®¿à®¯à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®™à¯à®•à®³à¯.",
-  "introduction.interactions.reblog.headline": "à®®à®¤à®¿à®ªà¯à®ªà¯ˆ à®‰à®¯à®°à¯à®¤à¯à®¤à¯",
-  "introduction.interactions.reblog.text": "à®®à®±à¯à®±à®µà®°à¯à®•à®³à®¿à®©à¯ à®ªà®•à®¿à®°à¯à®¨à¯à®¤à¯ à®•à¯Šà®³à¯à®³à®²à®¾à®®à¯ toots à®‰à®™à¯à®•à®³à¯ à®†à®¤à®°à®µà®¾à®³à®°à¯à®•à®³à¯à®Ÿà®©à¯ à®…à®µà®°à¯à®•à®³à¯ˆ à®…à®¤à®¿à®•à®°à®¿à®•à¯à®•à¯à®®à¯.",
-  "introduction.interactions.reply.headline": "à®®à®±à¯à®®à¯Šà®´à®¿ à®•à¯‚à®±à¯",
-  "introduction.interactions.reply.text": "à®¨à¯€à®™à¯à®•à®³à¯ à®®à®±à¯à®±à®µà®°à¯à®•à®³à¯à®•à¯à®•à¯à®®à¯ à®‰à®™à¯à®•à®³à¯ à®šà¯Šà®¨à¯à®¤ à®Ÿà¯‹à®Ÿà¯à®Ÿà¯à®•à®³à®¿à®±à¯à®•à¯à®®à¯ à®ªà®¤à®¿à®²à®³à®¿à®ªà¯à®ªà¯€à®°à¯à®•à®³à¯, à®‡à®¤à¯ à®’à®°à¯ à®‰à®°à¯ˆà®¯à®¾à®Ÿà®²à®¿à®²à¯ à®šà®™à¯à®•à®¿à®²à®¿ à®’à®©à¯à®±à®¾à®•à®šà¯ à®šà¯‡à®°à¯à®®à¯.",
-  "introduction.welcome.action": "à®ªà¯‹à®•à®²à®¾à®®à¯!",
-  "introduction.welcome.headline": "à®®à¯à®¤à®²à¯ à®ªà®Ÿà®¿à®•à®³à¯",
-  "introduction.welcome.text": "à®•à¯‚à®Ÿà¯à®Ÿà®¾à®³à®¿à®•à¯à®•à¯ à®µà®°à¯à®•! à®’à®°à¯ à®šà®¿à®² à®¨à®¿à®®à®¿à®Ÿà®™à¯à®•à®³à®¿à®²à¯, à®ªà®²à®µà®¿à®¤à®®à®¾à®© à®šà¯‡à®µà¯ˆà®¯à®•à®™à¯à®•à®³à®¿à®²à¯ à®šà¯†à®¯à¯à®¤à®¿à®•à®³à¯ˆ à®‰à®°à¯ˆà®¯à®¾à®Ÿ à®®à®±à¯à®±à¯à®®à¯ à®‰à®™à¯à®•à®³à¯ à®¨à®£à¯à®ªà®°à¯à®•à®³à®¿à®Ÿà®®à¯ à®ªà¯‡à®š à®®à¯à®Ÿà®¿à®¯à¯à®®à¯. à®†à®©à®¾à®²à¯ à®‡à®¨à¯à®¤ à®šà®°à¯à®µà®°à¯, {domain}, à®šà®¿à®±à®ªà¯à®ªà¯ - à®‡à®¤à¯ à®‰à®™à¯à®•à®³à¯ à®šà¯à®¯à®µà®¿à®µà®°à®¤à¯à®¤à¯ˆ à®µà®´à®™à¯à®•à¯à®•à®¿à®±à®¤à¯, à®Žà®©à®µà¯‡ à®…à®¤à®©à¯ à®ªà¯†à®¯à®°à¯ˆ à®¨à®¿à®©à¯ˆà®µà®¿à®²à¯ à®•à¯Šà®³à¯à®³à¯à®™à¯à®•à®³à¯.",
-  "keyboard_shortcuts.back": "à®ªà®¿à®©à¯ à®šà¯†à®²à¯à®µà®¤à®±à¯à®•à¯",
-  "keyboard_shortcuts.blocked": "à®¤à®Ÿà¯à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿ à®ªà®¯à®©à®°à¯à®•à®³à®¿à®©à¯ à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à¯ˆà®¤à¯ à®¤à®¿à®±à®•à¯à®•",
-  "keyboard_shortcuts.boost": "à®…à®¤à®¿à®•à®°à®¿à®•à¯à®•à¯à®®à¯",
-  "keyboard_shortcuts.column": "à®¨à¯†à®Ÿà¯à®µà®°à®¿à®šà¯ˆà®•à®³à®¿à®²à¯ à®’à®©à¯à®±à®¿à®²à¯ à®¨à®¿à®²à¯ˆà®•à¯à®•à¯ à®•à®µà®©à®®à¯ à®šà¯†à®²à¯à®¤à¯à®¤ à®µà¯‡à®£à¯à®Ÿà¯à®®à¯",
-  "keyboard_shortcuts.compose": "à®¤à¯Šà®•à¯ à®‰à®°à¯ˆà®ªà¯à®ªà®•à¯à®¤à®¿à®¯à¯ˆ à®•à®µà®©à®¤à¯à®¤à®¿à®²à¯ à®•à¯Šà®³à¯à®³à®µà¯à®®à¯",
+  "introduction.federation.local.text": "à®‰à®™à¯à®•à®³à¯ à®šà®°à¯à®µà®°à®¿à®²à¯ à®‡à®°à¯à®•à¯à®•à¯à®®à¯ à®®à®±à¯à®± à®¨à®ªà®°à¯à®•à®³à®¿à®©à¯ à®ªà¯Šà®¤à¯à®ªà¯ à®ªà®¤à®¿à®µà¯à®•à®³à¯ à®‡à®¨à¯à®¤ à®®à®¾à®¸à¯à®Ÿà®Ÿà®¾à®©à¯ à®®à¯à®šà¯à®šà®¨à¯à®¤à®¿à®¯à®¿à®²à¯ à®¤à¯‹à®©à¯à®±à¯à®®à¯.",
+  "introduction.interactions.action": "à®ªà®¯à®¿à®±à¯à®šà®¿à®¯à¯ˆ à®¨à®¿à®±à¯ˆà®µà¯ à®šà¯†à®¯à¯!",
+  "introduction.interactions.favourite.headline": "à®µà®¿à®°à¯à®ªà¯à®ªà®®à¯",
+  "introduction.interactions.favourite.text": "à®’à®°à¯ à®Ÿà¯‚à®Ÿà¯à®Ÿà®¿à®²à¯ à®µà®¿à®°à¯à®ªà¯à®ªà®•à¯à®•à¯à®±à®¿ à®‡à®Ÿà¯à®µà®¤à®©à¯ à®®à¯‚à®²à®®à¯ à®‰à®™à¯à®•à®³à¯ à®µà®¿à®°à¯à®ªà¯à®ªà®¤à¯à®¤à¯ˆ à®…à®¤à¯ˆ à®Žà®´à¯à®¤à®¿à®¯à®µà®°à¯à®•à¯à®•à¯à®¤à¯ à®¤à¯†à®°à®¿à®¯à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤ à®®à¯à®Ÿà®¿à®¯à¯à®®à¯, à®®à¯‡à®²à¯à®®à¯ à®…à®¨à¯à®¤ à®Ÿà¯‚à®Ÿà¯à®Ÿà¯ˆ à®®à®±à¯à®µà®¾à®šà®¿à®ªà¯à®ªà®¿à®±à¯à®•à®¾à®• à®šà¯‡à®®à®¿à®•à¯à®•à®®à¯à®Ÿà®¿à®¯à¯à®®à¯.",
+  "introduction.interactions.reblog.headline": "à®ªà®•à®¿à®°à¯",
+  "introduction.interactions.reblog.text": "à®®à®±à¯à®±à®µà®°à¯à®•à®³à®¿à®©à¯ à®Ÿà¯‚à®Ÿà¯à®Ÿà¯à®•à®³à¯ˆà®ªà¯ à®ªà®•à®¿à®°à¯à®µà®¤à®©à¯ à®®à¯‚à®²à®®à¯ à®…à®µà®±à¯à®±à¯ˆ à®‰à®™à¯à®•à®³à¯ à®µà®¾à®šà®•à®°à¯à®•à®³à¯à®•à¯à®•à¯à®•à¯ à®•à®¾à®£à¯à®ªà®¿à®•à¯à®• à®®à¯à®Ÿà®¿à®¯à¯à®®à¯.",
+  "introduction.interactions.reply.headline": "à®®à®±à¯à®®à¯Šà®´à®¿",
+  "introduction.interactions.reply.text": "à®‰à®™à¯à®•à®³à®¾à®²à¯ à®®à®±à¯à®±à®µà®°à¯à®•à®³à®¿à®©à¯ à®Ÿà¯‚à®Ÿà¯à®Ÿà¯à®•à®³à®¿à®²à¯à®®à¯ à®‰à®™à¯à®•à®³à¯ à®Ÿà¯‚à®Ÿà¯à®Ÿà¯à®•à®³à®¿à®²à¯à®®à¯ à®®à®±à¯à®®à¯Šà®´à®¿ à®‡à®Ÿ à®®à¯à®Ÿà®¿à®¯à¯à®®à¯. à®…à®µà¯ˆ à®’à®©à¯à®±à¯‹à®Ÿà¯ à®’à®©à¯à®±à®¾à®• à®šà®™à¯à®•à®¿à®²à®¿à®ªà¯‹à®²à¯ à®ªà®¿à®©à¯à®©à®ªà¯à®ªà®Ÿà¯à®Ÿà¯ à®‰à®°à¯ˆà®¯à®¾à®Ÿà®²à®¾à®• à®®à®¾à®±à¯à®®à¯.",
+  "introduction.welcome.action": "à®µà®¾à®°à¯à®™à¯à®•à®³à¯ à®¤à¯à®µà®™à¯à®•à®²à®¾à®®à¯!",
+  "introduction.welcome.headline": "à®®à¯à®¤à®±à¯à®ªà®Ÿà®¿à®•à®³à¯",
+  "introduction.welcome.text": "à®ƒà®ªà¯†à®Ÿà®¿à®µà¯†à®°à¯à®¸à¯ à®‰à®™à¯à®•à®³à¯ˆ à®…à®©à¯à®ªà¯à®Ÿà®©à¯ à®µà®°à®µà¯‡à®±à¯à®•à®¿à®±à®¤à¯! à®‡à®©à¯à®©à¯à®®à¯ à®šà®¿à®² à®¨à®¿à®®à®¿à®Ÿà®™à¯à®•à®³à®¿à®²à¯ à®‰à®™à¯à®•à®³à®¾à®²à¯ à®šà¯†à®¯à¯à®¤à®¿à®•à®³à¯ˆ à®‰à®²à®•à®¿à®±à¯à®•à¯à®šà¯ à®šà¯Šà®²à¯à®²à®®à¯à®Ÿà®¿à®¯à¯à®®à¯. à®ªà®²à¯à®µà¯‡à®±à¯ à®šà®°à¯à®µà®°à¯à®•à®³à®¿à®²à¯ à®‡à®°à¯à®•à¯à®•à¯à®®à¯ à®‰à®™à¯à®•à®³à¯ à®¨à®£à¯à®ªà®°à¯à®•à®³à¯‹à®Ÿà¯ à®ªà¯‡à®š à®®à¯à®Ÿà®¿à®¯à¯à®®à¯. à®†à®©à®¾à®²à¯, à®‡à®¨à¯à®¤ à®šà®°à¯à®µà®°à¯ {domain} à®®à®¿à®•à®µà¯à®®à¯ à®¤à®©à®¿à®¤à¯à®¤à¯à®µà®®à®¾à®©à®¤à¯, à®à®©à¯†à®©à®¿à®²à¯ à®‰à®™à¯à®•à®³à¯ à®ªà®•à¯à®•à®¤à¯à®¤à¯ˆ à®‡à®¤à¯à®¤à®¾à®©à¯ à®µà®´à®™à¯à®•à¯à®•à®¿à®±à®¤à¯, à®Žà®©à®µà¯‡ à®‡à®¤à®©à¯ à®ªà¯†à®¯à®°à¯ˆ à®¨à®¿à®©à¯ˆà®µà®¿à®²à¯ à®•à¯Šà®³à¯à®³à¯à®™à¯à®•à®³à¯.",
+  "keyboard_shortcuts.back": "à®ªà®¿à®©à¯ à®šà¯†à®²à¯à®²",
+  "keyboard_shortcuts.blocked": "à®¤à®Ÿà¯à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿ à®ªà®¯à®©à®°à¯à®•à®³à¯ à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à¯ˆà®¤à¯ à®¤à®¿à®±à®•à¯à®•",
+  "keyboard_shortcuts.boost": "à®ªà®•à®¿à®°",
+  "keyboard_shortcuts.column": "à®à®¤à¯‡à®©à¯à®®à¯ à®’à®°à¯ à®¨à¯†à®Ÿà¯à®µà®°à®¿à®šà¯ˆà®¯à®¿à®²à¯ à®‰à®³à¯à®³ à®Ÿà¯‚à®Ÿà¯à®Ÿà¯à®²à¯ à®•à®µà®©à®®à¯ à®šà¯†à®²à¯à®¤à¯à®¤",
+  "keyboard_shortcuts.compose": "à®ªà®¤à®¿à®µà¯ à®Žà®´à¯à®¤à¯à®®à¯ à®ªà¯†à®Ÿà¯à®Ÿà®¿à®¯à®¿à®²à¯ à®•à®µà®©à®®à¯ à®šà¯†à®²à¯à®¤à¯à®¤",
   "keyboard_shortcuts.description": "à®µà®¿à®µà®°à®®à¯",
-  "keyboard_shortcuts.direct": "à®¨à¯‡à®°à®Ÿà®¿ à®šà¯†à®¯à¯à®¤à®¿à®•à®³à¯ à®ªà®¤à¯à®¤à®¿ à®¤à®¿à®±à®•à¯à®•",
-  "keyboard_shortcuts.down": "à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ à®•à¯€à®´à¯‡ à®¨à®•à®°à¯à®¤à¯à®¤",
-  "keyboard_shortcuts.enter": "à®ªà®¤à®¿à®µà¯ˆà®¤à¯à®¤à®¿à®±à®•à¯à®•",
-  "keyboard_shortcuts.favourite": "à®ªà®¿à®Ÿà®¿à®¤à¯à®¤à®¤à¯",
-  "keyboard_shortcuts.favourites": "à®ªà®¿à®Ÿà®¿à®¤à¯à®¤à®µà¯ˆ à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à¯ˆ à®¤à®¿à®±à®•à¯à®•",
-  "keyboard_shortcuts.federated": "à®’à®°à¯à®™à¯à®•à®¿à®£à¯ˆà®¨à¯à®¤ à®¨à¯‡à®°à®¤à¯à®¤à¯ˆ à®¤à®¿à®±à®•à¯à®•",
-  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.home": "à®µà¯€à®Ÿà¯à®Ÿà¯ à®¨à¯‡à®°à®¤à¯à®¤à¯ˆ à®¤à®¿à®±à®•à¯à®•",
+  "keyboard_shortcuts.direct": "à®¤à®©à®¿à®ªà¯à®ªà¯†à®Ÿà¯à®Ÿà®¿à®¯à¯ˆà®¤à¯ à®¤à®¿à®±à®•à¯à®•",
+  "keyboard_shortcuts.down": "à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à®¿à®©à¯ à®•à¯€à®´à¯‡ à®šà¯†à®²à¯à®²",
+  "keyboard_shortcuts.enter": "à®Ÿà¯‚à®Ÿà¯à®Ÿà¯ˆà®¤à¯ à®¤à®¿à®±à®•à¯à®•",
+  "keyboard_shortcuts.favourite": "à®µà®¿à®°à¯à®ªà¯à®ªà®•à¯à®•à¯à®±à®¿ à®‡à®Ÿ",
+  "keyboard_shortcuts.favourites": "à®µà®¿à®°à¯à®ªà¯à®ªà®ªà¯ à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à¯ˆà®¤à¯ à®¤à®¿à®±à®•à¯à®•",
+  "keyboard_shortcuts.federated": "à®®à®¾à®¸à¯à®Ÿà®Ÿà®¾à®©à¯ à®†à®²à®®à®°à®¤à¯à®¤à¯ˆà®¤à¯ à®¤à®¿à®±à®•à¯à®•",
+  "keyboard_shortcuts.heading": "à®µà®¿à®šà¯ˆà®ªà¯à®ªà®²à®•à¯ˆ à®•à¯à®±à¯à®•à¯à®•à¯à®µà®´à®¿à®•à®³à¯",
+  "keyboard_shortcuts.home": "à®®à®¾à®¸à¯à®Ÿà®Ÿà®¾à®©à¯ à®µà¯€à®Ÿà¯à®Ÿà¯ˆà®¤à¯ à®¤à®¿à®±à®•à¯à®•",
   "keyboard_shortcuts.hotkey": "à®¹à®¾à®Ÿà¯ à®•à¯€",
   "keyboard_shortcuts.legend": "à®‡à®¨à¯à®¤ à®ªà¯à®°à®¾à®£à®¤à¯à®¤à¯ˆ à®•à®¾à®Ÿà¯à®šà®¿à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤",
   "keyboard_shortcuts.local": "à®‰à®³à¯à®³à¯‚à®°à¯ à®•à®¾à®²à®µà®°à®¿à®šà¯ˆ à®¤à®¿à®±à®•à¯à®•",
@@ -242,7 +247,7 @@
   "keyboard_shortcuts.reply": "à®ªà®¤à®¿à®²à®³à®¿à®•à¯à®•",
   "keyboard_shortcuts.requests": "à®•à¯‹à®°à®¿à®•à¯à®•à¯ˆà®•à®³à¯ à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à¯ˆà®¤à¯ à®¤à®¿à®±à®•à¯à®•",
   "keyboard_shortcuts.search": "à®¤à¯‡à®Ÿà®²à¯ à®•à®µà®©à®®à¯ à®šà¯†à®²à¯à®¤à¯à®¤",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "à®‰à®³à¯à®³à®Ÿà®•à¯à®• à®Žà®šà¯à®šà®°à®¿à®•à¯à®•à¯ˆ à®šà¯†à®¯à¯à®¤à®¿à®¯à¯ˆà®•à¯ à®•à®¾à®Ÿà¯à®Ÿ/à®®à®±à¯ˆà®•à¯à®•",
   "keyboard_shortcuts.start": "'à®¤à¯Šà®Ÿà®™à¯à®•à¯à®µà®¤à®±à¯à®•à¯' à®¨à¯†à®Ÿà¯à®µà®°à®¿à®šà¯ˆ à®¤à®¿à®±à®•à¯à®•",
   "keyboard_shortcuts.toggle_hidden": "CW à®•à¯à®•à¯ à®ªà®¿à®©à¯à®©à®¾à®²à¯ à®‰à®°à¯ˆà®¯à¯ˆ à®®à®±à¯ˆà®•à¯à®• / à®®à®±à¯ˆà®•à¯à®•",
   "keyboard_shortcuts.toggle_sensitivity": "à®ªà®Ÿà®¿à®®à®™à¯à®•à®³à¯ˆà®•à¯ à®•à®¾à®Ÿà¯à®Ÿ/à®®à®±à¯ˆà®•à¯à®•",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "à®‰à®°à¯ˆ à®ªà®•à¯à®¤à®¿à®¯à¯ˆ / à®¤à¯‡à®Ÿà®²à¯ˆ à®•à®µà®©à®®à¯ à®šà¯†à®²à¯à®¤à¯à®¤ à®µà¯‡à®£à¯à®Ÿà¯à®®à¯",
   "keyboard_shortcuts.up": "à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ à®®à¯‡à®²à¯‡ à®šà¯†à®²à¯à®²",
   "lightbox.close": "à®¨à¯†à®°à¯à®•à¯à®•à®®à®¾à®•",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "à®…à®Ÿà¯à®¤à¯à®¤",
   "lightbox.previous": "à®šà¯†à®©à¯à®±",
-  "lightbox.view_context": "à®šà¯‚à®´à®²à¯ˆà®•à¯ à®ªà®¾à®°à¯",
   "lists.account.add": "à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ à®šà¯‡à®°à¯",
   "lists.account.remove": "à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ à®‡à®°à¯à®¨à¯à®¤à¯ à®…à®•à®±à¯à®±à¯",
   "lists.delete": "à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à¯ˆ à®¨à¯€à®•à¯à®•à¯",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "à®¤à®²à¯ˆà®ªà¯à®ªà¯ à®®à®¾à®±à¯à®±à®µà¯à®®à¯",
   "lists.new.create": "à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ à®šà¯‡à®°à¯",
   "lists.new.title_placeholder": "à®ªà¯à®¤à®¿à®¯ à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à¯ à®¤à®²à¯ˆà®ªà¯à®ªà¯",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "à®¨à¯€à®™à¯à®•à®³à¯ à®ªà®¿à®©à¯à®¤à¯†à®¾à®Ÿà®°à¯à®®à¯ à®¨à®ªà®°à¯à®•à®³à¯ à®®à®¤à¯à®¤à®¿à®¯à®¿à®²à¯ à®¤à¯‡à®Ÿà¯à®¤à®²à¯",
   "lists.subheading": "à®‰à®™à¯à®•à®³à¯ à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à¯à®•à®³à¯",
   "load_pending": "{count, plural,one {# à®ªà¯à®¤à®¿à®¯à®¤à¯}other {# à®ªà¯à®¤à®¿à®¯à®µà¯ˆ}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "à®¨à®¿à®²à¯ˆà®®à®¾à®±à¯à®±à¯ à®¤à¯†à®°à®¿à®¯à¯à®®à¯",
   "missing_indicator.label": "à®•à®¿à®Ÿà¯ˆà®•à¯à®•à®µà®¿à®²à¯à®²à¯ˆ",
   "missing_indicator.sublabel": "à®‡à®¨à¯à®¤ à®†à®¤à®¾à®°à®¤à¯à®¤à¯ˆ à®•à®¾à®£ à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "à®‡à®¨à¯à®¤ à®ªà®¯à®©à®°à®¿à®©à¯ à®…à®±à®¿à®µà®¿à®ªà¯à®ªà¯à®•à®³à¯ˆ à®®à®±à¯ˆà®•à¯à®•à®µà®¾?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "à®®à¯Šà®ªà¯ˆà®²à¯ à®ªà®¯à®©à¯à®ªà®¾à®Ÿà¯à®•à®³à¯",
   "navigation_bar.blocks": "à®¤à®Ÿà¯à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿ à®ªà®¯à®©à®°à¯à®•à®³à¯",
   "navigation_bar.bookmarks": "à®…à®Ÿà¯ˆà®¯à®¾à®³à®•à¯à®•à¯à®±à®¿à®•à®³à¯",
@@ -298,6 +310,7 @@
   "notification.own_poll": "à®•à®°à¯à®¤à¯à®¤à¯à®•à¯à®•à®£à®¿à®ªà¯à®ªà¯ à®¨à®¿à®±à¯ˆà®µà®Ÿà¯ˆà®¨à¯à®¤à®¤à¯",
   "notification.poll": "à®¨à¯€à®™à¯à®•à®³à¯ à®µà®¾à®•à¯à®•à®³à®¿à®¤à¯à®¤ à®µà®¾à®•à¯à®•à¯†à®Ÿà¯à®ªà¯à®ªà¯ à®®à¯à®Ÿà®¿à®µà®Ÿà¯ˆà®¨à¯à®¤à®¤à¯",
   "notification.reblog": "{name} à®‰à®™à¯à®•à®³à¯ à®¨à®¿à®²à¯ˆ à®…à®¤à®¿à®•à®°à®¿à®¤à¯à®¤à®¤à¯",
+  "notification.status": "{name} just posted",
   "notifications.clear": "à®…à®±à®¿à®µà®¿à®ªà¯à®ªà¯à®•à®³à¯ˆ à®…à®´à®¿à®•à¯à®•à®µà¯à®®à¯",
   "notifications.clear_confirmation": "à®‰à®™à¯à®•à®³à¯ à®Žà®²à¯à®²à®¾ à®…à®±à®¿à®µà®¿à®ªà¯à®ªà¯à®•à®³à¯ˆà®¯à¯à®®à¯ à®¨à®¿à®°à®¨à¯à®¤à®°à®®à®¾à®• à®…à®´à®¿à®•à¯à®• à®µà®¿à®°à¯à®®à¯à®ªà¯à®•à®¿à®±à¯€à®°à¯à®•à®³à®¾?",
   "notifications.column_settings.alert": "à®Ÿà¯†à®¸à¯à®•à¯à®Ÿà®¾à®ªà¯ à®…à®±à®¿à®µà®¿à®ªà¯à®ªà¯à®•à®³à¯",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "à®®à®¤à®¿à®ªà¯à®ªà¯ˆ à®‰à®¯à®°à¯à®¤à¯à®¤à¯:",
   "notifications.column_settings.show": "à®ªà®¤à¯à®¤à®¿à®¯à®¿à®²à¯ à®•à®¾à®£à¯à®ªà®¿",
   "notifications.column_settings.sound": "à®’à®²à®¿ à®µà®¿à®³à¯ˆà®¯à®¾à®Ÿ",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "à®Žà®²à¯à®²à®¾",
   "notifications.filter.boosts": "à®®à®¤à®¿à®ªà¯à®ªà¯ˆ à®‰à®¯à®°à¯à®¤à¯à®¤à¯",
   "notifications.filter.favourites": "à®µà®¿à®°à¯à®ªà¯à®ªà®¤à¯à®¤à¯à®•à¯à®•à¯à®•à®¨à¯à®¤",
   "notifications.filter.follows": "à®ªà®¿à®©à¯à®ªà®±à¯à®±à¯",
   "notifications.filter.mentions": "à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯à®•à®¿à®±à®¾à®°à¯",
   "notifications.filter.polls": "à®•à®°à¯à®¤à¯à®¤à¯à®•à¯à®•à®£à®¿à®ªà¯à®ªà¯ à®®à¯à®Ÿà®¿à®µà¯à®•à®³à¯",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} à®…à®±à®¿à®µà®¿à®ªà¯à®ªà¯à®•à®³à¯",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "à®®à¯‚à®Ÿà®¿à®¯",
   "poll.refresh": "à®ªà®¤à¯à®¤à¯à®¯à®¿à®°à¯à®ªà¯à®ª?à®Ÿà¯à®Ÿà¯",
   "poll.total_people": "{count, plural, one {# à®¨à®ªà®°à¯} other {# à®¨à®ªà®°à¯à®•à®³à¯}}",
@@ -419,11 +443,11 @@
   "time_remaining.minutes": "{number, plural, one {# minute} à®®à®±à¯à®± {# minutes}} left",
   "time_remaining.moments": "à®¤à®°à¯à®£à®™à¯à®•à®³à¯ à®®à¯€à®¤à®®à¯à®³à¯à®³à®©",
   "time_remaining.seconds": "{number, plural, one {# second} à®®à®±à¯à®± {# seconds}} left",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "timeline_hint.remote_resource_not_displayed": "à®ªà®¿à®± à®šà®°à¯à®µà®°à¯à®•à®³à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®µà®°à¯à®®à¯ {resource} à®•à®¾à®Ÿà¯à®Ÿà®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ.",
+  "timeline_hint.resources.followers": "à®µà®¾à®šà®•à®°à¯à®•à®³à¯",
+  "timeline_hint.resources.follows": "à®µà®¾à®šà®¿à®•à¯à®•à®¿à®±à®¾à®°à¯",
+  "timeline_hint.resources.statuses": "à®ªà®´à¯ˆà®¯ à®Ÿà¯‚à®Ÿà¯à®Ÿà¯à®•à®³à¯",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} à®¨à®ªà®°à¯} other {{counter} à®¨à®ªà®°à¯à®•à®³à¯}} à®‰à®°à¯ˆà®¯à®¾à®Ÿà®²à®¿à®²à¯",
   "trends.trending_now": "à®‡à®ªà¯à®ªà¯‹à®¤à¯ à®šà¯†à®²à¯à®¤à®¿à®šà¯ˆà®¯à®¿à®²à¯ à®‡à®°à¯à®ªà¯à®ªà®µà¯ˆ",
   "ui.beforeunload": "à®¨à¯€à®™à¯à®•à®³à¯ à®µà¯†à®³à®¿à®¯à¯‡ à®šà¯†à®©à¯à®±à®¾à®²à¯ à®‰à®™à¯à®•à®³à¯ à®µà®°à¯ˆà®µà¯ à®‡à®´à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®®à¯ à®®à®¸à¯à®¤à¯‹à®Ÿà¯‹à®©à¯.",
   "units.short.billion": "{count}B",
@@ -436,16 +460,17 @@
   "upload_form.audio_description": "à®šà¯†à®µà®¿à®¤à¯à®¤à®¿à®±à®©à¯ à®•à¯à®±à¯ˆà®ªà®¾à®Ÿà¯ à®‰à®³à¯à®³à®µà®°à¯à®•à®³à¯à®•à¯à®•à®¾à®• à®µà®¿à®³à®•à¯à®•à¯à®•â€Œ",
   "upload_form.description": "à®ªà®¾à®°à¯à®µà¯ˆà®¯à®±à¯à®± à®µà®¿à®µà®°à®¿à®•à¯à®•à®µà¯à®®à¯",
   "upload_form.edit": "à®¤à¯†à®¾à®•à¯",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "à®šà®¿à®±à¯à®ªà®Ÿà®¤à¯à®¤à¯ˆ à®®à®¾à®±à¯à®±",
   "upload_form.undo": "à®¨à¯€à®•à¯à®•à¯",
   "upload_form.video_description": "à®šà¯†à®µà®¿à®¤à¯à®¤à®¿à®±à®©à¯ à®®à®±à¯à®±à¯à®®à¯ à®ªà®¾à®°à¯à®µà¯ˆà®•à¯ à®•à¯à®±à¯ˆà®ªà®¾à®Ÿà¯ à®‰à®³à¯à®³à®µà®°à¯à®•à®³à¯à®•à¯à®•à®¾à®• à®µà®¿à®³à®•à¯à®•à¯à®•â€Œ",
   "upload_modal.analyzing_picture": "à®ªà®Ÿà®®à¯ à®†à®°à®¾à®¯à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯â€¦",
   "upload_modal.apply": "à®‰à®ªà®¯à¯‹à®•à®¿",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "à®ªà®Ÿà®¤à¯à®¤à¯ˆà®¤à¯ à®¤à¯‡à®°à¯à®µà¯à®šà¯†à®¯à¯à®¯",
   "upload_modal.description_placeholder": "à®ªà¯Šà®°à¯à®³à¯ à®µà®¿à®³à®•à¯à®•à®®à¯",
   "upload_modal.detect_text": "à®ªà®Ÿà®¤à¯à®¤à®¿à®²à¯ à®‡à®°à¯à®•à¯à®•à¯à®®à¯ à®Žà®´à¯à®¤à¯à®¤à¯ˆ à®•à®£à¯à®Ÿà®±à®¿",
   "upload_modal.edit_media": "à®ªà®Ÿà®¤à¯à®¤à¯ˆà®¤à¯ à®¤à¯Šà®•à¯",
   "upload_modal.hint": "à®Žà®²à¯à®²à®¾ à®µà®¿à®²à¯à®²à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®¿à®²à¯à®®à¯ à®¤à¯†à®°à®¿à®¯à®µà¯‡à®£à¯à®Ÿà®¿à®¯, à®ªà®Ÿà®¤à¯à®¤à®¿à®©à¯ à®®à¯à®•à¯à®•à®¿à®¯ à®•à¯à®µà®¿à®¯à®ªà¯à®ªà¯à®³à¯à®³à®¿à®•à¯à®•à¯, à®µà®Ÿà¯à®Ÿà®¤à¯à®¤à¯ˆ à®šà¯Šà®Ÿà¯à®•à¯à®•à®¿ à®‡à®´à¯à®¤à¯à®¤à¯à®šà¯à®šà¯†à®²à¯à®²à®µà¯à®®à¯.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "à®®à¯à®©à¯à®©à¯‹à®Ÿà¯à®Ÿà®®à¯ ({ratio})",
   "upload_progress.label": "à®à®±à¯à®±à¯à®•à®¿à®±à®¤à¯ ...",
   "video.close": "à®µà¯€à®Ÿà®¿à®¯à¯‹à®µà¯ˆ à®®à¯‚à®Ÿà¯",
diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json
index e5d833fe87465898b1831bb4ceb749f69e1f8e65..70f6ab1529e76eb2ac320779468d4f934d169e1a 100644
--- a/app/javascript/mastodon/locales/tai.json
+++ b/app/javascript/mastodon/locales/tai.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Cancel follow request",
   "account.direct": "Direct message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain blocked",
   "account.edit_profile": "Edit profile",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
   "account.follow": "Follow",
   "account.followers": "Followers",
@@ -96,9 +98,9 @@
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "Write your warning here",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No toots here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "Authorize",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
-  "lightbox.view_context": "View context",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Change title",
   "lists.new.create": "Add list",
   "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Search among people you follow",
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.alert": "Desktop notifications",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Closed",
   "poll.refresh": "Refresh",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -389,7 +413,7 @@
   "status.pinned": "Pinned toot",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploadingâ€¦",
   "video.close": "Close video",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 4763dcbd309154f5ece5126e0c8c4d2f7c809ac3..994682a675c4cd184d0dbb8e34a178ab29b5fd7b 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Cancel follow request",
   "account.direct": "@{name}à°•à± à°¨à±‡à°°à±à°—à°¾ à°¸à°‚à°¦à±‡à°¶à°‚ à°ªà°‚à°ªà±",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "à°¡à±Šà°®à±ˆà°¨à± à°¦à°¾à°šà°¿à°ªà±†à°Ÿà±à°Ÿà°¬à°¡à°¿à°¨à°¦à°¿",
   "account.edit_profile": "à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à°¿ à°¸à°µà°°à°¿à°‚à°šà°‚à°¡à°¿",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "à°ªà±à°°à±Šà°«à±ˆà°²à±à°²à±‹ à°šà±‚à°ªà°¿à°‚à°šà±",
   "account.follow": "à°…à°¨à±à°¸à°°à°¿à°‚à°šà±",
   "account.followers": "à°…à°¨à±à°šà°°à±à°²à±",
@@ -96,7 +98,7 @@
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
   "compose_form.publish": "à°Ÿà±‚à°Ÿà±",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "à°®à±€à°¡à°¿à°¯à°¾ à°¸à±à°¨à±à°¨à°¿à°¤à°®à±ˆà°¨à°¦à°¿à°—à°¾ à°—à±à°°à±à°¤à°¿à°‚à°šà°¬à°¡à°¿à°‚à°¦à°¿",
   "compose_form.sensitive.unmarked": "à°®à±€à°¡à°¿à°¯à°¾ à°¸à±à°¨à±à°¨à°¿à°¤à°®à±ˆà°¨à°¦à°¿à°—à°¾ à°—à±à°°à±à°¤à°¿à°‚à°šà°¬à°¡à°²à±‡à°¦à±",
   "compose_form.spoiler.marked": "à°¹à±†à°šà±à°šà°°à°¿à°• à°µà±†à°¨à±à°• à°ªà°¾à° à±à°¯à°‚ à°¦à°¾à°šà°¬à°¡à°¿à°‚à°¦à°¿",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "à°¶à±‹à°§à°¨ à°«à°²à°¿à°¤à°¾à°²à±",
   "emoji_button.symbols": "à°šà°¿à°¹à±à°¨à°¾à°²à±",
   "emoji_button.travel": "à°ªà±à°°à°¯à°¾à°£à°‚ & à°ªà±à°°à°¦à±‡à°¶à°¾à°²à±",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "à°‡à°•à±à°•à°¡ à° à°Ÿà±‚à°Ÿà±à°²à±‚ à°²à±‡à°µà±!No toots here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "à°®à±€à°°à± à°‡à°‚à°•à°¾ à° à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à±à°²à°¨à±‚ à°¬à±à°²à°¾à°•à± à°šà±‡à°¯à°²à±‡à°¦à±.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "à°®à±€à°•à± à°‡à°‚à°•à°¾ à° à°¨à±‹à°Ÿà°¿à°«à°¿à°•à±‡à°·à°¨à±à°²à± à°²à±‡à°µà±. à°¸à°‚à°à°¾à°·à°£à°¨à± à°ªà±à°°à°¾à°°à°‚à°à°¿à°‚à°šà°¡à°¾à°¨à°¿à°•à°¿ à°‡à°¤à°°à±à°²à°¤à±‹ à°ªà±à°°à°¤à°¿à°¸à±à°ªà°‚à°¦à°¿à°‚à°šà°‚à°¡à°¿.",
   "empty_column.public": "à°‡à°•à±à°•à°¡ à°à°®à±€ à°²à±‡à°¦à±! à°¦à±€à°¨à±à°¨à°¿ à°¨à°¿à°‚à°ªà°¡à°¾à°¨à°¿à°•à°¿ à°¬à°¹à°¿à°°à°‚à°—à°‚à°—à°¾ à°à°¦à±ˆà°¨à°¾ à°µà±à°°à°¾à°¯à°‚à°¡à°¿, à°²à±‡à°¦à°¾ à°‡à°¤à°° à°¸à±‡à°µà°¿à°•à°² à°¨à±à°‚à°¡à°¿ à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à±à°²à°¨à± à°…à°¨à±à°¸à°°à°¿à°‚à°šà°‚à°¡à°¿",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "à°…à°¨à±à°®à°¤à°¿à°‚à°šà±",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "à°ªà°¾à° à±à°¯à°‚ à°µà±à°°à°¾à°¸à±‡ à°à°°à°¿à°¯à°¾/à°¶à±‹à°§à°¨ à°ªà°Ÿà±à°Ÿà°¿à°• à°¨à±à°‚à°¡à°¿ à°¬à°¯à°Ÿà°•à± à°°à°¾à°µà°¡à°¾à°¨à°¿à°•à°¿",
   "keyboard_shortcuts.up": "à°œà°¾à°¬à°¿à°¤à°¾à°²à±‹ à°ªà±ˆà°•à°¿ à°¤à°°à°²à°¿à°‚à°šà°¡à°¾à°¨à°¿à°•à°¿",
   "lightbox.close": "à°®à±‚à°¸à°¿à°µà±‡à°¯à±",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "à°¤à°°à±à°µà°¾à°¤",
   "lightbox.previous": "à°®à±à°¨à±à°ªà°Ÿà°¿",
-  "lightbox.view_context": "View context",
   "lists.account.add": "à°œà°¾à°¬à°¿à°¤à°¾à°•à± à°œà±‹à°¡à°¿à°‚à°šà±",
   "lists.account.remove": "à°œà°¾à°¬à°¿à°¤à°¾ à°¨à±à°‚à°¡à°¿ à°¤à±Šà°²à°—à°¿à°‚à°šà±",
   "lists.delete": "à°œà°¾à°¬à°¿à°¤à°¾à°¨à± à°¤à±Šà°²à°—à°¿à°‚à°šà±",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "à°¶à±€à°°à±à°·à°¿à°• à°®à°¾à°°à±à°šà±",
   "lists.new.create": "à°œà°¾à°¬à°¿à°¤à°¾à°¨à± à°œà±‹à°¡à°¿à°‚à°šà±",
   "lists.new.title_placeholder": "à°•à±Šà°¤à±à°¤ à°œà°¾à°¬à°¿à°¤à°¾ à°¶à±€à°°à±à°·à°¿à°•",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "à°®à±€à°°à± à°…à°¨à±à°¸à°°à°¿à°‚à°šà±‡ à°µà±à°¯à°•à±à°¤à±à°²à°²à±‹ à°¶à±‹à°§à°¿à°‚à°šà°‚à°¡à°¿",
   "lists.subheading": "à°®à±€ à°œà°¾à°¬à°¿à°¤à°¾à°²à±",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "à°¦à±ƒà°¶à±à°¯à°®à°¾à°¨à°¤à°¨à± à°Ÿà±‹à°—à±à°²à± à°šà±‡à°¯à°‚à°¡à°¿",
   "missing_indicator.label": "à°¦à±Šà°°à°•à°²à±‡à°¦à±",
   "missing_indicator.sublabel": "à°ˆ à°µà°¨à°°à± à°•à°¨à±à°—à±Šà°¨à°¬à°¡à°²à±‡à°¦à±",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "à°ˆ à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à± à°¨à±à°‚à°¡à°¿ à°¨à±‹à°Ÿà°¿à°«à°¿à°•à±‡à°·à°¨à±à°²à°¨à± à°¦à°¾à°šà°¾à°²à°¾?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "à°®à±Šà°¬à±ˆà°²à± à°†à°ªà± à°²à±",
   "navigation_bar.blocks": "à°¬à±à°²à°¾à°•à± à°šà±‡à°¯à°¬à°¡à°¿à°¨ à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à±à°²à±",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "à°®à±€à°°à± à°ªà°¾à°²à±à°—à±Šà°¨à°¿à°¨ à°Žà°¨à±à°¸à°¿à°• à°®à±à°—à°¿à°¸à°¿à°¨à°¦à°¿",
   "notification.reblog": "{name} à°®à±€ à°¸à±à°Ÿà±‡à°Ÿà°¸à± à°¨à± à°¬à±‚à°¸à±à°Ÿà± à°šà±‡à°¸à°¾à°°à±",
+  "notification.status": "{name} just posted",
   "notifications.clear": "à°ªà±à°°à°•à°Ÿà°¨à°²à°¨à± à°¤à±à°¡à°¿à°šà°¿à°µà±‡à°¯à±",
   "notifications.clear_confirmation": "à°®à±€à°°à± à°®à±€ à°…à°¨à±à°¨à°¿ à°¨à±‹à°Ÿà°¿à°«à°¿à°•à±‡à°·à°¨à±à°²à°¨à± à°¶à°¾à°¶à±à°µà°¤à°‚à°—à°¾ à°¤à±Šà°²à°—à°¿à°‚à°šà°¾à°²à°¨à±à°•à±à°‚à°Ÿà±à°¨à±à°¨à°¾à°°à°¾?",
   "notifications.column_settings.alert": "à°¡à±†à°¸à±à°•à±à°Ÿà°¾à°ªà± à°¨à±‹à°Ÿà°¿à°«à°¿à°•à±‡à°·à°¨à±à°²à±",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "à°¬à±‚à°¸à±à°Ÿà± à°²à±:",
   "notifications.column_settings.show": "à°¨à°¿à°²à±à°µà± à°µà°°à±à°¸à°²à±‹ à°šà±‚à°ªà±",
   "notifications.column_settings.sound": "à°§à±à°µà°¨à°¿à°¨à°¿ à°ªà±à°²à±‡ à°šà±‡à°¯à°¿",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "à°…à°¨à±à°¨à±€",
   "notifications.filter.boosts": "à°¬à±‚à°¸à±à°Ÿà±à°²à±",
   "notifications.filter.favourites": "à°‡à°·à±à°Ÿà°¾à°²à±",
   "notifications.filter.follows": "à°…à°¨à±à°¸à°°à°¿à°¸à±à°¤à±à°¨à±à°¨à°µà°¿",
   "notifications.filter.mentions": "à°ªà±‡à°°à±à°•à±Šà°¨à±à°¨à°µà°¿",
   "notifications.filter.polls": "à°Žà°¨à±à°¨à°¿à°• à°«à°²à°¿à°¤à°¾à°²à±",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} à°ªà±à°°à°•à°Ÿà°¨à°²à±",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "à°®à±‚à°¸à°¿à°µà±‡à°¯à°¬à°¡à°¿à°¨à°µà°¿",
   "poll.refresh": "à°¨à°µà±€à°•à°°à°¿à°‚à°šà±",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "à°…à°ªà±à°²à±‹à°¡à± à°…à°µà±à°¤à±‹à°‚à°¦à°¿...",
   "video.close": "à°µà±€à°¡à°¿à°¯à±‹à°¨à°¿ à°®à±‚à°¸à°¿à°µà±‡à°¯à°¿",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index a5c6b07cde64013e8e9df28e0dc8a5d9f1ffce3b..30ec26809b566e108feee5d6d27ac9daa79e410e 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -1,22 +1,24 @@
 {
-  "account.account_note_header": "à¸«à¸¡à¸²à¸¢à¹€à¸«à¸•à¸¸à¸‚à¸à¸‡à¸„à¸¸à¸“à¸ªà¸³à¸«à¸£à¸±à¸š @{name}",
+  "account.account_note_header": "à¸«à¸¡à¸²à¸¢à¹€à¸«à¸•à¸¸",
   "account.add_or_remove_from_list": "à¹€à¸žà¸´à¹ˆà¸¡à¸«à¸£à¸·à¸à¹€à¸à¸²à¸à¸à¸à¸ˆà¸²à¸à¸£à¸²à¸¢à¸à¸²à¸£",
   "account.badges.bot": "à¸šà¸à¸•",
   "account.badges.group": "à¸à¸¥à¸¸à¹ˆà¸¡",
   "account.block": "à¸›à¸´à¸”à¸à¸±à¹‰à¸™ @{name}",
   "account.block_domain": "à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™ {domain}",
   "account.blocked": "à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¸à¸¢à¸¹à¹ˆ",
-  "account.browse_more_on_origin_server": "à¸”à¸¹à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡à¹ƒà¸™à¹‚à¸›à¸£à¹„à¸Ÿà¸¥à¹Œà¸•à¹‰à¸™à¸‰à¸šà¸±à¸š",
+  "account.browse_more_on_origin_server": "à¹€à¸£à¸µà¸¢à¸à¸”à¸¹à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡à¹ƒà¸™à¹‚à¸›à¸£à¹„à¸Ÿà¸¥à¹Œà¸”à¸±à¹‰à¸‡à¹€à¸”à¸´à¸¡",
   "account.cancel_follow_request": "à¸¢à¸à¹€à¸¥à¸´à¸à¸„à¸³à¸‚à¸à¸•à¸´à¸”à¸•à¸²à¸¡",
   "account.direct": "à¸ªà¹ˆà¸‡à¸‚à¹‰à¸à¸„à¸§à¸²à¸¡à¹‚à¸”à¸¢à¸•à¸£à¸‡à¸–à¸¶à¸‡ @{name}",
+  "account.disable_notifications": "à¸«à¸¢à¸¸à¸”à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™à¸‰à¸±à¸™à¹€à¸¡à¸·à¹ˆà¸ @{name} à¹‚à¸žà¸ªà¸•à¹Œ",
   "account.domain_blocked": "à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™à¸à¸¢à¸¹à¹ˆ",
   "account.edit_profile": "à¹à¸à¹‰à¹„à¸‚à¹‚à¸›à¸£à¹„à¸Ÿà¸¥à¹Œ",
+  "account.enable_notifications": "à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™à¸‰à¸±à¸™à¹€à¸¡à¸·à¹ˆà¸ @{name} à¹‚à¸žà¸ªà¸•à¹Œ",
   "account.endorse": "à¹à¸ªà¸”à¸‡à¹ƒà¸«à¹‰à¹€à¸«à¹‡à¸™à¹ƒà¸™à¹‚à¸›à¸£à¹„à¸Ÿà¸¥à¹Œ",
   "account.follow": "à¸•à¸´à¸”à¸•à¸²à¸¡",
   "account.followers": "à¸œà¸¹à¹‰à¸•à¸´à¸”à¸•à¸²à¸¡",
   "account.followers.empty": "à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¸¡à¸µà¹ƒà¸„à¸£à¸•à¸´à¸”à¸•à¸²à¸¡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸™à¸µà¹‰",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers_counter": "{count, plural, other {{counter} à¸œà¸¹à¹‰à¸•à¸´à¸”à¸•à¸²à¸¡}}",
+  "account.following_counter": "{count, plural, other {{counter} à¸à¸³à¸¥à¸±à¸‡à¸•à¸´à¸”à¸•à¸²à¸¡}}",
   "account.follows.empty": "à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸™à¸µà¹‰à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸•à¸´à¸”à¸•à¸²à¸¡à¹ƒà¸„à¸£",
   "account.follows_you": "à¸•à¸´à¸”à¸•à¸²à¸¡à¸„à¸¸à¸“",
   "account.hide_reblogs": "à¸‹à¹ˆà¸à¸™à¸à¸²à¸£à¸”à¸±à¸™à¸ˆà¸²à¸ @{name}",
@@ -36,14 +38,14 @@
   "account.requested": "à¸à¸³à¸¥à¸±à¸‡à¸£à¸à¸à¸²à¸£à¸à¸™à¸¸à¸¡à¸±à¸•à¸´ à¸„à¸¥à¸´à¸à¹€à¸žà¸·à¹ˆà¸à¸¢à¸à¹€à¸¥à¸´à¸à¸„à¸³à¸‚à¸à¸•à¸´à¸”à¸•à¸²à¸¡",
   "account.share": "à¹à¸šà¹ˆà¸‡à¸›à¸±à¸™à¹‚à¸›à¸£à¹„à¸Ÿà¸¥à¹Œà¸‚à¸à¸‡ @{name}",
   "account.show_reblogs": "à¹à¸ªà¸”à¸‡à¸à¸²à¸£à¸”à¸±à¸™à¸ˆà¸²à¸ @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, other {{counter} à¹‚à¸žà¸ªà¸•à¹Œ}}",
   "account.unblock": "à¹€à¸¥à¸´à¸à¸›à¸´à¸”à¸à¸±à¹‰à¸™ @{name}",
   "account.unblock_domain": "à¹€à¸¥à¸´à¸à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™ {domain}",
   "account.unendorse": "à¹„à¸¡à¹ˆà¹à¸ªà¸”à¸‡à¹ƒà¸«à¹‰à¹€à¸«à¹‡à¸™à¹ƒà¸™à¹‚à¸›à¸£à¹„à¸Ÿà¸¥à¹Œ",
   "account.unfollow": "à¹€à¸¥à¸´à¸à¸•à¸´à¸”à¸•à¸²à¸¡",
   "account.unmute": "à¹€à¸¥à¸´à¸à¸‹à¹ˆà¸à¸™ @{name}",
   "account.unmute_notifications": "à¹€à¸¥à¸´à¸à¸‹à¹ˆà¸à¸™à¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™à¸ˆà¸²à¸ @{name}",
-  "account_note.placeholder": "à¹„à¸¡à¹ˆà¸¡à¸µà¸„à¸§à¸²à¸¡à¸„à¸´à¸”à¹€à¸«à¹‡à¸™à¸—à¸µà¹ˆà¸£à¸°à¸šà¸¸à¹„à¸§à¹‰",
+  "account_note.placeholder": "à¸„à¸¥à¸´à¸à¹€à¸žà¸·à¹ˆà¸à¹€à¸žà¸´à¹ˆà¸¡à¸«à¸¡à¸²à¸¢à¹€à¸«à¸•à¸¸",
   "alert.rate_limited.message": "à¹‚à¸›à¸£à¸”à¸¥à¸à¸‡à¹ƒà¸«à¸¡à¹ˆà¸«à¸¥à¸±à¸‡à¸ˆà¸²à¸ {retry_time, time, medium}",
   "alert.rate_limited.title": "à¸¡à¸µà¸à¸²à¸£à¸ˆà¸³à¸à¸±à¸”à¸à¸±à¸•à¸£à¸²",
   "alert.unexpected.message": "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¸„à¸²à¸”à¸„à¸´à¸”",
@@ -82,23 +84,23 @@
   "community.column_settings.local_only": "à¹ƒà¸™à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™",
   "community.column_settings.media_only": "à¸ªà¸·à¹ˆà¸à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™",
   "community.column_settings.remote_only": "à¸£à¸°à¸¢à¸°à¹„à¸à¸¥à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™",
-  "compose_form.direct_message_warning": "à¹‚à¸žà¸ªà¸•à¹Œà¸™à¸µà¹‰à¸ˆà¸°à¸–à¸¹à¸à¸ªà¹ˆà¸‡à¹„à¸›à¸¢à¸±à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸—à¸µà¹ˆà¸à¸¥à¹ˆà¸²à¸§à¸–à¸¶à¸‡à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™",
+  "compose_form.direct_message_warning": "à¸ˆà¸°à¸ªà¹ˆà¸‡à¹‚à¸žà¸ªà¸•à¹Œà¸™à¸µà¹‰à¹„à¸›à¸¢à¸±à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸—à¸µà¹ˆà¸à¸¥à¹ˆà¸²à¸§à¸–à¸¶à¸‡à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™",
   "compose_form.direct_message_warning_learn_more": "à¹€à¸£à¸µà¸¢à¸™à¸£à¸¹à¹‰à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡",
-  "compose_form.hashtag_warning": "à¹‚à¸žà¸ªà¸•à¹Œà¸™à¸µà¹‰à¸ˆà¸°à¹„à¸¡à¹ˆà¸–à¸¹à¸à¹à¸ªà¸”à¸‡à¹ƒà¸™à¹à¸®à¸Šà¹à¸—à¹‡à¸à¹ƒà¸” à¹† à¹€à¸™à¸·à¹ˆà¸à¸‡à¸ˆà¸²à¸à¹„à¸¡à¹ˆà¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸£à¸²à¸¢à¸à¸²à¸£ à¹€à¸‰à¸žà¸²à¸°à¹‚à¸žà¸ªà¸•à¹Œà¸ªà¸²à¸˜à¸²à¸£à¸“à¸°à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™à¸—à¸µà¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸„à¹‰à¸™à¸«à¸²à¹‚à¸”à¸¢à¹à¸®à¸Šà¹à¸—à¹‡à¸",
+  "compose_form.hashtag_warning": "à¸ˆà¸°à¹„à¸¡à¹ˆà¹à¸ªà¸”à¸‡à¸£à¸²à¸¢à¸à¸²à¸£à¹‚à¸žà¸ªà¸•à¹Œà¸™à¸µà¹‰à¸ à¸²à¸¢à¹ƒà¸•à¹‰à¹à¸®à¸Šà¹à¸—à¹‡à¸à¹ƒà¸” à¹† à¹€à¸™à¸·à¹ˆà¸à¸‡à¸ˆà¸²à¸à¹„à¸¡à¹ˆà¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸£à¸²à¸¢à¸à¸²à¸£ à¹€à¸‰à¸žà¸²à¸°à¹‚à¸žà¸ªà¸•à¹Œà¸ªà¸²à¸˜à¸²à¸£à¸“à¸°à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™à¸—à¸µà¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸„à¹‰à¸™à¸«à¸²à¹‚à¸”à¸¢à¹à¸®à¸Šà¹à¸—à¹‡à¸",
   "compose_form.lock_disclaimer": "à¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡à¸„à¸¸à¸“à¹„à¸¡à¹ˆà¹„à¸”à¹‰ {locked} à¹ƒà¸„à¸£à¸à¹‡à¸•à¸²à¸¡à¸ªà¸²à¸¡à¸²à¸£à¸–à¸•à¸´à¸”à¸•à¸²à¸¡à¸„à¸¸à¸“à¹€à¸žà¸·à¹ˆà¸à¸”à¸¹à¹‚à¸žà¸ªà¸•à¹Œà¸ªà¸³à¸«à¸£à¸±à¸šà¸œà¸¹à¹‰à¸•à¸´à¸”à¸•à¸²à¸¡à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™à¸‚à¸à¸‡à¸„à¸¸à¸“",
   "compose_form.lock_disclaimer.lock": "à¸¥à¹‡à¸à¸„à¸à¸¢à¸¹à¹ˆ",
   "compose_form.placeholder": "à¸„à¸¸à¸“à¸à¸³à¸¥à¸±à¸‡à¸„à¸´à¸”à¸à¸°à¹„à¸£à¸à¸¢à¸¹à¹ˆ?",
   "compose_form.poll.add_option": "à¹€à¸žà¸´à¹ˆà¸¡à¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸",
-  "compose_form.poll.duration": "à¸£à¸°à¸¢à¸°à¹€à¸§à¸¥à¸²à¹‚à¸žà¸¥",
+  "compose_form.poll.duration": "à¸£à¸°à¸¢à¸°à¹€à¸§à¸¥à¸²à¸à¸²à¸£à¸ªà¸³à¸£à¸§à¸ˆà¸„à¸§à¸²à¸¡à¸„à¸´à¸”à¹€à¸«à¹‡à¸™",
   "compose_form.poll.option_placeholder": "à¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸ {number}",
   "compose_form.poll.remove_option": "à¹€à¸à¸²à¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸à¸™à¸µà¹‰à¸à¸à¸",
   "compose_form.poll.switch_to_multiple": "à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸à¸²à¸£à¸ªà¸³à¸£à¸§à¸ˆà¸„à¸§à¸²à¸¡à¸„à¸´à¸”à¹€à¸«à¹‡à¸™à¹€à¸›à¹‡à¸™à¸à¸™à¸¸à¸à¸²à¸•à¸«à¸¥à¸²à¸¢à¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸",
   "compose_form.poll.switch_to_single": "à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸à¸²à¸£à¸ªà¸³à¸£à¸§à¸ˆà¸„à¸§à¸²à¸¡à¸„à¸´à¸”à¹€à¸«à¹‡à¸™à¹€à¸›à¹‡à¸™à¸à¸™à¸¸à¸à¸²à¸•à¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸à¹€à¸”à¸µà¹ˆà¸¢à¸§",
   "compose_form.publish": "à¹‚à¸žà¸ªà¸•à¹Œ",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "à¸—à¸³à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸«à¸¡à¸²à¸¢à¸ªà¸·à¹ˆà¸à¸§à¹ˆà¸²à¸¥à¸°à¹€à¸à¸µà¸¢à¸”à¸à¹ˆà¸à¸™",
-  "compose_form.sensitive.marked": "à¸¡à¸µà¸à¸²à¸£à¸—à¸³à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸«à¸¡à¸²à¸¢à¸ªà¸·à¹ˆà¸à¸§à¹ˆà¸²à¸¥à¸°à¹€à¸à¸µà¸¢à¸”à¸à¹ˆà¸à¸™",
-  "compose_form.sensitive.unmarked": "à¹„à¸¡à¹ˆà¸¡à¸µà¸à¸²à¸£à¸—à¸³à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸«à¸¡à¸²à¸¢à¸ªà¸·à¹ˆà¸à¸§à¹ˆà¸²à¸¥à¸°à¹€à¸à¸µà¸¢à¸”à¸à¹ˆà¸à¸™",
+  "compose_form.sensitive.hide": "{count, plural, other {à¸—à¸³à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸«à¸¡à¸²à¸¢à¸ªà¸·à¹ˆà¸à¸§à¹ˆà¸²à¸¥à¸°à¹€à¸à¸µà¸¢à¸”à¸à¹ˆà¸à¸™}}",
+  "compose_form.sensitive.marked": "{count, plural, other {à¸¡à¸µà¸à¸²à¸£à¸—à¸³à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸«à¸¡à¸²à¸¢à¸ªà¸·à¹ˆà¸à¸§à¹ˆà¸²à¸¥à¸°à¹€à¸à¸µà¸¢à¸”à¸à¹ˆà¸à¸™}}",
+  "compose_form.sensitive.unmarked": "{count, plural, other {à¹„à¸¡à¹ˆà¸¡à¸µà¸à¸²à¸£à¸—à¸³à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸«à¸¡à¸²à¸¢à¸ªà¸·à¹ˆà¸à¸§à¹ˆà¸²à¸¥à¸°à¹€à¸à¸µà¸¢à¸”à¸à¹ˆà¸à¸™}}",
   "compose_form.spoiler.marked": "à¸¡à¸µà¸à¸²à¸£à¸‹à¹ˆà¸à¸™à¸‚à¹‰à¸à¸„à¸§à¸²à¸¡à¸à¸¢à¸¹à¹ˆà¸«à¸¥à¸±à¸‡à¸„à¸³à¹€à¸•à¸·à¸à¸™",
   "compose_form.spoiler.unmarked": "à¹„à¸¡à¹ˆà¸¡à¸µà¸à¸²à¸£à¸‹à¹ˆà¸à¸™à¸‚à¹‰à¸à¸„à¸§à¸²à¸¡",
   "compose_form.spoiler_placeholder": "à¹€à¸‚à¸µà¸¢à¸™à¸„à¸³à¹€à¸•à¸·à¸à¸™à¸‚à¸à¸‡à¸„à¸¸à¸“à¸—à¸µà¹ˆà¸™à¸µà¹ˆ",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "à¸œà¸¥à¸¥à¸±à¸žà¸˜à¹Œà¸à¸²à¸£à¸„à¹‰à¸™à¸«à¸²",
   "emoji_button.symbols": "à¸ªà¸±à¸à¸¥à¸±à¸à¸©à¸“à¹Œ",
   "emoji_button.travel": "à¸à¸²à¸£à¹€à¸”à¸´à¸™à¸—à¸²à¸‡à¹à¸¥à¸°à¸ªà¸–à¸²à¸™à¸—à¸µà¹ˆ",
+  "empty_column.account_suspended": "à¸£à¸°à¸‡à¸±à¸šà¸šà¸±à¸à¸Šà¸µà¸à¸¢à¸¹à¹ˆ",
   "empty_column.account_timeline": "à¹„à¸¡à¹ˆà¸¡à¸µà¹‚à¸žà¸ªà¸•à¹Œà¸—à¸µà¹ˆà¸™à¸µà¹ˆ!",
   "empty_column.account_unavailable": "à¹„à¸¡à¹ˆà¸¡à¸µà¹‚à¸›à¸£à¹„à¸Ÿà¸¥à¹Œ",
   "empty_column.blocks": "à¸„à¸¸à¸“à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¹ƒà¸” à¹†",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "à¸„à¸¸à¸“à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¸¡à¸µà¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™à¹ƒà¸” à¹† à¹‚à¸•à¹‰à¸•à¸à¸šà¸à¸±à¸šà¸œà¸¹à¹‰à¸à¸·à¹ˆà¸™à¹€à¸žà¸·à¹ˆà¸à¹€à¸£à¸´à¹ˆà¸¡à¸à¸²à¸£à¸ªà¸™à¸—à¸™à¸²",
   "empty_column.public": "à¹„à¸¡à¹ˆà¸¡à¸µà¸ªà¸´à¹ˆà¸‡à¹ƒà¸”à¸—à¸µà¹ˆà¸™à¸µà¹ˆ! à¹€à¸‚à¸µà¸¢à¸™à¸šà¸²à¸‡à¸à¸¢à¹ˆà¸²à¸‡à¹€à¸›à¹‡à¸™à¸ªà¸²à¸˜à¸²à¸£à¸“à¸° à¸«à¸£à¸·à¸à¸•à¸´à¸”à¸•à¸²à¸¡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸ˆà¸²à¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸à¸·à¹ˆà¸™ à¹† à¸”à¹‰à¸§à¸¢à¸•à¸™à¹€à¸à¸‡à¹€à¸žà¸·à¹ˆà¸à¹€à¸•à¸´à¸¡à¹ƒà¸«à¹‰à¹€à¸•à¹‡à¸¡",
   "error.unexpected_crash.explanation": "à¹€à¸™à¸·à¹ˆà¸à¸‡à¸ˆà¸²à¸à¸‚à¹‰à¸à¸šà¸à¸žà¸£à¹ˆà¸à¸‡à¹ƒà¸™à¹‚à¸„à¹‰à¸”à¸‚à¸à¸‡à¹€à¸£à¸²à¸«à¸£à¸·à¸à¸›à¸±à¸à¸«à¸²à¸„à¸§à¸²à¸¡à¹€à¸‚à¹‰à¸²à¸à¸±à¸™à¹„à¸”à¹‰à¸‚à¸à¸‡à¹€à¸šà¸£à¸²à¸§à¹Œà¹€à¸‹à¸à¸£à¹Œ à¸ˆà¸¶à¸‡à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹à¸ªà¸”à¸‡à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰à¹„à¸”à¹‰à¸à¸¢à¹ˆà¸²à¸‡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡",
+  "error.unexpected_crash.explanation_addons": "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹à¸ªà¸”à¸‡à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰à¹„à¸”à¹‰à¸à¸¢à¹ˆà¸²à¸‡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡ à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¸™à¸µà¹‰à¹€à¸›à¹‡à¸™à¹„à¸›à¹„à¸”à¹‰à¸§à¹ˆà¸²à¹€à¸à¸´à¸”à¸ˆà¸²à¸à¸ªà¹ˆà¸§à¸™à¹€à¸ªà¸£à¸´à¸¡à¸‚à¸à¸‡à¹€à¸šà¸£à¸²à¸§à¹Œà¹€à¸‹à¸à¸£à¹Œà¸«à¸£à¸·à¸à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸¡à¸·à¸à¸à¸²à¸£à¹à¸›à¸¥à¸à¸±à¸•à¹‚à¸™à¸¡à¸±à¸•à¸´",
   "error.unexpected_crash.next_steps": "à¸¥à¸à¸‡à¸£à¸µà¹€à¸Ÿà¸£à¸Šà¸«à¸™à¹‰à¸² à¸«à¸²à¸à¸™à¸±à¹ˆà¸™à¹„à¸¡à¹ˆà¸Šà¹ˆà¸§à¸¢ à¸„à¸¸à¸“à¸à¸²à¸ˆà¸¢à¸±à¸‡à¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰ Mastodon à¸œà¹ˆà¸²à¸™à¹€à¸šà¸£à¸²à¸§à¹Œà¹€à¸‹à¸à¸£à¹Œà¸à¸·à¹ˆà¸™à¸«à¸£à¸·à¸à¹à¸à¸›",
+  "error.unexpected_crash.next_steps_addons": "à¸¥à¸à¸‡à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸ªà¹ˆà¸§à¸™à¹€à¸ªà¸£à¸´à¸¡à¸«à¸£à¸·à¸à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸¡à¸·à¸à¹à¸¥à¹‰à¸§à¸£à¸µà¹€à¸Ÿà¸£à¸Šà¸«à¸™à¹‰à¸² à¸«à¸²à¸à¸™à¸±à¹ˆà¸™à¹„à¸¡à¹ˆà¸Šà¹ˆà¸§à¸¢ à¸„à¸¸à¸“à¸à¸²à¸ˆà¸¢à¸±à¸‡à¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰ Mastodon à¸œà¹ˆà¸²à¸™à¹€à¸šà¸£à¸²à¸§à¹Œà¹€à¸‹à¸à¸£à¹Œà¸à¸·à¹ˆà¸™à¸«à¸£à¸·à¸à¹à¸à¸›",
   "errors.unexpected_crash.copy_stacktrace": "à¸„à¸±à¸”à¸¥à¸à¸à¸à¸²à¸£à¸•à¸´à¸”à¸•à¸²à¸¡à¸ªà¹à¸•à¸à¹„à¸›à¸¢à¸±à¸‡à¸„à¸¥à¸´à¸›à¸šà¸à¸£à¹Œà¸”",
   "errors.unexpected_crash.report_issue": "à¸£à¸²à¸¢à¸‡à¸²à¸™à¸›à¸±à¸à¸«à¸²",
   "follow_request.authorize": "à¸à¸™à¸¸à¸à¸²à¸•",
@@ -202,7 +207,7 @@
   "introduction.federation.federated.headline": "à¸—à¸µà¹ˆà¸•à¸´à¸”à¸•à¹ˆà¸à¸à¸±à¸šà¸ à¸²à¸¢à¸™à¸à¸",
   "introduction.federation.federated.text": "à¹‚à¸žà¸ªà¸•à¹Œà¸ªà¸²à¸˜à¸²à¸£à¸“à¸°à¸ˆà¸²à¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸à¸·à¹ˆà¸™ à¹† à¸‚à¸à¸‡à¹€à¸Ÿà¸”à¸´à¹€à¸§à¸´à¸£à¹Œà¸ªà¸ˆà¸°à¸›à¸£à¸²à¸à¸à¹ƒà¸™à¹€à¸ªà¹‰à¸™à¹€à¸§à¸¥à¸²à¸—à¸µà¹ˆà¸•à¸´à¸”à¸•à¹ˆà¸à¸à¸±à¸šà¸ à¸²à¸¢à¸™à¸à¸",
   "introduction.federation.home.headline": "à¸«à¸™à¹‰à¸²à¹à¸£à¸",
-  "introduction.federation.home.text": "à¹‚à¸žà¸ªà¸•à¹Œà¸ˆà¸²à¸à¸œà¸¹à¹‰à¸„à¸™à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¸´à¸”à¸•à¸²à¸¡à¸ˆà¸°à¸›à¸£à¸²à¸à¸à¹ƒà¸™à¸Ÿà¸µà¸”à¸«à¸™à¹‰à¸²à¹à¸£à¸à¸‚à¸à¸‡à¸„à¸¸à¸“ à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¸•à¸´à¸”à¸•à¸²à¸¡à¹ƒà¸„à¸£à¸à¹‡à¹„à¸”à¹‰à¸šà¸™à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¹„à¸«à¸™à¸à¹‡à¹„à¸”à¹‰!",
+  "introduction.federation.home.text": "à¹‚à¸žà¸ªà¸•à¹Œà¸ˆà¸²à¸à¸œà¸¹à¹‰à¸„à¸™à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¸´à¸”à¸•à¸²à¸¡à¸ˆà¸°à¸›à¸£à¸²à¸à¸à¹ƒà¸™à¸Ÿà¸µà¸”à¸«à¸™à¹‰à¸²à¹à¸£à¸à¸‚à¸à¸‡à¸„à¸¸à¸“ à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¸•à¸´à¸”à¸•à¸²à¸¡à¹ƒà¸„à¸£à¸à¹‡à¸•à¸²à¸¡à¹ƒà¸™à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¹ƒà¸”à¸à¹‡à¸•à¸²à¸¡!",
   "introduction.federation.local.headline": "à¹ƒà¸™à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ",
   "introduction.federation.local.text": "à¹‚à¸žà¸ªà¸•à¹Œà¸ªà¸²à¸˜à¸²à¸£à¸“à¸°à¸ˆà¸²à¸à¸œà¸¹à¹‰à¸„à¸™à¹ƒà¸™à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¹€à¸”à¸µà¸¢à¸§à¸à¸±à¸™à¸à¸±à¸šà¸„à¸¸à¸“à¸ˆà¸°à¸›à¸£à¸²à¸à¸à¹ƒà¸™à¹€à¸ªà¹‰à¸™à¹€à¸§à¸¥à¸²à¹ƒà¸™à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ",
   "introduction.interactions.action": "à¹€à¸ªà¸£à¹‡à¸ˆà¸ªà¸´à¹‰à¸™à¸šà¸—à¸Šà¹ˆà¸§à¸¢à¸ªà¸à¸™!",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "à¹€à¸žà¸·à¹ˆà¸à¹€à¸¥à¸´à¸à¹‚à¸Ÿà¸à¸±à¸ªà¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¹€à¸‚à¸µà¸¢à¸™à¸‚à¹‰à¸à¸„à¸§à¸²à¸¡/à¸à¸²à¸£à¸„à¹‰à¸™à¸«à¸²",
   "keyboard_shortcuts.up": "à¹€à¸žà¸·à¹ˆà¸à¸¢à¹‰à¸²à¸¢à¸‚à¸¶à¹‰à¸™à¹ƒà¸™à¸£à¸²à¸¢à¸à¸²à¸£",
   "lightbox.close": "à¸›à¸´à¸”",
+  "lightbox.compress": "à¸šà¸µà¸šà¸à¸±à¸”à¸à¸¥à¹ˆà¸à¸‡à¸”à¸¹à¸ à¸²à¸ž",
+  "lightbox.expand": "à¸‚à¸¢à¸²à¸¢à¸à¸¥à¹ˆà¸à¸‡à¸”à¸¹à¸ à¸²à¸ž",
   "lightbox.next": "à¸–à¸±à¸”à¹„à¸›",
   "lightbox.previous": "à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²",
-  "lightbox.view_context": "à¸”à¸¹à¸šà¸£à¸´à¸šà¸—",
   "lists.account.add": "à¹€à¸žà¸´à¹ˆà¸¡à¹„à¸›à¸¢à¸±à¸‡à¸£à¸²à¸¢à¸à¸²à¸£",
   "lists.account.remove": "à¹€à¸à¸²à¸à¸à¸à¸ˆà¸²à¸à¸£à¸²à¸¢à¸à¸²à¸£",
   "lists.delete": "à¸¥à¸šà¸£à¸²à¸¢à¸à¸²à¸£",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸Šà¸·à¹ˆà¸à¹€à¸£à¸·à¹ˆà¸à¸‡",
   "lists.new.create": "à¹€à¸žà¸´à¹ˆà¸¡à¸£à¸²à¸¢à¸à¸²à¸£",
   "lists.new.title_placeholder": "à¸Šà¸·à¹ˆà¸à¹€à¸£à¸·à¹ˆà¸à¸‡à¸£à¸²à¸¢à¸à¸²à¸£à¹ƒà¸«à¸¡à¹ˆ",
+  "lists.replies_policy.followed": "à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¹ƒà¸” à¹† à¸—à¸µà¹ˆà¸•à¸´à¸”à¸•à¸²à¸¡",
+  "lists.replies_policy.list": "à¸ªà¸¡à¸²à¸Šà¸´à¸à¸‚à¸à¸‡à¸£à¸²à¸¢à¸à¸²à¸£",
+  "lists.replies_policy.none": "à¹„à¸¡à¹ˆà¸¡à¸µà¹ƒà¸„à¸£",
+  "lists.replies_policy.title": "à¹à¸ªà¸”à¸‡à¸à¸²à¸£à¸•à¸à¸šà¸à¸¥à¸±à¸šà¹à¸à¹ˆ:",
   "lists.search": "à¸„à¹‰à¸™à¸«à¸²à¹ƒà¸™à¸«à¸¡à¸¹à¹ˆà¸œà¸¹à¹‰à¸„à¸™à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¸´à¸”à¸•à¸²à¸¡",
   "lists.subheading": "à¸£à¸²à¸¢à¸à¸²à¸£à¸‚à¸à¸‡à¸„à¸¸à¸“",
   "load_pending": "{count, plural, other {# à¸£à¸²à¸¢à¸à¸²à¸£à¹ƒà¸«à¸¡à¹ˆ}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "à¸‹à¹ˆà¸à¸™ {number, plural, other {à¸ à¸²à¸ž}}",
   "missing_indicator.label": "à¹„à¸¡à¹ˆà¸žà¸š",
   "missing_indicator.sublabel": "à¹„à¸¡à¹ˆà¸žà¸šà¸—à¸£à¸±à¸žà¸¢à¸²à¸à¸£à¸™à¸µà¹‰",
+  "mute_modal.duration": "à¸£à¸°à¸¢à¸°à¹€à¸§à¸¥à¸²",
   "mute_modal.hide_notifications": "à¸‹à¹ˆà¸à¸™à¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™à¸ˆà¸²à¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸™à¸µà¹‰?",
+  "mute_modal.indefinite": "à¹„à¸¡à¹ˆà¸¡à¸µà¸à¸³à¸«à¸™à¸”",
   "navigation_bar.apps": "à¹à¸à¸›à¸¡à¸·à¸à¸–à¸·à¸",
   "navigation_bar.blocks": "à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸—à¸µà¹ˆà¸›à¸´à¸”à¸à¸±à¹‰à¸™à¸à¸¢à¸¹à¹ˆ",
   "navigation_bar.bookmarks": "à¸—à¸µà¹ˆà¸„à¸±à¹ˆà¸™à¸«à¸™à¹‰à¸²",
@@ -298,6 +310,7 @@
   "notification.own_poll": "à¸à¸²à¸£à¸ªà¸³à¸£à¸§à¸ˆà¸„à¸§à¸²à¸¡à¸„à¸´à¸”à¹€à¸«à¹‡à¸™à¸‚à¸à¸‡à¸„à¸¸à¸“à¹„à¸”à¹‰à¸ªà¸´à¹‰à¸™à¸ªà¸¸à¸”à¹à¸¥à¹‰à¸§",
   "notification.poll": "à¸à¸²à¸£à¸ªà¸³à¸£à¸§à¸ˆà¸„à¸§à¸²à¸¡à¸„à¸´à¸”à¹€à¸«à¹‡à¸™à¸—à¸µà¹ˆà¸„à¸¸à¸“à¹„à¸”à¹‰à¸¥à¸‡à¸„à¸°à¹à¸™à¸™à¹„à¸”à¹‰à¸ªà¸´à¹‰à¸™à¸ªà¸¸à¸”à¹à¸¥à¹‰à¸§",
   "notification.reblog": "{name} à¹„à¸”à¹‰à¸”à¸±à¸™à¹‚à¸žà¸ªà¸•à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“",
+  "notification.status": "{name} à¹€à¸žà¸´à¹ˆà¸‡à¹‚à¸žà¸ªà¸•à¹Œ",
   "notifications.clear": "à¸¥à¹‰à¸²à¸‡à¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™",
   "notifications.clear_confirmation": "à¸„à¸¸à¸“à¹à¸™à¹ˆà¹ƒà¸ˆà¸«à¸£à¸·à¸à¹„à¸¡à¹ˆà¸§à¹ˆà¸²à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¸¥à¹‰à¸²à¸‡à¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”à¸‚à¸à¸‡à¸„à¸¸à¸“à¸à¸¢à¹ˆà¸²à¸‡à¸–à¸²à¸§à¸£?",
   "notifications.column_settings.alert": "à¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™à¸šà¸™à¹€à¸”à¸ªà¸à¹Œà¸—à¹‡à¸à¸›",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "à¸à¸²à¸£à¸”à¸±à¸™:",
   "notifications.column_settings.show": "à¹à¸ªà¸”à¸‡à¹ƒà¸™à¸„à¸à¸¥à¸±à¸¡à¸™à¹Œ",
   "notifications.column_settings.sound": "à¹€à¸¥à¹ˆà¸™à¹€à¸ªà¸µà¸¢à¸‡",
+  "notifications.column_settings.status": "à¹‚à¸žà¸ªà¸•à¹Œà¹ƒà¸«à¸¡à¹ˆ:",
   "notifications.filter.all": "à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”",
   "notifications.filter.boosts": "à¸à¸²à¸£à¸”à¸±à¸™",
   "notifications.filter.favourites": "à¸£à¸²à¸¢à¸à¸²à¸£à¹‚à¸›à¸£à¸”",
   "notifications.filter.follows": "à¸à¸²à¸£à¸•à¸´à¸”à¸•à¸²à¸¡",
   "notifications.filter.mentions": "à¸à¸²à¸£à¸à¸¥à¹ˆà¸²à¸§à¸–à¸¶à¸‡",
   "notifications.filter.polls": "à¸œà¸¥à¸¥à¸±à¸žà¸˜à¹Œà¸à¸²à¸£à¸ªà¸³à¸£à¸§à¸ˆà¸„à¸§à¸²à¸¡à¸„à¸´à¸”à¹€à¸«à¹‡à¸™",
+  "notifications.filter.statuses": "à¸à¸²à¸£à¸à¸±à¸›à¹€à¸”à¸•à¸ˆà¸²à¸à¸œà¸¹à¹‰à¸„à¸™à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¸´à¸”à¸•à¸²à¸¡",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} à¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™",
+  "notifications.mark_as_read": "à¸—à¸³à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸«à¸¡à¸²à¸¢à¸—à¸¸à¸à¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™à¸§à¹ˆà¸²à¸à¹ˆà¸²à¸™à¹à¸¥à¹‰à¸§",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™à¸šà¸™à¹€à¸”à¸ªà¸à¹Œà¸—à¹‡à¸à¸›",
+  "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.title": "à¹„à¸¡à¹ˆà¸žà¸¥à¸²à¸”à¸ªà¸´à¹ˆà¸‡à¸•à¹ˆà¸²à¸‡ à¹†",
+  "picture_in_picture.restore": "à¸™à¸³à¸à¸¥à¸±à¸šà¸¡à¸²",
   "poll.closed": "à¸›à¸´à¸”à¹à¸¥à¹‰à¸§",
   "poll.refresh": "à¸£à¸µà¹€à¸Ÿà¸£à¸Š",
   "poll.total_people": "{count, plural, other {# à¸„à¸™}}",
@@ -348,8 +372,8 @@
   "relative_time.today": "à¸§à¸±à¸™à¸™à¸µà¹‰",
   "reply_indicator.cancel": "à¸¢à¸à¹€à¸¥à¸´à¸",
   "report.forward": "à¸ªà¹ˆà¸‡à¸•à¹ˆà¸à¹„à¸›à¸¢à¸±à¸‡ {target}",
-  "report.forward_hint": "à¸šà¸±à¸à¸Šà¸µà¸¡à¸²à¸ˆà¸²à¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸à¸·à¹ˆà¸™ à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¸ªà¹ˆà¸‡à¸ªà¸³à¹€à¸™à¸²à¸‚à¸à¸‡à¸£à¸²à¸¢à¸‡à¸²à¸™à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¸£à¸°à¸šà¸¸à¸•à¸±à¸§à¸•à¸™à¹„à¸›à¸—à¸µà¹ˆà¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸™à¸±à¹‰à¸™à¸”à¹‰à¸§à¸¢à¸«à¸£à¸·à¸à¹„à¸¡à¹ˆ?",
-  "report.hint": "à¸£à¸²à¸¢à¸‡à¸²à¸™à¸™à¸µà¹‰à¸ˆà¸°à¸–à¸¹à¸à¸ªà¹ˆà¸‡à¹„à¸›à¸¢à¸±à¸‡à¸œà¸¹à¹‰à¸„à¸§à¸šà¸„à¸¸à¸¡à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“ à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¸à¸˜à¸´à¸šà¸²à¸¢à¹€à¸«à¸•à¸¸à¸œà¸¥à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸£à¸²à¸¢à¸‡à¸²à¸™à¸šà¸±à¸à¸Šà¸µà¸™à¸µà¹‰à¸”à¹‰à¸²à¸™à¸¥à¹ˆà¸²à¸‡:",
+  "report.forward_hint": "à¸šà¸±à¸à¸Šà¸µà¸¡à¸²à¸ˆà¸²à¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸à¸·à¹ˆà¸™ à¸ªà¹ˆà¸‡à¸ªà¸³à¹€à¸™à¸²à¸‚à¸à¸‡à¸£à¸²à¸¢à¸‡à¸²à¸™à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¸£à¸°à¸šà¸¸à¸•à¸±à¸§à¸•à¸™à¹„à¸›à¸—à¸µà¹ˆà¸™à¸±à¹ˆà¸™à¸”à¹‰à¸§à¸¢?",
+  "report.hint": "à¸ˆà¸°à¸ªà¹ˆà¸‡à¸£à¸²à¸¢à¸‡à¸²à¸™à¹„à¸›à¸¢à¸±à¸‡à¸œà¸¹à¹‰à¸„à¸§à¸šà¸„à¸¸à¸¡à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“ à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸«à¹‰à¸„à¸³à¸à¸˜à¸´à¸šà¸²à¸¢à¹€à¸«à¸•à¸¸à¸œà¸¥à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸£à¸²à¸¢à¸‡à¸²à¸™à¸šà¸±à¸à¸Šà¸µà¸™à¸µà¹‰à¸”à¹‰à¸²à¸™à¸¥à¹ˆà¸²à¸‡:",
   "report.placeholder": "à¸„à¸§à¸²à¸¡à¸„à¸´à¸”à¹€à¸«à¹‡à¸™à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡",
   "report.submit": "à¸ªà¹ˆà¸‡",
   "report.target": "à¸à¸³à¸¥à¸±à¸‡à¸£à¸²à¸¢à¸‡à¸²à¸™ {target}",
@@ -389,7 +413,7 @@
   "status.pinned": "à¹‚à¸žà¸ªà¸•à¹Œà¸—à¸µà¹ˆà¸›à¸±à¸à¸«à¸¡à¸¸à¸”",
   "status.read_more": "à¸à¹ˆà¸²à¸™à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡",
   "status.reblog": "à¸”à¸±à¸™",
-  "status.reblog_private": "à¸”à¸±à¸™à¹„à¸›à¸¢à¸±à¸‡à¸œà¸¹à¹‰à¸Šà¸¡à¸”à¸±à¹‰à¸‡à¹€à¸”à¸´à¸¡",
+  "status.reblog_private": "à¸”à¸±à¸™à¸”à¹‰à¸§à¸¢à¸à¸²à¸£à¸¡à¸à¸‡à¹€à¸«à¹‡à¸™à¸”à¸±à¹‰à¸‡à¹€à¸”à¸´à¸¡",
   "status.reblogged_by": "{name} à¹„à¸”à¹‰à¸”à¸±à¸™",
   "status.reblogs.empty": "à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¸¡à¸µà¹ƒà¸„à¸£à¸”à¸±à¸™à¹‚à¸žà¸ªà¸•à¹Œà¸™à¸µà¹‰ à¹€à¸¡à¸·à¹ˆà¸à¹ƒà¸„à¸£à¸ªà¸±à¸à¸„à¸™à¸”à¸±à¸™ à¹€à¸‚à¸²à¸ˆà¸°à¸›à¸£à¸²à¸à¸à¸—à¸µà¹ˆà¸™à¸µà¹ˆ",
   "status.redraft": "à¸¥à¸šà¹à¸¥à¹‰à¸§à¸£à¹ˆà¸²à¸‡à¹ƒà¸«à¸¡à¹ˆ",
@@ -407,7 +431,7 @@
   "status.uncached_media_warning": "à¹„à¸¡à¹ˆà¸žà¸£à¹‰à¸à¸¡à¹ƒà¸Šà¹‰à¸‡à¸²à¸™",
   "status.unmute_conversation": "à¹€à¸¥à¸´à¸à¸‹à¹ˆà¸à¸™à¸à¸²à¸£à¸ªà¸™à¸—à¸™à¸²",
   "status.unpin": "à¸–à¸à¸™à¸«à¸¡à¸¸à¸”à¸ˆà¸²à¸à¹‚à¸›à¸£à¹„à¸Ÿà¸¥à¹Œ",
-  "suggestions.dismiss": "à¸›à¸´à¸”à¸‚à¹‰à¸à¹€à¸ªà¸™à¸à¹à¸™à¸°",
+  "suggestions.dismiss": "à¸¢à¸à¹€à¸¥à¸´à¸à¸‚à¹‰à¸à¹€à¸ªà¸™à¸à¹à¸™à¸°",
   "suggestions.header": "à¸„à¸¸à¸“à¸à¸²à¸ˆà¸ªà¸™à¹ƒà¸ˆâ€¦",
   "tabs_bar.federated_timeline": "à¸—à¸µà¹ˆà¸•à¸´à¸”à¸•à¹ˆà¸à¸à¸±à¸šà¸ à¸²à¸¢à¸™à¸à¸",
   "tabs_bar.home": "à¸«à¸™à¹‰à¸²à¹à¸£à¸",
@@ -423,29 +447,30 @@
   "timeline_hint.resources.followers": "à¸œà¸¹à¹‰à¸•à¸´à¸”à¸•à¸²à¸¡",
   "timeline_hint.resources.follows": "à¸à¸²à¸£à¸•à¸´à¸”à¸•à¸²à¸¡",
   "timeline_hint.resources.statuses": "à¹‚à¸žà¸ªà¸•à¹Œà¸—à¸µà¹ˆà¹€à¸à¹ˆà¸²à¸à¸§à¹ˆà¸²",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, other {{counter} à¸„à¸™}}à¸à¸³à¸¥à¸±à¸‡à¸žà¸¹à¸”à¸„à¸¸à¸¢",
   "trends.trending_now": "à¸à¸³à¸¥à¸±à¸‡à¸™à¸´à¸¢à¸¡",
   "ui.beforeunload": "à¹à¸šà¸šà¸£à¹ˆà¸²à¸‡à¸‚à¸à¸‡à¸„à¸¸à¸“à¸ˆà¸°à¸«à¸²à¸¢à¹„à¸›à¸«à¸²à¸à¸„à¸¸à¸“à¸à¸à¸à¸ˆà¸²à¸ Mastodon",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
+  "units.short.billion": "{count} à¸žà¸±à¸™à¸¥à¹‰à¸²à¸™",
+  "units.short.million": "{count} à¸¥à¹‰à¸²à¸™",
+  "units.short.thousand": "{count} à¸žà¸±à¸™",
   "upload_area.title": "à¸¥à¸²à¸à¹à¸¥à¹‰à¸§à¸›à¸¥à¹ˆà¸à¸¢à¹€à¸žà¸·à¹ˆà¸à¸à¸±à¸›à¹‚à¸«à¸¥à¸”",
-  "upload_button.label": "à¹€à¸žà¸´à¹ˆà¸¡à¹„à¸Ÿà¸¥à¹Œà¸ à¸²à¸ž à¸§à¸´à¸”à¸µà¹‚à¸ à¸«à¸£à¸·à¸à¹€à¸ªà¸µà¸¢à¸‡",
+  "upload_button.label": "à¹€à¸žà¸´à¹ˆà¸¡à¹„à¸Ÿà¸¥à¹Œà¸ à¸²à¸ž, à¸§à¸´à¸”à¸µà¹‚à¸ à¸«à¸£à¸·à¸à¹€à¸ªà¸µà¸¢à¸‡",
   "upload_error.limit": "à¹€à¸à¸´à¸™à¸‚à¸µà¸”à¸ˆà¸³à¸à¸±à¸”à¸à¸²à¸£à¸à¸±à¸›à¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œ",
-  "upload_error.poll": "à¹„à¸¡à¹ˆà¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸à¸±à¸›à¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œà¸žà¸£à¹‰à¸à¸¡à¹‚à¸žà¸¥",
+  "upload_error.poll": "à¹„à¸¡à¹ˆà¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸à¸±à¸›à¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œà¸à¸±à¸šà¸à¸²à¸£à¸¥à¸‡à¸„à¸°à¹à¸™à¸™",
   "upload_form.audio_description": "à¸à¸˜à¸´à¸šà¸²à¸¢à¸ªà¸³à¸«à¸£à¸±à¸šà¸œà¸¹à¹‰à¸ªà¸¹à¸à¹€à¸ªà¸µà¸¢à¸à¸²à¸£à¹„à¸”à¹‰à¸¢à¸´à¸™",
   "upload_form.description": "à¸à¸˜à¸´à¸šà¸²à¸¢à¸ªà¸³à¸«à¸£à¸±à¸šà¸œà¸¹à¹‰à¸šà¸à¸žà¸£à¹ˆà¸à¸‡à¸—à¸²à¸‡à¸à¸²à¸£à¸¡à¸à¸‡à¹€à¸«à¹‡à¸™",
   "upload_form.edit": "à¹à¸à¹‰à¹„à¸‚",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸ à¸²à¸žà¸‚à¸™à¸²à¸”à¸¢à¹ˆà¸",
   "upload_form.undo": "à¸¥à¸š",
   "upload_form.video_description": "à¸à¸˜à¸´à¸šà¸²à¸¢à¸ªà¸³à¸«à¸£à¸±à¸šà¸œà¸¹à¹‰à¸ªà¸¹à¸à¹€à¸ªà¸µà¸¢à¸à¸²à¸£à¹„à¸”à¹‰à¸¢à¸´à¸™à¸«à¸£à¸·à¸à¸šà¸à¸žà¸£à¹ˆà¸à¸‡à¸—à¸²à¸‡à¸à¸²à¸£à¸¡à¸à¸‡à¹€à¸«à¹‡à¸™",
   "upload_modal.analyzing_picture": "à¸à¸³à¸¥à¸±à¸‡à¸§à¸´à¹€à¸„à¸£à¸²à¸°à¸«à¹Œà¸£à¸¹à¸›à¸ à¸²à¸žâ€¦",
   "upload_modal.apply": "à¸™à¸³à¹„à¸›à¹ƒà¸Šà¹‰",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "à¹€à¸¥à¸·à¸à¸à¸ à¸²à¸ž",
   "upload_modal.description_placeholder": "à¸ªà¸¸à¸™à¸±à¸‚à¸ˆà¸´à¹‰à¸‡à¸ˆà¸à¸à¸ªà¸µà¸™à¹‰à¸³à¸•à¸²à¸¥à¸—à¸µà¹ˆà¸§à¹ˆà¸à¸‡à¹„à¸§à¸à¸£à¸°à¹‚à¸”à¸”à¸‚à¹‰à¸²à¸¡à¸ªà¸¸à¸™à¸±à¸‚à¸‚à¸µà¹‰à¹€à¸à¸µà¸¢à¸ˆ",
   "upload_modal.detect_text": "à¸•à¸£à¸§à¸ˆà¸«à¸²à¸‚à¹‰à¸à¸„à¸§à¸²à¸¡à¸ˆà¸²à¸à¸£à¸¹à¸›à¸ à¸²à¸ž",
   "upload_modal.edit_media": "à¹à¸à¹‰à¹„à¸‚à¸ªà¸·à¹ˆà¸",
   "upload_modal.hint": "à¸„à¸¥à¸´à¸à¸«à¸£à¸·à¸à¸¥à¸²à¸à¸§à¸‡à¸à¸¥à¸¡à¹ƒà¸™à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡à¹€à¸žà¸·à¹ˆà¸à¹€à¸¥à¸·à¸à¸à¸ˆà¸¸à¸”à¹‚à¸Ÿà¸à¸±à¸ª à¸‹à¸¶à¹ˆà¸‡à¸ˆà¸°à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸¡à¸¸à¸¡à¸¡à¸à¸‡à¸‚à¸à¸‡à¸ à¸²à¸žà¸‚à¸™à¸²à¸”à¸¢à¹ˆà¸à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”à¹€à¸ªà¸¡à¸",
+  "upload_modal.preparing_ocr": "à¸à¸³à¸¥à¸±à¸‡à¹€à¸•à¸£à¸µà¸¢à¸¡ OCRâ€¦",
   "upload_modal.preview_label": "à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡ ({ratio})",
   "upload_progress.label": "à¸à¸³à¸¥à¸±à¸‡à¸à¸±à¸›à¹‚à¸«à¸¥à¸”...",
   "video.close": "à¸›à¸´à¸”à¸§à¸´à¸”à¸µà¹‚à¸",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 351e80f8119d67089131940d36ef26b42efea0ee..1d56d169cdbccceead61d7887be3288bbc46cd6f 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -1,30 +1,32 @@
 {
-  "account.account_note_header": "@{name} iÃ§in notunuz",
+  "account.account_note_header": "Not",
   "account.add_or_remove_from_list": "Listelere ekle veya kaldÄ±r",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grup",
   "account.block": "@{name} adlÄ± kiÅŸiyi engelle",
-  "account.block_domain": "{domain} alanÄ±ndan her ÅŸeyi gizle",
-  "account.blocked": "EngellenmiÅŸ",
+  "account.block_domain": "{domain} alan adÄ±nÄ± engelle",
+  "account.blocked": "Engellendi",
   "account.browse_more_on_origin_server": "Orijinal profilde daha fazlasÄ±na gÃ¶z atÄ±n",
   "account.cancel_follow_request": "Takip isteÄŸini iptal et",
-  "account.direct": "Mesaj gÃ¶nder @{name}",
-  "account.domain_blocked": "Alan adÄ± gizlendi",
+  "account.direct": "@{name} adlÄ± kiÅŸiye mesaj gÃ¶nder",
+  "account.disable_notifications": "@{name} gÃ¶nderi yaptÄ±ÄŸÄ±nda bana bildirmeyi durdur",
+  "account.domain_blocked": "Alan adÄ± engellendi",
   "account.edit_profile": "Profili dÃ¼zenle",
+  "account.enable_notifications": "@{name} gÃ¶nderi yaptÄ±ÄŸÄ±nda bana bildir",
   "account.endorse": "Profildeki Ã¶zellik",
   "account.follow": "Takip et",
   "account.followers": "TakipÃ§i",
   "account.followers.empty": "HenÃ¼z kimse bu kullanÄ±cÄ±yÄ± takip etmiyor.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers_counter": "{count, plural, one {{counter} TakipÃ§i} other {{counter} TakipÃ§i}}",
+  "account.following_counter": "{count, plural, one {{counter} Takip Edilen} other {{counter} Takip Edilen}}",
   "account.follows.empty": "Bu kullanÄ±cÄ± henÃ¼z kimseyi takip etmiyor.",
   "account.follows_you": "Seni takip ediyor",
-  "account.hide_reblogs": "@{name} kiÅŸisinin yinelemelerini gizle",
-  "account.last_status": "Son aktivite",
+  "account.hide_reblogs": "@{name} kiÅŸisinin boostlarÄ±nÄ± gizle",
+  "account.last_status": "Son etkinlik",
   "account.link_verified_on": "Bu baÄŸlantÄ±nÄ±n sahipliÄŸi {date} tarihinde kontrol edildi",
   "account.locked_info": "Bu hesabÄ±n gizlilik durumu kilitli olarak ayarlanmÄ±ÅŸ. Sahibi, onu kimin takip edebileceÄŸini elle inceliyor.",
   "account.media": "Medya",
-  "account.mention": "@{name} kullanÄ±cÄ±sÄ±ndan bahset",
+  "account.mention": "@{name} kiÅŸisinden bahset",
   "account.moved_to": "{name} ÅŸuraya taÅŸÄ±ndÄ±:",
   "account.mute": "@{name} adlÄ± kiÅŸiyi sessize al",
   "account.mute_notifications": "@{name} adlÄ± kiÅŸinin bildirimlerini kapat",
@@ -33,18 +35,18 @@
   "account.posts": "Toot",
   "account.posts_with_replies": "Tootlar ve cevaplar",
   "account.report": "@{name} adlÄ± kiÅŸiyi bildir",
-  "account.requested": "Onay Bekleniyor. Takip isteÄŸini iptal etmek iÃ§in tÄ±klayÄ±n",
-  "account.share": "@{name} kullanÄ±cÄ±sÄ±nÄ±n profilini paylaÅŸ",
-  "account.show_reblogs": "@{name} kullanÄ±cÄ±sÄ±nÄ±n yinelemelerini gÃ¶ster",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.requested": "Onay bekleniyor. Takip isteÄŸini iptal etmek iÃ§in tÄ±klayÄ±n",
+  "account.share": "@{name} adlÄ± kiÅŸinin profilini paylaÅŸ",
+  "account.show_reblogs": "@{name} kiÅŸisinin boostlarÄ±nÄ± gÃ¶ster",
+  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toot}}",
   "account.unblock": "@{name} adlÄ± kiÅŸinin engelini kaldÄ±r",
-  "account.unblock_domain": "{domain} gÃ¶ster",
-  "account.unendorse": "Profilde Ã¶zellik yok",
+  "account.unblock_domain": "{domain} alan adÄ±nÄ±n engelini kaldÄ±r",
+  "account.unendorse": "Profilde gÃ¶sterme",
   "account.unfollow": "Takibi bÄ±rak",
   "account.unmute": "@{name} adlÄ± kiÅŸinin sesini aÃ§",
   "account.unmute_notifications": "@{name} adlÄ± kiÅŸinin bildirimlerini aÃ§",
-  "account_note.placeholder": "Yorum yapÄ±lmamÄ±ÅŸ",
-  "alert.rate_limited.message": "LÃ¼tfen sonra tekrar deneyin {retry_time, time, medium}.",
+  "account_note.placeholder": "Not eklemek iÃ§in tÄ±klayÄ±n",
+  "alert.rate_limited.message": "LÃ¼tfen {retry_time, time, medium} sÃ¼resinden sonra tekrar deneyin.",
   "alert.rate_limited.title": "Oran sÄ±nÄ±rlÄ±dÄ±r",
   "alert.unexpected.message": "Beklenmedik bir hata oluÅŸtu.",
   "alert.unexpected.title": "Hay aksi!",
@@ -58,16 +60,16 @@
   "bundle_modal_error.message": "Bu bileÅŸen yÃ¼klenirken bir ÅŸeyler ters gitti.",
   "bundle_modal_error.retry": "Tekrar deneyin",
   "column.blocks": "Engellenen kullanÄ±cÄ±lar",
-  "column.bookmarks": "Yer imleri",
+  "column.bookmarks": "Yer Ä°mleri",
   "column.community": "Yerel zaman tÃ¼neli",
-  "column.direct": "DoÄŸrudan mesajlar",
+  "column.direct": "Direkt Mesajlar",
   "column.directory": "Profillere gÃ¶z at",
-  "column.domain_blocks": "Gizli alan adlarÄ±",
+  "column.domain_blocks": "Engellenen alan adlarÄ±",
   "column.favourites": "Favoriler",
   "column.follow_requests": "Takip istekleri",
-  "column.home": "Anasayfa",
+  "column.home": "Ana Sayfa",
   "column.lists": "Listeler",
-  "column.mutes": "SusturulmuÅŸ kullanÄ±cÄ±lar",
+  "column.mutes": "Sessize alÄ±nmÄ±ÅŸ kullanÄ±cÄ±lar",
   "column.notifications": "Bildirimler",
   "column.pins": "SabitlenmiÅŸ tootlar",
   "column.public": "Federe zaman tÃ¼neli",
@@ -87,45 +89,45 @@
   "compose_form.hashtag_warning": "Bu toot liste dÄ±ÅŸÄ± olduÄŸu iÃ§in hiÃ§ bir etikette yer almayacak. Sadece herkese aÃ§Ä±k tootlar etiketlerde bulunabilir.",
   "compose_form.lock_disclaimer": "HesabÄ±nÄ±z {locked} deÄŸil. Sadece takipÃ§ilerle paylaÅŸtÄ±ÄŸÄ±nÄ±z gÃ¶nderileri gÃ¶rebilmek iÃ§in sizi herhangi bir kullanÄ±cÄ± takip edebilir.",
   "compose_form.lock_disclaimer.lock": "kilitli",
-  "compose_form.placeholder": "AklÄ±nÄ±zdan ne geÃ§iyor?",
+  "compose_form.placeholder": "AklÄ±nda ne var?",
   "compose_form.poll.add_option": "Bir seÃ§enek ekleyin",
   "compose_form.poll.duration": "Anket sÃ¼resi",
-  "compose_form.poll.option_placeholder": "SeÃ§im {number}",
-  "compose_form.poll.remove_option": "Bu seÃ§imi kaldÄ±r",
+  "compose_form.poll.option_placeholder": "{number}.seÃ§enek",
+  "compose_form.poll.remove_option": "Bu seÃ§eneÄŸi kaldÄ±r",
   "compose_form.poll.switch_to_multiple": "Birden Ã§ok seÃ§eneÄŸe izin vermek iÃ§in anketi deÄŸiÅŸtir",
   "compose_form.poll.switch_to_single": "Tek bir seÃ§eneÄŸe izin vermek iÃ§in anketi deÄŸiÅŸtir",
   "compose_form.publish": "Tootla",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "MedyayÄ± hassas olarak iÅŸaretle",
-  "compose_form.sensitive.marked": "Medya hassas olarak iÅŸaretlendi",
-  "compose_form.sensitive.unmarked": "Medya hassas olarak iÅŸaretlenmemiÅŸ",
+  "compose_form.sensitive.hide": "{count, plural, one {MedyayÄ± hassas olarak iÅŸaretle} other {MedyayÄ± hassas olarak iÅŸaretle}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Medya hassas olarak iÅŸaretlendi} other {Medya hassas olarak iÅŸaretlendi}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Medya hassas olarak iÅŸaretlenmemiÅŸ} other {Medya hassas olarak iÅŸaretlenmemiÅŸ}}",
   "compose_form.spoiler.marked": "Metin uyarÄ±nÄ±n arkasÄ±na gizlenir",
   "compose_form.spoiler.unmarked": "Metin gizli deÄŸil",
-  "compose_form.spoiler_placeholder": "Ä°Ã§erik uyarÄ±sÄ±",
+  "compose_form.spoiler_placeholder": "UyarÄ±nÄ±zÄ± buraya yazÄ±n",
   "confirmation_modal.cancel": "Ä°ptal",
-  "confirmations.block.block_and_report": "Engelle & Bildir",
+  "confirmations.block.block_and_report": "Engelle ve Bildir",
   "confirmations.block.confirm": "Engelle",
-  "confirmations.block.message": "{name} kullanÄ±cÄ±sÄ±nÄ± engellemek istiyor musunuz?",
+  "confirmations.block.message": "{name} adlÄ± kullanÄ±cÄ±yÄ± engellemek istediÄŸinizden emin misiniz?",
   "confirmations.delete.confirm": "Sil",
-  "confirmations.delete.message": "Bu gÃ¶nderiyi silmek istiyor musunuz?",
+  "confirmations.delete.message": "Bu tootu silmek istediÄŸinizden emin misiniz?",
   "confirmations.delete_list.confirm": "Sil",
   "confirmations.delete_list.message": "Bu listeyi kalÄ±cÄ± olarak silmek istediÄŸinize emin misiniz?",
-  "confirmations.domain_block.confirm": "Alan adÄ±nÄ±n tamamÄ±nÄ± gizle",
+  "confirmations.domain_block.confirm": "AlanÄ±n tamamÄ±nÄ± engelle",
   "confirmations.domain_block.message": "tÃ¼m {domain} alan adÄ±nÄ± engellemek istediÄŸinizden emin misiniz? Genellikle birkaÃ§ hedefli engel ve susturma iÅŸi gÃ¶rÃ¼r ve tercih edilir.",
-  "confirmations.logout.confirm": "Ã‡Ä±kÄ±ÅŸ Yap",
-  "confirmations.logout.message": "Ã‡Ä±kÄ±ÅŸ yapmak istediÄŸinize emin misiniz?",
+  "confirmations.logout.confirm": "Oturumu kapat",
+  "confirmations.logout.message": "Oturumu kapatmak istediÄŸinizden emin misiniz?",
   "confirmations.mute.confirm": "Sessize al",
   "confirmations.mute.explanation": "Bu onlardan gelen ve onlardan bahseden gÃ¶nderileri gizleyecek, fakat yine de onlarÄ±n gÃ¶nderilerinizi gÃ¶rmelerine ve sizi takip etmelerine izin verecektir.",
-  "confirmations.mute.message": "{name} kullanÄ±cÄ±sÄ±nÄ± sessize almak istiyor musunuz?",
-  "confirmations.redraft.confirm": "Sil ve yeniden tasarla",
-  "confirmations.redraft.message": "Bu durumu silip tekrar taslaklaÅŸtÄ±rmak istediÄŸinizden emin misiniz? TÃ¼m cevaplarÄ±, boostlarÄ± ve favorileri kaybedeceksiniz.",
+  "confirmations.mute.message": "{name} kullanÄ±cÄ±sÄ±nÄ± sessize almak istediÄŸinizden emin misiniz?",
+  "confirmations.redraft.confirm": "Sil ve yeniden taslak yap",
+  "confirmations.redraft.message": "Bu toot'u silmek ve yeniden taslak yapmak istediÄŸinizden emin misiniz? Favoriler, boostlar kaybolacak ve orijinal gÃ¶nderiye verilen yanÄ±tlar sahipsiz kalacak.",
   "confirmations.reply.confirm": "YanÄ±tla",
   "confirmations.reply.message": "Åžimdi yanÄ±tlarken o an oluÅŸturduÄŸunuz mesajÄ±n Ã¼zerine yazÄ±lÄ±r. Devam etmek istediÄŸinize emin misiniz?",
-  "confirmations.unfollow.confirm": "Takibi kaldÄ±r",
-  "confirmations.unfollow.message": "{name}'yi takipten Ã§Ä±karmak istediÄŸinizden emin misiniz?",
-  "conversation.delete": "KonuÅŸmayÄ± sil",
-  "conversation.mark_as_read": "OkunmuÅŸ olarak iÅŸaretle",
-  "conversation.open": "KonuÅŸmayÄ± gÃ¶rÃ¼ntÃ¼le",
+  "confirmations.unfollow.confirm": "Takibi bÄ±rak",
+  "confirmations.unfollow.message": "{name} adlÄ± kullanÄ±cÄ±yÄ± takibi bÄ±rakmak istediÄŸinizden emin misiniz?",
+  "conversation.delete": "Sohbeti sil",
+  "conversation.mark_as_read": "Okundu olarak iÅŸaretle",
+  "conversation.open": "Sohbeti gÃ¶rÃ¼ntÃ¼le",
   "conversation.with": "{names} ile",
   "directory.federated": "Bilinen fediverse'lerden",
   "directory.local": "YalnÄ±zca {domain} adresinden",
@@ -137,7 +139,7 @@
   "emoji_button.custom": "Ã–zel",
   "emoji_button.flags": "Bayraklar",
   "emoji_button.food": "Yiyecek ve Ä°Ã§ecek",
-  "emoji_button.label": "Emoji ekle",
+  "emoji_button.label": "Ä°fade ekle",
   "emoji_button.nature": "DoÄŸa",
   "emoji_button.not_found": "Ä°fade yok!! (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
   "emoji_button.objects": "Nesneler",
@@ -147,52 +149,55 @@
   "emoji_button.search_results": "Arama sonuÃ§larÄ±",
   "emoji_button.symbols": "Semboller",
   "emoji_button.travel": "Seyahat ve Yerler",
+  "empty_column.account_suspended": "Hesap askÄ±ya alÄ±ndÄ±",
   "empty_column.account_timeline": "Burada hiÃ§ toot yok!",
   "empty_column.account_unavailable": "Profil kullanÄ±lamÄ±yor",
   "empty_column.blocks": "HenÃ¼z bir kullanÄ±cÄ±yÄ± engellemediniz.",
-  "empty_column.bookmarked_statuses": "HiÃ§ iÅŸaretlediÄŸiniz tootunuz yok. Bir tane olduÄŸunda burada gÃ¶rÃ¼necek.",
+  "empty_column.bookmarked_statuses": "HenÃ¼z yer imine eklediÄŸiniz toot yok. Yer imine eklendiÄŸinde burada gÃ¶rÃ¼necek.",
   "empty_column.community": "Yerel zaman Ã§izelgesi boÅŸ. Daha fazla eÄŸlence iÃ§in herkese aÃ§Ä±k bir gÃ¶nderi paylaÅŸÄ±n!",
-  "empty_column.direct": "HenÃ¼z doÄŸrudan mesajÄ±nÄ±z yok. Bir tane gÃ¶nderdiÄŸinizde veya aldÄ±ÄŸÄ±nÄ±zda burada gÃ¶rÃ¼necektir.",
+  "empty_column.direct": "HenÃ¼z direkt mesajÄ±nÄ±z yok. Bir tane gÃ¶nderdiÄŸinizde veya aldÄ±ÄŸÄ±nÄ±zda burada gÃ¶rÃ¼necektir.",
   "empty_column.domain_blocks": "HenÃ¼z hiÃ§bir gizli alan adÄ± yok.",
-  "empty_column.favourited_statuses": "HiÃ§ favori tootunuz yok. Bir tane olduÄŸunda burada gÃ¶rÃ¼necek.",
+  "empty_column.favourited_statuses": "HiÃ§ favori tootunuz yok. Favori olduÄŸunda burada gÃ¶rÃ¼necek.",
   "empty_column.favourites": "Kimse bu tootu favorilerine eklememiÅŸ. Biri eklediÄŸinde burada gÃ¶rÃ¼necek.",
   "empty_column.follow_requests": "HiÃ§ takip isteÄŸiniz yok. Bir tane aldÄ±ÄŸÄ±nÄ±zda burada gÃ¶rÃ¼necek.",
   "empty_column.hashtag": "HenÃ¼z bu hashtagâ€™e sahip hiÃ§bir gÃ¶nderi yok.",
   "empty_column.home": "HenÃ¼z kimseyi takip etmiyorsunuz. {public} ziyaret edebilir veya arama kÄ±smÄ±nÄ± kullanarak diÄŸer kullanÄ±cÄ±larla iletiÅŸime geÃ§ebilirsiniz.",
   "empty_column.home.public_timeline": "herkese aÃ§Ä±k zaman tÃ¼neli",
   "empty_column.list": "Bu listede henÃ¼z hiÃ§bir ÅŸey yok.",
-  "empty_column.lists": "HenÃ¼z hiÃ§ listeniz yok. Bir tane oluÅŸturduÄŸunuzda burada gÃ¶rÃ¼necek.",
-  "empty_column.mutes": "HenÃ¼z hiÃ§bir kullanÄ±cÄ±yÄ± sessize almadÄ±nÄ±z.",
-  "empty_column.notifications": "HenÃ¼z hiÃ§bir bildiriminiz yok. DiÄŸer insanlarla sobhet edebilmek iÃ§in etkileÅŸime geÃ§ebilirsiniz.",
+  "empty_column.lists": "HenÃ¼z listeniz yok. Liste oluÅŸturduÄŸunuzda burada gÃ¶rÃ¼necek.",
+  "empty_column.mutes": "HenÃ¼z bir kullanÄ±cÄ±yÄ± sessize almadÄ±nÄ±z.",
+  "empty_column.notifications": "HenÃ¼z bildiriminiz yok. Sohbete baÅŸlamak iÃ§in baÅŸkalarÄ±yla etkileÅŸim kurun.",
   "empty_column.public": "Burada hiÃ§bir ÅŸey yok! Herkese aÃ§Ä±k bir ÅŸeyler yazÄ±n veya burayÄ± doldurmak iÃ§in diÄŸer sunuculardaki kullanÄ±cÄ±larÄ± takip edin",
   "error.unexpected_crash.explanation": "Bizim kodumuzdaki bir hatadan ya da tarayÄ±cÄ± uyumluluk sorunundan dolayÄ±, bu sayfa dÃ¼zgÃ¼n gÃ¶rÃ¼ntÃ¼lenemedi.",
+  "error.unexpected_crash.explanation_addons": "Bu sayfa doÄŸru gÃ¶rÃ¼ntÃ¼lenemedi. Bu hata bÃ¼yÃ¼k olasÄ±lÄ±kla bir tarayÄ±cÄ± eklentisinden veya otomatik Ã§eviri araÃ§larÄ±ndan kaynaklanÄ±r.",
   "error.unexpected_crash.next_steps": "SayfayÄ± yenilemeyi deneyin. EÄŸer bu yardÄ±mcÄ± olmazsa, Mastodon'u farklÄ± bir tarayÄ±cÄ± ya da yerel uygulama Ã¼zerinden kullanabilirsiniz.",
+  "error.unexpected_crash.next_steps_addons": "BunlarÄ± devre dÄ±ÅŸÄ± bÄ±rakmayÄ± ve sayfayÄ± yenilemeyi deneyin. Bu yardÄ±mcÄ± olmazsa, Mastodon'u baÅŸka bir tarayÄ±cÄ± veya yerel uygulama aracÄ±lÄ±ÄŸÄ±yla kullanabilirsiniz.",
   "errors.unexpected_crash.copy_stacktrace": "YÄ±ÄŸÄ±n izlemeyi (stacktrace) panoya kopyala",
   "errors.unexpected_crash.report_issue": "Sorun bildir",
-  "follow_request.authorize": "Yetkilendir",
+  "follow_request.authorize": "Ä°zin Ver",
   "follow_request.reject": "Reddet",
-  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
-  "generic.saved": "Saved",
+  "follow_requests.unlocked_explanation": "HesabÄ±nÄ±z kilitli olmasa bile, {domain} personeli bu hesaplardan gelen takip isteklerini gÃ¶zden geÃ§irmek isteyebileceÄŸinizi dÃ¼ÅŸÃ¼ndÃ¼.",
+  "generic.saved": "Kaydedildi",
   "getting_started.developers": "GeliÅŸtiriciler",
-  "getting_started.directory": "Profil dizini",
+  "getting_started.directory": "Profil Dizini",
   "getting_started.documentation": "Belgeler",
-  "getting_started.heading": "BaÅŸlangÄ±Ã§",
-  "getting_started.invite": "Ä°nsanlarÄ± davet edin",
-  "getting_started.open_source_notice": "Mastodon aÃ§Ä±k kaynaklÄ± bir yazÄ±lÄ±mdÄ±r. Github {github}. {apps} Ã¼zerinden katkÄ±da bulunabilir, hata raporlayabilirsiniz.",
-  "getting_started.security": "GÃ¼venlik",
-  "getting_started.terms": "Hizmet koÅŸullarÄ±",
+  "getting_started.heading": "BaÅŸlarken",
+  "getting_started.invite": "Ä°nsanlarÄ± davet et",
+  "getting_started.open_source_notice": "Mastodon aÃ§Ä±k kaynaklÄ± bir yazÄ±lÄ±mdÄ±r. GitHub'taki {github} Ã¼zerinden katkÄ±da bulunabilir veya sorunlarÄ± bildirebilirsiniz.",
+  "getting_started.security": "Hesap ayarlarÄ±",
+  "getting_started.terms": "KullanÄ±m ÅŸartlarÄ±",
   "hashtag.column_header.tag_mode.all": "ve {additional}",
   "hashtag.column_header.tag_mode.any": "ya da {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} olmadan",
-  "hashtag.column_settings.select.no_options_message": "HiÃ§ Ã¶neri bulunamadÄ±",
-  "hashtag.column_settings.select.placeholder": "Hashtagler girinâ€¦",
+  "hashtag.column_settings.select.no_options_message": "Ã–neri bulunamadÄ±",
+  "hashtag.column_settings.select.placeholder": "Etiketler girinâ€¦",
   "hashtag.column_settings.tag_mode.all": "BunlarÄ±n hepsi",
-  "hashtag.column_settings.tag_mode.any": "BunlarÄ±n hiÃ§biri",
+  "hashtag.column_settings.tag_mode.any": "Herhangi biri",
   "hashtag.column_settings.tag_mode.none": "BunlarÄ±n hiÃ§biri",
   "hashtag.column_settings.tag_toggle": "Bu sÃ¼tundaki ek etiketleri iÃ§er",
   "home.column_settings.basic": "Temel",
-  "home.column_settings.show_reblogs": "Boost edilenleri gÃ¶ster",
-  "home.column_settings.show_replies": "CevaplarÄ± gÃ¶ster",
+  "home.column_settings.show_reblogs": "BoostlarÄ± gÃ¶ster",
+  "home.column_settings.show_replies": "YanÄ±tlarÄ± gÃ¶ster",
   "home.hide_announcements": "DuyurularÄ± gizle",
   "home.show_announcements": "DuyurularÄ± gÃ¶ster",
   "intervals.full.days": "{number, plural, one {# gÃ¼n} other {# gÃ¼n}}",
@@ -201,22 +206,22 @@
   "introduction.federation.action": "Ä°leri",
   "introduction.federation.federated.headline": "BirleÅŸik",
   "introduction.federation.federated.text": "DiÄŸer dosya sunucularÄ±ndan gelen genel gÃ¶nderiler, birleÅŸik zaman Ã§izelgesinde gÃ¶rÃ¼necektir.",
-  "introduction.federation.home.headline": "Ana sayfa",
+  "introduction.federation.home.headline": "Ana Sayfa",
   "introduction.federation.home.text": "Takip ettiÄŸiniz kiÅŸilerin yayÄ±nlarÄ± ana sayfada gÃ¶sterilecek. Herhangi bir sunucudaki herkesi takip edebilirsiniz!",
   "introduction.federation.local.headline": "Yerel",
   "introduction.federation.local.text": "AynÄ± sunucudaki kiÅŸilerin gÃ¶nderileri yerel zaman tÃ¼nelinde gÃ¶zÃ¼kecektir.",
-  "introduction.interactions.action": "Ã–ÄŸreticiyi bitirin!",
-  "introduction.interactions.favourite.headline": "Favori",
+  "introduction.interactions.action": "Ã–ÄŸreticiyi bitir!",
+  "introduction.interactions.favourite.headline": "BeÄŸeni",
   "introduction.interactions.favourite.text": "Bir tootu favorilerinize alarak sonrasÄ± iÃ§in saklayabilirsiniz ve yazara tootu beÄŸendiÄŸinizi sÃ¶yleyebilirsiniz.",
-  "introduction.interactions.reblog.headline": "Yinele",
-  "introduction.interactions.reblog.text": "BaÅŸkalarÄ±nÄ±n tootlarÄ±nÄ± yineleyerek onlarÄ± kendi takipÃ§ilerinizle paylaÅŸabillirsiniz.",
+  "introduction.interactions.reblog.headline": "Boostla",
+  "introduction.interactions.reblog.text": "BaÅŸkalarÄ±nÄ±n tootlarÄ±nÄ± boostlayarak onlarÄ± kendi takipÃ§ilerinizle paylaÅŸabillirsiniz.",
   "introduction.interactions.reply.headline": "YanÄ±t",
   "introduction.interactions.reply.text": "BaÅŸkalarÄ±nÄ±n ve kendinizin tootlarÄ±na cevap verebilirsiniz. Bu, onlarÄ± bir konuÅŸmada zincirli bir ÅŸekilde gÃ¶sterecektir.",
-  "introduction.welcome.action": "Hadi gidelim!",
+  "introduction.welcome.action": "Hadi baÅŸlayalÄ±m!",
   "introduction.welcome.headline": "Ä°lk adÄ±mlar",
   "introduction.welcome.text": "KrallÄ±ÄŸa hoÅŸ geldiniz! Az sonra, geniÅŸ bir sunucu yelpazesinde mesaj gÃ¶nderip arkadaÅŸlarÄ±nÄ±zla konuÅŸabileceksiniz. Ama bu sunucu, {domain}, Ã¶zel (profilinizi barÄ±ndÄ±rÄ±r, bu yÃ¼zden adresini hatÄ±rlayÄ±n).",
   "keyboard_shortcuts.back": "geriye gitmek iÃ§in",
-  "keyboard_shortcuts.blocked": "engelli kullanÄ±cÄ±lar listesini aÃ§mak iÃ§in",
+  "keyboard_shortcuts.blocked": "engellenen kullanÄ±cÄ±lar listesini aÃ§mak iÃ§in",
   "keyboard_shortcuts.boost": "boostlamak iÃ§in",
   "keyboard_shortcuts.column": "sÃ¼tunlardan birindeki duruma odaklanmak iÃ§in",
   "keyboard_shortcuts.compose": "yazma alanÄ±na odaklanmak iÃ§in",
@@ -224,102 +229,121 @@
   "keyboard_shortcuts.direct": "direkt mesajlar sÃ¼tununu aÃ§mak iÃ§in",
   "keyboard_shortcuts.down": "listede aÅŸaÄŸÄ±ya inmek iÃ§in",
   "keyboard_shortcuts.enter": "durumu aÃ§mak iÃ§in",
-  "keyboard_shortcuts.favourite": "favorilere eklemek iÃ§in",
+  "keyboard_shortcuts.favourite": "beÄŸenmek iÃ§in",
   "keyboard_shortcuts.favourites": "favoriler listesini aÃ§mak iÃ§in",
   "keyboard_shortcuts.federated": "federe edilmiÅŸ zaman tÃ¼nelini aÃ§mak iÃ§in",
   "keyboard_shortcuts.heading": "Klavye kÄ±sayollarÄ±",
-  "keyboard_shortcuts.home": "ana sayfa zaman Ã§izelgesini aÃ§mak iÃ§in",
-  "keyboard_shortcuts.hotkey": "KÄ±satuÅŸ",
+  "keyboard_shortcuts.home": "anasayfa zaman Ã§izelgesini aÃ§mak iÃ§in",
+  "keyboard_shortcuts.hotkey": "KÄ±sayol tuÅŸu",
   "keyboard_shortcuts.legend": "bu efsaneyi gÃ¶rÃ¼ntÃ¼lemek iÃ§in",
   "keyboard_shortcuts.local": "yerel zaman tÃ¼nelini aÃ§mak iÃ§in",
   "keyboard_shortcuts.mention": "yazardan bahsetmek iÃ§in",
-  "keyboard_shortcuts.muted": "susturulmuÅŸ kullanÄ±cÄ± listesini aÃ§mak iÃ§in",
+  "keyboard_shortcuts.muted": "sessize alÄ±nmÄ±ÅŸ kullanÄ±cÄ± listesini aÃ§mak iÃ§in",
   "keyboard_shortcuts.my_profile": "profilinizi aÃ§mak iÃ§in",
   "keyboard_shortcuts.notifications": "bildirimler sÃ¼tununu aÃ§mak iÃ§in",
   "keyboard_shortcuts.open_media": "medyayÄ± aÃ§mak iÃ§in",
   "keyboard_shortcuts.pinned": "sabitlenmiÅŸ tootlarÄ±n listesini aÃ§mak iÃ§in",
   "keyboard_shortcuts.profile": "yazarÄ±n profilini aÃ§mak iÃ§in",
-  "keyboard_shortcuts.reply": "cevaplamak iÃ§in",
+  "keyboard_shortcuts.reply": "yanÄ±tlamak iÃ§in",
   "keyboard_shortcuts.requests": "takip istekleri listesini aÃ§mak iÃ§in",
   "keyboard_shortcuts.search": "aramaya odaklanmak iÃ§in",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "\"baÅŸlayÄ±n\" sÃ¼tununu aÃ§mak iÃ§in",
+  "keyboard_shortcuts.spoilers": "CW alanÄ±nÄ± gÃ¶stermek/gizlemek iÃ§in",
+  "keyboard_shortcuts.start": "\"baÅŸlarken\" sÃ¼tununu aÃ§mak iÃ§in",
   "keyboard_shortcuts.toggle_hidden": "CW'den Ã¶nceki yazÄ±yÄ± gÃ¶stermek/gizlemek iÃ§in",
   "keyboard_shortcuts.toggle_sensitivity": "medyayÄ± gÃ¶stermek/gizlemek iÃ§in",
-  "keyboard_shortcuts.toot": "yeni bir toot baÅŸlatmak iÃ§in",
+  "keyboard_shortcuts.toot": "yepyeni bir toot baÅŸlatmak iÃ§in",
   "keyboard_shortcuts.unfocus": "aramada bir gÃ¶nderiye odaklanmamak iÃ§in",
   "keyboard_shortcuts.up": "listede yukarÄ±ya Ã§Ä±kmak iÃ§in",
   "lightbox.close": "Kapat",
+  "lightbox.compress": "Resim gÃ¶rÃ¼ntÃ¼leme kutusunu sÄ±kÄ±ÅŸtÄ±r",
+  "lightbox.expand": "Resim gÃ¶rÃ¼ntÃ¼leme kutusunu geniÅŸlet",
   "lightbox.next": "Sonraki",
-  "lightbox.previous": "Ã–nceli",
-  "lightbox.view_context": "Ä°Ã§eriÄŸi gÃ¶ster",
+  "lightbox.previous": "Ã–nceki",
   "lists.account.add": "Listeye ekle",
   "lists.account.remove": "Listeden kaldÄ±r",
   "lists.delete": "Listeyi sil",
-  "lists.edit": "listeyi dÃ¼zenle",
+  "lists.edit": "Listeleri dÃ¼zenle",
   "lists.edit.submit": "BaÅŸlÄ±ÄŸÄ± deÄŸiÅŸtir",
   "lists.new.create": "Liste ekle",
   "lists.new.title_placeholder": "Yeni liste baÅŸlÄ±ÄŸÄ±",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Listenin Ã¼yeleri",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "YanÄ±tlarÄ± gÃ¶ster:",
   "lists.search": "Takip ettiÄŸiniz kiÅŸiler arasÄ±ndan arayÄ±n",
   "lists.subheading": "Listeleriniz",
   "load_pending": "{count, plural, one {# yeni Ã¶ÄŸe} other {# yeni Ã¶ÄŸe}}",
   "loading_indicator.label": "YÃ¼kleniyor...",
-  "media_gallery.toggle_visible": "GÃ¶rÃ¼nÃ¼rlÃ¼ÄŸÃ¼ deÄŸiÅŸtir",
+  "media_gallery.toggle_visible": "{number, plural, one {Resmi} other {Resimleri}} gizle",
   "missing_indicator.label": "BulunamadÄ±",
   "missing_indicator.sublabel": "Bu kaynak bulunamadÄ±",
+  "mute_modal.duration": "SÃ¼re",
   "mute_modal.hide_notifications": "Bu kullanÄ±cÄ±dan bildirimler gizlensin mÄ±?",
+  "mute_modal.indefinite": "Belirsiz",
   "navigation_bar.apps": "Mobil uygulamalar",
   "navigation_bar.blocks": "Engellenen kullanÄ±cÄ±lar",
-  "navigation_bar.bookmarks": "Yer imleri",
-  "navigation_bar.community_timeline": "Yerel zaman tÃ¼neli",
+  "navigation_bar.bookmarks": "Yer Ä°mleri",
+  "navigation_bar.community_timeline": "Yerel Zaman TÃ¼neli",
   "navigation_bar.compose": "Yeni toot oluÅŸtur",
   "navigation_bar.direct": "Direkt Mesajlar",
   "navigation_bar.discover": "KeÅŸfet",
-  "navigation_bar.domain_blocks": "Gizli alan adlarÄ±",
+  "navigation_bar.domain_blocks": "Engellenen alan adlarÄ±",
   "navigation_bar.edit_profile": "Profili dÃ¼zenle",
   "navigation_bar.favourites": "Favoriler",
-  "navigation_bar.filters": "SusturulmuÅŸ kelimeler",
+  "navigation_bar.filters": "Sessize alÄ±nmÄ±ÅŸ kelimeler",
   "navigation_bar.follow_requests": "Takip istekleri",
   "navigation_bar.follows_and_followers": "Takip edilenler ve takipÃ§iler",
-  "navigation_bar.info": "GeniÅŸletilmiÅŸ bilgi",
+  "navigation_bar.info": "Bu sunucu hakkÄ±nda",
   "navigation_bar.keyboard_shortcuts": "Klavye kÄ±sayollarÄ±",
   "navigation_bar.lists": "Listeler",
-  "navigation_bar.logout": "Ã‡Ä±kÄ±ÅŸ",
+  "navigation_bar.logout": "Oturumu kapat",
   "navigation_bar.mutes": "Sessize alÄ±nmÄ±ÅŸ kullanÄ±cÄ±lar",
   "navigation_bar.personal": "KiÅŸisel",
   "navigation_bar.pins": "SabitlenmiÅŸ tootlar",
   "navigation_bar.preferences": "Tercihler",
   "navigation_bar.public_timeline": "Federe zaman tÃ¼neli",
   "navigation_bar.security": "GÃ¼venlik",
-  "notification.favourite": "{name} senin durumunu favorilere ekledi",
-  "notification.follow": "{name} seni takip ediyor",
-  "notification.follow_request": "{name} sizi takip etme isteÄŸi gÃ¶nderdi",
+  "notification.favourite": "{name} tootunu beÄŸendi",
+  "notification.follow": "{name} seni takip etti",
+  "notification.follow_request": "{name} size takip isteÄŸi gÃ¶nderdi",
   "notification.mention": "{name} senden bahsetti",
   "notification.own_poll": "Anketiniz sona erdi",
-  "notification.poll": "Oy verdiÄŸiniz bir anket bitti",
-  "notification.reblog": "{name} senin durumunu boost etti",
+  "notification.poll": "Oy verdiÄŸiniz bir anket sona erdi",
+  "notification.reblog": "{name} tootunu boostladÄ±",
+  "notification.status": "{name} az Ã¶nce gÃ¶nderdi",
   "notifications.clear": "Bildirimleri temizle",
   "notifications.clear_confirmation": "TÃ¼m bildirimlerinizi kalÄ±cÄ± olarak temizlemek ister misiniz?",
   "notifications.column_settings.alert": "MasaÃ¼stÃ¼ bildirimleri",
-  "notifications.column_settings.favourite": "Favoriler:",
-  "notifications.column_settings.filter_bar.advanced": "TÃ¼m kategorileri gÃ¶ster",
+  "notifications.column_settings.favourite": "BeÄŸeniler:",
+  "notifications.column_settings.filter_bar.advanced": "TÃ¼m kategorileri gÃ¶rÃ¼ntÃ¼le",
   "notifications.column_settings.filter_bar.category": "HÄ±zlÄ± filtre Ã§ubuÄŸu",
   "notifications.column_settings.filter_bar.show": "GÃ¶ster",
   "notifications.column_settings.follow": "Yeni takipÃ§iler:",
   "notifications.column_settings.follow_request": "Yeni takip istekleri:",
-  "notifications.column_settings.mention": "Bahsedilenler:",
+  "notifications.column_settings.mention": "Bahsetmeler:",
   "notifications.column_settings.poll": "Anket sonuÃ§larÄ±:",
-  "notifications.column_settings.push": "Push bildirimleri",
+  "notifications.column_settings.push": "AnlÄ±k bildirimler",
   "notifications.column_settings.reblog": "Boostlar:",
-  "notifications.column_settings.show": "Bildirimlerde gÃ¶ster",
+  "notifications.column_settings.show": "SÃ¼tunda gÃ¶ster",
   "notifications.column_settings.sound": "Ses Ã§al",
+  "notifications.column_settings.status": "Yeni tootlar:",
   "notifications.filter.all": "TÃ¼mÃ¼",
   "notifications.filter.boosts": "Boostlar",
-  "notifications.filter.favourites": "Favoriler",
+  "notifications.filter.favourites": "BeÄŸeniler",
   "notifications.filter.follows": "Takip edilenler",
   "notifications.filter.mentions": "Bahsetmeler",
   "notifications.filter.polls": "Anket sonuÃ§larÄ±",
+  "notifications.filter.statuses": "Takip ettiÄŸiniz kiÅŸilerden gelen gÃ¼ncellemeler",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} bildirim",
+  "notifications.mark_as_read": "Her bildirimi okundu olarak iÅŸaretle",
+  "notifications.permission_denied": "Daha Ã¶nce reddedilen tarayÄ±cÄ± izinleri isteÄŸi nedeniyle masaÃ¼stÃ¼ bildirimleri kullanÄ±lamÄ±yor",
+  "notifications.permission_denied_alert": "TarayÄ±cÄ± izni daha Ã¶nce reddedildiÄŸinden, masaÃ¼stÃ¼ bildirimleri etkinleÅŸtirilemez",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "MasaÃ¼stÃ¼ bildirimlerini etkinleÅŸtir",
+  "notifications_permission_banner.how_to_control": "Mastodon aÃ§Ä±k olmadÄ±ÄŸÄ±nda bildirim almak iÃ§in masaÃ¼stÃ¼ bildirimlerini etkinleÅŸtirin. EtkinleÅŸtirildikten sonra yukarÄ±daki {icon} dÃ¼ÄŸmesini kullanarak hangi etkileÅŸim tÃ¼rlerinin masaÃ¼stÃ¼ bildirimleri oluÅŸturduÄŸunu tam olarak kontrol edebilirsiniz.",
+  "notifications_permission_banner.title": "HiÃ§bir ÅŸeyi kaÃ§Ä±rmayÄ±n",
+  "picture_in_picture.restore": "Onu geri koy",
   "poll.closed": "KapandÄ±",
   "poll.refresh": "Yenile",
   "poll.total_people": "{count, plural, one {# kiÅŸi} other {# kiÅŸi}}",
@@ -327,90 +351,90 @@
   "poll.vote": "Oy ver",
   "poll.voted": "Bu cevap iÃ§in oy kullandÄ±nÄ±z",
   "poll_button.add_poll": "Bir anket ekleyin",
-  "poll_button.remove_poll": "Anket kaldÄ±r",
-  "privacy.change": "GÃ¶nderi gizliliÄŸini ayarla",
-  "privacy.direct.long": "Sadece bahsedilen kiÅŸilere gÃ¶nder",
+  "poll_button.remove_poll": "Anketi kaldÄ±r",
+  "privacy.change": "Toot gizliliÄŸini ayarlayÄ±n",
+  "privacy.direct.long": "Sadece bahsedilen kullanÄ±cÄ±lar iÃ§in gÃ¶rÃ¼nÃ¼r",
   "privacy.direct.short": "Direkt",
-  "privacy.private.long": "Sadece takipÃ§ilerime gÃ¶nder",
+  "privacy.private.long": "Sadece takipÃ§iler iÃ§in gÃ¶rÃ¼nÃ¼r",
   "privacy.private.short": "Sadece takipÃ§iler",
-  "privacy.public.long": "Herkese aÃ§Ä±k zaman tÃ¼neline gÃ¶nder",
+  "privacy.public.long": "Herkese gÃ¶rÃ¼nÃ¼r, herkese aÃ§Ä±k zaman Ã§izelgelerinde gÃ¶sterilir",
   "privacy.public.short": "Herkese aÃ§Ä±k",
-  "privacy.unlisted.long": "Herkese aÃ§Ä±k zaman tÃ¼neline gÃ¶nderme",
+  "privacy.unlisted.long": "Herkese gÃ¶rÃ¼nÃ¼r, ancak genel zaman Ã§izelgelerinde gÃ¶sterilmez",
   "privacy.unlisted.short": "ListelenmemiÅŸ",
   "refresh": "Yenile",
   "regeneration_indicator.label": "YÃ¼kleniyorâ€¦",
-  "regeneration_indicator.sublabel": "Ev akÄ±ÅŸÄ±nÄ±z hazÄ±rlanÄ±yor!",
+  "regeneration_indicator.sublabel": "Ana akÄ±ÅŸÄ±nÄ±z hazÄ±rlanÄ±yor!",
   "relative_time.days": "{number}g",
-  "relative_time.hours": "{number}s",
+  "relative_time.hours": "{number}sa",
   "relative_time.just_now": "ÅŸimdi",
   "relative_time.minutes": "{number}dk",
   "relative_time.seconds": "{number}sn",
   "relative_time.today": "bugÃ¼n",
   "reply_indicator.cancel": "Ä°ptal",
-  "report.forward": "Åžu kiÅŸiye ilet : {target}",
-  "report.forward_hint": "Bu hesap baÅŸka bir sunucudan. AnonimleÅŸtirilmiÅŸ bir rapor oraya da gÃ¶nderilsin mi?",
+  "report.forward": "{target} ilet",
+  "report.forward_hint": "Hesap baÅŸka bir sunucudan. Raporun anonim bir kopyasÄ± da oraya gÃ¶nderilsin mi?",
   "report.hint": "Bu rapor sunucu moderatÃ¶rlerine gÃ¶nderilecek. Bu hesabÄ± neden bildirdiÄŸiniz hakkÄ±nda bilgi verebirsiniz:",
   "report.placeholder": "Ek yorumlar",
   "report.submit": "GÃ¶nder",
-  "report.target": "Raporlama",
+  "report.target": "{target} Bildiriliyor",
   "search.placeholder": "Ara",
-  "search_popout.search_format": "GeliÅŸmiÅŸ arama formatÄ±",
-  "search_popout.tips.full_text": "Basit metin yazdÄ±ÄŸÄ±nÄ±z, tercih ettiÄŸiniz, yinelediÄŸiniz veya bunlardan bahsettiÄŸiniz durumlarÄ±n yanÄ± sÄ±ra kullanÄ±cÄ± adlarÄ±nÄ±, gÃ¶rÃ¼nen adlarÄ± ve hashtag'leri eÅŸleÅŸtiren durumlarÄ± dÃ¶ndÃ¼rÃ¼r.",
-  "search_popout.tips.hashtag": "etiketler",
-  "search_popout.tips.status": "durum",
+  "search_popout.search_format": "GeliÅŸmiÅŸ arama biÃ§imi",
+  "search_popout.tips.full_text": "Basit metin yazdÄ±ÄŸÄ±nÄ±z, tercih ettiÄŸiniz, boostladÄ±ÄŸÄ±nÄ±z veya bunlardan bahsettiÄŸiniz tootlarÄ±n yanÄ± sÄ±ra kullanÄ±cÄ± adlarÄ±nÄ±, gÃ¶rÃ¼nen adlarÄ± ve hashtag'leri eÅŸleÅŸtiren tootlarÄ± dÃ¶ndÃ¼rÃ¼r.",
+  "search_popout.tips.hashtag": "etiket",
+  "search_popout.tips.status": "toot",
   "search_popout.tips.text": "Basit metin, eÅŸleÅŸen gÃ¶rÃ¼nen adlarÄ±, kullanÄ±cÄ± adlarÄ±nÄ± ve hashtag'leri dÃ¶ndÃ¼rÃ¼r",
   "search_popout.tips.user": "kullanÄ±cÄ±",
   "search_results.accounts": "Ä°nsanlar",
-  "search_results.hashtags": "Hashtagler",
+  "search_results.hashtags": "Etiketler",
   "search_results.statuses": "Tootlar",
   "search_results.statuses_fts_disabled": "Bu Mastodon sunucusunda toot iÃ§eriÄŸine gÃ¶re arama etkin deÄŸil.",
-  "search_results.total": "{count, number} {count, plural, one {sonuÃ§} other {sonuÃ§lar}}",
+  "search_results.total": "{count, number} {count, plural, one {sonuÃ§} other {sonuÃ§}}",
   "status.admin_account": "@{name} iÃ§in denetim arayÃ¼zÃ¼nÃ¼ aÃ§Ä±n",
   "status.admin_status": "Denetim arayÃ¼zÃ¼nde bu durumu aÃ§Ä±n",
-  "status.block": "Engelle : @{name}",
+  "status.block": "@{name} adlÄ± kiÅŸiyi engelle",
   "status.bookmark": "Yer imlerine ekle",
-  "status.cancel_reblog_private": "Boost'u geri al",
+  "status.cancel_reblog_private": "Boostu geri al",
   "status.cannot_reblog": "Bu gÃ¶nderi boost edilemez",
   "status.copy": "BaÄŸlantÄ± durumunu kopyala",
   "status.delete": "Sil",
-  "status.detailed_status": "DetaylÄ± yazÄ±ÅŸma dÃ¶kÃ¼mÃ¼",
-  "status.direct": "@{name}'e gÃ¶nder",
+  "status.detailed_status": "AyrÄ±ntÄ±lÄ± sohbet gÃ¶rÃ¼nÃ¼mÃ¼",
+  "status.direct": "@{name} adlÄ± kiÅŸiye direkt mesaj",
   "status.embed": "GÃ¶mÃ¼lÃ¼",
-  "status.favourite": "Favorilere ekle",
+  "status.favourite": "BeÄŸen",
   "status.filtered": "FiltrelenmiÅŸ",
-  "status.load_more": "Daha fazla",
+  "status.load_more": "Daha fazlasÄ±nÄ± yÃ¼kle",
   "status.media_hidden": "Gizli gÃ¶rsel",
-  "status.mention": "Bahset : @{name}",
+  "status.mention": "@{name} kiÅŸisinden bahset",
   "status.more": "Daha fazla",
-  "status.mute": "Sustur : @{name}",
-  "status.mute_conversation": "YazÄ±ÅŸmayÄ± sustur",
-  "status.open": "Bu gÃ¶nderiyi geniÅŸlet",
+  "status.mute": "@{name} kiÅŸisini sessize al",
+  "status.mute_conversation": "Sohbeti sessize al",
+  "status.open": "Bu tootu geniÅŸlet",
   "status.pin": "Profile sabitle",
   "status.pinned": "SabitlenmiÅŸ toot",
-  "status.read_more": "Daha dazla oku",
+  "status.read_more": "DevamÄ±nÄ± okuyun",
   "status.reblog": "Boostla",
-  "status.reblog_private": "Orjinal kitleye yinele",
-  "status.reblogged_by": "{name} boost etti",
-  "status.reblogs.empty": "HenÃ¼z kimse bu tootu yinelemedi. Biri yaptÄ±ÄŸÄ±nda burada gÃ¶rÃ¼necek.",
-  "status.redraft": "Sil & tekrar taslakla",
+  "status.reblog_private": "Orijinal gÃ¶rÃ¼nÃ¼rlÃ¼k ile boostla",
+  "status.reblogged_by": "{name} boostladÄ±",
+  "status.reblogs.empty": "HenÃ¼z kimse bu tootu boostlamadÄ±. Biri yaptÄ±ÄŸÄ±nda burada gÃ¶rÃ¼necek.",
+  "status.redraft": "Sil ve yeniden taslak yap",
   "status.remove_bookmark": "Yer imini kaldÄ±r",
-  "status.reply": "Cevapla",
-  "status.replyAll": "Mesaj dizisini cevapla",
-  "status.report": "@{name}'i raporla",
+  "status.reply": "YanÄ±tla",
+  "status.replyAll": "Konuyu yanÄ±tla",
+  "status.report": "@{name} adlÄ± kiÅŸiyi bildir",
   "status.sensitive_warning": "Hassas iÃ§erik",
   "status.share": "PaylaÅŸ",
   "status.show_less": "Daha az gÃ¶ster",
   "status.show_less_all": "Hepsi iÃ§in daha az gÃ¶ster",
-  "status.show_more": "Daha fazla gÃ¶ster",
+  "status.show_more": "Daha fazlasÄ±nÄ± gÃ¶ster",
   "status.show_more_all": "Hepsi iÃ§in daha fazla gÃ¶ster",
-  "status.show_thread": "Mesaj dizisini gÃ¶ster",
+  "status.show_thread": "Konuyu gÃ¶ster",
   "status.uncached_media_warning": "Mevcut deÄŸil",
-  "status.unmute_conversation": "Sohbeti aÃ§",
+  "status.unmute_conversation": "Sohbet sesini aÃ§",
   "status.unpin": "Profilden sabitlemeyi kaldÄ±r",
   "suggestions.dismiss": "Ã–neriyi gÃ¶rmezden gel",
   "suggestions.header": "Åžuna ilgi duyuyor olabilirsinizâ€¦",
   "tabs_bar.federated_timeline": "Federe",
-  "tabs_bar.home": "Ana sayfa",
+  "tabs_bar.home": "Ana Sayfa",
   "tabs_bar.local_timeline": "Yerel",
   "tabs_bar.notifications": "Bildirimler",
   "tabs_bar.search": "Ara",
@@ -419,33 +443,34 @@
   "time_remaining.minutes": "{number, plural, one {# dakika} other {# dakika}} kaldÄ±",
   "time_remaining.moments": "Sadece birkaÃ§ dakika kaldÄ±",
   "time_remaining.seconds": "{number, plural, one {# saniye} other {# saniye}} kaldÄ±",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
+  "timeline_hint.remote_resource_not_displayed": "diÄŸer sunucudaki {resource} gÃ¶sterilemiyor.",
   "timeline_hint.resources.followers": "TakipÃ§iler",
   "timeline_hint.resources.follows": "Takip Edilenler",
   "timeline_hint.resources.statuses": "Eski tootlar",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
-  "trends.trending_now": "Åžu an popÃ¼ler",
-  "ui.beforeunload": "Mastodon'dan ayrÄ±lÄ±rsanÄ±z taslaÄŸÄ±nÄ±z kaybolacak.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} kiÅŸi} other {{counter} kiÅŸi}} konuÅŸuyor",
+  "trends.trending_now": "Åžu an gÃ¼ndemde",
+  "ui.beforeunload": "Mastodon'u terk ederseniz taslaÄŸÄ±nÄ±z kaybolacak.",
+  "units.short.billion": "{count}Mr",
+  "units.short.million": "{count}Mn",
+  "units.short.thousand": "{count}Mn",
   "upload_area.title": "KarÅŸÄ±ya yÃ¼kleme iÃ§in sÃ¼rÃ¼kle bÄ±rak yapÄ±nÄ±z",
-  "upload_button.label": "GÃ¶rsel ekle",
+  "upload_button.label": "Resim, video veya ses dosyasÄ± ekleyin",
   "upload_error.limit": "Dosya yÃ¼kleme sÄ±nÄ±rÄ± aÅŸÄ±ldÄ±.",
   "upload_error.poll": "Anketlerde dosya yÃ¼klemesine izin verilmez.",
   "upload_form.audio_description": "Ä°ÅŸitme kaybÄ± olan kiÅŸiler iÃ§in tarif edin",
   "upload_form.description": "GÃ¶rme engelliler iÃ§in aÃ§Ä±klama",
   "upload_form.edit": "DÃ¼zenle",
-  "upload_form.thumbnail": "Change thumbnail",
-  "upload_form.undo": "Geri al",
+  "upload_form.thumbnail": "KÃ¼Ã§Ã¼k resmi deÄŸiÅŸtir",
+  "upload_form.undo": "Sil",
   "upload_form.video_description": "Ä°ÅŸitme kaybÄ± veya gÃ¶rme engeli olan kiÅŸiler iÃ§in tarif edin",
-  "upload_modal.analyzing_picture": "Resmi analiz ediyorâ€¦",
+  "upload_modal.analyzing_picture": "Resim analiz ediliyorâ€¦",
   "upload_modal.apply": "Uygula",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "Resim seÃ§",
   "upload_modal.description_placeholder": "PijamalÄ± hasta yaÄŸÄ±z ÅŸofÃ¶re Ã§abucak gÃ¼vendi",
   "upload_modal.detect_text": "Resimdeki metni algÄ±la",
   "upload_modal.edit_media": "MedyayÄ± dÃ¼zenle",
   "upload_modal.hint": "Her zaman tÃ¼m kÃ¼Ã§Ã¼k resimlerde gÃ¶rÃ¼ntÃ¼lenecek odak noktasÄ±nÄ± seÃ§mek iÃ§in Ã¶n izlemedeki daireyi tÄ±klayÄ±n veya sÃ¼rÃ¼kleyin.",
+  "upload_modal.preparing_ocr": "OCR hazÄ±rlanÄ±yorâ€¦",
   "upload_modal.preview_label": "Ã–n izleme ({ratio})",
   "upload_progress.label": "YÃ¼kleniyor...",
   "video.close": "Videoyu kapat",
@@ -454,7 +479,7 @@
   "video.expand": "Videoyu geniÅŸlet",
   "video.fullscreen": "Tam ekran",
   "video.hide": "Videoyu gizle",
-  "video.mute": "Sesi kÄ±s",
+  "video.mute": "Sesi sustur",
   "video.pause": "Duraklat",
   "video.play": "Oynat",
   "video.unmute": "Sesi aÃ§"
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
new file mode 100644
index 0000000000000000000000000000000000000000..224c51301448e390f1f25e2b2d01518107380f5e
--- /dev/null
+++ b/app/javascript/mastodon/locales/tt.json
@@ -0,0 +1,486 @@
+{
+  "account.account_note_header": "Ð¯Ð·Ð¼Ð°",
+  "account.add_or_remove_from_list": "Ð˜ÑÐµÐ¼Ð»ÐµÐºÐºÓ™ ÐºÐµÑ€Ñ‚Ò¯ Ñ Ð±ÐµÑ‚ÐµÑ€Ò¯",
+  "account.badges.bot": "Ð‘Ð¾Ñ‚",
+  "account.badges.group": "Ð¢Ó©Ñ€ÐºÐµÐ¼",
+  "account.block": "Block @{name}",
+  "account.block_domain": "Block domain {domain}",
+  "account.blocked": "Blocked",
+  "account.browse_more_on_origin_server": "Ð¢ÑƒÐ»Ñ‹Ñ€Ð°Ðº Ð¾Ñ€Ð¸Ð³Ð¸Ð½Ð°Ð» Ð¿Ñ€Ð¾Ñ„Ð¸Ð»ÐµÐ½Ð´Ó™ ÐºÐ°Ñ€Ð°Ð¿ Ð±ÑƒÐ»Ð°",
+  "account.cancel_follow_request": "Cancel follow request",
+  "account.direct": "Direct message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.domain_blocked": "Domain blocked",
+  "account.edit_profile": "Edit profile",
+  "account.enable_notifications": "Notify me when @{name} posts",
+  "account.endorse": "Feature on profile",
+  "account.follow": "Follow",
+  "account.followers": "Followers",
+  "account.followers.empty": "No one follows this user yet.",
+  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "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.hide_reblogs": "Hide boosts from @{name}",
+  "account.last_status": "Last active",
+  "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 moved to:",
+  "account.mute": "Mute @{name}",
+  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.muted": "Muted",
+  "account.never_active": "Never",
+  "account.posts": "Toots",
+  "account.posts_with_replies": "Toots and replies",
+  "account.report": "Report @{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": "Unblock domain {domain}",
+  "account.unendorse": "Don't feature on profile",
+  "account.unfollow": "Unfollow",
+  "account.unmute": "Unmute @{name}",
+  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account_note.placeholder": "Click to add a note",
+  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Rate limited",
+  "alert.unexpected.message": "An unexpected error occurred.",
+  "alert.unexpected.title": "Oops!",
+  "announcement.announcement": "Announcement",
+  "autosuggest_hashtag.per_week": "{count} per week",
+  "boost_modal.combo": "You can press {combo} to skip this next time",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
+  "column.blocks": "Blocked users",
+  "column.bookmarks": "Bookmarks",
+  "column.community": "Local timeline",
+  "column.direct": "Direct messages",
+  "column.directory": "Browse profiles",
+  "column.domain_blocks": "Blocked domains",
+  "column.favourites": "Favourites",
+  "column.follow_requests": "Follow requests",
+  "column.home": "Home",
+  "column.lists": "Lists",
+  "column.mutes": "Muted users",
+  "column.notifications": "Notifications",
+  "column.pins": "Pinned toot",
+  "column.public": "Federated timeline",
+  "column_back_button.label": "Back",
+  "column_header.hide_settings": "Hide settings",
+  "column_header.moveLeft_settings": "Move column to the left",
+  "column_header.moveRight_settings": "Move column to the right",
+  "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
+  "column_header.unpin": "Unpin",
+  "column_subheading.settings": "Settings",
+  "community.column_settings.local_only": "Local only",
+  "community.column_settings.media_only": "Media only",
+  "community.column_settings.remote_only": "Remote only",
+  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
+  "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
+  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
+  "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.placeholder": "What is on your mind?",
+  "compose_form.poll.add_option": "Add a choice",
+  "compose_form.poll.duration": "Poll duration",
+  "compose_form.poll.option_placeholder": "Choice {number}",
+  "compose_form.poll.remove_option": "Remove this choice",
+  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
+  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.publish": "Toot",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
+  "compose_form.spoiler.marked": "Text is hidden behind warning",
+  "compose_form.spoiler.unmarked": "Text is not hidden",
+  "compose_form.spoiler_placeholder": "Write your warning here",
+  "confirmation_modal.cancel": "Cancel",
+  "confirmations.block.block_and_report": "Block & Report",
+  "confirmations.block.confirm": "Block",
+  "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.delete.confirm": "Delete",
+  "confirmations.delete.message": "Are you sure you want to delete this status?",
+  "confirmations.delete_list.confirm": "Delete",
+  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+  "confirmations.domain_block.confirm": "Hide entire domain",
+  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
+  "confirmations.logout.confirm": "Log out",
+  "confirmations.logout.message": "Are you sure you want to log out?",
+  "confirmations.mute.confirm": "Mute",
+  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
+  "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.redraft.confirm": "Delete & redraft",
+  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
+  "confirmations.reply.confirm": "Reply",
+  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+  "conversation.delete": "Delete conversation",
+  "conversation.mark_as_read": "Mark as read",
+  "conversation.open": "View conversation",
+  "conversation.with": "With {names}",
+  "directory.federated": "From known fediverse",
+  "directory.local": "From {domain} only",
+  "directory.new_arrivals": "New arrivals",
+  "directory.recently_active": "Recently active",
+  "embed.instructions": "Embed this status on your website by copying the code below.",
+  "embed.preview": "Here is what it will look like:",
+  "emoji_button.activity": "Activity",
+  "emoji_button.custom": "Custom",
+  "emoji_button.flags": "Flags",
+  "emoji_button.food": "Food & Drink",
+  "emoji_button.label": "Insert emoji",
+  "emoji_button.nature": "Nature",
+  "emoji_button.not_found": "No emojos!! (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
+  "emoji_button.objects": "Objects",
+  "emoji_button.people": "People",
+  "emoji_button.recent": "Frequently used",
+  "emoji_button.search": "Search...",
+  "emoji_button.search_results": "Search results",
+  "emoji_button.symbols": "Symbols",
+  "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.account_unavailable": "Profile unavailable",
+  "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
+  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+  "empty_column.domain_blocks": "There are no blocked domains yet.",
+  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
+  "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
+  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.hashtag": "There is nothing in this hashtag yet.",
+  "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
+  "empty_column.home.public_timeline": "the public timeline",
+  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
+  "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
+  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
+  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
+  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
+  "errors.unexpected_crash.report_issue": "Report issue",
+  "follow_request.authorize": "Authorize",
+  "follow_request.reject": "Reject",
+  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "generic.saved": "Saved",
+  "getting_started.developers": "Developers",
+  "getting_started.directory": "Profile directory",
+  "getting_started.documentation": "Documentation",
+  "getting_started.heading": "Getting started",
+  "getting_started.invite": "Invite people",
+  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
+  "getting_started.security": "Security",
+  "getting_started.terms": "Terms of service",
+  "hashtag.column_header.tag_mode.all": "and {additional}",
+  "hashtag.column_header.tag_mode.any": "or {additional}",
+  "hashtag.column_header.tag_mode.none": "without {additional}",
+  "hashtag.column_settings.select.no_options_message": "No suggestions found",
+  "hashtag.column_settings.select.placeholder": "Enter hashtagsâ€¦",
+  "hashtag.column_settings.tag_mode.all": "All of these",
+  "hashtag.column_settings.tag_mode.any": "Any of these",
+  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "home.column_settings.basic": "Basic",
+  "home.column_settings.show_reblogs": "Show boosts",
+  "home.column_settings.show_replies": "Show replies",
+  "home.hide_announcements": "Hide announcements",
+  "home.show_announcements": "Show announcements",
+  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
+  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
+  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish toot-orial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is specialâ€”it hosts your profile, so remember its name.",
+  "keyboard_shortcuts.back": "to navigate back",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
+  "keyboard_shortcuts.boost": "to boost",
+  "keyboard_shortcuts.column": "to focus a status in one of the columns",
+  "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.down": "to move down in the list",
+  "keyboard_shortcuts.enter": "to open status",
+  "keyboard_shortcuts.favourite": "to favourite",
+  "keyboard_shortcuts.favourites": "to open favourites list",
+  "keyboard_shortcuts.federated": "to open federated timeline",
+  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.hotkey": "Hotkey",
+  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.local": "to open local timeline",
+  "keyboard_shortcuts.mention": "to mention author",
+  "keyboard_shortcuts.muted": "to open muted users list",
+  "keyboard_shortcuts.my_profile": "to open your profile",
+  "keyboard_shortcuts.notifications": "to open notifications column",
+  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.pinned": "to open pinned toots list",
+  "keyboard_shortcuts.profile": "to open author's profile",
+  "keyboard_shortcuts.reply": "to reply",
+  "keyboard_shortcuts.requests": "to open follow requests list",
+  "keyboard_shortcuts.search": "to focus search",
+  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
+  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
+  "keyboard_shortcuts.toot": "to start a brand new toot",
+  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.up": "to move up in the list",
+  "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
+  "lightbox.next": "Next",
+  "lightbox.previous": "Previous",
+  "lists.account.add": "Add to list",
+  "lists.account.remove": "Remove from list",
+  "lists.delete": "Delete list",
+  "lists.edit": "Edit list",
+  "lists.edit.submit": "Change title",
+  "lists.new.create": "Add list",
+  "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
+  "lists.search": "Search among people you follow",
+  "lists.subheading": "Your lists",
+  "load_pending": "{count, plural, one {# new item} other {# new items}}",
+  "loading_indicator.label": "Loading...",
+  "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
+  "missing_indicator.label": "Not found",
+  "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
+  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
+  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.bookmarks": "Bookmarks",
+  "navigation_bar.community_timeline": "Local timeline",
+  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
+  "navigation_bar.discover": "Discover",
+  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.favourites": "Favourites",
+  "navigation_bar.filters": "Muted words",
+  "navigation_bar.follow_requests": "Follow requests",
+  "navigation_bar.follows_and_followers": "Follows and followers",
+  "navigation_bar.info": "About this server",
+  "navigation_bar.keyboard_shortcuts": "Hotkeys",
+  "navigation_bar.lists": "Lists",
+  "navigation_bar.logout": "Logout",
+  "navigation_bar.mutes": "Muted users",
+  "navigation_bar.personal": "Personal",
+  "navigation_bar.pins": "Pinned toots",
+  "navigation_bar.preferences": "Preferences",
+  "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.security": "Security",
+  "notification.favourite": "{name} favourited your status",
+  "notification.follow": "{name} followed you",
+  "notification.follow_request": "{name} has requested to follow you",
+  "notification.mention": "{name} mentioned you",
+  "notification.own_poll": "Your poll has ended",
+  "notification.poll": "A poll you have voted in has ended",
+  "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
+  "notifications.clear": "Clear notifications",
+  "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.alert": "Desktop notifications",
+  "notifications.column_settings.favourite": "Favourites:",
+  "notifications.column_settings.filter_bar.advanced": "Display all categories",
+  "notifications.column_settings.filter_bar.category": "Quick filter bar",
+  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.follow": "New followers:",
+  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.mention": "Mentions:",
+  "notifications.column_settings.poll": "Poll results:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.reblog": "Boosts:",
+  "notifications.column_settings.show": "Show in column",
+  "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New toots:",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
+  "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
+  "poll.closed": "Closed",
+  "poll.refresh": "Refresh",
+  "poll.total_people": "{count, plural, one {# person} other {# people}}",
+  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+  "poll.vote": "Vote",
+  "poll.voted": "You voted for this answer",
+  "poll_button.add_poll": "Add a poll",
+  "poll_button.remove_poll": "Remove poll",
+  "privacy.change": "Adjust status privacy",
+  "privacy.direct.long": "Visible for mentioned users only",
+  "privacy.direct.short": "Direct",
+  "privacy.private.long": "Visible for followers only",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all, shown in public timelines",
+  "privacy.public.short": "Public",
+  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "privacy.unlisted.short": "Unlisted",
+  "refresh": "Refresh",
+  "regeneration_indicator.label": "Loadingâ€¦",
+  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "relative_time.days": "{number}d",
+  "relative_time.hours": "{number}h",
+  "relative_time.just_now": "now",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
+  "relative_time.today": "today",
+  "reply_indicator.cancel": "Cancel",
+  "report.forward": "Forward to {target}",
+  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.placeholder": "Additional comments",
+  "report.submit": "Submit",
+  "report.target": "Report {target}",
+  "search.placeholder": "Search",
+  "search_popout.search_format": "Advanced search format",
+  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+  "search_popout.tips.hashtag": "hashtag",
+  "search_popout.tips.status": "status",
+  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
+  "search_popout.tips.user": "user",
+  "search_results.accounts": "People",
+  "search_results.hashtags": "Hashtags",
+  "search_results.statuses": "Toots",
+  "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
+  "status.cancel_reblog_private": "Unboost",
+  "status.cannot_reblog": "This post cannot be boosted",
+  "status.copy": "Copy link to status",
+  "status.delete": "Delete",
+  "status.detailed_status": "Detailed conversation view",
+  "status.direct": "Direct message @{name}",
+  "status.embed": "Embed",
+  "status.favourite": "Favourite",
+  "status.filtered": "Filtered",
+  "status.load_more": "Load more",
+  "status.media_hidden": "Media hidden",
+  "status.mention": "Mention @{name}",
+  "status.more": "More",
+  "status.mute": "Mute @{name}",
+  "status.mute_conversation": "Mute conversation",
+  "status.open": "Expand this status",
+  "status.pin": "Pin on profile",
+  "status.pinned": "Pinned toot",
+  "status.read_more": "Read more",
+  "status.reblog": "Boost",
+  "status.reblog_private": "Boost with original visibility",
+  "status.reblogged_by": "{name} boosted",
+  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
+  "status.redraft": "Delete & re-draft",
+  "status.remove_bookmark": "Remove bookmark",
+  "status.reply": "Reply",
+  "status.replyAll": "Reply to thread",
+  "status.report": "Report @{name}",
+  "status.sensitive_warning": "Sensitive content",
+  "status.share": "Share",
+  "status.show_less": "Show less",
+  "status.show_less_all": "Show less for all",
+  "status.show_more": "Show more",
+  "status.show_more_all": "Show more for all",
+  "status.show_thread": "Show thread",
+  "status.uncached_media_warning": "Not available",
+  "status.unmute_conversation": "Unmute conversation",
+  "status.unpin": "Unpin from profile",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested inâ€¦",
+  "tabs_bar.federated_timeline": "Federated",
+  "tabs_bar.home": "Home",
+  "tabs_bar.local_timeline": "Local",
+  "tabs_bar.notifications": "Notifications",
+  "tabs_bar.search": "Search",
+  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
+  "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
+  "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
+  "time_remaining.moments": "Moments remaining",
+  "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
+  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
+  "timeline_hint.resources.followers": "Followers",
+  "timeline_hint.resources.follows": "Follows",
+  "timeline_hint.resources.statuses": "Older toots",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.trending_now": "Trending now",
+  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+  "units.short.billion": "{count}B",
+  "units.short.million": "{count}M",
+  "units.short.thousand": "{count}K",
+  "upload_area.title": "Drag & drop to upload",
+  "upload_button.label": "Add images, a video or an audio file",
+  "upload_error.limit": "File upload limit exceeded.",
+  "upload_error.poll": "File upload not allowed with polls.",
+  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_form.description": "Describe for the visually impaired",
+  "upload_form.edit": "Edit",
+  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.undo": "Delete",
+  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_modal.analyzing_picture": "Analyzing pictureâ€¦",
+  "upload_modal.apply": "Apply",
+  "upload_modal.choose_image": "Choose image",
+  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
+  "upload_modal.detect_text": "Detect text from picture",
+  "upload_modal.edit_media": "Edit media",
+  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
+  "upload_modal.preview_label": "Preview ({ratio})",
+  "upload_progress.label": "Uploadingâ€¦",
+  "video.close": "Close video",
+  "video.download": "Download file",
+  "video.exit_fullscreen": "Exit full screen",
+  "video.expand": "Expand video",
+  "video.fullscreen": "Full screen",
+  "video.hide": "Hide video",
+  "video.mute": "Mute sound",
+  "video.pause": "Pause",
+  "video.play": "Play",
+  "video.unmute": "Unmute sound"
+}
diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json
index e5d833fe87465898b1831bb4ceb749f69e1f8e65..70f6ab1529e76eb2ac320779468d4f934d169e1a 100644
--- a/app/javascript/mastodon/locales/ug.json
+++ b/app/javascript/mastodon/locales/ug.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Cancel follow request",
   "account.direct": "Direct message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain blocked",
   "account.edit_profile": "Edit profile",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
   "account.follow": "Follow",
   "account.followers": "Followers",
@@ -96,9 +98,9 @@
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "Write your warning here",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No toots here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "Authorize",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
-  "lightbox.view_context": "View context",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Change title",
   "lists.new.create": "Add list",
   "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Search among people you follow",
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.alert": "Desktop notifications",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Closed",
   "poll.refresh": "Refresh",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -389,7 +413,7 @@
   "status.pinned": "Pinned toot",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploadingâ€¦",
   "video.close": "Close video",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 244f04a9e87f831c181e327bb3213a3559333d00..941e43c9995b790037f0ed6bb64237c7ff1d24dd 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -9,14 +9,16 @@
   "account.browse_more_on_origin_server": "ÐŸÐµÑ€ÐµÐ³Ð»ÑÐ½ÑƒÑ‚Ð¸ Ð±Ñ–Ð»ÑŒÑˆÐµ Ð² Ð¾Ñ€Ð¸Ð³Ñ–Ð½Ð°Ð»Ñ–",
   "account.cancel_follow_request": "Ð¡ÐºÐ°ÑÑƒÐ²Ð°Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ‚ Ð½Ð° Ð¿Ñ–Ð´Ð¿Ð¸ÑÐºÑƒ",
   "account.direct": "ÐŸÑ€ÑÐ¼Ðµ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Ð”Ð¾Ð¼ÐµÐ½ Ð¿Ñ€Ð¸Ñ…Ð¾Ð²Ð°Ð½Ð¾",
   "account.edit_profile": "Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŒ",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "ÐŸÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ñƒ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»Ñ–",
   "account.follow": "ÐŸÑ–Ð´Ð¿Ð¸ÑÐ°Ñ‚Ð¸ÑÑ",
   "account.followers": "ÐŸÑ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÐ¸",
   "account.followers.empty": "ÐÑ–Ñ…Ñ‚Ð¾ Ñ‰Ðµ Ð½Ðµ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð²ÑÑ Ð½Ð° Ñ†ÑŒÐ¾Ð³Ð¾ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers_counter": "{count, plural, one {{counter} ÐŸÑ–Ð´Ð¿Ð¸ÑÐ½Ð¸Ðº} few {{counter} ÐŸÑ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÐ¸} many {{counter} ÐŸÑ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÑ–Ð²} other {{counter} ÐŸÑ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÐ¸}}",
+  "account.following_counter": "{count, plural, one {{counter} ÐŸÑ–Ð´Ð¿Ð¸ÑÐºÐ°} few {{counter} ÐŸÑ–Ð´Ð¿Ð¸ÑÐºÐ¸} many {{counter} ÐŸÑ–Ð´Ð¿Ð¸ÑÐ¾Ðº} other {{counter} ÐŸÑ–Ð´Ð¿Ð¸ÑÐºÐ¸}}",
   "account.follows.empty": "Ð¦ÐµÐ¹ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ Ñ‰Ðµ Ð½Ñ– Ð½Ð° ÐºÐ¾Ð³Ð¾ Ð½Ðµ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð²ÑÑ.",
   "account.follows_you": "ÐŸÑ–Ð´Ð¿Ð¸ÑÐ°Ð½Ð¸Ð¹(-Ð°) Ð½Ð° Ð²Ð°Ñ",
   "account.hide_reblogs": "Ð¡Ñ…Ð¾Ð²Ð°Ñ‚Ð¸ Ð¿ÐµÑ€ÐµÐ´Ð¼ÑƒÑ…Ð¸ Ð²Ñ–Ð´ @{name}",
@@ -36,7 +38,7 @@
   "account.requested": "ÐžÑ‡Ñ–ÐºÑƒÑ” Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ. ÐÐ°Ñ‚Ð¸ÑÐ½Ñ–Ñ‚ÑŒ Ñ‰Ð¾Ð± Ð²Ñ–Ð´Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ‚",
   "account.share": "ÐŸÐ¾Ð´Ñ–Ð»Ð¸Ñ‚Ð¸ÑÑ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÐµÐ¼ @{name}",
   "account.show_reblogs": "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð¿ÐµÑ€ÐµÐ´Ð¼ÑƒÑ…Ð¸ Ð²Ñ–Ð´ @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, one {{counter} ÐŸÐ¾ÑÑ‚} few {{counter} ÐŸÐ¾ÑÑ‚Ð¸} many {{counter} ÐŸÐ¾ÑÑ‚Ñ–Ð²} other {{counter} ÐŸÐ¾ÑÑ‚Ð¸}}",
   "account.unblock": "Ð Ð¾Ð·Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ @{name}",
   "account.unblock_domain": "Ð Ð¾Ð·Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ {domain}",
   "account.unendorse": "ÐÐµ Ð¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ñƒ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»Ñ–",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Ð ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð¸ Ð¿Ð¾ÑˆÑƒÐºÑƒ",
   "emoji_button.symbols": "Ð¡Ð¸Ð¼Ð²Ð¾Ð»Ð¸",
   "emoji_button.travel": "ÐŸÐ¾Ð´Ð¾Ñ€Ð¾Ð¶Ñ–",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "Ð¢ÑƒÑ‚ Ð´Ð¼ÑƒÑ…Ð°Ð»Ð¾Ðº Ð½ÐµÐ¼Ð°Ñ”!",
   "empty_column.account_unavailable": "ÐŸÑ€Ð¾Ñ„Ñ–Ð»ÑŒ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¸Ð¹",
   "empty_column.blocks": "Ð’Ð¸ Ñ‰Ðµ Ð½Ðµ Ð·Ð°Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð»Ð¸ Ð¶Ð¾Ð´Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°.",
@@ -166,13 +169,15 @@
   "empty_column.notifications": "Ð£ Ð²Ð°Ñ Ñ‰Ðµ Ð½ÐµÐ¼Ð°Ñ” ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½ÑŒ. ÐŸÐµÑ€ÐµÐ¿Ð¸ÑÑƒÐ¹Ñ‚ÐµÑÑŒ Ð· Ñ–Ð½ÑˆÐ¸Ð¼Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°Ð¼Ð¸, Ñ‰Ð¾Ð± Ð¿Ð¾Ñ‡Ð°Ñ‚Ð¸ Ñ€Ð¾Ð·Ð¼Ð¾Ð²Ñƒ.",
   "empty_column.public": "Ð¢ÑƒÑ‚ Ð¿Ð¾ÐºÐ¸ Ð½Ñ–Ñ‡Ð¾Ð³Ð¾ Ð½ÐµÐ¼Ð°Ñ”! ÐžÐ¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ¹Ñ‚Ðµ Ñ‰Ð¾ÑÑŒ, Ð°Ð±Ð¾ Ð²Ñ€ÑƒÑ‡Ð½Ñƒ Ð¿Ñ–Ð´Ð¿Ð¸ÑˆÑ–Ñ‚ÑŒÑÑ Ð½Ð° ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð² Ñ–Ð½ÑˆÐ¸Ñ… Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ð¹, Ñ‰Ð¾Ð± Ð·Ð°Ð¿Ð¾Ð²Ð½Ð¸Ñ‚Ð¸ ÑÑ‚Ñ€Ñ–Ñ‡ÐºÑƒ",
   "error.unexpected_crash.explanation": "Ð¦Ñ ÑÑ‚Ð¾Ñ€Ñ–Ð½ÐºÐ° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑƒÑ‚Ð¸ ÐºÐ¾Ñ€ÐµÐºÑ‚Ð½Ð¾ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð° Ñ‡ÐµÑ€ÐµÐ· Ð±Ð°Ò‘ Ñƒ Ð½Ð°ÑˆÐ¾Ð¼Ñƒ ÐºÐ¾Ð´Ñ– Ð°Ð±Ð¾ Ñ‡ÐµÑ€ÐµÐ· Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñƒ ÑÑƒÐ¼Ñ–ÑÐ½Ð¾ÑÑ‚Ñ– Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð°.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Ð¡Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ Ð¿ÐµÑ€ÐµÐ·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ ÑÑ‚Ð¾Ñ€Ñ–Ð½ÐºÑƒ. Ð¯ÐºÑ‰Ð¾ Ñ†Ðµ Ð½Ðµ Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð¶Ðµ, Ð²Ð¸ Ð²ÑÐµ Ñ‰Ðµ Ð·Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Mastodon Ñ‡ÐµÑ€ÐµÐ· Ñ–Ð½ÑˆÐ¸Ð¹ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€ Ð°Ð±Ð¾ Ñ€Ñ–Ð´Ð½Ð¸Ð¹ Ð´Ð¾Ð´Ð°Ñ‚Ð¾Ðº.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Ð¡ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ñ‚Ð¸ Ñ‚Ñ€Ð°ÑÑƒÐ²Ð°Ð½Ð½Ñ ÑÑ‚ÐµÐºÐ° Ñƒ Ð±ÑƒÑ„ÐµÑ€ Ð¾Ð±Ð¼Ñ–Ð½Ñƒ",
   "errors.unexpected_crash.report_issue": "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð¾ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñƒ",
   "follow_request.authorize": "ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·ÑƒÐ²Ð°Ñ‚Ð¸",
   "follow_request.reject": "Ð’Ñ–Ð´Ð¼Ð¾Ð²Ð¸Ñ‚Ð¸",
   "follow_requests.unlocked_explanation": "Ð¥Ð¾Ñ‡Ð° Ð²Ð°Ñˆ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ Ð½Ðµ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ð¾, Ð¿Ñ€Ð°Ñ†Ñ–Ð²Ð½Ð¸ÐºÐ¸ {domain} Ð¿Ñ€Ð¸Ð¿ÑƒÑÐºÐ°ÑŽÑ‚ÑŒ, Ñ‰Ð¾, Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾, Ð²Ð¸ Ñ…Ð¾Ñ‚Ñ–Ð»Ð¸ Ð± Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ½ÑƒÑ‚Ð¸ Ñ†Ñ– Ð·Ð°Ð¿Ð¸Ñ‚Ð¸ Ð½Ð° Ð¿Ñ–Ð´Ð¿Ð¸ÑÐºÑƒ.",
-  "generic.saved": "Saved",
+  "generic.saved": "Ð—Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð¾",
   "getting_started.developers": "Ð Ð¾Ð·Ñ€Ð¾Ð±Ð½Ð¸ÐºÐ°Ð¼",
   "getting_started.directory": "ÐšÐ°Ñ‚Ð°Ð»Ð¾Ð³ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»Ñ–Ð²",
   "getting_started.documentation": "Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ñ–Ñ",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "Ñ€Ð¾Ð·Ñ„Ð¾ÐºÑƒÑÑƒÐ²Ð°Ñ‚Ð¸ÑÑ Ð· Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð´Ð¾Ð¿Ð¸ÑÑƒ Ñ‡Ð¸ Ð¿Ð¾ÑˆÑƒÐºÑƒ",
   "keyboard_shortcuts.up": "Ñ€ÑƒÑ…Ð°Ñ‚Ð¸ÑÑ Ð²Ð²ÐµÑ€Ñ… ÑÐ¿Ð¸ÑÐºÐ¾Ð¼",
   "lightbox.close": "Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¸",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Ð”Ð°Ð»Ñ–",
   "lightbox.previous": "ÐÐ°Ð·Ð°Ð´",
-  "lightbox.view_context": "ÐŸÐµÑ€ÐµÐ³Ð»ÑÐ½ÑƒÑ‚Ð¸ ÐºÐ¾Ð½Ñ‚ÐµÐºÑÑ‚",
   "lists.account.add": "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ð´Ð¾ ÑÐ¿Ð¸ÑÐºÑƒ",
   "lists.account.remove": "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð·Ñ– ÑÐ¿Ð¸ÑÐºÑƒ",
   "lists.delete": "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ ÑÐ¿Ð¸ÑÐ¾Ðº",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Ð—Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð½Ð°Ð·Ð²Ñƒ",
   "lists.new.create": "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ ÑÐ¿Ð¸ÑÐ¾Ðº",
   "lists.new.title_placeholder": "ÐÐ¾Ð²Ð° Ð½Ð°Ð·Ð²Ð° ÑÐ¿Ð¸ÑÐºÑƒ",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Ð¨ÑƒÐºÐ°Ñ‚Ð¸ ÑÐµÑ€ÐµÐ´ Ð»ÑŽÐ´ÐµÐ¹, Ð½Ð° ÑÐºÐ¸Ñ… Ð²Ð¸ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð½Ñ–",
   "lists.subheading": "Ð’Ð°ÑˆÑ– ÑÐ¿Ð¸ÑÐºÐ¸",
   "load_pending": "{count, plural, one {# Ð½Ð¾Ð²Ð¸Ð¹ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚} other {# Ð½Ð¾Ð²Ð¸Ñ… ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚Ñ–Ð²}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸/Ð¿Ñ€Ð¸Ñ…Ð¾Ð²Ð°Ñ‚Ð¸",
   "missing_indicator.label": "ÐÐµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾",
   "missing_indicator.sublabel": "Ð ÐµÑÑƒÑ€Ñ Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¸Ð¹",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "ÐŸÑ€Ð¸Ñ…Ð¾Ð²Ð°Ñ‚Ð¸ ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "ÐœÐ¾Ð±Ñ–Ð»ÑŒÐ½Ñ– Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¸",
   "navigation_bar.blocks": "Ð—Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ñ– ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–",
   "navigation_bar.bookmarks": "Ð—Ð°ÐºÐ»Ð°Ð´ÐºÐ¸",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Ð’Ð°ÑˆÐµ Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾",
   "notification.poll": "ÐžÐ¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ, Ñƒ ÑÐºÐ¾Ð¼Ñƒ Ð²Ð¸ Ð³Ð¾Ð»Ð¾ÑÑƒÐ²Ð°Ð»Ð¸, Ð·Ð°ÐºÑ–Ð½Ñ‡Ð¸Ð»Ð¾ÑÑ",
   "notification.reblog": "{name} Ð¿ÐµÑ€ÐµÐ´Ð¼ÑƒÑ…Ð½ÑƒÐ²(-Ð»Ð°) Ð’Ð°Ñˆ Ð´Ð¾Ð¿Ð¸Ñ",
+  "notification.status": "{name} just posted",
   "notifications.clear": "ÐžÑ‡Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ",
   "notifications.clear_confirmation": "Ð’Ð¸ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ–, Ñ‰Ð¾ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð½Ð°Ð·Ð°Ð²Ð¶Ð´Ð¸ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð²ÑÑ– ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ñ?",
   "notifications.column_settings.alert": "Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð½Ð° ÐºÐ¾Ð¼Ð¿'ÑŽÑ‚ÐµÑ€Ñ–",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "ÐŸÐµÑ€ÐµÐ´Ð¼ÑƒÑ…Ð¸:",
   "notifications.column_settings.show": "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð² ÐºÐ¾Ð»Ð¾Ð½Ñ†Ñ–",
   "notifications.column_settings.sound": "Ð’Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÑŽÐ²Ð°Ñ‚Ð¸ Ð·Ð²ÑƒÐºÐ¸",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "Ð£ÑÑ–",
   "notifications.filter.boosts": "ÐŸÐµÑ€ÐµÐ´Ð¼ÑƒÑ…Ð¸",
   "notifications.filter.favourites": "Ð£Ð»ÑŽÐ±Ð»ÐµÐ½Ñ–",
   "notifications.filter.follows": "ÐŸÑ–Ð´Ð¿Ð¸ÑÐºÐ¸",
   "notifications.filter.mentions": "Ð—Ð³Ð°Ð´ÐºÐ¸",
   "notifications.filter.polls": "Ð ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð¸ Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½ÑŒ",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¾",
   "poll.refresh": "ÐžÐ½Ð¾Ð²Ð¸Ñ‚Ð¸",
   "poll.total_people": "{count, plural, one {# Ð¾ÑÐ¾Ð±Ð°} other {# Ð¾ÑÑ–Ð±}}",
@@ -423,29 +447,30 @@
   "timeline_hint.resources.followers": "ÐŸÑ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÐ¸",
   "timeline_hint.resources.follows": "ÐŸÑ–Ð´Ð¿Ð¸ÑÐºÐ¸",
   "timeline_hint.resources.statuses": "Ð¡Ñ‚Ð°Ñ€Ñ–ÑˆÑ– Ð´Ð¼ÑƒÑ…Ð¸",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} Ð¾ÑÐ¾Ð±Ð° Ð¾Ð±Ð³Ð¾Ð²Ð¾Ñ€ÑŽÑ”} few {{counter} Ð¾ÑÐ¾Ð±Ð¸ Ð¾Ð±Ð³Ð¾Ð²Ð¾Ñ€ÑŽÑŽÑ‚ÑŒ} many {{counter} Ð¾ÑÑ–Ð± Ð¾Ð±Ð³Ð¾Ð²Ð¾Ñ€ÑŽÑŽÑ‚ÑŒ} other {{counter} Ð¾ÑÐ¾Ð±Ð¸ Ð¾Ð±Ð³Ð¾Ð²Ð¾Ñ€ÑŽÑŽÑ‚ÑŒ}}",
   "trends.trending_now": "ÐÐºÑ‚ÑƒÐ°Ð»ÑŒÐ½Ñ–",
   "ui.beforeunload": "Ð’Ð°ÑˆÑƒ Ñ‡ÐµÑ€Ð½ÐµÑ‚ÐºÑƒ Ð±ÑƒÐ´Ðµ Ð²Ñ‚Ñ€Ð°Ñ‡ÐµÐ½Ð¾, ÑÐºÑ‰Ð¾ Ð²Ð¸ Ð¿Ð¾ÐºÐ¸Ð½ÐµÑ‚Ðµ Mastodon.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
+  "units.short.billion": "{count} Ð¼Ð»Ñ€Ð´",
+  "units.short.million": "{count} Ð¼Ð»Ð½",
+  "units.short.thousand": "{count} Ñ‚Ð¸Ñ",
   "upload_area.title": "ÐŸÐµÑ€ÐµÑ‚ÑÐ³Ð½Ñ–Ñ‚ÑŒ ÑÑŽÐ´Ð¸, Ñ‰Ð¾Ð± Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸",
-  "upload_button.label": "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ð¼ÐµÐ´Ñ–Ð° ({formats})",
+  "upload_button.label": "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ð¼ÐµÐ´Ñ–Ð°",
   "upload_error.limit": "Ð›Ñ–Ð¼Ñ–Ñ‚ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² Ð¿ÐµÑ€ÐµÐ²Ð¸Ñ‰ÐµÐ½Ð¾.",
   "upload_error.poll": "ÐÐµ Ð¼Ð¾Ð¶Ð½Ð° Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÐ²Ð°Ñ‚Ð¸ Ñ„Ð°Ð¹Ð»Ð¸ Ð´Ð¾ Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½ÑŒ.",
   "upload_form.audio_description": "ÐžÐ¿Ð¸ÑˆÑ–Ñ‚ÑŒ Ð´Ð»Ñ Ð»ÑŽÐ´ÐµÐ¹ Ñ–Ð· Ð²Ð°Ð´Ð°Ð¼Ð¸ ÑÐ»ÑƒÑ…Ñƒ",
   "upload_form.description": "ÐžÐ¿Ð¸ÑˆÑ–Ñ‚ÑŒ Ð´Ð»Ñ Ð»ÑŽÐ´ÐµÐ¹ Ð· Ð²Ð°Ð´Ð°Ð¼Ð¸ Ð·Ð¾Ñ€Ñƒ",
   "upload_form.edit": "Ð—Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "Ð—Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð¼Ñ–Ð½Ñ–Ð°Ñ‚ÑŽÑ€Ñƒ",
   "upload_form.undo": "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸",
   "upload_form.video_description": "ÐžÐ¿Ð¸ÑˆÑ–Ñ‚ÑŒ Ð´Ð»Ñ Ð»ÑŽÐ´ÐµÐ¹ Ñ–Ð· Ð²Ð°Ð´Ð°Ð¼Ð¸ ÑÐ»ÑƒÑ…Ñƒ Ð°Ð±Ð¾ Ð·Ð¾Ñ€Ñƒ",
   "upload_modal.analyzing_picture": "ÐÐ½Ð°Ð»Ñ–Ð·ÑƒÑ”Ð¼Ð¾ Ð¼Ð°Ð»ÑŽÐ½Ð¾Ðºâ€¦",
   "upload_modal.apply": "Ð—Ð°ÑÑ‚Ð¾ÑÑƒÐ²Ð°Ñ‚Ð¸",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.choose_image": "Ð’Ð¸Ð±Ñ€Ð°Ñ‚Ð¸ Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ",
   "upload_modal.description_placeholder": "Ð©ÑƒÑ€ÑÑ‡Ð¸Ð¹ Ð±ÑƒÐ³Ð°Ð¹ Ñ–Ð· Ñ—Ð¶Ð°ÐºÐ¾Ð¼-Ñ…Ð°Ñ€Ñ†Ð¸Ð·Ð¾Ð¼ Ð²'ÑŽÑ‡Ð¸ÑÑŒ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð»Ð¸ Ò‘ÐµÑˆÐµÑ„Ñ‚ Ñƒ Ñ”Ð½Ð°Ñ…",
   "upload_modal.detect_text": "Ð’Ð¸ÑÐ²Ð¸Ñ‚Ð¸ Ñ‚ÐµÐºÑÑ‚ Ð½Ð° Ð¼Ð°Ð»ÑŽÐ½ÐºÑƒ",
   "upload_modal.edit_media": "Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸ Ð¼ÐµÐ´Ñ–Ð°",
   "upload_modal.hint": "ÐšÐ»Ð°Ñ†Ð½Ñ–Ñ‚ÑŒ Ð°Ð±Ð¾ Ð¿ÐµÑ€ÐµÑ‚ÑÐ³Ð½Ñ–Ñ‚ÑŒ ÐºÐ¾Ð»Ð¾ Ð½Ð° Ð¿Ñ€ÐµÐ²ÑŒÑŽ, Ñ‰Ð¾Ð± Ð¾Ð±Ñ€Ð°Ñ‚Ð¸ Ñ‚Ð¾Ñ‡ÐºÑƒ, ÑÐºÑƒ Ð±ÑƒÐ´Ðµ Ð·Ð°Ð²Ð¶Ð´Ð¸ Ð²Ð¸Ð´Ð½Ð¾ Ð½Ð° Ð¼Ñ–Ð½Ñ–Ð°Ñ‚ÑŽÑ€Ð°Ñ….",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "ÐŸÐµÑ€ÐµÐ³Ð»ÑÐ½ÑƒÑ‚Ð¸ ({ratio})",
   "upload_progress.label": "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ...",
   "video.close": "Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ð²Ñ–Ð´ÐµÐ¾",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index b94b7c16200664e7fe4709fdf69aeb6961382edf..aaccf1d8381e057fa365c723f18520074fe7b6be 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -9,8 +9,10 @@
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Ø¯Ø±Ø®ÙˆØ§Ø³ØªÙ Ù¾ÛŒØ±ÙˆÛŒ Ù…Ù†Ø³ÙˆØ® Ú©Ø±ÛŒÚº",
   "account.direct": "Ø±Ø§Ø³Øª Ù¾ÛŒØºØ§Ù… @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Ù¾ÙˆØ´ÛŒØ¯Û ÚˆÙˆÙ…ÛŒÙ†",
   "account.edit_profile": "Ù…Ø´Ø®Øµ ØªØ±Ù…ÛŒÙ… Ú©Ø±ÛŒÚº",
+  "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Ù…Ø´Ú©Øµ Ù¾Ø± Ù†Ù…Ø§ÛŒØ§Úº Ú©Ø±ÛŒÚº",
   "account.follow": "Ù¾ÛŒØ±ÙˆÛŒ Ú©Ø±ÛŒÚº",
   "account.followers": "Ù¾ÛŒØ±ÙˆÚ©Ø§Ø±",
@@ -98,7 +100,7 @@
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "ÙˆØ³Ø§Ø¦Ù„ Ú©Ùˆ ØØ³Ø§Ø³ Ù†Ø´Ø§Ù†Ø¯Û Ú©Ø±ÛŒÚº",
   "compose_form.sensitive.marked": "ÙˆØ³Ø§Ø¦Ù„ ØØ³Ø§Ø³ Ù†Ø´Ø§Ù†Ø¯Û ÛÛ’",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "Write your warning here",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "ÛŒÛØ§Úº Ú©ÙˆØ¦ÛŒ Ù†ÙˆÙ¹Ø³ Ù†ÛÛŒÚº ÛÛŒÚº!",
   "empty_column.account_unavailable": "Ù…Ø´Ø®Øµ Ø¯Ø³ØªÛŒØ§Ø¨ Ù†ÛÛŒÚº ÛÛ’",
   "empty_column.blocks": "Ø¢Ù¾ Ù†Û’ Ø§Ø¨Ú¾ÛŒ Ú©Ø³ÛŒ ØµØ§Ø±Ù Ú©Ùˆ Ù…Ø³Ø¯ÙˆØ¯ Ù†ÛÛŒÚº Ú©ÛŒØ§ ÛÛ’.",
@@ -166,7 +169,9 @@
   "empty_column.notifications": "Ø§Ø¨Ú¾ÛŒ Ø¢Ù¾ Ú©ÛŒÙ„Ø¦Û’ Ú©ÙˆØ¦ÛŒ Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ù†ÛÛŒÚº ÛÛŒÚº. Ú¯ÙØªÚ¯Ùˆ Ø´Ø±ÙˆØ¹ Ú©Ø±Ù†Û’ Ú©Û’ Ù„Ø¦Û’ Ø¯ÛŒÚ¯Ø± ØµØ§Ø±ÙÛŒÙ† Ø³Û’ Ù…ØªØ¹Ø§Ù…Ù„ ÛÙˆÚº.",
   "empty_column.public": "ÛŒÛØ§Úº Ú©Ú†Ú¾ Ø¨Ú¾ÛŒ Ù†ÛÛŒÚº ÛÛ’! Ú©Ú†Ú¾ Ø¹Ù…ÙˆÙ…ÛŒ ØªØØ±ÛŒØ± Ú©Ø±ÛŒÚº ÛŒØ§ Ø§Ø³ Ø¬Ú¯Û Ú©Ùˆ Ù¾ÙØ± Ú©Ø±Ù†Û’ Ú©Û’ Ù„Ø¦Û’ Ø§Ø² Ø®ÙˆØ¯ Ø¯ÛŒÚ¯Ø± Ø³Ø±ÙˆØ±Ø³ Ú©Û’ ØµØ§Ø±ÙÛŒÙ† Ú©ÛŒ Ù¾ÛŒØ±ÙˆÛŒ Ú©Ø±ÛŒÚº",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "ØµÙØÛ’ Ú©Ùˆ ØªØ§Ø²Û Ú©Ø±Ù†Û’ Ú©ÛŒ Ú©ÙˆØ´Ø´ Ú©Ø±ÛŒÚº. Ø§Ú¯Ø± Ú©Ø§Ø±Ø¢Ù…Ø¯ Ù†Û ÛÙˆ ØªÙˆ Ø¢Ù¾ Ú©Ø³ÛŒ Ø¯ÛŒÚ¯Ø± Ø¨Ø±Ø§Ø¤Ø²Ø± ÛŒØ§ Ù…Ù‚Ø§Ù…ÛŒ Ø§ÛŒÙ¾ Ø³Û’ ÛÙ†ÙˆØ² Ù…Ø§Ø³Ù¹ÙˆÚˆÙˆÙ† Ø§Ø³ØªØ¹Ù…Ø§Ù„ Ú©Ø± Ø³Ú©ØªÛ’ ÛÛŒÚº.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Ù…Ø³Ø¦Ù„Û Ú©ÛŒ Ø§Ø·Ù„Ø§Ø¹ Ú©Ø±ÛŒÚº",
   "follow_request.authorize": "Ø§Ø¬Ø§Ø²Øª Ø¯ÛŒÚº",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
-  "lightbox.view_context": "View context",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "Change title",
   "lists.new.create": "Add list",
   "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Search among people you follow",
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -298,6 +310,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.alert": "Desktop notifications",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New toots:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
   "poll.closed": "Closed",
   "poll.refresh": "Refresh",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
@@ -389,7 +413,7 @@
   "status.pinned": "Pinned toot",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "Detect text from picture",
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploadingâ€¦",
   "video.close": "Close video",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 17c4302c268a92524fde3a9cd994578c6f8f53d2..d22b8d7045413fa422af4eec8b3177616e3059c8 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -1,28 +1,30 @@
 {
-  "account.account_note_header": "Ghi chÃº cá»§a báº¡n cho @{name}",
+  "account.account_note_header": "Ghi chÃº",
   "account.add_or_remove_from_list": "ThÃªm hoáº·c XÃ³a khá»i danh sÃ¡ch",
   "account.badges.bot": "Bot",
   "account.badges.group": "NhÃ³m",
   "account.block": "Cháº·n @{name}",
   "account.block_domain": "áº¨n má»i thá»© tá»« {domain}",
   "account.blocked": "ÄÃ£ cháº·n",
-  "account.browse_more_on_origin_server": "TÃ¬m nhá»¯ng tÃ i khoáº£n cÃ³ liÃªn quan",
+  "account.browse_more_on_origin_server": "Truy cáºp trang cá»§a ngÆ°á»i nÃ y",
   "account.cancel_follow_request": "Há»§y yÃªu cáº§u theo dÃµi",
-  "account.direct": "Nháº¯n tin cho @{name}",
-  "account.domain_blocked": "ÄÃ£ cháº·n ngÆ°á»i dÃ¹ng",
+  "account.direct": "Nháº¯n tin @{name}",
+  "account.disable_notifications": "KhÃ´ng thÃ´ng bÃ¡o khi @{name} Ä‘Äƒng tÃºt",
+  "account.domain_blocked": "NgÆ°á»i Ä‘Ã£ cháº·n",
   "account.edit_profile": "Chá»‰nh sá»a trang cÃ¡ nhÃ¢n",
-  "account.endorse": "Hiá»ƒn thá»‹ trÃªn trang cÃ¡ nhÃ¢n",
+  "account.enable_notifications": "ThÃ´ng bÃ¡o khi @{name} Ä‘Äƒng tÃºt",
+  "account.endorse": "Vinh danh ngÆ°á»i nÃ y",
   "account.follow": "Theo dÃµi",
   "account.followers": "NgÆ°á»i theo dÃµi",
   "account.followers.empty": "ChÆ°a cÃ³ ngÆ°á»i theo dÃµi nÃ o.",
   "account.followers_counter": "{count, plural, one {{counter} NgÆ°á»i theo dÃµi} other {{counter} NgÆ°á»i theo dÃµi}}",
-  "account.following_counter": "{count, plural, other {{counter} Äang theo dÃµi}}",
-  "account.follows.empty": "NgÆ°á»i dÃ¹ng nÃ y chÆ°a theo dÃµi ai.",
+  "account.following_counter": "{count, plural, one {{counter} Theo dÃµi} other {{counter} Theo dÃµi}}",
+  "account.follows.empty": "NgÆ°á»i nÃ y chÆ°a theo dÃµi ai.",
   "account.follows_you": "Äang theo dÃµi báº¡n",
   "account.hide_reblogs": "áº¨n chia sáº» tá»« @{name}",
-  "account.last_status": "Hoáº¡t Ä‘á»™ng gáº§n Ä‘Ã¢y",
+  "account.last_status": "Online",
   "account.link_verified_on": "LiÃªn káº¿t nÃ y Ä‘Ã£ Ä‘Æ°á»£c xÃ¡c thá»±c vÃ o {date}",
-  "account.locked_info": "NgÆ°á»i dÃ¹ng nÃ y thiáº¿t láºp tráº¡ng thÃ¡i áº©n. Há» sáº½ tá»± mÃ¬nh xÃ©t duyá»‡t cÃ¡c yÃªu cáº§u theo dÃµi.",
+  "account.locked_info": "ÄÃ¢y lÃ  tÃ i khoáº£n riÃªng tÆ°. Há» sáº½ tá»± mÃ¬nh xÃ©t duyá»‡t cÃ¡c yÃªu cáº§u theo dÃµi.",
   "account.media": "Bá»™ sÆ°u táºp",
   "account.mention": "Nháº¯c Ä‘áº¿n @{name}",
   "account.moved_to": "{name} Ä‘Ã£ dá»i sang:",
@@ -31,52 +33,52 @@
   "account.muted": "ÄÃ£ áº©n",
   "account.never_active": "ChÆ°a cÃ³ báº¥t cá»© hoáº¡t Ä‘á»™ng nÃ o",
   "account.posts": "TÃºt",
-  "account.posts_with_replies": "Tráº£ lá»i",
+  "account.posts_with_replies": "TÆ°Æ¡ng tÃ¡c",
   "account.report": "BÃ¡o cÃ¡o @{name}",
   "account.requested": "Äang chá» cháº¥p thuáºn. Nháº¥p vÃ o Ä‘Ã¢y Ä‘á»ƒ há»§y yÃªu cáº§u theo dÃµi",
   "account.share": "Chia sáº» há»“ sÆ¡ @{name}",
   "account.show_reblogs": "Hiá»‡n chia sáº» tá»« @{name}",
-  "account.statuses_counter": "{count, plural, other {{counter} TÃºt}}",
+  "account.statuses_counter": "{count, plural, one {{counter} TÃºt} other {{counter} TÃºt}}",
   "account.unblock": "Bá» cháº·n @{name}",
   "account.unblock_domain": "Bá» áº©n {domain}",
-  "account.unendorse": "KhÃ´ng hiá»‡n trÃªn trang cÃ¡ nhÃ¢n",
+  "account.unendorse": "NgÆ°ng vinh danh ngÆ°á»i nÃ y",
   "account.unfollow": "NgÆ°ng theo dÃµi",
   "account.unmute": "Bá» áº©n @{name}",
   "account.unmute_notifications": "Hiá»ƒn láº¡i thÃ´ng bÃ¡o tá»« @{name}",
-  "account_note.placeholder": "Nháº¥n Ä‘á»ƒ thÃªm ghi chÃº",
+  "account_note.placeholder": "Báº¡n cÃ³ Ä‘iá»u gÃ¬ thÃº vá»‹ muá»‘n nÃ³i vá» ngÆ°á»i nÃ y?",
   "alert.rate_limited.message": "Vui lÃ²ng thá» láº¡i sau {retry_time, time, medium}.",
   "alert.rate_limited.title": "VÆ°á»£t giá»›i háº¡n",
   "alert.unexpected.message": "ÄÃ£ xáº£y ra lá»—i khÃ´ng mong muá»‘n.",
   "alert.unexpected.title": "á»iii!",
-  "announcement.announcement": "ThÃ´ng bÃ¡o",
+  "announcement.announcement": "ThÃ´ng bÃ¡o chung",
   "autosuggest_hashtag.per_week": "{count} má»—i tuáº§n",
-  "boost_modal.combo": "Báº¡n cÃ³ thá»ƒ nháº¥n {combo} Ä‘á»ƒ bá» qua",
+  "boost_modal.combo": "Nháº¥n {combo} Ä‘á»ƒ chia sáº» nhanh hÆ¡n",
   "bundle_column_error.body": "ÄÃ£ cÃ³ lá»—i xáº£y ra trong khi táº£i ná»™i dung nÃ y.",
   "bundle_column_error.retry": "Thá» láº¡i",
   "bundle_column_error.title": "KhÃ´ng cÃ³ káº¿t ná»‘i internet",
   "bundle_modal_error.close": "ÄÃ³ng",
   "bundle_modal_error.message": "ÄÃ£ cÃ³ lá»—i xáº£y ra trong khi táº£i ná»™i dung nÃ y.",
   "bundle_modal_error.retry": "Thá» láº¡i",
-  "column.blocks": "NgÆ°á»i dÃ¹ng Ä‘Ã£ cháº·n",
-  "column.bookmarks": "TÃºt Ä‘Ã£ lÆ°u",
+  "column.blocks": "NgÆ°á»i Ä‘Ã£ cháº·n",
+  "column.bookmarks": "ÄÃ£ lÆ°u",
   "column.community": "MÃ¡y chá»§ cá»§a báº¡n",
-  "column.direct": "Nháº¯n tin",
-  "column.directory": "TÃ¬m má»™t ai Ä‘Ã³",
+  "column.direct": "Tin nháº¯n",
+  "column.directory": "TÃ¬m ngÆ°á»i cÃ¹ng sá»Ÿ thÃch",
   "column.domain_blocks": "MÃ¡y chá»§ Ä‘Ã£ cháº·n",
-  "column.favourites": "TÃ¢m Ä‘áº¯c",
+  "column.favourites": "LÆ°á»£t thÃch",
   "column.follow_requests": "YÃªu cáº§u theo dÃµi",
   "column.home": "Báº£ng tin",
   "column.lists": "Danh sÃ¡ch",
-  "column.mutes": "NgÆ°á»i dÃ¹ng Ä‘Ã£ cháº·n",
+  "column.mutes": "NgÆ°á»i Ä‘Ã£ áº©n",
   "column.notifications": "ThÃ´ng bÃ¡o",
   "column.pins": "TÃºt ghim",
-  "column.public": "Máº¡ng liÃªn káº¿t",
+  "column.public": "Máº¡ng liÃªn há»£p",
   "column_back_button.label": "Quay láº¡i",
-  "column_header.hide_settings": "áº¨n cÃ i Ä‘áº·t",
+  "column_header.hide_settings": "áº¨n bá»™ lá»c",
   "column_header.moveLeft_settings": "Dá»i cá»™t sang bÃªn trÃ¡i",
   "column_header.moveRight_settings": "Dá»i cá»™t sang bÃªn pháº£i",
   "column_header.pin": "Ghim",
-  "column_header.show_settings": "Hiá»ƒn thá»‹ cÃ i Ä‘áº·t",
+  "column_header.show_settings": "Hiá»‡n bá»™ lá»c",
   "column_header.unpin": "KhÃ´ng ghim",
   "column_subheading.settings": "CÃ i Ä‘áº·t",
   "community.column_settings.local_only": "Chá»‰ mÃ¡y chá»§ cá»§a báº¡n",
@@ -96,11 +98,11 @@
   "compose_form.poll.switch_to_single": "Chá»‰ cho phÃ©p chá»n duy nháº¥t má»™t lá»±a chá»n",
   "compose_form.publish": "TÃºt",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Ná»™i dung nháº¡y cáº£m",
-  "compose_form.sensitive.marked": "Ná»™i dung Ä‘Ã£ Ä‘Ã¡nh dáº¥u nháº¡y cáº£m",
-  "compose_form.sensitive.unmarked": "Ná»™i dung khÃ´ng Ä‘Ã¡nh dáº¥u nháº¡y cáº£m",
-  "compose_form.spoiler.marked": "VÄƒn báº£n bá»‹ áº©n",
-  "compose_form.spoiler.unmarked": "VÄƒn báº£n khÃ´ng áº©n sau spoil",
+  "compose_form.sensitive.hide": "{count, plural, one {Ná»™i dung lÃ  nháº¡y cáº£m} other {Ná»™i dung lÃ  nháº¡y cáº£m}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Ná»™i dung Ä‘Ã£ Ä‘Ã¡nh dáº¥u lÃ  nháº¡y cáº£m} other {Ná»™i dung Ä‘Ã£ Ä‘Ã¡nh dáº¥u lÃ  nháº¡y cáº£m}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Ná»™i dung nÃ y bÃ¬nh thÆ°á»ng} other {Ná»™i dung nÃ y bÃ¬nh thÆ°á»ng}}",
+  "compose_form.spoiler.marked": "Há»§y ná»™i dung áº©n",
+  "compose_form.spoiler.unmarked": "Táº¡o ná»™i dung áº©n",
   "compose_form.spoiler_placeholder": "Viáº¿t ná»™i dung áº©n cá»§a báº¡n á»Ÿ Ä‘Ã¢y",
   "confirmation_modal.cancel": "Há»§y bá»",
   "confirmations.block.block_and_report": "Cháº·n & BÃ¡o cÃ¡o",
@@ -115,58 +117,61 @@
   "confirmations.logout.confirm": "ÄÄƒng xuáº¥t",
   "confirmations.logout.message": "Báº¡n cÃ³ tháºt sá»± muá»‘n thoÃ¡t?",
   "confirmations.mute.confirm": "áº¨n",
-  "confirmations.mute.explanation": "Äiá»u nÃ y sáº½ khiáº¿n tÃºt cá»§a ngÆ°á»i Ä‘Ã³ vÃ  nhá»¯ng tÃºt cÃ³ Ä‘á» cáºp Ä‘áº¿n há» bá»‹ áº©n, tuy nhiÃªn váº«n cho phÃ©p há» xem bÃ i Ä‘Äƒng cá»§a báº¡n vÃ  theo dÃµi báº¡n.",
+  "confirmations.mute.explanation": "Äiá»u nÃ y sáº½ khiáº¿n tÃºt cá»§a há» vÃ  nhá»¯ng tÃºt cÃ³ nháº¯c Ä‘áº¿n há» bá»‹ áº©n, tuy nhiÃªn há» váº«n cÃ³ thá»ƒ xem tÃºt cá»§a báº¡n vÃ  theo dÃµi báº¡n.",
   "confirmations.mute.message": "Báº¡n cÃ³ cháº¯c cháº¯n muá»‘n áº©n {name}?",
   "confirmations.redraft.confirm": "XÃ³a & viáº¿t láº¡i",
-  "confirmations.redraft.message": "Báº¡n cÃ³ cháº¯c cháº¯n muá»‘n xÃ³a tÃºt vÃ  viáº¿t láº¡i? Äiá»u nÃ y sáº½ xÃ³a máº¥t nhá»¯ng lÆ°á»£t tÃ¢m Ä‘áº¯c vÃ  chia sáº» cá»§a tÃºt, cÅ©ng nhÆ° nhá»¯ng tráº£ lá»i sáº½ khÃ´ng cÃ²n ná»™i dung gá»‘c.",
+  "confirmations.redraft.message": "Báº¡n cÃ³ cháº¯c cháº¯n muá»‘n xÃ³a tÃºt vÃ  viáº¿t láº¡i? Äiá»u nÃ y sáº½ xÃ³a máº¥t nhá»¯ng lÆ°á»£t thÃch vÃ  chia sáº» cá»§a tÃºt, cÅ©ng nhÆ° nhá»¯ng tráº£ lá»i sáº½ khÃ´ng cÃ²n ná»™i dung gá»‘c.",
   "confirmations.reply.confirm": "Tráº£ lá»i",
   "confirmations.reply.message": "Ná»™i dung báº¡n Ä‘ang soáº¡n tháº£o sáº½ bá»‹ ghi Ä‘Ã¨, báº¡n cÃ³ tiáº¿p tá»¥c?",
   "confirmations.unfollow.confirm": "NgÆ°ng theo dÃµi",
   "confirmations.unfollow.message": "Báº¡n cÃ³ cháº¯c cháº¯n muá»‘n ngÆ°ng theo dÃµi {name}?",
   "conversation.delete": "XÃ³a tin nháº¯n nÃ y",
   "conversation.mark_as_read": "ÄÃ¡nh dáº¥u lÃ  Ä‘Ã£ Ä‘á»c",
-  "conversation.open": "Xem tin nháº¯n",
+  "conversation.open": "Xem toÃ n bá»™ tin nháº¯n",
   "conversation.with": "Vá»›i {names}",
-  "directory.federated": "Tá»« máº¡ng liÃªn káº¿t",
-  "directory.local": "Chá»‰ tá»« {domain}",
-  "directory.new_arrivals": "Gia nháºp gáº§n Ä‘Ã¢y",
+  "directory.federated": "Tá»« máº¡ng liÃªn há»£p",
+  "directory.local": "Tá»« {domain}",
+  "directory.new_arrivals": "Má»›i tham gia",
   "directory.recently_active": "Hoáº¡t Ä‘á»™ng gáº§n Ä‘Ã¢y",
   "embed.instructions": "Sao chÃ©p Ä‘oáº¡n mÃ£ dÆ°á»›i Ä‘Ã¢y vÃ  chÃ¨n vÃ o trang web cá»§a báº¡n.",
   "embed.preview": "NÃ³ sáº½ hiá»ƒn thá»‹ nhÆ° váº§y:",
   "emoji_button.activity": "Hoáº¡t Ä‘á»™ng",
-  "emoji_button.custom": "RiÃªng",
+  "emoji_button.custom": "Äá»™c Ä‘Ã¡o",
   "emoji_button.flags": "Cá»",
   "emoji_button.food": "Ä‚n uá»‘ng",
   "emoji_button.label": "ChÃ¨n emoji",
   "emoji_button.nature": "ThiÃªn nhiÃªn",
   "emoji_button.not_found": "KhÃ´ng tÃ¬m tháº¥y emoji! (Â°â–¡Â°)",
   "emoji_button.objects": "Äá»“ váºt",
-  "emoji_button.people": "NgÆ°á»i",
+  "emoji_button.people": "Máº·t cÆ°á»i",
   "emoji_button.recent": "ThÆ°á»ng dÃ¹ng",
   "emoji_button.search": "TÃ¬m kiáº¿m...",
   "emoji_button.search_results": "Káº¿t quáº£ tÃ¬m kiáº¿m",
   "emoji_button.symbols": "Biá»ƒu tÆ°á»£ng",
   "emoji_button.travel": "Du lá»‹ch",
+  "empty_column.account_suspended": "TÃ i khoáº£n vÃ´ hiá»‡u hÃ³a",
   "empty_column.account_timeline": "ChÆ°a cÃ³ tÃºt nÃ o!",
-  "empty_column.account_unavailable": "TÃ i khoáº£n khÃ´ng cÃ²n ná»¯a",
+  "empty_column.account_unavailable": "TÃ i khoáº£n bá»‹ Ä‘Ã¬nh chá»‰",
   "empty_column.blocks": "Báº¡n chÆ°a cháº·n báº¥t cá»© ai.",
   "empty_column.bookmarked_statuses": "Báº¡n chÆ°a lÆ°u tÃºt nÃ o. Náº¿u cÃ³, nÃ³ sáº½ hiá»ƒn thá»‹ á»Ÿ Ä‘Ã¢y.",
   "empty_column.community": "MÃ¡y chá»§ cá»§a báº¡n chÆ°a cÃ³ tÃºt nÃ o cÃ´ng khai. Báº¡n hÃ£y thá» viáº¿t gÃ¬ Ä‘Ã³ Ä‘i!",
   "empty_column.direct": "Báº¡n chÆ°a cÃ³ tin nháº¯n nÃ o. Khi báº¡n gá»i hoáº·c nháºn tin nháº¯n, nÃ³ sáº½ hiá»ƒn thá»‹ á»Ÿ Ä‘Ã¢y.",
   "empty_column.domain_blocks": "ChÆ°a áº©n báº¥t ká»³ mÃ¡y chá»§ nÃ o.",
-  "empty_column.favourited_statuses": "Báº¡n chÆ°a tÃ¢m Ä‘áº¯c tÃºt nÃ o. HÃ£y thá» Ä‘i, nÃ³ sáº½ xuáº¥t hiá»‡n á»Ÿ Ä‘Ã¢y.",
-  "empty_column.favourites": "ChÆ°a cÃ³ ai tÃ¢m Ä‘áº¯c tÃºt nÃ y.",
+  "empty_column.favourited_statuses": "Báº¡n chÆ°a thÃch tÃºt nÃ o. HÃ£y thá» Ä‘i, nÃ³ sáº½ xuáº¥t hiá»‡n á»Ÿ Ä‘Ã¢y.",
+  "empty_column.favourites": "ChÆ°a cÃ³ ai thÃch tÃºt nÃ y.",
   "empty_column.follow_requests": "Báº¡n chÆ°a cÃ³ yÃªu cáº§u theo dÃµi nÃ o.",
-  "empty_column.hashtag": "ChÆ°a cÃ³ bÃ i Ä‘Äƒng nÃ o sá» dá»¥ng hashtag nÃ y.",
+  "empty_column.hashtag": "ChÆ°a cÃ³ bÃ i Ä‘Äƒng nÃ o dÃ¹ng hashtag nÃ y.",
   "empty_column.home": "ChÆ°a cÃ³ báº¥t cá»© gÃ¬! HÃ£y báº¯t Ä‘áº§u báº±ng cÃ¡ch tÃ¬m kiáº¿m hoáº·c truy cáºp {public} Ä‘á»ƒ theo dÃµi nhá»¯ng ngÆ°á»i báº¡n quan tÃ¢m.",
   "empty_column.home.public_timeline": "tÃºt cÃ´ng khai",
-  "empty_column.list": "ChÆ°a cÃ³ gÃ¬ trong danh sÃ¡ch. Khi thÃ nh viÃªn cá»§a danh sÃ¡ch nÃ y Ä‘Äƒng tÃºt má»›i, chÃºng má»›i xuáº¥t hiá»‡n á»Ÿ Ä‘Ã¢y.",
-  "empty_column.lists": "Báº¡n khÃ´ng cÃ³ danh sÃ¡ch nÃ o.",
-  "empty_column.mutes": "Báº¡n chÆ°a áº©n ngÆ°á»i dÃ¹ng nÃ o.",
+  "empty_column.list": "ChÆ°a cÃ³ tÃºt. Khi nhá»¯ng ngÆ°á»i trong danh sÃ¡ch nÃ y Ä‘Äƒng tÃºt má»›i, chÃºng sáº½ xuáº¥t hiá»‡n á»Ÿ Ä‘Ã¢y.",
+  "empty_column.lists": "Báº¡n chÆ°a táº¡o danh sÃ¡ch nÃ o.",
+  "empty_column.mutes": "Báº¡n chÆ°a áº©n báº¥t ká»³ ai.",
   "empty_column.notifications": "Báº¡n chÆ°a cÃ³ thÃ´ng bÃ¡o nÃ o. HÃ£y thá» theo dÃµi hoáº·c nháº¯n tin cho má»™t ai Ä‘Ã³.",
-  "empty_column.public": "Trá»‘ng trÆ¡n! Báº¡n hÃ£y viáº¿t gÃ¬ Ä‘Ã³ hoáº·c báº¯t Ä‘áº§u theo dÃµi ngÆ°á»i dÃ¹ng khÃ¡c",
+  "empty_column.public": "Trá»‘ng trÆ¡n! Báº¡n hÃ£y viáº¿t gÃ¬ Ä‘Ã³ hoáº·c báº¯t Ä‘áº§u theo dÃµi nhá»¯ng ngÆ°á»i khÃ¡c",
   "error.unexpected_crash.explanation": "Trang nÃ y cÃ³ thá»ƒ khÃ´ng hiá»ƒn thá»‹ chÃnh xÃ¡c do lá»—i láºp trÃ¬nh Mastodon hoáº·c váº¥n Ä‘á» tÆ°Æ¡ng thÃch trÃ¬nh duyá»‡t.",
+  "error.unexpected_crash.explanation_addons": "Trang nÃ y khÃ´ng thá»ƒ hiá»ƒn thá»‹ do xung kháº¯c vá»›i add-on cá»§a trÃ¬nh duyá»‡t hoáº·c cÃ´ng cá»¥ tá»± Ä‘á»™ng dá»‹ch ngÃ´n ngá»¯.",
   "error.unexpected_crash.next_steps": "HÃ£y thá» lÃ m má»›i trang. Náº¿u váº«n khÃ´ng Ä‘Æ°á»£c, báº¡n hÃ£y vÃ o Mastodon báº±ng má»™t á»©ng dá»¥ng di Ä‘á»™ng hoáº·c trÃ¬nh duyá»‡t khÃ¡c.",
+  "error.unexpected_crash.next_steps_addons": "HÃ£y táº¯t add-on vÃ  lÃ m tÆ°Æ¡i trang. Náº¿u váº«n khÃ´ng Ä‘Æ°á»£c, báº¡n nÃªn thá» Ä‘Äƒng nháºp Mastodon trÃªn trÃ¬nh duyá»‡t khÃ¡c hoáº·c app khÃ¡c.",
   "errors.unexpected_crash.copy_stacktrace": "Sao chÃ©p stacktrace vÃ o clipboard",
   "errors.unexpected_crash.report_issue": "BÃ¡o cÃ¡o lá»—i",
   "follow_request.authorize": "Cho phÃ©p",
@@ -174,9 +179,9 @@
   "follow_requests.unlocked_explanation": "Máº·c dÃ¹ tÃ i khoáº£n cá»§a báº¡n Ä‘ang á»Ÿ cháº¿ Ä‘á»™ cÃ´ng khai, quáº£n trá»‹ viÃªn cá»§a {domain} váº«n tin ráº±ng báº¡n sáº½ muá»‘n xem láº¡i yÃªu cáº§u theo dÃµi tá»« nhá»¯ng ngÆ°á»i khÃ¡c.",
   "generic.saved": "ÄÃ£ lÆ°u",
   "getting_started.developers": "NhÃ  phÃ¡t triá»ƒn",
-  "getting_started.directory": "Danh sÃ¡ch ngÆ°á»i dÃ¹ng",
+  "getting_started.directory": "Máº¡ng lÆ°á»›i",
   "getting_started.documentation": "TÃ i liá»‡u",
-  "getting_started.heading": "DÃ nh cho ngÆ°á»i má»›i",
+  "getting_started.heading": "Quáº£n lÃ½",
   "getting_started.invite": "Má»i báº¡n bÃ¨",
   "getting_started.open_source_notice": "Mastodon lÃ  pháº§n má»m mÃ£ nguá»“n má»Ÿ. Báº¡n cÃ³ thá»ƒ Ä‘Ã³ng gÃ³p hoáº·c bÃ¡o lá»—i trÃªn GitHub táº¡i {github}.",
   "getting_started.security": "Báº£o máºt",
@@ -190,24 +195,24 @@
   "hashtag.column_settings.tag_mode.any": "Má»™t pháº§n",
   "hashtag.column_settings.tag_mode.none": "KhÃ´ng chá»n",
   "hashtag.column_settings.tag_toggle": "Bao gá»“m thÃªm hashtag cho cá»™t nÃ y",
-  "home.column_settings.basic": "CÆ¡ báº£n",
-  "home.column_settings.show_reblogs": "Hiá»‡n tÃºt chia sáº»",
-  "home.column_settings.show_replies": "Hiá»‡n tráº£ lá»i",
+  "home.column_settings.basic": "TÃ¹y chá»‰nh",
+  "home.column_settings.show_reblogs": "Hiá»‡n nhá»¯ng lÆ°á»£t chia sáº»",
+  "home.column_settings.show_replies": "Hiá»‡n nhá»¯ng tÃºt dáº¡ng tráº£ lá»i",
   "home.hide_announcements": "áº¨n thÃ´ng bÃ¡o",
   "home.show_announcements": "Hiá»‡n thÃ´ng bÃ¡o",
-  "intervals.full.days": "{number} days",
-  "intervals.full.hours": "{number} hours",
-  "intervals.full.minutes": "{number} minutes",
+  "intervals.full.days": "{number, plural, other {# ngÃ y}}",
+  "intervals.full.hours": "{number, plural, other {# giá»}}",
+  "intervals.full.minutes": "{number, plural, other {# phÃºt}}",
   "introduction.federation.action": "Tiáº¿p theo",
-  "introduction.federation.federated.headline": "Máº¡ng liÃªn káº¿t",
-  "introduction.federation.federated.text": "Náº¿u mÃ¡y chá»§ cá»§a báº¡n cÃ³ liÃªn káº¿t vá»›i cÃ¡c mÃ¡y chá»§ khÃ¡c, bÃ i Ä‘Äƒng cÃ´ng khai tá»« há» sáº½ xuáº¥t hiá»‡n á»Ÿ Máº¡ng liÃªn káº¿t.",
+  "introduction.federation.federated.headline": "Máº¡ng liÃªn há»£p",
+  "introduction.federation.federated.text": "Náº¿u mÃ¡y chá»§ cá»§a báº¡n cÃ³ liÃªn káº¿t vá»›i cÃ¡c mÃ¡y chá»§ khÃ¡c, bÃ i Ä‘Äƒng cÃ´ng khai tá»« há» sáº½ xuáº¥t hiá»‡n á»Ÿ Tháº¿ giá»›i.",
   "introduction.federation.home.headline": "Báº£ng tin",
   "introduction.federation.home.text": "Báº£ng tin lÃ  nÆ¡i hiá»ƒn thá»‹ bÃ i Ä‘Äƒng tá»« nhá»¯ng ngÆ°á»i báº¡n theo dÃµi. Báº¡n cÃ³ thá»ƒ theo dÃµi báº¥t cá»© ai trÃªn báº¥t cá»© mÃ¡y chá»§ nÃ o!",
-  "introduction.federation.local.headline": "MÃ¡y chá»§ cá»§a báº¡n",
-  "introduction.federation.local.text": "MÃ¡y chá»§ cá»§a báº¡n lÃ  nÆ¡i hiá»ƒn thá»‹ bÃ i Ä‘Äƒng cÃ´ng khai tá»« nhá»¯ng ngÆ°á»i thuá»™c cÃ¹ng má»™t mÃ¡y chá»§ cá»§a báº¡n.",
+  "introduction.federation.local.headline": "Cá»™ng Ä‘á»“ng",
+  "introduction.federation.local.text": "Cá»™ng Ä‘á»“ng lÃ  nÆ¡i hiá»ƒn thá»‹ bÃ i Ä‘Äƒng cÃ´ng khai tá»« nhá»¯ng ngÆ°á»i thuá»™c cÃ¹ng má»™t mÃ¡y chá»§ cá»§a báº¡n.",
   "introduction.interactions.action": "TÃ´i Ä‘Ã£ hiá»ƒu rá»“i!",
-  "introduction.interactions.favourite.headline": "TÃ¢m Ä‘áº¯c",
-  "introduction.interactions.favourite.text": "TÃ¢m Ä‘áº¯c má»™t tÃºt cÃ³ nghÄ©a lÃ  báº¡n thÃch tÃºt Ä‘Ã³ vÃ  lÆ°u giá»¯ Ä‘á»ƒ sau nÃ y xem láº¡i.",
+  "introduction.interactions.favourite.headline": "ThÃch",
+  "introduction.interactions.favourite.text": "ThÃch má»™t tÃºt cÃ³ nghÄ©a lÃ  báº¡n tÃ¢m Ä‘áº¯c ná»™i dung cá»§a tÃºt vÃ  muá»‘n lÆ°u giá»¯ Ä‘á»ƒ sau nÃ y xem láº¡i.",
   "introduction.interactions.reblog.headline": "Chia sáº»",
   "introduction.interactions.reblog.text": "Vá»›i tÃnh nÄƒng chia sáº», báº¡n cÃ³ thá»ƒ chia sáº» tÃºt cá»§a ngÆ°á»i khÃ¡c cho nhá»¯ng ngÆ°á»i theo dÃµi báº¡n.",
   "introduction.interactions.reply.headline": "Tráº£ lá»i",
@@ -216,7 +221,7 @@
   "introduction.welcome.headline": "HÆ°á»›ng dáº«n ngÆ°á»i má»›i",
   "introduction.welcome.text": "ChÃ o má»«ng báº¡n Ä‘áº¿n máº¡ng xÃ£ há»™i liÃªn há»£p! Táº¡i Ä‘Ã¢y báº¡n cÃ³ thá»ƒ Ä‘Äƒng táº£i ná»™i dung vÃ  trao Ä‘á»•i vá»›i báº¡n bÃ¨ cá»§a mÃ¬nh trÃªn cÃ¡c mÃ¡y chá»§ khÃ¡c nhau. MÃ¡y chá»§ {domain} lÃ  nÆ¡i lÆ°u trá»¯ trang cÃ¡ nhÃ¢n cá»§a báº¡n.",
   "keyboard_shortcuts.back": "trá»Ÿ láº¡i",
-  "keyboard_shortcuts.blocked": "má»Ÿ danh sÃ¡ch ngÆ°á»i dÃ¹ng Ä‘Ã£ cháº·n",
+  "keyboard_shortcuts.blocked": "má»Ÿ danh sÃ¡ch ngÆ°á»i Ä‘Ã£ cháº·n",
   "keyboard_shortcuts.boost": "chia sáº»",
   "keyboard_shortcuts.column": "má»Ÿ cÃ¡c má»¥c",
   "keyboard_shortcuts.compose": "má»Ÿ khung soáº¡n tÃºt",
@@ -224,16 +229,16 @@
   "keyboard_shortcuts.direct": "má»Ÿ má»¥c tin nháº¯n",
   "keyboard_shortcuts.down": "di chuyá»ƒn xuá»‘ng dÆ°á»›i danh sÃ¡ch",
   "keyboard_shortcuts.enter": "viáº¿t tÃºt má»›i",
-  "keyboard_shortcuts.favourite": "tÃ¢m Ä‘áº¯c",
-  "keyboard_shortcuts.favourites": "má»Ÿ danh sÃ¡ch tÃ¢m Ä‘áº¯c",
-  "keyboard_shortcuts.federated": "má»Ÿ máº¡ng liÃªn káº¿t",
+  "keyboard_shortcuts.favourite": "thÃch",
+  "keyboard_shortcuts.favourites": "má»Ÿ lÆ°á»£t thÃch",
+  "keyboard_shortcuts.federated": "má»Ÿ máº¡ng liÃªn há»£p",
   "keyboard_shortcuts.heading": "CÃ¡c phÃm táº¯t",
   "keyboard_shortcuts.home": "má»Ÿ báº£ng tin",
   "keyboard_shortcuts.hotkey": "PhÃm táº¯t",
   "keyboard_shortcuts.legend": "hiá»‡n báº£ng hÆ°á»›ng dáº«n nÃ y",
   "keyboard_shortcuts.local": "má»Ÿ mÃ¡y chá»§ cá»§a báº¡n",
-  "keyboard_shortcuts.mention": "nháº¯c Ä‘áº¿n ngÆ°á»i dÃ¹ng",
-  "keyboard_shortcuts.muted": "má»Ÿ danh sÃ¡ch ngÆ°á»i dÃ¹ng Ä‘Ã£ áº©n",
+  "keyboard_shortcuts.mention": "nháº¯c Ä‘áº¿n ai Ä‘Ã³",
+  "keyboard_shortcuts.muted": "má»Ÿ danh sÃ¡ch ngÆ°á»i Ä‘Ã£ áº©n",
   "keyboard_shortcuts.my_profile": "má»Ÿ trang cÃ¡ nhÃ¢n cá»§a báº¡n",
   "keyboard_shortcuts.notifications": "má»Ÿ má»¥c thÃ´ng bÃ¡o",
   "keyboard_shortcuts.open_media": "má»Ÿ áº£nh hoáº·c video",
@@ -242,7 +247,7 @@
   "keyboard_shortcuts.reply": "tráº£ lá»i",
   "keyboard_shortcuts.requests": "má»Ÿ danh sÃ¡ch yÃªu cáº§u theo dÃµi",
   "keyboard_shortcuts.search": "má»Ÿ tÃ¬m kiáº¿m",
-  "keyboard_shortcuts.spoilers": "Hiá»‡n/áº©n ná»™i dung nháº¡y cáº£m",
+  "keyboard_shortcuts.spoilers": "hiá»‡n/áº©n ná»™i dung nháº¡y cáº£m",
   "keyboard_shortcuts.start": "má»Ÿ má»¥c \"DÃ nh cho ngÆ°á»i má»›i\"",
   "keyboard_shortcuts.toggle_hidden": "áº©n/hiá»‡n vÄƒn báº£n bÃªn dÆ°á»›i spoil",
   "keyboard_shortcuts.toggle_sensitivity": "áº©n/hiá»‡n áº£nh hoáº·c video",
@@ -250,34 +255,41 @@
   "keyboard_shortcuts.unfocus": "Ä‘Æ°a con trá» ra khá»i Ã´ soáº¡n tháº£o hoáº·c Ã´ tÃ¬m kiáº¿m",
   "keyboard_shortcuts.up": "di chuyá»ƒn lÃªn trÃªn danh sÃ¡ch",
   "lightbox.close": "ÄÃ³ng",
+  "lightbox.compress": "Thu nhá» hÃ¬nh",
+  "lightbox.expand": "PhÃ³ng to hÃ¬nh",
   "lightbox.next": "Tiáº¿p",
   "lightbox.previous": "TrÆ°á»›c",
-  "lightbox.view_context": "Xem ná»™i dung",
   "lists.account.add": "ThÃªm vÃ o danh sÃ¡ch",
   "lists.account.remove": "XÃ³a khá»i danh sÃ¡ch",
   "lists.delete": "XÃ³a danh sÃ¡ch",
   "lists.edit": "Sá»a danh sÃ¡ch",
   "lists.edit.submit": "Thay Ä‘á»•i tiÃªu Ä‘á»",
-  "lists.new.create": "ThÃªm vÃ o danh sÃ¡ch",
+  "lists.new.create": "Táº¡o danh sÃ¡ch má»›i",
   "lists.new.title_placeholder": "TÃªn danh sÃ¡ch má»›i",
+  "lists.replies_policy.followed": "NgÆ°á»i theo dÃµi",
+  "lists.replies_policy.list": "NgÆ°á»i trong danh sÃ¡ch",
+  "lists.replies_policy.none": "KhÃ´ng ai",
+  "lists.replies_policy.title": "Cho phÃ©p bÃ¬nh luáºn vá»›i:",
   "lists.search": "TÃ¬m kiáº¿m nhá»¯ng ngÆ°á»i mÃ  báº¡n quan tÃ¢m",
   "lists.subheading": "Danh sÃ¡ch cá»§a báº¡n",
-  "load_pending": "{count, plural, one {# new item} other {# new items}}",
+  "load_pending": "{count, plural, one {# tÃºt má»›i} other {# tÃºt má»›i}}",
   "loading_indicator.label": "Äang táº£i...",
-  "media_gallery.toggle_visible": "áº¨n {number, plural, one {image} other {images}}",
+  "media_gallery.toggle_visible": "áº¨n {number, plural, one {hÃ¬nh áº£nh} other {hÃ¬nh áº£nh}}",
   "missing_indicator.label": "KhÃ´ng tÃ¬m tháº¥y",
-  "missing_indicator.sublabel": "KhÃ´ng tÃ¬m tháº¥y cÃ¡i nÃ y",
-  "mute_modal.hide_notifications": "áº¨n thÃ´ng bÃ¡o tá»« ngÆ°á»i dÃ¹ng nÃ y?",
+  "missing_indicator.sublabel": "Ná»™i dung nÃ y khÃ´ng cÃ²n tá»“n táº¡i",
+  "mute_modal.duration": "Thá»i háº¡n",
+  "mute_modal.hide_notifications": "áº¨n thÃ´ng bÃ¡o tá»« ngÆ°á»i nÃ y?",
+  "mute_modal.indefinite": "VÄ©nh viá»…n",
   "navigation_bar.apps": "Apps",
-  "navigation_bar.blocks": "NgÆ°á»i dÃ¹ng Ä‘Ã£ cháº·n",
+  "navigation_bar.blocks": "NgÆ°á»i Ä‘Ã£ cháº·n",
   "navigation_bar.bookmarks": "ÄÃ£ lÆ°u",
-  "navigation_bar.community_timeline": "MÃ¡y chá»§ cá»§a báº¡n",
-  "navigation_bar.compose": "Soáº¡n tÃºt má»›i",
+  "navigation_bar.community_timeline": "Cá»™ng Ä‘á»“ng",
+  "navigation_bar.compose": "Viáº¿t tÃºt má»›i",
   "navigation_bar.direct": "Tin nháº¯n",
-  "navigation_bar.discover": "Cá»™ng Ä‘á»“ng",
+  "navigation_bar.discover": "KhÃ¡m phÃ¡",
   "navigation_bar.domain_blocks": "MÃ¡y chá»§ Ä‘Ã£ áº©n",
-  "navigation_bar.edit_profile": "Chá»‰nh sá»a trang cÃ¡ nhÃ¢n",
-  "navigation_bar.favourites": "Nhá»¯ng thá»© tÃ¢m Ä‘áº¯c",
+  "navigation_bar.edit_profile": "Trang cÃ¡ nhÃ¢n",
+  "navigation_bar.favourites": "LÆ°á»£t thÃch",
   "navigation_bar.filters": "Bá»™ lá»c tá»« ngá»¯",
   "navigation_bar.follow_requests": "YÃªu cáº§u theo dÃµi",
   "navigation_bar.follows_and_followers": "LÆ°á»£t theo dÃµi",
@@ -285,98 +297,110 @@
   "navigation_bar.keyboard_shortcuts": "PhÃm táº¯t",
   "navigation_bar.lists": "Danh sÃ¡ch",
   "navigation_bar.logout": "ÄÄƒng xuáº¥t",
-  "navigation_bar.mutes": "NgÆ°á»i dÃ¹ng Ä‘Ã£ cháº·n",
+  "navigation_bar.mutes": "NgÆ°á»i Ä‘Ã£ áº©n",
   "navigation_bar.personal": "CÃ¡ nhÃ¢n",
   "navigation_bar.pins": "TÃºt ghim",
-  "navigation_bar.preferences": "TÃ¹y chá»‰nh",
-  "navigation_bar.public_timeline": "DÃ²ng thá»i gian liÃªn káº¿t",
+  "navigation_bar.preferences": "CÃ i Ä‘áº·t",
+  "navigation_bar.public_timeline": "Tháº¿ giá»›i",
   "navigation_bar.security": "Báº£o máºt",
-  "notification.favourite": "{name} vá»«a tÃ¢m Ä‘áº¯c tÃºt cá»§a báº¡n",
-  "notification.follow": "{name} vá»«a theo dÃµi báº¡n",
-  "notification.follow_request": "{name} vá»«a yÃªu cáº§u theo dÃµi báº¡n",
+  "notification.favourite": "{name} thÃch tÃºt cá»§a báº¡n",
+  "notification.follow": "{name} theo dÃµi báº¡n",
+  "notification.follow_request": "{name} yÃªu cáº§u theo dÃµi báº¡n",
   "notification.mention": "{name} nháº¯c Ä‘áº¿n báº¡n",
-  "notification.own_poll": "Cuá»™c thÄƒm dÃ² cá»§a báº¡n Ä‘Ã£ káº¿t thÃºc",
-  "notification.poll": "Má»™t cuá»™c thÄƒm dÃ² mÃ  báº¡n tham gia Ä‘Ã£ káº¿t thÃºc",
+  "notification.own_poll": "Cuá»™c bÃ¬nh chá»n báº¡n táº¡o Ä‘Ã£ káº¿t thÃºc",
+  "notification.poll": "Cuá»™c bÃ¬nh chá»n cá»§a báº¡n Ä‘Ã£ káº¿t thÃºc",
   "notification.reblog": "{name} chia sáº» tÃºt cá»§a báº¡n",
-  "notifications.clear": "XÃ³a thÃ´ng bÃ¡o",
+  "notification.status": "{name} vá»«a Ä‘Äƒng",
+  "notifications.clear": "XÃ³a háº¿t thÃ´ng bÃ¡o",
   "notifications.clear_confirmation": "Báº¡n cÃ³ cháº¯c cháº¯n muá»‘n xÃ³a vÄ©nh viá»…n táº¥t cáº£ thÃ´ng bÃ¡o cá»§a mÃ¬nh?",
   "notifications.column_settings.alert": "ThÃ´ng bÃ¡o trÃªn mÃ¡y tÃnh",
-  "notifications.column_settings.favourite": "TÃ¢m Ä‘áº¯c:",
-  "notifications.column_settings.filter_bar.advanced": "Hiá»ƒn thá»‹ toÃ n bá»™",
-  "notifications.column_settings.filter_bar.category": "Lá»c nhanh",
-  "notifications.column_settings.filter_bar.show": "Hiá»‡n",
+  "notifications.column_settings.favourite": "LÆ°á»£t thÃch:",
+  "notifications.column_settings.filter_bar.advanced": "ToÃ n bá»™",
+  "notifications.column_settings.filter_bar.category": "PhÃ¢n loáº¡i",
+  "notifications.column_settings.filter_bar.show": "LÆ°á»£t nháº¯c",
   "notifications.column_settings.follow": "NgÆ°á»i theo dÃµi má»›i:",
   "notifications.column_settings.follow_request": "YÃªu cáº§u theo dÃµi má»›i:",
-  "notifications.column_settings.mention": "Nháº¯c Ä‘áº¿n:",
-  "notifications.column_settings.poll": "Káº¿t quáº£ cuá»™c thÄƒm dÃ²:",
+  "notifications.column_settings.mention": "LÆ°á»£t nháº¯c Ä‘áº¿n:",
+  "notifications.column_settings.poll": "Káº¿t quáº£:",
   "notifications.column_settings.push": "ThÃ´ng bÃ¡o Ä‘áº©y",
-  "notifications.column_settings.reblog": "Chia sáº»:",
-  "notifications.column_settings.show": "Hiá»‡n trong cá»™t",
-  "notifications.column_settings.sound": "Má»Ÿ tiáº¿ng",
+  "notifications.column_settings.reblog": "LÆ°á»£t chia sáº» má»›i:",
+  "notifications.column_settings.show": "ThÃ´ng bÃ¡o trÃªn thanh menu",
+  "notifications.column_settings.sound": "KÃ¨m theo tiáº¿ng \"bÃp\"",
+  "notifications.column_settings.status": "TÃºt má»›i:",
   "notifications.filter.all": "ToÃ n bá»™",
   "notifications.filter.boosts": "Chia sáº»",
-  "notifications.filter.favourites": "TÃ¢m Ä‘áº¯c",
+  "notifications.filter.favourites": "ThÃch",
   "notifications.filter.follows": "Äang theo dÃµi",
-  "notifications.filter.mentions": "Nháº¯c Ä‘áº¿n",
-  "notifications.filter.polls": "Káº¿t quáº£ cuá»™c thÄƒm dÃ²",
+  "notifications.filter.mentions": "LÆ°á»£t nháº¯c Ä‘áº¿n",
+  "notifications.filter.polls": "Káº¿t quáº£ bÃ¬nh chá»n",
+  "notifications.filter.statuses": "Cáºp nháºt tá»« nhá»¯ng ngÆ°á»i báº¡n theo dÃµi",
+  "notifications.grant_permission": "Cho phÃ©p.",
   "notifications.group": "{count} thÃ´ng bÃ¡o",
-  "poll.closed": "Cuá»™c thÄƒm dÃ² Ä‘Ã£ káº¿t thÃºc",
+  "notifications.mark_as_read": "ÄÃ¡nh dáº¥u táº¥t cáº£ thÃ´ng bÃ¡o lÃ  Ä‘Ã£ Ä‘á»c",
+  "notifications.permission_denied": "TrÃ¬nh duyá»‡t khÃ´ng cho phÃ©p hiá»ƒn thá»‹ thÃ´ng bÃ¡o trÃªn mÃ n hÃ¬nh.",
+  "notifications.permission_denied_alert": "KhÃ´ng thá»ƒ báºt thÃ´ng bÃ¡o trÃªn mÃ n hÃ¬nh bá»Ÿi vÃ¬ trÃ¬nh duyá»‡t Ä‘Ã£ cáº¥m trÆ°á»›c Ä‘Ã³",
+  "notifications.permission_required": "KhÃ´ng hiá»‡n thÃ´ng bÃ¡o trÃªn mÃ n hÃ¬nh bá»Ÿi vÃ¬ chÆ°a cho phÃ©p.",
+  "notifications_permission_banner.enable": "Cho phÃ©p thÃ´ng bÃ¡o trÃªn mÃ n hÃ¬nh",
+  "notifications_permission_banner.how_to_control": "HÃ£y báºt thÃ´ng bÃ¡o trÃªn mÃ n hÃ¬nh Ä‘á»ƒ khÃ´ng bá» lá»¡ nhá»¯ng thÃ´ng bÃ¡o tá»« Mastodon. Má»™t khi Ä‘Ã£ báºt, báº¡n cÃ³ thá»ƒ lá»±a chá»n tá»«ng loáº¡i thÃ´ng bÃ¡o khÃ¡c nhau thÃ´ng qua {icon} nÃºt bÃªn dÆ°á»›i.",
+  "notifications_permission_banner.title": "KhÃ´ng bá» lá»¡ Ä‘iá»u thÃº vá»‹ nÃ o",
+  "picture_in_picture.restore": "Hiá»ƒn thá»‹ bÃ¬nh thÆ°á»ng",
+  "poll.closed": "Káº¿t thÃºc",
   "poll.refresh": "LÃ m má»›i",
-  "poll.total_people": "{count, plural, one {# ngÆ°á»i Ä‘Ã£ bÃ¬nh chá»n} other {# ngÆ°á»i Ä‘Ã£ bÃ¬nh chá»n}}",
-  "poll.total_votes": "{count, plural, one {# bÃ¬nh chá»n} other {# bÃ¬nh chá»n}}",
-  "poll.vote": "Cuá»™c thÄƒm dÃ²",
-  "poll.voted": "Báº¡n Ä‘Ã£ bÃ¬nh chá»n cÃ¢u tráº£ lá»i nÃ y",
-  "poll_button.add_poll": "Táº¡o thÄƒm dÃ²",
-  "poll_button.remove_poll": "Há»§y thÄƒm dÃ²",
+  "poll.total_people": "{count, plural, one {# ngÆ°á»i} other {# ngÆ°á»i}}",
+  "poll.total_votes": "{count, plural, one {# ngÆ°á»i} other {# ngÆ°á»i}}",
+  "poll.vote": "BÃ¬nh chá»n",
+  "poll.voted": "Báº¡n Ä‘Ã£ bÃ¬nh chá»n rá»“i",
+  "poll_button.add_poll": "Táº¡o bÃ¬nh chá»n",
+  "poll_button.remove_poll": "Há»§y cuá»™c bÃ¬nh chá»n",
   "privacy.change": "Thay Ä‘á»•i quyá»n riÃªng tÆ°",
   "privacy.direct.long": "Chá»‰ ngÆ°á»i Ä‘Æ°á»£c nháº¯c Ä‘áº¿n má»›i tháº¥y",
   "privacy.direct.short": "Tin nháº¯n",
   "privacy.private.long": "Chá»‰ dÃ nh cho ngÆ°á»i theo dÃµi",
-  "privacy.private.short": "Chá»‰ ngÆ°á»i theo dÃµi",
+  "privacy.private.short": "NgÆ°á»i theo dÃµi",
   "privacy.public.long": "Hiá»‡n trÃªn báº£ng tin mÃ¡y chá»§",
   "privacy.public.short": "CÃ´ng khai",
-  "privacy.unlisted.long": "Ai cÅ©ng cÃ³ thá»ƒ xem nhÆ°ng khÃ´ng hiá»‡n trÃªn báº£ng tin mÃ¡y chá»§",
-  "privacy.unlisted.short": "Má»Ÿ",
+  "privacy.unlisted.long": "KhÃ´ng hiá»‡n trÃªn báº£ng tin mÃ¡y chá»§",
+  "privacy.unlisted.short": "RiÃªng tÆ°",
   "refresh": "LÃ m má»›i",
   "regeneration_indicator.label": "Äang táº£iâ€¦",
   "regeneration_indicator.sublabel": "Báº£ng tin cá»§a báº¡n Ä‘ang Ä‘Æ°á»£c cáºp nháºt!",
   "relative_time.days": "{number} ngÃ y",
-  "relative_time.hours": "{number} giá»",
-  "relative_time.just_now": "vá»«a xong",
-  "relative_time.minutes": "{number}p",
+  "relative_time.hours": "{number}h",
+  "relative_time.just_now": "má»›i",
+  "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hÃ´m nay",
   "reply_indicator.cancel": "Há»§y bá»",
   "report.forward": "Chuyá»ƒn Ä‘áº¿n {target}",
-  "report.forward_hint": "NgÆ°á»i dÃ¹ng nÃ y á»Ÿ mÃ¡y chá»§ khÃ¡c. Gá»i má»™t bÃ¡o xáº¥u áº©n danh tá»›i mÃ¡y chá»§ Ä‘Ã³?",
-  "report.hint": "HÃ£y cho quáº£n trá»‹ viÃªn biáº¿t lÃ½ do táº¡i sao báº¡n láº¡i bÃ¡o xáº¥u tÃ i khoáº£n nÃ y:",
+  "report.forward_hint": "NgÆ°á»i nÃ y thuá»™c mÃ¡y chá»§ khÃ¡c. Gá»i má»™t bÃ¡o cÃ¡o áº©n danh tá»›i mÃ¡y chá»§ Ä‘Ã³?",
+  "report.hint": "HÃ£y cho quáº£n trá»‹ viÃªn biáº¿t lÃ½ do vÃ¬ sao báº¡n bÃ¡o cÃ¡o ngÆ°á»i nÃ y:",
   "report.placeholder": "Bá»• sung thÃªm",
   "report.submit": "Gá»i Ä‘i",
-  "report.target": "BÃ¡o xáº¥u {target}",
+  "report.target": "BÃ¡o cÃ¡o {target}",
   "search.placeholder": "TÃ¬m kiáº¿m",
-  "search_popout.search_format": "TÃ¬m kiáº¿m nÃ¢ng cao",
-  "search_popout.tips.full_text": "Ná»™i dung tráº£ vá» bao gá»“m cÃ¡c tÃºt do báº¡n viáº¿t, yÃªu thÃch, Ä‘Ã£ chia sáº» hoáº·c Ä‘Æ°á»£c nháº¯c Ä‘áº¿n. CÅ©ng nhÆ° Ä‘á»‹a chá»‰ ngÆ°á»i dÃ¹ng, tÃªn hiá»ƒn thá»‹ láº«n hashtag.",
+  "search_popout.search_format": "Gá»£i Ã½",
+  "search_popout.tips.full_text": "Ná»™i dung tráº£ vá» bao gá»“m nhá»¯ng tÃºt mÃ  báº¡n Ä‘Ã£ viáº¿t, thÃch, chia sáº» hoáº·c nhá»¯ng tÃºt cÃ³ nháº¯c Ä‘áº¿n báº¡n. Báº¡n cÅ©ng cÃ³ thá»ƒ tÃ¬m Ä‘á»‹a chá»‰ ngÆ°á»i dÃ¹ng, tÃªn hiá»ƒn thá»‹ vÃ  hashtag.",
   "search_popout.tips.hashtag": "hashtag",
   "search_popout.tips.status": "tÃºt",
-  "search_popout.tips.text": "Ná»™i dung tráº£ vá» lÃ  Ä‘á»‹a chá»‰ ngÆ°á»i dÃ¹ng, tÃªn hiá»ƒn thá»‹ vÃ  hashtag",
+  "search_popout.tips.text": "Ná»™i dung tráº£ vá» lÃ  tÃªn ngÆ°á»i dÃ¹ng, tÃªn hiá»ƒn thá»‹ vÃ  hashtag",
   "search_popout.tips.user": "ngÆ°á»i dÃ¹ng",
   "search_results.accounts": "NgÆ°á»i dÃ¹ng",
   "search_results.hashtags": "Hashtags",
   "search_results.statuses": "TÃºt",
-  "search_results.statuses_fts_disabled": "MÃ¡y chá»§ cá»§a báº¡n khÃ´ng báºt chá»©c nÄƒng tÃ¬m kiáº¿m tÃºt.",
-  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "search_results.statuses_fts_disabled": "MÃ¡y chá»§ cá»§a báº¡n khÃ´ng báºt tÃnh nÄƒng tÃ¬m kiáº¿m tÃºt.",
+  "search_results.total": "{count, number} {count, plural, one {káº¿t quáº£} other {káº¿t quáº£}}",
   "status.admin_account": "Má»Ÿ giao diá»‡n quáº£n trá»‹ @{name}",
   "status.admin_status": "Má»Ÿ tÃºt nÃ y trong giao diá»‡n quáº£n trá»‹",
   "status.block": "Cháº·n @{name}",
   "status.bookmark": "LÆ°u",
   "status.cancel_reblog_private": "Há»§y chia sáº»",
   "status.cannot_reblog": "KhÃ´ng thá»ƒ chia sáº» tÃºt nÃ y",
-  "status.copy": "Sao chÃ©p URL tÃºt",
+  "status.copy": "Sao chÃ©p URL",
   "status.delete": "XÃ³a",
   "status.detailed_status": "Xem chi tiáº¿t thÃªm",
-  "status.direct": "Nháº¯n riÃªng @{name}",
+  "status.direct": "Nháº¯n tin @{name}",
   "status.embed": "NhÃºng",
-  "status.favourite": "TÃ¢m Ä‘áº¯c",
+  "status.favourite": "ThÃch",
   "status.filtered": "Bá»™ lá»c",
   "status.load_more": "Xem thÃªm",
   "status.media_hidden": "áº¢nh/video Ä‘Ã£ áº©n",
@@ -387,36 +411,36 @@
   "status.open": "Xem nguyÃªn vÄƒn",
   "status.pin": "Ghim lÃªn trang cÃ¡ nhÃ¢n",
   "status.pinned": "TÃºt Ä‘Ã£ ghim",
-  "status.read_more": "Äá»c thÃªm",
+  "status.read_more": "Äá»c tiáº¿p",
   "status.reblog": "Chia sáº»",
-  "status.reblog_private": "Chia sáº» vá»›i ngÆ°á»i viáº¿t tÃºt gá»‘c",
+  "status.reblog_private": "Chia sáº» vá»›i ngÆ°á»i cÃ³ thá»ƒ xem",
   "status.reblogged_by": "{name} chia sáº»",
   "status.reblogs.empty": "TÃºt nÃ y chÆ°a cÃ³ ai chia sáº». Náº¿u cÃ³, nÃ³ sáº½ hiá»ƒn thá»‹ á»Ÿ Ä‘Ã¢y.",
   "status.redraft": "XÃ³a vÃ  viáº¿t láº¡i",
   "status.remove_bookmark": "Há»§y lÆ°u",
   "status.reply": "Tráº£ lá»i",
   "status.replyAll": "Tráº£ lá»i táº¥t cáº£",
-  "status.report": "BÃ¡o xáº¥u @{name}",
-  "status.sensitive_warning": "Ná»™i dung nháº¡y cáº£m",
+  "status.report": "BÃ¡o cÃ¡o @{name}",
+  "status.sensitive_warning": "Nháº¡y cáº£m",
   "status.share": "Chia sáº»",
   "status.show_less": "Thu gá»n",
-  "status.show_less_all": "Thu gá»n táº¥t cáº£",
-  "status.show_more": "Má»Ÿ rá»™ng",
+  "status.show_less_all": "Thu gá»n toÃ n bá»™",
+  "status.show_more": "Xem thÃªm",
   "status.show_more_all": "Hiá»ƒn thá»‹ táº¥t cáº£",
-  "status.show_thread": "Hiá»‡n thÃªm",
-  "status.uncached_media_warning": "N/A",
+  "status.show_thread": "ToÃ n bá»™ chá»§ Ä‘á»",
+  "status.uncached_media_warning": "Uncached",
   "status.unmute_conversation": "Quan tÃ¢m",
   "status.unpin": "Bá» ghim trÃªn trang cÃ¡ nhÃ¢n",
   "suggestions.dismiss": "Táº¯t Ä‘á» xuáº¥t",
   "suggestions.header": "CÃ³ thá»ƒ báº¡n quan tÃ¢mâ€¦",
-  "tabs_bar.federated_timeline": "Máº¡ng liÃªn káº¿t",
+  "tabs_bar.federated_timeline": "Tháº¿ giá»›i",
   "tabs_bar.home": "Báº£ng tin",
-  "tabs_bar.local_timeline": "MÃ¡y chá»§ cá»§a báº¡n",
+  "tabs_bar.local_timeline": "Cá»™ng Ä‘á»“ng",
   "tabs_bar.notifications": "ThÃ´ng bÃ¡o",
   "tabs_bar.search": "TÃ¬m kiáº¿m",
-  "time_remaining.days": "Thá»i háº¡n cÃ²n {number, plural, other {# ngÃ y}}",
-  "time_remaining.hours": "Thá»i háº¡n cÃ²n {number, plural, other {# giá»}}",
-  "time_remaining.minutes": "Thá»i háº¡n cÃ²n {number, plural, other {# phÃºt}}",
+  "time_remaining.days": "Káº¿t thÃºc sau {number, plural, other {# ngÃ y}}",
+  "time_remaining.hours": "Káº¿t thÃºc sau {number, plural, other {# giá»}}",
+  "time_remaining.minutes": "Káº¿t thÃºc sau {number, plural, other {# phÃºt}}",
   "time_remaining.moments": "CÃ²n láº¡i",
   "time_remaining.seconds": "Chá»‰ cÃ²n {number, plural, other {# giÃ¢y}}",
   "timeline_hint.remote_resource_not_displayed": "{resource} tá»« mÃ¡y chá»§ khÃ¡c sáº½ khÃ´ng hiá»ƒn thá»‹.",
@@ -432,24 +456,25 @@
   "upload_area.title": "KÃ©o vÃ  tháº£ Ä‘á»ƒ táº£i lÃªn",
   "upload_button.label": "ThÃªm media (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Táºp tin táº£i lÃªn vÆ°á»£t quÃ¡ giá»›i háº¡n cho phÃ©p.",
-  "upload_error.poll": "Cuá»™c thÄƒm dÃ² khÃ´ng Ä‘Æ°á»£c táº£i táºp tin.",
-  "upload_form.audio_description": "MÃ´ táº£ cho ngÆ°á»i thÃnh giÃ¡c kÃ©m",
+  "upload_error.poll": "KhÃ´ng cho phÃ©p Ä‘Ãnh kÃ¨m táºp tin.",
+  "upload_form.audio_description": "MÃ´ táº£ cho ngÆ°á»i máº¥t thÃnh giÃ¡c",
   "upload_form.description": "MÃ´ táº£ cho ngÆ°á»i khiáº¿m thá»‹",
   "upload_form.edit": "BiÃªn táºp",
   "upload_form.thumbnail": "Äá»•i áº£nh thumbnail",
   "upload_form.undo": "XÃ³a bá»",
-  "upload_form.video_description": "MÃ´ táº£ cho ngÆ°á»i cÃ³ váº¥n Ä‘á» vá» thÃnh giÃ¡c",
+  "upload_form.video_description": "MÃ´ táº£ cho ngÆ°á»i máº¥t thá»‹ lá»±c hoáº·c khÃ´ng thá»ƒ nghe",
   "upload_modal.analyzing_picture": "PhÃ¢n tÃch hÃ¬nh áº£nh",
   "upload_modal.apply": "Ãp dá»¥ng",
-  "upload_modal.choose_image": "Chá»n hÃ¬nh",
+  "upload_modal.choose_image": "Chá»n áº£nh",
   "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
-  "upload_modal.detect_text": "PhÃ¡t hiá»‡n vÄƒn báº£n trong hÃ¬nh áº£nh",
-  "upload_modal.edit_media": "Chá»‰nh sá»a áº£nh/video",
+  "upload_modal.detect_text": "TrÃch vÄƒn báº£n tá»« trong áº£nh",
+  "upload_modal.edit_media": "BiÃªn táºp",
   "upload_modal.hint": "Nháº¥p hoáº·c kÃ©o vÃ²ng trÃ²n trÃªn báº£n xem trÆ°á»›c Ä‘á»ƒ chá»n pháº§n hiá»ƒn thá»‹ trÃªn hÃ¬nh thu nhá».",
+  "upload_modal.preparing_ocr": "Äang nháºn dáº¡ng kÃ½ tá»±â€¦",
   "upload_modal.preview_label": "Xem trÆ°á»›c ({ratio})",
   "upload_progress.label": "Äang táº£i lÃªn...",
   "video.close": "ÄÃ³ng video",
-  "video.download": "Táº£i táºp tin",
+  "video.download": "LÆ°u vá» mÃ¡y",
   "video.exit_fullscreen": "ThoÃ¡t toÃ n mÃ n hÃ¬nh",
   "video.expand": "Má»Ÿ rá»™ng video",
   "video.fullscreen": "ToÃ n mÃ n hÃ¬nh",
diff --git a/app/javascript/mastodon/locales/whitelist_sa.json b/app/javascript/mastodon/locales/whitelist_sa.json
new file mode 100644
index 0000000000000000000000000000000000000000..0d4f101c7a37a4c875e6999bee1a287fdb733380
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_sa.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_tt.json b/app/javascript/mastodon/locales/whitelist_tt.json
new file mode 100644
index 0000000000000000000000000000000000000000..0d4f101c7a37a4c875e6999bee1a287fdb733380
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_tt.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_zgh.json b/app/javascript/mastodon/locales/whitelist_zgh.json
new file mode 100644
index 0000000000000000000000000000000000000000..0d4f101c7a37a4c875e6999bee1a287fdb733380
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_zgh.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
new file mode 100644
index 0000000000000000000000000000000000000000..e2c69c11685cb81337d32e5d36ea5cf660e3fdd7
--- /dev/null
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -0,0 +1,486 @@
+{
+  "account.account_note_header": "âµâµŽâ´· âµ“â´³â´³â´°âµ”",
+  "account.add_or_remove_from_list": "âµ”âµâµ“ âµâµ– âµ™âµ‰âµœâµœâµ¢ âµ™â´³ âµœâµâ´³â´°âµŽâµœ",
+  "account.badges.bot": "â´°â´±âµ“âµœ",
+  "account.badges.group": "âµœâ´°âµ”â´°â´±â´±âµ“âµœ",
+  "account.block": "â´³â´·âµ @{name}",
+  "account.block_domain": "â´³â´·âµ âµ‰â´³âµ” {domain}",
+  "account.blocked": "âµ‰âµœâµœâµ“â´³â´·âµ",
+  "account.browse_more_on_origin_server": "âµ™âµœâ´°âµ”â´° âµ“â´³â´³â´°âµ” â´³ âµ‰â´¼âµ”âµ™ â´°âµâµšâµâµ‰",
+  "account.cancel_follow_request": "âµ™âµ” âµœâµ“âµœâµ”â´° âµ âµ“â´¹â´¼âµ•",
+  "account.direct": "âµœâµ“âµ£âµ‰âµâµœ âµœâµ“âµ™âµ”âµ‰â´·âµœ @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.domain_blocked": "âµ‰âµœâµœâµ“â´³â´·âµ âµ‰â´³âµ”",
+  "account.edit_profile": "âµ™âµâ´¼âµ âµ‰â´¼âµ”âµ™",
+  "account.enable_notifications": "Notify me when @{name} posts",
+  "account.endorse": "Feature on profile",
+  "account.follow": "â´¹â´¼âµ•",
+  "account.followers": "âµ‰âµŽâ´¹â´¼â´°âµ•âµ",
+  "account.followers.empty": "No one follows this user yet.",
+  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
+  "account.follows_you": "â´¹â´¼âµ•âµ â´½âµ¯âµ",
+  "account.hide_reblogs": "Hide boosts from @{name}",
+  "account.last_status": "Last active",
+  "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": "â´°âµ™âµâµ–âµŽâµ‰âµ™",
+  "account.mention": "Mention @{name}",
+  "account.moved_to": "{name} has moved to:",
+  "account.mute": "Mute @{name}",
+  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.muted": "Muted",
+  "account.never_active": "âµ“âµ™â´°âµ”",
+  "account.posts": "Toots",
+  "account.posts_with_replies": "Toots and replies",
+  "account.report": "Report @{name}",
+  "account.requested": "Awaiting approval",
+  "account.share": "â´±â´¹âµ“ âµ‰â´¼âµ”âµ™ âµ @{name}",
+  "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": "Unblock domain {domain}",
+  "account.unendorse": "Don't feature on profile",
+  "account.unfollow": "â´½â´½âµ™ â´°â´¹â´¼â´¼âµ“âµ•",
+  "account.unmute": "Unmute @{name}",
+  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account_note.placeholder": "Click to add a note",
+  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Rate limited",
+  "alert.unexpected.message": "An unexpected error occurred.",
+  "alert.unexpected.title": "Oops!",
+  "announcement.announcement": "Announcement",
+  "autosuggest_hashtag.per_week": "{count} âµ™ âµ‰âµŽâ´°âµâ´°âµ™âµ™",
+  "boost_modal.combo": "You can press {combo} to skip this next time",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "â´°âµâµ™ â´°âµ”âµŽ",
+  "bundle_column_error.title": "â´°âµ£â´³â´°âµ âµ âµ“âµ¥âµŸâµŸâ´°",
+  "bundle_modal_error.close": "âµ”â´³âµ",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "â´°âµâµ™ â´°âµ”âµŽ",
+  "column.blocks": "âµ‰âµâµ™âµ™âµŽâµ”âµ™âµ âµœâµœâµ“â´³â´·âµâµâµ‰âµ",
+  "column.bookmarks": "Bookmarks",
+  "column.community": "Local timeline",
+  "column.direct": "Direct messages",
+  "column.directory": "Browse profiles",
+  "column.domain_blocks": "Blocked domains",
+  "column.favourites": "âµœâµ“â´¼âµ“âµœâµ‰âµ",
+  "column.follow_requests": "Follow requests",
+  "column.home": "â´°âµ™âµâµ“â´±â´³",
+  "column.lists": "âµœâµ‰âµâ´³â´°âµŽâµ‰âµ",
+  "column.mutes": "Muted users",
+  "column.notifications": "âµœâµ‰âµâµ–âµŽâµ‰âµ™âµ‰âµ",
+  "column.pins": "Pinned toot",
+  "column.public": "Federated timeline",
+  "column_back_button.label": "â´°âµ–âµ“âµ",
+  "column_header.hide_settings": "âµ™âµâµœâµ âµœâµ‰âµ™âµ–â´°âµ",
+  "column_header.moveLeft_settings": "Move column to the left",
+  "column_header.moveRight_settings": "Move column to the right",
+  "column_header.pin": "âµ–âµâµ™",
+  "column_header.show_settings": "âµ™âµŽâ´°âµ âµœâµ‰âµ™âµ–â´°âµ",
+  "column_header.unpin": "â´½â´½âµ™ â´°âµ–âµâ´°âµ™",
+  "column_subheading.settings": "âµœâµ‰âµ™âµ–â´°âµ",
+  "community.column_settings.local_only": "âµ–â´°âµ™ â´°â´·âµ–â´°âµ”â´°âµ",
+  "community.column_settings.media_only": "âµ–â´°âµ™ âµ‰âµ™âµâµ–âµŽâµ‰âµ™âµ",
+  "community.column_settings.remote_only": "Remote only",
+  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
+  "compose_form.direct_message_warning_learn_more": "âµ™âµ™âµ âµ“â´³â´³â´°âµ”",
+  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
+  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
+  "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.placeholder": "âµŽâ´°âµ¢â´· âµ‰âµâµâ´°âµ â´³ âµ‰âµ…â´¼ âµâµâ´½?",
+  "compose_form.poll.add_option": "Add a choice",
+  "compose_form.poll.duration": "Poll duration",
+  "compose_form.poll.option_placeholder": "â´°âµ™âµœâµœâ´°âµ¢ {number}",
+  "compose_form.poll.remove_option": "Remove this choice",
+  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
+  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.publish": "Toot",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
+  "compose_form.spoiler.marked": "Text is hidden behind warning",
+  "compose_form.spoiler.unmarked": "Text is not hidden",
+  "compose_form.spoiler_placeholder": "Write your warning here",
+  "confirmation_modal.cancel": "âµ™âµ”",
+  "confirmations.block.block_and_report": "Block & Report",
+  "confirmations.block.confirm": "â´³â´·âµ",
+  "confirmations.block.message": "âµ‰âµ™ âµâµ‰âµœ âµœâµ…âµ™â´· â´°â´· âµœâ´³â´·âµâ´· {name}?",
+  "confirmations.delete.confirm": "â´½â´½âµ™",
+  "confirmations.delete.message": "âµ‰âµ™ âµâµ‰âµœ âµœâµ…âµ™â´· â´°â´· âµœâ´½â´½âµ™â´· âµœâ´°âµ¥âµ•âµ‰â´³âµœ â´°?",
+  "confirmations.delete_list.confirm": "â´½â´½âµ™",
+  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+  "confirmations.domain_block.confirm": "Hide entire domain",
+  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
+  "confirmations.logout.confirm": "â´¼â´¼âµ–",
+  "confirmations.logout.message": "âµ‰âµ™ âµâµ‰âµœ âµœâµ…âµ™â´· â´°â´· âµœâ´¼â´¼âµ–â´·?",
+  "confirmations.mute.confirm": "âµ¥âµ¥âµ‰âµ¥âµ",
+  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
+  "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.redraft.confirm": "Delete & redraft",
+  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
+  "confirmations.reply.confirm": "âµ”â´°âµ”",
+  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+  "confirmations.unfollow.confirm": "â´½â´½âµ™ â´°â´¹â´¼â´¼âµ“âµ•",
+  "confirmations.unfollow.message": "âµ‰âµ™ âµâµ‰âµœ âµœâµ…âµ™â´· â´°â´· âµœâ´½â´½âµ™â´· â´°â´¹â´¼â´¼âµ“âµ• âµ‰ {name}?",
+  "conversation.delete": "â´½â´½âµ™ â´°âµŽâµ™â´°âµ¡â´°âµ",
+  "conversation.mark_as_read": "Mark as read",
+  "conversation.open": "View conversation",
+  "conversation.with": "â´°â´½â´· {names}",
+  "directory.federated": "From known fediverse",
+  "directory.local": "From {domain} only",
+  "directory.new_arrivals": "New arrivals",
+  "directory.recently_active": "Recently active",
+  "embed.instructions": "Embed this status on your website by copying the code below.",
+  "embed.preview": "Here is what it will look like:",
+  "emoji_button.activity": "Activity",
+  "emoji_button.custom": "Custom",
+  "emoji_button.flags": "âµ‰âµ›âµâµ¢â´°âµâµ",
+  "emoji_button.food": "Food & Drink",
+  "emoji_button.label": "Insert emoji",
+  "emoji_button.nature": "Nature",
+  "emoji_button.not_found": "âµ“âµâ´° âµ‰âµŽâµ“âµŠâµ‰!! (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
+  "emoji_button.objects": "Objects",
+  "emoji_button.people": "âµŽâµ‰â´·â´·âµ",
+  "emoji_button.recent": "Frequently used",
+  "emoji_button.search": "âµ”âµ£âµ“...",
+  "emoji_button.search_results": "Search results",
+  "emoji_button.symbols": "âµœâµ‰âµŽâ´°âµœâ´°âµ”âµ‰âµ",
+  "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.account_unavailable": "Profile unavailable",
+  "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
+  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+  "empty_column.domain_blocks": "There are no blocked domains yet.",
+  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
+  "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
+  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.hashtag": "There is nothing in this hashtag yet.",
+  "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
+  "empty_column.home.public_timeline": "the public timeline",
+  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
+  "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
+  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
+  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
+  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
+  "errors.unexpected_crash.report_issue": "Report issue",
+  "follow_request.authorize": "Authorize",
+  "follow_request.reject": "Reject",
+  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "generic.saved": "Saved",
+  "getting_started.developers": "Developers",
+  "getting_started.directory": "Profile directory",
+  "getting_started.documentation": "Documentation",
+  "getting_started.heading": "Getting started",
+  "getting_started.invite": "Invite people",
+  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
+  "getting_started.security": "âµœâµ‰âµ™âµ–â´°âµ âµ âµ“âµŽâµ‰â´¹â´°âµ",
+  "getting_started.terms": "Terms of service",
+  "hashtag.column_header.tag_mode.all": "â´· {additional}",
+  "hashtag.column_header.tag_mode.any": "âµâµ– {additional}",
+  "hashtag.column_header.tag_mode.none": "without {additional}",
+  "hashtag.column_settings.select.no_options_message": "No suggestions found",
+  "hashtag.column_settings.select.placeholder": "âµ™â´½âµ›âµŽ â´°âµ€â´°âµ›âµŸâ´°â´³â€¦",
+  "hashtag.column_settings.tag_mode.all": "All of these",
+  "hashtag.column_settings.tag_mode.any": "Any of these",
+  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "home.column_settings.basic": "Basic",
+  "home.column_settings.show_reblogs": "Show boosts",
+  "home.column_settings.show_replies": "Show replies",
+  "home.hide_announcements": "Hide announcements",
+  "home.show_announcements": "Show announcements",
+  "intervals.full.days": "{number, plural, one {# âµ¡â´°âµ™âµ™} other {# âµ¡âµ“âµ™âµ™â´°âµ}}",
+  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
+  "intervals.full.minutes": "{number, plural, one {# âµœâµ“âµ™â´·âµ‰â´·âµœ} other {# âµœâµ“âµ™â´·âµ‰â´·âµ‰âµ}}",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "â´°âµ™âµâµ“â´±â´³",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "â´°â´·âµ–â´°âµ”â´°âµ",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish toot-orial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "âµ”â´°âµ”",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is specialâ€”it hosts your profile, so remember its name.",
+  "keyboard_shortcuts.back": "to navigate back",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
+  "keyboard_shortcuts.boost": "to boost",
+  "keyboard_shortcuts.column": "to focus a status in one of the columns",
+  "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.down": "to move down in the list",
+  "keyboard_shortcuts.enter": "to open status",
+  "keyboard_shortcuts.favourite": "to favourite",
+  "keyboard_shortcuts.favourites": "to open favourites list",
+  "keyboard_shortcuts.federated": "to open federated timeline",
+  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.hotkey": "Hotkey",
+  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.local": "to open local timeline",
+  "keyboard_shortcuts.mention": "to mention author",
+  "keyboard_shortcuts.muted": "to open muted users list",
+  "keyboard_shortcuts.my_profile": "to open your profile",
+  "keyboard_shortcuts.notifications": "to open notifications column",
+  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.pinned": "to open pinned toots list",
+  "keyboard_shortcuts.profile": "to open author's profile",
+  "keyboard_shortcuts.reply": "to reply",
+  "keyboard_shortcuts.requests": "to open follow requests list",
+  "keyboard_shortcuts.search": "to focus search",
+  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
+  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
+  "keyboard_shortcuts.toot": "to start a brand new toot",
+  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.up": "to move up in the list",
+  "lightbox.close": "âµ”â´³âµ",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
+  "lightbox.next": "Next",
+  "lightbox.previous": "Previous",
+  "lists.account.add": "âµ”âµâµ“ âµ–âµ” âµœâµâ´³â´°âµŽâµœ",
+  "lists.account.remove": "â´½â´½âµ™ âµ™â´³ âµœâµâ´³â´°âµŽâµœ",
+  "lists.delete": "â´½â´½âµ™ âµœâ´°âµâ´³â´°âµŽâµœ",
+  "lists.edit": "âµ™âµâ´¼âµ âµœâ´°âµâ´³â´°âµŽâµœ",
+  "lists.edit.submit": "âµ™âµâ´¼âµ â´°âµ£âµ¡âµ",
+  "lists.new.create": "âµ™â´½âµ” âµœâ´°âµâ´³â´°âµŽâµœ",
+  "lists.new.title_placeholder": "â´°âµ£âµ¡âµ âµ âµœâµâ´³â´°âµŽâµœ âµœâ´°âµŽâ´°âµ¢âµâµ“âµœ",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
+  "lists.search": "Search among people you follow",
+  "lists.subheading": "âµœâµ‰âµâ´³â´°âµŽâµ‰âµ âµâµâ´½",
+  "load_pending": "{count, plural, one {# âµ“â´¼âµ”â´·âµ‰âµ™ â´°âµŽâ´°âµ¢âµâµ“} other {# âµ‰â´¼âµ”â´·â´°âµ™ âµ‰âµŽâ´°âµ¢âµâµ“âµœâµ}}",
+  "loading_indicator.label": "â´°âµ£â´·â´°âµŽ...",
+  "media_gallery.toggle_visible": "â´¼â´¼âµ” {number, plural, one {âµœâ´°âµ¡âµâ´°â´¼âµœ} other {âµœâµ‰âµ¡âµâ´°â´¼âµ‰âµ}}",
+  "missing_indicator.label": "Not found",
+  "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
+  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
+  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.bookmarks": "Bookmarks",
+  "navigation_bar.community_timeline": "Local timeline",
+  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
+  "navigation_bar.discover": "Discover",
+  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.favourites": "Favourites",
+  "navigation_bar.filters": "Muted words",
+  "navigation_bar.follow_requests": "Follow requests",
+  "navigation_bar.follows_and_followers": "Follows and followers",
+  "navigation_bar.info": "About this server",
+  "navigation_bar.keyboard_shortcuts": "Hotkeys",
+  "navigation_bar.lists": "Lists",
+  "navigation_bar.logout": "â´¼â´¼âµ–",
+  "navigation_bar.mutes": "Muted users",
+  "navigation_bar.personal": "Personal",
+  "navigation_bar.pins": "Pinned toots",
+  "navigation_bar.preferences": "Preferences",
+  "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.security": "Security",
+  "notification.favourite": "{name} favourited your status",
+  "notification.follow": "{name} followed you",
+  "notification.follow_request": "{name} has requested to follow you",
+  "notification.mention": "{name} mentioned you",
+  "notification.own_poll": "Your poll has ended",
+  "notification.poll": "A poll you have voted in has ended",
+  "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
+  "notifications.clear": "âµ™â´¼â´¹ âµœâµ‰âµâµ–âµŽâµ‰âµ™âµ‰âµ",
+  "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.alert": "Desktop notifications",
+  "notifications.column_settings.favourite": "Favourites:",
+  "notifications.column_settings.filter_bar.advanced": "Display all categories",
+  "notifications.column_settings.filter_bar.category": "Quick filter bar",
+  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.follow": "New followers:",
+  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.mention": "Mentions:",
+  "notifications.column_settings.poll": "Poll results:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.reblog": "Boosts:",
+  "notifications.column_settings.show": "Show in column",
+  "notifications.column_settings.sound": "âµ–âµ” âµ‰âµŽâµ™âµâµ‰",
+  "notifications.column_settings.status": "New toots:",
+  "notifications.filter.all": "â´°â´½â´½âµ¯",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
+  "notifications.group": "{count} âµœâµâµ–âµŽâµ‰âµ™âµ‰âµ",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "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.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
+  "poll.closed": "âµ‰âµœâµœâµ“âµ”â´³âµ",
+  "poll.refresh": "Refresh",
+  "poll.total_people": "{count, plural, one {# âµ“â´¼â´³â´°âµ} other {# âµ‰â´¼â´³â´°âµâµ}}",
+  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+  "poll.vote": "Vote",
+  "poll.voted": "You voted for this answer",
+  "poll_button.add_poll": "âµ”âµâµ“ âµ¢â´°âµ âµ¢âµ‰â´·âµ£",
+  "poll_button.remove_poll": "Remove poll",
+  "privacy.change": "Adjust status privacy",
+  "privacy.direct.long": "Visible for mentioned users only",
+  "privacy.direct.short": "âµœâµ“âµ”â´·âµ‰âµœ",
+  "privacy.private.long": "Visible for followers only",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all, shown in public timelines",
+  "privacy.public.short": "âµœâ´°â´³â´·âµ“â´·â´°âµâµœ",
+  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "privacy.unlisted.short": "Unlisted",
+  "refresh": "Refresh",
+  "regeneration_indicator.label": "â´°âµ£â´·â´°âµŽâ€¦",
+  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "relative_time.days": "{number}â´°âµ™",
+  "relative_time.hours": "{number}âµ™âµ”â´³",
+  "relative_time.just_now": "â´·âµ–âµ‰",
+  "relative_time.minutes": "{number}âµ™â´·",
+  "relative_time.seconds": "{number}âµ™âµ",
+  "relative_time.today": "â´°âµ™âµ™â´°",
+  "reply_indicator.cancel": "âµ™âµ”",
+  "report.forward": "âµ™âµ™âµ‰â´¼â´¹ âµ‰ {target}",
+  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.placeholder": "Additional comments",
+  "report.submit": "â´°âµ£âµ",
+  "report.target": "Report {target}",
+  "search.placeholder": "âµ”âµ£âµ“",
+  "search_popout.search_format": "Advanced search format",
+  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+  "search_popout.tips.hashtag": "hashtag",
+  "search_popout.tips.status": "status",
+  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
+  "search_popout.tips.user": "user",
+  "search_results.accounts": "âµŽâµ‰â´·â´·âµ",
+  "search_results.hashtags": "âµ€â´°âµ›âµŸâ´°â´³",
+  "search_results.statuses": "Toots",
+  "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "â´³â´·âµ @{name}",
+  "status.bookmark": "Bookmark",
+  "status.cancel_reblog_private": "Unboost",
+  "status.cannot_reblog": "This post cannot be boosted",
+  "status.copy": "Copy link to status",
+  "status.delete": "â´½â´½âµ™",
+  "status.detailed_status": "Detailed conversation view",
+  "status.direct": "âµœâµ“âµ£âµ‰âµâµœ âµœâµ“âµ™âµ”âµ‰â´·âµœ âµ‰ @{name}",
+  "status.embed": "Embed",
+  "status.favourite": "Favourite",
+  "status.filtered": "Filtered",
+  "status.load_more": "âµ™âµ™âµ‰âµâµ‰ âµ“â´³â´³â´°âµ”",
+  "status.media_hidden": "Media hidden",
+  "status.mention": "Mention @{name}",
+  "status.more": "âµ“â´³â´³â´°âµ”",
+  "status.mute": "âµ¥âµ¥âµ‰âµ¥âµ @{name}",
+  "status.mute_conversation": "âµ¥âµ¥âµ‰âµ¥âµ â´°âµŽâµ™â´°âµ¡â´°âµ",
+  "status.open": "Expand this status",
+  "status.pin": "Pin on profile",
+  "status.pinned": "Pinned toot",
+  "status.read_more": "âµ–âµ” âµ“â´³â´³â´°âµ”",
+  "status.reblog": "Boost",
+  "status.reblog_private": "Boost with original visibility",
+  "status.reblogged_by": "{name} boosted",
+  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
+  "status.redraft": "Delete & re-draft",
+  "status.remove_bookmark": "Remove bookmark",
+  "status.reply": "âµ”â´°âµ”",
+  "status.replyAll": "Reply to thread",
+  "status.report": "Report @{name}",
+  "status.sensitive_warning": "Sensitive content",
+  "status.share": "â´±â´¹âµ“",
+  "status.show_less": "âµ™âµŽâ´°âµ â´·âµ”âµ“âµ™",
+  "status.show_less_all": "âµ™âµŽâ´°âµ â´·âµ”âµ“âµ™ âµ‰ âµŽâ´°âµ•âµ•â´°",
+  "status.show_more": "âµ™âµŽâ´°âµ âµ“â´³â´³â´°âµ”",
+  "status.show_more_all": "âµ™âµŽâ´°âµ âµ“â´³â´³â´°âµ” âµ‰ âµŽâ´°âµ•âµ•â´°",
+  "status.show_thread": "Show thread",
+  "status.uncached_media_warning": "Not available",
+  "status.unmute_conversation": "Unmute conversation",
+  "status.unpin": "Unpin from profile",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested inâ€¦",
+  "tabs_bar.federated_timeline": "Federated",
+  "tabs_bar.home": "â´°âµ™âµâµ“â´±â´³",
+  "tabs_bar.local_timeline": "â´°â´·âµ–â´°âµ”â´°âµ",
+  "tabs_bar.notifications": "âµœâµ‰âµâµ–âµŽâµ‰âµ™âµ‰âµ",
+  "tabs_bar.search": "âµ”âµ£âµ“",
+  "time_remaining.days": "{number, plural, one {# âµ¡â´°âµ™âµ™} other {# âµ¡âµ“âµ™âµ™â´°âµ}} âµ‰âµ‡âµ‡âµ‰âµŽâµ",
+  "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
+  "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
+  "time_remaining.moments": "Moments remaining",
+  "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
+  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
+  "timeline_hint.resources.followers": "âµ‰âµŽâ´¹â´¼â´°âµ•âµ",
+  "timeline_hint.resources.follows": "Follows",
+  "timeline_hint.resources.statuses": "Older toots",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.trending_now": "Trending now",
+  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+  "units.short.billion": "{count}B",
+  "units.short.million": "{count}M",
+  "units.short.thousand": "{count}K",
+  "upload_area.title": "Drag & drop to upload",
+  "upload_button.label": "Add images, a video or an audio file",
+  "upload_error.limit": "File upload limit exceeded.",
+  "upload_error.poll": "File upload not allowed with polls.",
+  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_form.description": "Describe for the visually impaired",
+  "upload_form.edit": "âµ™âµâ´¼âµ",
+  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.undo": "â´½â´½âµ™",
+  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_modal.analyzing_picture": "Analyzing pictureâ€¦",
+  "upload_modal.apply": "Apply",
+  "upload_modal.choose_image": "Choose image",
+  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
+  "upload_modal.detect_text": "Detect text from picture",
+  "upload_modal.edit_media": "Edit media",
+  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCRâ€¦",
+  "upload_modal.preview_label": "Preview ({ratio})",
+  "upload_progress.label": "Uploadingâ€¦",
+  "video.close": "âµ”â´³âµ â´°â´¼âµ‰â´·âµ¢âµ“",
+  "video.download": "â´°â´³âµŽ â´°â´¼â´°âµ¢âµâµ“",
+  "video.exit_fullscreen": "Exit full screen",
+  "video.expand": "Expand video",
+  "video.fullscreen": "Full screen",
+  "video.hide": "Hide video",
+  "video.mute": "Mute sound",
+  "video.pause": "Pause",
+  "video.play": "âµ–âµ”",
+  "video.unmute": "Unmute sound"
+}
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index ac19eb3e695ca4b4d47fba449bdb5e4aa88b39d3..6c746bf960024971e98be666c7e4d4b72b566027 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -9,14 +9,16 @@
   "account.browse_more_on_origin_server": "åœ¨åŽŸå§‹ä¸ªäººèµ„æ–™é¡µé¢ä¸Šæµè§ˆè¯¦æƒ…",
   "account.cancel_follow_request": "å–æ¶ˆå…³æ³¨è¯·æ±‚",
   "account.direct": "å‘é€ç§ä¿¡ç»™ @{name}",
+  "account.disable_notifications": "å½“ @{name} å‘å˜Ÿæ—¶ä¸è¦é€šçŸ¥æˆ‘",
   "account.domain_blocked": "ç½‘ç«™å·²å±è”½",
   "account.edit_profile": "ä¿®æ”¹ä¸ªäººèµ„æ–™",
+  "account.enable_notifications": "å½“ @{name} å‘å˜Ÿæ—¶é€šçŸ¥æˆ‘",
   "account.endorse": "åœ¨ä¸ªäººèµ„æ–™ä¸æŽ¨èæ¤ç”¨æˆ·",
   "account.follow": "å…³æ³¨",
   "account.followers": "å…³æ³¨è€…",
   "account.followers.empty": "ç›®å‰æ— äººå…³æ³¨æ¤ç”¨æˆ·ã€‚",
-  "account.followers_counter": "è¢« {count, plural, one {{counter} äºº} other {{counter} äºº}}å…³æ³¨",
-  "account.following_counter": "æ£åœ¨å…³æ³¨ {count, plural, other {{counter} äºº}}",
+  "account.followers_counter": "è¢« {counter} äººå…³æ³¨",
+  "account.following_counter": "æ£åœ¨å…³æ³¨ {counter} äºº",
   "account.follows.empty": "æ¤ç”¨æˆ·ç›®å‰å°šæœªå…³æ³¨ä»»ä½•äººã€‚",
   "account.follows_you": "å…³æ³¨äº†ä½ ",
   "account.hide_reblogs": "éšè—æ¥è‡ª @{name} çš„è½¬å˜Ÿ",
@@ -36,7 +38,7 @@
   "account.requested": "æ£åœ¨ç‰å¾…å¯¹æ–¹åŒæ„ã€‚ç‚¹å‡»ä»¥å–æ¶ˆå‘é€å…³æ³¨è¯·æ±‚",
   "account.share": "åˆ†äº« @{name} çš„ä¸ªäººèµ„æ–™",
   "account.show_reblogs": "æ˜¾ç¤ºæ¥è‡ª @{name} çš„è½¬å˜Ÿ",
-  "account.statuses_counter": "{count, plural, one {{counter} æ¡} other {{counter} æ¡}}å˜Ÿæ–‡",
+  "account.statuses_counter": "{counter} æ¡å˜Ÿæ–‡",
   "account.unblock": "è§£é™¤å±è”½ @{name}",
   "account.unblock_domain": "ä¸å†éšè—æ¥è‡ª {domain} çš„å†…å®¹",
   "account.unendorse": "ä¸åœ¨ä¸ªäººèµ„æ–™ä¸æŽ¨èæ¤ç”¨æˆ·",
@@ -131,7 +133,7 @@
   "directory.local": "ä»…æ¥è‡ª {domain}",
   "directory.new_arrivals": "æ–°æ¥è€…",
   "directory.recently_active": "æœ€è¿‘æ´»è·ƒ",
-  "embed.instructions": "è¦åœ¨ä½ çš„ç½‘ç«™ä¸ŠåµŒå…¥è¿™æ¡å˜Ÿæ–‡ï¼Œè¯·å¤åˆ¶ä»¥ä¸‹ä»£ç ã€‚",
+  "embed.instructions": "è¦åœ¨ä½ çš„ç½‘ç«™ä¸ŠåµŒå…¥æ¤å˜Ÿæ–‡ï¼Œè¯·å¤åˆ¶ä»¥ä¸‹ä»£ç ã€‚",
   "embed.preview": "å®ƒä¼šåƒè¿™æ ·æ˜¾ç¤ºå‡ºæ¥ï¼š",
   "emoji_button.activity": "æ´»åŠ¨",
   "emoji_button.custom": "è‡ªå®šä¹‰",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "æœç´¢ç»“æžœ",
   "emoji_button.symbols": "ç¬¦å·",
   "emoji_button.travel": "æ—…è¡Œå’Œåœ°ç‚¹",
+  "empty_column.account_suspended": "è´¦æˆ·è¢«å°ç¦",
   "empty_column.account_timeline": "è¿™é‡Œæ²¡æœ‰å˜Ÿæ–‡ï¼",
   "empty_column.account_unavailable": "ä¸ªäººèµ„æ–™ä¸å¯ç”¨",
   "empty_column.blocks": "ä½ ç›®å‰æ²¡æœ‰å±è”½ä»»ä½•ç”¨æˆ·ã€‚",
@@ -160,13 +163,15 @@
   "empty_column.hashtag": "è¿™ä¸ªè¯é¢˜æ ‡ç¾ä¸‹æš‚æ—¶æ²¡æœ‰å†…å®¹ã€‚",
   "empty_column.home": "ä½ è¿˜æ²¡æœ‰å…³æ³¨ä»»ä½•ç”¨æˆ·ã€‚å¿«çœ‹çœ‹{public}ï¼Œå‘å…¶ä»–äººé—®ä¸ªå¥½å§ã€‚",
   "empty_column.home.public_timeline": "å…¬å…±æ—¶é—´è½´",
-  "empty_column.list": "è¿™ä¸ªåˆ—è¡¨ä¸æš‚æ—¶æ²¡æœ‰å†…å®¹ã€‚åˆ—è¡¨ä¸ç”¨æˆ·æ‰€å‘é€çš„çš„æ–°å˜Ÿæ–‡å°†ä¼šåœ¨è¿™é‡Œæ˜¾ç¤ºã€‚",
+  "empty_column.list": "æ¤åˆ—è¡¨ä¸æš‚æ—¶æ²¡æœ‰å†…å®¹ã€‚åˆ—è¡¨ä¸ç”¨æˆ·æ‰€å‘é€çš„çš„æ–°å˜Ÿæ–‡å°†ä¼šåœ¨è¿™é‡Œæ˜¾ç¤ºã€‚",
   "empty_column.lists": "ä½ è¿˜æ²¡æœ‰åˆ›å»ºè¿‡åˆ—è¡¨ã€‚ä½ åˆ›å»ºçš„åˆ—è¡¨ä¼šåœ¨è¿™é‡Œæ˜¾ç¤ºã€‚",
   "empty_column.mutes": "ä½ æ²¡æœ‰éšè—ä»»ä½•ç”¨æˆ·ã€‚",
   "empty_column.notifications": "ä½ è¿˜æ²¡æœ‰æ”¶åˆ°è¿‡ä»»ä½•é€šçŸ¥ï¼Œå¿«å’Œå…¶ä»–ç”¨æˆ·äº’åŠ¨å§ã€‚",
   "empty_column.public": "è¿™é‡Œä»€ä¹ˆéƒ½æ²¡æœ‰ï¼å†™ä¸€äº›å…¬å¼€çš„å˜Ÿæ–‡ï¼Œæˆ–è€…å…³æ³¨å…¶ä»–æœåŠ¡å™¨çš„ç”¨æˆ·åŽï¼Œè¿™é‡Œå°±ä¼šæœ‰å˜Ÿæ–‡å‡ºçŽ°äº†",
   "error.unexpected_crash.explanation": "æ¤é¡µé¢æ— æ³•æ£ç¡®æ˜¾ç¤ºï¼Œè¿™å¯èƒ½æ˜¯å› ä¸ºæˆ‘ä»¬çš„ä»£ç ä¸æœ‰é”™è¯¯ï¼Œä¹Ÿå¯èƒ½æ˜¯å› ä¸ºæµè§ˆå™¨å…¼å®¹é—®é¢˜ã€‚",
+  "error.unexpected_crash.explanation_addons": "æ¤é¡µé¢æ— æ³•æ£ç¡®æ˜¾ç¤ºï¼Œè¿™ä¸ªé”™è¯¯å¾ˆå¯èƒ½æ˜¯ç”±æµè§ˆå™¨é™„åŠ ç»„ä»¶æˆ–è‡ªåŠ¨ç¿»è¯‘å·¥å…·é€ æˆçš„ã€‚",
   "error.unexpected_crash.next_steps": "åˆ·æ–°ä¸€ä¸‹é¡µé¢è¯•è¯•ã€‚å¦‚æžœæ²¡ç”¨ï¼Œæ‚¨å¯ä»¥æ¢ä¸ªæµè§ˆå™¨æˆ–è€…ç”¨æœ¬åœ°åº”ç”¨ã€‚",
+  "error.unexpected_crash.next_steps_addons": "è¯·å°è¯•ç¦ç”¨å®ƒä»¬å¹¶åˆ·æ–°é¡µé¢ã€‚å¦‚æžœæ²¡æœ‰å¸®åŠ©ï¼Œä½ ä»å¯ä»¥å°è¯•ä½¿ç”¨å…¶ä»–æµè§ˆå™¨æˆ–åŽŸç”Ÿåº”ç”¨æ¥ä½¿ç”¨ Mastodonã€‚",
   "errors.unexpected_crash.copy_stacktrace": "æŠŠå †æ ˆè·Ÿè¸ªä¿¡æ¯å¤åˆ¶åˆ°å‰ªè´´æ¿",
   "errors.unexpected_crash.report_issue": "æŠ¥å‘Šé—®é¢˜",
   "follow_request.authorize": "åŒæ„",
@@ -250,9 +255,10 @@
   "keyboard_shortcuts.unfocus": "å–æ¶ˆè¾“å…¥",
   "keyboard_shortcuts.up": "åœ¨åˆ—è¡¨ä¸è®©å…‰æ ‡ä¸Šç§»",
   "lightbox.close": "å…³é—",
+  "lightbox.compress": "è¿”å›žå›¾ç‰‡å…¨è§ˆ",
+  "lightbox.expand": "æ”¾å¤§æŸ¥çœ‹å›¾ç‰‡",
   "lightbox.next": "ä¸‹ä¸€ä¸ª",
   "lightbox.previous": "ä¸Šä¸€ä¸ª",
-  "lightbox.view_context": "æŸ¥çœ‹ä¸Šä¸‹æ–‡",
   "lists.account.add": "æ·»åŠ åˆ°åˆ—è¡¨",
   "lists.account.remove": "ä»Žåˆ—è¡¨ä¸ç§»é™¤",
   "lists.delete": "åˆ é™¤åˆ—è¡¨",
@@ -260,6 +266,10 @@
   "lists.edit.submit": "æ›´æ”¹æ ‡é¢˜",
   "lists.new.create": "æ–°å»ºåˆ—è¡¨",
   "lists.new.title_placeholder": "æ–°åˆ—è¡¨çš„æ ‡é¢˜",
+  "lists.replies_policy.followed": "ä»»ä½•è¢«å…³æ³¨çš„ç”¨æˆ·",
+  "lists.replies_policy.list": "åˆ—è¡¨æˆå‘˜",
+  "lists.replies_policy.none": "æ²¡æœ‰äºº",
+  "lists.replies_policy.title": "æ˜¾ç¤ºå›žå¤ç»™ï¼š",
   "lists.search": "æœç´¢ä½ å…³æ³¨çš„äºº",
   "lists.subheading": "ä½ çš„åˆ—è¡¨",
   "load_pending": "{count} é¡¹",
@@ -267,7 +277,9 @@
   "media_gallery.toggle_visible": "éšè— {number} å¼ å›¾ç‰‡",
   "missing_indicator.label": "æ‰¾ä¸åˆ°å†…å®¹",
   "missing_indicator.sublabel": "æ— æ³•æ‰¾åˆ°æ¤èµ„æº",
+  "mute_modal.duration": "æŒç»æœŸé—´",
   "mute_modal.hide_notifications": "åŒæ—¶éšè—æ¥è‡ªè¿™ä¸ªç”¨æˆ·çš„é€šçŸ¥ï¼Ÿ",
+  "mute_modal.indefinite": "æ— æœŸé™",
   "navigation_bar.apps": "ç§»åŠ¨åº”ç”¨",
   "navigation_bar.blocks": "å·²å±è”½çš„ç”¨æˆ·",
   "navigation_bar.bookmarks": "ä¹¦ç¾",
@@ -298,6 +310,7 @@
   "notification.own_poll": "æ‚¨çš„æŠ•ç¥¨å·²ç»ç»“æŸ",
   "notification.poll": "ä½ å‚ä¸Žçš„ä¸€ä¸ªæŠ•ç¥¨å·²ç»ç»“æŸ",
   "notification.reblog": "{name} è½¬å˜Ÿäº†ä½ çš„å˜Ÿæ–‡",
+  "notification.status": "{name} åˆšåˆšå‘å˜Ÿ",
   "notifications.clear": "æ¸…ç©ºé€šçŸ¥åˆ—è¡¨",
   "notifications.clear_confirmation": "ä½ ç¡®å®šè¦æ°¸ä¹…æ¸…ç©ºé€šçŸ¥åˆ—è¡¨å—ï¼Ÿ",
   "notifications.column_settings.alert": "æ¡Œé¢é€šçŸ¥",
@@ -313,13 +326,24 @@
   "notifications.column_settings.reblog": "å½“æœ‰äººè½¬å˜Ÿäº†ä½ çš„å˜Ÿæ–‡æ—¶ï¼š",
   "notifications.column_settings.show": "åœ¨é€šçŸ¥æ æ˜¾ç¤º",
   "notifications.column_settings.sound": "æ’æ”¾éŸ³æ•ˆ",
+  "notifications.column_settings.status": "æ–°å˜Ÿæ–‡ï¼š",
   "notifications.filter.all": "å…¨éƒ¨",
   "notifications.filter.boosts": "è½¬å˜Ÿ",
   "notifications.filter.favourites": "å–œæ¬¢",
   "notifications.filter.follows": "å…³æ³¨",
   "notifications.filter.mentions": "æåŠ",
   "notifications.filter.polls": "æŠ•ç¥¨ç»“æžœ",
+  "notifications.filter.statuses": "ä½ å…³æ³¨çš„äººçš„åŠ¨æ€",
+  "notifications.grant_permission": "æŽˆäºˆæƒé™",
   "notifications.group": "{count} æ¡é€šçŸ¥",
+  "notifications.mark_as_read": "å°†æ‰€æœ‰é€šçŸ¥æ ‡ä¸ºå·²è¯»",
+  "notifications.permission_denied": "ç”±äºŽæƒé™è¢«æ‹’ç»ï¼Œæ— æ³•å¯ç”¨æ¡Œé¢é€šçŸ¥ã€‚",
+  "notifications.permission_denied_alert": "ç”±äºŽåœ¨æ¤ä¹‹å‰æµè§ˆå™¨æƒé™è¯·æ±‚å°±å·²è¢«æ‹’ç»ï¼Œæ‰€ä»¥å¯ç”¨æ¡Œé¢é€šçŸ¥å¤±è´¥",
+  "notifications.permission_required": "æ‰€éœ€æƒé™æœªè¢«æŽˆäºˆï¼Œæ‰€ä»¥æ¡Œé¢é€šçŸ¥ä¸å¯ç”¨",
+  "notifications_permission_banner.enable": "å¯ç”¨æ¡Œé¢é€šçŸ¥",
+  "notifications_permission_banner.how_to_control": "å¯ç”¨æ¡Œé¢é€šçŸ¥ä»¥åœ¨ Mastodon æœªæ‰“å¼€æ—¶æŽ¥æ”¶é€šçŸ¥ã€‚æ‚¨å¯ä»¥é€šè¿‡äº¤äº’é€šè¿‡ä¸Šé¢çš„ {icon} æŒ‰é’®æ¥ç²¾ç»†æŽ§åˆ¶å¯ä»¥å‘é€æ¡Œé¢é€šçŸ¥çš„äº¤äº’ç±»åž‹ã€‚",
+  "notifications_permission_banner.title": "ç²¾å½©ä¸å®¹é”™è¿‡",
+  "picture_in_picture.restore": "æ¢å¤",
   "poll.closed": "å·²å…³é—",
   "poll.refresh": "åˆ·æ–°",
   "poll.total_people": "{count}äºº",
@@ -328,7 +352,7 @@
   "poll.voted": "æ‚¨å·²ç»å¯¹è¿™ä¸ªç”æ¡ˆæŠ•è¿‡ç¥¨äº†",
   "poll_button.add_poll": "å‘èµ·æŠ•ç¥¨",
   "poll_button.remove_poll": "ç§»é™¤æŠ•ç¥¨",
-  "privacy.change": "è®¾ç½®å˜Ÿæ–‡å¯è§èŒƒå›´",
+  "privacy.change": "è®¾ç½®å˜Ÿæ–‡çš„å¯è§èŒƒå›´",
   "privacy.direct.long": "åªæœ‰è¢«æåŠçš„ç”¨æˆ·èƒ½çœ‹åˆ°",
   "privacy.direct.short": "ç§ä¿¡",
   "privacy.private.long": "åªæœ‰å…³æ³¨ä½ çš„ç”¨æˆ·èƒ½çœ‹åˆ°",
@@ -379,11 +403,11 @@
   "status.favourite": "å–œæ¬¢",
   "status.filtered": "å·²è¿‡æ»¤",
   "status.load_more": "åŠ è½½æ›´å¤š",
-  "status.media_hidden": "éšè—åª’ä½“å†…å®¹",
+  "status.media_hidden": "å·²éšè—çš„åª’ä½“å†…å®¹",
   "status.mention": "æåŠ @{name}",
   "status.more": "æ›´å¤š",
   "status.mute": "éšè— @{name}",
-  "status.mute_conversation": "éšè—æ¤å¯¹è¯",
+  "status.mute_conversation": "å°†æ¤å¯¹è¯é™éŸ³",
   "status.open": "å±•å¼€å˜Ÿæ–‡",
   "status.pin": "åœ¨ä¸ªäººèµ„æ–™é¡µé¢ç½®é¡¶",
   "status.pinned": "ç½®é¡¶å˜Ÿæ–‡",
@@ -405,7 +429,7 @@
   "status.show_more_all": "æ˜¾ç¤ºæ‰€æœ‰å†…å®¹",
   "status.show_thread": "æ˜¾ç¤ºå…¨éƒ¨å¯¹è¯",
   "status.uncached_media_warning": "æš‚ä¸å¯ç”¨",
-  "status.unmute_conversation": "ä¸å†éšè—æ¤å¯¹è¯",
+  "status.unmute_conversation": "å°†æ¤å¯¹è¯è§£é™¤é™éŸ³",
   "status.unpin": "åœ¨ä¸ªäººèµ„æ–™é¡µé¢å–æ¶ˆç½®é¡¶",
   "suggestions.dismiss": "å…³é—å»ºè®®",
   "suggestions.header": "æ‚¨å¯èƒ½ä¼šæ„Ÿå…´è¶£â€¦",
@@ -426,11 +450,11 @@
   "trends.counter_by_accounts": "{count, plural, one {{counter} äºº} other {{counter} äºº}}æ£åœ¨è®¨è®º",
   "trends.trending_now": "çŽ°åœ¨æµè¡Œ",
   "ui.beforeunload": "å¦‚æžœä½ çŽ°åœ¨ç¦»å¼€ Mastodonï¼Œä½ çš„è‰ç¨¿å†…å®¹å°†ä¼šä¸¢å¤±ã€‚",
-  "units.short.billion": "{count}åäº¿",
-  "units.short.million": "{count}ç™¾ä¸‡",
-  "units.short.thousand": "{count}åƒ",
+  "units.short.billion": "{count}B",
+  "units.short.million": "{count}M",
+  "units.short.thousand": "{count}K",
   "upload_area.title": "å°†æ–‡ä»¶æ‹–æ”¾åˆ°æ¤å¤„å¼€å§‹ä¸Šä¼ ",
-  "upload_button.label": "ä¸Šä¼ åª’ä½“æ–‡ä»¶ ({formats})",
+  "upload_button.label": "ä¸Šä¼ å›¾ç‰‡ã€è§†é¢‘æˆ–éŸ³é¢‘",
   "upload_error.limit": "æ–‡ä»¶å¤§å°è¶…è¿‡é™åˆ¶ã€‚",
   "upload_error.poll": "æŠ•ç¥¨ä¸ä¸å…è®¸ä¸Šä¼ æ–‡ä»¶ã€‚",
   "upload_form.audio_description": "ä¸ºå¬éšœäººå£«æ·»åŠ æ–‡å—æè¿°",
@@ -446,6 +470,7 @@
   "upload_modal.detect_text": "ä»Žå›¾ç‰‡ä¸æ£€æµ‹æ–‡æœ¬",
   "upload_modal.edit_media": "ç¼–è¾‘åª’ä½“",
   "upload_modal.hint": "åœ¨é¢„è§ˆå›¾ä¸Šç‚¹å‡»æˆ–æ‹–åŠ¨åœ†åœˆï¼Œä»¥é€‰æ‹©ç¼©ç•¥å›¾çš„ç„¦ç‚¹ã€‚",
+  "upload_modal.preparing_ocr": "æ£åœ¨å‡†å¤‡æ–‡å—è¯†åˆ«â€¦â€¦",
   "upload_modal.preview_label": "é¢„è§ˆ ({ratio})",
   "upload_progress.label": "ä¸Šä¼ ä¸â€¦â€¦",
   "video.close": "å…³é—è§†é¢‘",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 24a63ab6b3872950a8bec8c5cb899807e592af22..1a62ccbb38f2cdc8eec3d2aa29544c59d024483f 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -1,28 +1,30 @@
 {
-  "account.account_note_header": "Note",
-  "account.add_or_remove_from_list": "å¾žåå–®ä¸æ–°å¢žæˆ–ç§»é™¤",
+  "account.account_note_header": "ç†è¨˜",
+  "account.add_or_remove_from_list": "å¾žåˆ—è¡¨ä¸æ–°å¢žæˆ–ç§»é™¤",
   "account.badges.bot": "æ©Ÿæ¢°äºº",
   "account.badges.group": "ç¾¤çµ„",
   "account.block": "å°éŽ– @{name}",
-  "account.block_domain": "éš±è—ä¾†è‡ª {domain} çš„ä¸€åˆ‡æ–‡ç« ",
-  "account.blocked": "å°éŽ–",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.block_domain": "å°éŽ–ä¾†è‡ª {domain} çš„ä¸€åˆ‡æ–‡ç« ",
+  "account.blocked": "å·²å°éŽ–",
+  "account.browse_more_on_origin_server": "ç€è¦½åŽŸæœå‹™ç«™ä¸Šçš„å€‹äººè³‡æ–™é ",
   "account.cancel_follow_request": "å–æ¶ˆé—œæ³¨è«‹æ±‚",
   "account.direct": "ç§è¨Š @{name}",
-  "account.domain_blocked": "æœå‹™ç«™è¢«éš±è—",
+  "account.disable_notifications": "å¦‚æžœ @{name} ç™¼æ–‡è«‹ä¸è¦å†é€šçŸ¥æˆ‘",
+  "account.domain_blocked": "æœå‹™ç«™è¢«å°éŽ–",
   "account.edit_profile": "ä¿®æ”¹å€‹äººè³‡æ–™",
-  "account.endorse": "åœ¨å€‹äººè³‡æ–™æŽ¨è–¦å°æ–¹",
-  "account.follow": "é—œæ³¨",
-  "account.followers": "é—œæ³¨çš„äºº",
-  "account.followers.empty": "å°šæ²’æœ‰äººé—œæ³¨é€™ä½ä½¿ç”¨è€…ã€‚",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
-  "account.follows.empty": "é€™ä½ä½¿ç”¨è€…å°šæœªé—œæ³¨ä»»ä½•ä½¿ç”¨è€…ã€‚",
+  "account.enable_notifications": "å¦‚æžœ @{name} ç™¼æ–‡è«‹é€šçŸ¥æˆ‘",
+  "account.endorse": "åœ¨å€‹äººè³‡æ–™é æŽ¨è–¦å°æ–¹",
+  "account.follow": "æ£åœ¨é—œæ³¨",
+  "account.followers": "é—œæ³¨è€…",
+  "account.followers.empty": "å°šæœªæœ‰äººé—œæ³¨é€™ä½ä½¿ç”¨è€…ã€‚",
+  "account.followers_counter": "æœ‰ {count, plural,one {{counter} å€‹} other {{counter} å€‹}}é—œæ³¨è€…",
+  "account.following_counter": "æ£åœ¨é—œæ³¨ {count, plural,one {{counter}}other {{counter} äºº}}",
+  "account.follows.empty": "é€™ä½ä½¿ç”¨è€…å°šæœªé—œæ³¨ä»»ä½•äººã€‚",
   "account.follows_you": "é—œæ³¨ä½ ",
   "account.hide_reblogs": "éš±è— @{name} çš„è½‰æŽ¨",
   "account.last_status": "ä¸Šæ¬¡æ´»èºæ™‚é–“",
   "account.link_verified_on": "æ¤é€£çµçš„æ‰€æœ‰æ¬Šå·²åœ¨ {date} æª¢æŸ¥éŽ",
-  "account.locked_info": "æ¤ç”¨æˆ¶çš„ç§éš±ç‹€æ…‹ç‚ºä¸å…¬é–‹ï¼Œé—œæ³¨è«‹æ±‚éœ€ç¶“éŽè©²ç”¨æˆ¶çš„å¯©æ ¸ã€‚",
+  "account.locked_info": "é€™ä½ä½¿ç”¨è€…å°‡ç§éš±è¨å®šç‚ºã€Œä¸å…¬é–‹ã€ï¼Œæœƒæ‰‹å‹•å¯©æ‰¹èª°èƒ½é—œæ³¨ä»–/å¥¹ã€‚",
   "account.media": "åª’é«”",
   "account.mention": "æåŠ @{name}",
   "account.moved_to": "{name} å·²ç¶“é·ç§»åˆ°ï¼š",
@@ -36,15 +38,15 @@
   "account.requested": "ç‰å€™å¯©æ‰¹",
   "account.share": "åˆ†äº« @{name} çš„å€‹äººè³‡æ–™",
   "account.show_reblogs": "é¡¯ç¤º @{name} çš„æŽ¨æ–‡",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural,one {{counter} ç¯‡}other {{counter} ç¯‡}}æ–‡ç« ",
   "account.unblock": "è§£é™¤å° @{name} çš„å°éŽ–",
-  "account.unblock_domain": "ä¸å†éš±è— {domain}",
+  "account.unblock_domain": "è§£é™¤å°åŸŸå {domain} çš„å°éŽ–",
   "account.unendorse": "ä¸å†æ–¼å€‹äººè³‡æ–™é é¢æŽ¨è–¦å°æ–¹",
   "account.unfollow": "å–æ¶ˆé—œæ³¨",
   "account.unmute": "å–æ¶ˆ @{name} çš„éœéŸ³",
   "account.unmute_notifications": "å–æ¶ˆä¾†è‡ª @{name} é€šçŸ¥çš„éœéŸ³",
-  "account_note.placeholder": "Click to add a note",
-  "alert.rate_limited.message": "è«‹åœ¨ {retry_time, time, medium} éŽå¾Œé‡è©¦",
+  "account_note.placeholder": "æŒ‰æ¤æ·»åŠ å‚™æ³¨",
+  "alert.rate_limited.message": "è«‹åœ¨ {retry_time, time, medium} å¾Œé‡è©¦",
   "alert.rate_limited.title": "å·²é™é€Ÿ",
   "alert.unexpected.message": "ç™¼ç”Ÿä¸å¯é æœŸçš„éŒ¯èª¤ã€‚",
   "alert.unexpected.title": "å™¢ï¼",
@@ -57,12 +59,12 @@
   "bundle_modal_error.close": "é—œé–‰",
   "bundle_modal_error.message": "åŠ è¼‰æœ¬çµ„ä»¶å‡ºéŒ¯ã€‚",
   "bundle_modal_error.retry": "é‡è©¦",
-  "column.blocks": "å°éŽ–ç”¨æˆ¶",
+  "column.blocks": "å°éŽ–åå–®",
   "column.bookmarks": "æ›¸ç±¤",
   "column.community": "æœ¬ç«™æ™‚é–“è»¸",
   "column.direct": "å€‹äººè¨Šæ¯",
   "column.directory": "ç€è¦½å€‹äººè³‡æ–™",
-  "column.domain_blocks": "éš±è—çš„æœå‹™ç«™",
+  "column.domain_blocks": "å°éŽ–çš„æœå‹™ç«™",
   "column.favourites": "æœ€æ„›çš„æ–‡ç« ",
   "column.follow_requests": "é—œæ³¨è«‹æ±‚",
   "column.home": "ä¸»é ",
@@ -75,25 +77,25 @@
   "column_header.hide_settings": "éš±è—è¨å®š",
   "column_header.moveLeft_settings": "å°‡æ¬„å·¦ç§»",
   "column_header.moveRight_settings": "å°‡æ¬„å³ç§»",
-  "column_header.pin": "å›ºå®š",
+  "column_header.pin": "ç½®é ‚",
   "column_header.show_settings": "é¡¯ç¤ºè¨å®š",
-  "column_header.unpin": "å–ä¸‹",
+  "column_header.unpin": "å–æ¶ˆç½®é ‚",
   "column_subheading.settings": "è¨å®š",
-  "community.column_settings.local_only": "åªæœ‰æœ¬åœ°",
-  "community.column_settings.media_only": "åƒ…åª’é«”",
-  "community.column_settings.remote_only": "åªæœ‰é ç«¯",
-  "compose_form.direct_message_warning": "é€™æ–‡ç« åªæœ‰è¢«æåŠçš„ç”¨æˆ¶æ‰å¯ä»¥çœ‹åˆ°ã€‚",
+  "community.column_settings.local_only": "åªé¡¯ç¤ºæœ¬ç«™",
+  "community.column_settings.media_only": "åªé¡¯ç¤ºå¤šåª’é«”",
+  "community.column_settings.remote_only": "åªé¡¯ç¤ºå¤–ç«™",
+  "compose_form.direct_message_warning": "é€™æ–‡ç« åªæœ‰è¢«æåŠçš„ä½¿ç”¨è€…æ‰å¯ä»¥çœ‹åˆ°ã€‚",
   "compose_form.direct_message_warning_learn_more": "äº†è§£æ›´å¤š",
   "compose_form.hashtag_warning": "é€™æ–‡ç« å› ç‚ºä¸æ˜¯å…¬é–‹ï¼Œæ‰€ä»¥ä¸æœƒè¢«æ¨™ç±¤æœç´¢ã€‚åªæœ‰å…¬é–‹çš„æ–‡ç« æ‰æœƒè¢«æ¨™ç±¤æœç´¢ã€‚",
-  "compose_form.lock_disclaimer": "ä½ çš„ç”¨æˆ¶ç‹€æ…‹ç‚ºã€Œ{locked}ã€ï¼Œä»»ä½•äººéƒ½èƒ½ç«‹å³é—œæ³¨ä½ ï¼Œç„¶å¾Œçœ‹åˆ°ã€Œåªæœ‰é—œæ³¨è€…èƒ½çœ‹ã€çš„æ–‡ç« ã€‚",
-  "compose_form.lock_disclaimer.lock": "å…¬å…±",
+  "compose_form.lock_disclaimer": "ä½ çš„ç”¨æˆ¶ç‹€æ…‹æ²’æœ‰{locked}ï¼Œä»»ä½•äººéƒ½èƒ½ç«‹å³é—œæ³¨ä½ ï¼Œç„¶å¾Œçœ‹åˆ°ã€Œåªæœ‰é—œæ³¨è€…èƒ½çœ‹ã€çš„æ–‡ç« ã€‚",
+  "compose_form.lock_disclaimer.lock": "éŽ–å®š",
   "compose_form.placeholder": "ä½ åœ¨æƒ³ç”šéº¼ï¼Ÿ",
   "compose_form.poll.add_option": "æ–°å¢žé¸æ“‡",
   "compose_form.poll.duration": "æŠ•ç¥¨æœŸé™",
   "compose_form.poll.option_placeholder": "ç¬¬ {number} å€‹é¸æ“‡",
   "compose_form.poll.remove_option": "ç§»é™¤æ¤é¸æ“‡",
   "compose_form.poll.switch_to_multiple": "è®Šæ›´æŠ•ç¥¨ç‚ºå…è¨±å¤šå€‹é¸é …",
-  "compose_form.poll.switch_to_single": "è®Šæ›´æŠ•ç¥¨ç‚ºå…è¨±å–®ä¸€é¸é …",
+  "compose_form.poll.switch_to_single": "è®Šæ›´æŠ•ç¥¨ç‚ºé™å®šå–®ä¸€é¸é …",
   "compose_form.publish": "ç™¼æ–‡",
   "compose_form.publish_loud": "{publish}ï¼",
   "compose_form.sensitive.hide": "æ¨™è¨˜åª’é«”ç‚ºæ•æ„Ÿå…§å®¹",
@@ -110,8 +112,8 @@
   "confirmations.delete.message": "ä½ ç¢ºå®šè¦åˆªé™¤é€™æ–‡ç« å—Žï¼Ÿ",
   "confirmations.delete_list.confirm": "åˆªé™¤",
   "confirmations.delete_list.message": "ä½ ç¢ºå®šè¦æ°¸ä¹…åˆªé™¤é€™åˆ—è¡¨å—Žï¼Ÿ",
-  "confirmations.domain_block.confirm": "éš±è—æ•´å€‹ç¶²ç«™",
-  "confirmations.domain_block.message": "ä½ çœŸçš„çœŸçš„ç¢ºå®šè¦éš±è—æ•´å€‹ {domain} ï¼Ÿå¤šæ•¸æƒ…æ³ä¸‹ï¼Œæ¯”è¼ƒæŽ¨è–¦å°éŽ–æˆ–éœéŸ³å¹¾å€‹ç‰¹å®šç›®æ¨™å°±å¥½ã€‚ä½ å¾žæ¤å°‡ä¸æœƒå†çœ‹åˆ°è©²ç«™çš„å…§å®¹å’Œé€šçŸ¥ã€‚ä¾†è‡ªè©²ç«™çš„é—œæ³¨è€…äº¦æœƒè¢«ç§»é™¤ã€‚",
+  "confirmations.domain_block.confirm": "å°éŽ–æ•´å€‹ç¶²ç«™",
+  "confirmations.domain_block.message": "ä½ çœŸçš„çœŸçš„ç¢ºå®šè¦å°éŽ–æ•´å€‹ {domain} ï¼Ÿå¤šæ•¸æƒ…æ³ä¸‹ï¼Œå°éŽ–æˆ–éœéŸ³å¹¾å€‹ç‰¹å®šç›®æ¨™å°±å·²ç¶“æœ‰æ•ˆï¼Œä¹Ÿæ˜¯æ¯”è¼ƒå»ºè°çš„åšæ³•ã€‚è‹¥ç„¶å°éŽ–å…¨ç«™ï¼Œä½ å°‡ä¸æœƒå†åœ¨é€™è£çœ‹åˆ°è©²ç«™çš„å…§å®¹å’Œé€šçŸ¥ã€‚ä¾†è‡ªè©²ç«™çš„é—œæ³¨è€…äº¦æœƒè¢«ç§»é™¤ã€‚",
   "confirmations.logout.confirm": "ç™»å‡º",
   "confirmations.logout.message": "ç¢ºå®šè¦ç™»å‡ºå—Žï¼Ÿ",
   "confirmations.mute.confirm": "éœéŸ³",
@@ -127,9 +129,9 @@
   "conversation.mark_as_read": "æ¨™ç‚ºå·²è®€",
   "conversation.open": "æª¢è¦–å°è©±",
   "conversation.with": "èˆ‡ {names}",
-  "directory.federated": "ä¾†è‡ªå·²çŸ¥è¯é‚¦å®‡å®™",
+  "directory.federated": "ä¾†è‡ªå·²çŸ¥çš„è¯ç›Ÿç¶²çµ¡",
   "directory.local": "åƒ…ä¾†è‡ª {domain}",
-  "directory.new_arrivals": "æ–°è²¨",
+  "directory.new_arrivals": "æ–°å…§å®¹",
   "directory.recently_active": "æœ€è¿‘æ´»èº",
   "embed.instructions": "è¦å…§åµŒæ¤æ–‡ç« ï¼Œè«‹å°‡ä»¥ä¸‹ä»£ç¢¼è²¼é€²ä½ çš„ç¶²ç«™ã€‚",
   "embed.preview": "çœ‹ä¸ŠåŽ»æœƒæ˜¯é€™æ¨£ï¼š",
@@ -139,7 +141,7 @@
   "emoji_button.food": "é£²é£²é£Ÿé£Ÿ",
   "emoji_button.label": "åŠ å…¥è¡¨æƒ…ç¬¦è™Ÿ",
   "emoji_button.nature": "è‡ªç„¶",
-  "emoji_button.not_found": "æ²’æœ‰è¡¨æƒ…ç¬¦è™Ÿï¼ï¼ (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
+  "emoji_button.not_found": "æ²’æ‰¾åˆ°è¡¨æƒ…ç¬¦è™Ÿï¼ï¼ (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
   "emoji_button.objects": "ç‰©å“",
   "emoji_button.people": "äººç‰©",
   "emoji_button.recent": "å¸¸ç”¨",
@@ -147,6 +149,7 @@
   "emoji_button.search_results": "æœå°‹çµæžœ",
   "emoji_button.symbols": "ç¬¦è™Ÿ",
   "emoji_button.travel": "æ—…éŠæ™¯ç‰©",
+  "empty_column.account_suspended": "å¸³è™Ÿå·²åœæ¬Š",
   "empty_column.account_timeline": "é€™è£¡é‚„æ²’æœ‰å˜Ÿæ–‡ï¼",
   "empty_column.account_unavailable": "ç„¡æ³•å–å¾—å€‹äººè³‡æ–™",
   "empty_column.blocks": "ä½ é‚„æ²’æœ‰å°éŽ–ä»»ä½•ä½¿ç”¨è€…ã€‚",
@@ -154,11 +157,11 @@
   "empty_column.community": "æœ¬ç«™æ™‚é–“è»¸æš«æ™‚æœªæœ‰å…§å®¹ï¼Œå¿«å¯«ä¸€é»žæ±è¥¿ä¾†æ¶é é¦™å•Šï¼",
   "empty_column.direct": "ä½ æ²’æœ‰å€‹äººè¨Šæ¯ã€‚ç•¶ä½ ç™¼å‡ºæˆ–æŽ¥æ”¶å€‹äººè¨Šæ¯ï¼Œå°±æœƒåœ¨é€™è£¡å‡ºç¾ã€‚",
   "empty_column.domain_blocks": "å°šæœªéš±è—ä»»ä½•ç¶²åŸŸã€‚",
-  "empty_column.favourited_statuses": "ä½ é‚„æ²’æ”¶è—ä»»ä½•å˜Ÿæ–‡ã€‚é€™è£¡å°‡æœƒé¡¯ç¤ºä½ æ”¶è—çš„å˜Ÿæ–‡ã€‚",
-  "empty_column.favourites": "é‚„æ²’æœ‰äººæ”¶è—é€™å‰‡å˜Ÿæ–‡ã€‚é€™è£¡å°‡æœƒé¡¯ç¤ºè¢«æ”¶è—çš„å˜Ÿæ–‡ã€‚",
+  "empty_column.favourited_statuses": "ä½ é‚„æ²’æ”¶è—ä»»ä½•æ–‡ç« ã€‚é€™è£¡å°‡æœƒé¡¯ç¤ºä½ æ”¶è—çš„å˜Ÿæ–‡ã€‚",
+  "empty_column.favourites": "é‚„æ²’æœ‰äººæ”¶è—é€™å‰‡æ–‡ç« ã€‚é€™è£¡å°‡æœƒé¡¯ç¤ºè¢«æ”¶è—çš„å˜Ÿæ–‡ã€‚",
   "empty_column.follow_requests": "æ‚¨å°šæœªæ”¶åˆ°ä»»ä½•é—œæ³¨è«‹æ±‚ã€‚é€™è£¡å°‡æœƒé¡¯ç¤ºæ”¶åˆ°çš„é—œæ³¨è«‹æ±‚ã€‚",
   "empty_column.hashtag": "é€™å€‹æ¨™ç±¤æš«æ™‚æœªæœ‰å…§å®¹ã€‚",
-  "empty_column.home": "ä½ é‚„æ²’æœ‰é—œæ³¨ä»»ä½•ç”¨æˆ¶ã€‚å¿«çœ‹çœ‹{public}ï¼Œå‘å…¶ä»–ç”¨æˆ¶æè¨•å§ã€‚",
+  "empty_column.home": "ä½ é‚„æ²’æœ‰é—œæ³¨ä»»ä½•ä½¿ç”¨è€…ã€‚å¿«çœ‹çœ‹{public}ï¼Œå‘å…¶ä»–ä½¿ç”¨è€…æè¨•å§ã€‚",
   "empty_column.home.public_timeline": "å…¬å…±æ™‚é–“è»¸",
   "empty_column.list": "é€™å€‹åˆ—è¡¨æš«æ™‚æœªæœ‰å…§å®¹ã€‚",
   "empty_column.lists": "ä½ é‚„æ²’æœ‰å»ºç«‹ä»»ä½•åå–®ã€‚é€™è£¡å°‡æœƒé¡¯ç¤ºä½ æ‰€å»ºç«‹çš„åå–®ã€‚",
@@ -166,20 +169,22 @@
   "empty_column.notifications": "ä½ æ²’æœ‰ä»»ä½•é€šçŸ¥ç´€éŒ„ï¼Œå¿«å‘å…¶ä»–ç”¨æˆ¶æè¨•å§ã€‚",
   "empty_column.public": "è·¨ç«™æ™‚é–“è»¸æš«æ™‚æ²’æœ‰å…§å®¹ï¼å¿«å¯«ä¸€äº›å…¬å…±çš„æ–‡ç« ï¼Œæˆ–è€…é—œæ³¨å¦ä¸€äº›æœå‹™ç«™çš„ç”¨æˆ¶å§ï¼ä½ å’Œæœ¬ç«™ã€å‹ç«™çš„äº¤æµï¼Œå°‡æ±ºå®šé€™è£å‡ºç¾çš„å…§å®¹ã€‚",
   "error.unexpected_crash.explanation": "ç”±æ–¼ç™¼ç”Ÿç³»çµ±æ•…éšœæˆ–ç€è¦½å™¨ç›¸å®¹æ€§å•é¡Œï¼Œæ•…ç„¡æ³•æ£å¸¸é¡¯ç¤ºé é¢ã€‚",
+  "error.unexpected_crash.explanation_addons": "æ¤é é¢ç„¡æ³•è¢«æ£ç¢ºé¡¯ç¤ºï¼Œé€™å¯èƒ½æ˜¯ç”±æ–¼ç€è¦½å™¨çš„é™„åŠ å…ƒä»¶æˆ–ç¶²é è‡ªå‹•ç¿»è¯å·¥å…·é€ æˆçš„ã€‚",
   "error.unexpected_crash.next_steps": "è«‹å˜—è©¦é‡æ–°æ•´ç†é é¢ã€‚å¦‚æžœç‹€æ³æ²’æœ‰é€²å±•ï¼Œä½ å¯ä»¥ä½¿ç”¨ä¸åŒçš„ç€è¦½å™¨æˆ– Mastodon æ‡‰ç”¨ç¨‹å¼ä¾†æª¢è¦–ã€‚",
-  "errors.unexpected_crash.copy_stacktrace": "è¤‡è£½åˆ°å‰ªè²¼ç°¿",
+  "error.unexpected_crash.next_steps_addons": "è«‹å˜—è©¦åœæ¢ä½¿ç”¨é€™äº›é™„åŠ å…ƒä»¶ç„¶å¾Œé‡æ–°è¼‰å…¥é é¢ã€‚å¦‚æžœå•é¡Œæ²’æœ‰è§£æ±ºï¼Œä½ ä»ç„¶å¯ä»¥ä½¿ç”¨ä¸åŒçš„ç€è¦½å™¨æˆ– Mastodon æ‡‰ç”¨ç¨‹å¼ä¾†æª¢è¦–ã€‚",
+  "errors.unexpected_crash.copy_stacktrace": "è¤‡è£½ stacktrace åˆ°å‰ªè²¼ç°¿",
   "errors.unexpected_crash.report_issue": "èˆ‰å ±å•é¡Œ",
   "follow_request.authorize": "æ‰¹å‡†",
   "follow_request.reject": "æ‹’çµ•",
-  "follow_requests.unlocked_explanation": "å³ä¾¿æ‚¨çš„å¸³è™Ÿæœªè¢«éŽ–å®šï¼Œ{domain} çš„å“¡å·¥èªç‚ºå¯èƒ½æƒ³è¦è‡ªå·±å¯©æ ¸é€™äº›å¸³è™Ÿçš„è¿½è¹¤è«‹æ±‚ã€‚",
-  "generic.saved": "Saved",
+  "follow_requests.unlocked_explanation": "å³ä½¿æ‚¨çš„å¸³æˆ¶æœªä¸ŠéŽ–ï¼Œ{domain} çš„å·¥ä½œäººå“¡èªç‚ºæ‚¨å¯èƒ½æƒ³æ‰‹å‹•å¯©æ ¸ä¾†è‡ªé€™äº›å¸³æˆ¶çš„é—œæ³¨è«‹æ±‚ã€‚",
+  "generic.saved": "å·²å„²å˜",
   "getting_started.developers": "é–‹ç™¼è€…",
   "getting_started.directory": "å€‹äººè³‡æ–™ç›®éŒ„",
   "getting_started.documentation": "æ–‡ä»¶",
   "getting_started.heading": "é–‹å§‹ä½¿ç”¨",
   "getting_started.invite": "é‚€è«‹ä½¿ç”¨è€…",
-  "getting_started.open_source_notice": "Mastodonï¼ˆè¬è±¡ï¼‰æ˜¯ä¸€å€‹é–‹æ”¾æºç¢¼çš„è»Ÿä»¶ã€‚ä½ å¯ä»¥åœ¨å®˜æ–¹ GitHub ({github}) è²¢ç»æˆ–è€…å›žå ±å•é¡Œã€‚",
-  "getting_started.security": "å¸³æˆ¶å®‰å…¨",
+  "getting_started.open_source_notice": "Mastodonï¼ˆè¬è±¡ï¼‰æ˜¯ä¸€å€‹é–‹æ”¾æºç¢¼çš„è»Ÿä»¶ã€‚ä½ å¯ä»¥åœ¨å®˜æ–¹ GitHub {github} è²¢ç»æˆ–è€…å›žå ±å•é¡Œã€‚",
+  "getting_started.security": "å¸³æˆ¶è¨å®š",
   "getting_started.terms": "æœå‹™æ¢æ¬¾",
   "hashtag.column_header.tag_mode.all": "ä»¥åŠ{additional}",
   "hashtag.column_header.tag_mode.any": "æˆ–æ˜¯{additional}",
@@ -189,7 +194,7 @@
   "hashtag.column_settings.tag_mode.all": "å…¨éƒ¨",
   "hashtag.column_settings.tag_mode.any": "ä»»ä¸€",
   "hashtag.column_settings.tag_mode.none": "å…¨ä¸",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.column_settings.tag_toggle": "åœ¨é€™æ¬„ä½åŠ å…¥é¡å¤–çš„æ¨™ç±¤",
   "home.column_settings.basic": "åŸºæœ¬",
   "home.column_settings.show_reblogs": "é¡¯ç¤ºè¢«è½‰æŽ¨çš„æ–‡ç« ",
   "home.column_settings.show_replies": "é¡¯ç¤ºå›žæ‡‰æ–‡ç« ",
@@ -199,24 +204,24 @@
   "intervals.full.hours": "{number, plural, one {# å°æ™‚} other {# å°æ™‚}}",
   "intervals.full.minutes": "{number, plural, one {# åˆ†é˜} other {# åˆ†é˜}}",
   "introduction.federation.action": "ä¸‹ä¸€æ¥",
-  "introduction.federation.federated.headline": "ç«™å°è¯ç›Ÿ",
-  "introduction.federation.federated.text": "ä¾†è‡ªè¯ç›Ÿå®‡å®™ä¸å…¶ä»–ç«™å°çš„å…¬é–‹å˜Ÿæ–‡å°‡æœƒåœ¨ç«™é»žè¯ç›Ÿæ™‚é–“è»¸ä¸é¡¯ç¤ºã€‚",
+  "introduction.federation.federated.headline": "å·²çŸ¥æœå‹™ç«™",
+  "introduction.federation.federated.text": "ä¾†è‡ªç¤¾äº¤è¯ç›Ÿå…¶ä»–ç¶²ç«™çš„å…¬é–‹æ–‡ç« ï¼Œå°‡æœƒé¡¯ç¤ºåœ¨ç«™é»žè·¨ç«™æ™‚é–“è»¸ä¸Šã€‚",
   "introduction.federation.home.headline": "é¦–é ",
-  "introduction.federation.home.text": "ä½ é—œæ³¨ä½¿ç”¨è€…çš„å˜Ÿæ–‡å°‡æœƒåœ¨é¦–é å‹•æ…‹ä¸é¡¯ç¤ºã€‚ä½ å¯ä»¥é—œæ³¨ä»»ä½•ä¼ºæœå™¨ä¸Šçš„ä»»ä½•äººï¼",
-  "introduction.federation.local.headline": "æœ¬æ©Ÿ",
-  "introduction.federation.local.text": "è·Ÿæ‚¨åŒä¼ºæœå™¨ä¹‹ä½¿ç”¨è€…æ‰€ç™¼çš„å…¬é–‹å˜Ÿæ–‡å°‡æœƒé¡¯ç¤ºåœ¨æœ¬æ©Ÿæ™‚é–“è»¸ä¸ã€‚",
-  "introduction.interactions.action": "Finish toot-orial!",
-  "introduction.interactions.favourite.headline": "é—œæ³¨",
-  "introduction.interactions.favourite.text": "æ‚¨èƒ½å„²å˜å˜Ÿæ–‡ä¾›ç¨å€™è§€çœ‹ï¼Œæˆ–è€…æ”¶è—å˜Ÿæ–‡ï¼Œè®“ä½œè€…çŸ¥é“æ‚¨å–œæ¡é€™å‰‡å˜Ÿæ–‡ã€‚",
-  "introduction.interactions.reblog.headline": "è½‰å˜Ÿ",
-  "introduction.interactions.reblog.text": "æ‚¨èƒ½è—‰ç”±è½‰å˜Ÿä»–äººå˜Ÿæ–‡ä¾†åˆ†äº«çµ¦æ‚¨çš„é—œæ³¨è€…ã€‚",
+  "introduction.federation.home.text": "ä½ æ‰€é—œæ³¨ä½¿ç”¨è€…çš„æ–‡ç« ï¼Œå°‡æœƒåœ¨é¦–é å‹•æ…‹ä¸é¡¯ç¤ºã€‚ä½ å¯ä»¥é—œæ³¨ä»»ä½•ä¼ºæœå™¨ä¸Šçš„ä»»ä½•äººï¼",
+  "introduction.federation.local.headline": "æœ¬ç«™",
+  "introduction.federation.local.text": "èˆ‡ä½ å…±ç”¨ä¸€å€‹æœå‹™ç«™ä½¿ç”¨è€…çš„å…¬é–‹æ–‡ç« ï¼Œå°‡æœƒé¡¯ç¤ºåœ¨æœ¬ç«™æ™‚é–“è»¸ä¸ã€‚",
+  "introduction.interactions.action": "å®Œæˆä½¿ç”¨æ•™å¸",
+  "introduction.interactions.favourite.headline": "æœ€æ„›",
+  "introduction.interactions.favourite.text": "ä½ èƒ½ç”¨å°‡æ–‡ç« åŠ å…¥ã€Œæœ€æ„›çš„æ–‡ç« ã€ï¼Œä¸€æ–¹ä¾¿æŠŠå„²å˜æ–‡ç« ç¨å€™è§€çœ‹ï¼Œä¹ŸåŒæ™‚å°ä½œè€…è¡¨ç¤ºæ”¯æŒã€‚",
+  "introduction.interactions.reblog.headline": "è½‰æŽ¨",
+  "introduction.interactions.reblog.text": "ä½ å¯ä»¥é€éŽã€Œè½‰æŽ¨æ–‡ç« ã€æŠŠæ–‡ç« åˆ†äº«çµ¦ä½ çš„é—œæ³¨è€…ã€‚",
   "introduction.interactions.reply.headline": "å›žè¦†",
-  "introduction.interactions.reply.text": "æ‚¨èƒ½å›žè¦†å…¶ä»–äººæˆ–è‡ªå·±çš„å˜Ÿæ–‡ï¼Œé€™éº¼åšæœƒæŠŠé€™äº›å›žè¦†ä¸²æˆä¸€ä¸²å°è©±ã€‚",
+  "introduction.interactions.reply.text": "ä½ å¯ä»¥å›žè¦†å…¶ä»–äººæˆ–è‡ªå·±çš„æ–‡ç« ï¼Œé€™éº¼åšæœƒæŠŠé€™äº›å›žè¦†ä¸²æˆä¸€ä¸²å°è©±ã€‚",
   "introduction.welcome.action": "é–‹å§‹æ—…ç¨‹å§ï¼",
   "introduction.welcome.headline": "ç¬¬ä¸€æ¥",
-  "introduction.welcome.text": "æ¡è¿Žä¾†åˆ°è¯ç›Ÿå®‡å®™ï¼ç‰ç‰ä½ å°±å¯ä»¥å»£æ’è¨Šæ¯åŠè·¨è¶Šå„ç¨®å„å¼å„æ¨£çš„ä¼ºæœå™¨èˆ‡æœ‹å‹èŠå¤©ã€‚ä½†é€™å°ä¼ºæœå™¨ï¼Œ{domain}ï¼Œéžå¸¸ç‰¹åˆ¥ - å®ƒå¯„ç®¡äº†ä½ çš„å€‹äººè³‡æ–™ï¼Œæ‰€ä»¥è«‹è¨˜ä½å®ƒçš„åå—ã€‚",
-  "keyboard_shortcuts.back": "å¾Œé€€",
-  "keyboard_shortcuts.blocked": "é–‹å•Ÿã€Œå°éŽ–ä½¿ç”¨è€…ã€åå–®",
+  "introduction.welcome.text": "æ¡è¿Žä¾†åˆ°è¯ç›Ÿç¤¾äº¤ç¶²çµ¡ (fediverse)ï¼ç¨å¾Œä½ å°±å¯ä»¥å»£æ’è¨Šæ¯ï¼ŒåŒæ™‚èˆ‡å¤šå€‹æœå‹™ç«™çš„ä¸åŒæœ‹å‹èŠå¤©ã€‚ä½†ç•™æ„ {domain} é€™å€‹æœå‹™ç«™éžå¸¸ç‰¹åˆ¥â€”â€”å®ƒè¨—ç®¡äº†ä½ çš„å€‹äººè³‡æ–™å•Šï¼æ‰€ä»¥è«‹è¨˜ä½å®ƒã€‚",
+  "keyboard_shortcuts.back": "è¿”å›ž",
+  "keyboard_shortcuts.blocked": "é–‹å•Ÿå°éŽ–åå–®",
   "keyboard_shortcuts.boost": "è½‰æŽ¨",
   "keyboard_shortcuts.column": "æŠŠæ¨™ç¤ºç§»å‹•åˆ°å…¶ä¸ä¸€åˆ—",
   "keyboard_shortcuts.compose": "æŠŠæ¨™ç¤ºç§»å‹•åˆ°æ–‡å—è¼¸å…¥å€",
@@ -224,35 +229,36 @@
   "keyboard_shortcuts.direct": "é–‹å•Ÿç§è¨Šæ¬„",
   "keyboard_shortcuts.down": "åœ¨åˆ—è¡¨å¾€ä¸‹ç§»å‹•",
   "keyboard_shortcuts.enter": "æ‰“é–‹æ–‡ç« ",
-  "keyboard_shortcuts.favourite": "æ”¶è—",
-  "keyboard_shortcuts.favourites": "é–‹å•Ÿæ”¶è—åå–®",
-  "keyboard_shortcuts.federated": "é–‹å•Ÿç«™é»žè¯ç›Ÿæ™‚é–“è»¸",
+  "keyboard_shortcuts.favourite": "æ”¶è—æ–‡ç« ",
+  "keyboard_shortcuts.favourites": "é–‹å•Ÿæœ€æ„›çš„å…§å®¹",
+  "keyboard_shortcuts.federated": "æ‰“é–‹è·¨ç«™æ™‚é–“è»¸",
   "keyboard_shortcuts.heading": "éµç›¤å¿«é€Ÿéµ",
-  "keyboard_shortcuts.home": "é–‹å•Ÿé¦–é æ™‚é–“è»¸",
+  "keyboard_shortcuts.home": "é–‹å•Ÿå€‹äººæ™‚é–“è»¸",
   "keyboard_shortcuts.hotkey": "å¿«é€Ÿéµ",
   "keyboard_shortcuts.legend": "é¡¯ç¤ºé€™å€‹èªªæ˜Ž",
-  "keyboard_shortcuts.local": "é–‹å•Ÿæœ¬æ©Ÿæ™‚é–“è»¸",
+  "keyboard_shortcuts.local": "é–‹å•Ÿæœ¬ç«™æ™‚é–“è»¸",
   "keyboard_shortcuts.mention": "æåŠä½œè€…",
-  "keyboard_shortcuts.muted": "é–‹å•ŸéœéŸ³ä½¿ç”¨è€…åå–®",
+  "keyboard_shortcuts.muted": "é–‹å•ŸéœéŸ³åå–®",
   "keyboard_shortcuts.my_profile": "é–‹å•Ÿå€‹äººè³‡æ–™é é¢",
   "keyboard_shortcuts.notifications": "é–‹å•Ÿé€šçŸ¥æ¬„",
   "keyboard_shortcuts.open_media": "é–‹å•Ÿåª’é«”",
-  "keyboard_shortcuts.pinned": "é–‹å•Ÿé‡˜é¸çš„å˜Ÿæ–‡åå–®",
+  "keyboard_shortcuts.pinned": "é–‹å•Ÿé‡˜é¸çš„æ–‡ç« æ¸…å–®",
   "keyboard_shortcuts.profile": "é–‹å•Ÿä½œè€…çš„å€‹äººè³‡æ–™é é¢",
   "keyboard_shortcuts.reply": "å›žè¦†",
   "keyboard_shortcuts.requests": "é–‹å•Ÿé—œæ³¨è«‹æ±‚åå–®",
   "keyboard_shortcuts.search": "æŠŠæ¨™ç¤ºç§»å‹•åˆ°æœç´¢",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "é¡¯ç¤ºæˆ–éš±è—è¢«æŠ˜ç–Šçš„æ£æ–‡",
   "keyboard_shortcuts.start": "é–‹å•Ÿã€Œé–‹å§‹ä½¿ç”¨ã€æ¬„ä½",
   "keyboard_shortcuts.toggle_hidden": "é¡¯ç¤ºæˆ–éš±è—è¢«æ¨™ç‚ºæ•æ„Ÿçš„æ–‡å—",
   "keyboard_shortcuts.toggle_sensitivity": "é¡¯ç¤º / éš±è—åª’é«”",
-  "keyboard_shortcuts.toot": "æ–°çš„æŽ¨æ–‡",
+  "keyboard_shortcuts.toot": "æ–°çš„æ–‡ç« ",
   "keyboard_shortcuts.unfocus": "æŠŠæ¨™ç¤ºç§»é›¢æ–‡å—è¼¸å…¥å’Œæœç´¢",
   "keyboard_shortcuts.up": "åœ¨åˆ—è¡¨å¾€ä¸Šç§»å‹•",
   "lightbox.close": "é—œé–‰",
-  "lightbox.next": "ç¹¼çºŒ",
-  "lightbox.previous": "å›žé€€",
-  "lightbox.view_context": "æª¢è¦–å…§æ–‡",
+  "lightbox.compress": "ç¸®å°æª¢è¦–",
+  "lightbox.expand": "æ“´å¤§æª¢è¦–",
+  "lightbox.next": "ä¸‹ä¸€é ",
+  "lightbox.previous": "ä¸Šä¸€é ",
   "lists.account.add": "æ–°å¢žåˆ°åˆ—è¡¨",
   "lists.account.remove": "å¾žåˆ—è¡¨åˆªé™¤",
   "lists.delete": "åˆªé™¤åˆ—è¡¨",
@@ -260,22 +266,28 @@
   "lists.edit.submit": "è®Šæ›´æ¨™é¡Œ",
   "lists.new.create": "æ–°å¢žåˆ—è¡¨",
   "lists.new.title_placeholder": "æ–°åˆ—è¡¨æ¨™é¡Œ",
-  "lists.search": "å¾žä½ é—œæ³¨çš„ç”¨æˆ¶ä¸æœç´¢",
+  "lists.replies_policy.followed": "ä»»ä½•å·²é—œæ³¨çš„ç”¨æˆ¶",
+  "lists.replies_policy.list": "åˆ—è¡¨ä¸çš„ç”¨æˆ¶",
+  "lists.replies_policy.none": "ç„¡äºº",
+  "lists.replies_policy.title": "é¡¯ç¤ºå›žæ‡‰æ–‡ç« ï¸°",
+  "lists.search": "å¾žä½ é—œæ³¨çš„äººæœç´¢",
   "lists.subheading": "åˆ—è¡¨",
   "load_pending": "{count, plural, other {# å€‹æ–°é …ç›®}}",
   "loading_indicator.label": "è¼‰å…¥ä¸...",
-  "media_gallery.toggle_visible": "æ‰“é–‹æˆ–é—œä¸Š",
+  "media_gallery.toggle_visible": "éš±è—åœ–ç‰‡",
   "missing_indicator.label": "æ‰¾ä¸åˆ°å…§å®¹",
   "missing_indicator.sublabel": "ç„¡æ³•æ‰¾åˆ°å…§å®¹",
-  "mute_modal.hide_notifications": "éš±è—ä¾†è‡ªé€™ç”¨æˆ¶çš„é€šçŸ¥å—Žï¼Ÿ",
-  "navigation_bar.apps": "å°éŽ–çš„ä½¿ç”¨è€…",
-  "navigation_bar.blocks": "è¢«ä½ å°éŽ–çš„ç”¨æˆ¶",
+  "mute_modal.duration": "æ™‚é–“",
+  "mute_modal.hide_notifications": "éœ€è¦éš±è—é€™ä½¿ç”¨è€…çš„é€šçŸ¥å—Žï¼Ÿ",
+  "mute_modal.indefinite": "æ²’æœŸé™",
+  "navigation_bar.apps": "æ‰‹æ©Ÿ App",
+  "navigation_bar.blocks": "å°éŽ–åå–®",
   "navigation_bar.bookmarks": "æ›¸ç±¤",
   "navigation_bar.community_timeline": "æœ¬ç«™æ™‚é–“è»¸",
-  "navigation_bar.compose": "æ’°å¯«æ–°å˜Ÿæ–‡",
+  "navigation_bar.compose": "æ’°å¯«æ–°æ–‡ç« ",
   "navigation_bar.direct": "å€‹äººè¨Šæ¯",
   "navigation_bar.discover": "æŽ¢ç´¢",
-  "navigation_bar.domain_blocks": "éš±è—çš„æœå‹™ç«™",
+  "navigation_bar.domain_blocks": "å°éŽ–çš„æœå‹™ç«™",
   "navigation_bar.edit_profile": "ä¿®æ”¹å€‹äººè³‡æ–™",
   "navigation_bar.favourites": "æœ€æ„›çš„å…§å®¹",
   "navigation_bar.filters": "éœéŸ³è©žå½™",
@@ -285,23 +297,24 @@
   "navigation_bar.keyboard_shortcuts": "éµç›¤å¿«é€Ÿéµ",
   "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.security": "å®‰å…¨",
-  "notification.favourite": "{name} æ”¶è—äº†ä½ çš„æ–‡ç« ",
+  "notification.favourite": "{name} å–œæ¡ä½ çš„æ–‡ç« ",
   "notification.follow": "{name} é–‹å§‹é—œæ³¨ä½ ",
   "notification.follow_request": "{name} è¦æ±‚é—œæ³¨ä½ ",
   "notification.mention": "{name} æåŠä½ ",
-  "notification.own_poll": "æ‚¨çš„æŠ•ç¥¨å·²çµæŸ",
-  "notification.poll": "æ‚¨æŠ•éŽçš„æŠ•ç¥¨å·²ç¶“çµæŸ",
+  "notification.own_poll": "ä½ çš„æŠ•ç¥¨å·²çµæŸ",
+  "notification.poll": "ä½ åƒèˆ‡éŽçš„ä¸€å€‹æŠ•ç¥¨å·²ç¶“çµæŸ",
   "notification.reblog": "{name} è½‰æŽ¨ä½ çš„æ–‡ç« ",
+  "notification.status": "{name} å‰›ç™¼è¡¨äº†æ–‡ç« ",
   "notifications.clear": "æ¸…ç©ºé€šçŸ¥ç´€éŒ„",
   "notifications.clear_confirmation": "ä½ ç¢ºå®šè¦æ¸…ç©ºé€šçŸ¥ç´€éŒ„å—Žï¼Ÿ",
   "notifications.column_settings.alert": "é¡¯ç¤ºæ¡Œé¢é€šçŸ¥",
-  "notifications.column_settings.favourite": "æ”¶è—äº†ä½ çš„æ–‡ç« ï¼š",
+  "notifications.column_settings.favourite": "ä½ æœ€æ„›çš„æ–‡ç« ï¼š",
   "notifications.column_settings.filter_bar.advanced": "é¡¯ç¤ºæ‰€æœ‰åˆ†é¡ž",
   "notifications.column_settings.filter_bar.category": "å¿«é€ŸéŽæ¿¾æ¬„",
   "notifications.column_settings.filter_bar.show": "é¡¯ç¤º",
@@ -313,25 +326,36 @@
   "notifications.column_settings.reblog": "è½‰æŽ¨ä½ çš„æ–‡ç« ï¼š",
   "notifications.column_settings.show": "åœ¨é€šçŸ¥æ¬„é¡¯ç¤º",
   "notifications.column_settings.sound": "æ’æ”¾éŸ³æ•ˆ",
+  "notifications.column_settings.status": "æ–°çš„æ–‡ç« ",
   "notifications.filter.all": "å…¨éƒ¨",
-  "notifications.filter.boosts": "è½‰å˜Ÿ",
+  "notifications.filter.boosts": "è½‰æŽ¨",
   "notifications.filter.favourites": "æœ€æ„›",
   "notifications.filter.follows": "é—œæ³¨çš„ä½¿ç”¨è€…",
   "notifications.filter.mentions": "æåŠ",
   "notifications.filter.polls": "æŠ•ç¥¨çµæžœ",
+  "notifications.filter.statuses": "å·²é—œæ³¨çš„ç”¨æˆ¶çš„æœ€æ–°å‹•æ…‹",
+  "notifications.grant_permission": "æŽˆäºˆæ¬Šé™",
   "notifications.group": "{count} æ¢é€šçŸ¥",
+  "notifications.mark_as_read": "æ¨™è¨˜æ‰€æœ‰é€šçŸ¥ç‚ºå·²è®€",
+  "notifications.permission_denied": "æœ¬ç«™ä¸èƒ½ç™¼é€æ¡Œé¢é€šçŸ¥ï¼Œå› ç‚ºç€è¦½å™¨å…ˆå‰æ‹’çµ•äº†æœ¬ç«™çš„æ¡Œé¢é€šçŸ¥æ¬Šé™è«‹æ±‚",
+  "notifications.permission_denied_alert": "ç„¡æ³•å•Ÿç”¨æ¡Œé¢é€šçŸ¥ï¼Œå› ç‚ºç€è¦½å™¨å…ˆå‰æ‹’çµ•äº†æœ¬ç«™çš„æ¡Œé¢é€šçŸ¥æ¬Šé™è«‹æ±‚",
+  "notifications.permission_required": "ç”±æ–¼ç€è¦½å™¨æœªæœ‰æŽˆäºˆæ¡Œé¢é€šçŸ¥æ¬Šé™ï¼Œæœ¬ç«™æš«æœªèƒ½ç™¼é€æ¡Œé¢é€šçŸ¥ã€‚",
+  "notifications_permission_banner.enable": "å•Ÿç”¨æ¡Œé¢é€šçŸ¥",
+  "notifications_permission_banner.how_to_control": "åªè¦å•Ÿç”¨æ¡Œé¢é€šçŸ¥ï¼Œä¾¿å¯åœ¨ Mastodon ç¶²ç«™æ²’æœ‰æ‰“é–‹æ™‚æ”¶åˆ°é€šçŸ¥ã€‚åœ¨å·²ç¶“å•Ÿç”¨æ¡Œé¢é€šçŸ¥çš„æ™‚å€™ï¼Œä½ å¯ä»¥é€éŽä¸Šé¢çš„ {icon} æŒ‰éˆ•æº–ç¢ºæŽ§åˆ¶å“ªäº›é¡žåž‹çš„äº’å‹•æœƒç”¢ç”Ÿæ¡Œé¢é€šçŸ¥ã€‚",
+  "notifications_permission_banner.title": "ä¸æ”¾éŽä»»ä½•äº‹æƒ…",
+  "picture_in_picture.restore": "é‚„åŽŸå½±ç‰‡æ’æ”¾å™¨",
   "poll.closed": "å·²é—œé–‰",
   "poll.refresh": "é‡æ–°æ•´ç†",
-  "poll.total_people": "{count, plural, one {# å€‹æŠ•ç¥¨} other {# å€‹æŠ•ç¥¨}}",
-  "poll.total_votes": "{count, plural, one {# å€‹æŠ•ç¥¨} other {# å€‹æŠ•ç¥¨}}",
+  "poll.total_people": "{count, plural, one {# äººæŠ•ç¥¨} other {# äººæŠ•ç¥¨}}",
+  "poll.total_votes": "{count, plural, one {# ç¥¨} other {# ç¥¨}}",
   "poll.vote": "æŠ•ç¥¨",
-  "poll.voted": "ä½ å·²å°æ¤å•é¡ŒæŠ•ç¥¨",
+  "poll.voted": "ä½ å·²æŠ•ç¥¨çµ¦é€™ç”æ¡ˆ",
   "poll_button.add_poll": "å»ºç«‹æŠ•ç¥¨",
   "poll_button.remove_poll": "ç§»é™¤æŠ•ç¥¨",
   "privacy.change": "èª¿æ•´ç§éš±è¨å®š",
-  "privacy.direct.long": "åªæœ‰æåŠçš„ç”¨æˆ¶èƒ½çœ‹åˆ°",
+  "privacy.direct.long": "åªæœ‰æåŠçš„ä½¿ç”¨è€…èƒ½çœ‹åˆ°",
   "privacy.direct.short": "ç§äººè¨Šæ¯",
-  "privacy.private.long": "åªæœ‰é—œæ³¨ä½ ç”¨æˆ¶èƒ½çœ‹åˆ°",
+  "privacy.private.long": "åªæœ‰ä½ çš„é—œæ³¨è€…èƒ½çœ‹åˆ°",
   "privacy.private.short": "é—œæ³¨è€…",
   "privacy.public.long": "åœ¨å…¬å…±æ™‚é–“è»¸é¡¯ç¤º",
   "privacy.public.short": "å…¬å…±",
@@ -340,11 +364,11 @@
   "refresh": "é‡æ–°æ•´ç†",
   "regeneration_indicator.label": "è¼‰å…¥ä¸â€¦â€¦",
   "regeneration_indicator.sublabel": "ä½ çš„ä¸»é æ™‚é–“è»¸æ£åœ¨æº–å‚™ä¸ï¼",
-  "relative_time.days": "{number}æ—¥",
-  "relative_time.hours": "{number}å°æ™‚",
+  "relative_time.days": "{number}æ—¥å‰",
+  "relative_time.hours": "{number}å°æ™‚å‰",
   "relative_time.just_now": "å‰›å‰›",
-  "relative_time.minutes": "{number}åˆ†é˜",
-  "relative_time.seconds": "{number}ç§’",
+  "relative_time.minutes": "{number}åˆ†é˜å‰",
+  "relative_time.seconds": "{number}ç§’å‰",
   "relative_time.today": "ä»Šå¤©",
   "reply_indicator.cancel": "å–æ¶ˆ",
   "report.forward": "è½‰å¯„åˆ° {target}",
@@ -355,28 +379,28 @@
   "report.target": "èˆ‰å ±",
   "search.placeholder": "æœå°‹",
   "search_popout.search_format": "é«˜ç´šæœç´¢æ ¼å¼",
-  "search_popout.tips.full_text": "è¼¸å…¥ç°¡å–®çš„æ–‡å—ï¼Œæœç´¢ç”±ä½ ç™¼æ”¾ã€æ”¶è—ã€è½‰æŽ¨å’ŒæåŠä½ çš„æ–‡ç« ï¼Œä»¥åŠç¬¦åˆçš„ç”¨æˆ¶åç¨±ï¼Œå¸³è™Ÿåç¨±å’Œæ¨™ç±¤ã€‚",
+  "search_popout.tips.full_text": "è¼¸å…¥ç°¡å–®çš„æ–‡å—ï¼Œæœç´¢ç”±ä½ ç™¼æ”¾ã€æ”¶è—ã€è½‰æŽ¨å’ŒæåŠä½ çš„æ–‡ç« ï¼Œä»¥åŠç¬¦åˆçš„ä½¿ç”¨è€…åç¨±ï¼Œé¡¯ç¤ºåç¨±å’Œæ¨™ç±¤ã€‚",
   "search_popout.tips.hashtag": "æ¨™ç±¤",
   "search_popout.tips.status": "æ–‡ç« ",
-  "search_popout.tips.text": "è¼¸å…¥ç°¡å–®çš„æ–‡å—ï¼Œæœç´¢ç¬¦åˆçš„ç”¨æˆ¶åç¨±ï¼Œå¸³è™Ÿåç¨±å’Œæ¨™ç±¤",
-  "search_popout.tips.user": "ç”¨æˆ¶",
+  "search_popout.tips.text": "è¼¸å…¥ç°¡å–®çš„æ–‡å—ï¼Œæœç´¢ç¬¦åˆçš„é¡¯ç¤ºåç¨±ã€ä½¿ç”¨è€…åç¨±å’Œæ¨™ç±¤",
+  "search_popout.tips.user": "ä½¿ç”¨è€…",
   "search_results.accounts": "ä½¿ç”¨è€…",
   "search_results.hashtags": "æ¨™ç±¤",
   "search_results.statuses": "æ–‡ç« ",
-  "search_results.statuses_fts_disabled": "ã€Œä¾å…§å®¹æœå°‹å˜Ÿæ–‡ã€æœªåœ¨æ¤ Mastodon ä¼ºæœå™¨å•Ÿç”¨ã€‚",
+  "search_results.statuses_fts_disabled": "æ¤ Mastodon ä¼ºæœå™¨ä¸¦æœªå•Ÿç”¨ã€Œæœå°‹æ–‡ç« å…§ç« ã€åŠŸèƒ½ã€‚",
   "search_results.total": "{count, number} é …çµæžœ",
   "status.admin_account": "é–‹å•Ÿ @{name} çš„ç®¡ç†ä»‹é¢",
-  "status.admin_status": "åœ¨ç®¡ç†ä»‹é¢é–‹å•Ÿæ¤å˜Ÿæ–‡",
+  "status.admin_status": "åœ¨ç®¡ç†ä»‹é¢é–‹å•Ÿé€™ç¯‡æ–‡ç« ",
   "status.block": "å°éŽ– @{name}",
   "status.bookmark": "æ›¸ç±¤",
   "status.cancel_reblog_private": "å–æ¶ˆè½‰æŽ¨",
   "status.cannot_reblog": "é€™ç¯‡æ–‡ç« ç„¡æ³•è¢«è½‰æŽ¨",
-  "status.copy": "å°‡é€£çµè¤‡è£½åˆ°å˜Ÿæ–‡ä¸",
+  "status.copy": "å°‡é€£çµè¤‡è£½åˆ°æ–‡ç« ä¸",
   "status.delete": "åˆªé™¤",
-  "status.detailed_status": "å°è©±çš„è©³ç´°å…§å®¹",
+  "status.detailed_status": "è©³ç´°å°è©±å…§å®¹",
   "status.direct": "ç§è¨Š @{name}",
-  "status.embed": "é‘²åµŒ",
-  "status.favourite": "æ”¶è—",
+  "status.embed": "åµŒå…¥",
+  "status.favourite": "æœ€æ„›",
   "status.filtered": "å·²éŽæ¿¾",
   "status.load_more": "è¼‰å…¥æ›´å¤š",
   "status.media_hidden": "éš±è—åª’é«”å…§å®¹",
@@ -391,7 +415,7 @@
   "status.reblog": "è½‰æŽ¨",
   "status.reblog_private": "è½‰æŽ¨åˆ°åŽŸè®€è€…",
   "status.reblogged_by": "{name} è½‰æŽ¨",
-  "status.reblogs.empty": "é‚„æ²’æœ‰äººè½‰å˜Ÿã€‚å¦‚æžœæœ‰ï¼Œæœƒé¡¯ç¤ºåœ¨é€™è£¡ã€‚",
+  "status.reblogs.empty": "é‚„æœªæœ‰äººè½‰æŽ¨ã€‚æœ‰çš„è©±æœƒé¡¯ç¤ºåœ¨é€™è£¡ã€‚",
   "status.redraft": "åˆªé™¤ä¸¦ç·¨è¼¯",
   "status.remove_bookmark": "ç§»é™¤æ›¸ç±¤",
   "status.reply": "å›žæ‡‰",
@@ -399,60 +423,61 @@
   "status.report": "èˆ‰å ± @{name}",
   "status.sensitive_warning": "æ•æ„Ÿå…§å®¹",
   "status.share": "åˆ†äº«",
-  "status.show_less": "æ¸›å°‘é¡¯ç¤º",
-  "status.show_less_all": "æ¸›å°‘é¡¯ç¤ºé€™é¡žæ–‡ç« ",
-  "status.show_more": "é¡¯ç¤ºæ›´å¤š",
-  "status.show_more_all": "é¡¯ç¤ºæ›´å¤šé€™é¡žæ–‡ç« ",
+  "status.show_less": "æ”¶èµ·",
+  "status.show_less_all": "å…¨éƒ¨æ”¶èµ·",
+  "status.show_more": "å±•é–‹",
+  "status.show_more_all": "å…¨éƒ¨å±•é–‹",
   "status.show_thread": "é¡¯ç¤ºè¨Žè«–ä¸²",
   "status.uncached_media_warning": "ç„¡æ³•ä½¿ç”¨",
-  "status.unmute_conversation": "è§£ç¦å°è©±",
+  "status.unmute_conversation": "å°è©±è§£é™¤éœéŸ³",
   "status.unpin": "è§£é™¤ç½®é ‚",
   "suggestions.dismiss": "é—œé–‰å»ºè°",
-  "suggestions.header": "æ‚¨å¯èƒ½å°é€™äº›æ±è¥¿æœ‰èˆˆè¶£â€¦",
+  "suggestions.header": "ä½ å¯èƒ½å°é€™äº›æ„Ÿèˆˆè¶£â€¦",
   "tabs_bar.federated_timeline": "è·¨ç«™",
   "tabs_bar.home": "ä¸»é ",
   "tabs_bar.local_timeline": "æœ¬ç«™",
   "tabs_bar.notifications": "é€šçŸ¥",
   "tabs_bar.search": "æœå°‹",
-  "time_remaining.days": "å‰©é¤˜{number, plural, one {# å¤©æ•¸} other {# å¤©æ•¸}}",
-  "time_remaining.hours": "å‰©é¤˜{number, plural, one {# å°æ™‚} other {# å°æ™‚}}",
-  "time_remaining.minutes": "å‰©é¤˜{number, plural, one {# åˆ†é˜} other {# åˆ†é˜}}",
+  "time_remaining.days": "å‰©é¤˜ {number, plural, one {# å¤©} other {# å¤©}}",
+  "time_remaining.hours": "å‰©é¤˜ {number, plural, one {# å°æ™‚} other {# å°æ™‚}}",
+  "time_remaining.minutes": "å‰©é¤˜ {number, plural, one {# åˆ†é˜} other {# åˆ†é˜}}",
   "time_remaining.moments": "å‰©é¤˜æ™‚é–“",
   "time_remaining.seconds": "å‰©é¤˜ {number, plural, one {# ç§’} other {# ç§’}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
-  "trends.trending_now": "ç›®å‰è¶¨å‹¢",
+  "timeline_hint.remote_resource_not_displayed": "ä¸æœƒé¡¯ç¤ºä¾†è‡ªå…¶ä»–ä¼ºæœå™¨çš„ {resource}",
+  "timeline_hint.resources.followers": "é—œæ³¨è€…",
+  "timeline_hint.resources.follows": "é—œæ³¨ä¸",
+  "timeline_hint.resources.statuses": "æ›´æ—©çš„æ–‡ç« ",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} å€‹äºº}other {{counter} å€‹äºº}}æ£åœ¨è¨Žè«–",
+  "trends.trending_now": "ç¾åœ¨æµè¡Œ",
   "ui.beforeunload": "å¦‚æžœä½ ç¾åœ¨é›¢é–‹ Mastodonï¼Œä½ çš„è‰ç¨¿å…§å®¹å°‡æœƒè¢«ä¸Ÿæ£„ã€‚",
   "units.short.billion": "{count}B",
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "å°‡æª”æ¡ˆæ‹–æ”¾è‡³æ¤ä¸Šè¼‰",
-  "upload_button.label": "ä¸Šè¼‰åª’é«”æª”æ¡ˆ",
+  "upload_button.label": "åŠ å…¥åœ–ç‰‡ã€å½±ç‰‡æˆ–éŸ³è¨Šæª”",
   "upload_error.limit": "å·²é”åˆ°æª”æ¡ˆä¸Šå‚³é™åˆ¶ã€‚",
   "upload_error.poll": "ä¸å…è¨±åœ¨æŠ•ç¥¨ä¸Šå‚³æª”æ¡ˆã€‚",
   "upload_form.audio_description": "ç°¡å–®æè¿°å…§å®¹çµ¦è½éšœäººå£«",
   "upload_form.description": "ç‚ºè¦–è¦ºéšœç¤™äººå£«æ·»åŠ æ–‡å—èªªæ˜Ž",
   "upload_form.edit": "ç·¨è¼¯",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "æ›´æ”¹é è¦½åœ–",
   "upload_form.undo": "åˆªé™¤",
   "upload_form.video_description": "ç°¡å–®æè¿°çµ¦è½éšœæˆ–è¦–éšœäººå£«",
   "upload_modal.analyzing_picture": "æ£åœ¨åˆ†æžåœ–ç‰‡â€¦",
   "upload_modal.apply": "å¥—ç”¨",
-  "upload_modal.choose_image": "Choose image",
-  "upload_modal.description_placeholder": "A quick brown fox è·³éŽé‚£éš»æ‡¶ç‹—",
+  "upload_modal.choose_image": "é¸æ“‡åœ–ç‰‡",
+  "upload_modal.description_placeholder": "ä¸€éš»æ•æ·çš„ç‹ç‹¸ï¼Œè¼•å·§åœ°è·³éŽé‚£éš»æ‡¶æ´‹æ´‹çš„ç‹—",
   "upload_modal.detect_text": "å¾žåœ–ç‰‡åµæ¸¬æ–‡å—",
   "upload_modal.edit_media": "ç·¨è¼¯åª’é«”",
   "upload_modal.hint": "é»žæ“Šæˆ–æ‹–æ›³åœ“åœˆä»¥é¸æ“‡é è¦½ç¸®åœ–ã€‚",
+  "upload_modal.preparing_ocr": "æº–å‚™è¾¨è˜åœ–ç‰‡æ–‡å—â€¦",
   "upload_modal.preview_label": "é è¦½ ({ratio})",
   "upload_progress.label": "ä¸Šè¼‰ä¸â€¦â€¦",
   "video.close": "é—œé–‰å½±ç‰‡",
   "video.download": "ä¸‹è¼‰æª”æ¡ˆ",
-  "video.exit_fullscreen": "é€€å‡ºå…¨ç†’å¹•",
+  "video.exit_fullscreen": "é€€å‡ºå…¨èž¢å¹•",
   "video.expand": "å±•é–‹å½±ç‰‡",
-  "video.fullscreen": "å…¨ç†’å¹•",
+  "video.fullscreen": "å…¨èž¢å¹•",
   "video.hide": "éš±è—å½±ç‰‡",
   "video.mute": "éœéŸ³",
   "video.pause": "æš«åœ",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index e964ccd4961fdda5db5203e8822cd3e77de5b53c..cc996e91b3b89587cefb5b22cbee7a55b719584b 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -1,28 +1,30 @@
 {
-  "account.account_note_header": "Note",
+  "account.account_note_header": "å‚™è¨»",
   "account.add_or_remove_from_list": "å¾žåå–®ä¸æ–°å¢žæˆ–ç§»é™¤",
   "account.badges.bot": "æ©Ÿå™¨äºº",
   "account.badges.group": "ç¾¤çµ„",
   "account.block": "å°éŽ– @{name}",
-  "account.block_domain": "éš±è—ä¾†è‡ª {domain} çš„æ‰€æœ‰å…§å®¹",
+  "account.block_domain": "å°éŽ–ä¾†è‡ª {domain} ç¶²åŸŸçš„æ‰€æœ‰å…§å®¹",
   "account.blocked": "å·²å°éŽ–",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "åœ¨è©²ä¼ºæœå™¨çš„å€‹äººæª”æ¡ˆé ä¸Šç€è¦½æ›´å¤š",
   "account.cancel_follow_request": "å–æ¶ˆé—œæ³¨è«‹æ±‚",
   "account.direct": "å‚³ç§è¨Šçµ¦ @{name}",
-  "account.domain_blocked": "å·²éš±è—ç¶²åŸŸ",
+  "account.disable_notifications": "å–æ¶ˆä¾†è‡ª @{name} å˜Ÿæ–‡çš„é€šçŸ¥",
+  "account.domain_blocked": "å·²å°éŽ–ç¶²åŸŸ",
   "account.edit_profile": "ç·¨è¼¯å€‹äººè³‡æ–™",
+  "account.enable_notifications": "ç•¶ @{name} å˜Ÿæ–‡æ™‚é€šçŸ¥æˆ‘",
   "account.endorse": "åœ¨å€‹äººè³‡æ–™æŽ¨è–¦å°æ–¹",
   "account.follow": "é—œæ³¨",
   "account.followers": "é—œæ³¨è€…",
-  "account.followers.empty": "å°šæ²’æœ‰äººé—œæ³¨é€™ä½ä½¿ç”¨è€…ã€‚",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
-  "account.follows.empty": "é€™ä½ä½¿ç”¨è€…å°šæœªé—œæ³¨ä»»ä½•ä½¿ç”¨è€…ã€‚",
-  "account.follows_you": "é—œæ³¨äº†ä½ ",
-  "account.hide_reblogs": "éš±è—ä¾†è‡ª @{name} çš„è½‰æŽ¨",
-  "account.last_status": "ä¸Šæ¬¡æ´»èº",
+  "account.followers.empty": "å°šæœªæœ‰äººé—œæ³¨é€™ä½ä½¿ç”¨è€…ã€‚",
+  "account.followers_counter": "è¢« {count, plural,one {{counter} äºº}other {{counter} äºº}}é—œæ³¨",
+  "account.following_counter": "æ£åœ¨é—œæ³¨ {count, plural,one {{counter}}other {{counter} äºº}}",
+  "account.follows.empty": "é€™ä½ä½¿ç”¨è€…å°šæœªé—œæ³¨ä»»ä½•äººã€‚",
+  "account.follows_you": "é—œæ³¨äº†æ‚¨",
+  "account.hide_reblogs": "éš±è—ä¾†è‡ª @{name} çš„è½‰å˜Ÿ",
+  "account.last_status": "ä¸Šæ¬¡æ´»èºæ™‚é–“",
   "account.link_verified_on": "å·²åœ¨ {date} æª¢æŸ¥æ¤é€£çµçš„æ“æœ‰è€…æ¬Šé™",
-  "account.locked_info": "é€™éš»å¸³æˆ¶çš„éš±ç§ç‹€æ…‹è¢«è¨æˆéŽ–å®šã€‚è©²æ“æœ‰è€…æœƒæ‰‹å‹•å¯©æ ¸èƒ½é—œæ³¨é€™éš»å¸³è™Ÿçš„äººã€‚",
+  "account.locked_info": "æ¤å¸³è™Ÿçš„éš±ç§ç‹€æ…‹è¢«è¨ç‚ºéŽ–å®šã€‚è©²æ“æœ‰è€…æœƒæ‰‹å‹•å¯©æ ¸èƒ½é—œæ³¨æ¤å¸³è™Ÿçš„äººã€‚",
   "account.media": "åª’é«”",
   "account.mention": "æåŠ @{name}",
   "account.moved_to": "{name} å·²é·ç§»è‡³ï¼š",
@@ -36,15 +38,15 @@
   "account.requested": "æ£åœ¨ç‰å¾…æ ¸å‡†ã€‚æŒ‰ä¸€ä¸‹å–æ¶ˆé—œæ³¨è«‹æ±‚",
   "account.share": "åˆ†äº« @{name} çš„å€‹äººè³‡æ–™",
   "account.show_reblogs": "é¡¯ç¤ºä¾†è‡ª @{name} çš„å˜Ÿæ–‡",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural,one {{counter} å‰‡}other {{counter} å‰‡}}å˜Ÿæ–‡",
   "account.unblock": "å–æ¶ˆå°éŽ– @{name}",
-  "account.unblock_domain": "å–æ¶ˆéš±è— {domain}",
+  "account.unblock_domain": "å–æ¶ˆå°éŽ–åŸŸå {domain}",
   "account.unendorse": "ä¸å†æ–¼å€‹äººè³‡æ–™é é¢æŽ¨è–¦å°æ–¹",
   "account.unfollow": "å–æ¶ˆé—œæ³¨",
   "account.unmute": "å–æ¶ˆéœéŸ³ @{name}",
   "account.unmute_notifications": "é‡æ–°æŽ¥æ”¶ä¾†è‡ª @{name} çš„é€šçŸ¥",
-  "account_note.placeholder": "Click to add a note",
-  "alert.rate_limited.message": "è«‹åœ¨ {retry_time, time, medium} éŽå¾Œé‡è©¦",
+  "account_note.placeholder": "æŒ‰æ¤æ·»åŠ å‚™æ³¨",
+  "alert.rate_limited.message": "è«‹åœ¨ {retry_time, time, medium} å¾Œé‡è©¦",
   "alert.rate_limited.title": "å·²é™é€Ÿ",
   "alert.unexpected.message": "ç™¼ç”Ÿäº†éžé æœŸçš„éŒ¯èª¤ã€‚",
   "alert.unexpected.title": "å“Žå‘€ï¼",
@@ -57,17 +59,17 @@
   "bundle_modal_error.close": "é—œé–‰",
   "bundle_modal_error.message": "è¼‰å…¥æ¤å…ƒä»¶æ™‚ç™¼ç”ŸéŒ¯èª¤ã€‚",
   "bundle_modal_error.retry": "é‡è©¦",
-  "column.blocks": "å°éŽ–çš„ä½¿ç”¨è€…",
+  "column.blocks": "å·²å°éŽ–çš„ä½¿ç”¨è€…",
   "column.bookmarks": "æ›¸ç±¤",
   "column.community": "æœ¬æ©Ÿæ™‚é–“è»¸",
   "column.direct": "ç§è¨Š",
   "column.directory": "ç€è¦½å€‹äººè³‡æ–™",
-  "column.domain_blocks": "éš±è—çš„ç¶²åŸŸ",
+  "column.domain_blocks": "å·²å°éŽ–çš„ç¶²åŸŸ",
   "column.favourites": "æ”¶è—",
   "column.follow_requests": "é—œæ³¨è«‹æ±‚",
-  "column.home": "ä¸»é ",
+  "column.home": "é¦–é ",
   "column.lists": "åå–®",
-  "column.mutes": "è¢«éœéŸ³çš„ä½¿ç”¨è€…",
+  "column.mutes": "å·²éœéŸ³çš„ä½¿ç”¨è€…",
   "column.notifications": "é€šçŸ¥",
   "column.pins": "é‡˜é¸çš„å˜Ÿæ–‡",
   "column.public": "è¯é‚¦æ™‚é–“è»¸",
@@ -79,113 +81,116 @@
   "column_header.show_settings": "é¡¯ç¤ºè¨å®š",
   "column_header.unpin": "å–æ¶ˆé‡˜é¸",
   "column_subheading.settings": "è¨å®š",
-  "community.column_settings.local_only": "åªæœ‰æœ¬åœ°",
+  "community.column_settings.local_only": "åªæœ‰æœ¬æ©Ÿ",
   "community.column_settings.media_only": "åªæœ‰åª’é«”",
   "community.column_settings.remote_only": "åªæœ‰é ç«¯",
   "compose_form.direct_message_warning": "é€™æ¢å˜Ÿæ–‡åªæœ‰è¢«æåŠçš„ä½¿ç”¨è€…æ‰çœ‹å¾—åˆ°ã€‚",
   "compose_form.direct_message_warning_learn_more": "äº†è§£æ›´å¤š",
-  "compose_form.hashtag_warning": "ç”±æ–¼é€™å‰‡å˜Ÿæ–‡è¢«è¨å®šæˆã€Œä¸å…¬é–‹ã€ï¼Œæ‰€ä»¥å®ƒå°‡ä¸æœƒè¢«åˆ—åœ¨ä»»ä½•ä¸»é¡Œæ¨™ç±¤ä¸‹ã€‚åªæœ‰å…¬é–‹çš„å˜Ÿæ–‡æ‰èƒ½è—‰ä¸»é¡Œæ¨™ç±¤æ‰¾åˆ°ã€‚",
+  "compose_form.hashtag_warning": "ç”±æ–¼é€™å‰‡å˜Ÿæ–‡è¨å®šç‚ºã€Œä¸å…¬é–‹ã€ï¼Œå®ƒå°‡ä¸æœƒè¢«åˆ—æ–¼ä»»ä½•ä¸»é¡Œæ¨™ç±¤ä¸‹ã€‚åªæœ‰å…¬é–‹çš„å˜Ÿæ–‡æ‰èƒ½è—‰ç”±ä¸»é¡Œæ¨™ç±¤æ‰¾åˆ°ã€‚",
   "compose_form.lock_disclaimer": "æ‚¨çš„å¸³æˆ¶å°šæœª{locked}ã€‚ä»»ä½•äººéƒ½èƒ½é—œæ³¨æ‚¨ä¸¦çœ‹åˆ°æ‚¨è¨å®šæˆåªæœ‰é—œæ³¨è€…èƒ½çœ‹çš„å˜Ÿæ–‡ã€‚",
   "compose_form.lock_disclaimer.lock": "ä¸ŠéŽ–",
-  "compose_form.placeholder": "æ‚¨æ£åœ¨æƒ³äº›ä»€éº¼ï¼Ÿ",
-  "compose_form.poll.add_option": "æ–°å¢žé¸æ“‡",
+  "compose_form.placeholder": "æ£åœ¨æƒ³äº›ä»€éº¼å—Žï¼Ÿ",
+  "compose_form.poll.add_option": "æ–°å¢žé¸é …",
   "compose_form.poll.duration": "æŠ•ç¥¨æœŸé™",
-  "compose_form.poll.option_placeholder": "ç¬¬ {number} å€‹é¸æ“‡",
-  "compose_form.poll.remove_option": "ç§»é™¤æ¤é¸æ“‡",
+  "compose_form.poll.option_placeholder": "ç¬¬ {number} å€‹é¸é …",
+  "compose_form.poll.remove_option": "ç§»é™¤æ¤é¸é …",
   "compose_form.poll.switch_to_multiple": "è®Šæ›´æŠ•ç¥¨ç‚ºå…è¨±å¤šå€‹é¸é …",
   "compose_form.poll.switch_to_single": "è®Šæ›´æŠ•ç¥¨ç‚ºå…è¨±å–®ä¸€é¸é …",
   "compose_form.publish": "å˜Ÿå‡ºåŽ»",
   "compose_form.publish_loud": "{publish}ï¼",
   "compose_form.sensitive.hide": "æ¨™è¨˜åª’é«”ç‚ºæ•æ„Ÿå…§å®¹",
   "compose_form.sensitive.marked": "æ¤åª’é«”è¢«æ¨™è¨˜ç‚ºæ•æ„Ÿå…§å®¹",
-  "compose_form.sensitive.unmarked": "æ¤åª’é«”æœªæ¨™è¨˜ç‚ºæ•æ„Ÿå…§å®¹",
+  "compose_form.sensitive.unmarked": "æ¤åª’é«”æœªè¢«æ¨™è¨˜ç‚ºæ•æ„Ÿå…§å®¹",
   "compose_form.spoiler.marked": "æ£æ–‡å·²éš±è—åˆ°è¦å‘Šä¹‹å¾Œ",
   "compose_form.spoiler.unmarked": "æ£æ–‡æœªè¢«éš±è—",
   "compose_form.spoiler_placeholder": "è«‹åœ¨æ¤è™•å¯«å…¥è¦å‘Šè¨Šæ¯",
   "confirmation_modal.cancel": "å–æ¶ˆ",
   "confirmations.block.block_and_report": "å°éŽ–ä¸¦æª¢èˆ‰",
   "confirmations.block.confirm": "å°éŽ–",
-  "confirmations.block.message": "ç¢ºå®šå°éŽ– {name} ï¼Ÿ",
+  "confirmations.block.message": "ç¢ºå®šè¦å°éŽ– {name} å—Žï¼Ÿ",
   "confirmations.delete.confirm": "åˆªé™¤",
-  "confirmations.delete.message": "ä½ ç¢ºå®šè¦åˆªé™¤é€™æ¢å˜Ÿæ–‡ï¼Ÿ",
+  "confirmations.delete.message": "æ‚¨ç¢ºå®šè¦åˆªé™¤é€™å‰‡å˜Ÿæ–‡ï¼Ÿ",
   "confirmations.delete_list.confirm": "åˆªé™¤",
   "confirmations.delete_list.message": "ç¢ºå®šæ°¸ä¹…åˆªé™¤æ¤åå–®ï¼Ÿ",
-  "confirmations.domain_block.confirm": "éš±è—æ•´å€‹ç¶²åŸŸ",
-  "confirmations.domain_block.message": "çœŸçš„éžå¸¸ç¢ºå®šå°éŽ–æ•´å€‹ {domain} å—Žï¼Ÿå¤§éƒ¨åˆ†æƒ…æ³ä¸‹ï¼Œä½ åªéœ€è¦å°éŽ–æˆ–éœéŸ³å°‘æ•¸ç‰¹å®šçš„äººå°±èƒ½æ»¿è¶³éœ€æ±‚äº†ã€‚ä½ å°‡ä¸èƒ½åœ¨ä»»ä½•å…¬é–‹çš„æ™‚é–“è»¸åŠé€šçŸ¥ä¸çœ‹åˆ°é‚£å€‹ç¶²åŸŸçš„å…§å®¹ã€‚ä½ ä¾†è‡ªè©²ç¶²åŸŸçš„é—œæ³¨è€…ä¹Ÿæœƒè¢«ç§»é™¤ã€‚",
+  "confirmations.domain_block.confirm": "éš±è—æ•´å€‹åŸŸå",
+  "confirmations.domain_block.message": "çœŸçš„éžå¸¸ç¢ºå®šå°éŽ–æ•´å€‹ {domain} ç¶²åŸŸå—Žï¼Ÿå¤§éƒ¨åˆ†æƒ…æ³ä¸‹ï¼Œæ‚¨åªéœ€è¦å°éŽ–æˆ–éœéŸ³å°‘æ•¸ç‰¹å®šçš„å¸³è™Ÿå°±èƒ½æ»¿è¶³éœ€æ±‚äº†ã€‚æ‚¨å°‡ä¸èƒ½åœ¨ä»»ä½•å…¬é–‹çš„æ™‚é–“è»¸åŠé€šçŸ¥ä¸çœ‹åˆ°æ¤ç¶²åŸŸçš„å…§å®¹ã€‚æ‚¨ä¾†è‡ªè©²ç¶²åŸŸçš„é—œæ³¨è€…ä¹Ÿå°‡è¢«ç§»é™¤ã€‚",
   "confirmations.logout.confirm": "ç™»å‡º",
   "confirmations.logout.message": "ç¢ºå®šè¦ç™»å‡ºå—Žï¼Ÿ",
   "confirmations.mute.confirm": "éœéŸ³",
-  "confirmations.mute.explanation": "é€™å°‡æœƒéš±è—ä¾†è‡ªä»–å€‘çš„è²¼æ–‡èˆ‡é€šçŸ¥ï¼Œä½†æ˜¯ä»–å€‘é‚„æ˜¯å¯ä»¥æŸ¥é–±ä½ çš„è²¼æ–‡èˆ‡é—œæ³¨ä½ ã€‚",
+  "confirmations.mute.explanation": "é€™å°‡æœƒéš±è—ä¾†è‡ªä»–å€‘çš„è²¼æ–‡èˆ‡é€šçŸ¥ï¼Œä½†æ˜¯ä»–å€‘é‚„æ˜¯å¯ä»¥æŸ¥é–±ä½ çš„è²¼æ–‡èˆ‡é—œæ³¨æ‚¨ã€‚",
   "confirmations.mute.message": "ç¢ºå®šéœéŸ³ {name} ï¼Ÿ",
   "confirmations.redraft.confirm": "åˆªé™¤ä¸¦é‡æ–°ç·¨è¼¯",
   "confirmations.redraft.message": "ç¢ºå®šåˆªæŽ‰é€™å‰‡å˜Ÿæ–‡ä¸¦é‡æ–°ç·¨è¼¯å—Žï¼Ÿå°‡æœƒå¤±åŽ»é€™å‰‡å˜Ÿæ–‡çš„è½‰å˜ŸåŠæ”¶è—ï¼Œä¸”å›žè¦†é€™å‰‡çš„å˜Ÿæ–‡å°‡æœƒè®Šæˆç¨ç«‹çš„å˜Ÿæ–‡ã€‚",
   "confirmations.reply.confirm": "å›žè¦†",
   "confirmations.reply.message": "ç¾åœ¨å›žè¦†å°‡è“‹æŽ‰æ‚¨ç›®å‰æ£åœ¨æ’°å¯«çš„è¨Šæ¯ã€‚æ˜¯å¦ä»è¦å›žè¦†ï¼Ÿ",
   "confirmations.unfollow.confirm": "å–æ¶ˆé—œæ³¨",
-  "confirmations.unfollow.message": "çœŸçš„è¦å–æ¶ˆé—œæ³¨ {name} å—Žï¼Ÿ",
+  "confirmations.unfollow.message": "ç¢ºå®šè¦å–æ¶ˆé—œæ³¨ {name} å—Žï¼Ÿ",
   "conversation.delete": "åˆªé™¤å°è©±",
-  "conversation.mark_as_read": "æ¨™ç‚ºå·²è®€",
+  "conversation.mark_as_read": "æ¨™è¨˜ç‚ºå·²è®€",
   "conversation.open": "æª¢è¦–å°è©±",
   "conversation.with": "èˆ‡ {names}",
   "directory.federated": "ä¾†è‡ªå·²çŸ¥è¯é‚¦å®‡å®™",
-  "directory.local": "åƒ…ä¾†è‡ª {domain}",
-  "directory.new_arrivals": "æ–°è²¨",
+  "directory.local": "åƒ…ä¾†è‡ª {domain} ç¶²åŸŸ",
+  "directory.new_arrivals": "æ–°äºº",
   "directory.recently_active": "æœ€è¿‘æ´»èº",
-  "embed.instructions": "è¦åµŒå…¥æ¤å˜Ÿæ–‡ï¼Œè«‹å°‡ä»¥ä¸‹ç¨‹å¼ç¢¼è²¼é€²ä½ çš„ç¶²ç«™ã€‚",
-  "embed.preview": "ä»–æœƒé¡¯ç¤ºæˆé€™æ¨£ï¼š",
+  "embed.instructions": "è¦åœ¨æ‚¨çš„ç¶²ç«™åµŒå…¥æ¤å˜Ÿæ–‡ï¼Œè«‹è¤‡è£½ä»¥ä¸‹ç¨‹å¼ç¢¼ã€‚",
+  "embed.preview": "å®ƒå°‡é¡¯ç¤ºæˆé€™æ¨£ï¼š",
   "emoji_button.activity": "æ´»å‹•",
   "emoji_button.custom": "è‡ªè¨‚",
-  "emoji_button.flags": "æ——æ¨™",
-  "emoji_button.food": "é£²é£Ÿ",
+  "emoji_button.flags": "æ——å¹Ÿ",
+  "emoji_button.food": "é£Ÿç‰© & é£²æ–™",
   "emoji_button.label": "æ’å…¥è¡¨æƒ…ç¬¦è™Ÿ",
-  "emoji_button.nature": "å¤§è‡ªç„¶",
+  "emoji_button.nature": "è‡ªç„¶",
   "emoji_button.not_found": "å•Šå°±æ²’é€™è¡¨æƒ…ç¬¦è™Ÿå¼ï¼ï¼ (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
   "emoji_button.objects": "ç‰©ä»¶",
-  "emoji_button.people": "ä½¿ç”¨è€…",
+  "emoji_button.people": "äººç‰©",
   "emoji_button.recent": "æœ€å¸¸ä½¿ç”¨",
   "emoji_button.search": "æœå°‹â€¦",
   "emoji_button.search_results": "æœå°‹çµæžœ",
   "emoji_button.symbols": "ç¬¦è™Ÿ",
   "emoji_button.travel": "æ—…éŠèˆ‡åœ°é»ž",
+  "empty_column.account_suspended": "å¸³è™Ÿè¢«æš«åœ",
   "empty_column.account_timeline": "é€™è£¡é‚„æ²’æœ‰å˜Ÿæ–‡ï¼",
   "empty_column.account_unavailable": "ç„¡æ³•å–å¾—å€‹äººè³‡æ–™",
-  "empty_column.blocks": "ä½ é‚„æ²’æœ‰å°éŽ–ä»»ä½•ä½¿ç”¨è€…ã€‚",
-  "empty_column.bookmarked_statuses": "ä½ é‚„æ²’å»ºç«‹ä»»ä½•æ›¸ç±¤ã€‚é€™è£¡å°‡æœƒé¡¯ç¤ºä½ å»ºç«‹çš„æ›¸ç±¤ã€‚",
-  "empty_column.community": "æœ¬åœ°æ™‚é–“è»¸æ˜¯ç©ºçš„ã€‚å¿«å…¬é–‹å˜Ÿäº›æ–‡æ¶é é¦™å•Šï¼",
+  "empty_column.blocks": "æ‚¨é‚„æ²’æœ‰å°éŽ–ä»»ä½•ä½¿ç”¨è€…ã€‚",
+  "empty_column.bookmarked_statuses": "æ‚¨é‚„æ²’å»ºç«‹ä»»ä½•æ›¸ç±¤ã€‚ç•¶æ‚¨å»ºç«‹æ›¸ç°½æ™‚ï¼Œå®ƒå°‡æ–¼æ¤é¡¯ç¤ºã€‚",
+  "empty_column.community": "æœ¬æ©Ÿæ™‚é–“è»¸æ˜¯ç©ºçš„ã€‚å¿«å…¬é–‹å˜Ÿäº›æ–‡æ¶é é¦™å•Šï¼",
   "empty_column.direct": "æ‚¨é‚„æ²’æœ‰ä»»ä½•ç§è¨Šã€‚ç•¶æ‚¨ç§è¨Šåˆ¥äººæˆ–æ”¶åˆ°ç§è¨Šæ™‚ï¼Œå®ƒå°‡æ–¼æ¤é¡¯ç¤ºã€‚",
-  "empty_column.domain_blocks": "å°šæœªéš±è—ä»»ä½•ç¶²åŸŸã€‚",
-  "empty_column.favourited_statuses": "ä½ é‚„æ²’æ”¶è—ä»»ä½•å˜Ÿæ–‡ã€‚é€™è£¡å°‡æœƒé¡¯ç¤ºä½ æ”¶è—çš„å˜Ÿæ–‡ã€‚",
-  "empty_column.favourites": "é‚„æ²’æœ‰äººæ”¶è—é€™å‰‡å˜Ÿæ–‡ã€‚é€™è£¡å°‡æœƒé¡¯ç¤ºè¢«æ”¶è—çš„å˜Ÿæ–‡ã€‚",
+  "empty_column.domain_blocks": "å°šæœªå°éŽ–ä»»ä½•ç¶²åŸŸã€‚",
+  "empty_column.favourited_statuses": "æ‚¨é‚„æ²’æ”¶è—éŽä»»ä½•å˜Ÿæ–‡ã€‚ç•¶æ‚¨æ”¶è—å˜Ÿæ–‡æ™‚ï¼Œå®ƒå°‡æ–¼æ¤é¡¯ç¤ºã€‚",
+  "empty_column.favourites": "é‚„æ²’æœ‰äººæ”¶è—éŽé€™å‰‡å˜Ÿæ–‡ã€‚ç•¶æœ‰äººæ”¶è—å˜Ÿæ–‡æ™‚ï¼Œå®ƒå°‡æ–¼æ¤é¡¯ç¤ºã€‚",
   "empty_column.follow_requests": "æ‚¨å°šæœªæ”¶åˆ°ä»»ä½•é—œæ³¨è«‹æ±‚ã€‚é€™è£¡å°‡æœƒé¡¯ç¤ºæ”¶åˆ°çš„é—œæ³¨è«‹æ±‚ã€‚",
   "empty_column.hashtag": "é€™å€‹ä¸»é¡Œæ¨™ç±¤ä¸‹ä»€éº¼ä¹Ÿæ²’æœ‰ã€‚",
   "empty_column.home": "æ‚¨çš„é¦–é æ™‚é–“è»¸æ˜¯ç©ºçš„ï¼å‰å¾€ {public} æˆ–ä½¿ç”¨æœå°‹åŠŸèƒ½ä¾†èªè˜å…¶ä»–äººã€‚",
   "empty_column.home.public_timeline": "å…¬é–‹æ™‚é–“è»¸",
   "empty_column.list": "é€™ä»½åå–®é‚„æ²’æœ‰æ±è¥¿ã€‚ç•¶æ¤åå–®çš„æˆå“¡å˜Ÿå‡ºäº†æ–°çš„å˜Ÿæ–‡æ™‚ï¼Œå®ƒå€‘å°±æœƒé¡¯ç¤ºæ–¼æ¤ã€‚",
-  "empty_column.lists": "ä½ é‚„æ²’æœ‰å»ºç«‹ä»»ä½•åå–®ã€‚é€™è£¡å°‡æœƒé¡¯ç¤ºä½ æ‰€å»ºç«‹çš„åå–®ã€‚",
-  "empty_column.mutes": "ä½ å°šæœªéœéŸ³ä»»ä½•ä½¿ç”¨è€…ã€‚",
+  "empty_column.lists": "æ‚¨é‚„æ²’æœ‰å»ºç«‹ä»»ä½•åå–®ã€‚é€™è£¡å°‡æœƒé¡¯ç¤ºæ‚¨æ‰€å»ºç«‹çš„åå–®ã€‚",
+  "empty_column.mutes": "æ‚¨å°šæœªéœéŸ³ä»»ä½•ä½¿ç”¨è€…ã€‚",
   "empty_column.notifications": "æ‚¨å°šæœªæ”¶åˆ°ä»»ä½•é€šçŸ¥ï¼Œå’Œåˆ¥äººäº’å‹•é–‹å•Ÿå°è©±å§ã€‚",
   "empty_column.public": "é€™è£¡ä»€éº¼éƒ½æ²’æœ‰ï¼å˜—è©¦å¯«äº›å…¬é–‹çš„å˜Ÿæ–‡ï¼Œæˆ–è‘—è‡ªå·±é—œæ³¨å…¶ä»–ä¼ºæœå™¨çš„ä½¿ç”¨è€…å¾Œå°±æœƒæœ‰å˜Ÿæ–‡å‡ºç¾äº†",
-  "error.unexpected_crash.explanation": "ç”±æ–¼ç™¼ç”Ÿç³»çµ±æ•…éšœæˆ–ç€è¦½å™¨ç›¸å®¹æ€§å•é¡Œï¼Œæ•…ç„¡æ³•æ£å¸¸é¡¯ç¤ºé é¢ã€‚",
-  "error.unexpected_crash.next_steps": "è«‹å˜—è©¦é‡æ–°æ•´ç†é é¢ã€‚å¦‚æžœç‹€æ³æ²’æœ‰é€²å±•ï¼Œä½ å¯ä»¥ä½¿ç”¨ä¸åŒçš„ç€è¦½å™¨æˆ– Mastodon æ‡‰ç”¨ç¨‹å¼ä¾†æª¢è¦–ã€‚",
-  "errors.unexpected_crash.copy_stacktrace": "è¤‡è£½åˆ°å‰ªè²¼ç°¿",
-  "errors.unexpected_crash.report_issue": "èˆ‰å ±å•é¡Œ",
+  "error.unexpected_crash.explanation": "ç”±æ–¼ç™¼ç”Ÿç³»çµ±æ•…éšœæˆ–ç€è¦½å™¨ç›¸å®¹æ€§å•é¡Œï¼Œç„¡æ³•æ£å¸¸é¡¯ç¤ºæ¤é é¢ã€‚",
+  "error.unexpected_crash.explanation_addons": "æ¤é é¢ç„¡æ³•è¢«æ£å¸¸é¡¯ç¤ºï¼Œé€™å¯èƒ½æ˜¯ç”±ç€è¦½å™¨é™„åŠ å…ƒä»¶æˆ–ç¶²é è‡ªå‹•ç¿»è¯å·¥å…·é€ æˆçš„ã€‚",
+  "error.unexpected_crash.next_steps": "è«‹å˜—è©¦é‡æ–°æ•´ç†é é¢ã€‚å¦‚æžœç‹€æ³æ²’æœ‰æ”¹å–„ï¼Œæ‚¨å¯ä»¥ä½¿ç”¨ä¸åŒçš„ç€è¦½å™¨æˆ–æ‡‰ç”¨ç¨‹å¼ä¾†æª¢è¦–ä¾†ä½¿ç”¨ Mastodonã€‚",
+  "error.unexpected_crash.next_steps_addons": "è«‹å˜—è©¦é—œé–‰ä»–å€‘ç„¶å¾Œé‡æ–°æ•´ç†é é¢ã€‚å¦‚æžœç‹€æ³æ²’æœ‰æ”¹å–„ï¼Œæ‚¨å¯ä»¥ä½¿ç”¨ä¸åŒçš„ç€è¦½å™¨æˆ–æ‡‰ç”¨ç¨‹å¼ä¾†æª¢è¦–ä¾†ä½¿ç”¨ Mastodonã€‚",
+  "errors.unexpected_crash.copy_stacktrace": "è¤‡è£½ stacktrace åˆ°å‰ªè²¼ç°¿",
+  "errors.unexpected_crash.report_issue": "å›žå ±å•é¡Œ",
   "follow_request.authorize": "æŽˆæ¬Š",
   "follow_request.reject": "æ‹’çµ•",
-  "follow_requests.unlocked_explanation": "å³ä¾¿æ‚¨çš„å¸³è™Ÿæœªè¢«éŽ–å®šï¼Œ{domain} çš„å“¡å·¥èªç‚ºå¯èƒ½æƒ³è¦è‡ªå·±å¯©æ ¸é€™äº›å¸³è™Ÿçš„è¿½è¹¤è«‹æ±‚ã€‚",
-  "generic.saved": "Saved",
+  "follow_requests.unlocked_explanation": "å³ä¾¿æ‚¨çš„å¸³è™Ÿæœªè¢«éŽ–å®šï¼Œ{domain} çš„å“¡å·¥èªç‚ºæ‚¨å¯èƒ½æƒ³è¦è‡ªå·±å¯©æ ¸é€™äº›å¸³è™Ÿçš„è¿½è¹¤è«‹æ±‚ã€‚",
+  "generic.saved": "å·²å„²å˜",
   "getting_started.developers": "é–‹ç™¼è€…",
   "getting_started.directory": "å€‹äººè³‡æ–™ç›®éŒ„",
   "getting_started.documentation": "æ–‡ä»¶",
   "getting_started.heading": "é–‹å§‹ä½¿ç”¨",
   "getting_started.invite": "é‚€è«‹ä½¿ç”¨è€…",
-  "getting_started.open_source_notice": "Mastodon æ˜¯é–‹æºè»Ÿé«”ã€‚ä½ å¯ä»¥åœ¨ GitHub {github} ä¸Šè²¢ç»æˆ–æ˜¯å›žå ±å•é¡Œã€‚",
-  "getting_started.security": "å®‰å…¨æ€§",
+  "getting_started.open_source_notice": "Mastodon æ˜¯é–‹æºè»Ÿé«”ã€‚æ‚¨å¯ä»¥åœ¨ GitHub {github} ä¸Šè²¢ç»æˆ–æ˜¯å›žå ±å•é¡Œã€‚",
+  "getting_started.security": "å¸³è™Ÿå®‰å…¨æ€§è¨å®š",
   "getting_started.terms": "æœå‹™æ¢æ¬¾",
-  "hashtag.column_header.tag_mode.all": "ä»¥åŠ{additional}",
-  "hashtag.column_header.tag_mode.any": "æˆ–æ˜¯{additional}",
-  "hashtag.column_header.tag_mode.none": "è€Œç„¡éœ€{additional}",
+  "hashtag.column_header.tag_mode.all": "ä»¥åŠ {additional}",
+  "hashtag.column_header.tag_mode.any": "æˆ–æ˜¯ {additional}",
+  "hashtag.column_header.tag_mode.none": "è€Œç„¡éœ€ {additional}",
   "hashtag.column_settings.select.no_options_message": "æ‰¾ä¸åˆ°å»ºè°",
-  "hashtag.column_settings.select.placeholder": "è¼¸å…¥ä¸»é¡Œæ¨™ç±¤â€¦",
+  "hashtag.column_settings.select.placeholder": "è«‹è¼¸å…¥ä¸»é¡Œæ¨™ç±¤â€¦",
   "hashtag.column_settings.tag_mode.all": "å…¨éƒ¨",
   "hashtag.column_settings.tag_mode.any": "ä»»ä¸€",
   "hashtag.column_settings.tag_mode.none": "å…¨ä¸",
@@ -199,14 +204,14 @@
   "intervals.full.hours": "{number, plural, one {# å°æ™‚} other {# å°æ™‚}}",
   "intervals.full.minutes": "{number, plural, one {# åˆ†é˜} other {# åˆ†é˜}}",
   "introduction.federation.action": "ä¸‹ä¸€æ¥",
-  "introduction.federation.federated.headline": "ç«™å°è¯ç›Ÿ",
-  "introduction.federation.federated.text": "ä¾†è‡ªè¯ç›Ÿå®‡å®™ä¸å…¶ä»–ç«™å°çš„å…¬é–‹å˜Ÿæ–‡å°‡æœƒåœ¨ç«™é»žè¯ç›Ÿæ™‚é–“è»¸ä¸é¡¯ç¤ºã€‚",
+  "introduction.federation.federated.headline": "è¯é‚¦",
+  "introduction.federation.federated.text": "ä¾†è‡ªè¯ç›Ÿå®‡å®™ä¸å…¶ä»–ä¼ºæœå™¨çš„å…¬é–‹å˜Ÿæ–‡å°‡æœƒåœ¨è¯é‚¦æ™‚é–“è»¸ä¸é¡¯ç¤ºã€‚",
   "introduction.federation.home.headline": "é¦–é ",
   "introduction.federation.home.text": "ä½ é—œæ³¨ä½¿ç”¨è€…çš„å˜Ÿæ–‡å°‡æœƒåœ¨é¦–é å‹•æ…‹ä¸é¡¯ç¤ºã€‚ä½ å¯ä»¥é—œæ³¨ä»»ä½•ä¼ºæœå™¨ä¸Šçš„ä»»ä½•äººï¼",
   "introduction.federation.local.headline": "æœ¬æ©Ÿ",
   "introduction.federation.local.text": "è·Ÿæ‚¨åŒä¼ºæœå™¨ä¹‹ä½¿ç”¨è€…æ‰€ç™¼çš„å…¬é–‹å˜Ÿæ–‡å°‡æœƒé¡¯ç¤ºåœ¨æœ¬æ©Ÿæ™‚é–“è»¸ä¸ã€‚",
   "introduction.interactions.action": "å®Œæˆæ•™å¸ï¼",
-  "introduction.interactions.favourite.headline": "é—œæ³¨",
+  "introduction.interactions.favourite.headline": "æ”¶è—",
   "introduction.interactions.favourite.text": "æ‚¨èƒ½å„²å˜å˜Ÿæ–‡ä¾›ç¨å€™è§€çœ‹ï¼Œæˆ–è€…æ”¶è—å˜Ÿæ–‡ï¼Œè®“ä½œè€…çŸ¥é“æ‚¨å–œæ¡é€™å‰‡å˜Ÿæ–‡ã€‚",
   "introduction.interactions.reblog.headline": "è½‰å˜Ÿ",
   "introduction.interactions.reblog.text": "æ‚¨èƒ½è—‰ç”±è½‰å˜Ÿä»–äººå˜Ÿæ–‡ä¾†åˆ†äº«çµ¦æ‚¨çš„é—œæ³¨è€…ã€‚",
@@ -214,23 +219,23 @@
   "introduction.interactions.reply.text": "æ‚¨èƒ½å›žè¦†å…¶ä»–äººæˆ–è‡ªå·±çš„å˜Ÿæ–‡ï¼Œé€™éº¼åšæœƒæŠŠé€™äº›å›žè¦†ä¸²æˆä¸€ä¸²å°è©±ã€‚",
   "introduction.welcome.action": "é–‹å§‹æ—…ç¨‹å§ï¼",
   "introduction.welcome.headline": "ç¬¬ä¸€æ¥",
-  "introduction.welcome.text": "æ¡è¿Žä¾†åˆ°è¯ç›Ÿå®‡å®™ï¼ç‰ç‰ä½ å°±å¯ä»¥å»£æ’è¨Šæ¯åŠè·¨è¶Šå„ç¨®å„å¼å„æ¨£çš„ä¼ºæœå™¨èˆ‡æœ‹å‹èŠå¤©ã€‚ä½†é€™å°ä¼ºæœå™¨ï¼Œ{domain}ï¼Œéžå¸¸ç‰¹åˆ¥ - å®ƒå¯„ç®¡äº†ä½ çš„å€‹äººè³‡æ–™ï¼Œæ‰€ä»¥è«‹è¨˜ä½å®ƒçš„åå—ã€‚",
+  "introduction.welcome.text": "æ¡è¿Žä¾†åˆ°è¯ç›Ÿå®‡å®™ï¼ç¨å€™æ‚¨å°±å¯ä»¥å»£æ’è¨Šæ¯åŠè·¨è¶Šå„ç¨®å„å¼å„æ¨£çš„ä¼ºæœå™¨èˆ‡æœ‹å‹èŠå¤©ã€‚ä½†é€™å°ä¼ºæœå™¨ï¼Œ{domain}ï¼Œéžå¸¸ç‰¹åˆ¥ - å®ƒæ‰¿è¼‰äº†æ‚¨çš„å€‹äººè³‡æ–™ï¼Œæ‰€ä»¥è«‹è¨˜ä½å®ƒçš„åå—ã€‚",
   "keyboard_shortcuts.back": "è¿”å›žä¸Šä¸€é ",
   "keyboard_shortcuts.blocked": "é–‹å•Ÿã€Œå°éŽ–ä½¿ç”¨è€…ã€åå–®",
   "keyboard_shortcuts.boost": "è½‰å˜Ÿ",
   "keyboard_shortcuts.column": "å°‡ç„¦é»žæ”¾åœ¨å…¶ä¸ä¸€æ¬„çš„å˜Ÿæ–‡",
   "keyboard_shortcuts.compose": "å°‡ç„¦é»žç§»è‡³æ’°å¯«æ–‡å—å€å¡Š",
-  "keyboard_shortcuts.description": "æè¿°",
+  "keyboard_shortcuts.description": "èªªæ˜Ž",
   "keyboard_shortcuts.direct": "é–‹å•Ÿç§è¨Šæ¬„",
-  "keyboard_shortcuts.down": "å¾€ä¸‹ç§»å‹•åå–®é …ç›®",
+  "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.hotkey": "å¿«é€Ÿéµ",
-  "keyboard_shortcuts.legend": "é¡¯ç¤ºæ¤åˆ—è¡¨",
+  "keyboard_shortcuts.legend": "é¡¯ç¤ºæ¤åœ–ä¾‹",
   "keyboard_shortcuts.local": "é–‹å•Ÿæœ¬æ©Ÿæ™‚é–“è»¸",
   "keyboard_shortcuts.mention": "æåŠä½œè€…",
   "keyboard_shortcuts.muted": "é–‹å•ŸéœéŸ³ä½¿ç”¨è€…åå–®",
@@ -239,20 +244,21 @@
   "keyboard_shortcuts.open_media": "é–‹å•Ÿåª’é«”",
   "keyboard_shortcuts.pinned": "é–‹å•Ÿé‡˜é¸çš„å˜Ÿæ–‡åå–®",
   "keyboard_shortcuts.profile": "é–‹å•Ÿä½œè€…çš„å€‹äººè³‡æ–™é é¢",
-  "keyboard_shortcuts.reply": "å›žè¦†",
+  "keyboard_shortcuts.reply": "å›žæ‡‰å˜Ÿæ–‡",
   "keyboard_shortcuts.requests": "é–‹å•Ÿé—œæ³¨è«‹æ±‚åå–®",
   "keyboard_shortcuts.search": "å°‡ç„¦é»žç§»è‡³æœå°‹æ¡†",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "é¡¯ç¤ºæˆ–éš±è—è¢«æŠ˜ç–Šçš„æ£æ–‡",
   "keyboard_shortcuts.start": "é–‹å•Ÿã€Œé–‹å§‹ä½¿ç”¨ã€æ¬„ä½",
   "keyboard_shortcuts.toggle_hidden": "é¡¯ç¤º/éš±è—åœ¨å…§å®¹è¦å‘Šä¹‹å¾Œçš„æ£æ–‡",
   "keyboard_shortcuts.toggle_sensitivity": "é¡¯ç¤º / éš±è—åª’é«”",
   "keyboard_shortcuts.toot": "é–‹å§‹ç™¼å‡ºæ–°å˜Ÿæ–‡",
   "keyboard_shortcuts.unfocus": "å–æ¶ˆè¼¸å…¥æ–‡å—å€å¡Š / æœå°‹çš„ç„¦é»ž",
-  "keyboard_shortcuts.up": "å¾€ä¸Šç§»å‹•åå–®é …ç›®",
+  "keyboard_shortcuts.up": "åœ¨åå–®ä¸å¾€ä¸Šç§»å‹•",
   "lightbox.close": "é—œé–‰",
+  "lightbox.compress": "æŠ˜ç–Šåœ–ç‰‡æª¢è¦–æ¡†",
+  "lightbox.expand": "å±•é–‹åœ–ç‰‡æª¢è¦–æ¡†",
   "lightbox.next": "ä¸‹ä¸€æ¥",
   "lightbox.previous": "ä¸Šä¸€æ¥",
-  "lightbox.view_context": "æª¢è¦–å…§æ–‡",
   "lists.account.add": "æ–°å¢žè‡³åå–®",
   "lists.account.remove": "å¾žåå–®ä¸ç§»é™¤",
   "lists.delete": "åˆªé™¤åå–®",
@@ -260,15 +266,21 @@
   "lists.edit.submit": "è®Šæ›´æ¨™é¡Œ",
   "lists.new.create": "æ–°å¢žåå–®",
   "lists.new.title_placeholder": "æ–°åå–®æ¨™é¡Œ",
+  "lists.replies_policy.followed": "ä»»ä½•è·Ÿéš¨çš„ä½¿ç”¨è€…",
+  "lists.replies_policy.list": "åˆ—è¡¨æˆå“¡",
+  "lists.replies_policy.none": "æ²’æœ‰äºº",
+  "lists.replies_policy.title": "é¡¯ç¤ºå›žè¦†ï¼š",
   "lists.search": "æœå°‹æ‚¨é—œæ³¨çš„ä½¿ç”¨è€…",
   "lists.subheading": "æ‚¨çš„åå–®",
-  "load_pending": "{count, plural, other {# å€‹æ–°é …ç›®}}",
+  "load_pending": "{count, plural, one {# å€‹æ–°é …ç›®} other {# å€‹æ–°é …ç›®}}",
   "loading_indicator.label": "è®€å–ä¸...",
   "media_gallery.toggle_visible": "åˆ‡æ›å¯è¦‹æ€§",
   "missing_indicator.label": "æ‰¾ä¸åˆ°",
   "missing_indicator.sublabel": "æ‰¾ä¸åˆ°æ¤è³‡æº",
+  "mute_modal.duration": "æŒçºŒæ™‚é–“",
   "mute_modal.hide_notifications": "éš±è—ä¾†è‡ªé€™ä½ä½¿ç”¨è€…çš„é€šçŸ¥ï¼Ÿ",
-  "navigation_bar.apps": "å°éŽ–çš„ä½¿ç”¨è€…",
+  "mute_modal.indefinite": "ç„¡æœŸé™",
+  "navigation_bar.apps": "è¡Œå‹•æ‡‰ç”¨ç¨‹å¼",
   "navigation_bar.blocks": "å°éŽ–ä½¿ç”¨è€…",
   "navigation_bar.bookmarks": "æ›¸ç±¤",
   "navigation_bar.community_timeline": "æœ¬æ©Ÿæ™‚é–“è»¸",
@@ -291,71 +303,83 @@
   "navigation_bar.preferences": "åå¥½è¨å®š",
   "navigation_bar.public_timeline": "è¯é‚¦æ™‚é–“è»¸",
   "navigation_bar.security": "å®‰å…¨æ€§",
-  "notification.favourite": "{name} æŠŠä½ çš„å˜Ÿæ–‡åŠ å…¥äº†æœ€æ„›",
-  "notification.follow": "{name} é—œæ³¨äº†ä½ ",
-  "notification.follow_request": "{name} è¦æ±‚é—œæ³¨ä½ ",
-  "notification.mention": "{name} æåˆ°äº†ä½ ",
+  "notification.favourite": "{name} æŠŠæ‚¨çš„å˜Ÿæ–‡åŠ å…¥äº†æœ€æ„›",
+  "notification.follow": "{name} é—œæ³¨äº†æ‚¨",
+  "notification.follow_request": "{name} è¦æ±‚é—œæ³¨æ‚¨",
+  "notification.mention": "{name} æåˆ°äº†æ‚¨",
   "notification.own_poll": "æ‚¨çš„æŠ•ç¥¨å·²çµæŸ",
-  "notification.poll": "æ‚¨æŠ•éŽçš„æŠ•ç¥¨å·²ç¶“çµæŸ",
-  "notification.reblog": "{name}è½‰å˜Ÿäº†ä½ çš„å˜Ÿæ–‡",
+  "notification.poll": "æ‚¨æ›¾æŠ•éŽçš„æŠ•ç¥¨å·²ç¶“çµæŸ",
+  "notification.reblog": "{name} è½‰å˜Ÿäº†æ‚¨çš„å˜Ÿæ–‡",
+  "notification.status": "{name} å‰›å‰›å˜Ÿæ–‡",
   "notifications.clear": "æ¸…é™¤é€šçŸ¥",
-  "notifications.clear_confirmation": "ç¢ºå®šè¦æ°¸ä¹…æ¸…é™¤ä½ çš„é€šçŸ¥å—Žï¼Ÿ",
+  "notifications.clear_confirmation": "ç¢ºå®šè¦æ°¸ä¹…æ¸…é™¤æ‚¨çš„é€šçŸ¥å—Žï¼Ÿ",
   "notifications.column_settings.alert": "æ¡Œé¢é€šçŸ¥",
   "notifications.column_settings.favourite": "æœ€æ„›ï¼š",
   "notifications.column_settings.filter_bar.advanced": "é¡¯ç¤ºæ‰€æœ‰åˆ†é¡ž",
   "notifications.column_settings.filter_bar.category": "å¿«é€ŸéŽæ¿¾æ¬„",
   "notifications.column_settings.filter_bar.show": "é¡¯ç¤º",
   "notifications.column_settings.follow": "æ–°é—œæ³¨è€…ï¼š",
-  "notifications.column_settings.follow_request": "æ–°çš„é—œæ³¨è«‹æ±‚:",
+  "notifications.column_settings.follow_request": "æ–°çš„é—œæ³¨è«‹æ±‚ï¼š",
   "notifications.column_settings.mention": "æåŠï¼š",
   "notifications.column_settings.poll": "æŠ•ç¥¨çµæžœï¼š",
-  "notifications.column_settings.push": "æŽ¨é€é€šçŸ¥",
+  "notifications.column_settings.push": "æŽ¨æ’é€šçŸ¥",
   "notifications.column_settings.reblog": "è½‰å˜Ÿï¼š",
   "notifications.column_settings.show": "åœ¨æ¬„ä½ä¸é¡¯ç¤º",
-  "notifications.column_settings.sound": "æ’æ”¾éŸ³æ•ˆ",
+  "notifications.column_settings.sound": "æ’æ”¾è²éŸ³",
+  "notifications.column_settings.status": "æ–°å˜Ÿæ–‡ï¼š",
   "notifications.filter.all": "å…¨éƒ¨",
   "notifications.filter.boosts": "è½‰å˜Ÿ",
   "notifications.filter.favourites": "æœ€æ„›",
   "notifications.filter.follows": "é—œæ³¨çš„ä½¿ç”¨è€…",
   "notifications.filter.mentions": "æåŠ",
   "notifications.filter.polls": "æŠ•ç¥¨çµæžœ",
+  "notifications.filter.statuses": "å·²è·Ÿéš¨ä½¿ç”¨è€…çš„æœ€æ–°å‹•æ…‹",
+  "notifications.grant_permission": "æŽˆäºˆæ¬Šé™",
   "notifications.group": "{count} æ¢é€šçŸ¥",
+  "notifications.mark_as_read": "å°‡æ‰€æœ‰é€šçŸ¥éƒ½æ¨™è¨˜ç‚ºå·²è®€",
+  "notifications.permission_denied": "ç”±æ–¼ä¹‹å‰æ‹’çµ•äº†ç€è¦½å™¨è«‹æ±‚ï¼Œå› æ¤æ¡Œé¢é€šçŸ¥ä¸å¯ç”¨",
+  "notifications.permission_denied_alert": "å› ç‚ºä¹‹å‰ç€è¦½å™¨æ¬Šé™è¢«æ‹’çµ•ï¼Œç„¡æ³•å•Ÿç”¨æ¡Œé¢é€šçŸ¥",
+  "notifications.permission_required": "å› ç‚ºå°šæœªæŽˆäºˆæ‰€éœ€çš„æ¬Šé™ï¼Œæ‰€ä»¥æ¡Œé¢é€šçŸ¥ä¸å¯ç”¨ã€‚",
+  "notifications_permission_banner.enable": "å•Ÿç”¨æ¡Œé¢é€šçŸ¥",
+  "notifications_permission_banner.how_to_control": "å•Ÿç”¨æ¡Œé¢é€šçŸ¥ä»¥åœ¨ Mastodon æ²’æœ‰é–‹å•Ÿçš„æ™‚å€™æŽ¥æ”¶é€šçŸ¥ã€‚åœ¨å·²ç¶“å•Ÿç”¨æ¡Œé¢é€šçŸ¥çš„æ™‚å€™ï¼Œæ‚¨å¯ä»¥é€éŽä¸Šé¢çš„ {icon} æŒ‰éˆ•æº–ç¢ºçš„æŽ§åˆ¶å“ªäº›é¡žåž‹çš„äº’å‹•æœƒç”¢ç”Ÿæ¡Œé¢é€šçŸ¥ã€‚",
+  "notifications_permission_banner.title": "ä¸è¦éŒ¯éŽä»»ä½•æ±è¥¿ï¼",
+  "picture_in_picture.restore": "é‚„åŽŸ",
   "poll.closed": "å·²é—œé–‰",
   "poll.refresh": "é‡æ–°æ•´ç†",
   "poll.total_people": "{count, plural, one {# å€‹æŠ•ç¥¨} other {# å€‹æŠ•ç¥¨}}",
   "poll.total_votes": "{count, plural, one {# å€‹æŠ•ç¥¨} other {# å€‹æŠ•ç¥¨}}",
   "poll.vote": "æŠ•ç¥¨",
-  "poll.voted": "ä½ å·²å°æ¤å•é¡ŒæŠ•ç¥¨",
+  "poll.voted": "æ‚¨å·²å°æ¤å•é¡ŒæŠ•ç¥¨",
   "poll_button.add_poll": "å»ºç«‹æŠ•ç¥¨",
   "poll_button.remove_poll": "ç§»é™¤æŠ•ç¥¨",
-  "privacy.change": "èª¿æ•´éš±ç§ç‹€æ…‹",
-  "privacy.direct.long": "åªæœ‰è¢«æåˆ°çš„ä½¿ç”¨è€…èƒ½çœ‹åˆ°",
+  "privacy.change": "èª¿æ•´å˜Ÿæ–‡éš±ç§ç‹€æ…‹",
+  "privacy.direct.long": "åªæœ‰è¢«æåŠçš„ä½¿ç”¨è€…èƒ½çœ‹åˆ°",
   "privacy.direct.short": "ç§è¨Š",
-  "privacy.private.long": "åªæœ‰é—œæ³¨ä½ çš„ä½¿ç”¨è€…èƒ½çœ‹åˆ°",
+  "privacy.private.long": "åªæœ‰é—œæ³¨æ‚¨çš„ä½¿ç”¨è€…èƒ½çœ‹åˆ°",
   "privacy.private.short": "åƒ…é—œæ³¨è€…",
-  "privacy.public.long": "å˜Ÿåˆ°å…¬é–‹æ™‚é–“è»¸",
+  "privacy.public.long": "å…¬é–‹ï¼Œä¸”é¡¯ç¤ºæ–¼å…¬é–‹æ™‚é–“è»¸",
   "privacy.public.short": "å…¬é–‹",
   "privacy.unlisted.long": "å…¬é–‹ï¼Œä½†ä¸æœƒé¡¯ç¤ºåœ¨å…¬é–‹æ™‚é–“è»¸",
   "privacy.unlisted.short": "ä¸å…¬é–‹",
   "refresh": "é‡æ–°æ•´ç†",
   "regeneration_indicator.label": "è¼‰å…¥ä¸â€¦",
-  "regeneration_indicator.sublabel": "ä½ çš„ä¸»é æ™‚é–“è»¸æ£åœ¨æº–å‚™ä¸!",
+  "regeneration_indicator.sublabel": "æ‚¨çš„ä¸»é æ™‚é–“è»¸æ£åœ¨æº–å‚™ä¸ï¼",
   "relative_time.days": "{number} å¤©",
-  "relative_time.hours": "{number} å°æ™‚",
+  "relative_time.hours": "{number}å°æ™‚å‰",
   "relative_time.just_now": "å‰›å‰›",
-  "relative_time.minutes": "{number} åˆ†",
+  "relative_time.minutes": "{number} åˆ†å‰",
   "relative_time.seconds": "{number} ç§’",
   "relative_time.today": "ä»Šå¤©",
   "reply_indicator.cancel": "å–æ¶ˆ",
   "report.forward": "è½‰å¯„åˆ° {target}",
-  "report.forward_hint": "é€™å€‹å¸³æˆ¶å±¬æ–¼å…¶ä»–ç«™é»žã€‚è¦åƒè©²ç«™é»žç™¼é€åŒ¿åçš„æª¢èˆ‰è¨Šæ¯å—Ž?",
-  "report.hint": "é€™é …è¨Šæ¯æœƒç™¼é€åˆ°æ‚¨ä¼ºæœå™¨çš„ç®¡ç†å“¡ã€‚ä½ å¯ä»¥æä¾›æª¢èˆ‰é€™å€‹å¸³æˆ¶çš„ç†ç”±ï¼š",
-  "report.placeholder": "æ›´å¤šè¨Šæ¯",
+  "report.forward_hint": "é€™å€‹å¸³æˆ¶å±¬æ–¼å…¶ä»–ä¼ºæœå™¨ã€‚è¦åƒè©²ä¼ºæœå™¨ç™¼é€åŒ¿åçš„æª¢èˆ‰è¨Šæ¯å—Ž?",
+  "report.hint": "é€™é …è¨Šæ¯æœƒç™¼é€åˆ°æ‚¨ä¼ºæœå™¨çš„ç®¡ç†å“¡ã€‚æ‚¨å¯ä»¥æä¾›æª¢èˆ‰é€™å€‹å¸³æˆ¶çš„ç†ç”±ï¼š",
+  "report.placeholder": "å…¶ä»–å‚™è¨»",
   "report.submit": "é€å‡º",
   "report.target": "æª¢èˆ‰ {target}",
   "search.placeholder": "æœå°‹",
   "search_popout.search_format": "é€²éšŽæœå°‹æ ¼å¼",
-  "search_popout.tips.full_text": "è¼¸å…¥ç°¡å–®çš„æ–‡å—ï¼Œæœå°‹ç”±ä½ æ’°å¯«ã€æœ€æ„›ã€è½‰å˜Ÿæˆ–æä½ çš„å˜Ÿæ–‡ï¼Œä»¥åŠç¬¦åˆä½¿ç”¨è€…åç¨±ã€å¸³æˆ¶åç¨±å’Œæ¨™ç±¤ã€‚",
+  "search_popout.tips.full_text": "è¼¸å…¥ç°¡å–®çš„æ–‡å—ï¼Œæœå°‹ç”±æ‚¨æ’°å¯«ã€æ”¶è—ã€è½‰å˜Ÿæˆ–ææ‚¨çš„å˜Ÿæ–‡ï¼Œä»¥åŠèˆ‡é—œéµè©žåŒ¹é…çš„ä½¿ç”¨è€…åç¨±ã€å¸³æˆ¶é¡¯ç¤ºåç¨±å’Œä¸»é¡Œæ¨™ç±¤ã€‚",
   "search_popout.tips.hashtag": "ä¸»é¡Œæ¨™ç±¤",
   "search_popout.tips.status": "å˜Ÿæ–‡",
   "search_popout.tips.text": "è¼¸å…¥ç°¡å–®çš„æ–‡å—ï¼Œæœå°‹ç¬¦åˆçš„ä½¿ç”¨è€…åç¨±ï¼Œå¸³æˆ¶åç¨±èˆ‡æ¨™ç±¤",
@@ -370,32 +394,32 @@
   "status.block": "å°éŽ– @{name}",
   "status.bookmark": "æ›¸ç±¤",
   "status.cancel_reblog_private": "å–æ¶ˆè½‰å˜Ÿ",
-  "status.cannot_reblog": "é€™ç¯‡å˜Ÿæ–‡ç„¡æ³•è¢«è½‰å˜Ÿ",
-  "status.copy": "å°‡é€£çµè¤‡è£½åˆ°å˜Ÿæ–‡ä¸",
+  "status.cannot_reblog": "é€™å‰‡å˜Ÿæ–‡ç„¡æ³•è¢«è½‰å˜Ÿ",
+  "status.copy": "è¤‡è£½å˜Ÿæ–‡é€£çµ",
   "status.delete": "åˆªé™¤",
-  "status.detailed_status": "å°è©±çš„è©³ç´°å…§å®¹",
+  "status.detailed_status": "è©³ç´°çš„å°è©±å…§å®¹",
   "status.direct": "ç™¼é€ç§è¨Šçµ¦ @{name}",
-  "status.embed": "åµŒå…¥",
+  "status.embed": "å…§åµŒ",
   "status.favourite": "æœ€æ„›",
   "status.filtered": "å·²éŽæ¿¾",
   "status.load_more": "è¼‰å…¥æ›´å¤š",
   "status.media_hidden": "éš±è—åª’é«”å…§å®¹",
-  "status.mention": "æåˆ° @{name}",
+  "status.mention": "æåŠ @{name}",
   "status.more": "æ›´å¤š",
   "status.mute": "éœéŸ³ @{name}",
   "status.mute_conversation": "éœéŸ³å°è©±",
-  "status.open": "å±•é–‹å˜Ÿæ–‡",
+  "status.open": "å±•é–‹æ¤å˜Ÿæ–‡",
   "status.pin": "é‡˜é¸åˆ°å€‹äººè³‡æ–™é ",
   "status.pinned": "é‡˜é¸çš„å˜Ÿæ–‡",
   "status.read_more": "é–±è®€æ›´å¤š",
   "status.reblog": "è½‰å˜Ÿ",
   "status.reblog_private": "è½‰å˜Ÿçµ¦åŽŸæœ‰é—œæ³¨è€…",
   "status.reblogged_by": "{name} è½‰å˜Ÿäº†",
-  "status.reblogs.empty": "é‚„æ²’æœ‰äººè½‰å˜Ÿã€‚å¦‚æžœæœ‰ï¼Œæœƒé¡¯ç¤ºåœ¨é€™è£¡ã€‚",
+  "status.reblogs.empty": "é‚„æ²’æœ‰äººè½‰å˜ŸéŽé€™å‰‡å˜Ÿæ–‡ã€‚ç•¶æœ‰äººè½‰å˜Ÿæ™‚ï¼Œå®ƒå°‡æ–¼æ¤é¡¯ç¤ºã€‚",
   "status.redraft": "åˆªé™¤ & ç·¨è¼¯",
   "status.remove_bookmark": "ç§»é™¤æ›¸ç±¤",
   "status.reply": "å›žè¦†",
-  "status.replyAll": "å›žè¦†æ‰€æœ‰äºº",
+  "status.replyAll": "å›žè¦†è¨Žè«–ä¸²",
   "status.report": "æª¢èˆ‰ @{name}",
   "status.sensitive_warning": "æ•æ„Ÿå…§å®¹",
   "status.share": "åˆ†äº«",
@@ -406,46 +430,47 @@
   "status.show_thread": "é¡¯ç¤ºè¨Žè«–ä¸²",
   "status.uncached_media_warning": "ç„¡æ³•ä½¿ç”¨",
   "status.unmute_conversation": "è§£é™¤æ¤å°è©±çš„éœéŸ³",
-  "status.unpin": "è§£é™¤ç½®é ‚",
+  "status.unpin": "å¾žå€‹äººé é¢è§£é™¤é‡˜é¸",
   "suggestions.dismiss": "é—œé–‰å»ºè°",
   "suggestions.header": "æ‚¨å¯èƒ½å°é€™äº›æ±è¥¿æœ‰èˆˆè¶£â€¦",
-  "tabs_bar.federated_timeline": "å…¶ä»–ç«™é»ž",
-  "tabs_bar.home": "ä¸»é ",
-  "tabs_bar.local_timeline": "æœ¬ç«™",
+  "tabs_bar.federated_timeline": "è¯é‚¦å®‡å®™",
+  "tabs_bar.home": "é¦–é ",
+  "tabs_bar.local_timeline": "æœ¬æ©Ÿ",
   "tabs_bar.notifications": "é€šçŸ¥",
   "tabs_bar.search": "æœå°‹",
-  "time_remaining.days": "å‰©é¤˜{number, plural, one {# å¤©æ•¸} other {# å¤©æ•¸}}",
+  "time_remaining.days": "å‰©é¤˜{number, plural, one {# å¤©} other {# å¤©}}",
   "time_remaining.hours": "å‰©é¤˜{number, plural, one {# å°æ™‚} other {# å°æ™‚}}",
   "time_remaining.minutes": "å‰©é¤˜{number, plural, one {# åˆ†é˜} other {# åˆ†é˜}}",
   "time_remaining.moments": "å‰©é¤˜æ™‚é–“",
   "time_remaining.seconds": "å‰©é¤˜ {number, plural, one {# ç§’} other {# ç§’}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "timeline_hint.remote_resource_not_displayed": "ä¸æœƒé¡¯ç¤ºä¾†è‡ªå…¶ä»–æœå‹™å™¨çš„ {resource}",
+  "timeline_hint.resources.followers": "é—œæ³¨è€…",
+  "timeline_hint.resources.follows": "æ£åœ¨é—œæ³¨",
+  "timeline_hint.resources.statuses": "æ›´æ—©çš„å˜Ÿæ–‡",
+  "trends.counter_by_accounts": "{count, plural,one {{counter} äºº}other {{counter} äºº}}æ£åœ¨è¨Žè«–",
   "trends.trending_now": "ç›®å‰è¶¨å‹¢",
-  "ui.beforeunload": "å¦‚æžœé›¢é–‹ Mastodonï¼Œä½ çš„è‰ç¨¿å°‡æœƒä¸è¦‹ã€‚",
+  "ui.beforeunload": "å¦‚æžœé›¢é–‹ Mastodonï¼Œæ‚¨çš„è‰ç¨¿å°‡æœƒä¸è¦‹ã€‚",
   "units.short.billion": "{count}B",
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "æ‹–æ”¾ä¾†ä¸Šå‚³",
-  "upload_button.label": "ä¸Šå‚³åª’é«”æª”æ¡ˆ (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "upload_button.label": "ä¸Šå‚³åœ–åƒã€å½±ç‰‡ã€æˆ–éŸ³æ¨‚æª”æ¡ˆ",
   "upload_error.limit": "å·²é”åˆ°æª”æ¡ˆä¸Šå‚³é™åˆ¶ã€‚",
-  "upload_error.poll": "ä¸å…è¨±åœ¨æŠ•ç¥¨ä¸Šå‚³æª”æ¡ˆã€‚",
-  "upload_form.audio_description": "ç°¡å–®æè¿°å…§å®¹çµ¦è½éšœäººå£«",
+  "upload_error.poll": "ä¸å…è¨±åœ¨æŠ•ç¥¨ä¸ä¸Šå‚³æª”æ¡ˆã€‚",
+  "upload_form.audio_description": "æè¿°å…§å®¹çµ¦è½éšœäººå£«",
   "upload_form.description": "ç‚ºè¦–éšœäººå£«å¢žåŠ æ–‡å—èªªæ˜Ž",
   "upload_form.edit": "ç·¨è¼¯",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.thumbnail": "æ›´æ”¹é è¦½åœ–",
   "upload_form.undo": "åˆªé™¤",
-  "upload_form.video_description": "ç°¡å–®æè¿°çµ¦è½éšœæˆ–è¦–éšœäººå£«",
+  "upload_form.video_description": "æè¿°çµ¦è½éšœæˆ–è¦–éšœäººå£«",
   "upload_modal.analyzing_picture": "æ£åœ¨åˆ†æžåœ–ç‰‡â€¦",
   "upload_modal.apply": "å¥—ç”¨",
-  "upload_modal.choose_image": "Choose image",
-  "upload_modal.description_placeholder": "A quick brown fox è·³éŽé‚£éš»æ‡¶ç‹—",
-  "upload_modal.detect_text": "å¾žåœ–ç‰‡åµæ¸¬æ–‡å—",
+  "upload_modal.choose_image": "é¸æ“‡åœ–ç‰‡",
+  "upload_modal.description_placeholder": "æˆ‘èƒ½åžä¸‹çŽ»ç’ƒè€Œä¸å‚·èº«é«”",
+  "upload_modal.detect_text": "å¾žåœ–ç‰‡ä¸åµæ¸¬æ–‡å—",
   "upload_modal.edit_media": "ç·¨è¼¯åª’é«”",
-  "upload_modal.hint": "é»žæ“Šæˆ–æ‹–æ›³åœ“åœˆä»¥é¸æ“‡é è¦½ç¸®åœ–ã€‚",
+  "upload_modal.hint": "æ–¼é è¦½ä¸é»žæ“Šæˆ–æ‹–æ›³åœ“åœˆä»¥é¸æ“‡å°‡æ–¼æ‰€æœ‰ç¸®åœ–ä¸é¡¯ç¤ºçš„ç„¦é»žã€‚",
+  "upload_modal.preparing_ocr": "æº–å‚™ OCR ä¸â€¦â€¦",
   "upload_modal.preview_label": "é è¦½ ({ratio})",
   "upload_progress.label": "ä¸Šå‚³ä¸...",
   "video.close": "é—œé–‰å½±ç‰‡",
diff --git a/app/javascript/mastodon/main.js b/app/javascript/mastodon/main.js
index da4884fd3d77644b77ec3cd484b77e24f79344de..bda51f692b770f8cda0c433648d35b085b81d0f6 100644
--- a/app/javascript/mastodon/main.js
+++ b/app/javascript/mastodon/main.js
@@ -1,4 +1,5 @@
 import * as registerPushNotifications from './actions/push_notifications';
+import { setupBrowserNotifications } from './actions/notifications';
 import { default as Mastodon, store } from './containers/mastodon';
 import React from 'react';
 import ReactDOM from 'react-dom';
@@ -22,6 +23,7 @@ function main() {
     const props = JSON.parse(mountNode.getAttribute('data-props'));
 
     ReactDOM.render(<Mastodon {...props} />, mountNode);
+    store.dispatch(setupBrowserNotifications());
     if (process.env.NODE_ENV === 'production') {
       // avoid offline in dev mode because it's harder to debug
       require('offline-plugin/runtime').install();
diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js
index 3823bb05e09b41da5f5f2e76d746dd37b2c20729..a8fb69c274830d4d0fa7e2d7108802cc0b17b1c9 100644
--- a/app/javascript/mastodon/reducers/index.js
+++ b/app/javascript/mastodon/reducers/index.js
@@ -36,6 +36,7 @@ import trends from './trends';
 import missed_updates from './missed_updates';
 import announcements from './announcements';
 import markers from './markers';
+import picture_in_picture from './picture_in_picture';
 
 const reducers = {
   announcements,
@@ -75,6 +76,7 @@ const reducers = {
   trends,
   missed_updates,
   markers,
+  picture_in_picture,
 };
 
 export default combineReducers(reducers);
diff --git a/app/javascript/mastodon/reducers/meta.js b/app/javascript/mastodon/reducers/meta.js
index 36a5a1c35403d4f8ada45dc3f6162a503559d42e..65becc44f8f46482ce1dde8f7c23da155f4851c2 100644
--- a/app/javascript/mastodon/reducers/meta.js
+++ b/app/javascript/mastodon/reducers/meta.js
@@ -1,15 +1,20 @@
-import { STORE_HYDRATE } from '../actions/store';
+import { STORE_HYDRATE } from 'mastodon/actions/store';
+import { APP_LAYOUT_CHANGE } from 'mastodon/actions/app';
 import { Map as ImmutableMap } from 'immutable';
+import { layoutFromWindow } from 'mastodon/is_mobile';
 
 const initialState = ImmutableMap({
   streaming_api_base_url: null,
   access_token: null,
+  layout: layoutFromWindow(),
 });
 
 export default function meta(state = initialState, action) {
   switch(action.type) {
   case STORE_HYDRATE:
     return state.merge(action.state.get('meta'));
+  case APP_LAYOUT_CHANGE:
+    return state.set('layout', action.layout);
   default:
     return state;
   }
diff --git a/app/javascript/mastodon/reducers/mutes.js b/app/javascript/mastodon/reducers/mutes.js
index 4672e50974eaa2a1394b5df9a6c51bc15548e0fa..a9eb61ff834cbcff296c6ad0d1ec1d541a0ba3cf 100644
--- a/app/javascript/mastodon/reducers/mutes.js
+++ b/app/javascript/mastodon/reducers/mutes.js
@@ -3,12 +3,14 @@ import Immutable from 'immutable';
 import {
   MUTES_INIT_MODAL,
   MUTES_TOGGLE_HIDE_NOTIFICATIONS,
+  MUTES_CHANGE_DURATION,
 } from '../actions/mutes';
 
 const initialState = Immutable.Map({
   new: Immutable.Map({
     account: null,
     notifications: true,
+    duration: 0,
   }),
 });
 
@@ -21,6 +23,8 @@ export default function mutes(state = initialState, action) {
     });
   case MUTES_TOGGLE_HIDE_NOTIFICATIONS:
     return state.updateIn(['new', 'notifications'], (old) => !old);
+  case MUTES_CHANGE_DURATION:
+    return state.setIn(['new', 'duration'], Number(action.duration));
   default:
     return state;
   }
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index ed1ba02726727362f80de3570cd3ffdd1e21fc64..1d48747176b092a2e77dc92a5806909a46b15548 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -9,6 +9,9 @@ import {
   NOTIFICATIONS_LOAD_PENDING,
   NOTIFICATIONS_MOUNT,
   NOTIFICATIONS_UNMOUNT,
+  NOTIFICATIONS_MARK_AS_READ,
+  NOTIFICATIONS_SET_BROWSER_SUPPORT,
+  NOTIFICATIONS_SET_BROWSER_PERMISSION,
 } from '../actions/notifications';
 import {
   ACCOUNT_BLOCK_SUCCESS,
@@ -16,6 +19,13 @@ import {
   FOLLOW_REQUEST_AUTHORIZE_SUCCESS,
   FOLLOW_REQUEST_REJECT_SUCCESS,
 } from '../actions/accounts';
+import {
+  MARKERS_FETCH_SUCCESS,
+} from '../actions/markers';
+import {
+  APP_FOCUS,
+  APP_UNFOCUS,
+} from '../actions/app';
 import { DOMAIN_BLOCK_SUCCESS } from 'mastodon/actions/domain_blocks';
 import { TIMELINE_DELETE, TIMELINE_DISCONNECT } from '../actions/timelines';
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
@@ -26,9 +36,14 @@ const initialState = ImmutableMap({
   items: ImmutableList(),
   hasMore: true,
   top: false,
-  mounted: false,
+  mounted: 0,
   unread: 0,
+  lastReadId: '0',
+  readMarkerId: '0',
+  isTabVisible: true,
   isLoading: false,
+  browserSupport: false,
+  browserPermission: 'default',
 });
 
 const notificationToMap = notification => ImmutableMap({
@@ -46,8 +61,10 @@ const normalizeNotification = (state, notification, usePendingItems) => {
     return state.update('pendingItems', list => list.unshift(notificationToMap(notification))).update('unread', unread => unread + 1);
   }
 
-  if (!top) {
+  if (shouldCountUnreadNotifications(state)) {
     state = state.update('unread', unread => unread + 1);
+  } else {
+    state = state.set('lastReadId', notification.id);
   }
 
   return state.update('items', list => {
@@ -60,6 +77,7 @@ const normalizeNotification = (state, notification, usePendingItems) => {
 };
 
 const expandNormalizedNotifications = (state, notifications, next, isLoadingRecent, usePendingItems) => {
+  const lastReadId = state.get('lastReadId');
   let items = ImmutableList();
 
   notifications.forEach((n, i) => {
@@ -87,6 +105,15 @@ const expandNormalizedNotifications = (state, notifications, next, isLoadingRece
       mutable.set('hasMore', false);
     }
 
+    if (shouldCountUnreadNotifications(state)) {
+      mutable.update('unread', unread => unread + items.count(item => compareId(item.get('id'), lastReadId) > 0));
+    } else {
+      const mostRecent = items.find(item => item !== null);
+      if (mostRecent && compareId(lastReadId, mostRecent.get('id')) < 0) {
+        mutable.set('lastReadId', mostRecent.get('id'));
+      }
+    }
+
     mutable.set('isLoading', false);
   });
 };
@@ -96,21 +123,93 @@ const filterNotifications = (state, accountIds, type) => {
   return state.update('items', helper).update('pendingItems', helper);
 };
 
+const clearUnread = (state) => {
+  state = state.set('unread', state.get('pendingItems').size);
+  const lastNotification = state.get('items').find(item => item !== null);
+  return state.set('lastReadId', lastNotification ? lastNotification.get('id') : '0');
+};
+
 const updateTop = (state, top) => {
-  if (top) {
-    state = state.set('unread', state.get('pendingItems').size);
+  state = state.set('top', top);
+
+  if (!shouldCountUnreadNotifications(state)) {
+    state = clearUnread(state);
   }
 
-  return state.set('top', top);
+  return state;
 };
 
 const deleteByStatus = (state, statusId) => {
+  const lastReadId = state.get('lastReadId');
+
+  if (shouldCountUnreadNotifications(state)) {
+    const deletedUnread = state.get('items').filter(item => item !== null && item.get('status') === statusId && compareId(item.get('id'), lastReadId) > 0);
+    state = state.update('unread', unread => unread - deletedUnread.size);
+  }
+
   const helper = list => list.filterNot(item => item !== null && item.get('status') === statusId);
+  const deletedUnread = state.get('pendingItems').filter(item => item !== null && item.get('status') === statusId && compareId(item.get('id'), lastReadId) > 0);
+  state = state.update('unread', unread => unread - deletedUnread.size);
   return state.update('items', helper).update('pendingItems', helper);
 };
 
+const updateMounted = (state) => {
+  state = state.update('mounted', count => count + 1);
+  if (!shouldCountUnreadNotifications(state, state.get('mounted') === 1)) {
+    state = state.set('readMarkerId', state.get('lastReadId'));
+    state = clearUnread(state);
+  }
+  return state;
+};
+
+const updateVisibility = (state, visibility) => {
+  state = state.set('isTabVisible', visibility);
+  if (!shouldCountUnreadNotifications(state)) {
+    state = state.set('readMarkerId', state.get('lastReadId'));
+    state = clearUnread(state);
+  }
+  return state;
+};
+
+const shouldCountUnreadNotifications = (state, ignoreScroll = false) => {
+  const isTabVisible   = state.get('isTabVisible');
+  const isOnTop        = state.get('top');
+  const isMounted      = state.get('mounted') > 0;
+  const lastReadId     = state.get('lastReadId');
+  const lastItem       = state.get('items').findLast(item => item !== null);
+  const lastItemReached = !state.get('hasMore') || lastReadId === '0' || (lastItem && compareId(lastItem.get('id'), lastReadId) <= 0);
+
+  return !(isTabVisible && (ignoreScroll || isOnTop) && isMounted && lastItemReached);
+};
+
+const recountUnread = (state, last_read_id) => {
+  return state.withMutations(mutable => {
+    if (compareId(last_read_id, mutable.get('lastReadId')) > 0) {
+      mutable.set('lastReadId', last_read_id);
+    }
+
+    if (compareId(last_read_id, mutable.get('readMarkerId')) > 0) {
+      mutable.set('readMarkerId', last_read_id);
+    }
+
+    if (state.get('unread') > 0 || shouldCountUnreadNotifications(state)) {
+      mutable.set('unread', mutable.get('pendingItems').count(item => item !== null) + mutable.get('items').count(item => item && compareId(item.get('id'), last_read_id) > 0));
+    }
+  });
+};
+
 export default function notifications(state = initialState, action) {
   switch(action.type) {
+  case MARKERS_FETCH_SUCCESS:
+    return action.markers.notifications ? recountUnread(state, action.markers.notifications.last_read_id) : state;
+  case NOTIFICATIONS_MOUNT:
+    return updateMounted(state);
+  case NOTIFICATIONS_UNMOUNT:
+    return state.update('mounted', count => count - 1);
+  case APP_FOCUS:
+    return updateVisibility(state, true);
+  case APP_UNFOCUS:
+    return updateVisibility(state, false);
   case NOTIFICATIONS_LOAD_PENDING:
     return state.update('items', list => state.get('pendingItems').concat(list.take(40))).set('pendingItems', ImmutableList()).set('unread', 0);
   case NOTIFICATIONS_EXPAND_REQUEST:
@@ -144,10 +243,13 @@ export default function notifications(state = initialState, action) {
     return action.timeline === 'home' ?
       state.update(action.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items) :
       state;
-  case NOTIFICATIONS_MOUNT:
-    return state.set('mounted', true);
-  case NOTIFICATIONS_UNMOUNT:
-    return state.set('mounted', false);
+  case NOTIFICATIONS_MARK_AS_READ:
+    const lastNotification = state.get('items').find(item => item !== null);
+    return lastNotification ? recountUnread(state, lastNotification.get('id')) : state;
+  case NOTIFICATIONS_SET_BROWSER_SUPPORT:
+    return state.set('browserSupport', action.value);
+  case NOTIFICATIONS_SET_BROWSER_PERMISSION:
+    return state.set('browserPermission', action.value);
   default:
     return state;
   }
diff --git a/app/javascript/mastodon/reducers/picture_in_picture.js b/app/javascript/mastodon/reducers/picture_in_picture.js
new file mode 100644
index 0000000000000000000000000000000000000000..06cd8c5e875051b584d0338d08d3f0c71d1285b1
--- /dev/null
+++ b/app/javascript/mastodon/reducers/picture_in_picture.js
@@ -0,0 +1,22 @@
+import { PICTURE_IN_PICTURE_DEPLOY, PICTURE_IN_PICTURE_REMOVE } from 'mastodon/actions/picture_in_picture';
+
+const initialState = {
+  statusId: null,
+  accountId: null,
+  type: null,
+  src: null,
+  muted: false,
+  volume: 0,
+  currentTime: 0,
+};
+
+export default function pictureInPicture(state = initialState, action) {
+  switch(action.type) {
+  case PICTURE_IN_PICTURE_DEPLOY:
+    return { statusId: action.statusId, accountId: action.accountId, type: action.playerType, ...action.props };
+  case PICTURE_IN_PICTURE_REMOVE:
+    return { ...initialState };
+  default:
+    return state;
+  }
+};
diff --git a/app/javascript/mastodon/reducers/relationships.js b/app/javascript/mastodon/reducers/relationships.js
index 1d050cc6349915a25036380113c1a7cf0dcd52c6..53949258a3206b1da3127442d79127406a0cb6d9 100644
--- a/app/javascript/mastodon/reducers/relationships.js
+++ b/app/javascript/mastodon/reducers/relationships.js
@@ -45,7 +45,7 @@ const initialState = ImmutableMap();
 export default function relationships(state = initialState, action) {
   switch(action.type) {
   case ACCOUNT_FOLLOW_REQUEST:
-    return state.setIn([action.id, action.locked ? 'requested' : 'following'], true);
+    return state.getIn([action.id, 'following']) ? state : state.setIn([action.id, action.locked ? 'requested' : 'following'], true);
   case ACCOUNT_FOLLOW_FAIL:
     return state.setIn([action.id, action.locked ? 'requested' : 'following'], false);
   case ACCOUNT_UNFOLLOW_REQUEST:
diff --git a/app/javascript/mastodon/reducers/settings.js b/app/javascript/mastodon/reducers/settings.js
index efef2ad9a5364bbc6343501f54013b8e70ac7874..357ab352aee2b25561e9410237ab8815803bc195 100644
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@@ -29,12 +29,13 @@ const initialState = ImmutableMap({
 
   notifications: ImmutableMap({
     alerts: ImmutableMap({
-      follow: true,
+      follow: false,
       follow_request: false,
-      favourite: true,
-      reblog: true,
-      mention: true,
-      poll: true,
+      favourite: false,
+      reblog: false,
+      mention: false,
+      poll: false,
+      status: false,
     }),
 
     quickFilter: ImmutableMap({
@@ -43,6 +44,8 @@ const initialState = ImmutableMap({
       advanced: false,
     }),
 
+    dismissPermissionBanner: false,
+
     shows: ImmutableMap({
       follow: true,
       follow_request: false,
@@ -50,6 +53,7 @@ const initialState = ImmutableMap({
       reblog: true,
       mention: true,
       poll: true,
+      status: true,
     }),
 
     sounds: ImmutableMap({
@@ -59,6 +63,7 @@ const initialState = ImmutableMap({
       reblog: true,
       mention: true,
       poll: true,
+      status: true,
     }),
   }),
 
diff --git a/app/javascript/mastodon/reducers/user_lists.js b/app/javascript/mastodon/reducers/user_lists.js
index 8165952a700debfd87d9bc54d7399475384e4988..10aaa2d682d6b0fa06ba447762cc1121a04dee73 100644
--- a/app/javascript/mastodon/reducers/user_lists.js
+++ b/app/javascript/mastodon/reducers/user_lists.js
@@ -53,14 +53,20 @@ import {
 } from 'mastodon/actions/directory';
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 
+const initialListState = ImmutableMap({
+  next: null,
+  isLoading: false,
+  items: ImmutableList(),
+});
+
 const initialState = ImmutableMap({
-  followers: ImmutableMap(),
-  following: ImmutableMap(),
-  reblogged_by: ImmutableMap(),
-  favourited_by: ImmutableMap(),
-  follow_requests: ImmutableMap(),
-  blocks: ImmutableMap(),
-  mutes: ImmutableMap(),
+  followers: initialListState,
+  following: initialListState,
+  reblogged_by: initialListState,
+  favourited_by: initialListState,
+  follow_requests: initialListState,
+  blocks: initialListState,
+  mutes: initialListState,
 });
 
 const normalizeList = (state, path, accounts, next) => {
diff --git a/app/javascript/mastodon/rtl.js b/app/javascript/mastodon/rtl.js
deleted file mode 100644
index 89bed6de88811a5be77b99fbee174c7276898f67..0000000000000000000000000000000000000000
--- a/app/javascript/mastodon/rtl.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// U+0590  to U+05FF  - Hebrew
-// U+0600  to U+06FF  - Arabic
-// U+0700  to U+074F  - Syriac
-// U+0750  to U+077F  - Arabic Supplement
-// U+0780  to U+07BF  - Thaana
-// U+07C0  to U+07FF  - N'Ko
-// U+0800  to U+083F  - Samaritan
-// U+08A0  to U+08FF  - Arabic Extended-A
-// U+FB1D  to U+FB4F  - Hebrew presentation forms
-// U+FB50  to U+FDFF  - Arabic presentation forms A
-// U+FE70  to U+FEFF  - Arabic presentation forms B
-
-const rtlChars = /[\u0590-\u083F]|[\u08A0-\u08FF]|[\uFB1D-\uFDFF]|[\uFE70-\uFEFF]/mg;
-
-export function isRtl(text) {
-  if (text.length === 0) {
-    return false;
-  }
-
-  text = text.replace(/(?:^|[^\/\w])@([a-z0-9_]+(@[a-z0-9\.\-]+)?)/ig, '');
-  text = text.replace(/(?:^|[^\/\w])#([\S]+)/ig, '');
-  text = text.replace(/\s+/g, '');
-  text = text.replace(/(\w\S+\.\w{2,}\S*)/g, '');
-
-  const matches = text.match(rtlChars);
-
-  if (!matches) {
-    return false;
-  }
-
-  return matches.length / text.length > 0.3;
-};
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index fd3b72f96c62a7592a6453d477abcca31e0e9368..1e19db65d027f006570a67a98936f923801fc71a 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -1,5 +1,5 @@
 import { createSelector } from 'reselect';
-import { List as ImmutableList, is } from 'immutable';
+import { List as ImmutableList, Map as ImmutableMap, is } from 'immutable';
 import { me } from '../initial_state';
 
 const getAccountBase         = (state, id) => state.getIn(['accounts', id], null);
@@ -121,6 +121,16 @@ export const makeGetStatus = () => {
   );
 };
 
+export const makeGetPictureInPicture = () => {
+  return createSelector([
+    (state, { id }) => state.get('picture_in_picture').statusId === id,
+    (state) => state.getIn(['meta', 'layout']) !== 'mobile',
+  ], (inUse, available) => ImmutableMap({
+    inUse: inUse && available,
+    available,
+  }));
+};
+
 const getAlertsBase = state => state.get('alerts');
 
 export const getAlerts = createSelector([getAlertsBase], (base) => {
diff --git a/app/javascript/mastodon/stream.js b/app/javascript/mastodon/stream.js
index 0cb2b228f3c29b8e33fd120d1734a4aeb26fc585..c6d12cd6ff7c0bf5044b5ba3f39597233cde23a1 100644
--- a/app/javascript/mastodon/stream.js
+++ b/app/javascript/mastodon/stream.js
@@ -1,87 +1,235 @@
+// @ts-check
+
 import WebSocketClient from '@gamestdio/websocket';
 
-const randomIntUpTo = max => Math.floor(Math.random() * Math.floor(max));
+/**
+ * @type {WebSocketClient | undefined}
+ */
+let sharedConnection;
 
-const knownEventTypes = [
-  'update',
-  'delete',
-  'notification',
-  'conversation',
-  'filters_changed',
-];
+/**
+ * @typedef Subscription
+ * @property {string} channelName
+ * @property {Object.<string, string>} params
+ * @property {function(): void} onConnect
+ * @property {function(StreamEvent): void} onReceive
+ * @property {function(): void} onDisconnect
+ */
 
-export function connectStream(path, pollingRefresh = null, callbacks = () => ({ onConnect() {}, onDisconnect() {}, onReceive() {} })) {
-  return (dispatch, getState) => {
-    const streamingAPIBaseURL = getState().getIn(['meta', 'streaming_api_base_url']);
-    const accessToken = getState().getIn(['meta', 'access_token']);
-    const { onConnect, onDisconnect, onReceive } = callbacks(dispatch, getState);
+/**
+  * @typedef StreamEvent
+  * @property {string} event
+  * @property {object} payload
+  */
 
-    let polling = null;
+/**
+ * @type {Array.<Subscription>}
+ */
+const subscriptions = [];
 
-    const setupPolling = () => {
-      pollingRefresh(dispatch, () => {
-        polling = setTimeout(() => setupPolling(), 20000 + randomIntUpTo(20000));
-      });
-    };
+/**
+ * @type {Object.<string, number>}
+ */
+const subscriptionCounters = {};
+
+/**
+ * @param {Subscription} subscription
+ */
+const addSubscription = subscription => {
+  subscriptions.push(subscription);
+};
+
+/**
+ * @param {Subscription} subscription
+ */
+const removeSubscription = subscription => {
+  const index = subscriptions.indexOf(subscription);
+
+  if (index !== -1) {
+    subscriptions.splice(index, 1);
+  }
+};
+
+/**
+ * @param {Subscription} subscription
+ */
+const subscribe = ({ channelName, params, onConnect }) => {
+  const key = channelNameWithInlineParams(channelName, params);
+
+  subscriptionCounters[key] = subscriptionCounters[key] || 0;
+
+  if (subscriptionCounters[key] === 0) {
+    sharedConnection.send(JSON.stringify({ type: 'subscribe', stream: channelName, ...params }));
+  }
+
+  subscriptionCounters[key] += 1;
+  onConnect();
+};
 
-    const clearPolling = () => {
-      if (polling) {
-        clearTimeout(polling);
-        polling = null;
+/**
+ * @param {Subscription} subscription
+ */
+const unsubscribe = ({ channelName, params, onDisconnect }) => {
+  const key = channelNameWithInlineParams(channelName, params);
+
+  subscriptionCounters[key] = subscriptionCounters[key] || 1;
+
+  if (subscriptionCounters[key] === 1 && sharedConnection.readyState === WebSocketClient.OPEN) {
+    sharedConnection.send(JSON.stringify({ type: 'unsubscribe', stream: channelName, ...params }));
+  }
+
+  subscriptionCounters[key] -= 1;
+  onDisconnect();
+};
+
+const sharedCallbacks = {
+  connected () {
+    subscriptions.forEach(subscription => subscribe(subscription));
+  },
+
+  received (data) {
+    const { stream } = data;
+
+    subscriptions.filter(({ channelName, params }) => {
+      const streamChannelName = stream[0];
+
+      if (stream.length === 1) {
+        return channelName === streamChannelName;
       }
-    };
 
-    const subscription = getStream(streamingAPIBaseURL, accessToken, path, {
-      connected () {
-        if (pollingRefresh) {
-          clearPolling();
-        }
+      const streamIdentifier = stream[1];
 
-        onConnect();
-      },
+      if (['hashtag', 'hashtag:local'].includes(channelName)) {
+        return channelName === streamChannelName && params.tag === streamIdentifier;
+      } else if (channelName === 'list') {
+        return channelName === streamChannelName && params.list === streamIdentifier;
+      }
 
-      disconnected () {
-        if (pollingRefresh) {
-          polling = setTimeout(() => setupPolling(), randomIntUpTo(40000));
-        }
+      return false;
+    }).forEach(subscription => {
+      subscription.onReceive(data);
+    });
+  },
 
-        onDisconnect();
+  disconnected () {
+    subscriptions.forEach(subscription => unsubscribe(subscription));
+  },
+
+  reconnected () {
+  },
+};
+
+/**
+ * @param {string} channelName
+ * @param {Object.<string, string>} params
+ * @return {string}
+ */
+const channelNameWithInlineParams = (channelName, params) => {
+  if (Object.keys(params).length === 0) {
+    return channelName;
+  }
+
+  return `${channelName}&${Object.keys(params).map(key => `${key}=${params[key]}`).join('&')}`;
+};
+
+/**
+ * @param {string} channelName
+ * @param {Object.<string, string>} params
+ * @param {function(Function, Function): { onConnect: (function(): void), onReceive: (function(StreamEvent): void), onDisconnect: (function(): void) }} callbacks
+ * @return {function(): void}
+ */
+export const connectStream = (channelName, params, callbacks) => (dispatch, getState) => {
+  const streamingAPIBaseURL = getState().getIn(['meta', 'streaming_api_base_url']);
+  const accessToken = getState().getIn(['meta', 'access_token']);
+  const { onConnect, onReceive, onDisconnect } = callbacks(dispatch, getState);
+
+  // If we cannot use a websockets connection, we must fall back
+  // to using individual connections for each channel
+  if (!streamingAPIBaseURL.startsWith('ws')) {
+    const connection = createConnection(streamingAPIBaseURL, accessToken, channelNameWithInlineParams(channelName, params), {
+      connected () {
+        onConnect();
       },
 
       received (data) {
         onReceive(data);
       },
 
-      reconnected () {
-        if (pollingRefresh) {
-          clearPolling();
-          pollingRefresh(dispatch);
-        }
+      disconnected () {
+        onDisconnect();
+      },
 
+      reconnected () {
         onConnect();
       },
-
     });
 
-    const disconnect = () => {
-      if (subscription) {
-        subscription.close();
-      }
-
-      clearPolling();
+    return () => {
+      connection.close();
     };
+  }
+
+  const subscription = {
+    channelName,
+    params,
+    onConnect,
+    onReceive,
+    onDisconnect,
+  };
+
+  addSubscription(subscription);
+
+  // If a connection is open, we can execute the subscription right now. Otherwise,
+  // because we have already registered it, it will be executed on connect
 
-    return disconnect;
+  if (!sharedConnection) {
+    sharedConnection = /** @type {WebSocketClient} */ (createConnection(streamingAPIBaseURL, accessToken, '', sharedCallbacks));
+  } else if (sharedConnection.readyState === WebSocketClient.OPEN) {
+    subscribe(subscription);
+  }
+
+  return () => {
+    removeSubscription(subscription);
+    unsubscribe(subscription);
   };
-}
+};
+
+const KNOWN_EVENT_TYPES = [
+  'update',
+  'delete',
+  'notification',
+  'conversation',
+  'filters_changed',
+  'encrypted_message',
+  'announcement',
+  'announcement.delete',
+  'announcement.reaction',
+];
 
+/**
+ * @param {MessageEvent} e
+ * @param {function(StreamEvent): void} received
+ */
+const handleEventSourceMessage = (e, received) => {
+  received({
+    event: e.type,
+    payload: e.data,
+  });
+};
+
+/**
+ * @param {string} streamingAPIBaseURL
+ * @param {string} accessToken
+ * @param {string} channelName
+ * @param {{ connected: Function, received: function(StreamEvent): void, disconnected: Function, reconnected: Function }} callbacks
+ * @return {WebSocketClient | EventSource}
+ */
+const createConnection = (streamingAPIBaseURL, accessToken, channelName, { connected, received, disconnected, reconnected }) => {
+  const params = channelName.split('&');
 
-export default function getStream(streamingAPIBaseURL, accessToken, stream, { connected, received, disconnected, reconnected }) {
-  const params = stream.split('&');
-  stream = params.shift();
+  channelName = params.shift();
 
   if (streamingAPIBaseURL.startsWith('ws')) {
-    params.unshift(`stream=${stream}`);
     const ws = new WebSocketClient(`${streamingAPIBaseURL}/api/v1/streaming/?${params.join('&')}`, accessToken);
 
     ws.onopen      = connected;
@@ -92,28 +240,26 @@ export default function getStream(streamingAPIBaseURL, accessToken, stream, { co
     return ws;
   }
 
-  stream = stream.replace(/:/g, '/');
+  channelName = channelName.replace(/:/g, '/');
+
+  if (channelName.endsWith(':media')) {
+    channelName = channelName.replace('/media', '');
+    params.push('only_media=true');
+  }
+
   params.push(`access_token=${accessToken}`);
-  const es = new EventSource(`${streamingAPIBaseURL}/api/v1/streaming/${stream}?${params.join('&')}`);
 
-  let firstConnect = true;
+  const es = new EventSource(`${streamingAPIBaseURL}/api/v1/streaming/${channelName}?${params.join('&')}`);
+
   es.onopen = () => {
-    if (firstConnect) {
-      firstConnect = false;
-      connected();
-    } else {
-      reconnected();
-    }
+    connected();
   };
-  for (let type of knownEventTypes) {
-    es.addEventListener(type, (e) => {
-      received({
-        event: e.type,
-        payload: e.data,
-      });
-    });
-  }
-  es.onerror = disconnected;
+
+  KNOWN_EVENT_TYPES.forEach(type => {
+    es.addEventListener(type, e => handleEventSourceMessage(/** @type {MessageEvent} */ (e), received));
+  });
+
+  es.onerror = /** @type {function(): void} */ (disconnected);
 
   return es;
 };
diff --git a/app/javascript/mastodon/utils/config.js b/app/javascript/mastodon/utils/config.js
new file mode 100644
index 0000000000000000000000000000000000000000..932cd0cbf543e110eb5c3255f92f0fe9fc45ab07
--- /dev/null
+++ b/app/javascript/mastodon/utils/config.js
@@ -0,0 +1,10 @@
+import ready from '../ready';
+
+export let assetHost = '';
+
+ready(() => {
+  const cdnHost = document.querySelector('meta[name=cdn-host]');
+  if (cdnHost) {
+    assetHost = cdnHost.content || '';
+  }
+});
diff --git a/app/javascript/mastodon/utils/notifications.js b/app/javascript/mastodon/utils/notifications.js
new file mode 100644
index 0000000000000000000000000000000000000000..7634cac21f80cd6c44cae2b142e489a5b5a80e5a
--- /dev/null
+++ b/app/javascript/mastodon/utils/notifications.js
@@ -0,0 +1,30 @@
+// Handles browser quirks, based on
+// https://developer.mozilla.org/en-US/docs/Web/API/Notifications_API/Using_the_Notifications_API
+
+const checkNotificationPromise = () => {
+  try {
+    // eslint-disable-next-line promise/catch-or-return
+    Notification.requestPermission().then();
+  } catch(e) {
+    return false;
+  }
+
+  return true;
+};
+
+const handlePermission = (permission, callback) => {
+  // Whatever the user answers, we make sure Chrome stores the information
+  if(!('permission' in Notification)) {
+    Notification.permission = permission;
+  }
+
+  callback(Notification.permission);
+};
+
+export const requestNotificationPermission = (callback) => {
+  if (checkNotificationPromise()) {
+    Notification.requestPermission().then((permission) => handlePermission(permission, callback)).catch(console.warn);
+  } else {
+    Notification.requestPermission((permission) => handlePermission(permission, callback));
+  }
+};
diff --git a/app/javascript/mastodon/utils/resize_image.js b/app/javascript/mastodon/utils/resize_image.js
index 6c1cb61a2535cd748907f93ebdfbe74a26f88c6c..8f14853796a97cb4eaae070a9047b5421769582a 100644
--- a/app/javascript/mastodon/utils/resize_image.js
+++ b/app/javascript/mastodon/utils/resize_image.js
@@ -41,6 +41,45 @@ const dropOrientationIfNeeded = (orientation) => new Promise(resolve => {
   }
 });
 
+// Some browsers don't allow reading from a canvas and instead return all-white
+// or randomized data. Use a pre-defined image to check if reading the canvas
+// works.
+const checkCanvasReliability = () => new Promise((resolve, reject) => {
+  switch(_browser_quirks['canvas-read-unreliable']) {
+  case true:
+    reject('Canvas reading unreliable');
+    break;
+  case false:
+    resolve();
+    break;
+  default:
+    // 2Ã—2 GIF with white, red, green and blue pixels
+    const testImageURL =
+      'data:image/gif;base64,R0lGODdhAgACAKEDAAAA//8AAAD/AP///ywAAAAAAgACAAACA1wEBQA7';
+    const refData =
+      [255, 255, 255, 255,  255, 0, 0, 255,  0, 255, 0, 255,  0, 0, 255, 255];
+    const img = new Image();
+    img.onload = () => {
+      const canvas  = document.createElement('canvas');
+      const context = canvas.getContext('2d');
+      context.drawImage(img, 0, 0, 2, 2);
+      const imageData = context.getImageData(0, 0, 2, 2);
+      if (imageData.data.every((x, i) => refData[i] === x)) {
+        _browser_quirks['canvas-read-unreliable'] = false;
+        resolve();
+      } else {
+        _browser_quirks['canvas-read-unreliable'] = true;
+        reject('Canvas reading unreliable');
+      }
+    };
+    img.onerror = () => {
+      _browser_quirks['canvas-read-unreliable'] = true;
+      reject('Failed to load test image');
+    };
+    img.src = testImageURL;
+  }
+});
+
 const getImageUrl = inputFile => new Promise((resolve, reject) => {
   if (window.URL && URL.createObjectURL) {
     try {
@@ -110,14 +149,6 @@ const processImage = (img, { width, height, orientation, type = 'image/png' }) =
 
   context.drawImage(img, 0, 0, width, height);
 
-  // The Tor Browser and maybe other browsers may prevent reading from canvas
-  // and return an all-white image instead. Assume reading failed if the resized
-  // image is perfectly white.
-  const imageData = context.getImageData(0, 0, width, height);
-  if (imageData.data.every(value => value === 255)) {
-    throw 'Failed to read from canvas';
-  }
-
   canvas.toBlob(resolve, type);
 });
 
@@ -127,7 +158,8 @@ const resizeImage = (img, type = 'image/png') => new Promise((resolve, reject) =
   const newWidth  = Math.round(Math.sqrt(MAX_IMAGE_PIXELS * (width / height)));
   const newHeight = Math.round(Math.sqrt(MAX_IMAGE_PIXELS * (height / width)));
 
-  getOrientation(img, type)
+  checkCanvasReliability()
+    .then(getOrientation(img, type))
     .then(orientation => processImage(img, {
       width: newWidth,
       height: newHeight,
diff --git a/app/javascript/packs/about.js b/app/javascript/packs/about.js
index 843cb2c87d43860242a16b32852452f597080f78..892d825ece23e552289d47300a9d887e9949f938 100644
--- a/app/javascript/packs/about.js
+++ b/app/javascript/packs/about.js
@@ -1,3 +1,4 @@
+import './public-path';
 import loadPolyfills from '../mastodon/load_polyfills';
 import { start } from '../mastodon/common';
 
diff --git a/app/javascript/packs/admin.js b/app/javascript/packs/admin.js
index 51f92de8aa58a79bed1a5f5fd73d3b74cdc9e9f6..8fd1b8a8edbb934a2d655c92cf98ad738fff538d 100644
--- a/app/javascript/packs/admin.js
+++ b/app/javascript/packs/admin.js
@@ -1,3 +1,4 @@
+import './public-path';
 import { delegate } from '@rails/ujs';
 import ready from '../mastodon/ready';
 
@@ -56,18 +57,46 @@ const onEnableBootstrapTimelineAccountsChange = (target) => {
     bootstrapTimelineAccountsField.disabled = !target.checked;
     if (target.checked) {
       bootstrapTimelineAccountsField.parentElement.classList.remove('disabled');
+      bootstrapTimelineAccountsField.parentElement.parentElement.classList.remove('disabled');
     } else {
       bootstrapTimelineAccountsField.parentElement.classList.add('disabled');
+      bootstrapTimelineAccountsField.parentElement.parentElement.classList.add('disabled');
     }
   }
 };
 
 delegate(document, '#form_admin_settings_enable_bootstrap_timeline_accounts', 'change', ({ target }) => onEnableBootstrapTimelineAccountsChange(target));
 
+const onChangeRegistrationMode = (target) => {
+  const enabled = target.value === 'approved';
+
+  [].forEach.call(document.querySelectorAll('#form_admin_settings_require_invite_text'), (input) => {
+    input.disabled = !enabled;
+    if (enabled) {
+      let element = input;
+      do {
+        element.classList.remove('disabled');
+        element = element.parentElement;
+      } while (element && !element.classList.contains('fields-group'));
+    } else {
+      let element = input;
+      do {
+        element.classList.add('disabled');
+        element = element.parentElement;
+      } while (element && !element.classList.contains('fields-group'));
+    }
+  });
+};
+
+delegate(document, '#form_admin_settings_registrations_mode', 'change', ({ target }) => onChangeRegistrationMode(target));
+
 ready(() => {
   const domainBlockSeverityInput = document.getElementById('domain_block_severity');
   if (domainBlockSeverityInput) onDomainBlockSeverityChange(domainBlockSeverityInput);
 
   const enableBootstrapTimelineAccounts = document.getElementById('form_admin_settings_enable_bootstrap_timeline_accounts');
   if (enableBootstrapTimelineAccounts) onEnableBootstrapTimelineAccountsChange(enableBootstrapTimelineAccounts);
+
+  const registrationMode = document.getElementById('form_admin_settings_registrations_mode');
+  if (registrationMode) onChangeRegistrationMode(registrationMode);
 });
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index c65ebed74f8b94abf31111d7aa395e2a33a42ba4..91240aecfb85a09494bcdb6e54837ef244d57f43 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -1,3 +1,4 @@
+import './public-path';
 import loadPolyfills from '../mastodon/load_polyfills';
 import { start } from '../mastodon/common';
 
diff --git a/app/javascript/packs/error.js b/app/javascript/packs/error.js
index 685c890658a007886aaafa00509d42916de05788..6376dc2f5dfcc1f63eb3f5af6c847caf9209e1de 100644
--- a/app/javascript/packs/error.js
+++ b/app/javascript/packs/error.js
@@ -1,3 +1,4 @@
+import './public-path';
 import ready from '../mastodon/ready';
 
 ready(() => {
diff --git a/app/javascript/packs/public-path.js b/app/javascript/packs/public-path.js
new file mode 100644
index 0000000000000000000000000000000000000000..f96109f4fcd1824561deaeb737f12927f806da78
--- /dev/null
+++ b/app/javascript/packs/public-path.js
@@ -0,0 +1,21 @@
+// Dynamically set webpack's loading path depending on a meta header, in order
+// to share the same assets regardless of instance configuration.
+// See https://webpack.js.org/guides/public-path/#on-the-fly
+
+function removeOuterSlashes(string) {
+  return string.replace(/^\/*/, '').replace(/\/*$/, '');
+}
+
+function formatPublicPath(host = '', path = '') {
+  let formattedHost = removeOuterSlashes(host);
+  if (formattedHost && !/^http/i.test(formattedHost)) {
+    formattedHost = `//${formattedHost}`;
+  }
+  const formattedPath = removeOuterSlashes(path);
+  return `${formattedHost}/${formattedPath}/`;
+}
+
+const cdnHost = document.querySelector('meta[name=cdn-host]');
+
+// eslint-disable-next-line camelcase, no-undef, no-unused-vars
+__webpack_public_path__ = formatPublicPath(cdnHost ? cdnHost.content : '', process.env.PUBLIC_OUTPUT_PATH);
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 08cc662e60b65c1e904dee7c06464d115256acdf..8c5c15b8f4c8ddc3d503f474e2fc7e36a3a338a8 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -1,3 +1,4 @@
+import './public-path';
 import escapeTextContentForBrowser from 'escape-html';
 import loadPolyfills from '../mastodon/load_polyfills';
 import ready from '../mastodon/ready';
@@ -116,6 +117,28 @@ function main() {
       new Rellax('.parallax', { speed: -1 });
     }
 
+    delegate(document, '#registration_user_password_confirmation,#registration_user_password', 'input', () => {
+      const password = document.getElementById('registration_user_password');
+      const confirmation = document.getElementById('registration_user_password_confirmation');
+      if (password.value && password.value !== confirmation.value) {
+        confirmation.setCustomValidity((new IntlMessageFormat(messages['password_confirmation.mismatching'] || 'Password confirmation does not match', locale)).format());
+      } else {
+        confirmation.setCustomValidity('');
+      }
+    });
+
+    delegate(document, '#user_password,#user_password_confirmation', 'input', () => {
+      const password = document.getElementById('user_password');
+      const confirmation = document.getElementById('user_password_confirmation');
+      if (!confirmation) return;
+
+      if (password.value && password.value !== confirmation.value) {
+        confirmation.setCustomValidity((new IntlMessageFormat(messages['password_confirmation.mismatching'] || 'Password confirmation does not match', locale)).format());
+      } else {
+        confirmation.setCustomValidity('');
+      }
+    });
+
     delegate(document, '.custom-emoji', 'mouseover', getEmojiAnimationHandler('data-original'));
     delegate(document, '.custom-emoji', 'mouseout', getEmojiAnimationHandler('data-static'));
 
@@ -257,6 +280,17 @@ function main() {
       target.style.display = 'block';
     }
   });
+
+  // Empty the honeypot fields in JS in case something like an extension
+  // automatically filled them.
+  delegate(document, '#registration_new_user,#new_user', 'submit', () => {
+    ['user_website', 'user_confirm_password', 'registration_user_website', 'registration_user_confirm_password'].forEach(id => {
+      const field = document.getElementById(id);
+      if (field) {
+        field.value = '';
+      }
+    });
+  });
 }
 
 loadPolyfills()
diff --git a/app/javascript/packs/share.js b/app/javascript/packs/share.js
index 4ef23e1b2e9b8ef705ff07a4d9e468df39d89801..1225d7b52943151a18249c091a7454a63c012d79 100644
--- a/app/javascript/packs/share.js
+++ b/app/javascript/packs/share.js
@@ -1,3 +1,4 @@
+import './public-path';
 import loadPolyfills from '../mastodon/load_polyfills';
 import { start } from '../mastodon/common';
 
diff --git a/app/javascript/packs/two_factor_authentication.js b/app/javascript/packs/two_factor_authentication.js
new file mode 100644
index 0000000000000000000000000000000000000000..dde06be8c19f5ec0caebda7b8e7236f0e42d5565
--- /dev/null
+++ b/app/javascript/packs/two_factor_authentication.js
@@ -0,0 +1,118 @@
+import axios from 'axios';
+import * as WebAuthnJSON from '@github/webauthn-json';
+import ready from '../mastodon/ready';
+import 'regenerator-runtime/runtime';
+
+function getCSRFToken() {
+  var CSRFSelector = document.querySelector('meta[name="csrf-token"]');
+  if (CSRFSelector) {
+    return CSRFSelector.getAttribute('content');
+  } else {
+    return null;
+  }
+}
+
+function hideFlashMessages() {
+  Array.from(document.getElementsByClassName('flash-message')).forEach(function(flashMessage) {
+    flashMessage.classList.add('hidden');
+  });
+}
+
+function callback(url, body) {
+  axios.post(url, JSON.stringify(body), {
+    headers: {
+      'Content-Type': 'application/json',
+      'Accept': 'application/json',
+      'X-CSRF-Token': getCSRFToken(),
+    },
+    credentials: 'same-origin',
+  }).then(function(response) {
+    window.location.replace(response.data.redirect_path);
+  }).catch(function(error) {
+    if (error.response.status === 422) {
+      const errorMessage = document.getElementById('security-key-error-message');
+      errorMessage.classList.remove('hidden');
+      console.error(error.response.data.error);
+    } else {
+      console.error(error);
+    }
+  });
+}
+
+ready(() => {
+  if (!WebAuthnJSON.supported()) {
+    const unsupported_browser_message = document.getElementById('unsupported-browser-message');
+    if (unsupported_browser_message) {
+      unsupported_browser_message.classList.remove('hidden');
+      document.querySelector('.btn.js-webauthn').disabled = true;
+    }
+  }
+
+
+  const webAuthnCredentialRegistrationForm = document.getElementById('new_webauthn_credential');
+  if (webAuthnCredentialRegistrationForm) {
+    webAuthnCredentialRegistrationForm.addEventListener('submit', (event) => {
+      event.preventDefault();
+
+      var nickname = event.target.querySelector('input[name="new_webauthn_credential[nickname]"]');
+      if (nickname.value) {
+        axios.get('/settings/security_keys/options')
+          .then((response) => {
+            const credentialOptions = response.data;
+
+            WebAuthnJSON.create({ 'publicKey': credentialOptions }).then((credential) => {
+              var params = { 'credential': credential, 'nickname': nickname.value };
+              callback('/settings/security_keys', params);
+            }).catch((error) => {
+              const errorMessage = document.getElementById('security-key-error-message');
+              errorMessage.classList.remove('hidden');
+              console.error(error);
+            });
+          }).catch((error) => {
+            console.error(error.response.data.error);
+          });
+      } else {
+        nickname.focus();
+      }
+    });
+  }
+
+  const webAuthnCredentialAuthenticationForm = document.getElementById('webauthn-form');
+  if (webAuthnCredentialAuthenticationForm) {
+    webAuthnCredentialAuthenticationForm.addEventListener('submit', (event) => {
+      event.preventDefault();
+
+      axios.get('sessions/security_key_options')
+        .then((response) => {
+          const credentialOptions = response.data;
+
+          WebAuthnJSON.get({ 'publicKey': credentialOptions }).then((credential) => {
+            var params = { 'user': { 'credential': credential } };
+            callback('sign_in', params);
+          }).catch((error) => {
+            const errorMessage = document.getElementById('security-key-error-message');
+            errorMessage.classList.remove('hidden');
+            console.error(error);
+          });
+        }).catch((error) => {
+          console.error(error.response.data.error);
+        });
+    });
+
+    const otpAuthenticationForm = document.getElementById('otp-authentication-form');
+
+    const linkToOtp = document.getElementById('link-to-otp');
+    linkToOtp.addEventListener('click', () => {
+      webAuthnCredentialAuthenticationForm.classList.add('hidden');
+      otpAuthenticationForm.classList.remove('hidden');
+      hideFlashMessages();
+    });
+
+    const linkToWebAuthn = document.getElementById('link-to-webauthn');
+    linkToWebAuthn.addEventListener('click', () => {
+      otpAuthenticationForm.classList.add('hidden');
+      webAuthnCredentialAuthenticationForm.classList.remove('hidden');
+      hideFlashMessages();
+    });
+  }
+});
diff --git a/app/javascript/styles/contrast/diff.scss b/app/javascript/styles/contrast/diff.scss
index 5a40e7d79a9f0a537bc5947fa9f21c3242d0ccf1..841ed66480c6288375f7ce8045bfbab88261e86a 100644
--- a/app/javascript/styles/contrast/diff.scss
+++ b/app/javascript/styles/contrast/diff.scss
@@ -75,3 +75,8 @@
 .public-layout .public-account-header__tabs__tabs .counter.active::after {
   border-bottom: 4px solid $ui-highlight-color;
 }
+
+.compose-form .autosuggest-textarea__textarea::placeholder,
+.compose-form .spoiler-input__input::placeholder {
+  color: $inverted-text-color;
+}
diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss
index e25a80c043287ba3aaae16fdbbd134bdb0a3cdc8..55ebd309195352acf8628d92ffa8172a0be823e8 100644
--- a/app/javascript/styles/mailer.scss
+++ b/app/javascript/styles/mailer.scss
@@ -58,6 +58,16 @@ td {
   vertical-align: top;
 }
 
+.auto-dir {
+  p {
+    unicode-bidi: plaintext;
+  }
+
+  a {
+    unicode-bidi: isolate;
+  }
+}
+
 .email-table,
 .content-section,
 .column,
@@ -96,7 +106,7 @@ body {
 .col-3,
 .col-4,
 .col-5,
-.col-6, {
+.col-6 {
   font-size: 0;
   display: inline-block;
   width: 100%;
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 8c8d69fc47e284e3e9eb0057d01f53b5a47e618f..d4290d7e61a80eb919d9e25594b9fb06570ee88b 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -256,14 +256,6 @@ html {
   background: $ui-base-color;
 }
 
-.status.status-direct {
-  background: lighten($ui-base-color, 4%);
-}
-
-.focusable:focus .status.status-direct {
-  background: lighten($ui-base-color, 8%);
-}
-
 .detailed-status,
 .detailed-status__action-bar {
   background: $white;
@@ -363,11 +355,45 @@ html {
 .error-modal,
 .onboarding-modal,
 .report-modal__comment .setting-text__wrapper,
-.report-modal__comment .setting-text {
+.report-modal__comment .setting-text,
+.announcements,
+.picture-in-picture__header,
+.picture-in-picture__footer,
+.reactions-bar__item {
   background: $white;
   border: 1px solid lighten($ui-base-color, 8%);
 }
 
+.reactions-bar__item {
+  &:hover,
+  &:focus,
+  &:active {
+    background-color: $ui-base-color;
+  }
+}
+
+.reactions-bar__item.active {
+  background-color: mix($white, $ui-highlight-color, 80%);
+  border-color: mix(lighten($ui-base-color, 8%), $ui-highlight-color, 80%);
+}
+
+.media-modal__overlay .picture-in-picture__footer {
+  border: 0;
+}
+
+.picture-in-picture__header {
+  border-bottom: 0;
+}
+
+.announcements,
+.picture-in-picture__footer {
+  border-top: 0;
+}
+
+.icon-with-badge__badge {
+  border-color: $white;
+}
+
 .report-modal__comment {
   border-right-color: lighten($ui-base-color, 8%);
 }
@@ -520,6 +546,12 @@ html {
   }
 }
 
+.picture-in-picture-placeholder {
+  background: $white;
+  border-color: lighten($ui-base-color, 8%);
+  color: lighten($ui-base-color, 8%);
+}
+
 .brand__tagline {
   color: $ui-secondary-color;
 }
@@ -767,3 +799,8 @@ html {
 .compose-form .compose-form__warning {
   box-shadow: none;
 }
+
+.mute-modal select {
+  border: 1px solid lighten($ui-base-color, 8%);
+  background: $simple-background-color url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 8%))}'/></svg>") no-repeat right 8px center / auto 16px;
+}
diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss
index 3be0aee49bcaab3646dedc80da8df89e031e8076..d6bd9e3c6054b0f164f79955ab7e34a2ac4e5d99 100644
--- a/app/javascript/styles/mastodon/about.scss
+++ b/app/javascript/styles/mastodon/about.scss
@@ -732,6 +732,7 @@ $small-breakpoint: 960px;
 
       &__column {
         flex: 1 1 50%;
+        overflow-x: hidden;
       }
     }
 
diff --git a/app/javascript/styles/mastodon/boost.scss b/app/javascript/styles/mastodon/boost.scss
index 5a6d6ae406c4610faf56bd1bcbba343f7c67b23a..fb1451cb245bee001cbc058098cc82d8234c3527 100644
--- a/app/javascript/styles/mastodon/boost.scss
+++ b/app/javascript/styles/mastodon/boost.scss
@@ -1,11 +1,32 @@
-button.icon-button i.fa-retweet {
-  background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($action-button-color)}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($highlight-text-color)}' stroke-width='0'/></svg>");
+button.icon-button {
+  i.fa-retweet {
+    background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($action-button-color)}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($highlight-text-color)}' stroke-width='0'/></svg>");
+  }
 
-  &:hover {
+  &:hover i.fa-retweet {
     background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(lighten($action-button-color, 7%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($highlight-text-color)}' stroke-width='0'/></svg>");
   }
-}
 
-button.icon-button.disabled i.fa-retweet {
-  background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(darken($action-button-color, 13%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($highlight-text-color)}' stroke-width='0'/></svg>");
+  &.reblogPrivate {
+    i.fa-retweet {
+      background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' height='209' width='22'><path d='M 4.9707031 3.1503906 L 4.9707031 3.1601562 C 4.8707031 3.1901563 4.8 3.2598438 4.75 3.3398438 L 0.80078125 8.2402344 C 0.60078125 8.5402344 0.8292187 9.0190625 1.1992188 9.0390625 L 3.5996094 9.0390625 L 3.5996094 11.720703 C 3.5996094 15.980703 3.0497656 15.339844 7.2597656 15.339844 L 11.869141 15.339844 L 11.869141 14.119141 L 11.869141 13.523438 L 11.869141 12.441406 C 11.869141 12.441406 11.869141 12.439453 11.869141 12.439453 L 7.2695312 12.439453 C 6.8295312 12.439453 6.5507814 12.140703 6.5507812 11.720703 L 6.5507812 9.0195312 L 9.0507812 9.0195312 C 9.4207813 9.0495313 9.6792188 8.54 9.4492188 8.25 L 5.5 3.3496094 C 5.38 3.1796094 5.1607031 3.1003906 4.9707031 3.1503906 z M 17.150391 3.5800781 L 17.130859 3.5898438 C 16.580859 3.5698436 15.810469 3.609375 14.730469 3.609375 L 7.0996094 3.609375 L 9.4199219 6.4609375 L 9.4492188 6.5195312 L 14.699219 6.5195312 C 15.106887 6.5195312 15.397113 6.7872181 15.414062 7.2050781 C 15.738375 7.0991315 16.077769 7.0273437 16.435547 7.0273438 L 16.578125 7.0273438 C 17.24903 7.0273438 17.874081 7.2325787 18.400391 7.578125 L 18.400391 7.2402344 C 18.400391 4.0902344 18.800391 3.6200781 17.150391 3.5800781 z M 16.435547 8.0273438 C 15.143818 8.0273438 14.083984 9.0851838 14.083984 10.376953 L 14.083984 11.607422 L 13.570312 11.607422 C 13.375448 11.607422 13.210603 11.704118 13.119141 11.791016 C 13.027691 11.877916 12.983569 11.958238 12.951172 12.03125 C 12.886382 12.177277 12.867187 12.304789 12.867188 12.441406 L 12.867188 13.523438 L 12.867188 14.119141 L 12.867188 15.677734 L 12.867188 16.509766 L 13.570312 16.509766 L 19.472656 16.509766 L 20.173828 16.509766 L 20.173828 15.677734 L 20.173828 13.523438 L 20.173828 12.441406 C 20.173828 12.304794 20.156597 12.177281 20.091797 12.03125 C 20.059397 11.95824 20.015299 11.877916 19.923828 11.791016 C 19.832368 11.704116 19.667509 11.607422 19.472656 11.607422 L 18.927734 11.607422 L 18.927734 10.376953 C 18.927734 9.0851838 17.867902 8.0273438 16.576172 8.0273438 L 16.435547 8.0273438 z M 16.435547 9.2207031 L 16.576172 9.2207031 C 17.22782 9.2207031 17.734375 9.7251013 17.734375 10.376953 L 17.734375 11.607422 L 15.277344 11.607422 L 15.277344 10.376953 C 15.277344 9.7251013 15.7839 9.2207031 16.435547 9.2207031 z M 12.919922 9.9394531 C 12.559922 9.9594531 12.359141 10.480234 12.619141 10.740234 L 12.751953 10.904297 C 12.862211 10.870135 12.980058 10.842244 13.085938 10.802734 L 13.085938 10.378906 C 13.085938 10.228632 13.111295 10.084741 13.130859 9.9394531 L 12.919922 9.9394531 z M 19.882812 9.9394531 C 19.902378 10.084741 19.927734 10.228632 19.927734 10.378906 L 19.927734 10.791016 C 20.168811 10.875098 20.455966 10.916935 20.613281 11.066406 C 20.691227 11.140457 20.749315 11.223053 20.806641 11.302734 L 21.259766 10.740234 C 21.519766 10.460234 21.260625 9.9094531 20.890625 9.9394531 L 19.882812 9.9394531 z M 16.435547 10.220703 C 16.301234 10.220703 16.277344 10.244432 16.277344 10.378906 L 16.277344 10.607422 L 16.734375 10.607422 L 16.734375 10.378906 C 16.734375 10.244433 16.712442 10.220703 16.578125 10.220703 L 16.435547 10.220703 z ' fill='#{hex-color($action-button-color)}' stroke-width='0'/><path d='M 7.7792969 19.650391 L 7.7792969 19.660156 C 7.5392969 19.680156 7.3398437 19.910156 7.3398438 20.160156 L 7.3398438 22.619141 L 7.2792969 22.619141 C 6.1992969 22.619141 5.4208594 22.589844 4.8808594 22.589844 C 3.2408594 22.589844 3.6308594 23.020234 3.6308594 26.240234 L 3.6308594 30.710938 C 3.6308594 34.970937 3.0692969 34.330078 7.2792969 34.330078 L 8.5 34.330078 L 7.1992188 33.269531 C 7.0992188 33.189531 7.02 33.070703 7 32.970703 C 6.98 32.800703 7.0592186 32.619531 7.1992188 32.519531 L 8.5292969 31.419922 L 7.2792969 31.419922 C 6.8392969 31.419922 6.5605469 31.120703 6.5605469 30.720703 L 6.5605469 26.240234 C 6.5605469 25.800234 6.8392969 25.519531 7.2792969 25.519531 L 7.3398438 25.519531 L 7.3398438 28.019531 C 7.3398438 28.399531 7.8801564 28.650391 8.1601562 28.400391 L 13.060547 24.470703 C 13.310547 24.290703 13.310547 23.869453 13.060547 23.689453 L 8.1601562 19.769531 C 8.0601563 19.669531 7.9192969 19.630391 7.7792969 19.650391 z M 17.119141 22.580078 L 17.119141 22.589844 C 16.579141 22.569844 15.820703 22.609375 14.720703 22.609375 L 13.470703 22.609375 L 14.769531 23.679688 C 14.869531 23.749688 14.950703 23.879766 14.970703 24.009766 C 14.990703 24.169766 14.909531 24.310156 14.769531 24.410156 L 13.439453 25.509766 L 14.720703 25.509766 C 15.129702 25.509766 15.41841 25.778986 15.433594 26.199219 C 15.752266 26.097283 16.084896 26.027344 16.435547 26.027344 L 16.578125 26.027344 C 17.236645 26.027344 17.848901 26.228565 18.369141 26.5625 L 18.369141 26.240234 C 18.369141 23.090234 18.769141 22.620078 17.119141 22.580078 z M 16.435547 27.027344 C 15.143818 27.027344 14.083984 28.085184 14.083984 29.376953 L 14.083984 30.607422 L 13.570312 30.607422 C 13.375452 30.607422 13.210603 30.704118 13.119141 30.791016 C 13.027691 30.877916 12.983569 30.958238 12.951172 31.03125 C 12.886382 31.177277 12.867184 31.304789 12.867188 31.441406 L 12.867188 32.523438 L 12.867188 33.119141 L 12.867188 34.677734 L 12.867188 35.509766 L 13.570312 35.509766 L 19.472656 35.509766 L 20.173828 35.509766 L 20.173828 34.677734 L 20.173828 32.523438 L 20.173828 31.441406 C 20.173828 31.304794 20.156597 31.177281 20.091797 31.03125 C 20.059397 30.95824 20.015299 30.877916 19.923828 30.791016 C 19.832368 30.704116 19.667509 30.607422 19.472656 30.607422 L 18.927734 30.607422 L 18.927734 29.376953 C 18.927734 28.085184 17.867902 27.027344 16.576172 27.027344 L 16.435547 27.027344 z M 16.435547 28.220703 L 16.576172 28.220703 C 17.22782 28.220703 17.734375 28.725101 17.734375 29.376953 L 17.734375 30.607422 L 15.277344 30.607422 L 15.277344 29.376953 C 15.277344 28.725101 15.7839 28.220703 16.435547 28.220703 z M 13.109375 29.150391 L 8.9199219 32.509766 C 8.6599219 32.689766 8.6599219 33.109063 8.9199219 33.289062 L 11.869141 35.648438 L 11.869141 34.677734 L 11.869141 33.119141 L 11.869141 32.523438 L 11.869141 31.441406 C 11.869141 31.217489 11.912641 30.907486 12.037109 30.626953 C 12.093758 30.499284 12.228597 30.257492 12.429688 30.066406 C 12.580253 29.92335 12.859197 29.887344 13.085938 29.802734 L 13.085938 29.378906 C 13.085938 29.300761 13.104 29.227272 13.109375 29.150391 z M 16.435547 29.220703 C 16.301234 29.220703 16.277344 29.244432 16.277344 29.378906 L 16.277344 29.607422 L 16.734375 29.607422 L 16.734375 29.378906 C 16.734375 29.244433 16.712442 29.220703 16.578125 29.220703 L 16.435547 29.220703 z M 12.943359 36.509766 L 13.820312 37.210938 C 14.090314 37.460938 14.639141 37.210078 14.619141 36.830078 L 14.619141 36.509766 L 13.570312 36.509766 L 12.943359 36.509766 z M 10.330078 38.650391 L 10.339844 38.660156 C 10.099844 38.680156 9.9001562 38.910156 9.9101562 39.160156 L 9.9101562 41.630859 L 7.3007812 41.630859 C 6.2207812 41.630859 5.4403906 41.589844 4.9003906 41.589844 C 3.2603906 41.589844 3.6503906 42.020234 3.6503906 45.240234 L 3.6503906 49.710938 C 3.6503906 53.370936 3.4202344 53.409141 5.9902344 53.369141 L 4.6503906 52.269531 C 4.5503906 52.189531 4.4692187 52.070703 4.4492188 51.970703 C 4.4492188 51.800703 4.5203906 51.619531 4.6503906 51.519531 L 6.609375 49.919922 C 6.579375 49.859922 6.5703125 49.790703 6.5703125 49.720703 L 6.5703125 45.240234 C 6.5703125 44.800234 6.8490625 44.519531 7.2890625 44.519531 L 9.9003906 44.519531 L 9.9003906 47.019531 C 9.9003906 47.379531 10.399219 47.620391 10.699219 47.400391 L 15.630859 43.470703 C 15.870859 43.290703 15.870859 42.869453 15.630859 42.689453 L 10.689453 38.769531 C 10.589453 38.689531 10.460078 38.640391 10.330078 38.650391 z M 16.869141 41.585938 C 16.616211 41.581522 16.322969 41.584844 15.980469 41.589844 L 15.970703 41.589844 L 17.310547 42.689453 C 17.410547 42.759453 17.489766 42.889531 17.509766 43.019531 C 17.529766 43.179531 17.479609 43.319922 17.349609 43.419922 L 15.390625 45.019531 C 15.406724 45.075878 15.427133 45.132837 15.4375 45.197266 C 15.754974 45.096169 16.086404 45.027344 16.435547 45.027344 L 16.578125 45.027344 C 17.24129 45.027344 17.858323 45.230088 18.380859 45.568359 L 18.380859 45.25 C 18.380859 42.0475 18.639648 41.616836 16.869141 41.585938 z M 16.435547 46.027344 C 15.143818 46.027344 14.083984 47.085184 14.083984 48.376953 L 14.083984 49.607422 L 13.570312 49.607422 C 13.375448 49.607422 13.210603 49.704118 13.119141 49.791016 C 13.027691 49.877916 12.983569 49.958238 12.951172 50.03125 C 12.886382 50.177277 12.867187 50.304789 12.867188 50.441406 L 12.867188 51.523438 L 12.867188 52.119141 L 12.867188 53.677734 L 12.867188 54.509766 L 13.570312 54.509766 L 19.472656 54.509766 L 20.173828 54.509766 L 20.173828 53.677734 L 20.173828 51.523438 L 20.173828 50.441406 C 20.173828 50.304794 20.156597 50.177281 20.091797 50.03125 C 20.059397 49.95824 20.015299 49.877916 19.923828 49.791016 C 19.832368 49.704116 19.667509 49.607422 19.472656 49.607422 L 18.927734 49.607422 L 18.927734 48.376953 C 18.927734 47.085184 17.867902 46.027344 16.576172 46.027344 L 16.435547 46.027344 z M 16.435547 47.220703 L 16.576172 47.220703 C 17.22782 47.220703 17.734375 47.725101 17.734375 48.376953 L 17.734375 49.607422 L 15.277344 49.607422 L 15.277344 48.376953 C 15.277344 47.725101 15.7839 47.220703 16.435547 47.220703 z M 11.470703 47.490234 C 11.410703 47.510234 11.349063 47.539844 11.289062 47.589844 L 6.3496094 51.519531 C 6.1096094 51.699531 6.1096094 52.120781 6.3496094 52.300781 L 11.289062 56.220703 C 11.569064 56.440703 12.070312 56.199844 12.070312 55.839844 L 12.070312 55.509766 L 11.869141 55.509766 L 11.869141 53.677734 L 11.869141 52.119141 L 11.869141 51.523438 L 11.869141 50.441406 C 11.869141 50.217489 11.912641 49.907486 12.037109 49.626953 C 12.043809 49.611855 12.061451 49.584424 12.070312 49.566406 L 12.070312 47.960938 C 12.070312 47.660938 11.770703 47.430234 11.470703 47.490234 z M 16.435547 48.220703 C 16.301234 48.220703 16.277344 48.244432 16.277344 48.378906 L 16.277344 48.607422 L 16.734375 48.607422 L 16.734375 48.378906 C 16.734375 48.244433 16.712442 48.220703 16.578125 48.220703 L 16.435547 48.220703 z M 13.060547 57.650391 L 13.060547 57.660156 C 12.830547 57.690156 12.660156 57.920156 12.660156 58.160156 L 12.660156 60.630859 L 7.2792969 60.630859 C 6.1992969 60.630859 5.4208594 60.589844 4.8808594 60.589844 C 3.2408594 60.589844 3.6308594 61.020234 3.6308594 64.240234 L 3.6308594 69.109375 L 6.5605469 66.740234 L 6.5605469 64.240234 C 6.5605469 63.800234 6.8392969 63.519531 7.2792969 63.519531 L 12.660156 63.519531 L 12.660156 66.019531 C 12.660156 66.299799 12.960394 66.500006 13.226562 66.474609 C 13.625751 65.076914 14.904956 64.035678 16.421875 64.029297 L 18.380859 62.470703 C 18.620859 62.290703 18.620859 61.869453 18.380859 61.689453 L 13.439453 57.769531 C 13.339453 57.669531 13.200547 57.630391 13.060547 57.650391 z M 18.359375 63.810547 L 17.800781 64.269531 C 18.004793 64.350836 18.198411 64.450249 18.380859 64.568359 L 18.380859 64.25 L 18.380859 63.810547 L 18.359375 63.810547 z M 16.435547 65.027344 C 15.143818 65.027344 14.083984 66.085184 14.083984 67.376953 L 14.083984 68.607422 L 13.570312 68.607422 C 13.375448 68.607422 13.210603 68.704118 13.119141 68.791016 C 13.027691 68.877916 12.983569 68.958238 12.951172 69.03125 C 12.886382 69.177277 12.867187 69.304789 12.867188 69.441406 L 12.867188 70.523438 L 12.867188 71.119141 L 12.867188 72.677734 L 12.867188 73.509766 L 13.570312 73.509766 L 19.472656 73.509766 L 20.173828 73.509766 L 20.173828 72.677734 L 20.173828 70.523438 L 20.173828 69.441406 C 20.173828 69.304794 20.156597 69.177281 20.091797 69.03125 C 20.059397 68.95824 20.015299 68.877916 19.923828 68.791016 C 19.832368 68.704116 19.667509 68.607422 19.472656 68.607422 L 18.927734 68.607422 L 18.927734 67.376953 C 18.927734 66.085184 17.867902 65.027344 16.576172 65.027344 L 16.435547 65.027344 z M 16.435547 66.220703 L 16.576172 66.220703 C 17.22782 66.220703 17.734375 66.725101 17.734375 67.376953 L 17.734375 68.607422 L 15.277344 68.607422 L 15.277344 67.376953 C 15.277344 66.725101 15.7839 66.220703 16.435547 66.220703 z M 8.7207031 66.509766 C 8.6507031 66.529766 8.5895312 66.559375 8.5195312 66.609375 L 3.5996094 70.519531 C 3.3496094 70.699531 3.3496094 71.120781 3.5996094 71.300781 L 8.5292969 75.220703 C 8.8092969 75.440703 9.3105469 75.199844 9.3105469 74.839844 L 9.3105469 72.339844 L 11.869141 72.339844 L 11.869141 71.119141 L 11.869141 70.523438 L 11.869141 69.449219 L 9.3203125 69.449219 L 9.3203125 66.980469 C 9.3203125 66.680469 9.0007031 66.449766 8.7207031 66.509766 z M 16.435547 67.220703 C 16.301234 67.220703 16.277344 67.244432 16.277344 67.378906 L 16.277344 67.607422 L 16.734375 67.607422 L 16.734375 67.378906 C 16.734375 67.244433 16.712442 67.220703 16.578125 67.220703 L 16.435547 67.220703 z M 19.248047 78.800781 C 19.148558 78.831033 19.050295 78.90106 18.970703 78.970703 L 18.070312 79.869141 C 17.630312 79.569141 16.710703 79.619141 14.720703 79.619141 L 7.2792969 79.619141 C 6.1992969 79.619141 5.4208594 79.589844 4.8808594 79.589844 C 3.2408594 79.589844 3.6308594 80.020234 3.6308594 83.240234 L 3.6308594 83.939453 L 6.5605469 84.240234 L 6.5605469 83.240234 C 6.5605469 82.800234 6.8392969 82.519531 7.2792969 82.519531 L 14.720703 82.519531 C 14.920703 82.519531 15.090703 82.600703 15.220703 82.720703 L 13.419922 84.519531 C 13.279464 84.665607 13.281282 84.881022 13.363281 85.054688 C 13.880838 83.867655 15.067337 83.027344 16.435547 83.027344 L 16.578125 83.027344 C 18.290465 83.027344 19.703357 84.345788 19.890625 86.011719 L 19.960938 86.019531 C 20.240938 86.049531 20.520234 85.770234 20.490234 85.490234 L 19.789062 79.240234 C 19.789062 78.973661 19.498025 78.767523 19.25 78.800781 L 19.248047 78.800781 z M 16.435547 84.027344 C 15.143818 84.027344 14.083984 85.085184 14.083984 86.376953 L 14.083984 87.607422 L 13.570312 87.607422 C 13.375448 87.607422 13.210603 87.704118 13.119141 87.791016 C 13.027691 87.877916 12.983569 87.958238 12.951172 88.03125 C 12.886382 88.177277 12.867187 88.304789 12.867188 88.441406 L 12.867188 89.523438 L 12.867188 90.119141 L 12.867188 91.677734 L 12.867188 92.509766 L 13.570312 92.509766 L 19.472656 92.509766 L 20.173828 92.509766 L 20.173828 91.677734 L 20.173828 89.523438 L 20.173828 88.441406 C 20.173828 88.304794 20.156597 88.177281 20.091797 88.03125 C 20.059397 87.95824 20.015299 87.877916 19.923828 87.791016 C 19.832368 87.704116 19.667509 87.607422 19.472656 87.607422 L 18.927734 87.607422 L 18.927734 86.376953 C 18.927734 85.085184 17.867902 84.027344 16.576172 84.027344 L 16.435547 84.027344 z M 2.0507812 84.900391 C 1.8507824 84.970391 1.6907031 85.199453 1.7207031 85.439453 L 2.4199219 91.689453 C 2.4399219 92.049453 3 92.240929 3.25 91.960938 L 4.0507812 91.160156 C 4.0707812 91.160156 4.0898437 91.140156 4.0898438 91.160156 C 4.5498437 91.400156 5.4595313 91.330078 7.2695312 91.330078 L 11.869141 91.330078 L 11.869141 90.119141 L 11.869141 89.523438 L 11.869141 88.441406 C 11.869141 88.437991 11.871073 88.433136 11.871094 88.429688 L 7.2792969 88.429688 C 7.1292969 88.429688 6.9808594 88.400078 6.8808594 88.330078 L 8.8007812 86.400391 C 9.1007822 86.160391 8.8992969 85.600547 8.5292969 85.560547 L 2.25 84.910156 L 2.0507812 84.910156 L 2.0507812 84.900391 z M 16.435547 85.220703 L 16.576172 85.220703 C 17.22782 85.220703 17.734375 85.725101 17.734375 86.376953 L 17.734375 87.607422 L 15.277344 87.607422 L 15.277344 86.376953 C 15.277344 85.725101 15.7839 85.220703 16.435547 85.220703 z M 4.8808594 98.599609 C 3.5508594 98.599609 3.5400781 99.080402 3.5800781 100.90039 L 4.7207031 99.529297 C 4.8007031 99.429297 4.9405469 99.360078 5.0605469 99.330078 C 5.2205469 99.330078 5.4 99.409297 5.5 99.529297 L 7.1601562 101.56055 C 7.2001563 101.56055 7.2292969 101.5293 7.2792969 101.5293 L 14.720703 101.5293 C 15.060703 101.5293 15.289141 101.7293 15.369141 102.0293 L 12.939453 102.0293 C 12.599453 102.0793 12.410625 102.55055 12.640625 102.81055 L 13.470703 103.85742 C 14.029941 102.77899 15.146801 102.02734 16.435547 102.02734 L 16.578125 102.02734 C 18.158418 102.02734 19.491598 103.14879 19.835938 104.63086 L 21.279297 102.82031 C 21.499297 102.55031 21.260156 102.06078 20.910156 102.05078 L 18.400391 102.05078 C 18.420391 98.150792 19.000234 98.650391 14.740234 98.650391 L 7.2792969 98.650391 C 6.1992969 98.650391 5.4208594 98.609375 4.8808594 98.609375 L 4.8808594 98.599609 z M 5.0292969 101.06055 C 4.9292969 101.09055 4.83 101.15977 4.75 101.25977 L 0.81054688 106.16016 C 0.61054688 106.44016 0.8409375 106.92945 1.2109375 106.93945 L 3.5996094 106.93945 C 3.5796094 110.87945 3.1497656 110.33984 7.2597656 110.33984 L 11.869141 110.33984 L 11.869141 109.11914 L 11.869141 108.52344 L 11.869141 107.44141 L 11.869141 107.43945 L 7.2792969 107.43945 C 6.9292969 107.43945 6.7091406 107.23945 6.6191406 106.93945 L 9.0605469 106.93945 C 9.4305469 106.93945 9.6909375 106.44016 9.4609375 106.16016 L 5.5 101.25977 C 5.4 101.10977 5.1992969 101.03055 5.0292969 101.06055 z M 16.435547 103.02734 C 15.143818 103.02734 14.083984 104.08518 14.083984 105.37695 L 14.083984 106.60742 L 13.570312 106.60742 C 13.375448 106.60742 13.210603 106.70409 13.119141 106.79102 C 13.027691 106.87792 12.983569 106.95823 12.951172 107.03125 C 12.886382 107.17727 12.867187 107.30479 12.867188 107.44141 L 12.867188 108.52344 L 12.867188 109.11914 L 12.867188 110.67773 L 12.867188 111.50977 L 13.570312 111.50977 L 19.472656 111.50977 L 20.173828 111.50977 L 20.173828 110.67773 L 20.173828 108.52344 L 20.173828 107.44141 C 20.173828 107.3048 20.156597 107.17728 20.091797 107.03125 C 20.059397 106.95825 20.015299 106.87792 19.923828 106.79102 C 19.832368 106.70412 19.667509 106.60742 19.472656 106.60742 L 18.927734 106.60742 L 18.927734 105.37695 C 18.927734 104.08518 17.867902 103.02734 16.576172 103.02734 L 16.435547 103.02734 z M 16.435547 104.2207 L 16.576172 104.2207 C 17.22782 104.2207 17.734375 104.7251 17.734375 105.37695 L 17.734375 106.60742 L 15.277344 106.60742 L 15.277344 105.37695 C 15.277344 104.7251 15.7839 104.2207 16.435547 104.2207 z M 16.435547 105.2207 C 16.301234 105.2207 16.277344 105.24444 16.277344 105.37891 L 16.277344 105.60742 L 16.734375 105.60742 L 16.734375 105.37891 C 16.734375 105.24441 16.712442 105.2207 16.578125 105.2207 L 16.435547 105.2207 z M 4.8808594 117.58984 L 4.8808594 117.59961 C 3.7208594 117.59961 3.5800781 117.90016 3.5800781 119.16016 L 4.7207031 117.7793 C 4.8007031 117.6793 4.9405469 117.63914 5.0605469 117.61914 C 5.2205469 117.61914 5.4 117.6593 5.5 117.7793 L 7.7207031 120.5293 L 14.720703 120.5293 C 15.123595 120.5293 15.408576 120.79174 15.431641 121.20117 C 15.750992 121.09876 16.08404 121.02734 16.435547 121.02734 L 16.578125 121.02734 C 17.24903 121.02734 17.874081 121.23262 18.400391 121.57812 L 18.400391 121.25 C 18.400391 117.05 19.120234 117.61914 14.740234 117.61914 L 7.2792969 117.61914 C 6.1992969 117.61914 5.4208594 117.58984 4.8808594 117.58984 z M 4.9804688 119.33984 C 4.8804688 119.36984 4.81 119.44 4.75 119.5 L 0.80078125 124.43945 C 0.60078125 124.71945 0.8292182 125.2107 1.1992188 125.2207 L 3.5996094 125.2207 L 3.5996094 125.7207 C 3.5996094 129.9807 3.0497656 129.33984 7.2597656 129.33984 L 11.869141 129.33984 L 11.869141 128.11914 L 11.869141 127.52344 L 11.869141 126.44141 C 11.869141 126.43799 11.871073 126.43314 11.871094 126.42969 L 7.2792969 126.42969 C 6.8392969 126.42969 6.5605469 126.13094 6.5605469 125.71094 L 6.5605469 125.21094 L 9.0605469 125.21094 C 9.4305469 125.23094 9.6909375 124.70969 9.4609375 124.42969 L 5.5 119.5 C 5.3820133 119.35252 5.1682348 119.28513 4.9804688 119.33984 z M 12.839844 121.7793 C 12.539844 121.8793 12.410625 122.32055 12.640625 122.56055 L 13.267578 123.34375 C 13.473522 122.72168 13.852237 122.1828 14.353516 121.7793 L 12.839844 121.7793 z M 18.658203 121.7793 C 19.393958 122.37155 19.878978 123.25738 19.916016 124.25781 L 21.279297 122.56055 C 21.499297 122.28055 21.260156 121.7893 20.910156 121.7793 L 18.658203 121.7793 z M 16.435547 122.02734 C 15.143818 122.02734 14.083984 123.08518 14.083984 124.37695 L 14.083984 125.60742 L 13.570312 125.60742 C 13.375448 125.60742 13.210603 125.70409 13.119141 125.79102 C 13.027691 125.87792 12.983569 125.95823 12.951172 126.03125 C 12.886382 126.17727 12.867187 126.30479 12.867188 126.44141 L 12.867188 127.52344 L 12.867188 128.11914 L 12.867188 129.67773 L 12.867188 130.50977 L 13.570312 130.50977 L 19.472656 130.50977 L 20.173828 130.50977 L 20.173828 129.67773 L 20.173828 127.52344 L 20.173828 126.44141 C 20.173828 126.3048 20.156597 126.17728 20.091797 126.03125 C 20.059397 125.95825 20.015299 125.87792 19.923828 125.79102 C 19.832368 125.70412 19.667509 125.60742 19.472656 125.60742 L 18.927734 125.60742 L 18.927734 124.37695 C 18.927734 123.08518 17.867902 122.02734 16.576172 122.02734 L 16.435547 122.02734 z M 16.435547 123.2207 L 16.576172 123.2207 C 17.22782 123.2207 17.734375 123.7251 17.734375 124.37695 L 17.734375 125.60742 L 15.277344 125.60742 L 15.277344 124.37695 C 15.277344 123.7251 15.7839 123.2207 16.435547 123.2207 z M 16.435547 124.2207 C 16.301234 124.2207 16.277344 124.24444 16.277344 124.37891 L 16.277344 124.60742 L 16.734375 124.60742 L 16.734375 124.37891 C 16.734375 124.24441 16.712442 124.2207 16.578125 124.2207 L 16.435547 124.2207 z M 5.9394531 136.58984 L 5.9394531 136.59961 L 8.3105469 139.5293 L 14.730469 139.5293 C 15.131912 139.5293 15.414551 139.79039 15.439453 140.19727 C 15.756409 140.09653 16.087055 140.02734 16.435547 140.02734 L 16.578125 140.02734 C 17.24903 140.02734 17.874081 140.23261 18.400391 140.57812 L 18.400391 140.25 C 18.400391 136.05 19.120234 136.61914 14.740234 136.61914 L 7.2792969 136.61914 C 6.6792969 136.61914 6.3594531 136.59984 5.9394531 136.58984 z M 4.2207031 136.66016 C 3.8207031 136.74016 3.6791406 136.96016 3.6191406 137.41016 L 4.2207031 136.66992 L 4.2207031 136.66016 z M 5.0605469 137.57031 L 5.0605469 137.58984 C 4.9405469 137.58984 4.8197656 137.66953 4.7597656 137.76953 L 0.81054688 142.66992 C 0.57054688 142.96992 0.8109375 143.50023 1.2109375 143.49023 L 3.5996094 143.49023 L 3.5996094 144.71094 C 3.5996094 148.97094 3.0497656 148.33008 7.2597656 148.33008 L 11.869141 148.33008 L 11.869141 147.11914 L 11.869141 146.52344 L 11.869141 145.44141 C 11.869141 145.43799 11.871073 145.43314 11.871094 145.42969 L 7.2792969 145.42969 C 6.8392969 145.42969 6.5605469 145.13094 6.5605469 144.71094 L 6.5605469 143.49023 L 9.0605469 143.49023 C 9.4605469 143.53023 9.7309375 142.95945 9.4609375 142.68945 L 5.5 137.76953 C 5.4 137.63953 5.2305469 137.57031 5.0605469 137.57031 z M 16.435547 141.02734 C 15.143818 141.02734 14.083984 142.08518 14.083984 143.37695 L 14.083984 144.60742 L 13.570312 144.60742 C 13.375448 144.60742 13.210603 144.70409 13.119141 144.79102 C 13.027691 144.87792 12.983569 144.95823 12.951172 145.03125 C 12.886382 145.17727 12.867187 145.30479 12.867188 145.44141 L 12.867188 146.52344 L 12.867188 147.11914 L 12.867188 148.67773 L 12.867188 149.50977 L 13.570312 149.50977 L 19.472656 149.50977 L 20.173828 149.50977 L 20.173828 148.67773 L 20.173828 146.52344 L 20.173828 145.44141 C 20.173828 145.3048 20.156597 145.17728 20.091797 145.03125 C 20.059397 144.95825 20.015299 144.87792 19.923828 144.79102 C 19.832368 144.70412 19.667509 144.60742 19.472656 144.60742 L 18.927734 144.60742 L 18.927734 143.37695 C 18.927734 142.08518 17.867902 141.02734 16.576172 141.02734 L 16.435547 141.02734 z M 12.849609 141.5 C 12.549609 141.6 12.420391 142.0393 12.650391 142.2793 L 13.136719 142.88672 C 13.213026 142.38119 13.390056 141.90696 13.667969 141.5 L 12.849609 141.5 z M 19.34375 141.5 C 19.710704 142.03735 19.927734 142.68522 19.927734 143.37891 L 19.927734 143.79102 C 19.965561 143.80421 20.005506 143.81448 20.044922 143.82617 L 21.289062 142.2793 C 21.509062 141.9993 21.269922 141.51 20.919922 141.5 L 19.34375 141.5 z M 16.435547 142.2207 L 16.576172 142.2207 C 17.22782 142.2207 17.734375 142.7251 17.734375 143.37695 L 17.734375 144.60742 L 15.277344 144.60742 L 15.277344 143.37695 C 15.277344 142.7251 15.7839 142.2207 16.435547 142.2207 z M 16.435547 143.2207 C 16.301234 143.2207 16.277344 143.24444 16.277344 143.37891 L 16.277344 143.60742 L 16.734375 143.60742 L 16.734375 143.37891 C 16.734375 143.24441 16.712442 143.2207 16.578125 143.2207 L 16.435547 143.2207 z M 17.130859 155.59961 C 16.580859 155.57961 15.810469 155.63086 14.730469 155.63086 L 6.5292969 155.63086 L 8.9101562 158.5293 L 14.730469 158.5293 C 15.131912 158.5293 15.414551 158.79039 15.439453 159.19727 C 15.756409 159.09653 16.087055 159.02734 16.435547 159.02734 L 16.578125 159.02734 C 17.24903 159.02734 17.874081 159.23261 18.400391 159.57812 L 18.400391 159.25977 C 18.400391 156.10977 18.800391 155.63961 17.150391 155.59961 L 17.130859 155.59961 z M 5.0292969 155.86914 L 5.0292969 155.88086 C 4.9292969 155.90086 4.83 155.98055 4.75 156.06055 L 0.81054688 160.96094 C 0.61054688 161.26094 0.8409375 161.73977 1.2109375 161.75977 L 3.5996094 161.75977 L 3.5996094 163.7207 C 3.5996094 167.9807 3.0497656 167.33984 7.2597656 167.33984 L 11.869141 167.33984 L 11.869141 166.11914 L 11.869141 165.52344 L 11.869141 164.44141 L 11.869141 164.43945 L 7.2792969 164.43945 C 6.8392969 164.43945 6.5605469 164.1407 6.5605469 163.7207 L 6.5605469 161.75 L 9.0605469 161.75 C 9.4305469 161.77 9.6909375 161.2507 9.4609375 160.9707 L 5.5 156.07031 C 5.4 155.92031 5.1992969 155.84914 5.0292969 155.86914 z M 16.435547 160.02734 C 15.143818 160.02734 14.083984 161.08518 14.083984 162.37695 L 14.083984 163.60742 L 13.570312 163.60742 C 13.375448 163.60742 13.210603 163.70409 13.119141 163.79102 C 13.027691 163.87792 12.983569 163.95823 12.951172 164.03125 C 12.886382 164.17727 12.867187 164.30479 12.867188 164.44141 L 12.867188 165.52344 L 12.867188 166.11914 L 12.867188 167.67773 L 12.867188 168.50977 L 13.570312 168.50977 L 19.472656 168.50977 L 20.173828 168.50977 L 20.173828 167.67773 L 20.173828 165.52344 L 20.173828 164.44141 C 20.173828 164.3048 20.156597 164.17728 20.091797 164.03125 C 20.059397 163.95825 20.015299 163.87792 19.923828 163.79102 C 19.832368 163.70412 19.667509 163.60742 19.472656 163.60742 L 18.927734 163.60742 L 18.927734 162.37695 C 18.927734 161.08518 17.867902 160.02734 16.576172 160.02734 L 16.435547 160.02734 z M 12.900391 161.2207 C 12.580391 161.2807 12.419141 161.74 12.619141 162 L 13.085938 162.58594 L 13.085938 162.37891 C 13.085938 161.97087 13.170592 161.58376 13.306641 161.2207 L 12.900391 161.2207 z M 16.435547 161.2207 L 16.576172 161.2207 C 17.22782 161.2207 17.734375 161.7251 17.734375 162.37695 L 17.734375 163.60742 L 15.277344 163.60742 L 15.277344 162.37695 C 15.277344 161.7251 15.7839 161.2207 16.435547 161.2207 z M 19.708984 161.23047 C 19.842743 161.59081 19.927734 161.97449 19.927734 162.37891 L 19.927734 162.79102 C 20.119162 162.85779 20.322917 162.91147 20.484375 163 L 21.279297 162.00977 C 21.499297 161.72977 21.260156 161.24047 20.910156 161.23047 L 19.708984 161.23047 z M 16.435547 162.2207 C 16.301234 162.2207 16.277344 162.24444 16.277344 162.37891 L 16.277344 162.60742 L 16.734375 162.60742 L 16.734375 162.37891 C 16.734375 162.24441 16.712442 162.2207 16.578125 162.2207 L 16.435547 162.2207 z M 5.0996094 174.49023 L 5.1308594 174.5 C 4.9808594 174.5 4.83 174.56922 4.75 174.69922 L 0.80078125 179.59961 C 0.56078125 179.86961 0.7992182 180.42039 1.1992188 180.40039 L 3.5996094 180.40039 L 3.5996094 182.7207 C 3.5996094 186.9807 3.0497656 186.33984 7.2597656 186.33984 L 11.869141 186.33984 L 11.869141 185.11914 L 11.869141 184.52344 L 11.869141 183.44141 L 11.869141 183.43945 L 7.25 183.43945 C 6.82 183.43945 6.5507814 183.1407 6.5507812 182.7207 L 6.5507812 180.41992 L 9.0507812 180.41992 C 9.4307824 180.44992 9.7092187 179.87984 9.4492188 179.58984 L 5.4804688 174.68945 C 5.3804688 174.55945 5.2496094 174.49023 5.0996094 174.49023 z M 17.150391 174.58008 L 17.130859 174.59961 C 16.580859 174.57961 15.810469 174.63086 14.730469 174.63086 L 6.8300781 174.63086 L 9.1796875 177.5293 L 14.699219 177.5293 C 15.104107 177.5293 15.391475 177.79407 15.412109 178.20703 C 15.737096 178.1006 16.076913 178.02734 16.435547 178.02734 L 16.578125 178.02734 C 17.24903 178.02734 17.874081 178.2326 18.400391 178.57812 L 18.400391 178.24023 C 18.400391 175.09023 18.800391 174.62008 17.150391 174.58008 z M 16.435547 179.02734 C 15.143818 179.02734 14.083984 180.08518 14.083984 181.37695 L 14.083984 182.60742 L 13.570312 182.60742 C 13.375448 182.60742 13.210603 182.70409 13.119141 182.79102 C 13.027691 182.87792 12.983569 182.95823 12.951172 183.03125 C 12.886382 183.17727 12.867187 183.30479 12.867188 183.44141 L 12.867188 184.52344 L 12.867188 185.11914 L 12.867188 186.67773 L 12.867188 187.50977 L 13.570312 187.50977 L 19.472656 187.50977 L 20.173828 187.50977 L 20.173828 186.67773 L 20.173828 184.52344 L 20.173828 183.44141 C 20.173828 183.3048 20.156597 183.17728 20.091797 183.03125 C 20.059397 182.95825 20.015299 182.87792 19.923828 182.79102 C 19.832368 182.70412 19.667509 182.60742 19.472656 182.60742 L 18.927734 182.60742 L 18.927734 181.37695 C 18.927734 180.08518 17.867902 179.02734 16.576172 179.02734 L 16.435547 179.02734 z M 16.435547 180.2207 L 16.576172 180.2207 C 17.22782 180.2207 17.734375 180.7251 17.734375 181.37695 L 17.734375 182.60742 L 15.277344 182.60742 L 15.277344 181.37695 C 15.277344 180.7251 15.7839 180.2207 16.435547 180.2207 z M 19.816406 180.57031 C 19.882311 180.83091 19.927734 181.09907 19.927734 181.37891 L 19.927734 181.79102 C 20.168811 181.87511 20.455966 181.91694 20.613281 182.06641 C 20.630645 182.0829 20.639883 182.10199 20.65625 182.11914 L 21.259766 181.36914 C 21.479766 181.06914 21.240625 180.59031 20.890625 180.57031 L 19.816406 180.57031 z M 12.820312 180.58984 C 12.520316 180.68984 12.389141 181.11914 12.619141 181.36914 L 12.990234 181.83203 C 13.022029 181.82207 13.055579 181.81406 13.085938 181.80273 L 13.085938 181.37891 C 13.085938 181.10616 13.128698 180.84442 13.191406 180.58984 L 12.820312 180.58984 z M 16.435547 181.2207 C 16.301234 181.2207 16.277344 181.24444 16.277344 181.37891 L 16.277344 181.60742 L 16.734375 181.60742 L 16.734375 181.37891 C 16.734375 181.24441 16.712442 181.2207 16.578125 181.2207 L 16.435547 181.2207 z M 4.9609375 193.15039 L 4.9707031 193.16016 C 4.8707031 193.19016 4.8 193.25984 4.75 193.33984 L 0.81054688 198.24023 C 0.61054688 198.54023 0.8409375 199.01906 1.2109375 199.03906 L 3.5996094 199.03906 L 3.5996094 201.7207 C 3.5996094 205.9807 3.0497656 205.33984 7.2597656 205.33984 L 11.869141 205.33984 L 11.869141 204.11914 L 11.869141 203.52344 L 11.869141 202.44141 C 11.869141 202.44141 11.869141 202.43945 11.869141 202.43945 L 7.2695312 202.43945 C 6.8295312 202.43945 6.5507814 202.1407 6.5507812 201.7207 L 6.5507812 199.01953 L 9.0507812 199.01953 C 9.4207814 199.04953 9.6792188 198.54 9.4492188 198.25 L 5.4902344 193.34961 C 5.3702344 193.17961 5.1509375 193.10039 4.9609375 193.15039 z M 17.150391 193.58008 L 17.130859 193.58984 C 16.580859 193.56984 15.810469 193.61914 14.730469 193.61914 L 7.0996094 193.61914 L 9.4199219 196.46094 L 9.4492188 196.51953 L 14.699219 196.51953 C 15.106887 196.51953 15.397075 196.78718 15.414062 197.20508 C 15.738375 197.09913 16.077769 197.02734 16.435547 197.02734 L 16.578125 197.02734 C 17.24903 197.02734 17.874081 197.23259 18.400391 197.57812 L 18.400391 197.24023 C 18.400391 194.09023 18.800391 193.62008 17.150391 193.58008 z M 16.435547 198.02734 C 15.143818 198.02734 14.083984 199.08518 14.083984 200.37695 L 14.083984 201.60742 L 13.570312 201.60742 C 13.375448 201.60742 13.210603 201.70409 13.119141 201.79102 C 13.027691 201.87792 12.983569 201.95823 12.951172 202.03125 C 12.886382 202.17727 12.867187 202.30479 12.867188 202.44141 L 12.867188 203.52344 L 12.867188 204.11914 L 12.867188 205.67773 L 12.867188 206.50977 L 13.570312 206.50977 L 19.472656 206.50977 L 20.173828 206.50977 L 20.173828 205.67773 L 20.173828 203.52344 L 20.173828 202.44141 C 20.173828 202.3048 20.156597 202.17728 20.091797 202.03125 C 20.059397 201.95825 20.015299 201.87792 19.923828 201.79102 C 19.832368 201.70412 19.667509 201.60742 19.472656 201.60742 L 18.927734 201.60742 L 18.927734 200.37695 C 18.927734 199.08518 17.867902 198.02734 16.576172 198.02734 L 16.435547 198.02734 z M 16.435547 199.2207 L 16.576172 199.2207 C 17.22782 199.2207 17.734375 199.7251 17.734375 200.37695 L 17.734375 201.60742 L 15.277344 201.60742 L 15.277344 200.37695 C 15.277344 199.7251 15.7839 199.2207 16.435547 199.2207 z M 12.919922 199.93945 C 12.559922 199.95945 12.359141 200.48023 12.619141 200.74023 L 12.751953 200.9043 C 12.862211 200.87013 12.980058 200.84224 13.085938 200.80273 L 13.085938 200.37891 C 13.085938 200.22863 13.111295 200.08474 13.130859 199.93945 L 12.919922 199.93945 z M 19.882812 199.93945 C 19.902378 200.08474 19.927734 200.22863 19.927734 200.37891 L 19.927734 200.79102 C 20.168811 200.87511 20.455966 200.91694 20.613281 201.06641 C 20.691227 201.14046 20.749315 201.22305 20.806641 201.30273 L 21.259766 200.74023 C 21.519766 200.46023 21.260625 199.90945 20.890625 199.93945 L 19.882812 199.93945 z M 16.435547 200.2207 C 16.301234 200.2207 16.277344 200.24444 16.277344 200.37891 L 16.277344 200.60742 L 16.734375 200.60742 L 16.734375 200.37891 C 16.734375 200.24441 16.712442 200.2207 16.578125 200.2207 L 16.435547 200.2207 z ' fill='#{hex-color($highlight-text-color)}' stroke-width='0' /></svg>");
+    }
+
+    &:hover i.fa-retweet {
+      background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' height='209' width='22'><path d='M 4.9707031 3.1503906 L 4.9707031 3.1601562 C 4.8707031 3.1901563 4.8 3.2598438 4.75 3.3398438 L 0.80078125 8.2402344 C 0.60078125 8.5402344 0.8292187 9.0190625 1.1992188 9.0390625 L 3.5996094 9.0390625 L 3.5996094 11.720703 C 3.5996094 15.980703 3.0497656 15.339844 7.2597656 15.339844 L 11.869141 15.339844 L 11.869141 14.119141 L 11.869141 13.523438 L 11.869141 12.441406 C 11.869141 12.441406 11.869141 12.439453 11.869141 12.439453 L 7.2695312 12.439453 C 6.8295312 12.439453 6.5507814 12.140703 6.5507812 11.720703 L 6.5507812 9.0195312 L 9.0507812 9.0195312 C 9.4207813 9.0495313 9.6792188 8.54 9.4492188 8.25 L 5.5 3.3496094 C 5.38 3.1796094 5.1607031 3.1003906 4.9707031 3.1503906 z M 17.150391 3.5800781 L 17.130859 3.5898438 C 16.580859 3.5698436 15.810469 3.609375 14.730469 3.609375 L 7.0996094 3.609375 L 9.4199219 6.4609375 L 9.4492188 6.5195312 L 14.699219 6.5195312 C 15.106887 6.5195312 15.397113 6.7872181 15.414062 7.2050781 C 15.738375 7.0991315 16.077769 7.0273437 16.435547 7.0273438 L 16.578125 7.0273438 C 17.24903 7.0273438 17.874081 7.2325787 18.400391 7.578125 L 18.400391 7.2402344 C 18.400391 4.0902344 18.800391 3.6200781 17.150391 3.5800781 z M 16.435547 8.0273438 C 15.143818 8.0273438 14.083984 9.0851838 14.083984 10.376953 L 14.083984 11.607422 L 13.570312 11.607422 C 13.375448 11.607422 13.210603 11.704118 13.119141 11.791016 C 13.027691 11.877916 12.983569 11.958238 12.951172 12.03125 C 12.886382 12.177277 12.867187 12.304789 12.867188 12.441406 L 12.867188 13.523438 L 12.867188 14.119141 L 12.867188 15.677734 L 12.867188 16.509766 L 13.570312 16.509766 L 19.472656 16.509766 L 20.173828 16.509766 L 20.173828 15.677734 L 20.173828 13.523438 L 20.173828 12.441406 C 20.173828 12.304794 20.156597 12.177281 20.091797 12.03125 C 20.059397 11.95824 20.015299 11.877916 19.923828 11.791016 C 19.832368 11.704116 19.667509 11.607422 19.472656 11.607422 L 18.927734 11.607422 L 18.927734 10.376953 C 18.927734 9.0851838 17.867902 8.0273438 16.576172 8.0273438 L 16.435547 8.0273438 z M 16.435547 9.2207031 L 16.576172 9.2207031 C 17.22782 9.2207031 17.734375 9.7251013 17.734375 10.376953 L 17.734375 11.607422 L 15.277344 11.607422 L 15.277344 10.376953 C 15.277344 9.7251013 15.7839 9.2207031 16.435547 9.2207031 z M 12.919922 9.9394531 C 12.559922 9.9594531 12.359141 10.480234 12.619141 10.740234 L 12.751953 10.904297 C 12.862211 10.870135 12.980058 10.842244 13.085938 10.802734 L 13.085938 10.378906 C 13.085938 10.228632 13.111295 10.084741 13.130859 9.9394531 L 12.919922 9.9394531 z M 19.882812 9.9394531 C 19.902378 10.084741 19.927734 10.228632 19.927734 10.378906 L 19.927734 10.791016 C 20.168811 10.875098 20.455966 10.916935 20.613281 11.066406 C 20.691227 11.140457 20.749315 11.223053 20.806641 11.302734 L 21.259766 10.740234 C 21.519766 10.460234 21.260625 9.9094531 20.890625 9.9394531 L 19.882812 9.9394531 z M 16.435547 10.220703 C 16.301234 10.220703 16.277344 10.244432 16.277344 10.378906 L 16.277344 10.607422 L 16.734375 10.607422 L 16.734375 10.378906 C 16.734375 10.244433 16.712442 10.220703 16.578125 10.220703 L 16.435547 10.220703 z ' fill='#{hex-color(lighten($action-button-color, 7%))}' stroke-width='0'/><path d='M 7.7792969 19.650391 L 7.7792969 19.660156 C 7.5392969 19.680156 7.3398437 19.910156 7.3398438 20.160156 L 7.3398438 22.619141 L 7.2792969 22.619141 C 6.1992969 22.619141 5.4208594 22.589844 4.8808594 22.589844 C 3.2408594 22.589844 3.6308594 23.020234 3.6308594 26.240234 L 3.6308594 30.710938 C 3.6308594 34.970937 3.0692969 34.330078 7.2792969 34.330078 L 8.5 34.330078 L 7.1992188 33.269531 C 7.0992188 33.189531 7.02 33.070703 7 32.970703 C 6.98 32.800703 7.0592186 32.619531 7.1992188 32.519531 L 8.5292969 31.419922 L 7.2792969 31.419922 C 6.8392969 31.419922 6.5605469 31.120703 6.5605469 30.720703 L 6.5605469 26.240234 C 6.5605469 25.800234 6.8392969 25.519531 7.2792969 25.519531 L 7.3398438 25.519531 L 7.3398438 28.019531 C 7.3398438 28.399531 7.8801564 28.650391 8.1601562 28.400391 L 13.060547 24.470703 C 13.310547 24.290703 13.310547 23.869453 13.060547 23.689453 L 8.1601562 19.769531 C 8.0601563 19.669531 7.9192969 19.630391 7.7792969 19.650391 z M 17.119141 22.580078 L 17.119141 22.589844 C 16.579141 22.569844 15.820703 22.609375 14.720703 22.609375 L 13.470703 22.609375 L 14.769531 23.679688 C 14.869531 23.749688 14.950703 23.879766 14.970703 24.009766 C 14.990703 24.169766 14.909531 24.310156 14.769531 24.410156 L 13.439453 25.509766 L 14.720703 25.509766 C 15.129702 25.509766 15.41841 25.778986 15.433594 26.199219 C 15.752266 26.097283 16.084896 26.027344 16.435547 26.027344 L 16.578125 26.027344 C 17.236645 26.027344 17.848901 26.228565 18.369141 26.5625 L 18.369141 26.240234 C 18.369141 23.090234 18.769141 22.620078 17.119141 22.580078 z M 16.435547 27.027344 C 15.143818 27.027344 14.083984 28.085184 14.083984 29.376953 L 14.083984 30.607422 L 13.570312 30.607422 C 13.375452 30.607422 13.210603 30.704118 13.119141 30.791016 C 13.027691 30.877916 12.983569 30.958238 12.951172 31.03125 C 12.886382 31.177277 12.867184 31.304789 12.867188 31.441406 L 12.867188 32.523438 L 12.867188 33.119141 L 12.867188 34.677734 L 12.867188 35.509766 L 13.570312 35.509766 L 19.472656 35.509766 L 20.173828 35.509766 L 20.173828 34.677734 L 20.173828 32.523438 L 20.173828 31.441406 C 20.173828 31.304794 20.156597 31.177281 20.091797 31.03125 C 20.059397 30.95824 20.015299 30.877916 19.923828 30.791016 C 19.832368 30.704116 19.667509 30.607422 19.472656 30.607422 L 18.927734 30.607422 L 18.927734 29.376953 C 18.927734 28.085184 17.867902 27.027344 16.576172 27.027344 L 16.435547 27.027344 z M 16.435547 28.220703 L 16.576172 28.220703 C 17.22782 28.220703 17.734375 28.725101 17.734375 29.376953 L 17.734375 30.607422 L 15.277344 30.607422 L 15.277344 29.376953 C 15.277344 28.725101 15.7839 28.220703 16.435547 28.220703 z M 13.109375 29.150391 L 8.9199219 32.509766 C 8.6599219 32.689766 8.6599219 33.109063 8.9199219 33.289062 L 11.869141 35.648438 L 11.869141 34.677734 L 11.869141 33.119141 L 11.869141 32.523438 L 11.869141 31.441406 C 11.869141 31.217489 11.912641 30.907486 12.037109 30.626953 C 12.093758 30.499284 12.228597 30.257492 12.429688 30.066406 C 12.580253 29.92335 12.859197 29.887344 13.085938 29.802734 L 13.085938 29.378906 C 13.085938 29.300761 13.104 29.227272 13.109375 29.150391 z M 16.435547 29.220703 C 16.301234 29.220703 16.277344 29.244432 16.277344 29.378906 L 16.277344 29.607422 L 16.734375 29.607422 L 16.734375 29.378906 C 16.734375 29.244433 16.712442 29.220703 16.578125 29.220703 L 16.435547 29.220703 z M 12.943359 36.509766 L 13.820312 37.210938 C 14.090314 37.460938 14.639141 37.210078 14.619141 36.830078 L 14.619141 36.509766 L 13.570312 36.509766 L 12.943359 36.509766 z M 10.330078 38.650391 L 10.339844 38.660156 C 10.099844 38.680156 9.9001562 38.910156 9.9101562 39.160156 L 9.9101562 41.630859 L 7.3007812 41.630859 C 6.2207812 41.630859 5.4403906 41.589844 4.9003906 41.589844 C 3.2603906 41.589844 3.6503906 42.020234 3.6503906 45.240234 L 3.6503906 49.710938 C 3.6503906 53.370936 3.4202344 53.409141 5.9902344 53.369141 L 4.6503906 52.269531 C 4.5503906 52.189531 4.4692187 52.070703 4.4492188 51.970703 C 4.4492188 51.800703 4.5203906 51.619531 4.6503906 51.519531 L 6.609375 49.919922 C 6.579375 49.859922 6.5703125 49.790703 6.5703125 49.720703 L 6.5703125 45.240234 C 6.5703125 44.800234 6.8490625 44.519531 7.2890625 44.519531 L 9.9003906 44.519531 L 9.9003906 47.019531 C 9.9003906 47.379531 10.399219 47.620391 10.699219 47.400391 L 15.630859 43.470703 C 15.870859 43.290703 15.870859 42.869453 15.630859 42.689453 L 10.689453 38.769531 C 10.589453 38.689531 10.460078 38.640391 10.330078 38.650391 z M 16.869141 41.585938 C 16.616211 41.581522 16.322969 41.584844 15.980469 41.589844 L 15.970703 41.589844 L 17.310547 42.689453 C 17.410547 42.759453 17.489766 42.889531 17.509766 43.019531 C 17.529766 43.179531 17.479609 43.319922 17.349609 43.419922 L 15.390625 45.019531 C 15.406724 45.075878 15.427133 45.132837 15.4375 45.197266 C 15.754974 45.096169 16.086404 45.027344 16.435547 45.027344 L 16.578125 45.027344 C 17.24129 45.027344 17.858323 45.230088 18.380859 45.568359 L 18.380859 45.25 C 18.380859 42.0475 18.639648 41.616836 16.869141 41.585938 z M 16.435547 46.027344 C 15.143818 46.027344 14.083984 47.085184 14.083984 48.376953 L 14.083984 49.607422 L 13.570312 49.607422 C 13.375448 49.607422 13.210603 49.704118 13.119141 49.791016 C 13.027691 49.877916 12.983569 49.958238 12.951172 50.03125 C 12.886382 50.177277 12.867187 50.304789 12.867188 50.441406 L 12.867188 51.523438 L 12.867188 52.119141 L 12.867188 53.677734 L 12.867188 54.509766 L 13.570312 54.509766 L 19.472656 54.509766 L 20.173828 54.509766 L 20.173828 53.677734 L 20.173828 51.523438 L 20.173828 50.441406 C 20.173828 50.304794 20.156597 50.177281 20.091797 50.03125 C 20.059397 49.95824 20.015299 49.877916 19.923828 49.791016 C 19.832368 49.704116 19.667509 49.607422 19.472656 49.607422 L 18.927734 49.607422 L 18.927734 48.376953 C 18.927734 47.085184 17.867902 46.027344 16.576172 46.027344 L 16.435547 46.027344 z M 16.435547 47.220703 L 16.576172 47.220703 C 17.22782 47.220703 17.734375 47.725101 17.734375 48.376953 L 17.734375 49.607422 L 15.277344 49.607422 L 15.277344 48.376953 C 15.277344 47.725101 15.7839 47.220703 16.435547 47.220703 z M 11.470703 47.490234 C 11.410703 47.510234 11.349063 47.539844 11.289062 47.589844 L 6.3496094 51.519531 C 6.1096094 51.699531 6.1096094 52.120781 6.3496094 52.300781 L 11.289062 56.220703 C 11.569064 56.440703 12.070312 56.199844 12.070312 55.839844 L 12.070312 55.509766 L 11.869141 55.509766 L 11.869141 53.677734 L 11.869141 52.119141 L 11.869141 51.523438 L 11.869141 50.441406 C 11.869141 50.217489 11.912641 49.907486 12.037109 49.626953 C 12.043809 49.611855 12.061451 49.584424 12.070312 49.566406 L 12.070312 47.960938 C 12.070312 47.660938 11.770703 47.430234 11.470703 47.490234 z M 16.435547 48.220703 C 16.301234 48.220703 16.277344 48.244432 16.277344 48.378906 L 16.277344 48.607422 L 16.734375 48.607422 L 16.734375 48.378906 C 16.734375 48.244433 16.712442 48.220703 16.578125 48.220703 L 16.435547 48.220703 z M 13.060547 57.650391 L 13.060547 57.660156 C 12.830547 57.690156 12.660156 57.920156 12.660156 58.160156 L 12.660156 60.630859 L 7.2792969 60.630859 C 6.1992969 60.630859 5.4208594 60.589844 4.8808594 60.589844 C 3.2408594 60.589844 3.6308594 61.020234 3.6308594 64.240234 L 3.6308594 69.109375 L 6.5605469 66.740234 L 6.5605469 64.240234 C 6.5605469 63.800234 6.8392969 63.519531 7.2792969 63.519531 L 12.660156 63.519531 L 12.660156 66.019531 C 12.660156 66.299799 12.960394 66.500006 13.226562 66.474609 C 13.625751 65.076914 14.904956 64.035678 16.421875 64.029297 L 18.380859 62.470703 C 18.620859 62.290703 18.620859 61.869453 18.380859 61.689453 L 13.439453 57.769531 C 13.339453 57.669531 13.200547 57.630391 13.060547 57.650391 z M 18.359375 63.810547 L 17.800781 64.269531 C 18.004793 64.350836 18.198411 64.450249 18.380859 64.568359 L 18.380859 64.25 L 18.380859 63.810547 L 18.359375 63.810547 z M 16.435547 65.027344 C 15.143818 65.027344 14.083984 66.085184 14.083984 67.376953 L 14.083984 68.607422 L 13.570312 68.607422 C 13.375448 68.607422 13.210603 68.704118 13.119141 68.791016 C 13.027691 68.877916 12.983569 68.958238 12.951172 69.03125 C 12.886382 69.177277 12.867187 69.304789 12.867188 69.441406 L 12.867188 70.523438 L 12.867188 71.119141 L 12.867188 72.677734 L 12.867188 73.509766 L 13.570312 73.509766 L 19.472656 73.509766 L 20.173828 73.509766 L 20.173828 72.677734 L 20.173828 70.523438 L 20.173828 69.441406 C 20.173828 69.304794 20.156597 69.177281 20.091797 69.03125 C 20.059397 68.95824 20.015299 68.877916 19.923828 68.791016 C 19.832368 68.704116 19.667509 68.607422 19.472656 68.607422 L 18.927734 68.607422 L 18.927734 67.376953 C 18.927734 66.085184 17.867902 65.027344 16.576172 65.027344 L 16.435547 65.027344 z M 16.435547 66.220703 L 16.576172 66.220703 C 17.22782 66.220703 17.734375 66.725101 17.734375 67.376953 L 17.734375 68.607422 L 15.277344 68.607422 L 15.277344 67.376953 C 15.277344 66.725101 15.7839 66.220703 16.435547 66.220703 z M 8.7207031 66.509766 C 8.6507031 66.529766 8.5895312 66.559375 8.5195312 66.609375 L 3.5996094 70.519531 C 3.3496094 70.699531 3.3496094 71.120781 3.5996094 71.300781 L 8.5292969 75.220703 C 8.8092969 75.440703 9.3105469 75.199844 9.3105469 74.839844 L 9.3105469 72.339844 L 11.869141 72.339844 L 11.869141 71.119141 L 11.869141 70.523438 L 11.869141 69.449219 L 9.3203125 69.449219 L 9.3203125 66.980469 C 9.3203125 66.680469 9.0007031 66.449766 8.7207031 66.509766 z M 16.435547 67.220703 C 16.301234 67.220703 16.277344 67.244432 16.277344 67.378906 L 16.277344 67.607422 L 16.734375 67.607422 L 16.734375 67.378906 C 16.734375 67.244433 16.712442 67.220703 16.578125 67.220703 L 16.435547 67.220703 z M 19.248047 78.800781 C 19.148558 78.831033 19.050295 78.90106 18.970703 78.970703 L 18.070312 79.869141 C 17.630312 79.569141 16.710703 79.619141 14.720703 79.619141 L 7.2792969 79.619141 C 6.1992969 79.619141 5.4208594 79.589844 4.8808594 79.589844 C 3.2408594 79.589844 3.6308594 80.020234 3.6308594 83.240234 L 3.6308594 83.939453 L 6.5605469 84.240234 L 6.5605469 83.240234 C 6.5605469 82.800234 6.8392969 82.519531 7.2792969 82.519531 L 14.720703 82.519531 C 14.920703 82.519531 15.090703 82.600703 15.220703 82.720703 L 13.419922 84.519531 C 13.279464 84.665607 13.281282 84.881022 13.363281 85.054688 C 13.880838 83.867655 15.067337 83.027344 16.435547 83.027344 L 16.578125 83.027344 C 18.290465 83.027344 19.703357 84.345788 19.890625 86.011719 L 19.960938 86.019531 C 20.240938 86.049531 20.520234 85.770234 20.490234 85.490234 L 19.789062 79.240234 C 19.789062 78.973661 19.498025 78.767523 19.25 78.800781 L 19.248047 78.800781 z M 16.435547 84.027344 C 15.143818 84.027344 14.083984 85.085184 14.083984 86.376953 L 14.083984 87.607422 L 13.570312 87.607422 C 13.375448 87.607422 13.210603 87.704118 13.119141 87.791016 C 13.027691 87.877916 12.983569 87.958238 12.951172 88.03125 C 12.886382 88.177277 12.867187 88.304789 12.867188 88.441406 L 12.867188 89.523438 L 12.867188 90.119141 L 12.867188 91.677734 L 12.867188 92.509766 L 13.570312 92.509766 L 19.472656 92.509766 L 20.173828 92.509766 L 20.173828 91.677734 L 20.173828 89.523438 L 20.173828 88.441406 C 20.173828 88.304794 20.156597 88.177281 20.091797 88.03125 C 20.059397 87.95824 20.015299 87.877916 19.923828 87.791016 C 19.832368 87.704116 19.667509 87.607422 19.472656 87.607422 L 18.927734 87.607422 L 18.927734 86.376953 C 18.927734 85.085184 17.867902 84.027344 16.576172 84.027344 L 16.435547 84.027344 z M 2.0507812 84.900391 C 1.8507824 84.970391 1.6907031 85.199453 1.7207031 85.439453 L 2.4199219 91.689453 C 2.4399219 92.049453 3 92.240929 3.25 91.960938 L 4.0507812 91.160156 C 4.0707812 91.160156 4.0898437 91.140156 4.0898438 91.160156 C 4.5498437 91.400156 5.4595313 91.330078 7.2695312 91.330078 L 11.869141 91.330078 L 11.869141 90.119141 L 11.869141 89.523438 L 11.869141 88.441406 C 11.869141 88.437991 11.871073 88.433136 11.871094 88.429688 L 7.2792969 88.429688 C 7.1292969 88.429688 6.9808594 88.400078 6.8808594 88.330078 L 8.8007812 86.400391 C 9.1007822 86.160391 8.8992969 85.600547 8.5292969 85.560547 L 2.25 84.910156 L 2.0507812 84.910156 L 2.0507812 84.900391 z M 16.435547 85.220703 L 16.576172 85.220703 C 17.22782 85.220703 17.734375 85.725101 17.734375 86.376953 L 17.734375 87.607422 L 15.277344 87.607422 L 15.277344 86.376953 C 15.277344 85.725101 15.7839 85.220703 16.435547 85.220703 z M 4.8808594 98.599609 C 3.5508594 98.599609 3.5400781 99.080402 3.5800781 100.90039 L 4.7207031 99.529297 C 4.8007031 99.429297 4.9405469 99.360078 5.0605469 99.330078 C 5.2205469 99.330078 5.4 99.409297 5.5 99.529297 L 7.1601562 101.56055 C 7.2001563 101.56055 7.2292969 101.5293 7.2792969 101.5293 L 14.720703 101.5293 C 15.060703 101.5293 15.289141 101.7293 15.369141 102.0293 L 12.939453 102.0293 C 12.599453 102.0793 12.410625 102.55055 12.640625 102.81055 L 13.470703 103.85742 C 14.029941 102.77899 15.146801 102.02734 16.435547 102.02734 L 16.578125 102.02734 C 18.158418 102.02734 19.491598 103.14879 19.835938 104.63086 L 21.279297 102.82031 C 21.499297 102.55031 21.260156 102.06078 20.910156 102.05078 L 18.400391 102.05078 C 18.420391 98.150792 19.000234 98.650391 14.740234 98.650391 L 7.2792969 98.650391 C 6.1992969 98.650391 5.4208594 98.609375 4.8808594 98.609375 L 4.8808594 98.599609 z M 5.0292969 101.06055 C 4.9292969 101.09055 4.83 101.15977 4.75 101.25977 L 0.81054688 106.16016 C 0.61054688 106.44016 0.8409375 106.92945 1.2109375 106.93945 L 3.5996094 106.93945 C 3.5796094 110.87945 3.1497656 110.33984 7.2597656 110.33984 L 11.869141 110.33984 L 11.869141 109.11914 L 11.869141 108.52344 L 11.869141 107.44141 L 11.869141 107.43945 L 7.2792969 107.43945 C 6.9292969 107.43945 6.7091406 107.23945 6.6191406 106.93945 L 9.0605469 106.93945 C 9.4305469 106.93945 9.6909375 106.44016 9.4609375 106.16016 L 5.5 101.25977 C 5.4 101.10977 5.1992969 101.03055 5.0292969 101.06055 z M 16.435547 103.02734 C 15.143818 103.02734 14.083984 104.08518 14.083984 105.37695 L 14.083984 106.60742 L 13.570312 106.60742 C 13.375448 106.60742 13.210603 106.70409 13.119141 106.79102 C 13.027691 106.87792 12.983569 106.95823 12.951172 107.03125 C 12.886382 107.17727 12.867187 107.30479 12.867188 107.44141 L 12.867188 108.52344 L 12.867188 109.11914 L 12.867188 110.67773 L 12.867188 111.50977 L 13.570312 111.50977 L 19.472656 111.50977 L 20.173828 111.50977 L 20.173828 110.67773 L 20.173828 108.52344 L 20.173828 107.44141 C 20.173828 107.3048 20.156597 107.17728 20.091797 107.03125 C 20.059397 106.95825 20.015299 106.87792 19.923828 106.79102 C 19.832368 106.70412 19.667509 106.60742 19.472656 106.60742 L 18.927734 106.60742 L 18.927734 105.37695 C 18.927734 104.08518 17.867902 103.02734 16.576172 103.02734 L 16.435547 103.02734 z M 16.435547 104.2207 L 16.576172 104.2207 C 17.22782 104.2207 17.734375 104.7251 17.734375 105.37695 L 17.734375 106.60742 L 15.277344 106.60742 L 15.277344 105.37695 C 15.277344 104.7251 15.7839 104.2207 16.435547 104.2207 z M 16.435547 105.2207 C 16.301234 105.2207 16.277344 105.24444 16.277344 105.37891 L 16.277344 105.60742 L 16.734375 105.60742 L 16.734375 105.37891 C 16.734375 105.24441 16.712442 105.2207 16.578125 105.2207 L 16.435547 105.2207 z M 4.8808594 117.58984 L 4.8808594 117.59961 C 3.7208594 117.59961 3.5800781 117.90016 3.5800781 119.16016 L 4.7207031 117.7793 C 4.8007031 117.6793 4.9405469 117.63914 5.0605469 117.61914 C 5.2205469 117.61914 5.4 117.6593 5.5 117.7793 L 7.7207031 120.5293 L 14.720703 120.5293 C 15.123595 120.5293 15.408576 120.79174 15.431641 121.20117 C 15.750992 121.09876 16.08404 121.02734 16.435547 121.02734 L 16.578125 121.02734 C 17.24903 121.02734 17.874081 121.23262 18.400391 121.57812 L 18.400391 121.25 C 18.400391 117.05 19.120234 117.61914 14.740234 117.61914 L 7.2792969 117.61914 C 6.1992969 117.61914 5.4208594 117.58984 4.8808594 117.58984 z M 4.9804688 119.33984 C 4.8804688 119.36984 4.81 119.44 4.75 119.5 L 0.80078125 124.43945 C 0.60078125 124.71945 0.8292182 125.2107 1.1992188 125.2207 L 3.5996094 125.2207 L 3.5996094 125.7207 C 3.5996094 129.9807 3.0497656 129.33984 7.2597656 129.33984 L 11.869141 129.33984 L 11.869141 128.11914 L 11.869141 127.52344 L 11.869141 126.44141 C 11.869141 126.43799 11.871073 126.43314 11.871094 126.42969 L 7.2792969 126.42969 C 6.8392969 126.42969 6.5605469 126.13094 6.5605469 125.71094 L 6.5605469 125.21094 L 9.0605469 125.21094 C 9.4305469 125.23094 9.6909375 124.70969 9.4609375 124.42969 L 5.5 119.5 C 5.3820133 119.35252 5.1682348 119.28513 4.9804688 119.33984 z M 12.839844 121.7793 C 12.539844 121.8793 12.410625 122.32055 12.640625 122.56055 L 13.267578 123.34375 C 13.473522 122.72168 13.852237 122.1828 14.353516 121.7793 L 12.839844 121.7793 z M 18.658203 121.7793 C 19.393958 122.37155 19.878978 123.25738 19.916016 124.25781 L 21.279297 122.56055 C 21.499297 122.28055 21.260156 121.7893 20.910156 121.7793 L 18.658203 121.7793 z M 16.435547 122.02734 C 15.143818 122.02734 14.083984 123.08518 14.083984 124.37695 L 14.083984 125.60742 L 13.570312 125.60742 C 13.375448 125.60742 13.210603 125.70409 13.119141 125.79102 C 13.027691 125.87792 12.983569 125.95823 12.951172 126.03125 C 12.886382 126.17727 12.867187 126.30479 12.867188 126.44141 L 12.867188 127.52344 L 12.867188 128.11914 L 12.867188 129.67773 L 12.867188 130.50977 L 13.570312 130.50977 L 19.472656 130.50977 L 20.173828 130.50977 L 20.173828 129.67773 L 20.173828 127.52344 L 20.173828 126.44141 C 20.173828 126.3048 20.156597 126.17728 20.091797 126.03125 C 20.059397 125.95825 20.015299 125.87792 19.923828 125.79102 C 19.832368 125.70412 19.667509 125.60742 19.472656 125.60742 L 18.927734 125.60742 L 18.927734 124.37695 C 18.927734 123.08518 17.867902 122.02734 16.576172 122.02734 L 16.435547 122.02734 z M 16.435547 123.2207 L 16.576172 123.2207 C 17.22782 123.2207 17.734375 123.7251 17.734375 124.37695 L 17.734375 125.60742 L 15.277344 125.60742 L 15.277344 124.37695 C 15.277344 123.7251 15.7839 123.2207 16.435547 123.2207 z M 16.435547 124.2207 C 16.301234 124.2207 16.277344 124.24444 16.277344 124.37891 L 16.277344 124.60742 L 16.734375 124.60742 L 16.734375 124.37891 C 16.734375 124.24441 16.712442 124.2207 16.578125 124.2207 L 16.435547 124.2207 z M 5.9394531 136.58984 L 5.9394531 136.59961 L 8.3105469 139.5293 L 14.730469 139.5293 C 15.131912 139.5293 15.414551 139.79039 15.439453 140.19727 C 15.756409 140.09653 16.087055 140.02734 16.435547 140.02734 L 16.578125 140.02734 C 17.24903 140.02734 17.874081 140.23261 18.400391 140.57812 L 18.400391 140.25 C 18.400391 136.05 19.120234 136.61914 14.740234 136.61914 L 7.2792969 136.61914 C 6.6792969 136.61914 6.3594531 136.59984 5.9394531 136.58984 z M 4.2207031 136.66016 C 3.8207031 136.74016 3.6791406 136.96016 3.6191406 137.41016 L 4.2207031 136.66992 L 4.2207031 136.66016 z M 5.0605469 137.57031 L 5.0605469 137.58984 C 4.9405469 137.58984 4.8197656 137.66953 4.7597656 137.76953 L 0.81054688 142.66992 C 0.57054688 142.96992 0.8109375 143.50023 1.2109375 143.49023 L 3.5996094 143.49023 L 3.5996094 144.71094 C 3.5996094 148.97094 3.0497656 148.33008 7.2597656 148.33008 L 11.869141 148.33008 L 11.869141 147.11914 L 11.869141 146.52344 L 11.869141 145.44141 C 11.869141 145.43799 11.871073 145.43314 11.871094 145.42969 L 7.2792969 145.42969 C 6.8392969 145.42969 6.5605469 145.13094 6.5605469 144.71094 L 6.5605469 143.49023 L 9.0605469 143.49023 C 9.4605469 143.53023 9.7309375 142.95945 9.4609375 142.68945 L 5.5 137.76953 C 5.4 137.63953 5.2305469 137.57031 5.0605469 137.57031 z M 16.435547 141.02734 C 15.143818 141.02734 14.083984 142.08518 14.083984 143.37695 L 14.083984 144.60742 L 13.570312 144.60742 C 13.375448 144.60742 13.210603 144.70409 13.119141 144.79102 C 13.027691 144.87792 12.983569 144.95823 12.951172 145.03125 C 12.886382 145.17727 12.867187 145.30479 12.867188 145.44141 L 12.867188 146.52344 L 12.867188 147.11914 L 12.867188 148.67773 L 12.867188 149.50977 L 13.570312 149.50977 L 19.472656 149.50977 L 20.173828 149.50977 L 20.173828 148.67773 L 20.173828 146.52344 L 20.173828 145.44141 C 20.173828 145.3048 20.156597 145.17728 20.091797 145.03125 C 20.059397 144.95825 20.015299 144.87792 19.923828 144.79102 C 19.832368 144.70412 19.667509 144.60742 19.472656 144.60742 L 18.927734 144.60742 L 18.927734 143.37695 C 18.927734 142.08518 17.867902 141.02734 16.576172 141.02734 L 16.435547 141.02734 z M 12.849609 141.5 C 12.549609 141.6 12.420391 142.0393 12.650391 142.2793 L 13.136719 142.88672 C 13.213026 142.38119 13.390056 141.90696 13.667969 141.5 L 12.849609 141.5 z M 19.34375 141.5 C 19.710704 142.03735 19.927734 142.68522 19.927734 143.37891 L 19.927734 143.79102 C 19.965561 143.80421 20.005506 143.81448 20.044922 143.82617 L 21.289062 142.2793 C 21.509062 141.9993 21.269922 141.51 20.919922 141.5 L 19.34375 141.5 z M 16.435547 142.2207 L 16.576172 142.2207 C 17.22782 142.2207 17.734375 142.7251 17.734375 143.37695 L 17.734375 144.60742 L 15.277344 144.60742 L 15.277344 143.37695 C 15.277344 142.7251 15.7839 142.2207 16.435547 142.2207 z M 16.435547 143.2207 C 16.301234 143.2207 16.277344 143.24444 16.277344 143.37891 L 16.277344 143.60742 L 16.734375 143.60742 L 16.734375 143.37891 C 16.734375 143.24441 16.712442 143.2207 16.578125 143.2207 L 16.435547 143.2207 z M 17.130859 155.59961 C 16.580859 155.57961 15.810469 155.63086 14.730469 155.63086 L 6.5292969 155.63086 L 8.9101562 158.5293 L 14.730469 158.5293 C 15.131912 158.5293 15.414551 158.79039 15.439453 159.19727 C 15.756409 159.09653 16.087055 159.02734 16.435547 159.02734 L 16.578125 159.02734 C 17.24903 159.02734 17.874081 159.23261 18.400391 159.57812 L 18.400391 159.25977 C 18.400391 156.10977 18.800391 155.63961 17.150391 155.59961 L 17.130859 155.59961 z M 5.0292969 155.86914 L 5.0292969 155.88086 C 4.9292969 155.90086 4.83 155.98055 4.75 156.06055 L 0.81054688 160.96094 C 0.61054688 161.26094 0.8409375 161.73977 1.2109375 161.75977 L 3.5996094 161.75977 L 3.5996094 163.7207 C 3.5996094 167.9807 3.0497656 167.33984 7.2597656 167.33984 L 11.869141 167.33984 L 11.869141 166.11914 L 11.869141 165.52344 L 11.869141 164.44141 L 11.869141 164.43945 L 7.2792969 164.43945 C 6.8392969 164.43945 6.5605469 164.1407 6.5605469 163.7207 L 6.5605469 161.75 L 9.0605469 161.75 C 9.4305469 161.77 9.6909375 161.2507 9.4609375 160.9707 L 5.5 156.07031 C 5.4 155.92031 5.1992969 155.84914 5.0292969 155.86914 z M 16.435547 160.02734 C 15.143818 160.02734 14.083984 161.08518 14.083984 162.37695 L 14.083984 163.60742 L 13.570312 163.60742 C 13.375448 163.60742 13.210603 163.70409 13.119141 163.79102 C 13.027691 163.87792 12.983569 163.95823 12.951172 164.03125 C 12.886382 164.17727 12.867187 164.30479 12.867188 164.44141 L 12.867188 165.52344 L 12.867188 166.11914 L 12.867188 167.67773 L 12.867188 168.50977 L 13.570312 168.50977 L 19.472656 168.50977 L 20.173828 168.50977 L 20.173828 167.67773 L 20.173828 165.52344 L 20.173828 164.44141 C 20.173828 164.3048 20.156597 164.17728 20.091797 164.03125 C 20.059397 163.95825 20.015299 163.87792 19.923828 163.79102 C 19.832368 163.70412 19.667509 163.60742 19.472656 163.60742 L 18.927734 163.60742 L 18.927734 162.37695 C 18.927734 161.08518 17.867902 160.02734 16.576172 160.02734 L 16.435547 160.02734 z M 12.900391 161.2207 C 12.580391 161.2807 12.419141 161.74 12.619141 162 L 13.085938 162.58594 L 13.085938 162.37891 C 13.085938 161.97087 13.170592 161.58376 13.306641 161.2207 L 12.900391 161.2207 z M 16.435547 161.2207 L 16.576172 161.2207 C 17.22782 161.2207 17.734375 161.7251 17.734375 162.37695 L 17.734375 163.60742 L 15.277344 163.60742 L 15.277344 162.37695 C 15.277344 161.7251 15.7839 161.2207 16.435547 161.2207 z M 19.708984 161.23047 C 19.842743 161.59081 19.927734 161.97449 19.927734 162.37891 L 19.927734 162.79102 C 20.119162 162.85779 20.322917 162.91147 20.484375 163 L 21.279297 162.00977 C 21.499297 161.72977 21.260156 161.24047 20.910156 161.23047 L 19.708984 161.23047 z M 16.435547 162.2207 C 16.301234 162.2207 16.277344 162.24444 16.277344 162.37891 L 16.277344 162.60742 L 16.734375 162.60742 L 16.734375 162.37891 C 16.734375 162.24441 16.712442 162.2207 16.578125 162.2207 L 16.435547 162.2207 z M 5.0996094 174.49023 L 5.1308594 174.5 C 4.9808594 174.5 4.83 174.56922 4.75 174.69922 L 0.80078125 179.59961 C 0.56078125 179.86961 0.7992182 180.42039 1.1992188 180.40039 L 3.5996094 180.40039 L 3.5996094 182.7207 C 3.5996094 186.9807 3.0497656 186.33984 7.2597656 186.33984 L 11.869141 186.33984 L 11.869141 185.11914 L 11.869141 184.52344 L 11.869141 183.44141 L 11.869141 183.43945 L 7.25 183.43945 C 6.82 183.43945 6.5507814 183.1407 6.5507812 182.7207 L 6.5507812 180.41992 L 9.0507812 180.41992 C 9.4307824 180.44992 9.7092187 179.87984 9.4492188 179.58984 L 5.4804688 174.68945 C 5.3804688 174.55945 5.2496094 174.49023 5.0996094 174.49023 z M 17.150391 174.58008 L 17.130859 174.59961 C 16.580859 174.57961 15.810469 174.63086 14.730469 174.63086 L 6.8300781 174.63086 L 9.1796875 177.5293 L 14.699219 177.5293 C 15.104107 177.5293 15.391475 177.79407 15.412109 178.20703 C 15.737096 178.1006 16.076913 178.02734 16.435547 178.02734 L 16.578125 178.02734 C 17.24903 178.02734 17.874081 178.2326 18.400391 178.57812 L 18.400391 178.24023 C 18.400391 175.09023 18.800391 174.62008 17.150391 174.58008 z M 16.435547 179.02734 C 15.143818 179.02734 14.083984 180.08518 14.083984 181.37695 L 14.083984 182.60742 L 13.570312 182.60742 C 13.375448 182.60742 13.210603 182.70409 13.119141 182.79102 C 13.027691 182.87792 12.983569 182.95823 12.951172 183.03125 C 12.886382 183.17727 12.867187 183.30479 12.867188 183.44141 L 12.867188 184.52344 L 12.867188 185.11914 L 12.867188 186.67773 L 12.867188 187.50977 L 13.570312 187.50977 L 19.472656 187.50977 L 20.173828 187.50977 L 20.173828 186.67773 L 20.173828 184.52344 L 20.173828 183.44141 C 20.173828 183.3048 20.156597 183.17728 20.091797 183.03125 C 20.059397 182.95825 20.015299 182.87792 19.923828 182.79102 C 19.832368 182.70412 19.667509 182.60742 19.472656 182.60742 L 18.927734 182.60742 L 18.927734 181.37695 C 18.927734 180.08518 17.867902 179.02734 16.576172 179.02734 L 16.435547 179.02734 z M 16.435547 180.2207 L 16.576172 180.2207 C 17.22782 180.2207 17.734375 180.7251 17.734375 181.37695 L 17.734375 182.60742 L 15.277344 182.60742 L 15.277344 181.37695 C 15.277344 180.7251 15.7839 180.2207 16.435547 180.2207 z M 19.816406 180.57031 C 19.882311 180.83091 19.927734 181.09907 19.927734 181.37891 L 19.927734 181.79102 C 20.168811 181.87511 20.455966 181.91694 20.613281 182.06641 C 20.630645 182.0829 20.639883 182.10199 20.65625 182.11914 L 21.259766 181.36914 C 21.479766 181.06914 21.240625 180.59031 20.890625 180.57031 L 19.816406 180.57031 z M 12.820312 180.58984 C 12.520316 180.68984 12.389141 181.11914 12.619141 181.36914 L 12.990234 181.83203 C 13.022029 181.82207 13.055579 181.81406 13.085938 181.80273 L 13.085938 181.37891 C 13.085938 181.10616 13.128698 180.84442 13.191406 180.58984 L 12.820312 180.58984 z M 16.435547 181.2207 C 16.301234 181.2207 16.277344 181.24444 16.277344 181.37891 L 16.277344 181.60742 L 16.734375 181.60742 L 16.734375 181.37891 C 16.734375 181.24441 16.712442 181.2207 16.578125 181.2207 L 16.435547 181.2207 z M 4.9609375 193.15039 L 4.9707031 193.16016 C 4.8707031 193.19016 4.8 193.25984 4.75 193.33984 L 0.81054688 198.24023 C 0.61054688 198.54023 0.8409375 199.01906 1.2109375 199.03906 L 3.5996094 199.03906 L 3.5996094 201.7207 C 3.5996094 205.9807 3.0497656 205.33984 7.2597656 205.33984 L 11.869141 205.33984 L 11.869141 204.11914 L 11.869141 203.52344 L 11.869141 202.44141 C 11.869141 202.44141 11.869141 202.43945 11.869141 202.43945 L 7.2695312 202.43945 C 6.8295312 202.43945 6.5507814 202.1407 6.5507812 201.7207 L 6.5507812 199.01953 L 9.0507812 199.01953 C 9.4207814 199.04953 9.6792188 198.54 9.4492188 198.25 L 5.4902344 193.34961 C 5.3702344 193.17961 5.1509375 193.10039 4.9609375 193.15039 z M 17.150391 193.58008 L 17.130859 193.58984 C 16.580859 193.56984 15.810469 193.61914 14.730469 193.61914 L 7.0996094 193.61914 L 9.4199219 196.46094 L 9.4492188 196.51953 L 14.699219 196.51953 C 15.106887 196.51953 15.397075 196.78718 15.414062 197.20508 C 15.738375 197.09913 16.077769 197.02734 16.435547 197.02734 L 16.578125 197.02734 C 17.24903 197.02734 17.874081 197.23259 18.400391 197.57812 L 18.400391 197.24023 C 18.400391 194.09023 18.800391 193.62008 17.150391 193.58008 z M 16.435547 198.02734 C 15.143818 198.02734 14.083984 199.08518 14.083984 200.37695 L 14.083984 201.60742 L 13.570312 201.60742 C 13.375448 201.60742 13.210603 201.70409 13.119141 201.79102 C 13.027691 201.87792 12.983569 201.95823 12.951172 202.03125 C 12.886382 202.17727 12.867187 202.30479 12.867188 202.44141 L 12.867188 203.52344 L 12.867188 204.11914 L 12.867188 205.67773 L 12.867188 206.50977 L 13.570312 206.50977 L 19.472656 206.50977 L 20.173828 206.50977 L 20.173828 205.67773 L 20.173828 203.52344 L 20.173828 202.44141 C 20.173828 202.3048 20.156597 202.17728 20.091797 202.03125 C 20.059397 201.95825 20.015299 201.87792 19.923828 201.79102 C 19.832368 201.70412 19.667509 201.60742 19.472656 201.60742 L 18.927734 201.60742 L 18.927734 200.37695 C 18.927734 199.08518 17.867902 198.02734 16.576172 198.02734 L 16.435547 198.02734 z M 16.435547 199.2207 L 16.576172 199.2207 C 17.22782 199.2207 17.734375 199.7251 17.734375 200.37695 L 17.734375 201.60742 L 15.277344 201.60742 L 15.277344 200.37695 C 15.277344 199.7251 15.7839 199.2207 16.435547 199.2207 z M 12.919922 199.93945 C 12.559922 199.95945 12.359141 200.48023 12.619141 200.74023 L 12.751953 200.9043 C 12.862211 200.87013 12.980058 200.84224 13.085938 200.80273 L 13.085938 200.37891 C 13.085938 200.22863 13.111295 200.08474 13.130859 199.93945 L 12.919922 199.93945 z M 19.882812 199.93945 C 19.902378 200.08474 19.927734 200.22863 19.927734 200.37891 L 19.927734 200.79102 C 20.168811 200.87511 20.455966 200.91694 20.613281 201.06641 C 20.691227 201.14046 20.749315 201.22305 20.806641 201.30273 L 21.259766 200.74023 C 21.519766 200.46023 21.260625 199.90945 20.890625 199.93945 L 19.882812 199.93945 z M 16.435547 200.2207 C 16.301234 200.2207 16.277344 200.24444 16.277344 200.37891 L 16.277344 200.60742 L 16.734375 200.60742 L 16.734375 200.37891 C 16.734375 200.24441 16.712442 200.2207 16.578125 200.2207 L 16.435547 200.2207 z ' fill='#{hex-color($highlight-text-color)}' stroke-width='0' /></svg>");
+    }
+  }
+
+  &.disabled {
+    i.fa-retweet,
+    &:hover i.fa-retweet {
+      background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' height='209' width='22'><path d='M 18.972656 1.2011719 C 18.829825 1.1881782 18.685932 1.2302188 18.572266 1.3300781 L 15.990234 3.5996094 C 15.58109 3.6070661 15.297269 3.609375 14.730469 3.609375 L 7.0996094 3.609375 L 9.4199219 6.4609375 L 9.4492188 6.5195312 L 12.664062 6.5195312 L 6.5761719 11.867188 C 6.5674697 11.818249 6.5507813 11.773891 6.5507812 11.720703 L 6.5507812 9.0195312 L 9.0507812 9.0195312 C 9.4207813 9.0495313 9.6792188 8.54 9.4492188 8.25 L 5.5 3.3496094 C 5.38 3.1796094 5.1607031 3.1003906 4.9707031 3.1503906 L 4.9707031 3.1601562 C 4.8707031 3.1901563 4.8 3.2598438 4.75 3.3398438 L 0.80078125 8.2402344 C 0.60078125 8.5402344 0.8292187 9.0190625 1.1992188 9.0390625 L 3.5996094 9.0390625 L 3.5996094 11.720703 C 3.5996094 13.045739 3.5690668 13.895038 3.6503906 14.4375 L 2.6152344 15.347656 C 2.3879011 15.547375 2.3754917 15.901081 2.5859375 16.140625 L 3.1464844 16.78125 C 3.3569308 17.020794 3.7101667 17.053234 3.9375 16.853516 L 19.892578 2.8359375 C 20.119911 2.6362188 20.134275 2.282513 19.923828 2.0429688 L 19.361328 1.4023438 C 19.256105 1.282572 19.115488 1.2141655 18.972656 1.2011719 z M 18.410156 6.7753906 L 15.419922 9.4042969 L 15.419922 9.9394531 L 14.810547 9.9394531 L 13.148438 11.400391 L 16.539062 15.640625 C 16.719062 15.890625 17.140313 15.890625 17.320312 15.640625 L 21.259766 10.740234 C 21.519766 10.460234 21.260625 9.9094531 20.890625 9.9394531 L 18.400391 9.9394531 L 18.400391 7.2402344 C 18.400391 7.0470074 18.407711 6.9489682 18.410156 6.7753906 z M 11.966797 12.439453 L 8.6679688 15.339844 L 14.919922 15.339844 L 12.619141 12.5 C 12.589141 12.48 12.590313 12.459453 12.570312 12.439453 L 11.966797 12.439453 z' fill='#{hex-color(darken($action-button-color, 13%))}' stroke-width='0'/></svg>");
+    }
+  }
+
+  .media-modal__overlay .picture-in-picture__footer & {
+    i.fa-retweet {
+      background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($white)}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($highlight-text-color)}' stroke-width='0'/></svg>");
+    }
+  }
 }
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 17206977026684fe1cc92fc590354eb663584cb8..d6385f161cc8fd283c914b2280c40e63e0ea17c8 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -154,6 +154,11 @@
     display: block;
     width: 100%;
   }
+
+  .layout-multiple-columns &.button--with-bell {
+    font-size: 12px;
+    padding: 0 8px;
+  }
 }
 
 .column__wrapper {
@@ -172,6 +177,7 @@
   cursor: pointer;
   transition: all 100ms ease-in;
   transition-property: background-color, color;
+  text-decoration: none;
 
   &:hover,
   &:active,
@@ -245,6 +251,20 @@
       background: rgba($base-overlay-background, 0.9);
     }
   }
+
+  &--with-counter {
+    display: inline-flex;
+    align-items: center;
+    width: auto !important;
+  }
+
+  &__counter {
+    display: inline-block;
+    width: 14px;
+    margin-left: 4px;
+    font-size: 12px;
+    font-weight: 500;
+  }
 }
 
 .text-icon-button {
@@ -779,6 +799,10 @@
   cursor: pointer;
 }
 
+.status__content {
+  clear: both;
+}
+
 .status__content,
 .reply-indicator__content {
   position: relative;
@@ -812,6 +836,7 @@
   p {
     margin-bottom: 20px;
     white-space: pre-wrap;
+    unicode-bidi: plaintext;
 
     &:last-child {
       margin-bottom: 0;
@@ -821,6 +846,7 @@
   a {
     color: $secondary-text-color;
     text-decoration: none;
+    unicode-bidi: isolate;
 
     &:hover {
       text-decoration: underline;
@@ -980,14 +1006,6 @@
     outline: 0;
     background: lighten($ui-base-color, 4%);
 
-    .status.status-direct {
-      background: lighten($ui-base-color, 12%);
-
-      &.muted {
-        background: transparent;
-      }
-    }
-
     .detailed-status,
     .detailed-status__action-bar {
       background: lighten($ui-base-color, 8%);
@@ -1022,11 +1040,6 @@
     margin-top: 8px;
   }
 
-  &.status-direct:not(.read) {
-    background: lighten($ui-base-color, 8%);
-    border-bottom-color: lighten($ui-base-color, 12%);
-  }
-
   &.light {
     .status__relative-time,
     .status__visibility-icon {
@@ -1064,27 +1077,16 @@
   }
 }
 
-.notification-favourite {
-  .status.status-direct {
-    background: transparent;
-
-    .icon-button.disabled {
-      color: lighten($action-button-color, 13%);
-    }
-  }
-}
-
 .status__relative-time,
-.status__visibility-icon,
 .notification__relative_time {
   color: $dark-text-color;
   float: right;
   font-size: 14px;
+  padding-bottom: 1px;
 }
 
 .status__visibility-icon {
-  margin-left: 4px;
-  margin-right: 4px;
+  padding: 0 4px;
 }
 
 .status__display-name {
@@ -1162,28 +1164,14 @@
   align-items: center;
   display: flex;
   margin-top: 8px;
-
-  &__counter {
-    display: inline-flex;
-    margin-right: 11px;
-    align-items: center;
-
-    .status__action-bar-button {
-      margin-right: 4px;
-    }
-
-    &__label {
-      display: inline-block;
-      width: 14px;
-      font-size: 12px;
-      font-weight: 500;
-      color: $action-button-color;
-    }
-  }
 }
 
 .status__action-bar-button {
   margin-right: 18px;
+
+  &.icon-button--with-counter {
+    margin-right: 14px;
+  }
 }
 
 .status__action-bar-dropdown {
@@ -1671,11 +1659,11 @@ a.account__display-name {
   }
 }
 
-.star-icon.active {
+.icon-button.star-icon.active {
   color: $gold-star;
 }
 
-.bookmark-icon.active {
+.icon-button.bookmark-icon.active {
   color: $red-bookmark;
 }
 
@@ -1739,6 +1727,20 @@ a.account__display-name {
   align-items: center;
   justify-content: center;
   flex-direction: column;
+  scrollbar-width: none; /* Firefox */
+  -ms-overflow-style: none;  /* IE 10+ */
+
+  * {
+    scrollbar-width: none; /* Firefox */
+    -ms-overflow-style: none;  /* IE 10+ */
+  }
+
+  &::-webkit-scrollbar,
+  *::-webkit-scrollbar {
+    width: 0;
+    height: 0;
+    background: transparent; /* Chrome/Safari/Webkit */
+  }
 
   .image-loader__preview-canvas {
     max-width: $media-modal-media-max-width;
@@ -2440,6 +2442,17 @@ a.account__display-name {
     line-height: 14px;
     color: $primary-text-color;
   }
+
+  &__issue-badge {
+    position: absolute;
+    left: 11px;
+    bottom: 1px;
+    display: block;
+    background: $error-red;
+    border-radius: 50%;
+    width: 0.625rem;
+    height: 0.625rem;
+  }
 }
 
 .column-link--transparent .icon-with-badge__badge {
@@ -2990,7 +3003,7 @@ a.account__display-name {
   }
 }
 
-.no-reduce-motion button.icon-button i.fa-retweet {
+button.icon-button i.fa-retweet {
   background-position: 0 0;
   height: 19px;
   transition: background-position 0.9s steps(10);
@@ -3001,21 +3014,16 @@ a.account__display-name {
   &::before {
     display: none !important;
   }
-
 }
 
-.no-reduce-motion button.icon-button.active i.fa-retweet {
+button.icon-button.active i.fa-retweet {
   transition-duration: 0.9s;
   background-position: 0 100%;
 }
 
-.reduce-motion button.icon-button i.fa-retweet {
-  color: $action-button-color;
-  transition: color 100ms ease-in;
-}
-
+.reduce-motion button.icon-button i.fa-retweet,
 .reduce-motion button.icon-button.active i.fa-retweet {
-  color: $highlight-text-color;
+  transition: none;
 }
 
 .status-card {
@@ -3456,6 +3464,12 @@ a.status-card.compact:hover {
   }
 }
 
+.column-header__permission-btn {
+  display: inline;
+  font-weight: inherit;
+  text-decoration: underline;
+}
+
 .column-header__setting-arrows {
   float: right;
 
@@ -3479,6 +3493,15 @@ a.status-card.compact:hover {
   cursor: pointer;
 }
 
+.column-header__issue-btn {
+  color: $warning-red;
+
+  &:hover {
+    color: $error-red;
+    text-decoration: underline;
+  }
+}
+
 .column-header__icon {
   display: inline-block;
   margin-right: 5px;
@@ -3738,6 +3761,10 @@ a.status-card.compact:hover {
   margin-bottom: 10px;
 }
 
+.column-settings__row--with-margin {
+  margin-bottom: 15px;
+}
+
 .column-settings__hashtags {
   .column-settings__row {
     margin-bottom: 15px;
@@ -3841,7 +3868,7 @@ a.status-card.compact:hover {
 }
 
 .column-settings__row {
-  .text-btn {
+  .text-btn:not(.column-header__permission-btn) {
     margin-bottom: 15px;
   }
 }
@@ -4424,8 +4451,6 @@ a.status-card.compact:hover {
 
 .modal-root {
   position: relative;
-  transition: opacity 0.3s linear;
-  will-change: opacity;
   z-index: 9999;
 }
 
@@ -4474,16 +4499,19 @@ a.status-card.compact:hover {
   height: 100%;
   position: relative;
 
-  .extended-video-player {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
+  &__close,
+  &__zoom-button {
+    color: rgba($white, 0.7);
 
-    video {
-      max-width: $media-modal-media-max-width;
-      max-height: $media-modal-media-max-height;
+    &:hover,
+    &:focus,
+    &:active {
+      color: $white;
+      background-color: rgba($white, 0.15);
+    }
+
+    &:focus {
+      background-color: rgba($white, 0.3);
     }
   }
 }
@@ -4520,10 +4548,10 @@ a.status-card.compact:hover {
 }
 
 .media-modal__nav {
-  background: rgba($base-overlay-background, 0.5);
+  background: transparent;
   box-sizing: border-box;
   border: 0;
-  color: $primary-text-color;
+  color: rgba($primary-text-color, 0.7);
   cursor: pointer;
   display: flex;
   align-items: center;
@@ -4534,6 +4562,12 @@ a.status-card.compact:hover {
   position: absolute;
   top: 0;
   bottom: 0;
+
+  &:hover,
+  &:focus,
+  &:active {
+    color: $primary-text-color;
+  }
 }
 
 .media-modal__nav--left {
@@ -4544,58 +4578,86 @@ a.status-card.compact:hover {
   right: 0;
 }
 
-.media-modal__pagination {
-  width: 100%;
-  text-align: center;
+.media-modal__overlay {
+  max-width: 600px;
   position: absolute;
   left: 0;
-  bottom: 20px;
-  pointer-events: none;
-}
+  right: 0;
+  bottom: 0;
+  margin: 0 auto;
 
-.media-modal__meta {
-  text-align: center;
-  position: absolute;
-  left: 0;
-  bottom: 20px;
-  width: 100%;
-  pointer-events: none;
+  .picture-in-picture__footer {
+    border-radius: 0;
+    background: transparent;
+    padding: 20px 0;
 
-  &--shifted {
-    bottom: 62px;
-  }
+    .icon-button {
+      color: $white;
 
-  a {
-    pointer-events: auto;
-    text-decoration: none;
-    font-weight: 500;
-    color: $ui-secondary-color;
+      &:hover,
+      &:focus,
+      &:active {
+        color: $white;
+        background-color: rgba($white, 0.15);
+      }
 
-    &:hover,
-    &:focus,
-    &:active {
-      text-decoration: underline;
+      &:focus {
+        background-color: rgba($white, 0.3);
+      }
+
+      &.active {
+        color: $highlight-text-color;
+
+        &:hover,
+        &:focus,
+        &:active {
+          background: rgba($highlight-text-color, 0.15);
+        }
+
+        &:focus {
+          background: rgba($highlight-text-color, 0.3);
+        }
+      }
+
+      &.star-icon.active {
+        color: $gold-star;
+
+        &:hover,
+        &:focus,
+        &:active {
+          background: rgba($gold-star, 0.15);
+        }
+
+        &:focus {
+          background: rgba($gold-star, 0.3);
+        }
+      }
     }
   }
 }
 
-.media-modal__page-dot {
-  display: inline-block;
+.media-modal__pagination {
+  display: flex;
+  justify-content: center;
+  margin-bottom: 20px;
 }
 
-.media-modal__button {
-  background-color: $primary-text-color;
-  height: 12px;
-  width: 12px;
-  border-radius: 6px;
-  margin: 10px;
+.media-modal__page-dot {
+  flex: 0 0 auto;
+  background-color: $white;
+  opacity: 0.4;
+  height: 6px;
+  width: 6px;
+  border-radius: 50%;
+  margin: 0 4px;
   padding: 0;
   border: 0;
   font-size: 0;
-}
+  transition: opacity .2s ease-in-out;
 
-.media-modal__button--active {
-  background-color: $highlight-text-color;
+  &.active {
+    opacity: 1;
+  }
 }
 
 .media-modal__close {
@@ -4605,6 +4667,21 @@ a.status-card.compact:hover {
   z-index: 100;
 }
 
+.media-modal__zoom-button {
+  position: absolute;
+  right: 64px;
+  top: 8px;
+  z-index: 100;
+  pointer-events: auto;
+  transition: opacity 0.3s linear;
+  will-change: opacity;
+}
+
+.media-modal__zoom-button--hidden {
+  pointer-events: none;
+  opacity: 0;
+}
+
 .onboarding-modal,
 .error-modal,
 .embed-modal {
@@ -5080,6 +5157,22 @@ a.status-card.compact:hover {
       }
     }
   }
+
+  select {
+    appearance: none;
+    box-sizing: border-box;
+    font-size: 14px;
+    color: $inverted-text-color;
+    display: inline-block;
+    width: auto;
+    outline: 0;
+    font-family: inherit;
+    background: $simple-background-color url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(darken($simple-background-color, 14%))}'/></svg>") no-repeat right 8px center / auto 16px;
+    border: 1px solid darken($simple-background-color, 14%);
+    border-radius: 4px;
+    padding: 6px 10px;
+    padding-right: 30px;
+  }
 }
 
 .confirmation-modal__container,
@@ -5370,7 +5463,6 @@ a.status-card.compact:hover {
   }
 
   .video-player__controls {
-    padding: 0 15px;
     padding-top: 10px;
     background: transparent;
   }
@@ -5489,7 +5581,8 @@ a.status-card.compact:hover {
   &__buttons-bar {
     display: flex;
     justify-content: space-between;
-    padding-bottom: 10px;
+    padding-bottom: 8px;
+    margin: 0 -5px;
 
     .video-player__download__icon {
       color: inherit;
@@ -5506,22 +5599,13 @@ a.status-card.compact:hover {
     overflow: hidden;
     text-overflow: ellipsis;
 
-    &.left {
-      button {
-        padding-left: 0;
-      }
-    }
-
-    &.right {
-      button {
-        padding-right: 0;
-      }
-    }
+    .player-button {
+      display: inline-block;
+      outline: 0;
 
-    button {
       flex: 0 0 auto;
       background: transparent;
-      padding: 2px 10px;
+      padding: 5px;
       font-size: 16px;
       border: 0;
       color: rgba($white, 0.75);
@@ -5539,6 +5623,7 @@ a.status-card.compact:hover {
     flex: 0 1 auto;
     overflow: hidden;
     text-overflow: ellipsis;
+    margin: 0 5px;
   }
 
   &__time-sep,
@@ -5658,7 +5743,7 @@ a.status-card.compact:hover {
       display: block;
       position: absolute;
       height: 4px;
-      top: 10px;
+      top: 14px;
     }
 
     &__progress,
@@ -5667,7 +5752,7 @@ a.status-card.compact:hover {
       position: absolute;
       height: 4px;
       border-radius: 4px;
-      top: 10px;
+      top: 14px;
       background: lighten($ui-highlight-color, 8%);
     }
 
@@ -5682,7 +5767,7 @@ a.status-card.compact:hover {
       border-radius: 50%;
       width: 12px;
       height: 12px;
-      top: 6px;
+      top: 10px;
       margin-left: -6px;
       background: lighten($ui-highlight-color, 8%);
       box-shadow: 1px 2px 6px rgba($base-shadow-color, 0.2);
@@ -5706,7 +5791,7 @@ a.status-card.compact:hover {
   &.detailed,
   &.fullscreen {
     .video-player__buttons {
-      button {
+      .player-button {
         padding-top: 10px;
         padding-bottom: 10px;
       }
@@ -5961,6 +6046,10 @@ a.status-card.compact:hover {
   }
 }
 
+.column-settings__row .radio-button {
+  display: block;
+}
+
 .radio-button {
   font-size: 14px;
   position: relative;
@@ -6525,6 +6614,10 @@ noscript {
         padding: 2px;
       }
 
+      & > .icon-button {
+        margin-right: 8px;
+      }
+
       .button {
         margin: 0 8px;
       }
@@ -7034,3 +7127,133 @@ noscript {
     }
   }
 }
+
+.notification,
+.status__wrapper {
+  position: relative;
+
+  &.unread {
+    &::before {
+      content: "";
+      position: absolute;
+      top: 0;
+      left: 0;
+      pointer-events: 0;
+      width: 100%;
+      height: 100%;
+      border-left: 2px solid $highlight-text-color;
+      pointer-events: none;
+    }
+  }
+}
+
+.picture-in-picture {
+  position: fixed;
+  bottom: 20px;
+  right: 20px;
+  width: 300px;
+
+  &__footer {
+    border-radius: 0 0 4px 4px;
+    background: lighten($ui-base-color, 4%);
+    padding: 10px;
+    padding-top: 12px;
+    display: flex;
+    justify-content: space-between;
+  }
+
+  &__header {
+    border-radius: 4px 4px 0 0;
+    background: lighten($ui-base-color, 4%);
+    padding: 10px;
+    display: flex;
+    justify-content: space-between;
+
+    &__account {
+      display: flex;
+      text-decoration: none;
+    }
+
+    .account__avatar {
+      margin-right: 10px;
+    }
+
+    .display-name {
+      color: $primary-text-color;
+      text-decoration: none;
+
+      strong,
+      span {
+        display: block;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
+
+      span {
+        color: $darker-text-color;
+      }
+    }
+  }
+
+  .video-player,
+  .audio-player {
+    border-radius: 0;
+  }
+}
+
+.picture-in-picture-placeholder {
+  box-sizing: border-box;
+  border: 2px dashed lighten($ui-base-color, 8%);
+  background: $base-shadow-color;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  margin-top: 10px;
+  font-size: 16px;
+  font-weight: 500;
+  cursor: pointer;
+  color: $darker-text-color;
+
+  i {
+    display: block;
+    font-size: 24px;
+    font-weight: 400;
+    margin-bottom: 10px;
+  }
+
+  &:hover,
+  &:focus,
+  &:active {
+    border-color: lighten($ui-base-color, 12%);
+  }
+}
+
+.notifications-permission-banner {
+  padding: 30px;
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+
+  &__close {
+    position: absolute;
+    top: 10px;
+    right: 10px;
+  }
+
+  h2 {
+    font-size: 16px;
+    font-weight: 500;
+    margin-bottom: 15px;
+    text-align: center;
+  }
+
+  p {
+    color: $darker-text-color;
+    margin-bottom: 15px;
+    text-align: center;
+  }
+}
diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss
index 51d9b46b0f34fd0de7b7eba43c76b82710d75f6c..e40ad18fffecb2587c63a588424a83bd8abe6730 100644
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@@ -444,6 +444,10 @@
       }
     }
 
+    .logo-button {
+      padding: 3px 15px;
+    }
+
     &__image {
       border-radius: 4px 4px 0 0;
       overflow: hidden;
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 7a0b2f9a398391c0a74580dd079143a47a7ea4a0..e0604303bfaf76427d1f020aa2185a4e04e838ba 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -12,6 +12,10 @@ code {
 }
 
 .simple_form {
+  &.hidden {
+    display: none;
+  }
+
   .input {
     margin-bottom: 15px;
     overflow: hidden;
@@ -100,6 +104,14 @@ code {
     }
   }
 
+  .title {
+    color: #d9e1e8;
+    font-size: 20px;
+    line-height: 28px;
+    font-weight: 400;
+    margin-bottom: 30px;
+  }
+
   .hint {
     color: $darker-text-color;
 
@@ -142,7 +154,7 @@ code {
     }
   }
 
-  .otp-hint {
+  .authentication-hint {
     margin-bottom: 25px;
   }
 
@@ -342,6 +354,7 @@ code {
   input[type=number],
   input[type=email],
   input[type=password],
+  input[type=url],
   textarea {
     box-sizing: border-box;
     font-size: 16px;
@@ -364,10 +377,6 @@ code {
       box-shadow: none;
     }
 
-    &:focus:invalid:not(:placeholder-shown) {
-      border-color: lighten($error-red, 12%);
-    }
-
     &:required:valid {
       border-color: $valid-value-color;
     }
@@ -383,6 +392,16 @@ code {
     }
   }
 
+  input[type=text],
+  input[type=number],
+  input[type=email],
+  input[type=password] {
+    &:focus:invalid:not(:placeholder-shown),
+    &:required:invalid:not(:placeholder-shown) {
+      border-color: lighten($error-red, 12%);
+    }
+  }
+
   .input.field_with_errors {
     label {
       color: lighten($error-red, 12%);
@@ -591,6 +610,10 @@ code {
     color: $error-value-color;
   }
 
+  &.hidden {
+    display: none;
+  }
+
   a {
     display: inline-block;
     color: $darker-text-color;
@@ -977,3 +1000,10 @@ code {
     flex-direction: row;
   }
 }
+
+.input.user_confirm_password,
+.input.user_website {
+  &:not(.field_with_errors) {
+    display: none;
+  }
+}
diff --git a/app/javascript/styles/mastodon/rtl.scss b/app/javascript/styles/mastodon/rtl.scss
index fbf26e30bc029020c405c2fd7680d9c80defcd91..baacf46b9fe275a9ec8459357c0b7ae64a503137 100644
--- a/app/javascript/styles/mastodon/rtl.scss
+++ b/app/javascript/styles/mastodon/rtl.scss
@@ -17,15 +17,38 @@ body.rtl {
     margin-right: 15px;
   }
 
-  .display-name {
+  .display-name,
+  .announcements__item {
     text-align: right;
   }
 
+  .announcements__item__range {
+    padding-right: 0;
+    padding-left: 18px;
+  }
+
+  .reactions-bar {
+    margin-left: auto;
+    margin-right: -2px;
+    direction: rtl;
+  }
+
+  .reactions-bar__item__count {
+    margin-left: 0;
+    margin-right: 6px;
+  }
+
+  .announcements__pagination {
+    right: auto;
+    left: 0;
+  }
+
   .notification__message {
     margin-left: 0;
     margin-right: 68px;
   }
 
+  .announcements__mastodon,
   .drawer__inner__mastodon > img {
     transform: scaleX(-1);
   }
@@ -147,6 +170,11 @@ body.rtl {
     right: 42px;
   }
 
+  .account__header__tabs__buttons > .icon-button {
+    margin-right: 0;
+    margin-left: 8px;
+  }
+
   .account__avatar-overlay-overlay {
     right: auto;
     left: 0;
@@ -195,6 +223,7 @@ body.rtl {
     margin-right: 0;
   }
 
+  .picture-in-picture__header__account .display-name,
   .detailed-status__display-name .display-name {
     text-align: right;
   }
@@ -205,6 +234,21 @@ body.rtl {
     float: right;
   }
 
+  .picture-in-picture__header__account .account__avatar {
+    margin-right: 0;
+    margin-left: 10px;
+  }
+
+  .icon-button__counter {
+    margin-left: 0;
+    margin-right: 4px;
+  }
+
+  .notifications-permission-banner__close {
+    right: auto;
+    left: 10px;
+  }
+
   .detailed-status__favorites,
   .detailed-status__reblogs {
     margin-left: 0;
@@ -416,4 +460,9 @@ body.rtl {
     left: auto;
     right: 0;
   }
+
+  .picture-in-picture {
+    right: auto;
+    left: 20px;
+  }
 }
diff --git a/app/javascript/styles/mastodon/statuses.scss b/app/javascript/styles/mastodon/statuses.scss
index 7ae1c5a2406e3850b90804520e4f108d50908bde..078714325eef308ae143451bb7138e0b36a76c44 100644
--- a/app/javascript/styles/mastodon/statuses.scss
+++ b/app/javascript/styles/mastodon/statuses.scss
@@ -83,9 +83,14 @@
   background: $ui-highlight-color;
   color: $primary-text-color;
   text-transform: none;
-  line-height: 36px;
+  line-height: 1.2;
   height: auto;
-  padding: 3px 15px;
+  min-height: 36px;
+  min-width: 88px;
+  white-space: normal;
+  overflow-wrap: break-word;
+  hyphens: auto;
+  padding: 0 15px;
   border: 0;
 
   svg {
@@ -126,6 +131,12 @@
   }
 }
 
+a.button.logo-button {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+
 .embed,
 .public-layout {
   .status__content[data-spoiler=folded] {
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
index 8602c3dde9d5a38103805d77de5c76187a8892c2..f463419c8203ca3e6405c900f3732904dc99b40c 100644
--- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss
@@ -36,6 +36,8 @@ $dark-text-color: $ui-base-lighter-color !default;
 $secondary-text-color: $ui-secondary-color !default;
 $highlight-text-color: $ui-highlight-color !default;
 $action-button-color: $ui-base-lighter-color !default;
+$passive-text-color: $gold-star !default;
+$active-passive-text-color: $success-green !default;
 // For texts on inverted backgrounds
 $inverted-text-color: $ui-base-color !default;
 $lighter-text-color: $ui-base-lighter-color !default;
diff --git a/app/javascript/styles/mastodon/widgets.scss b/app/javascript/styles/mastodon/widgets.scss
index 5b97d1ec4f3e16d999b7a5293c4f168356fa0bbd..5ee4d104bad6d0c4d0edc75fd8a659bc6b616e72 100644
--- a/app/javascript/styles/mastodon/widgets.scss
+++ b/app/javascript/styles/mastodon/widgets.scss
@@ -2,6 +2,10 @@
   margin-bottom: 10px;
   box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
 
+  &:last-child {
+    margin-bottom: 0;
+  }
+
   &__img {
     width: 100%;
     position: relative;
@@ -442,6 +446,26 @@
     vertical-align: initial !important;
   }
 
+  &__interrelationships {
+    width: 21px;
+  }
+
+  .fa {
+    font-size: 16px;
+
+    &.active {
+      color: $highlight-text-color;
+    }
+
+    &.passive {
+      color: $passive-text-color;
+    }
+
+    &.active.passive {
+      color: $active-passive-text-color;
+    }
+  }
+
   @media screen and (max-width: $no-gap-breakpoint) {
     tbody td.optional {
       display: none;
diff --git a/app/lib/access_token_extension.rb b/app/lib/access_token_extension.rb
new file mode 100644
index 0000000000000000000000000000000000000000..3e184e7753032dd50813170cca6ab3b43ff508d4
--- /dev/null
+++ b/app/lib/access_token_extension.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module AccessTokenExtension
+  extend ActiveSupport::Concern
+
+  included do
+    after_commit :push_to_streaming_api
+  end
+
+  def revoke(clock = Time)
+    update(revoked_at: clock.now.utc)
+  end
+
+  def push_to_streaming_api
+    Redis.current.publish("timeline:access_token:#{id}", Oj.dump(event: :kill)) if revoked? || destroyed?
+  end
+end
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 0ce279d287321d5c7aa4e922c3db89cfc1403f64..2b5d3ffc29c7a0379ad1d7cb2925562d47d5d0db 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -71,7 +71,15 @@ class ActivityPub::Activity
   end
 
   def object_uri
-    @object_uri ||= value_or_id(@object)
+    @object_uri ||= begin
+      str = value_or_id(@object)
+
+      if str&.start_with?('bear:')
+        Addressable::URI.parse(str).query_values['u']
+      else
+        str
+      end
+    end
   end
 
   def unsupported_object_type?
@@ -110,13 +118,13 @@ class ActivityPub::Activity
   end
 
   def notify_about_reblog(status)
-    NotifyService.new.call(status.reblog.account, status)
+    NotifyService.new.call(status.reblog.account, :reblog, status)
   end
 
   def notify_about_mentions(status)
     status.active_mentions.includes(:account).each do |mention|
       next unless mention.account.local? && audience_includes?(mention.account)
-      NotifyService.new.call(mention.account, mention)
+      NotifyService.new.call(mention.account, :mention, mention)
     end
   end
 
@@ -157,6 +165,34 @@ class ActivityPub::Activity
     fetch_remote_original_status
   end
 
+  def dereference_object!
+    return unless @object.is_a?(String)
+
+    dereferencer = ActivityPub::Dereferencer.new(@object, permitted_origin: @account.uri, signature_account: signed_fetch_account)
+
+    @object = dereferencer.object unless dereferencer.object.nil?
+  end
+
+  def signed_fetch_account
+    return Account.find(@options[:delivered_to_account_id]) if @options[:delivered_to_account_id].present?
+
+    first_mentioned_local_account || first_local_follower
+  end
+
+  def first_mentioned_local_account
+    audience = (as_array(@json['to']) + as_array(@json['cc'])).map { |x| value_or_id(x) }.uniq
+    local_usernames = audience.select { |uri| ActivityPub::TagManager.instance.local_uri?(uri) }
+                              .map { |uri| ActivityPub::TagManager.instance.uri_to_local_id(uri, :username) }
+
+    return if local_usernames.empty?
+
+    Account.local.where(username: local_usernames).first
+  end
+
+  def first_local_follower
+    @account.followers.local.first
+  end
+
   def follow_request_from_object
     @follow_request ||= FollowRequest.find_by(target_account: @account, uri: object_uri) unless object_uri.nil?
   end
diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb
index 34c646668b15ade966f24dbf28f094758e97e6ab..349e8f77e717d503ddb748f6a8421bb34aed2d0f 100644
--- a/app/lib/activitypub/activity/announce.rb
+++ b/app/lib/activitypub/activity/announce.rb
@@ -4,35 +4,50 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
   def perform
     return reject_payload! if delete_arrived_first?(@json['id']) || !related_to_local_activity?
 
-    original_status = status_from_object
+    RedisLock.acquire(lock_options) do |lock|
+      if lock.acquired?
+        original_status = status_from_object
 
-    return reject_payload! if original_status.nil? || !announceable?(original_status)
+        return reject_payload! if original_status.nil? || !announceable?(original_status)
 
-    status = Status.find_by(account: @account, reblog: original_status)
+        @status = Status.find_by(account: @account, reblog: original_status)
 
-    return status unless status.nil?
+        return @status unless @status.nil?
 
-    status = Status.create!(
-      account: @account,
-      reblog: original_status,
-      uri: @json['id'],
-      created_at: @json['published'],
-      override_timestamps: @options[:override_timestamps],
-      visibility: visibility_from_audience
-    )
+        @status = Status.create!(
+          account: @account,
+          reblog: original_status,
+          uri: @json['id'],
+          created_at: @json['published'],
+          override_timestamps: @options[:override_timestamps],
+          visibility: visibility_from_audience
+        )
 
-    distribute(status)
-    status
+        distribute(@status)
+      else
+        raise Mastodon::RaceConditionError
+      end
+    end
+
+    @status
   end
 
   private
 
+  def audience_to
+    as_array(@json['to']).map { |x| value_or_id(x) }
+  end
+
+  def audience_cc
+    as_array(@json['cc']).map { |x| value_or_id(x) }
+  end
+
   def visibility_from_audience
-    if equals_or_includes?(@json['to'], ActivityPub::TagManager::COLLECTIONS[:public])
+    if audience_to.include?(ActivityPub::TagManager::COLLECTIONS[:public])
       :public
-    elsif equals_or_includes?(@json['cc'], ActivityPub::TagManager::COLLECTIONS[:public])
+    elsif audience_cc.include?(ActivityPub::TagManager::COLLECTIONS[:public])
       :unlisted
-    elsif equals_or_includes?(@json['to'], @account.followers_url)
+    elsif audience_to.include?(@account.followers_url)
       :private
     else
       :direct
@@ -54,4 +69,8 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
   def reblog_of_local_status?
     status_from_uri(object_uri)&.account&.local?
   end
+
+  def lock_options
+    { redis: Redis.current, key: "announce:#{@object['id']}" }
+  end
 end
diff --git a/app/lib/activitypub/activity/block.rb b/app/lib/activitypub/activity/block.rb
index a17a2d50a6af0a738b2c36f41bae3afa5dcf309a..90477bf3369dca5416f54bdf813fe3e40400bce3 100644
--- a/app/lib/activitypub/activity/block.rb
+++ b/app/lib/activitypub/activity/block.rb
@@ -4,7 +4,12 @@ class ActivityPub::Activity::Block < ActivityPub::Activity
   def perform
     target_account = account_from_uri(object_uri)
 
-    return if target_account.nil? || !target_account.local? || @account.blocking?(target_account)
+    return if target_account.nil? || !target_account.local?
+
+    if @account.blocking?(target_account)
+      @account.block_relationships.find_by(target_account: target_account).update(uri: @json['id']) if @json['id'].present?
+      return
+    end
 
     UnfollowService.new.call(target_account, @account) if target_account.following?(@account)
 
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index e81452e3cae83e398af501225db538be170163b4..6127446763dc02ad915b793f7c0229ce60478f65 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -2,6 +2,8 @@
 
 class ActivityPub::Activity::Create < ActivityPub::Activity
   def perform
+    dereference_object!
+
     case @object['type']
     when 'EncryptedMessage'
       create_encrypted_message
@@ -13,7 +15,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   private
 
   def create_encrypted_message
-    return reject_payload! if invalid_origin?(@object['id']) || @options[:delivered_to_account_id].blank?
+    return reject_payload! if invalid_origin?(object_uri) || @options[:delivered_to_account_id].blank?
 
     target_account = Account.find(@options[:delivered_to_account_id])
     target_device  = target_account.devices.find_by(device_id: @object.dig('to', 'deviceId'))
@@ -41,7 +43,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def create_status
-    return reject_payload! if unsupported_object_type? || invalid_origin?(@object['id']) || Tombstone.exists?(uri: @object['id']) || !related_to_local_activity?
+    return reject_payload! if unsupported_object_type? || invalid_origin?(object_uri) || tombstone_exists? || !related_to_local_activity?
 
     RedisLock.acquire(lock_options) do |lock|
       if lock.acquired?
@@ -63,11 +65,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def audience_to
-    @object['to'] || @json['to']
+    as_array(@object['to'] || @json['to']).map { |x| value_or_id(x) }
   end
 
   def audience_cc
-    @object['cc'] || @json['cc']
+    as_array(@object['cc'] || @json['cc']).map { |x| value_or_id(x) }
   end
 
   def process_status
@@ -88,7 +90,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     fetch_replies(@status)
     check_for_spam
     distribute(@status)
-    forward_for_reply if @status.distributable?
+    forward_for_reply
   end
 
   def find_existing_status
@@ -100,8 +102,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   def process_status_params
     @params = begin
       {
-        uri: @object['id'],
-        url: object_url || @object['id'],
+        uri: object_uri,
+        url: object_url || object_uri,
         account: @account,
         text: text_from_content || '',
         language: detected_language,
@@ -109,7 +111,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
         created_at: @object['published'],
         override_timestamps: @options[:override_timestamps],
         reply: @object['inReplyTo'].present?,
-        sensitive: @object['sensitive'] || false,
+        sensitive: @account.sensitized? || @object['sensitive'] || false,
         visibility: visibility_from_audience,
         thread: replied_to_status,
         conversation: conversation_from_uri(@object['conversation']),
@@ -120,7 +122,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def process_audience
-    (as_array(audience_to) + as_array(audience_cc)).uniq.each do |audience|
+    (audience_to + audience_cc).uniq.each do |audience|
       next if audience == ActivityPub::TagManager::COLLECTIONS[:public]
 
       # Unlike with tags, there is no point in resolving accounts we don't already
@@ -226,6 +228,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: shortcode, uri: uri)
     emoji.image_remote_url = image_url
     emoji.save
+  rescue Seahorse::Client::NetworkingError
+    nil
   end
 
   def process_attachments
@@ -248,6 +252,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
         media_attachment.save
       rescue Mastodon::UnexpectedResponseError, HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError
         RedownloadMediaWorker.perform_in(rand(30..600).seconds, media_attachment.id)
+      rescue Seahorse::Client::NetworkingError
+        nil
       end
     end
 
@@ -311,7 +317,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     RedisLock.acquire(poll_lock_options) do |lock|
       if lock.acquired?
         already_voted = poll.votes.where(account: @account).exists?
-        poll.votes.create!(account: @account, choice: poll.options.index(@object['name']), uri: @object['id'])
+        poll.votes.create!(account: @account, choice: poll.options.index(@object['name']), uri: object_uri)
       else
         raise Mastodon::RaceConditionError
       end
@@ -350,11 +356,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def visibility_from_audience
-    if equals_or_includes?(audience_to, ActivityPub::TagManager::COLLECTIONS[:public])
+    if audience_to.include?(ActivityPub::TagManager::COLLECTIONS[:public])
       :public
-    elsif equals_or_includes?(audience_cc, ActivityPub::TagManager::COLLECTIONS[:public])
+    elsif audience_cc.include?(ActivityPub::TagManager::COLLECTIONS[:public])
       :unlisted
-    elsif equals_or_includes?(audience_to, @account.followers_url)
+    elsif audience_to.include?(@account.followers_url)
       :private
     else
       :direct
@@ -363,7 +369,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
 
   def audience_includes?(account)
     uri = ActivityPub::TagManager.instance.uri_for(account)
-    equals_or_includes?(audience_to, uri) || equals_or_includes?(audience_cc, uri)
+    audience_to.include?(uri) || audience_cc.include?(uri)
   end
 
   def replied_to_status
@@ -383,7 +389,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def text_from_content
-    return Formatter.instance.linkify([[text_from_name, text_from_summary.presence].compact.join("\n\n"), object_url || @object['id']].join(' ')) if converted_object_type?
+    return Formatter.instance.linkify([[text_from_name, text_from_summary.presence].compact.join("\n\n"), object_url || object_uri].join(' ')) if converted_object_type?
 
     if @object['content'].present?
       @object['content']
@@ -475,19 +481,23 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   def addresses_local_accounts?
     return true if @options[:delivered_to_account_id]
 
-    local_usernames = (as_array(audience_to) + as_array(audience_cc)).uniq.select { |uri| ActivityPub::TagManager.instance.local_uri?(uri) }.map { |uri| ActivityPub::TagManager.instance.uri_to_local_id(uri, :username) }
+    local_usernames = (audience_to + audience_cc).uniq.select { |uri| ActivityPub::TagManager.instance.local_uri?(uri) }.map { |uri| ActivityPub::TagManager.instance.uri_to_local_id(uri, :username) }
 
     return false if local_usernames.empty?
 
     Account.local.where(username: local_usernames).exists?
   end
 
+  def tombstone_exists?
+    Tombstone.exists?(uri: object_uri)
+  end
+
   def check_for_spam
     SpamCheck.perform(@status)
   end
 
   def forward_for_reply
-    return unless @json['signature'].present? && reply_to_local?
+    return unless @status.distributable? && @json['signature'].present? && reply_to_local?
 
     ActivityPub::RawDistributionWorker.perform_async(Oj.dump(@json), replied_to_status.account_id, [@account.preferred_inbox_url])
   end
@@ -505,7 +515,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def lock_options
-    { redis: Redis.current, key: "create:#{@object['id']}" }
+    { redis: Redis.current, key: "create:#{object_uri}" }
   end
 
   def poll_lock_options
diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb
index dc9ff580c1ae8b4343d41f38f74a040ff0b99475..2e5293b832ae35b2aecdf136c0112221af83f41b 100644
--- a/app/lib/activitypub/activity/delete.rb
+++ b/app/lib/activitypub/activity/delete.rb
@@ -13,7 +13,7 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
 
   def delete_person
     lock_or_return("delete_in_progress:#{@account.id}") do
-      SuspendAccountService.new.call(@account, reserve_username: false)
+      DeleteAccountService.new.call(@account, reserve_username: false, skip_activitypub: true)
     end
   end
 
diff --git a/app/lib/activitypub/activity/follow.rb b/app/lib/activitypub/activity/follow.rb
index ec92f4255f6b0295acc9bb457f90fcc22ce23dd6..0beec68ab382653d622e60402017c590c120acab 100644
--- a/app/lib/activitypub/activity/follow.rb
+++ b/app/lib/activitypub/activity/follow.rb
@@ -22,10 +22,10 @@ class ActivityPub::Activity::Follow < ActivityPub::Activity
     follow_request = FollowRequest.create!(account: @account, target_account: target_account, uri: @json['id'])
 
     if target_account.locked? || @account.silenced?
-      NotifyService.new.call(target_account, follow_request)
+      NotifyService.new.call(target_account, :follow_request, follow_request)
     else
       AuthorizeFollowService.new.call(@account, target_account)
-      NotifyService.new.call(target_account, ::Follow.find_by(account: @account, target_account: target_account))
+      NotifyService.new.call(target_account, :follow, ::Follow.find_by(account: @account, target_account: target_account))
     end
   end
 
diff --git a/app/lib/activitypub/activity/like.rb b/app/lib/activitypub/activity/like.rb
index 674d5fe47236302cb3c770c69213dcdc4e556443..c065f01f86005387a38fbd4f70056bb1090c1386 100644
--- a/app/lib/activitypub/activity/like.rb
+++ b/app/lib/activitypub/activity/like.rb
@@ -7,6 +7,6 @@ class ActivityPub::Activity::Like < ActivityPub::Activity
     return if original_status.nil? || !original_status.account.local? || delete_arrived_first?(@json['id']) || @account.favourited?(original_status)
 
     favourite = original_status.favourites.create!(account: @account)
-    NotifyService.new.call(original_status.account, favourite)
+    NotifyService.new.call(original_status.account, :favourite, favourite)
   end
 end
diff --git a/app/lib/activitypub/activity/move.rb b/app/lib/activitypub/activity/move.rb
index 2103f503f20a6c97231f98a2b7c9128501361509..7e073f64d2309cdc212eafec7651a5cf6c34cf21 100644
--- a/app/lib/activitypub/activity/move.rb
+++ b/app/lib/activitypub/activity/move.rb
@@ -20,6 +20,9 @@ class ActivityPub::Activity::Move < ActivityPub::Activity
 
     # Initiate a re-follow for each follower
     MoveWorker.perform_async(origin_account.id, target_account.id)
+  rescue
+    unmark_as_processing!
+    raise
   end
 
   private
diff --git a/app/lib/activitypub/activity/reject.rb b/app/lib/activitypub/activity/reject.rb
index 8d771ed81753b311d77403128bd71d1594f1f55d..886dddb23557c43c52aabe6266d6cb73d6b60327 100644
--- a/app/lib/activitypub/activity/reject.rb
+++ b/app/lib/activitypub/activity/reject.rb
@@ -4,7 +4,7 @@ class ActivityPub::Activity::Reject < ActivityPub::Activity
   def perform
     return reject_follow_for_relay if relay_follow?
     return follow_request_from_object.reject! unless follow_request_from_object.nil?
-    return UnfollowService.new.call(follow_from_object.target_account, @account) unless follow_from_object.nil?
+    return UnfollowService.new.call(follow_from_object.account, @account) unless follow_from_object.nil?
 
     case @object['type']
     when 'Follow'
diff --git a/app/lib/activitypub/activity/undo.rb b/app/lib/activitypub/activity/undo.rb
index 599823c6e25db8ffac3ed5c1a513e92ef40bf7a8..9eff1b71c9db366289b3399d024ee256a33d750d 100644
--- a/app/lib/activitypub/activity/undo.rb
+++ b/app/lib/activitypub/activity/undo.rb
@@ -13,11 +13,62 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
       undo_like
     when 'Block'
       undo_block
+    when nil
+      handle_reference
     end
   end
 
   private
 
+  def handle_reference
+    # Some implementations do not inline the object, and as we don't have a
+    # global index, we have to guess what object it is.
+    return if object_uri.nil?
+
+    try_undo_announce || try_undo_accept || try_undo_follow || try_undo_like || try_undo_block || delete_later!(object_uri)
+  end
+
+  def try_undo_announce
+    status = Status.where.not(reblog_of_id: nil).find_by(uri: object_uri, account: @account)
+    if status.present?
+      RemoveStatusService.new.call(status)
+      true
+    else
+      false
+    end
+  end
+
+  def try_undo_accept
+    # We can't currently handle `Undo Accept` as we don't record `Accept`'s uri
+    false
+  end
+
+  def try_undo_follow
+    follow = @account.follow_requests.find_by(uri: object_uri) || @account.active_relationships.find_by(uri: object_uri)
+
+    if follow.present?
+      follow.destroy
+      true
+    else
+      false
+    end
+  end
+
+  def try_undo_like
+    # There is an index on accounts, but an account may have *many* favs, so this may be too costly
+    false
+  end
+
+  def try_undo_block
+    block = @account.block_relationships.find_by(uri: object_uri)
+    if block.present?
+      UnblockService.new.call(@account, block.target_account)
+      true
+    else
+      false
+    end
+  end
+
   def undo_announce
     return if object_uri.nil?
 
diff --git a/app/lib/activitypub/activity/update.rb b/app/lib/activitypub/activity/update.rb
index 70035325b65b4dfc02307db5ceceb0df33281ef7..018e2df549299b56644893e856e1097c675328d4 100644
--- a/app/lib/activitypub/activity/update.rb
+++ b/app/lib/activitypub/activity/update.rb
@@ -4,6 +4,8 @@ class ActivityPub::Activity::Update < ActivityPub::Activity
   SUPPORTED_TYPES = %w(Application Group Organization Person Service).freeze
 
   def perform
+    dereference_object!
+
     if equals_or_includes_any?(@object['type'], SUPPORTED_TYPES)
       update_account
     elsif equals_or_includes_any?(@object['type'], %w(Question))
diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb
index 634ed29fa3dbe01a4db29715ac7536287b440319..2d6b876593752eb48a2af6f29dd707aa1928db03 100644
--- a/app/lib/activitypub/adapter.rb
+++ b/app/lib/activitypub/adapter.rb
@@ -13,7 +13,7 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
     moved_to: { 'movedTo' => { '@id' => 'as:movedTo', '@type' => '@id' } },
     also_known_as: { 'alsoKnownAs' => { '@id' => 'as:alsoKnownAs', '@type' => '@id' } },
     emoji: { 'toot' => 'http://joinmastodon.org/ns#', 'Emoji' => 'toot:Emoji' },
-    featured: { 'toot' => 'http://joinmastodon.org/ns#', 'featured' => { '@id' => 'toot:featured', '@type' => '@id' } },
+    featured: { 'toot' => 'http://joinmastodon.org/ns#', 'featured' => { '@id' => 'toot:featured', '@type' => '@id' }, 'featuredTags' => { '@id' => 'toot:featuredTags', '@type' => '@id' } },
     property_value: { 'schema' => 'http://schema.org#', 'PropertyValue' => 'schema:PropertyValue', 'value' => 'schema:value' },
     atom_uri: { 'ostatus' => 'http://ostatus.org#', 'atomUri' => 'ostatus:atomUri' },
     conversation: { 'ostatus' => 'http://ostatus.org#', 'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri', 'conversation' => 'ostatus:conversation' },
@@ -23,6 +23,7 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
     discoverable: { 'toot' => 'http://joinmastodon.org/ns#', 'discoverable' => 'toot:discoverable' },
     voters_count: { 'toot' => 'http://joinmastodon.org/ns#', 'votersCount' => 'toot:votersCount' },
     olm: { 'toot' => 'http://joinmastodon.org/ns#', 'Device' => 'toot:Device', 'Ed25519Signature' => 'toot:Ed25519Signature', 'Ed25519Key' => 'toot:Ed25519Key', 'Curve25519Key' => 'toot:Curve25519Key', 'EncryptedMessage' => 'toot:EncryptedMessage', 'publicKeyBase64' => 'toot:publicKeyBase64', 'deviceId' => 'toot:deviceId', 'claim' => { '@type' => '@id', '@id' => 'toot:claim' }, 'fingerprintKey' => { '@type' => '@id', '@id' => 'toot:fingerprintKey' }, 'identityKey' => { '@type' => '@id', '@id' => 'toot:identityKey' }, 'devices' => { '@type' => '@id', '@id' => 'toot:devices' }, 'messageFranking' => 'toot:messageFranking', 'messageType' => 'toot:messageType', 'cipherText' => 'toot:cipherText' },
+    suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' },
   }.freeze
 
   def self.default_key_transform
diff --git a/app/lib/activitypub/dereferencer.rb b/app/lib/activitypub/dereferencer.rb
new file mode 100644
index 0000000000000000000000000000000000000000..bea69608fe228be2e2eb2ee37367fc25923cf185
--- /dev/null
+++ b/app/lib/activitypub/dereferencer.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+class ActivityPub::Dereferencer
+  include JsonLdHelper
+
+  def initialize(uri, permitted_origin: nil, signature_account: nil)
+    @uri               = uri
+    @permitted_origin  = permitted_origin
+    @signature_account = signature_account
+  end
+
+  def object
+    @object ||= fetch_object!
+  end
+
+  private
+
+  def bear_cap?
+    @uri.start_with?('bear:')
+  end
+
+  def fetch_object!
+    if bear_cap?
+      fetch_with_token!
+    else
+      fetch_with_signature!
+    end
+  end
+
+  def fetch_with_token!
+    perform_request(bear_cap['u'], headers: { 'Authorization' => "Bearer #{bear_cap['t']}" })
+  end
+
+  def fetch_with_signature!
+    perform_request(@uri)
+  end
+
+  def bear_cap
+    @bear_cap ||= Addressable::URI.parse(@uri).query_values
+  end
+
+  def perform_request(uri, headers: nil)
+    return if invalid_origin?(uri)
+
+    req = Request.new(:get, uri)
+
+    req.add_headers('Accept' => 'application/activity+json, application/ld+json')
+    req.add_headers(headers) if headers
+    req.on_behalf_of(@signature_account) if @signature_account
+
+    req.perform do |res|
+      if res.code == 200
+        json = body_to_json(res.body_with_limit)
+        json if json.present? && json['id'] == uri
+      else
+        raise Mastodon::UnexpectedResponseError, res unless response_successful?(res) || response_error_unsalvageable?(res)
+      end
+    end
+  end
+
+  def invalid_origin?(uri)
+    return true if unsupported_uri_scheme?(uri)
+
+    needle   = Addressable::URI.parse(uri).host
+    haystack = Addressable::URI.parse(@permitted_origin).host
+
+    !haystack.casecmp(needle).zero?
+  end
+end
diff --git a/app/lib/activitypub/linked_data_signature.rb b/app/lib/activitypub/linked_data_signature.rb
index f52a8f406fde3dfd07d7830fe32c929418222346..e853a970e81d2272af6fead2261a5f2187060b41 100644
--- a/app/lib/activitypub/linked_data_signature.rb
+++ b/app/lib/activitypub/linked_data_signature.rb
@@ -27,7 +27,7 @@ class ActivityPub::LinkedDataSignature
     document_hash  = hash(@json.without('signature'))
     to_be_verified = options_hash + document_hash
 
-    if creator.keypair.public_key.verify(OpenSSL::Digest::SHA256.new, Base64.decode64(signature), to_be_verified)
+    if creator.keypair.public_key.verify(OpenSSL::Digest.new('SHA256'), Base64.decode64(signature), to_be_verified)
       creator
     end
   end
@@ -44,7 +44,7 @@ class ActivityPub::LinkedDataSignature
     to_be_signed  = options_hash + document_hash
     keypair       = sign_with.present? ? OpenSSL::PKey::RSA.new(sign_with) : creator.keypair
 
-    signature = Base64.strict_encode64(keypair.sign(OpenSSL::Digest::SHA256.new, to_be_signed))
+    signature = Base64.strict_encode64(keypair.sign(OpenSSL::Digest.new('SHA256'), to_be_signed))
 
     @json.merge('signature' => options.merge('signatureValue' => signature))
   end
diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb
index 3f98dad2eb0c1b2452b4b220c43c93d44fc8deef..3f2ae1106b6d11108c81e3b64f78a2e75b85ef60 100644
--- a/app/lib/activitypub/tag_manager.rb
+++ b/app/lib/activitypub/tag_manager.rb
@@ -40,6 +40,10 @@ class ActivityPub::TagManager
     end
   end
 
+  def uri_for_username(username)
+    account_url(username: username)
+  end
+
   def generate_uri_for(_target)
     URI.join(root_url, 'payloads', SecureRandom.uuid)
   end
diff --git a/app/lib/cache_buster.rb b/app/lib/cache_buster.rb
new file mode 100644
index 0000000000000000000000000000000000000000..035611518eb52afb879961ddb404a10758a70030
--- /dev/null
+++ b/app/lib/cache_buster.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class CacheBuster
+  def initialize(options = {})
+    @secret_header = options[:secret_header] || 'Secret-Header'
+    @secret        = options[:secret] || 'True'
+  end
+
+  def bust(url)
+    site = Addressable::URI.parse(url).normalized_site
+
+    request_pool.with(site) do |http_client|
+      build_request(url, http_client).perform
+    end
+  end
+
+  private
+
+  def request_pool
+    RequestPool.current
+  end
+
+  def build_request(url, http_client)
+    Request.new(:get, url, http_client: http_client).tap do |request|
+      request.add_headers(@secret_header => @secret)
+    end
+  end
+end
diff --git a/app/lib/entity_cache.rb b/app/lib/entity_cache.rb
index afdbd70f2646f44828800b6499a0d23fea91a095..89cbf8d2c47bc06c2e53e24f43ac9a401c43ad58 100644
--- a/app/lib/entity_cache.rb
+++ b/app/lib/entity_cache.rb
@@ -16,7 +16,7 @@ class EntityCache
   end
 
   def emoji(shortcodes, domain)
-    shortcodes   = [shortcodes] unless shortcodes.is_a?(Array)
+    shortcodes   = Array(shortcodes)
     cached       = Rails.cache.read_multi(*shortcodes.map { |shortcode| to_key(:emoji, shortcode, domain) })
     uncached_ids = []
 
diff --git a/app/lib/exceptions.rb b/app/lib/exceptions.rb
index 3362576b0bc6af4caf0bb24ca16a452c9088f09a..7c8e778713a2b38a5c373cd09214b2c5b320f93a 100644
--- a/app/lib/exceptions.rb
+++ b/app/lib/exceptions.rb
@@ -7,6 +7,7 @@ module Mastodon
   class HostValidationError < ValidationError; end
   class LengthValidationError < ValidationError; end
   class DimensionsValidationError < ValidationError; end
+  class StreamValidationError < ValidationError; end
   class RaceConditionError < Error; end
   class RateLimitExceededError < Error; end
 
diff --git a/app/lib/fast_ip_map.rb b/app/lib/fast_ip_map.rb
new file mode 100644
index 0000000000000000000000000000000000000000..ba30b45f3320e77f56a5196bf704b170fbd9d3b2
--- /dev/null
+++ b/app/lib/fast_ip_map.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class FastIpMap
+  MAX_IPV4_PREFIX = 32
+  MAX_IPV6_PREFIX = 128
+
+  # @param [Enumerable<IPAddr>] addresses
+  def initialize(addresses)
+    @fast_lookup = {}
+    @ranges      = []
+
+    # Hash look-up is faster but only works for exact matches, so we split
+    # exact addresses from non-exact ones
+    addresses.each do |address|
+      if (address.ipv4? && address.prefix == MAX_IPV4_PREFIX) || (address.ipv6? && address.prefix == MAX_IPV6_PREFIX)
+        @fast_lookup[address.to_s] = true
+      else
+        @ranges << address
+      end
+    end
+
+    # We're more likely to hit wider-reaching ranges when checking for
+    # inclusion, so make sure they're sorted first
+    @ranges.sort_by!(&:prefix)
+  end
+
+  # @param [IPAddr] address
+  # @return [Boolean]
+  def include?(address)
+    @fast_lookup[address.to_s] || @ranges.any? { |cidr| cidr.include?(address) }
+  end
+end
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 96fa6cfc06ea529eba59ab49a8af1e56fe25738e..f0ad3e21fe46d7e183e509385a129e0ed5143d52 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -6,31 +6,54 @@ class FeedManager
   include Singleton
   include Redisable
 
+  # Maximum number of items stored in a single feed
   MAX_ITEMS = 400
 
-  # Must be <= MAX_ITEMS or the tracking sets will grow forever
+  # Number of items in the feed since last reblog of status
+  # before the new reblog will be inserted. Must be <= MAX_ITEMS
+  # or the tracking sets will grow forever
   REBLOG_FALLOFF = 40
 
+  # Execute block for every active account
+  # @yield [Account]
+  # @return [void]
   def with_active_accounts(&block)
     Account.joins(:user).where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago).find_each(&block)
   end
 
+  # Redis key of a feed
+  # @param [Symbol] type
+  # @param [Integer] id
+  # @param [Symbol] subtype
+  # @return [String]
   def key(type, id, subtype = nil)
     return "feed:#{type}:#{id}" unless subtype
 
     "feed:#{type}:#{id}:#{subtype}"
   end
 
-  def filter?(timeline_type, status, receiver_id)
-    if timeline_type == :home
-      filter_from_home?(status, receiver_id, build_crutches(receiver_id, [status]))
-    elsif timeline_type == :mentions
-      filter_from_mentions?(status, receiver_id)
+  # Check if the status should not be added to a feed
+  # @param [Symbol] timeline_type
+  # @param [Status] status
+  # @param [Account|List] receiver
+  # @return [Boolean]
+  def filter?(timeline_type, status, receiver)
+    case timeline_type
+    when :home
+      filter_from_home?(status, receiver.id, build_crutches(receiver.id, [status]))
+    when :list
+      filter_from_list?(status, receiver) || filter_from_home?(status, receiver.account_id, build_crutches(receiver.account_id, [status]))
+    when :mentions
+      filter_from_mentions?(status, receiver.id)
     else
       false
     end
   end
 
+  # Add a status to a home feed and send a streaming API update
+  # @param [Account] account
+  # @param [Status] status
+  # @return [Boolean]
   def push_to_home(account, status)
     return false unless add_to_feed(:home, account.id, status, account.user&.aggregates_reblogs?)
 
@@ -39,6 +62,10 @@ class FeedManager
     true
   end
 
+  # Remove a status from a home feed and send a streaming API update
+  # @param [Account] account
+  # @param [Status] status
+  # @return [Boolean]
   def unpush_from_home(account, status)
     return false unless remove_from_feed(:home, account.id, status, account.user&.aggregates_reblogs?)
 
@@ -46,20 +73,22 @@ class FeedManager
     true
   end
 
+  # Add a status to a list feed and send a streaming API update
+  # @param [List] list
+  # @param [Status] status
+  # @return [Boolean]
   def push_to_list(list, status)
-    if status.reply? && status.in_reply_to_account_id != status.account_id
-      should_filter = status.in_reply_to_account_id != list.account_id
-      should_filter &&= !ListAccount.where(list_id: list.id, account_id: status.in_reply_to_account_id).exists?
-      return false if should_filter
-    end
-
-    return false unless add_to_feed(:list, list.id, status, list.account.user&.aggregates_reblogs?)
+    return false if filter_from_list?(status, list) || !add_to_feed(:list, list.id, status, list.account.user&.aggregates_reblogs?)
 
     trim(:list, list.id)
     PushUpdateWorker.perform_async(list.account_id, status.id, "timeline:list:#{list.id}") if push_update_required?("timeline:list:#{list.id}")
     true
   end
 
+  # Remove a status from a list feed and send a streaming API update
+  # @param [List] list
+  # @param [Status] status
+  # @return [Boolean]
   def unpush_from_list(list, status)
     return false unless remove_from_feed(:list, list.id, status, list.account.user&.aggregates_reblogs?)
 
@@ -67,32 +96,11 @@ class FeedManager
     true
   end
 
-  def trim(type, account_id)
-    timeline_key = key(type, account_id)
-    reblog_key   = key(type, account_id, 'reblogs')
-
-    # Remove any items past the MAX_ITEMS'th entry in our feed
-    redis.zremrangebyrank(timeline_key, 0, -(FeedManager::MAX_ITEMS + 1))
-
-    # Get the score of the REBLOG_FALLOFF'th item in our feed, and stop
-    # tracking anything after it for deduplication purposes.
-    falloff_rank  = FeedManager::REBLOG_FALLOFF - 1
-    falloff_range = redis.zrevrange(timeline_key, falloff_rank, falloff_rank, with_scores: true)
-    falloff_score = falloff_range&.first&.last&.to_i || 0
-
-    # Get any reblogs we might have to clean up after.
-    redis.zrangebyscore(reblog_key, 0, falloff_score).each do |reblogged_id|
-      # Remove it from the set of reblogs we're tracking *first* to avoid races.
-      redis.zrem(reblog_key, reblogged_id)
-      # Just drop any set we might have created to track additional reblogs.
-      # This means that if this reblog is deleted, we won't automatically insert
-      # another reblog, but also that any new reblog can be inserted into the
-      # feed.
-      redis.del(key(type, account_id, "reblogs:#{reblogged_id}"))
-    end
-  end
-
-  def merge_into_timeline(from_account, into_account)
+  # Fill a home feed with an account's statuses
+  # @param [Account] from_account
+  # @param [Account] into_account
+  # @return [void]
+  def merge_into_home(from_account, into_account)
     timeline_key = key(:home, into_account.id)
     aggregate    = into_account.user&.aggregates_reblogs?
     query        = from_account.statuses.where(visibility: [:public, :unlisted, :private]).includes(:preloadable_poll, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
@@ -114,7 +122,37 @@ class FeedManager
     trim(:home, into_account.id)
   end
 
-  def unmerge_from_timeline(from_account, into_account)
+  # Fill a list feed with an account's statuses
+  # @param [Account] from_account
+  # @param [List] list
+  # @return [void]
+  def merge_into_list(from_account, list)
+    timeline_key = key(:list, list.id)
+    aggregate    = list.account.user&.aggregates_reblogs?
+    query        = from_account.statuses.where(visibility: [:public, :unlisted, :private]).includes(:preloadable_poll, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
+
+    if redis.zcard(timeline_key) >= FeedManager::MAX_ITEMS / 4
+      oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true).first.last.to_i
+      query = query.where('id > ?', oldest_home_score)
+    end
+
+    statuses = query.to_a
+    crutches = build_crutches(list.account_id, statuses)
+
+    statuses.each do |status|
+      next if filter_from_home?(status, list.account_id, crutches) || filter_from_list?(status, list)
+
+      add_to_feed(:list, list.id, status, aggregate)
+    end
+
+    trim(:list, list.id)
+  end
+
+  # Remove an account's statuses from a home feed
+  # @param [Account] from_account
+  # @param [Account] into_account
+  # @return [void]
+  def unmerge_from_home(from_account, into_account)
     timeline_key      = key(:home, into_account.id)
     oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true)&.first&.last&.to_i || 0
 
@@ -123,14 +161,31 @@ class FeedManager
     end
   end
 
-  def clear_from_timeline(account, target_account)
-    # Clear from timeline all statuses from or mentionning target_account
+  # Remove an account's statuses from a list feed
+  # @param [Account] from_account
+  # @param [List] list
+  # @return [void]
+  def unmerge_from_list(from_account, list)
+    timeline_key      = key(:list, list.id)
+    oldest_list_score = redis.zrange(timeline_key, 0, 0, with_scores: true)&.first&.last&.to_i || 0
+
+    from_account.statuses.select('id, reblog_of_id').where('id > ?', oldest_list_score).reorder(nil).find_each do |status|
+      remove_from_feed(:list, list.id, status, list.account.user&.aggregates_reblogs?)
+    end
+  end
+
+  # Clear all statuses from or mentioning target_account from a home feed
+  # @param [Account] account
+  # @param [Account] target_account
+  # @return [void]
+  def clear_from_home(account, target_account)
     timeline_key        = key(:home, account.id)
     timeline_status_ids = redis.zrange(timeline_key, 0, -1)
     statuses            = Status.where(id: timeline_status_ids).select(:id, :reblog_of_id, :account_id).to_a
     reblogged_ids       = Status.where(id: statuses.map(&:reblog_of_id).compact, account: target_account).pluck(:id)
     with_mentions_ids   = Mention.active.where(status_id: statuses.flat_map { |s| [s.id, s.reblog_of_id] }.compact, account: target_account).pluck(:status_id)
-    target_statuses     = statuses.filter do |status|
+
+    target_statuses = statuses.select do |status|
       status.account_id == target_account.id || reblogged_ids.include?(status.reblog_of_id) || with_mentions_ids.include?(status.id) || with_mentions_ids.include?(status.reblog_of_id)
     end
 
@@ -139,12 +194,15 @@ class FeedManager
     end
   end
 
-  def populate_feed(account)
+  # Populate home feed of account from scratch
+  # @param [Account] account
+  # @return [void]
+  def populate_home(account)
     limit        = FeedManager::MAX_ITEMS / 2
     aggregate    = account.user&.aggregates_reblogs?
     timeline_key = key(:home, account.id)
 
-    account.statuses.where.not(visibility: :direct).limit(limit).each do |status|
+    account.statuses.limit(limit).each do |status|
       add_to_feed(:home, account.id, status, aggregate)
     end
 
@@ -172,17 +230,91 @@ class FeedManager
     end
   end
 
+  # Completely clear multiple feeds at once
+  # @param [Symbol] type
+  # @param [Array<Integer>] ids
+  # @return [void]
+  def clean_feeds!(type, ids)
+    reblogged_id_sets = {}
+
+    redis.pipelined do
+      ids.each do |feed_id|
+        redis.del(key(type, feed_id))
+        reblog_key = key(type, feed_id, 'reblogs')
+        # We collect a future for this: we don't block while getting
+        # it, but we can iterate over it later.
+        reblogged_id_sets[feed_id] = redis.zrange(reblog_key, 0, -1)
+        redis.del(reblog_key)
+      end
+    end
+
+    # Remove all of the reblog tracking keys we just removed the
+    # references to.
+    redis.pipelined do
+      reblogged_id_sets.each do |feed_id, future|
+        future.value.each do |reblogged_id|
+          reblog_set_key = key(type, feed_id, "reblogs:#{reblogged_id}")
+          redis.del(reblog_set_key)
+        end
+      end
+    end
+  end
+
   private
 
-  def push_update_required?(timeline_id)
-    redis.exists?("subscribed:#{timeline_id}")
+  # Trim a feed to maximum size by removing older items
+  # @param [Symbol] type
+  # @param [Integer] timeline_id
+  # @return [void]
+  def trim(type, timeline_id)
+    timeline_key = key(type, timeline_id)
+    reblog_key   = key(type, timeline_id, 'reblogs')
+
+    # Remove any items past the MAX_ITEMS'th entry in our feed
+    redis.zremrangebyrank(timeline_key, 0, -(FeedManager::MAX_ITEMS + 1))
+
+    # Get the score of the REBLOG_FALLOFF'th item in our feed, and stop
+    # tracking anything after it for deduplication purposes.
+    falloff_rank  = FeedManager::REBLOG_FALLOFF
+    falloff_range = redis.zrevrange(timeline_key, falloff_rank, falloff_rank, with_scores: true)
+    falloff_score = falloff_range&.first&.last&.to_i
+
+    return if falloff_score.nil?
+
+    # Get any reblogs we might have to clean up after.
+    redis.zrangebyscore(reblog_key, 0, falloff_score).each do |reblogged_id|
+      # Remove it from the set of reblogs we're tracking *first* to avoid races.
+      redis.zrem(reblog_key, reblogged_id)
+      # Just drop any set we might have created to track additional reblogs.
+      # This means that if this reblog is deleted, we won't automatically insert
+      # another reblog, but also that any new reblog can be inserted into the
+      # feed.
+      redis.del(key(type, timeline_id, "reblogs:#{reblogged_id}"))
+    end
   end
 
+  # Check if there is a streaming API client connected
+  # for the given feed
+  # @param [String] timeline_key
+  # @return [Boolean]
+  def push_update_required?(timeline_key)
+    redis.exists?("subscribed:#{timeline_key}")
+  end
+
+  # Check if the account is blocking or muting any of the given accounts
+  # @param [Integer] receiver_id
+  # @param [Array<Integer>] account_ids
+  # @param [Symbol] context
   def blocks_or_mutes?(receiver_id, account_ids, context)
     Block.where(account_id: receiver_id, target_account_id: account_ids).any? ||
       (context == :home ? Mute.where(account_id: receiver_id, target_account_id: account_ids).any? : Mute.where(account_id: receiver_id, target_account_id: account_ids, hide_notifications: true).any?)
   end
 
+  # Check if status should not be added to the home feed
+  # @param [Status] status
+  # @param [Integer] receiver_id
+  # @param [Hash] crutches
+  # @return [Boolean]
   def filter_from_home?(status, receiver_id, crutches)
     return false if receiver_id == status.account_id
     return true  if status.reply? && (status.in_reply_to_id.nil? || status.in_reply_to_account_id.nil?)
@@ -215,6 +347,11 @@ class FeedManager
     false
   end
 
+  # Check if status should not be added to the mentions feed
+  # @see NotifyService
+  # @param [Status] status
+  # @param [Integer] receiver_id
+  # @return [Boolean]
   def filter_from_mentions?(status, receiver_id)
     return true if receiver_id == status.account_id
     return true if phrase_filtered?(status, receiver_id, :notifications)
@@ -231,6 +368,27 @@ class FeedManager
     should_filter
   end
 
+  # Check if status should not be added to the list feed
+  # @param [Status] status
+  # @param [List] list
+  # @return [Boolean]
+  def filter_from_list?(status, list)
+    if status.reply? && status.in_reply_to_account_id != status.account_id
+      should_filter = status.in_reply_to_account_id != list.account_id
+      should_filter &&= !list.show_followed?
+      should_filter &&= !(list.show_list? && ListAccount.where(list_id: list.id, account_id: status.in_reply_to_account_id).exists?)
+
+      return !!should_filter
+    end
+
+    false
+  end
+
+  # Check if the status hits a phrase filter
+  # @param [Status] status
+  # @param [Integer] receiver_id
+  # @param [Symbol] context
+  # @return [Boolean]
   def phrase_filtered?(status, receiver_id, context)
     active_filters = Rails.cache.fetch("filters:#{receiver_id}") { CustomFilter.where(account_id: receiver_id).active_irreversible.to_a }.to_a
 
@@ -266,6 +424,11 @@ class FeedManager
   # added, and false if it was not added to the feed. Note that this is
   # an internal helper: callers must call trim or push updates if
   # either action is appropriate.
+  # @param [Symbol] timeline_type
+  # @param [Integer] account_id
+  # @param [Status] status
+  # @param [Boolean] aggregate_reblogs
+  # @return [Boolean]
   def add_to_feed(timeline_type, account_id, status, aggregate_reblogs = true)
     timeline_key = key(timeline_type, account_id)
     reblog_key   = key(timeline_type, account_id, 'reblogs')
@@ -278,14 +441,12 @@ class FeedManager
 
       return false if !rank.nil? && rank < FeedManager::REBLOG_FALLOFF
 
-      reblog_rank = redis.zrevrank(reblog_key, status.reblog_of_id)
-
-      if reblog_rank.nil?
+      # The ordered set at `reblog_key` holds statuses which have a reblog
+      # in the top `REBLOG_FALLOFF` statuses of the timeline
+      if redis.zadd(reblog_key, status.id, status.reblog_of_id, nx: true)
         # This is not something we've already seen reblogged, so we
-        # can just add it to the feed (and note that we're
-        # reblogging it).
+        # can just add it to the feed (and note that we're reblogging it).
         redis.zadd(timeline_key, status.id, status.id)
-        redis.zadd(reblog_key, status.id, status.reblog_of_id)
       else
         # Another reblog of the same status was already in the
         # REBLOG_FALLOFF most recent statuses, so we note that this
@@ -299,9 +460,7 @@ class FeedManager
       # delay of the worker deliverying the original status, the late addition
       # by merging timelines, and other reasons.
       # If such a reblog already exists, just do not re-insert it into the feed.
-      rank = redis.zrevrank(reblog_key, status.id)
-
-      return false unless rank.nil?
+      return false unless redis.zscore(reblog_key, status.id).nil?
 
       redis.zadd(timeline_key, status.id, status.id)
     end
@@ -313,6 +472,11 @@ class FeedManager
   # with reblogs, and returning true if a status was removed. As with
   # `add_to_feed`, this does not trigger push updates, so callers must
   # do so if appropriate.
+  # @param [Symbol] timeline_type
+  # @param [Integer] account_id
+  # @param [Status] status
+  # @param [Boolean] aggregate_reblogs
+  # @return [Boolean]
   def remove_from_feed(timeline_type, account_id, status, aggregate_reblogs = true)
     timeline_key = key(timeline_type, account_id)
     reblog_key   = key(timeline_type, account_id, 'reblogs')
@@ -347,6 +511,11 @@ class FeedManager
     redis.zrem(timeline_key, status.id)
   end
 
+  # Pre-fetch various objects and relationships for given statuses that
+  # are going to be checked by the filtering methods
+  # @param [Integer] receiver_id
+  # @param [Array<Status>] statuses
+  # @return [Hash]
   def build_crutches(receiver_id, statuses)
     crutches = {}
 
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index e6f5d7a6327969a990f12bab33ff0e26dc79530d..7f217ae9f688a6b024fb8fdd2457cc5eb30c188f 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -135,6 +135,7 @@ class Formatter
     end
   end
 
+  # rubocop:disable Metrics/BlockNesting
   def encode_custom_emojis(html, emojis, animate = false)
     return html if emojis.empty?
 
@@ -189,6 +190,7 @@ class Formatter
 
     html
   end
+  # rubocop:enable Metrics/BlockNesting
 
   def rewrite(text, entities)
     text = text.to_s
diff --git a/app/lib/request.rb b/app/lib/request.rb
index bcba1eebf645c8eaa078e6e2e3e3dbe30df5eb28..38048dad7b552e1718ce50710311b358c4d166e4 100644
--- a/app/lib/request.rb
+++ b/app/lib/request.rb
@@ -114,7 +114,7 @@ class Request
 
   def signature
     algorithm = 'rsa-sha256'
-    signature = Base64.strict_encode64(@keypair.sign(OpenSSL::Digest::SHA256.new, signed_string))
+    signature = Base64.strict_encode64(@keypair.sign(OpenSSL::Digest.new('SHA256'), signed_string))
 
     "keyId=\"#{key_id}\",algorithm=\"#{algorithm}\",headers=\"#{signed_headers.keys.join(' ').downcase}\",signature=\"#{signature}\""
   end
@@ -253,7 +253,15 @@ class Request
       alias new open
 
       def check_private_address(address)
-        raise Mastodon::HostValidationError if PrivateAddressCheck.private_address?(IPAddr.new(address.to_s))
+        addr = IPAddr.new(address.to_s)
+        return if private_address_exceptions.any? { |range| range.include?(addr) }
+        raise Mastodon::HostValidationError if PrivateAddressCheck.private_address?(addr)
+      end
+
+      def private_address_exceptions
+        @private_address_exceptions = begin
+          (ENV['ALLOWED_PRIVATE_ADDRESSES'] || '').split(',').map { |addr| IPAddr.new(addr) }
+        end
       end
     end
   end
diff --git a/app/lib/sanitize_config.rb b/app/lib/sanitize_config.rb
index 4ad1199a60442c9788d8c731e963ff31cfd1a62b..8f700197b272a88dc9f6fb1a2bec49b1465b1cfe 100644
--- a/app/lib/sanitize_config.rb
+++ b/app/lib/sanitize_config.rb
@@ -18,6 +18,7 @@ class Sanitize
       gopher
       xmpp
       magnet
+      gemini
     ).freeze
 
     CLASS_WHITELIST_TRANSFORMER = lambda do |env|
diff --git a/app/lib/settings/scoped_settings.rb b/app/lib/settings/scoped_settings.rb
index 3bec9bd569d0ecc9ee923f18294a3bcf59842f03..ef694205c43dacd966d2eb69903f0c568fad2e78 100644
--- a/app/lib/settings/scoped_settings.rb
+++ b/app/lib/settings/scoped_settings.rb
@@ -11,7 +11,6 @@ module Settings
       @object = object
     end
 
-    # rubocop:disable Style/MethodMissingSuper
     def method_missing(method, *args)
       method_name = method.to_s
       # set a value for a variable
@@ -24,7 +23,6 @@ module Settings
         self[method_name]
       end
     end
-    # rubocop:enable Style/MethodMissingSuper
 
     def respond_to_missing?(*)
       true
diff --git a/app/lib/sidekiq_error_handler.rb b/app/lib/sidekiq_error_handler.rb
index b07817d4556b2d37059471aa97b9b4b27069f7a2..ab555b1be3eb893923e7520c0051d12123abb116 100644
--- a/app/lib/sidekiq_error_handler.rb
+++ b/app/lib/sidekiq_error_handler.rb
@@ -17,8 +17,10 @@ class SidekiqErrorHandler
 
   private
 
+  # rubocop:disable Naming/MethodParameterName
   def limit_backtrace_and_raise(e)
     e.set_backtrace(e.backtrace.first(BACKTRACE_LIMIT))
     raise e
   end
+  # rubocop:enable Naming/MethodParameterName
 end
diff --git a/app/lib/status_reach_finder.rb b/app/lib/status_reach_finder.rb
new file mode 100644
index 0000000000000000000000000000000000000000..35b191dadb0bc777d2a4f7570dc8ad7e98e07933
--- /dev/null
+++ b/app/lib/status_reach_finder.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+class StatusReachFinder
+  def initialize(status)
+    @status = status
+  end
+
+  def inboxes
+    Account.where(id: reached_account_ids).inboxes
+  end
+
+  private
+
+  def reached_account_ids
+    [
+      replied_to_account_id,
+      reblog_of_account_id,
+      mentioned_account_ids,
+      reblogs_account_ids,
+      favourites_account_ids,
+      replies_account_ids,
+    ].tap do |arr|
+      arr.flatten!
+      arr.compact!
+      arr.uniq!
+    end
+  end
+
+  def replied_to_account_id
+    @status.in_reply_to_account_id
+  end
+
+  def reblog_of_account_id
+    @status.reblog.account_id if @status.reblog?
+  end
+
+  def mentioned_account_ids
+    @status.mentions.pluck(:account_id)
+  end
+
+  def reblogs_account_ids
+    @status.reblogs.pluck(:account_id)
+  end
+
+  def favourites_account_ids
+    @status.favourites.pluck(:account_id)
+  end
+
+  def replies_account_ids
+    @status.replies.pluck(:account_id)
+  end
+end
diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb
index fa8255faab159edbbfa0ecf5fcb57024c528d686..e37bc6d9f11437a0f53794da3aedbae7b126635d 100644
--- a/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@ -27,6 +27,7 @@ class UserSettingsDecorator
     user.settings['display_media']       = display_media_preference if change?('setting_display_media')
     user.settings['expand_spoilers']     = expand_spoilers_preference if change?('setting_expand_spoilers')
     user.settings['reduce_motion']       = reduce_motion_preference if change?('setting_reduce_motion')
+    user.settings['disable_swiping']     = disable_swiping_preference if change?('setting_disable_swiping')
     user.settings['system_font_ui']      = system_font_ui_preference if change?('setting_system_font_ui')
     user.settings['noindex']             = noindex_preference if change?('setting_noindex')
     user.settings['theme']               = theme_preference if change?('setting_theme')
@@ -88,6 +89,10 @@ class UserSettingsDecorator
     boolean_cast_setting 'setting_reduce_motion'
   end
 
+  def disable_swiping_preference
+    boolean_cast_setting 'setting_disable_swiping'
+  end
+
   def noindex_preference
     boolean_cast_setting 'setting_noindex'
   end
diff --git a/app/lib/webfinger.rb b/app/lib/webfinger.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c7aa43bb334efc18508e2a9754d27fe825aad298
--- /dev/null
+++ b/app/lib/webfinger.rb
@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+class Webfinger
+  class Error < StandardError; end
+  class GoneError < Error; end
+  class RedirectError < StandardError; end
+
+  class Response
+    def initialize(body)
+      @json = Oj.load(body, mode: :strict)
+    end
+
+    def subject
+      @json['subject']
+    end
+
+    def link(rel, attribute)
+      links.dig(rel, attribute)
+    end
+
+    private
+
+    def links
+      @links ||= @json['links'].map { |link| [link['rel'], link] }.to_h
+    end
+  end
+
+  def initialize(uri)
+    _, @domain = uri.split('@')
+
+    raise ArgumentError, 'Webfinger requested for local account' if @domain.nil?
+
+    @uri = uri
+  end
+
+  def perform
+    Response.new(body_from_webfinger)
+  rescue Oj::ParseError
+    raise Webfinger::Error, "Invalid JSON in response for #{@uri}"
+  rescue Addressable::URI::InvalidURIError
+    raise Webfinger::Error, "Invalid URI for #{@uri}"
+  end
+
+  private
+
+  def body_from_webfinger(url = standard_url, use_fallback = true)
+    webfinger_request(url).perform do |res|
+      if res.code == 200
+        res.body_with_limit
+      elsif res.code == 404 && use_fallback
+        body_from_host_meta
+      elsif res.code == 410
+        raise Webfinger::GoneError, "#{@uri} is gone from the server"
+      else
+        raise Webfinger::Error, "Request for #{@uri} returned HTTP #{res.code}"
+      end
+    end
+  end
+
+  def body_from_host_meta
+    host_meta_request.perform do |res|
+      if res.code == 200
+        body_from_webfinger(url_from_template(res.body_with_limit), false)
+      else
+        raise Webfinger::Error, "Request for #{@uri} returned HTTP #{res.code}"
+      end
+    end
+  end
+
+  def url_from_template(str)
+    link = Nokogiri::XML(str).at_xpath('//xmlns:Link[@rel="lrdd"]')
+
+    if link.present?
+      link['template'].gsub('{uri}', @uri)
+    else
+      raise Webfinger::Error, "Request for #{@uri} returned host-meta without link to Webfinger"
+    end
+  rescue Nokogiri::XML::XPath::SyntaxError
+    raise Webfinger::Error, "Invalid XML encountered in host-meta for #{@uri}"
+  end
+
+  def host_meta_request
+    Request.new(:get, host_meta_url).add_headers('Accept' => 'application/xrd+xml, application/xml, text/xml')
+  end
+
+  def webfinger_request(url)
+    Request.new(:get, url).add_headers('Accept' => 'application/jrd+json, application/json')
+  end
+
+  def standard_url
+    "https://#{@domain}/.well-known/webfinger?resource=#{@uri}"
+  end
+
+  def host_meta_url
+    "https://#{@domain}/.well-known/host-meta"
+  end
+end
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index 9d8a7886c2732c174ffb5a1ece1ac9bc83601eb6..54db892ccc6e767ae4c7d1cf344deeabccf33ed3 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -10,7 +10,7 @@ class NotificationMailer < ApplicationMailer
     @me     = recipient
     @status = notification.target_status
 
-    return if @me.user.disabled? || @status.nil?
+    return unless @me.user.functional? && @status.present?
 
     locale_for_account(@me) do
       thread_by_conversation(@status.conversation)
@@ -22,7 +22,7 @@ class NotificationMailer < ApplicationMailer
     @me      = recipient
     @account = notification.from_account
 
-    return if @me.user.disabled?
+    return unless @me.user.functional?
 
     locale_for_account(@me) do
       mail to: @me.user.email, subject: I18n.t('notification_mailer.follow.subject', name: @account.acct)
@@ -34,7 +34,7 @@ class NotificationMailer < ApplicationMailer
     @account = notification.from_account
     @status  = notification.target_status
 
-    return if @me.user.disabled? || @status.nil?
+    return unless @me.user.functional? && @status.present?
 
     locale_for_account(@me) do
       thread_by_conversation(@status.conversation)
@@ -47,7 +47,7 @@ class NotificationMailer < ApplicationMailer
     @account = notification.from_account
     @status  = notification.target_status
 
-    return if @me.user.disabled? || @status.nil?
+    return unless @me.user.functional? && @status.present?
 
     locale_for_account(@me) do
       thread_by_conversation(@status.conversation)
@@ -59,7 +59,7 @@ class NotificationMailer < ApplicationMailer
     @me      = recipient
     @account = notification.from_account
 
-    return if @me.user.disabled?
+    return unless @me.user.functional?
 
     locale_for_account(@me) do
       mail to: @me.user.email, subject: I18n.t('notification_mailer.follow_request.subject', name: @account.acct)
@@ -67,7 +67,7 @@ class NotificationMailer < ApplicationMailer
   end
 
   def digest(recipient, **opts)
-    return if recipient.user.disabled?
+    return unless recipient.user.functional?
 
     @me                  = recipient
     @since               = opts[:since] || [@me.user.last_emailed_at, (@me.user.current_sign_in_at + 1.day)].compact.max
@@ -88,8 +88,10 @@ class NotificationMailer < ApplicationMailer
 
   def thread_by_conversation(conversation)
     return if conversation.nil?
+
     msg_id = "<conversation-#{conversation.id}.#{conversation.created_at.strftime('%Y-%m-%d')}@#{Rails.configuration.x.local_domain}>"
+
     headers['In-Reply-To'] = msg_id
-    headers['References'] = msg_id
+    headers['References']  = msg_id
   end
 end
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 2cd58e60a7e963c414ae4078c21c7249f3b90382..95996ba3ff9d8c92fc2423322a041899cb3592c7 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -15,7 +15,7 @@ class UserMailer < Devise::Mailer
     @token    = token
     @instance = Rails.configuration.x.local_domain
 
-    return if @resource.disabled?
+    return unless @resource.active_for_authentication?
 
     I18n.with_locale(@resource.locale || I18n.default_locale) do
       mail to: @resource.unconfirmed_email.presence || @resource.email,
@@ -29,7 +29,7 @@ class UserMailer < Devise::Mailer
     @token    = token
     @instance = Rails.configuration.x.local_domain
 
-    return if @resource.disabled?
+    return unless @resource.active_for_authentication?
 
     I18n.with_locale(@resource.locale || I18n.default_locale) do
       mail to: @resource.email, subject: I18n.t('devise.mailer.reset_password_instructions.subject')
@@ -40,7 +40,7 @@ class UserMailer < Devise::Mailer
     @resource = user
     @instance = Rails.configuration.x.local_domain
 
-    return if @resource.disabled?
+    return unless @resource.active_for_authentication?
 
     I18n.with_locale(@resource.locale || I18n.default_locale) do
       mail to: @resource.email, subject: I18n.t('devise.mailer.password_change.subject')
@@ -51,7 +51,7 @@ class UserMailer < Devise::Mailer
     @resource = user
     @instance = Rails.configuration.x.local_domain
 
-    return if @resource.disabled?
+    return unless @resource.active_for_authentication?
 
     I18n.with_locale(@resource.locale || I18n.default_locale) do
       mail to: @resource.email, subject: I18n.t('devise.mailer.email_changed.subject')
@@ -62,7 +62,7 @@ class UserMailer < Devise::Mailer
     @resource = user
     @instance = Rails.configuration.x.local_domain
 
-    return if @resource.disabled?
+    return unless @resource.active_for_authentication?
 
     I18n.with_locale(@resource.locale || I18n.default_locale) do
       mail to: @resource.email, subject: I18n.t('devise.mailer.two_factor_enabled.subject')
@@ -73,7 +73,7 @@ class UserMailer < Devise::Mailer
     @resource = user
     @instance = Rails.configuration.x.local_domain
 
-    return if @resource.disabled?
+    return unless @resource.active_for_authentication?
 
     I18n.with_locale(@resource.locale || I18n.default_locale) do
       mail to: @resource.email, subject: I18n.t('devise.mailer.two_factor_disabled.subject')
@@ -84,18 +84,64 @@ class UserMailer < Devise::Mailer
     @resource = user
     @instance = Rails.configuration.x.local_domain
 
-    return if @resource.disabled?
+    return unless @resource.active_for_authentication?
 
     I18n.with_locale(@resource.locale || I18n.default_locale) do
       mail to: @resource.email, subject: I18n.t('devise.mailer.two_factor_recovery_codes_changed.subject')
     end
   end
 
+  def webauthn_enabled(user, **)
+    @resource = user
+    @instance = Rails.configuration.x.local_domain
+
+    return unless @resource.active_for_authentication?
+
+    I18n.with_locale(@resource.locale || I18n.default_locale) do
+      mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_enabled.subject')
+    end
+  end
+
+  def webauthn_disabled(user, **)
+    @resource = user
+    @instance = Rails.configuration.x.local_domain
+
+    return unless @resource.active_for_authentication?
+
+    I18n.with_locale(@resource.locale || I18n.default_locale) do
+      mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_disabled.subject')
+    end
+  end
+
+  def webauthn_credential_added(user, webauthn_credential)
+    @resource = user
+    @instance = Rails.configuration.x.local_domain
+    @webauthn_credential = webauthn_credential
+
+    return unless @resource.active_for_authentication?
+
+    I18n.with_locale(@resource.locale || I18n.default_locale) do
+      mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_credential.added.subject')
+    end
+  end
+
+  def webauthn_credential_deleted(user, webauthn_credential)
+    @resource = user
+    @instance = Rails.configuration.x.local_domain
+    @webauthn_credential = webauthn_credential
+
+    return unless @resource.active_for_authentication?
+
+    I18n.with_locale(@resource.locale || I18n.default_locale) do
+      mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_credential.deleted.subject')
+    end
+  end
+
   def welcome(user)
     @resource = user
     @instance = Rails.configuration.x.local_domain
 
-    return if @resource.disabled?
+    return unless @resource.active_for_authentication?
 
     I18n.with_locale(@resource.locale || I18n.default_locale) do
       mail to: @resource.email, subject: I18n.t('user_mailer.welcome.subject')
@@ -107,7 +153,7 @@ class UserMailer < Devise::Mailer
     @instance = Rails.configuration.x.local_domain
     @backup   = backup
 
-    return if @resource.disabled?
+    return unless @resource.active_for_authentication?
 
     I18n.with_locale(@resource.locale || I18n.default_locale) do
       mail to: @resource.email, subject: I18n.t('user_mailer.backup_ready.subject')
@@ -135,7 +181,7 @@ class UserMailer < Devise::Mailer
     @detection  = Browser.new(user_agent)
     @timestamp  = timestamp.to_time.utc
 
-    return if @resource.disabled?
+    return unless @resource.active_for_authentication?
 
     I18n.with_locale(@resource.locale || I18n.default_locale) do
       mail to: @resource.email,
diff --git a/app/models/account.rb b/app/models/account.rb
index 6b7ebda9e67f0e18cfa742e4c83c2fbcfd9daa0a..e6cf03fa84e9cd54aee8f8165d75d26a79109775 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -50,6 +50,8 @@
 #  avatar_storage_schema_version :integer
 #  header_storage_schema_version :integer
 #  devices_url                   :string
+#  sensitized_at                 :datetime
+#  suspension_origin             :integer
 #
 
 class Account < ApplicationRecord
@@ -65,6 +67,8 @@ class Account < ApplicationRecord
   include Paginable
   include AccountCounters
   include DomainNormalizable
+  include DomainMaterializable
+  include AccountMerging
 
   TRUST_LEVELS = {
     untrusted: 0,
@@ -72,6 +76,7 @@ class Account < ApplicationRecord
   }.freeze
 
   enum protocol: [:ostatus, :activitypub]
+  enum suspension_origin: [:local, :remote], _prefix: true
 
   validates :username, presence: true
   validates_with UniqueUsernameValidator, if: -> { will_save_change_to_username? }
@@ -92,13 +97,14 @@ class Account < ApplicationRecord
   scope :partitioned, -> { order(Arel.sql('row_number() over (partition by domain)')) }
   scope :silenced, -> { where.not(silenced_at: nil) }
   scope :suspended, -> { where.not(suspended_at: nil) }
+  scope :sensitized, -> { where.not(sensitized_at: nil) }
   scope :without_suspended, -> { where(suspended_at: nil) }
   scope :without_silenced, -> { where(silenced_at: nil) }
+  scope :without_instance_actor, -> { where.not(id: -99) }
   scope :recent, -> { reorder(id: :desc) }
   scope :bots, -> { where(actor_type: %w(Application Service)) }
   scope :groups, -> { where(actor_type: 'Group') }
   scope :alphabetic, -> { order(domain: :asc, username: :asc) }
-  scope :by_domain_accounts, -> { group(:domain).select(:domain, 'COUNT(*) AS accounts_count').order('accounts_count desc') }
   scope :matches_username, ->(value) { where(arel_table[:username].matches("#{value}%")) }
   scope :matches_display_name, ->(value) { where(arel_table[:display_name].matches("#{value}%")) }
   scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
@@ -217,28 +223,45 @@ class Account < ApplicationRecord
   end
 
   def suspended?
-    suspended_at.present?
+    suspended_at.present? && !instance_actor?
   end
 
-  def suspend!(date = Time.now.utc)
+  def suspended_permanently?
+    suspended? && deletion_request.nil?
+  end
+
+  def suspended_temporarily?
+    suspended? && deletion_request.present?
+  end
+
+  def suspend!(date: Time.now.utc, origin: :local)
     transaction do
-      user&.disable! if local?
-      update!(suspended_at: date)
+      create_deletion_request!
+      update!(suspended_at: date, suspension_origin: origin)
     end
   end
 
   def unsuspend!
     transaction do
-      user&.enable! if local?
-      update!(suspended_at: nil)
+      deletion_request&.destroy!
+      update!(suspended_at: nil, suspension_origin: nil)
     end
   end
 
+  def sensitized?
+    sensitized_at.present?
+  end
+
+  def sensitize!(date = Time.now.utc)
+    update!(sensitized_at: date)
+  end
+
+  def unsensitize!
+    update!(sensitized_at: nil)
+  end
+
   def memorialize!
-    transaction do
-      user&.disable! if local?
-      update!(memorial: true)
-    end
+    update!(memorial: true)
   end
 
   def sign?
@@ -355,6 +378,12 @@ class Account < ApplicationRecord
     shared_inbox_url.presence || inbox_url
   end
 
+  def synchronization_uri_prefix
+    return 'local' if local?
+
+    @synchronization_uri_prefix ||= uri[/http(s?):\/\/[^\/]+\//]
+  end
+
   class Field < ActiveModelSerializers::Model
     attributes :name, :value, :verified_at, :account, :errors
 
@@ -410,12 +439,8 @@ class Account < ApplicationRecord
       super - %w(statuses_count following_count followers_count)
     end
 
-    def domains
-      reorder(nil).pluck(Arel.sql('distinct accounts.domain'))
-    end
-
     def inboxes
-      urls = reorder(nil).where(protocol: :activitypub).pluck(Arel.sql("distinct coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url)"))
+      urls = reorder(nil).where(protocol: :activitypub).group(:preferred_inbox_url).pluck(Arel.sql("coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url) AS preferred_inbox_url"))
       DeliveryFailureTracker.without_unavailable(urls)
     end
 
@@ -553,17 +578,6 @@ class Account < ApplicationRecord
   end
 
   def clean_feed_manager
-    reblog_key       = FeedManager.instance.key(:home, id, 'reblogs')
-    reblogged_id_set = Redis.current.zrange(reblog_key, 0, -1)
-
-    Redis.current.pipelined do
-      Redis.current.del(FeedManager.instance.key(:home, id))
-      Redis.current.del(reblog_key)
-
-      reblogged_id_set.each do |reblogged_id|
-        reblog_set_key = FeedManager.instance.key(:home, id, "reblogs:#{reblogged_id}")
-        Redis.current.del(reblog_set_key)
-      end
-    end
+    FeedManager.instance.clean_feeds!(:home, [id])
   end
 end
diff --git a/app/models/account_alias.rb b/app/models/account_alias.rb
index 792e9e8d4da7574bd2e7acdd079fe6488d9f02fb..3d659142a05548022c60f04e72591c836cdecde3 100644
--- a/app/models/account_alias.rb
+++ b/app/models/account_alias.rb
@@ -33,7 +33,7 @@ class AccountAlias < ApplicationRecord
   def set_uri
     target_account = ResolveAccountService.new.call(acct)
     self.uri       = ActivityPub::TagManager.instance.uri_for(target_account) unless target_account.nil?
-  rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error
+  rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error
     # Validation will take care of it
   end
 
diff --git a/app/models/account_conversation.rb b/app/models/account_conversation.rb
index b43816588521b479130462aaf501a3cad7773a6e..56fd13543c8cf3f153ee71777d430c1d9a4cd88d 100644
--- a/app/models/account_conversation.rb
+++ b/app/models/account_conversation.rb
@@ -36,17 +36,18 @@ class AccountConversation < ApplicationRecord
   end
 
   class << self
-    def paginate_by_id(limit, options = {})
+    def to_a_paginated_by_id(limit, options = {})
       if options[:min_id]
-        paginate_by_min_id(limit, options[:min_id]).reverse
+        paginate_by_min_id(limit, options[:min_id], options[:max_id]).reverse
       else
-        paginate_by_max_id(limit, options[:max_id], options[:since_id])
+        paginate_by_max_id(limit, options[:max_id], options[:since_id]).to_a
       end
     end
 
-    def paginate_by_min_id(limit, min_id = nil)
+    def paginate_by_min_id(limit, min_id = nil, max_id = nil)
       query = order(arel_table[:last_status_id].asc).limit(limit)
       query = query.where(arel_table[:last_status_id].gt(min_id)) if min_id.present?
+      query = query.where(arel_table[:last_status_id].lt(max_id)) if max_id.present?
       query
     end
 
diff --git a/app/models/account_deletion_request.rb b/app/models/account_deletion_request.rb
new file mode 100644
index 0000000000000000000000000000000000000000..7d0c346cc27e2806049db0fa27ce8530dd75a22d
--- /dev/null
+++ b/app/models/account_deletion_request.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: account_deletion_requests
+#
+#  id         :bigint(8)        not null, primary key
+#  account_id :bigint(8)
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+class AccountDeletionRequest < ApplicationRecord
+  DELAY_TO_DELETION = 30.days.freeze
+
+  belongs_to :account
+
+  def due_at
+    created_at + DELAY_TO_DELETION
+  end
+end
diff --git a/app/models/account_filter.rb b/app/models/account_filter.rb
index 7b6012e0fa78ec2948d3008cf5dc8accff831212..2b001385f2d8a1091c1f9686bbeb3ce03bcfb170 100644
--- a/app/models/account_filter.rb
+++ b/app/models/account_filter.rb
@@ -45,7 +45,7 @@ class AccountFilter
   def scope_for(key, value)
     case key.to_s
     when 'local'
-      Account.local
+      Account.local.without_instance_actor
     when 'remote'
       Account.remote
     when 'by_domain'
diff --git a/app/models/account_migration.rb b/app/models/account_migration.rb
index 681b5b2cd0bc9e76d1f08e2d1a8c72dd7a26d3f3..4fae98ed7260d525ed7bddabde9990b91f252d0c 100644
--- a/app/models/account_migration.rb
+++ b/app/models/account_migration.rb
@@ -54,7 +54,7 @@ class AccountMigration < ApplicationRecord
 
   def set_target_account
     self.target_account = ResolveAccountService.new.call(acct)
-  rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error
+  rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error
     # Validation will take care of it
   end
 
diff --git a/app/models/account_stat.rb b/app/models/account_stat.rb
index c84e4217c8c6b11d5a0770ff443a6de39db1afd6..e70b54d79b93df00916053708e1ba0aabd9c790c 100644
--- a/app/models/account_stat.rb
+++ b/app/models/account_stat.rb
@@ -21,26 +21,26 @@ class AccountStat < ApplicationRecord
 
   def increment_count!(key)
     update(attributes_for_increment(key))
-  rescue ActiveRecord::StaleObjectError
+  rescue ActiveRecord::StaleObjectError, ActiveRecord::RecordNotUnique
     begin
       reload_with_id
     rescue ActiveRecord::RecordNotFound
-      # Nothing to do
-    else
-      retry
+      return
     end
+
+    retry
   end
 
   def decrement_count!(key)
-    update(key => [public_send(key) - 1, 0].max)
-  rescue ActiveRecord::StaleObjectError
+    update(attributes_for_decrement(key))
+  rescue ActiveRecord::StaleObjectError, ActiveRecord::RecordNotUnique
     begin
       reload_with_id
     rescue ActiveRecord::RecordNotFound
-      # Nothing to do
-    else
-      retry
+      return
     end
+
+    retry
   end
 
   private
@@ -51,8 +51,13 @@ class AccountStat < ApplicationRecord
     attrs
   end
 
+  def attributes_for_decrement(key)
+    attrs = { key => [public_send(key) - 1, 0].max }
+    attrs
+  end
+
   def reload_with_id
-    self.id = find_by!(account: account).id if new_record?
+    self.id = self.class.find_by!(account: account).id if new_record?
     reload
   end
 end
diff --git a/app/models/account_warning.rb b/app/models/account_warning.rb
index 157e6c04d1eb39d41872f3c07f1054179c6d66af..5efc924d5f7ae36a7fb038ff4c2fbfe06a157416 100644
--- a/app/models/account_warning.rb
+++ b/app/models/account_warning.rb
@@ -13,7 +13,7 @@
 #
 
 class AccountWarning < ApplicationRecord
-  enum action: %i(none disable silence suspend), _suffix: :action
+  enum action: %i(none disable sensitive silence suspend), _suffix: :action
 
   belongs_to :account, inverse_of: :account_warnings
   belongs_to :target_account, class_name: 'Account', inverse_of: :targeted_account_warnings
diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb
index b30a823699e3df2573e9b4e2f4993dfaa588c574..bf222391f7e9c114bab81a36676d95421001cd21 100644
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@@ -8,6 +8,7 @@ class Admin::AccountAction
   TYPES = %w(
     none
     disable
+    sensitive
     silence
     suspend
   ).freeze
@@ -64,6 +65,8 @@ class Admin::AccountAction
     case type
     when 'disable'
       handle_disable!
+    when 'sensitive'
+      handle_sensitive!
     when 'silence'
       handle_silence!
     when 'suspend'
@@ -109,6 +112,12 @@ class Admin::AccountAction
     target_account.user&.disable!
   end
 
+  def handle_sensitive!
+    authorize(target_account, :sensitive?)
+    log_action(:sensitive, target_account)
+    target_account.sensitize!
+  end
+
   def handle_silence!
     authorize(target_account, :silence?)
     log_action(:silence, target_account)
@@ -118,7 +127,7 @@ class Admin::AccountAction
   def handle_suspend!
     authorize(target_account, :suspend?)
     log_action(:suspend, target_account)
-    target_account.suspend!
+    target_account.suspend!(origin: :local)
   end
 
   def text_for_warning
@@ -134,7 +143,7 @@ class Admin::AccountAction
   end
 
   def process_email!
-    UserMailer.warning(target_account.user, warning, status_ids).deliver_now! if warnable?
+    UserMailer.warning(target_account.user, warning, status_ids).deliver_later! if warnable?
   end
 
   def warnable?
@@ -142,7 +151,7 @@ class Admin::AccountAction
   end
 
   def status_ids
-    @report.status_ids if @report && include_statuses
+    report.status_ids if report && include_statuses
   end
 
   def reports
diff --git a/app/models/admin/action_log_filter.rb b/app/models/admin/action_log_filter.rb
index 0ba7e1609449eb9ccf433a4775120e24fb61eb88..3a1b67e06752c7c5f1235673fb04c7972a6e04a5 100644
--- a/app/models/admin/action_log_filter.rb
+++ b/app/models/admin/action_log_filter.rb
@@ -35,9 +35,11 @@ class Admin::ActionLogFilter
     reopen_report: { target_type: 'Report', action: 'reopen' }.freeze,
     reset_password_user: { target_type: 'User', action: 'reset_password' }.freeze,
     resolve_report: { target_type: 'Report', action: 'resolve' }.freeze,
+    sensitive_account: { target_type: 'Account', action: 'sensitive' }.freeze,
     silence_account: { target_type: 'Account', action: 'silence' }.freeze,
     suspend_account: { target_type: 'Account', action: 'suspend' }.freeze,
     unassigned_report: { target_type: 'Report', action: 'unassigned' }.freeze,
+    unsensitive_account: { target_type: 'Account', action: 'unsensitive' }.freeze,
     unsilence_account: { target_type: 'Account', action: 'unsilence' }.freeze,
     unsuspend_account: { target_type: 'Account', action: 'unsuspend' }.freeze,
     update_announcement: { target_type: 'Announcement', action: 'update' }.freeze,
diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index c493604c22bbd32a38da5fcdd013168ace681a15..f8183aabce47673597f992a1ed53e5489fe686cf 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -22,6 +22,7 @@ class Announcement < ApplicationRecord
   scope :published, -> { where(published: true) }
   scope :without_muted, ->(account) { joins("LEFT OUTER JOIN announcement_mutes ON announcement_mutes.announcement_id = announcements.id AND announcement_mutes.account_id = #{account.id}").where('announcement_mutes.id IS NULL') }
   scope :chronological, -> { order(Arel.sql('COALESCE(announcements.starts_at, announcements.scheduled_at, announcements.published_at, announcements.created_at) ASC')) }
+  scope :reverse_chronological, -> { order(Arel.sql('COALESCE(announcements.starts_at, announcements.scheduled_at, announcements.published_at, announcements.created_at) DESC')) }
 
   has_many :announcement_mutes, dependent: :destroy
   has_many :announcement_reactions, dependent: :destroy
diff --git a/app/models/concerns/account_associations.rb b/app/models/concerns/account_associations.rb
index d5144d4b8ea27a1e253c58ad3abbebae529132a4..b5f12c9a56556d32a4ad4ab779e3c32ed3011baa 100644
--- a/app/models/concerns/account_associations.rb
+++ b/app/models/concerns/account_associations.rb
@@ -63,5 +63,8 @@ module AccountAssociations
     # Hashtags
     has_and_belongs_to_many :tags
     has_many :featured_tags, -> { includes(:tag) }, dependent: :destroy, inverse_of: :account
+
+    # Account deletion requests
+    has_one :deletion_request, class_name: 'AccountDeletionRequest', inverse_of: :account, dependent: :destroy
   end
 end
diff --git a/app/models/concerns/account_interactions.rb b/app/models/concerns/account_interactions.rb
index be7211f2cad29aee750a7f27ca309d9f786b296e..974f57820d08332436492d5b0b3bc2cb65fdfa35 100644
--- a/app/models/concerns/account_interactions.rb
+++ b/app/models/concerns/account_interactions.rb
@@ -8,6 +8,7 @@ module AccountInteractions
       Follow.where(target_account_id: target_account_ids, account_id: account_id).each_with_object({}) do |follow, mapping|
         mapping[follow.target_account_id] = {
           reblogs: follow.show_reblogs?,
+          notify: follow.notify?,
         }
       end
     end
@@ -36,6 +37,7 @@ module AccountInteractions
       FollowRequest.where(target_account_id: target_account_ids, account_id: account_id).each_with_object({}) do |follow_request, mapping|
         mapping[follow_request.target_account_id] = {
           reblogs: follow_request.show_reblogs?,
+          notify: follow_request.notify?,
         }
       end
     end
@@ -95,25 +97,29 @@ module AccountInteractions
     has_many :announcement_mutes, dependent: :destroy
   end
 
-  def follow!(other_account, reblogs: nil, uri: nil, rate_limit: false)
-    reblogs = true if reblogs.nil?
-
-    rel = active_relationships.create_with(show_reblogs: reblogs, uri: uri, rate_limit: rate_limit)
+  def follow!(other_account, reblogs: nil, notify: nil, uri: nil, rate_limit: false, bypass_limit: false)
+    rel = active_relationships.create_with(show_reblogs: reblogs.nil? ? true : reblogs, notify: notify.nil? ? false : notify, uri: uri, rate_limit: rate_limit, bypass_follow_limit: bypass_limit)
                               .find_or_create_by!(target_account: other_account)
 
-    rel.update!(show_reblogs: reblogs)
+    rel.show_reblogs = reblogs unless reblogs.nil?
+    rel.notify       = notify  unless notify.nil?
+
+    rel.save! if rel.changed?
+
     remove_potential_friendship(other_account)
 
     rel
   end
 
-  def request_follow!(other_account, reblogs: nil, uri: nil, rate_limit: false)
-    reblogs = true if reblogs.nil?
-
-    rel = follow_requests.create_with(show_reblogs: reblogs, uri: uri, rate_limit: rate_limit)
+  def request_follow!(other_account, reblogs: nil, notify: nil, uri: nil, rate_limit: false, bypass_limit: false)
+    rel = follow_requests.create_with(show_reblogs: reblogs.nil? ? true : reblogs, notify: notify.nil? ? false : notify, uri: uri, rate_limit: rate_limit, bypass_follow_limit: bypass_limit)
                          .find_or_create_by!(target_account: other_account)
 
-    rel.update!(show_reblogs: reblogs)
+    rel.show_reblogs = reblogs unless reblogs.nil?
+    rel.notify       = notify  unless notify.nil?
+
+    rel.save! if rel.changed?
+
     remove_potential_friendship(other_account)
 
     rel
@@ -125,9 +131,12 @@ module AccountInteractions
                        .find_or_create_by!(target_account: other_account)
   end
 
-  def mute!(other_account, notifications: nil)
+  def mute!(other_account, notifications: nil, duration: 0)
     notifications = true if notifications.nil?
-    mute = mute_relationships.create_with(hide_notifications: notifications).find_or_create_by!(target_account: other_account)
+    mute = mute_relationships.create_with(hide_notifications: notifications).find_or_initialize_by(target_account: other_account)
+    mute.expires_in = duration.zero? ? nil : duration
+    mute.save!
+
     remove_potential_friendship(other_account)
 
     # When toggling a mute between hiding and allowing notifications, the mute will already exist, so the find_or_create_by! call will return the existing Mute without updating the hide_notifications attribute. Therefore, we check that hide_notifications? is what we want and set it if it isn't.
@@ -234,6 +243,26 @@ module AccountInteractions
          .where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago)
   end
 
+  def remote_followers_hash(url_prefix)
+    Rails.cache.fetch("followers_hash:#{id}:#{url_prefix}") do
+      digest = "\x00" * 32
+      followers.where(Account.arel_table[:uri].matches(url_prefix + '%', false, true)).pluck_each(:uri) do |uri|
+        Xorcist.xor!(digest, Digest::SHA256.digest(uri))
+      end
+      digest.unpack('H*')[0]
+    end
+  end
+
+  def local_followers_hash
+    Rails.cache.fetch("followers_hash:#{id}:local") do
+      digest = "\x00" * 32
+      followers.where(domain: nil).pluck_each(:username) do |username|
+        Xorcist.xor!(digest, Digest::SHA256.digest(ActivityPub::TagManager.instance.uri_for_username(username)))
+      end
+      digest.unpack('H*')[0]
+    end
+  end
+
   private
 
   def remove_potential_friendship(other_account, mutual = false)
diff --git a/app/models/concerns/account_merging.rb b/app/models/concerns/account_merging.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c3b7018f2c3db57aa04a14d96070465d8ece227a
--- /dev/null
+++ b/app/models/concerns/account_merging.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module AccountMerging
+  extend ActiveSupport::Concern
+
+  def merge_with!(other_account)
+    # Since it's the same remote resource, the remote resource likely
+    # already believes we are following/blocking, so it's safe to
+    # re-attribute the relationships too. However, during the presence
+    # of the index bug users could have *also* followed the reference
+    # account already, therefore mass update will not work and we need
+    # to check for (and skip past) uniqueness errors
+
+    owned_classes = [
+      Status, StatusPin, MediaAttachment, Poll, Report, Tombstone, Favourite,
+      Follow, FollowRequest, Block, Mute, AccountIdentityProof,
+      AccountModerationNote, AccountPin, AccountStat, ListAccount,
+      PollVote, Mention, AccountDeletionRequest, AccountNote
+    ]
+
+    owned_classes.each do |klass|
+      klass.where(account_id: other_account.id).find_each do |record|
+        begin
+          record.update_attribute(:account_id, id)
+        rescue ActiveRecord::RecordNotUnique
+          next
+        end
+      end
+    end
+
+    target_classes = [
+      Follow, FollowRequest, Block, Mute, AccountModerationNote, AccountPin,
+      AccountNote
+    ]
+
+    target_classes.each do |klass|
+      klass.where(target_account_id: other_account.id).find_each do |record|
+        begin
+          record.update_attribute(:target_account_id, id)
+        rescue ActiveRecord::RecordNotUnique
+          next
+        end
+      end
+    end
+
+    # Some follow relationships have moved, so the cache is stale
+    Rails.cache.delete_matched("followers_hash:#{id}:*")
+    Rails.cache.delete_matched("relationships:#{id}:*")
+    Rails.cache.delete_matched("relationships:*:#{id}")
+  end
+end
diff --git a/app/models/concerns/domain_materializable.rb b/app/models/concerns/domain_materializable.rb
new file mode 100644
index 0000000000000000000000000000000000000000..88337f8c00094c9c504d4929224819f2cae739a9
--- /dev/null
+++ b/app/models/concerns/domain_materializable.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module DomainMaterializable
+  extend ActiveSupport::Concern
+
+  included do
+    after_create_commit :refresh_instances_view
+  end
+
+  def refresh_instances_view
+    Instance.refresh unless domain.nil? || Instance.where(domain: domain).exists?
+  end
+end
diff --git a/app/models/concerns/expireable.rb b/app/models/concerns/expireable.rb
index f7d2bab498a19571cf375be43355f93c8de98edf..a66a4661b1cca3a8fcf64211f13a81cfd018bb3c 100644
--- a/app/models/concerns/expireable.rb
+++ b/app/models/concerns/expireable.rb
@@ -6,7 +6,15 @@ module Expireable
   included do
     scope :expired, -> { where.not(expires_at: nil).where('expires_at < ?', Time.now.utc) }
 
-    attr_reader :expires_in
+    def expires_in
+      return @expires_in if defined?(@expires_in)
+
+      if expires_at.nil?
+        nil
+      else
+        (expires_at - created_at).to_i
+      end
+    end
 
     def expires_in=(interval)
       self.expires_at = interval.to_i.seconds.from_now if interval.present?
diff --git a/app/models/concerns/follow_limitable.rb b/app/models/concerns/follow_limitable.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c64060d6e56b46c63bf11d547d87c73e00f8ca72
--- /dev/null
+++ b/app/models/concerns/follow_limitable.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module FollowLimitable
+  extend ActiveSupport::Concern
+
+  included do
+    validates_with FollowLimitValidator, on: :create, unless: :bypass_follow_limit?
+  end
+
+  def bypass_follow_limit=(value)
+    @bypass_follow_limit = value
+  end
+
+  def bypass_follow_limit?
+    @bypass_follow_limit
+  end
+end
diff --git a/app/models/concerns/paginable.rb b/app/models/concerns/paginable.rb
index 8863094f7d467be0ac73ae1279648d9f24b4347d..62e39f6714ab860f467055fbe7e2975c86b89afe 100644
--- a/app/models/concerns/paginable.rb
+++ b/app/models/concerns/paginable.rb
@@ -14,18 +14,19 @@ module Paginable
     # Differs from :paginate_by_max_id in that it gives the results immediately following min_id,
     # whereas since_id gives the items with largest id, but with since_id as a cutoff.
     # Results will be in ascending order by id.
-    scope :paginate_by_min_id, ->(limit, min_id = nil) {
+    scope :paginate_by_min_id, ->(limit, min_id = nil, max_id = nil) {
       query = reorder(arel_table[:id]).limit(limit)
       query = query.where(arel_table[:id].gt(min_id)) if min_id.present?
+      query = query.where(arel_table[:id].lt(max_id)) if max_id.present?
       query
     }
 
-    scope :paginate_by_id, ->(limit, options = {}) {
+    def self.to_a_paginated_by_id(limit, options = {})
       if options[:min_id].present?
-        paginate_by_min_id(limit, options[:min_id]).reverse
+        paginate_by_min_id(limit, options[:min_id], options[:max_id]).reverse
       else
-        paginate_by_max_id(limit, options[:max_id], options[:since_id])
+        paginate_by_max_id(limit, options[:max_id], options[:since_id]).to_a
       end
-    }
+    end
   end
 end
diff --git a/app/models/concerns/remotable.rb b/app/models/concerns/remotable.rb
index c6d0c7f1f440a8f1a42564ea885f076709dde38f..56b9c0164221f1ddb3e37e3c229684c1f68e8a68 100644
--- a/app/models/concerns/remotable.rb
+++ b/app/models/concerns/remotable.rb
@@ -29,7 +29,7 @@ module Remotable
         rescue Mastodon::UnexpectedResponseError, HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError => e
           Rails.logger.debug "Error fetching remote #{attachment_name}: #{e}"
           raise e unless suppress_errors
-        rescue Paperclip::Errors::NotIdentifiedByImageMagickError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError, Paperclip::Error, Mastodon::DimensionsValidationError => e
+        rescue Paperclip::Errors::NotIdentifiedByImageMagickError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError, Paperclip::Error, Mastodon::DimensionsValidationError, Mastodon::StreamValidationError => e
           Rails.logger.debug "Error fetching remote #{attachment_name}: #{e}"
         end
 
diff --git a/app/models/domain_allow.rb b/app/models/domain_allow.rb
index 5fe0e3a29c340d8a2da1dfdbdea1e32577b0880f..4b0a89c184cff14804f9d7f53ccad48daae121a6 100644
--- a/app/models/domain_allow.rb
+++ b/app/models/domain_allow.rb
@@ -12,6 +12,7 @@
 
 class DomainAllow < ApplicationRecord
   include DomainNormalizable
+  include DomainMaterializable
 
   validates :domain, presence: true, uniqueness: true, domain: true
 
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb
index 2b18e01fadd9ca4df1b53cce99bb193064dca8c1..bba04c60395ed1ec597ef89d76a59013ab833e23 100644
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@@ -12,10 +12,12 @@
 #  reject_reports  :boolean          default(FALSE), not null
 #  private_comment :text
 #  public_comment  :text
+#  obfuscate       :boolean          default(FALSE), not null
 #
 
 class DomainBlock < ApplicationRecord
   include DomainNormalizable
+  include DomainMaterializable
 
   enum severity: [:silence, :suspend, :noop]
 
@@ -72,4 +74,23 @@ class DomainBlock < ApplicationRecord
     scope = suspend? ? accounts.where(suspended_at: created_at) : accounts.where(silenced_at: created_at)
     scope.count
   end
+
+  def public_domain
+    return domain unless obfuscate?
+
+    length        = domain.size
+    visible_ratio = length / 4
+
+    domain.chars.map.with_index do |chr, i|
+      if i > visible_ratio && i < length - visible_ratio && chr != '.'
+        '*'
+      else
+        chr
+      end
+    end.join
+  end
+
+  def domain_digest
+    Digest::SHA256.hexdigest(domain)
+  end
 end
diff --git a/app/models/export.rb b/app/models/export.rb
index cab01f11ad004c7e3e76b72dc3769eb25ce994bd..5216eed5ea7613dec39a1e46095b82c542a29def 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -9,6 +9,14 @@ class Export
     @account = account
   end
 
+  def to_bookmarks_csv
+    CSV.generate do |csv|
+      account.bookmarks.includes(:status).reorder(id: :desc).each do |bookmark|
+        csv << [ActivityPub::TagManager.instance.uri_for(bookmark.status)]
+      end
+    end
+  end
+
   def to_blocked_accounts_csv
     to_csv account.blocking.select(:username, :domain)
   end
@@ -55,6 +63,10 @@ class Export
     account.statuses_count
   end
 
+  def total_bookmarks
+    account.bookmarks.count
+  end
+
   def total_follows
     account.following_count
   end
diff --git a/app/models/favourite.rb b/app/models/favourite.rb
index bf0ec4449c4615c6aee68c89b5c890bd18831330..35028b7dd339d7fa561bcee8fba7b1feaf774b60 100644
--- a/app/models/favourite.rb
+++ b/app/models/favourite.rb
@@ -36,7 +36,7 @@ class Favourite < ApplicationRecord
   end
 
   def decrement_cache_counters
-    return if association(:status).loaded? && (status.marked_for_destruction? || status.marked_for_mass_destruction?)
+    return if association(:status).loaded? && status.marked_for_destruction?
     status&.decrement_count!(:favourites_count)
   end
 end
diff --git a/app/models/feed.rb b/app/models/feed.rb
index 36e0c1e0a09b94375a4ba3d2178c5dd00b7df0e0..f51dcfab1dad66affbea0199b22aa7033db33d8e 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -20,12 +20,12 @@ class Feed
   protected
 
   def from_redis(limit, max_id, since_id, min_id)
+    max_id = '+inf' if max_id.blank?
     if min_id.blank?
-      max_id     = '+inf' if max_id.blank?
       since_id   = '-inf' if since_id.blank?
       unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", "(#{since_id}", limit: [0, limit], with_scores: true).map(&:first).map(&:to_i)
     else
-      unhydrated = redis.zrangebyscore(key, "(#{min_id}", '+inf', limit: [0, limit], with_scores: true).map(&:first).map(&:to_i)
+      unhydrated = redis.zrangebyscore(key, "(#{min_id}", "(#{max_id}", limit: [0, limit], with_scores: true).map(&:first).map(&:to_i)
     end
 
     Status.where(id: unhydrated).cache_ids
diff --git a/app/models/follow.rb b/app/models/follow.rb
index f3e48a2ed7e73f3239eaac68e35af4286a973487..a5e3fe8099516c717b184316a3d455b4650a8782 100644
--- a/app/models/follow.rb
+++ b/app/models/follow.rb
@@ -10,12 +10,14 @@
 #  target_account_id :bigint(8)        not null
 #  show_reblogs      :boolean          default(TRUE), not null
 #  uri               :string
+#  notify            :boolean          default(FALSE), not null
 #
 
 class Follow < ApplicationRecord
   include Paginable
   include RelationshipCacheable
   include RateLimitable
+  include FollowLimitable
 
   rate_limit by: :account, family: :follows
 
@@ -25,7 +27,6 @@ class Follow < ApplicationRecord
   has_one :notification, as: :activity, dependent: :destroy
 
   validates :account_id, uniqueness: { scope: :target_account_id }
-  validates_with FollowLimitValidator, on: :create
 
   scope :recent, -> { reorder(id: :desc) }
 
@@ -34,14 +35,16 @@ class Follow < ApplicationRecord
   end
 
   def revoke_request!
-    FollowRequest.create!(account: account, target_account: target_account, show_reblogs: show_reblogs, uri: uri)
+    FollowRequest.create!(account: account, target_account: target_account, show_reblogs: show_reblogs, notify: notify, uri: uri)
     destroy!
   end
 
   before_validation :set_uri, only: :create
   after_create :increment_cache_counters
+  after_create :invalidate_hash_cache
   after_destroy :remove_endorsements
   after_destroy :decrement_cache_counters
+  after_destroy :invalidate_hash_cache
 
   private
 
@@ -62,4 +65,10 @@ class Follow < ApplicationRecord
     account&.decrement_count!(:following_count)
     target_account&.decrement_count!(:followers_count)
   end
+
+  def invalidate_hash_cache
+    return if account.local? && target_account.local?
+
+    Rails.cache.delete("followers_hash:#{target_account_id}:#{account.synchronization_uri_prefix}")
+  end
 end
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index 3325e264cce33f0cd9a1f7ce30f63169a176ea26..59fefcdf64e402cb87671676421fb56beabd41bd 100644
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -10,12 +10,14 @@
 #  target_account_id :bigint(8)        not null
 #  show_reblogs      :boolean          default(TRUE), not null
 #  uri               :string
+#  notify            :boolean          default(FALSE), not null
 #
 
 class FollowRequest < ApplicationRecord
   include Paginable
   include RelationshipCacheable
   include RateLimitable
+  include FollowLimitable
 
   rate_limit by: :account, family: :follows
 
@@ -25,10 +27,9 @@ class FollowRequest < ApplicationRecord
   has_one :notification, as: :activity, dependent: :destroy
 
   validates :account_id, uniqueness: { scope: :target_account_id }
-  validates_with FollowLimitValidator, on: :create
 
   def authorize!
-    account.follow!(target_account, reblogs: show_reblogs, uri: uri)
+    account.follow!(target_account, reblogs: show_reblogs, notify: notify, uri: uri)
     MergeWorker.perform_async(target_account.id, account.id) if account.local?
     destroy!
   end
diff --git a/app/models/form/account_batch.rb b/app/models/form/account_batch.rb
index 0b285fde92caa40d895f558d6aa9a0ff9bd116b6..26d6d3abfc00a932dd1d18f04f7a2c09053d1cc1 100644
--- a/app/models/form/account_batch.rb
+++ b/app/models/form/account_batch.rb
@@ -9,6 +9,8 @@ class Form::AccountBatch
 
   def save
     case action
+    when 'follow'
+      follow!
     when 'unfollow'
       unfollow!
     when 'remove_from_followers'
@@ -24,6 +26,12 @@ class Form::AccountBatch
 
   private
 
+  def follow!
+    accounts.find_each do |target_account|
+      FollowService.new.call(current_account, target_account)
+    end
+  end
+
   def unfollow!
     accounts.find_each do |target_account|
       UnfollowService.new.call(current_account, target_account)
@@ -43,7 +51,7 @@ class Form::AccountBatch
   end
 
   def account_domains
-    accounts.pluck(Arel.sql('distinct domain')).compact
+    accounts.group(:domain).pluck(:domain).compact
   end
 
   def accounts
@@ -69,6 +77,6 @@ class Form::AccountBatch
     records = accounts.includes(:user)
 
     records.each { |account| authorize(account.user, :reject?) }
-           .each { |account| SuspendAccountService.new.call(account, reserve_email: false, reserve_username: false) }
+           .each { |account| DeleteAccountService.new.call(account, reserve_email: false, reserve_username: false) }
   end
 end
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb
index 390836f287fae9b79f6f3ae013430d725fc1be5c..e9f78da2123ba4833b1047e625d6a5413179fe8d 100644
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@ -35,6 +35,7 @@ class Form::AdminSettings
     show_domain_blocks
     show_domain_blocks_rationale
     noindex
+    require_invite_text
   ).freeze
 
   BOOLEAN_KEYS = %i(
@@ -51,6 +52,7 @@ class Form::AdminSettings
     trends
     trendable_by_default
     noindex
+    require_invite_text
   ).freeze
 
   UPLOAD_KEYS = %i(
diff --git a/app/models/form/custom_emoji_batch.rb b/app/models/form/custom_emoji_batch.rb
index 6b7ea5355dd1dcbd6c14fc0f77a7e02761a1acca..f4fa84c102cacd4f994c2e02f10d0e4f5e4881ce 100644
--- a/app/models/form/custom_emoji_batch.rb
+++ b/app/models/form/custom_emoji_batch.rb
@@ -30,7 +30,7 @@ class Form::CustomEmojiBatch
   private
 
   def custom_emojis
-    CustomEmoji.where(id: custom_emoji_ids)
+    @custom_emojis ||= CustomEmoji.where(id: custom_emoji_ids)
   end
 
   def update!
diff --git a/app/models/form/ip_block_batch.rb b/app/models/form/ip_block_batch.rb
new file mode 100644
index 0000000000000000000000000000000000000000..f6fe9b59357779c59c3f0db4d91acb3e22d024db
--- /dev/null
+++ b/app/models/form/ip_block_batch.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class Form::IpBlockBatch
+  include ActiveModel::Model
+  include Authorization
+  include AccountableConcern
+
+  attr_accessor :ip_block_ids, :action, :current_account
+
+  def save
+    case action
+    when 'delete'
+      delete!
+    end
+  end
+
+  private
+
+  def ip_blocks
+    @ip_blocks ||= IpBlock.where(id: ip_block_ids)
+  end
+
+  def delete!
+    ip_blocks.each { |ip_block| authorize(ip_block, :destroy?) }
+
+    ip_blocks.each do |ip_block|
+      ip_block.destroy
+      log_action :destroy, ip_block
+    end
+  end
+end
diff --git a/app/models/form/redirect.rb b/app/models/form/redirect.rb
index a7961f8e8aa00e7b311a3742644e3f79c89ebf61..19ee9faedd046bb420e66a93d123064cf30e8abb 100644
--- a/app/models/form/redirect.rb
+++ b/app/models/form/redirect.rb
@@ -32,7 +32,7 @@ class Form::Redirect
 
   def set_target_account
     @target_account = ResolveAccountService.new.call(acct)
-  rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error
+  rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error
     # Validation will take care of it
   end
 
diff --git a/app/models/import.rb b/app/models/import.rb
index c78a04d07349215dae3155c4419f5fdf48ad6684..00a54892ef2d4314e4f766ec1703d0431217d5c4 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -24,9 +24,10 @@ class Import < ApplicationRecord
 
   belongs_to :account
 
-  enum type: [:following, :blocking, :muting, :domain_blocking]
+  enum type: [:following, :blocking, :muting, :domain_blocking, :bookmarks]
 
   validates :type, presence: true
+  validates_with ImportValidator, on: :create
 
   has_attached_file :data
   validates_attachment_content_type :data, content_type: FILE_TYPES
diff --git a/app/models/instance.rb b/app/models/instance.rb
index 3c740f8a2bc7dc50554db94fe082a12439fcc2bf..29be036626e75dee42fa32118a1394029ac6cb13 100644
--- a/app/models/instance.rb
+++ b/app/models/instance.rb
@@ -1,26 +1,63 @@
 # frozen_string_literal: true
+# == Schema Information
+#
+# Table name: instances
+#
+#  domain         :string           primary key
+#  accounts_count :bigint(8)
+#
 
-class Instance
-  include ActiveModel::Model
+class Instance < ApplicationRecord
+  self.primary_key = :domain
 
-  attr_accessor :domain, :accounts_count, :domain_block
+  has_many :accounts, foreign_key: :domain, primary_key: :domain
 
-  def initialize(resource)
-    @domain         = resource.domain
-    @accounts_count = resource.respond_to?(:accounts_count) ? resource.accounts_count : nil
-    @domain_block   = resource.is_a?(DomainBlock) ? resource : DomainBlock.rule_for(domain)
-    @domain_allow   = resource.is_a?(DomainAllow) ? resource : DomainAllow.rule_for(domain)
+  belongs_to :domain_block, foreign_key: :domain, primary_key: :domain
+  belongs_to :domain_allow, foreign_key: :domain, primary_key: :domain
+
+  scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
+
+  def self.refresh
+    Scenic.database.refresh_materialized_view(table_name, concurrently: true, cascade: false)
   end
 
-  def countable?
-    @accounts_count.present?
+  def readonly?
+    true
   end
 
-  def to_param
-    domain
+  def delivery_failure_tracker
+    @delivery_failure_tracker ||= DeliveryFailureTracker.new(domain)
+  end
+
+  def following_count
+    @following_count ||= Follow.where(account: accounts).count
+  end
+
+  def followers_count
+    @followers_count ||= Follow.where(target_account: accounts).count
+  end
+
+  def reports_count
+    @reports_count ||= Report.where(target_account: accounts).count
   end
 
-  def cache_key
+  def blocks_count
+    @blocks_count ||= Block.where(target_account: accounts).count
+  end
+
+  def public_comment
+    domain_block&.public_comment
+  end
+
+  def private_comment
+    domain_block&.private_comment
+  end
+
+  def media_storage
+    @media_storage ||= MediaAttachment.where(account: accounts).sum(:file_file_size)
+  end
+
+  def to_param
     domain
   end
 end
diff --git a/app/models/instance_filter.rb b/app/models/instance_filter.rb
index 9c467bc276c55d97aa7c3c27606fdefa49e9dc77..0598d8fead628dd9687b48af9ba975bdd1dea067 100644
--- a/app/models/instance_filter.rb
+++ b/app/models/instance_filter.rb
@@ -13,18 +13,27 @@ class InstanceFilter
   end
 
   def results
-    if params[:limited].present?
-      scope = DomainBlock
-      scope = scope.matches_domain(params[:by_domain]) if params[:by_domain].present?
-      scope.order(id: :desc)
-    elsif params[:allowed].present?
-      scope = DomainAllow
-      scope = scope.matches_domain(params[:by_domain]) if params[:by_domain].present?
-      scope.order(id: :desc)
+    scope = Instance.includes(:domain_block, :domain_allow).order(accounts_count: :desc)
+
+    params.each do |key, value|
+      scope.merge!(scope_for(key, value.to_s.strip)) if value.present?
+    end
+
+    scope
+  end
+
+  private
+
+  def scope_for(key, value)
+    case key.to_s
+    when 'limited'
+      Instance.joins(:domain_block).reorder(Arel.sql('domain_blocks.id desc'))
+    when 'allowed'
+      Instance.joins(:domain_allow).reorder(Arel.sql('domain_allows.id desc'))
+    when 'by_domain'
+      Instance.matches_domain(value)
     else
-      scope = Account.remote
-      scope = scope.matches_domain(params[:by_domain]) if params[:by_domain].present?
-      scope.by_domain_accounts
+      raise "Unknown filter: #{key}"
     end
   end
 end
diff --git a/app/models/invite.rb b/app/models/invite.rb
index 29d25eae801c3ea576bf45cffbd05d92024424f5..7ea4e2f9841b0d8042db34d5eee3c1f9b5f981f5 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -28,7 +28,7 @@ class Invite < ApplicationRecord
   before_validation :set_code
 
   def valid_for_use?
-    (max_uses.nil? || uses < max_uses) && !expired? && !(user.nil? || user.disabled?)
+    (max_uses.nil? || uses < max_uses) && !expired? && user&.functional?
   end
 
   private
diff --git a/app/models/ip_block.rb b/app/models/ip_block.rb
new file mode 100644
index 0000000000000000000000000000000000000000..aedd3ca0d4d91e6173a8ef3fd9402ddee676d1a4
--- /dev/null
+++ b/app/models/ip_block.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: ip_blocks
+#
+#  id         :bigint(8)        not null, primary key
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#  expires_at :datetime
+#  ip         :inet             default(#<IPAddr: IPv4:0.0.0.0/255.255.255.255>), not null
+#  severity   :integer          default(NULL), not null
+#  comment    :text             default(""), not null
+#
+
+class IpBlock < ApplicationRecord
+  CACHE_KEY = 'blocked_ips'
+
+  include Expireable
+
+  enum severity: {
+    sign_up_requires_approval: 5000,
+    no_access: 9999,
+  }
+
+  validates :ip, :severity, presence: true
+
+  after_commit :reset_cache
+
+  class << self
+    def blocked?(remote_ip)
+      blocked_ips_map = Rails.cache.fetch(CACHE_KEY) { FastIpMap.new(IpBlock.where(severity: :no_access).pluck(:ip)) }
+      blocked_ips_map.include?(remote_ip)
+    end
+  end
+
+  private
+
+  def reset_cache
+    Rails.cache.delete(CACHE_KEY)
+  end
+end
diff --git a/app/models/list.rb b/app/models/list.rb
index c9c94fca1dc40e681f3ca3f45282dc23a87a3ae2..cdc6ebdb37a8f256e2b9bda598a8d704d6b47b9d 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -3,11 +3,12 @@
 #
 # Table name: lists
 #
-#  id         :bigint(8)        not null, primary key
-#  account_id :bigint(8)        not null
-#  title      :string           default(""), not null
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  id             :bigint(8)        not null, primary key
+#  account_id     :bigint(8)        not null
+#  title          :string           default(""), not null
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
+#  replies_policy :integer          default("list"), not null
 #
 
 class List < ApplicationRecord
@@ -15,6 +16,8 @@ class List < ApplicationRecord
 
   PER_ACCOUNT_LIMIT = 50
 
+  enum replies_policy: [:list, :followed, :none], _prefix: :show
+
   belongs_to :account, optional: true
 
   has_many :list_accounts, inverse_of: :list, dependent: :destroy
@@ -31,17 +34,6 @@ class List < ApplicationRecord
   private
 
   def clean_feed_manager
-    reblog_key       = FeedManager.instance.key(:list, id, 'reblogs')
-    reblogged_id_set = Redis.current.zrange(reblog_key, 0, -1)
-
-    Redis.current.pipelined do
-      Redis.current.del(FeedManager.instance.key(:list, id))
-      Redis.current.del(reblog_key)
-
-      reblogged_id_set.each do |reblogged_id|
-        reblog_set_key = FeedManager.instance.key(:list, id, "reblogs:#{reblogged_id}")
-        Redis.current.del(reblog_set_key)
-      end
-    end
+    FeedManager.instance.clean_feeds!(:list, [id])
   end
 end
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 3f2e0ceb1b85a90d164f15ee9cc673753bf46045..663bb0896d4135c95d6e828da5e11fc5c53e918f 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -336,8 +336,9 @@ class MediaAttachment < ApplicationRecord
 
     return unless movie.valid?
 
+    raise Mastodon::StreamValidationError, 'Video has no video stream' if movie.width.nil? || movie.frame_rate.nil?
     raise Mastodon::DimensionsValidationError, "#{movie.width}x#{movie.height} videos are not supported" if movie.width * movie.height > MAX_VIDEO_MATRIX_LIMIT
-    raise Mastodon::DimensionsValidationError, "#{movie.frame_rate.to_i}fps videos are not supported" if movie.frame_rate > MAX_VIDEO_FRAME_RATE
+    raise Mastodon::DimensionsValidationError, "#{movie.frame_rate.floor}fps videos are not supported" if movie.frame_rate.floor > MAX_VIDEO_FRAME_RATE
   end
 
   def set_meta
diff --git a/app/models/mute.rb b/app/models/mute.rb
index 0e00c2278f6f6be1a83e620d41730e0f7c6488aa..578345ef644ad4459a90fde1be38c540d7e5cb82 100644
--- a/app/models/mute.rb
+++ b/app/models/mute.rb
@@ -9,11 +9,13 @@
 #  account_id         :bigint(8)        not null
 #  target_account_id  :bigint(8)        not null
 #  hide_notifications :boolean          default(TRUE), not null
+#  expires_at         :datetime
 #
 
 class Mute < ApplicationRecord
   include Paginable
   include RelationshipCacheable
+  include Expireable
 
   belongs_to :account
   belongs_to :target_account, class_name: 'Account'
diff --git a/app/models/notification.rb b/app/models/notification.rb
index ad7528f505c035f8702fe9e7fdf53af2f5c18ac4..e83123c973184b1f3d09f8ad78ee2423de13777d 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -10,21 +10,34 @@
 #  updated_at      :datetime         not null
 #  account_id      :bigint(8)        not null
 #  from_account_id :bigint(8)        not null
+#  type            :string
 #
 
 class Notification < ApplicationRecord
+  self.inheritance_column = nil
+
   include Paginable
   include Cacheable
 
-  TYPE_CLASS_MAP = {
-    mention:        'Mention',
-    reblog:         'Status',
-    follow:         'Follow',
-    follow_request: 'FollowRequest',
-    favourite:      'Favourite',
-    poll:           'Poll',
+  LEGACY_TYPE_CLASS_MAP = {
+    'Mention'       => :mention,
+    'Status'        => :reblog,
+    'Follow'        => :follow,
+    'FollowRequest' => :follow_request,
+    'Favourite'     => :favourite,
+    'Poll'          => :poll,
   }.freeze
 
+  TYPES = %i(
+    mention
+    status
+    reblog
+    follow
+    follow_request
+    favourite
+    poll
+  ).freeze
+
   STATUS_INCLUDES = [:account, :application, :preloadable_poll, :media_attachments, :tags, active_mentions: :account, reblog: [:account, :application, :preloadable_poll, :media_attachments, :tags, active_mentions: :account]].freeze
 
   belongs_to :account, optional: true
@@ -38,26 +51,30 @@ class Notification < ApplicationRecord
   belongs_to :favourite,      foreign_type: 'Favourite',     foreign_key: 'activity_id', optional: true
   belongs_to :poll,           foreign_type: 'Poll',          foreign_key: 'activity_id', optional: true
 
-  validates :account_id, uniqueness: { scope: [:activity_type, :activity_id] }
-  validates :activity_type, inclusion: { in: TYPE_CLASS_MAP.values }
+  validates :type, inclusion: { in: TYPES }
+
+  scope :without_suspended, -> { joins(:from_account).merge(Account.without_suspended) }
 
   scope :browserable, ->(exclude_types = [], account_id = nil) {
-    types = TYPE_CLASS_MAP.values - activity_types_from_types(exclude_types)
+    types = TYPES - exclude_types.map(&:to_sym)
+
     if account_id.nil?
-      where(activity_type: types)
+      where(type: types)
     else
-      where(activity_type: types, from_account_id: account_id)
+      where(type: types, from_account_id: account_id)
     end
   }
 
   cache_associated :from_account, status: STATUS_INCLUDES, mention: [status: STATUS_INCLUDES], favourite: [:account, status: STATUS_INCLUDES], follow: :account, follow_request: :account, poll: [status: STATUS_INCLUDES]
 
   def type
-    @type ||= TYPE_CLASS_MAP.invert[activity_type].to_sym
+    @type ||= (super || LEGACY_TYPE_CLASS_MAP[activity_type]).to_sym
   end
 
   def target_status
     case type
+    when :status
+      status
     when :reblog
       status&.reblog
     when :favourite
@@ -86,10 +103,6 @@ class Notification < ApplicationRecord
         item.target_status.account = accounts[item.target_status.account_id] if item.target_status
       end
     end
-
-    def activity_types_from_types(types)
-      types.map { |type| TYPE_CLASS_MAP[type.to_sym] }.compact
-    end
   end
 
   after_initialize :set_from_account
diff --git a/app/models/poll.rb b/app/models/poll.rb
index b5deafcc21fbe442f54b86fb3a0c7bb592c7aac9..e1ca5525219e4eaa67caf0538f69f79a026eb9ed 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -25,7 +25,7 @@ class Poll < ApplicationRecord
   belongs_to :account
   belongs_to :status
 
-  has_many :votes, class_name: 'PollVote', inverse_of: :poll, dependent: :destroy
+  has_many :votes, class_name: 'PollVote', inverse_of: :poll, dependent: :delete_all
 
   has_many :notifications, as: :activity, dependent: :destroy
 
diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb
index 235928260d26733dc61ed335da78911f8c330172..a6ec839f805d296991d436d58a55dd4c04c8d08b 100644
--- a/app/models/preview_card.rb
+++ b/app/models/preview_card.rb
@@ -72,6 +72,7 @@ class PreviewCard < ApplicationRecord
   class << self
     private
 
+    # rubocop:disable Naming/MethodParameterName
     def image_styles(f)
       styles = {
         original: {
@@ -85,6 +86,7 @@ class PreviewCard < ApplicationRecord
       styles[:original][:format] = 'jpg' if f.instance.image_content_type == 'image/gif'
       styles
     end
+    # rubocop:enable Naming/MethodParameterName
   end
 
   private
diff --git a/app/models/public_feed.rb b/app/models/public_feed.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c8ce1a1403bb0aa38dd5be11a6b17163e0fd96a6
--- /dev/null
+++ b/app/models/public_feed.rb
@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+class PublicFeed < Feed
+  # @param [Account] account
+  # @param [Hash] options
+  # @option [Boolean] :with_replies
+  # @option [Boolean] :with_reblogs
+  # @option [Boolean] :local
+  # @option [Boolean] :remote
+  # @option [Boolean] :only_media
+  def initialize(account, options = {})
+    @account = account
+    @options = options
+  end
+
+  # @param [Integer] limit
+  # @param [Integer] max_id
+  # @param [Integer] since_id
+  # @param [Integer] min_id
+  # @return [Array<Status>]
+  def get(limit, max_id = nil, since_id = nil, min_id = nil)
+    scope = public_scope
+
+    scope.merge!(without_replies_scope) unless with_replies?
+    scope.merge!(without_reblogs_scope) unless with_reblogs?
+    scope.merge!(local_only_scope) if local_only?
+    scope.merge!(remote_only_scope) if remote_only?
+    scope.merge!(account_filters_scope) if account?
+    scope.merge!(media_only_scope) if media_only?
+
+    scope.cache_ids.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
+  end
+
+  private
+
+  def with_reblogs?
+    @options[:with_reblogs]
+  end
+
+  def with_replies?
+    @options[:with_replies]
+  end
+
+  def local_only?
+    @options[:local]
+  end
+
+  def remote_only?
+    @options[:remote]
+  end
+
+  def account?
+    @account.present?
+  end
+
+  def media_only?
+    @options[:only_media]
+  end
+
+  def public_scope
+    Status.with_public_visibility.joins(:account).merge(Account.without_suspended.without_silenced)
+  end
+
+  def local_only_scope
+    Status.local
+  end
+
+  def remote_only_scope
+    Status.remote
+  end
+
+  def without_replies_scope
+    Status.without_replies
+  end
+
+  def without_reblogs_scope
+    Status.without_reblogs
+  end
+
+  def media_only_scope
+    Status.joins(:media_attachments).group(:id)
+  end
+
+  def account_filters_scope
+    Status.not_excluded_by_account(@account).tap do |scope|
+      scope.merge!(Status.not_domain_blocked_by_account(@account)) unless local_only?
+      scope.merge!(Status.in_chosen_languages(@account)) if @account.chosen_languages.present?
+    end
+  end
+end
diff --git a/app/models/remote_follow.rb b/app/models/remote_follow.rb
index 30b84f7d529574b8f6689014f80dadecaf911c6d..911c067133c35fe63a18cc789d497a495985ac6f 100644
--- a/app/models/remote_follow.rb
+++ b/app/models/remote_follow.rb
@@ -56,7 +56,7 @@ class RemoteFollow
 
     if domain.nil?
       @addressable_template = Addressable::Template.new("#{authorize_interaction_url}?uri={uri}")
-    elsif redirect_url_link.nil? || redirect_url_link.template.nil?
+    elsif redirect_uri_template.nil?
       missing_resource_error
     else
       @addressable_template = Addressable::Template.new(redirect_uri_template)
@@ -64,16 +64,12 @@ class RemoteFollow
   end
 
   def redirect_uri_template
-    redirect_url_link.template
-  end
-
-  def redirect_url_link
-    acct_resource&.link('http://ostatus.org/schema/1.0/subscribe')
+    acct_resource&.link('http://ostatus.org/schema/1.0/subscribe', 'template')
   end
 
   def acct_resource
     @acct_resource ||= webfinger!("acct:#{acct}")
-  rescue Goldfinger::Error, HTTP::ConnectionError
+  rescue Webfinger::Error, HTTP::ConnectionError
     nil
   end
 
diff --git a/app/models/report.rb b/app/models/report.rb
index f31bcfd2e92f146ff91dfd1369eb73706a872185..cd08120e4130a9272c89eadd189936405304607e 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -14,6 +14,7 @@
 #  target_account_id          :bigint(8)        not null
 #  assigned_account_id        :bigint(8)
 #  uri                        :string
+#  forwarded                  :boolean
 #
 
 class Report < ApplicationRecord
diff --git a/app/models/session_activation.rb b/app/models/session_activation.rb
index 34d25c83db29f02e1ccbb2ec9ef82ba6640ede70..b0ce9d112828961778c9656b359ef38d4530b03d 100644
--- a/app/models/session_activation.rb
+++ b/app/models/session_activation.rb
@@ -70,12 +70,16 @@ class SessionActivation < ApplicationRecord
   end
 
   def assign_access_token
-    superapp = Doorkeeper::Application.find_by(superapp: true)
+    self.access_token = Doorkeeper::AccessToken.create!(access_token_attributes)
+  end
 
-    self.access_token = Doorkeeper::AccessToken.create!(application_id: superapp&.id,
-                                                        resource_owner_id: user_id,
-                                                        scopes: 'read write follow',
-                                                        expires_in: Doorkeeper.configuration.access_token_expires_in,
-                                                        use_refresh_token: Doorkeeper.configuration.refresh_token_enabled?)
+  def access_token_attributes
+    {
+      application_id: Doorkeeper::Application.find_by(superapp: true)&.id,
+      resource_owner_id: user_id,
+      scopes: 'read write follow',
+      expires_in: Doorkeeper.configuration.access_token_expires_in,
+      use_refresh_token: Doorkeeper.configuration.refresh_token_enabled?,
+    }
   end
 end
diff --git a/app/models/status.rb b/app/models/status.rb
index 71596ec2f8a16c4a03f15f8569ad1fb252fa458c..b426f9d5bcc10b34afd6be671774eb2df483acfd 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -85,23 +85,23 @@ class Status < ApplicationRecord
   scope :recent, -> { reorder(id: :desc) }
   scope :remote, -> { where(local: false).where.not(uri: nil) }
   scope :local,  -> { where(local: true).or(where(uri: nil)) }
-
   scope :with_accounts, ->(ids) { where(id: ids).includes(:account) }
   scope :without_replies, -> { where('statuses.reply = FALSE OR statuses.in_reply_to_account_id = statuses.account_id') }
   scope :without_reblogs, -> { where('statuses.reblog_of_id IS NULL') }
   scope :with_public_visibility, -> { where(visibility: :public) }
-  scope :tagged_with, ->(tag) { joins(:statuses_tags).where(statuses_tags: { tag_id: tag }) }
+  scope :tagged_with, ->(tag_ids) { joins(:statuses_tags).where(statuses_tags: { tag_id: tag_ids }) }
+  scope :in_chosen_languages, ->(account) { where(language: nil).or where(language: account.chosen_languages) }
   scope :excluding_silenced_accounts, -> { left_outer_joins(:account).where(accounts: { silenced_at: nil }) }
   scope :including_silenced_accounts, -> { left_outer_joins(:account).where.not(accounts: { silenced_at: nil }) }
   scope :not_excluded_by_account, ->(account) { where.not(account_id: account.excluded_from_timeline_account_ids) }
   scope :not_domain_blocked_by_account, ->(account) { account.excluded_from_timeline_domains.blank? ? left_outer_joins(:account) : left_outer_joins(:account).where('accounts.domain IS NULL OR accounts.domain NOT IN (?)', account.excluded_from_timeline_domains) }
-  scope :tagged_with_all, ->(tags) {
-    Array(tags).map(&:id).map(&:to_i).reduce(self) do |result, id|
+  scope :tagged_with_all, ->(tag_ids) {
+    Array(tag_ids).reduce(self) do |result, id|
       result.joins("INNER JOIN statuses_tags t#{id} ON t#{id}.status_id = statuses.id AND t#{id}.tag_id = #{id}")
     end
   }
-  scope :tagged_with_none, ->(tags) {
-    Array(tags).map(&:id).map(&:to_i).reduce(self) do |result, id|
+  scope :tagged_with_none, ->(tag_ids) {
+    Array(tag_ids).reduce(self) do |result, id|
       result.joins("LEFT OUTER JOIN statuses_tags t#{id} ON t#{id}.status_id = statuses.id AND t#{id}.tag_id = #{id}")
             .where("t#{id}.tag_id IS NULL")
     end
@@ -228,14 +228,6 @@ class Status < ApplicationRecord
     @emojis = CustomEmoji.from_text(fields.join(' '), account.domain)
   end
 
-  def mark_for_mass_destruction!
-    @marked_for_mass_destruction = true
-  end
-
-  def marked_for_mass_destruction?
-    @marked_for_mass_destruction
-  end
-
   def replies_count
     status_stat&.replies_count || 0
   end
@@ -277,26 +269,6 @@ class Status < ApplicationRecord
       visibilities.keys - %w(direct limited)
     end
 
-    def in_chosen_languages(account)
-      where(language: nil).or where(language: account.chosen_languages)
-    end
-
-    def as_public_timeline(account = nil, local_only = false)
-      query = timeline_scope(local_only).without_replies
-
-      apply_timeline_filters(query, account, [:local, true].include?(local_only))
-    end
-
-    def as_tag_timeline(tag, account = nil, local_only = false)
-      query = timeline_scope(local_only).tagged_with(tag)
-
-      apply_timeline_filters(query, account, local_only)
-    end
-
-    def as_outbox_timeline(account)
-      where(account: account, visibility: :public)
-    end
-
     def favourites_map(status_ids, account_id)
       Favourite.select('status_id').where(status_id: status_ids).where(account_id: account_id).each_with_object({}) { |f, h| h[f.status_id] = true }
     end
@@ -373,51 +345,6 @@ class Status < ApplicationRecord
         status&.distributable? ? status : nil
       end.compact
     end
-
-    private
-
-    def timeline_scope(scope = false)
-      starting_scope = case scope
-                       when :local, true
-                         Status.local
-                       when :remote
-                         Status.remote
-                       else
-                         Status
-                       end
-
-      starting_scope
-        .with_public_visibility
-        .without_reblogs
-    end
-
-    def apply_timeline_filters(query, account, local_only)
-      if account.nil?
-        filter_timeline_default(query)
-      else
-        filter_timeline_for_account(query, account, local_only)
-      end
-    end
-
-    def filter_timeline_for_account(query, account, local_only)
-      query = query.not_excluded_by_account(account)
-      query = query.not_domain_blocked_by_account(account) unless local_only
-      query = query.in_chosen_languages(account) if account.chosen_languages.present?
-      query.merge(account_silencing_filter(account))
-    end
-
-    def filter_timeline_default(query)
-      query.excluding_silenced_accounts
-    end
-
-    def account_silencing_filter(account)
-      if account.silenced?
-        including_myself = left_outer_joins(:account).where(account_id: account.id).references(:accounts)
-        excluding_silenced_accounts.or(including_myself)
-      else
-        excluding_silenced_accounts
-      end
-    end
   end
 
   def status_stat
@@ -495,7 +422,7 @@ class Status < ApplicationRecord
   end
 
   def decrement_counter_caches
-    return if direct_visibility? || marked_for_mass_destruction?
+    return if direct_visibility?
 
     account&.decrement_count!(:statuses_count)
     reblog&.decrement_count!(:reblogs_count) if reblog?
@@ -505,7 +432,7 @@ class Status < ApplicationRecord
   def unlink_from_conversations
     return unless direct_visibility?
 
-    mentioned_accounts = mentions.includes(:account).map(&:account)
+    mentioned_accounts = (association(:mentions).loaded? ? mentions : mentions.includes(:account)).map(&:account)
     inbox_owners       = mentioned_accounts.select(&:local?) + (account.local? ? [account] : [])
 
     inbox_owners.each do |inbox_owner|
diff --git a/app/models/tag.rb b/app/models/tag.rb
index bce76fc1667b43c8d700aa28c2928b21fcf94d64..bb93a52e2e56e6717a6b50c651a069e8367f50a6 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -39,7 +39,7 @@ class Tag < ApplicationRecord
   scope :listable, -> { where(listable: [true, nil]) }
   scope :trendable, -> { Setting.trendable_by_default ? where(trendable: [true, nil]) : where(trendable: true) }
   scope :discoverable, -> { listable.joins(:account_tag_stat).where(AccountTagStat.arel_table[:accounts_count].gt(0)).order(Arel.sql('account_tag_stats.accounts_count desc')) }
-  scope :most_used, ->(account) { joins(:statuses).where(statuses: { account: account }).group(:id).order(Arel.sql('count(*) desc')) }
+  scope :recently_used, ->(account) { joins(:statuses).where(statuses: { id: account.statuses.select(:id).limit(1000) }).group(:id).order(Arel.sql('count(*) desc')) }
   scope :matches_name, ->(value) { where(arel_table[:name].matches("#{value}%")) }
 
   delegate :accounts_count,
@@ -126,7 +126,7 @@ class Tag < ApplicationRecord
     end
 
     def search_for(term, limit = 5, offset = 0, options = {})
-      normalized_term = normalize(term.strip).mb_chars.downcase.to_s
+      normalized_term = normalize(term.strip)
       pattern         = sanitize_sql_like(normalized_term) + '%'
       query           = Tag.listable.where(arel_table[:name].lower.matches(pattern))
       query           = query.where(arel_table[:name].lower.eq(normalized_term).or(arel_table[:reviewed_at].not_eq(nil))) if options[:exclude_unreviewed]
diff --git a/app/models/tag_feed.rb b/app/models/tag_feed.rb
new file mode 100644
index 0000000000000000000000000000000000000000..9a16ffc82b312123a1effa1b56f7f87db3845672
--- /dev/null
+++ b/app/models/tag_feed.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+class TagFeed < PublicFeed
+  LIMIT_PER_MODE = 4
+
+  # @param [Tag] tag
+  # @param [Account] account
+  # @param [Hash] options
+  # @option [Enumerable<String>] :any
+  # @option [Enumerable<String>] :all
+  # @option [Enumerable<String>] :none
+  # @option [Boolean] :local
+  # @option [Boolean] :remote
+  # @option [Boolean] :only_media
+  def initialize(tag, account, options = {})
+    @tag     = tag
+    @account = account
+    @options = options
+  end
+
+  # @param [Integer] limit
+  # @param [Integer] max_id
+  # @param [Integer] since_id
+  # @param [Integer] min_id
+  # @return [Array<Status>]
+  def get(limit, max_id = nil, since_id = nil, min_id = nil)
+    scope = public_scope
+
+    scope.merge!(tagged_with_any_scope)
+    scope.merge!(tagged_with_all_scope)
+    scope.merge!(tagged_with_none_scope)
+    scope.merge!(local_only_scope) if local_only?
+    scope.merge!(remote_only_scope) if remote_only?
+    scope.merge!(account_filters_scope) if account?
+    scope.merge!(media_only_scope) if media_only?
+
+    scope.cache_ids.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
+  end
+
+  private
+
+  def tagged_with_any_scope
+    Status.group(:id).tagged_with(tags_for(Array(@tag.name) | Array(@options[:any])))
+  end
+
+  def tagged_with_all_scope
+    Status.group(:id).tagged_with_all(tags_for(@options[:all]))
+  end
+
+  def tagged_with_none_scope
+    Status.group(:id).tagged_with_none(tags_for(@options[:none]))
+  end
+
+  def tags_for(names)
+    Tag.matching_name(Array(names).take(LIMIT_PER_MODE)).pluck(:id) if names.present?
+  end
+end
diff --git a/app/models/unavailable_domain.rb b/app/models/unavailable_domain.rb
index e2918b5860472a263dfa3527ff027629cc0ec7d1..5e8870bde03049b84e328f3af81da4d2a6e5a6dd 100644
--- a/app/models/unavailable_domain.rb
+++ b/app/models/unavailable_domain.rb
@@ -12,6 +12,8 @@
 class UnavailableDomain < ApplicationRecord
   include DomainNormalizable
 
+  validates :domain, presence: true, uniqueness: true
+
   after_commit :reset_cache!
 
   private
diff --git a/app/models/user.rb b/app/models/user.rb
index 306e2d4355c771ab46c9852321d425f9cda95f4b..f8c8a6ab550c82f081e81fa6c52968c16dae113f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -40,6 +40,8 @@
 #  approved                  :boolean          default(TRUE), not null
 #  sign_in_token             :string
 #  sign_in_token_sent_at     :datetime
+#  webauthn_id               :string
+#  sign_up_ip                :inet
 #
 
 class User < ApplicationRecord
@@ -61,7 +63,7 @@ class User < ApplicationRecord
   devise :two_factor_backupable,
          otp_number_of_backup_codes: 10
 
-  devise :registerable, :recoverable, :rememberable, :trackable, :validatable,
+  devise :registerable, :recoverable, :rememberable, :validatable,
          :confirmable
 
   include Omniauthable
@@ -77,15 +79,24 @@ class User < ApplicationRecord
   has_many :backups, inverse_of: :user
   has_many :invites, inverse_of: :user
   has_many :markers, inverse_of: :user, dependent: :destroy
+  has_many :webauthn_credentials, dependent: :destroy
 
   has_one :invite_request, class_name: 'UserInviteRequest', inverse_of: :user, dependent: :destroy
-  accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? }
+  accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? && !Setting.require_invite_text }
+  validates :invite_request, presence: true, on: :create, if: :invite_text_required?
 
   validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale?
   validates_with BlacklistedEmailValidator, on: :create
   validates_with EmailMxValidator, if: :validate_email_dns?
   validates :agreement, acceptance: { allow_nil: false, accept: [true, 'true', '1'] }, on: :create
 
+  # Those are honeypot/antispam fields
+  attr_accessor :registration_form_time, :website, :confirm_password
+
+  validates_with RegistrationFormTimeValidator, on: :create
+  validates :website, absence: true, on: :create
+  validates :confirm_password, absence: true, on: :create
+
   scope :recent, -> { order(id: :desc) }
   scope :pending, -> { where(approved: false) }
   scope :approved, -> { where(approved: true) }
@@ -95,7 +106,7 @@ class User < ApplicationRecord
   scope :inactive, -> { where(arel_table[:current_sign_in_at].lt(ACTIVE_DURATION.ago)) }
   scope :active, -> { confirmed.where(arel_table[:current_sign_in_at].gteq(ACTIVE_DURATION.ago)).joins(:account).where(accounts: { suspended_at: nil }) }
   scope :matches_email, ->(value) { where(arel_table[:email].matches("#{value}%")) }
-  scope :matches_ip, ->(value) { left_joins(:session_activations).where('users.current_sign_in_ip <<= ?', value).or(left_joins(:session_activations).where('users.last_sign_in_ip <<= ?', value)).or(left_joins(:session_activations).where('session_activations.ip <<= ?', value)) }
+  scope :matches_ip, ->(value) { left_joins(:session_activations).where('users.current_sign_in_ip <<= ?', value).or(left_joins(:session_activations).where('users.sign_up_ip <<= ?', value)).or(left_joins(:session_activations).where('users.last_sign_in_ip <<= ?', value)).or(left_joins(:session_activations).where('session_activations.ip <<= ?', value)) }
   scope :emailable, -> { confirmed.enabled.joins(:account).merge(Account.searchable) }
 
   before_validation :sanitize_languages
@@ -113,10 +124,11 @@ class User < ApplicationRecord
            :reduce_motion, :system_font_ui, :noindex, :theme, :display_media, :hide_network,
            :expand_spoilers, :default_language, :aggregate_reblogs, :show_application,
            :advanced_layout, :use_blurhash, :use_pending_items, :trends, :crop_images,
+           :disable_swiping,
            to: :settings, prefix: :setting, allow_nil: false
 
   attr_reader :invite_code, :sign_in_token_attempt
-  attr_writer :external
+  attr_writer :external, :bypass_invite_request_check
 
   def confirmed?
     confirmed_at.present?
@@ -161,12 +173,30 @@ class User < ApplicationRecord
     prepare_new_user! if new_user && approved?
   end
 
+  def update_sign_in!(request, new_sign_in: false)
+    old_current, new_current = current_sign_in_at, Time.now.utc
+    self.last_sign_in_at     = old_current || new_current
+    self.current_sign_in_at  = new_current
+
+    old_current, new_current = current_sign_in_ip, request.remote_ip
+    self.last_sign_in_ip     = old_current || new_current
+    self.current_sign_in_ip  = new_current
+
+    if new_sign_in
+      self.sign_in_count ||= 0
+      self.sign_in_count  += 1
+    end
+
+    save(validate: false) unless new_record?
+    prepare_returning_user!
+  end
+
   def pending?
     !approved?
   end
 
   def active_for_authentication?
-    true
+    !account.memorial?
   end
 
   def suspicious_sign_in?(ip)
@@ -174,7 +204,7 @@ class User < ApplicationRecord
   end
 
   def functional?
-    confirmed? && approved? && !disabled? && !account.suspended? && account.moved_to_account_id.nil?
+    confirmed? && approved? && !disabled? && !account.suspended? && !account.memorial? && account.moved_to_account_id.nil?
   end
 
   def unconfirmed_or_pending?
@@ -192,14 +222,25 @@ class User < ApplicationRecord
     prepare_new_user!
   end
 
-  def update_tracked_fields!(request)
-    super
-    prepare_returning_user!
+  def otp_enabled?
+    otp_required_for_login
+  end
+
+  def webauthn_enabled?
+    webauthn_credentials.any?
+  end
+
+  def two_factor_enabled?
+    otp_required_for_login? || webauthn_credentials.any?
   end
 
   def disable_two_factor!
     self.otp_required_for_login = false
+    self.otp_secret = nil
     otp_backup_codes&.clear
+
+    webauthn_credentials.destroy_all if webauthn_enabled?
+
     save!
   end
 
@@ -235,16 +276,16 @@ class User < ApplicationRecord
     @shows_application ||= settings.show_application
   end
 
+  # rubocop:disable Naming/MethodParameterName
   def token_for_app(a)
     return nil if a.nil? || a.owner != self
-    Doorkeeper::AccessToken
-      .find_or_create_by(application_id: a.id, resource_owner_id: id) do |t|
-
+    Doorkeeper::AccessToken.find_or_create_by(application_id: a.id, resource_owner_id: id) do |t|
       t.scopes = a.scopes
       t.expires_in = Doorkeeper.configuration.access_token_expires_in
       t.use_refresh_token = Doorkeeper.configuration.refresh_token_enabled?
     end
   end
+  # rubocop:enable Naming/MethodParameterName
 
   def activate_session(request)
     session_activations.activate(session_id: SecureRandom.hex,
@@ -312,6 +353,7 @@ class User < ApplicationRecord
 
       arr << [current_sign_in_at, current_sign_in_ip] if current_sign_in_ip.present?
       arr << [last_sign_in_at, last_sign_in_ip] if last_sign_in_ip.present?
+      arr << [created_at, sign_up_ip] if sign_up_ip.present?
 
       arr.sort_by { |pair| pair.first || Time.now.utc }.uniq(&:last).reverse!
     end
@@ -366,7 +408,17 @@ class User < ApplicationRecord
   end
 
   def set_approved
-    self.approved = open_registrations? || valid_invitation? || external?
+    self.approved = begin
+      if sign_up_from_ip_requires_approval?
+        false
+      else
+        open_registrations? || valid_invitation? || external?
+      end
+    end
+  end
+
+  def sign_up_from_ip_requires_approval?
+    !sign_up_ip.nil? && IpBlock.where(severity: :sign_up_requires_approval).where('ip >>= ?', sign_up_ip.to_s).exists?
   end
 
   def open_registrations?
@@ -377,6 +429,10 @@ class User < ApplicationRecord
     !!@external
   end
 
+  def bypass_invite_request_check?
+    @bypass_invite_request_check
+  end
+
   def sanitize_languages
     return if chosen_languages.nil?
     chosen_languages.reject!(&:blank?)
@@ -395,7 +451,7 @@ class User < ApplicationRecord
   end
 
   def notify_staff_about_pending_account!
-    User.staff.includes(:account).each do |u|
+    User.staff.includes(:account).find_each do |u|
       next unless u.allows_pending_account_emails?
       AdminMailer.new_pending_account(u.account, self).deliver_later
     end
@@ -414,4 +470,8 @@ class User < ApplicationRecord
   def validate_email_dns?
     email_changed? && !(Rails.env.test? || Rails.env.development?)
   end
+
+  def invite_text_required?
+    Setting.require_invite_text && !invited? && !external? && !bypass_invite_request_check?
+  end
 end
diff --git a/app/models/webauthn_credential.rb b/app/models/webauthn_credential.rb
new file mode 100644
index 0000000000000000000000000000000000000000..7d423e38d71f59949ea8f959db36a71dd44fa571
--- /dev/null
+++ b/app/models/webauthn_credential.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: webauthn_credentials
+#
+#  id          :bigint(8)        not null, primary key
+#  external_id :string           not null
+#  public_key  :string           not null
+#  nickname    :string           not null
+#  sign_count  :bigint(8)        default(0), not null
+#  user_id     :bigint(8)
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#
+
+class WebauthnCredential < ApplicationRecord
+  validates :external_id, :public_key, :nickname, :sign_count, presence: true
+  validates :external_id, uniqueness: true
+  validates :nickname, uniqueness: { scope: :user_id }
+  validates :sign_count,
+            numericality: { only_integer: true, greater_than_or_equal_to: 0, less_than_or_equal_to: 2**63 - 1 }
+end
diff --git a/app/policies/account_policy.rb b/app/policies/account_policy.rb
index 9c145979d6c2c076577a2359139e457d1164e8e5..672e1786bfd7bb0cdc512b705b9fd7dcd3c45faa 100644
--- a/app/policies/account_policy.rb
+++ b/app/policies/account_policy.rb
@@ -14,10 +14,22 @@ class AccountPolicy < ApplicationPolicy
   end
 
   def suspend?
-    staff? && !record.user&.staff?
+    staff? && !record.user&.staff? && !record.instance_actor?
+  end
+
+  def destroy?
+    record.suspended_temporarily? && admin?
   end
 
   def unsuspend?
+    staff? && record.suspension_origin_local?
+  end
+
+  def sensitive?
+    staff? && !record.user&.staff?
+  end
+
+  def unsensitive?
     staff?
   end
 
@@ -50,6 +62,6 @@ class AccountPolicy < ApplicationPolicy
   end
 
   def memorialize?
-    admin? && !record.user&.admin?
+    admin? && !record.user&.admin? && !record.instance_actor?
   end
 end
diff --git a/app/policies/domain_block_policy.rb b/app/policies/domain_block_policy.rb
index 47c0a81af44f923bff704873ca9964755d614154..543259ccef8681e2bd6bf0b4c0596119adf8ba6d 100644
--- a/app/policies/domain_block_policy.rb
+++ b/app/policies/domain_block_policy.rb
@@ -13,6 +13,10 @@ class DomainBlockPolicy < ApplicationPolicy
     admin?
   end
 
+  def update?
+    admin?
+  end
+
   def destroy?
     admin?
   end
diff --git a/app/policies/ip_block_policy.rb b/app/policies/ip_block_policy.rb
new file mode 100644
index 0000000000000000000000000000000000000000..34dbd746a33f35fde066738f03b9e76748c468a9
--- /dev/null
+++ b/app/policies/ip_block_policy.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class IpBlockPolicy < ApplicationPolicy
+  def index?
+    admin?
+  end
+
+  def create?
+    admin?
+  end
+
+  def destroy?
+    admin?
+  end
+end
diff --git a/app/policies/status_policy.rb b/app/policies/status_policy.rb
index 3d4e50d3719730cc65540f58180a103fc3a284f9..bcf9c3395ca974291ad738c45fcae14f05702bce 100644
--- a/app/policies/status_policy.rb
+++ b/app/policies/status_policy.rb
@@ -12,6 +12,8 @@ class StatusPolicy < ApplicationPolicy
   end
 
   def show?
+    return false if author.suspended?
+
     if requires_mention?
       owned? || mention_exists?
     elsif private?
diff --git a/app/presenters/instance_presenter.rb b/app/presenters/instance_presenter.rb
index c150bf742be5799816de757aa6d0795326dddaff..1bfdd40ac9d3c1b712e0b2e8f9fa31f7f0014ca4 100644
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@@ -29,7 +29,7 @@ class InstancePresenter
   end
 
   def domain_count
-    Rails.cache.fetch('distinct_domain_count') { Account.distinct.count(:domain) }
+    Rails.cache.fetch('distinct_domain_count') { Instance.count }
   end
 
   def sample_accounts
diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb
index 627d4446b9919d45ae6379153a2e2458724e2901..759ef30f91bb5dbe94dfb672a6c99a95882c6ce0 100644
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@@ -7,10 +7,10 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
 
   context_extensions :manually_approves_followers, :featured, :also_known_as,
                      :moved_to, :property_value, :identity_proof,
-                     :discoverable, :olm
+                     :discoverable, :olm, :suspended
 
   attributes :id, :type, :following, :followers,
-             :inbox, :outbox, :featured,
+             :inbox, :outbox, :featured, :featured_tags,
              :preferred_username, :name, :summary,
              :url, :manually_approves_followers,
              :discoverable
@@ -23,6 +23,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
   attribute :devices, unless: :instance_actor?
   attribute :moved_to, if: :moved?
   attribute :also_known_as, if: :also_known_as?
+  attribute :suspended, if: :suspended?
 
   class EndpointsSerializer < ActivityPub::Serializer
     include RoutingHelper
@@ -39,7 +40,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
   has_one :icon,  serializer: ActivityPub::ImageSerializer, if: :avatar_exists?
   has_one :image, serializer: ActivityPub::ImageSerializer, if: :header_exists?
 
-  delegate :moved?, :instance_actor?, to: :object
+  delegate :suspended?, :instance_actor?, to: :object
 
   def id
     object.instance_actor? ? instance_actor_url : account_url(object)
@@ -74,13 +75,17 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
   end
 
   def outbox
-    account_outbox_url(object)
+    object.instance_actor? ? instance_actor_outbox_url : account_outbox_url(object)
   end
 
   def featured
     account_collection_url(object, :featured)
   end
 
+  def featured_tags
+    account_collection_url(object, :tags)
+  end
+
   def endpoints
     object
   end
@@ -89,12 +94,16 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
     object.username
   end
 
+  def discoverable
+    object.suspended? ? false : (object.discoverable || false)
+  end
+
   def name
-    object.display_name
+    object.suspended? ? '' : object.display_name
   end
 
   def summary
-    Formatter.instance.simplified_format(object)
+    object.suspended? ? '' : Formatter.instance.simplified_format(object)
   end
 
   def icon
@@ -109,36 +118,44 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
     object
   end
 
+  def suspended
+    object.suspended?
+  end
+
   def url
     object.instance_actor? ? about_more_url(instance_actor: true) : short_account_url(object)
   end
 
   def avatar_exists?
-    object.avatar?
+    !object.suspended? && object.avatar?
   end
 
   def header_exists?
-    object.header?
+    !object.suspended? && object.header?
   end
 
   def manually_approves_followers
-    object.locked
+    object.suspended? ? false : object.locked
   end
 
   def virtual_tags
-    object.emojis + object.tags
+    object.suspended? ? [] : (object.emojis + object.tags)
   end
 
   def virtual_attachments
-    object.fields + object.identity_proofs.active
+    object.suspended? ? [] : (object.fields + object.identity_proofs.active)
   end
 
   def moved_to
     ActivityPub::TagManager.instance.uri_for(object.moved_to_account)
   end
 
+  def moved?
+    !object.suspended? && object.moved?
+  end
+
   def also_known_as?
-    !object.also_known_as.empty?
+    !object.suspended? && !object.also_known_as.empty?
   end
 
   class CustomEmojiSerializer < ActivityPub::EmojiSerializer
diff --git a/app/serializers/activitypub/collection_serializer.rb b/app/serializers/activitypub/collection_serializer.rb
index ea7af543320dca3b74b0e38185e35e534dfa4d27..34026a6b5be01d6475c490b541ea3e54c5a858d9 100644
--- a/app/serializers/activitypub/collection_serializer.rb
+++ b/app/serializers/activitypub/collection_serializer.rb
@@ -16,6 +16,8 @@ class ActivityPub::CollectionSerializer < ActivityPub::Serializer
       ActivityPub::NoteSerializer
     when 'Device'
       ActivityPub::DeviceSerializer
+    when 'FeaturedTag'
+      ActivityPub::HashtagSerializer
     when 'ActivityPub::CollectionPresenter'
       ActivityPub::CollectionSerializer
     when 'String'
diff --git a/app/serializers/activitypub/hashtag_serializer.rb b/app/serializers/activitypub/hashtag_serializer.rb
new file mode 100644
index 0000000000000000000000000000000000000000..1a56e4dfe4c745f375bacb3b6001d7b6d8d95291
--- /dev/null
+++ b/app/serializers/activitypub/hashtag_serializer.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class ActivityPub::HashtagSerializer < ActivityPub::Serializer
+  include RoutingHelper
+
+  attributes :type, :href, :name
+
+  def type
+    'Hashtag'
+  end
+
+  def name
+    "##{object.name}"
+  end
+
+  def href
+    if object.class.name == 'FeaturedTag'
+      short_account_tag_url(object.account, object.tag)
+    else
+      tag_url(object)
+    end
+  end
+end
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index f26fd93a424f1ecb30f10f0e11ebbe880080b528..6f9e1ca639183282d9bfb0daa5a3365da1b339f7 100644
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -95,6 +95,10 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
     ActivityPub::TagManager.instance.cc(object)
   end
 
+  def sensitive
+    object.account.sensitized? || object.sensitive
+  end
+
   def virtual_tags
     object.active_mentions.to_a.sort_by(&:id) + object.tags + object.emojis
   end
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 2939004efeb7484a3b322d88d29e1263a82ea022..70263e0c5768c257912c28da71f21e43b6a1441e 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -33,6 +33,7 @@ class InitialStateSerializer < ActiveModel::Serializer
       store[:display_media]     = object.current_account.user.setting_display_media
       store[:expand_spoilers]   = object.current_account.user.setting_expand_spoilers
       store[:reduce_motion]     = object.current_account.user.setting_reduce_motion
+      store[:disable_swiping]   = object.current_account.user.setting_disable_swiping
       store[:advanced_layout]   = object.current_account.user.setting_advanced_layout
       store[:use_blurhash]      = object.current_account.user.setting_use_blurhash
       store[:use_pending_items] = object.current_account.user.setting_use_pending_items
diff --git a/app/serializers/manifest_serializer.rb b/app/serializers/manifest_serializer.rb
index 21ec0d4bed2f96f38b9ec58f1f6dc4950a6413fc..dafe8f55b9e8e42f32e07bc92f421f44370832f6 100644
--- a/app/serializers/manifest_serializer.rb
+++ b/app/serializers/manifest_serializer.rb
@@ -7,7 +7,7 @@ class ManifestSerializer < ActiveModel::Serializer
   attributes :name, :short_name, :description,
              :icons, :theme_color, :background_color,
              :display, :start_url, :scope,
-             :share_target
+             :share_target, :shortcuts
 
   def name
     object.site_title
@@ -64,4 +64,42 @@ class ManifestSerializer < ActiveModel::Serializer
       },
     }
   end
+
+  def shortcuts
+    [
+      {
+        name: 'New toot',
+        url: '/web/statuses/new',
+        icons: [
+          {
+            src: '/shortcuts/new-status.png',
+            type: 'image/png',
+            sizes: '192x192',
+          },
+        ],
+      },
+      {
+        name: 'Notifications',
+        url: '/web/notifications',
+        icons: [
+          {
+            src: '/shortcuts/notifications.png',
+            type: 'image/png',
+            sizes: '192x192',
+          },
+        ],
+      },
+      {
+        name: 'Direct messages',
+        url: '/web/timelines/direct',
+        icons: [
+          {
+            src: '/shortcuts/direct.png',
+            type: 'image/png',
+            sizes: '192x192',
+          },
+        ],
+      },
+    ]
+  end
 end
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb
index 0db1916b0740640cf0ef64eb155da9ab2d5579e6..189a62d0eec82b5395687117f5501cde8a085fd6 100644
--- a/app/serializers/rest/account_serializer.rb
+++ b/app/serializers/rest/account_serializer.rb
@@ -8,8 +8,11 @@ class REST::AccountSerializer < ActiveModel::Serializer
              :followers_count, :following_count, :statuses_count, :last_status_at
 
   has_one :moved_to_account, key: :moved, serializer: REST::AccountSerializer, if: :moved_and_not_nested?
+
   has_many :emojis, serializer: REST::CustomEmojiSerializer
 
+  attribute :suspended, if: :suspended?
+
   class FieldSerializer < ActiveModel::Serializer
     attributes :name, :value, :verified_at
 
@@ -29,7 +32,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
   end
 
   def note
-    Formatter.instance.simplified_format(object)
+    object.suspended? ? '' : Formatter.instance.simplified_format(object)
   end
 
   def url
@@ -37,26 +40,60 @@ class REST::AccountSerializer < ActiveModel::Serializer
   end
 
   def avatar
-    full_asset_url(object.avatar_original_url)
+    full_asset_url(object.suspended? ? object.avatar.default_url : object.avatar_original_url)
   end
 
   def avatar_static
-    full_asset_url(object.avatar_static_url)
+    full_asset_url(object.suspended? ? object.avatar.default_url : object.avatar_static_url)
   end
 
   def header
-    full_asset_url(object.header_original_url)
+    full_asset_url(object.suspended? ? object.header.default_url : object.header_original_url)
   end
 
   def header_static
-    full_asset_url(object.header_static_url)
-  end
-
-  def moved_and_not_nested?
-    object.moved? && object.moved_to_account.moved_to_account_id.nil?
+    full_asset_url(object.suspended? ? object.header.default_url : object.header_static_url)
   end
 
   def last_status_at
     object.last_status_at&.to_date&.iso8601
   end
+
+  def display_name
+    object.suspended? ? '' : object.display_name
+  end
+
+  def locked
+    object.suspended? ? false : object.locked
+  end
+
+  def bot
+    object.suspended? ? false : object.bot
+  end
+
+  def discoverable
+    object.suspended? ? false : object.discoverable
+  end
+
+  def moved_to_account
+    object.suspended? ? nil : object.moved_to_account
+  end
+
+  def emojis
+    object.suspended? ? [] : object.emojis
+  end
+
+  def fields
+    object.suspended? ? [] : object.fields
+  end
+
+  def suspended
+    object.suspended?
+  end
+
+  delegate :suspended?, to: :object
+
+  def moved_and_not_nested?
+    object.moved? && object.moved_to_account.moved_to_account_id.nil?
+  end
 end
diff --git a/app/serializers/rest/featured_tag_serializer.rb b/app/serializers/rest/featured_tag_serializer.rb
index 08121ff16db2be23bcb352b5a4f4cfc129eb74a0..96adcc7d09345a0405adf9eaf5b795f3e858aea7 100644
--- a/app/serializers/rest/featured_tag_serializer.rb
+++ b/app/serializers/rest/featured_tag_serializer.rb
@@ -1,9 +1,15 @@
 # frozen_string_literal: true
 
 class REST::FeaturedTagSerializer < ActiveModel::Serializer
-  attributes :id, :name, :statuses_count, :last_status_at
+  include RoutingHelper
+
+  attributes :id, :name, :url, :statuses_count, :last_status_at
 
   def id
     object.id.to_s
   end
+
+  def url
+    short_account_tag_url(object.account, object.tag)
+  end
 end
diff --git a/app/serializers/rest/list_serializer.rb b/app/serializers/rest/list_serializer.rb
index 977da7439acb9f54844dacc90a1572451afc3bb3..3e87f711961279f4fe2f8ebc49631b49d290699c 100644
--- a/app/serializers/rest/list_serializer.rb
+++ b/app/serializers/rest/list_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class REST::ListSerializer < ActiveModel::Serializer
-  attributes :id, :title
+  attributes :id, :title, :replies_policy
 
   def id
     object.id.to_s
diff --git a/app/serializers/rest/media_attachment_serializer.rb b/app/serializers/rest/media_attachment_serializer.rb
index e65f7acf1a9e607d5aeba71379616b7845befdc2..a24f953152f4a811b47e400341a6f37c9f33c4ea 100644
--- a/app/serializers/rest/media_attachment_serializer.rb
+++ b/app/serializers/rest/media_attachment_serializer.rb
@@ -4,7 +4,7 @@ class REST::MediaAttachmentSerializer < ActiveModel::Serializer
   include RoutingHelper
 
   attributes :id, :type, :url, :preview_url,
-             :remote_url, :text_url, :meta,
+             :remote_url, :preview_remote_url, :text_url, :meta,
              :description, :blurhash
 
   def id
@@ -35,6 +35,10 @@ class REST::MediaAttachmentSerializer < ActiveModel::Serializer
     end
   end
 
+  def preview_remote_url
+    object.thumbnail_remote_url.presence
+  end
+
   def text_url
     object.local? ? medium_url(object) : nil
   end
diff --git a/app/serializers/rest/muted_account_serializer.rb b/app/serializers/rest/muted_account_serializer.rb
new file mode 100644
index 0000000000000000000000000000000000000000..3ddd706dcd327b0f28c81f878e052745c442ecb8
--- /dev/null
+++ b/app/serializers/rest/muted_account_serializer.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class REST::MutedAccountSerializer < REST::AccountSerializer
+  attribute :mute_expires_at
+
+  def mute_expires_at
+    mute = current_user.account.mute_relationships.find_by(target_account_id: object.id)
+    mute && !mute.expired? ? mute.expires_at : nil
+  end
+end
diff --git a/app/serializers/rest/notification_serializer.rb b/app/serializers/rest/notification_serializer.rb
index 80812ad0df9cd5d8f740ff78d8d28287b84c10c8..27b031fcc77a1603b617faca6745550b43216129 100644
--- a/app/serializers/rest/notification_serializer.rb
+++ b/app/serializers/rest/notification_serializer.rb
@@ -11,6 +11,6 @@ class REST::NotificationSerializer < ActiveModel::Serializer
   end
 
   def status_type?
-    [:favourite, :reblog, :mention, :poll].include?(object.type)
+    [:favourite, :reblog, :status, :mention, :poll].include?(object.type)
   end
 end
diff --git a/app/serializers/rest/relationship_serializer.rb b/app/serializers/rest/relationship_serializer.rb
index c2f3c9a112642113eed01025d5b08caf01792dbf..afd4cddf9b5718aba504ed5dbdb18cdbf5b32bb1 100644
--- a/app/serializers/rest/relationship_serializer.rb
+++ b/app/serializers/rest/relationship_serializer.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 class REST::RelationshipSerializer < ActiveModel::Serializer
-  attributes :id, :following, :showing_reblogs, :followed_by, :blocking, :blocked_by,
-             :muting, :muting_notifications, :requested, :domain_blocking,
-             :endorsed, :note
+  attributes :id, :following, :showing_reblogs, :notifying, :followed_by,
+             :blocking, :blocked_by, :muting, :muting_notifications, :requested,
+             :domain_blocking, :endorsed, :note
 
   def id
     object.id.to_s
@@ -19,6 +19,12 @@ class REST::RelationshipSerializer < ActiveModel::Serializer
       false
   end
 
+  def notifying
+    (instance_options[:relationships].following[object.id] || {})[:notify] ||
+      (instance_options[:relationships].requested[object.id] || {})[:notify] ||
+      false
+  end
+
   def followed_by
     instance_options[:relationships].followed_by[object.id] || false
   end
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index 0109de882bdc0021fdbeb9b9c86bd3b41981d602..bb6df90b7a61f53342506f92b7dd945177e940e2 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -58,6 +58,14 @@ class REST::StatusSerializer < ActiveModel::Serializer
     end
   end
 
+  def sensitive
+    if current_user? && current_user.account_id == object.account_id
+      object.sensitive
+    else
+      object.account.sensitized? || object.sensitive
+    end
+  end
+
   def uri
     ActivityPub::TagManager.instance.uri_for(object)
   end
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index 493813aab4e1c6b465da3a344a6fd17aee169636..43e59604055342a684d908b3810dd229a912a99c 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -27,7 +27,7 @@ class AccountSearchService < BaseService
 
     return @exact_match if defined?(@exact_match)
 
-    @exact_match = begin
+    match = begin
       if options[:resolve]
         ResolveAccountService.new.call(query)
       elsif domain_is_local?
@@ -36,6 +36,10 @@ class AccountSearchService < BaseService
         Account.find_remote(query_username, query_domain)
       end
     end
+
+    match = nil if !match.nil? && !account.nil? && options[:following] && !account.following?(match)
+
+    @exact_match = match
   end
 
   def search_results
diff --git a/app/services/activitypub/fetch_remote_account_service.rb b/app/services/activitypub/fetch_remote_account_service.rb
index 83fbf6d07d32bd155883406d69e886792499e0c3..9d01f538687ed2d6d20d1c8b1c3f0a35771802e4 100644
--- a/app/services/activitypub/fetch_remote_account_service.rb
+++ b/app/services/activitypub/fetch_remote_account_service.rb
@@ -28,7 +28,7 @@ class ActivityPub::FetchRemoteAccountService < BaseService
 
     return unless only_key || verified_webfinger?
 
-    ActivityPub::ProcessAccountService.new.call(@username, @domain, @json, only_key: only_key)
+    ActivityPub::ProcessAccountService.new.call(@username, @domain, @json, only_key: only_key, verified_webfinger: !only_key)
   rescue Oj::ParseError
     nil
   end
@@ -39,17 +39,16 @@ class ActivityPub::FetchRemoteAccountService < BaseService
     webfinger                            = webfinger!("acct:#{@username}@#{@domain}")
     confirmed_username, confirmed_domain = split_acct(webfinger.subject)
 
-    return webfinger.link('self')&.href == @uri if @username.casecmp(confirmed_username).zero? && @domain.casecmp(confirmed_domain).zero?
+    return webfinger.link('self', 'href') == @uri if @username.casecmp(confirmed_username).zero? && @domain.casecmp(confirmed_domain).zero?
 
     webfinger                            = webfinger!("acct:#{confirmed_username}@#{confirmed_domain}")
     @username, @domain                   = split_acct(webfinger.subject)
-    self_reference                       = webfinger.link('self')
 
     return false unless @username.casecmp(confirmed_username).zero? && @domain.casecmp(confirmed_domain).zero?
-    return false if self_reference&.href != @uri
+    return false if webfinger.link('self', 'href') != @uri
 
     true
-  rescue Goldfinger::Error
+  rescue Webfinger::Error
     false
   end
 
diff --git a/app/services/activitypub/prepare_followers_synchronization_service.rb b/app/services/activitypub/prepare_followers_synchronization_service.rb
new file mode 100644
index 0000000000000000000000000000000000000000..2d22ed701e8722f8beef2f407d8e8d9b6661d517
--- /dev/null
+++ b/app/services/activitypub/prepare_followers_synchronization_service.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class ActivityPub::PrepareFollowersSynchronizationService < BaseService
+  include JsonLdHelper
+
+  def call(account, params)
+    @account = account
+
+    return if params['collectionId'] != @account.followers_url || invalid_origin?(params['url']) || @account.local_followers_hash == params['digest']
+
+    ActivityPub::FollowersSynchronizationWorker.perform_async(@account.id, params['url'])
+  end
+end
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index 85b915ec6752f4a5e298bf3ff1b4589e232f88fd..6afeb92d62612c393152ee59ac3ad66f79295fa8 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -18,15 +18,18 @@ class ActivityPub::ProcessAccountService < BaseService
 
     RedisLock.acquire(lock_options) do |lock|
       if lock.acquired?
-        @account          = Account.remote.find_by(uri: @uri) if @options[:only_key]
-        @account        ||= Account.find_remote(@username, @domain)
-        @old_public_key   = @account&.public_key
-        @old_protocol     = @account&.protocol
+        @account            = Account.remote.find_by(uri: @uri) if @options[:only_key]
+        @account          ||= Account.find_remote(@username, @domain)
+        @old_public_key     = @account&.public_key
+        @old_protocol       = @account&.protocol
+        @suspension_changed = false
 
         create_account if @account.nil?
         update_account
         process_tags
         process_attachments
+
+        process_duplicate_accounts! if @options[:verified_webfinger]
       else
         raise Mastodon::RaceConditionError
       end
@@ -37,8 +40,9 @@ class ActivityPub::ProcessAccountService < BaseService
     after_protocol_change! if protocol_changed?
     after_key_change! if key_changed? && !@options[:signed_with_known_key]
     clear_tombstones! if key_changed?
+    after_suspension_change! if suspension_changed?
 
-    unless @options[:only_key]
+    unless @options[:only_key] || @account.suspended?
       check_featured_collection! if @account.featured_collection_url.present?
       check_links! unless @account.fields.empty?
     end
@@ -52,46 +56,57 @@ class ActivityPub::ProcessAccountService < BaseService
 
   def create_account
     @account = Account.new
-    @account.protocol     = :activitypub
-    @account.username     = @username
-    @account.domain       = @domain
-    @account.private_key  = nil
-    @account.suspended_at = domain_block.created_at if auto_suspend?
-    @account.silenced_at  = domain_block.created_at if auto_silence?
+    @account.protocol          = :activitypub
+    @account.username          = @username
+    @account.domain            = @domain
+    @account.private_key       = nil
+    @account.suspended_at      = domain_block.created_at if auto_suspend?
+    @account.suspension_origin = :local if auto_suspend?
+    @account.silenced_at       = domain_block.created_at if auto_silence?
+    @account.save
   end
 
   def update_account
     @account.last_webfingered_at = Time.now.utc unless @options[:only_key]
     @account.protocol            = :activitypub
 
-    set_immediate_attributes!
-    set_fetchable_attributes! unless @options[:only_keys]
+    set_suspension!
+    set_immediate_protocol_attributes!
+    set_fetchable_key! unless @account.suspended? && @account.suspension_origin_local?
+    set_immediate_attributes! unless @account.suspended?
+    set_fetchable_attributes! unless @options[:only_key] || @account.suspended?
 
     @account.save_with_optional_media!
   end
 
-  def set_immediate_attributes!
+  def set_immediate_protocol_attributes!
     @account.inbox_url               = @json['inbox'] || ''
     @account.outbox_url              = @json['outbox'] || ''
     @account.shared_inbox_url        = (@json['endpoints'].is_a?(Hash) ? @json['endpoints']['sharedInbox'] : @json['sharedInbox']) || ''
     @account.followers_url           = @json['followers'] || ''
-    @account.featured_collection_url = @json['featured'] || ''
-    @account.devices_url             = @json['devices'] || ''
     @account.url                     = url || @uri
     @account.uri                     = @uri
+    @account.actor_type              = actor_type
+  end
+
+  def set_immediate_attributes!
+    @account.featured_collection_url = @json['featured'] || ''
+    @account.devices_url             = @json['devices'] || ''
     @account.display_name            = @json['name'] || ''
     @account.note                    = @json['summary'] || ''
     @account.locked                  = @json['manuallyApprovesFollowers'] || false
     @account.fields                  = property_values || {}
     @account.also_known_as           = as_array(@json['alsoKnownAs'] || []).map { |item| value_or_id(item) }
-    @account.actor_type              = actor_type
     @account.discoverable            = @json['discoverable'] || false
   end
 
+  def set_fetchable_key!
+    @account.public_key        = public_key || ''
+  end
+
   def set_fetchable_attributes!
     @account.avatar_remote_url = image_url('icon')  || '' unless skip_download?
     @account.header_remote_url = image_url('image') || '' unless skip_download?
-    @account.public_key        = public_key || ''
     @account.statuses_count    = outbox_total_items    if outbox_total_items.present?
     @account.following_count   = following_total_items if following_total_items.present?
     @account.followers_count   = followers_total_items if followers_total_items.present?
@@ -99,6 +114,18 @@ class ActivityPub::ProcessAccountService < BaseService
     @account.moved_to_account  = @json['movedTo'].present? ? moved_account : nil
   end
 
+  def set_suspension!
+    return if @account.suspended? && @account.suspension_origin_local?
+
+    if @account.suspended? && !@json['suspended']
+      @account.unsuspend!
+      @suspension_changed = true
+    elsif !@account.suspended? && @json['suspended']
+      @account.suspend!(origin: :remote)
+      @suspension_changed = true
+    end
+  end
+
   def after_protocol_change!
     ActivityPub::PostUpgradeWorker.perform_async(@account.domain)
   end
@@ -107,6 +134,14 @@ class ActivityPub::ProcessAccountService < BaseService
     RefollowWorker.perform_async(@account.id)
   end
 
+  def after_suspension_change!
+    if @account.suspended?
+      Admin::SuspensionWorker.perform_async(@account.id)
+    else
+      Admin::UnsuspensionWorker.perform_async(@account.id)
+    end
+  end
+
   def check_featured_collection!
     ActivityPub::SynchronizeFeaturedCollectionWorker.perform_async(@account.id)
   end
@@ -115,6 +150,12 @@ class ActivityPub::ProcessAccountService < BaseService
     VerifyAccountLinksWorker.perform_async(@account.id)
   end
 
+  def process_duplicate_accounts!
+    return unless Account.where(uri: @account.uri).where.not(id: @account.id).exists?
+
+    AccountMergingWorker.perform_async(@account.id)
+  end
+
   def actor_type
     if @json['type'].is_a?(Array)
       @json['type'].find { |type| ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES.include?(type) }
@@ -196,7 +237,7 @@ class ActivityPub::ProcessAccountService < BaseService
     total_items = collection.is_a?(Hash) && collection['totalItems'].present? && collection['totalItems'].is_a?(Numeric) ? collection['totalItems'] : nil
     has_first_page = collection.is_a?(Hash) && collection['first'].present?
     @collections[type] = [total_items, has_first_page]
-  rescue HTTP::Error, OpenSSL::SSL::SSLError
+  rescue HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::LengthValidationError
     @collections[type] = [nil, nil]
   end
 
@@ -227,6 +268,10 @@ class ActivityPub::ProcessAccountService < BaseService
     !@old_public_key.nil? && @old_public_key != @account.public_key
   end
 
+  def suspension_changed?
+    @suspension_changed
+  end
+
   def clear_tombstones!
     Tombstone.where(account_id: @account.id).delete_all
   end
diff --git a/app/services/activitypub/process_collection_service.rb b/app/services/activitypub/process_collection_service.rb
index e6ccaccc90f3e61cbdf27ab095c59e82330e7213..f1d175dacc1996043ba0513dc97f2161c545e2c8 100644
--- a/app/services/activitypub/process_collection_service.rb
+++ b/app/services/activitypub/process_collection_service.rb
@@ -8,7 +8,7 @@ class ActivityPub::ProcessCollectionService < BaseService
     @json    = Oj.load(body, mode: :strict)
     @options = options
 
-    return if !supported_context? || (different_actor? && verify_account!.nil?) || @account.suspended? || @account.local?
+    return if !supported_context? || (different_actor? && verify_account!.nil?) || suspended_actor? || @account.local?
 
     case @json['type']
     when 'Collection', 'CollectionPage'
@@ -28,6 +28,14 @@ class ActivityPub::ProcessCollectionService < BaseService
     @json['actor'].present? && value_or_id(@json['actor']) != @account.uri
   end
 
+  def suspended_actor?
+    @account.suspended? && !activity_allowed_while_suspended?
+  end
+
+  def activity_allowed_while_suspended?
+    %w(Delete Reject Undo Update).include?(@json['type'])
+  end
+
   def process_items(items)
     items.reverse_each.map { |item| process_item(item) }.compact
   end
diff --git a/app/services/activitypub/synchronize_followers_service.rb b/app/services/activitypub/synchronize_followers_service.rb
new file mode 100644
index 0000000000000000000000000000000000000000..d83fcf55e665c9a6b9ccb3a937dfc12ccd17b529
--- /dev/null
+++ b/app/services/activitypub/synchronize_followers_service.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+class ActivityPub::SynchronizeFollowersService < BaseService
+  include JsonLdHelper
+  include Payloadable
+
+  def call(account, partial_collection_url)
+    @account = account
+
+    items = collection_items(partial_collection_url)
+    return if items.nil?
+
+    # There could be unresolved accounts (hence the call to .compact) but this
+    # should never happen in practice, since in almost all cases we keep an
+    # Account record, and should we not do that, we should have sent a Delete.
+    # In any case there is not much we can do if that occurs.
+    @expected_followers = items.map { |uri| ActivityPub::TagManager.instance.uri_to_resource(uri, Account) }.compact
+
+    remove_unexpected_local_followers!
+    handle_unexpected_outgoing_follows!
+  end
+
+  private
+
+  def remove_unexpected_local_followers!
+    @account.followers.local.where.not(id: @expected_followers.map(&:id)).each do |unexpected_follower|
+      UnfollowService.new.call(unexpected_follower, @account)
+    end
+  end
+
+  def handle_unexpected_outgoing_follows!
+    @expected_followers.each do |expected_follower|
+      next if expected_follower.following?(@account)
+
+      if expected_follower.requested?(@account)
+        # For some reason the follow request went through but we missed it
+        expected_follower.follow_requests.find_by(target_account: @account)&.authorize!
+      else
+        # Since we were not aware of the follow from our side, we do not have an
+        # ID for it that we can include in the Undo activity. For this reason,
+        # the Undo may not work with software that relies exclusively on
+        # matching activity IDs and not the actor and target
+        follow = Follow.new(account: expected_follower, target_account: @account)
+        ActivityPub::DeliveryWorker.perform_async(build_undo_follow_json(follow), follow.account_id, follow.target_account.inbox_url)
+      end
+    end
+  end
+
+  def build_undo_follow_json(follow)
+    Oj.dump(serialize_payload(follow, ActivityPub::UndoFollowSerializer))
+  end
+
+  def collection_items(collection_or_uri)
+    collection = fetch_collection(collection_or_uri)
+    return unless collection.is_a?(Hash)
+
+    collection = fetch_collection(collection['first']) if collection['first'].present?
+    return unless collection.is_a?(Hash)
+
+    case collection['type']
+    when 'Collection', 'CollectionPage'
+      collection['items']
+    when 'OrderedCollection', 'OrderedCollectionPage'
+      collection['orderedItems']
+    end
+  end
+
+  def fetch_collection(collection_or_uri)
+    return collection_or_uri if collection_or_uri.is_a?(Hash)
+    return if invalid_origin?(collection_or_uri)
+
+    fetch_resource_without_id_validation(collection_or_uri, nil, true)
+  end
+end
diff --git a/app/services/after_block_service.rb b/app/services/after_block_service.rb
index 2a0e10a79a60e294edb490ed928b58e6541e3908..314919df8851145341e42e8225d1362500859b1a 100644
--- a/app/services/after_block_service.rb
+++ b/app/services/after_block_service.rb
@@ -13,7 +13,7 @@ class AfterBlockService < BaseService
   private
 
   def clear_home_feed!
-    FeedManager.instance.clear_from_timeline(@account, @target_account)
+    FeedManager.instance.clear_from_home(@account, @target_account)
   end
 
   def clear_conversations!
diff --git a/app/services/after_unallow_domain_service.rb b/app/services/after_unallow_domain_service.rb
index ccd0b8ae919f653ce0c8f51d0721f3b6cd8af756..d3008a1052f0186f3821c89fc11036bb43437657 100644
--- a/app/services/after_unallow_domain_service.rb
+++ b/app/services/after_unallow_domain_service.rb
@@ -3,7 +3,7 @@
 class AfterUnallowDomainService < BaseService
   def call(domain)
     Account.where(domain: domain).find_each do |account|
-      SuspendAccountService.new.call(account, reserve_username: false)
+      DeleteAccountService.new.call(account, reserve_username: false)
     end
   end
 end
diff --git a/app/services/app_sign_up_service.rb b/app/services/app_sign_up_service.rb
index c9739c77d194796e738057d8856fc4421f2c01af..e006941577228e4ff1fe8979e5e8d24f15217b00 100644
--- a/app/services/app_sign_up_service.rb
+++ b/app/services/app_sign_up_service.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 class AppSignUpService < BaseService
-  def call(app, params)
+  def call(app, remote_ip, params)
     return unless allowed_registrations?
 
     user_params           = params.slice(:email, :password, :agreement, :locale)
     account_params        = params.slice(:username)
     invite_request_params = { text: params[:reason] }
-    user                  = User.create!(user_params.merge(created_by_application: app, password_confirmation: user_params[:password], account_attributes: account_params, invite_request_attributes: invite_request_params))
+    user                  = User.create!(user_params.merge(created_by_application: app, sign_up_ip: remote_ip, password_confirmation: user_params[:password], account_attributes: account_params, invite_request_attributes: invite_request_params))
 
     Doorkeeper::AccessToken.create!(application: app,
                                     resource_owner_id: user.id,
diff --git a/app/services/batched_remove_status_service.rb b/app/services/batched_remove_status_service.rb
index 2295a01dc3d613bf2499af71d6672c8b64bbfa1d..b54bcae3504d8f976e279d3e747db6725045151c 100644
--- a/app/services/batched_remove_status_service.rb
+++ b/app/services/batched_remove_status_service.rb
@@ -3,32 +3,40 @@
 class BatchedRemoveStatusService < BaseService
   include Redisable
 
-  # Delete given statuses and reblogs of them
-  # Dispatch PuSH updates of the deleted statuses, but only local ones
-  # Dispatch Salmon deletes, unique per domain, of the deleted statuses, but only local ones
-  # Remove statuses from home feeds
-  # Push delete events to streaming API for home feeds and public feeds
-  # @param [Enumerable<Status>] statuses A preferably batched array of statuses
+  # Delete multiple statuses and reblogs of them as efficiently as possible
+  # @param [Enumerable<Status>] statuses An array of statuses
   # @param [Hash] options
-  # @option [Boolean] :skip_side_effects
+  # @option [Boolean] :skip_side_effects Do not modify feeds and send updates to streaming API
   def call(statuses, **options)
-    statuses = Status.where(id: statuses.map(&:id)).includes(:account).flat_map { |status| [status] + status.reblogs.includes(:account).to_a }
+    ActiveRecord::Associations::Preloader.new.preload(statuses, options[:skip_side_effects] ? :reblogs : [:account, :tags, reblogs: :account])
 
-    @mentions = statuses.each_with_object({}) { |s, h| h[s.id] = s.active_mentions.includes(:account).to_a }
-    @tags     = statuses.each_with_object({}) { |s, h| h[s.id] = s.tags.pluck(:name) }
+    statuses_and_reblogs = statuses.flat_map { |status| [status] + status.reblogs }
 
-    @json_payloads = statuses.each_with_object({}) { |s, h| h[s.id] = Oj.dump(event: :delete, payload: s.id.to_s) }
+    # The conversations for direct visibility statuses also need
+    # to be manually updated. This part is not efficient but we
+    # rely on direct visibility statuses being relatively rare.
+    statuses_with_account_conversations = statuses.select(&:direct_visibility?)
 
-    # Ensure that rendered XML reflects destroyed state
-    statuses.each do |status|
-      status.mark_for_mass_destruction!
-      status.destroy
+    ActiveRecord::Associations::Preloader.new.preload(statuses_with_account_conversations, [mentions: :account])
+
+    statuses_with_account_conversations.each do |status|
+      status.send(:unlink_from_conversations)
     end
 
+    # We do not batch all deletes into one to avoid having a long-running
+    # transaction lock the database, but we use the delete method instead
+    # of destroy to avoid all callbacks. We rely on foreign keys to
+    # cascade the delete faster without loading the associations.
+    statuses_and_reblogs.each_slice(50) { |slice| Status.where(id: slice.map(&:id)).delete_all }
+
+    # Since we skipped all callbacks, we also need to manually
+    # deindex the statuses
+    Chewy.strategy.current.update(StatusesIndex::Status, statuses_and_reblogs) if Chewy.enabled?
+
     return if options[:skip_side_effects]
 
     # Batch by source account
-    statuses.group_by(&:account_id).each_value do |account_statuses|
+    statuses_and_reblogs.group_by(&:account_id).each_value do |account_statuses|
       account = account_statuses.first.account
 
       next unless account
@@ -38,19 +46,18 @@ class BatchedRemoveStatusService < BaseService
     end
 
     # Cannot be batched
-    statuses.each do |status|
-      unpush_from_public_timelines(status)
+    @status_id_cutoff = Mastodon::Snowflake.id_at(2.weeks.ago)
+    redis.pipelined do
+      statuses.each do |status|
+        unpush_from_public_timelines(status)
+      end
     end
   end
 
   private
 
   def unpush_from_home_timelines(account, statuses)
-    recipients = account.followers_for_local_distribution.to_a
-
-    recipients << account if account.local?
-
-    recipients.each do |follower|
+    account.followers_for_local_distribution.includes(:user).reorder(nil).find_each do |follower|
       statuses.each do |status|
         FeedManager.instance.unpush_from_home(follower, status)
       end
@@ -58,7 +65,7 @@ class BatchedRemoveStatusService < BaseService
   end
 
   def unpush_from_list_timelines(account, statuses)
-    account.lists_for_local_distribution.select(:id, :account_id).each do |list|
+    account.lists_for_local_distribution.select(:id, :account_id).includes(account: :user).reorder(nil).find_each do |list|
       statuses.each do |status|
         FeedManager.instance.unpush_from_list(list, status)
       end
@@ -66,30 +73,21 @@ class BatchedRemoveStatusService < BaseService
   end
 
   def unpush_from_public_timelines(status)
-    return unless status.public_visibility?
+    return unless status.public_visibility? && status.id > @status_id_cutoff
 
-    payload = @json_payloads[status.id]
+    payload = Oj.dump(event: :delete, payload: status.id.to_s)
 
-    redis.pipelined do
-      redis.publish('timeline:public', payload)
-      if status.local?
-        redis.publish('timeline:public:local', payload)
-      else
-        redis.publish('timeline:public:remote', payload)
-      end
-      if status.media_attachments.any?
-        redis.publish('timeline:public:media', payload)
-        if status.local?
-          redis.publish('timeline:public:local:media', payload)
-        else
-          redis.publish('timeline:public:remote:media', payload)
-        end
-      end
+    redis.publish('timeline:public', payload)
+    redis.publish(status.local? ? 'timeline:public:local' : 'timeline:public:remote', payload)
 
-      @tags[status.id].each do |hashtag|
-        redis.publish("timeline:hashtag:#{hashtag.mb_chars.downcase}", payload)
-        redis.publish("timeline:hashtag:#{hashtag.mb_chars.downcase}:local", payload) if status.local?
-      end
+    if status.media_attachments.any?
+      redis.publish('timeline:public:media', payload)
+      redis.publish(status.local? ? 'timeline:public:local:media' : 'timeline:public:remote:media', payload)
+    end
+
+    status.tags.map { |tag| tag.name.mb_chars.downcase }.each do |hashtag|
+      redis.publish("timeline:hashtag:#{hashtag}", payload)
+      redis.publish("timeline:hashtag:#{hashtag}:local", payload) if status.local?
     end
   end
 end
diff --git a/app/services/block_domain_service.rb b/app/services/block_domain_service.rb
index dc23ef8d8a8e5019e44b783190ad44eebd901ba7..76cc36ff6b0d005adede48ca8be89cf0027bebf6 100644
--- a/app/services/block_domain_service.rb
+++ b/app/services/block_domain_service.rb
@@ -16,7 +16,7 @@ class BlockDomainService < BaseService
     scope = Account.by_domain_and_subdomains(domain_block.domain)
 
     scope.where(silenced_at: domain_block.created_at).in_batches.update_all(silenced_at: nil) unless domain_block.silence?
-    scope.where(suspended_at: domain_block.created_at).in_batches.update_all(suspended_at: nil) unless domain_block.suspend?
+    scope.where(suspended_at: domain_block.created_at).in_batches.update_all(suspended_at: nil, suspension_origin: nil) unless domain_block.suspend?
   end
 
   def process_domain_block!
@@ -34,9 +34,10 @@ class BlockDomainService < BaseService
   end
 
   def suspend_accounts!
-    blocked_domain_accounts.without_suspended.in_batches.update_all(suspended_at: @domain_block.created_at)
+    blocked_domain_accounts.without_suspended.in_batches.update_all(suspended_at: @domain_block.created_at, suspension_origin: :local)
+
     blocked_domain_accounts.where(suspended_at: @domain_block.created_at).reorder(nil).find_each do |account|
-      SuspendAccountService.new.call(account, reserve_username: true, suspended_at: @domain_block.created_at)
+      DeleteAccountService.new.call(account, reserve_username: true, suspended_at: @domain_block.created_at)
     end
   end
 
diff --git a/app/services/delete_account_service.rb b/app/services/delete_account_service.rb
new file mode 100644
index 0000000000000000000000000000000000000000..802799ccd9b96389fc644202f3a9e4395acb841f
--- /dev/null
+++ b/app/services/delete_account_service.rb
@@ -0,0 +1,307 @@
+# frozen_string_literal: true
+
+class DeleteAccountService < BaseService
+  include Payloadable
+
+  ASSOCIATIONS_ON_SUSPEND = %w(
+    account_pins
+    active_relationships
+    aliases
+    block_relationships
+    blocked_by_relationships
+    conversation_mutes
+    conversations
+    custom_filters
+    devices
+    domain_blocks
+    featured_tags
+    follow_requests
+    identity_proofs
+    list_accounts
+    migrations
+    mute_relationships
+    muted_by_relationships
+    notifications
+    owned_lists
+    passive_relationships
+    report_notes
+    scheduled_statuses
+    status_pins
+  ).freeze
+
+  # The following associations have no important side-effects
+  # in callbacks and all of their own associations are secured
+  # by foreign keys, making them safe to delete without loading
+  # into memory
+  ASSOCIATIONS_WITHOUT_SIDE_EFFECTS = %w(
+    account_pins
+    aliases
+    conversation_mutes
+    conversations
+    custom_filters
+    devices
+    domain_blocks
+    featured_tags
+    follow_requests
+    identity_proofs
+    list_accounts
+    migrations
+    mute_relationships
+    muted_by_relationships
+    notifications
+    owned_lists
+    scheduled_statuses
+    status_pins
+  )
+
+  ASSOCIATIONS_ON_DESTROY = %w(
+    reports
+    targeted_moderation_notes
+    targeted_reports
+  ).freeze
+
+  # Suspend or remove an account and remove as much of its data
+  # as possible. If it's a local account and it has not been confirmed
+  # or never been approved, then side effects are skipped and both
+  # the user and account records are removed fully. Otherwise,
+  # it is controlled by options.
+  # @param [Account]
+  # @param [Hash] options
+  # @option [Boolean] :reserve_email Keep user record. Only applicable for local accounts
+  # @option [Boolean] :reserve_username Keep account record
+  # @option [Boolean] :skip_side_effects Side effects are ActivityPub and streaming API payloads
+  # @option [Boolean] :skip_activitypub Skip sending ActivityPub payloads. Implied by :skip_side_effects
+  # @option [Time]    :suspended_at Only applicable when :reserve_username is true
+  def call(account, **options)
+    @account = account
+    @options = { reserve_username: true, reserve_email: true }.merge(options)
+
+    if @account.local? && @account.user_unconfirmed_or_pending?
+      @options[:reserve_email]     = false
+      @options[:reserve_username]  = false
+      @options[:skip_side_effects] = true
+    end
+
+    @options[:skip_activitypub] = true if @options[:skip_side_effects]
+
+    distribute_activities!
+    purge_content!
+    fulfill_deletion_request!
+  end
+
+  private
+
+  def distribute_activities!
+    return if skip_activitypub?
+
+    if @account.local?
+      delete_actor!
+    elsif @account.activitypub?
+      reject_follows!
+      undo_follows!
+    end
+  end
+
+  def reject_follows!
+    # When deleting a remote account, the account obviously doesn't
+    # actually become deleted on its origin server, i.e. unlike a
+    # locally deleted account it continues to have access to its home
+    # feed and other content. To prevent it from being able to continue
+    # to access toots it would receive because it follows local accounts,
+    # we have to force it to unfollow them.
+
+    ActivityPub::DeliveryWorker.push_bulk(Follow.where(account: @account)) do |follow|
+      [Oj.dump(serialize_payload(follow, ActivityPub::RejectFollowSerializer)), follow.target_account_id, @account.inbox_url]
+    end
+  end
+
+  def undo_follows!
+    # When deleting a remote account, the account obviously doesn't
+    # actually become deleted on its origin server, but following relationships
+    # are severed on our end. Therefore, make the remote server aware that the
+    # follow relationships are severed to avoid confusion and potential issues
+    # if the remote account gets un-suspended.
+
+    ActivityPub::DeliveryWorker.push_bulk(Follow.where(target_account: @account)) do |follow|
+      [Oj.dump(serialize_payload(follow, ActivityPub::UndoFollowSerializer)), follow.account_id, @account.inbox_url]
+    end
+  end
+
+  def purge_user!
+    return if !@account.local? || @account.user.nil?
+
+    if keep_user_record?
+      @account.user.disable!
+      @account.user.invites.where(uses: 0).destroy_all
+    else
+      @account.user.destroy
+    end
+  end
+
+  def purge_content!
+    purge_user!
+    purge_profile!
+    purge_statuses!
+    purge_mentions!
+    purge_media_attachments!
+    purge_polls!
+    purge_generated_notifications!
+    purge_favourites!
+    purge_bookmarks!
+    purge_feeds!
+    purge_other_associations!
+
+    @account.destroy unless keep_account_record?
+  end
+
+  def purge_statuses!
+    @account.statuses.reorder(nil).where.not(id: reported_status_ids).in_batches do |statuses|
+      BatchedRemoveStatusService.new.call(statuses, skip_side_effects: skip_side_effects?)
+    end
+  end
+
+  def purge_mentions!
+    @account.mentions.reorder(nil).where.not(status_id: reported_status_ids).in_batches.delete_all
+  end
+
+  def purge_media_attachments!
+    @account.media_attachments.reorder(nil).find_each do |media_attachment|
+      next if keep_account_record? && reported_status_ids.include?(media_attachment.status_id)
+
+      media_attachment.destroy
+    end
+  end
+
+  def purge_polls!
+    @account.polls.reorder(nil).where.not(status_id: reported_status_ids).in_batches.delete_all
+  end
+
+  def purge_generated_notifications!
+    # By deleting polls and statuses without callbacks, we've left behind
+    # polymorphically associated notifications generated by this account
+
+    Notification.where(from_account: @account).in_batches.delete_all
+  end
+
+  def purge_favourites!
+    @account.favourites.in_batches do |favourites|
+      ids = favourites.pluck(:status_id)
+      StatusStat.where(status_id: ids).update_all('favourites_count = GREATEST(0, favourites_count - 1)')
+      Chewy.strategy.current.update(StatusesIndex::Status, ids) if Chewy.enabled?
+      # Rails.cache.delete_multi would be better, but we don't have it yet
+      ids.each { |id| Rails.cache.delete("statuses/#{id}") }
+      favourites.delete_all
+    end
+  end
+
+  def purge_bookmarks!
+    @account.bookmarks.in_batches do |bookmarks|
+      Chewy.strategy.current.update(StatusesIndex::Status, bookmarks.pluck(:status_id)) if Chewy.enabled?
+      bookmarks.delete_all
+    end
+  end
+
+  def purge_other_associations!
+    associations_for_destruction.each do |association_name|
+      purge_association(association_name)
+    end
+  end
+
+  def purge_feeds!
+    return unless @account.local?
+
+    FeedManager.instance.clean_feeds!(:home, [@account.id])
+    FeedManager.instance.clean_feeds!(:list, @account.owned_lists.pluck(:id))
+  end
+
+  def purge_profile!
+    # If the account is going to be destroyed
+    # there is no point wasting time updating
+    # its values first
+
+    return unless keep_account_record?
+
+    @account.silenced_at       = nil
+    @account.suspended_at      = @options[:suspended_at] || Time.now.utc
+    @account.suspension_origin = :local
+    @account.locked            = false
+    @account.memorial          = false
+    @account.discoverable      = false
+    @account.display_name      = ''
+    @account.note              = ''
+    @account.fields            = []
+    @account.statuses_count    = 0
+    @account.followers_count   = 0
+    @account.following_count   = 0
+    @account.moved_to_account  = nil
+    @account.also_known_as     = []
+    @account.trust_level       = :untrusted
+    @account.avatar.destroy
+    @account.header.destroy
+    @account.save!
+  end
+
+  def fulfill_deletion_request!
+    @account.deletion_request&.destroy
+  end
+
+  def purge_association(association_name)
+    association = @account.public_send(association_name)
+
+    if ASSOCIATIONS_WITHOUT_SIDE_EFFECTS.include?(association_name)
+      association.in_batches.delete_all
+    else
+      association.in_batches.destroy_all
+    end
+  end
+
+  def delete_actor!
+    ActivityPub::DeliveryWorker.push_bulk(delivery_inboxes) do |inbox_url|
+      [delete_actor_json, @account.id, inbox_url]
+    end
+
+    ActivityPub::LowPriorityDeliveryWorker.push_bulk(low_priority_delivery_inboxes) do |inbox_url|
+      [delete_actor_json, @account.id, inbox_url]
+    end
+  end
+
+  def delete_actor_json
+    @delete_actor_json ||= Oj.dump(serialize_payload(@account, ActivityPub::DeleteActorSerializer, signer: @account))
+  end
+
+  def delivery_inboxes
+    @delivery_inboxes ||= @account.followers.inboxes + Relay.enabled.pluck(:inbox_url)
+  end
+
+  def low_priority_delivery_inboxes
+    Account.inboxes - delivery_inboxes
+  end
+
+  def reported_status_ids
+    @reported_status_ids ||= Report.where(target_account: @account).unresolved.pluck(:status_ids).flatten.uniq
+  end
+
+  def associations_for_destruction
+    if keep_account_record?
+      ASSOCIATIONS_ON_SUSPEND
+    else
+      ASSOCIATIONS_ON_SUSPEND + ASSOCIATIONS_ON_DESTROY
+    end
+  end
+
+  def keep_user_record?
+    @options[:reserve_email]
+  end
+
+  def keep_account_record?
+    @options[:reserve_username]
+  end
+
+  def skip_side_effects?
+    @options[:skip_side_effects]
+  end
+
+  def skip_activitypub?
+    @options[:skip_activitypub]
+  end
+end
diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index 276eac0c18c93224192596a2cf3e99abd81c3d6b..b72bb82d3faea4f9e9bf0b776f21eaba809012a2 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -6,20 +6,22 @@ class FanOutOnWriteService < BaseService
   def call(status)
     raise Mastodon::RaceConditionError if status.visibility.nil?
 
-    render_anonymous_payload(status)
+    deliver_to_self(status) if status.account.local?
 
     if status.direct_visibility?
+      deliver_to_mentioned_followers(status)
       deliver_to_own_conversation(status)
     elsif status.limited_visibility?
       deliver_to_mentioned_followers(status)
     else
-      deliver_to_self(status) if status.account.local?
       deliver_to_followers(status)
       deliver_to_lists(status)
     end
 
     return if status.account.silenced? || !status.public_visibility? || status.reblog?
 
+    render_anonymous_payload(status)
+
     deliver_to_hashtags(status)
 
     return if status.reply? && status.in_reply_to_account_id != status.account_id
@@ -58,8 +60,10 @@ class FanOutOnWriteService < BaseService
   def deliver_to_mentioned_followers(status)
     Rails.logger.debug "Delivering status #{status.id} to limited followers"
 
-    FeedInsertWorker.push_bulk(status.mentions.includes(:account).map(&:account).select { |mentioned_account| mentioned_account.local? && mentioned_account.following?(status.account) }) do |follower|
-      [status.id, follower.id, :home]
+    status.mentions.joins(:account).merge(status.account.followers_for_local_distribution).select(:id, :account_id).reorder(nil).find_in_batches do |mentions|
+      FeedInsertWorker.push_bulk(mentions) do |mention|
+        [status.id, mention.account_id, :home]
+      end
     end
   end
 
diff --git a/app/services/favourite_service.rb b/app/services/favourite_service.rb
index 02b26458a6fa09e7934354c22443ec1768d55d1b..a0ab3b4b755603c046034df4dc6859442bec51f5 100644
--- a/app/services/favourite_service.rb
+++ b/app/services/favourite_service.rb
@@ -29,7 +29,7 @@ class FavouriteService < BaseService
     status = favourite.status
 
     if status.account.local?
-      NotifyService.new.call(status.account, favourite)
+      NotifyService.new.call(status.account, :favourite, favourite)
     elsif status.account.activitypub?
       ActivityPub::DeliveryWorker.perform_async(build_json(favourite), favourite.account_id, status.account.inbox_url)
     end
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index beab449b27389d576a9965f1d3dd9fdb6ba6f598..7efa310547efcdff47144fae63ffd6420207ca1f 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -78,6 +78,7 @@ class FetchLinkCardService < BaseService
     uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme)
   end
 
+  # rubocop:disable Naming/MethodParameterName
   def mention_link?(a)
     @status.mentions.any? do |mention|
       a['href'] == ActivityPub::TagManager.instance.url_for(mention.account)
@@ -88,6 +89,7 @@ class FetchLinkCardService < BaseService
     # Avoid links for hashtags and mentions (microformats)
     a['rel']&.include?('tag') || a['class']&.match?(/u-url|h-card/) || mention_link?(a)
   end
+  # rubocop:enable Naming/MethodParameterName
 
   def attempt_oembed
     service         = FetchOEmbedService.new
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index 311ae7fa688dd65c14ae1869bcd556e66b9e3f60..b98f7011d1887e55460ef042f2c99127293bed75 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -9,12 +9,14 @@ class FollowService < BaseService
   # @param [String, Account] uri User URI to follow in the form of username@domain (or account record)
   # @param [Hash] options
   # @option [Boolean] :reblogs Whether or not to show reblogs, defaults to true
+  # @option [Boolean] :notify Whether to create notifications about new posts, defaults to false
   # @option [Boolean] :bypass_locked
+  # @option [Boolean] :bypass_limit Allow following past the total follow number
   # @option [Boolean] :with_rate_limit
   def call(source_account, target_account, options = {})
     @source_account = source_account
     @target_account = ResolveAccountService.new.call(target_account, skip_webfinger: true)
-    @options        = { reblogs: true, bypass_locked: false, with_rate_limit: false }.merge(options)
+    @options        = { bypass_locked: false, bypass_limit: false, with_rate_limit: false }.merge(options)
 
     raise ActiveRecord::RecordNotFound if following_not_possible?
     raise Mastodon::NotPermittedError  if following_not_allowed?
@@ -45,18 +47,18 @@ class FollowService < BaseService
   end
 
   def change_follow_options!
-    @source_account.follow!(@target_account, reblogs: @options[:reblogs])
+    @source_account.follow!(@target_account, reblogs: @options[:reblogs], notify: @options[:notify])
   end
 
   def change_follow_request_options!
-    @source_account.request_follow!(@target_account, reblogs: @options[:reblogs])
+    @source_account.request_follow!(@target_account, reblogs: @options[:reblogs], notify: @options[:notify])
   end
 
   def request_follow!
-    follow_request = @source_account.request_follow!(@target_account, reblogs: @options[:reblogs], rate_limit: @options[:with_rate_limit])
+    follow_request = @source_account.request_follow!(@target_account, reblogs: @options[:reblogs], notify: @options[:notify], rate_limit: @options[:with_rate_limit], bypass_limit: @options[:bypass_limit])
 
     if @target_account.local?
-      LocalNotificationWorker.perform_async(@target_account.id, follow_request.id, follow_request.class.name)
+      LocalNotificationWorker.perform_async(@target_account.id, follow_request.id, follow_request.class.name, :follow_request)
     elsif @target_account.activitypub?
       ActivityPub::DeliveryWorker.perform_async(build_json(follow_request), @source_account.id, @target_account.inbox_url)
     end
@@ -65,9 +67,9 @@ class FollowService < BaseService
   end
 
   def direct_follow!
-    follow = @source_account.follow!(@target_account, reblogs: @options[:reblogs], rate_limit: @options[:with_rate_limit])
+    follow = @source_account.follow!(@target_account, reblogs: @options[:reblogs], notify: @options[:notify], rate_limit: @options[:with_rate_limit], bypass_limit: @options[:bypass_limit])
 
-    LocalNotificationWorker.perform_async(@target_account.id, follow.id, follow.class.name)
+    LocalNotificationWorker.perform_async(@target_account.id, follow.id, follow.class.name, :follow)
     MergeWorker.perform_async(@target_account.id, @source_account.id)
 
     follow
diff --git a/app/services/hashtag_query_service.rb b/app/services/hashtag_query_service.rb
deleted file mode 100644
index 196de0639205b20596ea5968210234ab390c5b08..0000000000000000000000000000000000000000
--- a/app/services/hashtag_query_service.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-class HashtagQueryService < BaseService
-  LIMIT_PER_MODE = 4
-
-  def call(tag, params, account = nil, local = false)
-    tags = tags_for(Array(tag.name) | Array(params[:any])).pluck(:id)
-    all  = tags_for(params[:all])
-    none = tags_for(params[:none])
-
-    Status.distinct
-          .as_tag_timeline(tags, account, local)
-          .tagged_with_all(all)
-          .tagged_with_none(none)
-  end
-
-  private
-
-  def tags_for(names)
-    Tag.matching_name(Array(names).take(LIMIT_PER_MODE)) if names.present?
-  end
-end
diff --git a/app/services/import_service.rb b/app/services/import_service.rb
index 4cad93767a4268acc75dc3008afc684329ac3392..0c6ef2238e94afc430ee7bc1821b07e5e0cc7317 100644
--- a/app/services/import_service.rb
+++ b/app/services/import_service.rb
@@ -18,6 +18,8 @@ class ImportService < BaseService
       import_mutes!
     when 'domain_blocking'
       import_domain_blocks!
+    when 'bookmarks'
+      import_bookmarks!
     end
   end
 
@@ -25,7 +27,7 @@ class ImportService < BaseService
 
   def import_follows!
     parse_import_data!(['Account address'])
-    import_relationships!('follow', 'unfollow', @account.following, follow_limit, reblogs: 'Show boosts')
+    import_relationships!('follow', 'unfollow', @account.following, ROWS_PROCESSING_LIMIT, reblogs: { header: 'Show boosts', default: true })
   end
 
   def import_blocks!
@@ -35,7 +37,7 @@ class ImportService < BaseService
 
   def import_mutes!
     parse_import_data!(['Account address'])
-    import_relationships!('mute', 'unmute', @account.muting, ROWS_PROCESSING_LIMIT, notifications: 'Hide notifications')
+    import_relationships!('mute', 'unmute', @account.muting, ROWS_PROCESSING_LIMIT, notifications: { header: 'Hide notifications', default: true })
   end
 
   def import_domain_blocks!
@@ -65,7 +67,7 @@ class ImportService < BaseService
 
   def import_relationships!(action, undo_action, overwrite_scope, limit, extra_fields = {})
     local_domain_suffix = "@#{Rails.configuration.x.local_domain}"
-    items = @data.take(limit).map { |row| [row['Account address']&.strip&.delete_suffix(local_domain_suffix), Hash[extra_fields.map { |key, header| [key, row[header]&.strip] }]] }.reject { |(id, _)| id.blank? }
+    items = @data.take(limit).map { |row| [row['Account address']&.strip&.delete_suffix(local_domain_suffix), Hash[extra_fields.map { |key, field_settings| [key, row[field_settings[:header]]&.strip || field_settings[:default]] }]] }.reject { |(id, _)| id.blank? }
 
     if @import.overwrite?
       presence_hash = items.each_with_object({}) { |(id, extra), mapping| mapping[id] = [true, extra] }
@@ -83,11 +85,45 @@ class ImportService < BaseService
 
     head_items = items.uniq { |acct, _| acct.split('@')[1] }
     tail_items = items - head_items
+
     Import::RelationshipWorker.push_bulk(head_items + tail_items) do |acct, extra|
       [@account.id, acct, action, extra]
     end
   end
 
+  def import_bookmarks!
+    parse_import_data!(['#uri'])
+    items = @data.take(ROWS_PROCESSING_LIMIT).map { |row| row['#uri'].strip }
+
+    if @import.overwrite?
+      presence_hash = items.each_with_object({}) { |id, mapping| mapping[id] = true }
+
+      @account.bookmarks.find_each do |bookmark|
+        if presence_hash[bookmark.status.uri]
+          items.delete(bookmark.status.uri)
+        else
+          bookmark.destroy!
+        end
+      end
+    end
+
+    statuses = items.map do |uri|
+      status = ActivityPub::TagManager.instance.uri_to_resource(uri, Status)
+      next if status.nil? && ActivityPub::TagManager.instance.local_uri?(uri)
+
+      status || ActivityPub::FetchRemoteStatusService.new.call(uri)
+    end.compact
+
+    account_ids         = statuses.map(&:account_id)
+    preloaded_relations = relations_map_for_account(@account, account_ids)
+
+    statuses.keep_if { |status| StatusPolicy.new(@account, status, preloaded_relations).show? }
+
+    statuses.each do |status|
+      @account.bookmarks.find_or_create_by!(account: @account, status: status)
+    end
+  end
+
   def parse_import_data!(default_headers)
     data = CSV.parse(import_data, headers: true)
     data = CSV.parse(import_data, headers: default_headers) unless data.headers&.first&.strip&.include?(' ')
@@ -98,7 +134,13 @@ class ImportService < BaseService
     Paperclip.io_adapters.for(@import.data).read
   end
 
-  def follow_limit
-    FollowLimitValidator.limit_for_account(@account)
+  def relations_map_for_account(account, account_ids)
+    {
+      blocking: {},
+      blocked_by: Account.blocked_by_map(account_ids, account.id),
+      muting: {},
+      following: Account.following_map(account_ids, account.id),
+      domain_blocking_by_domain: {},
+    }
   end
 end
diff --git a/app/services/mute_service.rb b/app/services/mute_service.rb
index 676804cb991d97fa718f9b5554c47ea339daf4da..9ae9afd623498d3a6b0baaa7d6cb7d91a88fea6f 100644
--- a/app/services/mute_service.rb
+++ b/app/services/mute_service.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 class MuteService < BaseService
-  def call(account, target_account, notifications: nil)
+  def call(account, target_account, notifications: nil, duration: 0)
     return if account.id == target_account.id
 
-    mute = account.mute!(target_account, notifications: notifications)
+    mute = account.mute!(target_account, notifications: notifications, duration: duration)
 
     if mute.hide_notifications?
       BlockWorker.perform_async(account.id, target_account.id)
@@ -12,6 +12,8 @@ class MuteService < BaseService
       MuteWorker.perform_async(account.id, target_account.id)
     end
 
+    DeleteMuteWorker.perform_at(duration.seconds, mute.id) if duration != 0
+
     mute
   end
 end
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 9364a6ae87933f3c4caae2421c3f596d9c2a8ef2..fc187db4030673ac4d4093b2fbcd40c5e71d50ea 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 class NotifyService < BaseService
-  def call(recipient, activity)
+  def call(recipient, type, activity)
     @recipient    = recipient
     @activity     = activity
-    @notification = Notification.new(account: @recipient, activity: @activity)
+    @notification = Notification.new(account: @recipient, type: type, activity: @activity)
 
     return if recipient.user.nil? || blocked?
 
@@ -13,13 +13,17 @@ class NotifyService < BaseService
     push_to_conversation! if direct_message?
     send_email! if email_enabled?
   rescue ActiveRecord::RecordInvalid
-    return
+    nil
   end
 
   private
 
   def blocked_mention?
-    FeedManager.instance.filter?(:mentions, @notification.mention.status, @recipient.id)
+    FeedManager.instance.filter?(:mentions, @notification.mention.status, @recipient)
+  end
+
+  def blocked_status?
+    false
   end
 
   def blocked_favourite?
diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb
index 076dedacab97dfed799c5c417b4ada969e0555e4..61f573534dda18ca4267e73b1da1a4f98dcc0c32 100644
--- a/app/services/precompute_feed_service.rb
+++ b/app/services/precompute_feed_service.rb
@@ -2,7 +2,7 @@
 
 class PrecomputeFeedService < BaseService
   def call(account)
-    FeedManager.instance.populate_feed(account)
+    FeedManager.instance.populate_home(account)
   ensure
     Redis.current.del("account:#{account.id}:regeneration")
   end
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index 33243c0ba70d6dd6f4bf885bdc306f34b7900e63..d8d24e8e0bdab2ebe811a5b077f2864e56f9813f 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -30,14 +30,15 @@ class ProcessMentionsService < BaseService
       if mention_undeliverable?(mentioned_account)
         begin
           mentioned_account = resolve_account_service.call(Regexp.last_match(1))
-        rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::UnexpectedResponseError
+        rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::UnexpectedResponseError
           mentioned_account = nil
         end
       end
 
       next match if mention_undeliverable?(mentioned_account) || mentioned_account&.suspended?
 
-      mentions << mentioned_account.mentions.where(status: status).first_or_create(status: status)
+      mention = mentioned_account.mentions.new(status: status)
+      mentions << mention if mention.save
 
       "@#{mentioned_account.acct}"
     end
@@ -64,9 +65,9 @@ class ProcessMentionsService < BaseService
     mentioned_account = mention.account
 
     if mentioned_account.local?
-      LocalNotificationWorker.perform_async(mentioned_account.id, mention.id, mention.class.name)
+      LocalNotificationWorker.perform_async(mentioned_account.id, mention.id, mention.class.name, :mention)
     elsif mentioned_account.activitypub?
-      ActivityPub::DeliveryWorker.perform_async(activitypub_json, mention.status.account_id, mentioned_account.inbox_url)
+      ActivityPub::DeliveryWorker.perform_async(activitypub_json, mention.status.account_id, mentioned_account.inbox_url, { synchronize_followers: !mention.status.distributable? })
     end
   end
 
diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb
index 6866d2face796633465531e1d03cb4682599a820..5032397b34f8d8e83292b9ac05b0d7be013bb91c 100644
--- a/app/services/reblog_service.rb
+++ b/app/services/reblog_service.rb
@@ -45,7 +45,7 @@ class ReblogService < BaseService
     reblogged_status = reblog.reblog
 
     if reblogged_status.account.local?
-      LocalNotificationWorker.perform_async(reblogged_status.account_id, reblog.id, reblog.class.name)
+      LocalNotificationWorker.perform_async(reblogged_status.account_id, reblog.id, reblog.class.name, :reblog)
     elsif reblogged_status.account.activitypub? && !reblogged_status.account.following?(reblog.account)
       ActivityPub::DeliveryWorker.perform_async(build_json(reblog), reblog.account_id, reblogged_status.account.inbox_url)
     end
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb
index 4f0edc3cfbaaa2ff346eca7942179380cc52ddc1..d6043fb5d8099cc318286c2b49fbe851b11bd6db 100644
--- a/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@ -9,44 +9,47 @@ class RemoveStatusService < BaseService
   # @param   [Hash] options
   # @option  [Boolean] :redraft
   # @option  [Boolean] :immediate
-  # @option [Boolean] :original_removed
+  # @option  [Boolean] :original_removed
   def call(status, **options)
     @payload  = Oj.dump(event: :delete, payload: status.id.to_s)
     @status   = status
     @account  = status.account
-    @tags     = status.tags.pluck(:name).to_a
-    @mentions = status.active_mentions.includes(:account).to_a
-    @reblogs  = status.reblogs.includes(:account).to_a
     @options  = options
 
     RedisLock.acquire(lock_options) do |lock|
       if lock.acquired?
-        remove_from_self if status.account.local?
+        remove_from_self if @account.local?
         remove_from_followers
         remove_from_lists
-        remove_from_affected
-        remove_reblogs
-        remove_from_hashtags
-        remove_from_public
-        remove_from_media if status.media_attachments.any?
-        remove_from_spam_check
-        remove_media
+
+        # There is no reason to send out Undo activities when the
+        # cause is that the original object has been removed, since
+        # original object being removed implicitly removes reblogs
+        # of it. The Delete activity of the original is forwarded
+        # separately.
+        if @account.local? && !@options[:original_removed]
+          remove_from_remote_followers
+          remove_from_remote_reach
+        end
+
+        # Since reblogs don't mention anyone, don't get reblogged,
+        # favourited and don't contain their own media attachments
+        # or hashtags, this can be skipped
+        unless @status.reblog?
+          remove_from_mentions
+          remove_reblogs
+          remove_from_hashtags
+          remove_from_public
+          remove_from_media if @status.media_attachments.any?
+          remove_from_spam_check
+          remove_media
+        end
 
         @status.destroy! if @options[:immediate] || !@status.reported?
       else
         raise Mastodon::RaceConditionError
       end
     end
-
-    # There is no reason to send out Undo activities when the
-    # cause is that the original object has been removed, since
-    # original object being removed implicitly removes reblogs
-    # of it. The Delete activity of the original is forwarded
-    # separately.
-    return if !@account.local? || @options[:original_removed]
-
-    remove_from_remote_followers
-    remove_from_remote_affected
   end
 
   private
@@ -67,31 +70,35 @@ class RemoveStatusService < BaseService
     end
   end
 
-  def remove_from_affected
-    @mentions.map(&:account).select(&:local?).each do |account|
-      redis.publish("timeline:#{account.id}", @payload)
+  def remove_from_mentions
+    # For limited visibility statuses, the mentions that determine
+    # who receives them in their home feed are a subset of followers
+    # and therefore the delete is already handled by sending it to all
+    # followers. Here we send a delete to actively mentioned accounts
+    # that may not follow the account
+
+    @status.active_mentions.find_each do |mention|
+      redis.publish("timeline:#{mention.account_id}", @payload)
     end
   end
 
-  def remove_from_remote_affected
+  def remove_from_remote_reach
+    return if @status.reblog?
+
     # People who got mentioned in the status, or who
     # reblogged it from someone else might not follow
     # the author and wouldn't normally receive the
     # delete notification - so here, we explicitly
     # send it to them
 
-    target_accounts = (@mentions.map(&:account).reject(&:local?) + @reblogs.map(&:account).reject(&:local?))
-    target_accounts << @status.reblog.account if @status.reblog? && !@status.reblog.account.local?
-    target_accounts.uniq!(&:id)
+    status_reach_finder = StatusReachFinder.new(@status)
 
-    # ActivityPub
-    ActivityPub::DeliveryWorker.push_bulk(target_accounts.select(&:activitypub?).uniq(&:preferred_inbox_url)) do |target_account|
-      [signed_activity_json, @account.id, target_account.preferred_inbox_url]
+    ActivityPub::DeliveryWorker.push_bulk(status_reach_finder.inboxes) do |inbox_url|
+      [signed_activity_json, @account.id, inbox_url]
     end
   end
 
   def remove_from_remote_followers
-    # ActivityPub
     ActivityPub::DeliveryWorker.push_bulk(@account.followers.inboxes) do |inbox_url|
       [signed_activity_json, @account.id, inbox_url]
     end
@@ -118,19 +125,19 @@ class RemoveStatusService < BaseService
     # because once original status is gone, reblogs will disappear
     # without us being able to do all the fancy stuff
 
-    @reblogs.each do |reblog|
+    @status.reblogs.includes(:account).find_each do |reblog|
       RemoveStatusService.new.call(reblog, original_removed: true)
     end
   end
 
   def remove_from_hashtags
-    @account.featured_tags.where(tag_id: @status.tags.pluck(:id)).each do |featured_tag|
+    @account.featured_tags.where(tag_id: @status.tags.map(&:id)).each do |featured_tag|
       featured_tag.decrement(@status.id)
     end
 
     return unless @status.public_visibility?
 
-    @tags.each do |hashtag|
+    @status.tags.map(&:name).each do |hashtag|
       redis.publish("timeline:hashtag:#{hashtag.mb_chars.downcase}", @payload)
       redis.publish("timeline:hashtag:#{hashtag.mb_chars.downcase}:local", @payload) if @status.local?
     end
@@ -140,22 +147,14 @@ class RemoveStatusService < BaseService
     return unless @status.public_visibility?
 
     redis.publish('timeline:public', @payload)
-    if @status.local?
-      redis.publish('timeline:public:local', @payload)
-    else
-      redis.publish('timeline:public:remote', @payload)
-    end
+    redis.publish(@status.local? ? 'timeline:public:local' : 'timeline:public:remote', @payload)
   end
 
   def remove_from_media
     return unless @status.public_visibility?
 
     redis.publish('timeline:public:media', @payload)
-    if @status.local?
-      redis.publish('timeline:public:local:media', @payload)
-    else
-      redis.publish('timeline:public:remote:media', @payload)
-    end
+    redis.publish(@status.local? ? 'timeline:public:local:media' : 'timeline:public:remote:media', @payload)
   end
 
   def remove_media
diff --git a/app/services/report_service.rb b/app/services/report_service.rb
index 1e955c1e704b70574511426e1e7f25097889d257..9d9c7d6c9fc1da60126dcce7e5964ac8ff211b34 100644
--- a/app/services/report_service.rb
+++ b/app/services/report_service.rb
@@ -24,7 +24,8 @@ class ReportService < BaseService
       target_account: @target_account,
       status_ids: @status_ids,
       comment: @comment,
-      uri: @options[:uri]
+      uri: @options[:uri],
+      forwarded: ActiveModel::Type::Boolean.new.cast(@options[:forward])
     )
   end
 
diff --git a/app/services/resolve_account_service.rb b/app/services/resolve_account_service.rb
index ba77552c6c02796170cc55d04f80317bbeec4642..3301aaf51b1311c2f19d5db6f7839aaffe7dd9e8 100644
--- a/app/services/resolve_account_service.rb
+++ b/app/services/resolve_account_service.rb
@@ -5,8 +5,6 @@ class ResolveAccountService < BaseService
   include DomainControlHelper
   include WebfingerHelper
 
-  class WebfingerRedirectError < StandardError; end
-
   # Find or create an account record for a remote user. When creating,
   # look up the user's webfinger and fetch ActivityPub data
   # @param [String, Account] uri URI in the username@domain format or account record
@@ -26,12 +24,12 @@ class ResolveAccountService < BaseService
 
     @account ||= Account.find_remote(@username, @domain)
 
-    return @account if @account&.local? || !webfinger_update_due?
+    return @account if @account&.local? || @domain.nil? || !webfinger_update_due?
 
     # At this point we are in need of a Webfinger query, which may
     # yield us a different username/domain through a redirect
-
     process_webfinger!(@uri)
+    @domain = nil if TagManager.instance.local_domain?(@domain)
 
     # Because the username/domain pair may be different than what
     # we already checked, we need to check if we've already got
@@ -41,13 +39,18 @@ class ResolveAccountService < BaseService
 
     @account ||= Account.find_remote(@username, @domain)
 
-    return @account if @account&.local? || !webfinger_update_due?
+    if gone_from_origin? && not_yet_deleted?
+      queue_deletion!
+      return
+    end
+
+    return @account if @account&.local? || gone_from_origin? || !webfinger_update_due?
 
     # Now it is certain, it is definitely a remote account, and it
     # either needs to be created, or updated from fresh data
 
-    process_account!
-  rescue Goldfinger::Error, WebfingerRedirectError, Oj::ParseError => e
+    fetch_account!
+  rescue Webfinger::Error, Oj::ParseError => e
     Rails.logger.debug "Webfinger query for #{@uri} failed: #{e}"
     nil
   end
@@ -76,33 +79,37 @@ class ResolveAccountService < BaseService
     @uri = [@username, @domain].compact.join('@')
   end
 
-  def process_webfinger!(uri, redirected = false)
+  def process_webfinger!(uri)
     @webfinger                           = webfinger!("acct:#{uri}")
-    confirmed_username, confirmed_domain = @webfinger.subject.gsub(/\Aacct:/, '').split('@')
+    confirmed_username, confirmed_domain = split_acct(@webfinger.subject)
 
     if confirmed_username.casecmp(@username).zero? && confirmed_domain.casecmp(@domain).zero?
       @username = confirmed_username
       @domain   = confirmed_domain
-      @uri      = uri
-    elsif !redirected
-      return process_webfinger!("#{confirmed_username}@#{confirmed_domain}", true)
-    else
-      raise WebfingerRedirectError, "The URI #{uri} tries to hijack #{@username}@#{@domain}"
+      return
     end
 
-    @domain = nil if TagManager.instance.local_domain?(@domain)
+    # Account doesn't match, so it may have been redirected
+    @webfinger         = webfinger!("acct:#{confirmed_username}@#{confirmed_domain}")
+    @username, @domain = split_acct(@webfinger.subject)
+
+    unless confirmed_username.casecmp(@username).zero? && confirmed_domain.casecmp(@domain).zero?
+      raise Webfinger::RedirectError, "The URI #{uri} tries to hijack #{@username}@#{@domain}"
+    end
+  rescue Webfinger::GoneError
+    @gone = true
+  end
+
+  def split_acct(acct)
+    acct.gsub(/\Aacct:/, '').split('@')
   end
 
-  def process_account!
+  def fetch_account!
     return unless activitypub_ready?
 
     RedisLock.acquire(lock_options) do |lock|
       if lock.acquired?
-        @account = Account.find_remote(@username, @domain)
-
-        next if actor_json.nil?
-
-        @account = ActivityPub::ProcessAccountService.new.call(@username, @domain, actor_json)
+        @account = ActivityPub::FetchRemoteAccountService.new.call(actor_url)
       else
         raise Mastodon::RaceConditionError
       end
@@ -118,18 +125,23 @@ class ResolveAccountService < BaseService
   end
 
   def activitypub_ready?
-    !@webfinger.link('self').nil? && ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].include?(@webfinger.link('self').type)
+    ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].include?(@webfinger.link('self', 'type'))
   end
 
   def actor_url
-    @actor_url ||= @webfinger.link('self').href
+    @actor_url ||= @webfinger.link('self', 'href')
+  end
+
+  def gone_from_origin?
+    @gone
   end
 
-  def actor_json
-    return @actor_json if defined?(@actor_json)
+  def not_yet_deleted?
+    @account.present? && !@account.local?
+  end
 
-    json        = fetch_resource(actor_url, false)
-    @actor_json = supported_context?(json) && equals_or_includes_any?(json['type'], ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES) ? json : nil
+  def queue_deletion!
+    AccountDeletionWorker.perform_async(@account.id, reserve_username: false, skip_activitypub: true)
   end
 
   def lock_options
diff --git a/app/services/resolve_url_service.rb b/app/services/resolve_url_service.rb
index 78080d878f9dba5f238ceb0044331952c9305ec9..5981e4d98a00fc4e2a958972bbfd84894a65e6ee 100644
--- a/app/services/resolve_url_service.rb
+++ b/app/services/resolve_url_service.rb
@@ -34,7 +34,17 @@ class ResolveURLService < BaseService
 
     # It may happen that the resource is a private toot, and thus not fetchable,
     # but we can return the toot if we already know about it.
-    status = Status.find_by(uri: @url) || Status.find_by(url: @url)
+    scope = Status.where(uri: @url)
+
+    # We don't have an index on `url`, so try guessing the `uri` from `url`
+    parsed_url = Addressable::URI.parse(@url)
+    parsed_url.path.match(%r{/@(?<username>#{Account::USERNAME_RE})/(?<status_id>[0-9]+)\Z}) do |matched|
+      parsed_url.path = "/users/#{matched[:username]}/statuses/#{matched[:status_id]}"
+      scope = scope.or(Status.where(uri: parsed_url.to_s, url: @url))
+    end
+
+    status = scope.first
+
     authorize_with @on_behalf_of, status, :show? unless status.nil?
     status
   rescue Mastodon::NotPermittedError
diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb
index ecc893931d596d9fd00a8a0911ce910be7bf9f95..9f4da91d4c005986f23c672d3ef636359277fe96 100644
--- a/app/services/suspend_account_service.rb
+++ b/app/services/suspend_account_service.rb
@@ -3,173 +3,91 @@
 class SuspendAccountService < BaseService
   include Payloadable
 
-  ASSOCIATIONS_ON_SUSPEND = %w(
-    account_pins
-    active_relationships
-    block_relationships
-    blocked_by_relationships
-    conversation_mutes
-    conversations
-    custom_filters
-    domain_blocks
-    favourites
-    follow_requests
-    list_accounts
-    mute_relationships
-    muted_by_relationships
-    notifications
-    owned_lists
-    passive_relationships
-    report_notes
-    scheduled_statuses
-    status_pins
-  ).freeze
-
-  ASSOCIATIONS_ON_DESTROY = %w(
-    reports
-    targeted_moderation_notes
-    targeted_reports
-  ).freeze
-
-  # Suspend or remove an account and remove as much of its data
-  # as possible. If it's a local account and it has not been confirmed
-  # or never been approved, then side effects are skipped and both
-  # the user and account records are removed fully. Otherwise,
-  # it is controlled by options.
-  # @param [Account]
-  # @param [Hash] options
-  # @option [Boolean] :reserve_email Keep user record. Only applicable for local accounts
-  # @option [Boolean] :reserve_username Keep account record
-  # @option [Boolean] :skip_side_effects Side effects are ActivityPub and streaming API payloads
-  # @option [Time]    :suspended_at Only applicable when :reserve_username is true
-  def call(account, **options)
+  def call(account)
     @account = account
-    @options = { reserve_username: true, reserve_email: true }.merge(options)
 
-    if @account.local? && @account.user_unconfirmed_or_pending?
-      @options[:reserve_email]     = false
-      @options[:reserve_username]  = false
-      @options[:skip_side_effects] = true
-    end
-
-    reject_follows!
-    purge_user!
-    purge_profile!
-    purge_content!
+    suspend!
+    reject_remote_follows!
+    distribute_update_actor!
+    unmerge_from_home_timelines!
+    unmerge_from_list_timelines!
+    privatize_media_attachments!
   end
 
   private
 
-  def reject_follows!
-    return if @account.local? || !@account.activitypub?
-
-    ActivityPub::DeliveryWorker.push_bulk(Follow.where(account: @account)) do |follow|
-      [build_reject_json(follow), follow.target_account_id, follow.account.inbox_url]
-    end
+  def suspend!
+    @account.suspend! unless @account.suspended?
   end
 
-  def purge_user!
-    return if !@account.local? || @account.user.nil?
-
-    if @options[:reserve_email]
-      @account.user.disable!
-      @account.user.invites.where(uses: 0).destroy_all
-    else
-      @account.user.destroy
-    end
-  end
-
-  def purge_content!
-    distribute_delete_actor! if @account.local? && !@options[:skip_side_effects]
-
-    @account.statuses.reorder(nil).find_in_batches do |statuses|
-      statuses.reject! { |status| reported_status_ids.include?(status.id) } if @options[:reserve_username]
-      BatchedRemoveStatusService.new.call(statuses, skip_side_effects: @options[:skip_side_effects])
-    end
-
-    @account.media_attachments.reorder(nil).find_each do |media_attachment|
-      next if @options[:reserve_username] && reported_status_ids.include?(media_attachment.status_id)
+  def reject_remote_follows!
+    return if @account.local? || !@account.activitypub?
 
-      media_attachment.destroy
-    end
+    # When suspending a remote account, the account obviously doesn't
+    # actually become suspended on its origin server, i.e. unlike a
+    # locally suspended account it continues to have access to its home
+    # feed and other content. To prevent it from being able to continue
+    # to access toots it would receive because it follows local accounts,
+    # we have to force it to unfollow them. Unfortunately, there is no
+    # counterpart to this operation, i.e. you can't then force a remote
+    # account to re-follow you, so this part is not reversible.
 
-    @account.polls.reorder(nil).find_each do |poll|
-      next if @options[:reserve_username] && reported_status_ids.include?(poll.status_id)
+    follows = Follow.where(account: @account).to_a
 
-      poll.destroy
+    ActivityPub::DeliveryWorker.push_bulk(follows) do |follow|
+      [Oj.dump(serialize_payload(follow, ActivityPub::RejectFollowSerializer)), follow.target_account_id, @account.inbox_url]
     end
 
-    associations_for_destruction.each do |association_name|
-      destroy_all(@account.public_send(association_name))
-    end
-
-    @account.destroy unless @options[:reserve_username]
-  end
-
-  def purge_profile!
-    # If the account is going to be destroyed
-    # there is no point wasting time updating
-    # its values first
-
-    return unless @options[:reserve_username]
-
-    @account.silenced_at      = nil
-    @account.suspended_at     = @options[:suspended_at] || Time.now.utc
-    @account.locked           = false
-    @account.memorial         = false
-    @account.discoverable     = false
-    @account.display_name     = ''
-    @account.note             = ''
-    @account.fields           = []
-    @account.statuses_count   = 0
-    @account.followers_count  = 0
-    @account.following_count  = 0
-    @account.moved_to_account = nil
-    @account.trust_level      = :untrusted
-    @account.avatar.destroy
-    @account.header.destroy
-    @account.save!
+    follows.each(&:destroy)
   end
 
-  def destroy_all(association)
-    association.in_batches.destroy_all
+  def distribute_update_actor!
+    ActivityPub::UpdateDistributionWorker.perform_async(@account.id) if @account.local?
   end
 
-  def distribute_delete_actor!
-    ActivityPub::DeliveryWorker.push_bulk(delivery_inboxes) do |inbox_url|
-      [delete_actor_json, @account.id, inbox_url]
+  def unmerge_from_home_timelines!
+    @account.followers_for_local_distribution.find_each do |follower|
+      FeedManager.instance.unmerge_from_home(@account, follower)
     end
-
-    ActivityPub::LowPriorityDeliveryWorker.push_bulk(low_priority_delivery_inboxes) do |inbox_url|
-      [delete_actor_json, @account.id, inbox_url]
-    end
-  end
-
-  def delete_actor_json
-    @delete_actor_json ||= Oj.dump(serialize_payload(@account, ActivityPub::DeleteActorSerializer, signer: @account))
   end
 
-  def build_reject_json(follow)
-    Oj.dump(serialize_payload(follow, ActivityPub::RejectFollowSerializer))
-  end
-
-  def delivery_inboxes
-    @delivery_inboxes ||= @account.followers.inboxes + Relay.enabled.pluck(:inbox_url)
-  end
-
-  def low_priority_delivery_inboxes
-    Account.inboxes - delivery_inboxes
-  end
-
-  def reported_status_ids
-    @reported_status_ids ||= Report.where(target_account: @account).unresolved.pluck(:status_ids).flatten.uniq
+  def unmerge_from_list_timelines!
+    @account.lists_for_local_distribution.find_each do |list|
+      FeedManager.instance.unmerge_from_list(@account, list)
+    end
   end
 
-  def associations_for_destruction
-    if @options[:reserve_username]
-      ASSOCIATIONS_ON_SUSPEND
-    else
-      ASSOCIATIONS_ON_SUSPEND + ASSOCIATIONS_ON_DESTROY
+  def privatize_media_attachments!
+    attachment_names = MediaAttachment.attachment_definitions.keys
+
+    @account.media_attachments.find_each do |media_attachment|
+      attachment_names.each do |attachment_name|
+        attachment = media_attachment.public_send(attachment_name)
+        styles     = [:original] | attachment.styles.keys
+
+        next if attachment.blank?
+
+        styles.each do |style|
+          case Paperclip::Attachment.default_options[:storage]
+          when :s3
+            begin
+              attachment.s3_object(style).acl.put(acl: 'private')
+            rescue Aws::S3::Errors::NoSuchKey
+              Rails.logger.warn "Tried to change acl on non-existent key #{attachment.s3_object(style).key}"
+            end
+          when :fog
+            # Not supported
+          when :filesystem
+            begin
+              FileUtils.chmod(0o600 & ~File.umask, attachment.path(style)) unless attachment.path(style).nil?
+            rescue Errno::ENOENT
+              Rails.logger.warn "Tried to change permission on non-existent file #{attachment.path(style)}"
+            end
+          end
+
+          CacheBusterWorker.perform_async(attachment.path(style)) if Rails.configuration.x.cache_buster_enabled
+        end
+      end
     end
   end
 end
diff --git a/app/services/unblock_domain_service.rb b/app/services/unblock_domain_service.rb
index d502d9e4925cf1227cb7bbbf0454e2938e2bcb98..e765fb7a86f91fc31385c99de471266ae321662e 100644
--- a/app/services/unblock_domain_service.rb
+++ b/app/services/unblock_domain_service.rb
@@ -13,6 +13,6 @@ class UnblockDomainService < BaseService
     scope = Account.by_domain_and_subdomains(domain_block.domain)
 
     scope.where(silenced_at: domain_block.created_at).in_batches.update_all(silenced_at: nil) unless domain_block.noop?
-    scope.where(suspended_at: domain_block.created_at).in_batches.update_all(suspended_at: nil) if domain_block.suspend?
+    scope.where(suspended_at: domain_block.created_at).in_batches.update_all(suspended_at: nil, suspension_origin: nil) if domain_block.suspend?
   end
 end
diff --git a/app/services/unsuspend_account_service.rb b/app/services/unsuspend_account_service.rb
new file mode 100644
index 0000000000000000000000000000000000000000..ce9ee48ed11ec5771ea4f4376f09560d9dc6531c
--- /dev/null
+++ b/app/services/unsuspend_account_service.rb
@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+class UnsuspendAccountService < BaseService
+  def call(account)
+    @account = account
+
+    unsuspend!
+    refresh_remote_account!
+
+    return if @account.nil?
+
+    merge_into_home_timelines!
+    merge_into_list_timelines!
+    publish_media_attachments!
+  end
+
+  private
+
+  def unsuspend!
+    @account.unsuspend! if @account.suspended?
+  end
+
+  def refresh_remote_account!
+    return if @account.local?
+
+    # While we had the remote account suspended, it could be that
+    # it got suspended on its origin, too. So, we need to refresh
+    # it straight away so it gets marked as remotely suspended in
+    # that case.
+
+    @account.update!(last_webfingered_at: nil)
+    @account = ResolveAccountService.new.call(@account)
+
+    # Worth noting that it is possible that the remote has not only
+    # been suspended, but deleted permanently, in which case
+    # @account would now be nil.
+  end
+
+  def merge_into_home_timelines!
+    @account.followers_for_local_distribution.find_each do |follower|
+      FeedManager.instance.merge_into_home(@account, follower)
+    end
+  end
+
+  def merge_into_list_timelines!
+    @account.lists_for_local_distribution.find_each do |list|
+      FeedManager.instance.merge_into_list(@account, list)
+    end
+  end
+
+  def publish_media_attachments!
+    attachment_names = MediaAttachment.attachment_definitions.keys
+
+    @account.media_attachments.find_each do |media_attachment|
+      attachment_names.each do |attachment_name|
+        attachment = media_attachment.public_send(attachment_name)
+        styles     = [:original] | attachment.styles.keys
+
+        next if attachment.blank?
+
+        styles.each do |style|
+          case Paperclip::Attachment.default_options[:storage]
+          when :s3
+            begin
+              attachment.s3_object(style).acl.put(acl: Paperclip::Attachment.default_options[:s3_permissions])
+            rescue Aws::S3::Errors::NoSuchKey
+              Rails.logger.warn "Tried to change acl on non-existent key #{attachment.s3_object(style).key}"
+            end
+          when :fog
+            # Not supported
+          when :filesystem
+            begin
+              FileUtils.chmod(0o666 & ~File.umask, attachment.path(style)) unless attachment.path(style).nil?
+            rescue Errno::ENOENT
+              Rails.logger.warn "Tried to change permission on non-existent file #{attachment.path(style)}"
+            end
+          end
+
+          CacheBusterWorker.perform_async(attachment.path(style)) if Rails.configuration.x.cache_buster_enabled
+        end
+      end
+    end
+  end
+end
diff --git a/app/services/update_account_service.rb b/app/services/update_account_service.rb
index 4172d577408f4ae88aaeb91ab2fc8b64548f7313..77f794e1787dca244f09d211cab4809c062c8554 100644
--- a/app/services/update_account_service.rb
+++ b/app/services/update_account_service.rb
@@ -12,8 +12,8 @@ class UpdateAccountService < BaseService
       check_links(account)
       process_hashtags(account)
     end
-  rescue Mastodon::DimensionsValidationError => de
-    account.errors.add(:avatar, de.message)
+  rescue Mastodon::DimensionsValidationError, Mastodon::StreamValidationError => e
+    account.errors.add(:avatar, e.message)
     false
   end
 
diff --git a/app/validators/blacklisted_email_validator.rb b/app/validators/blacklisted_email_validator.rb
index 0d01a1c47fb7fb842542a5d0981fcb547dd1d06b..16e3abf1298ed080f586e486524a7f89673a68d3 100644
--- a/app/validators/blacklisted_email_validator.rb
+++ b/app/validators/blacklisted_email_validator.rb
@@ -6,7 +6,7 @@ class BlacklistedEmailValidator < ActiveModel::Validator
 
     @email = user.email
 
-    user.errors.add(:email, I18n.t('users.invalid_email')) if blocked_email?
+    user.errors.add(:email, I18n.t('users.blocked_email_provider')) if blocked_email?
   end
 
   private
diff --git a/app/validators/email_mx_validator.rb b/app/validators/email_mx_validator.rb
index 9b5009966833ac391ce42e631e836aefd7e43525..ef1554494cccbe535e2b69496d509bdb395adc90 100644
--- a/app/validators/email_mx_validator.rb
+++ b/app/validators/email_mx_validator.rb
@@ -4,22 +4,38 @@ require 'resolv'
 
 class EmailMxValidator < ActiveModel::Validator
   def validate(user)
-    user.errors.add(:email, I18n.t('users.invalid_email')) if invalid_mx?(user.email)
+    domain = get_domain(user.email)
+
+    if domain.nil?
+      user.errors.add(:email, I18n.t('users.invalid_email'))
+    else
+      ips, hostnames = resolve_mx(domain)
+      if ips.empty?
+        user.errors.add(:email, I18n.t('users.invalid_email_mx'))
+      elsif on_blacklist?(hostnames + ips)
+        user.errors.add(:email, I18n.t('users.blocked_email_provider'))
+      end
+    end
   end
 
   private
 
-  def invalid_mx?(value)
+  def get_domain(value)
     _, domain = value.split('@', 2)
 
-    return true if domain.nil?
+    return nil if domain.nil?
+
+    TagManager.instance.normalize_domain(domain)
+  rescue Addressable::URI::InvalidURIError
+    nil
+  end
 
-    domain    = TagManager.instance.normalize_domain(domain)
+  def resolve_mx(domain)
     hostnames = []
     ips       = []
 
     Resolv::DNS.open do |dns|
-      dns.timeouts = 1
+      dns.timeouts = 5
 
       hostnames = dns.getresources(domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }
 
@@ -29,9 +45,7 @@ class EmailMxValidator < ActiveModel::Validator
       end
     end
 
-    ips.empty? || on_blacklist?(hostnames + ips)
-  rescue Addressable::URI::InvalidURIError
-    true
+    [ips, hostnames]
   end
 
   def on_blacklist?(values)
diff --git a/app/validators/import_validator.rb b/app/validators/import_validator.rb
new file mode 100644
index 0000000000000000000000000000000000000000..a182abfa5066ee85e4b4beda94d70de1dba0604d
--- /dev/null
+++ b/app/validators/import_validator.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+class ImportValidator < ActiveModel::Validator
+  KNOWN_HEADERS = [
+    'Account address',
+    '#domain',
+    '#uri',
+  ].freeze
+
+  def validate(import)
+    return if import.type.blank? || import.data.blank?
+
+    # We parse because newlines could be part of individual rows. This
+    # runs on create so we should be reading the local file here before
+    # it is uploaded to object storage or moved anywhere...
+    csv_data = CSV.parse(import.data.queued_for_write[:original].read)
+
+    row_count  = csv_data.size
+    row_count -= 1 if KNOWN_HEADERS.include?(csv_data.first&.first)
+
+    import.errors.add(:data, I18n.t('imports.errors.over_rows_processing_limit', count: ImportService::ROWS_PROCESSING_LIMIT)) if row_count > ImportService::ROWS_PROCESSING_LIMIT
+
+    case import.type
+    when 'following'
+      validate_following_import(import, row_count)
+    end
+  end
+
+  private
+
+  def validate_following_import(import, row_count)
+    base_limit = FollowLimitValidator.limit_for_account(import.account)
+
+    limit = begin
+      if import.overwrite?
+        base_limit
+      else
+        base_limit - import.account.following_count
+      end
+    end
+
+    import.errors.add(:data, I18n.t('users.follow_limit_reached', limit: base_limit)) if row_count > limit
+  end
+end
diff --git a/app/validators/registration_form_time_validator.rb b/app/validators/registration_form_time_validator.rb
new file mode 100644
index 0000000000000000000000000000000000000000..ba7c7e6c6462ecb837e85af2189ab0fa10fc2c7b
--- /dev/null
+++ b/app/validators/registration_form_time_validator.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RegistrationFormTimeValidator < ActiveModel::Validator
+  REGISTRATION_FORM_MIN_TIME = 3.seconds.freeze
+
+  def validate(user)
+    user.errors.add(:base, I18n.t('auth.too_fast')) if user.registration_form_time.present? && user.registration_form_time > REGISTRATION_FORM_MIN_TIME.ago
+  end
+end
diff --git a/app/views/about/_domain_blocks.html.haml b/app/views/about/_domain_blocks.html.haml
index e0c5df41d632aa82219911c14db70af38e5be4f3..35a30f16eefd830b3f2cc8dd4154d508d0417609 100644
--- a/app/views/about/_domain_blocks.html.haml
+++ b/app/views/about/_domain_blocks.html.haml
@@ -7,6 +7,6 @@
     - domain_blocks.each do |domain_block|
       %tr
         %td.nowrap
-          %span{ title: domain_block.domain }= domain_block.domain
+          %span{ title: "SHA-256: #{domain_block.domain_digest}" }= domain_block.public_domain
         %td
           = domain_block.public_comment if display_blocks_rationale?
diff --git a/app/views/about/_registration.html.haml b/app/views/about/_registration.html.haml
index af28e21749133aec80e1826bf9f38d84ddadd60c..e4d614d71e7a7c17770d3b559c41cdff27bd8227 100644
--- a/app/views/about/_registration.html.haml
+++ b/app/views/about/_registration.html.haml
@@ -1,22 +1,25 @@
 .simple_form__overlay-area{ class: (closed_registrations? && @instance_presenter.closed_registrations_message.present?) ? 'simple_form__overlay-area__blurred' : '' }
-  = simple_form_for(new_user, url: user_registration_path, namespace: 'registration') do |f|
+  = simple_form_for(new_user, url: user_registration_path, namespace: 'registration', html: { novalidate: false }) do |f|
     %p.lead= t('about.federation_hint_html', instance: content_tag(:strong, site_hostname))
 
     .fields-group
       = f.simple_fields_for :account do |account_fields|
-        = account_fields.input :username, wrapper: :with_label, label: false, required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username'), :autocomplete => 'off', placeholder: t('simple_form.labels.defaults.username') }, append: "@#{site_hostname}", hint: false, disabled: closed_registrations?
+        = account_fields.input :username, wrapper: :with_label, label: false, required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username'), :autocomplete => 'off', placeholder: t('simple_form.labels.defaults.username'), pattern: '[a-zA-Z0-9_]+', maxlength: 30 }, append: "@#{site_hostname}", hint: false, disabled: closed_registrations?
 
       = f.input :email, placeholder: t('simple_form.labels.defaults.email'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.email'), :autocomplete => 'off' }, hint: false, disabled: closed_registrations?
-      = f.input :password, placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'off' }, hint: false, disabled: closed_registrations?
+      = f.input :password, placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'off', :minlength => User.password_length.first, :maxlength => User.password_length.last }, hint: false, disabled: closed_registrations?
       = f.input :password_confirmation, placeholder: t('simple_form.labels.defaults.confirm_password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_password'), :autocomplete => 'off' }, hint: false, disabled: closed_registrations?
 
+      = f.input :confirm_password, as: :string, placeholder: t('simple_form.labels.defaults.honeypot', label: t('simple_form.labels.defaults.password')), required: false, input_html: { 'aria-label' => t('simple_form.labels.defaults.honeypot', label: t('simple_form.labels.defaults.password')), :autocomplete => 'off' }, hint: false, disabled: closed_registrations?
+      = f.input :website, as: :url, placeholder: t('simple_form.labels.defaults.honeypot', label: 'Website'), required: false, input_html: { 'aria-label' => t('simple_form.labels.defaults.honeypot', label: 'Website'), :autocomplete => 'off' }, hint: false, disabled: closed_registrations?
+
     - if approved_registrations?
       .fields-group
         = f.simple_fields_for :invite_request do |invite_request_fields|
-          = invite_request_fields.input :text, as: :text, wrapper: :with_block_label, required: false
+          = invite_request_fields.input :text, as: :text, wrapper: :with_block_label, required: Setting.require_invite_text
 
     .fields-group
-      = f.input :agreement, as: :boolean, wrapper: :with_label, label: t('auth.checkbox_agreement_html', rules_path: about_more_path, terms_path: terms_path), disabled: closed_registrations?
+      = f.input :agreement, as: :boolean, wrapper: :with_label, label: t('auth.checkbox_agreement_html', rules_path: about_more_path, terms_path: terms_path), required: true, disabled: closed_registrations?
 
     .actions
       = f.button :button, sign_up_message, type: :submit, class: 'button button-primary', disabled: closed_registrations?
diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml
index 4152a360170dc77efafc64ebccf9b8a1037d6186..109b5fa863fb548739eea79459a09e4716b4a82a 100644
--- a/app/views/about/more.html.haml
+++ b/app/views/about/more.html.haml
@@ -2,7 +2,7 @@
   = site_hostname
 
 - content_for :header_tags do
-  = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'public', crossorigin: 'anonymous'
   = render partial: 'shared/og'
 
 .grid-4
@@ -17,11 +17,11 @@
         .row__information-board
           .information-board__section
             %span= t 'about.user_count_before'
-            %strong= number_with_delimiter @instance_presenter.user_count
+            %strong= number_to_human @instance_presenter.user_count, strip_insignificant_zeros: true
             %span= t 'about.user_count_after', count: @instance_presenter.user_count
           .information-board__section
             %span= t 'about.status_count_before'
-            %strong= number_with_delimiter @instance_presenter.status_count
+            %strong= number_to_human @instance_presenter.status_count, strip_insignificant_zeros: true
             %span= t 'about.status_count_after', count: @instance_presenter.status_count
         .row__mascot
           .landing-page__mascot
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index c9688ea88d55b6cbf783a7ee9b3ddd1b5bc03fa4..1a81b96f6c90fc420abccdc2c5fd0419ca3a4f1e 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -39,12 +39,12 @@
             = render partial: 'statuses/status', collection: @pinned_statuses, as: :status, locals: { pinned: true }
 
           - if @newer_url
-            .entry= link_to_more @newer_url
+            .entry= link_to_newer @newer_url
 
           = render partial: 'statuses/status', collection: @statuses, as: :status
 
           - if @older_url
-            .entry= link_to_more @older_url
+            .entry= link_to_older @older_url
 
   .column-1
     - if @account.memorial?
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index e6461aad04de5c7b03b8dd9e3e9274bb8776deba..27e1f80a722fe8b4a82433af4f4afc5f159a05c7 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -1,6 +1,10 @@
 - content_for :page_title do
   = @account.acct
 
+- if @account.instance_actor?
+  .flash-message.notice
+    %strong= t('accounts.instance_actor_flash')
+
 = render 'application/card', account: @account
 
 - account = @account
@@ -56,19 +60,23 @@
     = link_to admin_action_logs_path(target_account_id: @account.id) do
       .dashboard__counters__text
         - if @account.local? && @account.user.nil?
-          %span.neutral= t('admin.accounts.deleted')
+          = t('admin.accounts.deleted')
+        - elsif @account.memorial?
+          = t('admin.accounts.memorialized')
         - elsif @account.suspended?
-          %span.red= t('admin.accounts.suspended')
+          = t('admin.accounts.suspended')
         - elsif @account.silenced?
-          %span.red= t('admin.accounts.silenced')
+          = t('admin.accounts.silenced')
         - elsif @account.local? && @account.user&.disabled?
-          %span.red= t('admin.accounts.disabled')
+          = t('admin.accounts.disabled')
         - elsif @account.local? && !@account.user&.confirmed?
-          %span.neutral= t('admin.accounts.confirming')
+          = t('admin.accounts.confirming')
         - elsif @account.local? && !@account.user_approved?
-          %span.neutral= t('admin.accounts.pending')
+          = t('admin.accounts.pending')
+        - elsif @account.sensitized?
+          = t('admin.accounts.sensitive')
         - else
-          %span.neutral= t('admin.accounts.no_limits_imposed')
+          = t('admin.accounts.no_limits_imposed')
       .dashboard__counters__label= t 'admin.accounts.login_status'
 
 - unless @account.local? && @account.user.nil?
@@ -122,19 +130,6 @@
                 = t('admin.accounts.confirming')
             %td= table_link_to 'refresh', t('admin.accounts.resend_confirmation.send'), resend_admin_account_confirmation_path(@account.id), method: :post if can?(:confirm, @account.user)
 
-          %tr
-            %th= t('admin.accounts.login_status')
-            %td
-              - if @account.user&.disabled?
-                = t('admin.accounts.disabled')
-              - else
-                = t('admin.accounts.enabled')
-            %td
-              - if @account.user&.disabled?
-                = table_link_to 'unlock', t('admin.accounts.enable'), enable_admin_account_path(@account.id), method: :post if can?(:enable, @account.user)
-              - elsif @account.user_approved?
-                = table_link_to 'lock', t('admin.accounts.disable'), new_admin_account_action_path(@account.id, type: 'disable') if can?(:disable, @account.user)
-
           %tr
             %th= t('simple_form.labels.defaults.locale')
             %td= @account.user_locale
@@ -172,49 +167,67 @@
             %td
               = @account.inbox_url
               = fa_icon DeliveryFailureTracker.available?(@account.inbox_url) ? 'check' : 'times'
+            %td
+              = table_link_to 'search', @domain_block.present? ? t('admin.domain_blocks.view') : t('admin.accounts.view_domain'), admin_instance_path(@account.domain)
           %tr
             %th= t('admin.accounts.shared_inbox_url')
             %td
               = @account.shared_inbox_url
               = fa_icon DeliveryFailureTracker.available?(@account.shared_inbox_url) ? 'check': 'times'
+            %td
+              - if @domain_block.nil?
+                = table_link_to 'ban', t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: @account.domain)
+
+  - if @account.suspended?
+    %hr.spacer/
+
+    %p.muted-hint= @deletion_request.present? ? t('admin.accounts.suspension_reversible_hint_html', date: content_tag(:strong, l(@deletion_request.due_at.to_date))) : t('admin.accounts.suspension_irreversible')
+
+    = link_to t('admin.accounts.undo_suspension'), unsuspend_admin_account_path(@account.id), method: :post, class: 'button' if can?(:unsuspend, @account)
+
+    - if @deletion_request.present?
+      = link_to t('admin.accounts.delete'), admin_account_path(@account.id), method: :delete, class: 'button button--destructive', data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, @account)
+  - else
+    %div.action-buttons
+      %div
+        - if @account.local? && @account.user_approved?
+          = link_to t('admin.accounts.warn'), new_admin_account_action_path(@account.id, type: 'none'), class: 'button' if can?(:warn, @account)
+
+          - if @account.user_disabled?
+            = link_to t('admin.accounts.enable'), enable_admin_account_path(@account.id), method: :post, class: 'button' if can?(:enable, @account.user)
+          - else
+            = link_to t('admin.accounts.disable'), new_admin_account_action_path(@account.id, type: 'disable'), class: 'button' if can?(:disable, @account.user)
+
+        - if @account.sensitized?
+          = link_to t('admin.accounts.undo_sensitized'), unsensitive_admin_account_path(@account.id), method: :post, class: 'button' if can?(:unsensitive, @account)
+        - elsif !@account.local? || @account.user_approved?
+          = link_to t('admin.accounts.sensitive'), new_admin_account_action_path(@account.id, type: 'sensitive'), class: 'button' if can?(:sensitive, @account)
+
+        - if @account.silenced?
+          = link_to t('admin.accounts.undo_silenced'), unsilence_admin_account_path(@account.id), method: :post, class: 'button' if can?(:unsilence, @account)
+        - elsif !@account.local? || @account.user_approved?
+          = link_to t('admin.accounts.silence'), new_admin_account_action_path(@account.id, type: 'silence'), class: 'button' if can?(:silence, @account)
+
+        - if @account.local?
+          - if @account.user_pending?
+            = link_to t('admin.accounts.approve'), approve_admin_account_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button' if can?(:approve, @account.user)
+            = link_to t('admin.accounts.reject'), reject_admin_account_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive' if can?(:reject, @account.user)
+
+          - unless @account.user_confirmed?
+            = link_to t('admin.accounts.confirm'), admin_account_confirmation_path(@account.id), method: :post, class: 'button' if can?(:confirm, @account.user)
 
-  %div.action-buttons
-    %div
-      - if @account.local? && @account.user_approved?
-        = link_to t('admin.accounts.warn'), new_admin_account_action_path(@account.id, type: 'none'), class: 'button' if can?(:warn, @account)
-      - if @account.silenced?
-        = link_to t('admin.accounts.undo_silenced'), unsilence_admin_account_path(@account.id), method: :post, class: 'button' if can?(:unsilence, @account)
-      - elsif !@account.local? || @account.user_approved?
-        = link_to t('admin.accounts.silence'), new_admin_account_action_path(@account.id, type: 'silence'), class: 'button button--destructive' if can?(:silence, @account)
-
-      - if @account.local?
-        - if @account.user_pending?
-          = link_to t('admin.accounts.approve'), approve_admin_account_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button' if can?(:approve, @account.user)
-          = link_to t('admin.accounts.reject'), reject_admin_account_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive' if can?(:reject, @account.user)
-
-        - unless @account.user_confirmed?
-          = link_to t('admin.accounts.confirm'), admin_account_confirmation_path(@account.id), method: :post, class: 'button' if can?(:confirm, @account.user)
-
-      - if @account.suspended?
-        = link_to t('admin.accounts.undo_suspension'), unsuspend_admin_account_path(@account.id), method: :post, class: 'button' if can?(:unsuspend, @account)
-      - elsif !@account.local? || @account.user_approved?
-        = link_to t('admin.accounts.perform_full_suspension'), new_admin_account_action_path(@account.id, type: 'suspend'), class: 'button button--destructive' if can?(:suspend, @account)
-
-      - unless @account.local?
-        - if DomainBlock.rule_for(@account.domain)
-          = link_to t('admin.domain_blocks.view'), admin_instance_path(@account.domain), class: 'button'
+        - if !@account.local? || @account.user_approved?
+          = link_to t('admin.accounts.perform_full_suspension'), new_admin_account_action_path(@account.id, type: 'suspend'), class: 'button' if can?(:suspend, @account)
+
+      %div
+        - if @account.local?
+          = link_to t('admin.accounts.reset_password'), admin_account_reset_path(@account.id), method: :create, class: 'button' if can?(:reset_password, @account.user)
+          - if @account.user&.otp_required_for_login?
+            = link_to t('admin.accounts.disable_two_factor_authentication'), admin_user_two_factor_authentication_path(@account.user.id), method: :delete, class: 'button' if can?(:disable_2fa, @account.user)
+          - if !@account.memorial? && @account.user_approved?
+            = link_to t('admin.accounts.memorialize'), memorialize_admin_account_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive' if can?(:memorialize, @account)
         - else
-          = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: @account.domain), class: 'button button--destructive'
-
-    %div
-      - if @account.local?
-        = link_to t('admin.accounts.reset_password'), admin_account_reset_path(@account.id), method: :create, class: 'button' if can?(:reset_password, @account.user)
-        - if @account.user&.otp_required_for_login?
-          = link_to t('admin.accounts.disable_two_factor_authentication'), admin_user_two_factor_authentication_path(@account.user.id), method: :delete, class: 'button' if can?(:disable_2fa, @account.user)
-        - if !@account.memorial? && @account.user_approved?
-          = link_to t('admin.accounts.memorialize'), memorialize_admin_account_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive' if can?(:memorialize, @account)
-      - else
-        = link_to t('admin.accounts.redownload'), redownload_admin_account_path(@account.id), method: :post, class: 'button' if can?(:redownload, @account)
+          = link_to t('admin.accounts.redownload'), redownload_admin_account_path(@account.id), method: :post, class: 'button' if can?(:redownload, @account)
 
   %hr.spacer/
 
@@ -233,3 +246,13 @@
 
     .actions
       = f.button :button, t('admin.account_moderation_notes.create'), type: :submit
+
+  %hr.spacer/
+
+  - if @account.user&.invite_request&.text&.present?
+    %div.speech-bubble
+      %div.speech-bubble__bubble
+        = @account.user&.invite_request&.text
+      %div.speech-bubble__owner
+        = admin_account_link_to @account
+        = t('admin.accounts.invite_request_text')
diff --git a/app/views/admin/action_logs/index.html.haml b/app/views/admin/action_logs/index.html.haml
index 99f756762958b96b2745d350eb9f8ba6c3e24cf9..e7d9054d9f8beb1d4c9ffcdd70106e528e08303d 100644
--- a/app/views/admin/action_logs/index.html.haml
+++ b/app/views/admin/action_logs/index.html.haml
@@ -2,7 +2,7 @@
   = t('admin.action_logs.title')
 
 - content_for :header_tags do
-  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
 = form_tag admin_action_logs_url, method: 'GET', class: 'simple_form' do
   = hidden_field_tag :target_account_id, params[:target_account_id] if params[:target_account_id].present?
diff --git a/app/views/admin/custom_emojis/index.html.haml b/app/views/admin/custom_emojis/index.html.haml
index 1cbc36f97ec4650632210e4527c820ee51ea94cf..bfec0407ef2aa4e3a060a1826a6ca1e1e560d522 100644
--- a/app/views/admin/custom_emojis/index.html.haml
+++ b/app/views/admin/custom_emojis/index.html.haml
@@ -2,7 +2,7 @@
   = t('admin.custom_emojis.title')
 
 - content_for :header_tags do
-  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
 - if can?(:create, :custom_emoji)
   - content_for :heading_actions do
diff --git a/app/views/admin/domain_allows/new.html.haml b/app/views/admin/domain_allows/new.html.haml
index 52599857aabc43b8a55733c84e6c0200a272059c..249a961cee85bb0ec58bbb618a69044f247e1192 100644
--- a/app/views/admin/domain_allows/new.html.haml
+++ b/app/views/admin/domain_allows/new.html.haml
@@ -1,5 +1,5 @@
 - content_for :header_tags do
-  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
 - content_for :page_title do
   = t('admin.domain_allows.add_new')
diff --git a/app/views/admin/domain_blocks/edit.html.haml b/app/views/admin/domain_blocks/edit.html.haml
index 29e47ef3bdd78af7919145bd00f498f13449752b..6fe2edc8218914c7297a1c188b65bbbb7221210a 100644
--- a/app/views/admin/domain_blocks/edit.html.haml
+++ b/app/views/admin/domain_blocks/edit.html.haml
@@ -1,5 +1,5 @@
 - content_for :header_tags do
-  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
 - content_for :page_title do
   = t('admin.domain_blocks.edit')
@@ -20,6 +20,9 @@
   .fields-group
     = f.input :reject_reports, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_reports'), hint: I18n.t('admin.domain_blocks.reject_reports_hint')
 
+  .fields-group
+    = f.input :obfuscate, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.obfuscate'), hint: I18n.t('admin.domain_blocks.obfuscate_hint')
+
   .field-group
     = f.input :private_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.private_comment'), hint: t('admin.domain_blocks.private_comment_hint'), rows: 6
 
diff --git a/app/views/admin/domain_blocks/new.html.haml b/app/views/admin/domain_blocks/new.html.haml
index ed1581936a8fac4e9b60df1c57a13e337e3f9592..8b78f71f2d24e2dfad26c2e49ba4d7e61559bf09 100644
--- a/app/views/admin/domain_blocks/new.html.haml
+++ b/app/views/admin/domain_blocks/new.html.haml
@@ -1,5 +1,5 @@
 - content_for :header_tags do
-  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
 - content_for :page_title do
   = t('.title')
@@ -20,6 +20,9 @@
   .fields-group
     = f.input :reject_reports, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_reports'), hint: I18n.t('admin.domain_blocks.reject_reports_hint')
 
+  .fields-group
+    = f.input :obfuscate, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.obfuscate'), hint: I18n.t('admin.domain_blocks.obfuscate_hint')
+
   .field-group
     = f.input :private_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.private_comment'), hint: t('admin.domain_blocks.private_comment_hint'), rows: 6
 
diff --git a/app/views/admin/instances/_instance.html.haml b/app/views/admin/instances/_instance.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..188d0d9841df229ae6e22f07db5681ffea1fdaa6
--- /dev/null
+++ b/app/views/admin/instances/_instance.html.haml
@@ -0,0 +1,25 @@
+.directory__tag
+  = link_to admin_instance_path(instance) do
+    %h4
+      = instance.domain
+      %small
+        - if instance.domain_block
+          - first_item = true
+          - if !instance.domain_block.noop?
+            = t("admin.domain_blocks.severity.#{instance.domain_block.severity}")
+            - first_item = false
+          - unless instance.domain_block.suspend?
+            - if instance.domain_block.reject_media?
+              - unless first_item
+                &bull;
+              = t('admin.domain_blocks.rejecting_media')
+              - first_item = false
+            - if instance.domain_block.reject_reports?
+              - unless first_item
+                &bull;
+              = t('admin.domain_blocks.rejecting_reports')
+        - elsif whitelist_mode?
+          = t('admin.accounts.whitelisted')
+        - else
+          = t('admin.accounts.no_limits_imposed')
+    .trends__item__current{ title: t('admin.instances.known_accounts', count: instance.accounts_count) }= number_to_human instance.accounts_count, strip_insignificant_zeros: true
diff --git a/app/views/admin/instances/index.html.haml b/app/views/admin/instances/index.html.haml
index 696ba3c7febf72d19c72522b17b462fd4ea5902c..5f20e7ec04559d47ff381fbe2123369039aa1f84 100644
--- a/app/views/admin/instances/index.html.haml
+++ b/app/views/admin/instances/index.html.haml
@@ -32,32 +32,10 @@
 
 %hr.spacer/
 
-- @instances.each do |instance|
-  .directory__tag
-    = link_to admin_instance_path(instance) do
-      %h4
-        = instance.domain
-        %small
-          - if instance.domain_block
-            - first_item = true
-            - if !instance.domain_block.noop?
-              = t("admin.domain_blocks.severity.#{instance.domain_block.severity}")
-              - first_item = false
-            - unless instance.domain_block.suspend?
-              - if instance.domain_block.reject_media?
-                - unless first_item
-                  &bull;
-                = t('admin.domain_blocks.rejecting_media')
-                - first_item = false
-              - if instance.domain_block.reject_reports?
-                - unless first_item
-                  &bull;
-                = t('admin.domain_blocks.rejecting_reports')
-          - elsif whitelist_mode?
-            = t('admin.accounts.whitelisted')
-          - else
-            = t('admin.accounts.no_limits_imposed')
-      - if instance.countable?
-        .trends__item__current{ title: t('admin.instances.known_accounts', count: instance.accounts_count) }= number_to_human instance.accounts_count, strip_insignificant_zeros: true
-
-= paginate paginated_instances
+- if @instances.empty?
+  %div.muted-hint.center-text
+    = t 'admin.instances.empty'
+- else
+  = render @instances
+
+= paginate @instances
diff --git a/app/views/admin/instances/show.html.haml b/app/views/admin/instances/show.html.haml
index 92e14c0df06b16efee5d1130b3b8e3eed370a5c6..0b9382771bb50d370746755698b1ea28930cb087 100644
--- a/app/views/admin/instances/show.html.haml
+++ b/app/views/admin/instances/show.html.haml
@@ -2,58 +2,60 @@
   = @instance.domain
 
 .dashboard__counters
+  %div
+    = link_to admin_accounts_path(remote: '1', by_domain: @instance.domain) do
+      .dashboard__counters__num= number_with_delimiter @instance.accounts_count
+      .dashboard__counters__label= t 'admin.accounts.title'
+  %div
+    = link_to admin_reports_path(by_target_domain: @instance.domain) do
+      .dashboard__counters__num= number_with_delimiter @instance.reports_count
+      .dashboard__counters__label= t 'admin.instances.total_reported'
   %div
     %div
-      .dashboard__counters__num= number_with_delimiter @following_count
-      .dashboard__counters__label= t 'admin.instances.total_followed_by_them'
+      .dashboard__counters__num= number_to_human_size @instance.media_storage
+      .dashboard__counters__label= t 'admin.instances.total_storage'
   %div
     %div
-      .dashboard__counters__num= number_with_delimiter @followers_count
-      .dashboard__counters__label= t 'admin.instances.total_followed_by_us'
+      .dashboard__counters__num= number_with_delimiter @instance.following_count
+      .dashboard__counters__label= t 'admin.instances.total_followed_by_them'
   %div
     %div
-      .dashboard__counters__num= number_to_human_size @media_storage
-      .dashboard__counters__label= t 'admin.instances.total_storage'
+      .dashboard__counters__num= number_with_delimiter @instance.followers_count
+      .dashboard__counters__label= t 'admin.instances.total_followed_by_us'
   %div
     %div
-      .dashboard__counters__num= number_with_delimiter @blocks_count
+      .dashboard__counters__num= number_with_delimiter @instance.blocks_count
       .dashboard__counters__label= t 'admin.instances.total_blocked_by_us'
-  %div
-    = link_to admin_reports_path(by_target_domain: @instance.domain) do
-      .dashboard__counters__num= number_with_delimiter @reports_count
-      .dashboard__counters__label= t 'admin.instances.total_reported'
+
   %div
     %div
       .dashboard__counters__num
-        - if @available
+        - if @instance.delivery_failure_tracker.available?
           = fa_icon 'check'
         - else
           = fa_icon 'times'
       .dashboard__counters__label= t 'admin.instances.delivery_available'
 
-- if @private_comment.present?
+- if @instance.private_comment.present?
   .speech-bubble
     .speech-bubble__bubble
-      = simple_format(h(@private_comment))
+      = simple_format(h(@instance.private_comment))
     .speech-bubble__owner= t 'admin.instances.private_comment'
 
-- if @public_comment.present?
+- if @instance.public_comment.present?
   .speech-bubble
     .speech-bubble__bubble
-      = simple_format(h(@public_comment))
+      = simple_format(h(@instance.public_comment))
     .speech-bubble__owner= t 'admin.instances.public_comment'
 
 %hr.spacer/
 
 %div.action-buttons
   %div
-    = link_to t('admin.accounts.title'), admin_accounts_path(remote: '1', by_domain: @instance.domain), class: 'button'
-
-  %div
-    - if @domain_allow
-      = link_to t('admin.domain_allows.undo'), admin_domain_allow_path(@domain_allow), class: 'button button--destructive', data: { confirm: t('admin.accounts.are_you_sure'), method: :delete }
-    - elsif @domain_block
-      = link_to t('admin.domain_blocks.edit'), edit_admin_domain_block_path(@domain_block), class: 'button'
-      = link_to t('admin.domain_blocks.undo'), admin_domain_block_path(@domain_block), class: 'button'
+    - if @instance.domain_allow
+      = link_to t('admin.domain_allows.undo'), admin_domain_allow_path(@instance.domain_allow), class: 'button button--destructive', data: { confirm: t('admin.accounts.are_you_sure'), method: :delete }
+    - elsif @instance.domain_block
+      = link_to t('admin.domain_blocks.edit'), edit_admin_domain_block_path(@instance.domain_block), class: 'button'
+      = link_to t('admin.domain_blocks.undo'), admin_domain_block_path(@instance.domain_block), class: 'button'
     - else
       = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: @instance.domain), class: 'button'
diff --git a/app/views/admin/ip_blocks/_ip_block.html.haml b/app/views/admin/ip_blocks/_ip_block.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..e07e2b4448b726928acbc7c9f6ec51d5372fad6c
--- /dev/null
+++ b/app/views/admin/ip_blocks/_ip_block.html.haml
@@ -0,0 +1,11 @@
+.batch-table__row
+  %label.batch-table__row__select.batch-table__row__select--aligned.batch-checkbox
+    = f.check_box :ip_block_ids, { multiple: true, include_hidden: false }, ip_block.id
+  .batch-table__row__content
+    .batch-table__row__content__text
+      %samp= "#{ip_block.ip}/#{ip_block.ip.prefix}"
+      - if ip_block.comment.present?
+        â€¢
+        = ip_block.comment
+      %br/
+      = t("simple_form.labels.ip_block.severities.#{ip_block.severity}")
diff --git a/app/views/admin/ip_blocks/index.html.haml b/app/views/admin/ip_blocks/index.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..d5b983de9ec079750a67fcfe381cfd2e9cfd3209
--- /dev/null
+++ b/app/views/admin/ip_blocks/index.html.haml
@@ -0,0 +1,28 @@
+- content_for :page_title do
+  = t('admin.ip_blocks.title')
+
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+- if can?(:create, :ip_block)
+  - content_for :heading_actions do
+    = link_to t('admin.ip_blocks.add_new'), new_admin_ip_block_path, class: 'button'
+
+= form_for(@form, url: batch_admin_ip_blocks_path) do |f|
+  = hidden_field_tag :page, params[:page] || 1
+
+  .batch-table
+    .batch-table__toolbar
+      %label.batch-table__toolbar__select.batch-checkbox-all
+        = check_box_tag :batch_checkbox_all, nil, false
+      .batch-table__toolbar__actions
+        - if can?(:destroy, :ip_block)
+          = f.button safe_join([fa_icon('times'), t('admin.ip_blocks.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+    .batch-table__body
+      - if @ip_blocks.empty?
+        = nothing_here 'nothing-here--under-tabs'
+      - else
+        = render partial: 'ip_block', collection: @ip_blocks, locals: { f: f }
+
+= paginate @ip_blocks
+
diff --git a/app/views/admin/ip_blocks/new.html.haml b/app/views/admin/ip_blocks/new.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..69f6b98b9b676f2f38262ef8479db29e93d7bf77
--- /dev/null
+++ b/app/views/admin/ip_blocks/new.html.haml
@@ -0,0 +1,20 @@
+- content_for :page_title do
+  = t('.title')
+
+= simple_form_for @ip_block, url: admin_ip_blocks_path do |f|
+  = render 'shared/error_messages', object: @ip_block
+
+  .fields-group
+    = f.input :ip, as: :string, wrapper: :with_block_label, input_html: { placeholder: '192.0.2.0/24' }
+
+  .fields-group
+    = f.input :expires_in, wrapper: :with_block_label, collection: [1.day, 2.weeks, 1.month, 6.months, 1.year, 3.years].map(&:to_i), label_method: lambda { |i| I18n.t("admin.ip_blocks.expires_in.#{i}") }, prompt: I18n.t('invites.expires_in_prompt')
+
+  .fields-group
+    = f.input :severity, as: :radio_buttons, collection: IpBlock.severities.keys, include_blank: false, wrapper: :with_block_label, label_method: lambda { |severity| safe_join([I18n.t("simple_form.labels.ip_block.severities.#{severity}"), content_tag(:span, I18n.t("simple_form.hints.ip_block.severities.#{severity}"), class: 'hint')]) }
+
+  .fields-group
+    = f.input :comment, as: :string, wrapper: :with_block_label
+
+  .actions
+    = f.button :button, t('admin.ip_blocks.add_new'), type: :submit
diff --git a/app/views/admin/pending_accounts/_account.html.haml b/app/views/admin/pending_accounts/_account.html.haml
index 7a9796a6741b96c2019ab7d4439810ebb5ff602e..5b475b59a90107ab95d2a57c9f7e13f33ad463ca 100644
--- a/app/views/admin/pending_accounts/_account.html.haml
+++ b/app/views/admin/pending_accounts/_account.html.haml
@@ -7,7 +7,7 @@
         %strong= account.user_email
         = "(@#{account.username})"
       %br/
-      = account.user_current_sign_in_ip
+      %samp= account.user_current_sign_in_ip
       â€¢
       = t 'admin.accounts.time_in_queue', time: time_ago_in_words(account.user&.created_at)
 
diff --git a/app/views/admin/pending_accounts/index.html.haml b/app/views/admin/pending_accounts/index.html.haml
index 79ae4a320fccc4639045b60c8a31d59e6230f36d..8384a1c9f012f5c233712ab91bb97ef97ef9fe4c 100644
--- a/app/views/admin/pending_accounts/index.html.haml
+++ b/app/views/admin/pending_accounts/index.html.haml
@@ -2,7 +2,7 @@
   = t('admin.pending_accounts.title', count: User.pending.count)
 
 - content_for :header_tags do
-  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
 = form_for(@form, url: batch_admin_pending_accounts_path) do |f|
   = hidden_field_tag :page, params[:page] || 1
diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml
index fa15796d280b9aad6303d351cd4459ec30132ba4..ada6dd2bc549f9b3ab43ae7e1369b7a4826ee0ff 100644
--- a/app/views/admin/reports/_status.html.haml
+++ b/app/views/admin/reports/_status.html.haml
@@ -14,7 +14,7 @@
     - unless status.proper.media_attachments.empty?
       - if status.proper.media_attachments.first.video?
         - video = status.proper.media_attachments.first
-        = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), blurhash: video.blurhash, sensitive: status.proper.sensitive?, visible: false, width: 610, height: 343, inline: true, alt: video.description
+        = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), frameRate: video.file.meta.dig('original', 'frame_rate'), blurhash: video.blurhash, sensitive: status.proper.sensitive?, visible: false, width: 610, height: 343, inline: true, alt: video.description, media: [ActiveModelSerializers::SerializableResource.new(video, serializer: REST::MediaAttachmentSerializer)].as_json
       - elsif status.proper.media_attachments.first.audio?
         - audio = status.proper.media_attachments.first
         = react_component :audio, src: audio.file.url(:original), height: 110, alt: audio.description, duration: audio.file.meta.dig(:original, :duration)
diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml
index bb441380ec76870f4df401e6043ebe95baf1d0d0..721c55f71a6c4f86e6f06c03f92d5c39cbfe8769 100644
--- a/app/views/admin/reports/index.html.haml
+++ b/app/views/admin/reports/index.html.haml
@@ -59,6 +59,10 @@
                 = fa_icon('camera')
                 = report.media_attachments.count
 
+              - if report.forwarded?
+                Â·
+                = t('admin.reports.forwarded_to', domain: target_account.domain)
+
           .report-card__summary__item__assigned
             - if report.assigned_account.present?
               = admin_account_link_to report.assigned_account
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index 0d563eea77749548a8751ae79d5560bafb4715cb..b060c553f09df03ee32f470074ba10c768a516b4 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -1,5 +1,5 @@
 - content_for :header_tags do
-  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
 - content_for :page_title do
   = t('admin.reports.report', id: @report.id)
@@ -46,6 +46,16 @@
         %td{ colspan: 2 }
           - if @report.action_taken?
             = table_link_to 'envelope-open', t('admin.reports.reopen'), admin_report_path(@report, outcome: 'reopen'), method: :put
+      - unless @report.target_account.local?
+        %tr
+          %th= t('admin.reports.forwarded')
+          %td{ colspan: 3 }
+            - if @report.forwarded.nil?
+              \-
+            - elsif @report.forwarded?
+              = t('simple_form.yes')
+            - else
+              = t('simple_form.no')
       - if !@report.action_taken_by_account.nil?
         %tr
           %th= t('admin.reports.action_taken_by')
diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml
index f37775aa985a7bca1866fce95b936dc51d3c9591..159bd4b0a0d011aba7ea90b5637e99d20aafa3b5 100644
--- a/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@@ -1,5 +1,5 @@
 - content_for :header_tags do
-  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
 - content_for :page_title do
   = t('admin.settings.title')
@@ -44,7 +44,14 @@
   %hr.spacer/
 
   .fields-group
-    = f.input :enable_bootstrap_timeline_accounts, as: :boolean, wrapper: :with_label, label: t('admin.settings.enable_bootstrap_timeline_accounts.title')
+    = f.input :require_invite_text, as: :boolean, wrapper: :with_label, label: t('admin.settings.registrations.require_invite_text.title'), hint: t('admin.settings.registrations.require_invite_text.desc_html'), disabled: !approved_registrations?
+  .fields-group
+
+  %hr.spacer/
+
+  .fields-group
+    = f.input :enable_bootstrap_timeline_accounts, as: :boolean, wrapper: :with_label, label: t('admin.settings.enable_bootstrap_timeline_accounts.title'), hint: t('admin.settings.enable_bootstrap_timeline_accounts.desc_html')
+
   .fields-group
     = f.input :bootstrap_timeline_accounts, wrapper: :with_block_label, label: t('admin.settings.bootstrap_timeline_accounts.title'), hint: t('admin.settings.bootstrap_timeline_accounts.desc_html'), disabled: !Setting.enable_bootstrap_timeline_accounts
 
diff --git a/app/views/admin/statuses/index.html.haml b/app/views/admin/statuses/index.html.haml
index f1169a2fdecca46d5da81fc9ab6be1f63b916b17..c39ba9071fce14f297c87150e0f089ba1eb27404 100644
--- a/app/views/admin/statuses/index.html.haml
+++ b/app/views/admin/statuses/index.html.haml
@@ -1,5 +1,5 @@
 - content_for :header_tags do
-  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
 - content_for :page_title do
   = t('admin.statuses.title')
diff --git a/app/views/admin/tags/index.html.haml b/app/views/admin/tags/index.html.haml
index f888a311dbf8c5f9b6e3c3e30f957ccf63e5d726..d7719d45d62d1ad65a3eff56f5cc37823f7ed2e7 100644
--- a/app/views/admin/tags/index.html.haml
+++ b/app/views/admin/tags/index.html.haml
@@ -2,7 +2,7 @@
   = t('admin.tags.title')
 
 - content_for :header_tags do
-  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
 .filters
   .filter-subset
diff --git a/app/views/auth/passwords/edit.html.haml b/app/views/auth/passwords/edit.html.haml
index 383d44f00fa3f9ae49109f2c7e9b2ddf40d09bbe..114a74454223dc283a6d24ce67e7f9ac6a8f66e4 100644
--- a/app/views/auth/passwords/edit.html.haml
+++ b/app/views/auth/passwords/edit.html.haml
@@ -1,14 +1,14 @@
 - content_for :page_title do
   = t('auth.set_new_password')
 
-= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
+= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, novalidate: false }) do |f|
   = render 'shared/error_messages', object: resource
 
   - if !use_seamless_external_login? || resource.encrypted_password.present?
     = f.input :reset_password_token, as: :hidden
 
     .fields-group
-      = f.input :password, wrapper: :with_label, autofocus: true, label: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.new_password'), :autocomplete => 'off' }, required: true
+      = f.input :password, wrapper: :with_label, autofocus: true, label: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.new_password'), :autocomplete => 'off', :minlength => User.password_length.first, :maxlength => User.password_length.last }, required: true
     .fields-group
       = f.input :password_confirmation, wrapper: :with_label, label: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_new_password'), :autocomplete => 'off' }, required: true
 
diff --git a/app/views/auth/registrations/_sessions.html.haml b/app/views/auth/registrations/_sessions.html.haml
index 395e36a9fd6d07373a3e4ca01bad451bab6b31d5..d3a04c00e7eceb98a6e30e0ec792066cce51e289 100644
--- a/app/views/auth/registrations/_sessions.html.haml
+++ b/app/views/auth/registrations/_sessions.html.haml
@@ -27,5 +27,5 @@
             - else
               %time.time-ago{ datetime: session.updated_at.iso8601, title: l(session.updated_at) }= l(session.updated_at)
           %td
-            - if current_session.session_id != session.session_id
+            - if current_session.session_id != session.session_id && !current_account.suspended?
               = table_link_to 'times', t('sessions.revoke'), settings_session_path(session), method: :delete
diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml
index a155c75c987e9c69d220e905a66c3d0093f97543..a3445b421aa1f0bb039e19af422c1ce548316763 100644
--- a/app/views/auth/registrations/edit.html.haml
+++ b/app/views/auth/registrations/edit.html.haml
@@ -5,7 +5,7 @@
 
 %h3= t('auth.security')
 
-= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put, class: 'auth_edit' }) do |f|
+= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put, class: 'auth_edit', novalidate: false }) do |f|
   = render 'shared/error_messages', object: resource
 
   - if !use_seamless_external_login? || resource.encrypted_password.present?
@@ -17,7 +17,7 @@
 
     .fields-row
       .fields-row__column.fields-group.fields-row__column-6
-        = f.input :password, wrapper: :with_label, label: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.new_password'), :autocomplete => 'off' }, hint: t('simple_form.hints.defaults.password'), disabled: current_account.suspended?
+        = f.input :password, wrapper: :with_label, label: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.new_password'), :autocomplete => 'off', :minlength => User.password_length.first, :maxlength => User.password_length.last }, hint: t('simple_form.hints.defaults.password'), disabled: current_account.suspended?
       .fields-row__column.fields-group.fields-row__column-6
         = f.input :password_confirmation, wrapper: :with_label, label: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_new_password'), :autocomplete => 'off' }, disabled: current_account.suspended?
 
@@ -30,18 +30,19 @@
 
 = render 'sessions'
 
-%hr.spacer/
+- unless current_account.suspended?
+  %hr.spacer/
 
-%h3= t('auth.migrate_account')
-%p.muted-hint= t('auth.migrate_account_html', path: settings_migration_path)
+  %h3= t('auth.migrate_account')
+  %p.muted-hint= t('auth.migrate_account_html', path: settings_migration_path)
 
-%hr.spacer/
+  %hr.spacer/
 
-%h3= t('migrations.incoming_migrations')
-%p.muted-hint= t('migrations.incoming_migrations_html', path: settings_aliases_path)
+  %h3= t('migrations.incoming_migrations')
+  %p.muted-hint= t('migrations.incoming_migrations_html', path: settings_aliases_path)
 
-- if open_deletion? && !current_account.suspended?
-  %hr.spacer/
+  - if open_deletion?
+    %hr.spacer/
 
-  %h3= t('auth.delete_account')
-  %p.muted-hint= t('auth.delete_account_html', path: settings_delete_path)
+    %h3= t('auth.delete_account')
+    %p.muted-hint= t('auth.delete_account_html', path: settings_delete_path)
diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml
index 457bc1d2314129b145de64504a158b8650f3b5cf..6981195ed90f212e29e54efb411f4632197abcbb 100644
--- a/app/views/auth/registrations/new.html.haml
+++ b/app/views/auth/registrations/new.html.haml
@@ -4,7 +4,7 @@
 - content_for :header_tags do
   = render partial: 'shared/og', locals: { description: description_for_sign_up }
 
-= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
+= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { novalidate: false }) do |f|
   = render 'shared/error_messages', object: resource
 
   - if @invite.present? && @invite.autofollow?
@@ -14,26 +14,29 @@
 
   = f.simple_fields_for :account do |ff|
     .fields-group
-      = ff.input :username, wrapper: :with_label, autofocus: true, label: t('simple_form.labels.defaults.username'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username'), :autocomplete => 'off' }, append: "@#{site_hostname}", hint: t('simple_form.hints.defaults.username', domain: site_hostname)
+      = ff.input :username, wrapper: :with_label, autofocus: true, label: t('simple_form.labels.defaults.username'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username'), :autocomplete => 'off', pattern: '[a-zA-Z0-9_]+', maxlength: 30 }, append: "@#{site_hostname}", hint: t('simple_form.hints.defaults.username', domain: site_hostname)
 
   .fields-group
     = f.input :email, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.email'), :autocomplete => 'off' }
 
   .fields-group
-    = f.input :password, wrapper: :with_label, label: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'off' }
+    = f.input :password, wrapper: :with_label, label: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'off', :minlength => User.password_length.first, :maxlength => User.password_length.last }
 
   .fields-group
     = f.input :password_confirmation, wrapper: :with_label, label: t('simple_form.labels.defaults.confirm_password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_password'), :autocomplete => 'off' }
+    = f.input :confirm_password, as: :string, wrapper: :with_label, label: t('simple_form.labels.defaults.honeypot', label: t('simple_form.labels.defaults.password')), required: false, input_html: { 'aria-label' => t('simple_form.labels.defaults.honeypot', label: t('simple_form.labels.defaults.password')), :autocomplete => 'off' }
+
+  = f.input :website, as: :url, wrapper: :with_label, label: t('simple_form.labels.defaults.honeypot', label: 'Website'), required: false, input_html: { 'aria-label' => t('simple_form.labels.defaults.honeypot', label: 'Website'), :autocomplete => 'off' }
 
   - if approved_registrations? && !@invite.present?
     .fields-group
       = f.simple_fields_for :invite_request, resource.invite_request || resource.build_invite_request do |invite_request_fields|
-        = invite_request_fields.input :text, as: :text, wrapper: :with_block_label, required: false
+        = invite_request_fields.input :text, as: :text, wrapper: :with_block_label, required: Setting.require_invite_text
 
   = f.input :invite_code, as: :hidden
 
   .fields-group
-    = f.input :agreement, as: :boolean, wrapper: :with_label, label: whitelist_mode? ? t('auth.checkbox_agreement_without_rules_html', terms_path: terms_path) : t('auth.checkbox_agreement_html', rules_path: about_more_path, terms_path: terms_path)
+    = f.input :agreement, as: :boolean, wrapper: :with_label, label: whitelist_mode? ? t('auth.checkbox_agreement_without_rules_html', terms_path: terms_path) : t('auth.checkbox_agreement_html', rules_path: about_more_path, terms_path: terms_path), required: true
 
   .actions
     = f.button :button, @invite.present? ? t('auth.register') : sign_up_message, type: :submit
diff --git a/app/views/auth/sessions/new.html.haml b/app/views/auth/sessions/new.html.haml
index ceb1694084bee70ebe50a7cfdb41623d6282465f..9713bdaebfd41de17302b32c9383e6382af7ec64 100644
--- a/app/views/auth/sessions/new.html.haml
+++ b/app/views/auth/sessions/new.html.haml
@@ -22,7 +22,6 @@
 
     .actions
       - resource_class.omniauth_providers.each do |provider|
-        = link_to omniauth_authorize_path(resource_name, provider), class: "button button-#{provider}" do
-          = t("auth.providers.#{provider}", default: provider.to_s.chomp("_oauth2").capitalize)
+        = link_to t("auth.providers.#{provider}", default: provider.to_s.chomp("_oauth2").capitalize), omniauth_authorize_path(resource_name, provider), class: "button button-#{provider}", method: :post
 
 .form-footer= render 'auth/shared/links'
diff --git a/app/views/auth/sessions/two_factor.html.haml b/app/views/auth/sessions/two_factor.html.haml
index b2e36f6bca4e5e011a1f935afaa468cb16feeef6..b897a0422e23c1ca5ab1b472b84478656a9ea53b 100644
--- a/app/views/auth/sessions/two_factor.html.haml
+++ b/app/views/auth/sessions/two_factor.html.haml
@@ -1,14 +1,9 @@
 - content_for :page_title do
   = t('auth.login')
 
-= simple_form_for(resource, as: resource_name, url: session_path(resource_name), method: :post) do |f|
-  %p.hint.otp-hint= t('simple_form.hints.sessions.otp')
+=javascript_pack_tag 'two_factor_authentication', crossorigin: 'anonymous'
 
-  .fields-group
-    = f.input :otp_attempt, type: :number, wrapper: :with_label, label: t('simple_form.labels.defaults.otp_attempt'), input_html: { 'aria-label' => t('simple_form.labels.defaults.otp_attempt'), :autocomplete => 'off' }, autofocus: true
+- if @webauthn_enabled
+  = render partial: 'auth/sessions/two_factor/webauthn_form', locals: { hidden: @scheme_type != 'webauthn' }
 
-  .actions
-    = f.button :button, t('auth.login'), type: :submit
-
-  - if Setting.site_contact_email.present?
-    %p.hint.subtle-hint= t('users.otp_lost_help_html', email: mail_to(Setting.site_contact_email, nil))
+= render partial: 'auth/sessions/two_factor/otp_authentication_form', locals: { hidden: @scheme_type != 'totp' }
diff --git a/app/views/auth/sessions/two_factor/_otp_authentication_form.html.haml b/app/views/auth/sessions/two_factor/_otp_authentication_form.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..ab2d48c0a3ebce1ca84b4a33fa8139a49661025c
--- /dev/null
+++ b/app/views/auth/sessions/two_factor/_otp_authentication_form.html.haml
@@ -0,0 +1,18 @@
+= simple_form_for(resource,
+                  as: resource_name,
+                  url: session_path(resource_name),
+                  html: { method: :post, id: 'otp-authentication-form' }.merge(hidden ? { class: 'hidden' } : {})) do |f|
+  %p.hint.authentication-hint= t('simple_form.hints.sessions.otp')
+
+  .fields-group
+    = f.input :otp_attempt, type: :number, wrapper: :with_label, label: t('simple_form.labels.defaults.otp_attempt'), input_html: { 'aria-label' => t('simple_form.labels.defaults.otp_attempt'), :autocomplete => 'off' }, autofocus: true
+
+  .actions
+    = f.button :button, t('auth.login'), type: :submit
+
+  - if Setting.site_contact_email.present?
+    %p.hint.subtle-hint= t('users.otp_lost_help_html', email: mail_to(Setting.site_contact_email, nil))
+
+  - if @webauthn_enabled
+    .form-footer
+      = link_to(t('auth.link_to_webauth'), '#', id: 'link-to-webauthn')
diff --git a/app/views/auth/sessions/two_factor/_webauthn_form.html.haml b/app/views/auth/sessions/two_factor/_webauthn_form.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..32ed1294aa424f3cf30cd5c817a1e7a88039cc91
--- /dev/null
+++ b/app/views/auth/sessions/two_factor/_webauthn_form.html.haml
@@ -0,0 +1,17 @@
+%p.flash-message.hidden#unsupported-browser-message= t 'webauthn_credentials.not_supported'
+%p.flash-message.alert.hidden#security-key-error-message= t 'webauthn_credentials.invalid_credential'
+
+
+= simple_form_for(resource,
+                  as: resource_name,
+                  url: session_path(resource_name),
+                  html: { method: :post, id: 'webauthn-form' }.merge(hidden ? { class: 'hidden' } : {})) do |f|
+  %h3.title= t('simple_form.title.sessions.webauthn')
+  %p.hint= t('simple_form.hints.sessions.webauthn')
+
+  .actions
+    = f.button :button, t('auth.use_security_key'), class: 'js-webauthn', type: :submit
+
+  .form-footer
+    %p= t('auth.dont_have_your_security_key')
+    = link_to(t('auth.link_to_otp'), '#', id: 'link-to-otp')
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 30c7aab194f3aa6365f1839ebe5634cfbc184051..94cc782b2b7fe06518e075d99d13be4fe696594f 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -1,12 +1,12 @@
 - content_for :header_tags do
-  = preload_link_tag asset_pack_path('features/getting_started.js'), crossorigin: 'anonymous'
-  = preload_link_tag asset_pack_path('features/compose.js'), crossorigin: 'anonymous'
-  = preload_link_tag asset_pack_path('features/home_timeline.js'), crossorigin: 'anonymous'
-  = preload_link_tag asset_pack_path('features/notifications.js'), crossorigin: 'anonymous'
+  = preload_pack_asset 'features/getting_started.js', crossorigin: 'anonymous'
+  = preload_pack_asset 'features/compose.js', crossorigin: 'anonymous'
+  = preload_pack_asset 'features/home_timeline.js', crossorigin: 'anonymous'
+  = preload_pack_asset 'features/notifications.js', crossorigin: 'anonymous'
 
   %meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key}
   = render_initial_state
-  = javascript_pack_tag 'application', integrity: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'application', crossorigin: 'anonymous'
 
 .app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
   %noscript
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index b1a2d0617ff23e1b401a344e9a158f7a34aa19ec..62716ab1ee01b403d8c1d51b48f70d8ee850588d 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -1,6 +1,6 @@
 - content_for :header_tags do
   = render_initial_state
-  = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'public', crossorigin: 'anonymous'
 
 - content_for :content do
   .admin-wrapper
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index e32cdcabb3f6017d6b499c14924a21ddaa8084fb..9501207e0818b373e699ec1e588b3a67ff27ae3d 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -6,6 +6,7 @@
 
     - if cdn_host?
       %link{ rel: 'dns-prefetch', href: cdn_host }/
+      %meta{ name: 'cdn-host', content: cdn_host }/
 
     - if storage_host?
       %link{ rel: 'dns-prefetch', href: storage_host }/
@@ -20,10 +21,10 @@
 
     %title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp.html_safe, title], ' - ') : title
 
-    = stylesheet_pack_tag 'common', media: 'all'
-    = stylesheet_pack_tag current_theme, media: 'all'
-    = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
-    = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
+    = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
+    = stylesheet_pack_tag current_theme, media: 'all', crossorigin: 'anonymous'
+    = javascript_pack_tag 'common', crossorigin: 'anonymous'
+    = javascript_pack_tag "locale_#{I18n.locale}", crossorigin: 'anonymous'
     = csrf_meta_tags
     %meta{ name: 'style-nonce', content: request.content_security_policy_nonce }
 
diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml
index 585e246557a4de1dcef951c5a4e275a781facc72..0ea3bbe3b07069112a502e7e66a58f9d873cc6cd 100644
--- a/app/views/layouts/auth.html.haml
+++ b/app/views/layouts/auth.html.haml
@@ -1,5 +1,5 @@
 - content_for :header_tags do
-  = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'public', crossorigin: 'anonymous'
 
 - content_for :content do
   .container-alt
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index 4a40b8584b407d9815b3da2674ce1421ed670d45..e4311d342c82ab999922489e6b439f20feb1e404 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -6,12 +6,13 @@
 
     - if cdn_host?
       %link{ rel: 'dns-prefetch', href: cdn_host }/
+      %meta{ name: 'cdn-host', content: cdn_host }/
 
     - if storage_host?
       %link{ rel: 'dns-prefetch', href: storage_host }/
 
-    = stylesheet_pack_tag 'common', media: 'all'
-    = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all'
+    = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
+    = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all', crossorigin: 'anonymous'
     = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
     = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
     = render_initial_state
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
index 25c85abf9e7964611d339bc9177af4eeac4c89fd..852a0c69b6069f0224567ae750692d0b3da070d7 100644
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@ -5,10 +5,10 @@
     %meta{ charset: 'utf-8' }/
     %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
     %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
-    = stylesheet_pack_tag 'common', media: 'all'
-    = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all'
-    = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
-    = javascript_pack_tag 'error', integrity: true, crossorigin: 'anonymous'
+    = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
+    = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all', crossorigin: 'anonymous'
+    = javascript_pack_tag 'common', crossorigin: 'anonymous'
+    = javascript_pack_tag 'error', crossorigin: 'anonymous'
   %body.error
     .dialog
       .dialog__illustration
diff --git a/app/views/layouts/modal.html.haml b/app/views/layouts/modal.html.haml
index 2ef49e413208ad2e9fa717f4a53d8675a0884e0a..e74e2c0e35644e7d7d38b66e55586819cc4b34bc 100644
--- a/app/views/layouts/modal.html.haml
+++ b/app/views/layouts/modal.html.haml
@@ -1,5 +1,5 @@
 - content_for :header_tags do
-  = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'public', crossorigin: 'anonymous'
 
 - content_for :content do
   - if user_signed_in? && !@hide_header
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index a2c4e5deb2d4078eeb3f642f47759c1a60a263d3..e63cf0848f0dc4f7c23bfd99911823c9f262e34c 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -1,6 +1,6 @@
 - content_for :header_tags do
   = render_initial_state
-  = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'public', crossorigin: 'anonymous'
 
 - content_for :content do
   .public-layout
diff --git a/app/views/media/player.html.haml b/app/views/media/player.html.haml
index ae47750e9ab0e61900b8f0b260b8d5ae0b769582..95e37bb22a8b276a70aecff5a0febeb4ad1a5a00 100644
--- a/app/views/media/player.html.haml
+++ b/app/views/media/player.html.haml
@@ -1,9 +1,9 @@
 - content_for :header_tags do
   = render_initial_state
-  = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'public', crossorigin: 'anonymous'
 
 - if @media_attachment.video?
-  = react_component :video, src: @media_attachment.file.url(:original), preview: @media_attachment.thumbnail.present? ? @media_attachment.thumbnail.url : @media_attachment.file.url(:small), blurhash: @media_attachment.blurhash, width: 670, height: 380, editable: true, detailed: true, inline: true, alt: @media_attachment.description do
+  = react_component :video, src: @media_attachment.file.url(:original), preview: @media_attachment.thumbnail.present? ? @media_attachment.thumbnail.url : @media_attachment.file.url(:small), frameRate: @media_attachment.file.meta.dig('original', 'frame_rate'), blurhash: @media_attachment.blurhash, width: 670, height: 380, editable: true, detailed: true, inline: true, alt: @media_attachment.description, media: [ActiveModelSerializers::SerializableResource.new(@media_attachment, serializer: REST::MediaAttachmentSerializer)].as_json do
     %video{ controls: 'controls' }
       %source{ src: @media_attachment.file.url(:original) }
 - elsif @media_attachment.gifv?
diff --git a/app/views/notification_mailer/_status.html.haml b/app/views/notification_mailer/_status.html.haml
index e992e5563dc82a51a6ccddf6811fbee4fa143c8e..9b7e1b65c63937b9dc10920b221603df1c65ab8a 100644
--- a/app/views/notification_mailer/_status.html.haml
+++ b/app/views/notification_mailer/_status.html.haml
@@ -26,11 +26,11 @@
                                       = "@#{status.account.acct}"
 
                               - if status.spoiler_text?
-                                %div{ dir: rtl_status?(status) ? 'rtl' : 'ltr' }
+                                %div.auto-dir
                                   %p
                                     = Formatter.instance.format_spoiler(status)
 
-                              %div{ dir: rtl_status?(status) ? 'rtl' : 'ltr' }
+                              %div.auto-dir
                                 = Formatter.instance.format(status)
 
                                 - if status.media_attachments.size > 0
diff --git a/app/views/oauth/authorized_applications/index.html.haml b/app/views/oauth/authorized_applications/index.html.haml
index 7b77108a93c959295405638bacef7126c43a641b..fbb733db49f3cd95a70a450e0ad74a2b277a0a0d 100644
--- a/app/views/oauth/authorized_applications/index.html.haml
+++ b/app/views/oauth/authorized_applications/index.html.haml
@@ -20,5 +20,5 @@
           %th!= application.scopes.map { |scope| t(scope, scope: [:doorkeeper, :scopes]) }.join(', ')
           %td= l application.created_at
           %td
-            - unless application.superapp?
+            - unless application.superapp? || current_account.suspended?
               = table_link_to 'times', t('doorkeeper.authorized_applications.buttons.revoke'), oauth_authorized_application_path(application), method: :delete, data: { confirm: t('doorkeeper.authorized_applications.confirmations.revoke') }
diff --git a/app/views/public_timelines/show.html.haml b/app/views/public_timelines/show.html.haml
index 5e536a2356180270bcc02fd6da54877539dca737..3325be5bf1c82d2dc474aa3e16708aa4630b19bb 100644
--- a/app/views/public_timelines/show.html.haml
+++ b/app/views/public_timelines/show.html.haml
@@ -3,7 +3,7 @@
 
 - content_for :header_tags do
   %meta{ name: 'robots', content: 'noindex' }/
-  = javascript_pack_tag 'about', integrity: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'about', crossorigin: 'anonymous'
 
 .page-header
   %h1= t('about.see_whats_happening')
diff --git a/app/views/relationships/_account.html.haml b/app/views/relationships/_account.html.haml
index af5a4aaf7d0fce7a1c897e3c9225ed90b47a2d84..f521aff2258ed2bbe3650adfc54797d3da6c6fe4 100644
--- a/app/views/relationships/_account.html.haml
+++ b/app/views/relationships/_account.html.haml
@@ -5,6 +5,8 @@
     %table.accounts-table
       %tbody
         %tr
+          %td.accounts-table__interrelationships
+            = interrelationships_icon(@relationships, account.id)
           %td= account_link_to account
           %td.accounts-table__count.optional
             = number_to_human account.statuses_count, strip_insignificant_zeros: true
diff --git a/app/views/relationships/show.html.haml b/app/views/relationships/show.html.haml
index 099bb32024d111701a6bf497a1715f76b9bcb5e3..c82e639e0ed605f4c57aa124cf74d01526341a6a 100644
--- a/app/views/relationships/show.html.haml
+++ b/app/views/relationships/show.html.haml
@@ -2,7 +2,7 @@
   = t('settings.relationships')
 
 - content_for :header_tags do
-  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
 .filters
   .filter-subset
@@ -42,6 +42,8 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
+        = f.button safe_join([fa_icon('user-plus'), t('relationships.follow_selected_followers')]), name: :follow, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } if followed_by_relationship? && !mutual_relationship?
+
         = f.button safe_join([fa_icon('user-times'), t('relationships.remove_selected_follows')]), name: :unfollow, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } unless followed_by_relationship?
 
         = f.button safe_join([fa_icon('trash'), t('relationships.remove_selected_followers')]), name: :remove_from_followers, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } unless following_relationship?
diff --git a/app/views/settings/exports/show.html.haml b/app/views/settings/exports/show.html.haml
index 0bb80e93726f2ca43eea12c5b0c4149e46ba594e..18b52c0c2c6f8d123295a2ed349cefdb01ea2812 100644
--- a/app/views/settings/exports/show.html.haml
+++ b/app/views/settings/exports/show.html.haml
@@ -36,6 +36,10 @@
         %th= t('exports.domain_blocks')
         %td= number_with_delimiter @export.total_domain_blocks
         %td= table_link_to 'download', t('exports.csv'), settings_exports_domain_blocks_path(format: :csv)
+      %tr
+        %th= t('exports.bookmarks')
+        %td= number_with_delimiter @export.total_bookmarks
+        %td= table_link_to 'download', t('bookmarks.csv'), settings_exports_bookmarks_path(format: :csv)
 
 %hr.spacer/
 
diff --git a/app/views/settings/featured_tags/index.html.haml b/app/views/settings/featured_tags/index.html.haml
index 6734d027c5409dbb9bdb5e3766680ce527b4dcc6..297379893ab24df83ba7e53fe63ee4e05a542007 100644
--- a/app/views/settings/featured_tags/index.html.haml
+++ b/app/views/settings/featured_tags/index.html.haml
@@ -9,7 +9,7 @@
   = render 'shared/error_messages', object: @featured_tag
 
   .fields-group
-    = f.input :name, wrapper: :with_block_label, hint: safe_join([t('simple_form.hints.featured_tag.name'), safe_join(@most_used_tags.map { |tag| link_to("##{tag.name}", settings_featured_tags_path(featured_tag: { name: tag.name }), method: :post) }, ', ')], ' ')
+    = f.input :name, wrapper: :with_block_label, hint: safe_join([t('simple_form.hints.featured_tag.name'), safe_join(@recently_used_tags.map { |tag| link_to("##{tag.name}", settings_featured_tags_path(featured_tag: { name: tag.name }), method: :post) }, ', ')], ' ')
 
   .actions
     = f.button :button, t('featured_tags.add_new'), type: :submit
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
index 10fff406e6dd7f1ce2592e641dfd7cd29bfeff07..14941d5fd3f6edc7ee26630e6406efac8332a3ac 100644
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -30,6 +30,7 @@
   .fields-group
     = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label, recommended: true
     = f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label
+    = f.input :setting_disable_swiping, as: :boolean, wrapper: :with_label
     = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label
 
   %h4= t 'appearance.toot_layout'
diff --git a/app/views/settings/two_factor_authentication/confirmations/new.html.haml b/app/views/settings/two_factor_authentication/confirmations/new.html.haml
index 86cf1f695effc8880200268ec00c8b34a4c2bde2..671237db573f8756db04c0eee026eb00525248e3 100644
--- a/app/views/settings/two_factor_authentication/confirmations/new.html.haml
+++ b/app/views/settings/two_factor_authentication/confirmations/new.html.haml
@@ -2,17 +2,17 @@
   = t('settings.two_factor_authentication')
 
 = simple_form_for @confirmation, url: settings_two_factor_authentication_confirmation_path, method: :post do |f|
-  %p.hint= t('two_factor_authentication.instructions_html')
+  %p.hint= t('otp_authentication.instructions_html')
 
   .qr-wrapper
     .qr-code!= @qrcode.as_svg(padding: 0, module_size: 4)
 
     .qr-alternative
-      %p.hint= t('two_factor_authentication.manual_instructions')
-      %samp.qr-alternative__code= current_user.otp_secret.scan(/.{4}/).join(' ')
+      %p.hint= t('otp_authentication.manual_instructions')
+      %samp.qr-alternative__code= @new_otp_secret.scan(/.{4}/).join(' ')
 
   .fields-group
-    = f.input :otp_attempt, wrapper: :with_label, hint: t('two_factor_authentication.code_hint'), label: t('simple_form.labels.defaults.otp_attempt'), input_html: { :autocomplete => 'off' }, required: true
+    = f.input :otp_attempt, wrapper: :with_label, hint: t('otp_authentication.code_hint'), label: t('simple_form.labels.defaults.otp_attempt'), input_html: { :autocomplete => 'off' }, required: true
 
   .actions
-    = f.button :button, t('two_factor_authentication.enable'), type: :submit
+    = f.button :button, t('otp_authentication.enable'), type: :submit
diff --git a/app/views/settings/two_factor_authentication/otp_authentication/show.html.haml b/app/views/settings/two_factor_authentication/otp_authentication/show.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..d069ba12a96bc1a61b112c5b8569c9745d6058d7
--- /dev/null
+++ b/app/views/settings/two_factor_authentication/otp_authentication/show.html.haml
@@ -0,0 +1,9 @@
+- content_for :page_title do
+  = t('settings.two_factor_authentication')
+
+.simple_form
+  %p.hint= t('otp_authentication.description_html')
+
+  %hr.spacer/
+
+  = link_to t('otp_authentication.setup'), settings_otp_authentication_path, data: { method: :post }, class: 'block-button'
diff --git a/app/views/settings/two_factor_authentication/webauthn_credentials/index.html.haml b/app/views/settings/two_factor_authentication/webauthn_credentials/index.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..0dfd94ab9dcf58e93b50986f7865c2d11b829da9
--- /dev/null
+++ b/app/views/settings/two_factor_authentication/webauthn_credentials/index.html.haml
@@ -0,0 +1,17 @@
+- content_for :page_title do
+  = t('settings.webauthn_authentication')
+
+.table-wrapper
+  %table.table
+    %tbody
+      - current_user.webauthn_credentials.each do |credential|
+        %tr
+          %td= credential.nickname
+          %td= t('webauthn_credentials.registered_on', date: l(credential.created_at.to_date, format: :with_month_name))
+          %td
+            = table_link_to 'trash', t('webauthn_credentials.delete'), settings_webauthn_credential_path(credential.id), method: :delete, data: { confirm: t('webauthn_credentials.delete_confirmation') }
+
+%hr.spacer/
+
+.simple_form
+  = link_to t('webauthn_credentials.add'), new_settings_webauthn_credential_path, class: 'block-button'
diff --git a/app/views/settings/two_factor_authentication/webauthn_credentials/new.html.haml b/app/views/settings/two_factor_authentication/webauthn_credentials/new.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..1148d5ed7e9f104af4e119055a22441ac7a8da1e
--- /dev/null
+++ b/app/views/settings/two_factor_authentication/webauthn_credentials/new.html.haml
@@ -0,0 +1,16 @@
+- content_for :page_title do
+  = t('settings.webauthn_authentication')
+
+= simple_form_for(:new_webauthn_credential, url: settings_webauthn_credentials_path, html: { id: :new_webauthn_credential }) do |f|
+  %p.flash-message.hidden#unsupported-browser-message= t 'webauthn_credentials.not_supported'
+  %p.flash-message.alert.hidden#security-key-error-message= t 'webauthn_credentials.invalid_credential'
+
+  %p.hint= t('webauthn_credentials.description_html')
+
+  .fields_group
+    = f.input :nickname, wrapper: :with_block_label, hint: t('webauthn_credentials.nickname_hint'), input_html: { :autocomplete => 'off' }, required: true
+
+  .actions
+    = f.button :button, t('webauthn_credentials.add'), class: 'js-webauthn', type: :submit
+
+= javascript_pack_tag 'two_factor_authentication', crossorigin: 'anonymous'
diff --git a/app/views/settings/two_factor_authentication_methods/index.html.haml b/app/views/settings/two_factor_authentication_methods/index.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..315443e6d59508e5f81b19795ccfadffd5853145
--- /dev/null
+++ b/app/views/settings/two_factor_authentication_methods/index.html.haml
@@ -0,0 +1,41 @@
+- content_for :page_title do
+  = t('settings.two_factor_authentication')
+
+- content_for :heading_actions do
+  = link_to t('two_factor_authentication.disable'), disable_settings_two_factor_authentication_methods_path, class: 'button button--destructive', method: :post
+
+%p.hint
+  %span.positive-hint
+    = fa_icon 'check'
+    = ' '
+    = t 'two_factor_authentication.enabled'
+
+.table-wrapper
+  %table.table
+    %thead
+      %tr
+        %th= t('two_factor_authentication.methods')
+        %th
+    %tbody
+      %tr
+        %td= t('two_factor_authentication.otp')
+        %td
+          = table_link_to 'pencil', t('two_factor_authentication.edit'), settings_otp_authentication_path, method: :post
+      %tr
+        %td= t('two_factor_authentication.webauthn')
+        - if current_user.webauthn_enabled?
+          %td
+            = table_link_to 'pencil', t('two_factor_authentication.edit'), settings_webauthn_credentials_path, method: :get
+        - else
+          %td
+            = table_link_to 'key', t('two_factor_authentication.add'), new_settings_webauthn_credential_path, method: :get
+
+%hr.spacer/
+
+%h3= t('two_factor_authentication.recovery_codes')
+%p.muted-hint= t('two_factor_authentication.lost_recovery_codes')
+
+%hr.spacer/
+
+.simple_form
+  = link_to t('two_factor_authentication.generate_recovery_codes'), settings_two_factor_authentication_recovery_codes_path, data: { method: :post }, class: 'block-button'
diff --git a/app/views/settings/two_factor_authentications/show.html.haml b/app/views/settings/two_factor_authentications/show.html.haml
deleted file mode 100644
index f1eecd0002d5ee4216a6884462fc751e643051b0..0000000000000000000000000000000000000000
--- a/app/views/settings/two_factor_authentications/show.html.haml
+++ /dev/null
@@ -1,36 +0,0 @@
-- content_for :page_title do
-  = t('settings.two_factor_authentication')
-
-- if current_user.otp_required_for_login
-  %p.hint
-    %span.positive-hint
-      = fa_icon 'check'
-      = ' '
-      = t 'two_factor_authentication.enabled'
-
-  %hr.spacer/
-
-  = simple_form_for @confirmation, url: settings_two_factor_authentication_path, method: :delete do |f|
-    .fields-group
-      = f.input :otp_attempt, wrapper: :with_block_label, hint: t('two_factor_authentication.code_hint'), label: t('simple_form.labels.defaults.otp_attempt'), input_html: { :autocomplete => 'off' }, required: true
-
-    .actions
-      = f.button :button, t('two_factor_authentication.disable'), type: :submit, class: 'negative'
-
-  %hr.spacer/
-
-  %h3= t('two_factor_authentication.recovery_codes')
-  %p.muted-hint= t('two_factor_authentication.lost_recovery_codes')
-
-  %hr.spacer/
-
-  .simple_form
-    = link_to t('two_factor_authentication.generate_recovery_codes'), settings_two_factor_authentication_recovery_codes_path, data: { method: :post }, class: 'block-button'
-
-- else
-  .simple_form
-    %p.hint= t('two_factor_authentication.description_html')
-
-    %hr.spacer/
-
-    = link_to t('two_factor_authentication.setup'), settings_two_factor_authentication_path, data: { method: :post }, class: 'block-button'
diff --git a/app/views/shared/_error_messages.html.haml b/app/views/shared/_error_messages.html.haml
index 28becd6c4482da59d232e33a93894b9e4279ed91..4916bd424e8a440ba27f617b6923c26caf3c30c3 100644
--- a/app/views/shared/_error_messages.html.haml
+++ b/app/views/shared/_error_messages.html.haml
@@ -1,3 +1,6 @@
 - if object.errors.any?
   .flash-message.alert#error_explanation
     %strong= t('generic.validation_errors', count: object.errors.count)
+- object.errors[:base].each do |error|
+  .flash-message.alert
+    %strong= error
diff --git a/app/views/shares/show.html.haml b/app/views/shares/show.html.haml
index f2f5479a79c4a6d9f4331d9f486e37d6ec189e10..1c0bbf6765817d96438687d12f503f653e2513c9 100644
--- a/app/views/shares/show.html.haml
+++ b/app/views/shares/show.html.haml
@@ -1,5 +1,5 @@
 - content_for :header_tags do
   = render_initial_state
-  = javascript_pack_tag 'share', integrity: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'share', crossorigin: 'anonymous'
 
 #mastodon-compose{ data: { props: Oj.dump(default_props) } }
diff --git a/app/views/statuses/_detailed_status.html.haml b/app/views/statuses/_detailed_status.html.haml
index 85b2ceea44e1f6be89b7aa8d836c622dba37bf2f..93af131e5a6afc1999d8413c1f1a9835106073c9 100644
--- a/app/views/statuses/_detailed_status.html.haml
+++ b/app/views/statuses/_detailed_status.html.haml
@@ -20,7 +20,7 @@
       %p<
         %span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)}&nbsp;
         %button.status__content__spoiler-link= t('statuses.show_more')
-    .e-content{ dir: rtl_status?(status) ? 'rtl' : 'ltr' }
+    .e-content
       = Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
       - if status.preloadable_poll
         = react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.preloadable_poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do
@@ -29,17 +29,17 @@
   - if !status.media_attachments.empty?
     - if status.media_attachments.first.video?
       - video = status.media_attachments.first
-      = react_component :video, src: video.file.url(:original), preview: video.thumbnail.present? ? video.thumbnail.url : video.file.url(:small), blurhash: video.blurhash, sensitive: status.sensitive?, width: 670, height: 380, detailed: true, inline: true, alt: video.description do
+      = react_component :video, src: full_asset_url(video.file.url(:original)), preview: full_asset_url(video.thumbnail.present? ? video.thumbnail.url : video.file.url(:small)), frameRate: video.file.meta.dig('original', 'frame_rate'), blurhash: video.blurhash, sensitive: sensitized?(status, current_account), width: 670, height: 380, detailed: true, inline: true, alt: video.description, media: [ActiveModelSerializers::SerializableResource.new(video, serializer: REST::MediaAttachmentSerializer)].as_json do
         = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
     - elsif status.media_attachments.first.audio?
       - audio = status.media_attachments.first
-      = react_component :audio, src: audio.file.url(:original), poster: audio.thumbnail.present? ? audio.thumbnail.url : status.account.avatar_static_url, backgroundColor: audio.file.meta.dig('colors', 'background'), foregroundColor: audio.file.meta.dig('colors', 'foreground'), accentColor: audio.file.meta.dig('colors', 'accent'), width: 670, height: 380, alt: audio.description, duration: audio.file.meta.dig('original', 'duration') do
+      = react_component :audio, src: full_asset_url(audio.file.url(:original)), poster: full_asset_url(audio.thumbnail.present? ? audio.thumbnail.url : status.account.avatar_static_url), backgroundColor: audio.file.meta.dig('colors', 'background'), foregroundColor: audio.file.meta.dig('colors', 'foreground'), accentColor: audio.file.meta.dig('colors', 'accent'), width: 670, height: 380, alt: audio.description, duration: audio.file.meta.dig('original', 'duration') do
         = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
     - else
-      = react_component :media_gallery, height: 380, sensitive: status.sensitive?, standalone: true, autoplay: autoplay, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json } do
+      = react_component :media_gallery, height: 380, sensitive: sensitized?(status, current_account), standalone: true, autoplay: autoplay, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json } do
         = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
   - elsif status.preview_card
-    = react_component :card, sensitive: status.sensitive?, 'maxDescription': 160, card: ActiveModelSerializers::SerializableResource.new(status.preview_card, serializer: REST::PreviewCardSerializer).as_json
+    = react_component :card, sensitive: sensitized?(status, current_account), 'maxDescription': 160, card: ActiveModelSerializers::SerializableResource.new(status.preview_card, serializer: REST::PreviewCardSerializer).as_json
 
   .detailed-status__meta
     %data.dt-published{ value: status.created_at.to_time.iso8601 }
diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml
index 67c6c0fd090a555ccb1924dccb856f07ac51f53d..7e5f1125984fcff4f4157a2c66def8a21e3ecd40 100644
--- a/app/views/statuses/_simple_status.html.haml
+++ b/app/views/statuses/_simple_status.html.haml
@@ -1,10 +1,13 @@
+:ruby
+  hide_show_thread ||= false
+
 .status{ class: "status-#{status.visibility}" }
   .status__info
     = link_to ActivityPub::TagManager.instance.url_for(status), class: 'status__relative-time u-url u-uid', target: stream_link_target, rel: 'noopener noreferrer' do
+      %span.status__visibility-icon><
+        = visibility_icon status
       %time.time-ago{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
     %data.dt-published{ value: status.created_at.to_time.iso8601 }
-    %span.status__visibility-icon
-      = visibility_icon status
 
     .p-author.h-card
       = link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'status__display-name u-url', target: stream_link_target, rel: 'noopener noreferrer' do
@@ -17,7 +20,7 @@
         %span.display-name
           %bdi
             %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: autoplay)
-          &nbsp;
+          = ' '
           %span.display-name__account
             = acct(status.account)
             = fa_icon('lock') if status.account.locked?
@@ -26,7 +29,7 @@
       %p<
         %span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)}&nbsp;
         %button.status__content__spoiler-link= t('statuses.show_more')
-    .e-content{ dir: rtl_status?(status) ? 'rtl' : 'ltr' }
+    .e-content
       = Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
       - if status.preloadable_poll
         = react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.preloadable_poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do
@@ -35,30 +38,29 @@
   - if !status.media_attachments.empty?
     - if status.media_attachments.first.video?
       - video = status.media_attachments.first
-      = react_component :video, src: video.file.url(:original), preview: video.thumbnail.present? ? video.thumbnail.url : video.file.url(:small), blurhash: video.blurhash, sensitive: status.sensitive?, width: 610, height: 343, inline: true, alt: video.description do
+      = react_component :video, src: full_asset_url(video.file.url(:original)), preview: full_asset_url(video.thumbnail.present? ? video.thumbnail.url : video.file.url(:small)), frameRate: video.file.meta.dig('original', 'frame_rate'), blurhash: video.blurhash, sensitive: sensitized?(status, current_account), width: 610, height: 343, inline: true, alt: video.description, media: [ActiveModelSerializers::SerializableResource.new(video, serializer: REST::MediaAttachmentSerializer)].as_json do
         = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
     - elsif status.media_attachments.first.audio?
       - audio = status.media_attachments.first
-      = react_component :audio, src: audio.file.url(:original), poster: audio.thumbnail.present? ? audio.thumbnail.url : status.account.avatar_static_url, backgroundColor: audio.file.meta.dig('colors', 'background'), foregroundColor: audio.file.meta.dig('colors', 'foreground'), accentColor: audio.file.meta.dig('colors', 'accent'), width: 610, height: 343, alt: audio.description, duration: audio.file.meta.dig('original', 'duration') do
+      = react_component :audio, src: full_asset_url(audio.file.url(:original)), poster: full_asset_url(audio.thumbnail.present? ? audio.thumbnail.url : status.account.avatar_static_url), backgroundColor: audio.file.meta.dig('colors', 'background'), foregroundColor: audio.file.meta.dig('colors', 'foreground'), accentColor: audio.file.meta.dig('colors', 'accent'), width: 610, height: 343, alt: audio.description, duration: audio.file.meta.dig('original', 'duration') do
         = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
     - else
-      = react_component :media_gallery, height: 343, sensitive: status.sensitive?, autoplay: autoplay, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json } do
+      = react_component :media_gallery, height: 343, sensitive: sensitized?(status, current_account), autoplay: autoplay, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json } do
         = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
   - elsif status.preview_card
-    = react_component :card, sensitive: status.sensitive?, 'maxDescription': 160, card: ActiveModelSerializers::SerializableResource.new(status.preview_card, serializer: REST::PreviewCardSerializer).as_json
+    = react_component :card, sensitive: sensitized?(status, current_account), 'maxDescription': 160, card: ActiveModelSerializers::SerializableResource.new(status.preview_card, serializer: REST::PreviewCardSerializer).as_json
 
-  - if !status.in_reply_to_id.nil? && status.in_reply_to_account_id == status.account.id
+  - if !status.in_reply_to_id.nil? && status.in_reply_to_account_id == status.account.id && !hide_show_thread
     = link_to ActivityPub::TagManager.instance.url_for(status), class: 'status__content__read-more-button', target: stream_link_target, rel: 'noopener noreferrer' do
       = t 'statuses.show_thread'
 
   .status__action-bar
-    .status__action-bar__counter
-      = link_to remote_interaction_path(status, type: :reply), class: 'status__action-bar-button icon-button modal-button' do
-        - if status.in_reply_to_id.nil?
-          = fa_icon 'reply fw'
-        - else
-          = fa_icon 'reply-all fw'
-      .status__action-bar__counter__label= obscured_counter status.replies_count
+    = link_to remote_interaction_path(status, type: :reply), class: 'status__action-bar-button icon-button icon-button--with-counter modal-button' do
+      - if status.in_reply_to_id.nil?
+        = fa_icon 'reply fw'
+      - else
+        = fa_icon 'reply-all fw'
+      %span.icon-button__counter= obscured_counter status.replies_count
     = link_to remote_interaction_path(status, type: :reblog), class: 'status__action-bar-button icon-button modal-button' do
       - if status.distributable?
         = fa_icon 'retweet fw'
diff --git a/app/views/statuses/_status.html.haml b/app/views/statuses/_status.html.haml
index 0e3652503067836203082446e3c3e125ee072f43..13a06519cf434ac55b1d6a2c59dc35e665bec03b 100644
--- a/app/views/statuses/_status.html.haml
+++ b/app/views/statuses/_status.html.haml
@@ -17,7 +17,7 @@
 - if status.reply? && include_threads
   - if @next_ancestor
     .entry{ class: entry_classes }
-      = link_to_more ActivityPub::TagManager.instance.url_for(@next_ancestor)
+      = link_to_older ActivityPub::TagManager.instance.url_for(@next_ancestor)
 
   = render partial: 'statuses/status', collection: @ancestors, as: :status, locals: { is_predecessor: true, direct_reply_id: status.in_reply_to_id }, autoplay: autoplay
 
@@ -39,21 +39,21 @@
       %span
         = t('stream_entries.pinned')
 
-  = render (centered ? 'statuses/detailed_status' : 'statuses/simple_status'), status: status.proper, autoplay: autoplay
+  = render (centered ? 'statuses/detailed_status' : 'statuses/simple_status'), status: status.proper, autoplay: autoplay, hide_show_thread: is_predecessor || is_successor
 
 - if include_threads
   - if @since_descendant_thread_id
     .entry{ class: entry_classes }
-      = link_to_more short_account_status_url(status.account.username, status, max_descendant_thread_id: @since_descendant_thread_id + 1)
+      = link_to_newer short_account_status_url(status.account.username, status, max_descendant_thread_id: @since_descendant_thread_id + 1)
   - @descendant_threads.each do |thread|
     = render partial: 'statuses/status', collection: thread[:statuses], as: :status, locals: { is_successor: true, parent_id: status.id }, autoplay: autoplay
 
     - if thread[:next_status]
       .entry{ class: entry_classes }
-        = link_to_more ActivityPub::TagManager.instance.url_for(thread[:next_status])
+        = link_to_newer ActivityPub::TagManager.instance.url_for(thread[:next_status])
   - if @next_descendant_thread
     .entry{ class: entry_classes }
-      = link_to_more short_account_status_url(status.account.username, status, since_descendant_thread_id: @max_descendant_thread_id - 1)
+      = link_to_newer short_account_status_url(status.account.username, status, since_descendant_thread_id: @max_descendant_thread_id - 1)
 
 - if include_threads && !embedded_view? && !user_signed_in?
   .entry{ class: entry_classes }
diff --git a/app/views/statuses/show.html.haml b/app/views/statuses/show.html.haml
index 873df7fbd1dbe7d7f8bcafc9b731205a68fc56e4..7ef7b09a2de2d64b6719e1d4457e3d8a3f947ad8 100644
--- a/app/views/statuses/show.html.haml
+++ b/app/views/statuses/show.html.haml
@@ -12,6 +12,7 @@
   = opengraph 'og:type', 'article'
   = opengraph 'og:title', "#{display_name(@account)} (#{acct(@account)})"
   = opengraph 'og:url', short_account_status_url(@account, @status)
+  = opengraph 'og:published_time', @status.created_at.iso8601
 
   = render 'og_description', activity: @status
   = render 'og_image', activity: @status, account: @account
diff --git a/app/views/tags/show.html.haml b/app/views/tags/show.html.haml
index 19dadd36a552daf6db4d6d2cc889357429ffa7b5..beeeb56f2ddf79da52a0ff1e734b5082d07d8a52 100644
--- a/app/views/tags/show.html.haml
+++ b/app/views/tags/show.html.haml
@@ -5,7 +5,7 @@
   %meta{ name: 'robots', content: 'noindex' }/
   %link{ rel: 'alternate', type: 'application/rss+xml', href: tag_url(@tag, format: 'rss') }/
 
-  = javascript_pack_tag 'about', integrity: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'about', crossorigin: 'anonymous'
   = render 'og'
 
 .page-header
diff --git a/app/views/user_mailer/webauthn_credential_added.html.haml b/app/views/user_mailer/webauthn_credential_added.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..81de84b564010fc44d9cd7dab70c1c2a3635528b
--- /dev/null
+++ b/app/views/user_mailer/webauthn_credential_added.html.haml
@@ -0,0 +1,44 @@
+%table.email-table{ cellspacing: 0, cellpadding: 0 }
+  %tbody
+    %tr
+      %td.email-body
+        .email-container
+          %table.content-section{ cellspacing: 0, cellpadding: 0 }
+            %tbody
+              %tr
+                %td.content-cell.hero
+                  .email-row
+                    .col-6
+                      %table.column{ cellspacing: 0, cellpadding: 0 }
+                        %tbody
+                          %tr
+                            %td.column-cell.text-center.padded
+                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
+                                %tbody
+                                  %tr
+                                    %td
+                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
+
+                              %h1= t 'devise.mailer.webauthn_credential.added.title'
+                              %p.lead= "#{t 'devise.mailer.webauthn_credential.added.explanation' }:"
+                              %p.lead= @webauthn_credential.nickname
+
+%table.email-table{ cellspacing: 0, cellpadding: 0 }
+  %tbody
+    %tr
+      %td.email-body
+        .email-container
+          %table.content-section{ cellspacing: 0, cellpadding: 0 }
+            %tbody
+              %tr
+                %td.content-cell.content-start
+                  %table.column{ cellspacing: 0, cellpadding: 0 }
+                    %tbody
+                      %tr
+                        %td.column-cell.button-cell
+                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
+                            %tbody
+                              %tr
+                                %td.button-primary
+                                  = link_to edit_user_registration_url do
+                                    %span= t('settings.account_settings')
diff --git a/app/views/user_mailer/webauthn_credential_added.text.erb b/app/views/user_mailer/webauthn_credential_added.text.erb
new file mode 100644
index 0000000000000000000000000000000000000000..4319dddbfc49559563a2121d021a921e8dd75544
--- /dev/null
+++ b/app/views/user_mailer/webauthn_credential_added.text.erb
@@ -0,0 +1,7 @@
+<%= t 'devise.mailer.two_factor_enabled.title' %>
+
+===
+
+<%= t 'devise.mailer.two_factor_enabled.explanation' %>
+
+=> <%= edit_user_registration_url %>
diff --git a/app/views/user_mailer/webauthn_credential_deleted.html.haml b/app/views/user_mailer/webauthn_credential_deleted.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..7b47f0c88e6d81fcfab5cbf3053381f9d24996f9
--- /dev/null
+++ b/app/views/user_mailer/webauthn_credential_deleted.html.haml
@@ -0,0 +1,44 @@
+%table.email-table{ cellspacing: 0, cellpadding: 0 }
+  %tbody
+    %tr
+      %td.email-body
+        .email-container
+          %table.content-section{ cellspacing: 0, cellpadding: 0 }
+            %tbody
+              %tr
+                %td.content-cell.hero
+                  .email-row
+                    .col-6
+                      %table.column{ cellspacing: 0, cellpadding: 0 }
+                        %tbody
+                          %tr
+                            %td.column-cell.text-center.padded
+                              %table.hero-icon.alert-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
+                                %tbody
+                                  %tr
+                                    %td
+                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
+
+                              %h1= t 'devise.mailer.webauthn_credential.deleted.title'
+                              %p.lead= "#{t 'devise.mailer.webauthn_credential.deleted.explanation' }:"
+                              %p.lead= @webauthn_credential.nickname
+
+%table.email-table{ cellspacing: 0, cellpadding: 0 }
+  %tbody
+    %tr
+      %td.email-body
+        .email-container
+          %table.content-section{ cellspacing: 0, cellpadding: 0 }
+            %tbody
+              %tr
+                %td.content-cell.content-start
+                  %table.column{ cellspacing: 0, cellpadding: 0 }
+                    %tbody
+                      %tr
+                        %td.column-cell.button-cell
+                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
+                            %tbody
+                              %tr
+                                %td.button-primary
+                                  = link_to edit_user_registration_url do
+                                    %span= t('settings.account_settings')
diff --git a/app/views/user_mailer/webauthn_credential_deleted.text.erb b/app/views/user_mailer/webauthn_credential_deleted.text.erb
new file mode 100644
index 0000000000000000000000000000000000000000..53e5bc78c7caa1f5eabe227f47ad0b1a9b0eef1d
--- /dev/null
+++ b/app/views/user_mailer/webauthn_credential_deleted.text.erb
@@ -0,0 +1,7 @@
+<%= t 'devise.mailer.webauthn_credential.deleted.title' %>
+
+===
+
+<%= t 'devise.mailer.webauthn_credential.deleted.explanation' %>
+
+=> <%= edit_user_registration_url %>
diff --git a/app/views/user_mailer/webauthn_disabled.html.haml b/app/views/user_mailer/webauthn_disabled.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..81a2a7954c7f2096ffb25003ae49d82de650cde6
--- /dev/null
+++ b/app/views/user_mailer/webauthn_disabled.html.haml
@@ -0,0 +1,43 @@
+%table.email-table{ cellspacing: 0, cellpadding: 0 }
+  %tbody
+    %tr
+      %td.email-body
+        .email-container
+          %table.content-section{ cellspacing: 0, cellpadding: 0 }
+            %tbody
+              %tr
+                %td.content-cell.hero
+                  .email-row
+                    .col-6
+                      %table.column{ cellspacing: 0, cellpadding: 0 }
+                        %tbody
+                          %tr
+                            %td.column-cell.text-center.padded
+                              %table.hero-icon.alert-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
+                                %tbody
+                                  %tr
+                                    %td
+                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
+
+                              %h1= t 'devise.mailer.webauthn_disabled.title'
+                              %p.lead= t 'devise.mailer.webauthn_disabled.explanation'
+
+%table.email-table{ cellspacing: 0, cellpadding: 0 }
+  %tbody
+    %tr
+      %td.email-body
+        .email-container
+          %table.content-section{ cellspacing: 0, cellpadding: 0 }
+            %tbody
+              %tr
+                %td.content-cell.content-start
+                  %table.column{ cellspacing: 0, cellpadding: 0 }
+                    %tbody
+                      %tr
+                        %td.column-cell.button-cell
+                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
+                            %tbody
+                              %tr
+                                %td.button-primary
+                                  = link_to edit_user_registration_url do
+                                    %span= t('settings.account_settings')
diff --git a/app/views/user_mailer/webauthn_disabled.text.erb b/app/views/user_mailer/webauthn_disabled.text.erb
new file mode 100644
index 0000000000000000000000000000000000000000..962df77caa9cbdcb2a7be52334639021ba3df627
--- /dev/null
+++ b/app/views/user_mailer/webauthn_disabled.text.erb
@@ -0,0 +1,7 @@
+<%= t 'devise.mailer.webauthn_disabled.title' %>
+
+===
+
+<%= t 'devise.mailer.webauthn_disabled.explanation' %>
+
+=> <%= edit_user_registration_url %>
diff --git a/app/views/user_mailer/webauthn_enabled.html.haml b/app/views/user_mailer/webauthn_enabled.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..f08e764e8df64e793ec1bbd0536ee65f1153d3a7
--- /dev/null
+++ b/app/views/user_mailer/webauthn_enabled.html.haml
@@ -0,0 +1,43 @@
+%table.email-table{ cellspacing: 0, cellpadding: 0 }
+  %tbody
+    %tr
+      %td.email-body
+        .email-container
+          %table.content-section{ cellspacing: 0, cellpadding: 0 }
+            %tbody
+              %tr
+                %td.content-cell.hero
+                  .email-row
+                    .col-6
+                      %table.column{ cellspacing: 0, cellpadding: 0 }
+                        %tbody
+                          %tr
+                            %td.column-cell.text-center.padded
+                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
+                                %tbody
+                                  %tr
+                                    %td
+                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
+
+                              %h1= t 'devise.mailer.webauthn_enabled.title'
+                              %p.lead= t 'devise.mailer.webauthn_enabled.explanation'
+
+%table.email-table{ cellspacing: 0, cellpadding: 0 }
+  %tbody
+    %tr
+      %td.email-body
+        .email-container
+          %table.content-section{ cellspacing: 0, cellpadding: 0 }
+            %tbody
+              %tr
+                %td.content-cell.content-start
+                  %table.column{ cellspacing: 0, cellpadding: 0 }
+                    %tbody
+                      %tr
+                        %td.column-cell.button-cell
+                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
+                            %tbody
+                              %tr
+                                %td.button-primary
+                                  = link_to edit_user_registration_url do
+                                    %span= t('settings.account_settings')
diff --git a/app/views/user_mailer/webauthn_enabled.text.erb b/app/views/user_mailer/webauthn_enabled.text.erb
new file mode 100644
index 0000000000000000000000000000000000000000..4c233fefbd980c2797f2f476270df3e47241232f
--- /dev/null
+++ b/app/views/user_mailer/webauthn_enabled.text.erb
@@ -0,0 +1,7 @@
+<%= t 'devise.mailer.webauthn_credentia.added.title' %>
+
+===
+
+<%= t 'devise.mailer.webauthn_credentia.added.explanation' %>
+
+=> <%= edit_user_registration_url %>
diff --git a/app/views/well_known/host_meta/show.xml.ruby b/app/views/well_known/host_meta/show.xml.ruby
index 0a6bdc322fb130363c190603be1e6c8e6402cce5..b4e867c5f88a7c53631639890d9cbdbb250c4103 100644
--- a/app/views/well_known/host_meta/show.xml.ruby
+++ b/app/views/well_known/host_meta/show.xml.ruby
@@ -5,7 +5,6 @@ doc << Ox::Element.new('XRD').tap do |xrd|
 
   xrd << Ox::Element.new('Link').tap do |link|
     link['rel']      = 'lrdd'
-    link['type']     = 'application/xrd+xml'
     link['template'] = @webfinger_template
   end
 end
diff --git a/app/workers/account_deletion_worker.rb b/app/workers/account_deletion_worker.rb
new file mode 100644
index 0000000000000000000000000000000000000000..fdf013e01043b10fa26025bcfa46cf87565408b0
--- /dev/null
+++ b/app/workers/account_deletion_worker.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AccountDeletionWorker
+  include Sidekiq::Worker
+
+  sidekiq_options queue: 'pull', lock: :until_executed
+
+  def perform(account_id, options = {})
+    reserve_username = options.with_indifferent_access.fetch(:reserve_username, true)
+    skip_activitypub = options.with_indifferent_access.fetch(:skip_activitypub, false)
+    DeleteAccountService.new.call(Account.find(account_id), reserve_username: reserve_username, skip_activitypub: skip_activitypub, reserve_email: false)
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+end
diff --git a/app/workers/account_merging_worker.rb b/app/workers/account_merging_worker.rb
new file mode 100644
index 0000000000000000000000000000000000000000..8c234e7acf185ab2ea60e2d0ebf08365b43b8163
--- /dev/null
+++ b/app/workers/account_merging_worker.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class AccountMergingWorker
+  include Sidekiq::Worker
+
+  sidekiq_options queue: 'pull'
+
+  def perform(account_id)
+    account = Account.find(account_id)
+
+    return true if account.nil? || account.local?
+
+    Account.where(uri: account.uri).where.not(id: account.id).find_each do |duplicate|
+      account.merge_with!(duplicate)
+      duplicate.destroy
+    end
+  end
+end
diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb
index 60775787a8a01138a92d6f36e316a79f2bda0279..6c5a576a703c4ea075637d83290e46c07be95499 100644
--- a/app/workers/activitypub/delivery_worker.rb
+++ b/app/workers/activitypub/delivery_worker.rb
@@ -2,6 +2,7 @@
 
 class ActivityPub::DeliveryWorker
   include Sidekiq::Worker
+  include RoutingHelper
   include JsonLdHelper
 
   STOPLIGHT_FAILURE_THRESHOLD = 10
@@ -38,9 +39,18 @@ class ActivityPub::DeliveryWorker
     Request.new(:post, @inbox_url, body: @json, http_client: http_client).tap do |request|
       request.on_behalf_of(@source_account, :uri, sign_with: @options[:sign_with])
       request.add_headers(HEADERS)
+      request.add_headers({ 'Collection-Synchronization' => synchronization_header }) if ENV['DISABLE_FOLLOWERS_SYNCHRONIZATION'] != 'true' && @options[:synchronize_followers]
     end
   end
 
+  def synchronization_header
+    "collectionId=\"#{account_followers_url(@source_account)}\", digest=\"#{@source_account.remote_followers_hash(inbox_url_prefix)}\", url=\"#{account_followers_synchronization_url(@source_account)}\""
+  end
+
+  def inbox_url_prefix
+    @inbox_url[/http(s?):\/\/[^\/]+\//]
+  end
+
   def perform_request
     light = Stoplight(@inbox_url) do
       request_pool.with(@host) do |http_client|
diff --git a/app/workers/activitypub/distribution_worker.rb b/app/workers/activitypub/distribution_worker.rb
index e4997ba0eaf9ce2d788a507732a1138cef19747f..9b4814644f278a829de4430bed00f6f069e1a7db 100644
--- a/app/workers/activitypub/distribution_worker.rb
+++ b/app/workers/activitypub/distribution_worker.rb
@@ -13,7 +13,7 @@ class ActivityPub::DistributionWorker
     return if skip_distribution?
 
     ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
-      [payload, @account.id, inbox_url]
+      [payload, @account.id, inbox_url, { synchronize_followers: !@status.distributable? }]
     end
 
     relay! if relayable?
diff --git a/app/workers/activitypub/followers_synchronization_worker.rb b/app/workers/activitypub/followers_synchronization_worker.rb
new file mode 100644
index 0000000000000000000000000000000000000000..35a3ef0b9676dc21fa6f497854513b6d74ab8051
--- /dev/null
+++ b/app/workers/activitypub/followers_synchronization_worker.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class ActivityPub::FollowersSynchronizationWorker
+  include Sidekiq::Worker
+
+  sidekiq_options queue: 'push', lock: :until_executed
+
+  def perform(account_id, url)
+    @account = Account.find_by(id: account_id)
+    return true if @account.nil?
+
+    ActivityPub::SynchronizeFollowersService.new.call(@account, url)
+  end
+end
diff --git a/app/workers/activitypub/processing_worker.rb b/app/workers/activitypub/processing_worker.rb
index 05139f616db9688890ffa638eb2faf554fdb16cf..cef5953194993a55d27b15d0773f78976b59c13d 100644
--- a/app/workers/activitypub/processing_worker.rb
+++ b/app/workers/activitypub/processing_worker.rb
@@ -3,7 +3,7 @@
 class ActivityPub::ProcessingWorker
   include Sidekiq::Worker
 
-  sidekiq_options backtrace: true
+  sidekiq_options backtrace: true, retry: 8
 
   def perform(account_id, body, delivered_to_account_id = nil)
     ActivityPub::ProcessCollectionService.new.call(body, Account.find(account_id), override_timestamps: true, delivered_to_account_id: delivered_to_account_id, delivery: true)
diff --git a/app/workers/admin/account_deletion_worker.rb b/app/workers/admin/account_deletion_worker.rb
new file mode 100644
index 0000000000000000000000000000000000000000..82f269ad6fb8c8d384fe1d2d3a615fa1c80e66be
--- /dev/null
+++ b/app/workers/admin/account_deletion_worker.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Admin::AccountDeletionWorker
+  include Sidekiq::Worker
+
+  sidekiq_options queue: 'pull'
+
+  def perform(account_id)
+    DeleteAccountService.new.call(Account.find(account_id), reserve_username: true, reserve_email: true)
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+end
diff --git a/app/workers/admin/suspension_worker.rb b/app/workers/admin/suspension_worker.rb
index 83c815efd7c1ed624248b0b2213a9688a2aed2aa..35c570336094efff2aabd016e87240754ebd667f 100644
--- a/app/workers/admin/suspension_worker.rb
+++ b/app/workers/admin/suspension_worker.rb
@@ -5,7 +5,9 @@ class Admin::SuspensionWorker
 
   sidekiq_options queue: 'pull'
 
-  def perform(account_id, remove_user = false)
-    SuspendAccountService.new.call(Account.find(account_id), reserve_username: true, reserve_email: !remove_user)
+  def perform(account_id)
+    SuspendAccountService.new.call(Account.find(account_id))
+  rescue ActiveRecord::RecordNotFound
+    true
   end
 end
diff --git a/app/workers/admin/unsuspension_worker.rb b/app/workers/admin/unsuspension_worker.rb
new file mode 100644
index 0000000000000000000000000000000000000000..7cb2349b16bf5b5e528323ceba18d02bdf7ff525
--- /dev/null
+++ b/app/workers/admin/unsuspension_worker.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Admin::UnsuspensionWorker
+  include Sidekiq::Worker
+
+  sidekiq_options queue: 'pull'
+
+  def perform(account_id)
+    UnsuspendAccountService.new.call(Account.find(account_id))
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+end
diff --git a/app/workers/authorize_follow_worker.rb b/app/workers/authorize_follow_worker.rb
index 0d50146246301af88653513a6e4200e3eadd7476..f57900fa59a31b902d9f2e6d36c56a95ad5537a5 100644
--- a/app/workers/authorize_follow_worker.rb
+++ b/app/workers/authorize_follow_worker.rb
@@ -7,7 +7,7 @@ class AuthorizeFollowWorker
     source_account = Account.find(source_account_id)
     target_account = Account.find(target_account_id)
 
-    AuthorizeFollowService.new.call(source_account, target_account)
+    AuthorizeFollowService.new.call(source_account, target_account, bypass_limit: true)
   rescue ActiveRecord::RecordNotFound
     true
   end
diff --git a/app/workers/cache_buster_worker.rb b/app/workers/cache_buster_worker.rb
new file mode 100644
index 0000000000000000000000000000000000000000..5ad0a44cb7a9f19de9bc5176020b88d41a96e0e4
--- /dev/null
+++ b/app/workers/cache_buster_worker.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class CacheBusterWorker
+  include Sidekiq::Worker
+  include RoutingHelper
+
+  sidekiq_options queue: 'pull'
+
+  def perform(path)
+    cache_buster.bust(full_asset_url(path))
+  end
+
+  private
+
+  def cache_buster
+    CacheBuster.new(Rails.configuration.x.cache_buster)
+  end
+end
diff --git a/app/workers/delete_mute_worker.rb b/app/workers/delete_mute_worker.rb
new file mode 100644
index 0000000000000000000000000000000000000000..eb031020e1b2cfea2cad1b1dcd0d966161a25b4c
--- /dev/null
+++ b/app/workers/delete_mute_worker.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class DeleteMuteWorker
+  include Sidekiq::Worker
+
+  def perform(mute_id)
+    mute = Mute.find_by(id: mute_id)
+    UnmuteService.new.call(mute.account, mute.target_account) if mute&.expired?
+  end
+end
diff --git a/app/workers/feed_insert_worker.rb b/app/workers/feed_insert_worker.rb
index 1ae3c877b0976abdfc73c622b7ca69c02dc3c128..b70c7e3895cedefafdbed574060236c7488d2ccf 100644
--- a/app/workers/feed_insert_worker.rb
+++ b/app/workers/feed_insert_worker.rb
@@ -23,13 +23,25 @@ class FeedInsertWorker
   private
 
   def check_and_insert
-    perform_push unless feed_filtered?
+    return if feed_filtered?
+
+    perform_push
+    perform_notify if notify?
   end
 
   def feed_filtered?
-    # Note: Lists are a variation of home, so the filtering rules
-    # of home apply to both
-    FeedManager.instance.filter?(:home, @status, @follower.id)
+    case @type
+    when :home
+      FeedManager.instance.filter?(:home, @status, @follower)
+    when :list
+      FeedManager.instance.filter?(:list, @status, @list)
+    end
+  end
+
+  def notify?
+    return false if @type != :home || @status.reblog? || (@status.reply? && @status.in_reply_to_account_id != @status.account_id)
+
+    Follow.find_by(account: @follower, target_account: @status.account)&.notify?
   end
 
   def perform_push
@@ -40,4 +52,8 @@ class FeedInsertWorker
       FeedManager.instance.push_to_list(@list, @status)
     end
   end
+
+  def perform_notify
+    NotifyService.new.call(@follower, :status, @status)
+  end
 end
diff --git a/app/workers/import/relationship_worker.rb b/app/workers/import/relationship_worker.rb
index 4a455f3aebd3003904f2578f0151d288ef83ee75..4a7100435f7dc42a89fd133dc8e7ae6186a3928a 100644
--- a/app/workers/import/relationship_worker.rb
+++ b/app/workers/import/relationship_worker.rb
@@ -15,7 +15,11 @@ class Import::RelationshipWorker
 
     case relationship
     when 'follow'
-      FollowService.new.call(from_account, target_account, options)
+      begin
+        FollowService.new.call(from_account, target_account, options)
+      rescue ActiveRecord::RecordInvalid
+        raise if FollowLimitValidator.limit_for_account(from_account) < from_account.following_count
+      end
     when 'unfollow'
       UnfollowService.new.call(from_account, target_account)
     when 'block'
diff --git a/app/workers/local_notification_worker.rb b/app/workers/local_notification_worker.rb
index 48635e498fffd7e09893fd25ec92d509da241f0e..6b08ca6fcf8f9aa3c902768d56fa4f7ce03b8e78 100644
--- a/app/workers/local_notification_worker.rb
+++ b/app/workers/local_notification_worker.rb
@@ -3,7 +3,7 @@
 class LocalNotificationWorker
   include Sidekiq::Worker
 
-  def perform(receiver_account_id, activity_id = nil, activity_class_name = nil)
+  def perform(receiver_account_id, activity_id = nil, activity_class_name = nil, type = nil)
     if activity_id.nil? && activity_class_name.nil?
       activity = Mention.find(receiver_account_id)
       receiver = activity.account
@@ -12,7 +12,7 @@ class LocalNotificationWorker
       activity = activity_class_name.constantize.find(activity_id)
     end
 
-    NotifyService.new.call(receiver, activity)
+    NotifyService.new.call(receiver, type || activity_class_name.underscore, activity)
   rescue ActiveRecord::RecordNotFound
     true
   end
diff --git a/app/workers/merge_worker.rb b/app/workers/merge_worker.rb
index d745cb99c7b9aada475223d9250a0315dc0c6c5b..74ef7d4daa7a7739e0b8a87afa809a839113702e 100644
--- a/app/workers/merge_worker.rb
+++ b/app/workers/merge_worker.rb
@@ -6,6 +6,8 @@ class MergeWorker
   sidekiq_options queue: 'pull'
 
   def perform(from_account_id, into_account_id)
-    FeedManager.instance.merge_into_timeline(Account.find(from_account_id), Account.find(into_account_id))
+    FeedManager.instance.merge_into_home(Account.find(from_account_id), Account.find(into_account_id))
+  rescue ActiveRecord::RecordNotFound
+    true
   end
 end
diff --git a/app/workers/mute_worker.rb b/app/workers/mute_worker.rb
index 7bf0923a5dbfb32b07dea86b665b2389279dcde3..c74f657cbacad84d1976ea37051c90d82cd7c463 100644
--- a/app/workers/mute_worker.rb
+++ b/app/workers/mute_worker.rb
@@ -4,9 +4,8 @@ class MuteWorker
   include Sidekiq::Worker
 
   def perform(account_id, target_account_id)
-    FeedManager.instance.clear_from_timeline(
-      Account.find(account_id),
-      Account.find(target_account_id)
-    )
+    FeedManager.instance.clear_from_home(Account.find(account_id), Account.find(target_account_id))
+  rescue ActiveRecord::RecordNotFound
+    true
   end
 end
diff --git a/app/workers/poll_expiration_notify_worker.rb b/app/workers/poll_expiration_notify_worker.rb
index 64b4cbd7e46b01db2f4aea7847b7e6b0c2754cc4..f0191d4799daad1500eac23433f2b92a981b1fde 100644
--- a/app/workers/poll_expiration_notify_worker.rb
+++ b/app/workers/poll_expiration_notify_worker.rb
@@ -11,12 +11,12 @@ class PollExpirationNotifyWorker
     # Notify poll owner and remote voters
     if poll.local?
       ActivityPub::DistributePollUpdateWorker.perform_async(poll.status.id)
-      NotifyService.new.call(poll.account, poll)
+      NotifyService.new.call(poll.account, :poll, poll)
     end
 
     # Notify local voters
-    poll.votes.includes(:account).map(&:account).select(&:local?).each do |account|
-      NotifyService.new.call(account, poll)
+    poll.votes.includes(:account).group(:account_id).select(:account_id).map(&:account).select(&:local?).each do |account|
+      NotifyService.new.call(account, :poll, poll)
     end
   rescue ActiveRecord::RecordNotFound
     true
diff --git a/app/workers/refollow_worker.rb b/app/workers/refollow_worker.rb
index 9b07ce1b56a13ea5aa7b7045ab25a58492d914e9..319b001097b4374a1416865122256d39fd117bb3 100644
--- a/app/workers/refollow_worker.rb
+++ b/app/workers/refollow_worker.rb
@@ -11,6 +11,7 @@ class RefollowWorker
 
     target_account.passive_relationships.where(account: Account.where(domain: nil)).includes(:account).reorder(nil).find_each do |follow|
       reblogs = follow.show_reblogs?
+      notify  = follow.notify?
 
       # Locally unfollow remote account
       follower = follow.account
@@ -18,7 +19,7 @@ class RefollowWorker
 
       # Schedule re-follow
       begin
-        FollowService.new.call(follower, target_account, reblogs: reblogs)
+        FollowService.new.call(follower, target_account, reblogs: reblogs, notify: notify, bypass_limit: true)
       rescue Mastodon::NotPermittedError, ActiveRecord::RecordNotFound, Mastodon::UnexpectedResponseError, HTTP::Error, OpenSSL::SSL::SSLError
         next
       end
diff --git a/app/workers/scheduler/feed_cleanup_scheduler.rb b/app/workers/scheduler/feed_cleanup_scheduler.rb
index 458fe6193e53d69877baeb5968bb49c3624a702f..42b29f4eca072681ad9ef71b96615fc51c80a709 100644
--- a/app/workers/scheduler/feed_cleanup_scheduler.rb
+++ b/app/workers/scheduler/feed_cleanup_scheduler.rb
@@ -14,37 +14,11 @@ class Scheduler::FeedCleanupScheduler
   private
 
   def clean_home_feeds!
-    clean_feeds!(inactive_account_ids, :home)
+    feed_manager.clean_feeds!(:home, inactive_account_ids)
   end
 
   def clean_list_feeds!
-    clean_feeds!(inactive_list_ids, :list)
-  end
-
-  def clean_feeds!(ids, type)
-    reblogged_id_sets = {}
-
-    redis.pipelined do
-      ids.each do |feed_id|
-        redis.del(feed_manager.key(type, feed_id))
-        reblog_key = feed_manager.key(type, feed_id, 'reblogs')
-        # We collect a future for this: we don't block while getting
-        # it, but we can iterate over it later.
-        reblogged_id_sets[feed_id] = redis.zrange(reblog_key, 0, -1)
-        redis.del(reblog_key)
-      end
-    end
-
-    # Remove all of the reblog tracking keys we just removed the
-    # references to.
-    redis.pipelined do
-      reblogged_id_sets.each do |feed_id, future|
-        future.value.each do |reblogged_id|
-          reblog_set_key = feed_manager.key(type, feed_id, "reblogs:#{reblogged_id}")
-          redis.del(reblog_set_key)
-        end
-      end
-    end
+    feed_manager.clean_feeds!(:list, inactive_list_ids)
   end
 
   def inactive_account_ids
diff --git a/app/workers/scheduler/instance_refresh_scheduler.rb b/app/workers/scheduler/instance_refresh_scheduler.rb
new file mode 100644
index 0000000000000000000000000000000000000000..917404beccb3addce4315c64740b51a6d8341f1a
--- /dev/null
+++ b/app/workers/scheduler/instance_refresh_scheduler.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Scheduler::InstanceRefreshScheduler
+  include Sidekiq::Worker
+
+  sidekiq_options lock: :until_executed, retry: 0
+
+  def perform
+    Instance.refresh
+  end
+end
diff --git a/app/workers/scheduler/ip_cleanup_scheduler.rb b/app/workers/scheduler/ip_cleanup_scheduler.rb
index 6d38b52a2988de2965a53cfbe5dcf819a69b5049..853f20e2515c367b47cc4e1450dff9938b6026c6 100644
--- a/app/workers/scheduler/ip_cleanup_scheduler.rb
+++ b/app/workers/scheduler/ip_cleanup_scheduler.rb
@@ -3,13 +3,23 @@
 class Scheduler::IpCleanupScheduler
   include Sidekiq::Worker
 
-  RETENTION_PERIOD = 1.year
+  IP_RETENTION_PERIOD = 1.year.freeze
 
   sidekiq_options lock: :until_executed, retry: 0
 
   def perform
-    time_ago = RETENTION_PERIOD.ago
-    SessionActivation.where('updated_at < ?', time_ago).in_batches.destroy_all
-    User.where('last_sign_in_at < ?', time_ago).where.not(last_sign_in_ip: nil).in_batches.update_all(last_sign_in_ip: nil)
+    clean_ip_columns!
+    clean_expired_ip_blocks!
+  end
+
+  private
+
+  def clean_ip_columns!
+    SessionActivation.where('updated_at < ?', IP_RETENTION_PERIOD.ago).in_batches.destroy_all
+    User.where('current_sign_in_at < ?', IP_RETENTION_PERIOD.ago).in_batches.update_all(last_sign_in_ip: nil, current_sign_in_ip: nil, sign_up_ip: nil)
+  end
+
+  def clean_expired_ip_blocks!
+    IpBlock.expired.in_batches.destroy_all
   end
 end
diff --git a/app/workers/scheduler/user_cleanup_scheduler.rb b/app/workers/scheduler/user_cleanup_scheduler.rb
index 6113edde17b301a15f2ea67f846bf7b498b0ff12..8571b59e1408e1e7d455d84b8ecda4c772f01a53 100644
--- a/app/workers/scheduler/user_cleanup_scheduler.rb
+++ b/app/workers/scheduler/user_cleanup_scheduler.rb
@@ -6,9 +6,22 @@ class Scheduler::UserCleanupScheduler
   sidekiq_options lock: :until_executed, retry: 0
 
   def perform
+    clean_unconfirmed_accounts!
+    clean_suspended_accounts!
+  end
+
+  private
+
+  def clean_unconfirmed_accounts!
     User.where('confirmed_at is NULL AND confirmation_sent_at <= ?', 2.days.ago).reorder(nil).find_in_batches do |batch|
       Account.where(id: batch.map(&:account_id)).delete_all
       User.where(id: batch.map(&:id)).delete_all
     end
   end
+
+  def clean_suspended_accounts!
+    AccountDeletionRequest.where('created_at <= ?', AccountDeletionRequest::DELAY_TO_DELETION.ago).reorder(nil).find_each do |deletion_request|
+      Admin::AccountDeletionWorker.perform_async(deletion_request.account_id)
+    end
+  end
 end
diff --git a/app/workers/unfollow_follow_worker.rb b/app/workers/unfollow_follow_worker.rb
index b6e665a41fbd67bceb6ce00b14f3fdfa6cca1a62..0bd5ff472e845d03eb5d5a03fe9b3632bc5e8424 100644
--- a/app/workers/unfollow_follow_worker.rb
+++ b/app/workers/unfollow_follow_worker.rb
@@ -10,10 +10,11 @@ class UnfollowFollowWorker
     old_target_account = Account.find(old_target_account_id)
     new_target_account = Account.find(new_target_account_id)
 
-    follow = follower_account.active_relationships.find_by(target_account: old_target_account)
+    follow  = follower_account.active_relationships.find_by(target_account: old_target_account)
     reblogs = follow&.show_reblogs?
+    notify  = follow&.notify?
 
-    FollowService.new.call(follower_account, new_target_account, reblogs: reblogs, bypass_locked: bypass_locked)
+    FollowService.new.call(follower_account, new_target_account, reblogs: reblogs, notify: notify, bypass_locked: bypass_locked, bypass_limit: true)
     UnfollowService.new.call(follower_account, old_target_account, skip_unmerge: true)
   rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
     true
diff --git a/app/workers/unmerge_worker.rb b/app/workers/unmerge_worker.rb
index ea6aacebf6df28fc7bad92bb8fc455661a16155e..1a23faae51f67632e1aac7db8d235bf2c1e5e431 100644
--- a/app/workers/unmerge_worker.rb
+++ b/app/workers/unmerge_worker.rb
@@ -6,6 +6,8 @@ class UnmergeWorker
   sidekiq_options queue: 'pull'
 
   def perform(from_account_id, into_account_id)
-    FeedManager.instance.unmerge_from_timeline(Account.find(from_account_id), Account.find(into_account_id))
+    FeedManager.instance.unmerge_from_home(Account.find(from_account_id), Account.find(into_account_id))
+  rescue ActiveRecord::RecordNotFound
+    true
   end
 end
diff --git a/bin/heroku-web b/bin/heroku-web
new file mode 100755
index 0000000000000000000000000000000000000000..219ef35b978bc169e7bff1e2b03a07f322e1ba0d
--- /dev/null
+++ b/bin/heroku-web
@@ -0,0 +1,2 @@
+#!/bin/bash
+if [ "$RUN_STREAMING" != "true" ]; then BIND=0.0.0.0 bundle exec puma -C config/puma.rb; else BIND=0.0.0.0 node ./streaming; fi
\ No newline at end of file
diff --git a/boxfile.yml b/boxfile.yml
index c4fd19ce6039a2c3264f0ae8d923a70c1826cc46..c1d89bb159febf8b6a75845f70a3e33875f50470 100644
--- a/boxfile.yml
+++ b/boxfile.yml
@@ -110,6 +110,7 @@ worker.sidekiq:
     mailers: bundle exec sidekiq -c 5 -q mailers -L /app/log/sidekiq.log
     pull: bundle exec sidekiq -c 5 -q pull -L /app/log/sidekiq.log
     push: bundle exec sidekiq -c 5 -q push -L /app/log/sidekiq.log
+    scheduler: bundle exec sidekiq -c 5 -q scheduler -L /app/log/sidekiq.log
 
   writable_dirs:
     - tmp
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 783569451d37c54f467587d1b7292e199915f200..19f9c64c741becf97874e56d0e86da4603872b52 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -15,12 +15,12 @@ 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: 0.1.0
+version: 0.1.2
 
 # 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: 3.1.5
+appVersion: 3.3.0
 
 dependencies:
   - name: elasticsearch
diff --git a/chart/templates/cronjob-media-remove.yaml b/chart/templates/cronjob-media-remove.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8a01a255181bdf7bd59ac9885af04faa0093069b
--- /dev/null
+++ b/chart/templates/cronjob-media-remove.yaml
@@ -0,0 +1,73 @@
+{{ if .Values.cron.removeMedia.enabled }}
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+  name: {{ include "mastodon.fullname" . }}-media-remove
+  labels:
+    {{- include "mastodon.labels" . | nindent 4 }}
+spec:
+  schedule: {{ .Values.cron.removeMedia.schedule }}
+  jobTemplate:
+    spec:
+      template:
+        metadata:
+          name: {{ include "mastodon.fullname" . }}-media-remove
+        spec:
+          restartPolicy: OnFailure
+          # 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.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.persistence.system.accessMode) }}
+          affinity:
+            podAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+              - labelSelector:
+                  matchExpressions:
+                    - key: component
+                      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
+          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.fullname" . }}
+              env:
+                - name: "DB_PASS"
+                  valueFrom:
+                    secretKeyRef:
+                      {{- if .Values.postgresql.enabled }}
+                      name: {{ .Release.Name }}-postgresql
+                      {{- else }}
+                      name: {{ template "mastodon.fullname" . }}-postgresql
+                      {{- end }}
+                      key: postgresql-password
+                - name: "REDIS_PASSWORD"
+                  valueFrom:
+                    secretKeyRef:
+                      name: {{ .Release.Name }}-redis
+                      key: redis-password
+                - name: "PORT"
+                  value: {{ .Values.application.web.port | quote }}
+              volumeMounts:
+                - name: assets
+                  mountPath: /opt/mastodon/public/assets
+                - name: system
+                  mountPath: /opt/mastodon/public/system
+{{- end }}
diff --git a/chart/values.yaml.template b/chart/values.yaml.template
index 694bc4d4224bfb8a58261608a1fbfd5e44e9c50f..9e50c6daca054563e6aedb8029dfa35743b750b8 100644
--- a/chart/values.yaml.template
+++ b/chart/values.yaml.template
@@ -4,7 +4,7 @@ image:
   repository: tootsuite/mastodon
   pullPolicy: Always
   # https://hub.docker.com/r/tootsuite/mastodon/tags
-  tag: v3.1.5
+  tag: v3.3.0
   # alternatively, use `latest` for the latest release or `edge` for the image
   # built from the most recent commit
   #
@@ -39,6 +39,12 @@ createAdmin:
 # available locales: https://github.com/tootsuite/mastodon/blob/master/config/application.rb#L43
 locale: en
 
+cron:
+  # run `tootctl media remove` every week
+  removeMedia:
+    enabled: true
+    schedule: "0 0 * * 0"
+
 application:
   web:
     port: 3000
diff --git a/config/application.rb b/config/application.rb
index ad6cf82d70f9710df3196214a06396d4a736dd5b..af77352212ff90f94cc6167db1394f82ceee2a5f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -22,6 +22,8 @@ require_relative '../lib/mastodon/version'
 require_relative '../lib/devise/two_factor_ldap_authenticatable'
 require_relative '../lib/devise/two_factor_pam_authenticatable'
 require_relative '../lib/chewy/strategy/custom_sidekiq'
+require_relative '../lib/webpacker/manifest_extensions'
+require_relative '../lib/webpacker/helper_extensions'
 
 Dotenv::Railtie.load
 
@@ -83,6 +85,7 @@ module Mastodon
       :kk,
       :kn,
       :ko,
+      :ku,
       :lt,
       :lv,
       :mk,
@@ -98,6 +101,8 @@ module Mastodon
       :'pt-PT',
       :ro,
       :ru,
+      :sa,
+      :sc,
       :sk,
       :sl,
       :sq,
@@ -111,6 +116,7 @@ module Mastodon
       :uk,
       :ur,
       :vi,
+      :zgh,
       :'zh-CN',
       :'zh-HK',
       :'zh-TW',
@@ -134,6 +140,7 @@ module Mastodon
       Doorkeeper::AuthorizationsController.layout 'modal'
       Doorkeeper::AuthorizedApplicationsController.layout 'admin'
       Doorkeeper::Application.send :include, ApplicationExtension
+      Doorkeeper::AccessToken.send :include, AccessTokenExtension
       Devise::FailureApp.send :include, AbstractController::Callbacks
       Devise::FailureApp.send :include, HttpAcceptLanguage::EasyAccess
       Devise::FailureApp.send :include, Localized
diff --git a/config/boot.rb b/config/boot.rb
index f3e36203aad90ff0b9874d6def3c6fa842941e0c..6cde5319d48414e15f593bca26637f6a6c124b86 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,3 +1,8 @@
+unless ENV.key?('RAILS_ENV')
+  STDERR.puts 'ERROR: Missing RAILS_ENV environment variable, please set it to "production", "development", or "test".'
+  exit 1
+end
+
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.
diff --git a/config/brakeman.ignore b/config/brakeman.ignore
index baa993c78ad9161eeb67ba72f2a1a4890413d0a2..dcbfd02b4e8cb17e85595cd3d89f8fe2c3f36726 100644
--- a/config/brakeman.ignore
+++ b/config/brakeman.ignore
@@ -102,6 +102,37 @@
       "confidence": "Weak",
       "note": ""
     },
+    {
+      "warning_type": "Dynamic Render Path",
+      "warning_code": 15,
+      "fingerprint": "4704e8093e3e0561bf705f892e8fc6780419f8255f4440b1c0afd09339bd6446",
+      "check_name": "Render",
+      "message": "Render path contains parameter value",
+      "file": "app/views/admin/instances/index.html.haml",
+      "line": 39,
+      "link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
+      "code": "render(action => filtered_instances.page(params[:page]), {})",
+      "render_path": [
+        {
+          "type": "controller",
+          "class": "Admin::InstancesController",
+          "method": "index",
+          "line": 10,
+          "file": "app/controllers/admin/instances_controller.rb",
+          "rendered": {
+            "name": "admin/instances/index",
+            "file": "app/views/admin/instances/index.html.haml"
+          }
+        }
+      ],
+      "location": {
+        "type": "template",
+        "template": "admin/instances/index"
+      },
+      "user_input": "params[:page]",
+      "confidence": "Weak",
+      "note": ""
+    },
     {
       "warning_type": "Redirect",
       "warning_code": 18,
@@ -122,6 +153,26 @@
       "confidence": "High",
       "note": ""
     },
+    {
+      "warning_type": "SQL Injection",
+      "warning_code": 0,
+      "fingerprint": "6e4051854bb62e2ddbc671f82d6c2328892e1134b8b28105ecba9b0122540714",
+      "check_name": "SQL",
+      "message": "Possible SQL injection",
+      "file": "app/models/account.rb",
+      "line": 491,
+      "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
+      "code": "find_by_sql([\"          WITH first_degree AS (\\n            SELECT target_account_id\\n            FROM follows\\n            WHERE account_id = ?\\n            UNION ALL\\n            SELECT ?\\n          )\\n          SELECT\\n            accounts.*,\\n            (count(f.id) + 1) * ts_rank_cd(#{textsearch}, #{query}, 32) AS rank\\n          FROM accounts\\n          LEFT OUTER JOIN follows AS f ON (accounts.id = f.account_id AND f.target_account_id = ?)\\n          WHERE accounts.id IN (SELECT * FROM first_degree)\\n            AND #{query} @@ #{textsearch}\\n            AND accounts.suspended_at IS NULL\\n            AND accounts.moved_to_account_id IS NULL\\n          GROUP BY accounts.id\\n          ORDER BY rank DESC\\n          LIMIT ? OFFSET ?\\n\".squish, account.id, account.id, account.id, limit, offset])",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "Account",
+        "method": "advanced_search_for"
+      },
+      "user_input": "textsearch",
+      "confidence": "Medium",
+      "note": ""
+    },
     {
       "warning_type": "SQL Injection",
       "warning_code": 0,
@@ -163,23 +214,23 @@
       "note": ""
     },
     {
-      "warning_type": "Mass Assignment",
-      "warning_code": 105,
-      "fingerprint": "8f63dec68951d9bcf7eddb15af9392b2e1333003089c41fb76688dfd3579f394",
-      "check_name": "PermitAttributes",
-      "message": "Potentially dangerous key allowed for mass assignment",
-      "file": "app/controllers/api/v1/crypto/deliveries_controller.rb",
-      "line": 23,
-      "link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
-      "code": "params.require(:device).permit(:account_id, :device_id, :type, :body, :hmac)",
+      "warning_type": "SQL Injection",
+      "warning_code": 0,
+      "fingerprint": "9251d682c4e2840e1b2fea91e7d758efe2097ecb7f6255c065e3750d25eb178c",
+      "check_name": "SQL",
+      "message": "Possible SQL injection",
+      "file": "app/models/account.rb",
+      "line": 460,
+      "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
+      "code": "find_by_sql([\"        SELECT\\n          accounts.*,\\n          ts_rank_cd(#{textsearch}, #{query}, 32) AS rank\\n        FROM accounts\\n        WHERE #{query} @@ #{textsearch}\\n          AND accounts.suspended_at IS NULL\\n          AND accounts.moved_to_account_id IS NULL\\n        ORDER BY rank DESC\\n        LIMIT ? OFFSET ?\\n\".squish, limit, offset])",
       "render_path": null,
       "location": {
         "type": "method",
-        "class": "Api::V1::Crypto::DeliveriesController",
-        "method": "resource_params"
+        "class": "Account",
+        "method": "search_for"
       },
-      "user_input": ":account_id",
-      "confidence": "High",
+      "user_input": "textsearch",
+      "confidence": "Medium",
       "note": ""
     },
     {
@@ -273,6 +324,26 @@
       "confidence": "High",
       "note": ""
     },
+    {
+      "warning_type": "SQL Injection",
+      "warning_code": 0,
+      "fingerprint": "e21d8fee7a5805761679877ca35ed1029c64c45ef3b4012a30262623e1ba8bb9",
+      "check_name": "SQL",
+      "message": "Possible SQL injection",
+      "file": "app/models/account.rb",
+      "line": 507,
+      "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
+      "code": "find_by_sql([\"          SELECT\\n            accounts.*,\\n            (count(f.id) + 1) * ts_rank_cd(#{textsearch}, #{query}, 32) AS rank\\n          FROM accounts\\n          LEFT OUTER JOIN follows AS f ON (accounts.id = f.account_id AND f.target_account_id = ?) OR (accounts.id = f.target_account_id AND f.account_id = ?)\\n          WHERE #{query} @@ #{textsearch}\\n            AND accounts.suspended_at IS NULL\\n            AND accounts.moved_to_account_id IS NULL\\n          GROUP BY accounts.id\\n          ORDER BY rank DESC\\n          LIMIT ? OFFSET ?\\n\".squish, account.id, account.id, limit, offset])",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "Account",
+        "method": "advanced_search_for"
+      },
+      "user_input": "textsearch",
+      "confidence": "Medium",
+      "note": ""
+    },
     {
       "warning_type": "Mass Assignment",
       "warning_code": 105,
@@ -294,6 +365,6 @@
       "note": ""
     }
   ],
-  "updated": "2020-06-01 18:18:02 +0200",
-  "brakeman_version": "4.8.0"
+  "updated": "2020-12-07 01:17:13 +0100",
+  "brakeman_version": "4.10.0"
 }
diff --git a/config/initializers/cache_buster.rb b/config/initializers/cache_buster.rb
new file mode 100644
index 0000000000000000000000000000000000000000..227e450f35c1e0df953995625f2f88e0ce7b35d5
--- /dev/null
+++ b/config/initializers/cache_buster.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+Rails.application.configure do
+  config.x.cache_buster_enabled = ENV['CACHE_BUSTER_ENABLED'] == 'true'
+
+  config.x.cache_buster = {
+    secret_header: ENV['CACHE_BUSTER_SECRET_HEADER'],
+    secret: ENV['CACHE_BUSTER_SECRET'],
+  }
+end
diff --git a/config/initializers/chewy.rb b/config/initializers/chewy.rb
index 8f54abf77890a533871e961c52ad74bd8851c8ed..9fc9b2f1a59368e8d87322242a46ce2cb57e93b9 100644
--- a/config/initializers/chewy.rb
+++ b/config/initializers/chewy.rb
@@ -12,6 +12,10 @@ Chewy.settings = {
   sidekiq: { queue: 'pull' },
 }
 
+# We use our own async strategy even outside the request-response
+# cycle, which takes care of checking if ElasticSearch is enabled
+# or not. However, mind that for the Rails console, the :urgent
+# strategy is set automatically with no way to override it.
 Chewy.root_strategy              = :custom_sidekiq
 Chewy.request_strategy           = :custom_sidekiq
 Chewy.use_after_commit_callbacks = false
@@ -37,6 +41,7 @@ Elasticsearch::Transport::Client.prepend Module.new {
     super arguments
   end
 }
+
 Elasticsearch::API::Indices::IndicesClient.prepend Module.new {
   def create(arguments = {})
     arguments[:include_type_name] = true
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 59e69ad375feeb25d42038eb6b447f0702eb1d33..ef612e177de2fc7557653944f613717064eecc72 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -10,6 +10,7 @@ Warden::Manager.after_set_user except: :fetch do |user, warden|
     expires: 1.year.from_now,
     httponly: true,
     secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'),
+    same_site: :lax,
   }
 end
 
@@ -20,6 +21,7 @@ Warden::Manager.after_fetch do |user, warden|
       expires: 1.year.from_now,
       httponly: true,
       secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'),
+      same_site: :lax,
     }
   else
     warden.logout
diff --git a/config/initializers/makara.rb b/config/initializers/makara.rb
new file mode 100644
index 0000000000000000000000000000000000000000..dc88fa63cd09430875d3ab5bd0508e8183f09ecb
--- /dev/null
+++ b/config/initializers/makara.rb
@@ -0,0 +1,2 @@
+Makara::Cookie::DEFAULT_OPTIONS[:same_site] = :lax
+Makara::Cookie::DEFAULT_OPTIONS[:secure]    = Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index b4849370dbd2bc2d4c7f776979a92f2d592e67c0..9ad7fd814c80dac34d29c05a0269e46731d3f4f3 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -62,7 +62,7 @@ if ENV['S3_ENABLED'] == 'true'
     s3_options: {
       signature_version: ENV.fetch('S3_SIGNATURE_VERSION') { 'v4' },
       http_open_timeout: ENV.fetch('S3_OPEN_TIMEOUT'){ '5' }.to_i,
-      http_read_timeout: 5,
+      http_read_timeout: ENV.fetch('S3_READ_TIMEOUT'){ '5' }.to_i,
       http_idle_timeout: 5,
       retry_limit: 0,
     }
@@ -107,10 +107,20 @@ elsif ENV['SWIFT_ENABLED'] == 'true'
 else
   Paperclip::Attachment.default_options.merge!(
     storage: :filesystem,
-    use_timestamp: true,
     path: File.join(ENV.fetch('PAPERCLIP_ROOT_PATH', File.join(':rails_root', 'public', 'system')), ':prefix_path:class', ':attachment', ':id_partition', ':style', ':filename'),
     url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + '/:prefix_url:class/:attachment/:id_partition/:style/:filename',
   )
 end
 
 Paperclip.options[:content_type_mappings] = { csv: Import::FILE_TYPES }
+
+# In some places in the code, we rescue this exception, but we don't always
+# load the S3 library, so it may be an undefined constant:
+
+unless defined?(Seahorse)
+  module Seahorse
+    module Client
+      class NetworkingError < StandardError; end
+    end
+  end
+end
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index cd29afac5258bc6b6485a22550e7bb26c2c88418..6662ef40b035a0a90410af2d672659c9d8ab35f1 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -42,6 +42,10 @@ class Rack::Attack
     req.remote_ip == '127.0.0.1' || req.remote_ip == '::1'
   end
 
+  Rack::Attack.blocklist('deny from blocklist') do |req|
+    IpBlock.blocked?(req.remote_ip)
+  end
+
   throttle('throttle_authenticated_api', limit: 300, period: 5.minutes) do |req|
     req.authenticated_user_id if req.api_request?
   end
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 3dc0edd6fd262f70a6c496c922beb97bd096003c..e5d1be4c6c7d53619c7bcd40c1806ef77ca669ce 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,3 +1,7 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.session_store :cookie_store, key: '_mastodon_session', secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true')
+Rails.application.config.session_store :cookie_store, {
+  key: '_mastodon_session',
+  secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'),
+  same_site: :lax,
+}
diff --git a/config/initializers/twitter_regex.rb b/config/initializers/twitter_regex.rb
index f84f7c0cbb62caca001a0d2a34fd992f7ad8e9ad..7f99a0005649e6f9b6c74e2676a1011831c57df4 100644
--- a/config/initializers/twitter_regex.rb
+++ b/config/initializers/twitter_regex.rb
@@ -29,7 +29,7 @@ module Twitter
       (                                                                                     #   $1 total match
         (#{REGEXEN[:valid_url_preceding_chars]})                                            #   $2 Preceding character
         (                                                                                   #   $3 URL
-          ((?:https?|dat|dweb|ipfs|ipns|ssb|gopher):\/\/)?                                  #   $4 Protocol (optional)
+          ((?:https?|dat|dweb|ipfs|ipns|ssb|gopher|gemini):\/\/)?                           #   $4 Protocol (optional)
           (#{REGEXEN[:valid_domain]})                                                       #   $5 Domain(s)
           (?::(#{REGEXEN[:valid_port_number]}))?                                            #   $6 Port number (optional)
           (/#{REGEXEN[:valid_url_path]}*)?                                                  #   $7 URL Path and anchor
diff --git a/config/initializers/webauthn.rb b/config/initializers/webauthn.rb
new file mode 100644
index 0000000000000000000000000000000000000000..a0a5b815378a15eca05340e7f0b2b87bd5195c1a
--- /dev/null
+++ b/config/initializers/webauthn.rb
@@ -0,0 +1,24 @@
+WebAuthn.configure do |config|
+  # This value needs to match `window.location.origin` evaluated by
+  # the User Agent during registration and authentication ceremonies.
+  config.origin = "#{Rails.configuration.x.use_https ? 'https' : 'http' }://#{Rails.configuration.x.web_domain}"
+
+  # Relying Party name for display purposes
+  config.rp_name = "Mastodon"
+
+  # Optionally configure a client timeout hint, in milliseconds.
+  # This hint specifies how long the browser should wait for an
+  # attestation or an assertion response.
+  # This hint may be overridden by the browser.
+  # https://www.w3.org/TR/webauthn/#dom-publickeycredentialcreationoptions-timeout
+  config.credential_options_timeout = 120_000
+
+  # You can optionally specify a different Relying Party ID
+  # (https://www.w3.org/TR/webauthn/#relying-party-identifier)
+  # if it differs from the default one.
+  #
+  # In this case the default would be "auth.example.com", but you can set it to
+  # the suffix "example.com"
+  #
+  # config.rp_id = "example.com"
+end
diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml
index f40e6c36132b1e227a261ccb87a6d1a1abdf5e95..2fbf0ffd710189ce2905acb59a57eba453b1b9f9 100644
--- a/config/locales/activerecord.es.yml
+++ b/config/locales/activerecord.es.yml
@@ -1,17 +1 @@
----
-es:
-  activerecord:
-    attributes:
-      poll:
-        expires_at: Vencimiento
-        options: Opciones
-    errors:
-      models:
-        account:
-          attributes:
-            username:
-              invalid: sÃ³lo letras, nÃºmeros y guiones bajos
-        status:
-          attributes:
-            reblog:
-              taken: del estado ya existe
+--- {}
diff --git a/config/locales/activerecord.hi.yml b/config/locales/activerecord.hi.yml
index d758a5b5357d76effdf363eeb2c8e0dfb231c4aa..b002ab0933bdf81204e2a39b7e56d8f2cf0c5c42 100644
--- a/config/locales/activerecord.hi.yml
+++ b/config/locales/activerecord.hi.yml
@@ -1 +1,17 @@
+---
 hi:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: à¤¸à¤®à¤¯à¤¸à¥€à¤®à¤¾
+        options: à¤µà¤¿à¤•à¤²à¥à¤ª
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: à¤•à¥‡à¤µà¤² à¤…à¤•à¥à¤·à¤°, à¤¸à¤‚à¤–à¥à¤¯à¤¾ à¤”à¤° à¤…à¤‚à¤¡à¤°à¤¸à¥à¤•à¥‹à¤°
+        status:
+          attributes:
+            reblog:
+              taken: à¤¸à¥à¤¥à¤¿à¤¤à¤¿ à¤ªà¤¹à¤²à¥‡ à¤¸à¥‡ à¤®à¥Œà¤œà¥‚à¤¦ à¤¹à¥ˆ
diff --git a/config/locales/activerecord.hr.yml b/config/locales/activerecord.hr.yml
index f67f33c7e0cfcce80b0d9e2a044068a78a531865..98ca8155fdaa25b5215f9c268341ccc99cdfc244 100644
--- a/config/locales/activerecord.hr.yml
+++ b/config/locales/activerecord.hr.yml
@@ -1 +1,7 @@
+---
 hr:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: Krajnji rok
+        options: Opcije
diff --git a/config/locales/activerecord.kab.yml b/config/locales/activerecord.kab.yml
index 24e2760dac0738652d83dcfe9c3c579573acfaef..d6b3c40e4a23f31710fc9be62c5a87672c8c28f7 100644
--- a/config/locales/activerecord.kab.yml
+++ b/config/locales/activerecord.kab.yml
@@ -3,7 +3,7 @@ kab:
   activerecord:
     attributes:
       poll:
-        expires_at: Azemz n tagara
+        expires_at: Azemz n taggara
         options: Tifranin
     errors:
       models:
diff --git a/config/locales/activerecord.ku.yml b/config/locales/activerecord.ku.yml
index cc251e86ae3fc9c96ba4a32a86e9e41868ac09d9..3b976de8c4766c48dbb6fc0cfa79a71818afb809 100644
--- a/config/locales/activerecord.ku.yml
+++ b/config/locales/activerecord.ku.yml
@@ -1 +1,17 @@
-ckb-IR:
+---
+ku:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: ÙˆØ§Ø¯Û•ÛŒ Ú©Û†ØªØ§ÛŒÛŒ
+        options: Ù‡Û•ÚµØ¨Ú˜Ø§Ø±Ø¯Ù†Û•Ú©Ø§Ù†
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: ØªÛ•Ù†Ù‡Ø§ Ù¾ÛŒØªØŒ Ú˜Ù…Ø§Ø±Û• Ùˆ Ú˜ÛŽØ±Û•ÙˆÛ•
+        status:
+          attributes:
+            reblog:
+              taken: Ù„Û• Ø¨Ø§Ø± Ø¨ÙˆÙˆÙ†ÛŒ Ù‡Û•ÛŒÛ•
diff --git a/config/locales/activerecord.sa.yml b/config/locales/activerecord.sa.yml
new file mode 100644
index 0000000000000000000000000000000000000000..07ea4372a3a109674214ba80f2070c9f99fb872d
--- /dev/null
+++ b/config/locales/activerecord.sa.yml
@@ -0,0 +1 @@
+sa:
diff --git a/config/locales/activerecord.sc.yml b/config/locales/activerecord.sc.yml
index 6467372690a4143ae03c3f28c23bdd1406a2c5d6..cae24d30c1d5925edac4d5d360ffc6cd1f82f351 100644
--- a/config/locales/activerecord.sc.yml
+++ b/config/locales/activerecord.sc.yml
@@ -4,3 +4,14 @@ sc:
     attributes:
       poll:
         expires_at: IscadÃ¨ntzia
+        options: Seberos
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: petzi lÃ¬teras, nÃ¹meros e tratigheddos bassos
+        status:
+          attributes:
+            reblog:
+              taken: de s'istadu esistet giai
diff --git a/config/locales/activerecord.sv.yml b/config/locales/activerecord.sv.yml
index 8d142e7acd9aa0259e12980952b56e2358f83fe5..67c1608219bc8dd27ca44473f265ceba629f8888 100644
--- a/config/locales/activerecord.sv.yml
+++ b/config/locales/activerecord.sv.yml
@@ -11,3 +11,7 @@ sv:
           attributes:
             username:
               invalid: endast bokstÃ¤ver, siffror och understrykning
+        status:
+          attributes:
+            reblog:
+              taken: av status finns redan
diff --git a/config/locales/activerecord.th.yml b/config/locales/activerecord.th.yml
index fd71e36d221f5b68bd41109183dbca89f703c9ad..4dea79b882f7bfb9716b31e24180d3edc3e4c81e 100644
--- a/config/locales/activerecord.th.yml
+++ b/config/locales/activerecord.th.yml
@@ -14,4 +14,4 @@ th:
         status:
           attributes:
             reblog:
-              taken: à¸¡à¸µà¸ªà¸–à¸²à¸™à¸°à¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§
+              taken: à¸‚à¸à¸‡à¸ªà¸–à¸²à¸™à¸°à¸¡à¸µà¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§
diff --git a/config/locales/activerecord.tr.yml b/config/locales/activerecord.tr.yml
index 8ce55599cb3b96c656effaf35bdf402b3de8fcae..336c83e7b8b6f40e66eccc3fa7769591c2c230bf 100644
--- a/config/locales/activerecord.tr.yml
+++ b/config/locales/activerecord.tr.yml
@@ -3,7 +3,7 @@ tr:
   activerecord:
     attributes:
       poll:
-        expires_at: Son Teslim Tarihi
+        expires_at: BitiÅŸ zamanÄ±
         options: SeÃ§enekler
     errors:
       models:
diff --git a/config/locales/activerecord.tt.yml b/config/locales/activerecord.tt.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5eab4abff95e2119202e91e8d75bd785c9ccbdc9
--- /dev/null
+++ b/config/locales/activerecord.tt.yml
@@ -0,0 +1 @@
+tt:
diff --git a/config/locales/activerecord.zgh.yml b/config/locales/activerecord.zgh.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8271554666df69414a57b28544cac7837eb71268
--- /dev/null
+++ b/config/locales/activerecord.zgh.yml
@@ -0,0 +1 @@
+zgh:
diff --git a/config/locales/activerecord.zh-HK.yml b/config/locales/activerecord.zh-HK.yml
index c968e55aa600f5f996656b7658b49231f6344697..89c3fa02d981371d62449d88a7a80f3f24f8e80d 100644
--- a/config/locales/activerecord.zh-HK.yml
+++ b/config/locales/activerecord.zh-HK.yml
@@ -4,7 +4,7 @@ zh-HK:
     attributes:
       poll:
         expires_at: æˆªæ¢æ™‚é–“
-        options: é¸æ“‡
+        options: é¸é …
     errors:
       models:
         account:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index b82b030a3e6cbf0c5b60662e086751c2a50da983..44ada75d1fe4743c1bd633e45ee9552d12e3f0e6 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -45,6 +45,7 @@ ar:
       silenced: 'Ø³ÙŠØªÙ… Ø¥Ø®ÙØ§Ø¡ Ø§Ù„Ù…Ù†Ø´ÙˆØ±Ø§Øª Ø§Ù„Ù‚Ø§Ø¯Ù…Ø© Ù…Ù† Ù‡Ø°Ù‡ Ø§Ù„Ø®ÙˆØ§Ø¯Ù… ÙÙŠ Ø§Ù„Ø®ÙŠÙˆØ· Ø§Ù„Ø²Ù…Ù†ÙŠØ© ÙˆØ§Ù„Ù…ØØ§Ø¯Ø«Ø§Øª Ø§Ù„Ø¹Ø§Ù…Ø©ØŒ ÙˆÙ„Ù† ÙŠØªÙ… Ø¥Ù†Ø´Ø§Ø¡ Ø£ÙŠ Ø¥Ø®Ø·Ø§Ø±Ø§Øª Ù…Ù† Ø¬Ø±Ø§Ø¡ ØªÙØ§Ø¹Ù„Ø§Øª Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ‡Ø§ØŒ Ù…Ø§ Ù„Ù… ØªÙØªÙŽØ§Ø¨Ø¹Ù‡Ù…:'
       silenced_title: Ø§Ù„Ø®ÙˆØ§Ø¯Ù… Ø§Ù„Ù…ÙƒØªÙˆÙ…Ø©
       suspended: 'Ù„Ù† ÙŠØªÙ… Ù…Ø¹Ø§Ù„Ø¬Ø© Ø£ÙŠ Ø¨ÙŠØ§Ù†Ø§Øª Ù‚Ø§Ø¯Ù…Ø© Ù…Ù† Ù‡Ø°Ù‡ Ø§Ù„Ø®ÙˆØ§Ø¯Ù… Ø£Ùˆ ØªØ®Ø²ÙŠÙ†Ù‡Ø§ Ø£Ùˆ ØªØ¨Ø§Ø¯Ù„Ù‡Ø§ØŒ Ù…Ù…Ø§ Ø³ÙŠØ¬Ø¹Ù„ Ø£ÙŠ ØªÙØ§Ø¹Ù„ Ø£Ùˆ Ø§ØªØµØ§Ù„ Ù…Ø¹ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† ÙˆØ§Ù„Ù…Ø³ØªØ®Ø¯Ù…Ø§Øª Ø§Ù„Ù…Ù†ØªÙ…ÙŠÙ† Ø¥Ù„Ù‰ Ù‡Ø°Ù‡ Ø§Ù„Ø®ÙˆØ§Ø¯Ù… Ù…Ø³ØªØÙŠÙ„Ø©:'
+      suspended_title: Ø§Ù„Ø®ÙˆØ§Ø¯Ù… Ø§Ù„Ù…Ø¹Ù„Ù‘ÙŽÙ‚Ø©
     unavailable_content_html: ÙŠØ³Ù…Ø Ù„Ùƒ Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ø¹Ù…ÙˆÙ…Ø§Ù‹ Ø¨Ø¹Ø±Ø¶ Ù…ØØªÙˆÙ‰ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† Ø§Ù„Ù‚Ø§Ø¯Ù… Ù…Ù† Ø£ÙŠ Ø®Ø§Ø¯Ù… Ø¢Ø®Ø± ÙÙŠ Ø§Ù„ÙØ¯ÙŠÙØ±Ø³ ÙˆØ§Ù„ØªÙØ§Ø¹Ù„ Ù…Ø¹Ù‡Ù…. ÙˆÙ‡Ø°Ù‡ Ù‡ÙŠ Ø§Ù„Ø§Ø³ØªØ«Ù†Ø§Ø¡Ø§Øª Ø§Ù„ØªÙŠ ÙˆØ¶Ø¹Øª Ø¹Ù„Ù‰ Ù‡Ø°Ø§ Ø§Ù„Ø®Ø§Ø¯ÙˆÙ… Ø¨Ø§Ù„Ø°Ø§Øª.
     user_count_after:
       few: Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ†
@@ -441,6 +442,14 @@ ar:
         expired: Ø§Ù„Ù…Ù†ØªÙ‡ÙŠ ØµÙ„Ø§ØÙŠØªÙ‡Ø§
         title: Ø§Ù„ØªØµÙÙŠØ©
       title: Ø§Ù„Ø¯Ø¹ÙˆØ§Øª
+    ip_blocks:
+      expires_in:
+        '1209600': Ø£Ø³Ø¨ÙˆØ¹Ø§Ù†
+        '15778476': 6 Ø£Ø´Ù‡Ø±
+        '2629746': Ø´Ù‡Ø± ÙˆØ§ØØ¯
+        '31556952': Ø³Ù†Ø© ÙˆØ§ØØ¯Ø©
+        '86400': ÙŠÙˆÙ… ÙˆØ§ØØ¯
+        '94670856': 3 Ø³Ù†ÙˆØ§Øª
     pending_accounts:
       title: Ø§Ù„ØØ³Ø§Ø¨Ø§Øª Ø§Ù„Ù…Ø¹Ù„Ù‚Ø© (%{count})
     relationships:
@@ -613,6 +622,7 @@ ar:
     tags:
       accounts_today: Ø§Ø³ØªØ®Ø¯Ø§Ù…Ø§Øª Ù‡Ø°Ø§ Ø§Ù„ÙŠÙˆÙ…
       accounts_week: Ø§Ø³ØªØ®Ø¯Ø§Ù…Ø§Øª Ù‡Ø°Ø§ Ø§Ù„Ø£Ø³Ø¨ÙˆØ¹
+      breakdown: ØªÙˆØ²ÙŠØ¹ Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø§Ù„ÙŠÙˆÙ… ØØ³Ø¨ Ø§Ù„Ù…ØµØ¯Ø±
       context: Ø§Ù„Ø³ÙŠØ§Ù‚
       directory: ÙÙŠ Ø¯Ù„ÙŠÙ„ ØØ³Ø§Ø¨Ø§Øª Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ†
       in_directory: "%{count} ÙÙŠ Ø³Ø¬Ù„ ØØ³Ø§Ø¨Ø§Øª Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ†"
@@ -1212,21 +1222,15 @@ ar:
       default: "%b %d, %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Ù‚Ù… Ø¨Ø¥Ø¯Ø®Ø§Ù„ Ø§Ù„Ø±Ù…Ø² Ø§Ù„Ù…ÙÙˆÙŽÙ„Ù‘Ø¯ Ø¹Ø¨Ø± ØªØ·Ø¨ÙŠÙ‚ Ø§Ù„Ù…ØµØ§Ø¯Ù‚Ø© Ù„Ù„ØªØ£ÙƒÙŠØ¯
-    description_html: ÙÙŠ ØØ§Ù„ ØªÙØ¹ÙŠÙ„ <strong>Ø§Ù„Ù…ØµØ§Ø¯Ù‚Ø© Ø¨Ø®Ø·ÙˆØªÙŠÙ† </strong>ØŒ ÙØªØ³Ø¬ÙŠÙ„ Ø§Ù„Ø¯Ø®ÙˆÙ„ ÙŠØªØ·Ù„Ø¨ Ù…Ù†Ùƒ Ø£Ù† ÙŠÙƒÙˆÙ† Ø¨ØÙˆØ²ØªÙƒ Ù‡Ø§ØªÙÙƒ Ø§Ù„Ù†Ù‚Ø§Ù„ Ù‚ØµØ¯ ØªÙˆÙ„ÙŠØ¯ Ø§Ù„Ø±Ù…Ø² Ø§Ù„Ø°ÙŠ Ø³ÙŠØªÙ… Ø¥Ø¯Ø®Ø§Ù„Ù‡.
     disable: ØªØ¹Ø·ÙŠÙ„
-    enable: ØªÙØ¹ÙŠÙ„
     enabled: Ù†Ø¸Ø§Ù… Ø§Ù„Ù…ØµØ§Ø¯Ù‚Ø© Ø¨Ø®Ø·ÙˆØªÙŠÙ† Ù…ÙÙØ¹Ù‘ÙŽÙ„
     enabled_success: ØªÙ… ØªÙØ¹ÙŠÙ„ Ø§Ù„Ù…ØµØ§Ø¯Ù‚Ø© Ø¨Ø®Ø·ÙˆØªÙŠÙ† Ø¨Ù†Ø¬Ø§Ø
     generate_recovery_codes: ØªÙˆÙ„ÙŠØ¯ Ø±Ù…ÙˆØ² Ø§Ù„Ø§Ø³ØªØ±Ø¬Ø§Ø¹
-    instructions_html: "<strong>Ù‚Ù… Ø¨Ù…Ø³Ø Ø±Ù…Ø² Ø§Ù„ÙƒÙŠÙˆ Ø¢Ø± Ø¹Ø¨Ø± Google Authenticator Ø£Ùˆ Ø£ÙŠ ØªØ·Ø¨ÙŠÙ‚ TOTP Ø¹Ù„Ù‰ Ø¬Ù‡Ø§Ø²Ùƒ</strong>. Ù…Ù† Ø§Ù„Ø¢Ù† ÙØµØ§Ø¹Ø¯Ø§ Ø³ÙˆÙ ÙŠÙ‚ÙˆÙ… Ø°Ø§Ùƒ Ø§Ù„ØªØ·Ø¨ÙŠÙ‚ Ø¨ØªÙˆÙ„ÙŠØ¯ Ø±Ù…ÙˆØ² ÙŠØ¬Ø¨ Ø¹Ù„ÙŠÙƒ Ø¥Ø¯Ø®Ø§Ù„Ù‡Ø§ Ø¹Ù†Ø¯ ØªØ³Ø¬ÙŠÙ„ Ø§Ù„Ø¯Ø®ÙˆÙ„."
     lost_recovery_codes: ØªÙÙ…ÙƒÙ‘Ù†Ùƒ Ø±Ù…ÙˆØ² Ø§Ù„Ø§Ø³ØªØ±Ø¬Ø§Ø¹ Ø§Ù„Ø§ØØªÙŠØ§Ø·ÙŠØ© Ù…ÙÙ† Ø§Ø³ØªØ±Ø¬Ø§Ø¹ Ø§Ù„Ù†ÙØ§Ø° Ø¥Ù„Ù‰ ØØ³Ø§Ø¨Ùƒ ÙÙŠ ØØ§Ù„Ø© ÙÙ‚Ø¯Ø§Ù† Ø¬Ù‡Ø§Ø²Ùƒ Ø§Ù„Ù…ØÙ…ÙˆÙ„. Ø¥Ù† Ø¶Ø§Ø¹Øª Ù…Ù†Ùƒ Ù‡Ø°Ù‡ Ø§Ù„Ø±Ù…ÙˆØ² ÙØ¨Ø¥Ù…ÙƒØ§Ù†Ùƒ Ø¥Ø¹Ø§Ø¯Ø© ØªÙˆÙ„ÙŠØ¯Ù‡Ø§ Ù…ÙÙ† Ù‡Ù†Ø§ Ùˆ Ø¥Ø¨Ø·Ø§Ù„ Ø§Ù„Ø±Ù…ÙˆØ² Ø§Ù„Ù‚Ø¯ÙŠÙ…Ø©.
-    manual_instructions: 'ÙÙŠ ØØ§Ù„Ø© ØªØ¹Ø°Ù‘Ø± Ù…Ø³Ø Ø±Ù…Ø² Ø§Ù„ÙƒÙŠÙˆ Ø¢Ø± Ø£Ùˆ Ø·ÙÙ„Ø¨ Ù…Ù†Ùƒ Ø¥Ø¯Ø®Ø§Ù„ ÙŠØ¯ÙˆÙŠØŒ ÙŠÙÙ…Ù’ÙƒÙÙ†Ùƒ Ø¥Ø¯Ø®Ø§Ù„ Ù‡Ø°Ø§ Ø§Ù„Ù†Øµ Ø§Ù„Ø³Ø±ÙŠ Ø¹Ù„Ù‰ Ø§Ù„ØªØ·Ø¨ÙŠÙ‚:'
     recovery_codes: Ø§Ù„Ù†Ø³Ø® Ø§Ù„Ø§ØØªÙŠØ§Ø·ÙŠ Ù„Ø±Ù…ÙˆØ² Ø§Ù„Ø§Ø³ØªØ±Ø¬Ø§Ø¹
     recovery_codes_regenerated: ØªÙ… Ø¥Ø¹Ø§Ø¯Ø© ØªÙˆÙ„ÙŠØ¯ Ø±Ù…ÙˆØ² Ø§Ù„Ø§Ø³ØªØ±Ø¬Ø§Ø¹ Ø§Ù„Ø§ØØªÙŠØ§Ø·ÙŠØ© Ø¨Ù†Ø¬Ø§Ø
     recovery_instructions_html: Ø¥Ù† ÙÙ‚Ø¯Øª Ø§Ù„ÙˆØµÙˆÙ„ Ø¥Ù„Ù‰ Ù‡Ø§ØªÙÙƒØŒ ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø£ØØ¯ Ø±Ù…ÙˆØ² Ø§Ù„Ø§Ø³ØªØ±Ø¯Ø§Ø¯ Ø£Ø¯Ù†Ø§Ù‡ Ù„Ø§Ø³ØªØ¹Ø§Ø¯Ø© Ø§Ù„ÙˆØµÙˆÙ„ Ø¥Ù„Ù‰ ØØ³Ø§Ø¨Ùƒ. <strong>ØØ§ÙØ¸ Ø¹Ù„Ù‰ Ø±Ù…ÙˆØ² Ø§Ù„Ø§Ø³ØªØ±Ø¯Ø§Ø¯ Ø¨Ø£Ù…Ø§Ù†</strong>. ÙŠÙ…ÙƒÙ†Ùƒ ØŒ Ø¹Ù„Ù‰ Ø³Ø¨ÙŠÙ„ Ø§Ù„Ù…Ø«Ø§Ù„ ØŒ Ø·Ø¨Ø§Ø¹ØªÙ‡Ø§ ÙˆØªØ®Ø²ÙŠÙ†Ù‡Ø§ Ù…Ø¹ Ù…Ø³ØªÙ†Ø¯Ø§Øª Ø£Ø®Ø±Ù‰ Ù‡Ø§Ù…Ø©.
-    setup: ØªÙ†Ø´ÙŠØ·
-    wrong_code: Ø§Ù„Ø±Ù…Ø² Ø§Ù„Ø°ÙŠ Ø£Ø¯Ø®Ù„ØªÙ‡ ØºÙŠØ± ØµØ§Ù„Ø! ØªØÙ‚Ù‚ Ù…Ù† ØµØØ© Ø§Ù„ÙˆÙ‚Øª Ø¹Ù„Ù‰ Ø§Ù„Ø®Ø§Ø¯Ù… Ùˆ Ø§Ù„Ø¬Ù‡Ø§Ø²ØŸ
+    webauthn: Ù…ÙØ§ØªÙŠØ Ø§Ù„Ø£Ù…Ø§Ù†
   user_mailer:
     backup_ready:
       explanation: Ù„Ù‚Ø¯ Ù‚Ù…Øª Ø¨Ø·Ù„Ø¨ Ù†Ø³Ø®Ø© ÙƒØ§Ù…Ù„Ø© Ù„ØØ³Ø§Ø¨Ùƒ Ø¹Ù„Ù‰ Ù…Ø§Ø³ØªØ¯ÙˆÙ†. Ø¥Ù†Ù‡Ø§ Ù…ØªÙˆÙØ±Ø© Ø§Ù„Ø¢Ù† Ù„Ù„ØªÙ†Ø²ÙŠÙ„!
@@ -1276,9 +1280,11 @@ ar:
       tips: Ù†ØµØ§Ø¦Ø
       title: Ø£Ù‡Ù„Ø§Ù‹ Ø¨ÙƒØŒ %{name}!
   users:
+    blocked_email_provider: Ù…Ø²ÙˆÙ‘Ø¯ Ø®Ø¯Ù…Ø© Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ Ù‡Ø°Ø§ ØºÙŠØ± Ù…Ø³Ù…ÙˆØ Ø¨Ù‡
     follow_limit_reached: Ù„Ø§ ÙŠÙ…ÙƒÙ†Ùƒ Ù…ØªØ§Ø¨Ø¹Ø© Ø£ÙƒØ«Ø± Ù…ÙÙ† %{limit} Ø£Ø´Ø®Ø§Øµ
     generic_access_help_html: ØµØ§Ø¯ÙØª Ù…Ø´ÙƒÙ„Ø© ÙÙŠ Ø§Ù„ÙˆØµÙˆÙ„ Ø¥Ù„Ù‰ ØØ³Ø§Ø¨ÙƒØŸ Ø§ØªØµÙ„ Ø¨Ù€ %{email} Ù„Ù„ØØµÙˆÙ„ Ø¹Ù„Ù‰ Ø§Ù„Ù…Ø³Ø§Ø¹Ø¯Ø©
     invalid_email: Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ ØºÙŠØ± ØµØ§Ù„Ø
+    invalid_email_mx: Ù„Ø§ ÙŠØ¨Ø¯Ùˆ Ø£Ù† Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ Ù…ÙˆØ¬ÙˆØ¯
     invalid_otp_token: Ø±Ù…Ø² Ø§Ù„Ù…ØµØ§Ø¯Ù‚Ø© Ø¨Ø®Ø·ÙˆØªÙŠÙ† ØºÙŠØ± ØµØ§Ù„Ø
     invalid_sign_in_token: Ø±Ù…Ø² Ø§Ù„Ø¢Ù…Ø§Ù† ØºÙŠØ± ØµØÙŠØ
     otp_lost_help_html: Ø¥Ù† ÙÙ‚Ø¯ØªÙŽÙ‡ÙÙ…Ø§ ØŒ ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ù€ %{email}
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index d88347f5b9e938d4d1ca596814bb4f5474306700..59dd30bed481959e2b6c43429bff2ce0772d1349 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -199,6 +199,7 @@ ast:
     description:
       suffix: "Â¡Con una cuenta, vas ser a siguir a persones, espublizar anovamientos ya intercambiar mensaxes con usuarios de cualesquier sirvidor de Mastodon y mÃ¡s!"
     didnt_get_confirmation: "Â¿Nun recibiesti les instrucciones de confirmaciÃ³n?"
+    dont_have_your_security_key: "Â¿Nun tienes una clave de seguranza?"
     forgot_password: "Â¿Escaeciesti la contraseÃ±a?"
     login: Aniciar sesiÃ³n
     migrate_account: Mudase a otra cuenta
@@ -437,6 +438,7 @@ ast:
     preferences: Preferencies
     profile: Perfil
     two_factor_authentication: AutenticaciÃ³n en dos pasos
+    webauthn_authentication: Claves d'autenticaciÃ³n
   spam_check:
     spam_detected: Esto ye un informe automatizÃ¡u. DeteutÃ³se spam.
   statuses:
@@ -483,15 +485,14 @@ ast:
     default: Mastodon
     mastodon-light: ClaridÃ¡
   two_factor_authentication:
-    code_hint: Introduz el cÃ³digu xenerÃ¡u pola aplicaciÃ³n autenticadora pa confirmar
     disable: Desactivar
     enabled: L'autenticaciÃ³n en dos pasos ta activada
     enabled_success: L'autenticaciÃ³n en dos pasos activÃ³se con Ã©situ
     generate_recovery_codes: Xenerar cÃ³digos de recuperaciÃ³n
     lost_recovery_codes: Los cÃ³digos de recuperaciÃ³n permÃtente recuperar l'accesu a la cuenta si pierdes el telÃ©fonu. Si tamiÃ©n pierdes estos cÃ³digos, pues rexeneralos equÃ. Los cÃ³digos de recuperaciÃ³n vieyos van invalidase.
-    manual_instructions: 'Si nun pues escaniar el cÃ³digu QR y precises introducilu a mano, equÃ ta''l secretu en testu planu:'
     recovery_codes: CÃ³digos de recuperaciÃ³n
     recovery_codes_regenerated: Los cÃ³digos de recuperaciÃ³n rexenerÃ¡ronse con Ã©situ
+    webauthn: Claves d'autenticaciÃ³n
   user_mailer:
     warning:
       explanation:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 4142d439f7a1ac7658dae239d314c3e5773f6a30..9284f25bf15913cb5d72a85b68379d7bdb84ee5e 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -70,14 +70,6 @@ bg:
       blocking: Ð¡Ð¿Ð¸ÑÑŠÐº Ð½Ð° Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð½Ð¸Ñ‚Ðµ
       following: Ð¡Ð¿Ð¸ÑÑŠÐº Ð½Ð° Ð¿Ð¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸Ñ‚Ðµ
     upload: ÐšÐ°Ñ‡Ð²Ð°Ð½Ðµ
-  invites:
-    expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
   media_attachments:
     validations:
       images_and_video: ÐÐµ Ð¼Ð¾Ð³Ð° Ð´Ð° Ð¿Ñ€Ð¸ÐºÐ°Ñ‡Ð° Ð²Ð¸Ð´ÐµÐ¾ÐºÐ»Ð¸Ð¿ ÐºÑŠÐ¼ Ð¿ÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ, ÐºÐ¾ÑÑ‚Ð¾ Ð²ÐµÑ‡Ðµ ÑÑŠÐ´ÑŠÑ€Ð¶Ð° Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ
@@ -138,10 +130,7 @@ bg:
     formats:
       default: "%d %b, %Y, %H:%M"
   two_factor_authentication:
-    description_html: ÐŸÑ€Ð¸ Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð½Ð° <strong>Ð´Ð²ÑƒÑÑ‚ÐµÐ¿ÐµÐ½Ð½Ð¾ ÑƒÐ´Ð¾ÑÑ‚Ð¾Ð²ÐµÑ€ÑÐ²Ð°Ð½Ðµ</strong>, Ð·Ð° Ð´Ð° Ð²Ð»ÐµÐ·ÐµÑˆ Ð² Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑ‚Ð¾, Ñ‰Ðµ Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ñˆ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð° ÑÐ¸. ÐŸÑ€ÐµÐ· Ð½ÐµÐ³Ð¾ Ñ‰Ðµ ÑÐµ Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð° ÐºÐ¾Ð´, ÐºÐ¾Ð¹Ñ‚Ð¾ Ð´Ð° Ð²ÑŠÐ²ÐµÐ¶Ð´Ð°Ñˆ Ð¿Ñ€Ð¸ Ð²Ð»Ð¸Ð·Ð°Ð½Ðµ.
     disable: Ð”ÐµÐ°ÐºÑ‚Ð¸Ð²Ð¸Ñ€Ð°Ð¹
-    enable: ÐÐºÑ‚Ð¸Ð²Ð¸Ñ€Ð°Ð¹
-    instructions_html: "<strong>Ð¡ÐºÐ°Ð½Ð¸Ñ€Ð°Ð¹ Ñ‚Ð¾Ð·Ð¸ QR ÐºÐ¾Ð´ Ñ Google Authenticator Ð¸Ð»Ð¸ Ð¿Ð¾Ð´Ð¾Ð±Ð½Ð¾ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¾Ñ‚ ÑÐ²Ð¾Ñ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½</strong>. OÑ‚ÑÐµÐ³Ð° Ð½Ð°Ñ‚Ð°Ñ‚ÑŠÐº, Ñ‚Ð¾Ð²Ð° Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ñ‰Ðµ Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð° ÐºÐ¾Ð´, ÐºÐ¾Ð¹Ñ‚Ð¾ Ñ‰Ðµ Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ð²ÑŠÐ²ÐµÐ¶Ð´Ð°Ñˆ Ð¿Ñ€Ð¸ Ð²ÑÑÐºÐ¾ Ð²Ð»Ð¸Ð·Ð°Ð½Ðµ."
   users:
     invalid_email: E-mail Ð°Ð´Ñ€ÐµÑÑŠÑ‚ Ðµ Ð½ÐµÐ²Ð°Ð»Ð¸Ð´ÐµÐ½
     invalid_otp_token: ÐÐµÐ²Ð°Ð»Ð¸Ð´ÐµÐ½ ÐºÐ¾Ð´
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 3b575100f6735fdce51873b064d6f9e3b464f3d9..0cf936d682d3c757bb9fa7758bdc6506ad6be2c2 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -21,7 +21,9 @@ bn:
     federation_hint_html: "%{instance}à¦¤à§‡ à¦à¦•à¦Ÿà¦¾ à¦¨à¦¿à¦¬à¦¨à§à¦§à¦¨ à¦¥à¦¾à¦•à¦²à§‡ à¦†à¦ªà¦¨à¦¿ à¦¯à§‡à¦•à§‹à¦¨à§‹ à¦®à¦¾à¦¸à§à¦Ÿà¦¾à¦¡à¦¨ à¦¬à¦¾ à¦à¦§à¦°à¦£à§‡à¦° à¦…à¦¨à§à¦¯à¦¾à¦¨à§à¦¯ à¦¸à¦¾à¦°à§à¦à¦¾à¦°à§‡à¦° à¦®à¦¾à¦¨à§à¦·à§‡à¦° à¦¸à¦¾à¦¥à§‡ à¦¯à§à¦•à§à¦¤ à¦¹à¦¤à§‡ à¦ªà¦¾à¦°à¦¬à§‡à¦¨ à¥¤"
     get_apps: à¦®à§‹à¦¬à¦¾à¦‡à¦² à¦à¦ªà§à¦ª à¦à¦•à¦Ÿà¦¾ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦° à¦•à¦°à¦¤à§‡ à¦ªà¦¾à¦°à§‡à¦¨
     hosted_on: à¦à¦‡ à¦®à¦¾à¦¸à§à¦Ÿà¦¾à¦¡à¦¨à¦Ÿà¦¿ à¦†à¦›à§‡ %{domain} à¦
-    instance_actor_flash: à¦à¦‡ à¦…à§à¦¯à¦¾à¦•à¦¾à¦‰à¦¨à§à¦Ÿà¦Ÿà¦¿ à¦à¦¾à¦°à§à¦šà§à¦¯à¦¼à¦¾à¦² à¦à¦•à§à¦Ÿà¦° à¦¯à¦¾ à¦¨à¦¿à¦œà§‡ à¦•à§‹à¦¨à¦“ à¦¸à¦¾à¦°à§à¦à¦¾à¦°à§‡à¦° à¦ªà§à¦°à¦¤à¦¿à¦¨à¦¿à¦§à¦¿à¦¤à§à¦¬ à¦•à¦°à¦¤à§‡ à¦¬à§à¦¯à¦¬à¦¹à§ƒà¦¤ à¦¹à¦¯à¦¼ à¦à¦¬à¦‚ à¦•à§‹à¦¨à¦“ à¦ªà§ƒà¦¥à¦• à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ à¦¨à¦¯à¦¼à¥¤ à¦à¦Ÿà¦¿ à¦«à§‡à¦¡à¦¾à¦°à§‡à¦¶à¦¨à§‡à¦° à¦‰à¦¦à§à¦¦à§‡à¦¶à§à¦¯à§‡ à¦¬à§à¦¯à¦¬à¦¹à§ƒà¦¤ à¦¹à¦¯à¦¼ à¦à¦¬à¦‚ à¦†à¦ªà¦¨à¦¿ à¦¯à¦¦à¦¿ à¦ªà§à¦°à§‹ à¦‡à¦¨à¦¸à§à¦Ÿà§à¦¯à¦¾à¦¨à§à¦¸ à¦¬à§à¦²à¦• à¦•à¦°à¦¤à§‡ à¦¨à¦¾ à¦šà¦¾à¦¨ à¦¤à¦¬à§‡ à¦…à¦¬à¦°à§à¦¦à§à¦§ à¦•à¦°à¦¾ à¦‰à¦šà¦¿à¦¤ à¦¨à¦¯à¦¼, à¦¸à§‡à¦•à§à¦·à§‡à¦¤à§à¦°à§‡ à¦†à¦ªà¦¨à¦¾à¦° à¦¡à§‹à¦®à§‡à¦¨ à¦¬à§à¦²à¦• à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦° à¦•à¦°à¦¾ à¦‰à¦šà¦¿à¦¤à¥¤
+    instance_actor_flash: 'à¦à¦‡ à¦…à§à¦¯à¦¾à¦•à¦¾à¦‰à¦¨à§à¦Ÿà¦Ÿà¦¿ à¦à¦¾à¦°à§à¦šà§à¦¯à¦¼à¦¾à¦² à¦à¦•à§à¦Ÿà¦° à¦¯à¦¾ à¦¨à¦¿à¦œà§‡ à¦•à§‹à¦¨à¦“ à¦¸à¦¾à¦°à§à¦à¦¾à¦°à§‡à¦° à¦ªà§à¦°à¦¤à¦¿à¦¨à¦¿à¦§à¦¿à¦¤à§à¦¬ à¦•à¦°à¦¤à§‡ à¦¬à§à¦¯à¦¬à¦¹à§ƒà¦¤ à¦¹à¦¯à¦¼ à¦à¦¬à¦‚ à¦•à§‹à¦¨à¦“ à¦ªà§ƒà¦¥à¦• à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ à¦¨à¦¯à¦¼à¥¤ à¦à¦Ÿà¦¿ à¦«à§‡à¦¡à¦¾à¦°à§‡à¦¶à¦¨à§‡à¦° à¦‰à¦¦à§à¦¦à§‡à¦¶à§à¦¯à§‡ à¦¬à§à¦¯à¦¬à¦¹à§ƒà¦¤ à¦¹à¦¯à¦¼ à¦à¦¬à¦‚ à¦†à¦ªà¦¨à¦¿ à¦¯à¦¦à¦¿ à¦ªà§à¦°à§‹ à¦‡à¦¨à¦¸à§à¦Ÿà§à¦¯à¦¾à¦¨à§à¦¸ à¦¬à§à¦²à¦• à¦•à¦°à¦¤à§‡ à¦¨à¦¾ à¦šà¦¾à¦¨ à¦¤à¦¬à§‡ à¦…à¦¬à¦°à§à¦¦à§à¦§ à¦•à¦°à¦¾ à¦‰à¦šà¦¿à¦¤ à¦¨à¦¯à¦¼, à¦¸à§‡à¦•à§à¦·à§‡à¦¤à§à¦°à§‡ à¦†à¦ªà¦¨à¦¾à¦° à¦¡à§‹à¦®à§‡à¦¨ à¦¬à§à¦²à¦• à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦° à¦•à¦°à¦¾ à¦‰à¦šà¦¿à¦¤à¥¤
+
+'
     learn_more: à¦¬à¦¿à¦¸à§à¦¤à¦¾à¦°à¦¿à¦¤ à¦œà¦¾à¦¨à§à¦¨
     privacy_policy: à¦—à§‹à¦ªà¦¨à§€à§Ÿà¦¤à¦¾ à¦¨à§€à¦¤à¦¿
     see_whats_happening: à¦•à§€ à¦•à§€ à¦¹à¦šà§à¦›à§‡ à¦¦à§‡à¦–à§à¦¨
@@ -38,8 +40,11 @@ bn:
       domain: à¦¸à¦¾à¦°à§à¦à¦¾à¦°
       reason: à¦•à¦¾à¦°à¦£
       rejecting_media: 'à¦à¦‡ à¦¸à¦¾à¦°à§à¦à¦¾à¦°à¦—à§à¦²à¦¿ à¦¥à§‡à¦•à§‡ à¦®à¦¿à¦¡à¦¿à¦¯à¦¼à¦¾ à¦«à¦¾à¦‡à¦²à¦—à§à¦²à¦¿ à¦ªà§à¦°à¦•à§à¦°à¦¿à¦¯à¦¼à¦¾ à¦•à¦°à¦¾ à¦¬à¦¾ à¦¸à¦‚à¦°à¦•à§à¦·à¦£ à¦•à¦°à¦¾ à¦¹à¦¬à§‡ à¦¨à¦¾ à¦à¦¬à¦‚ à¦•à§‹à¦¨à¦“ à¦¥à¦¾à¦®à§à¦¬à¦¨à§‡à¦‡à¦² à¦ªà§à¦°à¦¦à¦°à§à¦¶à¦¿à¦¤ à¦¹à¦¬à§‡ à¦¨à¦¾, à¦®à§‚à¦² à¦«à¦¾à¦‡à¦²à¦Ÿà¦¿à¦¤à§‡ à¦®à§à¦¯à¦¾à¦¨à§à¦¯à¦¼à¦¾à¦² à¦•à§à¦²à¦¿à¦•-à¦®à¦¾à¦§à§à¦¯à¦®à§‡ à¦ªà§à¦°à¦¯à¦¼à§‹à¦œà¦¨:'
+      rejecting_media_title: à¦«à¦¿à¦²à§à¦Ÿà¦¾à¦° à¦•à¦°à¦¾ à¦®à¦¿à¦¡à¦¿à¦¯à¦¼à¦¾
       silenced: 'à¦à¦‡ à¦¸à¦¾à¦°à§à¦à¦¾à¦°à¦—à§à¦²à¦¿à¦° à¦ªà§‹à¦¸à§à¦Ÿà¦—à§à¦²à¦¿ à¦œà¦¨à¦¸à¦¾à¦§à¦¾à¦°à¦£à§‡à¦° à¦Ÿà¦¾à¦‡à¦®à¦²à¦¾à¦‡à¦¨ à¦à¦¬à¦‚ à¦•à¦¥à§‹à¦ªà¦•à¦¥à¦¨à§‡ à¦²à§à¦•à¦¾à¦¨à§‹ à¦¥à¦¾à¦•à¦¬à§‡ à¦à¦¬à¦‚ à¦†à¦ªà¦¨à¦¿ à¦¯à¦¦à¦¿ à¦¤à¦¾à¦¦à§‡à¦° à¦…à¦¨à§à¦¸à¦°à¦£ à¦¨à¦¾ à¦•à¦°à§‡à¦¨ à¦¤à¦¬à§‡ à¦¤à¦¾à¦¦à§‡à¦° à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦° à¦‡à¦¨à§à¦Ÿà¦¾à¦°à¦…à§à¦¯à¦¾à¦•à¦¶à¦¨ à¦¥à§‡à¦•à§‡ à¦•à§‹à¦¨à¦“ à¦¬à¦¿à¦œà§à¦žà¦ªà§à¦¤à¦¿ à¦‰à¦¤à§à¦ªà¦¨à§à¦¨ à¦¹à¦¬à§‡ à¦¨à¦¾:'
+      silenced_title: à¦¨à§€à¦°à¦¬ à¦•à¦°à¦¾ à¦¸à¦¾à¦°à§à¦à¦¾à¦°
       suspended: 'à¦à¦‡ à¦¸à¦¾à¦°à§à¦à¦¾à¦°à¦—à§à¦²à¦¿ à¦¥à§‡à¦•à§‡ à¦•à§‹à¦¨à¦“ à¦¡à§‡à¦Ÿà¦¾ à¦ªà§à¦°à¦•à§à¦°à¦¿à¦¯à¦¼à¦¾à¦œà¦¾à¦¤à¦•à¦°à¦£, à¦¸à¦‚à¦°à¦•à§à¦·à¦£ à¦¬à¦¾ à¦†à¦¦à¦¾à¦¨-à¦ªà§à¦°à¦¦à¦¾à¦¨ à¦•à¦°à¦¾ à¦¹à¦¬à§‡ à¦¨à¦¾, à¦à¦‡ à¦¸à¦¾à¦°à§à¦à¦¾à¦°à¦—à§à¦²à¦¿à¦° à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦¦à§‡à¦° à¦¸à¦¾à¦¥à§‡ à¦•à§‹à¦¨à¦“ à¦®à¦¿à¦¥à¦¸à§à¦•à§à¦°à¦¿à¦¯à¦¼à¦¾ à¦¬à¦¾ à¦¯à§‹à¦—à¦¾à¦¯à§‹à¦—à¦•à§‡ à¦…à¦¸à¦®à§à¦à¦¬ à¦•à¦°à§‡ à¦¤à§à¦²à§‡à¦›à§‡:'
+      suspended_title: à¦¸à§à¦¥à¦—à¦¿à¦¤ à¦•à¦°à¦¾ à¦¸à¦¾à¦°à§à¦à¦¾à¦°
     unavailable_content_html: à¦®à§à¦¯à¦¾à¦¸à§à¦Ÿà§‹à¦¡à¦¨ à¦¸à¦¾à¦§à¦¾à¦°à¦£à¦¤ à¦†à¦ªà¦¨à¦¾à¦•à§‡ à¦«à§‡à¦¦à¦¿à¦à¦¾à¦°à§à¦¸ à¦ à¦…à¦¨à§à¦¯ à¦•à§‹à¦¨à¦“ à¦¸à¦¾à¦°à§à¦à¦¾à¦°à§‡à¦° à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦¦à§‡à¦° à¦¥à§‡à¦•à§‡ à¦¸à¦¾à¦®à¦—à§à¦°à§€ à¦¦à§‡à¦–à¦¤à§‡ à¦à¦¬à¦‚ à¦¤à¦¾à¦¦à§‡à¦° à¦¸à¦¾à¦¥à§‡ à¦†à¦²à¦¾à¦ªà¦šà¦¾à¦°à¦¿à¦¤à¦¾ à¦•à¦°à¦¾à¦° à¦…à¦¨à§à¦®à¦¤à¦¿ à¦¦à§‡à¦¯à¦¼à¥¤ à¦à¦‡ à¦¬à§à¦¯à¦¤à¦¿à¦•à§à¦°à¦® à¦¯à§‡ à¦à¦‡ à¦¬à¦¿à¦¶à§‡à¦· à¦¸à¦¾à¦°à§à¦à¦¾à¦°à§‡ à¦¤à§ˆà¦°à¦¿ à¦•à¦°à¦¾ à¦¹à¦¯à¦¼à§‡à¦›à§‡à¥¤
     user_count_after:
       one: à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€
@@ -76,6 +81,7 @@ bn:
     roles:
       admin: à¦ªà¦°à¦¿à¦šà¦¾à¦²à¦•
       bot: à¦°à§‹à¦¬à¦Ÿ
+      group: à¦—à§‹à¦·à§à¦ à§€
       moderator: à¦ªà¦°à¦¿à¦šà¦¾à¦²à¦•
     unavailable: à¦ªà§à¦°à§‹à¦«à¦¾à¦‡à¦² à¦…à¦¨à§à¦ªà¦²à¦¬à§à¦§
     unfollow: à¦…à¦¨à§à¦¸à¦°à¦£ à¦¬à¦¾à¦¦
@@ -89,6 +95,7 @@ bn:
       delete: à¦®à§à¦›à§‡ à¦«à§‡à¦²à¦¾
       destroyed_msg: à¦ªà§à¦°à¦¶à¦¾à¦¸à¦¨à¦¬à¦¸à§à¦¤à§à¦¤ à¦²à§‡à¦–à¦¾à¦Ÿà¦¿ à¦¸à¦ à¦¿à¦•à¦à¦¾à¦¬à§‡ à¦®à§à¦›à§‡ à¦«à§‡à¦²à¦¾ à¦¹à§Ÿà§‡à¦›à§‡!
     accounts:
+      add_email_domain_block: à¦¨à¦¿à¦·à¦¿à¦¦à§à¦§ à¦•à¦°à¦¾ à¦‡-à¦®à§‡à¦‡à¦² à¦¡à§‹à¦®à§‡à¦‡à¦¨
       approve: à¦…à¦¨à§à¦®à§‹à¦¦à¦¨ à¦¦à¦¿à¦¨
       approve_all: à¦ªà§à¦°à¦¤à§à¦¯à§‡à¦• à¦•à§‡ à¦…à¦¨à§à¦®à¦¤à¦¿ à¦¦à¦¿à¦¨
       are_you_sure: à¦†à¦ªà¦¨à¦¿ à¦•à¦¿ à¦¨à¦¿à¦¶à§à¦šà¦¿à¦¤ ?
@@ -169,6 +176,7 @@ bn:
         staff: à¦•à¦°à§à¦®à§€
         user: à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€
       search: à¦…à¦¨à§à¦¸à¦¨à§à¦§à¦¾à¦¨
+      search_same_email_domain: à¦à¦•à¦‡ à¦‡à¦®à§‡à¦² à¦¡à§‹à¦®à§‡à¦¨ à¦¸à¦¹ à¦…à¦¨à§à¦¯à¦¾à¦¨à§à¦¯ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦°à¦¾
       search_same_ip: à¦à¦•à¦‡ IP à¦¸à¦¹ à¦…à¦¨à§à¦¯à¦¾à¦¨à§à¦¯ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦°à¦¾
       shared_inbox_url: à¦à¦¾à¦— à¦•à¦°à¦¾ à¦‡à¦¨à¦¬à¦•à§à¦¸ URL
       show:
@@ -190,8 +198,149 @@ bn:
       web: à¦“à§Ÿà§‡à¦¬
       whitelisted: à¦¸à¦¾à¦¦à¦¾à¦¤à¦¾à¦²à¦¿à¦•à¦¾à¦¯à§à¦•à§à¦¤
     action_logs:
+      action_types:
+        assigned_to_self_report: à¦°à¦¿à¦ªà§‹à¦°à§à¦Ÿ à¦¬à¦°à¦¾à¦¦à§à¦¦ à¦•à¦°à§à¦¨
+        change_email_user: à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ à¦œà¦¨à§à¦¯ à¦‡à¦®à§‡à¦‡à¦² à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨ à¦•à¦°à§à¦¨
+        confirm_user: à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ à¦¨à¦¿à¦¶à§à¦šà¦¿à¦¤ à¦•à¦°à§à¦¨
+        create_account_warning: à¦¸à¦¤à¦°à§à¦•à¦¤à¦¾ à¦¤à§ˆà¦°à¦¿ à¦•à¦°à§à¦¨
+        create_announcement: à¦˜à§‹à¦·à¦£à¦¾ à¦¤à§ˆà¦°à¦¿ à¦•à¦°à§à¦¨
+        create_custom_emoji: à¦¸à§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ à¦‡à¦®à§‹à¦œà¦¿ à¦¤à§ˆà¦°à¦¿ à¦•à¦°à§à¦¨
+        create_domain_allow: à¦¡à§‹à¦®à§‡à¦¨ à¦…à¦¨à§à¦®à§‹à¦¦à¦¨ à¦¤à§ˆà¦°à¦¿ à¦•à¦°à§à¦¨
+        create_domain_block: à¦¡à§‹à¦®à§‡à¦¨ à¦¬à§à¦²à¦• à¦¤à§ˆà¦°à¦¿ à¦•à¦°à§à¦¨
+        create_email_domain_block: à¦‡à¦®à§‡à¦‡à¦² à¦¡à§‹à¦®à§‡à¦¨ à¦¬à§à¦²à¦• à¦¤à§ˆà¦°à¦¿ à¦•à¦°à§à¦¨
+        demote_user: à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ à¦•à§‡ à¦¹à§€à¦¨à¦ªà¦¦à¦¸à§à¦¥ à¦•à¦°à§à¦¨
+        destroy_announcement: à¦˜à§‹à¦·à¦£à¦¾ à¦®à§à¦›à§à¦¨
+        destroy_custom_emoji: à¦¸à§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ à¦‡à¦®à§‹à¦œà¦¿ à¦®à§à¦›à§à¦¨
+        destroy_domain_allow: à¦¡à§‹à¦®à§‡à¦¨ à¦…à¦¨à§à¦®à§‹à¦¦à¦¨ à¦®à§à¦›à§à¦¨
+        destroy_domain_block: à¦¡à§‹à¦®à§‡à¦¨ à¦¬à§à¦²à¦• à¦®à§à¦›à§à¦¨
+        destroy_email_domain_block: à¦‡à¦®à§‡à¦‡à¦² à¦¡à§‹à¦®à§‡à¦¨ à¦¬à§à¦²à¦• à¦®à§à¦›à§à¦¨
+        destroy_status: à¦¸à§à¦Ÿà§à¦¯à¦¾à¦Ÿà¦¾à¦¸ à¦®à§à¦›à§à¦¨
+        disable_2fa_user: 2FA à¦¨à¦¿à¦·à§à¦•à§à¦°à¦¿à§Ÿ à¦•à¦°à§à¦¨
+        disable_custom_emoji: à¦¸à§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ à¦‡à¦®à§‹à¦œà¦¿ à¦¨à¦¿à¦·à§à¦•à§à¦°à¦¿à§Ÿ à¦•à¦°à§à¦¨
+        disable_user: à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ à¦•à§‡ à¦¨à¦¿à¦·à§à¦•à§à¦°à¦¿à§Ÿ à¦•à¦°à§à¦¨
+        enable_custom_emoji: à¦¸à§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ à¦‡à¦®à§‹à¦œà¦¿ à¦¸à¦•à§à¦°à¦¿à§Ÿ à¦•à¦°à§à¦¨
+        enable_user: à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ à¦•à§‡ à¦¸à¦•à§à¦°à¦¿à§Ÿ à¦•à¦°à§à¦¨
+        memorialize_account: à¦®à§‡à¦®à§‹à¦°à¦¿à¦¯à¦¼à¦¾à¦²à¦¾à¦‡à¦œ à¦…à§à¦¯à¦¾à¦•à¦¾à¦‰à¦¨à§à¦Ÿ
+        promote_user: à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ à¦•à§‡ à¦ªà¦¦à§‡à¦¾à¦¨à§à¦¨à¦¤à¦¿ à¦•à¦°à§à¦¨
+        remove_avatar_user: à¦…à¦¬à¦¤à¦¾à¦° à¦…à¦ªà¦¸à¦¾à¦°à¦£ à¦•à¦°à§à¦¨
+        reopen_report: à¦ªà§à¦°à¦¤à¦¿à¦¬à§‡à¦¦à¦¨à¦Ÿà¦¿ à¦ªà§à¦¨à¦°à¦¾à¦¯à¦¼ à¦–à§à¦²à§à¦¨
+        reset_password_user: à¦ªà¦¾à¦¸à¦“à§Ÿà¦¾à¦°à§à¦¡ à¦ªà§à¦¨à¦ƒà¦¸à§à¦¥à¦¾à¦ªà¦¨ à¦•à¦°à§à¦¨
+        resolve_report: à¦ªà§à¦°à¦¤à¦¿à¦¬à§‡à¦¦à¦¨à¦Ÿà¦¿ à¦¸à¦®à¦¾à¦§à¦¾à¦¨ à¦•à¦°à§à¦¨
+        silence_account: à¦…à§à¦¯à¦¾à¦•à¦¾à¦‰à¦¨à§à¦Ÿ à¦¨à§€à¦°à¦¬ à¦•à¦°à§à¦¨
+        suspend_account: à¦…à§à¦¯à¦¾à¦•à¦¾à¦‰à¦¨à§à¦Ÿ à¦¸à§à¦¥à¦—à¦¿à¦¤ à¦•à¦°à§à¦¨
+        unassigned_report: à¦°à¦¿à¦ªà§‹à¦°à§à¦Ÿ à¦¬à¦°à¦¾à¦¦à§à¦¦ à¦®à§à¦•à§à¦¤ à¦•à¦°à§à¦¨
+        unsilence_account: à¦…à§à¦¯à¦¾à¦•à¦¾à¦‰à¦¨à§à¦Ÿ à¦¨à§€à¦°à¦¬ à¦®à§à¦•à§à¦¤ à¦•à¦°à§à¦¨
+        unsuspend_account: à¦…à§à¦¯à¦¾à¦•à¦¾à¦‰à¦¨à§à¦Ÿ à¦¸à§à¦¥à¦—à¦¿à¦¤à¦®à§à¦•à§à¦¤ à¦•à¦°à§à¦¨
+        update_announcement: à¦˜à§‹à¦·à¦£à¦¾ à¦†à¦ªà¦¡à§‡à¦Ÿ à¦•à¦°à§à¦¨
+        update_custom_emoji: à¦¸à§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ à¦‡à¦®à§‹à¦œà¦¿ à¦†à¦ªà¦¡à§‡à¦Ÿ à¦•à¦°à§à¦¨
+        update_status: à¦¸à§à¦¥à¦¿à¦¤à¦¿ à¦†à¦ªà¦¡à§‡à¦Ÿ à¦•à¦°à§à¦¨
       actions:
         assigned_to_self_report: "%{name} à¦¤à¦¾à¦¦à§‡à¦° à¦œà¦¨à§à¦¯ %{target} à¦°à¦¿à¦ªà§‹à¦°à§à¦Ÿ à¦…à¦°à§à¦ªà¦£ à¦•à¦°à§‡à¦›à¦¿à¦²à§‡à¦¨"
+        change_email_user: "%{name} %{target} à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦° à¦‡à¦®à§‡à¦² à¦ à¦¿à¦•à¦¾à¦¨à¦¾ à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨ à¦•à¦°à§‡à¦›à§‡à¦¨"
+        confirm_user: "%{name} %{target} à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦° à¦‡à¦®à§‡à¦² à¦ à¦¿à¦•à¦¾à¦¨à¦¾ à¦¨à¦¿à¦¶à§à¦šà¦¿à¦¤ à¦•à¦°à§‡à¦›à§‡à¦¨"
+        create_account_warning: "%{name} %{target} à¦à¦•à¦Ÿà¦¿ à¦¸à¦¤à¦°à§à¦•à¦¤à¦¾ à¦ªà§à¦°à§‡à¦°à¦£ à¦•à¦°à§‡à¦›à§‡à¦¨"
+        create_announcement: "%{name} à¦à¦•à¦Ÿà¦¿ à¦¨à¦¤à§à¦¨ à¦˜à§‹à¦·à¦£à¦¾ à¦¤à§ˆà¦°à¦¿ à¦•à¦°à§‡à¦›à§‡à¦¨ %{target}"
+        create_custom_emoji: "%{name} à¦¨à¦¤à§à¦¨ à¦‡à¦®à§‹à¦œà¦¿ à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à§‡à¦›à§‡à¦¨ %{target}"
+        create_domain_allow: "%{name} à¦¡à§‹à¦®à§‡à¦¨ %{target} à¦à¦° à¦¸à¦™à§à¦—à§‡ à¦«à§‡à¦¡à¦¾à¦°à§‡à¦¶à¦¨ à¦…à¦¨à§à¦®à§‹à¦¦à¦¿à¦¤ à¦•à¦°à§‡à¦›à§‡à¦¨"
+        create_domain_block: "%{name} à¦¡à§‹à¦®à§‡à¦¨ %{target} à¦•à§‡ à¦…à¦¬à¦°à§à¦¦à§à¦§ à¦•à¦°à§‡à¦›à§‡à¦¨"
+        create_email_domain_block: "%{name} à¦‡-à¦®à§‡à¦‡à¦² à¦¡à§‹à¦®à§‡à¦¨ %{target} à¦•à§‡ à¦…à¦¬à¦°à§à¦¦à§à¦§ à¦•à¦°à§‡à¦›à§‡à¦¨"
+        demote_user: "%{name} à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ %{target} à¦•à§‡ à¦¹à§€à¦¨à¦ªà¦¦à¦¸à§à¦¥ à¦•à¦°à§‡à¦›à§‡à¦¨"
+    custom_emojis:
+      destroyed_msg: à¦‡à¦®à§‹à¦œà§‹ à¦¸à¦«à¦²à¦à¦¾à¦¬à§‡ à¦§à§à¦¬à¦‚à¦¸ à¦¹à§Ÿà§‡à¦›à§‡!
+      disable: à¦…à¦•à§à¦·à¦®
+      disabled: à¦…à¦•à§à¦·à¦®à¦¿à¦¤
+      disabled_msg: à¦¸à¦«à¦²à¦à¦¾à¦¬à§‡ à¦¸à§‡à¦‡ à¦‡à¦®à§‹à¦œà¦¿ à¦…à¦•à§à¦·à¦® à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡
+      emoji: à¦‡à¦®à§‹à¦œà¦¿
+      enable: à¦¸à¦•à§à¦°à¦¿à§Ÿ
+      enabled: à¦¸à¦•à§à¦°à¦¿à¦¯à¦¼
+      enabled_msg: à¦¸à¦«à¦²à¦à¦¾à¦¬à§‡ à¦¸à§‡à¦‡ à¦‡à¦®à§‹à¦œà¦¿ à¦¸à¦•à§à¦·à¦® à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡
+      image_hint: à§«à§¦à¦•à§‡à¦¬à¦¿ à¦…à¦¬à¦§à¦¿ à¦ªà¦¿à¦à¦¨à¦œà¦¿
+      list: à¦¤à¦¾à¦²à¦¿à¦•à¦¾
+      listed: à¦¤à¦¾à¦²à¦¿à¦•à¦¾à¦à§à¦•à§à¦¤
+      new:
+        title: à¦¨à¦¤à§à¦¨ à¦¸à§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ à¦‡à¦®à§‹à¦œà¦¿ à¦¯à§‹à¦— à¦•à¦°à§à¦¨
+      not_permitted: à¦†à¦ªà¦¨à¦¾à¦° à¦à¦‡ à¦•à§à¦°à¦¿à¦¯à¦¼à¦¾ à¦¸à¦®à§à¦ªà¦¾à¦¦à¦¨ à¦•à¦°à¦¾à¦° à¦…à¦¨à§à¦®à¦¤à¦¿ à¦¨à§‡à¦‡
+      overwrite: à¦ªà§à¦¨à¦°à§à¦²à¦¿à¦–à¦¨
+      shortcode: à¦¶à¦°à§à¦Ÿà¦•à§‹à¦¡
+      shortcode_hint: à¦•à¦®à¦ªà¦•à§à¦·à§‡ à§¨ à¦Ÿà¦¿ à¦…à¦•à§à¦·à¦°, à¦•à§‡à¦¬à¦²à¦®à¦¾à¦¤à§à¦° à¦¬à¦°à§à¦£à¦¾à¦¨à§à¦•à§à¦°à¦®à¦¿à¦• à¦…à¦•à§à¦·à¦° à¦à¦¬à¦‚ à¦†à¦¨à§à¦¡à¦¾à¦°à¦¸à§à¦•à§‹à¦°
+      title: à¦¸à§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ à¦‡à¦®à§‹à¦œà¦¿à¦—à§à¦²à¦¿
+      uncategorized: à¦¶à§à¦°à§‡à¦£à§€à¦¬à¦¿à¦¹à§€à¦¨
+      unlist: à¦¤à¦¾à¦²à¦¿à¦•à¦¾à¦®à§à¦•à§à¦¤
+      unlisted: à¦¤à¦¾à¦²à¦¿à¦•à¦¾à¦®à§à¦•à§à¦¤
+      update_failed_msg: à¦¸à§‡à¦‡ à¦‡à¦®à§‹à¦œà¦¿ à¦†à¦ªà¦¡à§‡à¦Ÿ à¦•à¦°à¦¤à§‡ à¦ªà¦¾à¦°à§‡à¦¨à¦¿
+      updated_msg: à¦‡à¦®à§‹à¦œà¦¿ à¦¸à¦«à¦²à¦à¦¾à¦¬à§‡ à¦†à¦ªà¦¡à§‡à¦Ÿ à¦¹à¦¯à¦¼à§‡à¦›à§‡!
+      upload: à¦†à¦ªà¦²à§‹à¦¡
+    dashboard:
+      authorized_fetch_mode: à¦¸à§à¦°à¦•à§à¦·à¦¿à¦¤ à¦®à§‹à¦¡
+      backlog: à¦¬à§à¦¯à¦¾à¦•à¦²à¦— à¦œà¦¬à¦—à§à¦²à¦¿
+      config: à¦•à¦¨à¦«à¦¿à¦—à¦¾à¦°à§‡à¦¶à¦¨
+      feature_deletions: à¦®à§‹à¦›à¦¾ à¦…à§à¦¯à¦¾à¦•à¦¾à¦‰à¦¨à§à¦Ÿà¦—à§à¦²à¦¿
+      feature_invites: à¦†à¦®à¦¨à§à¦¤à§à¦°à¦£ à¦²à¦¿à¦™à§à¦•à¦—à§à¦²à¦¿
+      feature_profile_directory: à¦ªà§à¦°à§‹à¦«à¦¾à¦‡à¦² à¦¡à¦¿à¦°à§‡à¦•à§à¦Ÿà¦°à¦¿
+      feature_registrations: à¦¨à¦¿à¦¬à¦¨à§à¦§à¦¨à¦—à§à¦²à¦¿
+      feature_relay: à¦«à§‡à¦¡à¦¾à¦°à§‡à¦¶à¦¨ à¦°à¦¿à¦²à§‡
+      feature_spam_check: à¦¬à¦¿à¦°à§‹à¦§à§€ à¦¸à§à¦ªà§à¦¯à¦¾à¦®
+      feature_timeline_preview: à¦ªà§‚à¦°à§à¦¬à¦¦à¦°à§à¦¶à¦¨ à¦¸à¦®à¦¯à¦¼à¦°à§‡à¦–à¦¾
+      features: à¦¬à§ˆà¦¶à¦¿à¦·à§à¦Ÿà§à¦¯à¦—à§à¦²à¦¿
+      hidden_service: à¦²à§à¦•à¦¾à¦¨à§‹ à¦¸à§‡à¦¬à¦¾ à¦¸à¦¹ à¦«à§‡à¦¡à¦¾à¦°à§‡à¦¶à¦¨
+      open_reports: à¦–à§‹à¦²à¦¾à¦° à¦°à¦¿à¦ªà§‹à¦°à§à¦Ÿà¦—à§à¦²à¦¿
+      pending_tags: à¦¯à§‡ à¦¹à§à¦¯à¦¾à¦¶à¦Ÿà§à¦¯à¦¾à¦—à¦—à§à¦²à¦¿ à¦ªà§à¦¨à¦ƒà¦®à§‚à¦²à§à¦¯à¦¾à¦¯à¦¼à¦¨à¦¾à¦° à¦œà¦¨à§à¦¯ à¦…à¦ªà§‡à¦•à§à¦·à¦¾ à¦•à¦°à¦›à§‡
+      pending_users: à¦¯à§‡ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ à¦ªà§à¦¨à¦ƒà¦®à§‚à¦²à§à¦¯à¦¾à¦¯à¦¼à¦¨à¦¾à¦° à¦œà¦¨à§à¦¯ à¦…à¦ªà§‡à¦•à§à¦·à¦¾ à¦•à¦°à¦›à§‡
+      recent_users: à¦¸à¦¾à¦®à§à¦ªà§à¦°à¦¤à¦¿à¦• à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦°à¦¾
+      search: à¦¸à¦®à§à¦ªà§‚à¦°à§à¦£ à¦ªà¦¾à¦ à§à¦¯ à¦…à¦¨à§à¦¸à¦¨à§à¦§à¦¾à¦¨
+      single_user_mode: à¦à¦•à¦• à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ à¦®à§‹à¦¡
+      software: à¦¸à¦«à¦Ÿà¦“à§Ÿà§à¦¯à¦¾à¦°
+      space: à¦¸à§à¦¥à¦¾à¦¨ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°
+      title: à¦¡à§à¦¯à¦¾à¦¶à¦¬à§‹à¦°à§à¦¡
+      total_users: à¦®à§‹à¦Ÿ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€
+      trends: à¦ªà§à¦°à¦¬à¦£à¦¤à¦¾à¦—à§à¦²à¦¿
+      week_interactions: à¦à¦‡ à¦¸à¦ªà§à¦¤à¦¾à¦¹à§‡ à¦®à¦¿à¦¥à¦·à§à¦•à§à¦°à¦¿à¦¯à¦¼à¦¾à¦—à§à¦²à¦¿
+      week_users_active: à¦à¦‡ à¦¸à¦ªà§à¦¤à¦¾à¦¹à§‡ à¦¸à¦•à§à¦°à¦¿à¦¯à¦¼ à¦¬à§à¦¯à¦¾à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à¦¿à¦°à¦¾
+      week_users_new: à¦à¦‡ à¦¸à¦ªà§à¦¤à¦¾à¦¹à§‡ à¦¬à§à¦¯à¦¾à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à¦¿à¦°à¦¾
+      whitelist_mode: à¦¸à§€à¦®à¦¿à¦¤ à¦«à§‡à¦¡à¦¾à¦°à§‡à¦¶à¦¨ à¦®à§‹à¦¡
+    instances:
+      moderation:
+        limited: à¦¸à§€à¦®à¦¿à¦¤
+        title: à¦ªà§à¦°à¦¶à¦¾à¦¸à¦¨à¦¾
+      private_comment: à¦¬à§à¦¯à¦•à§à¦¤à¦¿à¦—à¦¤ à¦®à¦¨à§à¦¤à¦¬à§à¦¯
+      public_comment: à¦œà¦¨à¦®à¦¤
+      title: à¦«à§‡à¦¡à¦¾à¦°à§‡à¦¶à¦¨
+      total_blocked_by_us: à¦†à¦®à¦¾à¦¦à§‡à¦° à¦¦à§à¦¬à¦¾à¦°à¦¾ à¦…à¦¬à¦°à§à¦¦à§à¦§
+      total_followed_by_them: à¦¤à¦¾à¦¦à§‡à¦° à¦¦à§à¦¬à¦¾à¦°à¦¾ à¦…à¦¨à§à¦¸à¦°à¦£
+      total_followed_by_us: à¦†à¦®à¦¾à¦¦à§‡à¦° à¦¦à§à¦¬à¦¾à¦°à¦¾ à¦…à¦¨à§à¦¸à¦°à¦£
+      total_reported: à¦¤à¦¾à¦¦à§‡à¦° à¦¸à¦®à§à¦ªà¦°à§à¦•à§‡ à¦°à¦¿à¦ªà§‹à¦°à§à¦Ÿ
+      total_storage: à¦®à¦¿à¦¡à¦¿à¦¯à¦¼à¦¾ à¦¸à¦‚à¦¯à§à¦•à§à¦¤à¦¿à¦—à§à¦²à¦¿
+    invites:
+      deactivate_all: à¦¸à¦¬ à¦¨à¦¿à¦·à§à¦•à§à¦°à¦¿à¦¯à¦¼ à¦•à¦°à§à¦¨
+      filter:
+        all: à¦¸à¦¬
+        available: à¦¸à¦¹à¦œà¦²à¦à§à¦¯
+        expired: à¦®à§‡à¦¯à¦¼à¦¾à¦¦à§‹à¦¤à§à¦¤à§€à¦°à§à¦£
+        title: à¦«à¦¿à¦²à§à¦Ÿà¦¾à¦°
+      title: à¦†à¦®à¦¨à§à¦¤à§à¦°à¦£à¦—à§à¦²à¦¿
+    pending_accounts:
+      title: à¦®à§à¦²à¦¤à§à¦¬à¦¿ à¦¥à¦¾à¦•à¦¾ à¦…à§à¦¯à¦¾à¦•à¦¾à¦‰à¦¨à§à¦Ÿà¦—à§à¦²à¦¿ (%{count})
+    relationships:
+      title: "%{acct} à¦à¦° à¦¸à¦®à§à¦ªà¦°à§à¦•à¦—à§à¦²à¦¿"
+    relays:
+      add_new: à¦¨à¦¤à§à¦¨ à¦°à¦¿à¦²à§‡ à¦¯à§‹à¦— à¦•à¦°à§à¦¨
+      delete: à¦®à§à¦›à§à¦¨
+      description_html: à¦à¦•à¦Ÿà¦¿ <strong>à¦«à§‡à¦¡à¦¾à¦°à§‡à¦¶à¦¨ à¦°à¦¿à¦²à§‡</strong> à¦à¦•à¦Ÿà¦¿ à¦®à¦§à§à¦¯à¦¸à§à¦¥à¦¤à¦¾à¦•à¦¾à¦°à§€ à¦¸à¦¾à¦°à§à¦à¦¾à¦° à¦¯à¦¾ à¦¸à¦¾à¦¬à¦¸à§à¦•à§à¦°à¦¾à¦‡à¦¬ à¦•à¦°à§‡ à¦à¦Ÿà¦¿à¦¤à§‡ à¦ªà§à¦°à¦•à¦¾à¦¶ à¦•à¦°à§‡ à¦à¦®à¦¨ à¦¸à¦¾à¦°à§à¦à¦¾à¦°à§‡à¦° à¦®à¦§à§à¦¯à§‡ à¦ªà§à¦°à¦šà§à¦° à¦ªà¦°à¦¿à¦®à¦¾à¦£à§‡ à¦¸à¦°à§à¦¬à¦œà¦¨à§€à¦¨ à¦Ÿà¦Ÿà¦¸ à¦¬à¦¿à¦¨à¦¿à¦®à¦¯à¦¼ à¦•à¦°à§‡à¥¤ <strong>à¦à¦Ÿà¦¿ à¦•à§à¦·à§à¦¦à§à¦° à¦“ à¦®à¦¾à¦à¦¾à¦°à¦¿ à¦¸à¦¾à¦°à§à¦à¦¾à¦°à¦—à§à¦²à¦¿à¦•à§‡ à¦«à§‡à¦¡à¦¾à¦‡à¦à¦¾à¦°à§à¦¸ à¦¥à§‡à¦•à§‡ à¦¸à¦¾à¦®à¦—à§à¦°à§€ à¦†à¦¬à¦¿à¦·à§à¦•à¦¾à¦° à¦•à¦°à¦¤à§‡ à¦¸à¦¹à¦¾à¦¯à¦¼à¦¤à¦¾ à¦•à¦°à¦¤à§‡ à¦ªà¦¾à¦°à§‡</strong>, à¦…à¦¨à§à¦¯à¦¥à¦¾à¦¯à¦¼ à¦¸à§à¦¥à¦¾à¦¨à§€à¦¯à¦¼ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦¦à§‡à¦° à¦®à§à¦¯à¦¾à¦¨à§à¦¯à¦¼à¦¾à¦²à¦¿ à¦…à¦¨à§à¦¯ à¦²à§‹à¦•à¦•à§‡ à¦¦à§‚à¦°à¦¬à¦°à§à¦¤à§€ à¦¸à¦¾à¦°à§à¦à¦¾à¦°à§‡ à¦…à¦¨à§à¦¸à¦°à¦£ à¦•à¦°à¦¤à§‡ à¦¹à¦¬à§‡à¥¤
+      disable: à¦…à¦•à§à¦·à¦®
+      disabled: à¦…à¦•à§à¦·à¦®à¦¿à¦¤
+      enable: à¦¸à¦•à§à¦°à¦¿à§Ÿ
+      enable_hint: à¦à¦•à¦¬à¦¾à¦° à¦¸à¦•à§à¦·à¦® à¦¹à¦¯à¦¼à§‡ à¦—à§‡à¦²à§‡, à¦†à¦ªà¦¨à¦¾à¦° à¦¸à¦¾à¦°à§à¦à¦¾à¦° à¦à¦‡ à¦°à¦¿à¦²à§‡ à¦¥à§‡à¦•à§‡ à¦¸à¦®à¦¸à§à¦¤ à¦ªà¦¾à¦¬à¦²à¦¿à¦• à¦Ÿà§à¦Ÿà¦—à§à¦²à¦¿à¦¤à§‡ à¦¸à¦¾à¦¬à¦¸à§à¦•à§à¦°à¦¾à¦‡à¦¬ à¦•à¦°à¦¬à§‡ à¦à¦¬à¦‚ à¦à¦¤à§‡ à¦à¦‡ à¦¸à¦¾à¦°à§à¦à¦¾à¦°à§‡à¦° à¦¸à¦°à§à¦¬à¦œà¦¨à§€à¦¨ à¦Ÿà¦Ÿà¦—à§à¦²à¦¿ à¦ªà§à¦°à§‡à¦°à¦£ à¦¶à§à¦°à§ à¦•à¦°à¦¬à§‡à¥¤
+      enabled: à¦¸à¦•à§à¦°à¦¿à¦¯à¦¼à¦•à§ƒà¦¤
+      inbox_url: à¦°à¦¿à¦²à§‡ à¦‡à¦‰à¦†à¦°à¦à¦²
+      pending: à¦°à¦¿à¦²à§‡à¦° à¦…à¦¨à§à¦®à§‹à¦¦à¦¨à§‡à¦° à¦…à¦ªà§‡à¦•à§à¦·à¦¾à¦¯à¦¼
+      save_and_enable: à¦¸à¦‚à¦°à¦•à§à¦·à¦£ à¦•à¦°à§à¦¨ à¦à¦¬à¦‚ à¦¸à¦•à§à¦·à¦® à¦•à¦°à§à¦¨
+      setup: à¦°à¦¿à¦²à§‡ à¦¸à¦‚à¦¯à§‹à¦— à¦¸à§‡à¦Ÿà¦†à¦ª à¦•à¦°à§à¦¨
+      signatures_not_enabled: à¦¸à§à¦°à¦•à§à¦·à¦¿à¦¤ à¦®à§‹à¦¡ à¦¬à¦¾ à¦¸à§€à¦®à¦¿à¦¤ à¦«à§‡à¦¡à¦¾à¦°à§‡à¦¶à¦¨ à¦®à§‹à¦¡ à¦¸à¦•à§à¦·à¦® à¦¥à¦¾à¦•à¦¾ à¦…à¦¬à¦¸à§à¦¥à¦¾à¦¯à¦¼ à¦°à¦¿à¦²à§‡à¦—à§à¦²à¦¿ à¦¸à¦ à¦¿à¦•à¦à¦¾à¦¬à§‡ à¦•à¦¾à¦œ à¦•à¦°à¦¬à§‡ à¦¨à¦¾
+      status: à¦…à¦¬à¦¸à§à¦¥à¦¾
+      title: à¦°à¦¿à¦²à§‡à¦—à§à¦²à¦¿
+    report_notes:
+      created_msg: à¦°à¦¿à¦ªà§‹à¦°à§à¦Ÿ à¦¨à§‹à¦Ÿ à¦¸à¦«à¦²à¦à¦¾à¦¬à§‡ à¦¤à§ˆà¦°à¦¿ à¦•à¦°à¦¾ à¦¹à¦¯à¦¼à§‡à¦›à§‡!
+      destroyed_msg: à¦°à¦¿à¦ªà§‹à¦°à§à¦Ÿ à¦¨à§‹à¦Ÿ à¦¸à¦«à¦²à¦à¦¾à¦¬à§‡ à¦®à§‹à¦›à¦¾ à¦¹à§Ÿà§‡à¦›à§‡!
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': You don't have permission to view this page.
@@ -202,13 +351,5 @@ bn:
     '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
-  invites:
-    expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
   verification:
     verification: à¦¸à¦¤à§à¦¯à¦¤à¦¾ à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 5da24d25c3e9abe275d5de6ae89dca3652492a06..451bbade8284395e7b661bab05aafc29d10c5f38 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -11,11 +11,39 @@ br:
     learn_more: Gouzout hiroc'h
     privacy_policy: ReolennoÃ¹ prevezded
     source_code: Boneg tarzh
+    status_count_after:
+      few: toud
+      many: toud
+      one: toud
+      other: toud
+      two: toud
     terms: DivizoÃ¹ gwerzhaÃ± hollek
     unavailable_content_description:
       domain: Dafariad
+    user_count_after:
+      few: implijerÂ·ez
+      many: implijerÂ·ez
+      one: implijerÂ·ez
+      other: implijerÂ·ez
+      two: implijerÂ·ez
+    what_is_mastodon: Petra eo Mastodon?
   accounts:
+    follow: HeuliaÃ±
+    followers:
+      few: HeulierÂ·ez
+      many: HeulierÂ·ez
+      one: HeulierÂ·ez
+      other: HeulierÂ·ez
+      two: HeulierÂ·ez
+    following: O heuliaÃ±
     media: Media
+    never_active: Birviken
+    posts:
+      few: Toud
+      many: Toud
+      one: Toud
+      other: Toud
+      two: Toud
     posts_tab_heading: ToudoÃ¹
     posts_with_replies: ToudoÃ¹ ha respontoÃ¹
     roles:
@@ -29,11 +57,15 @@ br:
     account_moderation_notes:
       delete: Dilemel
     accounts:
+      by_domain: Domani
       change_email:
         current_email: Postel bremanel
         label: Kemm ar postel
         new_email: Postel nevez
         submit: Kemm ar postel
+      deleted: Dilamet
+      domain: Domani
+      email: Postel
       enable: Gweredekaat
       enabled: Gweredekaet
       followers: HeulierÂ·ezedÂ·ien
@@ -58,7 +90,14 @@ br:
         admin: Merour
         moderator: HabaskaerÂ·ez
         user: ImplijerÂ·ez
+      search: Klask
+      suspended: Astalet
+      title: KontoÃ¹
+      username: Anv
+      web: Web
     action_logs:
+      action_types:
+        destroy_status: Dilemel ar statud
       deleted_status: "(statud dilemet)"
     announcements:
       new:
@@ -66,15 +105,19 @@ br:
         title: Kemenn nevez
       title: KemennoÃ¹
     custom_emojis:
+      by_domain: Domani
+      copy: EilaÃ±
       delete: Dilemel
       disable: Diweredekaat
       disabled: Diweredekaet
       emoji: Fromlun
       enable: Gweredekaat
       enabled: Gweredekaet
+      list: Listenn
     dashboard:
       config: Kefluniadur
       software: Meziant
+      title: Taolenn labour
       trends: LuskadoÃ¹
     domain_blocks:
       domain: Domani
@@ -100,11 +143,50 @@ br:
       by_domain: Domani
       moderation:
         all: Pep tra
+    invites:
+      filter:
+        available: Hegerzh
+    relays:
+      delete: Dilemel
+      disable: Diweredekaat
+      disabled: Diweredekaet
+      enable: Gweredekaat
+      enabled: Gweredekaet
+      save_and_enable: EnrollaÃ± ha gweredekaat
+      status: Toud
+    reports:
+      account:
+        notes:
+          few: "%{count} a notennoÃ¹"
+          many: "%{count} a notennoÃ¹"
+          one: "%{count} a notennoÃ¹"
+          other: "%{count} a notennoÃ¹"
+          two: "%{count} a notennoÃ¹"
+      are_you_sure: Ha sur oc'h?
+      notes:
+        delete: Dilemel
+      status: Statud
+      updated_at: Nevesaet
     settings:
       domain_blocks:
         all: D'an holl dud
       site_title: Anv ar servijer
       title: ArventennoÃ¹ al lec'hienn
+    statuses:
+      batch:
+        delete: Dilemel
+      deleted: Dilamet
+      media:
+        title: Media
+      no_media: Media ebet
+    tags:
+      name: Ger-klik
+      title: GerioÃ¹-klik
+    warning_presets:
+      add_new: OuzhpenniÃ± unan nevez
+      delete: Dilemel
+  application_mailer:
+    salutation: "%{name},"
   auth:
     change_password: Ger-tremen
     delete_account: Dilemel ar gont
@@ -116,18 +198,27 @@ br:
     security: Diogelroez
     setup:
       title: KefluniaÃ±
+    status:
+      account_status: Statud ar gont
   authorize_follow:
+    follow: HeuliaÃ±
     title: HeuliaÃ± %{acct}
   challenge:
     confirm: Kenderc' hel
     invalid_password: Ger-tremen diwiriek
+  date:
+    formats:
+      default: "%d %b %Y"
+      with_month_name: "%d a viz %B %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}e"
       about_x_months: "%{count}miz"
       about_x_years: "%{count}b"
       almost_x_years: "%{count}b"
+      half_a_minute: Diouzhtu
       less_than_x_minutes: "%{count}m"
+      less_than_x_seconds: Diouzhtu
       over_x_years: "%{count}b"
       x_days: "%{count}d"
       x_minutes: "%{count}m"
@@ -147,6 +238,12 @@ br:
     '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
+  exports:
+    archive_takeout:
+      date: Deiziad
+      size: Ment
+    csv: CSV
+    lists: ListennoÃ¹
   featured_tags:
     add_new: OuzhpenniÃ± unan nevez
   filters:
@@ -155,6 +252,7 @@ br:
       notifications: KemennoÃ¹
     index:
       delete: Dilemel
+      title: SiloÃ¹
   footer:
     developers: Diorroerien
     more: Muioc'hâ€¦
@@ -163,11 +261,13 @@ br:
     copy: EilaÃ±
     delete: Dilemel
     order_by: UrzhiaÃ± dre
+  identity_proofs:
+    identity: Identelezh
   invites:
     expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
+      '1800': 30 munutenn
+      '21600': 6 eur
+      '3600': 1 eur
       '43200': 12 eur
       '604800': 1 sizhun
       '86400': 1 deiz
@@ -178,8 +278,18 @@ br:
       title: Heulier nevez
     mention:
       action: Respont
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+  otp_authentication:
+    enable: Gweredekaat
+    setup: KefluniaÃ±
+  pagination:
+    truncate: "&hellip;"
   relationships:
     followers: HeulierÂ·ezedÂ·ien
+    following: O heuliaÃ±
   sessions:
     browser: Merdeer
     browsers:
@@ -189,6 +299,7 @@ br:
       edge: Microsoft Edge
       electron: Electron
       firefox: Firefox
+      generic: Merdeer dianav
       ie: Internet Explorer
       micro_messenger: MicroMessenger
       nokia: Nokia S40 Ovi Browser
@@ -199,6 +310,7 @@ br:
       safari: Safari
       uc_browser: UCBrowser
       weibo: Weibo
+    description: "%{browser} war %{platform}"
     ip: IP
     platforms:
       adobe_air: Adobe Air
@@ -209,8 +321,33 @@ br:
       ios: iOS
       linux: Linux
       mac: macOS
+      other: savenn dianav
       windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+  settings:
+    account: Kont
+    account_settings: ArventennoÃ¹ ar gont
+    development: Diorren
+    edit_profile: AozaÃ± ar profil
+    import: EnporzhiaÃ±
+    import_and_export: EnporzhiaÃ± hag ezporzhiaÃ±
+    preferences: GwellvezioÃ¹
+    profile: Profil
   statuses:
+    attached:
+      image:
+        few: "%{count} skeudenn"
+        many: "%{count} skeudenn"
+        one: "%{count} skeudenn"
+        other: "%{count} skeudenn"
+        two: "%{count} skeudenn"
+      video:
+        few: "%{count} video"
+        many: "%{count} video"
+        one: "%{count} video"
+        other: "%{count} video"
+        two: "%{count} video"
     show_more: Diskouez muioc'h
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -225,12 +362,15 @@ br:
       default: "%He%M, %d %b %Y"
       month: "%b %Y"
   two_factor_authentication:
+    add: OuzhpennaÃ±
     disable: Diweredekaat
-    enable: Gweredekaat
-    setup: KefluniaÃ±
+    edit: AozaÃ±
   user_mailer:
     warning:
       title:
         none: Diwall
     welcome:
       edit_profile_action: KefluniaÃ± ar profil
+      subject: Donemat e MastodoÃ±
+  webauthn_credentials:
+    delete: Dilemel
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 10bb1269b7f0bcc4de678d0f0b110a26295553d9..ee3c554b469de3e2e26bd464232ac35db27b5cf7 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -60,6 +60,7 @@ ca:
       one: Seguidor
       other: Seguidors
     following: Seguint
+    instance_actor_flash: Aquest compte Ã©s un actor virtual usat per a representar el mateix servidor i no cap usuari individual. Es fa servir per a federar i no s'hauria d'esborrar.
     joined: Unit des de %{date}
     last_active: darrer actiu
     link_verified_on: La propietat d'aquest enllaÃ§ s'ha verificat el %{date}
@@ -98,6 +99,7 @@ ca:
       add_email_domain_block: Afegir el domini de correu a la llista negra
       approve: Aprova
       approve_all: Aprova'ls tots
+      approved_msg: Lâ€™aplicaciÃ³ del registre de %{username} sâ€™ha aprovat amb Ã¨xit
       are_you_sure: N'estÃ s segur?
       avatar: Avatar
       by_domain: Domini
@@ -111,8 +113,10 @@ ca:
       confirm: Confirma
       confirmed: Confirmat
       confirming: Confirmant
+      delete: Esborra les dades
       deleted: Esborrats
       demote: Degrada
+      destroyed_msg: Les dades de %{username} son a la cua per a ser esborrades en breu
       disable: Inhabilita
       disable_two_factor_authentication: Desactiva 2FA
       disabled: Inhabilitat
@@ -123,10 +127,12 @@ ca:
       email_status: Estat de l'adreÃ§a electrÃ²nica
       enable: Habilita
       enabled: Habilitat
+      enabled_msg: El compte de %{username} sâ€™ha descongelat amb Ã¨xit
       followers: Seguidors
       follows: Segueix
       header: CapÃ§alera
       inbox_url: URL de la safata d'entrada
+      invite_request_text: Motiu del registre
       invited_by: Convidat per
       ip: IP
       joined: Unit
@@ -138,6 +144,8 @@ ca:
       login_status: Estat d'accÃ©s
       media_attachments: Adjunts multimÃ¨dia
       memorialize: Converteix-lo en memorial
+      memorialized: Memorialitzat
+      memorialized_msg: Sâ€™ha canviat amb Ã¨xit a memorialitzat el compte de %{username}
       moderation:
         active: Actiu
         all: Tot
@@ -158,10 +166,14 @@ ca:
       public: PÃºblic
       push_subscription_expires: La subscripciÃ³ PuSH expira
       redownload: Actualitza el perfil
+      redownloaded_msg: El perfil de %{username} sâ€™ha refrescat des de lâ€™origen amb Ã¨xit
       reject: Rebutja
       reject_all: Rebutja'ls tots
+      rejected_msg: Lâ€™aplicaciÃ³ de registre de %{username} sâ€™ha rebutjat amb Ã¨xit
       remove_avatar: Eliminar avatar
       remove_header: Treu la capÃ§alera
+      removed_avatar_msg: Sâ€™ha suprimit amb Ã¨xit lâ€™imatge dâ€™acabar de %{username}
+      removed_header_msg: Sâ€™ha suprimit amb Ã¨xit lâ€™imatge de capÃ§alera de %{username}
       resend_confirmation:
         already_confirmed: Aquest usuari ja estÃ  confirmat
         send: Reenviar el correu electrÃ²nic de confirmaciÃ³
@@ -178,6 +190,8 @@ ca:
       search: Cerca
       search_same_email_domain: Altres usuaris amb el mateix domini de correu
       search_same_ip: Altres usuaris amb la mateixa IP
+      sensitive: Sensible
+      sensitized: marcar com a sensible
       shared_inbox_url: URL de la safata d'entrada compartida
       show:
         created_reports: Informes creats
@@ -187,13 +201,19 @@ ca:
       statuses: Tuts
       subscribe: Subscriu
       suspended: SuspÃ¨s
+      suspension_irreversible: Les dades dâ€™aquest compte sâ€™han suprimit irreversiblament. Pots desfer la suspensiÃ³ del compte per a fer-lo usable perÃ² aixÃ² no recuperarÃ  les dades si Ã©s que en tenia.
+      suspension_reversible_hint_html: El compte ha estat suspÃ¨s i les dades seran totalment suprimides el %{date}. Fins llavors, el compte pot ser restaurat sense problemes. Si vols suprimir immediatament totes les dades del compte, ho pots fer a continuaciÃ³.
       time_in_queue: Esperant en la cua %{time}
       title: Comptes
       unconfirmed_email: Correu electrÃ²nic sense confirmar
+      undo_sensitized: Desmarcar com a sensible
       undo_silenced: Deixa de silenciar
       undo_suspension: DesfÃ©s la suspensiÃ³
+      unsilenced_msg: El compte de %{username} ha estat ilÂ·limitat amb Ã¨xit
       unsubscribe: CancelÂ·la la subscripciÃ³
+      unsuspended_msg: Sâ€™ha desfet amb Ã¨xit la suspensiÃ³ del compte de %{username}
       username: Nom d'usuari
+      view_domain: Veure el resumen del domini
       warn: AvÃs
       web: Web
       whitelisted: Llista blanca
@@ -208,12 +228,14 @@ ca:
         create_domain_allow: Crea un domini permÃ¨s
         create_domain_block: Crea un bloqueig de domini
         create_email_domain_block: Crea un bloqueig de domini d'adreÃ§a de correu
+        create_ip_block: Crear regla IP
         demote_user: Degrada l'usuari
         destroy_announcement: Esborra l'anunci
         destroy_custom_emoji: Esborra l'emoji personalitzat
         destroy_domain_allow: Esborra el domini permÃ¨s
         destroy_domain_block: Esborra el bloqueig de domini
         destroy_email_domain_block: Esborra el bloqueig de domini de l'adreÃ§a de correu
+        destroy_ip_block: Eliminar regla IP
         destroy_status: Esborra el tut
         disable_2fa_user: Desactiva 2FA
         disable_custom_emoji: Desactiva l'emoji personalitzat
@@ -226,13 +248,16 @@ ca:
         reopen_report: Reobre l'informe
         reset_password_user: Restableix la contrasenya
         resolve_report: Resolt l'informe
+        sensitive_account: Marcar els mÃ¨dia en el teu compte com a sensibles
         silence_account: Silencia el compte
         suspend_account: SuspÃ¨n el compte
         unassigned_report: Des-assigna l'informe
+        unsensitive_account: Desmarcar els mÃ¨dia en el teu compte com a sensibles
         unsilence_account: DesfÃ©s el silenci del compte
         unsuspend_account: DesfÃ©s la suspensiÃ³ del compte
         update_announcement: Actualitza l'anunci
         update_custom_emoji: Actualitza l'emoji personalitzat
+        update_domain_block: Actualitza el Bloqueig de Domini
         update_status: Actualitza l'estat
       actions:
         assigned_to_self_report: "%{name} han assignat l'informe %{target} a ells mateixos"
@@ -244,12 +269,14 @@ ca:
         create_domain_allow: "%{name} ha afegit a la llista blanca el domini %{target}"
         create_domain_block: "%{name} ha blocat el domini %{target}"
         create_email_domain_block: "%{name} ha afegit a la llista negra el domini del correu electrÃ²nic %{target}"
+        create_ip_block: "%{name} ha creat una regla IP per a %{target}"
         demote_user: "%{name} ha degradat l'usuari %{target}"
         destroy_announcement: "%{name} ha eliminat l'anunci %{target}"
         destroy_custom_emoji: "%{name} ha destruÃ¯t l'emoji %{target}"
         destroy_domain_allow: "%{name} ha eliminat el domini %{target} de la llista blanca"
         destroy_domain_block: "%{name} ha desblocat el domini %{target}"
         destroy_email_domain_block: "%{name} ha afegit a la llista negra el domini de correu electrÃ²nic %{target}"
+        destroy_ip_block: "%{name} ha esborrat la regla IP per a %{target}"
         destroy_status: "%{name} eliminat l'estat per %{target}"
         disable_2fa_user: "%{name} ha desactivat el requisit de dos factors per a l'usuari %{target}"
         disable_custom_emoji: "%{name} ha desactivat l'emoji %{target}"
@@ -262,13 +289,16 @@ ca:
         reopen_report: "%{name} ha reobert l'informe %{target}"
         reset_password_user: "%{name} ha restablert la contrasenya de l'usuari %{target}"
         resolve_report: "%{name} ha resolt l'informe %{target}"
+        sensitive_account: "%{name} ha marcat els mÃ¨dia de %{target} com a sensibles"
         silence_account: "%{name} ha silenciat el compte de %{target}"
         suspend_account: "%{name} ha suspÃ¨s el compte de %{target}"
         unassigned_report: "%{name} ha des-assignat l'informe %{target}"
+        unsensitive_account: "%{name} ha desmarcat els mÃ¨dia de %{target} com a sensibles"
         unsilence_account: "%{name} ha silenciat el compte de %{target}"
         unsuspend_account: "%{name} ha llevat la suspensiÃ³ del compte de %{target}"
         update_announcement: "%{name} ha actualitzat l'anunci %{target}"
         update_custom_emoji: "%{name} ha actualitzat l'emoji %{target}"
+        update_domain_block: "%{name} ha actualitzat el bloqueig de domini per %{target}"
         update_status: "%{name} estat actualitzat per %{target}"
       deleted_status: "(tut esborrat)"
       empty: No sâ€™han trobat registres.
@@ -372,6 +402,8 @@ ca:
           silence: Silenci
           suspend: SuspensiÃ³
         title: Bloqueig de domini nou
+      obfuscate: Oculta el nom del domini
+      obfuscate_hint: Oculta parcialment el nom del domini si estÃ  activat mostrar la llista de dominis limitats
       private_comment: Comentari privat
       private_comment_hint: Comentari sobre aquesta limitaciÃ³ del domini per a Ãºs intern dels moderadors.
       public_comment: Comentari pÃºblic
@@ -411,6 +443,7 @@ ca:
     instances:
       by_domain: Domini
       delivery_available: El lliurament estÃ  disponible
+      empty: No s'han trobat dominis.
       known_accounts:
         one: "%{count} compte conegut"
         other: "%{count} comptes coneguts"
@@ -434,6 +467,21 @@ ca:
         expired: Caducat
         title: Filtre
       title: Convida
+    ip_blocks:
+      add_new: Crear regla
+      created_msg: Sâ€™ha afegit amb Ã¨xit la nova regla IP
+      delete: Suprimeix
+      expires_in:
+        '1209600': 2 setmanes
+        '15778476': 6 mesos
+        '2629746': 1 mes
+        '31556952': 1 any
+        '86400': 1 dia
+        '94670856': 3 anys
+      new:
+        title: Crea nova regla IP
+      no_ip_block_selected: No sâ€™ha canviat cap regla IP perquÃ¨ no sâ€™han seleccionat
+      title: Regles IP
     pending_accounts:
       title: Comptes pendents (%{count})
     relationships:
@@ -473,6 +521,8 @@ ca:
       comment:
         none: Cap
       created_at: Reportat
+      forwarded: Reenviat
+      forwarded_to: Reenviat a %{domain}
       mark_as_resolved: Marca com a resolt
       mark_as_unresolved: Marcar com a sense resoldre
       notes:
@@ -516,6 +566,7 @@ ca:
       domain_blocks_rationale:
         title: Mostra el raonament
       enable_bootstrap_timeline_accounts:
+        desc_html: Fer que els nous usuaris segueixin automÃ ticament als comptes configurats i la seva lÃnia de temps no arrenqui buida
         title: Activa els seguiments per defecte per els usuaris nous
       hero:
         desc_html: Es mostra en pÃ gina frontal. Recomanat al menys 600x100px. Si no es configura es mostrarÃ  el del servidor
@@ -542,6 +593,9 @@ ca:
         min_invite_role:
           disabled: NingÃº
           title: Permet les invitacions de
+        require_invite_text:
+          desc_html: Quan el registre requereix aprovaciÃ³ manual, fer que sigui obligatori enlloc d'opcions l escriure el text de la solicitud d'invitaciÃ³ "PerquÃ¨ vols unirte?"
+          title: Requerir als nous usuaris omplir el text de la solicitud d'invitaciÃ³
       registrations_mode:
         modes:
           approved: Es requereix lâ€™aprovaciÃ³ per registrar-se
@@ -681,8 +735,11 @@ ca:
       prefix_sign_up: Registra't avui a Mastodon!
       suffix: Amb un compte serÃ s capaÃ§ de seguir persones, publicar i intercanviar missatges amb usuaris de qualsevol servidor de Mastodon i mÃ©s!
     didnt_get_confirmation: No has rebut el correu de confirmaciÃ³?
+    dont_have_your_security_key: No tens la teva clau de seguretat?
     forgot_password: Has oblidat la contrasenya?
     invalid_reset_password_token: L'enllaÃ§ de restabliment de la contrasenya no Ã©s vÃ lid o ha caducat. Torna-ho a provar.
+    link_to_otp: Introdueix el teu codi de doble factor des dâ€™el teu mÃ²bil o un codi de recuperaciÃ³
+    link_to_webauth: Usa el teu dispositiu de clau de seguretat
     login: Inicia sessiÃ³
     logout: Surt
     migrate_account: Mou a un compte diferent
@@ -707,7 +764,9 @@ ca:
       functional: El teu compte Ã©s plenament operatiu.
       pending: La vostra solÂ·licitud estÃ  pendent de revisiÃ³ pel nostre personal. AixÃ² pot trigar una mica. Rebreu un correu electrÃ²nic quan sigui aprovada.
       redirecting_to: El teu compte Ã©s inactiu perquÃ¨ actualment estÃ  redirigint a %{acct}.
+    too_fast: Formulari enviat massa rÃ pid, torna a provar-ho.
     trouble_logging_in: Problemes per iniciar la sessiÃ³?
+    use_security_key: Usa clau de seguretat
   authorize_follow:
     already_following: Ja estÃ s seguint aquest compte
     already_requested: Ja has enviat una solÂ·licitud de seguiment a aquest usuari
@@ -732,6 +791,7 @@ ca:
   date:
     formats:
       default: "%b %d, %Y"
+      with_month_name: "%B %d, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count} h"
@@ -796,6 +856,7 @@ ca:
       request: SolÂ·licita el teu arxiu
       size: Mida
     blocks: Persones que has blocat
+    bookmarks: Marcadors
     csv: CSV
     domain_blocks: Bloquejos de dominis
     lists: Llistes
@@ -863,6 +924,8 @@ ca:
     status: Estat de verificaciÃ³
     view_proof: Veure la prova
   imports:
+    errors:
+      over_rows_processing_limit: contÃ© mÃ©s de %{count} files
     modes:
       merge: Fusionar
       merge_long: Mantenir els registres existents i afegir-ne de nous
@@ -872,6 +935,7 @@ ca:
     success: Les dades s'han rebut correctament i es processaran en breu
     types:
       blocking: Llista de blocats
+      bookmarks: Marcadors
       domain_blocking: Llistat de dominis bloquejats
       following: Llista de seguits
       muting: Llista de silenciats
@@ -992,6 +1056,14 @@ ca:
           quadrillion: Q
           thousand: m
           trillion: T
+  otp_authentication:
+    code_hint: Introdueix el codi generat per lâ€™aplicaciÃ³ dâ€™autenticaciÃ³ per a confirmar
+    description_html: Si actives <strong>lâ€™autenticaciÃ³ de factor doble</strong> usant lâ€™aplicaciÃ³ dâ€™autenticaciÃ³, lâ€™inici de sessiÃ³ et requerirÃ¡ tenir el teu mÃ²bil, que generarÃ  els tokens per a entrar.
+    enable: Activa
+    instructions_html: "<strong>Escaneja aquest codi QR en l'Autenticador de Google o una aplicaciÃ³ TOTP similar en el teu mÃ²bil</strong>. Des d'ara, aquesta aplicaciÃ³ generarÃ  tokens que haurÃ s d'introduir quan iniciÃ¯s sessiÃ³."
+    manual_instructions: 'Si no pots escanejar el codi QR i necessites introduir-lo manualment, aquÃ estÃ  el secret de text pla:'
+    setup: Configurar
+    wrong_code: El codi introduÃ¯t no Ã©s vÃ lid! Ã‰s correcta l'hora del servidor i la del dispositiu?
   pagination:
     newer: MÃ©s recent
     next: Endavant
@@ -1020,6 +1092,7 @@ ca:
   relationships:
     activity: Activitat del compte
     dormant: Inactiu
+    follow_selected_followers: Segueix als seguidors seleccionats
     followers: Seguidors
     following: Seguint
     invited: Convidat
@@ -1116,6 +1189,7 @@ ca:
     profile: Perfil
     relationships: Seguits i seguidors
     two_factor_authentication: AutenticaciÃ³ de dos factors
+    webauthn_authentication: Claus de seguretat
   spam_check:
     spam_detected: Aquest Ã©s un informe automÃ tic. S'ha detectat spam.
   statuses:
@@ -1154,6 +1228,8 @@ ca:
         other: "%{count} vots"
       vote: Vota
     show_more: Mostra'n mÃ©s
+    show_newer: Mostra els mÃ©s nous
+    show_older: Mostra els mÃ©s vells
     show_thread: Mostra el fil
     sign_in_to_participate: Inicia la sessiÃ³ per participar a la conversa
     title: '%{name}: "%{quote}"'
@@ -1262,21 +1338,20 @@ ca:
       default: "%b %d, %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Introdueix el codi generat per l'aplicaciÃ³ autenticadora per a confirmar
-    description_html: Si habilites l'<strong>autenticaciÃ³ de dos factors</strong>, et caldrÃ  tenir el teu telÃ¨fon, que generarÃ  tokens per a que puguis iniciar sessiÃ³.
+    add: Afegeix
     disable: Desactiva
-    enable: Activa
+    disabled_success: AutenticaciÃ³ de dos factors desactivada amb Ã¨xit
+    edit: Edita
     enabled: AutenticaciÃ³ de dos factors activada
     enabled_success: AutenticaciÃ³ de dos factors activada correctament
     generate_recovery_codes: Genera codis de recuperaciÃ³
-    instructions_html: "<strong>Escaneja aquest codi QR desde Google Authenticator o una aplicaciÃ³ similar del teu telÃ¨fon</strong>. Desde ara, aquesta aplicaciÃ³ generarÃ  tokens que tens que ingresar quan volguis iniciar sessiÃ³."
     lost_recovery_codes: Els codis de recuperaciÃ³ et permeten recuperar l'accÃ©s al teu compte si perds el telÃ¨fon. Si has perdut els codis de recuperaciÃ³ els pots tornar a generar aquÃ. S'anulÂ·laran els codis de recuperaciÃ³ anteriors.
-    manual_instructions: 'Si no pots escanejar el codi QR i necessites introduir-lo manualment, aquÃ tens el secret en text pla:'
+    methods: AutenticaciÃ³ de dos factors
+    otp: AplicaciÃ³ autenticadora
     recovery_codes: Codis de recuperaciÃ³ de cÃ²pia de seguretat
     recovery_codes_regenerated: Codis de recuperaciÃ³ regenerats amb Ã¨xit
     recovery_instructions_html: Si mai perds l'accÃ©s al teu telÃ¨fon pots utilitzar un dels codis de recuperaciÃ³ a continuaciÃ³ per a recuperar l'accÃ©s al teu compte. <strong>Cal mantenir els codis de recuperaciÃ³ en lloc segur</strong>. Per exemple, imprimint-los i guardar-los amb altres documents importants.
-    setup: Establir
-    wrong_code: El codi introduÃ¯t no Ã©s vÃ lid! Ã‰s correcta l'hora del servidor i del dispositiu?
+    webauthn: Claus de seguretat
   user_mailer:
     backup_ready:
       explanation: Has solÂ·licitat una copia completa del teu compte Mastodon. Ara ja estÃ  a punt per a descÃ rrega!
@@ -1285,12 +1360,13 @@ ca:
     sign_in_token:
       details: 'AquÃ es mostren els detalls del intent:'
       explanation: 'Hem detectat un intent dâ€™inici de sessiÃ³ al teu compte des dâ€™una IP desconeguda. Si ets tu, si us plau introdueix el codi de seguretat a sota, en la pÃ gina de desafiament dâ€™inici de sessiÃ³:'
-      further_actions: 'Si no has estat tu, si us plau canvia la contrasenya i activa lâ€™autentificaciÃ³ de dos factors del teu compte. Pots fer-ho aquÃ:'
+      further_actions: 'Si no has estat tu, si us plau canvia la contrasenya i activa lâ€™autenticaciÃ³ de dos factors del teu compte. Pots fer-ho aquÃ:'
       subject: Si us plau confirma lâ€™intent dâ€™inici de sessiÃ³
       title: Intent dâ€™inici de sessiÃ³
     warning:
       explanation:
         disable: Mentre el teu compte estigui congelat les dades romandran intactes perÃ² no pots dur a terme cap acciÃ³ fins que no estigui desbloquejat.
+        sensitive: Els fitxers multimÃ¨dia pujats i els enllaÃ§ats seran tractas com a sensibles.
         silence: Mentre el teu compte estigui limitat nomÃ©s les persones que ja et segueixen veuen les teves dades en aquest servidor i pots ser exclÃ²s de diverses llistes pÃºbliques. No obstant aixÃ², d'altres encara poden seguir-te manualment.
         suspend: El teu compte s'ha suspÃ¨s i tots els teus tuts i fitxers multimÃ¨dia penjats s'han eliminat de manera irreversible d'aquest servidor i dels servidors on tenies seguidors.
       get_in_touch: Pots respondre a aquest correu electrÃ²nic per a contactar amb el personal de %{instance}.
@@ -1299,11 +1375,13 @@ ca:
       subject:
         disable: S'ha congelat el teu compte %{acct}
         none: AvÃs per a %{acct}
+        sensitive: El teu compte %{acct} de publicaciÃ³ de mÃ¨dia ha estat marcat com a sensible
         silence: El teu compte %{acct} ha estat limitat
         suspend: S'ha suspÃ¨s el teu compte %{acct}
       title:
         disable: Compte congelat
         none: AvÃs
+        sensitive: Els teus mÃ¨dia han estat marcats com a sensibles
         silence: Compte limitat
         suspend: Compte suspÃ¨s
     welcome:
@@ -1324,9 +1402,11 @@ ca:
       tips: Consells
       title: Benvingut a bord, %{name}!
   users:
+    blocked_email_provider: Aquest proveÃ¯dor de correu electrÃ²nic no Ã©s permÃ©s
     follow_limit_reached: No pots seguir mÃ©s de %{limit} persones
     generic_access_help_html: Problemes accedint al teu compte? Pots contactar amb %{email} per a demanar assistÃ¨ncia
     invalid_email: L'adreÃ§a de correu no Ã©s correcta
+    invalid_email_mx: Sembla que lâ€™adreÃ§a de correu electrÃ²nic no existeix
     invalid_otp_token: El codi de dos factors no Ã©s correcte
     invalid_sign_in_token: Codi de seguretat invÃ lid
     otp_lost_help_html: Si has perdut l'accÃ©s a tots dos pots contactar per %{email}
@@ -1336,3 +1416,20 @@ ca:
   verification:
     explanation_html: 'Pots <strong>verificar-te com a propietari dels enllaÃ§os a les metadades del teu perfil</strong>. Per aixÃ², el lloc web enllaÃ§at ha de contenir un enllaÃ§ al teu perfil de Mastodon. El vincle <strong>ha de</strong> tenir l''atribut <code>rel="me"</code>. El contingut del text de l''enllaÃ§ no importa. AquÃ tens un exemple:'
     verification: VerificaciÃ³
+  webauthn_credentials:
+    add: Afegir nova clau de seguretat
+    create:
+      error: Hi ha hagut un problema en afegir la teva clau de seguretat. Tornau-ho a provar.
+      success: S'ha afegit correctament la teva clau de seguretat.
+    delete: Esborra
+    delete_confirmation: Segur que vols suprimir aquesta clau de seguretat?
+    description_html: Si actives <strong>l'autenticador amb clau de seguretat</strong>, l'inici de sessiÃ³ et requerirÃ  emprar un de les teves claus de seguretat.
+    destroy:
+      error: Hi ha hagut un problema al esborrar la teva clau de seguretat. Tornau-ho a provar.
+      success: La teva clau de seguretat s'ha esborrat correctament.
+    invalid_credential: Clau de seguretat invÃ lida
+    nickname_hint: Introdueix el sobrenom de la teva clau de seguretat nova
+    not_enabled: Encara no has activat WebAuthn
+    not_supported: Aquest navegador no suporta claus de seguretat
+    otp_required: Per emprar claus de seguretat si us plau activa primer l'autenticaciÃ³ de dos factors.
+    registered_on: Registrat en %{date}
diff --git a/config/locales/co.yml b/config/locales/co.yml
index b1d68b2d5993d9f50529fb2c4f1f18903d155649..29ba79688e72df4144899b6d833de5d9101fb526 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -32,18 +32,18 @@ co:
     status_count_after:
       one: statutu
       other: statuti
-    status_count_before: chÃ¬ anu pubblicatu
+    status_count_before: ChÃ¬ anu pubblicatu
     tagline: SiguitÃ  amichi Ã¨ scopre ancu di piÃ¹ altri
     terms: Cundizione di u serviziu
     unavailable_content: Cuntinutu micca dispunibule
     unavailable_content_description:
       domain: Servore
-      reason: 'Ragione:'
-      rejecting_media: I fugliali media da stu servore Ã¹n saranu micca arregistrati Ã¨ e vignette Ã¹n saranu micca affissate, duverete cliccÃ  manualmente per accede Ã  l'altru servore Ã¨ vedeli.
+      reason: Ragione
+      rejecting_media: 'I fugliali media da stu servore Ã¹n saranu micca arregistrati Ã¨ e vignette Ã¹n saranu micca affissate, duverete cliccÃ  manualmente per accede Ã  l''altru servore Ã¨ vedeli:'
       rejecting_media_title: Media filtrati
-      silenced: I statuti da stu servore Ã¹n saranu mai visti tranne nant'a vostra pagina d'accolta s'e voi siguitate l'autore.
+      silenced: 'I statuti da stu servore Ã¹n saranu mai visti tranne nant''a vostra pagina d''accolta s''e voi siguitate l''autore:'
       silenced_title: Servori silenzati
-      suspended: Ã™n puderete micca siguitÃ  qualsiasi nant'Ã  stu servore, i dati versu o da quallÃ  Ã¹n saranu mai accessi, scambiati o arregistrati.
+      suspended: 'Ã™n puderete micca siguitÃ  qualsiasi nant''Ã  stu servore, i dati versu o da quallÃ  Ã¹n saranu mai accessi, scambiati o arregistrati:'
       suspended_title: Servori suspesi
     unavailable_content_html: Mastodon vi parmette in generale di vede u cuntinutu Ã¨ interagisce cÃ¹ l'utilizatori di tutti l'altri servori di u fediversu. Quessi sÃ² l'eccezzione fatte nant'Ã  stu servore in particulare.
     user_count_after:
@@ -60,6 +60,7 @@ co:
       one: AbbunatuÂ·a
       other: Abbunati
     following: Abbunamenti
+    instance_actor_flash: Stu contu virtuale riprisenta u servore stessu, micca un'utilizatore individuale. HÃ¨ utilizatu per scopi di federazione Ã¨ Ã¹n duveria mai esse suspesu.
     joined: QuÃ¬ dapoi %{date}
     last_active: ultima attivitÃ 
     link_verified_on: A pruprietÃ  d'issu ligame hÃ¨ stata verificata u %{date}
@@ -98,6 +99,7 @@ co:
       add_email_domain_block: Mette u duminiu e-mail in lista nera
       approve: AppruvÃ 
       approve_all: AppruvÃ  tuttu
+      approved_msg: A dumanda d'arregistramente di %{username} hÃ¨ stata appruvata
       are_you_sure: Site sicuruÂ·a?
       avatar: Ritrattu di prufile
       by_domain: Duminiu
@@ -111,8 +113,10 @@ co:
       confirm: CunfirmÃ 
       confirmed: Cunfirmata
       confirming: Cunfirmazione
+      delete: SguassÃ  dati
       deleted: Sguassatu
       demote: RitrugradÃ 
+      destroyed_msg: I dati di %{username} sÃ² avÃ  in fila d'attesa per esse tolti da quÃ¬ Ã  pocu
       disable: DisattivÃ 
       disable_two_factor_authentication: DisattivÃ  lâ€™identificazione Ã  2 fattori
       disabled: Disattivatu
@@ -121,12 +125,14 @@ co:
       edit: MudificÃ 
       email: E-mail
       email_status: Statutu di lâ€™e-mail
-      enable: AttivÃ 
+      enable: RiattivÃ 
       enabled: Attivatu
+      enabled_msg: U contu di %{username} hÃ¨ statu riattivatu
       followers: Abbunati
       follows: Abbunamenti
-      header: Intistatura
+      header: Ritrattu di cuprendula
       inbox_url: URL di lâ€™inbox
+      invite_request_text: Ragione di l'arregistramentu
       invited_by: Invitatu da
       ip: IP
       joined: Ghjuntu
@@ -138,6 +144,8 @@ co:
       login_status: Statutu di cunnessione
       media_attachments: Media aghjunti
       memorialize: TrasfurmÃ  in mimuriale
+      memorialized: Mimurializatu
+      memorialized_msg: U contu di %{username} hÃ¨ statu trasfurmatu in una pagina mimuriale
       moderation:
         active: Attivu
         all: Tutti
@@ -158,10 +166,14 @@ co:
       public: Pubblicu
       push_subscription_expires: Spirata di lâ€™abbunamentu PuSH
       redownload: Mette Ã  ghjornu u prufile
+      redownloaded_msg: U prufile di %{username} hÃ¨ statu attualizatu da l'urighjine
       reject: RighjittÃ 
       reject_all: RighjittÃ  tutti
+      rejected_msg: A dumanda d'arregistramente di %{username} hÃ¨ stata righjittata
       remove_avatar: Toglie lâ€™avatar
-      remove_header: Toglie l'intistatura
+      remove_header: Toglie a cuprendula
+      removed_avatar_msg: U ritrattu di prufile di %{username} hÃ¨ statu toltu
+      removed_header_msg: U ritrattu di cuprendula di %{username} hÃ¨ statu toltu
       resend_confirmation:
         already_confirmed: Stâ€™utilizatore hÃ¨ digiÃ  cunfirmatu
         send: RimandÃ  unâ€™e-mail di cunfirmazione
@@ -178,22 +190,30 @@ co:
       search: CercÃ 
       search_same_email_domain: Altri utilizatori cÃ¹ listessu duminiu d'e-mail
       search_same_ip: Altri utilizatori cÃ¹ listessa IP
+      sensitive: Sensibile
+      sensitized: indicatu cumâ€™Ã¨ sensibile
       shared_inbox_url: URL di lâ€™inbox spartuta
       show:
         created_reports: Signalamenti fatti
         targeted_reports: Signalatu da l'altri
       silence: SilenzÃ 
-      silenced: Silenzatu
+      silenced: Limitatu
       statuses: Statuti
       subscribe: Abbunassi
       suspended: Suspesu
+      suspension_irreversible: I dati di stu contu sÃ² stati irreversibilamente sguassati. Pudete annullÃ  a suspensione di u contu per u rende utilizabile ma Ã¹n pudete micca ricuperÃ  i dati pricedenti.
+      suspension_reversible_hint_html: U contu hÃ¨ statu suspesu, Ã¨ i so dati saranu sguassati u %{date}. Da quÃ¬ Ã  lÃ , u contu pÃ² esse ricuperatu senza prublemu. S'e voi vulete toglie tutti i dati di u contu avÃ , pudete fallu quÃ¬ sottu.
       time_in_queue: 'Attesa in fila: %{time}'
       title: Conti
       unconfirmed_email: E-mail micca cunfirmatu
+      undo_sensitized: AnnullÃ  sensibile
       undo_silenced: Ã™n silenzÃ  piÃ¹
       undo_suspension: Ã™n suspende piÃ¹
+      unsilenced_msg: A limitazione di u contu di %{username} hÃ¨ stata annullata
       unsubscribe: Disabbunassi
+      unsuspended_msg: A suspensione di u contu di %{username} hÃ¨ stata annullata
       username: Cugnome
+      view_domain: Vede un riassuntu per u duminiu
       warn: Averte
       web: Web
       whitelisted: In a lista bianca
@@ -208,12 +228,14 @@ co:
         create_domain_allow: CreÃ  Auturizazione di Duminiu
         create_domain_block: CreÃ  Blucchime di Duminiu
         create_email_domain_block: CreÃ  Blucchime di Duminiu E-mail
+        create_ip_block: CreÃ  regula IP
         demote_user: RitrugadÃ  Utilizatore
         destroy_announcement: Toglie Annunziu
         destroy_custom_emoji: Toglie Emoji Persunalizata
         destroy_domain_allow: Toglie Auturizazione di Duminiu
         destroy_domain_block: Toglie Blucchime di Duminiu
         destroy_email_domain_block: Toglie blucchime di duminiu e-mail
+        destroy_ip_block: Toglie regula IP
         destroy_status: Toglie u statutu
         disable_2fa_user: DisattivÃ  lâ€™identificazione Ã  2 fattori
         disable_custom_emoji: DisattivÃ  Emoji Persunalizata
@@ -226,13 +248,16 @@ co:
         reopen_report: Riapre Signalamentu
         reset_password_user: RiinizializÃ  Chjave d'Accessu
         resolve_report: Chjode Signalamentu
+        sensitive_account: MarcÃ  i media di u vostru contu cum'Ã¨ sensibili
         silence_account: SilenzÃ  Contu
         suspend_account: Suspende Contu
         unassigned_report: DisassignÃ  signalamentu
+        unsensitive_account: Ã™n marcÃ  piÃ¹ i media di u vostru contu cum'Ã¨ sensibili
         unsilence_account: Ã™n SilenzÃ  PiÃ¹ u Contu
         unsuspend_account: Ã™n Suspende PiÃ¹ u Contu
         update_announcement: CambiÃ  Annunziu
         update_custom_emoji: CambiÃ  Emoji Persunalizata
+        update_domain_block: Mette Ã  Ghjornu Blucchime di Duminiu
         update_status: CambiÃ  Statutu
       actions:
         assigned_to_self_report: "%{name} sâ€™hÃ¨ assignatu u signalamentu %{target}"
@@ -244,12 +269,14 @@ co:
         create_domain_allow: "%{name} hÃ  messu u duminiu %{target} nantâ€™a lista bianca"
         create_domain_block: "%{name} hÃ  bluccatu u duminiu %{target}"
         create_email_domain_block: "%{name} hÃ  messu u duminiu e-mail %{target} nantâ€™a lista nera"
+        create_ip_block: "%{name} hÃ  creatu a regula IP %{target}"
         demote_user: "%{name} hÃ  ritrugradatu lâ€™utilizatore %{target}"
         destroy_announcement: "%{name} hÃ  sguassatu u novu annunziu %{target}"
         destroy_custom_emoji: "%{name} hÃ  sguassatu l'emoji %{target}"
         destroy_domain_allow: "%{name} hÃ  sguassatu u duminiu %{target} da a lista bianca"
         destroy_domain_block: "%{name} hÃ  sbluccatu u duminiu %{target}"
         destroy_email_domain_block: "%{name} hÃ  messu u duminiu e-mail %{target} nantâ€™a lista bianca"
+        destroy_ip_block: "%{name} hÃ  toltu a regula IP %{target}"
         destroy_status: "%{name} hÃ  toltu u statutu di %{target}"
         disable_2fa_user: "%{name} hÃ  disattivatu lâ€™identificazione Ã  dui fattori per %{target}"
         disable_custom_emoji: "%{name} hÃ  disattivatu lâ€™emoji %{target}"
@@ -262,13 +289,16 @@ co:
         reopen_report: "%{name} hÃ  riapertu u signalamentu %{target}"
         reset_password_user: "%{name} hÃ  riinizializatu a chjave dâ€™accessu di %{target}"
         resolve_report: "%{name} hÃ  chjosu u signalamentu %{target}"
-        silence_account: "%{name} hÃ  silenzatu u contu di %{target}"
+        sensitive_account: "%{name} hÃ  marcatu i media di %{target} cum'Ã¨ sensibili"
+        silence_account: "%{name} hÃ  limitatu u contu di %{target}"
         suspend_account: "%{name} hÃ  suspesu u contu di %{target}"
         unassigned_report: "%{name} hÃ  disassignatu u signalamentu %{target}"
-        unsilence_account: "%{name} hÃ  fattu che u contu di %{target} Ã¹n hÃ¨ piÃ¹ silenzatu"
+        unsensitive_account: "%{name} hÃ  sguassatu a marcatura di i media di %{target} cum'Ã¨ sensibili"
+        unsilence_account: "%{name} hÃ  fattu che u contu di %{target} Ã¹n hÃ¨ piÃ¹ limitatu"
         unsuspend_account: "%{name} hÃ  fattu che u contu di %{target} Ã¹n hÃ¨ piÃ¹ suspesu"
         update_announcement: "%{name} hÃ  cambiatu u novu annunziu %{target}"
         update_custom_emoji: "%{name} hÃ  messu Ã  ghjornu lâ€™emoji %{target}"
+        update_domain_block: "%{name} hÃ  messu Ã  ghjornu u blucchime di duminiu per %{target}"
         update_status: "%{name} hÃ  cambiatu u statutu di %{target}"
       deleted_status: "(statutu sguassatu)"
       empty: Nunda trovu.
@@ -411,6 +441,7 @@ co:
     instances:
       by_domain: Duminiu
       delivery_available: Rimessa dispunibule
+      empty: Mancun duminiu trovu.
       known_accounts:
         one: "%{count} contu cunnisciutu"
         other: "%{count} conti cunnisciuti"
@@ -434,6 +465,21 @@ co:
         expired: Spirati
         title: FiltrÃ 
       title: Invitazione
+    ip_blocks:
+      add_new: CreÃ  regula
+      created_msg: Nova regula IP aghjunta
+      delete: Toglie
+      expires_in:
+        '1209600': 2 settimane
+        '15778476': 6 mesi
+        '2629746': 1 mese
+        '31556952': 1 annu
+        '86400': 1 ghjornu
+        '94670856': 3 anni
+      new:
+        title: CreÃ  una nova regula IP
+      no_ip_block_selected: E regule Ã¹n sÃ² micca state mudificate perchÃ¨ manc'un'era selezziunata
+      title: Regule IP
     pending_accounts:
       title: Conti in attesa (%{count})
     relationships:
@@ -473,6 +519,8 @@ co:
       comment:
         none: Nisunu
       created_at: Palisatu
+      forwarded: Trasferitu
+      forwarded_to: Trasferistu Ã  %{domain}
       mark_as_resolved: IndicÃ  cumâ€™Ã¨ chjosu
       mark_as_unresolved: IndicÃ  cumâ€™Ã¨ sempre apertu
       notes:
@@ -540,8 +588,10 @@ co:
           desc_html: AuturizÃ  tuttu u mondu Ã  sguassÃ  u so propiu contu
           title: AuturizÃ  Ã  sguassÃ  i conti
         min_invite_role:
-          disabled: Nisunu
+          disabled: Nimu
           title: AuturizÃ  lâ€™invitazione da
+        require_invite_text:
+          title: Richiede chÃ¬ i novi utilizatori empiinu una dumanda d'invitazione
       registrations_mode:
         modes:
           approved: Apprubazione necessaria per arregistrassi
@@ -549,7 +599,7 @@ co:
           open: Tutt'ognunu pÃ² arregistrassi
         title: Modu d'arregistramenti
       show_known_fediverse_at_about_page:
-        desc_html: Quandu ghjÃ¨ selezziunatu, statuti di tuttu lâ€™istanze cunnisciute saranu affissati indÃ¨ a vista di e linee. Altrimente soli i statuti lucali saranu mustrati.
+        desc_html: Quandu ghjÃ¨ selezziunatu, statuti di tuttu lâ€™istanze cunnisciute saranu affissati indÃ¨ a vista di e linee. Altrimente soli i statuti lucali saranu mustrati
         title: Vedde tuttu u fediverse cunnisciutu nantâ€™a vista di e linee
       show_staff_badge:
         desc_html: MustrerÃ  un badge Squadra nantâ€™Ã  un prufile dâ€™utilizatore
@@ -681,8 +731,11 @@ co:
       prefix_sign_up: Arregistratevi nant'Ã  Mastodon oghji!
       suffix: CÃ¹ un contu, puderete siguitÃ  l'altri, pustÃ  statuti Ã¨ scambiÃ  missaghji cÃ¹ l'utilizatori di tutti i servori Mastodon Ã¨ ancu di piÃ¹!
     didnt_get_confirmation: Ã™n avete micca ricevutu lâ€™istruzione di cunfirmazione?
+    dont_have_your_security_key: Ã™n avete micca a chjave di sicuritÃ ?
     forgot_password: Chjave scurdata?
     invalid_reset_password_token: U ligame di riinizializazione di a chjave dâ€™accessu hÃ¨ spiratu o Ã¹n hÃ¨ micca validu. Pudete dumandÃ  un'altru ligame.
+    link_to_otp: Entrate u codice dâ€™I2F da l'applicazione o un codice di ricuperazione
+    link_to_webauth: Utilizate a vostra chjave di sicuritÃ 
     login: Cunnettassi
     logout: Scunnettassi
     migrate_account: CambiÃ  di contu
@@ -707,7 +760,9 @@ co:
       functional: U vostru contu hÃ¨ uperaziunale.
       pending: A vostra dumanda hÃ¨ in attesa di rivista da a squadra di muderazione. Quessa pÃ² pigliÃ  un certu tempu. Avete da riceve un'e-mail s'ella hÃ¨ appruvata.
       redirecting_to: U vostru contu hÃ¨ inattivu perchÃ¨ riindirizza versu %{acct}.
+    too_fast: Furmulariu mandatu troppu prestu, ripruvate.
     trouble_logging_in: DifficultÃ  per cunnettavi?
+    use_security_key: UtilizÃ  a chjave di sicuritÃ 
   authorize_follow:
     already_following: Site digiÃ  abbunatuÂ·a Ã  stu contu
     already_requested: Avete digiÃ  mandatu una dumanda d'abbunamentu Ã  stu contu
@@ -732,6 +787,7 @@ co:
   date:
     formats:
       default: "%d %b %Y"
+      with_month_name: "%d %B %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}o"
@@ -796,6 +852,7 @@ co:
       request: DumandÃ  u vostrâ€™archiviu
       size: Pesu
     blocks: Bluccate
+    bookmarks: Segnalibri
     csv: CSV
     domain_blocks: Blucchime di duminiu
     lists: Liste
@@ -827,7 +884,7 @@ co:
   footer:
     developers: Sviluppatori
     more: Di piÃ¹â€¦
-    resources: Risorze
+    resources: Risorse
     trending_now: Tindenze d'avÃ 
   generic:
     all: Tuttu
@@ -872,6 +929,7 @@ co:
     success: I vostri dati sÃ² stati impurtati Ã¨ saranu trattati da quÃ¬ Ã  pocu
     types:
       blocking: Persone chÃ¬ bluccate
+      bookmarks: Segnalibri
       domain_blocking: Lista di blucchimi di duminiu
       following: Persone chÃ¬ seguitate
       muting: Persone chÃ¬ piattate
@@ -908,7 +966,7 @@ co:
       not_ready: Ã™n si pÃ² micca aghjunghje un fugliale micca ancu trattatu. Ripruvate piÃ¹ tardi!
       too_many: Ã™n si pÃ² micca aghjunghje piÃ¹ di 4 fugliali
   migrations:
-    acct: cugnome@duminiu di u novu contu
+    acct: Spiazzatu nant'Ã 
     cancel: AnnullÃ  ridirezzione
     cancel_explanation: L'annullazione di a ridirezzione hÃ  da riattivÃ  stu contu, mÃ  Ã¹n si puderÃ  micca ricuperÃ  l'abbunati chÃ¬ sÃ² digiÃ  stati trasferriti Ã  l'altru contu.
     cancelled_msg: Ridirezzione annullata.
@@ -992,6 +1050,14 @@ co:
           quadrillion: P
           thousand: K
           trillion: T
+  otp_authentication:
+    code_hint: Entrate u codice generatu da lâ€™applicazione per cunfirmÃ 
+    description_html: Sâ€™ella hÃ¨ attivata <strong>lâ€™identificazione Ã  dui fattori</strong> cÃ¹ un'applicazione d'identificazione, duvete avÃ¨ u vostru telefuninu pÃ¨ ottene un codice di cunnezzione.
+    enable: AttivÃ 
+    instructions_html: "<strong>Scanate stu QR code cÃ¹ Google Authenticator, Authy o qualcosa cusÃ¬ nantâ€™Ã  u vostru telefuninu</strong>. Stâ€™applicazione hÃ  da creÃ  codici da entrÃ  ogni volta chÃ¬ vi cunnettate."
+    manual_instructions: 'Sâ€™ellu Ã¹n hÃ¨ micca pussibule scanÃ  u QR code, pudete entre sta chjave sicreta:'
+    setup: AttivÃ 
+    wrong_code: U codice Ã¹n hÃ¨ micca currettu! Site sicuruÂ·a chÃ¬ lâ€™ora di l'apparechju Ã¨ di u servore sÃ² esatte?
   pagination:
     newer: PiÃ¹ ricente
     next: Dopu
@@ -1020,6 +1086,7 @@ co:
   relationships:
     activity: AttivitÃ  di u contu
     dormant: Inattivu
+    follow_selected_followers: Abbunassi Ã  l'abbunati selezziunati
     followers: Abbunati
     following: Abbunamenti
     invited: Invitatu
@@ -1087,7 +1154,7 @@ co:
       firefox_os: Firefox OS
       ios: iOS
       linux: Linux
-      mac: Mac
+      mac: macOS
       other: piattaforma scunnisciuta
       windows: Windows
       windows_mobile: Windows Mobile
@@ -1116,6 +1183,7 @@ co:
     profile: Prufile
     relationships: Abbunamenti Ã¨ abbunati
     two_factor_authentication: Identificazione Ã  dui fattori
+    webauthn_authentication: Chjave di sicuritÃ 
   spam_check:
     spam_detected: Quessu ghjÃ¨ un riportu automaticu. Un spam hÃ¨ statu ditettatu.
   statuses:
@@ -1139,7 +1207,7 @@ co:
       in_reply_not_found: U statutu Ã  quellu avete pruvatu di risponde Ã¹n sembra micca esiste.
     language_detection: TruvÃ  a lingua autumaticamente
     open_in_web: Apre nantâ€™Ã  u web
-    over_character_limit: Site soprâ€™Ã  a limita di %{max} caratteri
+    over_character_limit: site soprâ€™Ã  a limita di %{max} caratteri
     pin_errors:
       limit: Avete digiÃ  puntarulatu u numeru massimale di statuti
       ownership: Pudete puntarulÃ  solu unu di i vostri propii statuti
@@ -1154,6 +1222,8 @@ co:
         other: "%{count} voti"
       vote: VutÃ 
     show_more: Vede di piÃ¹
+    show_newer: Vede i piÃ¹ ricenti
+    show_older: Vede i piÃ¹ anziani
     show_thread: Vede u filu
     sign_in_to_participate: Cunnettatevi per participÃ  Ã  a cunversazione
     title: '%{name}: "%{quote}"'
@@ -1262,21 +1332,20 @@ co:
       default: "%d %b %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Entrate u codice generatu da lâ€™applicazione per cunfirmÃ 
-    description_html: Sâ€™ella hÃ¨ attivata <strong>lâ€™identificazione Ã  dui fattori</strong>, duvete avÃ¨ u vostru telefuninu pÃ¨ ottene un codice di cunnezzione.
+    add: Aghjunghje
     disable: DisattivÃ 
-    enable: AttivÃ 
+    disabled_success: Lâ€™identificazione Ã  dui fattori hÃ¨ stata disattivata
+    edit: CambiÃ 
     enabled: Identificazione Ã  dui fattori attivata
     enabled_success: Lâ€™identificazione Ã  dui fattori hÃ¨ stata attivata
     generate_recovery_codes: CreÃ  codici di ricuperazione
-    instructions_html: "<strong>Scanate stu QR code cÃ¹ Google Authenticator, Authy o qualcosa cusÃ¬ nantâ€™Ã  u vostru telefuninu</strong>. Stâ€™applicazione hÃ  da creÃ  codici da entrÃ  ogni volta chÃ¬ vi cunnettate."
     lost_recovery_codes: I codici di ricuperazione Ã  usu unicu vi permettenu di sempre avÃ¨ accessu Ã  u vostru contu sâ€™Ã¨ voi avete persu u vostru telefuninu. Sâ€™elli sÃ² ancu persi, pudete creÃ  codici novi quÃ¬. I vechji codici Ã¹n marchjeranu piÃ¹.
-    manual_instructions: 'Sâ€™ellu Ã¹n hÃ¨ micca pussibule scanÃ  u QR code, pudete entre sta chjave sicreta:'
+    methods: Manere d'I2F
+    otp: Applicazione d'identificazione
     recovery_codes: Codici di ricuperazione
     recovery_codes_regenerated: Codici di ricuperazione ricreati
     recovery_instructions_html: Pudete fÃ  usu di i codici quÃ¬ sottu per sempre avÃ¨ accessu Ã  u vostru contu sâ€™ellu hÃ¨ statu persu u vostru telefuninu. <strong>Guardateli in una piazza sicura</strong>. Per esempiu, stampati Ã¨ cunservati cÃ¹ altri ducumenti impurtanti.
-    setup: AttivÃ 
-    wrong_code: U codice Ã¹n hÃ¨ micca currettu! Site sicuruÂ·a chÃ¬ lâ€™ora di l'apparechju Ã¨ di u servore sÃ² esatte?
+    webauthn: Chjave di sicuritÃ 
   user_mailer:
     backup_ready:
       explanation: Avete dumandatu unâ€™archiviu cumpletu di u vostru contu Mastodon. AvÃ  hÃ¨ prontu per scaricÃ !
@@ -1291,6 +1360,7 @@ co:
     warning:
       explanation:
         disable: Quandu u vostru contu hÃ¨ ghjacciatu, i vostri dati stannu intatti, mÃ  Ã¹n pudete fÃ  nunda fin'Ã  ch'ellu sia sbluccatu.
+        sensitive: I vostri media caricati Ã¨ in ligami saranu trattati cum'Ã¨ sensibili.
         silence: Quandu u vostru contu hÃ¨ limitatu, solu quelli chÃ¬ sÃ² digiÃ  abbunati Ã  u vostru contu viderenu i vostri statuti nant'Ã  quessu servore, Ã¨ puderete esse esclusuÂ·a di parechje liste pubbliche. PerÃ², altri conti puderenu sempre seguitavi.
         suspend: U vostru contu hÃ¨ statu suspesu, Ã¨ tutti i vo statuti Ã¨ fugliali media caricati sÃ² stati sguassati di manera irreversibile di stu servore, Ã¨ di i servori induve aviate abbunati.
       get_in_touch: Pudete risponde Ã  quest'e-mail per cuntattÃ  a squadra di muderazione di %{instance}.
@@ -1299,11 +1369,13 @@ co:
       subject:
         disable: U vostru contu %{acct} hÃ¨ statu ghjacciatu
         none: Avertimentu pÃ¨ %{acct}
+        sensitive: I media di u vostru contu %{acct} sÃ² stati marcati cum'Ã¨ sensibili
         silence: U vostru contu %{acct} hÃ¨ statu limitatu
         suspend: U vostru contu %{acct} hÃ¨ statu suspesu
       title:
         disable: Contu ghjacciatu
         none: Avertimentu
+        sensitive: U vostru media hÃ¨ statu marcatu cum'Ã¨ sensibile
         silence: Contu limitatu
         suspend: Contu suspesu
     welcome:
@@ -1324,9 +1396,11 @@ co:
       tips: Cunsiglii
       title: BenvenutuÂ·a, %{name}!
   users:
+    blocked_email_provider: Stu serviziu e-mail Ã¹n hÃ¨ micca auturizatu
     follow_limit_reached: Ã™n pidete seguitÃ  piÃ¹ di %{limit} conti
     generic_access_help_html: Prublemi d'accessu Ã  u vostru contu? Pudete cuntattÃ  %{email} per ottene aiutu
     invalid_email: Lâ€™indirizzu e-mail Ã¹n hÃ¨ currettu
+    invalid_email_mx: L'indirizzu e-mail Ã¹n pare micca esiste
     invalid_otp_token: U codice dâ€™identificazione Ã¹n hÃ¨ currettu
     invalid_sign_in_token: Codice di sicuritÃ  micca validu
     otp_lost_help_html: Sâ€™Ã¨ voi avete persu i dui, pudete cuntattÃ  %{email}
@@ -1336,3 +1410,20 @@ co:
   verification:
     explanation_html: 'Pudete <strong>verificavi cum''Ã¨ u pruprietariu di i ligami in i metadati di u vostru prufile</strong>. Per quessa, u vostru situ deve avÃ¨ un ligame versu a vostra pagina Mastodon. U ligame <strong>deve</strong> avÃ¨ un''attributu <code>rel="me"</code>. U cuntenutu di u testu di u ligame Ã¹n hÃ¨ micca impurtante. Eccu un''esempiu:'
     verification: Verificazione
+  webauthn_credentials:
+    add: Aghjunghje una chjave di sicuritÃ 
+    create:
+      error: C'hÃ¨ statu un prublemu aghjunghjendu a vostra chjave di sicuritÃ . Duvete ripruvÃ .
+      success: A vostra chjave di sicuritÃ  hÃ¨ stata aghjunta.
+    delete: SguassÃ 
+    delete_confirmation: Site sicuruÂ·a che vulete sguassÃ  sta chjave?
+    description_html: S'e voi attivate l'<strong>autentificazione Ã  chjave di sicuritÃ </strong>, duverete utilizÃ  una di e vostre chjave ogni volta chÃ¬ vi cunnettate.
+    destroy:
+      error: C'hÃ¨ statu un prublemu togliendu a vostra chjave di sicuritÃ . Duvete ripruvÃ .
+      success: A vostra chjave di sicuritÃ  hÃ¨ stata sguassata.
+    invalid_credential: Chjave di sicuritÃ  I2F micca validu
+    nickname_hint: Entrate u nome di a vostra nova chjave di sicuritÃ 
+    not_enabled: Ã™n avete micca attivatu WebAuthn
+    not_supported: E chjave di sicuritÃ  Ã¹n marchjanu micca cÃ¹ quessu navigatore
+    otp_required: Per utilizÃ  una chjave di sicuritÃ  duvete attivÃ  l'identificazione Ã  dui fattori prima.
+    registered_on: Arregistrata %{date}
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 73670dcc9ad9e19d1a760aeed51d6cd85ede176c..e54e635173d970dbe5fd1718f76516a19db3155f 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1285,21 +1285,14 @@ cs:
       default: "%d. %b %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Pro potvrzenÃ zadejte kÃ³d vygenerovanÃ½ vaÅ¡Ã ovÄ›Å™ovacÃ aplikacÃ
-    description_html: Zapnete-li <strong>dvoufÃ¡zovÃ© ovÄ›Å™ovÃ¡nÃ</strong>, budete pro pÅ™ihlaÅ¡ovÃ¡nÃ potÅ™ebovat telefon, kterÃ½ vÃ¡m vygeneruje pÅ™ÃstupovÃ© tokeny, kterÃ© musÃte zadat.
     disable: Vypnout
-    enable: Zapnout
     enabled: DvoufÃ¡zovÃ© ovÄ›Å™ovÃ¡nÃ je zapnuto
     enabled_success: DvoufÃ¡zovÃ© ovÄ›Å™ovÃ¡nÃ bylo ÃºspÄ›Å¡nÄ› zapnuto
     generate_recovery_codes: Vygenerovat zÃ¡loÅ¾nÃ kÃ³dy
-    instructions_html: "<strong>Naskenujte tento QR kÃ³d Google Authenticatorem nebo jinou TOTP aplikacÃ na svÃ©m telefonu</strong>. Od teÄ bude tato aplikace generovat tokeny, kterÃ© budete muset zadat pÅ™i pÅ™ihlÃ¡Å¡enÃ."
     lost_recovery_codes: ZÃ¡loÅ¾nÃ kÃ³dy vÃ¡m dovolÃ dostat se k vaÅ¡emu ÃºÄtu, pokud ztratÃte telefon. ZtratÃte-li zÃ¡loÅ¾nÃ kÃ³dy, mÅ¯Å¾ete je zde znovu vygenerovat. VaÅ¡e starÃ© zÃ¡loÅ¾nÃ kÃ³dy budou zneplatnÄ›ny.
-    manual_instructions: 'NemÅ¯Å¾ete-li QR kÃ³d naskenovat a je potÅ™eba ho zadat ruÄnÄ›, zde je secret v prostÃ©m textu:'
     recovery_codes: ZÃ¡loÅ¾nÃ kÃ³dy pro obnovu
     recovery_codes_regenerated: ZÃ¡loÅ¾nÃ kÃ³dy byly ÃºspÄ›Å¡nÄ› znovu vygenerovÃ¡ny
     recovery_instructions_html: ZtratÃte-li nÄ›kdy pÅ™Ãstup ke svÃ©mu telefonu, mÅ¯Å¾ete k zÃskÃ¡nÃ pÅ™Ãstupu k ÃºÄtu pouÅ¾Ãt jeden ze zÃ¡loÅ¾nÃch kÃ³dÅ¯. <strong>Uchovejte tyto kÃ³dy v bezpeÄÃ</strong>. MÅ¯Å¾ete si je napÅ™Ãklad vytisknout a uloÅ¾it je mezi jinÃ© dÅ¯leÅ¾itÃ© dokumenty.
-    setup: Nastavit
-    wrong_code: ZadanÃ½ kÃ³d byl neplatnÃ½! Je Äas na serveru a na zaÅ™ÃzenÃ sprÃ¡vnÃ½?
   user_mailer:
     backup_ready:
       explanation: VyÅ¾Ã¡dali jste si Ãºplnou zÃ¡lohu svÃ©ho ÃºÄtu Mastodon. NynÃ je pÅ™ipravena ke staÅ¾enÃ!
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 40d70b838302e9d33aeb6bf59e424a5919bf7178..92ce53fe686c7a11b92f76ed577417aa8784f32e 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -44,8 +44,11 @@ cy:
       domain: Gweinydd
       reason: 'Rheswm:'
       rejecting_media: Ni fydd ffeiliau cyfryngau o'r gweinydd hwn yn cael eu prosesu ac ni fydd unrhyw fawd yn cael eu harddangos, sy'n gofyn am glicio Ã¢ llaw i'r gweinydd arall.
+      rejecting_media_title: Cyfrwng hidliedig
       silenced: Ni fydd swyddi o'r gweinydd hwn yn ymddangos yn unman heblaw eich porthiant cartref os dilynwch yr awdur.
+      silenced_title: Gweinyddion wedi'i tawelu
       suspended: Ni fyddwch yn gallu dilyn unrhyw un o'r gweinydd hwn, ac ni fydd unrhyw ddata ohono'n cael ei brosesu na'i storio, ac ni chyfnewidir unrhyw ddata.
+      suspended_title: Gweinyddion wedi'i gwahardd
     unavailable_content_html: Yn gyffredinol, mae Mastodon yn caniatÃ¡u ichi weld cynnwys gan unrhyw weinyddwr arall yn y ffederasiwn a rhyngweithio Ã¢ hi. Dyma'r eithriadau a wnaed ar y gweinydd penodol hwn.
     user_count_after:
       few: defnyddwyr
@@ -325,6 +328,7 @@ cy:
       listed: Rhestredig
       new:
         title: Ychwanegu emoji personol newydd
+      not_permitted: Nid oes gennych caniatÃ¢d i gyflawni'r weithred hon
       overwrite: Trosysgrifio
       shortcode: Byrgod
       shortcode_hint: O leiaf 2 nodyn, dim ond nodau alffaniwmerig a tanlinellau
@@ -962,6 +966,7 @@ cy:
     on_cooldown: Rydych wedi mudo eich cyfrif yn diweddar. Bydd y swyddogaeth hon ar gael eto mewn %{count} diwrnod.
     past_migrations: Ymfudiadau yn y gorffennol
     proceed_with_move: Symud dilynwyr
+    redirected_msg: Mae eich cyfrif yn awr yn ailgyfeirio at %{acct}.
     redirecting_to: Mae eich cyfrif yn ailgyfeirio at %{acct}.
     set_redirect: Gosod ailgyfeiriad
     warning:
@@ -975,6 +980,10 @@ cy:
       redirect: Bydd proffil eich cyfrif presennol yn cael ei diweddaru gyda hysbysiad ailgyfeirio ac yn cael ei eithrio o chwiliadau
   moderation:
     title: Goruwchwyliad
+  move_handler:
+    carry_blocks_over_text: Wnaeth y defnyddiwr symud o %{acct}, a oeddech chi wedi'i flocio.
+    carry_mutes_over_text: Wnaeth y defnyddiwr symud o %{acct}, a oeddech chi wedi'i dawelu.
+    copy_account_note_text: 'Wnaeth y defnyddiwr symud o %{acct}, dyma oedd eich hen nodiadau amdanynt:'
   notification_mailer:
     digest:
       action: Gweld holl hysbysiadau
@@ -1161,6 +1170,13 @@ cy:
     spam_detected: Mae hyn yn adrodd awtomatig. Caiff sbam ei ganfod.
   statuses:
     attached:
+      audio:
+        few: "%{count} ffeil clywedol"
+        many: "%{count} ffeil clywedol"
+        one: "%{count} ffeil clywedol"
+        other: "%{count} ffeil clywedol"
+        two: "%{count} ffeil clywedol"
+        zero: "%{count} ffeil clywedol"
       description: 'Ynghlwm: %{attached}'
       image:
         few: "%{count} o luniau"
@@ -1320,26 +1336,25 @@ cy:
       default: "%b %d, %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Mewnbynwch y cÃ´d a grewyd gan eich ap dilysu i gadarnhau
-    description_html: Os ydych yn galluogi <strong>awdurdodi dau-gam</strong>, bydd mewngofnodi yn gofyn i chi fod a'ch ffÃ´n gerllaw er mwyn cynhyrchu tocyn i chi gael mewnbynnu.
     disable: Diffodd
-    enable: Galluogi
     enabled: Awdurdodi dau-gam wedi'i alluogi
     enabled_success: Awdurdodi dau-gam wedi'i alluogi'n llwyddiannus
     generate_recovery_codes: Cynhyrchu cÃ´dau adfer
-    instructions_html: "<strong>Sganiwch y cÃ´d QR yn Google Authenticator neu ap TOTP tebyg ar eich ffÃ´n</strong>. O hyn ymlaen, bydd yr ap hwnnw yn cynhyrchu tocynnau y bydd rhaid i chi fewnbynnu tra'n mewngofnodi."
     lost_recovery_codes: Mae cÃ´dau adfer yn caniatau i chi gael mynediad i'ch cyfrif eto os ydych yn colli'ch ffÃ´n. Os ydych wedi colli eich cÃ´dau adfer, mae modd i chi gynhyrchu nhw eto yma. Bydd eich hen gÃ´dau wedyn yn annilys.
-    manual_instructions: 'Os nad ydych yn gallu sganio cÃ´d QR ac angen ei fewnbynnu a llaw, dyma''r gyfrinach testun-plaen:'
     recovery_codes: Creu copi wrth gefn o gÃ´dau adfywio
     recovery_codes_regenerated: Llwyddwyd i ail greu cÃ´dau adfywio
     recovery_instructions_html: Os ydych byth yn colli mynediad i'ch ffÃ´n, mae modd i chi ddefnyddio un o'r cÃ´dau adfywio isod i ennill mynediad i'ch cyfrif eto. <strong>Cadwch y cÃ´dau adfywio yn saff</strong>. Er enghraifft, gallwch eu argraffu a'u cadw gyda dogfennau eraill pwysig.
-    setup: Sefydlu
-    wrong_code: Roedd y cod y mewnbynnwyd yn annilys! A yw'r amser gweinydd ac amser dyfais yn gywir?
   user_mailer:
     backup_ready:
       explanation: Fe wnaethoch chi gais am gopi wrth gefn llawn o'ch cyfrif Mastodon. Mae nawr yn barod i'w lawrlwytho!
       subject: Mae eich archif yn barod i'w lawrlwytho
       title: Allfudo archif
+    sign_in_token:
+      details: 'Dyma''r manylion o''r ceisiad:'
+      explanation: 'Wnaethom ni synhwyro ceisiad i fewngofnodi i''ch cyfrif o gyfeiriad IP anabyddiedig. Os mae hyn yn chi, mewnbynnwch y cod diogelwch isod i fewn i''r dudalen herio mewngofnodiad:'
+      further_actions: 'Os nad oedd hyn yn chi, newidwch eich cyfrinair ac alluogi awdurdodi dauffactor ar eich cyfrif. Gallwch gwneud hyn fama:'
+      subject: Cadarnhewch yr ymgais mewngofnodi
+      title: Ymgais mewngofnodi
     warning:
       explanation:
         disable: Er bod eich cyfrif wedi'i rewi, mae eich data cyfrif yn parhau i fod yn gyfan, ond ni allwch chi berfformio unrhyw gamau nes ei ddatgloi.
@@ -1376,12 +1391,17 @@ cy:
       tips: Awgrymiadau
       title: Croeso, %{name}!
   users:
+    blocked_email_provider: Nid yw'r darparwr ebost hon yn cael ei ganiatÃ¢u
     follow_limit_reached: Nid oes modd i chi ddilyn mwy na %{limit} o bobl
+    generic_access_help_html: Cael trafferth yn cyrchu eich cyfrif? Efallai hoffwch cysylltu Ã¢ %{email} am gymorth
     invalid_email: Mae'r cyfeiriad e-bost hwn yn annilys
+    invalid_email_mx: Nid yw'r ebost yn edrcyh fel ei bod yn bodoli
     invalid_otp_token: CÃ´d dau-ffactor annilys
+    invalid_sign_in_token: Cod diogelwch annilys
     otp_lost_help_html: Os colloch chi fynediad i'r ddau, mae modd i chi gysylltu a %{email}
     seamless_external_login: Yr ydych wedi'ch mewngofnodi drwy wasanaeth allanol, felly nid yw gosodiadau cyfrinair ac e-bost ar gael.
     signed_in_as: 'Wedi mewngofnodi fel:'
+    suspicious_sign_in_confirmation: Mae'n edrych fel nad ydych wedi mewngofnodi o'r dyfais hyn o'r blaen, a nid ydych wedi mewngofnodi am sbel, felly rydym yn anfon cod diogelwch i'ch cyfeiriad ebost i gadarnhau bod chi yw hi.
   verification:
     explanation_html: 'Mae modd i chi <strong>ddilysu eich hun fel perchenog y dolenni yn metadata eich proffil</strong>. Rhaid i''r wefan a dolen iddi gynnwys dolen yn Ã´l i''ch proffil Mastodon. <strong>Rhaid</strong> i''r ddolen yn Ã´l gael nodwedd <code>rel="fi"</code>. Nid oes ots beth yw cynnwys testun y ddolen. Dyma enghraifft:'
     verification: Dilysu
diff --git a/config/locales/da.yml b/config/locales/da.yml
index c7189ae34ba0f0f277c60958d188c55b33537374..c98404066e72f7cc9e7525f3a86a97946b5a2f4d 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -40,8 +40,11 @@ da:
       domain: Server
       reason: Ã…rsag
       rejecting_media: 'Medie filer fra disse servere vil ikke blive behandlet eller gemt, og ingen miniaturebilleder vil blive vist, som krÃ¦ver tilgang til den originale fil:'
+      rejecting_media_title: Filtrerede medier
       silenced: 'Posteringer fra disse servere vil vÃ¦re skjulte i den offentlige tidslinje feed eller beskeder og ingen notifikationer vil blive genereret fra brugere du ikke fÃ¸lger:'
+      silenced_title: DÃ¦mpede servere
       suspended: 'Ingen date fra disse servere vil blive behandlet, gemt eller udvekslet, at interagere eller kommunikere med brugere fra disse servere er ikke muligt:'
+      suspended_title: Suspenderede servere
     unavailable_content_html: Mastodon tillader dig generelt at se indhold og interagere med brugere fra enhver anden server i fediverset. Dette er undtagelser der er foretaget pÃ¥ netop denne server.
     user_count_after:
       one: bruger
@@ -50,6 +53,7 @@ da:
     what_is_mastodon: Hvad er Mastodon?
   accounts:
     choices_html: "%{name}s valg:"
+    endorsements_hint: Du kan stÃ¸tte folk du fÃ¸lger fra web-interface, og de vil dukke op her.
     featured_tags_hint: Du kan tilfÃ¸je specifikke hashtags der vil blive vist her.
     follow: FÃ¸lg
     followers:
@@ -91,6 +95,7 @@ da:
       delete: Slet
       destroyed_msg: Moderator notat succesfuldt destrueret!
     accounts:
+      add_email_domain_block: Bloker e-mail domÃ¦ne
       approve: Godkend
       approve_all: Godkend alle
       are_you_sure: Er du sikker?
@@ -106,6 +111,7 @@ da:
       confirm: BekrÃ¦ft
       confirmed: BekrÃ¦ftet
       confirming: BekrÃ¦fter
+      delete: Slet data
       deleted: Slettet
       demote: Degrader
       disable: Deaktiver
@@ -133,6 +139,7 @@ da:
       login_status: Status pÃ¥ login
       media_attachments: Medie bilag
       memorialize: Omdan til et memoriam
+      memorialized: Memorialiseret
       moderation:
         active: Aktiv
         all: Alle
@@ -172,6 +179,8 @@ da:
         user: Bruger
       search: SÃ¸g
       search_same_ip: Andre brugere med den samme IP-adresse
+      sensitive: FÃ¸lsomt
+      sensitized: markeret som fÃ¸lsomt
       shared_inbox_url: Link til delt indbakke
       show:
         created_reports: Anmeldelser oprettet
@@ -188,16 +197,37 @@ da:
       undo_suspension: Fortryd udelukkelse
       unsubscribe: Abonner ikke lÃ¦ngere
       username: Brugernavn
+      view_domain: Vis resumÃ© for domÃ¦ne
       warn: Advar
       web: Web
       whitelisted: Hvidlistet
     action_logs:
       action_types:
+        assigned_to_self_report: Tildel rapport
+        change_email_user: Ã†ndre e-mail for bruger
         confirm_user: BekrÃ¦ft bruger
+        create_account_warning: Opret advarsel
+        create_announcement: Opret bekendtgÃ¸relse
+        create_domain_allow: Opret domÃ¦ne tillad
+        create_domain_block: Opret domÃ¦neblokering
+        create_ip_block: Opret IP-regel
+        destroy_announcement: Slet bekendtgÃ¸relse
+        destroy_domain_block: Slet domÃ¦neblokering
+        destroy_email_domain_block: Slet e-mail domÃ¦ne blokering
+        destroy_ip_block: Slet IP-regel
         destroy_status: Slet status
         disable_2fa_user: Slet 2FA
         disable_user: Deaktiver brugeren
         enable_user: Aktiver brugeren
+        remove_avatar_user: Fjern profilbillede
+        reopen_report: GenÃ¥ben rapport
+        reset_password_user: Nulstil adgangskode
+        resolve_report: LÃ¸s rapport
+        silence_account: DÃ¦mp konto
+        suspend_account: SuspendÃ©r Konto
+        unsilence_account: Fjern dÃ¦mpelse af konto
+        update_announcement: Opdater bekendtgÃ¸relse
+        update_status: Opdater status
       actions:
         assigned_to_self_report: "%{name} tildelte anmeldelsen %{target} til sig selv"
         change_email_user: "%{name} Ã¦ndrede email adressen for brugeren %{target}"
@@ -207,11 +237,13 @@ da:
         create_domain_allow: "%{name} godkendte domÃ¦net %{target}"
         create_domain_block: "%{name} blokerede domÃ¦net %{target}"
         create_email_domain_block: "%{name} sortlistede email domÃ¦net %{target}"
+        create_ip_block: "%{name} oprettede regel for IP %{target}"
         demote_user: "%{name} degraderede %{target}"
         destroy_custom_emoji: "%{name} fjernede emoji %{target}"
         destroy_domain_allow: "%{name} fjernede godkendelsen af domÃ¦net %{target}"
         destroy_domain_block: "%{name} fjernede blokeringen af domÃ¦net %{target}"
         destroy_email_domain_block: "%{name} hvid-listede email domÃ¦net %{target}"
+        destroy_ip_block: "%{name} slettede reglen for IP %{target}"
         destroy_status: "%{name} fjernede statussen fra %{target}"
         disable_2fa_user: "%{name} deaktiverede to faktor kravet for brugeren %{target}"
         disable_custom_emoji: "%{name} deaktiverede humÃ¸rikonet %{target}"
@@ -232,9 +264,23 @@ da:
         update_custom_emoji: "%{name} opdaterede humÃ¸rikonet %{target}"
         update_status: "%{name} opdaterede status for %{target}"
       deleted_status: "(slettet status)"
+      empty: Ingen logs fundet.
       filter_by_action: Filtrer efter handling
       filter_by_user: Filtrer efter bruger
       title: Revisionslog
+    announcements:
+      destroyed_msg: BekendtgÃ¸relsen blev slettet!
+      edit:
+        title: Rediger bekendtgÃ¸relse
+      empty: Ingen bekendtgÃ¸relser fundet.
+      live: Direkte
+      new:
+        create: Opret bekendtgÃ¸relse
+        title: Ny bekendtgÃ¸relse
+      published_msg: BekendtgÃ¸relsen blev slettet!
+      scheduled_for: Planlagt til %{time}
+      title: BekendtgÃ¸relser
+      updated_msg: BekendtgÃ¸relsen blev opdateret!
     custom_emojis:
       assign_category: VÃ¦lg kategori
       by_domain: DomÃ¦ne
@@ -257,6 +303,7 @@ da:
       listed: Listet
       new:
         title: TilfÃ¸j nyt brugerdefineret humÃ¸rikon
+      not_permitted: Du har ikke tilladelse til at udfÃ¸re denne handling
       overwrite: Overskriv
       shortcode: Kortkode
       shortcode_hint: Mindst 2 tegn, kun alfabetiske tegn og understreger
@@ -323,6 +370,7 @@ da:
       rejecting_media: afviser mediefiler
       rejecting_reports: afviser anmeldelser
       severity:
+        silence: dÃ¦mpet
         suspend: suspenderet
       show:
         affected_accounts:
@@ -341,6 +389,7 @@ da:
       delete: Slet
       destroyed_msg: Fjernede succesfuldt email domÃ¦net fra sortliste
       domain: DomÃ¦ne
+      empty: Ingen e-mail-domÃ¦ner er i Ã¸jeblikket blokeret.
       from_html: fra %{domain}
       new:
         create: TilfÃ¸j domÃ¦ne
@@ -349,15 +398,21 @@ da:
     instances:
       by_domain: DomÃ¦ne
       delivery_available: Levering er tilgÃ¦ngelig
+      known_accounts:
+        one: "%{count} kendt konto"
+        other: "%{count} kendte konti"
       moderation:
         all: Alle
         limited: BegrÃ¦nset
+        title: Moderation
       private_comment: Privat kommentar
       public_comment: Offentlig kommentar
       title: FÃ¸rderation
       total_blocked_by_us: Blokeret af os
       total_followed_by_them: Fulgt af dem
       total_followed_by_us: Fulgt af os
+      total_reported: Rapporter om dem
+      total_storage: VedhÃ¦ftede medier
     invites:
       deactivate_all: Deaktiver alle
       filter:
@@ -366,6 +421,25 @@ da:
         expired: UdlÃ¸bet
         title: Filtre
       title: Invitationer
+    ip_blocks:
+      add_new: Opret regel
+      created_msg: Ny IP-regel blev tilfÃ¸jet
+      delete: Slet
+      expires_in:
+        '1209600': 2 uger
+        '15778476': 6 mÃ¥neder
+        '2629746': 1 mÃ¥ned
+        '31556952': 1 Ã¥r
+        '86400': 1 dag
+        '94670856': 3 Ã¥r
+      new:
+        title: Opret ny IP-regel
+      no_ip_block_selected: Ingen IP-regler blev Ã¦ndret, da ingen blev valgt
+      title: IP-regler
+    pending_accounts:
+      title: Afventende konti (%{count})
+    relationships:
+      title: "%{acct}'s relationer"
     relays:
       add_new: TilfÃ¸j nyt relay
       delete: Slet
@@ -379,16 +453,22 @@ da:
       pending: Venter pÃ¥ godkendelse fra relÃ¦et
       save_and_enable: Gem og aktiver
       setup: OpsÃ¦t en videresendelses forbindelse
+      signatures_not_enabled: RelÃ¦er fungerer ikke korrekt, mens sikker tilstand eller begrÃ¦nset fÃ¸derationstilstand er aktiveret
       status: Status
       title: Videresendelser
     report_notes:
       created_msg: Anmeldelse note blev oprettet!
       destroyed_msg: Anmeldelse note blev slettet!
     reports:
+      account:
+        reports:
+          one: "%{count} rapport"
+          other: "%{count} rapporter"
       action_taken_by: Handling udfÃ¸rt af
       are_you_sure: Er du sikker?
       assign_to_self: Tildel til mig
       assigned: Tildelt moderator
+      by_target_domain: DomÃ¦ne for rapporteret konto
       comment:
         none: Ingen
       created_at: Anmeldt
@@ -428,6 +508,8 @@ da:
         all: Til alle
         disabled: Til ingen
         title: Vis domÃ¦ne blokeringer
+      enable_bootstrap_timeline_accounts:
+        title: Aktiver standard fÃ¸lger for nye brugere
       hero:
         desc_html: Vist pÃ¥ forsiden. Mindst 600x100px anbefales. Hvis ikke sat, vil dette falde tilbage til billedet fra serveren
         title: Billede af helt
@@ -437,6 +519,9 @@ da:
       preview_sensitive_media:
         desc_html: ForhÃ¥ndsvisninger af links pÃ¥ andre websider vil vise et miniaturebillede selv hvis mediet er markeret som fÃ¸lsomt
         title: Vis fÃ¸lsomt medie i OpenGraph forhÃ¥ndsvisninger
+      profile_directory:
+        desc_html: Tillad bruger at kunne blive fundet
+        title: AktivÃ©r profilmappe
       registrations:
         closed_message:
           desc_html: Vist pÃ¥ forsiden nÃ¥r registreringer er lukkede. Du kan bruge HTML tags
@@ -449,8 +534,10 @@ da:
           title: Tillad invitationer af
       registrations_mode:
         modes:
+          approved: Godkendelse pÃ¥krÃ¦vet for tilmelding
           none: Ingen kan tilmelde sig
           open: Alle kan tilmelde sig
+        title: Tilstand for registreringer
       show_known_fediverse_at_about_page:
         desc_html: NÃ¥r slÃ¥et til, vil det vise trut fra hele det kendte fedivers pÃ¥ forhÃ¥ndsvisning. Ellers vil det kun vise lokale trut.
         title: Vis kendte fedivers pÃ¥ tidslinje forhÃ¥ndsvisning
@@ -470,6 +557,8 @@ da:
         desc_html: Du kan skrive din egen privatlivpolitik, servicevilkÃ¥r, eller lignende. Du kan bruge HTML tags
         title: Brugerdefineret servicevilkÃ¥r
       site_title: Navn af serveren
+      spam_check_enabled:
+        title: Anti-spam automatisering
       thumbnail:
         desc_html: Brugt til forhÃ¥ndsvisninger via OpenGraph og API. 1200x630px anbefales
         title: Miniaturebillede for serveren
@@ -477,6 +566,10 @@ da:
         desc_html: Vis offentlig tidslinje pÃ¥ landingssiden
         title: Tidslinje forhÃ¥ndsvisning
       title: Indstillinger for side
+      trends:
+        title: PopulÃ¦re hashtags
+    site_uploads:
+      delete: Slet oplagt fil
     statuses:
       back_to_account: Tilbage til kontosiden
       batch:
@@ -495,10 +588,22 @@ da:
       accounts_today: Unikke brug i dag
       accounts_week: Unikke brug denne uge
       context: Kontekst
+      directory: I mappe
+      in_directory: "%{count} i mappe"
       last_active: Sidst aktiv
       most_popular: Mest populÃ¦re
       most_recent: Seneste
+      name: Hashtag
+      review: GennemgÃ¥ status
+      reviewed: GennemgÃ¥et
+      title: Hashtags
+      trending_right_now: PopulÃ¦re lige nu
+      unique_uses_today: "%{count} indlÃ¦g i dag"
+      unreviewed: Ikke gennemlÃ¦st
+      updated_msg: Hashtag-indstillinger opdateret
+    title: Administration
     warning_presets:
+      add_new: TilfÃ¸j ny
       delete: Slet
   admin_mailer:
     new_report:
@@ -507,8 +612,11 @@ da:
       subject: Ny anmeldelse for %{instance} (#%{id})
   aliases:
     add_new: Opret alias
+    empty: Du har ingen aliasser.
   appearance:
+    advanced_web_interface: Avanceret webgrÃ¦nseflade
     animations_and_accessibility: Animationer og tilgÃ¦ngelighed
+    confirmation_dialogs: BekrÃ¦ftelsesdialoger
     discovery: Opdagelse
     localization:
       body: Mastodon oversÃ¦ttes af frivillige.
@@ -536,8 +644,10 @@ da:
     delete_account: Slet konto
     delete_account_html: Hvis du Ã¸nsker at slette din konto, kan du <a href="%{path}">gÃ¸re det her</a>. Du vil blive bedt om bekrÃ¦ftelse.
     description:
+      prefix_invited_by_user: "@%{name} inviterer dig til at deltage i denne Mastodons server!"
       prefix_sign_up: Tilmeld dig Mastodon i dag!
     didnt_get_confirmation: Har du endnu ikke modtaget instrukser for bekrÃ¦ftelse?
+    dont_have_your_security_key: Har du ikke dine sikkerhedsnÃ¸gler?
     forgot_password: Glemt dit kodeord?
     invalid_reset_password_token: Adgangskode nulstillings token er ugyldig eller udlÃ¸bet. Anmod venligst om en ny.
     login: Log ind
@@ -545,17 +655,26 @@ da:
     migrate_account: Flyt til en anden konto
     migrate_account_html: Hvis du Ã¸nsker at omdirigere denne konto til en anden, kan du <a href="%{path}">gÃ¸re det her</a>.
     or_log_in_with: Eller log in med
+    providers:
+      cas: CAS
+      saml: SAML
     register: Opret dig
     registration_closed: "%{instance} accepterer ikke nye medlemmer"
     resend_confirmation: Gensend bekrÃ¦ftelses instrukser
     reset_password: Nulstil kodeord
     security: Sikkerhed
     set_new_password: SÃ¦t et nyt kodeord
+    setup:
+      email_settings_hint_html: BekrÃ¦ftelsesmailen blev sendt til %{email}. Hvis denne e-mailadresse ikke er korrekt, kan du Ã¦ndre den i kontoindstillinger.
+      title: OpsÃ¦tning
     status:
       account_status: Kontostatus
+      confirming: Venter pÃ¥ at e-mail bekrÃ¦ftelsen er fuldfÃ¸rt.
     trouble_logging_in: Har du problemer med at logge pÃ¥?
+    use_security_key: Brug sikkerhedsnÃ¸gle
   authorize_follow:
     already_following: Du fÃ¸lger allerede denne konto
+    already_requested: Du har allerede sendt en fÃ¸lgeanmodning til denne konto
     error: Der opstod desvÃ¦rre en fejl under sÃ¸gningen af denne fjerne konto
     follow: FÃ¸lg
     follow_request: 'Du har anmodet om at fÃ¸lge:'
@@ -567,8 +686,17 @@ da:
     title: FÃ¸lg %{acct}
   challenge:
     confirm: FortsÃ¦t
+    hint_html: "<strong>Tip:</strong> We won't ask you for your password again for the next hour."
     invalid_password: Ugyldig adgangskode
     prompt: BekrÃ¦ft din adgangskode for at fortsÃ¦tte
+  crypto:
+    errors:
+      invalid_key: er ikke en gyldig Ed25519 eller Curve25519 nÃ¸gle
+      invalid_signature: er ikke en gylidig Ed25519 signatur
+  date:
+    formats:
+      default: "%b %d, %Y"
+      with_month_name: "%B %d, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}t"
@@ -576,18 +704,26 @@ da:
       about_x_years: "%{count}Ã¥r"
       almost_x_years: "%{count}Ã¥r"
       half_a_minute: Lige nu
+      less_than_x_minutes: "%{count}m"
       less_than_x_seconds: Lige nu
       over_x_years: "%{count}Ã¥r"
+      x_days: "%{count}d"
+      x_minutes: "%{count}m"
       x_months: "%{count}md"
+      x_seconds: "%{count}s"
   deletes:
+    challenge_not_passed: De oplysninger, du indtastede var ikke korrekte
     confirm_password: Indtast dit nuvÃ¦rende kodeord for at bekrÃ¦fte din identitet
+    confirm_username: Indtast dit brugernavn for at bekrÃ¦fte proceduren
     proceed: Slet konto
     success_msg: Din konto er nu blevet slettet
     warning:
+      email_change_html: Du kan <a href="%{path}">Ã¦ndre din e-mail-adresse</a> uden at slette din konto
       username_available: Dit brugernavn vil blive tilgÃ¦ngeligt igen
       username_unavailable: Dit brugernavn vil forblive utilgÃ¦ngeligt
   directories:
     directory: Profilliste
+    explanation: Opdag brugere baseret pÃ¥ deres interesser
     explore_mastodon: Uforsk %{title}
   domain_validator:
     invalid_domain: er ikke et gyldigt domÃ¦nenavn
@@ -604,7 +740,7 @@ da:
     '500':
       content: Beklager men der gik noget galt i vores ende.
       title: Siden er ikke korrekt
-    '503': The page could not be served due to a temporary server failure.
+    '503': Siden kunne ikke serveres pÃ¥ grund af en midlertidig serverfejl.
     noscript_html: For at bruge Mastodon web applikationen, aktiver JavaScript. Alternativt kan du prÃ¸ve en af disse <a href="%{apps_path}">apps</a> til Mastodon for din platform.
   existing_username_validator:
     not_found: kunne ikke finde en lokal bruger med dette brugenavn
@@ -618,11 +754,16 @@ da:
       request: Anmod om dit arkiv
       size: StÃ¸rrelse
     blocks: Du blokerer
+    bookmarks: BogmÃ¦rker
     csv: CSV
     domain_blocks: DomÃ¦ne blokeringer
     lists: Lister
     mutes: Du dÃ¦mper
     storage: Medie lager
+  featured_tags:
+    add_new: TilfÃ¸j ny
+    errors:
+      limit: Du har allerede vist det maksimale antal hashtags
   filters:
     contexts:
       account: Profiler
@@ -637,6 +778,7 @@ da:
       invalid_irreversible: Uigenkaldelig filtrering virker kun med hjem eller notifikations kontekst
     index:
       delete: Slet
+      empty: Du har ingen filtre.
       title: Filtrer
     new:
       title: TilfÃ¸j nyt filter
@@ -656,15 +798,27 @@ da:
       one: Der er noget der ikke er helt som det bÃ¸r vÃ¦re! Tag lige et kig pÃ¥ fÃ¸lgende fejl forneden
       other: Der er noget der ikke er helt som det bÃ¸r vÃ¦re! Tag lige et kig pÃ¥ fÃ¸lgende %{count} fejl forneden
   identity_proofs:
+    active: Aktiv
+    authorize: Ja, tillad
     i_am_html: Jeg er %{username} pÃ¥ %{service}.
     identity: Identitet
+    inactive: Inaktiv
+    publicize_checkbox: 'Og toot dette:'
+    publicize_toot: 'Det er bevist! Jeg er %{username} pÃ¥ %{service}: %{url}'
+    remove: Fjern bevis fra konto
+    removed: Beviset er fjernet fra kontoen
+    status: Status for verifikation
+    view_proof: Se bevis
   imports:
     modes:
+      merge: Sammenflet
       overwrite: Overskriv
     preface: Du kan importere data du har eksporteret fra en anden server, sÃ¥ som en liste over folk du fÃ¸lger eller blokerer.
     success: Dine data blev succesfuldt uploaded og vil nu blive behandlet hurtigst muligt
     types:
       blocking: Blokeringsliste
+      bookmarks: BogmÃ¦rker
+      domain_blocking: DomÃ¦ne blokeringsliste
       following: FÃ¸lgningsliste
       muting: Liste over dÃ¦mpninger
     upload: LÃ¦g op
@@ -697,12 +851,23 @@ da:
   media_attachments:
     validations:
       images_and_video: Kan ikke vedhÃ¦fte en video til en status der allerede har billeder
+      not_ready: Kan ikke vedhÃ¦fte filer, der ikke er fÃ¦rdige med behandlingen. PrÃ¸v igen om et Ã¸jeblik!
       too_many: Kan ikke vedhÃ¦fte mere en 4 filer
   migrations:
     acct: username@domain af den nye konto
     errors:
+      missing_also_known_as: er ikke et alias for denne konto
+      move_to_self: kan ikke vÃ¦re den nuvÃ¦rende konto
       not_found: kunne ikke bive fundet
+      on_cooldown: Du er pÃ¥ nedkÃ¸ling
+    followers_count: FÃ¸lgere pÃ¥ tidspunktet for flytningen
+    incoming_migrations: Flytter fra en anden konto
+    past_migrations: Tidligere migrationer
     proceed_with_move: Flyt fÃ¸lgere
+    redirected_msg: Din konto omdirigerer nu til %{acct}.
+    redirecting_to: Din konto omdirigerer til %{acct}.
+    warning:
+      other_data: Ingen andre data vil blive flyttet automatisk
   moderation:
     title: Moderatering
   notification_mailer:
@@ -739,12 +904,19 @@ da:
       body: 'Din status blev fremhÃ¦vet af %{name}:'
       subject: "%{name} fremhÃ¦vede din status"
       title: Ny fremhÃ¦velse
+  notifications:
+    email_events: Begivenheder for e-mail-meddelelser
+    other_settings: Andre indstillinger for notifikationer
   number:
     human:
       decimal_units:
+        format: "%n%u"
         units:
           billion: mia.
           million: mio.
+  otp_authentication:
+    enable: Aktiver
+    wrong_code: Den indtastede kode var ugyldig! Er serverens tid og enhedstid korrekt?
   pagination:
     newer: Nyere
     next: NÃ¦ste
@@ -754,22 +926,36 @@ da:
   polls:
     errors:
       already_voted: Du har allerede stemt i denne afstemning
+      duplicate_options: indeholder dublerede elementer
       duration_too_long: er for langt ude i fremtiden
       duration_too_short: er for tidligy
       expired: Denne afstemning er allerede afsluttet
+      invalid_choice: Den valgte stemmeindstilling findes ikke
+      over_character_limit: kan ikke vÃ¦re lÃ¦ngere end %{max} tegn hver
+      too_few_options: skal have mere end et element
+      too_many_options: kan ikke indeholde flere end %{max} elementer
   preferences:
     other: Andet
     public_timelines: Offentlige tidslinjer
+  reactions:
+    errors:
+      limit_reached: GrÃ¦nsen for forskellige reaktioner er nÃ¥et
+      unrecognized_emoji: er ikke en genkendt emoji
   relationships:
     activity: Aktivitet for konto
+    follow_selected_followers: FÃ¸lg valgte fÃ¸lgere
     followers: FÃ¸lgere
     following: FÃ¸lger
+    invited: Inviteret
     last_active: Sidst aktiv
     most_recent: Seneste
     moved: Flyttet
     mutual: FÃ¦lles
     primary: PrimÃ¦r
     relationship: Relation
+    remove_selected_domains: Fjern alle fÃ¸lgere fra de valgte domÃ¦ner
+    remove_selected_followers: Fjern valgte fÃ¸lgere
+    remove_selected_follows: FÃ¸lg ikke valgte brugere
     status: Status for konto
   remote_follow:
     acct: Indtast dit brugernavn@domÃ¦ne du vil handle fra
@@ -777,6 +963,8 @@ da:
     no_account_html: Har du ikke en konto? Du kan <a href='%{sign_up_path}' target='_blank'>oprette dig her</a>
     proceed: FortsÃ¦t for at fÃ¸lge
     prompt: 'Du er ved at fÃ¸lge:'
+  scheduled_statuses:
+    too_soon: Den planlagte dato skal vÃ¦re i fremtiden
   sessions:
     activity: Sidste aktivitet
     browser: Browser
@@ -821,6 +1009,7 @@ da:
   settings:
     account: Konto
     account_settings: Kontoindstillinger
+    aliases: Konto-aliaser
     appearance: Udseende
     authorized_apps: Godkendte apps
     back: Tilbage til Mastodon
@@ -828,6 +1017,7 @@ da:
     development: Udvikling
     edit_profile: Rediger profil
     export: Data eksportering
+    featured_tags: FremhÃ¦vede hashtags
     import: Importer
     import_and_export: Importer og eksporter
     migrate: Konto migrering
@@ -836,8 +1026,12 @@ da:
     profile: Profil
     relationships: FÃ¸lger og fÃ¸lgere
     two_factor_authentication: To-faktor godkendelse
+    webauthn_authentication: SikkerhedsnÃ¸gler
   statuses:
     attached:
+      audio:
+        one: "%{count} lyd"
+        other: "%{count} lyd"
       description: 'VedhÃ¦ftede: %{attached}'
       image:
         one: "%{count} billede"
@@ -859,10 +1053,19 @@ da:
       private: Ikke offentlige trut kan ikke blive fastgjort
       reblog: FremhÃ¦vede trut kan ikke fastgÃ¸res
     poll:
+      total_people:
+        one: "%{count} person"
+        other: "%{count} personer"
+      total_votes:
+        one: "%{count} stemme"
+        other: "%{count} stemmer"
       vote: Stem
     show_more: Vis mere
+    show_newer: Vis nyere
+    show_older: Vis Ã¦ldre
     show_thread: Vis trÃ¥d
     sign_in_to_participate: Log ind for at deltage i samtalen
+    title: '%{name}: "%{quote}"'
     visibilities:
       private: Kun-fÃ¸lgere
       private_long: Vis kun til fÃ¸lgere
@@ -874,6 +1077,8 @@ da:
     pinned: Fastgjort trut
     reblogged: fremhÃ¦vede
     sensitive_content: FÃ¸lsomt indhold
+  tags:
+    does_not_match_previous_name: stemmer ikke overens med det forrige navn
   terms:
     body_html: "<p><h2> Privatlivspolitik </h2> \n<h3 id=\"collect\">Hvilke information indsamler vi?</h3> \n\n<ul>\nÂ Â <li><em>GrundlÃ¦ggende kontoinformation </em>: Hvis du registrerer dig pÃ¥ denne server, bliver du mÃ¥ske bedt om at indtaste et brugernavn, en e-mail-adresse og et kodeord. Du kan ogsÃ¥ indtaste yderligere profiloplysninger, sÃ¥som et visningsnavn og biografi, og uploade et profilbillede og headerbillede. Brugernavnet, visningsnavnet, biografien, profilbilledet og hovedbilledet vises altid offentligt. </li> \nÂ Â <li> <em>Stillinger, fÃ¸lgende og andre offentlige oplysninger </em>: Listen over personer du fÃ¸lger er offentliggjort, det samme gÃ¦lder for dine tilhÃ¦ngere. NÃ¥r du sender en besked, gemmes datoen og klokkeslÃ¦ttet sÃ¥vel som det program, du sendte beskeden fra. Meddelelser kan indeholde medievedhÃ¦ftninger, som f.eks. Billeder og videoer. Offentlige og unoterede indlÃ¦g er offentligt tilgÃ¦ngelige. NÃ¥r du har et indlÃ¦g pÃ¥ din profil, er det ogsÃ¥ offentligt tilgÃ¦ngelig information. Dine indlÃ¦g leveres til dine tilhÃ¦ngere, i nogle tilfÃ¦lde betyder det, at de leveres til forskellige servere, og der gemmes kopier der. NÃ¥r du sletter indlÃ¦g, leveres det ogsÃ¥ til dine tilhÃ¦ngere. Handlingen med reblogging eller favorisering af et andet indlÃ¦g er altid offentligt. </li>\nÂ Â <li><em> Direkte og efterfÃ¸lger-kun indlÃ¦g </ em>: Alle indlÃ¦g gemmes og behandles pÃ¥ serveren. FÃ¸lgere-kun indlÃ¦g leveres til dine tilhÃ¦ngere og brugere, der er nÃ¦vnt i dem, og direkte indlÃ¦g leveres kun til brugere nÃ¦vnt i dem. I nogle tilfÃ¦lde betyder det, at de leveres til forskellige servere, og der gemmes kopier der. Vi gÃ¸r en god tro for at begrÃ¦nse adgangen til disse stillinger kun til autoriserede personer, men andre servere kan undlade at gÃ¸re det. Derfor er det vigtigt at gennemgÃ¥ de servere, dine tilhÃ¦ngere tilhÃ¸rer. Du kan skifte en mulighed for at godkende og afvise nye fÃ¸lgere manuelt i indstillingerne. <em> VÃ¦r opmÃ¦rksom pÃ¥, at operatÃ¸rerne af serveren og enhver modtagende server muligvis kan se sÃ¥danne meddelelser </em>, og at modtagere muligvis skÃ¦rmbilleder, kopierer eller pÃ¥ anden vis deler dem igen. <em> Del ikke nogen farlig information over Mastodon. </em> </li>\nÂ Â <li> <em> IP'er og andre metadata </em>: NÃ¥r du logger ind, registrerer vi den IP-adresse, du logger ind fra, samt navnet pÃ¥ din browser-applikation. Alle indloggede sessioner er tilgÃ¦ngelige til din anmeldelse og tilbagekaldelse i indstillingerne. Den seneste anvendte IP-adresse gemmes i op til 12 mÃ¥neder. Vi kan ogsÃ¥ beholde serverlogfiler, som indeholder IP-adressen til hver anmodning til vores server. </li>\n</ul>\n\n<hr class=\"spacer\" />\n\n<h3 id=\"use\">Hvad bruger vi dine oplysninger til? </h3>\n\n<p> Enhver af de oplysninger, vi indsamler fra dig, kan bruges pÃ¥ fÃ¸lgende mÃ¥der: </p>\n\n<ul>\nÂ Â <li> At levere kernen funktionalitet Mastodon. Du kan kun interagere med andres indhold og indsende dit eget indhold, nÃ¥r du er logget ind. Du kan f.eks. FÃ¸lge andre personer for at se deres kombinerede indlÃ¦g pÃ¥ din egen personlige tidslinje. </li>\nÂ Â <li> For at hjÃ¦lpe moderering af samfundet, f.eks. sammenligning af din IP-adresse med andre kendte, for at bestemme forbud mod unddragelse eller andre overtrÃ¦delser. </li>\nÂ Â <li> Den e-mail-adresse, du angiver, kan bruges til at sende dig oplysninger, meddelelser om andre personer, der interagerer med dit indhold eller sender dig beskeder, og for at svare pÃ¥ henvendelser og / eller andre forespÃ¸rgsler eller spÃ¸rgsmÃ¥l. </li>\n</ul>\n\n<hr class=\"spacer\" />\n\n<h3 id=\"protect\">Hvordan beskytter vi dine oplysninger? </h3>\n\n<p> Vi implementerer en rÃ¦kke sikkerhedsforanstaltninger for at opretholde sikkerheden for dine personlige oplysninger, nÃ¥r du indtaster, indsender eller har adgang til dine personlige oplysninger. Bl.a. er din browsersession samt trafikken mellem dine applikationer og API'en sikret med SSL, og din adgangskode er hashed ved hjÃ¦lp af en stÃ¦rk envejsalgoritme. Du kan muligvis aktivere tofaktors godkendelse for yderligere at sikre adgang til din konto. </p>\n\n<hr class=\"spacer\" />\n\n<h3 id=\"data-retention\"> Hvad er vores data retention politik? </h3>\n\n<p> Vi vil gÃ¸re en god tro indsats for at: </p>\n\n<ul>\nÂ Â <li> Behold serverlogfiler, der indeholder IP-adressen pÃ¥ alle anmodninger til denne server, for sÃ¥ vidt som sÃ¥danne logfiler holdes, ikke mere end 90 dage. </li>\nÂ Â <li> Behold de IP-adresser, der er forbundet med registrerede brugere, ikke mere end 12 mÃ¥neder. </li>\n</ul>\n\n<p> Du kan anmode om og downloade et arkiv af dit indhold, herunder dine indlÃ¦g, medievedhÃ¦ftninger, profilbillede og headerbillede. </p>\n\n<p> Du kan til enhver tid slette din konto. </p>\n\n<hr class=\"spacer\" />\n\n<h3 id=\"cookies\"> Bruger vi cookies? </h3>\n\n<p> Ja. Cookies er smÃ¥ filer, som et websted eller dets tjenesteudbyder overfÃ¸rer til din computers harddisk via din webbrowser (hvis du tillader det). Disse cookies gÃ¸r det muligt for webstedet at genkende din browser og, hvis du har en registreret konto, associerer den med din registrerede konto. </p>\n\n<p> Vi bruger cookies til at forstÃ¥ og gemme dine prÃ¦ferencer til fremtidige besÃ¸g. </p>\n\n<hr class=\"spacer\" />\n\n<h3 id=\"disclose\"> Viser vi nogen information til eksterne parter? </h3>\n\n<p> Vi sÃ¦lger ikke, handler eller pÃ¥ anden mÃ¥de overfÃ¸rer dine personlige identificerbare oplysninger til eksterne parter. Dette omfatter ikke tillid til tredjeparter, der hjÃ¦lper os med at drive vores hjemmeside, udfÃ¸re vores forretning eller servicere dig, sÃ¥ lÃ¦nge parterne er enige om at holde disse oplysninger fortrolige. Vi kan ogsÃ¥ frigive dine oplysninger, nÃ¥r vi mener, at udgivelsen er hensigtsmÃ¦ssig for at overholde loven, hÃ¥ndhÃ¦ve vores webstedspolitikker eller beskytte vores eller andre rettigheder, ejendom eller sikkerhed. </p>\n\n<p> Dit offentlige indhold kan downloades af andre servere i netvÃ¦rket. Dine offentlige og efterfÃ¸lger-kun indlÃ¦g leveres til de servere, hvor dine tilhÃ¦ngere er bosat, og direkte meddelelser leveres til modtagerens servere, for sÃ¥ vidt som disse tilhÃ¦ngere eller modtagere opholder sig pÃ¥ en anden server end dette. </p>\n\n<p> NÃ¥r du autoriserer et program til at bruge din konto, afhÃ¦nger det af omfanget af tilladelser, du godkender, det kan fÃ¥ adgang til dine offentlige profiloplysninger, din fÃ¸lgende liste, dine tilhÃ¦ngere, dine lister, alle dine indlÃ¦g og dine favoritter. Applikationer kan aldrig fÃ¥ adgang til din e-mail-adresse eller adgangskode. </p>\n\n<hr class=\"spacer\" />\n\n<h3 id=\"children\"> Bebyggelse af bÃ¸rn </h3>\n\n<p> Hvis denne server er i EU eller EÃ˜S: Vores websted, produkter og tjenester er alle rettet mod personer, der er mindst 16 Ã¥r gamle. Hvis du er under 16 Ã¥r, skal du ikke bruge dette websted efter kravene i GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\"> Generel databeskyttelsesforordning </a>). . </p>\n\n<p> Hvis denne server er i USA: Vores websted, produkter og tjenester er alle rettet mod personer, der er mindst 13 Ã¥r. Hvis du er under 13 Ã¥r, skal du ikke bruge kravene i COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\"> BÃ¸rns online beskyttelse af personlige oplysninger </a>) dette websted. </p>\n\n<p> Lovkrav kan vÃ¦re anderledes, hvis denne server er i en anden jurisdiktion. </p>\n\n<hr class = \"spacer\" />\n\n<h3 id=\"changes\"> Ã†ndringer i vores privatlivspolitik </h3>\n\n<p> Hvis vi beslutter os for at Ã¦ndre vores privatlivspolitik, vil vi sende disse Ã¦ndringer pÃ¥ denne side. </p>\n\n<p> Dette dokument er CC-BY-SA. Det blev senest opdateret 7. marts 2018. </p>\n\n<p> Oprindelig tilpasset fra <a href=\"https://github.com/discourse/discourse\"> Discourse privacy policy </a>.</p>\n"
     title: VilkÃ¥r og privatlivpolitik for %{instance}
@@ -881,28 +1086,40 @@ da:
     contrast: Mastodon (HÃ¸j kontrast)
     default: Mastodont (MÃ¸rk)
     mastodon-light: Mastodon (Lys)
+  time:
+    formats:
+      default: "%b %d, %Y, %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
-    code_hint: Indtast koden der er genereret af din app for at bekrÃ¦fte
-    description_html: Hvis du aktiverer <strong>to-faktor godkendelse</strong>, vil du vÃ¦re nÃ¸dt til at vÃ¦re i besiddelse af din telefon, der genererer tokens som du skal indtaste, nÃ¥r du logger ind.
+    add: TilfÃ¸j
     disable: Deaktiver
-    enable: Aktiver
+    edit: Rediger
     enabled: To-faktor godkendelse er aktiveret
     enabled_success: To-faktor godkendelse succesfuldt aktiveret
     generate_recovery_codes: Generer gendannelseskoder
-    instructions_html: "<strong>Scan denne QR kode i Google Autehnticator eller lignende TOTP app pÃ¥ din telefon</strong>. Fra nu af vil den app generere koder som du vil vÃ¦re nÃ¸dt til at indtaste nÃ¥r du logger ind."
     lost_recovery_codes: Gendannelseskoder vil lade dig fÃ¥ adgang til din konto hvis du mister din telefon. Hvis du har mistet dine gendannelseskoder, kan du regenerere dem her. Dine gamle gendannelseskoder vil blive ugyldige.
-    manual_instructions: 'Hvis du ikke kan scanne QR koden er er nÃ¸dt til at skrive koden ind manuelt, kan er din almindelig tekst secret:'
+    methods: To-faktor metoder
     recovery_codes: Reserve koder
     recovery_codes_regenerated: Reserve koder blev succesfuldt regenereret
     recovery_instructions_html: Hvis du nogensinde mister adgang til din telefon, kan du bruge en af genoprettelses koderne forneden for at fÃ¥ adgang til din konto. <strong>Gem gendannelses koderne et sikkert sted</strong>. Foreksempel kan du printe dem ud og gemme dem sammen med andre vigtige dokumenter.
-    setup: SÃ¦t op
-    wrong_code: Den indtastede kode var ugyldig! Er serverens tid og enhedens tid korrekte?
+    webauthn: SikkerhedsnÃ¸gler
   user_mailer:
     backup_ready:
       explanation: Din anmodning for fuld backup af din Mastodon konto. Den er nu klar til at blive hentet!
       subject: Dit arkiv er klar til at blive hentet ned
       title: Udpluk af arkiv
+    sign_in_token:
+      details: 'Her er detaljer om forsÃ¸get:'
+      subject: BekrÃ¦ft venligst forsÃ¸g pÃ¥ at logge ind
+      title: Login forsÃ¸g
     warning:
+      review_server_policies: GennemgÃ¥ serverpolitikker
+      statuses: 'IsÃ¦r for:'
+      subject:
+        disable: Din konto %{acct} er blevet frosset
+        none: Advarsel for %{acct}
+        silence: Din konto %{acct} er blevet begrÃ¦nset
+        suspend: Din konto %{acct} er blevet suspenderet
       title:
         disable: Konto frosset
         none: Advarsel
@@ -926,11 +1143,27 @@ da:
       tips: RÃ¥d
       title: Velkommen ombord, %{name}!
   users:
+    blocked_email_provider: Denne e-mail-udbyder er ikke tilladt
     follow_limit_reached: Du kan ikke fÃ¸lge mere end %{limit} personer
+    generic_access_help_html: Har du problemer med at fÃ¥ adgang til din konto? Du kan komme i kontakt med %{email} for hjÃ¦lp
     invalid_email: E-mail adressen er ugyldig
+    invalid_email_mx: E-mail-adressen virker ikke til at eksistere
     invalid_otp_token: Ugyldig to-faktor kode
+    invalid_sign_in_token: Ugyldig sikkerhedskode
     otp_lost_help_html: Hvis du har mistet adgang til begge, kan du fÃ¥ kontakt via %{email}
     seamless_external_login: Du er logget ind via en ekstern service, sÃ¥ er kodeord og e-mail indstillinger ikke tilgÃ¦ngelige.
     signed_in_as: 'Logget ind som:'
   verification:
     verification: Verificering
+  webauthn_credentials:
+    add: TilfÃ¸j ny sikkerhedsnÃ¸gle
+    create:
+      success: Din sikkerhedsnÃ¸gle blev tilfÃ¸jet.
+    delete: Slet
+    destroy:
+      success: Din sikkerhedsnÃ¸gle blev slettet.
+    invalid_credential: Ugyldig sikkerhedsnÃ¸gle
+    nickname_hint: Indtast kaldenavnet pÃ¥ din nye sikkerhedsnÃ¸gle
+    not_enabled: Du har endnu ikke aktiveret WebAuthn
+    not_supported: Denne browser understÃ¸tter ikke sikkerhedsnÃ¸gler
+    registered_on: Registreret den %{date}
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 021c4b2b26d12fab106f8846a85a2ca4774c1bf1..34d03f808dbe8782b4922e3ce4c78823282d14f9 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -60,6 +60,7 @@ de:
       one: Folgender
       other: Folgende
     following: Folgt
+    instance_actor_flash: Dieses Konto ist ein virtueller Akteur, der den Server selbst reprÃ¤sentiert und nicht ein einzelner Benutzer. Es wird fÃ¼r FÃ¶derationszwecke verwendet und sollte nicht gesperrt werden.
     joined: Beigetreten am %{date}
     last_active: zuletzt aktiv
     link_verified_on: Besitz des Links wurde Ã¼berprÃ¼ft am %{date}
@@ -98,6 +99,7 @@ de:
       add_email_domain_block: E-Mail-Domain blacklisten
       approve: Akzeptieren
       approve_all: Alle akzeptieren
+      approved_msg: "%{username}'s Anmeldeantrag erfolgreich genehmigt"
       are_you_sure: Bist du sicher?
       avatar: Profilbild
       by_domain: Domain
@@ -111,8 +113,10 @@ de:
       confirm: BestÃ¤tigen
       confirmed: BestÃ¤tigt
       confirming: BestÃ¤tigung
+      delete: Daten lÃ¶schen
       deleted: GelÃ¶scht
       demote: Degradieren
+      destroyed_msg: "%{username}'s Daten wurden zum LÃ¶schen in die Warteschlange eingereiht"
       disable: Ausschalten
       disable_two_factor_authentication: 2FA abschalten
       disabled: Ausgeschaltet
@@ -123,10 +127,12 @@ de:
       email_status: E-Mail-Status
       enable: Freischalten
       enabled: Freigegeben
+      enabled_msg: "%{username}'s Konto erfolgreich freigegeben"
       followers: Folgende
       follows: Folgt
       header: Titelbild
       inbox_url: Posteingangs-URL
+      invite_request_text: BegrÃ¼ndung fÃ¼r das beitreten
       invited_by: Eingeladen von
       ip: IP-Adresse
       joined: Beigetreten
@@ -138,6 +144,8 @@ de:
       login_status: Loginstatus
       media_attachments: Dateien
       memorialize: In Gedenkmal verwandeln
+      memorialized: Memorialisiert
+      memorialized_msg: "%{username} wurde erfolgreich in ein memorialisiertes Konto umgewandelt"
       moderation:
         active: Aktiv
         all: Alle
@@ -158,10 +166,14 @@ de:
       public: Ã–ffentlich
       push_subscription_expires: PuSH-Abonnement lÃ¤uft aus
       redownload: Profil neu laden
+      redownloaded_msg: Profil von %{username} erfolgreich von Ursprung aktualisiert
       reject: Ablehnen
       reject_all: Alle ablehnen
+      rejected_msg: "%{username}'s Anmeldeantrag erfolgreich abgelehnt"
       remove_avatar: Profilbild entfernen
       remove_header: Titelbild entfernen
+      removed_avatar_msg: Profilbild von %{username} erfolgreich entfernt
+      removed_header_msg: "%{username}'s Titelbild wurde erfolgreich entfernt"
       resend_confirmation:
         already_confirmed: Diese_r Benutzer_in wurde bereits bestÃ¤tigt
         send: BestÃ¤tigungs-E-Mail erneut senden
@@ -178,6 +190,8 @@ de:
       search: Suche
       search_same_email_domain: Andere Benutzer mit der gleichen E-Mail-Domain
       search_same_ip: Andere Benutzer mit derselben IP
+      sensitive: NSFW
+      sensitized: Als NSFW markieren
       shared_inbox_url: Geteilte Posteingang-URL
       show:
         created_reports: Erstellte Meldungen
@@ -187,13 +201,19 @@ de:
       statuses: BeitrÃ¤ge
       subscribe: Abonnieren
       suspended: Verbannt
+      suspension_irreversible: Die Daten dieses Kontos wurden unwiderruflich gelÃ¶scht. Du kannst das Konto aufheben, um es brauchbar zu machen, aber es wird keine Daten wiederherstellen, die es davor schon hatte.
+      suspension_reversible_hint_html: Das Konto wurde gesperrt und die Daten werden am %{date} vollstÃ¤ndig gelÃ¶scht. Bis dahin kann das Konto ohne irgendwelche negativen Auswirkungen wiederhergestellt werden. Wenn du alle Daten des Kontos sofort entfernen mÃ¶chtest, kannst du dies nachfolgend tun.
       time_in_queue: "%{time} in der Warteschlange"
       title: Konten
       unconfirmed_email: UnbestÃ¤tigte E-Mail-Adresse
+      undo_sensitized: Nicht mehr als NSFW markieren
       undo_silenced: Stummschaltung aufheben
       undo_suspension: Verbannung aufheben
+      unsilenced_msg: "%{username}'s Konto erfolgreich freigegeben"
       unsubscribe: Abbestellen
+      unsuspended_msg: "%{username}'s Konto erfolgreich freigegeben"
       username: Profilname
+      view_domain: Ãœbersicht fÃ¼r Domain anzeigen
       warn: Warnen
       web: Web
       whitelisted: Auf der Whitelist
@@ -208,31 +228,36 @@ de:
         create_domain_allow: Domain erlauben
         create_domain_block: Domain blockieren
         create_email_domain_block: E-Mail-Domain-Block erstellen
+        create_ip_block: IP-Regel erstellen
         demote_user: Benutzer degradieren
         destroy_announcement: AnkÃ¼ndigung lÃ¶schen
         destroy_custom_emoji: Eigene Emoji lÃ¶schen
         destroy_domain_allow: Erlaube das LÃ¶schen von Domains
         destroy_domain_block: Domain-Blockade lÃ¶schen
         destroy_email_domain_block: E-Mail-Domain-Blockade lÃ¶schen
+        destroy_ip_block: IP-Regel lÃ¶schen
         destroy_status: Beitrag lÃ¶schen
         disable_2fa_user: 2FA deaktivieren
         disable_custom_emoji: Benutzerdefiniertes Emoji deaktivieren
         disable_user: Benutzer deaktivieren
         enable_custom_emoji: Benutzerdefiniertes Emoji aktivieren
         enable_user: Benutzer aktivieren
-        memorialize_account: Konto in ein Konto von einer verstorbenen Person umwandeln
+        memorialize_account: Account deaktivieren
         promote_user: Benutzer befÃ¶rdern
         remove_avatar_user: Profilbild entfernen
         reopen_report: Meldung wieder erÃ¶ffnen
         reset_password_user: Passwort zurÃ¼cksetzen
         resolve_report: Bericht lÃ¶sen
+        sensitive_account: Markiere die Medien in deinem Konto als NSFW
         silence_account: Konto stummschalten
         suspend_account: Konto sperren
-        unassigned_report: Berichtszuweisung entfernen
+        unassigned_report: Meldung widerrufen
+        unsensitive_account: Markiere die Medien in deinem Konto nicht mehr als NSFW
         unsilence_account: Konto nicht mehr stummschalten
         unsuspend_account: Konto nicht mehr sperren
         update_announcement: AnkÃ¼ndigung aktualisieren
         update_custom_emoji: Benutzerdefiniertes Emoji aktualisieren
+        update_domain_block: Domain Block aktualisieren
         update_status: Beitrag aktualisieren
       actions:
         assigned_to_self_report: "%{name} hat sich die Meldung %{target} selbst zugewiesen"
@@ -244,12 +269,14 @@ de:
         create_domain_allow: "%{name} hat die Domain %{target} gewhitelistet"
         create_domain_block: "%{name} hat die Domain %{target} blockiert"
         create_email_domain_block: "%{name} hat die E-Mail-Domain %{target} geblacklistet"
+        create_ip_block: "%{name} hat eine Regel fÃ¼r IP %{target} erstellt"
         demote_user: "%{name} stufte Benutzer_in %{target} herunter"
         destroy_announcement: "%{name} hat die neue AnkÃ¼ndigung %{target} gelÃ¶scht"
         destroy_custom_emoji: "%{name} zerstÃ¶rte Emoji %{target}"
         destroy_domain_allow: "%{name} hat die Domain %{target} von der Whitelist entfernt"
         destroy_domain_block: "%{name} hat die Domain %{target} entblockt"
         destroy_email_domain_block: "%{name} hat die E-Mail-Domain %{target} gewhitelistet"
+        destroy_ip_block: "%{name} hat eine Regel fÃ¼r IP %{target} gelÃ¶scht"
         destroy_status: "%{name} hat einen Beitrag von %{target} entfernt"
         disable_2fa_user: "%{name} hat Zwei-Faktor-Anforderung fÃ¼r Benutzer_in %{target} deaktiviert"
         disable_custom_emoji: "%{name} hat das %{target} Emoji deaktiviert"
@@ -262,13 +289,16 @@ de:
         reopen_report: "%{name} hat die Meldung %{target} wieder geÃ¶ffnet"
         reset_password_user: "%{name} hat das Passwort von %{target} zurÃ¼ckgesetzt"
         resolve_report: "%{name} hat die Meldung %{target} bearbeitet"
+        sensitive_account: "%{name} markierte %{target}'s Medien als NSFW"
         silence_account: "%{name} hat das Konto von %{target} stummgeschaltet"
         suspend_account: "%{name} hat das Konto von %{target} verbannt"
         unassigned_report: "%{name} hat die Zuweisung der Meldung %{target} entfernt"
+        unsensitive_account: "%{name} markierte %{target}'s Medien nicht als NSFW"
         unsilence_account: "%{name} hat die Stummschaltung von %{target} aufgehoben"
         unsuspend_account: "%{name} hat die Verbannung von %{target} aufgehoben"
         update_announcement: "%{name} aktualisierte AnkÃ¼ndigung %{target}"
         update_custom_emoji: "%{name} hat das %{target} Emoji geÃ¤ndert"
+        update_domain_block: "%{name} hat den Domain-Block fÃ¼r %{target} aktualisiert"
         update_status: "%{name} hat einen Beitrag von %{target} aktualisiert"
       deleted_status: "(gelÃ¶schter Beitrag)"
       empty: Keine Protokolle gefunden.
@@ -372,6 +402,8 @@ de:
           silence: Stummschaltung
           suspend: Sperre
         title: Neue Domain-Blockade
+      obfuscate: Domainname verschleiern
+      obfuscate_hint: Den Domainnamen in der Liste teilweise verschleiern, wenn die Liste der DomÃ¤nenbeschrÃ¤nkungen aktiviert ist
       private_comment: Privater Kommentar
       private_comment_hint: Kommentar zu dieser Domain-BeschrÃ¤nkung fÃ¼r die interne Nutzung durch die Moderatoren.
       public_comment: Ã–ffentlicher Kommentar
@@ -411,6 +443,7 @@ de:
     instances:
       by_domain: Domain
       delivery_available: Zustellung funktioniert
+      empty: Keine Domains gefunden.
       known_accounts:
         one: "%{count} bekanntes Konto"
         other: "%{count} bekannte Konten"
@@ -434,6 +467,21 @@ de:
         expired: Ausgelaufen
         title: Filter
       title: Einladungen
+    ip_blocks:
+      add_new: Regel erstellen
+      created_msg: Neue IP-Regel erfolgreich hinzugefÃ¼gt
+      delete: LÃ¶schen
+      expires_in:
+        '1209600': 2 Wochen
+        '15778476': 6 Monate
+        '2629746': 1 Monat
+        '31556952': 1 Jahr
+        '86400': 1 Tag
+        '94670856': 3 Jahre
+      new:
+        title: Neue IP-Regel erstellen
+      no_ip_block_selected: Keine IP-Regeln wurden geÃ¤ndert, weil keine ausgewÃ¤hlt wurden
+      title: IP-Regeln
     pending_accounts:
       title: Ausstehende Konten (%{count})
     relationships:
@@ -473,6 +521,8 @@ de:
       comment:
         none: Kein
       created_at: Gemeldet
+      forwarded: Weitergeleitet
+      forwarded_to: Weitergeleitet an %{domain}
       mark_as_resolved: Als gelÃ¶st markieren
       mark_as_unresolved: Als ungelÃ¶st markieren
       notes:
@@ -516,6 +566,7 @@ de:
       domain_blocks_rationale:
         title: Rationale anzeigen
       enable_bootstrap_timeline_accounts:
+        desc_html: Neue Benutzer automatisch den konfigurierten Konten folgen lassen, sodass ihr Home-Feed nicht leer startet
         title: Aktiviere die Option "Konten, denen Neu-Angemeldete automatisch folgen"
       hero:
         desc_html: Wird auf der Startseite angezeigt. Mindestens 600x100px sind empfohlen. Wenn es nicht gesetzt wurde, wird das Server-Thumbnail dafÃ¼r verwendet
@@ -527,8 +578,8 @@ de:
         desc_html: Domain-Namen, die der Server im Fediversum gefunden hat
         title: VerÃ¶ffentliche entdeckte Server durch die API
       preview_sensitive_media:
-        desc_html: Linkvorschauen auf anderen Webseiten werden ein Vorschaubild anzeigen, obwohl die Medien als heikel gekennzeichnet sind
-        title: Heikle Medien im OpenGraph-Vorschau anzeigen
+        desc_html: Linkvorschauen auf anderen Webseiten werden ein Vorschaubild anzeigen, obwohl die Medien als NSFW markiert sind
+        title: NSFW-Medien in OpenGraph-Vorschau anzeigen
       profile_directory:
         desc_html: Erlaube Benutzer auffindbar zu sein
         title: Aktiviere Profilverzeichnis
@@ -542,6 +593,9 @@ de:
         min_invite_role:
           disabled: Niemand
           title: Einladungen erlauben von
+        require_invite_text:
+          desc_html: Wenn eine Registrierung manuell genehmigt werden muss, mache den "Warum mÃ¶chtest du beitreten?" Text eher obligatorisch als optional
+          title: Neue Benutzer mÃ¼ssen einen Einladungstext ausfÃ¼llen
       registrations_mode:
         modes:
           approved: Zustimmung benÃ¶tigt zur Registrierung
@@ -590,8 +644,8 @@ de:
       back_to_account: ZurÃ¼ck zum Konto
       batch:
         delete: LÃ¶schen
-        nsfw_off: Als nicht heikel markieren
-        nsfw_on: Als heikel markieren
+        nsfw_off: Als nicht NSFW markieren
+        nsfw_on: Als NSFW markieren
       deleted: GelÃ¶scht
       failed_to_execute: AusfÃ¼hren fehlgeschlagen
       media:
@@ -652,7 +706,7 @@ de:
       body: Mastodon wurde von Freiwilligen Ã¼bersetzt.
       guide_link: https://de.crowdin.com/project/mastodon
       guide_link_text: Jeder kann etwas dazu beitragen.
-    sensitive_content: Heikle Inhalte
+    sensitive_content: NSFW
     toot_layout: Beitragslayout
   application_mailer:
     notification_preferences: Ã„ndere E-Mail-Einstellungen
@@ -681,8 +735,11 @@ de:
       prefix_sign_up: Melde dich heute bei Mastodon an!
       suffix: Mit einem Konto kannst du Leuten folgen, Updates verÃ¶ffentlichen und Nachrichten mit Benutzern von jedem Mastodon-Server austauschen und mehr!
     didnt_get_confirmation: Keine BestÃ¤tigungs-Mail 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.
+    link_to_otp: Gib einen Zwei-Faktor-Code von deinem Handy oder einen Wiederherstellungscode ein
+    link_to_webauth: Verwende deinen SicherheitsschlÃ¼ssel
     login: Anmelden
     logout: Abmelden
     migrate_account: Ziehe zu einem anderen Konto um
@@ -707,7 +764,9 @@ de:
       functional: Dein Konto ist voll funktionsfÃ¤hig.
       pending: Deine Bewerbung wird von unseren Mitarbeitern noch Ã¼berprÃ¼ft. Dies kann einige Zeit dauern. Du erhÃ¤ltst eine E-Mail, wenn deine Bewerbung genehmigt wurde.
       redirecting_to: Dein Konto ist inaktiv, da es derzeit zu %{acct} umgeleitet wird.
+    too_fast: Formular zu schnell gesendet, versuchen Sie es erneut.
     trouble_logging_in: Schwierigkeiten beim Anmelden?
+    use_security_key: SicherheitsschlÃ¼ssel verwenden
   authorize_follow:
     already_following: Du folgst diesem Konto bereits
     already_requested: Du hast bereits eine Anfrage zum Folgen diesen Accounts versendet
@@ -732,6 +791,7 @@ de:
   date:
     formats:
       default: "%d. %b %Y"
+      with_month_name: "%B %d, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}h"
@@ -796,6 +856,7 @@ de:
       request: Dein Archiv anfragen
       size: GrÃ¶ÃŸe
     blocks: Du hast blockiert
+    bookmarks: Lesezeichen
     csv: CSV
     domain_blocks: Domainblockaden
     lists: Listen
@@ -863,6 +924,8 @@ de:
     status: Verifizierungsstatus
     view_proof: Zeige Nachweis
   imports:
+    errors:
+      over_rows_processing_limit: enthÃ¤lt mehr als %{count} Zeilen
     modes:
       merge: ZusammenfÃ¼hren
       merge_long: Behalte existierende DatensÃ¤tze und fÃ¼ge neue hinzu
@@ -872,6 +935,7 @@ de:
     success: Deine Daten wurden erfolgreich hochgeladen und werden in KÃ¼rze verarbeitet
     types:
       blocking: Blockierliste
+      bookmarks: Lesezeichen
       domain_blocking: Domain-Blockliste
       following: Folgeliste
       muting: Stummschaltungsliste
@@ -992,6 +1056,14 @@ de:
           quadrillion: Q
           thousand: K
           trillion: T
+  otp_authentication:
+    code_hint: Gib den von deiner Authentifizierungs-App generierten Code ein, um deine Anmeldung zu bestÃ¤tigen
+    description_html: Wenn du <strong>Zwei-Faktor-Authentifizierung</strong> mit einer Authentifizierungs-App aktivierst, musst du, um dich anzumelden, im Besitz deines Handys sein, dass Tokens fÃ¼r dein Konto generiert.
+    enable: Aktivieren
+    instructions_html: "<strong>Scanne diesen QR-Code in Google Authenticator oder einer Ã¤hnlichen TOTP-App auf deinem Handy</strong>. Von nun an generiert diese App Tokens, die du beim Anmelden eingeben musst."
+    manual_instructions: 'Wenn du den QR-Code nicht scannen kannst und ihn manuell eingeben musst, ist hier das Klartext-Geheimnis:'
+    setup: Einrichten
+    wrong_code: Der eingegebene Code war ungÃ¼ltig! Sind die Serverzeit und die GerÃ¤tezeit korrekt?
   pagination:
     newer: Neuer
     next: VorwÃ¤rts
@@ -1020,6 +1092,7 @@ de:
   relationships:
     activity: KontoaktivitÃ¤t
     dormant: Inaktiv
+    follow_selected_followers: AusgewÃ¤hlte Follower folgen
     followers: Folgende
     following: Folgt
     invited: Eingeladen
@@ -1116,6 +1189,7 @@ de:
     profile: Profil
     relationships: Folgende und Gefolgte
     two_factor_authentication: Zwei-Faktor-Auth
+    webauthn_authentication: SicherheitsschlÃ¼ssel
   spam_check:
     spam_detected: Dies ist ein automatisierter Bericht. Es wurde Spam erkannt.
   statuses:
@@ -1154,6 +1228,8 @@ de:
         other: "%{count} Stimmen"
       vote: Abstimmen
     show_more: Mehr anzeigen
+    show_newer: Neuere anzeigen
+    show_older: Ã„ltere anzeigen
     show_thread: Zeige Konversation
     sign_in_to_participate: Melde dich an, um an der Konversation teilzuhaben
     title: '%{name}: "%{quote}"'
@@ -1167,7 +1243,7 @@ de:
   stream_entries:
     pinned: Angehefteter Beitrag
     reblogged: teilte
-    sensitive_content: Heikle Inhalte
+    sensitive_content: NSFW
   tags:
     does_not_match_previous_name: entspricht nicht dem vorherigen Namen
   terms:
@@ -1264,21 +1340,20 @@ de:
       default: "%d.%m.%Y %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Gib zur BestÃ¤tigung den Code ein, den deine Authenticator-App generiert hat
-    description_html: Wenn du <strong>Zwei-Faktor-Authentifizierung (2FA)</strong> aktivierst, wirst du dein Telefon zum Anmelden benÃ¶tigen. Darauf werden Sicherheitscodes erzeugt, die du bei der Anmeldung eingeben musst.
+    add: HinzufÃ¼gen
     disable: Deaktivieren
-    enable: Aktivieren
+    disabled_success: Zwei-Faktor-Authentifizierung erfolgreich deaktiviert
+    edit: Bearbeiten
     enabled: Zwei-Faktor-Authentisierung ist aktiviert
     enabled_success: Zwei-Faktor-Authentisierung erfolgreich aktiviert
     generate_recovery_codes: Wiederherstellungscodes generieren
-    instructions_html: "<strong>Lies diesen QR-Code mit Google Authenticator oder einer Ã¤hnlichen TOTP-App auf deinem Telefon ein.</strong> Von nun an wird diese App Tokens generieren, die du beim Anmelden eingeben musst."
     lost_recovery_codes: Wiederherstellungscodes erlauben dir, wieder den Zugang zu deinem Konto zu erlangen, falls du dein Telefon verlieren solltest. Wenn du deine Wiederherstellungscodes verloren hast, kannst du sie hier neu generieren. Deine alten Wiederherstellungscodes werden damit ungÃ¼ltig gemacht.
-    manual_instructions: 'Wenn du den QR-Code nicht einlesen kannst und ihn manuell eingeben musst, ist hier das Klartext-Geheimnis:'
+    methods: Zwei-Faktor-Methoden
+    otp: Authentifizierungs-App
     recovery_codes: Wiederherstellungs-Codes sichern
     recovery_codes_regenerated: Wiederherstellungscodes erfolgreich neu generiert
     recovery_instructions_html: Wenn du den Zugang zu deinem Telefon verlieren solltest, kannst du einen untenstehenden Wiederherstellungscode benutzen, um wieder auf dein Konto zugreifen zu kÃ¶nnen. <strong>Bewahre die Wiederherstellungscodes gut auf.</strong> Du kÃ¶nntest sie beispielsweise ausdrucken und bei deinen restlichen wichtigen Dokumenten aufbewahren.
-    setup: Einrichten
-    wrong_code: Der eingegebene Code war ungÃ¼ltig! Stimmen Serverzeit und GerÃ¤tezeit?
+    webauthn: SicherheitsschlÃ¼ssel
   user_mailer:
     backup_ready:
       explanation: Du hast ein vollstÃ¤ndiges Backup von deinem Mastodon-Konto angefragt. Es kann jetzt heruntergeladen werden!
@@ -1293,6 +1368,7 @@ de:
     warning:
       explanation:
         disable: Solange dein Konto eingefroren ist, sind deine Benutzerdaten intakt; aber du kannst nichts tun, bis dein Konto entsperrt wurde.
+        sensitive: Deine hochgeladenen Mediendateien und verknÃ¼pften Medien werden als NSFW markiert.
         silence: Solange dein Konto limitiert ist, kÃ¶nnen nur die Leute, die dir bereits folgen, deine BeitrÃ¤ge auf dem Server sehen und es kÃ¶nnte sein, dass du von verschiedenen Ã¶ffentlichen Listungen ausgeschlossen wirst. Andererseits kÃ¶nnen andere dir manuell folgen.
         suspend: Dein Konto wurde gesperrt und alle deine BeitrÃ¤ge und hochgeladenen Medien wurden unwiderruflich vom Server und anderen Servern, bei denen du Folgende hattest, gelÃ¶scht.
       get_in_touch: Du kannst auf diese E-Mail antworten, um mit dem Personal von %{instance} in Kontakt zu treten.
@@ -1301,11 +1377,13 @@ de:
       subject:
         disable: Dein Konto %{acct} wurde eingefroren
         none: Warnung fÃ¼r %{acct}
+        sensitive: Die Medien deines Konto %{acct} wurden als NSFW markiert
         silence: Dein Konto %{acct} wurde limitiert
         suspend: Dein Konto %{acct} wurde gesperrt
       title:
         disable: Konto eingefroren
         none: Warnung
+        sensitive: Deine Medien wurden als NSFW markiert
         silence: Konto limitiert
         suspend: Konto gesperrt
     welcome:
@@ -1326,9 +1404,11 @@ de:
       tips: Tipps
       title: Willkommen an Bord, %{name}!
   users:
+    blocked_email_provider: Dieser E-Mail-Anbieter ist nicht erlaubt
     follow_limit_reached: Du kannst nicht mehr als %{limit} Leuten folgen
     generic_access_help_html: Probleme beim Zugriff auf dein Konto? Du kannst dich mit %{email} in Verbindung setzen, um Hilfe zu erhalten
     invalid_email: UngÃ¼ltige E-Mail-Adresse
+    invalid_email_mx: Die E-Mail-Adresse scheint nicht vorhanden zu sein
     invalid_otp_token: UngÃ¼ltiger Zwei-Faktor-Authentisierungs-Code
     invalid_sign_in_token: UngÃ¼ltiger Sicherheitscode
     otp_lost_help_html: Wenn Du beides nicht mehr weiÃŸt, melde Dich bei uns unter der E-Mailadresse %{email}
@@ -1338,3 +1418,20 @@ de:
   verification:
     explanation_html: 'Du kannst <strong>bestÃ¤tigen, dass die Links in deinen Profil-Metadaten dir gehÃ¶ren</strong>. DafÃ¼r muss die verlinkte Website einen Link zurÃ¼ck auf dein Mastodon-Profil enthalten. Dieser Link <strong>muss</strong> ein <code>rel="me"</code>-Attribut enthalten. Der Linktext ist dabei egal. Hier ist ein Beispiel:'
     verification: Verifizierung
+  webauthn_credentials:
+    add: SicherheitsschlÃ¼ssel hinzufÃ¼gen
+    create:
+      error: Beim HinzufÃ¼gen des SicherheitsschlÃ¼ssels ist ein Fehler aufgetreten. Bitte versuche es erneut.
+      success: Dein SicherheitsschlÃ¼ssel wurde erfolgreich hinzugefÃ¼gt.
+    delete: LÃ¶schen
+    delete_confirmation: Bist du sicher, dass du diesen SicherheitsschlÃ¼ssel lÃ¶schen mÃ¶chtest?
+    description_html: Wenn du die <strong>Authentifizierung mit SicherheitsschlÃ¼ssel</strong> aktivierst, musst du einen deiner SicherheitsschlÃ¼ssel verwenden, um dich anmelden zu kÃ¶nnen.
+    destroy:
+      error: Es gab ein Problem beim LÃ¶schen deines SicherheitsschlÃ¼ssels. Bitte versuche es erneut.
+      success: Dein SicherheitsschlÃ¼ssel wurde erfolgreich gelÃ¶scht.
+    invalid_credential: UngÃ¼ltiger SicherheitsschlÃ¼ssel
+    nickname_hint: Gib den Spitznamen deines neuen SicherheitsschlÃ¼ssels ein
+    not_enabled: Du hast WebAuthn noch nicht aktiviert
+    not_supported: Dieser Browser unterstÃ¼tzt keine SicherheitsschlÃ¼ssel
+    otp_required: Um SicherheitsschlÃ¼ssel zu verwenden, aktiviere zuerst die Zwei-Faktor-Authentifizierung.
+    registered_on: Registriert am %{date}
diff --git a/config/locales/devise.ca.yml b/config/locales/devise.ca.yml
index cca8764eadb40845a2c5ad9bea2a8e4facefe17f..e1600bc6ac228f4556d74963c7d126febd811592 100644
--- a/config/locales/devise.ca.yml
+++ b/config/locales/devise.ca.yml
@@ -53,7 +53,7 @@ ca:
         subject: 'Mastodon: autenticaciÃ³ de dos factors desactivada'
         title: 2FA desactivat
       two_factor_enabled:
-        explanation: L'autenticaciÃ³ de dos factors ha estat habilitada pel teu compte. Un token generat pel emparellat TOTP app serÃ  requerit per a iniciar sessiÃ³.
+        explanation: L'autenticaciÃ³ de dos factors ha estat habilitada pel teu compte. Un token generat per l'aplicaciÃ³ d'emparellat TOTP serÃ  requerit per a iniciar sessiÃ³.
         subject: 'Mastodon: autenticaciÃ³ de dos factors activada'
         title: 2FA activat
       two_factor_recovery_codes_changed:
@@ -62,9 +62,26 @@ ca:
         title: 2FA codis de recuperaciÃ³ canviats
       unlock_instructions:
         subject: 'Mastodon: Instruccions per a desbloquejar'
+      webauthn_credential:
+        added:
+          explanation: La segÃ¼ent clau de seguretat s'ha afegit al teu compte
+          subject: 'Mastodon: Nova clau de seguretat'
+          title: S'ha afegit una nova clau de seguretat
+        deleted:
+          explanation: La segÃ¼ent clau de seguretat s'ha esborrat del teu compte
+          subject: 'Mastodon: clau de seguretat esborrada'
+          title: Una de les teves claus de seguretat ha estat esborrada
+      webauthn_disabled:
+        explanation: S'ha desactivat l'autenticaciÃ³ amb claus de seguretat per al teu compte. L'inici de sessiÃ³ Ã©s ara possible emprant nomÃ©s el token generat per l'aplicaciÃ³ TOTP.
+        subject: 'Mastodon: S''ha desactivat l''autenticaciÃ³ amb claus de seguretat'
+        title: Claus de seguretat desactivades
+      webauthn_enabled:
+        explanation: S'ha activat l'autenticaciÃ³ amb claus de seguretat. La teva clau de seguretat por ser emprada per a iniciar sessiÃ³.
+        subject: 'Mastodon: AutenticaciÃ³ amb clau de seguretat activada'
+        title: Claus de seguretat activades
     omniauth_callbacks:
-      failure: No podem autentificar-te des de %{kind} degut a "%{reason}".
-      success: Autentificat amb Ã¨xit des del compte %{kind}.
+      failure: No podem autenticar-te des de %{kind} degut a "%{reason}".
+      success: Autenticat amb Ã¨xit des del compte %{kind}.
     passwords:
       no_token: No pots accedir a aquesta pÃ gina sense provenir des del correu de restabliment de la contrasenya. Si vens des del correu de restabliment de contrasenya, assegura't que estÃ s emprant l'adreÃ§a completa proporcionada.
       send_instructions: Si el teu correu electrÃ²nic existeix en la nostra base de dades, rebrÃ s en pocs minuts un enllaÃ§ de restabliment de contrasenya en l'adreÃ§a de correu. Si us plau verifica la teva carpeta de correu brossa if no rebut aquest correu.
diff --git a/config/locales/devise.co.yml b/config/locales/devise.co.yml
index c9511d14d14f245490072202ce8d84b63d0626c8..8409cfad9b2b8291c0ae213c130f4d86b5c291a7 100644
--- a/config/locales/devise.co.yml
+++ b/config/locales/devise.co.yml
@@ -60,6 +60,23 @@ co:
         title: Cambiamentu di i codici di ricuperazione d'A2F
       unlock_instructions:
         subject: 'Mastodon: Riapre u contu'
+      webauthn_credential:
+        added:
+          explanation: A chjave di sicuritÃ  quÃ¬ sottu hÃ¨ stata aghjunta Ã  u vostru contu
+          subject: 'Mastodon: Nova chjave di sicuritÃ '
+          title: Una nova chjave di sicuritÃ  hÃ¨ stata aghjunta
+        deleted:
+          explanation: A chjave di sicuritÃ  quÃ¬ sottu hÃ¨ stata sguassata di u vostru contu
+          subject: 'Mastodon: Chjave di sicuritÃ  sguassata'
+          title: Una di e vostre chjave di sicuritÃ  hÃ¨ stata sguassata
+      webauthn_disabled:
+        explanation: L'autentificazione cÃ¹ una chjave di sicuritÃ  hÃ¨ stata disattivata per u vostru contu. AvÃ  pudete solu cunnettavi cÃ¹ u codice di cunnessione generatu da l'applicazione TOTP appaghjata.
+        subject: 'Mastodon: Autentificazione cÃ¹ chjave di sicuritÃ  disattivata'
+        title: Chjave di sicuritÃ  disattivate
+      webauthn_enabled:
+        explanation: L'autentificazione cÃ¹ una chjave di sicuritÃ  hÃ¨ stata attivata per u vostru contu. AvÃ  a vostra chjave pÃ² esse utilizata per cunnettavi.
+        subject: 'Mastodon: Identificazione cÃ¹ chjave di sicuritÃ  attivata'
+        title: Chjave di sicuritÃ  attivate
     omniauth_callbacks:
       failure: Ã™n pudemu micca cunnettavi da %{kind} perchÃ¨ "%{reason}".
       success: Vi site cunnettatuÂ·a da %{kind}.
@@ -94,5 +111,5 @@ co:
       not_found: Ã¹n hÃ¨ micca statu trovu
       not_locked: Ã¹n era micca chjosu
       not_saved:
-        one: 'Un prublemu hÃ  impeditu a cunservazione di stu (sta) %{resource}:'
-        other: "%{count} prublemi anu impeditu a cunservazione di stu (sta) %{resource} :"
+        one: 'Un prublemu hÃ  impeditu a cunservazione di stu/sta %{resource}:'
+        other: "%{count} prublemi anu impeditu a cunservazione di stu/sta %{resource} :"
diff --git a/config/locales/devise.cs.yml b/config/locales/devise.cs.yml
index 743a1bfd5b679e8450d08ff0069bb5ba933c35c6..56ec4637dfae5f309fd1d2a05cd862062582b90c 100644
--- a/config/locales/devise.cs.yml
+++ b/config/locales/devise.cs.yml
@@ -60,6 +60,19 @@ cs:
         title: ZÃ¡loÅ¾nÃ kÃ³dy pro 2FA zmÄ›nÄ›ny
       unlock_instructions:
         subject: 'Mastodon: Instrukce pro odemÄenÃ ÃºÄtu'
+      webauthn_credential:
+        added:
+          explanation: NÃ¡sledujÃcÃ bezpeÄnostnÃ klÃÄ byl pÅ™idÃ¡n k vaÅ¡emu ÃºÄtu
+          subject: 'Mastodon: NovÃ½ bezpeÄnostnÃ klÃÄ'
+          title: Byl pÅ™idÃ¡n novÃ½ bezpeÄnostnÃ klÃÄ
+        deleted:
+          explanation: NÃ¡sledujÃcÃ bezpeÄnostnÃ klÃÄ byl odstranÄ›n z vaÅ¡eho ÃºÄtu
+          subject: 'Mastodon: BezpeÄnostnÃ klÃÄ byl smazÃ¡n'
+          title: Jeden z vaÅ¡ich bezpeÄnostnÃch klÃÄÅ¯ byl smazÃ¡n
+      webauthn_disabled:
+        title: BezpeÄnostnÃ klÃÄe zakÃ¡zÃ¡ny
+      webauthn_enabled:
+        title: BezpeÄnostnÃ klÃÄe povoleny
     omniauth_callbacks:
       failure: Nelze vÃ¡s ovÄ›Å™it z %{kind}, protoÅ¾e â€ž%{reason}â€œ.
       success: ÃšspÄ›Å¡nÄ› ovÄ›Å™eno z ÃºÄtu %{kind}.
diff --git a/config/locales/devise.da.yml b/config/locales/devise.da.yml
index 75a03593550cae3a22dd6ef30615b4dc5daf27d4..c23d2bbbfdd360bf4e7d0dc61a877f1b1a29f44b 100644
--- a/config/locales/devise.da.yml
+++ b/config/locales/devise.da.yml
@@ -60,6 +60,17 @@ da:
         title: 2FA gendannelseskoder er Ã¦ndret
       unlock_instructions:
         subject: 'Mastodon: Instruktioner for oplÃ¥sning'
+      webauthn_credential:
+        added:
+          subject: 'Mastodon: Ny sikkerhedsnÃ¸gle'
+          title: En ny sikkerhedsnÃ¸gle er blevet tilfÃ¸jet
+        deleted:
+          subject: 'Mastodon: SikkerhedsnÃ¸gle slettet'
+          title: En af dine sikkerhedsnÃ¸gler er blevet slettet
+      webauthn_disabled:
+        title: SikkerhedsnÃ¸gler deaktiveret
+      webauthn_enabled:
+        title: SikkerhedsnÃ¸gler aktiveret
     omniauth_callbacks:
       failure: Kunne ikke godkende dig fra %{kind} fordi "%{reason}".
       success: Godkendelse fra %{kind} konto lykkedes.
diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml
index c2eb057f53ba8cd7db6855439cd727c15a50b404..0512ca12956dbc031e0f2e1c7fd50765caeb4cd8 100644
--- a/config/locales/devise.de.yml
+++ b/config/locales/devise.de.yml
@@ -20,7 +20,7 @@ de:
       confirmation_instructions:
         action: E-Mail-Adresse verifizieren
         action_with_app: BestÃ¤tigen und zu %{app} zurÃ¼ckkehren
-        explanation: Du hast einen Account auf %{host} mit dieser E-Mail-Adresse erstellt. Du bist nur noch einen Klick weit entfernt von der Aktivierung. Wenn du das nicht warst, kannst du diese E-Mail ignorieren.
+        explanation: Du hast einen Account auf %{host} mit dieser E-Mail-Adresse erstellt. Du bist nur noch einen Klick weit von der Aktivierung entfernt. Wenn du das nicht warst, kannst du diese E-Mail ignorieren.
         explanation_when_pending: Du hast dich fÃ¼r eine Einladung bei %{host} mit dieser E-Mailadresse beworben. Sobald du deine E-Mailadresse bestÃ¤tigst werden wir deine Anfrage Ã¼berprÃ¼fen. Du kannst dich in dieser Zeit nicht anmelden. Wenn deine Anfrage abgelehnt wird, werden deine Daten entfernt, also wird keine weitere Handlung benÃ¶tigt. Wenn du das nicht warst kannst du diese E-Mail ignorieren.
         extra_html: Bitte lies auch die <a href="%{terms_path}">Regeln des Servers</a> und <a href="%{policy_path}">unsere Nutzungsbedingungen</a>.
         subject: 'Mastodon: BestÃ¤tigung deines Kontos bei %{instance}'
@@ -60,6 +60,23 @@ de:
         title: 2FA Wiederherstellungscodes geÃ¤ndert
       unlock_instructions:
         subject: 'Mastodon: Konto entsperren'
+      webauthn_credential:
+        added:
+          explanation: Der folgende SicherheitsschlÃ¼ssel wurde zu deinem Konto hinzugefÃ¼gt
+          subject: 'Mastodon: Neuer SicherheitsschlÃ¼ssel'
+          title: Ein neuer SicherheitsschlÃ¼ssel wurde hinzugefÃ¼gt
+        deleted:
+          explanation: Der folgende SicherheitsschlÃ¼ssel wurde aus deinem Konto gelÃ¶scht
+          subject: 'Mastodon: SicherheitsschlÃ¼ssel gelÃ¶scht'
+          title: Einer deiner SicherheitsschlÃ¼ssel wurde gelÃ¶scht
+      webauthn_disabled:
+        explanation: Die Authentifizierung mit SicherheitsschlÃ¼ssel wurde fÃ¼r dein Konto deaktiviert. Der Login ist nun nur mit dem Token mÃ¶glich, der von der eingerichteten TOTP-App generiert wird.
+        subject: 'Mastodon: Authentifizierung mit SicherheitsschlÃ¼ssel deaktiviert'
+        title: SicherheitsschlÃ¼ssel deaktiviert
+      webauthn_enabled:
+        explanation: Die Authentifizierung mit einem SicherheitsschlÃ¼ssel wurde fÃ¼r dein Konto aktiviert. Dein SicherheitsschlÃ¼ssel kann nun fÃ¼r die Anmeldung verwendet werden.
+        subject: 'Mastodon: Authentifizierung mit SicherheitsschlÃ¼ssel aktiviert'
+        title: SicherheitsschlÃ¼ssel aktiviert
     omniauth_callbacks:
       failure: Du konntest nicht mit deinem %{kind}-Konto angemeldet werden, weil Â»%{reason}Â«.
       success: Du hast dich erfolgreich mit deinem %{kind}-Konto angemeldet.
diff --git a/config/locales/devise.el.yml b/config/locales/devise.el.yml
index 7eb064e5d95eea7c6ccdcbcf3e4801e9ada19ce4..ba3ee59fab366c9520a619e4758ecdd327c3cfb7 100644
--- a/config/locales/devise.el.yml
+++ b/config/locales/devise.el.yml
@@ -60,6 +60,23 @@ el:
         title: ÎŸÎ¹ ÎºÏ‰Î´Î¹ÎºÎ¿Î¯ Î±Î½Î¬ÎºÏ„Î·ÏƒÎ·Ï‚ ÎµÏ€Î±Î»Î®Î¸ÎµÏ…ÏƒÎ·Ï‚ 2 Î²Î·Î¼Î¬Ï„Ï‰Î½ (2FA) Î¬Î»Î»Î±Î¾Î±Î½
       unlock_instructions:
         subject: 'Mastodon: ÎŸÎ´Î·Î³Î¯ÎµÏ‚ Î¾ÎµÎºÎ»ÎµÎ¹Î´ÏŽÎ¼Î±Ï„Î¿Ï‚'
+      webauthn_credential:
+        added:
+          explanation: Î ÏÎ¿ÏƒÏ„ÎÎ¸Î·ÎºÎµ Ï„Î¿ Î±ÎºÏŒÎ»Î¿Ï…Î¸Î¿ ÎºÎ»ÎµÎ¹Î´Î¯ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚ ÏƒÏ„Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ¿Ï…
+          subject: 'Mastodon: ÎÎÎ¿ ÎºÎ»ÎµÎ¹Î´Î¯ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚'
+          title: Î ÏÎ¿ÏƒÏ„ÎÎ¸Î·ÎºÎµ Î½ÎÎ¿ ÎºÎ»ÎµÎ¹Î´Î¯ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚
+        deleted:
+          explanation: Î”Î¹Î±Î³ÏÎ¬Ï†Î·ÎºÎµ Ï„Î¿ Î±ÎºÏŒÎ»Î¿Ï…Î¸Î¿ ÎºÎ»ÎµÎ¹Î´Î¯ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚ Î±Ï€ÏŒ Ï„Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ¿Ï…
+          subject: 'Mastodon: Î”Î¹Î±Î³ÏÎ¬Ï†Î·ÎºÎµ ÎÎ½Î± ÎºÎ»ÎµÎ¹Î´Î¯ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚'
+          title: ÎˆÎ½Î± Î±Ï€ÏŒ Ï„Î± ÎºÎ»ÎµÎ¹Î´Î¹Î¬ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚ ÏƒÎ¿Ï… Î´Î¹Î±Î³ÏÎ¬Ï†Î·ÎºÎµ
+      webauthn_disabled:
+        explanation: Î— ÎµÏ€Î±Î»Î®Î¸ÎµÏ…ÏƒÎ· Î¼Îµ ÎºÎ»ÎµÎ¹Î´Î¯ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚ ÎÏ‡ÎµÎ¹ Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¸ÎµÎ¯ Î³Î¹Î± Ï„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ±Ï‚. Î— ÏƒÏÎ½Î´ÎµÏƒÎ· ÎµÎ¯Î½Î±Î¹ Ï„ÏŽÏÎ± ÎµÏ†Î¹ÎºÏ„Î® Î¼ÏŒÎ½Î¿ Î¼Îµ Ï„Î· Ï‡ÏÎ®ÏƒÎ· ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Ï€Î¿Ï… Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î·Î¼ÎÎ½Î¿Ï… Î¼Îµ Ï„Î·Î½ ÏƒÏ…Î½Î´ÎµÎ´ÎµÎ¼ÎÎ½Î· ÎµÏ†Î±ÏÎ¼Î¿Î³Î® TOTP.
+        subject: 'Mastodon: Î— Î±Ï…Î¸ÎµÎ½Ï„Î¹ÎºÎ¿Ï€Î¿Î¯Î·ÏƒÎ· Î¼Îµ Ï‡ÏÎ®ÏƒÎ· ÎºÎ»ÎµÎ¹Î´Î¹ÏŽÎ½ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚ Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎµ'
+        title: Î¤Î± ÎºÎ»ÎµÎ¹Î´Î¹Î¬ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚ Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎ±Î½
+      webauthn_enabled:
+        explanation: Î— ÎµÏ€Î±Î»Î®Î¸ÎµÏ…ÏƒÎ· Î¼Îµ ÎºÎ»ÎµÎ¹Î´Î¯ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚ ÎÏ‡ÎµÎ¹ ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¸ÎµÎ¯ Î³Î¹Î± Ï„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ±Ï‚. ÎœÏ€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± Ï„Î¿ Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Î³Î¹Î± Î½Î± ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯Ï„Îµ.
+        subject: 'Mastodon: Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎµ Î· ÎµÏ€Î±Î»Î®Î¸ÎµÏ…ÏƒÎ· Î¼Îµ ÎºÎ»ÎµÎ¹Î´Î¯ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚'
+        title: Î¤Î± ÎºÎ»ÎµÎ¹Î´Î¹Î¬ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚ ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎ±Î½
     omniauth_callbacks:
       failure: Î”ÎµÎ½ Î¼Ï€ÏŒÏÎµÏƒÎ±Î¼Îµ Î½Î± ÏƒÎµ Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î®ÏƒÎ¿Ï…Î¼Îµ Î¼ÎÏƒÏ‰ %{kind} Î³Î¹Î±Ï„Î¯ "%{reason}".
       success: Î•Ï€Î¹Ï„Ï…Ï‡Î·Î¼ÎÎ½Î· Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î¼ÎÏƒÏ‰ %{kind} Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï.
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index 726d2426a77804095201b1ed845083c8d2d1ccec..a3f2c5796a02fb4a7b6435457fec7b895f5852ae 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -60,6 +60,23 @@ en:
         title: 2FA recovery codes changed
       unlock_instructions:
         subject: 'Mastodon: Unlock instructions'
+      webauthn_credential:
+        added:
+          explanation: The following security key has been added to your account
+          subject: 'Mastodon: New security key'
+          title: A new security key has been added
+        deleted:
+          explanation: The following security key has been deleted from your account
+          subject: 'Mastodon: Security key deleted'
+          title: One of you security keys has been deleted
+      webauthn_disabled:
+        explanation: Authentication with security keys has been disabled for your account. Login is now possible using only the token generated by the paired TOTP app.
+        subject: 'Mastodon: Authentication with security keys disabled'
+        title: Security keys disabled
+      webauthn_enabled:
+        explanation: Security key authentication has been enabled for your account. Your security key can now be used for login.
+        subject: 'Mastodon: Security key authentication enabled'
+        title: Security keys enabled
     omniauth_callbacks:
       failure: Could not authenticate you from %{kind} because "%{reason}".
       success: Successfully authenticated from %{kind} account.
diff --git a/config/locales/devise.es-AR.yml b/config/locales/devise.es-AR.yml
index bb229e8f5d10d39e5a3825c0f936b1e23ac3d01a..d4dc4b7a7427fc6b18e7ffd4c945fd7fa1cc20f1 100644
--- a/config/locales/devise.es-AR.yml
+++ b/config/locales/devise.es-AR.yml
@@ -39,7 +39,7 @@ es-AR:
         explanation: ConfirmÃ¡ la nueva direcciÃ³n para cambiar tu correo electrÃ³nico.
         extra: Si no pediste este cambio, por favor, ignorÃ¡ este mensaje. No se cambiarÃ¡ la direcciÃ³n de correo electrÃ³nico de tu cuenta de Mastodon hasta que no accedas al enlace de arriba.
         subject: 'Mastodon: confirmar correo electrÃ³nico para %{instance}'
-        title: Verifique direcciÃ³n de correo electrÃ³nico
+        title: Verificar direcciÃ³n de correo electrÃ³nico
       reset_password_instructions:
         action: Cambiar contraseÃ±a
         explanation: Pediste una nueva contraseÃ±a para tu cuenta.
@@ -60,6 +60,23 @@ es-AR:
         title: CÃ³digos de recuperaciÃ³n 2FA cambiados
       unlock_instructions:
         subject: 'Mastodon: instrucciones de desbloqueo'
+      webauthn_credential:
+        added:
+          explanation: Se agregÃ³ la siguiente llave de seguridad a tu cuenta
+          subject: 'Mastodon: nueva llave de seguridad'
+          title: Se agregÃ³ una nueva llave de seguridad
+        deleted:
+          explanation: Se eliminÃ³ la siguiente llave de seguridad de tu cuenta
+          subject: 'Mastodon: llave de seguridad eliminada'
+          title: Se eliminÃ³ una de tus llaves de seguridad
+      webauthn_disabled:
+        explanation: Se deshabilitÃ³ la autenticaciÃ³n con llaves de seguridad en tu cuenta. El inicio de sesiÃ³n ahora es posible usando sÃ³lo la clave generada por la aplicaciÃ³n TOTP asociada.
+        subject: 'Mastodon: autenticaciÃ³n con llaves de seguridad, deshabilitada'
+        title: Llaves de seguridad deshabilitadas
+      webauthn_enabled:
+        explanation: Se habilitÃ³ la autenticaciÃ³n de llave de seguridad en tu cuenta. Ahora tu llave de seguridad se puede usar para iniciar sesiÃ³n.
+        subject: 'Mastodon: autenticaciÃ³n con llaves de seguridad, habilitada'
+        title: Llaves de seguridad habilitadas
     omniauth_callbacks:
       failure: 'No se te pudo autenticar desde %{kind} debido a esto: "%{reason}".'
       success: Se autenticÃ³ exitosamente para la cuenta %{kind}.
@@ -67,7 +84,7 @@ es-AR:
       no_token: No podÃ©s acceder a esta pÃ¡gina sin venir desde un correo electrÃ³nico destinado al cambio de contraseÃ±a. Si venÃs desde dicho mensaje, por favor, asegurate que usaste toda la direcciÃ³n web ofrecida.
       send_instructions: Si tu direcciÃ³n de correo electrÃ³nico existe en nuestra base de datos, en unos minutos, vas a recibir un correo electrÃ³nico con un enlace para cambiar tu contraseÃ±a. Si pasa el tiempo y no recibiste ningÃºn mensaje, por favor, revisÃ¡ tu carpeta de correo basura / no deseado / spam.
       send_paranoid_instructions: Si tu direcciÃ³n de correo electrÃ³nico existe en nuestra base de datos, en unos minutos, vas a recibir un correo electrÃ³nico con un enlace para cambiar tu contraseÃ±a. Si pasa el tiempo y no recibiste ningÃºn mensaje, por favor, revisÃ¡ tu carpeta de correo basura / no deseado / spam.
-      updated: Se cambiÃ³ existosamente tu contraseÃ±a. Ya iniciaste sesiÃ³n.
+      updated: Se cambiÃ³ exitosamente tu contraseÃ±a. Ya iniciaste sesiÃ³n.
       updated_not_active: Se cambiÃ³ exitosamente tu contraseÃ±a.
     registrations:
       destroyed: "Â¡Chauchas! Se cancelÃ³ exitosamente tu cuenta. Esperamos verte pronto de nuevo."
diff --git a/config/locales/devise.es.yml b/config/locales/devise.es.yml
index 80d4380923339e75cf59b583431585a61f02e8f8..11ec46594238d7b6f5d700379f80f8102171c07f 100644
--- a/config/locales/devise.es.yml
+++ b/config/locales/devise.es.yml
@@ -60,6 +60,23 @@ es:
         title: CÃ³digos de recuperaciÃ³n 2FA cambiados
       unlock_instructions:
         subject: 'Mastodon: Instrucciones para desbloquear'
+      webauthn_credential:
+        added:
+          explanation: La siguiente clave de seguridad ha sido aÃ±adida a su cuenta
+          subject: 'Mastodon: Nueva clave de seguridad'
+          title: Se agregÃ³ una nueva clave de seguridad
+        deleted:
+          explanation: La siguiente clave de seguridad ha sido eliminada de su cuenta
+          subject: 'Mastodon: Clave de seguridad eliminada'
+          title: Una de sus claves de seguridad ha sido eliminada
+      webauthn_disabled:
+        explanation: La autenticaciÃ³n con claves de seguridad ha sido desactivada para tu cuenta. El inicio de sesiÃ³n es ahora posible Ãºnicamente utilizando el token generado por la aplicaciÃ³n emparejada TOTP.
+        subject: 'Mastodon: AutenticaciÃ³n con claves de seguridad desactivada'
+        title: Claves de seguridad desactivadas
+      webauthn_enabled:
+        explanation: La autenticaciÃ³n con clave de seguridad ha sido habilitada para su cuenta. Su clave de seguridad ahora puede ser usada para iniciar sesiÃ³n.
+        subject: 'Mastodon: AutenticaciÃ³n con clave de seguridad activada'
+        title: Claves de seguridad activadas
     omniauth_callbacks:
       failure: No podemos autentificarle desde %{kind} debido a "%{reason}".
       success: Autentificado con Ã©xito desde la cuenta %{kind} .
diff --git a/config/locales/devise.fa.yml b/config/locales/devise.fa.yml
index 753da6b9ce4bf38f15c42904236c92b336d64ccf..c13df99892f16a1eca44b0084e04586a49edf2f0 100644
--- a/config/locales/devise.fa.yml
+++ b/config/locales/devise.fa.yml
@@ -60,6 +60,23 @@ fa:
         title: Ú©Ø¯Ù‡Ø§ÛŒ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ ØªØ£ÛŒÛŒØ¯ Ù‡ÙˆÛŒØª Ø¯Ùˆ Ù…Ø±ØÙ„Ù‡â€ŒØ§ÛŒ Ø¹ÙˆØ¶ Ø´Ø¯Ù‡â€ŒØ§Ù†Ø¯
       unlock_instructions:
         subject: 'Ù…Ø§Ø³ØªÙˆØ¯ÙˆÙ†: Ø¯Ø³ØªÙˆØ±Ø§Ù„Ø¹Ù…Ù„â€ŒÙ‡Ø§ÛŒ Ù‚ÙÙ„â€ŒÚ¯Ø´Ø§ÛŒÛŒ'
+      webauthn_credential:
+        added:
+          explanation: Ú©Ù„ÛŒØ¯ Ø§Ù…Ù†ÛŒØªÛŒ Ø²ÛŒØ± Ø¨Ù‡ ØØ³Ø§Ø¨ØªØ§Ù† Ø§ÙØ²ÙˆØ¯Ù‡ Ø´Ø¯
+          subject: 'Ù…Ø§Ø³ØªÙˆØ¯ÙˆÙ†: Ú©Ù„ÛŒØ¯ Ø§Ù…Ù†ÛŒØªÛŒ Ø¬Ø¯ÛŒØ¯'
+          title: Ú©Ù„ÛŒØ¯ Ø§Ù…Ù†ÛŒØªÛŒ Ø¬Ø¯ÛŒØ¯ÛŒ Ø§ÙØ²ÙˆØ¯Ù‡ Ø´Ø¯
+        deleted:
+          explanation: Ú©Ù„ÛŒØ¯ Ø§Ù…Ù†ÛŒØªÛŒ Ø²ÛŒØ± Ø§Ø² ØØ³Ø§Ø¨ØªØ§Ù† ØØ°Ù Ø´Ø¯
+          subject: 'Ù…Ø§Ø³ØªÙˆØ¯ÙˆÙ†: Ú©Ù„ÛŒØ¯ Ø§Ù…Ù†ÛŒØªÛŒ ØØ°Ù Ø´Ø¯'
+          title: ÛŒÚ©ÛŒ Ø§Ø² Ú©Ù„ÛŒØ¯Ù‡Ø§ÛŒ Ø§Ù…Ù†ÛŒØªÛŒØªØ§Ù† ØØ°Ù Ø´Ø¯
+      webauthn_disabled:
+        explanation: ØªØ£ÛŒÛŒØ¯ Ù‡ÙˆÛŒØª Ø¨Ø§ Ú©Ù„ÛŒØ¯Ù‡Ø§ÛŒ Ø§Ù…Ù†ÛŒØªÛŒ Ø¨Ø±Ø§ÛŒ ØØ³Ø§Ø¨ØªØ§Ù† Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù‡ Ø§Ø³Øª. ÙˆØ±ÙˆØ¯ Ø§Ú©Ù†ÙˆÙ† ÙÙ‚Ø· Ø¨Ø§ Ú˜ØªÙˆÙ† Ø§ÛŒØ¬Ø§Ø¯ Ø´Ø¯Ù‡ Ø¨Ø§ Ú©Ø§Ø±Ù‡Ù” TOTP Ø¬ÙØªâ€ŒØ´Ø¯Ù‡ Ø§Ù…Ú©Ø§Ù†â€ŒÙ¾Ø°ÛŒØ± Ø§Ø³Øª.
+        subject: 'Ù…Ø§Ø³ØªÙˆØ¯ÙˆÙ†: ØªØ£ÛŒÛŒØ¯ Ù‡ÙˆÛŒØª Ø¨Ø§ Ú©Ù„ÛŒØ¯Ù‡Ø§ÛŒ Ø§Ù…Ù†ÛŒØªÛŒ Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯'
+        title: Ú©Ù„ÛŒØ¯Ù‡Ø§ÛŒ Ø§Ù…Ù†ÛŒØªÛŒ Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù†Ø¯
+      webauthn_enabled:
+        explanation: ØªØ£ÛŒÛŒØ¯ Ù‡ÙˆÛŒØª Ø¨Ø§ Ú©Ù„ÛŒØ¯ Ø§Ù…Ù†ÛŒØªÛŒ Ø¨Ø±Ø§ÛŒ ØØ³Ø§Ø¨ØªØ§Ù† Ø¨Ù‡ Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù‡ Ø§Ø³Øª. Ø§Ú©Ù†ÙˆÙ† Ú©Ù„ÛŒØ¯ Ø§Ù…Ù†ÛŒØªÛŒØªØ§Ù† Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ø¨Ø±Ø§ÛŒ ÙˆØ±ÙˆØ¯ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø´ÙˆØ¯.
+        subject: 'Ù…Ø§Ø³ØªÙˆØ¯ÙˆÙ†: ØªØ£ÛŒÛŒØ¯ Ù‡ÙˆÛŒØª Ø¨Ø§ Ú©Ù„ÛŒØ¯ Ø§Ù…Ù†ÛŒØªÛŒ Ø¨Ù‡ Ú©Ø§Ø± Ø§ÙØªØ§Ø¯'
+        title: Ú©Ù„ÛŒØ¯Ù‡Ø§ÛŒ Ø§Ù…Ù†ÛŒØªÛŒ Ø¨Ù‡ Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù†Ø¯
     omniauth_callbacks:
       failure: ØªØ¢ÛŒÛŒØ¯ Ù‡ÙˆÛŒØªØªØ§Ù† Ø§Ø² %{kind} Ù†ØªÙˆØ§Ù†Ø³Øª Ø§Ù†Ø¬Ø§Ù… Ø´ÙˆØ¯ Ú†Ø±Ø§ Ú©Ù‡ Â«%{reason}Â».
       success: ØªØ£ÛŒÛŒØ¯ Ù‡ÙˆÛŒØª Ø§Ø² ØØ³Ø§Ø¨ %{kind} Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª Ø§Ù†Ø¬Ø§Ù… Ø´Ø¯.
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index 3edd348e673ddab8923ae59e7f4831b3c37cdc3e..b918b7fb2c140207c882bfc79f25401c4912fbb7 100644
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -60,6 +60,23 @@ fr:
         title: Codes de rÃ©cupÃ©ration 2FA modifiÃ©s
       unlock_instructions:
         subject: 'MastodonÂ : Instructions pour dÃ©verrouiller votre compte'
+      webauthn_credential:
+        added:
+          explanation: La clÃ© de sÃ©curitÃ© suivante a Ã©tÃ© ajoutÃ©e Ã  votre compte
+          subject: 'Mastodon: Nouvelle clÃ© de sÃ©curitÃ©'
+          title: Une nouvelle clÃ© de sÃ©curitÃ© a Ã©tÃ© ajoutÃ©e
+        deleted:
+          explanation: La clÃ© de sÃ©curitÃ© suivante a Ã©tÃ© supprimÃ©e de votre compte
+          subject: 'Mastodon: ClÃ© de sÃ©curitÃ© supprimÃ©e'
+          title: Une de vos clÃ©s de sÃ©curitÃ© a Ã©tÃ© supprimÃ©e
+      webauthn_disabled:
+        explanation: L'authentification avec les clÃ©s de sÃ©curitÃ© a Ã©tÃ© dÃ©sactivÃ©e pour votre compte. La connexion est maintenant possible en utilisant uniquement le jeton gÃ©nÃ©rÃ© par l'application TOTP appairÃ©e.
+        subject: 'Mastodon: Authentification avec clÃ©s de sÃ©curitÃ© dÃ©sactivÃ©e'
+        title: ClÃ©s de sÃ©curitÃ© dÃ©sactivÃ©es
+      webauthn_enabled:
+        explanation: L'authentification par clÃ© de sÃ©curitÃ© a Ã©tÃ© activÃ©e pour votre compte. Votre clÃ© de sÃ©curitÃ© peut maintenant Ãªtre utilisÃ©e pour vous connecter.
+        subject: 'Mastodon: Authentification de la clÃ© de sÃ©curitÃ© activÃ©e'
+        title: ClÃ©s de sÃ©curitÃ© activÃ©es
     omniauth_callbacks:
       failure: 'Nous nâ€™avons pas pu vous authentifier via %{kind}â€¯: ''%{reason}''.'
       success: AuthentifiÃ© avec succÃ¨s via %{kind}.
diff --git a/config/locales/devise.gl.yml b/config/locales/devise.gl.yml
index f2eb2b77b1413e669b6bab73de1e844c6ddf8df3..6c8718f28cbed31d04f94884eb3cbba4077b531c 100644
--- a/config/locales/devise.gl.yml
+++ b/config/locales/devise.gl.yml
@@ -19,7 +19,7 @@ gl:
     mailer:
       confirmation_instructions:
         action: Verificar o enderezo de email
-        action_with_app: Confirmar e voltar a %{app}
+        action_with_app: Confirmar e volver a %{app}
         explanation: Creaches unha conta en %{host} con este enderezo de email. EstÃ¡s a un clic de activala. Se non foches ti o que fixeches este rexisto, por favor ignora esta mensaxe.
         explanation_when_pending: Solicitaches un convite para %{host} con este enderezo de email. Logo de que confirmes o teu enderezo de email, imos revisar a tÃºa inscriciÃ³n. Podes iniciar sesiÃ³n para mudar os teus datos ou eliminar a tÃºa conta, mais non poderÃ¡s aceder Ã¡ meirande parte das funciÃ³ns atÃ© que a tÃºa conta sexa aprobada. Se a tÃºa inscriciÃ³n for rexeitada, os teus datos serÃ¡n eliminados, polo que non serÃ¡ necesaria calquera acciÃ³n adicional da tÃºa parte. Se non solicitaches este convite, por favor, ignora este correo.
         extra_html: Por favor, le <a href="%{terms_path}">as regras do servidor</a> e os <a href="%{policy_path}">nosos termos do servizo</a>.
@@ -60,6 +60,23 @@ gl:
         title: CÃ³digos de recuperaciÃ³n 2FA mudados
       unlock_instructions:
         subject: 'Mastodon: InstruciÃ³ns para desbloquear'
+      webauthn_credential:
+        added:
+          explanation: Engadeuse a seguinte chave de seguridade Ã¡ tÃºa conta
+          subject: 'Mastodon: Nova chave de seguridade'
+          title: Engadeuse unha nova chave de seguridade
+        deleted:
+          explanation: Eliminouse a seguinte chave de seguridade da tÃºa conta
+          subject: 'Mastodon: Chave de seguridade eliminada'
+          title: Eliminouse unha das tÃºas chaves de seguridade
+      webauthn_disabled:
+        explanation: Desactivouse para a tÃºa conta a autenticaciÃ³n con chaves de seguridade. Agora a conexiÃ³n Ã© posible usando sÃ³ o token creado pola app TOTP emparellada.
+        subject: 'Mastodon: Desactivouse a autenticaciÃ³n con chave de seguridade'
+        title: Chaves de seguridade desactivadas
+      webauthn_enabled:
+        explanation: Activouse para a conta a autenticaciÃ³n con chave de seguridade. Xa podes usar a chave de seguridade para contectar.
+        subject: 'Mastodon: AutenticaciÃ³n con chave de seguridade activada'
+        title: Chaves de seguridade activas
     omniauth_callbacks:
       failure: Non foi posÃbel autenticar %{kind} porque "%{reason}".
       success: Autenticado con Ã©xito na conta %{kind}.
diff --git a/config/locales/devise.hi.yml b/config/locales/devise.hi.yml
index d758a5b5357d76effdf363eeb2c8e0dfb231c4aa..62048c9f5d09d186c5cec43b291a134511435f74 100644
--- a/config/locales/devise.hi.yml
+++ b/config/locales/devise.hi.yml
@@ -1 +1,12 @@
+---
 hi:
+  devise:
+    confirmations:
+      confirmed: à¤†à¤ªà¤•à¤¾ à¤ˆà¤®à¥‡à¤² à¤ªà¤¤à¤¾ à¤•à¤¾ à¤¸à¤«à¤²à¤¤à¤¾à¤ªà¥‚à¤°à¥à¤µà¤• à¤ªà¥à¤·à¥à¤Ÿà¤¿ à¤•à¤° à¤²à¤¿à¤¯à¤¾ à¤—à¤¯à¤¾ à¤¥à¤¾
+    failure:
+      already_authenticated: à¤†à¤ª à¤ªà¤¹à¤²à¥‡ à¤¸à¥‡ à¤¹à¥€ à¤¸à¤¾à¤‡à¤¨ à¤‡à¤¨ à¤¹à¥ˆ|
+      inactive: à¤†à¤ªà¤•à¤¾ à¤–à¤¾à¤¤à¤¾ à¤¸à¤•à¥à¤°à¤¿à¤¯ à¤¨à¤¹à¥€à¤‚ à¤¹à¥ˆ!
+      locked: à¤†à¤ªà¤•à¥‡ à¤…à¤•à¤¾à¤‰à¤‚à¤Ÿ à¤•à¥‹ à¤¬à¥à¤²à¥‰à¤• à¤•à¤¿à¤¯à¤¾ à¤—à¤¯à¤¾ à¤¹à¥ˆà¥¤
+    mailer:
+      email_changed:
+        title: à¤¨à¤¯à¤¾ à¤ˆà¤®à¥‡à¤² à¤ªà¤¤à¤¾
diff --git a/config/locales/devise.hr.yml b/config/locales/devise.hr.yml
index e0c569ceed8304271cb57771d5cb939be9ed06bf..235e354140fca10683d636daf4878ee9a4be2759 100644
--- a/config/locales/devise.hr.yml
+++ b/config/locales/devise.hr.yml
@@ -2,50 +2,56 @@
 hr:
   devise:
     confirmations:
-      confirmed: Tvoja email adresa je uspjeÅ¡no potvrÄ‘ena.
-      send_instructions: Primit Ä‡eÅ¡ email sa uputama kako potvrditi  svoju email adresu za nekoliko minuta.
-      send_paranoid_instructions: Ako tvoja email adresa postoji u naÅ¡oj bazi podataka, primit Ä‡eÅ¡ email sa uputama kako ju potvrditi za nekoliko minuta.
+      confirmed: VaÅ¡a adresa e-poÅ¡te uspjeÅ¡no je potvrÄ‘ena.
+      send_instructions: Za nekoliko minuta primit Ä‡ete e-poÅ¡tu s uputama kako potvrditi VaÅ¡u adresu e-poÅ¡te. Molimo pogledajte VaÅ¡u mapu s neÅ¾eljenom poÅ¡tom, ako niste primili ovu e-poÅ¡tu.
+      send_paranoid_instructions: Ako VaÅ¡a adresa e-poÅ¡te postoji u naÅ¡oj bazi podataka, za nekoliko minuta primit Ä‡ete e-poÅ¡tu s uputama kako ju potvrditi. Molimo provjerite mapu s neÅ¾eljenom poÅ¡tom, ako niste primili ovu e-poÅ¡tu.
     mailer:
       confirmation_instructions:
-        subject: 'Mastodon: Upute za potvrÄ‘ivanje %{instance}'
+        action: Potvrdi adresu e-poÅ¡te
+        action_with_app: Potvrdi i vrati se na %{app}
+        subject: 'Mastodon: upute za potvrÄ‘ivanje za %{instance}'
+        title: Potvrdi adresu e-poÅ¡te
       email_changed:
-        subject: 'Mastodon: Email adresa je promijenjena'
-        title: Nova email adresa
+        subject: 'Mastodon: adresa e-poÅ¡te je promijenjena'
+        title: Nova adresa e-poÅ¡te
       password_change:
-        subject: 'Mastodon: Lozinka je promijenjena'
+        subject: 'Mastodon: lozinka je promijenjena'
       reset_password_instructions:
-        subject: 'Mastodon: Upute za resetiranje lozinke'
+        subject: 'Mastodon: upute za ponovno postavljanje lozinke'
+        title: Ponovno postavljanje lozinke
+      two_factor_disabled:
+        title: 2FA je onemoguÄ‡en
       unlock_instructions:
-        subject: 'Mastodon: Upute za otkljuÄavanje'
+        subject: 'Mastodon: upute za otkljuÄavanje'
     omniauth_callbacks:
-      failure: Ne moÅ¾emo te autentificirati sa %{kind} zbog "%{reason}".
-      success: UspjeÅ¡no autentificiran sa %{kind} raÄuna.
+      failure: Ne moÅ¾emo Vas autentificirati s %{kind} zbog "%{reason}".
+      success: UspjeÅ¡no ste autentificirani s raÄunom na %{kind}.
     passwords:
-      no_token: Ne moÅ¾eÅ¡ pristupiti ovoj stranici bez dolaÅ¾enja sa emaila za resetiranje lozinke. Ako dolaziÅ¡ sa tog emaila, pazi da koristiÅ¡ potpuni link koji ti je dan.
-      send_instructions: Primit Ä‡eÅ¡ email sa uputama kako resetirati svoju lozinku za nekoliko minuta.
-      send_paranoid_instructions: Ako tvoja email adresa postoji u naÅ¡oj bazi podataka, primit Ä‡eÅ¡ link za povrat lozinke na svoju email adresu za nekoliko minuta.
-      updated: Tvoja lozinka je uspjeÅ¡no izmijenjena. Sada si prijavljen.
-      updated_not_active: Toja lozinka je uspjeÅ¡no izmijenjena.
+      no_token: Ovoj stranici ne moÅ¾ete pristupiti, ako ne stiÅ¾ete iz e-poÅ¡te za ponovno postavljanje lozinke. Ako dolazite iz e-poÅ¡te za ponovno postavljanje lozinke, molimo budite sigurni da koristite puni URL koji ste primili.
+      send_instructions: Ako VaÅ¡a adresa e-poÅ¡te postoji u naÅ¡oj bazi podataka, za nekoliko minuta primit Ä‡ete poveznicu za oporavak lozinke. Molimo provjerite mapu s neÅ¾eljenom poÅ¡tom, ako niste primili ovu e-poÅ¡tu.
+      send_paranoid_instructions: Ako VaÅ¡a adresa e-poÅ¡te postoji u naÅ¡oj bazi podataka, za nekoliko minuta primit Ä‡ete e-poÅ¡tu s poveznicom za oporavak lozinke. Molimo provjerite mapu s neÅ¾eljenom poÅ¡tom, ako niste primili ovu e-poÅ¡tu.
+      updated: VaÅ¡a lozinka uspjeÅ¡no je promijenjena. Sada ste prijavljeni.
+      updated_not_active: VaÅ¡a lozinka uspjeÅ¡no je promijenjena.
     registrations:
-      destroyed: Zbogom! Tvoj raÄun je uspjeÅ¡no otkazan. Nadamo se da Ä‡emo te vidjeti ponovo.
-      signed_up: Dobro doÅ¡ao! UspjeÅ¡no si se prijavio.
-      signed_up_but_inactive: UspjeÅ¡no si se registrirao. No, ne moÅ¾eÅ¡ se prijaviti, jer ti raÄun joÅ¡ nije aktiviran.
-      signed_up_but_locked: UspjeÅ¡no si se registrirao. No, ne moÅ¾eÅ¡ se prijaviti jer je tvoj raÄun zakljuÄan.
-      signed_up_but_unconfirmed: Poruka sa linkom za potvrÄ‘ivanje je poslana na tvoju email adresu. Molimo, slijedi link kako bi tvoj raÄun bio aktiviran.
-      update_needs_confirmation: Tvoj raÄun je uspjeÅ¡no aÅ¾uriran, ali trebamo provjeriti tvoju novu email adresu. Molimo, provjeri svoj email i slijedi link za potvrÄ‘ivanje kako bi tvoja nova email adresa bila potvrÄ‘ena.
-      updated: Tvoj raÄun je uspjeÅ¡no aÅ¾uriran.
+      destroyed: Zbogom! VaÅ¡ je raÄun uspjeÅ¡no otkazan. Nadamo se da Ä‡emo Vas uskoro ponovno vidjeti.
+      signed_up: Dobro doÅ¡li! UspjeÅ¡no ste se prijavili.
+      signed_up_but_inactive: UspjeÅ¡no ste se registrirali. No, ne moÅ¾emo Vas prijaviti jer VaÅ¡ raÄun joÅ¡ nije aktiviran.
+      signed_up_but_locked: UspjeÅ¡no ste se registrirali. No, ne moÅ¾emo Vas prijaviti jer je VaÅ¡ raÄun zakljuÄan.
+      signed_up_but_unconfirmed: Poruka s poveznicom za potvrÄ‘ivanje poslana je na VaÅ¡u adresu e-poÅ¡te. Molimo slijedite poveznicu za aktivaciju VaÅ¡eg raÄuna. Molimo provjerite mapu neÅ¾eljene poÅ¡te, ako niste primili ovu e-poÅ¡tu.
+      update_needs_confirmation: VaÅ¡ raÄun uspjeÅ¡no je aÅ¾uriran, ali moramo potvrditi VaÅ¡u novu adresu e-poÅ¡te. Molimo provjerite VaÅ¡u e-poÅ¡tu i slijedite poveznicu za potvrÄ‘ivanje VaÅ¡e nove adrese e-poÅ¡te. Molimo provjerite mapu neÅ¾eljene poÅ¡te, ako niste primili ovu e-poÅ¡tu.
+      updated: VaÅ¡ je raÄun uspjeÅ¡no aÅ¾uriran.
     sessions:
-      already_signed_out: UspjeÅ¡no si odjavljen.
-      signed_in: UspjeÅ¡no si prijavljen.
-      signed_out: UspjeÅ¡no si odjavljen.
+      already_signed_out: UspjeÅ¡no ste odjavljeni.
+      signed_in: UspjeÅ¡no ste prijavljeni.
+      signed_out: UspjeÅ¡no ste odjavljeni.
     unlocks:
-      send_instructions: Primit Ä‡eÅ¡ email sa uputama kako otkljuÄati svoj raÄun za nekoliko minuta.
-      send_paranoid_instructions: Ako tvoj raÄun postoji, primit Ä‡eÅ¡ email sa uputama kako ga otkljuÄati za nekoliko minuta.
-      unlocked: Tvoj raÄun je uspjeÅ¡no otkljuÄan. Prijavi se kako bi nastavio.
+      send_instructions: Primit Ä‡ete e-poÅ¡tu s uputama kako otkljuÄati VaÅ¡ raÄun za nekoliko minuta. Molimo provjerite neÅ¾eljenu poÅ¡tu, ako niste primili ovu e-poÅ¡tu.
+      send_paranoid_instructions: Ako VaÅ¡ raÄun postoji, za nekoliko minuta primit Ä‡ete e-poÅ¡tu s uputama kako ga otkljuÄati. Molimo provjerite mapu neÅ¾eljene poÅ¡te, ako niste primili ovu e-poÅ¡tu.
+      unlocked: VaÅ¡ je raÄun uspjeÅ¡no otkljuÄan. Molimo prijavite se za nastavak.
   errors:
     messages:
-      already_confirmed: je veÄ‡ potvrÄ‘en, pokuÅ¡aj se prijaviti
-      confirmation_period_expired: mora biti potvrÄ‘en u roku od %{period}, molimo zatraÅ¾i novi
-      expired: je istekao, zatraÅ¾i novu
-      not_found: nije naÄ‘en
+      already_confirmed: je veÄ‡ potvrÄ‘en, pokuÅ¡ajte se prijaviti
+      confirmation_period_expired: mora biti potvrÄ‘en unutar %{period}, molimo zatraÅ¾ite novi
+      expired: je istekao, zatraÅ¾ite novi
+      not_found: nije pronaÄ‘en
       not_locked: nije zakljuÄan
diff --git a/config/locales/devise.hu.yml b/config/locales/devise.hu.yml
index 62888be74e597d4567159217596f946535fe3a66..a60d2e88b0ff26601362f362f688e8d4c1e3f5ec 100644
--- a/config/locales/devise.hu.yml
+++ b/config/locales/devise.hu.yml
@@ -60,6 +60,23 @@ hu:
         title: A kÃ©tlÃ©pcsÅ‘s kÃ³dok megvÃ¡ltozott
       unlock_instructions:
         subject: 'Mastodon: FeloldÃ¡si lÃ©pÃ©sek'
+      webauthn_credential:
+        added:
+          explanation: A kÃ¶vetkezÅ‘ biztonsÃ¡gi kulcsot hozzÃ¡adtuk a fiÃ³kodhoz
+          subject: 'Mastodon: Ãšj biztonsÃ¡gi kulcs'
+          title: Ãšj biztonsÃ¡gi kulcsot vettÃ¼nk fel
+        deleted:
+          explanation: A kÃ¶vetkezÅ‘ biztonsÃ¡gi kulcsot tÃ¶rÃ¶ltÃ¼k a fiÃ³kodbÃ³l
+          subject: 'Mastodon: BiztonsÃ¡gi kulcs tÃ¶rÃ¶lve'
+          title: Az egyik biztonsÃ¡gi kulcsodat tÃ¶rÃ¶ltÃ©k
+      webauthn_disabled:
+        explanation: A biztonsÃ¡gi kulccsal tÃ¶rtÃ©nÅ‘ hitelesÃtÃ©st letiltottuk a fiÃ³kodon. Bejelentkezni csak a pÃ¡rosÃtott TOTP app Ã¡ltal generÃ¡lt tokennel lehet.
+        subject: 'Mastodon: BiztonsÃ¡gi kulccsal tÃ¶rtÃ©nÅ‘ hitelesÃtÃ©s letiltva'
+        title: BiztonsÃ¡gi kulcsok letiltva
+      webauthn_enabled:
+        explanation: A biztonsÃ¡gi kulccsal tÃ¶rtÃ©nÅ‘ hitelesÃtÃ©st engedÃ©lyeztÃ¼k a fiÃ³kodon. A biztonsÃ¡gi kulcsodat mostantÃ³l hasznÃ¡lhatod bejelentkezÃ©sre.
+        subject: 'Mastodon: BiztonsÃ¡gi kulcsos hitelesÃtÃ©s engedÃ©lyezve'
+        title: BiztonsÃ¡gi kulcsok engedÃ©lyezve
     omniauth_callbacks:
       failure: Sikertelen hitelesÃtÃ©s %{kind} fiÃ³krÃ³l, mert "%{reason}".
       success: Sikeres hitelesÃtÃ©s %{kind} fiÃ³krÃ³l.
@@ -94,5 +111,5 @@ hu:
       not_found: nem talÃ¡lhatÃ³
       not_locked: nincs lezÃ¡rva
       not_saved:
-        one: '1 hiba megakadÃ¡lyozta %{resource} mentÃ©sÃ©t:'
-        other: "%{count} szÃ¡mÃº hiba megakadÃ¡lyozta %{resource} mentÃ©sÃ©t:"
+        one: '1 hiba megakadÃ¡lyozta e %{resource} mentÃ©sÃ©t:'
+        other: "%{count} hiba megakadÃ¡lyozta e %{resource} mentÃ©sÃ©t:"
diff --git a/config/locales/devise.hy.yml b/config/locales/devise.hy.yml
index d7ebe3338fd50283eddbafca2c369407c90bf89f..2a75385e9fbfd90dba26bf0e8475ea2fb09afa95 100644
--- a/config/locales/devise.hy.yml
+++ b/config/locales/devise.hy.yml
@@ -2,12 +2,12 @@
 hy:
   devise:
     confirmations:
-      confirmed: ÕÕ¥Ö€ Õ§Õ¬ÖƒÕ¸Õ½Õ¿Õ« Õ°Õ¡Õ½ÖÕ¥Õ¶ Õ°Õ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¡Õ´Õ¢ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¾Õ¥ÖÖ‰
-      send_instructions: Õ„Õ¥Õ¶Ö„ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¥Õ¬ Õ¥Õ¶Ö„ ÕÕ¥Õ¦ Õ§Õ¬â€¤Õ¶Õ¡Õ´Õ¡Õ¯Õ Õ¶Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¸Õ¾, Õ©Õ¥ Õ«Õ¶Õ¹ÕºÕ¥Õ½ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Ö„ Õ§Õ¬â€¤ÖƒÕ¸Õ½Õ¿Õ¨ Õ´Õ« Ö„Õ¡Õ¶Õ« Õ¾Õ¡ÕµÖ€Õ¯ÕµÕ¡Õ¶Õ¸Ö‚Õ´Ö‰ ÕÕ¿Õ¸Ö‚Õ£Õ¥ Õ±Õ¥Ö€ Õ©Õ¡ÖƒÕ¸Õ¶ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ¨, Õ¥Õ©Õ¥ Õ¶Õ¡Õ´Õ¡Õ¯ Õ¹Õ¥Ö„ Õ½Õ¿Õ¡ÖÕ¥Õ¬Ö‰
+      confirmed: ÕÕ¥Ö€ Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ« Õ°Õ¡Õ½ÖÕ§Õ¶ ÕµÕ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¸Ö‚Õ¥ÖÖ‰
+      send_instructions: Õ„Õ« Ö„Õ¡Õ¶Õ« Ö€Õ¸ÕºÕ§Õ«Ö Õ¤Õ¸Ö‚ Õ¯Õ¨ Õ½Õ¿Õ¡Õ¶Õ¡Õ½ Õ«Õ´Õ¡Õ¯Õ Õ¶Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¸Õ¾, Õ©Õ§ Õ«Õ¶Õ¹ÕºÕ§Õ½ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ½ Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§Õ¤Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„, Õ½Õ¿Õ¸Ö‚Õ£Õ«Ö€ Õ½ÕºÕ¡Õ´ ÕºÕ¡Õ¶Õ¡Õ¯Õ¤, Õ¥Õ©Õ§ Õ¹Õ½Õ¿Õ¡Õ¶Õ¡Õ½ Õ«Õ´Õ¡Õ¯Ö‰
       send_paranoid_instructions: ÔµÕ©Õ¥ Õ±Õ¥Ö€ Õ§Õ¬â€¤ÖƒÕ¸Õ½Õ¿Õ« Õ°Õ¡Õ½ÖÕ¥Õ¶ Õ¡Ö€Õ¤Õ¥Õ¶ Õ¯Õ¡ Õ´Õ¥Ö€ Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¢Õ¡Õ¦Õ¡ÕµÕ¸Ö‚Õ´, Õ¡ÕºÕ¡ Õ´Õ¥Õ¶Ö„ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¥Õ¬ Õ¥Õ¶Ö„ ÕÕ¥Õ¦ Õ§Õ¬â€¤Õ¶Õ¡Õ´Õ¡Õ¯Õ Õ¶Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¸Õ¾, Õ©Õ¥ Õ«Õ¶Õ¹ÕºÕ¥Õ½ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Ö„ Õ§Õ¬â€¤ÖƒÕ¸Õ½Õ¿Õ¨ Õ´Õ« Ö„Õ¡Õ¶Õ« Õ¾Õ¡ÕµÖ€Õ¯ÕµÕ¡Õ¶Õ¸Ö‚Õ´Ö‰ ÕÕ¿Õ¸Ö‚Õ£Õ¥ Õ±Õ¥Ö€ Õ©Õ¡ÖƒÕ¸Õ¶ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ¨, Õ¥Õ©Õ¥ Õ¶Õ¡Õ´Õ¡Õ¯ Õ¹Õ¥Ö„ Õ½Õ¿Õ¡ÖÕ¥Õ¬Ö‰
     failure:
-      already_authenticated: Ô´Õ¸Ö‚Ö„ Õ¡Ö€Õ¤Õ¥Õ¶ Õ´Õ¸Ö‚Õ¿Ö„ Õ¥Ö„ Õ£Õ¸Ö€Õ®Õ¥Õ¬Ö‰
-      inactive: ÕÕ¥Ö€ Õ°Õ¡Õ·Õ«Õ¾Õ¨ Õ¤Õ¥Õ¼ Õ¡Õ¯Õ¿Õ«Õ¾Õ¡ÖÕ¾Õ¡Õ® Õ¹Õ§Ö‰
+      already_authenticated: Ô±Ö€Õ¤Õ§Õ¶ Õ´Õ¸Ö‚Õ¿Ö„ Õ¥Õ½ Õ£Õ¸Ö€Õ®Õ¥Õ¬
+      inactive: Õ€Õ¡Õ·Õ«Ö‚Õ¤ Õ¤Õ¥Õ¼ Õ¡Õ¯Õ¿Õ«Ö‚ Õ¹Õ§
       invalid: ÕÕÕ¡Õ¬ %{authentication_keys} Õ¯Õ¡Õ´ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Ö‰
       last_attempt: Ô´Õ¸Ö‚Ö„ Õ¸Ö‚Õ¶Õ¥Ö„ Õ¾Õ¥Ö€Õ»Õ«Õ¶ Õ°Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨, Õ¸Ö€Õ«Ö Õ°Õ¥Õ¿Õ¸ Õ°Õ¡Õ·Õ«Õ¾Õ¨ Õ¯Õ¡Ö€Õ£Õ¥Õ¡Õ¬Õ¡ÖƒÕ¡Õ¯Õ¾Õ«Ö‰
       locked: ÕÕ¥Ö€ Õ°Õ¡Õ·Õ«Õ¾Õ¨ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¾Õ¡Õ® Õ§Ö‰
@@ -20,28 +20,96 @@ hy:
       confirmation_instructions:
         action: Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬ Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ¥Õ¶
         action_with_app: Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Ö„ Ö‡ Õ¥Õ¿ Õ¡Õ¶ÖÕ¥Ö„ %{app}
-        title: Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬ Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ¥Õ¶
+        explanation: Ô´Õ¸Ö‚ Õ¡Ö€Õ¤Õ§Õ¶ Õ½Õ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ¥Õ½ Õ°Õ¡Õ·Õ«Ö‚ %{host}Õ¸Ö‚Õ´ Õ¡ÕµÕ½ Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ¸Õ¾Ö‰ Ô´Õ¸Ö‚ Õ¡ÕµÕ¶ Õ¡Õ¯Õ¿Õ«Ö‚Õ¡ÖÕ¶Õ¥Õ¬Õ¸Ö‚Ö Õ°Õ¥Õ¼Õ¸Ö‚ Õ¥Õ½ Õ´Õ§Õ¯ Õ¯Õ¿Õ¿Õ¸ÖÕ¸Õ¾Ö‰ ÔµÕ©Õ§ Õ¤Õ¸Ö‚ Õ¹Õ¥Õ½ Õ¥Õ²Õ¥Õ¬, Õ¡ÕºÕ¡ Õ¡Õ¶Õ¿Õ¥Õ½Õ«Ö€ Õ¡ÕµÕ½ Õ«Õ´Õ¡Õ¯Õ¨Ö‰
+        explanation_when_pending: Ô´Õ¸Ö‚ Õ¡Ö€Õ¤Õ§Õ¶ Õ¡ÕµÕ½ Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ¸Õ¾ Õ¤Õ«Õ´Õ¥Õ¬ Õ¥Õ½ %{host}Õ¸Ö‚Õ´ Õ°Ö€Õ¡Ö‚Õ§Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€Ö‰ ÔµÖ€Õ¢ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ½ Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§Õ¶, Õ´Õ¥Õ¶Ö„ Õ¯Õ¨ Õ¾Õ¥Ö€Õ¡Õ¶Õ¡ÕµÕ¥Õ¶Ö„ Ö„Õ¸ Õ¤Õ«Õ´Õ¸Ö‚Õ´Õ¨Ö‰ Ô¿Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ´Õ¸Ö‚Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬Õ¶Õ¥Ö€Õ¤ ÖƒÕ¸ÖƒÕ¸ÕÕ¥Õ¬Õ¸Ö‚ Õ¯Õ¡Õ´ Õ°Õ¡Õ·Õ«Ö‚Õ¤ Õ»Õ¶Õ»Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€, Õ¢Õ¡ÕµÖ Õ¡ÕµÕ¬ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ« Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ«Õ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¹Õ¸Ö‚Õ¶Õ¥Õ½Õ Õ¶Õ¡ÕÖ„Õ¡Õ¶ Õ°Õ¡Õ·Õ¸Ö‚Õ«Õ¤ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¸Ö‚Õ´Õ¨Ö‰ ÔµÕ©Õ§ Õ¤Õ«Õ´Õ¸Ö‚Õ´Õ¤ Õ´Õ¥Ö€ÕªÕ¸Ö‚Õ«, Ö„Õ¸ Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬Õ¶Õ¥Ö€Õ¨ Õ¯Õ¨ Õ¾Õ¥Ö€Õ¡ÖÕ¸Ö‚Õ¥Õ¶, Õ¥Ö‚ Ö„Õ¥Õ¦Õ¶Õ«Ö Õ¡ÕµÕ¬ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¹Õ« Õ½ÕºÕ¡Õ½Õ¸Ö‚Õ«Ö‰ ÔµÕ©Õ§ Õ¤Õ¸Ö‚ Õ¹Õ¥Õ½ Õ¥Õ²Õ¥Õ¬, ÕÕ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„, Õ¡Õ¶Õ¿Õ¥Õ½Õ«Ö€ Õ¡ÕµÕ½ Õ«Õ´Õ¡Õ¯Õ¨Ö‰
+        extra_html: Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„, Õ¿Õ¥Õ½ Õ¶Õ¡Õ¥Ö‚ <a href="%{terms_path}">Õ½Õ¥Ö€Õ¸Ö‚Õ¥Ö€Õ« Õ¯Õ¡Õ¶Õ¸Õ¶Õ¶Õ¥Ö€Õ¨</a> Õ¥Ö‚ <a href="%{policy_path}">Õ®Õ¡Õ¼Õ¡ÕµÕ¸Ö‚Õ©Õ¥Õ¡Õ¶ ÕºÕ¡ÕµÕ´Õ¡Õ¶Õ¶Õ¥Ö€Õ¨</a>Ö‰
+        subject: Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶â€¤ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ´Õ¡Õ¶ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€ %{instance}Õ« Õ°Õ¡Õ´Õ¡Ö€
+        title: Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬ Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§Õ¶
       email_changed:
-        subject: Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶â€¤ Ô·Õ¬â€¤ÖƒÕ¸Õ½Õ¿Õ¨ ÖƒÕ¸ÖƒÕ¸ÕÕ¾Õ¥Ö
-        title: Õ†Õ¸Ö€ Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ¥
+        explanation: Õ”Õ¸ Õ°Õ¡Õ·Õ¸Ö‚Õ« Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§Õ¶ ÖƒÕ¸ÕÕ¸Ö‚Õ¥Õ¬ Õ§â€¤
+        extra: ÔµÕ©Õ§ Õ¤Õ¸Ö‚ Õ¹Õ¥Õ½ ÖƒÕ¸ÕÕ¥Õ¬ Ö„Õ¸ Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§Õ¶Õ Õ¶Õ·Õ¡Õ¶Õ¡Õ¯Õ¸Ö‚Õ´ Õ§, Õ¸Ö€ Õ¸Ö€Õ¥Ö‚Õ§ Õ´Õ§Õ¯Õ¨ Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ«Õ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¸Ö‚Õ¶Õ« Ö„Õ¸ Õ°Õ¡Õ·Õ¸Ö‚Õ«Õ¶Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„, Õ·Õ¿Õ¡Õº ÖƒÕ¸ÕÕ«Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¤ Õ¯Õ¡Õ´ Õ¯Õ¡ÕºÕ¸Ö‚Õ«Ö€ Õ½Õ¥Ö€Õ¸Ö‚Õ§Ö€Õ« Õ¡Õ¤Õ´Õ«Õ¶Õ« Õ°Õ¥Õ¿, Õ¸Ö€ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ« Õ°Õ¡Õ·Õ«Ö‚Õ¤Ö‰
+        subject: Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶â€¤ Ô·Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ¨ ÖƒÕ¸ÖƒÕ¸ÕÕ¸Ö‚Õ¥Ö
+        title: Õ†Õ¸Ö€ Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§
       password_change:
-        subject: Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶â€¤ Ô³Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨ ÖƒÕ¸ÖƒÕ¸ÕÕ¾Õ¥Ö
-        title: Ô³Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨ ÖƒÕ¸ÖƒÕ¸ÕÕ¾Õ¥Ö
+        explanation: Õ€Õ¡Õ·Õ¸Ö‚Õ«Õ¤ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨ ÖƒÕ¸ÖƒÕ¸ÕÕ¸Ö‚Õ¥ÖÖ‰
+        extra: ÔµÕ©Õ§ Õ¤Õ¸Ö‚ Õ¹Õ¥Õ½ ÖƒÕ¸ÕÕ¥Õ¬ Ö„Õ¸ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨Õ Õ¶Õ·Õ¡Õ¶Õ¡Õ¯Õ¸Ö‚Õ´ Õ§, Õ¸Ö€ Õ¸Ö€Õ¥Ö‚Õ§ Õ´Õ§Õ¯Õ¨ Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ«Õ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¸Ö‚Õ¶Õ« Ö„Õ¸ Õ°Õ¡Õ·Õ¸Ö‚Õ«Õ¶Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„, Õ·Õ¿Õ¡Õº ÖƒÕ¸ÕÕ«Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¤ Õ¯Õ¡Õ´ Õ¯Õ¡ÕºÕ¸Ö‚Õ«Ö€ Õ½Õ¥Ö€Õ¸Ö‚Õ§Ö€Õ« Õ¡Õ¤Õ´Õ«Õ¶Õ« Õ°Õ¥Õ¿, Õ¸Ö€ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ« Õ°Õ¡Õ·Õ«Ö‚Õ¤Ö‰
+        subject: Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶â€¤ Ô³Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨ ÖƒÕ¸ÖƒÕ¸ÕÕ¸Ö‚Õ¥Ö
+        title: Ô³Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨ ÖƒÕ¸ÖƒÕ¸ÕÕ¸Ö‚Õ¥Ö
       reconfirmation_instructions:
-        explanation: Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Ö„ Õ¶Õ¸Ö€ Õ§Õ¬â€¤Õ°Õ¡Õ½ÖÕ¥Õ¶, Õ±Õ¥Ö€ Õ§Õ¬â€¤Õ©Õ¸Õ½Õ¿Õ¨ ÖƒÕ¸ÕÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰
-        title: Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬ Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ¥Õ¶
+        explanation: Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ«Ö€ Ö„Õ¸ Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§Õ¶ Õ¡ÕµÕ¶ ÖƒÕ¸ÕÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰
+        extra: ÔµÕ©Õ§ Õ¡ÕµÕ½ ÖƒÕ¸ÖƒÕ¸ÕÕ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ¤Õ¸Ö‚ Õ¹Õ¥Õ½ Õ¶Õ¡ÕÕ¡Õ±Õ¥Õ¼Õ¶Õ¥Õ¬Õ Õ¡Õ¶Õ¿Õ¥Õ½Õ«Ö€ Õ¡ÕµÕ½ Õ«Õ´Õ¡Õ¯Õ¨Ö‰ Ô·Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§Õ¶ Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶ Õ°Õ¡Õ·Õ¸Ö‚Õ« Õ°Õ¡Õ´Õ¡Ö€ Õ¹Õ« ÖƒÕ¸ÖƒÕ¸ÕÕ¸Ö‚Õ«, Ö„Õ¡Õ¶Õ« Õ¤Õ¥Õ¼ Õ¤Õ¸Ö‚ Õ¹Õ¥Õ½ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬ Õ¾Õ¥Ö€Õ¥Ö‚Õ« ÕµÕ²Õ¸Ö‚Õ´Õ¨Ö‰
+        subject: Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶â€¤ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ«Ö€ Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§Õ¶ %{instance}Õ« Õ°Õ¡Õ´Õ¡Ö€
+        title: Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬ Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§Õ¶
       reset_password_instructions:
         action: Õ“Õ¸ÕÕ¥Õ¬ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨
-        title: ÕŽÕ¥Ö€Õ¡Õ¯Õ¡ÕµÕ¥Õ¬ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨
+        explanation: Ô´Õ¸Ö‚ ÕºÕ¡Õ°Õ¡Õ¶Õ»Õ¥Õ¬ Õ¥Õ½ Õ¶Õ¸Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼ Õ¡ÕµÕ½ Õ°Õ¡Õ·Õ¸Ö‚Õ« Õ°Õ¡Õ´Õ¡Ö€Ö‰
+        extra: ÔµÕ©Õ§ Õ¤Õ¸Ö‚ Õ¹Õ¥Õ½ ÕºÕ¡Õ°Õ¡Õ¶Õ»Õ¥Õ¬ Õ¡ÕµÕ¶, ÕÕ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¡Õ¶Õ¿Õ¥Õ½Õ«Ö€ Õ¡ÕµÕ½ Õ«Õ´Õ¡Õ¯Õ¨Ö‰ Õ”Õ¸ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨ Õ¹Õ« ÖƒÕ¸ÕÕ¸Ö‚Õ«, Ö„Õ¡Õ¶Õ« Õ¤Õ¥Õ¼ Õ¤Õ¸Ö‚ Õ¹Õ¥Õ½ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬ Õ¾Õ¥Ö€Õ¥Ö‚Õ« ÕµÕ²Õ¸Ö‚Õ´Õ¨ Õ¥Ö‚ Õ½Õ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ¶Õ¸Ö€Õ¨Ö‰
+        subject: Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶â€¤ Ô³Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ« Õ¾Õ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ´Õ¡Õ¶ Õ¶Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€
+        title: ÕŽÕ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ¥Õ¬ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨
       two_factor_disabled:
-        title: 2FA Õ¡Õ¶Õ»Õ¡Õ¿Õ¾Õ¡Õ® Õ§
+        explanation: 2FAÖŠÕ¶ Ö„Õ¸ Õ°Õ¡Õ·Õ¸Ö‚Õ« Õ°Õ¡Õ´Õ¡Ö€ Õ¡Õ¶Õ»Õ¡Õ¿Õ¸Ö‚Õ¥ÖÖ‰ Õ„Õ¸Ö‚Õ¿Ö„Õ¶ Õ¡ÕµÕªÕ´ Õ°Õ¶Õ¡Ö€Õ¡Ö‚Õ¸Ö€ Õ§ Õ´Õ«Õ¡ÕµÕ¶ Õ§Õ¬â€¤ ÖƒÕ¸Õ¿Õ« Õ¥Ö‚ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ« Õ´Õ«Õ»Õ¸ÖÕ¸Õ¾Ö‰
+        subject: Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶â€¤ 2FAÖŠÕ¶ Õ¡Õ¶Õ»Õ¡Õ¿Õ¸Ö‚Õ¥Ö
+        title: 2FA Õ¡Õ¶Õ»Õ¡Õ¿Õ¸Ö‚Õ¡Õ® Õ§
       two_factor_enabled:
-        title: 2FA Õ´Õ«Õ¡ÖÕ¾Õ¡Õ® Õ§
+        explanation: 2FAÖŠÕ¶ Ö„Õ¸ Õ°Õ¡Õ·Õ¸Ö‚Õ« Õ°Õ¡Õ´Õ¡Ö€ Õ´Õ«Õ¡ÖÕ¸Ö‚Õ¡Õ® Õ§Ö‰ TOTP Õ®Ö€Õ¡Õ£Ö€Õ« Õ´Õ«Õ»Õ¸ÖÕ¸Õ¾ Õ£Õ¥Õ¶Õ¥Ö€Õ¡ÖÕ¸Ö‚Õ¡Õ® tokenÖŠÕ¨ ÕºÕ§Õ¿Ö„ Õ§ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ½ Õ´Õ¸Ö‚Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰
+        subject: Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶â€¤ 2FA-Õ¶ Õ´Õ«Õ¡ÖÕ¸Ö‚Õ¥Ö
+        title: 2FA Õ´Õ«Õ¡ÖÕ¸Ö‚Õ¡Õ® Õ§
+      two_factor_recovery_codes_changed:
+        explanation: Õ†Õ¡ÕÕ¸Ö€Õ¤ Õ¾Õ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ´Õ¡Õ¶ Õ¯Õ¸Õ¤Õ¥Ö€Õ¶ Õ¡Õ¶Õ¾Õ¡Ö‚Õ¥Ö€ Õ¥Õ¶, ÕºÕ§Õ¿Ö„ Õ§ Õ¶Õ¸Ö€Õ¨ Õ£Õ¥Õ¶Õ¥Ö€Õ¡ÖÕ¸Ö‚Õ«Ö‰
+        subject: Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶â€¤ 2FA Õ¾Õ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ´Õ¡Õ¶ Õ¯Õ¸Õ¤Õ¥Ö€Õ¨ Õ¯Ö€Õ¯Õ«Õ¶ Õ£Õ¥Õ¶Õ¥Ö€Õ¡ÖÕ¸Ö‚Õ¥Õ¬ Õ¥Õ¶
+        title: 2FA Õ¾Õ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ´Õ¡Õ¶ Õ¯Õ¸Õ¤Õ¥Ö€Õ¨ ÖƒÕ¸ÖƒÕ¸ÕÕ¸Ö‚Õ¥Õ¬ Õ¥Õ¶
       unlock_instructions:
-        subject: Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶â€¤ Ô±ÕºÕ¡Õ¯Õ¸Õ²ÕºÕ¥Õ¬Õ¸Ö‚ Õ¶Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨
+        subject: Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶â€¤ Ô±ÕºÕ¡Õ¯Õ¸Õ²ÕºÕ¥Õ¬Õ¸Ö‚ Õ¶Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¨
+      webauthn_credential:
+        added:
+          explanation: Õ€Õ¥Õ¿Õ¥Ö‚Õ¥Õ¡Õ¬ Õ¡Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶ Õ§ Õ¡Ö‚Õ¥Õ¬Õ¡ÖÕ¸Ö‚Õ¥Õ¬ Õ°Õ¡Õ·Õ¸Ö‚Õ«Õ¤
+          subject: Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶â€¤ Õ†Õ¸Ö€ Õ¡Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«
+          title: Õ†Õ¸Ö€ Õ¡Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ« Õ§ Õ¡Ö‚Õ¥Õ¬Õ¡ÖÕ¸Ö‚Õ¥Õ¬
+        deleted:
+          explanation: Õ€Õ¥Õ¿Õ¥Ö‚Õ¥Õ¡Õ¬ Õ¡Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶ Ö„Õ¸ Õ°Õ¡Õ·Õ¸Ö‚Õ«Ö Õ»Õ¶Õ»Õ¸Ö‚Õ¥Õ¬ Õ§
+          subject: Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶â€¤ Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶ Õ»Õ¶Õ»Õ¸Ö‚Õ¥Õ¬ Õ§
+          title: Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶Õ¥Ö€Õ«ÖÕ¤ Õ´Õ¥Õ¯Õ¨ Õ»Õ¶Õ»Õ¸Ö‚Õ¥Õ¬ Õ§
+      webauthn_disabled:
+        explanation: Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶Õ¥Ö€Õ¸Õ¾ Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¸Ö‚Õ´Õ¨ Ö„Õ¸ Õ°Õ¡Õ·Õ¸Ö‚Õ«Ö Õ¯Õ¡Õ½Õ¥ÖÕ¸Ö‚Õ¥Õ¬ Õ§Ö‰ Õ„Õ¸Ö‚Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ¥Õ¬Õ¶ Õ¡ÕµÕªÕ´ Õ°Õ¶Õ¡Ö€Õ¡Ö‚Õ¸Ö€ Õ§Õ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬Õ¸Õ¾ Õ´Õ«Õ¡ÕµÕ¶ Õ¦Õ¸Ö‚Õ£Õ¡Ö‚Õ¸Ö€Õ¸Ö‚Õ¡Õ® TOTP ÕµÕ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Õ«Ö Õ£Õ¥Õ¶Õ¥Ö€Õ¡ÖÕ¸Ö‚Õ¡Õ® Õ¯Õ¿Ö€Ö…Õ¶Õ¨Ö‰
+        subject: Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶â€¤ Õ†Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¸Ö‚Õ´Õ¶ Õ¡Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶Õ¥Ö€Õ¸Õ¾ Õ¯Õ¡Õ½Õ¥ÖÕ¸Ö‚Õ¡Õ® Õ§
+        title: Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶Õ¥Ö€Õ¨ Õ¯Õ¡Õ½Õ¥ÖÕ¸Ö‚Õ¥Õ¬ Õ¥Õ¶
+      webauthn_enabled:
+        explanation: Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¸Õ¾ Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¸Ö‚Õ´Õ¨ Ö„Õ¸ Õ°Õ¡Õ·Õ¸Ö‚Õ« Õ°Õ¡Õ´Õ¡Ö€ Õ´Õ«Õ¡ÖÕ¸Ö‚Õ¡Õ® Õ§Ö‰ Õ”Õ¸ Õ¡Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶ Õ¡ÕµÕªÕ´ Õ¯Õ¡Ö€Õ¸Õ² Õ§ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ¥Õ¬ Õ´Õ¸Ö‚Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰
+        subject: Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶â€¤ Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¸Õ¾ Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¸Ö‚Õ´Õ¨ Õ´Õ«Õ¡ÖÕ¸Ö‚Õ¡Õ® Õ§
+        title: Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶Õ¥Ö€Õ¨ Õ´Õ«Õ¡ÖÕ¸Ö‚Õ¥Õ¬ Õ¥Õ¶
+    omniauth_callbacks:
+      failure: Õ†Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¶Õ¥Õ¬ Õ°Õ¶Õ¡Ö€Õ¡Ö‚Õ¸Ö€ Õ¹Õ¥Õ²Õ¡Ö‚ %{kind}Õ«Ö Ö„Õ¡Õ¶Õ« Õ¸Ö€ %{reason}Ö‰
+      success: Õ…Õ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢ Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¸Ö‚Õ¥Ö %{kind} Õ°Õ¡Õ·Õ¸Ö‚Õ«ÖÖ‰
+    passwords:
+      no_token: Ô´Õ¸Ö‚ Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ«Õ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¹Õ¸Ö‚Õ¶Õ¥Õ½ Õ¡ÕµÕ½ Õ§Õ»Õ«Õ¶, Õ¡Õ¼Õ¡Õ¶Ö Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ« ÖƒÕ¸ÖƒÕ¸ÕÕ´Õ¡Õ¶ Õ«Õ´Õ¡Õ¯Õ« ÕµÕ²Õ´Õ¡Õ¶Ö‰ ÔµÕ©Õ§ Õ¥Õ¯Õ¥Õ¬ Õ¥Õ½ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ« Õ¾Õ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ´Õ¡Õ¶ Õ«Õ´Õ¡Õ¯Õ« Õ´Õ«Õ»Õ¸ÖÕ¸Õ¾, Õ¡ÕºÕ¡ ÕÕ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„, Õ°Õ¡Õ´Õ¸Õ¦Õ¸Ö‚Õ«Ö€, Õ¸Ö€ Õ¿Ö€Õ¡Õ´Õ¡Õ¤Ö€Õ¸Ö‚Õ¡Õ® URLÖŠÕ¶ ÖƒÕ¡Õ¯ÖÖ€Õ¥Õ¬ Õ¥Õ½ Õ¡Õ´Õ¢Õ¸Õ²Õ»Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢Ö‰
+      send_instructions: ÔµÕ©Õ§ Ö„Õ¸ Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ« Õ°Õ¡Õ½ÖÕ§Õ¶ Õ¡Ö€Õ¤Õ§Õ¶ Õ¯Õ¡Õµ Õ´Õ¥Ö€ Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¢Õ¡Õ¦Õ¡ÕµÕ¸Ö‚Õ´, Õ¤Õ¸Ö‚ Õ´Õ« Ö„Õ¡Õ¶Õ« Ö€Õ¸ÕºÕ§Õ«Ö Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ«Õ¤ Õ¯Õ¨ Õ½Õ¿Õ¡Õ¶Õ¡Õ½ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ« Õ¾Õ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ´Õ¡Õ¶ ÕµÕ²Õ¸Ö‚Õ´Õ¨Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„, Õ½Õ¿Õ¸Ö‚Õ£Õ«Ö€ Õ½ÕºÕ¡Õ´ ÕºÕ¡Õ¶Õ¡Õ¯Õ¤, Õ¥Õ©Õ§ Õ¹Õ½Õ¿Õ¡Õ¶Õ¡Õ½ Õ«Õ´Õ¡Õ¯Õ¨Ö‰
+      send_paranoid_instructions: ÔµÕ©Õ§ Ö„Õ¸ Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ« Õ°Õ¡Õ½ÖÕ§Õ¶ Õ¡Ö€Õ¤Õ§Õ¶ Õ¯Õ¡Õµ Õ´Õ¥Ö€ Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¢Õ¡Õ¦Õ¡ÕµÕ¸Ö‚Õ´, Õ¤Õ¸Ö‚ Õ´Õ« Ö„Õ¡Õ¶Õ« Ö€Õ¸ÕºÕ§Õ«Ö Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ«Õ¤ Õ¯Õ¨ Õ½Õ¿Õ¡Õ¶Õ¡Õ½ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ« Õ¾Õ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ´Õ¡Õ¶ ÕµÕ²Õ¸Ö‚Õ´Õ¨Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„, Õ½Õ¿Õ¸Ö‚Õ£Õ«Ö€ Õ½ÕºÕ¡Õ´ ÕºÕ¡Õ¶Õ¡Õ¯Õ¤, Õ¥Õ©Õ§ Õ¹Õ½Õ¿Õ¡Õ¶Õ¡Õ½ Õ«Õ´Õ¡Õ¯Õ¨Ö‰
+      updated: Ô³Õ¡Õ²Õ¿Õ¡Õ¢Õ¡Õ¼Õ¤ ÖƒÕ¸ÖƒÕ¸ÕÕ¸Ö‚Õ¥Ö ÕµÕ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢Ö‰ Ô±ÕµÕªÕ´ Õ´Õ¸Ö‚Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ¡Õ® Õ¥Õ½Ö‰
+      updated_not_active: Ô³Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¤ ÖƒÕ¸ÖƒÕ¸ÕÕ¸Ö‚Õ¥Ö ÕµÕ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢Ö‰
+    registrations:
+      destroyed: Õ‘Õ¨Õœâ€¤ Õ”Õ¸ Õ°Õ¡Õ·Õ«Ö‚Õ¨ ÕµÕ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢ Õ¹Õ¥Õ²Õ¡Ö€Õ¯Õ¸Ö‚Õ¥ÖÖ‰ Õ…Õ¸ÕµÕ½ Õ¸Ö‚Õ¶Õ¥Õ¶Ö„ Ö„Õ¥Õ¦ Õ¯Ö€Õ¯Õ«Õ¶ Õ¿Õ¥Õ½Õ¶Õ¥Õ¬Ö‰
+      signed_up: ÕˆÕ²Õ»Õ¸ÕœÕµÕ¶Ö‰ Ô²Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ£Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ¥ÖÕ«Ö€Ö‰
+      signed_up_but_inactive: Ô²Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ£Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ¥ÖÕ«Ö€Ö‰ ÕÕ¡Õ¯Õ¡ÕµÕ¶, Õ¤Õ¥Õ¼ Õ¹Õ¥Õ½ Õ¯Õ¡Ö€Õ¸Õ² Õ´Õ¸Ö‚Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ¥Õ¬, Ö„Õ¡Õ¶Õ« Õ¸Ö€ Õ°Õ¡Õ·Õ«Ö‚Õ¤ Õ¤Õ¥Õ¼ Õ¡Õ¯Õ¿Õ«Ö‚ Õ¹Õ§Ö‰
+      signed_up_but_locked: Ô²Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ£Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ¥ÖÕ«Ö€Ö‰ ÕÕ¡Õ¯Õ¡ÕµÕ¶, Õ¤Õ¥Õ¼ Õ¹Õ¥Õ½ Õ¯Õ¡Ö€Õ¸Õ² Õ´Õ¸Ö‚Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ¥Õ¬, Ö„Õ¡Õ¶Õ« Õ¸Ö€ Õ°Õ¡Õ·Õ«Ö‚Õ¤ ÖƒÕ¡Õ¯ Õ§Ö‰
+      signed_up_but_pending: Õ€Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨Õ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ´Õ¡Õ¶ ÕµÕ²Õ¸Ö‚Õ´Õ¸Õ¾ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¸Ö‚Õ¥Õ¬ Õ§ Ö„Õ¸ Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ«Õ¶Ö‰ Õ…Õ²Õ´Õ¡Õ¶Õ¨ Õ¯Õ¿Õ¿Õ¡ÖÕ¶Õ¥Õ¬Õ¸Ö‚Ö ÕµÕ¥Õ¿Õ¸Õµ Õ´Õ¥Õ¶Ö„ Õ¯Õ¨ Õ¾Õ¥Ö€Õ¡Õ¶Õ¡ÕµÕ¥Õ¶Ö„ Ö„Õ¸ Õ¤Õ«Õ´Õ¸Ö‚Õ´Õ¨Ö‰ Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¸Ö‚Õ´Õ«Ö ÕµÕ¥Õ¿Õ¸Õµ Ö„Õ¥Õ¦ Õ¯Õ¨ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡ÖÕ¶Õ¥Õ¶Ö„Ö‰
+      signed_up_but_unconfirmed: Õ€Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨Õ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ´Õ¡Õ¶ ÕµÕ²Õ¸Ö‚Õ´Õ¸Õ¾ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¸Ö‚Õ¥Õ¬ Õ§ Ö„Õ¸ Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ«Õ¶Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ°Õ¥Õ¿Õ¥Ö‚Õ«Ö€ ÕµÕ²Õ´Õ¡Õ¶Õ¨ Õ°Õ¡Õ·Õ«Ö‚Õ¤ Õ¡Õ¯Õ¿Õ«Ö‚Õ¡ÖÕ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„, Õ½Õ¿Õ¸Ö‚Õ£Õ«Ö€ Õ½ÕºÕ¡Õ´ ÕºÕ¡Õ¶Õ¡Õ¯Õ¨, Õ¥Õ©Õ§ Õ¹Õ½Õ¿Õ¡Õ¶Õ¡Õ½ Õ«Õ´Õ¡Õ¯Ö‰
+      update_needs_confirmation: Ô²Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ©Õ¡Ö€Õ´Õ¡ÖÖ€Õ«Ö€ Õ°Õ¡Õ·Õ«Ö‚Õ¤, Õ¢Õ¡ÕµÖ Õ´Õ¥Õ¶Ö„ ÕºÕ§Õ¿Ö„ Õ§ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¶Ö„ Ö„Õ¸ Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§Õ¶Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„, Õ½Õ¿Õ¸Ö‚Õ£Õ«Ö€ ÖƒÕ¸Õ½Õ¿Õ¤ Õ¥Ö‚ Õ°Õ¥Õ¿Õ¥Ö‚Õ«Ö€ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ´Õ¡Õ¶ ÕµÕ²Õ´Õ¡Õ¶Õ¨Õ Õ¶Õ¸Ö€ Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§Õ¤ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰ ÕÕ¿Õ¸Ö‚Õ£Õ«Ö€ Õ½ÕºÕ¡Õ´ ÕºÕ¡Õ¶Õ¡Õ¯Õ¨, Õ«Õ´Õ¡Õ¯ Õ¹Õ½Õ¿Õ¡Õ¶Õ¡Õ¬Õ¸Ö‚ Õ¤Õ§ÕºÖ„Õ¸Ö‚Õ´Ö‰
+      updated: Õ€Õ¡Õ·Õ«Ö‚Õ¤ Õ¢Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ©Õ¡Ö€Õ´Õ¡ÖÕ¸Ö‚Õ¥ÖÖ‰
     sessions:
-      signed_in: Õ„Õ¸Ö‚Õ¿Ö„Õ¨ Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥ÖÖ‰
+      already_signed_out: Ô²Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ¤Õ¸Ö‚Ö€Õ½ Õ¥Õ¯Õ¡Ö€Ö‰
+      signed_in: Õ„Õ¸Ö‚Õ¿Ö„Õ¨ ÕµÕ¡Õ»Õ¸Õ²Õ¸Ö‚Õ¥ÖÖ‰
+      signed_out: Ô²Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ¤Õ¸Ö‚Ö€Õ½ Õ¥Õ¯Õ¡Ö€Ö‰
+    unlocks:
+      send_instructions: Õ„Õ« Ö„Õ¡Õ¶Õ« Ö€Õ¸ÕºÕ§Õ«Ö Õ¤Õ¸Ö‚ Õ¯Õ¨ Õ½Õ¿Õ¡Õ¶Õ¡Õ½ Õ«Õ´Õ¡Õ¯Õ Õ¶Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¸Õ¾,  Õ©Õ§ Õ«Õ¶Õ¹ÕºÕ§Õ½ Õ¢Õ¡ÖÕ¥Õ½ Õ°Õ¡Õ·Õ«Ö‚Õ¤Ö‰ Ô»Õ´Õ¡Õ¯ Õ¹Õ½Õ¿Õ¡Õ¶Õ¡Õ¬Õ¸Ö‚ Õ¤Õ§ÕºÖ„Õ¸Ö‚Õ´, ÕÕ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„, Õ½Õ¿Õ¸Ö‚Õ£Õ«Ö€ Õ½ÕºÕ¡Õ´ ÕºÕ¡Õ¶Õ¡Õ¯Õ¨Ö‰
+      send_paranoid_instructions: ÔµÕ©Õ§ Õ°Õ¡Õ·Õ«Ö‚Õ¤ Õ£Õ¸ÕµÕ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¸Ö‚Õ¶Õ«Õ Õ´Õ« Ö„Õ¡Õ¶Õ« Ö€Õ¸ÕºÕ§Õ«Ö Õ¤Õ¸Ö‚ Õ¯Õ¨ Õ½Õ¿Õ¡Õ¶Õ¡Õ½ Õ«Õ´Õ¡Õ¯Õ Õ¶Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¸Õ¾,  Õ©Õ§ Õ«Õ¶Õ¹ÕºÕ§Õ½ Õ¢Õ¡ÖÕ¥Õ½ Õ¡ÕµÕ¶Ö‰ Ô»Õ´Õ¡Õ¯ Õ¹Õ½Õ¿Õ¡Õ¶Õ¡Õ¬Õ¸Ö‚ Õ¤Õ§ÕºÖ„Õ¸Ö‚Õ´, ÕÕ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„, Õ½Õ¿Õ¸Ö‚Õ£Õ«Ö€ Õ½ÕºÕ¡Õ´ ÕºÕ¡Õ¶Õ¡Õ¯Õ¨Ö‰
+      unlocked: Õ€Õ¡Õ·Õ«Ö‚Õ¤ Õ¢Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ¢Õ¡ÖÕ¸Ö‚Õ¥ÖÖ‰ Õ‡Õ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ ÕÕ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ´Õ¸Ö‚Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ«Ö€Ö‰
   errors:
     messages:
-      not_found: Õ¹Õ£Õ¿Õ¶Õ¾Õ¥Ö
-      not_locked: Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¾Õ¡Õ® Õ¹Õ§
+      already_confirmed: Õ¡Ö€Õ¤Õ§Õ¶ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¸Ö‚Õ¡Õ® Õ§, ÕÕ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ´Õ¸Ö‚Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ«Ö€
+      confirmation_period_expired: ÕºÕ§Õ¿Ö„ Õ§ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¸Ö‚Õ§Ö€ %{period} Õ¨Õ¶Õ©Õ¡ÖÖ„Õ¸Ö‚Õ´, ÕÕ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ ÕºÕ¡Õ°Õ¡Õ¶Õ»Õ«Ö€ Õ¶Õ¸Ö€Õ¨
+      expired: Õ½ÕºÕ¡Õ¼Õ¸Ö‚Õ¥Õ¬ Õ§, ÕÕ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¶Õ¸Ö€Õ¨ ÕºÕ¡Õ°Õ¡Õ¶Õ»Õ«Ö€
+      not_found: Õ¹Õ£Õ¿Õ¶Õ¸Ö‚Õ¥Ö
+      not_locked: Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ¡Õ® Õ¹Õ§
+      not_saved:
+        one: 1 Õ½ÕÕ¡Õ¬ Õ©Õ¸ÕµÕ¬ Õ¹Õ¿Õ¸Ö‚Õ¥Ö ÕºÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬ Õ¡ÕµÕ½ %{resource}Õ¨â€¤
+        other: "%{count} Õ½ÕÕ¡Õ¬Õ¶Õ¥Ö€ Õ©Õ¸ÕµÕ¬ Õ¹Õ¿Õ¸Ö‚Õ¥ÖÕ«Õ¶ ÕºÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬ Õ¡ÕµÕ½ %{resource}Õ¨â€¤"
diff --git a/config/locales/devise.id.yml b/config/locales/devise.id.yml
index 5b4e8af43da85803ea6898671182cd62e5f0e74b..6fe6c257d36d167f5d11885feaedaafb3fcee18a 100644
--- a/config/locales/devise.id.yml
+++ b/config/locales/devise.id.yml
@@ -60,6 +60,23 @@ id:
         title: Kode pemulihan 2FA diubah
       unlock_instructions:
         subject: 'Mastodon: Petunjuk membuka'
+      webauthn_credential:
+        added:
+          explanation: Kunci keamanan berikut telah ditambahkan ke akun Anda
+          subject: 'Mastodon: Kunci keamanan baru'
+          title: Kunci keamanan baru telah ditambahkan
+        deleted:
+          explanation: Kunci keamanan berikut telah dihapus dari akun Anda
+          subject: 'Mastodon: Kunci keamanan dihapus'
+          title: Salah satu dari kunci keamanan Anda telah dihapus
+      webauthn_disabled:
+        explanation: Autentikasi dengan kunci keamanan telah dinonaktifkan untuk akun ini. Proses masuk akun hanya mungkin menggunakan token yang dibuat dengan aplikasi TOTP.
+        subject: 'Mastodon: Autentikasi dengan kunci keamanan dinoaktifkan'
+        title: Kunci keamanan dinonaktifkan
+      webauthn_enabled:
+        explanation: Autentikasi kunci keamanan telah diaktifkan untuk akun Anda. Kunci keamanan Anda kini dapat dipakai untuk masuk.
+        subject: 'Mastodon: Autentikasi kunci keamanan aktif'
+        title: Kunci keamanan aktif
     omniauth_callbacks:
       failure: Tidak dapat mengautentikasi anda dari %{kind} karena "%{reason}".
       success: Autentikasi dari akun %{kind} berhasil dilakukan.
diff --git a/config/locales/devise.is.yml b/config/locales/devise.is.yml
index 4d6fb39024753964650723c65420970a6374b6c6..e595f77afdf2c4abb0e998e98d660369a81d55fe 100644
--- a/config/locales/devise.is.yml
+++ b/config/locales/devise.is.yml
@@ -60,6 +60,23 @@ is:
         title: EndurheimtukÃ³Ã°ar tveggja-Ã¾Ã¡tta auÃ°kenningar breyttust
       unlock_instructions:
         subject: 'Mastodon: LeiÃ°beiningar til aÃ° aflÃ¦sa'
+      webauthn_credential:
+        added:
+          explanation: Eftirfarandi Ã¶ryggislykli hefur veriÃ° bÃ¦tt viÃ° notandaaÃ°ganginn Ã¾inn
+          subject: 'Mastodon: NÃ½r Ã¶ryggislykill'
+          title: NÃ½jum Ã¶ryggislykli hefur veriÃ° bÃ¦tt viÃ°
+        deleted:
+          explanation: Eftirfarandi Ã¶ryggislykli hefur veriÃ° eytt Ãºr notandaaÃ°gangnum Ã¾Ãnum
+          subject: 'Mastodon: Ã–ryggislykli eytt'
+          title: Einum af Ã¶ryggilyklunum Ã¾Ãnum hefur veriÃ° eytt
+      webauthn_disabled:
+        explanation: AuÃ°kenning meÃ° Ã¶ryggislyklum hefur veriÃ° gerÃ° Ã³virk fyrir aÃ°ganginn Ã¾inn. InnskrÃ¡ning er nÃºna einungis mÃ¶guleg meÃ° teikni ÃºtbÃºnu af paraÃ°a TOTP-forritinu.
+        subject: 'Mastodon: AuÃ°kenning meÃ° Ã¶ryggislyklum er Ã³virk'
+        title: Ã–ryggislyklar eru Ã³virkir
+      webauthn_enabled:
+        explanation: AuÃ°kenning meÃ° Ã¶ryggislykli hefur veriÃ° gerÃ° virk fyrir aÃ°ganginn Ã¾inn. NÃº er hÃ¦gt aÃ° nota Ã¶ryggislykilinn Ã¾inn til aÃ° skrÃ¡ inn.
+        subject: 'Mastodon: AuÃ°kenning meÃ° Ã¶ryggislykli er virk'
+        title: Ã–ryggislyklar eru virkir
     omniauth_callbacks:
       failure: Gat ekki auÃ°kennt Ã¾ig frÃ¡ %{kind} vegna "%{reason}".
       success: TÃ³kst aÃ° auÃ°kenna frÃ¡ %{kind} notandaaÃ°gangnum.
diff --git a/config/locales/devise.it.yml b/config/locales/devise.it.yml
index 714684924983c2d9fa7cfc09c7d6c5cae2b6f5f3..31e3c7f944242d5a887a68936d23d1a9d27d4578 100644
--- a/config/locales/devise.it.yml
+++ b/config/locales/devise.it.yml
@@ -60,6 +60,23 @@ it:
         title: Codici di recupero 2FA modificati
       unlock_instructions:
         subject: 'Mastodon: Istruzioni di sblocco'
+      webauthn_credential:
+        added:
+          explanation: La seguente chiave di sicurezza Ã¨ stata aggiunta al tuo account
+          subject: 'Mastodon: Nuova chiave di sicurezza'
+          title: Ãˆ stata aggiunta una nuova chiave di sicurezza
+        deleted:
+          explanation: La seguente chiave di sicurezza Ã¨ stata cancellata dal tuo account
+          subject: 'Mastodon: Chiave di sicurezza cancellata'
+          title: Una delle tue chiavi di sicurezza Ã¨ stata cancellata
+      webauthn_disabled:
+        explanation: L'autenticazione con le chiavi di sicurezza Ã¨ stata disabilitata per il tuo account. L'accesso Ã¨ ora possibile utilizzando solo il codice generato dall'app TOTP abbinata.
+        subject: 'Mastodon: Autenticazione con chiavi di sicurezza disabilitata'
+        title: Chiavi di sicurezza disattivate
+      webauthn_enabled:
+        explanation: L'autenticazione con chiave di sicurezza Ã¨ stata attivata per il tuo account. La chiave di sicurezza puÃ² ora essere utilizzata per l'accesso.
+        subject: 'Mastodon: Autenticazione della chiave di sicurezza abilitata'
+        title: Chiave di sicurezza abilitata
     omniauth_callbacks:
       failure: Impossibile autenticarti da %{kind} perchÃ© "%{reason}".
       success: Autenticato con successo con account %{kind}.
diff --git a/config/locales/devise.ja.yml b/config/locales/devise.ja.yml
index e697e290de7246dafd8b71d33bb99d6aa3820a4d..73e79be23a383487fe8d37773c1779e67ec7db1c 100644
--- a/config/locales/devise.ja.yml
+++ b/config/locales/devise.ja.yml
@@ -60,6 +60,23 @@ ja:
         title: äºŒæ®µéšŽèªè¨¼ã®ãƒªã‚«ãƒãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ãŒå¤‰æ›´ã•ã‚Œã¾ã—ãŸ
       unlock_instructions:
         subject: 'Mastodon: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ãƒãƒƒã‚¯ã®è§£é™¤'
+      webauthn_credential:
+        added:
+          explanation: æ¬¡ã®ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ãŒã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«è¿½åŠ ã•ã‚Œã¾ã—ãŸ
+          subject: 'Mastodon: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ãŒè¿½åŠ ã•ã‚Œã¾ã—ãŸ'
+          title: æ–°ã—ã„ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ãŒè¿½åŠ ã•ã‚Œã¾ã—ãŸ
+        deleted:
+          explanation: æ¬¡ã®ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ãŒã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‹ã‚‰å‰Šé™¤ã•ã‚Œã¾ã—ãŸ
+          subject: 'Mastodon: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ãŒå‰Šé™¤ã•ã‚Œã¾ã—ãŸ'
+          title: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ãŒå‰Šé™¤ã•ã‚Œã¾ã—ãŸ
+      webauthn_disabled:
+        explanation: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã«ã‚ˆã‚‹èªè¨¼ãŒç„¡åŠ¹ã«ãªã‚Šã¾ã—ãŸã€‚ãƒšã‚¢ãƒªãƒ³ã‚°ã•ã‚ŒãŸTOTPã‚¢ãƒ—ãƒªã«ã‚ˆã£ã¦ç”Ÿæˆã•ã‚ŒãŸãƒˆãƒ¼ã‚¯ãƒ³ã®ã¿ã‚’ä½¿ç”¨ã—ã¦ãƒã‚°ã‚¤ãƒ³ãŒå¯èƒ½ã«ãªã‚Šã¾ã—ãŸã€‚
+        subject: 'Mastodon: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼èªè¨¼ãŒç„¡åŠ¹ã«ãªã‚Šã¾ã—ãŸ'
+        title: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã¯ç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™
+      webauthn_enabled:
+        explanation: ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼èªè¨¼ãŒæœ‰åŠ¹ã«ãªã‚Šã¾ã—ãŸã€‚ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã‚’ãƒã‚°ã‚¤ãƒ³ã«ä½¿ç”¨ã§ãã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã—ãŸã€‚
+        subject: 'Mastodon: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼èªè¨¼ãŒæœ‰åŠ¹ã«ãªã‚Šã¾ã—ãŸ'
+        title: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã¯æœ‰åŠ¹ã«ãªã£ã¦ã„ã¾ã™
     omniauth_callbacks:
       failure: "%{reason}ã«ã‚ˆã£ã¦%{kind}ã‹ã‚‰ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’èªè¨¼ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
       success: "%{kind}ã‹ã‚‰ã®ã‚¢ã‚¯ã‚»ã‚¹ã¯æ£å¸¸ã«èªè¨¼ã•ã‚Œã¾ã—ãŸã€‚"
diff --git a/config/locales/devise.ko.yml b/config/locales/devise.ko.yml
index fbe036875e593ba18117f4335d813c5755edc533..92cda21ef7d88c47db9938d7d5674efe33a8fb29 100644
--- a/config/locales/devise.ko.yml
+++ b/config/locales/devise.ko.yml
@@ -60,13 +60,30 @@ ko:
         title: 2FA ë³µêµ¬ ì½”ë“œ ë³€ê²½ë¨
       unlock_instructions:
         subject: 'ë§ˆìŠ¤í† ëˆ: ìž ê¸ˆ í•´ì œ ë°©ë²•'
+      webauthn_credential:
+        added:
+          explanation: ê³„ì •ì— ë‹¤ìŒ ë³´ì•ˆ í‚¤ê°€ ë“±ë¡ë˜ì—ˆìŠµë‹ˆë‹¤
+          subject: 'ë§ˆìŠ¤í† ëˆ: ìƒˆë¡œìš´ ë³´ì•ˆ í‚¤'
+          title: ìƒˆ ë³´ì•ˆ í‚¤ê°€ ì¶”ê°€ë˜ì—ˆìŠµë‹ˆë‹¤
+        deleted:
+          explanation: ê³„ì •ì—ì„œ ë‹¤ìŒ ë³´ì•ˆ í‚¤ê°€ ì‚ì œë˜ì—ˆìŠµë‹ˆë‹¤
+          subject: 'ë§ˆìŠ¤í† ëˆ: ë³´ì•ˆ í‚¤ ì‚ì œ'
+          title: ë³´ì•ˆ í‚¤ê°€ ì‚ì œë˜ì—ˆìŠµë‹ˆë‹¤
+      webauthn_disabled:
+        explanation: ë³´ì•ˆ í‚¤ë¥¼ ì´ìš©í•œ ì¸ì¦ì´ ë‹¹ì‹ ì˜ ê³„ì •ì— ëŒ€í•´ ë¹„í™œì„±í™” ë˜ì–´ ìžˆìŠµë‹ˆë‹¤. TOTP ì•±ì˜ í† í°ë§Œìœ¼ë¡œ ë¡œê·¸ì¸ í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤.
+        subject: 'ë§ˆìŠ¤í† ëˆ: ë³´ì•ˆ í‚¤ë¥¼ ì´ìš©í•œ ì¸ì¦ì´ ë¹„í™œì„±í™” ë¨'
+        title: ë³´ì•ˆ í‚¤ ë¹„í™œì„±í™” ë¨
+      webauthn_enabled:
+        explanation: ë³´ì•ˆ í‚¤ ì¸ì¦ì´ ë‹¹ì‹ ì˜ ê³„ì •ì— ëŒ€í•´ í™œì„±í™” ë˜ì–´ ìžˆìŠµë‹ˆë‹¤. ë³´ì•ˆ í‚¤ë¥¼ í†µí•´ ë¡œê·¸ì¸ í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤.
+        subject: 'ë§ˆìŠ¤í† ëˆ: ë³´ì•ˆ í‚¤ ì¸ì¦ í™œì„±í™” ë¨'
+        title: ë³´ì•ˆ í‚¤ í™œì„±í™” ë¨
     omniauth_callbacks:
       failure: '"%{reason}" ë•Œë¬¸ì— ë‹¹ì‹ ì„ %{kind}ì—ì„œ ì¸ì¦í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤.'
       success: ì„±ê³µì ìœ¼ë¡œ %{kind} ê³„ì •ì„ ì¸ì¦ í–ˆìŠµë‹ˆë‹¤.
     passwords:
       no_token: íŒ¨ìŠ¤ì›Œë“œ ìž¬ì„¤ì • ì´ë©”ì¼ì„ ê±°ì¹˜ì§€ ì•Šê³ ëŠ” ì—¬ê¸°ì— ì˜¬ ìˆ˜ ì—†ìŠµë‹ˆë‹¤. ë§Œì•½ íŒ¨ìŠ¤ì›Œë“œ ìž¬ì„¤ì • ë©”ì¼ì—ì„œ ì˜¨ ê²ƒì´ë¼ë©´ URLì´ ë§žëŠ”ì§€ í™•ì¸í•´ ì£¼ì„¸ìš”.
-      send_instructions: ë‹¹ì‹ ì˜ ì´ë©”ì¼ ì£¼ì†Œê°€ ìš°ë¦¬ì˜ DBì— ìžˆì•„ë©´ íŒ¨ìŠ¤ì›Œë“œ ë³µêµ¬ ë§í¬ê°€ ëª‡ ë¶„ ì´ë‚´ì— ë©”ì¼ë¡œ ë°œì†¡ ë©ë‹ˆë‹¤. ë§Œì•½ ë©”ì¼ì„ ë°›ì§€ ëª» í•˜ì‹  ê²½ìš° ìŠ¤íŒ¸ í´ë”ë¥¼ í™•ì¸í•´ ì£¼ì„¸ìš”.
-      send_paranoid_instructions: ë‹¹ì‹ ì˜ ì´ë©”ì¼ ì£¼ì†Œê°€ ìš°ë¦¬ì˜ DBì— ìžˆì•„ë©´ íŒ¨ìŠ¤ì›Œë“œ ë³µêµ¬ ë§í¬ê°€ ëª‡ ë¶„ ì´ë‚´ì— ë©”ì¼ë¡œ ë°œì†¡ ë©ë‹ˆë‹¤. ë§Œì•½ ë©”ì¼ì„ ë°›ì§€ ëª» í•˜ì‹  ê²½ìš° ìŠ¤íŒ¸ í´ë”ë¥¼ í™•ì¸í•´ ì£¼ì„¸ìš”.
+      send_instructions: ë‹¹ì‹ ì˜ ì´ë©”ì¼ ì£¼ì†Œê°€ ìš°ë¦¬ì˜ DBì— ìžˆë‹¤ë©´ íŒ¨ìŠ¤ì›Œë“œ ë³µêµ¬ ë§í¬ê°€ ëª‡ ë¶„ ì´ë‚´ì— ë©”ì¼ë¡œ ë°œì†¡ ë©ë‹ˆë‹¤. ë§Œì•½ ë©”ì¼ì„ ë°›ì§€ ëª» í•˜ì‹  ê²½ìš° ìŠ¤íŒ¸ í´ë”ë¥¼ í™•ì¸í•´ ì£¼ì„¸ìš”.
+      send_paranoid_instructions: ë‹¹ì‹ ì˜ ì´ë©”ì¼ ì£¼ì†Œê°€ ìš°ë¦¬ì˜ DBì— ìžˆë‹¤ë©´ íŒ¨ìŠ¤ì›Œë“œ ë³µêµ¬ ë§í¬ê°€ ëª‡ ë¶„ ì´ë‚´ì— ë©”ì¼ë¡œ ë°œì†¡ ë©ë‹ˆë‹¤. ë§Œì•½ ë©”ì¼ì„ ë°›ì§€ ëª» í•˜ì‹  ê²½ìš° ìŠ¤íŒ¸ í´ë”ë¥¼ í™•ì¸í•´ ì£¼ì„¸ìš”.
       updated: íŒ¨ìŠ¤ì›Œë“œê°€ ìž¬ì„¤ì • ë˜ì—ˆìŠµë‹ˆë‹¤. ë¡œê·¸ì¸ ë˜ì—ˆìŠµë‹ˆë‹¤.
       updated_not_active: íŒ¨ìŠ¤ì›Œë“œê°€ ì„±ê³µì ìœ¼ë¡œ ë³€ê²½ ë˜ì—ˆìŠµë‹ˆë‹¤.
     registrations:
@@ -79,9 +96,9 @@ ko:
       update_needs_confirmation: ê³„ì • ì •ë³´ë¥¼ ì—…ë°ì´íŠ¸ í–ˆìŠµë‹ˆë‹¤. í•˜ì§€ë§Œ ìƒˆ ì´ë©”ì¼ ì£¼ì†Œì— ëŒ€í•œ í™•ì¸ì´ í•„ìš”í•©ë‹ˆë‹¤. ì´ë©”ì¼ì„ í™•ì¸ í•œ í›„ ë§í¬ë¥¼ í†µí•´ ìƒˆ ì´ë©”ì¼ì„ í™•ì¸ í•˜ì„¸ìš”. ë©”ì¼ì„ ë°›ì§€ ëª» í•˜ì‹  ê²½ìš° ìŠ¤íŒ¸ í´ë”ë¥¼ í™•ì¸í•´ ì£¼ì„¸ìš”.
       updated: ê³„ì • ì •ë³´ê°€ ì„±ê³µì ìœ¼ë¡œ ì—…ë°ì´íŠ¸ ë˜ì—ˆìŠµë‹ˆë‹¤.
     sessions:
-      already_signed_out: ë¡œê·¸ì•„ì›ƒ ë˜ì—ˆìŠµë‹ˆë‹¤.
-      signed_in: ë¡œê·¸ì¸ ë˜ì—ˆìŠµë‹ˆë‹¤.
-      signed_out: ë¡œê·¸ì•„ì›ƒ ë˜ì—ˆìŠµë‹ˆë‹¤.
+      already_signed_out: ì„±ê³µì ìœ¼ë¡œ ë¡œê·¸ì•„ì›ƒ ë˜ì—ˆìŠµë‹ˆë‹¤.
+      signed_in: ì„±ê³µì ìœ¼ë¡œ ë¡œê·¸ì¸ ë˜ì—ˆìŠµë‹ˆë‹¤.
+      signed_out: ì„±ê³µì ìœ¼ë¡œ ë¡œê·¸ì•„ì›ƒ ë˜ì—ˆìŠµë‹ˆë‹¤.
     unlocks:
       send_instructions: ëª‡ ë¶„ ì´ë‚´ë¡œ ê³„ì • ìž ê¸ˆ í•´ì œì— ëŒ€í•œ ì•ˆë‚´ ë©”ì¼ì´ ë°œì†¡ ë©ë‹ˆë‹¤. ë©”ì¼ì„ ë°›ì§€ ëª» í•˜ì‹  ê²½ìš° ìŠ¤íŒ¸ í´ë”ë¥¼ í™•ì¸í•´ ì£¼ì„¸ìš”.
       send_paranoid_instructions: ê³„ì •ì´ ì¡´ìž¬í•œë‹¤ë©´ ëª‡ ë¶„ ì´ë‚´ë¡œ ê³„ì • ìž ê¸ˆ í•´ì œì— ëŒ€í•œ ì•ˆë‚´ ë©”ì¼ì´ ë°œì†¡ ë©ë‹ˆë‹¤. ë©”ì¼ì„ ë°›ì§€ ëª» í•˜ì‹  ê²½ìš° ìŠ¤íŒ¸ í´ë”ë¥¼ í™•ì¸í•´ ì£¼ì„¸ìš”.
diff --git a/config/locales/devise.ku.yml b/config/locales/devise.ku.yml
index cc251e86ae3fc9c96ba4a32a86e9e41868ac09d9..64c305681d3408c34f6099c68796cb601a1364cf 100644
--- a/config/locales/devise.ku.yml
+++ b/config/locales/devise.ku.yml
@@ -1 +1,115 @@
-ckb-IR:
+---
+ku:
+  devise:
+    confirmations:
+      confirmed: Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Ú©Û•Øª Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ù¾Ø´ØªÚ•Ø§Ø³ØªÚ©Ø±Ø§ÛŒÛ•ÙˆÛ•.
+      send_instructions: Ø¦ÛŒÙ…Û•ÛŒÚµÛŽÚ©Øª Ø¨Û† Ø¯Û•Ù†ÛŽØ±Ø¯Ø±ÛŽØª Ù„Û•Ú¯Û•Úµ Ú•ÛŽÙ†Ù…Ø§ÛŒÛŒ Ø¨Û† Ú†Û†Ù†ÛŒÛ•ØªÛŒ Ø¯ÚµÙ†ÛŒØ§Ø¨ÙˆÙˆÙ† Ù„Û• Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÙ„Û•Ú©Û•Øª Ù„Û• Ú†Û•Ù†Ø¯ Ø®ÙˆÙ„Û•Ú©ÛŽÚ©Ø¯Ø§. ØªÚ©Ø§ÛŒÛ• Ø¨ÙˆØ®Ú†Û•ÛŒ Ø³Ù¾Ø§Ù…Û•Ú©Û•Øª Ú†Ø§ÙˆÙ„ÛŽØ¨Ú©Û• Ø¦Û•Ú¯Û•Ø± Ø¦Û•Ù… Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Øª Ù¾ÛŽÙ†Û•Ø¯Ø±Ø§.
+      send_paranoid_instructions: Ø¦Û•Ú¯Û•Ø± Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Ú©Û•Øª Ù„Û• Ø¨Ù†Ú©Û•ÛŒ Ø²Ø§Ù†ÛŒØ§Ø±ÛŽÚ©Ø§Ù†Ù…Ø§Ù†Ø¯Ø§ Ù‡Û•Ø¨ÛŽØªØŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛŽÚ©Øª Ù¾ÛŽØ¯Û•Ú¯Ø§Øª Ù„Û•Ú¯Û•Úµ Ú•ÛŽÙ†Ù…Ø§ÛŒÛŒÛ•Ú©Ø§Ù†ÛŒ Ú†Û†Ù†ÛŒÛ•ØªÛŒ Ø¯ÚµÙ†ÛŒØ§Ø¨ÙˆÙˆÙ† Ù„Û• Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÙ„Û•Ú©Û•Øª Ù„Û• Ú†Û•Ù†Ø¯ Ø®ÙˆÙ„Û•Ú©ÛŽÚ©Ø¯Ø§. ØªÚ©Ø§ÛŒÛ• Ø¨Û†Ø®Ú†Û•ÛŒ Ø³Ù¾Ø§Ù…Û•Ú©Û•Øª Ø¨Ù¾Ø´Ú©Ù†Û• Ø¦Û•Ú¯Û•Ø± Ø¦Û•Ù… Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Øª Ù¾ÛŽÙ†Û•Ø¯Ø±Ø§.
+    failure:
+      already_authenticated: ØªÛ† Ù¾ÛŽØ´ØªØ± Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆÙˆØ±Û•ÙˆÛ•Øª Ú©Ø±Ø¯ÙˆÙˆÛ•.
+      inactive: Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ù‡ÛŽØ´ØªØ§ Ú©Ø§Ø±Ø§ Ù†Û•Ú©Ø±Ø§ÙˆÛ•.
+      invalid: "%{authentication_keys} ÛŒØ§Ù† Ù†Ù‡ÛŽÙ†ÙˆØ´Û• Ù†Ø§Ø¯Ø±ÙˆØ³ØªÛ•."
+      last_attempt: ØªÛ† ÛŒÛ•Ú© Ù‡Û•ÙˆÚµÛŒØ¯ÛŒÚ©Û•Øª Ù…Ø§ÙˆÛ• Ù¾ÛŽØ´ Ø¦Û•ÙˆÛ•ÛŒ Ø¦Û•Ú˜Ù…ÛŽØ±Û•Ú©Û•Øª Ù‚ÙˆÙÚµ Ø¨ÛŽØª.
+      locked: Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Øª Ø¯Ø§Ø®Ø±Ø§ÙˆÛ•.
+      not_found_in_database: "%{authentication_keys} ÛŒØ§Ù† Ù†Ù‡ÛŽÙ†ÙˆØ´Û• Ù†Ø§Ø¯Ø±ÙˆØ³ØªÛ•."
+      pending: Ù‡Û•Ú˜Ù…ÛŽØ±Û•Ú©Û•Øª Ù‡ÛŽØ´ØªØ§ Ù„Û•Ú˜ÛŽØ± Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ•Ø¯Ø§ÛŒÛ•.
+      timeout: Ú©Û†Ø¨ÙˆÙˆÙ†Û•ÙˆÛ•Ú©Û•Øª Ø¨Û•Ø³Û•Ø±Ú†ÙˆÙˆÛ•. ØªÚ©Ø§ÛŒÛ• Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ø¨Ú†Û† Ú˜ÙˆÙˆØ±Û•ÙˆÛ• Ø¨Û† Ø¨Û•Ø±Ø¯Û•ÙˆØ§Ù… Ø¨ÙˆÙˆÙ†.
+      unauthenticated: Ù¾ÛŽÙˆÛŒØ³ØªÛ• Ø¨Ú†ÛŒØªÛ• Ú˜ÙˆÙˆØ±Û•ÙˆÛ• ÛŒØ§Ù† Ø¨Ú†ÛŒØªÛ• Ù†Ø§Ùˆ Ú†ÙˆÙˆÙ†Û• Ù†Ø§Ùˆ Ù¾ÛŽØ´ Ø¨Û•Ø±Ø¯Û•ÙˆØ§Ù… Ø¨ÙˆÙˆÙ†.
+      unconfirmed: Ø¯Û•Ø¨ÛŽØª Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Ú©Û•Øª Ù¾Ø´ØªÚ•Ø§Ø³Øª Ø¨Ú©Û•ÛŒØªÛ•ÙˆÛ• Ù¾ÛŽØ´ Ø¨Û•Ø±Ø¯Û•ÙˆØ§Ù… Ø¨ÙˆÙˆÙ†.
+    mailer:
+      confirmation_instructions:
+        action: Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ Ø³Ø§Ø® Ø¨Ú©Û•Ø±Û•ÙˆÛ•
+        action_with_app: Ù¾Ø´ØªÚ•Ø§Ø³ØªÛŒ Ø¨Ú©Û•ÙˆÛ• Ùˆ Ø¨Ú¯Û•Ú•ÛŽÙˆÛ• Ø¨Û† %{app}
+        explanation: Ø¦Û•Ú˜Ù…ÛŽØ±ÛŽÚ©Øª Ø¯Ø±ÙˆØ³Øª Ú©Ø±Ø¯ÙˆÙˆÛ• Ù„Û•Ø³Û•Ø± %{host} Ø¨Û•Ù… Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛ•. ØªÛ† ÛŒÛ•Ú© Ú©Ø±ØªÛ• Ø¯ÙˆÙˆØ±ÛŒØª Ù„Û• Ú©Ø§Ø±Ø§Ú©Ø±Ø¯Ù†ÛŒ. Ø¦Û•Ú¯Û•Ø± Ø¦Û•Ù…Û• ØªÛ† Ù†Û•Ø¨ÙˆÙˆÛŒØŒ ØªÚ©Ø§ÛŒÛ• Ø¦Û•Ù… Ø¦ÛŒÙ…Û•ÛŒÚµÛ• ÙÛ•Ø±Ø§Ù…Û†Ø´ Ø¨Ú©Û•.
+        explanation_when_pending: ØªÛ† Ø¯Ø§ÙˆØ§ÛŒ Ø¨Ø§Ù†Ú¯Ù‡ÛŽØ´ØªØª Ú©Ø±Ø¯ Ø¨Û† %{host} Ø¨Û•Ù… Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛ•. Ù‡Û•Ø± Ú©Û• Ø¯ÚµÙ†ÛŒØ§ÛŒÛŒ Ù„Û• Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Ú©Û•Øª Ø¯Û•Ú©Û•ÛŒØªØŒ Ø¦ÛŽÙ…Û• Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ• Ø¯Û•Ú©Û•ÛŒÙ† Ø¨Û• Ø¨Û•Ø±Ù†Ø§Ù…Û•Ú©Û•ØªØ¯Ø§. Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø¨Ú†ÛŒØª Ø¨Û† Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆÙˆØ±Û•ÙˆÛ• Ø¨Û† Ú¯Û†Ú•ÛŒÙ†ÛŒ ÙˆÙˆØ±Ø¯Û•Ú©Ø§Ø±ÛŒÛ•Ú©Ø§Ù†Øª ÛŒØ§Ù† Ø³Ú•ÛŒÙ†Û•ÙˆÛ•ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•ØªØŒ Ø¨Û•ÚµØ§Ù… Ù†Ø§ØªÙˆØ§Ù†ÛŒØª Ø¯Û•Ø³ØªÚ¯Û•ÛŒØ´ØªÙ†Øª Ù‡Û•Ø¨ÛŽØª Ø¨Û• Ø²Û†Ø±Ø¨Û•ÛŒ Ø¦Û•Ø±Ú©Û•Ú©Ø§Ù† ØªØ§ Ø¦Û•Ú˜Ù…ÛŽØ±Û•Ú©Û•Øª Ù¾Û•Ø³Û•Ù†Ø¯ Ù†Ø§Ú©Ø±ÛŽØª. Ø¦Û•Ú¯Û•Ø± Ú©Ø§Ø±Ø¨Û•Ø±Ù†Ø§Ù…Û•Ú©Û•Øª Ú•Û•ØªÚ©Ø±Ø§ÛŒÛ•ÙˆÛ•ØŒ Ø¯Ø§ØªØ§Ú©Û•Øª Ù„Ø§Ø¯Û•Ø¨Ø±ÛŽØªØŒ Ø¨Û†ÛŒÛ• Ù¾ÛŽÙˆÛŒØ³Øª Ø¨Û• Ú©Ø§Ø±ÛŒ Ø²ÛŒØ§ØªØ± Ù„Û• ØªÛ† Ù†Ø§Ú©Ø±ÛŽØª. Ø¦Û•Ú¯Û•Ø± Ø¦Û•Ù…Û• ØªÛ† Ù†Û•Ø¨ÙˆÙˆÛŒØŒ ØªÚ©Ø§ÛŒÛ• Ø¦Û•Ù… Ø¦ÛŒÙ…Û•ÛŒÚµÛ• ÙÛ•Ø±Ø§Ù…Û†Ø´ Ø¨Ú©Û•.
+        extra_html: ØªÚ©Ø§ÛŒÛ• ØªÛŽÚ•ÙˆØ§Ù†Û• Ù„Û• <a href="%{terms_path}"> Ú•ÛŽØ³Ø§Ú©Ø§Ù†ÛŒ Ú•Ø§Ú˜Û•Ú©Ø§Ø±</a> Ùˆ <a href="%{policy_path}"> Ù…Û•Ø±Ø¬Û•Ú©Ø§Ù†ÛŒ Ø®Ø²Ù…Û•ØªÚ¯ÙˆØ²Ø§Ø±ÛŒ</a>.
+        subject: 'Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†: Ú•ÛŽÙ†Ù…Ø§ÛŒÛŒÛ•Ú©Ø§Ù†ÛŒ Ù¾Ø´ØªÚ•Ø§Ø³ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ• Ø¨Û† %{instance}'
+        title: Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ Ø³Ø§Ø® Ø¨Ú©Û•Ø±Û•ÙˆÛ•
+      email_changed:
+        explanation: 'Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Ú©Û•ÛŒ Ø¦Û•Ú˜Ù…ÛŽØ±Û•Ú©Û•Øª Ø¯Û•Ú¯Û†Ú•Ø¯Ø±ÛŽØª Ø¨Û†:'
+        extra: Ø¦Û•Ú¯Û•Ø± Ø¦ÛŒÙ…Û•ÛŒÙ„Û•Ú©Û•Øª Ù†Û•Ú¯Û†Ú•ÛŒØªØŒ Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ú©Û•Ø³ÛŽÚ© Ø¯Û•Ø³ØªÚ¯Û•ÛŒØ´ØªÙ†ÛŒ Ø¨Û† Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ø¨Û•Ø¯Û•Ø³Øª Ø¨ÛŽØª. ØªÚ©Ø§ÛŒÛ• ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•Ú©Û•Øª Ø¨Ú¯Û†Ú•Û• Ø¯Û•Ø³ØªØ¨Û•Ø¬ÛŽ ÛŒØ§Ù† Ù¾Û•ÛŒÙˆÛ•Ù†Ø¯ÛŒ Ø¨Ú©Û• Ø¨Û• Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Û•Ø±ÛŒ Ú•Ø§Ú˜Û•ÙˆÛ• Ø¦Û•Ú¯Û•Ø± ØªÛ† Ù„Û• Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ø¯Ø§Ø®Ø±Ø§ÛŒØª.
+        subject: 'Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†: Ø¦ÛŒÙ…Û•ÛŒÚµ Ú¯Û†Ú•Ø§'
+        title: Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛŒ Ù†ÙˆÛŽ
+      password_change:
+        explanation: ØªÛŽÙ¾Û•Ú•ÙˆØ´Û• Ø¨Û† Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ú¯Û†Ú•Ø§ÙˆÛ•.
+        extra: Ø¦Û•Ú¯Û•Ø± ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•Ú©Û•Øª Ù†Û•Ú¯Û†Ú•ÛŒØŒ ÙˆØ§ Ø¯ÛŒØ§Ø±Û• Ú©Û•Ø³ÛŽÚ© Ø¯Û•Ø³ØªÚ¯Û•ÛŒØ´ØªÙ†ÛŒ Ø¨Û† Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ø¨Û•Ø¯Û•Ø³Øª Ø¨ÛŽØª. ØªÚ©Ø§ÛŒÛ• ØªÛŽÙ¾Û•Ú•ÙˆØ³ÙŠÚ©Û•Øª Ø¨Ú¯Û†Ú•Û• Ø¯Û•Ø³ØªØ¨Û•Ø¬ÛŽ ÛŒØ§Ù† Ù¾Û•ÛŒÙˆÛ•Ù†Ø¯ÛŒ Ø¨Ú©Û• Ø¨Û• Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Û•Ø±ÛŒ Ú•Ø§Ú˜Û• Ø¦Û•Ú¯Û•Ø± ØªÛ† Ù„Û• Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ø¯Ø§Ø®Ø±Ø§ÛŒØª.
+        subject: 'Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†: ØªÛŽÙ¾Û•Ú•ÙˆØ´Û• Ú¯Û†Ú•Ø¯Ø±Ø§'
+        title: ØªÛŽÙ¾Û•Ú•ÙˆØ´Û• Ú¯Û†Ú•Ø¯Ø±Ø§
+      reconfirmation_instructions:
+        explanation: Ø¯ÚµÙ†ÛŒØ§Ø¨ÙˆÙˆÙ† Ù„Û• Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ù†ÙˆÛŽ Ø¨Û† Ú¯Û†Ú•ÛŒÙ†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Ú©Û•Øª.
+        extra: Ø¦Û•Ú¯Û•Ø± Ø¦Û•Ù… Ú¯Û†Ú•Ø§Ù†Ú©Ø§Ø±ÛŒÛ• Ù„Û•Ù„Ø§ÛŒÛ•Ù† ØªÛ†ÙˆÛ• Ø¯Û•Ø³Øª Ù¾ÛŽÙ†Û•Ú©Ø±Ø§ÙˆÛ•ØŒ ØªÚ©Ø§ÛŒÛ• Ø¦Û•Ù… Ø¦ÛŒÙ…Û•ÛŒÚµÛ• ÙÛ•Ø±Ø§Ù…Û†Ø´ Ø¨Ú©Û•. Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ Ø¨Û† Ù‡Û•Ú˜Ù…ÛŽØ±ÛŒ Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† Ù†Ø§Ú¯Û†Ú•ÛŽ Ù‡Û•ØªØ§ Ø¦Û•Ùˆ Ú©Ø§ØªÛ•ÛŒ Ø¯Û•Ø³ØªÙ¾ÛŽÚ¯Û•ÛŒØ´ØªÙ†ÛŒ Ø¦Û•Ù… Ù„ÛŒÙ†Ú©Û•Øª Ù„Û• Ø³Û•Ø±Û•ÙˆÛ• Ù†ÛŒÛ•.
+        subject: 'Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†: Ø¯ÙˆÙˆÙ¾Ø§ØªÛŒ Ø¦ÛŒÙ…Û•ÛŒÙ„ Ø¨Û† %{instance}'
+        title: Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ Ø³Ø§Ø® Ø¨Ú©Û•Ø±Û•ÙˆÛ•
+      reset_password_instructions:
+        action: Ú¯Û†Ú•ÛŒÙ†ÛŒ ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•
+        explanation: ØªÛ† ØªÛŒÙ¾Û•Ú•ÙˆØ´Û•ÛŒ Ù†ÙˆÛŽØª Ø¯Ø§ÙˆØ§ Ú©Ø±Ø¯ Ø¨Û† Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª.
+        extra: Ø¦Û•Ú¯Û•Ø± Ø¦Û•Ù… Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒÛ•Øª Ù†Û•Ú©Ø±Ø¯ØŒ ØªÚ©Ø§ÛŒÛ• Ø¦Û•Ù… Ø¦ÛŒÙ…Û•ÛŒÚµÛ• ÙÛ•Ø±Ø§Ù…Û†Ø´ Ø¨Ú©Û•. ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•Ú©Û•Øª Ù†Ø§Ú¯Û†Ú•ÛŽ Ù‡Û•ØªØ§ Ù†Û•Ú†ÛŒØªÛ• Ù†Ø§Ùˆ Ù„ÛŒÙ†Ú©ÛŒ Ø³Û•Ø±Û•ÙˆÛ• Ùˆ Ø¯Ø§Ù†Û•ÛŒÛ•Ú©ÛŒ Ù†ÙˆÛŽ Ø¯Ø±ÙˆØ³Øª Ø¨Ú©Û•ÛŒØª.
+        subject: 'Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†: Ø±ÛŽÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø±ÛŽÙ†Ù…Ø§ÛŒÛŒÛ•Ú©Ø§Ù†ÛŒ ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•'
+        title: Ú¯Û•Ú•Ø§Ù†Û•ÙˆÛ•ÛŒ ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•
+      two_factor_disabled:
+        explanation: Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†ÛŒ Ø¯ÙˆÙˆ-ÙØ§Ú©ØªÛ•Ø± Ø¨Û† Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ú©Û• Ù„Û• Ú©Ø§Ø±Ø®Ø±Ø§ÙˆÛ•. Ú†ÙˆÙˆÙ†Û•Ú˜ÙˆÙˆØ±Û•ÙˆÛ• Ø¦ÛŽØ³ØªØ§ Ø¯Û•Ú©Ø±ÛŽØª ØªÛ•Ù†Ù‡Ø§ Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ Ùˆ ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•Ú©Û•Øª Ø¨Û•Ú©Ø§Ø±Ø¨Ù‡ÛŽÙ†ÛŒ.
+        subject: 'Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†: Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†ÛŒ Ø¯ÙˆÙˆ-ÙØ§Ú©ØªÛ•Ø±ÛŒ Ù†Ø§Ú†Ø§Ù„Ø§Ú© Ú©Ø±Ø§ÙˆÛ•'
+        title: 2FA Ù†Ø§Ú†Ø§Ù„Ø§Ú© Ú©Ø±Ø§
+      two_factor_enabled:
+        explanation: Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†ÛŒ Ø¯ÙˆÙˆ-ÙØ§Ú©ØªÛ•Ø± Ø¨Û† Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ú†Ø§Ù„Ø§Ú© Ú©Ø±Ø§ÙˆÛ•. Ø¦Ø§Ù…Ø§Ú˜Û•ÛŒÛ•Ú© Ú©Û• Ù„Û•Ù„Ø§ÛŒÛ•Ù† Ù†Û•Ø±Ù…Û•Ú©Ø§Ù„Ø§ÛŒTOTP Ø¬ÙˆÙˆØªÚ©Ø±Ø§Ùˆ Ø¯Ø±ÙˆØ³Øª Ú©Ø±Ø§ÙˆÛ• Ù¾ÛŽÙˆÛŒØ³ØªÛ• Ø¨Û• Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆÙˆØ±Û•ÙˆÛ•.
+        subject: 'Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†: Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†ÛŒ Ø¯ÙˆÙˆ-ÙØ§Ú©ØªÛ•Ø±ÛŒ Ú†Ø§Ù„Ø§Ú© Ú©Ø±Ø§ÙˆÛ•'
+        title: 2FA Ú†Ø§Ù„Ø§Ú© Ú©Ø±Ø§
+      two_factor_recovery_codes_changed:
+        explanation: Ú©Û†Ø¯Û•Ú©Ø§Ù†ÛŒ Ú†Ø§Ú©Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù¾ÛŽØ´ÙˆÙˆ Ù‡Û•ÚµÙˆÛ•Ø´ÛŽÙ†Ø±Ø§Ù†Û•ÙˆÛ• ÙˆØŒ Ù†ÙˆÛŽÚ©Ø§Ù† Ø¯Ø±ÙˆØ³Øª Ø¨ÙˆÙˆÙ†.
+        subject: 'Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†: Ú©Û†Ø¯Û•Ú©Ø§Ù†ÛŒ Ú¯Û•Ú•Ø§Ù†Û•ÙˆÛ•ÛŒ Ø¯ÙˆÙˆ ÙØ§Ú©ØªÛ•Ø±ØŒ Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ø¯Ø±ÙˆØ³Øª Ø¯Û•Ú©Ø±ÛŽØªÛ•ÙˆÛ•'
+        title: 2FA Ú©Û†Ø¯ÛŒ Ú†Ø§Ú©Ú©Ø±Ø¯Ù†Û•ÙˆÛ• Ú¯Û†Ú•Ø§
+      unlock_instructions:
+        subject: 'Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†: Ø±ÛŽÙ†Ù…Ø§ÛŒÛŒÛ•Ú©Ø§Ù† Ø¨Ú©Û•Ø±Û•ÙˆÛ•'
+      webauthn_credential:
+        added:
+          explanation: Ú©Ù„ÛŒÙ„ÛŒ Ø¦Ø§Ø³Ø§ÛŒØ´ÛŒ Ø®ÙˆØ§Ø±Û•ÙˆÛ• Ø²ÛŒØ§Ø¯Ú©Ø±Ø§ Ø¨Û† Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª
+          subject: 'Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†: Ú©Ù„ÛŒÙ„ÛŒ Ø¦Ø§Ø³Ø§ÛŒØ´ÛŒ Ù†ÙˆÛŽ'
+          title: Ú©Ù„ÛŒÙ„ÛŒ Ù¾Ø§Ø±Ø§Ø³ØªÙ†ÛŒ Ù†ÙˆÛŽ Ø²ÛŒØ§Ø¯Ú©Ø±Ø§
+        deleted:
+          explanation: Ú©Ù„ÛŒÙ„ÛŒ Ø¦Ø§Ø³Ø§ÛŒØ´ÛŒ Ø®ÙˆØ§Ø±Û•ÙˆÛ• Ù„Û• Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ø³Ú•Ø§ÛŒÛ•ÙˆÛ•
+          subject: 'Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†: Ú©Ù„ÛŒÙ„ÛŒ Ù¾Ø§Ø±Ø§Ø³ØªÙ† Ø³Ú•Ø§ÛŒÛ•ÙˆÛ•'
+          title: Ú©Ù„ÛŒÙ„Û• Ú©Ø§Ù†ÛŒ Ù¾Ø§Ø±Ø§Ø³ØªÙ†ÛŒ ÛŒÛ•Ú©ÛŽÚ© Ù„Û• Ø¦ÛŽÙˆÛ• Ø³Ú•Ø§ÛŒÛ•ÙˆÛ•
+      webauthn_disabled:
+        explanation: Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù† Ø¨Û• Ú©Ù„ÛŒÙ„Û•Ù¾Ø§Ø±ÛŽØ²Ø±Ø§ÙˆÛ•Ú©Ø§Ù† Ù„Û• Ú©Ø§Ø±Ø®Ø±Ø§ÙˆÛ• Ø¨Û† Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª. Ú†ÙˆÙˆÙ†Û•Ú˜ÙˆÙˆØ±Û•ÙˆÛ• Ø¦ÛŽØ³ØªØ§ Ø¯Û•Ú©Ø±ÛŽØª ØªÛ•Ù†Ù‡Ø§ Ø¦Û•Ùˆ Ù†ÛŒØ´Ø§Ù†Û•ÛŒÛ• Ø¨Û•Ú©Ø§Ø±Ø¨ÛŽÙ†ÛŒØª Ú©Û• Ù„Û•Ù„Ø§ÛŒÛ•Ù† Ù†Û•Ø±Ù…Û•Ú©Ø§Ù„Ø§ÛŒTOTP Ø¯Ø±ÙˆØ³Øª Ú©Ø±Ø§ÙˆÛ•.
+        subject: 'Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†: Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù† Ù„Û•Ú¯Û•Úµ Ú©Ù„ÛŒÙ„Û• Ù¾Ø§Ø³Ø§ÛŒØ´ÛŒ Ù†Ø§Ú†Ø§Ù„Ø§Ú© Ú©Ø±Ø§ÙˆÛ•'
+        title: Ú©Ù„ÛŒÙ„Û• Ù¾Ø§Ø±Ø³ØªÙ†Û•Ú©Ø§Ù† Ù†Ø§Ú†Ø§Ù„Ø§Ú© Ú©Ø±Ø§ÙˆÙ†
+      webauthn_enabled:
+        explanation: Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†ÛŒ Ú©Ù„ÛŒÙ„ÛŒ Ø¦Ø§Ø³Ø§ÛŒØ´ Ú†Ø§Ù„Ø§Ú© Ú©Ø±Ø§ÙˆÛ• Ø¨Û† Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª. Ø¦ÛŽØ³ØªØ§ Ú©Ù„ÛŒÙ„ÛŒ Ù¾Ø§Ø±Ø§Ø³ØªÙ† Ø¯Û•ØªÙˆØ§Ù†Ø±ÛŽØª Ø¨Û† Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆÙˆØ±Û•ÙˆÛ• Ø¨Û•Ú©Ø§Ø± Ø¨ÛŽØª.
+        subject: 'Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†: Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†ÛŒ Ú©Ù„ÛŒÙ„ÛŒ Ù¾Ø§Ø±Ø§Ø³ØªÙ† Ú†Ø§Ù„Ø§Ú© Ú©Ø±Ø§ÙˆÛ•'
+        title: Ú©Ù„ÛŒÙ„Û• Ú©Ø§Ù†ÛŒ Ù¾Ø§Ø±Ø§Ø³ØªÙ† Ú†Ø§Ù„Ø§Ú© Ú©Ø±Ø§
+    omniauth_callbacks:
+      failure: Ù†Û•ÛŒØªÙˆØ§Ù†ÛŒ Ú•Û•Ø³Û•Ù†Ø§ÛŒÛ• ØªÛŒ %{kind} Ø¨ØªÛ•ÙˆØ¨Ú©Ø§Øª Ù„Û•Ø¨Û•Ø±Ø¦Û•ÙˆÛ•ÛŒ "%{reason}".
+      success: Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆØ§Ù†Û• Ù„Û• Ù‡Û•Ú˜Ù…Ø§Ø±ÛŒ %{kind} Ø³Û•Ù„Ù…ÛŽÙ†Ø±Ø§.
+    passwords:
+      no_token: Ù†Ø§ØªÙˆØ§Ù†ÛŒØª Ø¯Û•Ø³ØªÚ¯Û•ÛŒØ´ØªÙ†Øª Ù‡Û•Ø¨ÛŽØª Ø¨Û•Ù… Ù„Ø§Ù¾Û•Ú•Û•ÛŒÛ• Ø¨Û•Ø¨ÛŽ Ø¦Û•ÙˆÛ•ÛŒ Ù„Û• Ø¦ÛŒÙ…Û•ÛŒÚµÛŽÚ©ÛŒ Ú¯Û•Ú•Ø§Ù†Û•ÙˆÛ•ÛŒ ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•Øª Ø¨ÛŽØª. Ø¦Û•Ú¯Û•Ø± Ù„Û• Ø¦ÛŒÙ…Û•ÛŒÚµÛŽÚ©ÛŒÚ¯Û•Ú•Ø§Ù†Û•ÙˆÛ•ÛŒ ØªÛŽÙ¾Û•Ú•ÙˆØ´Û• Ù‡Ø§ØªÙˆÙˆÛŒØªØŒ ØªÚ©Ø§ÛŒÛ• Ø¯ÚµÙ†ÛŒØ§Ø¨Û• Ù„Û•ÙˆÛ•ÛŒ Ú©Û• URLÛŒ ØªÛ•ÙˆØ§ÙˆØª Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø§ÙˆÛ• Ú©Û• Ø¯Ø§Ø¨ÛŒÙ†Ú©Ø±Ø§ÙˆÛ•.
+      send_instructions: Ø¦Û•Ú¯Û•Ø± Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Ú©Û•Øª Ù„Û• Ø¨Ù†Ú©Û•ÛŒ Ø²Ø§Ù†ÛŒØ§Ø±ÛŽÚ©Ø§Ù†Ù…Ø§Ù†Ø¯Ø§ Ù‡Û•Ø¨ÛŽØªØŒ Ù„Û• Ú†Û•Ù†Ø¯ Ø®ÙˆÙ„Û•Ú©ÛŽÚ©ÛŒ Ú©Û•Ù…Ø¯Ø§ Ù„ÛŒÙ†Ú©ÛŒ Ù‡ÛŽÙ†Ø§Ù†Û•ÙˆÛ•ÛŒ ØªÛŽÙ¾Û•Ú•ÙˆØ´Û• Ù„Û• Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÙ„Û•Ú©Û•Øª Ù¾ÛŽ Ø¯Û•Ú¯Ø§Øª. ØªÚ©Ø§ÛŒÛ• Ø¨ÙˆØ®Ú†Û•ÛŒ Ø³Ù¾Ø§Ù…Û•Ú©Û•Øª Ø¨Ú©Û•Ø±Û•ÙˆÛ•ØŒ Ø¦Û•Ú¯Û•Ø± Ø¦Û•Ù… Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Øª Ù¾ÛŽÙ†Û•Ø¯Ø±Ø§.
+      send_paranoid_instructions: Ø¦Û•Ú¯Û•Ø± Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Ú©Û•Øª Ù„Û• Ø¨Ù†Ú©Û•ÛŒ Ø²Ø§Ù†ÛŒØ§Ø±ÛŽÚ©Ø§Ù†Ù…Ø§Ù†Ø¯Ø§ Ù‡Û•Ø¨ÛŽØªØŒ Ù„Û• Ú†Û•Ù†Ø¯ Ø®ÙˆÙ„Û•Ú©ÛŽÚ©ÛŒ Ú©Û•Ù…Ø¯Ø§ Ù„ÛŒÙ†Ú©ÛŒ Ù‡ÛŽÙ†Ø§Ù†Û•ÙˆÛ•ÛŒ ØªÛŽÙ¾Û•Ú•ÙˆØ´Û• Ù„Û• Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÙ„Û•Ú©Û•Øª Ù¾ÛŽ Ø¯Û•Ú¯Ø§Øª. ØªÚ©Ø§ÛŒÛ• Ø¨ÙˆØ®Ú†Û•ÛŒ Ø³Ù¾Ø§Ù…Û•Ú©Û•Øª Ø¨Ú©Û•Ø±Û•ÙˆÛ•ØŒ Ø¦Û•Ú¯Û•Ø± Ø¦Û•Ù… Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Øª Ù¾ÛŽÙ†Û•Ø¯Ø±Ø§.
+      updated: ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•Ú©Û•Øª Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ú¯Û†Ú•Ø¯Ø±Ø§. ØªÛ† Ø¦ÛŽØ³ØªØ§Ú†ÙˆÙˆÛŒØªÛ• Ú˜ÙˆÙˆØ±Û•ÙˆÛ•.
+      updated_not_active: ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•Ú©Û•Øª Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ú¯Û†Ú•Ø¯Ø±Ø§.
+    registrations:
+      destroyed: Ø®ÙˆØ§Øª Ù„Û•Ú¯Û•Úµ! Ø¦Û•Ú˜Ù…ÛŽØ±Û•Ú©Û•Øª Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ù‡Û•ÚµÙˆÛ•Ø´ÛŽÙ†Ø±Ø§ÛŒÛ•ÙˆÛ•. Ù‡ÛŒÙˆØ§Ø¯Ø§Ø±ÛŒÙ† Ø¨Û•Ø²ÙˆÙˆÛŒÛŒ Ø¨ØªØ¨ÛŒÙ†ÛŒÙ†Û•ÙˆÛ•.
+      signed_up: Ø¨Û•Ø®ÛŽØ±Ø¨ÛŽÛŒØª! ØªÛ† Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ ØªÛ†Ù…Ø§Ø± Ú©Ø±Ø§ÛŒ.
+      signed_up_but_inactive: ØªÛ† Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ ØªÛ†Ù…Ø§Ø±Ú©Ø±Ø§ÛŒ. Ù‡Û•Ø±Ú†Û†Ù†ÛŽÚ© Ø¨ÛŽØªØŒ Ù†Û•Ù…Ø§Ù†ØªÙˆØ§Ù†ÛŒ Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆÙˆØ±Û•ÙˆÛ•Øª Ø¨Û† Ø¨Ú©Û•ÛŒÙ† Ù„Û•Ø¨Û•Ø±Ø¦Û•ÙˆÛ•ÛŒ Ù‡ÛŽØ´ØªØ§ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ú©Ø§Ø±Ø§ Ù†Û•Ú©Ø±Ø§ÙˆÛ•.
+      signed_up_but_locked: ØªÛ† Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ ØªÛ†Ù…Ø§Ø±Ú©Ø±Ø§ÛŒ. Ù‡Û•Ø±Ú†Û†Ù†ÛŽÚ© Ø¨ÛŽØªØŒ Ù†Û•Ù…Ø§Ù†ØªÙˆØ§Ù†ÛŒ Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆÙˆØ±Û•ÙˆÛ•Øª Ø¨Û† Ø¨Ú©Û•ÛŒÙ† Ù„Û•Ø¨Û•Ø±Ø¦Û•ÙˆÛ•ÛŒ Ù‡ÛŽØ´ØªØ§ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ù‚ÙˆÙÚµ Ú©Ø±Ø§ÙˆÛ•.
+      signed_up_but_pending: Ù†Ø§Ù…Û•ÛŒÛ•Ú© Ø¨Û• Ù„ÛŒÙ†Ú©ÛŒ Ø¯ÙˆÙˆÙ¾Ø§ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ• Ù†ÛŽØ±Ø¯Ø±Ø§ÙˆÛ• Ø¨Û† Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Ú©Û•Øª. Ø¯ÙˆØ§ÛŒ Ø¦Û•ÙˆÛ•ÛŒ ØªÛ† Ú©Ø±ØªÛ• Ù„Û•Ø³Û•Ø± Ù„ÛŒÙ†Ú©Û•Ú©Û• Ø¯Û•Ú©Û•ÛŒØªØŒ Ø¦ÛŽÙ…Û• Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ• Ø¯Û•Ú©Û•ÛŒÙ† Ø¨Û• Ø¨Û•Ø±Ù†Ø§Ù…Û•Ú©Û•ØªØ¯Ø§. Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø± Ø¯Û•Ú©Ø±ÛŽÛŒØª Ø¦Û•Ú¯Û•Ø± Ù¾Û•Ø³Û•Ù†Ø¯ Ú©Ø±Ø§.
+      signed_up_but_unconfirmed: Ù†Ø§Ù…Û•ÛŒÛ•Ú© Ø¨Û• Ù„ÛŒÙ†Ú©ÛŒ Ø¯ÙˆÙˆÙ¾Ø§ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ• Ù†ÛŽØ±Ø¯Ø±Ø§ÙˆÛ• Ø¨Û† Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Ú©Û•Øª. ØªÚ©Ø§ÛŒÛ• Ø¯ÙˆØ§ÛŒ Ù„ÛŒÙ†Ú©Û•Ú©Û• Ø¨Ú©Û•ÙˆÛ• Ø¨Û† Ú©Ø§Ø±Ø§Ú©Ø±Ø¯Ù†ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª. ØªÚ©Ø§ÛŒÛ• Ø¨ÙˆØ®Ú†Û•ÛŒ Ø³Ù¾Ø§Ù…Û•Ú©Û•Øª Ø¨Ú©Û•Ø±Û•ÙˆÛ• Ø¦Û•Ú¯Û•Ø± Ø¦Û•Ù… Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Øª Ù¾ÛŽÙ†Û•Ø¯Ø±Ø§.
+      update_needs_confirmation: ØªÛ† Ø¦Û•Ú˜Ù…ÛŽØ±Û•Ú©Û•Øª Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ù†ÙˆÛŽÚ©Ø±Ø¯Û•ÙˆÛ•ØŒ Ø¨Û•ÚµØ§Ù… Ù¾ÛŽÙˆÛŒØ³ØªÛ• Ø¦ÛŒÙ…Û•ÛŒÚµÛ• Ù†ÙˆÛŽÚ©Û•Øª Ø¨Ø³Û•Ù„Ù…ÛŽÙ†ÛŒÙ†. ØªÚ©Ø§ÛŒÛ• Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Ú©Û•Øª Ø¨Ù¾Ø´Ú©Ù†Û• Ùˆ Ø¯ÙˆØ§ÛŒ Ø¨Û•Ø³ØªÛ•Ø±ÛŒ Ø¯ÚµÙ†ÛŒØ§Ø¨ÙˆÙˆÙ†Û•ÙˆÛ• Ø¨Ú©Û•ÙˆÛ• Ø¨Û† Ø¯ÚµÙ†ÛŒØ§Ø¨ÙˆÙˆÙ† Ù„Û• Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛ• Ù†ÙˆÛŽÚ©Û•Øª. ØªÚ©Ø§ÛŒÛ• Ø¨ÙˆØ®Ú†Û•ÛŒ Ø³Ù¾Ø§Ù…Û•Ú©Û•Øª Ø¨Ú©Û•Ø±Û•ÙˆÛ• Ø¦Û•Ú¯Û•Ø± Ø¦Û•Ù… Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Øª Ù¾ÛŽÙ†Û•Ø¯Ø±Ø§.
+      updated: Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ù†ÙˆÛŽÚ©Ø±Ø§ÛŒÛ•ÙˆÛ•.
+    sessions:
+      already_signed_out: Ú†ÙˆÙˆÙ†Û• Ø¯Û•Ø±Û•ÙˆÛ• Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¦Û•Ù†Ø¬Ø§Ù… Ø¨ÙˆÙˆ.
+      signed_in: Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆÙˆØ±Û•ÙˆÛ•.
+      signed_out: Ú†ÙˆÙˆÙ†Û• Ø¯Û•Ø±Û•ÙˆÛ• Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¦Û•Ù†Ø¬Ø§Ù… Ø¨ÙˆÙˆ.
+    unlocks:
+      send_instructions: Ø¦ÛŒÙ…Û•ÛŒÚµÛŽÚ©Øª Ø¨Û† Ø¯Û•Ù†ÛŽØ±Ø¯Ø±ÛŽØª Ù„Û•Ú¯Û•Úµ Ú•ÛŽÙ†Ù…Ø§ÛŒÛŒ Ø¨Û† Ú†Û†Ù†ÛŒÛ•ØªÛŒ Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ù„Û• Ú†Û•Ù†Ø¯ Ø®ÙˆÙ„Û•Ú©ÛŽÚ©Ø¯Ø§. ØªÚ©Ø§ÛŒÛ• Ø¨ÙˆØ®Ú†Û•ÛŒ Ø³Ù¾Ø§Ù…Û•Ú©Û•Øª Ø¨Ù¾Ø´Ú©Ù†Û• Ø¦Û•Ú¯Û•Ø± Ø¦Û•Ù… Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Øª Ù¾ÛŽÙ†Û•Ø¯Ø±Ø§.
+      send_paranoid_instructions: Ø¦Û•Ú¯Û•Ø± Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ø¨ÙˆÙˆÙ†ÛŒ Ù‡Û•Ø¨ÛŽØªØŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛŽÚ©Øª Ù¾ÛŽØ¯Û•Ú¯Ø§Øª Ù„Û•Ú¯Û•Úµ Ú•ÛŽÙ†Ù…Ø§ÛŒÛŒ Ú†Û†Ù†ÛŒÛ•ØªÛŒ Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù„Û• Ú†Û•Ù†Ø¯ Ø®ÙˆÙ„Û•Ú©ÛŽÚ©Ø¯Ø§. ØªÚ©Ø§ÛŒÛ• Ø¨ÙˆØ®Ú†Û•ÛŒ Ø³Ù¾Ø§Ù…Û•Ú©Û•Øª Ø¨Ù¾Ø´Ú©Ù†Û• Ø¦Û•Ú¯Û•Ø± Ø¦Û•Ù… Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Øª Ù¾ÛŽÙ†Û•Ø¯Ø±Ø§.
+      unlocked: Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ù„Û• Ù‚ÙˆÙÚµ Ù„Ø§Ú†ÙˆÙˆ. ØªÚ©Ø§ÛŒÛ• Ø¨Ú†Û† Ú˜ÙˆÙˆØ±Û•ÙˆÛ• Ø¨Û† Ø¨Û•Ø±Ø¯Û•ÙˆØ§Ù… Ø¨ÙˆÙˆÙ†.
+  errors:
+    messages:
+      already_confirmed: Ù¾ÛŽØ´ØªØ± Ù¾Ø´ØªÚ•Ø§Ø³Øª Ú©Ø±Ø§ÛŒÛ•ÙˆÛ•ØŒ ØªÚ©Ø§ÛŒÛ• Ù‡Û•ÙˆÚµ Ø¯Û•Ø¯Û• Ø¨Ú†Û† Ú˜ÙˆÙˆØ±Û•ÙˆÛ•
+      confirmation_period_expired: Ù¾ÛŽÙˆÛŒØ³ØªÛ• Ù„Û• Ù†ÛŽÙˆ %{period} Ø¯Ø§ Ù¾Ø´ØªÚ•Ø§Ø³Øª Ø¨Ú©Ø±ÛŽØªÛ•ÙˆÛ•ØŒ ØªÚ©Ø§ÛŒÛ• Ø¯Ø§ÙˆØ§ÛŒ Ø¯Ø§Ù†Û•ÛŒÛ•Ú©ÛŒ Ù†ÙˆÛŽ Ø¨Ú©Û•
+      expired: Ø¨Û•Ø³Û•Ø±Ú†ÙˆÙˆÛ•ØŒ ØªÚ©Ø§ÛŒÛ• Ø¯Ø§ÙˆØ§ÛŒÛ•Ú©ÛŒ Ù†ÙˆÛŽ Ø¨Ú©Û•
+      not_found: Ù†Û•Ø¯Û†Ø²Ø±Ø§ÛŒÛ•ÙˆÛ•
+      not_locked: Ø¯Ø§Ù†Û•Ø®Ø±Ø§Ø¨ÙˆÙˆ
+      not_saved:
+        one: 'Ù¡ Ù‡Û•ÚµÛ• Ù‚Û•Ø¯Û•ØºÛ•Ú©Ø±Ø§ Ø¦Û•Ù… %{resource} Ù„Û• ØªÛ†Ù…Ø§Ø±Ú©Ø±Ø¯Ù†:'
+        other: "%{count} Ù‡Û•ÚµÛ•ÛŒ Ù‚Û•Ø¯Û•ØºÛ•Ú©Ø±Ø¯ Ú©Û• %{resource} Ù„Û• Ù¾Ø§Ø´Ú©Û•ÙˆØªÚ©Ø±Ø¯Ù†:"
diff --git a/config/locales/devise.nl.yml b/config/locales/devise.nl.yml
index 3ab4d9f11711f8a90d20637b9ecef9d269dab6e2..fadc481262b574941c0f5aa1ad64273d9c67b711 100644
--- a/config/locales/devise.nl.yml
+++ b/config/locales/devise.nl.yml
@@ -60,6 +60,23 @@ nl:
         title: Herstelcodes tweestapsverificatie veranderd
       unlock_instructions:
         subject: 'Mastodon: Instructies om opschorten account ongedaan te maken'
+      webauthn_credential:
+        added:
+          explanation: De volgende beveiligingssleutel is aan uw account toegevoegd
+          subject: 'Mastodon: Nieuwe beveiligingssleutel'
+          title: Een nieuwe beveiligingssleutel is toegevoegd
+        deleted:
+          explanation: De volgende beveiligingssleutel is uit jouw account verwijderd
+          subject: 'Mastodon: Beveiligingssleutel verwijderd'
+          title: Een van jouw beveiligingssleutels is verwijderd
+      webauthn_disabled:
+        explanation: Verificatie met beveiligingssleutels is uitgeschakeld voor jouw account. Inloggen is nu alleen mogelijk met het gebruik van een door een gepaarde TOTP-app genereerde sleutel.
+        subject: 'Mastodon: Verificatie met beveiligingssleutels is uitgeschakeld'
+        title: Beveiligingssleutels uitgeschakeld
+      webauthn_enabled:
+        explanation: Verificatie met beveiligingssleutels is ingeschakeld voor jouw account. Jouw beveiligingssleutel kan nu gebruikt worden om in te loggen.
+        subject: 'Mastodon: Verificatie met beveiligingssleutels is ingeschakeld'
+        title: Beveiligingssleutels ingeschakeld
     omniauth_callbacks:
       failure: Kon je niet inloggen met jouw %{kind} account, omdat "%{reason}".
       success: Succesvol met jouw %{kind} account ingelogd.
diff --git a/config/locales/devise.nn.yml b/config/locales/devise.nn.yml
index 42eb0690aabe9e0402f1043fb17408a9d5a3e812..88d8458f7bd5a26d123ba054bae62e95d52cdbcd 100644
--- a/config/locales/devise.nn.yml
+++ b/config/locales/devise.nn.yml
@@ -60,6 +60,21 @@ nn:
         title: 2FA-gjenopprettingskodane er endra
       unlock_instructions:
         subject: 'Mastodon: Instruksjonar for Ã¥ opne kontoen igjen'
+      webauthn_credential:
+        added:
+          explanation: FÃ¸lgende sikkerhetsnÃ¸kkel har blitt lagt til i kontoen din
+          subject: 'Mastodon: Ny sikkerhetsnÃ¸kkel'
+          title: En ny sikkerhetsnÃ¸kkel har blitt lagt til
+        deleted:
+          explanation: FÃ¸lgende sikkerhetsnÃ¸kkel har blitt slettet fra kontoen din
+          subject: 'Mastodon: SikkerhetsnÃ¸kkel slettet'
+          title: En av sikkerhetsnÃ¸klene dine har blitt slettet
+      webauthn_disabled:
+        subject: 'Mastodon: Autentisering med sikkerhetsnÃ¸kler ble skrudd av'
+        title: SikkerhetsnÃ¸kler deaktivert
+      webauthn_enabled:
+        subject: 'Mastodon: SikkerhetsnÃ¸kkelsautentisering ble skrudd pÃ¥'
+        title: SikkerhetsnÃ¸kler aktivert
     omniauth_callbacks:
       failure: Du kunne ikkje verte autentisert frÃ¥ %{kind} av di "%{reason}".
       success: Autentisert frÃ¥ %{kind}-konto.
diff --git a/config/locales/devise.no.yml b/config/locales/devise.no.yml
index de651f6ca4efbc073ba0e28001bebf9840203144..4fdc1276b55cb3fa8293bf4735a02ba53520993a 100644
--- a/config/locales/devise.no.yml
+++ b/config/locales/devise.no.yml
@@ -60,6 +60,21 @@
         title: 2FA-gjenopprettingskodene ble endret
       unlock_instructions:
         subject: 'Mastodon: Instruksjoner for Ã¥ gjenÃ¥pne konto'
+      webauthn_credential:
+        added:
+          explanation: FÃ¸lgende sikkerhetsnÃ¸kkel har blitt lagt til i kontoen din
+          subject: 'Mastodon: Ny sikkerhetsnÃ¸kkel'
+          title: En ny sikkerhetsnÃ¸kkel har blitt lagt til
+        deleted:
+          explanation: FÃ¸lgende sikkerhetsnÃ¸kkel har blitt slettet fra kontoen din
+          subject: 'Mastodon: SikkerhetsnÃ¸kkel slettet'
+          title: En av sikkerhetsnÃ¸klene dine har blitt slettet
+      webauthn_disabled:
+        subject: 'Mastodon: Autentisering med sikkerhetsnÃ¸kler ble skrudd av'
+        title: SikkerhetsnÃ¸kler deaktivert
+      webauthn_enabled:
+        subject: 'Mastodon: SikkerhetsnÃ¸kkelsautentisering ble skrudd pÃ¥'
+        title: SikkerhetsnÃ¸kler aktivert
     omniauth_callbacks:
       failure: Kunne ikke autentisere deg fra %{kind} fordi "%{reason}".
       success: Vellykket autentisering fra %{kind}.
diff --git a/config/locales/devise.oc.yml b/config/locales/devise.oc.yml
index 0fb259429a23bcc7fc6b2bba70a983f81f867ceb..16419cd1e343434b2b11ca352f01a24d13e93dd2 100644
--- a/config/locales/devise.oc.yml
+++ b/config/locales/devise.oc.yml
@@ -60,6 +60,23 @@ oc:
         title: CÃ²dis 2FA de recuperacion cambiats
       unlock_instructions:
         subject: Mastodonâ€¯:â€¯consignas de desblocatge
+      webauthn_credential:
+        added:
+          explanation: La clau de seguretat seguenta foguÃ¨t ajustada a vÃ²stre compte
+          subject: 'Mastodonâ€¯: nÃ²va clau de seguretat'
+          title: Una nÃ²va clau de seguretat es estada ajustada
+        deleted:
+          explanation: La clau de seguretat seguenta foguÃ¨t suprimida a vÃ²stre compte
+          subject: 'Mastodonâ€¯: clau de seguretat suprimida'
+          title: Una de vÃ²stras claus de seguretats es estada suprimida
+      webauthn_disabled:
+        explanation: Lâ€™autentificacion amb de claus de seguretat foguÃ¨t estada desactivada per vÃ²stre compte. Lâ€™identificacion es ara possible en utilizan un geton generat per una aplicacion TOTP associada.
+        subject: 'Mastodonâ€¯: autentificacion amb claus de seguretat desactivada'
+        title: Claus de seguretat desactivadas
+      webauthn_enabled:
+        explanation: Lâ€™autentificacion amb de claus de seguretat foguÃ¨t estada activada per vÃ²stre compte. VÃ²stra clau de seguretat pÃ²t ara Ã¨sser utilizada per lâ€™identificacion.
+        subject: 'Mastodonâ€¯: autentificacion via clau de seguretat activada'
+        title: Claus de seguretat activadas
     omniauth_callbacks:
       failure: FracÃ s al moment de vos autentificar de %{kind} perque "%{reason}".
       success: SÃ¨tz ben autentificat dempuÃ¨i lo compte %{kind}.
diff --git a/config/locales/devise.pl.yml b/config/locales/devise.pl.yml
index 6336a579435c9acf470fb012bcb43c4821eb0c60..cc1b670bb88c21b81c6966c358e16bcaa9eb34aa 100644
--- a/config/locales/devise.pl.yml
+++ b/config/locales/devise.pl.yml
@@ -60,6 +60,23 @@ pl:
         title: Zmieniono kody odzyskiwania 2FA
       unlock_instructions:
         subject: 'Mastodon: Instrukcje odblokowania konta'
+      webauthn_credential:
+        added:
+          explanation: NastÄ™pujÄ…cy klucz bezpieczeÅ„stwa zostaÅ‚ dodany do twojego konta
+          subject: 'Mastodon: Nowy klucz bezpieczeÅ„stwa'
+          title: Dodano nowy klucz bezpieczeÅ„stwa
+        deleted:
+          explanation: NastÄ™pujÄ…cy klucz bezpieczeÅ„stwa zostaÅ‚ usuniÄ™ty z Twojego konta
+          subject: 'Mastodon: Klucz bezpieczeÅ„stwa usuniÄ™ty'
+          title: UsuniÄ™to jeden z twoich kluczy bezpieczeÅ„stwa
+      webauthn_disabled:
+        explanation: Uwierzytelnianie kluczem bezpieczeÅ„stwa zostaÅ‚o wyÅ‚Ä…czone dla Twojego konta. Logowanie jest teraz moÅ¼liwe tylko przy uÅ¼yciu tokenu generowanego przez sparowanÄ… aplikacjÄ™ TOTP.
+        subject: 'Mastodon: WyÅ‚Ä…czono uwierzytelnianie z kluczami bezpieczeÅ„stwa'
+        title: WyÅ‚Ä…czono klucze bezpieczeÅ„stwa
+      webauthn_enabled:
+        explanation: Uwierzytelnianie klucza bezpieczeÅ„stwa zostaÅ‚o wÅ‚Ä…czone dla Twojego konta. Klucz bezpieczeÅ„stwa moÅ¼e byÄ‡ teraz wykorzystywany do logowania.
+        subject: 'Mastodon: WÅ‚Ä…czono uwierzytelnianie z kluczami bezpieczeÅ„stwa'
+        title: WÅ‚Ä…czono klucze bezpieczeÅ„stwa
     omniauth_callbacks:
       failure: 'Uwierzytelnienie przez %{kind} nie powiodÅ‚o siÄ™, poniewaÅ¼: "%{reason}".'
       success: Uwierzytelnienie przez %{kind} powiodÅ‚o siÄ™.
diff --git a/config/locales/devise.pt-BR.yml b/config/locales/devise.pt-BR.yml
index bb5d5d34b6728f6f58f11584c8422ba498c1fc42..6fecaecdf5baef7629299e5408fa064f5740d8b4 100644
--- a/config/locales/devise.pt-BR.yml
+++ b/config/locales/devise.pt-BR.yml
@@ -60,6 +60,23 @@ pt-BR:
         title: CÃ³digos de recuperaÃ§Ã£o de dois fatores alterados
       unlock_instructions:
         subject: 'Mastodon: InstruÃ§Ãµes de desbloqueio'
+      webauthn_credential:
+        added:
+          explanation: A seguinte chave de seguranÃ§a foi adicionada Ã  sua conta
+          subject: 'Mastodon: Nova chave de seguranÃ§a'
+          title: Uma nova chave de seguranÃ§a foi adicionada
+        deleted:
+          explanation: A seguinte chave de seguranÃ§a foi excluÃda da sua conta
+          subject: 'Mastodon: Chave de seguranÃ§a excluÃda'
+          title: Uma das suas chaves de seguranÃ§a foi excluÃda
+      webauthn_disabled:
+        explanation: A autenticaÃ§Ã£o por chaves de seguranÃ§a foi desabilitada para a sua conta. O login agora Ã© possÃvel usando apenas o token gerado pelo aplicativo TOTP pareado.
+        subject: 'Mastodon: AutenticaÃ§Ã£o por chaves de seguranÃ§a desabilitada'
+        title: Chaves de seguranÃ§a desabilitadas
+      webauthn_enabled:
+        explanation: A autenticaÃ§Ã£o por chave de seguranÃ§a foi habilitada para a sua conta. Sua chave de seguranÃ§a agora pode ser usada para fazer login.
+        subject: 'Mastodon: AutenticaÃ§Ã£o por chave de seguranÃ§a habilitada'
+        title: Chaves de seguranÃ§a habilitadas
     omniauth_callbacks:
       failure: NÃ£o foi possÃvel entrar como %{kind} porque "%{reason}".
       success: Entrou como %{kind}.
diff --git a/config/locales/devise.pt-PT.yml b/config/locales/devise.pt-PT.yml
index 935189a16791a92e9ee7438b3dd2e7d206a34a1d..496ce7b1ddb7cd133216068526c1bd9e8985e39f 100644
--- a/config/locales/devise.pt-PT.yml
+++ b/config/locales/devise.pt-PT.yml
@@ -60,6 +60,23 @@ pt-PT:
         title: CÃ³digos de recuperaÃ§Ã£o 2FA alterados
       unlock_instructions:
         subject: 'Mastodon: InstruÃ§Ãµes para desbloquear a tua conta'
+      webauthn_credential:
+        added:
+          explanation: A seguinte chave de seguranÃ§a foi adicionada Ã  sua conta
+          subject: 'Mastodon: Nova chave de seguranÃ§a'
+          title: Foi adicionada uma nova chave de seguranÃ§a
+        deleted:
+          explanation: A seguinte chave de seguranÃ§a foi removida da sua conta
+          subject: 'Mastodon: Chave de seguranÃ§a removida'
+          title: Uma das suas chaves de seguranÃ§a foi removida
+      webauthn_disabled:
+        explanation: A autenticaÃ§Ã£o com chave de seguranÃ§a foi desativada para sua conta. Ã‰ agora possÃvel aceder Ã  sua conta utilizando apenas o token gerado pelo aplicativo TOTP pareado.
+        subject: 'Mastodon: AutenticaÃ§Ã£o com chave de seguranÃ§a desativada'
+        title: Chaves de seguranÃ§a desativadas
+      webauthn_enabled:
+        explanation: A autenticaÃ§Ã£o com chave de seguranÃ§a foi ativada para sua conta. A sua chave de seguranÃ§a pode agora ser utilizada para aceder Ã  sua conta.
+        subject: 'Mastodon: AutenticaÃ§Ã£o com chave de seguranÃ§a ativada'
+        title: Chaves de seguranÃ§a ativadas
     omniauth_callbacks:
       failure: NÃ£o foi possÃvel autenticar %{kind} porque "%{reason}".
       success: Autenticado com sucesso na conta %{kind}.
diff --git a/config/locales/devise.ru.yml b/config/locales/devise.ru.yml
index f1f6cb365c14a395db005e5a284362ac93432e71..ada7867f2daee3b7235e8af60a5c527c15b6f6fa 100644
--- a/config/locales/devise.ru.yml
+++ b/config/locales/devise.ru.yml
@@ -60,6 +60,23 @@ ru:
         title: Ð ÐµÐ·ÐµÑ€Ð²Ð½Ñ‹Ðµ ÐºÐ¾Ð´Ñ‹ 2Ð¤Ð Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ñ‹
       unlock_instructions:
         subject: 'Mastodon: Ð˜Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ð¸Ñ Ð¿Ð¾ Ñ€Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐµ'
+      webauthn_credential:
+        added:
+          explanation: Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ð¹ ÐºÐ»ÑŽÑ‡ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸ Ð±Ñ‹Ð» Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½ Ð² Ð²Ð°ÑˆÑƒ ÑƒÑ‡Ñ‘Ñ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ
+          subject: 'ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½: ÐÐ¾Ð²Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸'
+          title: Ð‘Ñ‹Ð» Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½ Ð½Ð¾Ð²Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸
+        deleted:
+          explanation: Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ð¹ ÐºÐ»ÑŽÑ‡ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸ Ð±Ñ‹Ð» ÑƒÐ´Ð°Ð»ÐµÐ½ Ð¸Ð· Ð²Ð°ÑˆÐµÐ¹ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸
+          subject: 'ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½: ÐšÐ»ÑŽÑ‡ Ð‘ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸ ÑƒÐ´Ð°Ð»ÐµÐ½'
+          title: ÐžÐ´Ð¸Ð½ Ð¸Ð· Ð²Ð°ÑˆÐ¸Ñ… Ð·Ð°Ñ‰Ð¸Ñ‚Ð½Ñ‹Ñ… ÐºÐ»ÑŽÑ‡ÐµÐ¹ Ð±Ñ‹Ð» ÑƒÐ´Ð°Ð»ÐµÐ½
+      webauthn_disabled:
+        explanation: ÐÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÐºÐ»ÑŽÑ‡ÐµÐ¹ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð° Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸. Ð¢ÐµÐ¿ÐµÑ€ÑŒ Ð²Ñ…Ð¾Ð´ Ð²Ð¾Ð·Ð¼Ð¾Ð¶ÐµÐ½ Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ñ‚Ð¾ÐºÐµÐ½Ð°, ÑÐ³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð² Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¸ TOTP.
+        subject: 'ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½: ÐÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ñ ÐºÐ»ÑŽÑ‡Ð°Ð¼Ð¸ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð°'
+        title: ÐšÐ»ÑŽÑ‡Ð¸ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ñ‹
+      webauthn_enabled:
+        explanation: Ð”Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð° Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð¿Ð¾ ÐºÐ»ÑŽÑ‡Ñƒ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸. Ð¢ÐµÐ¿ÐµÑ€ÑŒ Ð²Ð°Ñˆ ÐºÐ»ÑŽÑ‡ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½ Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð°.
+        subject: 'ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½: Ð’ÐºÐ»ÑŽÑ‡ÐµÐ½Ð° Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð¿Ð¾ ÐºÐ»ÑŽÑ‡Ñƒ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸'
+        title: ÐšÐ»ÑŽÑ‡Ð¸ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ñ‹
     omniauth_callbacks:
       failure: ÐÐµ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ð»Ð¾ÑÑŒ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸Ñ†Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð²Ð°Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ %{kind} Ð¿Ð¾ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰ÐµÐ¹ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ðµ - "%{reason}".
       success: ÐÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ %{kind} Ð¿Ñ€Ð¾ÑˆÐ»Ð° ÑƒÑÐ¿ÐµÑˆÐ½Ð¾.
diff --git a/config/locales/devise.sa.yml b/config/locales/devise.sa.yml
new file mode 100644
index 0000000000000000000000000000000000000000..07ea4372a3a109674214ba80f2070c9f99fb872d
--- /dev/null
+++ b/config/locales/devise.sa.yml
@@ -0,0 +1 @@
+sa:
diff --git a/config/locales/devise.sc.yml b/config/locales/devise.sc.yml
index 91bd6d92f04580bfea64f85ac0291ed4a4c1fb7c..0256c4674b2ed8d22469b4d3f67283be927fdda9 100644
--- a/config/locales/devise.sc.yml
+++ b/config/locales/devise.sc.yml
@@ -1 +1,115 @@
+---
 sc:
+  devise:
+    confirmations:
+      confirmed: S'indiritzu tuo de posta eletrÃ²nica est istadu cunfirmadu.
+      send_instructions: As a retzire unu messÃ giu de posta eletrÃ²nica cun is istrutziones pro sa cunfirma de s'indiritzu de posta eletrÃ²nica tra pagos minutos. Controlla sa cartella de s'arga si no as retzidu custu messÃ giu de posta eletrÃ²nica.
+      send_paranoid_instructions: Si s'indiritzu de posta eletrÃ²nica tuo esistit in sa base de datos nostra, as a retzire unu messÃ giu de posta eletrÃ²nica cun is istrutziones pro sa cunfirma de s'indiritzu de posta eletrÃ²nica tra pagos minutos. Controlla sa cartella de s'Ã liga si no as retzidu custu messÃ giu de posta eletrÃ²nica.
+    failure:
+      already_authenticated: Ses giai intradu.
+      inactive: Su contu tuo no est ancora ativadu.
+      invalid: "%{authentication_keys} o crae de intrada non vÃ lida."
+      last_attempt: Tenes ancora un'Ã teru tentativu, in antis chi su contu tuo bÃ¨ngiat blocadu.
+      locked: Su contu tuo est blocadu.
+      not_found_in_database: "%{authentication_keys} o crae de intrada non vÃ lida."
+      pending: Su contu tuo est ancora in revisione.
+      timeout: Sa sessione tua est iscadida. TorraÂ·bi a intrare pro sighire.
+      unauthenticated: Tocat a ti autenticare o ti registrare prima de sighire.
+      unconfirmed: Deves cunfirmare s'indiritzu tuo de posta eletrÃ²nica prima de sighire.
+    mailer:
+      confirmation_instructions:
+        action: VerÃ¬fica s'indiritzu de posta eletrÃ²nica
+        action_with_app: Cunfirma e torra a %{app}
+        explanation: As creadu unu contu in %{host} cun custu indiritzu de posta eletrÃ²nica. T'ammancat unu clic pro s'ativatzione. Si non fias tue, non cÃ rcules custu messÃ giu de posta eletrÃ²nica.
+        explanation_when_pending: As pedidu un'invitu a %{host} cun custu indiritzu de posta eletrÃ²nica. Cunfirmadu s'indiritzu de posta eletrÃ²nica, amus a revisionare sa dimanda tua. Podes intrare pro cambiare is detÃ llios o cantzellare su contu tuo, ma non podes atzÃ¨dere a sa majoria de is funtziones finas a chi su contu tuo siat aprovadu. Si sa dimanda tua est refudada, is datos ant a Ã¨ssere bogados, duncas no t'ant a pedire prus peruna atzione. Si non fias tue, non cÃ rcules custu messÃ giu de posta eletrÃ²nica.
+        extra_html: VerÃ¬fica puru <a href="%{terms_path}">is rÃ¨gulas de su server</a> e <a href="%{policy_path}">is cunditziones de servÃ¬tziu nostras</a>.
+        subject: 'Mastodon: Istrutziones de cunfirma pro %{instance}'
+        title: VerÃ¬fica s'indiritzu de posta eletrÃ²nica
+      email_changed:
+        explanation: 'Custu indiritzu de posta eletrÃ²nica pro su contu tuo est istadu mudadu a:'
+        extra: Si no as mudadu indiritzu de posta, forsis un'Ã tera persone at otentu s'atzessu de su contu tuo. Muda sa crae tua a sa lestra o chistiona cun s'amministratzione de su server si ses blocadu a foras dae su contu tuo.
+        subject: 'Mastodon: Indiritzu de posta mudadu'
+        title: Indiritzu de posta eletrÃ²nica nou
+      password_change:
+        explanation: Sa crae de su contu tuo est istada mudada.
+        extra: Si no as mudadu sa crae tua, forsis un'Ã tera persone at otentu s'atzessu de su contu tuo. Muda sa crae tua a sa lestra o chistiona cun s'amministratzione de su server si ses blocadu a foras dae su contu tuo.
+        subject: 'Mastodon: Crae mudada'
+        title: Crae mudada
+      reconfirmation_instructions:
+        explanation: Cunfirma s'indiritzu nou pro mudare s'indiritzu de posta eletrÃ²nica.
+        extra: Si custa muda no dd'as pedida tue, non cÃ rcules custu messÃ giu de posta eletrÃ²nica. Custu indiritzu de posta eletrÃ²nica pro su contu de Mastodon no at a mudare finas a s'atzessu tuo a su ligÃ mene in subra.
+        subject: 'Mastodon: Cunfirma indiritzu de posta eletrÃ²nica pro %{instance}'
+        title: VerÃ¬fica s'indiritzu de posta eletrÃ²nica
+      reset_password_instructions:
+        action: Muda sa crae
+        explanation: As pedidu una crae noa pro su contu tuo.
+        extra: Si no dd'as pedida tue, non cÃ rcules custu messÃ giu de posta eletrÃ²nica. Custa crae no at a mudare finas a s'atzessu tuo a su ligÃ mene in subra pro sa creatzione de una noa.
+        subject: 'Mastodon: Istrutziones pro resetare sa crae'
+        title: Crae resetada
+      two_factor_disabled:
+        explanation: S'autenticatzione a duos fatores est istada disativada pro su contu tuo. Immoe podes intrare impreende isceti indiritzu de posta eletrÃ²nica e crae.
+        subject: 'Mastodon: Autenticatzione a duos fatores disativada'
+        title: 2FA disativada
+      two_factor_enabled:
+        explanation: S'autenticatzione a duos fatores est istada ativada pro su contu tuo. Pro s'atzessu at Ã¨ssere rechÃ¨didu unu cÃ²dighe de autorizatzione generadu dae s'aplicatzione TOTP.
+        subject: 'Mastodon: Autenticatzione a duos fatores ativada'
+        title: 2FA ativada
+      two_factor_recovery_codes_changed:
+        explanation: Is cÃ²dighes de recÃ¹peru betzos sunt istados disativados e Ã teros noos generados.
+        subject: 'Mastodon: CÃ²dighes de recÃ¹peru a duos fatores re-generados'
+        title: cÃ²dighes de recÃ¹peru 2FA mudados
+      unlock_instructions:
+        subject: 'Mastodon: Istrutziones pro s''isblocu'
+      webauthn_credential:
+        added:
+          explanation: Sa crae de seguresa chi sighit est istada agiunta a su contu tuo
+          subject: 'Mastodon: Crae de seguresa noa'
+          title: Est istada agiunta una crae de seguresa noa
+        deleted:
+          explanation: Sa crae de seguresa chi sighit est istada cantzellada dae su contu tuo
+          subject: 'Mastodon: Crae de seguresa cantzellada'
+          title: Una de is craes de seguresa tuas est istada cantzellada
+      webauthn_disabled:
+        explanation: S'autenticatzione cun craes de seguresa est istada disabilitada pro su contu tuo. S'intrada como est possÃ¬bile impreende isceti su getone ingendradu dae s'aplicatzione TOTP ligada.
+        subject: 'Mastodon: Autenticatzione cun craes de seguresa disabilitada'
+        title: Craes de seguresa disabilitadas
+      webauthn_enabled:
+        explanation: S'autenticatzione cun crae de seguresa est istada abilitada pro su contu tuo. Sa crae de seguresa tua como si podet Ã¨ssere impreare pro intrare.
+        subject: 'Mastodon: Autenticatzione cun sa crae de seguresa ativada'
+        title: Craes de seguresa abilitadas
+    omniauth_callbacks:
+      failure: Autenticatzione dae %{kind} fallida, ca "%{reason}".
+      success: Autenticadu dae su contu de %{kind}.
+    passwords:
+      no_token: No podes intrare a custa pÃ gina chene passare dae unu messÃ giu de posta eletrÃ²nica pro resetare sa crae. Si benes dae su messÃ giu de posta pro resetare sa crae, faghe in modu de impreare s'URL intreu chi t'ant donadu.
+      send_instructions: Si s'indiritzu de posta eletrÃ²nica tuo esistit in sa base de datos nostra, as a retzire una unu ligÃ mene de recÃ¹peru de sa crae a s'indiritzu tuo de posta eletrÃ²nica tra pagos minutos. Controlla sa cartella de s'Ã liga si no as retzidu custu messÃ giu de posta eletrÃ²nica.
+      send_paranoid_instructions: Si s'indiritzu de posta eletrÃ²nica tuo esistit in sa base de datos nostra, as a retzire una unu ligÃ mene de recÃ¹peru de sa crae a s'indiritzu tuo de posta eletrÃ²nica tra pagos minutos. Controlla sa cartella de s'Ã liga si no as retzidu custu messÃ giu de posta eletrÃ²nica.
+      updated: Sa crae tua est istada mudada. Immoe ses intradu.
+      updated_not_active: Sa crae tua est istada mudada.
+    registrations:
+      destroyed: A si bÃ¬dere! Su contu tuo est istadu cantzelladu. Isperamus de ti torrare a bÃ¬dere chitzi.
+      signed_up: Registratzione curreta. Ti donamus sa benebÃ¨nnida!
+      signed_up_but_inactive: Registratzione curreta. Mancari de aici, si no ti faghimus intrare est ca su contu tuo no est ancora ativu.
+      signed_up_but_locked: Registratzione curreta. Mancari de aici, si no ti faghimus intrare est ca su contu tuo est blocadu.
+      signed_up_but_pending: Unu ligÃ mene de cunfirma est istadu imbiadu a s'indiritzu tuo de posta eletrÃ²nica. A pustis chi incarcas in su ligÃ mene, amus a revisionare sa dimanda tua. Si aprovada, t'at a arribare una notÃ¬fica.
+      signed_up_but_unconfirmed: Unu ligÃ mene de cunfirma est istadu imbiadu a s'indiritzu tuo de posta eletrÃ²nica. Sighi su ligÃ mene pro ativare su contu tuo. Controlla sa cartella de s'arga si no as retzidu custu messÃ giu de posta eletrÃ²nica.
+      update_needs_confirmation: Su contu tuo est istadu atualizadu, ma devimus verificare s'indiritzu tuo de posta eletrÃ²nica nou. Controlla sa posta eletrÃ²nica e sighi su ligÃ mene pro cunfirmare s'indiritzu nou de posta eletrÃ²nica. Controlla sa cartella de s'Ã liga si no as retzidu custu messÃ giu de posta eletrÃ²nica.
+      updated: Su contu tuo est istadu atualizadu.
+    sessions:
+      already_signed_out: Sessione serrada.
+      signed_in: Atzessu curretu.
+      signed_out: Sessione serrada.
+    unlocks:
+      send_instructions: As a retzire unu messÃ giu de posta eletrÃ²nica cun is istrutziones pro isblocare su contu tuo tra pagos minutos. Controlla sa cartella de s'arga si no as retzidu custu messÃ giu de posta eletrÃ²nica.
+      send_paranoid_instructions: Si su contu tuo esistit, as a retzire unu messÃ giu de posta eletrÃ²nica cun istrutziones pro ddu isblocare tra pagos minutos. Controlla sa cartella de s'arga si no as retzidu custu messÃ giu de posta eletrÃ²nica.
+      unlocked: Su contu tuo est istadu isblocadu. Intra pro sighire.
+  errors:
+    messages:
+      already_confirmed: fiat giai cunfirmadu, proa a intrare
+      confirmation_period_expired: tocat a ddu cunfirmare intro %{period}, pediÂ·nde unu nou
+      expired: est iscadidu, pediÂ·nde unu nou
+      not_found: no agatadu
+      not_locked: no fiat blocadu
+      not_saved:
+        one: '1 faddina at proibidu de sarvare custu %{resource}:'
+        other: "%{count} faddinas ant proibidu de sarvare %{resource}:"
diff --git a/config/locales/devise.sq.yml b/config/locales/devise.sq.yml
index 5dc8aa04305f6e2220c243b6006dabac014123da..97b97ce481f904d51a0f1583a6bc48aa90c3d09a 100644
--- a/config/locales/devise.sq.yml
+++ b/config/locales/devise.sq.yml
@@ -60,6 +60,23 @@ sq:
         title: Kodet e rikthimit 2FA u ndryshuan
       unlock_instructions:
         subject: 'Mastodon: UdhÃ«zime shkyÃ§jeje'
+      webauthn_credential:
+        added:
+          explanation: KyÃ§i vijues i sigurisÃ« Ã«shtÃ« shtuar te llogaria juaj
+          subject: 'Mastodon: KyÃ§ i ri sigurie'
+          title: U shtua njÃ« kyÃ§ i ri sigurie
+        deleted:
+          explanation: KyÃ§i vijues i sigurisÃ« Ã«shtÃ« fshirÃ« prej llogarisÃ« tuaj
+          subject: 'Mastodon: Fshirje kyÃ§i sigurie'
+          title: NjÃ« nga kyÃ§et tuaj tÃ« sigurisÃ« Ã«shtÃ« fshirÃ«
+      webauthn_disabled:
+        explanation: MirÃ«filltÃ«simi me kyÃ§e sigurie Ã«shtÃ« Ã§aktivizuar pÃ«r llogarinÃ« tuaj. Hyrja tani Ã«shtÃ« e mundshme vetÃ«m duke pÃ«rdorur token-in e prodhuar nga aplikacioni TOTP i Ã§iftuar.
+        subject: 'Mastodon: U Ã§aktivizua mirÃ«filltÃ«simi me kyÃ§e sigurie'
+        title: U Ã§aktivizuan kyÃ§e sigurie
+      webauthn_enabled:
+        explanation: MirÃ«filltÃ«simi pÃ«rmes kyÃ§esh sigurie Ã«shtÃ« aktivizuar pÃ«r llogarinÃ« tuaj. Tani, pÃ«r hyrje mund tÃ« pÃ«rdoren kyÃ§et tuaj tÃ« sigurisÃ«.
+        subject: 'Mastodon: U aktivizua mirÃ«filltÃ«sim me kyÃ§e sigurie'
+        title: U aktivizuan kyÃ§e sigurie
     omniauth_callbacks:
       failure: Sâ€™u bÃ« dot mirÃ«filltÃ«simi juaj nga %{kind}, sepse "%{reason}".
       success: MirÃ«filltÃ«simi nga llogaria %{kind} u bÃ« me sukses.
diff --git a/config/locales/devise.sv.yml b/config/locales/devise.sv.yml
index 9dfdde8e5610388aef3005376dccf2559fa8103e..071f00878c93c72d3923b208cc4fc57d93461eb8 100644
--- a/config/locales/devise.sv.yml
+++ b/config/locales/devise.sv.yml
@@ -21,6 +21,7 @@ sv:
         action: Verifiera e-postadress
         action_with_app: BekrÃ¤fta och Ã¥tergÃ¥ till %{app}
         explanation: Du har skapat ett konto pÃ¥ %{host} med den hÃ¤r e-postadressen. Du Ã¤r ett klick bort frÃ¥n att aktivera det. Om det inte var du ignorerar det hÃ¤r e-postmeddelandet.
+        explanation_when_pending: Du ansÃ¶kte om en inbjudan till %{host} med denna e-postadress. NÃ¤r du har bekrÃ¤ftat din e-postadress kommer vi att granska din ansÃ¶kan. Du kan logga in fÃ¶r att Ã¤ndra dina uppgifter eller ta bort ditt konto, men du kan inte komma Ã¥t de flesta funktionerna fÃ¶rrÃ¤n ditt konto har godkÃ¤nts. Om din ansÃ¶kan avvisas kommer dina uppgifter att tas bort, sÃ¥ ingen ytterligare Ã¥tgÃ¤rd kommer att krÃ¤vas av dig. Om detta inte var du, vÃ¤nligen ignorera detta mail.
         extra_html: Kolla gÃ¤rna ocksÃ¥ <a href="%{terms_path}">instansens regler</a> och <a href="%{policy_path}">vÃ¥ra anvÃ¤ndarvillkor</a>.
         subject: 'Mastodon: BekrÃ¤ftelsesinstruktioner fÃ¶r %{instance}'
         title: Verifiera e-postadress
@@ -59,6 +60,18 @@ sv:
         title: 2FA-Ã¥terstÃ¤llningskoder Ã¤ndrades
       unlock_instructions:
         subject: 'Mastodon: LÃ¥s upp instruktioner'
+      webauthn_credential:
+        added:
+          subject: 'Mastodon: Ny sÃ¤kerhetsnyckel'
+          title: En ny sÃ¤kerhetsnyckel har lagts till
+        deleted:
+          explanation: FÃ¶ljande sÃ¤kerhetsnyckel har tagits bort frÃ¥n ditt konto
+          subject: 'Mastodon: SÃ¤kerhetsnyckeln borttagen'
+          title: En av dina sÃ¤kerhetsnycklar har tagits bort
+      webauthn_disabled:
+        title: SÃ¤kerhetsnycklar inaktiverade
+      webauthn_enabled:
+        title: SÃ¤kerhetsnycklar aktiverade
     omniauth_callbacks:
       failure: Det gick inte att autentisera dig frÃ¥n %{kind} fÃ¶r "%{reason}".
       success: Autentiserad frÃ¥n %{kind} konto.
@@ -73,6 +86,7 @@ sv:
       signed_up: VÃ¤lkommen! Du har nu registrerat dig.
       signed_up_but_inactive: Du har nu registrerat dig. Vi kunde dock inte logga in dig eftersom ditt konto Ã¤nnu inte Ã¤r aktiverat.
       signed_up_but_locked: Du har nu registrerat dig. Vi kunde dock inte logga in eftersom ditt konto Ã¤r lÃ¥st.
+      signed_up_but_pending: Ett meddelande med en bekrÃ¤ftelselÃ¤nk har skickats till din e-postadress. NÃ¤r du klickar pÃ¥ lÃ¤nken kommer vi att granska din ansÃ¶kan. Du kommer att meddelas om den godkÃ¤nns.
       signed_up_but_unconfirmed: Ett meddelande med en bekrÃ¤ftelselÃ¤nk har skickats till din e-postadress. VÃ¤nligen fÃ¶lj lÃ¤nken fÃ¶r att aktivera ditt konto. Kontrollera din skrÃ¤ppostmapp om du inte fick det hÃ¤r e-postmeddelandet.
       update_needs_confirmation: Du har uppdaterat ditt konto med framgÃ¥ng, men vi mÃ¥ste verifiera din nya e-postadress. VÃ¤nligen kolla din email och fÃ¶lj bekrÃ¤fta lÃ¤nken fÃ¶r att bekrÃ¤fta din nya e-postadress. Kontrollera din spammapp om du inte fick det hÃ¤r e-postmeddelandet.
       updated: Ditt konto har uppdaterats utan problem.
diff --git a/config/locales/devise.th.yml b/config/locales/devise.th.yml
index c88577a9703c2559a385b097cfde4c3cd5b197a2..371a497ad6713b71e05e553b4baa3839be375130 100644
--- a/config/locales/devise.th.yml
+++ b/config/locales/devise.th.yml
@@ -60,6 +60,20 @@ th:
         title: à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¸à¸¹à¹‰à¸„à¸·à¸™ 2FA à¹à¸¥à¹‰à¸§
       unlock_instructions:
         subject: 'Mastodon: à¸„à¸³à¹à¸™à¸°à¸™à¸³à¸à¸²à¸£à¸›à¸¥à¸”à¸¥à¹‡à¸à¸„'
+      webauthn_credential:
+        added:
+          explanation: à¹€à¸žà¸´à¹ˆà¸¡à¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¸”à¸±à¸‡à¸•à¹ˆà¸à¹„à¸›à¸™à¸µà¹‰à¹„à¸›à¸¢à¸±à¸‡à¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡à¸„à¸¸à¸“à¹à¸¥à¹‰à¸§
+          subject: 'Mastodon: à¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¹ƒà¸«à¸¡à¹ˆ'
+          title: à¹€à¸žà¸´à¹ˆà¸¡à¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¹ƒà¸«à¸¡à¹ˆà¹à¸¥à¹‰à¸§
+        deleted:
+          explanation: à¸¥à¸šà¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¸”à¸±à¸‡à¸•à¹ˆà¸à¹„à¸›à¸™à¸µà¹‰à¸à¸à¸à¸ˆà¸²à¸à¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡à¸„à¸¸à¸“à¹à¸¥à¹‰à¸§
+          subject: 'Mastodon: à¸¥à¸šà¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¹à¸¥à¹‰à¸§'
+      webauthn_disabled:
+        subject: 'Mastodon: à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸²à¸£à¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¸”à¹‰à¸§à¸¢à¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¹à¸¥à¹‰à¸§'
+        title: à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¹à¸¥à¹‰à¸§
+      webauthn_enabled:
+        subject: 'Mastodon: à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸²à¸£à¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¸”à¹‰à¸§à¸¢à¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¹à¸¥à¹‰à¸§'
+        title: à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¹à¸¥à¹‰à¸§
     omniauth_callbacks:
       failure: à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¸‚à¸à¸‡à¸„à¸¸à¸“à¸ˆà¸²à¸ %{kind} à¹€à¸™à¸·à¹ˆà¸à¸‡à¸ˆà¸²à¸ "%{reason}"
       success: à¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¸ˆà¸²à¸à¸šà¸±à¸à¸Šà¸µ %{kind} à¸ªà¸³à¹€à¸£à¹‡à¸ˆ
@@ -88,7 +102,7 @@ th:
       unlocked: à¸›à¸¥à¸”à¸¥à¹‡à¸à¸„à¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡à¸„à¸¸à¸“à¸ªà¸³à¹€à¸£à¹‡à¸ˆ à¹‚à¸›à¸£à¸”à¸¥à¸‡à¸Šà¸·à¹ˆà¸à¹€à¸‚à¹‰à¸²à¹€à¸žà¸·à¹ˆà¸à¸”à¸³à¹€à¸™à¸´à¸™à¸à¸²à¸£à¸•à¹ˆà¸
   errors:
     messages:
-      already_confirmed: à¸¢à¸·à¸™à¸¢à¸±à¸™à¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§ à¹‚à¸›à¸£à¸”à¸¥à¸à¸‡à¸¥à¸‡à¸Šà¸·à¹ˆà¸à¹€à¸‚à¹‰à¸²
+      already_confirmed: à¹„à¸”à¹‰à¸£à¸±à¸šà¸à¸²à¸£à¸¢à¸·à¸™à¸¢à¸±à¸™à¹„à¸›à¹à¸¥à¹‰à¸§ à¹‚à¸›à¸£à¸”à¸¥à¸à¸‡à¸¥à¸‡à¸Šà¸·à¹ˆà¸à¹€à¸‚à¹‰à¸²
       confirmation_period_expired: à¸•à¹‰à¸à¸‡à¹„à¸”à¹‰à¸£à¸±à¸šà¸à¸²à¸£à¸¢à¸·à¸™à¸¢à¸±à¸™à¸ à¸²à¸¢à¹ƒà¸™ %{period} à¹‚à¸›à¸£à¸”à¸‚à¸à¸à¸µà¹€à¸¡à¸¥à¹ƒà¸«à¸¡à¹ˆ
       expired: à¸«à¸¡à¸”à¸à¸²à¸¢à¸¸à¹à¸¥à¹‰à¸§ à¹‚à¸›à¸£à¸”à¸‚à¸à¸à¸µà¹€à¸¡à¸¥à¹ƒà¸«à¸¡à¹ˆ
       not_found: à¹„à¸¡à¹ˆà¸žà¸š
diff --git a/config/locales/devise.tr.yml b/config/locales/devise.tr.yml
index 30cedc1fc92f3514f1efa5854d8cf51c54e8b105..a0bc7deaed5ab1e4f9407f0e56bfd0bdc000e029 100644
--- a/config/locales/devise.tr.yml
+++ b/config/locales/devise.tr.yml
@@ -10,7 +10,7 @@ tr:
       inactive: HesabÄ±nÄ±z henÃ¼z etkinleÅŸtirilmedi.
       invalid: GeÃ§ersiz %{authentication_keys} ya da ÅŸifre.
       last_attempt: HesabÄ±nÄ±z kilitlenmeden Ã¶nce bir kez daha denemeniz gerekir.
-      locked: HesabÄ±nÄ±z kilitli.
+      locked: HesabÄ±nÄ±z kilitlendi.
       not_found_in_database: GeÃ§ersiz %{authentication_keys} ya da ÅŸifre.
       pending: HesabÄ±nÄ±z hala inceleniyor.
       timeout: Oturum sÃ¼reniz sona erdi. LÃ¼tfen devam etmek iÃ§in tekrar giriÅŸ yapÄ±nÄ±z.
@@ -19,7 +19,7 @@ tr:
     mailer:
       confirmation_instructions:
         action: E-posta adresinizi doÄŸrulayÄ±n
-        action_with_app: Onayla ve %{app}'a dÃ¶n
+        action_with_app: Onayla ve %{app} uygulamasÄ±na geri dÃ¶n
         explanation: Bu e-posta adresiyle %{host} bir hesap oluÅŸturdunuz. EtkinleÅŸtirmekten bir tÄ±k uzaktasÄ±nÄ±z. Bu siz deÄŸilseniz, lÃ¼tfen bu e-postayÄ± dikkate almayÄ±n.
         explanation_when_pending: Bu e-posta adresiyle %{host} adresine bir davetiye iÃ§in baÅŸvuru yaptÄ±nÄ±z. E-posta adresinizi onayladÄ±ktan sonra baÅŸvurunuzu inceleyeceÄŸiz. O zamana kadar giriÅŸ yapamazsÄ±nÄ±z. BaÅŸvurunuz reddedilirse, verileriniz silinecek, baÅŸka bir iÅŸlem yapmanÄ±z gerekmeyecek. Bu siz deÄŸilseniz, lÃ¼tfen bu e-postayÄ± dikkate almayÄ±n.
         extra_html: LÃ¼tfen ayrÄ±ca <a href="%{terms_path}">sunucu kurallarÄ±nÄ±</a> ve <a href="%{policy_path}">hizmet ÅŸartlarÄ±mÄ±zÄ±</a> inceleyin.
@@ -28,38 +28,55 @@ tr:
       email_changed:
         explanation: 'HesabÄ±nÄ±zÄ±n e-posta adresi ÅŸu ÅŸekilde deÄŸiÅŸtirildi:'
         extra: E-posta adresinizi deÄŸiÅŸtirmediyseniz, bÃ¼yÃ¼k olasÄ±lÄ±kla birileri hesabÄ±nÄ±za eriÅŸti. LÃ¼tfen derhal parolanÄ±zÄ± deÄŸiÅŸtirin veya hesabÄ±nÄ±z kilitlendiyse sunucu yÃ¶neticisine baÅŸvurun.
-        subject: 'Mastodon: E-posta deÄŸiÅŸti'
+        subject: 'Mastodon: E-posta adresi deÄŸiÅŸti'
         title: Yeni e-posta adresi
       password_change:
-        explanation: HesabÄ±nÄ±zÄ±n parolasÄ± deÄŸiÅŸtirildi.
+        explanation: HesabÄ±nÄ±zÄ±n ÅŸifresi deÄŸiÅŸtirildi.
         extra: ParolanÄ±zÄ± deÄŸiÅŸtirmediyseniz, bÃ¼yÃ¼k olasÄ±lÄ±kla birileri hesabÄ±nÄ±za eriÅŸmiÅŸ olabilir. LÃ¼tfen derhal parolanÄ±zÄ± deÄŸiÅŸtirin veya hesabÄ±nÄ±z kilitlendiyse sunucu yÃ¶neticisine baÅŸvurun.
-        subject: 'Mastodon: Parola deÄŸiÅŸtirildi'
-        title: Parola deÄŸiÅŸtirildi
+        subject: 'Mastodon: Åžifre deÄŸiÅŸtirildi'
+        title: Åžifre deÄŸiÅŸtirildi
       reconfirmation_instructions:
         explanation: E-postanÄ±zÄ± deÄŸiÅŸtirmek iÃ§in yeni adresi onaylayÄ±n.
         extra: Bu deÄŸiÅŸiklik sizin tarafÄ±nÄ±zdan baÅŸlatÄ±lmadÄ±ysa, lÃ¼tfen bu e-postayÄ± dikkate almayÄ±n. Mastodon hesabÄ±nÄ±n e-posta adresi, yukarÄ±daki baÄŸlantÄ±ya eriÅŸene kadar deÄŸiÅŸmez.
         subject: 'Mastodon: %{instance} iÃ§in e-postayÄ± onayla'
         title: E-posta adresinizi doÄŸrulayÄ±n
       reset_password_instructions:
-        action: ParolayÄ± deÄŸiÅŸtir
-        explanation: HesabÄ±nÄ±z iÃ§in yeni bir parola istediniz.
+        action: Åžifreyi deÄŸiÅŸtir
+        explanation: HesabÄ±nÄ±z iÃ§in yeni bir ÅŸifre istediniz.
         extra: Bunu siz yapmadÄ±ysanÄ±z, lÃ¼tfen bu e-postayÄ± dikkate almayÄ±n. ParolanÄ±z yukarÄ±daki baÄŸlantÄ±ya eriÅŸene ve yeni bir tane oluÅŸturuncaya kadar deÄŸiÅŸmez.
-        subject: 'Mastodon: Parola sÄ±fÄ±rlama talimatlarÄ±'
-        title: Parola sÄ±fÄ±rlama
+        subject: 'Mastodon: Åžifre sÄ±fÄ±rlama talimatlarÄ±'
+        title: Åžifre sÄ±fÄ±rlama
       two_factor_disabled:
         explanation: HesabÄ±nÄ±z iÃ§in iki-adÄ±mlÄ± kimlik doÄŸrulama devre dÄ±ÅŸÄ± bÄ±rakÄ±ldÄ±. Åžimdi sadece e-posta adresi ve parola kullanarak giriÅŸ yapabilirsiniz.
         subject: 'Mastodon: Ä°ki-adÄ±mlÄ± kimlik doÄŸrulama devre dÄ±ÅŸÄ± bÄ±rakÄ±ldÄ±'
         title: 2FA devre dÄ±ÅŸÄ± bÄ±rakÄ±ldÄ±
       two_factor_enabled:
         explanation: HesabÄ±nÄ±z iÃ§in iki-adÄ±mlÄ± kimlik doÄŸrulama etkinleÅŸtirildi. GiriÅŸ yapmak iÃ§in eÅŸleÅŸtirilmiÅŸ TOTP uygulamasÄ± tarafÄ±ndan oluÅŸturulan bir belirteÃ§ gereklidir.
-        subject: 'Mastodon: Ä°ki-adÄ±mlÄ± kimlik doÄŸrulama etkinleÅŸtirildi'
+        subject: 'Mastodon: Ä°ki adÄ±mlÄ± kimlik doÄŸrulama etkinleÅŸtirildi'
         title: 2FA etkinleÅŸtirildi
       two_factor_recovery_codes_changed:
         explanation: Ã–nceki kurtarma kodlarÄ± geÃ§ersiz kÄ±lÄ±ndÄ± ve yenileri oluÅŸturuldu.
-        subject: 'Mastodon: Ä°ki-adÄ±mlÄ± kurtarma kodlarÄ± yeniden oluÅŸturuldu'
+        subject: 'Mastodon: Ä°ki adÄ±mlÄ± kurtarma kodlarÄ± yeniden oluÅŸturuldu'
         title: 2FA kurtarma kodlarÄ± deÄŸiÅŸtirildi
       unlock_instructions:
-        subject: 'Mastodon: Engel kaldÄ±rma talimatlarÄ±'
+        subject: 'Mastodon: Kilit aÃ§ma talimatlarÄ±'
+      webauthn_credential:
+        added:
+          explanation: AÅŸaÄŸÄ±daki gÃ¼venlik anahtarÄ± hesabÄ±nÄ±za eklendi
+          subject: 'Mastodon: Yeni gÃ¼venlik anahtarÄ±'
+          title: Yeni bir gÃ¼venlik anahtarÄ± eklendi
+        deleted:
+          explanation: AÅŸaÄŸÄ±daki gÃ¼venlik anahtarÄ± hesabÄ±nÄ±zdan silindi
+          subject: 'Mastodon: GÃ¼venlik anahtarÄ± silindi'
+          title: GÃ¼venlik anahtarlarÄ±nÄ±zdan biri silindi
+      webauthn_disabled:
+        explanation: HesabÄ±nÄ±z iÃ§in gÃ¼venlik anahtarlarÄ±yla kimlik doÄŸrulama devre dÄ±ÅŸÄ± bÄ±rakÄ±ldÄ±. ArtÄ±k yalnÄ±zca eÅŸleÅŸtirilmiÅŸ TOTP uygulamasÄ± tarafÄ±ndan oluÅŸturulan kodu kullanarak giriÅŸ yapmak mÃ¼mkÃ¼ndÃ¼r.
+        subject: 'Mastodon: GÃ¼venlik anahtarlarÄ±yla kimlik doÄŸrulama devre dÄ±ÅŸÄ±'
+        title: GÃ¼venlik anahtarlarÄ± devre dÄ±ÅŸÄ±
+      webauthn_enabled:
+        explanation: HesabÄ±nÄ±z iÃ§in gÃ¼venlik anahtarÄ± doÄŸrulamasÄ± etkinleÅŸtirildi. GÃ¼venlik anahtarÄ±nÄ±z artÄ±k giriÅŸ yapmak iÃ§in kullanÄ±labilir.
+        subject: 'Mastodon: GÃ¼venlik anahtarÄ± doÄŸrulamasÄ± etkinleÅŸtirildi'
+        title: GÃ¼venlik anahtarlarÄ± etkin
     omniauth_callbacks:
       failure: '%{kind}''den kimliÄŸiniz doÄŸrulanamadÄ± Ã§Ã¼nkÃ¼ "%{reason}".'
       success: "%{kind} hesabÄ±ndan baÅŸarÄ±yla kimlik doÄŸrulamasÄ± yapÄ±ldÄ±."
@@ -67,8 +84,8 @@ tr:
       no_token: Bu sayfaya ÅŸifre sÄ±fÄ±rlama e-postasÄ±ndan gelmeden eriÅŸemezsiniz. Åžifre sÄ±fÄ±rlama e-postasÄ±ndan geliyorsanÄ±z lÃ¼tfen saÄŸlanan tam URL'yi kullandÄ±ÄŸÄ±nÄ±zdan emin olun.
       send_instructions: E-posta adresiniz veritabanÄ±mÄ±zda varsa, e-posta adresinize birkaÃ§ dakika iÃ§inde bir parola kurtarma baÄŸlantÄ±sÄ± gÃ¶nderilir. Bu e-postayÄ± almadÄ±ysanÄ±z, lÃ¼tfen spam klasÃ¶rÃ¼nÃ¼zÃ¼ kontrol edin.
       send_paranoid_instructions: E-posta adresiniz veritabanÄ±mÄ±zda varsa, e-posta adresinize birkaÃ§ dakika iÃ§inde bir parola kurtarma baÄŸlantÄ±sÄ± gÃ¶nderilir. Bu e-postayÄ± almadÄ±ysanÄ±z, lÃ¼tfen spam klasÃ¶rÃ¼nÃ¼zÃ¼ kontrol edin.
-      updated: ParolanÄ±z baÅŸarÄ±yla deÄŸiÅŸtirildi. Åžuan oturumunuz aÃ§Ä±ldÄ±.
-      updated_not_active: ParolanÄ±z baÅŸarÄ±yla deÄŸiÅŸtirildi.
+      updated: Åžifreniz baÅŸarÄ±lÄ± bir ÅŸekilde deÄŸiÅŸtirildi. Åžu an oturum aÃ§tÄ±nÄ±z.
+      updated_not_active: Åžifreniz baÅŸarÄ±yla deÄŸiÅŸtirildi.
     registrations:
       destroyed: GÃ¶rÃ¼ÅŸÃ¼rÃ¼z! hesabÄ±n baÅŸarÄ±yla iptal edildi. UmarÄ±z seni sonra tekrar gÃ¶rÃ¼rÃ¼z.
       signed_up: HoÅŸ geldiniz! BaÅŸarÄ±lÄ± bir ÅŸekilde oturum aÃ§tÄ±nÄ±z.
@@ -79,9 +96,9 @@ tr:
       update_needs_confirmation: HesabÄ±nÄ±zÄ± baÅŸarÄ±yla gÃ¼ncellediniz, ancak yeni e-posta adresinizi doÄŸrulamamÄ±z gerekiyor. LÃ¼tfen e-postanÄ±zÄ± kontrol edin ve yeni e-posta adresinizi onaylamak iÃ§in onay baÄŸlantÄ±sÄ±nÄ± izleyin. Bu e-postayÄ± almadÄ±ysanÄ±z, lÃ¼tfen spam klasÃ¶rÃ¼nÃ¼zÃ¼ kontrol edin.
       updated: HesabÄ±nÄ±z baÅŸarÄ±yla gÃ¼ncellendi.
     sessions:
-      already_signed_out: BaÅŸarÄ±yla Ã§Ä±kÄ±ÅŸ yapÄ±ldÄ±.
-      signed_in: BaÅŸarÄ±yla giriÅŸ yapÄ±ldÄ±.
-      signed_out: BaÅŸarÄ±yla Ã§Ä±kÄ±ÅŸ yapÄ±ldÄ±.
+      already_signed_out: BaÅŸarÄ±lÄ± bir ÅŸekilde oturum kapatÄ±ldÄ±.
+      signed_in: BaÅŸarÄ±lÄ± bir ÅŸekilde oturum aÃ§Ä±ldÄ±.
+      signed_out: BaÅŸarÄ±lÄ± bir ÅŸekilde oturum kapatÄ±ldÄ±.
     unlocks:
       send_instructions: HesabÄ±nÄ±zÄ± birkaÃ§ dakika iÃ§inde nasÄ±l aÃ§acaÄŸÄ±nÄ±za iliÅŸkin talimatlarÄ± iÃ§eren bir e-posta alacaksÄ±nÄ±z. Bu e-postayÄ± almadÄ±ysanÄ±z, lÃ¼tfen spam klasÃ¶rÃ¼nÃ¼zÃ¼ kontrol edin.
       send_paranoid_instructions: HesabÄ±nÄ±z varsa, birkaÃ§ dakika iÃ§inde nasÄ±l kilidini aÃ§acaÄŸÄ±nÄ±za iliÅŸkin talimatlarÄ± iÃ§eren bir e-posta alacaksÄ±nÄ±z. Bu e-postayÄ± almadÄ±ysanÄ±z, lÃ¼tfen spam klasÃ¶rÃ¼nÃ¼zÃ¼ kontrol edin.
diff --git a/config/locales/devise.tt.yml b/config/locales/devise.tt.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5eab4abff95e2119202e91e8d75bd785c9ccbdc9
--- /dev/null
+++ b/config/locales/devise.tt.yml
@@ -0,0 +1 @@
+tt:
diff --git a/config/locales/devise.uk.yml b/config/locales/devise.uk.yml
index eebeb106cd4461f35730e1222d4c527fe91cdec0..afd83861cddeca890c608114c3ba84b0d891d9f2 100644
--- a/config/locales/devise.uk.yml
+++ b/config/locales/devise.uk.yml
@@ -60,6 +60,23 @@ uk:
         title: ÐšÐ¾Ð´Ð¸ Ð´Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð¾Ð³Ð¾ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·Ð¼Ñ–Ð½ÐµÐ½Ð¾
       unlock_instructions:
         subject: 'Mastodon: Ð†Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ñ–Ñ— Ð´Ð»Ñ Ñ€Ð¾Ð·Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ'
+      webauthn_credential:
+        added:
+          explanation: ÐÐ°ÑÑ‚ÑƒÐ¿Ð½Ð¸Ð¹ ÐºÐ»ÑŽÑ‡ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ Ð±ÑƒÐ² Ð´Ð¾Ð´Ð°Ð½Ð¸Ð¹ Ð´Ð¾ Ð²Ð°ÑˆÐ¾Ð³Ð¾ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑƒ
+          subject: 'Mastodon: ÐÐ¾Ð²Ð¸Ð¹ ÐºÐ»ÑŽÑ‡ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸'
+          title: ÐÐ¾Ð²Ð¸Ð¹ ÐºÐ»ÑŽÑ‡ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ Ð´Ð¾Ð´Ð°Ð½Ð¾
+        deleted:
+          explanation: ÐÐ°ÑÑ‚ÑƒÐ¿Ð½Ð¸Ð¹ ÐºÐ»ÑŽÑ‡ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ Ð±ÑƒÐ»Ð¾ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾ Ð· Ð²Ð°ÑˆÐ¾Ð³Ð¾ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑƒ
+          subject: 'Mastodon: ÐšÐ»ÑŽÑ‡ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾'
+          title: ÐžÐ´Ð¸Ð½ Ð· Ð²Ð°ÑˆÐ¸Ñ… ÐºÐ»ÑŽÑ‡Ñ–Ð² Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ Ð±ÑƒÐ»Ð¾ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾
+      webauthn_disabled:
+        explanation: ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–ÑŽ Ð· ÐºÐ»ÑŽÑ‡Ð°Ð¼Ð¸ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ Ð±ÑƒÐ»Ð¾ Ð²Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾ Ð´Ð»Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑƒ. Ð’Ñ…Ñ–Ð´ Ñ‚ÐµÐ¿ÐµÑ€ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¸Ð¹ Ð»Ð¸ÑˆÐµ Ñ‡ÐµÑ€ÐµÐ· Ñ‚Ð¾ÐºÐµÐ½, Ð·Ð³ÐµÐ½ÐµÑ€Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð¼ TOTP.
+        subject: 'Mastodon: ÐÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾ÑŽ ÐºÐ»ÑŽÑ‡Ñ–Ð² Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð°'
+        title: ÐšÐ»ÑŽÑ‡Ñ– Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ Ð²Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¾
+      webauthn_enabled:
+        explanation: ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð° Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ Ð±ÑƒÐ»Ð° ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð° Ð´Ð»Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑƒ. Ð’Ð°Ñˆ ÐºÐ»ÑŽÑ‡ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ Ñ‚ÐµÐ¿ÐµÑ€ Ð¼Ð¾Ð¶Ð½Ð° Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ.
+        subject: 'Mastodon: ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð° Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð°'
+        title: ÐšÐ»ÑŽÑ‡Ñ– Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð¾
     omniauth_callbacks:
       failure: ÐÐ°Ð¼ Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð’Ð°Ñ Ð· %{kind} Ñ‡ÐµÑ€ÐµÐ· Ñ‚Ðµ, Ñ‰Ð¾ "%{reason}".
       success: Ð£ÑÐ¿Ñ–ÑˆÐ½Ð¾ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ¾Ð²Ð°Ð½Ð¾ Ð· Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑƒ %{kind}.
diff --git a/config/locales/devise.vi.yml b/config/locales/devise.vi.yml
index 9a156be9dd0f6ad8cce84df4bfd41f41a351f06f..b0a240bf8e942c99d0964828003b7e7a37956fcc 100644
--- a/config/locales/devise.vi.yml
+++ b/config/locales/devise.vi.yml
@@ -8,7 +8,7 @@ vi:
     failure:
       already_authenticated: Báº¡n Ä‘Ã£ Ä‘Äƒng nháºp rá»“i.
       inactive: TÃ i khoáº£n cá»§a báº¡n chÆ°a Ä‘Æ°á»£c kich hoáº¡t.
-      invalid: Nháºp sai %{authentication_keys} hoáº·c máºt kháº©u.
+      invalid: "%{authentication_keys} hoáº·c máºt kháº©u khÃ´ng khá»›p."
       last_attempt: Náº¿u thá» sai láº§n ná»¯a, tÃ i khoáº£n cá»§a báº¡n sáº½ bá»‹ khÃ³a.
       locked: TÃ i khoáº£n cá»§a báº¡n bá»‹ khÃ³a.
       not_found_in_database: "%{authentication_keys} khÃ´ng cÃ³ trong dá»¯ liá»‡u."
@@ -21,8 +21,8 @@ vi:
         action: XÃ¡c thá»±c Ä‘á»‹a chá»‰ email
         action_with_app: XÃ¡c nháºn vÃ  quay láº¡i %{app}
         explanation: Báº¡n Ä‘Ã£ táº¡o má»™t tÃ i khoáº£n trÃªn %{host} vá»›i Ä‘á»‹a chá»‰ email nÃ y. Chá»‰ cáº§n má»™t cÃº nháº¥p chuá»™t ná»¯a Ä‘á»ƒ kÃch hoáº¡t nÃ³. Náº¿u Ä‘Ã¢y khÃ´ng pháº£i lÃ  báº¡n, xin vui lÃ²ng bá» qua email nÃ y.
-        explanation_when_pending: Báº¡n Ä‘Ã£ Ä‘Äƒng kÃ½ %{host} vá»›i Ä‘á»‹a chá»‰ email nÃ y. ChÃºng tÃ´i chá»‰ xem xÃ©t Ä‘Æ¡n Ä‘Äƒng kÃ½ sau khi báº¡n xÃ¡c thá»±c Ä‘á»‹a chá»‰ email. Báº¡n cÃ³ thá»ƒ Ä‘Äƒng nháºp Ä‘á»ƒ thay Ä‘á»•i chi tiáº¿t hoáº·c xÃ³a tÃ i khoáº£n cá»§a mÃ¬nh, nhÆ°ng báº¡n khÃ´ng thá»ƒ truy cáºp háº§u háº¿t cÃ¡c chá»©c nÄƒng cho Ä‘áº¿n khi tÃ i khoáº£n cá»§a báº¡n Ä‘Æ°á»£c cháº¥p thuáºn. Náº¿u báº¡n bá»‹ tá»« chá»‘i, dá»¯ liá»‡u cá»§a báº¡n sáº½ bá»‹ xÃ³a, do Ä‘Ã³ báº¡n sáº½ khÃ´ng cáº§n pháº£i thá»±c hiá»‡n thÃªm hÃ nh Ä‘á»™ng nÃ o ná»¯a. Náº¿u Ä‘Ã¢y khÃ´ng pháº£i lÃ  báº¡n, xin vui lÃ²ng bá» qua email nÃ y.
-        extra_html: Xin Ä‘á»c ká»¹ <a href="%{terms_path}">ná»™i quy mÃ¡y chá»§</a> vÃ  <a href="%{policy_path}">Ä‘iá»u khoáº£n dá»‹ch vá»¥</a> cá»§a chÃºng tÃ´i.
+        explanation_when_pending: Báº¡n vá»«a Ä‘Äƒng kÃ½ %{host} vá»›i Ä‘á»‹a chá»‰ email nÃ y. ChÃºng tÃ´i chá»‰ xem xÃ©t Ä‘Æ¡n Ä‘Äƒng kÃ½ sau khi báº¡n xÃ¡c thá»±c Ä‘á»‹a chá»‰ email. Báº¡n cÃ³ thá»ƒ Ä‘Äƒng nháºp Ä‘á»ƒ thay Ä‘á»•i chi tiáº¿t hoáº·c xÃ³a tÃ i khoáº£n cá»§a mÃ¬nh, nhÆ°ng báº¡n khÃ´ng thá»ƒ sá» dá»¥ng Ä‘áº§y Ä‘á»§ tÃnh nÄƒng cho Ä‘áº¿n khi tÃ i khoáº£n Ä‘Æ°á»£c xÃ¡c thá»±c. Náº¿u báº¡n bá»‹ tá»« chá»‘i, dá»¯ liá»‡u cá»§a báº¡n sáº½ bá»‹ xÃ³a, do Ä‘Ã³ báº¡n sáº½ khÃ´ng cáº§n pháº£i lÃ m gÃ¬ thÃªm ná»¯a. Náº¿u khÃ´ng pháº£i do báº¡n Ä‘Äƒng kÃ½, xin vui lÃ²ng bá» qua email nÃ y.
+        extra_html: Xin Ä‘á»c ká»¹ <a href="%{terms_path}">quy táº¯c mÃ¡y chá»§</a> vÃ  <a href="%{policy_path}">chÃnh sÃ¡ch riÃªng tÆ°</a> cá»§a chÃºng tÃ´i.
         subject: 'Mastodon: XÃ¡c thá»±c email cho %{instance}'
         title: XÃ¡c thá»±c Ä‘á»‹a chá»‰ email
       email_changed:
@@ -60,28 +60,45 @@ vi:
         title: MÃ£ khÃ´i phá»¥c xÃ¡c thá»±c hai yáº¿u tá»‘ Ä‘Ã£ thay Ä‘á»•i
       unlock_instructions:
         subject: 'Mastodon: HÆ°á»›ng dáº«n má»Ÿ khÃ³a'
+      webauthn_credential:
+        added:
+          explanation: KhÃ³a báº£o máºt nÃ y Ä‘Ã£ Ä‘Æ°á»£c thÃªm vÃ o tÃ i khoáº£n cá»§a báº¡n
+          subject: 'Mastodon: KhÃ³a báº£o máºt má»›i'
+          title: Vá»«a thÃªm má»™t khÃ³a báº£o máºt má»›i
+        deleted:
+          explanation: KhÃ³a báº£o máºt nÃ y Ä‘Ã£ bá»‹ xÃ³a khá»i tÃ i khoáº£n cá»§a báº¡n
+          subject: 'Mastodon: XÃ³a khÃ³a báº£o máºt'
+          title: Má»™t trong nhá»¯ng khÃ³a báº£o máºt cá»§a báº¡n vá»«a bá»‹ xÃ³a
+      webauthn_disabled:
+        explanation: Báº¡n vá»«a vÃ´ hiá»‡u hÃ³a xÃ¡c thá»±c tÃ i khoáº£n báº±ng khÃ³a báº£o máºt. Tá»« bÃ¢y giá», báº¡n sáº½ dÃ¹ng á»©ng dá»¥ng TOTP Ä‘á»ƒ táº¡o token Ä‘Äƒng nháºp.
+        subject: 'Mastodon: VÃ´ hiá»‡u hÃ³a xÃ¡c thá»±c báº±ng khÃ³a báº£o máºt'
+        title: ÄÃ£ vÃ´ hiá»‡u hÃ³a khÃ³a báº£o máºt
+      webauthn_enabled:
+        explanation: Báº¡n vá»«a kÃch hoáº¡t xÃ¡c thá»±c tÃ i khoáº£n báº±ng khÃ³a báº£o máºt. Tá»« bÃ¢y giá», khÃ³a báº£o máºt cá»§a báº¡n sáº½ Ä‘Æ°á»£c dÃ¹ng Ä‘á»ƒ Ä‘Äƒng nháºp.
+        subject: 'Mastodon: KÃch hoáº¡t xÃ¡c thá»±c báº±ng khÃ³a báº£o máºt'
+        title: ÄÃ£ kÃch hoáº¡t khÃ³a báº£o máºt
     omniauth_callbacks:
       failure: KhÃ´ng thá»ƒ xÃ¡c thá»±c báº¡n tá»« %{kind} bá»Ÿi vÃ¬ "%{reason}".
-      success: XÃ¡c thá»±c thÃ nh cÃ´ng tá»« tÃ i khoáº£n %{kind}.
+      success: XÃ¡c thá»±c tÃ i khoáº£n %{kind} thÃ nh cÃ´ng.
     passwords:
-      no_token: Báº¡n chá»‰ cÃ³ thá»ƒ truy cáºp trang nÃ y khi chuyá»ƒn tiáº¿p tá»« email phá»¥c há»“i máºt kháº©u. Náº¿u váº«n khÃ´ng Ä‘Æ°á»£c, vui lÃ²ng cháº¯c cháº¯n ráº±ng báº¡n Ä‘Ã£ sá» dá»¥ng chÃnh xÃ¡c URL Ä‘Æ°á»£c cung cáº¥p.
+      no_token: Báº¡n chá»‰ cÃ³ thá»ƒ truy cáºp trang nÃ y khi nháºn Ä‘Æ°á»£c email phá»¥c há»“i máºt kháº©u. Náº¿u váº«n khÃ´ng Ä‘Æ°á»£c, vui lÃ²ng cháº¯c cháº¯n ráº±ng báº¡n Ä‘Ã£ dÃ¹ng chÃnh xÃ¡c URL Ä‘Æ°á»£c cung cáº¥p.
       send_instructions: Náº¿u Ä‘á»‹a chá»‰ email cá»§a báº¡n tá»“n táº¡i trong cÆ¡ sá»Ÿ dá»¯ liá»‡u cá»§a chÃºng tÃ´i, báº¡n sáº½ nháºn Ä‘Æ°á»£c liÃªn káº¿t khÃ´i phá»¥c máºt kháº©u táº¡i Ä‘á»‹a chá»‰ email cá»§a báº¡n sau vÃ i phÃºt. Xin kiá»ƒm tra thÆ° má»¥c thÆ° rÃ¡c náº¿u nhÆ° báº¡n khÃ´ng tháº¥y email nÃ y.
       send_paranoid_instructions: Náº¿u Ä‘á»‹a chá»‰ email cá»§a báº¡n tá»“n táº¡i trong cÆ¡ sá»Ÿ dá»¯ liá»‡u cá»§a chÃºng tÃ´i, báº¡n sáº½ nháºn Ä‘Æ°á»£c liÃªn káº¿t khÃ´i phá»¥c máºt kháº©u táº¡i Ä‘á»‹a chá»‰ email cá»§a báº¡n sau vÃ i phÃºt. Xin kiá»ƒm tra thÆ° má»¥c thÆ° rÃ¡c náº¿u nhÆ° báº¡n khÃ´ng tháº¥y email nÃ y.
       updated: Máºt kháº©u cá»§a báº¡n Ä‘Ã£ Ä‘Æ°á»£c thay Ä‘á»•i thÃ nh cÃ´ng. Hiá»‡n táº¡i báº¡n Ä‘Ã£ Ä‘Äƒng nháºp.
       updated_not_active: Máºt kháº©u cá»§a báº¡n Ä‘Ã£ Ä‘Æ°á»£c thay Ä‘á»•i thÃ nh cÃ´ng.
     registrations:
-      destroyed: Táº¡m biá»‡t! TÃ i khoáº£n cá»§a báº¡n Ä‘Ã£ há»§y thÃ nh cÃ´ng. Hi vá»ng chÃºng tÃ´i sáº½ sá»›m gáº·p láº¡i báº¡n.
+      destroyed: Táº¡m biá»‡t! TÃ i khoáº£n cá»§a báº¡n Ä‘Ã£ bá»‹ há»§y. Hi vá»ng chÃºng tÃ´i sáº½ sá»›m gáº·p láº¡i báº¡n.
       signed_up: ChÃºc má»«ng! Báº¡n Ä‘Ã£ Ä‘Äƒng kÃ½ thÃ nh cÃ´ng.
-      signed_up_but_inactive: Báº¡n Ä‘Ã£ Ä‘Äƒng kÃ½ thÃ nh cÃ´ng. Tuy nhiÃªn, chÃºng tÃ´i khÃ´ng thá»ƒ Ä‘Äƒng nháºp cho báº¡n vÃ¬ tÃ i khoáº£n cá»§a báº¡n chÆ°a Ä‘Æ°á»£c kÃch hoáº¡t.
+      signed_up_but_inactive: Báº¡n Ä‘Ã£ Ä‘Äƒng kÃ½ thÃ nh cÃ´ng. Tuy nhiÃªn, báº¡n cáº§n pháº£i kÃch hoáº¡t tÃ i khoáº£n má»›i cÃ³ thá»ƒ Ä‘Äƒng nháºp.
       signed_up_but_locked: Báº¡n Ä‘Ã£ Ä‘Äƒng kÃ½ thÃ nh cÃ´ng. Tuy nhiÃªn, chÃºng tÃ´i khÃ´ng thá»ƒ Ä‘Äƒng nháºp cho báº¡n vÃ¬ tÃ i khoáº£n cá»§a báº¡n bá»‹ khÃ³a.
       signed_up_but_pending: Má»™t email xÃ¡c thá»±c Ä‘Ã£ Ä‘Æ°á»£c gá»i Ä‘áº¿n Ä‘á»‹a chá»‰ email cá»§a báº¡n. Sau khi báº¡n nháº¥p vÃ o liÃªn káº¿t, chÃºng tÃ´i sáº½ xem xÃ©t Ä‘Æ¡n Ä‘Äƒng kÃ½ cá»§a báº¡n vÃ  thÃ´ng bÃ¡o náº¿u Ä‘Æ¡n Ä‘Æ°á»£c cháº¥p thuáºn.
       signed_up_but_unconfirmed: Má»™t email xÃ¡c thá»±c Ä‘Ã£ Ä‘Æ°á»£c gá»i Ä‘áº¿n Ä‘á»‹a chá»‰ email cá»§a báº¡n. HÃ£y nháº¥p vÃ o liÃªn káº¿t trong email Ä‘á»ƒ kÃch hoáº¡t tÃ i khoáº£n cá»§a báº¡n. Náº¿u khÃ´ng tháº¥y, hÃ£y kiá»ƒm tra má»¥c thÆ° rÃ¡c.
       update_needs_confirmation: Báº¡n Ä‘Ã£ cáºp nháºt tÃ i khoáº£n thÃ nh cÃ´ng, nhÆ°ng chÃºng tÃ´i cáº§n xÃ¡c thá»±c Ä‘á»‹a chá»‰ email má»›i cá»§a báº¡n. Vui lÃ²ng kiá»ƒm tra email vÃ  nháº¥p vÃ o liÃªn káº¿t xÃ¡c thá»±c. Náº¿u báº¡n khÃ´ng tháº¥y email, hÃ£y kiá»ƒm tra trong thÆ° rÃ¡c.
       updated: TÃ i khoáº£n cá»§a báº¡n Ä‘Ã£ Ä‘Æ°á»£c cáºp nháºt thÃ nh cÃ´ng.
     sessions:
-      already_signed_out: HoÃ n táº¥t Ä‘Äƒng xuáº¥t.
+      already_signed_out: ÄÃ£ Ä‘Äƒng xuáº¥t.
       signed_in: ÄÃ£ Ä‘Äƒng nháºp thÃ nh cÃ´ng.
-      signed_out: HoÃ n táº¥t Ä‘Äƒng xuáº¥t.
+      signed_out: ÄÃ£ Ä‘Äƒng xuáº¥t.
     unlocks:
       send_instructions: Báº¡n sáº½ nháºn Ä‘Æ°á»£c má»™t email hÆ°á»›ng dáº«n vá» cÃ¡ch má»Ÿ khÃ³a tÃ i khoáº£n cá»§a báº¡n trong vÃ i phÃºt tá»›i. Xin kiá»ƒm tra thÆ° má»¥c thÆ° rÃ¡c náº¿u nhÆ° báº¡n khÃ´ng tháº¥y email nÃ y.
       send_paranoid_instructions: Náº¿u tÃ i khoáº£n cá»§a báº¡n tá»“n táº¡i, báº¡n sáº½ nháºn Ä‘Æ°á»£c email hÆ°á»›ng dáº«n cÃ¡ch má»Ÿ khÃ³a trong vÃ i phÃºt tá»›i. Xin kiá»ƒm tra thÆ° má»¥c thÆ° rÃ¡c náº¿u nhÆ° báº¡n khÃ´ng tháº¥y email nÃ y.
diff --git a/config/locales/devise.zgh.yml b/config/locales/devise.zgh.yml
new file mode 100644
index 0000000000000000000000000000000000000000..4d376ba8ca82f2ebbc2d310604ffcad97433001f
--- /dev/null
+++ b/config/locales/devise.zgh.yml
@@ -0,0 +1,8 @@
+---
+zgh:
+  devise:
+    failure:
+      locked: âµ‰âµœâµœâµ“âµ”â´³âµ âµ“âµŽâµ‰â´¹â´°âµ âµâµâ´½.
+    mailer:
+      reset_password_instructions:
+        action: âµ™âµâ´¼âµ âµœâ´°â´³âµ“âµ”âµ‰ âµ âµ“âµ£âµ”â´°âµ¢
diff --git a/config/locales/devise.zh-CN.yml b/config/locales/devise.zh-CN.yml
index b7887dfa8392e54e6302cc751666df2a0c3cdad8..a830708938decba31a77a5ba911d1589d074b2d4 100644
--- a/config/locales/devise.zh-CN.yml
+++ b/config/locales/devise.zh-CN.yml
@@ -9,7 +9,7 @@ zh-CN:
       already_authenticated: ä½ å·²ç»ç™»å½•ã€‚
       inactive: ä½ è¿˜æ²¡æœ‰æ¿€æ´»å¸æˆ·ã€‚
       invalid: "%{authentication_keys} æ— æ•ˆæˆ–å¯†ç é”™è¯¯ã€‚"
-      last_attempt: ä½ è¿˜æœ‰æœ€åŽä¸€æ¬¡å°è¯•æœºä¼šï¼Œå†æ¬¡å¤±è´¥ä½ çš„å¸æˆ·å°†è¢«é”å®šã€‚
+      last_attempt: è¿™æ˜¯æœ€åŽä¸€æ¬¡å°è¯•æœºä¼šï¼Œå¤±è´¥åŽä½ çš„å¸æˆ·å°†è¢«é”å®šã€‚
       locked: ä½ çš„å¸æˆ·å·²è¢«é”å®šã€‚
       not_found_in_database: "%{authentication_keys}æˆ–å¯†ç é”™è¯¯ã€‚"
       pending: ä½ çš„å¸å·ä»åœ¨å®¡æ ¸ä¸ã€‚
@@ -31,7 +31,7 @@ zh-CN:
         subject: Mastodonï¼šç”µåé‚®ä»¶åœ°å€å·²è¢«æ›´æ”¹
         title: æ–°ç”µåé‚®ä»¶åœ°å€
       password_change:
-        explanation: ä½ çš„å¸æˆ·çš„å¯†ç å·²è¢«æ›´æ”¹ã€‚
+        explanation: ä½ çš„å¸æˆ·å¯†ç å·²æ›´æ”¹ã€‚
         extra: å¦‚æžœä½ å¹¶æ²¡æœ‰è¯·æ±‚æ›´æ”¹ä½ çš„å¯†ç ï¼Œåˆ™ä»–äººå¾ˆæœ‰å¯èƒ½å·²ç»å…¥ä¾µä½ çš„å¸æˆ·ã€‚è¯·ç«‹å³æ›´æ”¹ä½ çš„å¯†ç ï¼›å¦‚æžœä½ å·²ç»æ— æ³•è®¿é—®ä½ çš„å¸æˆ·ï¼Œè¯·è”ç³»æœåŠ¡å™¨çš„ç®¡ç†å‘˜è¯·æ±‚ååŠ©ã€‚
         subject: Mastodonï¼šå¯†ç å·²è¢«æ›´æ”¹
         title: å¯†ç å·²è¢«é‡ç½®
@@ -60,6 +60,23 @@ zh-CN:
         title: åŒé‡éªŒè¯çš„æ¢å¤ç å·²æ›´æ”¹
       unlock_instructions:
         subject: Mastodonï¼šå¸æˆ·è§£é”ä¿¡æ¯
+      webauthn_credential:
+        added:
+          explanation: ä»¥ä¸‹å®‰å…¨å¯†é’¥å·²æ·»åŠ åˆ°æ‚¨çš„å¸æˆ·
+          subject: Mastodonï¼šæ–°çš„å®‰å…¨å¯†é’¥
+          title: å·²æ·»åŠ ä¸€ä¸ªæ–°çš„å®‰å…¨å¯†é’¥
+        deleted:
+          explanation: ä»¥ä¸‹å®‰å…¨å¯†é’¥å·²ä»Žæ‚¨çš„è´¦æˆ·ä¸åˆ é™¤
+          subject: Mastodonï¼šå®‰å…¨å¯†é’¥å·²åˆ é™¤
+          title: æ‚¨çš„å®‰å…¨å¯†é’¥ä¹‹ä¸€å·²è¢«åˆ é™¤
+      webauthn_disabled:
+        explanation: æ‚¨çš„å¸æˆ·å·²ç¦ç”¨å®‰å…¨å¯†é’¥è®¤è¯ã€‚çŽ°åœ¨åªèƒ½ä½¿ç”¨é…å¯¹çš„ TOTP åº”ç”¨ç¨‹åºç”Ÿæˆçš„ä»¤ç‰Œç™»å½•ã€‚
+        subject: Mastodonï¼šå®‰å…¨å¯†é’¥è®¤è¯å·²ç¦ç”¨
+        title: å®‰å…¨å¯†é’¥å·²ç¦ç”¨
+      webauthn_enabled:
+        explanation: æ‚¨çš„å¸æˆ·å·²å¯ç”¨å®‰å…¨å¯†é’¥èº«ä»½éªŒè¯ã€‚æ‚¨çš„å®‰å…¨å¯†é’¥çŽ°åœ¨å¯ä»¥ç”¨äºŽç™»å½•ã€‚
+        subject: Mastodonï¼šå®‰å…¨å¯†é’¥è®¤è¯å·²å¯ç”¨
+        title: å·²å¯ç”¨å®‰å…¨å¯†é’¥
     omniauth_callbacks:
       failure: ç”±äºŽ%{reason}ï¼Œæ— æ³•ä»Ž%{kind}èŽ·å¾—æŽˆæƒã€‚
       success: æˆåŠŸåœ°ä»Ž%{kind}èŽ·å¾—æŽˆæƒã€‚
@@ -70,13 +87,13 @@ zh-CN:
       updated: ä½ çš„å¯†ç å·²ä¿®æ”¹æˆåŠŸï¼Œä½ çŽ°åœ¨å·²ç™»å½•ã€‚
       updated_not_active: ä½ çš„å¯†ç å·²ä¿®æ”¹æˆåŠŸã€‚
     registrations:
-      destroyed: å†è§ï¼ä½ çš„å¸æˆ·å·²æˆåŠŸé”€æ¯ã€‚æˆ‘ä»¬å¸Œæœ›å¾ˆå¿«å¯ä»¥å†è§åˆ°ä½ ã€‚
+      destroyed: å†è§ï¼ä½ çš„å¸æˆ·å·²æˆåŠŸæ³¨é”€ã€‚æˆ‘ä»¬å¸Œæœ›å¾ˆå¿«å¯ä»¥å†è§åˆ°ä½ ã€‚
       signed_up: æ¬¢è¿Žï¼ä½ å·²æ³¨å†ŒæˆåŠŸã€‚
-      signed_up_but_inactive: ä½ å·²æ³¨å†Œï¼Œä½†å°šæœªæ¿€æ´»å¸æˆ·ã€‚
-      signed_up_but_locked: ä½ å·²æ³¨å†Œï¼Œä½†å¸æˆ·è¢«é”å®šäº†ã€‚
-      signed_up_but_pending: ä¸€å°å¸¦æœ‰ç¡®è®¤é“¾æŽ¥çš„é‚®ä»¶å·²ç»å‘é€åˆ°äº†æ‚¨çš„é‚®ç®±ã€‚ åœ¨æ‚¨ç‚¹å‡»ç¡®è®¤é“¾æŽ¥åŽï¼Œæˆ‘ä»¬å°†ä¼šå®¡æ ¸æ‚¨çš„ç”³è¯·ã€‚å®¡æ ¸é€šè¿‡åŽï¼Œæˆ‘ä»¬å°†ä¼šé€šçŸ¥æ‚¨ã€‚
+      signed_up_but_inactive: ä½ å·²æˆåŠŸæ³¨å†Œï¼Œä½†å› å°šæœªæ¿€æ´»å¸æˆ·æ‰€ä»¥æ— æ³•ç™»é™†ã€‚
+      signed_up_but_locked: ä½ å·²æˆåŠŸæ³¨å†Œï¼Œä½†å› å¸æˆ·è¢«é”å®šæ‰€ä»¥æ— æ³•ç™»é™†ã€‚
+      signed_up_but_pending: ä¸€å°å¸¦æœ‰ç¡®è®¤é“¾æŽ¥çš„é‚®ä»¶å·²ç»å‘é€åˆ°äº†ä½ çš„é‚®ç®±ã€‚ åœ¨ä½ ç‚¹å‡»ç¡®è®¤é“¾æŽ¥åŽï¼Œæˆ‘ä»¬å°†ä¼šå®¡æ ¸ä½ çš„ç”³è¯·ã€‚å®¡æ ¸é€šè¿‡åŽï¼Œæˆ‘ä»¬å°†ä¼šé€šçŸ¥ä½ ã€‚
       signed_up_but_unconfirmed: ä¸€å°å¸¦æœ‰ç¡®è®¤é“¾æŽ¥çš„é‚®ä»¶å·²ç»å‘é€è‡³ä½ çš„é‚®ç®±ï¼Œè¯·ç‚¹å‡»é‚®ä»¶ä¸çš„é“¾æŽ¥ä»¥æ¿€æ´»ä½ çš„å¸æˆ·ã€‚å¦‚æžœæ²¡æœ‰ï¼Œè¯·æ£€æŸ¥ä½ çš„åžƒåœ¾é‚®ä»¶ã€‚
-      update_needs_confirmation: ä¿¡æ¯æ›´æ–°æˆåŠŸï¼Œä½†æˆ‘ä»¬éœ€è¦éªŒè¯ä½ çš„æ–°ç”µåé‚®ä»¶åœ°å€ï¼Œè¯·ç‚¹å‡»é‚®ä»¶ä¸çš„é“¾æŽ¥ä»¥ç¡®è®¤ã€‚å¦‚æžœæ²¡æœ‰ï¼Œè¯·æ£€æŸ¥ä½ çš„åžƒåœ¾é‚®ç®±ã€‚
+      update_needs_confirmation: å¸å·ä¿¡æ¯æ›´æ–°æˆåŠŸï¼Œä½†æˆ‘ä»¬éœ€è¦éªŒè¯ä½ çš„æ–°ç”µåé‚®ä»¶åœ°å€ï¼Œè¯·ç‚¹å‡»é‚®ä»¶ä¸çš„é“¾æŽ¥ä»¥ç¡®è®¤ã€‚å¦‚æžœæ²¡æœ‰ï¼Œè¯·æ£€æŸ¥ä½ çš„åžƒåœ¾é‚®ç®±ã€‚
       updated: å¸æˆ·èµ„æ–™æ›´æ–°æˆåŠŸã€‚
     sessions:
       already_signed_out: å·²æˆåŠŸç™»å‡ºã€‚
@@ -84,12 +101,12 @@ zh-CN:
       signed_out: å·²æˆåŠŸç™»å‡ºã€‚
     unlocks:
       send_instructions: å‡ åˆ†é’ŸåŽï¼Œä½ å°†æ”¶åˆ°ä¸€å°è§£é”å¸æˆ·çš„é‚®ä»¶ã€‚å¦‚æžœæ²¡æœ‰ï¼Œè¯·æ£€æŸ¥ä½ çš„åžƒåœ¾é‚®ç®±ã€‚
-      send_paranoid_instructions: å¦‚æžœä½ çš„é‚®ç®±å˜åœ¨äºŽæˆ‘ä»¬çš„æ•°æ®åº“ä¸ï¼Œä½ å°†æ”¶åˆ°ä¸€å°è§£é”å¸æˆ·çš„é‚®ä»¶ã€‚å¦‚æžœæ²¡æœ‰ï¼Œè¯·æ£€æŸ¥ä½ çš„åžƒåœ¾é‚®ç®±ã€‚
+      send_paranoid_instructions: å¦‚æžœä½ çš„å¸å·å˜åœ¨äºŽæ•°æ®åº“ä¸ï¼Œä½ å°†æ”¶åˆ°ä¸€å°æŒ‡å¼•ä½ è§£é”å¸æˆ·çš„é‚®ä»¶ã€‚å¦‚æžœæ²¡æœ‰ï¼Œè¯·æ£€æŸ¥ä½ çš„åžƒåœ¾é‚®ç®±ã€‚
       unlocked: ä½ çš„å¸æˆ·å·²æˆåŠŸè§£é”ã€‚ç™»å½•ä»¥ç»§ç»ã€‚
   errors:
     messages:
       already_confirmed: å·²ç»ç¡®è®¤æˆåŠŸï¼Œè¯·å°è¯•ç™»å½•
-      confirmation_period_expired: å¿…é¡»åœ¨ %{period}ä»¥å†…ç¡®è®¤ã€‚è¯·é‡æ–°å‘èµ·è¯·æ±‚
+      confirmation_period_expired: å¿…é¡»åœ¨ %{period} ä»¥å†…ç¡®è®¤ã€‚è¯·é‡æ–°å‘èµ·è¯·æ±‚
       expired: å·²è¿‡æœŸã€‚è¯·é‡æ–°å‘èµ·è¯·æ±‚
       not_found: æœªæ‰¾åˆ°
       not_locked: æœªè¢«é”å®š
diff --git a/config/locales/devise.zh-HK.yml b/config/locales/devise.zh-HK.yml
index f72fd55a3ce53d4be8f5fddb104ed254a8edd1ce..2d9e8ddeada10c6c0ea53185ce3764a6e4e50844 100644
--- a/config/locales/devise.zh-HK.yml
+++ b/config/locales/devise.zh-HK.yml
@@ -2,90 +2,107 @@
 zh-HK:
   devise:
     confirmations:
-      confirmed: ä½ çš„é›»éƒµåœ°å€æˆåŠŸç¢ºèªã€‚
-      send_instructions: ä½ å°‡æœƒåœ¨å¹¾åˆ†é˜å…§æ”¶åˆ°ç¢ºèªæŒ‡ç¤ºé›»éƒµï¼Œä¸Šé¢æœ‰ç¢ºèªä½ é›»éƒµåœ°å€çš„æŒ‡ç¤ºã€‚
-      send_paranoid_instructions: å¦‚æžœä½ çš„é›»éƒµåœ°å€å·²ç¶“å˜åœ¨æ–¼æˆ‘å€‘çš„è³‡æ–™åº«ï¼Œä½ å°‡æœƒåœ¨å¹¾åˆ†é˜å…§æ”¶åˆ°é›»éƒµï¼Œç¢ºèªä½ é›»éƒµåœ°å€çš„æŒ‡ç¤ºã€‚
+      confirmed: å·²ç¢ºèªä½ çš„é›»éƒµåœ°å€ã€‚
+      send_instructions: ä½ å°‡æœƒåœ¨å¹¾åˆ†é˜å…§æ”¶åˆ°ç¢ºèªæŒ‡ç¤ºé›»éƒµï¼Œä¸Šé¢æœ‰ç¢ºèªä½ é›»éƒµåœ°å€çš„æŒ‡ç¤ºã€‚å¦‚æžœå®ƒæ²’æœ‰å‡ºç¾åœ¨ä½ çš„æ”¶ä»¶ç®±ï¼Œè«‹æª¢æŸ¥ä¸€ä¸‹ä½ çš„åžƒåœ¾éƒµä»¶ç®±ã€‚
+      send_paranoid_instructions: å¦‚æžœä½ çš„é›»éƒµåœ°å€å·²ç¶“å˜åœ¨æ–¼æˆ‘å€‘çš„è³‡æ–™åº«ï¼Œä½ å°‡æœƒåœ¨å¹¾åˆ†é˜å…§æ”¶åˆ°é›»éƒµï¼Œç¢ºèªä½ é›»éƒµåœ°å€çš„æŒ‡ç¤ºã€‚å¦‚æžœå®ƒæ²’æœ‰å‡ºç¾åœ¨ä½ çš„æ”¶ä»¶ç®±ï¼Œè«‹æª¢æŸ¥ä¸€ä¸‹ä½ çš„åžƒåœ¾éƒµä»¶ç®±ã€‚
     failure:
       already_authenticated: ä½ ä¹‹å‰å·²ç¶“ç™»å…¥äº†ã€‚
-      inactive: æ‚¨çš„å¸³è™Ÿå°šæœªå•Ÿç”¨ã€‚
-      invalid: ä¸æ£ç¢ºçš„ %{authentication_keys} æˆ–å¯†ç¢¼ã€‚
+      inactive: ä½ çš„å¸³è™Ÿå°šæœªè¢«å•Ÿç”¨ã€‚
+      invalid: ä¸æ£ç¢ºçš„%{authentication_keys}æˆ–å¯†ç¢¼ã€‚
       last_attempt: è‹¥ä½ å†ä¸€æ¬¡å˜—è©¦å¤±æ•—ï¼Œæˆ‘å€‘å°‡éŽ–å®šä½ çš„å¸³è™Ÿï¼Œä»¥ç–å®‰å…¨ã€‚
       locked: ä½ çš„å¸³è™Ÿå·²è¢«éŽ–å®šã€‚
-      not_found_in_database: ä¸æ£ç¢ºçš„ %{authentication_keys} æˆ–å¯†ç¢¼ã€‚
-      pending: æ‚¨çš„å¸³æˆ¶ä»åœ¨å¯©æ ¸ä¸ã€‚
+      not_found_in_database: ä¸æ£ç¢ºçš„%{authentication_keys}æˆ–å¯†ç¢¼ã€‚
+      pending: ä½ çš„å¸³è™Ÿä»åœ¨å¯©æ ¸ä¸
       timeout: ä½ çš„ç™»å…¥éšŽæ®µå·²ç¶“éŽæœŸï¼Œè«‹é‡æ–°ç™»å…¥ä»¥ç¹¼çºŒä½¿ç”¨ã€‚
       unauthenticated: ä½ å¿…é ˆå…ˆç™»å…¥æˆ–ç™»è¨˜ï¼Œä»¥ç¹¼çºŒä½¿ç”¨ã€‚
       unconfirmed: ä½ å¿…é ˆå…ˆç¢ºèªé›»éƒµåœ°å€ï¼Œç¹¼çºŒä½¿ç”¨ã€‚
     mailer:
       confirmation_instructions:
         action: é©—è‰é›»åéƒµä»¶åœ°å€
-        action_with_app: ç¢ºèªä¸¦è¿”å›ž %{app}
-        explanation: ä½ åœ¨ %{host} ä¸Šä½¿ç”¨é€™å€‹é›»åéƒµä»¶åœ°å€å»ºç«‹äº†ä¸€å€‹å¸³æˆ¶ã€‚åªéœ€é»žæ“Šä¸‹é¢çš„é€£çµï¼Œå³å¯å•Ÿç”¨å¸³æˆ¶ã€‚å¦‚æžœä½ ä¸¦æ²’æœ‰å»ºç«‹éŽå¸³æˆ¶ï¼Œè«‹å¿½ç•¥æ¤éƒµä»¶ã€‚
-        explanation_when_pending: æ‚¨ä½¿ç”¨æ¤é›»åä¿¡ç®±ä½å€ç”³è«‹äº† %{host} çš„é‚€è«‹ã€‚ç•¶æ‚¨ç¢ºèªé›»åä¿¡ç®±å¾Œæˆ‘å€‘å°‡å¯©æ ¸æ‚¨çš„ç”³è«‹ï¼Œè€Œç›´åˆ°æ ¸å‡†å‰æ‚¨éƒ½ç„¡æ³•ç™»å…¥ã€‚ç•¶æ‚¨çš„ç”³è«‹éæ‹’çµ•ï¼Œæ‚¨çš„è³‡æ–™å°‡è¢«ç§»é™¤è€Œä¸å¿…åšå¾ŒçºŒå‹•ä½œã€‚å¦‚æžœé€™ä¸æ˜¯æ‚¨ï¼Œè«‹å¿½ç•¥æ¤ä¿¡ä»¶ã€‚
-        extra_html: è«‹è¨˜å¾—é–±è®€æœ¬æœå‹™ç«™çš„<a href="%{terms_path}">ç›¸é—œè¦å®š</a>å’Œ<a href="%{policy_path}">ä½¿ç”¨æ¢æ¬¾</a>ã€‚
+        action_with_app: ç¢ºèªä¸¦å›žåˆ°%{app}
+        explanation: ä½ å·²æˆåŠŸç”¨é€™å€‹é›»éƒµåœ¨ %{host} ä¸Šå»ºç«‹äº†å¸³è™Ÿã€‚åªéœ€é»žæ“Šä¸‹é¢çš„é€£çµï¼Œå³å¯å•Ÿç”¨å¸³æˆ¶ã€‚å¦‚æžœä½ ä¸¦æ²’æœ‰å»ºç«‹éŽå¸³æˆ¶ï¼Œè«‹å¿½ç•¥æ¤éƒµä»¶ã€‚
+        explanation_when_pending: ä½ ä½¿ç”¨æ¤é›»éƒµåœ°å€ç”³è«‹äº†%{host} å¸³æˆ¶ã€‚ç¢ºèªé›»éƒµåœ°å€å¾Œï¼Œæˆ‘å€‘å°‡å¯©æ ¸ä½ çš„ç”³è«‹ã€‚ä½ å¯åœ¨ç™»å…¥å¾Œæ›´æ”¹è©³ç´°ä¿¡æ¯ï¼Œæˆ–åˆªé™¤å¸³æˆ¶ï¼Œä½†åœ¨å¸³æˆ¶ç²å¾—æ‰¹å‡†ä¹‹å‰ï¼Œä½ å°‡ç„¡æ³•ä½¿ç”¨å¤§éƒ¨ä»½åŠŸèƒ½ã€‚å¦‚æžœä½ çš„ç”³è«‹è¢«æ‹’çµ•ï¼Œä½ çš„è³‡æ–™æœƒè¢«ç›´æŽ¥åˆªé™¤ï¼Œè€Œç„¡éœ€ä½ æŽ¡å–ä»»ä½•å‹•ä½œã€‚å¦‚æžœç”³è«‹äººä¸æ˜¯ä½ ï¼Œè«‹å¿½ç•¥æ¤é›»éƒµã€‚
+        extra_html: è«‹é–±è®€<a href="%{terms_path}">ç«™è¦</a>å’Œ<a href="%{policy_path}">æˆ‘å€‘çš„ä½¿ç”¨æ¢æ¬¾</a>ã€‚
         subject: 'Mastodon: ç¢ºèªé›»éƒµåœ°å€ %{instance}'
         title: é©—è‰é›»åéƒµä»¶åœ°å€
       email_changed:
-        explanation: ä½ çš„å¸³æˆ¶çš„é›»åéƒµä»¶åœ°å€å³å°‡è®Šæ›´ç‚ºï¼š
-        extra: å¦‚æžœä½ æ²’æœ‰è«‹æ±‚æ›´æ”¹ä½ çš„é›»åéƒµä»¶åœ°å€ï¼Œå‰‡ä»–äººå¾ˆæœ‰å¯èƒ½å·²ç¶“å…¥ä¾µä½ çš„å¸³æˆ¶ã€‚è«‹ç«‹å³æ›´æ”¹ä½ çš„å¯†ç¢¼ï¼›å¦‚æžœä½ å·²ç¶“ç„¡æ³•è¨ªå•ä½ çš„å¸³æˆ¶ï¼Œè«‹è¯ç¹«æœå‹™ç«™çš„ç®¡ç†å“¡è«‹æ±‚å”åŠ©ã€‚
-        subject: Mastodonï¼šé›»åéƒµä»¶åœ°å€å·²è¢«æ›´æ”¹
-        title: æ–°é›»åéƒµä»¶åœ°å€
+        explanation: ä½ çš„å¸³è™Ÿçš„é›»éƒµåœ°å€å³å°‡è®Šæ›´ç‚ºï¼š
+        extra: å¦‚æžœä½ æ²’æœ‰æ›´æ”¹ä½ çš„é›»éƒµåœ°å€ï¼Œé‚£å¾ˆæœ‰å¯èƒ½å·²ç¶“æœ‰å…¶ä»–äººå…¥ä¾µä½ çš„å¸³è™Ÿã€‚è«‹ç«‹å³æ›´æ”¹ä½ çš„å¯†ç¢¼ï¼›å¦‚æžœä½ å·²ç¶“ç„¡æ³•è¨ªå•ä½ çš„å¸³æˆ¶ï¼Œè«‹è¯ç¹«æœå‹™ç«™çš„ç®¡ç†å“¡è«‹æ±‚å”åŠ©ã€‚
+        subject: Mastodonï¼šé›»éƒµåœ°å€å·²è¢«æ›´æ”¹
+        title: æ–°é›»éƒµåœ°å€
       password_change:
-        explanation: ä½ çš„å¸³æˆ¶çš„å¯†ç¢¼å·²è¢«æ›´æ”¹ã€‚
-        extra: å¦‚æžœä½ æ²’æœ‰è«‹æ±‚æ›´æ”¹ä½ çš„å¯†ç¢¼ï¼Œå‰‡ä»–äººå¾ˆæœ‰å¯èƒ½å·²ç¶“å…¥ä¾µä½ çš„å¸³æˆ¶ã€‚è«‹ç«‹å³æ›´æ”¹ä½ çš„å¯†ç¢¼ï¼›å¦‚æžœä½ å·²ç¶“ç„¡æ³•è¨ªå•ä½ çš„å¸³æˆ¶ï¼Œè«‹è¯ç¹«æœå‹™ç«™çš„ç®¡ç†å“¡è«‹æ±‚å”åŠ©ã€‚
-        subject: 'Mastodon: æ›´æ”¹å¯†ç¢¼'
-        title: å¯†ç¢¼å·²è¢«é‡è¨
+        explanation: ä½ çš„å¸³è™Ÿçš„å¯†ç¢¼å·²è¢«æ›´æ”¹ã€‚
+        extra: å¦‚æžœä½ æ²’æœ‰æ›´æ”¹ä½ çš„å¯†ç¢¼ï¼Œé‚£å¾ˆæœ‰å¯èƒ½å·²ç¶“æœ‰å…¶ä»–äººå…¥ä¾µä½ çš„å¸³è™Ÿã€‚è«‹ç«‹å³æ›´æ”¹ä½ çš„å¯†ç¢¼ï¼›å¦‚æžœä½ å·²ç¶“ç„¡æ³•è¨ªå•ä½ çš„å¸³æˆ¶ï¼Œè«‹è¯ç¹«æœå‹™ç«™çš„ç®¡ç†å“¡è«‹æ±‚å”åŠ©ã€‚
+        subject: 'Mastodon: å¯†ç¢¼å·²è¢«æ›´æ”¹'
+        title: å¯†ç¢¼å·²è¢«æ›´æ”¹
       reconfirmation_instructions:
-        explanation: é»žæ“Šä¸‹é¢çš„é€£çµä¾†ç¢ºèªä½ çš„æ–°é›»åéƒµä»¶åœ°å€ã€‚
+        explanation: é»žæ“Šä¸‹é¢çš„é€£çµä¾†ç¢ºèªä½ çš„æ–°é›»éƒµåœ°å€ã€‚
         extra: å¦‚æžœä½ æ²’æœ‰è«‹æ±‚æœ¬æ¬¡è®Šæ›´ï¼Œè«‹å¿½ç•¥æ¤éƒµä»¶ã€‚ Mastodon å¸³æˆ¶çš„é›»åéƒµä»¶åœ°å€åªæœ‰åœ¨ä½ é»žæ“Šä¸Šé¢çš„é€£çµå¾Œæ‰æœƒæ›´æ”¹ã€‚
-        subject: Mastodonï¼šç¢ºèª %{instance} é›»åéƒµä»¶åœ°å€
-        title: é©—è‰é›»åéƒµä»¶åœ°å€
+        subject: Mastodonï¼šç¢ºèª %{instance} é›»éƒµåœ°å€
+        title: é©—è‰é›»éƒµåœ°å€
       reset_password_instructions:
         action: æ›´æ”¹å¯†ç¢¼
-        explanation: é»žæ“Šä¸‹é¢çš„é€£çµä¾†æ›´æ”¹å¸³æˆ¶çš„å¯†ç¢¼ã€‚
-        extra: å¦‚æžœä½ æ²’æœ‰è«‹æ±‚æœ¬æ¬¡è®Šæ›´ï¼Œè«‹å¿½ç•¥æ¤éƒµä»¶ã€‚ä½ çš„å¯†ç¢¼åªæœ‰åœ¨ä½ é»žæ“Šä¸Šé¢çš„é€£çµä¸¦è¼¸å…¥æ–°å¯†ç¢¼å¾Œæ‰æœƒæ›´æ”¹ã€‚
+        explanation: é»žæ“Šä¸‹é¢çš„é€£çµä¾†æ›´æ”¹å¸³è™Ÿçš„å¯†ç¢¼ã€‚
+        extra: å¦‚æžœä½ æ²’æœ‰è«‹æ±‚ä¿®æ”¹å¸³è™Ÿï¼Œè«‹å¿½ç•¥æ¤éƒµä»¶ã€‚åœ¨ä½ é»žæ“Šé€²ä¸Šé¢é€£çµä¸¦è¨å®šæ–°å¯†ç¢¼å‰ï¼Œå¸³è™Ÿå¯†ç¢¼æœƒç¶æŒä¸è®Šã€‚
         subject: 'Mastodon: é‡è¨å¯†ç¢¼'
         title: é‡è¨å¯†ç¢¼
       two_factor_disabled:
-        explanation: æ‚¨å¸³æˆ¶çš„å…©æ¥é©Ÿé©—è‰å·²åœç”¨ã€‚ç¾åœ¨åªèƒ½ä½¿ç”¨é›»åä¿¡ç®±åŠå¯†ç¢¼ç™»å…¥ã€‚
-        subject: Mastodonï¼šå·²åœç”¨å…©æ¥é©Ÿé©—è‰
-        title: å·²åœç”¨ 2FA
+        explanation: å¸³è™Ÿçš„é›™é‡èªè‰å·²è¢«åœç”¨ã€‚ç¾åœ¨åªéœ€ä½¿ç”¨é›»éƒµåœ°å€å’Œå¯†ç¢¼ï¼Œå³å¯ç™»å…¥ã€‚
+        subject: Mastodonï¼šå·²é—œé–‰é›™é‡èªè‰
+        title: å·²é—œé–‰é›™é‡èªè‰
       two_factor_enabled:
-        explanation: å·²å°æ‚¨çš„å¸³æˆ¶å•Ÿç”¨å…©æ¥é©Ÿé©—è‰ã€‚ç™»å…¥æ™‚å°‡éœ€è¦é…å°ä¹‹ TOTP æ‡‰ç”¨ç¨‹å¼æ‰€ç”¢ç”Ÿçš„ Tokenã€‚
-        subject: Mastodonï¼šå·²å•Ÿç”¨å…©æ¥é©Ÿé©—è‰
-        title: å·²å•Ÿç”¨ 2FA
+        explanation: è³¬è™Ÿçš„é›™é‡èªè‰å·²è¢«å•Ÿç”¨ã€‚ç™»éŒ„æ™‚ï¼Œå°‡éœ€è¦å·²é…å° TOTP æ‡‰ç”¨ç¨‹å¼ç”Ÿæˆçš„é©—è‰ç¢¼ã€‚
+        subject: Mastodonï¼šå·²å•Ÿç”¨é›™é‡èªè‰
+        title: å·²å•Ÿç”¨é›™é‡èªè‰
       two_factor_recovery_codes_changed:
-        explanation: ä¸Šä¸€æ¬¡çš„å¾©åŽŸç¢¼å·²ç¶“å¤±æ•ˆï¼Œä¸”å·²ç”¢ç”Ÿæ–°çš„ã€‚
-        subject: Mastodonï¼šå…©æ¥é©Ÿé©—è‰å¾©åŽŸç¢¼å·²ç¶“é‡æ–°ç”¢ç”Ÿ
-        title: 2FA å¾©åŽŸç¢¼å·²è®Šæ›´
+        explanation: ä¹‹å‰çš„æ¢å¾©ç¢¼å¤±æ•ˆäº†ï¼Œæ–°çš„å·²ç”Ÿæˆã€‚
+        subject: Mastodonï¼šå·²ç”¢ç”Ÿæ–°çš„é›™é‡èªè‰æ¢å¾©ç¢¼
+        title: é›™é‡èªè‰æ¢å¾©ç¢¼å·²æ›´æ”¹
       unlock_instructions:
-        subject: 'Mastodon: è§£é™¤ç”¨æˆ¶éŽ–å®š'
+        subject: 'Mastodon: è§£é™¤å¸³è™ŸéŽ–å®š'
+      webauthn_credential:
+        added:
+          explanation: ä»¥ä¸‹çš„å®‰å…¨é‘°åŒ™å·²ç¶“åŠ é€²ä½ çš„å¸³è™Ÿ
+          subject: 'Mastodon: æ–°çš„å®‰å…¨é‘°åŒ™'
+          title: å·²ç¶“åŠ å…¥ä¸€å€‹æ–°çš„å®‰å…¨é‘°åŒ™
+        deleted:
+          explanation: ä»¥ä¸‹çš„å®‰å…¨é‘°åŒ™å·²ç¶“å¾žä½ çš„å¸³è™Ÿä¸ç§»é™¤äº†
+          subject: 'Mastodon: å®‰å…¨é‘°åŒ™å·²ç§»é™¤'
+          title: ä½ å…¶ä¸çš„ä¸€å€‹å®‰å…¨é‘°åŒ™å·²ç¶“è¢«ç§»é™¤äº†
+      webauthn_disabled:
+        explanation: ä½ çš„å¸³è™Ÿçš„å®‰å…¨é‘°åŒ™èº«ä»½é©—è‰å·²ç¶“åœç”¨ã€‚ä½ åªå¯ä»¥ç”¨éŽåŽ»å·²ç¶“é…å°å¥½çš„åŸºæ–¼æ™‚é–“ä¸€æ¬¡æ€§å¯†ç¢¼ç¨‹å¼ç”Ÿæˆçš„å¯†ç¢¼ä¾†ç™»éŒ„ã€‚
+        subject: 'Mastodon: å®‰å…¨é‘°åŒ™èº«ä»½é©—è‰å·²ç¶“åœç”¨'
+        title: å·²åœç”¨å®‰å…¨é‘°åŒ™
+      webauthn_enabled:
+        explanation: å®‰å…¨é‘°åŒ™èº«ä»½é©—è‰å·²å•Ÿç”¨ã€‚ä½ çš„å®‰å…¨é‘°åŒ™ç¾åœ¨å¯ä»¥ç”¨ä¾†ç™»éŒ„ã€‚
+        subject: 'Mastodon: å®‰å…¨é‘°åŒ™èº«ä»½é©—è‰å·²å•Ÿç”¨'
+        title: å·²å•Ÿç”¨å®‰å…¨é‘°åŒ™
     omniauth_callbacks:
-      failure: ç„¡æ³•ä»¥ %{kind} ç™»å…¥ä½ çš„ç”¨æˆ¶ï¼ŒåŽŸå› æ˜¯ï¸°ã€Œ%{reason}ã€ã€‚
+      failure: ç„¡æ³•ä»¥ %{kind} ç™»å…¥ä½ çš„å¸³è™Ÿï¼ŒåŽŸå› æ˜¯ï¸°ã€Œ%{reason}ã€ã€‚
       success: æˆåŠŸä»¥ %{kind} ç™»å…¥ä½ çš„ç”¨æˆ¶ã€‚
     passwords:
       no_token: ä½ å¿…é ˆä½¿ç”¨é‡è¨å¯†ç¢¼é›»éƒµå…§çš„ç¶²å€é€²å…¥æœ¬é ã€‚å¦‚æžœä½ ç¢ºæ˜¯ä½¿ç”¨é›»éƒµå…§çš„ç¶²å€ï¼Œè«‹ç¢ºèªä½ ç”¨äº†å®Œæ•´çš„ç¶²å€ã€‚
-      send_instructions: ä½ å°‡åœ¨å¹¾åˆ†é˜å…§æ”¶åˆ°é‡è¨å¯†ç¢¼çš„é›»éƒµæŒ‡ç¤ºã€‚
-      send_paranoid_instructions: å¦‚æžœä½ çš„é›»éƒµåœ°å€å·²ç¶“å˜åœ¨æ–¼æˆ‘å€‘çš„è³‡æ–™åº«ï¼Œä½ å°‡æœƒåœ¨å¹¾åˆ†é˜å…§æ”¶åˆ°é‡è¨å¯†ç¢¼çš„é›»éƒµæŒ‡ç¤ºã€‚
+      send_instructions: å¦‚æžœä½ çš„é›»éƒµå˜åœ¨æ–¼æˆ‘å€‘çš„è³‡æ–™åº«ä¸ï¼Œä½ å°‡åœ¨å¹¾åˆ†é˜å…§æ”¶åˆ°é‡è¨å¯†ç¢¼çš„é›»éƒµæŒ‡ç¤ºã€‚å¦‚æžœä½ æœªèƒ½åœ¨æ”¶ä»¶ç®±æ‰¾åˆ°è©²é›»éƒµï¼Œè«‹æª¢æŸ¥åžƒåœ¾éƒµä»¶ç®±ã€‚
+      send_paranoid_instructions: å¦‚æžœä½ çš„é›»éƒµå˜åœ¨æ–¼æˆ‘å€‘çš„è³‡æ–™åº«ä¸ï¼Œä½ å°‡åœ¨å¹¾åˆ†é˜å…§æ”¶åˆ°é‡è¨å¯†ç¢¼çš„é›»éƒµæŒ‡ç¤ºã€‚å¦‚æžœä½ æœªèƒ½åœ¨æ”¶ä»¶ç®±æ‰¾åˆ°è©²é›»éƒµï¼Œè«‹æª¢æŸ¥åžƒåœ¾éƒµä»¶ç®±ã€‚
       updated: ä½ çš„å¯†ç¢¼å·²ç¶“æ›´æ–°ï¼Œä½ ç¾åœ¨æ£ç™»å…¥æœ¬ç«™ã€‚
       updated_not_active: ä½ çš„å¯†ç¢¼å·²ç¶“æ›´æ–°ã€‚
     registrations:
-      destroyed: å†è¦‹äº†ï¼ä½ çš„ç”¨æˆ¶å·²è¢«å–æ¶ˆï¼Œå¸Œæœ›æˆ‘å€‘ç›¸æœ‰ç›¸è¦‹çš„æ©Ÿæœƒå§ã€‚
-      signed_up: æ¡è¿Žä½ ï¼ä½ çš„ç™»è¨˜å·²ç¶“æˆåŠŸã€‚
-      signed_up_but_inactive: ä½ çš„ç™»è¨˜å·²ç¶“æˆåŠŸï¼Œå¯æ˜¯ç”±æ–¼ä½ çš„ç”¨æˆ¶é‚„è¢«è¢«å•Ÿç”¨ï¼Œæš«æ™‚é‚„ä¸èƒ½è®“ä½ ç™»å…¥ã€‚
-      signed_up_but_locked: ä½ çš„ç™»è¨˜å·²ç¶“æˆåŠŸï¼Œå¯æ˜¯ç”±æ–¼ä½ çš„ç”¨æˆ¶å·²è¢«éŽ–å®šï¼Œæˆ‘å€‘ç„¡æ³•è®“ä½ ç™»å…¥ã€‚
-      signed_up_but_pending: åŒ…å«ç¢ºèªé€£çµçš„è¨Šæ¯å·²å¯„åˆ°æ‚¨çš„é›»åä¿¡ç®±ã€‚æŒ‰ä¸‹æ¤é€£çµå¾Œæˆ‘å€‘å°‡å¯©æ ¸æ‚¨çš„ç”³è«‹ã€‚æ ¸å‡†å¾Œå°‡é€šçŸ¥æ‚¨ã€‚
-      signed_up_but_unconfirmed: ä¸€æ¢ç¢ºèªé€£çµå·²ç¶“é›»éƒµåˆ°ä½ çš„éƒµå€ã€‚è«‹ä½¿ç”¨è®“é€£çµå•Ÿç”¨ä½ çš„ç”¨æˆ¶ã€‚
-      update_needs_confirmation: ä½ çš„ç”¨æˆ¶å·²ç¶“æ›´æ–°ï¼Œä½†æˆ‘å€‘éœ€è¦ç¢ºèªä½ çš„é›»éƒµåœ°å€ã€‚è«‹æ‰“é–‹ä½ çš„éƒµç®±ï¼Œä½¿ç”¨ç¢ºèªé›»éƒµçš„é€£çµä¾†ç¢ºèªçš„åœ°éƒµå€ã€‚
-      updated: ä½ çš„ç”¨æˆ¶å·²ç¶“æˆåŠŸæ›´æ–°ã€‚
+      destroyed: å†è¦‹ï¼ä½ çš„å¸³è™Ÿå·²è¢«å–æ¶ˆï¼Œå¸Œæœ›æ—¥å¾Œèƒ½å†è¦‹åˆ°ä½ ã€‚
+      signed_up: æ¡è¿Žä½ ï¼ä½ å·²ç¶“æˆåŠŸç™»è¨˜ã€‚
+      signed_up_but_inactive: ä½ çš„ç™»è¨˜å·²ç¶“æˆåŠŸï¼Œå¯æ˜¯ç”±æ–¼ä½ çš„å¸³è™Ÿé‚„æœªè¢«å•Ÿç”¨ï¼Œæš«æ™‚é‚„ä¸èƒ½è®“ä½ ç™»å…¥ã€‚
+      signed_up_but_locked: ä½ çš„ç™»è¨˜å·²ç¶“æˆåŠŸï¼Œå¯æ˜¯ç”±æ–¼ä½ çš„å¸³è™Ÿå·²è¢«éŽ–å®šï¼Œæˆ‘å€‘ç„¡æ³•è®“ä½ ç™»å…¥ã€‚
+      signed_up_but_pending: ç¢ºèªé€£çµå·²ç™¼é€åˆ°ä½ çš„é›»éƒµåœ°å€ã€‚åœ¨ä½ é»žæ“Šé€£çµå¾Œï¼Œæˆ‘å€‘æœƒå¯©æ ¸ä½ çš„ç”³è«‹ã€‚ä¸€æ—¦é€šéŽå¯©æ ¸ï¼Œä½ å°‡æœƒæ”¶åˆ°é€²ä¸€æ¥é€šçŸ¥ã€‚
+      signed_up_but_unconfirmed: ä¸€æ¢ç¢ºèªé€£çµå·²ç¶“é›»éƒµåˆ°ä½ çš„éƒµå€ã€‚è«‹ä½¿ç”¨è®“é€£çµå•Ÿç”¨ä½ çš„å¸³è™Ÿã€‚
+      update_needs_confirmation: ä½ çš„å¸³è™Ÿå·²ç¶“æ›´æ–°ï¼Œä½†æˆ‘å€‘éœ€è¦ç¢ºèªä½ çš„é›»éƒµåœ°å€ã€‚è«‹æ‰“é–‹ä½ çš„éƒµç®±ï¼Œä½¿ç”¨ç¢ºèªé›»éƒµçš„é€£çµä¾†ç¢ºèªçš„åœ°éƒµå€ã€‚å¦‚æžœæœªèƒ½åœ¨æ”¶ä»¶ç®±æ‰¾ç›¸é—œé›»éƒµæŒ‡ç¤ºï¼Œè«‹æª¢æŸ¥åžƒåœ¾éƒµä»¶ç®±ã€‚
+      updated: ä½ çš„å¸³è™Ÿå·²ç¶“æˆåŠŸæ›´æ–°ã€‚
     sessions:
       already_signed_out: æˆåŠŸç™»å‡ºã€‚
       signed_in: æˆåŠŸç™»å…¥ã€‚
       signed_out: æˆåŠŸç™»å‡ºã€‚
     unlocks:
-      send_instructions: ä½ å°‡åœ¨å¹¾åˆ†é˜å…§æ”¶åˆ°è§£é™¤ç”¨æˆ¶éŽ–å®šçš„é›»éƒµæŒ‡ç¤ºã€‚
-      send_paranoid_instructions: å¦‚æžœä½ çš„é›»éƒµåœ°å€å·²ç¶“å˜åœ¨æ–¼æˆ‘å€‘çš„è³‡æ–™åº«ï¼Œä½ å°‡åœ¨å¹¾åˆ†é˜å…§æ”¶åˆ°è§£é™¤ç”¨æˆ¶éŽ–å®šçš„é›»éƒµæŒ‡ç¤ºã€‚
-      unlocked: ä½ çš„ç”¨æˆ¶å·²ç¶“è§£éŽ–ï¼Œè«‹ç™»å…¥ä»¥ç¹¼çºŒã€‚
+      send_instructions: ä½ å°‡åœ¨å¹¾åˆ†é˜å…§æ”¶åˆ°è§£é™¤ç”¨æˆ¶éŽ–å®šçš„é›»éƒµæŒ‡ç¤ºã€‚å¦‚æžœæœªèƒ½åœ¨æ”¶ä»¶ç®±æ‰¾åˆ°é›»éƒµæŒ‡ç¤ºï¼Œè«‹æª¢æŸ¥åžƒåœ¾éƒµä»¶ç®±ã€‚
+      send_paranoid_instructions: å¦‚æžœä½ çš„é›»éƒµåœ°å€å·²ç¶“å˜åœ¨æ–¼æˆ‘å€‘çš„è³‡æ–™åº«ï¼Œä½ å°‡åœ¨å¹¾åˆ†é˜å…§æ”¶åˆ°è§£é™¤ç”¨æˆ¶éŽ–å®šçš„é›»éƒµæŒ‡ç¤ºã€‚å¦‚æžœæœªèƒ½åœ¨æ”¶ä»¶ç®±æ‰¾åˆ°é›»éƒµæŒ‡ç¤ºï¼Œè«‹æª¢æŸ¥åžƒåœ¾éƒµä»¶ç®±ã€‚
+      unlocked: ä½ çš„å¸³è™Ÿå·²ç¶“è§£éŽ–ï¼Œè«‹ç™»å…¥ä»¥ç¹¼çºŒã€‚
   errors:
     messages:
       already_confirmed: å…ˆå‰å·²ç¶“ç¢ºèªï¼Œè«‹å˜—è©¦ç™»å…¥
diff --git a/config/locales/devise.zh-TW.yml b/config/locales/devise.zh-TW.yml
index ef0da1a9cfbfd367675012deaa4b3fa61019257f..f7b087824fb7d950ca30c3dadd13445e04cb44b9 100644
--- a/config/locales/devise.zh-TW.yml
+++ b/config/locales/devise.zh-TW.yml
@@ -21,18 +21,18 @@ zh-TW:
         action: é©—è‰é›»åä¿¡ç®±ä½å€
         action_with_app: ç¢ºèªä¸¦è¿”å›ž %{app}
         explanation: æ‚¨å·²ç¶“åœ¨ %{host} ä¸Šä»¥æ¤é›»åä¿¡ç®±ä½å€å»ºç«‹äº†ä¸€æ”¯å¸³æˆ¶ã€‚æ‚¨è·é›¢å•Ÿç”¨å®ƒåªå‰©ä¸€é»žä¹‹é™äº†ã€‚è‹¥é€™ä¸æ˜¯æ‚¨ï¼Œè«‹å¿½ç•¥æ¤ä¿¡ä»¶ã€‚
-        explanation_when_pending: æ‚¨ä½¿ç”¨æ¤é›»åä¿¡ç®±ä½å€ç”³è«‹äº† %{host} çš„é‚€è«‹ã€‚ç•¶æ‚¨ç¢ºèªé›»åä¿¡ç®±å¾Œæˆ‘å€‘å°‡å¯©æ ¸æ‚¨çš„ç”³è«‹ï¼Œè€Œç›´åˆ°æ ¸å‡†å‰æ‚¨éƒ½ç„¡æ³•ç™»å…¥ã€‚ç•¶æ‚¨çš„ç”³è«‹éæ‹’çµ•ï¼Œæ‚¨çš„è³‡æ–™å°‡è¢«ç§»é™¤è€Œä¸å¿…åšå¾ŒçºŒå‹•ä½œã€‚å¦‚æžœé€™ä¸æ˜¯æ‚¨ï¼Œè«‹å¿½ç•¥æ¤ä¿¡ä»¶ã€‚
+        explanation_when_pending: æ‚¨ä½¿ç”¨æ¤é›»åä¿¡ç®±ä½å€ç”³è«‹äº† %{host} çš„é‚€è«‹ã€‚ç•¶æ‚¨ç¢ºèªé›»åä¿¡ç®±å¾Œæˆ‘å€‘å°‡å¯©æ ¸æ‚¨çš„ç”³è«‹ã€‚æ‚¨å¯ä»¥ç™»å…¥ä»¥æ”¹è®Šæ‚¨çš„ç´°ç¯€æˆ–åˆªé™¤æ‚¨çš„å¸³è™Ÿï¼Œä½†ç›´åˆ°æ‚¨çš„å¸³è™Ÿè¢«æ ¸å‡†ä¹‹å‰ï¼Œæ‚¨ç„¡æ³•æ“ä½œå¤§éƒ¨åˆ†çš„åŠŸèƒ½ã€‚è‹¥æ‚¨çš„ç”³è«‹éæ‹’çµ•ï¼Œæ‚¨çš„è³‡æ–™å°‡è¢«ç§»é™¤è€Œä¸å¿…åšå¾ŒçºŒå‹•ä½œã€‚å¦‚æžœé€™ä¸æ˜¯æ‚¨ï¼Œè«‹å¿½ç•¥æ¤ä¿¡ä»¶ã€‚
         extra_html: åŒæ™‚ä¹Ÿè«‹çœ‹çœ‹<a href="%{terms_path}">ä¼ºæœå™¨è¦å‰‡</a>èˆ‡<a href="%{policy_path}">æœå‹™æ¢æ¬¾</a>ã€‚
         subject: Mastodonï¼š%{instance} ç¢ºèªèªªæ˜Ž
         title: é©—è‰é›»åä¿¡ç®±ä½å€
       email_changed:
         explanation: æ‚¨å¸³æˆ¶çš„é›»åä¿¡ç®±ä½å€å°‡è®Šæ›´ç‚ºï¼š
-        extra: è‹¥æ‚¨æœªè®Šæ›´é›»åä¿¡ç®±ï¼Œé‚£éº¼å¾ˆæœ‰å¯èƒ½æ˜¯æŸäººå–å¾—äº†ä½ å¸³æˆ¶çš„å˜å–æ¬Šé™ã€‚è«‹ç«‹åˆ»è®Šæ›´å¯†ç¢¼ï¼Œæˆ–ç•¶å¸³æˆ¶è¢«éŽ–å®šæ™‚ï¼Œè«‹è¯çµ¡ä¼ºæœå™¨çš„ç®¡ç†å“¡ã€‚
+        extra: è‹¥æ‚¨æœªè®Šæ›´é›»åä¿¡ç®±ï¼Œé‚£éº¼å¾ˆæœ‰å¯èƒ½æ˜¯æŸäººå–å¾—äº†æ‚¨å¸³æˆ¶çš„å˜å–æ¬Šé™ã€‚è«‹ç«‹åˆ»è®Šæ›´å¯†ç¢¼ï¼Œæˆ–ç•¶å¸³æˆ¶è¢«éŽ–å®šæ™‚ï¼Œè«‹è¯çµ¡ä¼ºæœå™¨çš„ç®¡ç†å“¡ã€‚
         subject: Mastodonï¼šå·²è®Šæ›´é›»åä¿¡ç®±
         title: æ–°é›»åä¿¡ç®±ä½å€
       password_change:
         explanation: æ‚¨å¸³æˆ¶çš„å¯†ç¢¼å·²è®Šæ›´ã€‚
-        extra: å¦‚æžœæ‚¨æœªè®Šæ›´å¯†ç¢¼ï¼Œé‚£éº¼å¾ˆæœ‰å¯èƒ½æ˜¯æŸäººå–å¾—äº†å¸³æˆ¶çš„å˜å–æ¬Šé™ã€‚è«‹ç«‹åˆ»è®Šæ›´å¯†ç¢¼ï¼Œæˆ–è‹¥å¸³æˆ¶è¢«éŽ–å®šæ™‚ï¼Œè«‹è¯çµ¡ä¼ºæœå™¨çš„ç®¡ç†å“¡ã€‚
+        extra: è‹¥æ‚¨æœªè®Šæ›´å¯†ç¢¼ï¼Œé‚£éº¼å¾ˆæœ‰å¯èƒ½æ˜¯æŸäººå–å¾—äº†æ‚¨å¸³æˆ¶çš„å˜å–æ¬Šé™ã€‚è«‹ç«‹åˆ»è®Šæ›´å¯†ç¢¼ï¼Œæˆ–è‹¥å¸³æˆ¶è¢«éŽ–å®šæ™‚ï¼Œè«‹è¯çµ¡ä¼ºæœå™¨çš„ç®¡ç†å“¡ã€‚
         subject: Mastodonï¼šå·²è®Šæ›´å¯†ç¢¼
         title: å¯†ç¢¼å·²è®Šæ›´
       reconfirmation_instructions:
@@ -43,7 +43,7 @@ zh-TW:
       reset_password_instructions:
         action: è®Šæ›´å¯†ç¢¼
         explanation: æ‚¨å·²è«‹æ±‚å¸³æˆ¶çš„æ–°å¯†ç¢¼ã€‚
-        extra: è‹¥æ‚¨ä¸¦æœªè«‹æ±‚ï¼Œè«‹å¿½ç•¥æ¤ä¿¡ä»¶ã€‚æ‚¨çš„å¯†ç¢¼åœ¨å˜å–ä¸Šæ–¹é€£çµä¸¦å»ºç«‹æ–°é€£çµå‰ä¸æœƒè®Šæ›´ã€‚
+        extra: è‹¥æ‚¨ä¸¦æœªè«‹æ±‚ï¼Œè«‹å¿½ç•¥æ¤ä¿¡ä»¶ã€‚æ‚¨çš„å¯†ç¢¼åœ¨å˜å–ä¸Šæ–¹é€£çµä¸¦å»ºç«‹æ–°å¯†ç¢¼å‰ä¸æœƒè®Šæ›´ã€‚
         subject: Mastodonï¼šé‡è¨å¯†ç¢¼æŒ‡å¼•
         title: é‡è¨å¯†ç¢¼
       two_factor_disabled:
@@ -60,13 +60,30 @@ zh-TW:
         title: 2FA å¾©åŽŸç¢¼å·²è®Šæ›´
       unlock_instructions:
         subject: Mastodonï¼šè§£éŽ–æŒ‡å¼•
+      webauthn_credential:
+        added:
+          explanation: ä¸‹é¢çš„å®‰å…¨å¯†é‘°å·²ç¶“æ–°å¢žè‡³æ‚¨çš„å¸³æˆ¶
+          subject: Mastodonï¼šæ–°å®‰å…¨å¯†é‘°
+          title: å·²æ–°å¢žæ–°å®‰å…¨å¯†é‘°
+        deleted:
+          explanation: ä»¥ä¸‹çš„å®‰å…¨å¯†é‘°å·²ç¶“å¾žæ‚¨çš„å¸³æˆ¶ä¸ç§»é™¤
+          subject: Mastodonï¼šå®‰å…¨å¯†é‘°å·²ç§»é™¤
+          title: æ‚¨çš„ä¸€æ”¯å®‰å…¨å¯†é‘°å·²ç¶“è¢«ç§»é™¤
+      webauthn_disabled:
+        explanation: æ‚¨çš„å¸³æˆ¶ä¸¦æ²’æœ‰å•Ÿç”¨å®‰å…¨å¯†é‘°èªè‰æ–¹å¼ã€‚åªèƒ½ä»¥ TOTP app ç”¢ç”Ÿåœ°æˆå° token ç™»å…¥ã€‚
+        subject: Mastodonï¼šå®‰å…¨å¯†é‘°èªè‰æ–¹å¼å·²é—œé–‰
+        title: å·²é—œé–‰å®‰å…¨å¯†é‘°
+      webauthn_enabled:
+        explanation: æ‚¨çš„å¸³æˆ¶å·²å•Ÿç”¨å®‰å…¨å¯†é‘°èªè‰ã€‚æ‚¨å¯ä»¥ä½¿ç”¨å®‰å…¨å¯†é‘°ç™»å…¥äº†ã€‚
+        subject: Mastodonï¼šå·²å•Ÿç”¨å®‰å…¨å¯†é‘°èªè‰
+        title: å·²å•Ÿç”¨å®‰å…¨å¯†é‘°
     omniauth_callbacks:
       failure: ç„¡æ³•é€éŽ %{kind} èªè‰æ˜¯å¦ç‚ºæ‚¨ï¼Œå› ç‚ºã€Œ%{reason}ã€ã€‚
       success: æˆåŠŸé€éŽ %{kind} å¸³æˆ¶ç™»å…¥ã€‚
     passwords:
       no_token: æ‚¨å¿…é ˆé€éŽå¯†ç¢¼é‡è¨ä¿¡ä»¶æ‰èƒ½å˜å–æ¤é é¢ã€‚è‹¥ç¢ºå¯¦å¦‚æ¤ï¼Œè«‹ç¢ºå®šè¼¸å…¥çš„ç¶²å€æ˜¯å®Œæ•´çš„ã€‚
-      send_instructions: è‹¥é›»åä¿¡ç®±ä½å€å˜åœ¨æ–¼è³‡æ–™åº«ï¼Œå¹¾åˆ†é˜å¾Œæ‚¨å°‡åœ¨ä¿¡ç®±ä¸æ”¶åˆ°å¯†ç¢¼å¾©åŽŸé€£çµã€‚è‹¥æœªæ”¶åˆ°è«‹æª¢æŸ¥åžƒåœ¾éƒµä»¶è³‡æ–™å¤¾ã€‚
-      send_paranoid_instructions: è‹¥é›»åä¿¡ç®±ä½å€å˜åœ¨æ–¼è³‡æ–™åº«ï¼Œå¹¾åˆ†é˜å¾Œæ‚¨å°‡åœ¨ä¿¡ç®±ä¸æ”¶åˆ°å¯†ç¢¼å¾©åŽŸé€£çµã€‚è‹¥æœªæ”¶åˆ°è«‹æª¢æŸ¥åžƒåœ¾éƒµä»¶è³‡æ–™å¤¾ã€‚
+      send_instructions: è‹¥é›»åä¿¡ç®±ä½å€å˜åœ¨æ–¼æˆ‘å€‘çš„è³‡æ–™åº«ï¼Œå¹¾åˆ†é˜å¾Œæ‚¨å°‡åœ¨ä¿¡ç®±ä¸æ”¶åˆ°å¯†ç¢¼å¾©åŽŸé€£çµã€‚è‹¥æœªæ”¶åˆ°è«‹æª¢æŸ¥åžƒåœ¾éƒµä»¶è³‡æ–™å¤¾ã€‚
+      send_paranoid_instructions: è‹¥é›»åä¿¡ç®±ä½å€å˜åœ¨æ–¼æˆ‘å€‘çš„è³‡æ–™åº«ï¼Œå¹¾åˆ†é˜å¾Œæ‚¨å°‡åœ¨ä¿¡ç®±ä¸æ”¶åˆ°å¯†ç¢¼å¾©åŽŸé€£çµã€‚è‹¥æœªæ”¶åˆ°è«‹æª¢æŸ¥åžƒåœ¾éƒµä»¶è³‡æ–™å¤¾ã€‚
       updated: æ‚¨çš„å¯†ç¢¼å·²æˆåŠŸè®Šæ›´ï¼Œç¾åœ¨å·²ç¶“ç™»å…¥ã€‚
       updated_not_active: æ‚¨çš„å¯†ç¢¼å·²æˆåŠŸè®Šæ›´ã€‚
     registrations:
@@ -76,14 +93,14 @@ zh-TW:
       signed_up_but_locked: æ‚¨å·²è¨»å†ŠæˆåŠŸï¼Œä½†ç”±æ–¼æ‚¨çš„å¸³æˆ¶å·²è¢«éŽ–å®šï¼Œæˆ‘å€‘ç„¡æ³•è®“æ‚¨ç™»å…¥ã€‚
       signed_up_but_pending: åŒ…å«ç¢ºèªé€£çµçš„è¨Šæ¯å·²å¯„åˆ°æ‚¨çš„é›»åä¿¡ç®±ã€‚æŒ‰ä¸‹æ¤é€£çµå¾Œæˆ‘å€‘å°‡å¯©æ ¸æ‚¨çš„ç”³è«‹ã€‚æ ¸å‡†å¾Œå°‡é€šçŸ¥æ‚¨ã€‚
       signed_up_but_unconfirmed: åŒ…å«ç¢ºèªé€£çµçš„è¨Šæ¯å·²å¯„åˆ°æ‚¨çš„é›»åä¿¡ç®±ã€‚è«‹å‰å¾€é€£çµä»¥å•Ÿç”¨å¸³è™Ÿã€‚è‹¥æœªæ”¶åˆ°è«‹æª¢æŸ¥åžƒåœ¾éƒµä»¶è³‡æ–™å¤¾ã€‚
-      update_needs_confirmation: å·²æ›´æ–°æ‚¨çš„å¸³è™Ÿï¼Œä½†ä»éœ€é©—è‰æ‚¨çš„æ–°ä¿¡ç®±ã€‚è«‹æª¢æŸ¥é›»åä¿¡ç®±ä¸¦å‰å¾€ç¢ºèªé€£çµä¾†ç¢ºèªæ–°ä¿¡ç®±ä½å€ã€‚è‹¥æœªæ”¶åˆ°è«‹æª¢æŸ¥åžƒåœ¾éƒµä»¶è³‡æ–™å¤¾ã€‚
+      update_needs_confirmation: å·²æˆåŠŸæ›´æ–°æ‚¨çš„å¸³è™Ÿï¼Œä½†ä»éœ€é©—è‰æ‚¨çš„æ–°ä¿¡ç®±ã€‚è«‹æª¢æŸ¥é›»åä¿¡ç®±ä¸¦å‰å¾€ç¢ºèªé€£çµä¾†ç¢ºèªæ–°ä¿¡ç®±ä½å€ã€‚è‹¥æœªæ”¶åˆ°è«‹æª¢æŸ¥åžƒåœ¾éƒµä»¶è³‡æ–™å¤¾ã€‚
       updated: æ‚¨çš„å¸³æˆ¶å·²æˆåŠŸæ›´æ–°ã€‚
     sessions:
       already_signed_out: å·²æˆåŠŸç™»å‡ºã€‚
       signed_in: å·²æˆåŠŸç™»å…¥ã€‚
       signed_out: å·²æˆåŠŸç™»å‡ºã€‚
     unlocks:
-      send_instructions: å¹¾åˆ†é˜å¾Œæ‚¨å°‡æ”¶åˆ°ç¢ºèªä¿¡ä»¶ã€‚è‹¥æœªæ”¶åˆ°æ¤ä¿¡ä»¶ï¼Œè«‹æª¢æŸ¥åžƒåœ¾éƒµä»¶è³‡æ–™å¤¾ã€‚
+      send_instructions: å¹¾åˆ†é˜å¾Œæ‚¨å°‡æ”¶åˆ°è§£éŽ–å¸³è™Ÿçš„æŒ‡å¼•ä¿¡ä»¶ã€‚è‹¥æœªæ”¶åˆ°è«‹æª¢æŸ¥åžƒåœ¾éƒµä»¶è³‡æ–™å¤¾ã€‚
       send_paranoid_instructions: è‹¥æ¤å¸³è™Ÿå˜åœ¨ï¼Œæ‚¨å°‡åœ¨å¹¾åˆ†é˜å¾Œæ”¶åˆ°è§£éŽ–æŒ‡å¼•ä¿¡ä»¶ã€‚è‹¥æœªæ”¶åˆ°è«‹æª¢æŸ¥åžƒåœ¾éƒµä»¶è³‡æ–™å¤¾ã€‚
       unlocked: å·²è§£éŽ–æ‚¨çš„å¸³æˆ¶ï¼Œè«‹ç™»å…¥ç¹¼çºŒã€‚
   errors:
diff --git a/config/locales/doorkeeper.co.yml b/config/locales/doorkeeper.co.yml
index 4f03c0c3238bcdd222c8f1037c9ca1d3be75362a..a4c8cd4fc60a8a9263959fe2314f8da830b13421 100644
--- a/config/locales/doorkeeper.co.yml
+++ b/config/locales/doorkeeper.co.yml
@@ -121,10 +121,10 @@ co:
       admin:write: mudificÃ  tutti i dati nant'Ã  u servore
       admin:write:accounts: realizÃ  azzione di muderazione nant'Ã  i conti
       admin:write:reports: realizÃ  azzione di muderazione nant'Ã  i rapporti
-      follow: MudificÃ  rilazione trÃ  i conti
-      push: Riceve e vostre nutificazione push
+      follow: mudificÃ  rilazione trÃ  i conti
+      push: riceve e vostre nutificazione push
       read: leghje tutte lâ€™infurmazioni di u vostru contu
-      read:accounts: Vede l'infurmazione di i conti
+      read:accounts: vede l'infurmazione di i conti
       read:blocks: vede i vostri blucchimi
       read:bookmarks: vede i vostri segnalibri
       read:favourites: vede i vostri favuriti
diff --git a/config/locales/doorkeeper.eo.yml b/config/locales/doorkeeper.eo.yml
index 89a579ae9afef1b30273a98435044fb7cef300d8..65066cd8e8e66d96b531fec07bf99678025c80ef 100644
--- a/config/locales/doorkeeper.eo.yml
+++ b/config/locales/doorkeeper.eo.yml
@@ -116,22 +116,22 @@ eo:
         title: OAuth-a rajtigo bezonata
     scopes:
       admin:read: legu Ä‰iujn datumojn en la servilo
-      admin:read:accounts: legas senteman informacion de Ä‰iuj kontoj
-      admin:read:reports: legas konfidencajn informojn de Ä‰iuj signaloj kaj signalitaj kontoj
-      admin:write: modifu Ä‰iujn datumojn en la servilo
+      admin:read:accounts: legi konfidencajn informojn de Ä‰iuj kontoj
+      admin:read:reports: legi konfidencajn informojn de Ä‰iuj signaloj kaj signalitaj kontoj
+      admin:write: modifi Ä‰iujn datumojn en la servilo
       admin:write:accounts: plenumi agojn de kontrolo sur kontoj
       admin:write:reports: plenumi agojn de kontrolo sur signaloj
       follow: ÅanÄi rilatojn al aliaj kontoj
       push: ricevi viajn puÅ-sciigojn
       read: legi Ä‰iujn datumojn de via konto
-      read:accounts: vidi la informojn de la konto
-      read:blocks: vidi viajn blokojn
+      read:accounts: vidi la informojn de la kontoj
+      read:blocks: vidi viajn blokadojn
       read:bookmarks: vidi viajn legosignojn
       read:favourites: vidi viajn stelumojn
       read:filters: vidi viajn filtrilojn
       read:follows: vidi viajn sekvatojn
       read:lists: vidi viajn listojn
-      read:mutes: vidi viajn silentigojn
+      read:mutes: vidi viajn silentigadojn
       read:notifications: vidi viajn sciigojn
       read:reports: vidi viajn signalojn
       read:search: serÄ‰i vianome
@@ -140,7 +140,7 @@ eo:
       write:accounts: ÅanÄi vian profilon
       write:blocks: bloki kontojn kaj domajnojn
       write:bookmarks: aldoni mesaÄojn al la legosignoj
-      write:favourites: stelumitaj mesaÄoj
+      write:favourites: stelumi mesaÄojn
       write:filters: krei filtrilojn
       write:follows: sekvi homojn
       write:lists: krei listojn
diff --git a/config/locales/doorkeeper.es-AR.yml b/config/locales/doorkeeper.es-AR.yml
index 85ab7729dea57b3211a2cbf464adccd4f67d5ec7..29ce9b4c18c71fe81adfaf170ec9803aac5792f9 100644
--- a/config/locales/doorkeeper.es-AR.yml
+++ b/config/locales/doorkeeper.es-AR.yml
@@ -79,12 +79,12 @@ es-AR:
     errors:
       messages:
         access_denied: El propietario del recurso o servidor de autorizaciÃ³n denegÃ³ la peticiÃ³n.
-        credential_flow_not_configured: Las credenciales de contraseÃ±a del propietario del recurso fallÃ³ debido a que Doorkeeper.configure.resource_owner_from_credentials estÃ¡ sin configurar.
+        credential_flow_not_configured: Las credenciales de contraseÃ±a del propietario del recurso fallaron debido a que "Doorkeeper.configure.resource_owner_from_credentials" estÃ¡ sin configurar.
         invalid_client: La autenticaciÃ³n del cliente fallÃ³ debido a que es un cliente desconocido, o no estÃ¡ incluÃda la autenticaciÃ³n del cliente, o el mÃ©todo de autenticaciÃ³n no estÃ¡ soportado.
         invalid_grant: La concesiÃ³n de autorizaciÃ³n ofrecida no es vÃ¡lida, venciÃ³, se revocÃ³, no coincide con la direcciÃ³n web de redireccionamiento usada en la peticiÃ³n de autorizaciÃ³n, o fue emitida para otro cliente.
         invalid_redirect_uri: La direcciÃ³n web de redireccionamiento incluida no es vÃ¡lida.
         invalid_request: En la solicitud falta un parÃ¡metro requerido, o incluye un valor de parÃ¡metro no soportado, o estÃ¡ corrompida.
-        invalid_resource_owner: Las credenciales proporcionadas del propietario del recurso no son vÃ¡lidas, o no se puede encontrar al propietario del recurso.
+        invalid_resource_owner: Las credenciales proporcionadas del propietario del recurso no son vÃ¡lidas, o no se puede encontrar al propietario del recurso
         invalid_scope: El Ã¡mbito solicitado no es vÃ¡lido, o conocido, o estÃ¡ corrompido.
         invalid_token:
           expired: VenciÃ³ la clave de acceso
@@ -122,30 +122,30 @@ es-AR:
       admin:write:accounts: ejecutar acciones de moderaciÃ³n en cuentas
       admin:write:reports: ejecutar acciones de moderaciÃ³n en informes
       follow: modificar relaciones de cuenta
-      push: recibir tus notificaciones PuSH
+      push: recibir tus notificaciones push
       read: leer todos los datos de tu cuenta
       read:accounts: ver informaciÃ³n de cuentas
       read:blocks: ver quÃ© cuentas bloqueaste
-      read:bookmarks: mirÃ¡ tus marcadores
+      read:bookmarks: ver tus marcadores
       read:favourites: ver tus favoritos
       read:filters: ver tus filtros
       read:follows: ver quÃ© cuentas seguÃs
       read:lists: ver tus listas
       read:mutes: ver quÃ© cuentas silenciaste
       read:notifications: ver tus notificaciones
-      read:reports: ver tus informes
+      read:reports: ver tus denuncias
       read:search: buscar en tu nombre
-      read:statuses: ver todos los estados
+      read:statuses: ver todos los toots
       write: modificar todos los datos de tu cuenta
       write:accounts: modificar tu perfil
       write:blocks: bloquear cuentas y dominios
-      write:bookmarks: estados del marcador
-      write:favourites: toots favoritos
+      write:bookmarks: marcar toots
+      write:favourites: marcar toots como favoritos
       write:filters: crear filtros
       write:follows: seguir cuentas
       write:lists: crear listas
       write:media: subir archivos de medios
       write:mutes: silenciar usuarios y conversaciones
-      write:notifications: limpiÃ¡ tus notificaciones
+      write:notifications: limpiar tus notificaciones
       write:reports: denunciar otras cuentas
-      write:statuses: publicar estados
+      write:statuses: publicar toots
diff --git a/config/locales/doorkeeper.hi.yml b/config/locales/doorkeeper.hi.yml
index d758a5b5357d76effdf363eeb2c8e0dfb231c4aa..d7a933d1480714d106b279142200d9b917419574 100644
--- a/config/locales/doorkeeper.hi.yml
+++ b/config/locales/doorkeeper.hi.yml
@@ -1 +1,30 @@
+---
 hi:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: à¤†à¤µà¥‡à¤¦à¤¨ à¤•à¤¾ à¤¨à¤¾à¤®
+        redirect_uri: à¤…à¤¨à¥à¤ªà¥à¤°à¥‡à¤·à¤¿à¤¤ URI
+        scopes: à¤•à¤¾à¤°à¥à¤¯à¤•à¥à¤·à¥‡à¤¤à¥à¤°
+        website: à¤†à¤µà¥‡à¤¦à¤¨ à¤µà¥‡à¤¬à¤¸à¤¾à¤‡à¤Ÿ
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: à¤à¤• à¤Ÿà¥à¤•à¤¡à¤¼à¤¾ à¤¨à¤¹à¥€à¤‚ à¤¹à¥‹ à¤¸à¤•à¤¤à¤¾à¥¤
+              invalid_uri: à¤à¤• à¤µà¥ˆà¤§ à¤¯à¥‚à¤†à¤°à¤†à¤ˆ à¤¹à¥‹à¤¨à¤¾ à¤šà¤¾à¤¹à¤¿à¤à¥¤
+              relative_uri: à¤à¤• à¤ªà¥‚à¤°à¥à¤£ URI à¤¹à¥‹à¤¨à¤¾ à¤šà¤¾à¤¹à¤¿à¤à¥¤
+              secured_uri: hTTPS/SSL URI à¤¹à¥‹à¤¨à¤¾ à¤šà¤¾à¤¹à¤¿à¤à¥¤
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: à¤…à¤§à¤¿à¤•à¤¾à¤° à¤¦à¥‡à¤‚
+        cancel: à¤°à¤¦à¥à¤¦ à¤•à¤°à¥‡à¤‚
+        destroy: à¤¹à¤Ÿà¤¾à¤à¤‚
+        edit: à¤¸à¤‚à¤ªà¤¾à¤¦à¤¿à¤¤ à¤•à¤°à¥‡à¤‚
+        submit: à¤¸à¤¬à¤®à¤¿à¤Ÿ à¤•à¤°à¥‡à¤‚
+      confirmations:
+        destroy: à¤•à¥à¤¯à¤¾ à¤†à¤ª à¤¸à¥à¤¨à¤¿à¤¶à¥à¤šà¤¿à¤¤ à¤¹à¥ˆà¤‚?
+      edit:
+        title: à¤†à¤µà¥‡à¤¦à¤¨ à¤¸à¤‚à¤ªà¤¾à¤¦à¤¿à¤¤ à¤•à¤°à¥‡à¤‚
diff --git a/config/locales/doorkeeper.hr.yml b/config/locales/doorkeeper.hr.yml
index 221ec27e94284d0d3191a5e24f9a1718e75c3ddf..d2cde038b88cce1597eb516385bbd3a2166dc407 100644
--- a/config/locales/doorkeeper.hr.yml
+++ b/config/locales/doorkeeper.hr.yml
@@ -3,7 +3,9 @@ hr:
   activerecord:
     attributes:
       doorkeeper/application:
-        name: Ime
+        name: Ime aplikacije
+        scopes: Opsezi
+        website: Web-stranica aplikacije
     errors:
       models:
         doorkeeper/application:
@@ -22,26 +24,27 @@ hr:
         edit: Uredi
         submit: PoÅ¡alji
       confirmations:
-        destroy: Jesi li siguran?
+        destroy: Jeste li sigurni?
       edit:
         title: Uredi aplikaciju
       form:
-        error: Ups! Provjeri svoju formu za moguÄ‡e greÅ¡ke
+        error: Ups! Provjerite svoj obrazac za moguÄ‡e greÅ¡ke
       help:
         native_redirect_uri: Koristi %{native_redirect_uri} za lokalne testove
-        redirect_uri: Koristi jednu liniju po URI
-        scopes: Odvoji scopes sa razmacima. Ostavi prazninu kako bi koristio zadane scopes.
+        redirect_uri: Koristi jednu liniju po URI-u
+        scopes: Odvojite opsege razmacima. Za koriÅ¡tenje zadanih opsega, ostavite prazno.
       index:
+        application: Aplikacija
         name: Ime
-        new: Nova Aplikacija
-        title: Tvoje aplikacije
+        new: Nova aplikacija
+        title: VaÅ¡e aplikacije
       new:
-        title: Nova Aplikacija
+        title: Nova aplikacija
       show:
-        actions: Akcije
-        application_id: Id Aplikacije
-        callback_urls: Callback urls
-        secret: Tajna
+        actions: Radnje
+        application_id: KljuÄ klijenta
+        callback_urls: URL-ovi povratnih poziva
+        secret: Tajna klijenta
         title: 'Aplikacija: %{name}'
     authorizations:
       buttons:
@@ -51,34 +54,34 @@ hr:
         title: DoÅ¡lo je do greÅ¡ke
       new:
         able_to: MoÄ‡i Ä‡e
-        prompt: Aplikacija %{client_name} je zatraÅ¾ila pristup tvom raÄunu
-        title: TraÅ¾i se autorizacija
+        prompt: Aplikacija %{client_name} zatraÅ¾ila je pristup VaÅ¡em raÄunu
+        title: Potrebna je autorizacija
     authorized_applications:
       buttons:
         revoke: Odbij
       confirmations:
-        revoke: Jesi li siguran?
+        revoke: Jeste li sigurni?
       index:
         application: Aplikacija
         created_at: OvlaÅ¡eno
-        title: Tvoje autorizirane aplikacije
+        title: VaÅ¡e autorizirane aplikacije
     errors:
       messages:
-        access_denied: Vlasnik resursa / autorizacijski server je odbio zahtjev.
-        invalid_client: Autentifikacija klijenta nije uspjela zbog nepoznatog klijenta, neukljuÄene autentifikacije od strane klijenta, ili nepodrÅ¾ane metode autentifikacije.
-        invalid_redirect_uri: The redirect uri included nije valjan.
-        invalid_request: Zahtjevu nedostaje traÅ¾eni parametar, ukljuÄuje nepodrÅ¾anu vrijednost parametra, ili je na neki drugi naÄin neispravno formiran.
-        invalid_resource_owner: The provided resource owner credentials nisu valjani, ili vlasnik resursa ne moÅ¾e biti naÄ‘en
-        invalid_scope: TraÅ¾eni scope nije valjan, znan, ili je neispravno oblikovan.
+        access_denied: Vlasnik resursa ili autorizacijski posluÅ¾itelj odbili su zahtjev.
+        invalid_client: Autentifikacija klijenta nije uspjela zbog nepoznatog klijenta, nedostatka autentifikacije klijenta ili nepodrÅ¾ane metode autentifikacije.
+        invalid_redirect_uri: SadrÅ¾ani uri preusmjerenja nije valjan.
+        invalid_request: Zahtjevu nedostaje traÅ¾eni parametar, ukljuÄuje nepodrÅ¾anu vrijednost parametra ili je na neki drugi naÄin neispravno formatiran.
+        invalid_resource_owner: PruÅ¾ene vjerodajnice vlasnika resursa nisu valjane ili nije moguÄ‡e pronaÄ‡i vlasnika resursa
+        invalid_scope: TraÅ¾eni opseg nije valjan, znan ili je neispravno oblikovan.
         invalid_token:
           expired: Pristupni token je istekao
-          revoked: Pristupni token je odbijen
+          revoked: Pristupni token je opozvan
           unknown: Pristupni token nije valjan
-        server_error: Autorizacijski server naiÅ¡ao je na neoÄekivani uvjet, Å¡to ga je onemoguÄ‡ilo da ispuni zahtjev.
-        temporarily_unavailable: Autorizacijski server trenutno nije u moguÄ‡nosti  izvesti zahtjev zbog privremenog preoptereÄ‡enja ili odrÅ¾avanja servera.
+        server_error: Autorizacijski posluÅ¾itelj naiÅ¡ao je na neoÄekivani uvjet koji sprjeÄava provoÄ‘enje zahtjeva.
+        temporarily_unavailable: Autorizacijski posluÅ¾itelj trenutno nije u moguÄ‡nosti obraditi zahtjev zbog privremenog preoptereÄ‡enja ili njegovog odrÅ¾avanja.
         unauthorized_client: Klijent nije ovlaÅ¡ten izvesti zahtjev koristeÄ‡i ovu metodu.
-        unsupported_grant_type: The authorization grant tip nije podrÅ¾an od autorizacijskog servera.
-        unsupported_response_type: Autorizacijski server ne podrÅ¾ava ovaj tip odgovora.
+        unsupported_grant_type: Autorizacijski posluÅ¾itelj ne podrÅ¾ava ovu vrstu autorizacijskog odobrenja.
+        unsupported_response_type: Autorizacijski posluÅ¾itelj ne podrÅ¾ava ovu vrstu odgovora.
     flash:
       applications:
         create:
@@ -89,7 +92,7 @@ hr:
           notice: Aplikacija je aÅ¾urirana.
       authorized_applications:
         destroy:
-          notice: Aplikacija je odbijena.
+          notice: Aplikacija je opozvana.
     layouts:
       admin:
         nav:
@@ -97,6 +100,6 @@ hr:
       application:
         title: TraÅ¾i se OAuth autorizacija
     scopes:
-      follow: slijediti, blokirati, deblokirati i prestati slijediti raÄune
-      read: Äitati  podatke tvog raÄuna
-      write: slati poruke u tvoje ime
+      follow: mijenjati odnose izmeÄ‘u raÄuna
+      read: Äitati sve podatke VaÅ¡eg raÄuna
+      write: mijenjati sve podatke VaÅ¡eg raÄuna
diff --git a/config/locales/doorkeeper.hy.yml b/config/locales/doorkeeper.hy.yml
index 0a39ce30f6220f5cab4c13aa8765fb35cc511b35..ba3f4e124d6a5d38ac51609eaaa91cd0a0a3ce56 100644
--- a/config/locales/doorkeeper.hy.yml
+++ b/config/locales/doorkeeper.hy.yml
@@ -1,16 +1,157 @@
 ---
 hy:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Õ…Õ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Õ« Õ¡Õ¶Õ¸Ö‚Õ¶
+        redirect_uri: Õ¾Õ¥Ö€Õ¡Õ²ÕµÕ¥Õ¬ URI
+        scopes: Ô´Õ¡Õ·Õ¿Õ¥Ö€
+        website: 'Õ…Õ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Õ« Õ¾Õ§Õ¢Õ¯Õ¡ÕµÖ„
+
+'
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ´Õ¡Õ½ ÕºÕ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¥Õ¬
+              invalid_uri: ÕºÕ§Õ¿Ö„ Õ§ Õ¬Õ«Õ¶Õ« Õ¾Õ¡Ö‚Õ§Ö€ URIÖ‰
+              relative_uri: ÕºÕ§Õ¿Ö„ Õ§ Õ¬Õ«Õ¶Õ« Õ¢Õ¡ÖÕ¡Ö€Õ±Õ¡Õ¯ URIÖ‰
+              secured_uri: ÕºÕ§Õ¿Ö„ Õ§ Õ¬Õ«Õ¶Õ« HTTPS/SSL URIÖ‰
   doorkeeper:
     applications:
       buttons:
+        authorize: Õ†Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¶Õ¥Õ¬
         cancel: Õ‰Õ¥Õ²Õ¡Ö€Õ¯Õ¥Õ¬
+        destroy: ÕŽÕ¥Ö€Õ¡ÖÕ¶Õ¥Õ¬
         edit: Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬
+        submit: ÕˆÖ‚Õ²Õ¡Ö€Õ¯Õ¥Õ¬
+      confirmations:
+        destroy: ÕŽÕ½Õ¿Õ¡ÕžÕ° Õ¥Õ½
+      edit:
+        title: Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬ ÕµÕ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Õ¨
+      form:
+        error: ÕŽÕ¡ÕœÕµâ€¤ ÕÕ¿Õ¸Ö‚Õ£Õ«Ö€ Õ±Õ¥Ö‚Õ¡Õ¶Õ´Õ¸Ö‚Õ·Õ¸Ö‚Õ´ Õ¥Õ²Õ¡Õ® Õ°Õ¶Õ¡Ö€Õ¡Ö‚Õ¸Ö€ Õ½ÕÕ¡Õ¬Õ¶Õ¥Ö€Õ¨
+      help:
+        native_redirect_uri: Õ•Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ«Ö€ %{native_redirect_uri} Õ¬Õ¸Õ¯Õ¡Õ¬ ÖƒÕ¸Ö€Õ±Õ¡Ö€Õ¯Õ´Õ¡Õ¶ Õ°Õ¡Õ´Õ¡Ö€
+        redirect_uri: Õ•Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ«Ö€ Õ´Õ§Õ¯ Õ¿Õ¸Õ² Õ«Ö‚Ö€Õ¡Ö„Õ¡Õ¶Õ¹Õ«Ö‚Ö€ URI Õ°Õ¡Õ´Õ¡Ö€
+        scopes: Ô²Õ¡ÕªÕ¡Õ¶Õ«Ö€ Õ¤Õ¡Õ·Õ¿Õ¥Ö€Õ¨ Õ¢Õ¡ÖÕ¡Õ¿Õ¶Õ¥Ö€Õ¸Õ¾Ö‰ Ô´Õ¡Õ¿Õ¡Ö€Õ¯ Õ©Õ¸Õ²Õ Õ¬Õ¼Õ¥Õ¬Õ¥Õ¡ÕµÕ¶ Õ¤Õ¡Õ·Õ¿Õ¥Ö€Õ¶ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰
       index:
+        application: Õ…Õ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®
+        callback_url: URL Õ¥Õ¿Õ¯Õ¡Õ¶Õ¹
         delete: Õ‹Õ¶Õ»Õ¥Õ¬
+        empty: Ô´Õ¸Ö‚ Õ¹Õ¸Ö‚Õ¶Õ¥Õ½ ÕµÕ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Õ¶Õ¥Ö€Ö‰
         name: Ô±Õ¶Õ¸Ö‚Õ¶
+        new: Õ†Õ¸Ö€ ÕµÕ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®
+        scopes: Ô´Õ¡Õ·Õ¿Õ¥Ö€
         show: Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬
+        title: Õ”Õ¸ ÕµÕ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Õ¶Õ¥Ö€Õ¨
+      new:
+        title: Õ†Õ¸Ö€ ÕµÕ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®
       show:
-        actions: Ô³Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€
+        actions: Ô³Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€
+        application_id: 'Ô¿Õ¬Õ«Õ¥Õ¶Õ¿Õ« Õ¢Õ¡Õ¶Õ¡Õ¬Õ«
+
+'
+        callback_urls: URLÖŠÕ¶Õ¥Ö€Õ« Õ¥Õ¿Õ¯Õ¡Õ¶Õ¹
+        scopes: Ô´Õ¡Õ·Õ¿Õ¥Ö€
+        secret: Ô¿Õ¬Õ«Õ¥Õ¶Õ¿Õ« Õ£Õ¡Õ²Õ¿Õ¶Õ«Ö„
+        title: Õ…Õ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®â€¤ %{name}
+    authorizations:
+      buttons:
+        authorize: Ô¼Õ«Õ¡Õ¦Ö…Ö€Õ¥Õ¬
+        deny: Õ„Õ¥Ö€ÕªÕ¥Õ¬
+      error:
+        title: Ô±Õ¼Õ¡Õ»Õ¡ÖÕ¥Õ¬ Õ§ Õ½ÕÕ¡Õ¬Ö‰
+      new:
+        able_to: Õ†Õ¡ Õ¯Õ¡Ö€Õ¸Õ²Õ¡Õ¶Õ¡Õ¬Õ¸Ö‚ Õ§
+        prompt: "%{client_name} ÕµÕ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Õ¨ ÕÕ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ§ Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ«Õ¸Ö‚Õ©Õ«Ö‚Õ¶ Ö„Õ¸ Õ°Õ¡Õ·Õ¸Ö‚Õ«Õ¶"
+        title: Ô±Õ¶Õ°Ö€Õ¡ÕªÕ¥Õ·Õ¿ Õ§ Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¸Ö‚Õ´
+      show:
+        title: ÕŠÕ¡Õ¿Õ³Õ§Õ¶Õ«Ö€ Õ¡ÕµÕ½ Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ´Õ¡Õ¶ Õ¯Õ¸Õ¤Õ¨ Õ¥Ö‚ ÖƒÕ¡Õ¯ÖÖ€Õ¸Ö‚ ÕµÕ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Õ¸Ö‚Õ´Ö‰
     authorized_applications:
+      buttons:
+        revoke: Õ‰Õ¥Õ²Õ¡Ö€Õ¯Õ¥Õ¬
+      confirmations:
+        revoke: ÕŽÕ½Õ¿Õ¡ÕžÕ° Õ¥Õ½
       index:
+        application: Õ…Õ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®
+        created_at: Õ†Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÖ€Õ¡Õ®
         date_format: "%Y-%m-%d %H:%M:%S"
+        scopes: Ô´Õ¡Õ·Õ¿Õ¥Ö€
+        title: Õ”Õ¸ Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÖ€Õ¡Õ® Õ®Ö€Õ¡Õ£Ö€Õ¥Ö€Õ¨
+    errors:
+      messages:
+        access_denied: ÕŒÕ¥Õ½Õ¸Ö‚Ö€Õ½Õ« Õ¿Õ§Ö€Õ¨ Õ¯Õ¡Õ´ Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¶Õ¸Õ² Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ«Õ¹Õ¨ Õ´Õ¥Ö€ÕªÕ¥Õ¬ Õ§ Õ¤Õ«Õ´Õ¸Ö‚Õ´Õ¨Ö‰
+        credential_flow_not_configured: ÕŒÕ¥Õ½Õ¸Ö‚Ö€Õ½Õ« Õ¿Õ§Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ« Õ¬Õ«Õ¡Õ¦Ö…Ö€Õ¡Õ£Ö€Õ¥Ö€Õ¨ Õ±Õ¡ÕÕ¸Õ²Õ¸Ö‚Õ¥ÖÕ«Õ¶ Doorkeeper.configure.resource_owner_from_credentialsÖŠÕ« Õ¹Õ¯Õ¡Ö€Õ£Õ¡Ö‚Õ¸Ö€Õ¸Ö‚Õ¡Õ® Õ¬Õ«Õ¶Õ¥Õ¬Õ¸Ö‚ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¸Õ¾Ö‰
+        invalid_client: Ô¿Õ¬Õ«Õ¥Õ¶Õ¿Õ« Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¸Ö‚Õ´Õ¨ Õ±Õ¡ÕÕ¸Õ²Õ¸Ö‚Õ¥Ö Õ¡Õ¶ÕµÕ¡ÕµÕ¿ Õ¯Õ¬Õ«Õ¥Õ¶Õ¿Õ«, Õ¯Õ¬Õ«Õ¥Õ¶Õ¿Õ« Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ´Õ¡Õ¶, Õ¯Õ¡Õ´ Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ´Õ¡Õ¶ Õ¹Õ¡Õ»Õ¡Õ¯ÖÕ¸Ö‚Õ¸Õ² Õ±Õ¥Ö‚Õ« ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¸Õ¾Ö‰
+        invalid_grant: ÕÖ€Õ¡Õ´Õ¡Õ¤Ö€Õ¸Ö‚Õ¡Õ® Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ´Õ¡Õ¶ Õ©Õ¸ÕµÕ¬Õ¿Õ¸Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶ Õ¡Õ¶Õ¾Õ¡Ö‚Õ¥Ö€ Õ§, Õ½ÕºÕ¡Õ¼Õ¸Ö‚Õ¡Õ®, Õ¹Õ¥Õ²Õ¡Ö€Õ¯Õ¸Ö‚Õ¡Õ®, Õ¹Õ« Õ°Õ¡Õ´Õ¡ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¸Ö‚Õ´ Õ¾Õ¥Ö€Õ¡ÕµÕ²Õ¸Ö‚Õ¡Õ® URIÖŠÕ« Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ´Õ¡Õ¶ ÕµÕ¡ÕµÕ¿Õ«Õ¶, Õ¯Õ¡Õ´ ÕµÕ²Õ¸Ö‚Õ¥Õ¬ Õ§ Õ¡ÕµÕ¬ Õ¯Õ¬Õ«Õ¥Õ¶Õ¿Õ«Ö‰
+        invalid_redirect_uri: ÕŽÕ¥Ö€Õ¡ÕµÕ²Õ¸Ö‚Õ¡Õ® uriÖŠÕ« Õ¡Õ¶Õ¾Õ¡Ö‚Õ¥Ö€ Õ§Ö‰
+        invalid_request: Õ…Õ¡ÕµÕ¿Õ«Ö Õ¢Õ¡ÖÕ¡Õ¯Õ¡ÕµÕ¸Ö‚Õ´ Õ§ ÕºÕ¡Õ°Õ¡Õ¶Õ»Õ¸Ö‚Õ¸Õ² ÕºÕ¡Ö€Õ¡Õ´Õ¥Õ¿Ö€Õ¨, Õ¶Õ¥Ö€Õ¡Õ¼Õ¸Ö‚Õ´ Õ§ Õ¹Õ¡Õ»Õ¡Õ¯ÖÕ¸Ö‚Õ¸Õ² Õ¡Ö€ÕªÕ§Ö„ Õ¯Õ¡Õ´ Õ¡ÕµÕ¬ Õ¡Õ¶Õ½Õ¡Ö€Ö„Õ¸Ö‚Õ©Õ«Ö‚Õ¶Ö‰
+        invalid_resource_owner: ÕÖ€Õ¡Õ´Õ¡Õ¤Ö€Õ¸Ö‚Õ¡Õ® Õ¼Õ¥Õ½Õ¸Ö‚Ö€Õ½Õ« Õ¿Õ«Ö€Õ¸Õ» Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬Õ¶Õ¥Ö€Õ¨ Õ¡Õ¶Õ¾Õ¡Ö‚Õ¥Ö€ Õ¥Õ¶ Õ¯Õ¡Õ´ Õ¼Õ¥Õ½Õ¸Ö‚Ö€Õ½Õ« Õ¿Õ§Ö€Õ¨ Õ¹Õ« Õ£Õ¿Õ¶Õ¸Ö‚Õ¥Õ¬
+        invalid_scope: Õ…Õ¡ÕµÕ¿Õ« Õ¤Õ¡Õ·Õ¿Õ¶ Õ¡Õ¶Õ¾Õ¡Ö‚Õ¥Ö€, Õ¡Õ¶ÕµÕ¡ÕµÕ¿ Õ¯Õ¡Õ´ Õ¡Õ¶Õ½Õ¡Ö€Ö„Ö‰
+        invalid_token:
+          expired: Õ€Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ«Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¯Õ¿Ö€Õ¸Õ¶Õ¨ Õ½ÕºÕ¡Õ¼Õ¸Ö‚Õ¡Õ® Õ§
+          revoked: Õ€Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ«Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¯Õ¿Ö€Õ¸Õ¶Õ¨ Õ¹Õ¥Õ²Õ¡Ö€Õ¯Õ¸Ö‚Õ¡Õ® Õ§
+          unknown: Õ€Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ«Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¯Õ¿Ö€Õ¸Õ¶Õ¨ Õ¡Õ¶Õ¾Õ¡Ö‚Õ¥Ö€ Õ§
+        resource_owner_authenticator_not_configured: ÕŒÕ¥Õ½Õ¸Ö‚Ö€Õ½Õ« Õ¿Õ§Ö€Õ¨ Õ¹Õ£Õ¿Õ¶Õ¸Ö‚Õ¥Ö Doorkeeper.configure.resource_owner_authenticatorÖŠÕ« Õ¹Õ¯Õ¡Ö€Õ£Õ¡Ö‚Õ¸Ö€Õ¸Ö‚Õ¡Õ® Õ¬Õ«Õ¶Õ¥Õ¬Õ¸Ö‚ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¸Õ¾Ö‰
+        server_error: Õ†Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ´Õ¡Õ¶ Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ«Õ¹Õ¨ Õ¢Õ¡ÕÕ¸Ö‚Õ¥Õ¬  Õ§ Õ¹Õ¶Õ¡ÕÕ¡Õ¿Õ¥Õ½Õ¸Ö‚Õ¡Õ® ÕºÕ¡ÕµÕ´Õ¡Õ¶Õ«, Õ¸Ö€Õ¨ ÕÕ¸Õ¹Õ¨Õ¶Õ¤Õ¸Õ¿Õ¸Ö‚Õ´ Õ§ ÕµÕ¡ÕµÕ¿Õ« Õ¬Ö€Õ¡ÖÕ´Õ¡Õ¶Õ¨Ö‰
+        temporarily_unavailable: Õ†Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ´Õ¡Õ¶ Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ«Õ¹Õ¶ Õ¡ÕµÕªÕ´ Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ£Õ¸Ö€Õ®Õ¡Ö€Õ¯Õ¥Õ¬ ÕµÕ¡ÕµÕ¿Õ¨Õ Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ«Õ¹Õ« ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ¡Ö‚Õ¸Ö€ Õ®Õ¡Õ¶Ö€Õ¡Õ¢Õ¥Õ¼Õ¶Õ´Õ¡Õ¶ Õ¯Õ¡Õ´ ÕºÕ¡Õ°ÕºÕ¡Õ¶Õ´Õ¡Õ¶ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¸Õ¾Ö‰
+        unauthorized_client: Ô¿Õ¬Õ«Õ¥Õ¶Õ¿Õ¨ Õ¬Õ«Õ¡Õ¦Ö…Ö€Õ¸Ö‚Õ¡Õ® Õ¹Õ§ Õ«Ö€Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ ÕµÕ¡ÕµÕ¿Õ¶ Õ¡ÕµÕ½ Õ´Õ¥Õ©Õ¸Õ¤Õ¸Õ¾Ö‰
+        unsupported_grant_type: Õ†Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ´Õ¡Õ¶ Õ¬Õ«Õ¡Õ¦Ö…Ö€Õ¸Ö‚Õ´Õ¨ Õ¹Õ« Õ¡Õ»Õ¡Õ¯ÖÕ¸Ö‚Õ¸Ö‚Õ´ Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ´Õ¡Õ¶ Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ¹Õ« Õ¯Õ¸Õ²Õ´Õ«ÖÖ‰
+        unsupported_response_type: Õ†Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ´Õ¡Õ¶ Õ½Õ¥Ö€Õ¸Ö‚Õ¥Ö€Õ¨ Õ¹Õ« Õ¡Õ»Õ¡Õ¯ÖÕ¸Ö‚Õ´ Õ¡ÕµÕ½ ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¨Ö‰
+    flash:
+      applications:
+        create:
+          notice: ÕÕ¿Õ¥Õ²Õ®Õ¸Ö‚Õ¥Õ¬ Õ§ ÕµÕ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Ö‰
+        destroy:
+          notice: Õ…Õ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Õ¨ Õ»Õ¶Õ»Õ¸Ö‚Õ¥Õ¬ Õ§Ö‰
+        update:
+          notice: Õ…Õ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Õ¨ Õ©Õ¡Ö€Õ´Õ¡ÖÕ¸Ö‚Õ¥Õ¬ Õ§Ö‰
+      authorized_applications:
+        destroy:
+          notice: Õ…Õ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Õ¨ Õ¹Õ¥Õ²Õ¡Ö€Õ¯Õ¸Ö‚Õ¥Õ¬ Õ§Ö‰
+    layouts:
+      admin:
+        nav:
+          applications: Õ…Õ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Õ¶Õ¥Ö€
+          oauth2_provider: OAuth2 Õ´Õ¡Õ¿Õ¡Õ¯Õ¡Ö€Õ¡Ö€
+      application:
+        title: Ô±Õ¶Õ°Ö€Õ¡ÕªÕ¥Õ·Õ¿ Õ§ OAuth Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¸Ö‚Õ´
+    scopes:
+      admin:read: Õ¯Õ¡Ö€Õ¤Õ¡Õ¬ Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ¹Õ« Õ¸Õ²Õ» Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬Õ¶Õ¥Ö€Õ¨
+      admin:read:accounts: Õ¯Õ¡Ö€Õ¤Õ¡Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€ Õ°Õ¡Õ·Õ«Ö‚Õ¶Õ¥Ö€Õ« Õ¦Õ£Õ¡ÕµÕ¸Ö‚Õ¶ Õ«Õ¶Ö†Õ¸Ö€Õ´Õ¡ÖÕ«Õ¡Õ¶
+      admin:read:reports: Õ¯Õ¡Ö€Õ¤Õ¡Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€ Õ¢Õ¸Õ²Õ¸Ö„Õ¶Õ¥Ö€Õ« Õ¥Ö‚ ÕµÕ¡Õ²Õ¸Ö€Õ¤Õ¸Ö‚Õ¡Õ® Õ°Õ¡Õ·Õ«Ö‚Õ¶Õ¥Ö€Õ« Õ¦Õ£Õ¡ÕµÕ¸Ö‚Õ¶ Õ«Õ¶Ö†Õ¸Ö€Õ´Õ¡ÖÕ«Õ¡Õ¶
+      admin:write: ÖƒÕ¸ÖƒÕ¸ÕÕ¥Õ¬ Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ¹Õ« Õ¸Õ²Õ» Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬Õ¶Õ¥Ö€Õ¨
+      admin:write:accounts: Õ«Ö€Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¶Õ¥Õ¬ Õ´Õ¸Õ¤Õ¥Ö€Õ¡Õ¿Õ¸Ö€Õ¡Õ¯Õ¡Õ¶ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€ Õ°Õ¡Õ·Õ«Ö‚Õ¶Õ¥Ö€Õ« Õ¾Ö€Õ¡Õµ
+      admin:write:reports: Õ«Ö€Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¶Õ¥Õ¬ Õ´Õ¸Õ¤Õ¥Ö€Õ¡Õ¿Õ¸Ö€Õ¡Õ¯Õ¡Õ¶ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€ Õ¢Õ¸Õ²Õ¸Ö„Õ¶Õ¥Ö€Õ« Õ¾Ö€Õ¡Õµ
+      follow: ÖƒÕ¸ÖƒÕ¸ÕÕ¥Õ¬ Õ°Õ¡Õ·Õ¸Ö‚Õ« ÕµÕ¡Ö€Õ¡Õ¢Õ¥Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¨
+      push: Õ½Õ¿Õ¡Õ¶Õ¡Õ¬ Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨
+      read: Õ¯Õ¡Ö€Õ¤Õ¡Õ¬ Ö„Õ¸ Õ°Õ¡Õ·Õ¸Ö‚Õ« Õ¢Õ¸Õ¬Õ¸Ö€ Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬Õ¶Õ¥Ö€Õ¨
+      read:accounts: Õ¿Õ¥Õ½Õ¶Õ¥Õ¬ Õ°Õ¡Õ·Õ«Ö‚Õ¶Õ¥Ö€Õ« Õ«Õ¶Ö†Õ¸Ö€Õ´Õ¡ÖÕ«Õ¡Õ¶
+      read:blocks: Õ¿Õ¥Õ½Õ¶Õ¥Õ¬ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨
+      read:bookmarks: Õ¿Õ¥Õ½Õ¶Õ¥Õ¬ Õ§Õ»Õ¡Õ¶Õ«Õ·Õ¶Õ¥Ö€Õ¨
+      read:favourites: Õ¿Õ¥Õ½Õ¶Õ¥Õ¬ Õ°Õ¡Ö‚Õ¡Õ¶Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨
+      read:filters: Õ¿Õ¥Õ½Õ¶Õ¥Õ¬ Ö†Õ«Õ¬Õ¿Ö€Õ¥Ö€Õ¨
+      read:follows: Õ¿Õ¥Õ½Õ¶Õ¥Õ¬ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ«Õ¶
+      read:lists: Õ¿Õ¥Õ½Õ¶Õ¥Õ¬ ÖÕ¡Õ¶Õ¯Õ¥Ö€Õ¨
+      read:mutes: Õ¿Õ¥Õ½Õ¶Õ¥Õ¬ Õ¬Õ¼Õ¥ÖÕ¸Ö‚Õ¡Õ®Õ¶Õ¥Ö€Õ«Õ¶
+      read:notifications: Õ¿Õ¥Õ½Õ¶Õ¥Õ¬ Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨
+      read:reports: Õ¿Õ¥Õ½Õ¶Õ¥Õ¬ Õ¢Õ¸Õ²Õ¸Ö„Õ¶Õ¥Ö€Õ¨
+      read:search: Õ¸Ö€Õ¸Õ¶Õ«Ö€ Ö„Õ¸ Õ¡Õ¶Õ¸Ö‚Õ¶Õ«Ö
+      read:statuses: Õ¿Õ¥Õ½Õ¶Õ¥Õ¬ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨
+      write: ÖƒÕ¸ÖƒÕ¸ÕÕ¥Õ¬ Ö„Õ¸ Õ°Õ¡Õ·Õ¸Ö‚Õ« Õ¢Õ¸Õ¬Õ¸Ö€ Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬Õ¶Õ¥Ö€Õ¨
+      write:accounts: ÖƒÕ¸ÖƒÕ¸ÕÕ¥Õ¬ Õ°Õ¡Õ·Õ«Ö‚Õ¨
+      write:blocks: Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬ Õ°Õ¡Õ·Õ«Ö‚Õ¶Õ¥Ö€Õ¨ Õ¥Ö‚ Õ¤Õ¸Õ´Õ§ÕµÕ¶Õ¶Õ¥Ö€Õ¨
+      write:bookmarks: Õ§Õ»Õ¡Õ¶Õ·Õ¥Õ¬ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨
+      write:favourites: Õ°Õ¡Ö‚Õ¡Õ¶Õ¥Õ¬ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨
+      write:filters: 'Õ½Õ¿Õ¥Õ²Õ®Õ¥Õ¬ Ö†Õ«Õ¬Õ¿Ö€Õ¥Ö€
+
+'
+      write:follows: Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬
+      write:lists: Õ½Õ¿Õ¥Õ²Õ®Õ¥Õ¬ ÖÕ¡Õ¶Õ¯Õ¥Ö€
+      write:media: Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ Õ´Õ¥Õ¤Õ«Õ¡ Ö†Õ¡ÕµÕ¬Õ¥Ö€
+      write:mutes: Õ¬Õ¼Õ¥ÖÕ¶Õ¥Õ¬ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö Õ¥Ö‚ Õ¦Ö€Õ¸ÕµÖÕ¶Õ¥Ö€Õ¨
+      write:notifications: Õ´Õ¡Ö„Ö€Õ¥Õ¬ Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨
+      write:reports: Õ¢Õ¸Õ²Õ¸Ö„Õ¥Õ¬ Õ¡ÕµÕ¬Õ¸ÖÕ«Ö
+      write:statuses: Õ©Õ©Õ¥Õ¬
diff --git a/config/locales/doorkeeper.it.yml b/config/locales/doorkeeper.it.yml
index 68e2b57f3eefd147d27901c86c7a497d0088fef0..607abb2b3465760c19e3b11b583952ed0f6cd624 100644
--- a/config/locales/doorkeeper.it.yml
+++ b/config/locales/doorkeeper.it.yml
@@ -25,7 +25,7 @@ it:
         edit: Modifica
         submit: Invia
       confirmations:
-        destroy: Sei sicuro?
+        destroy: Sei sicur*?
       edit:
         title: Modifica applicazione
       form:
@@ -69,7 +69,7 @@ it:
       buttons:
         revoke: Disabilita
       confirmations:
-        revoke: Sei sicuro?
+        revoke: Sei sicur*?
       index:
         application: Applicazione
         created_at: Autorizzato
diff --git a/config/locales/doorkeeper.ku.yml b/config/locales/doorkeeper.ku.yml
index cc251e86ae3fc9c96ba4a32a86e9e41868ac09d9..29d5f40dbe1eca0daef84b9e25b1121d45ef725d 100644
--- a/config/locales/doorkeeper.ku.yml
+++ b/config/locales/doorkeeper.ku.yml
@@ -1 +1,151 @@
-ckb-IR:
+---
+ku:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Ù†Ø§ÙˆÛŒ Ø¨Û•Ø±Ù†Ø§Ù…Û•
+        redirect_uri: URI Ú¯Û†Ú•Ø§Ù†ÛŒ Ø´ÙˆÛŽÙ†
+        scopes: Ø¨ÙˆØ§Ø±Û•Ú©Ø§Ù†
+        website: Ù†Û•Ø±Ù…Û•Ú©Ø§Ù„Ø§ÛŒ Ù…Ø§ÚµÙ¾Û•Ú•
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: Ù†Ø§ØªÙˆØ§Ù†ÛŽØª Ù¾Ø§Ø±Ú†Û•ÛŒÛ•Ú© Ù„Û•Ø®Û†ÙˆÛ• Ø¨Ú¯Ø±ÛŒ.
+              invalid_uri: Ù¾ÛŽÙˆÛŒØ³ØªÛ• URI Ø¯Ø±ÙˆØ³Øª Ø¨ÛŽØª.
+              relative_uri: Ù¾ÛŽÙˆÛŒØ³ØªÛ• URI ÛŒ Ú•Û•Ù‡Ø§ Ø¨ÛŽØª.
+              secured_uri: Ù¾ÛŽÙˆÛŒØ³ØªÛ• HTTPS/SSL URI Ø¨ÛŽØª.
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: Ú•ÛŽÚ¯Û•Ù¾ÛŽØ¯Ø§Ù†
+        cancel: Ù‡Û•ÚµÙˆÛ•Ø´Ø§Ù†Ø¯Ù†Û•ÙˆÙ‡
+        destroy: Ù„Û•Ù†Ø§ÙˆØ¨Ø±Ø¯Ù†
+        edit: Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒ
+        submit: Ù†Ø§Ø±Ø¯Ù†
+      confirmations:
+        destroy: Ø¯ÚµÙ†ÛŒØ§ÛŒ?
+      edit:
+        title: Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒ Ú©Ø±Ø¯Ù†ÛŒ Ø¨Û•Ø±Ù†Ø§Ù…Û•
+      form:
+        error: ØªÛ•ØØ! Ø¨Ø²Ø§Ù†Û• Ø´ØªÛŽÚ©Øª Ù„Û• Ù†ÛŽÙˆ ÙÛ†Ø±Ù…Û•Ú©Û• Ø¨Û• Ù‡Û•ÚµÛ• Ù†Û•Ù†ÙˆÙˆØ³ÛŒÙˆÛ•
+      help:
+        native_redirect_uri: Ø¨Û† ØªØ§Ù‚ÛŒÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù†Ø§ÙˆØ®Û†ÛŒÛŒ %{native_redirect_uri} Ø¨Û•Ú©Ø§Ø±Ø¨Û•Ø±Û•ØŒ
+        redirect_uri: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø§Ù†ÛŒ ÛŒÛ•Ú© Ù‡ÛŽÚµ Ø¨Û† Ù‡Û•Ø± URI
+        scopes: Ø¯Û†Ù…Û•ÛŒÙ†Û•Ú©Ø§Ù† Ø¬ÛŒØ§Ø¨Ø¨Ú©Û•Ù† Ø¨Û• Ø¨Û†Ø´Ø§ÛŒÛŒÛ•Ú©Ø§Ù†. Ø¨Û† Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø§Ù†ÛŒ Ø¯Û†Ù…Û•ÛŒÙ†ÛŒ Ú¯Ø±ÛŒÙ…Ø§Ù†Û•ÛŒÛŒ Ú†Û†ÚµÛŒ Ø¨Û•Ø¬ÛŽØ¨Ù‡ÛŽÚµÛ•.
+      index:
+        application: Ù†Û•Ø±Ù…Û•Ú©Ø§Ù„
+        callback_url: Callback Ù†ÛŒØ´Ø§Ù†ÛŒ
+        delete: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•
+        empty: Ù‡ÛŒÚ† Ø¨Û•Ø±Ù†Ø§Ù…Û•ÛŒÛ•Ú©Øª Ù†ÛŒÛ•.
+        name: Ù†Ø§Ùˆ
+        new: Ø¨Û•Ø±Ù†Ø§Ù…Û•ÛŒ Ù†ÙˆÛŽ
+        scopes: Ø¯Û†Ù…Û•ÛŒÙ†Û•Ú©Ø§Ù†
+        show: Ù†ÛŒØ´Ø§Ù†Ø¯Ø§Ù†
+        title: Ø¨Û•Ø±Ù†Ø§Ù…Û•ÛŒ ØªÛ†
+      new:
+        title: Ø¨Û•Ø±Ù†Ø§Ù…Û•ÛŒ Ù†ÙˆÛŽ
+      show:
+        actions: Ú©Ø§Ø±Û•Ú©Ø§Ù†
+        application_id: Ú©Ù„ÛŒÙ„ÛŒ Ú•Ø§Ú˜Û•Ø®ÙˆØ§Ø²
+        callback_urls: Callback Ù†ÛŒØ´Ø§Ù†Û•Ú©Ø§Ù†ÛŒ
+        scopes: Ø¯Û†Ù…Û•ÛŒÙ†Û•Ú©Ø§Ù†
+        secret: Ù†Ù‡ÛŽÙ†ÛŒ Ú•Ø§Ú˜Û•Ø®ÙˆØ§Ø²
+        title: 'Ø¨Û•Ø±Ù†Ø§Ù…Û•: %{name}'
+    authorizations:
+      buttons:
+        authorize: Ú•ÛŽÙ¾ÛŽØ¯Ø±Ø§Ùˆ
+        deny: Ù†Ú©Û†ÚµÛŒ Ù„ÛŽØ¨Ú©Û•
+      error:
+        title: Ù‡Û•ÚµÛ•ÛŒÛ•Ú© Ú•ÙˆÙˆÛŒØ¯Ø§
+      new:
+        able_to: Ø¯Û•ØªÙˆØ§Ù†ÛŽØª
+        prompt: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø§Ù†ÛŒ %{client_name} Ø¯Ø§ÙˆØ§ÛŒ Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆÙˆØ±Û•ÙˆÛ• Ø¨Û† Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ø¯Û•Ú©Ø§Øª
+        title: Ú•ÛŽÙ¾ÛŽØ¯Ø§Ù† Ù¾ÛŽÙˆÛŒØ³ØªÛ•
+      show:
+        title: Ú©Û†Ù¾ÛŒÚ©Ø±Ø¯Ù†ÛŒ Ú©Û†Ø¯ÛŒ Ø¦Û•Ù… Ø±ÛŽÙ¾ÛŽØ¯Ø§Ù†Û• Ùˆ Ù„Ú©Ø§Ù†Ø¯Ù†ÛŒ Ø¨Û• Ø¨Û•Ø±Ù†Ø§Ù…Û•Ú©Û•.
+    authorized_applications:
+      buttons:
+        revoke: Ø¨Û•ØªØ§ÚµÛŒ Ø¨Ú©Û•
+      confirmations:
+        revoke: Ø¦Ø§ÛŒØ§ Ø¯ÚµÙ†ÛŒØ§ÛŒØª?
+      index:
+        application: Ù†Û•Ø±Ù…Û•Ú©Ø§Ù„
+        created_at: Ø¯Ù‡â€ŒØ³Ù‡â€ŒÚµØ§ØªÙ¾ÛŽØ¯Ø±Ø§Ùˆ
+        date_format: "%Y-%m-%d %H:%M:%S"
+        scopes: Ø¨ÙˆØ§Ø±Û•Ú©Ø§Ù†
+        title: Ø¨Û•Ø±Ù†Ø§Ù…Û• Ú•ÛŽÚ¯Û•Ù¾ÛŽØ¯Ø±Ø§ÙˆÛ•Ú©Ø§Ù†Øª
+    errors:
+      messages:
+        access_denied: Ø®Ø§ÙˆÛ•Ù†ÛŒ Ø³Û•Ø±Ú†Ø§ÙˆÛ• ÛŒØ§Ù† Ø³ÛŽØ±Ú¤Û•Ø±ÛŒ Ú•ÛŽÙ¾ÛŽØ¯Ø§Ù† Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒÛ•Ú©Û•ÛŒ Ú•Û•Øª Ú©Ø±Ø¯Û•ÙˆÛ•.
+        credential_flow_not_configured: Ù„ÛŽØ´Ø§ÙˆÛŒ Ø¨Ú•ÙˆØ§Ù¾ÛŽØ¯Ø§Ù†ÛŒ ØªÛŽÙ¾Û•Ú•Û•ÙˆØ´Û•ÛŒ Ø®Ø§ÙˆÛ•Ù† Ø³Û•Ø±Ú†Ø§ÙˆÛ• Ø´Ú©Ø³ØªÛŒ Ù‡ÛŽÙ†Ø§ Ø¨Û•Ù‡Û†ÛŒ Doorkeeper.configure.resource_owner_from_credentials Ø´ÛŽÙˆÛ•Ø¨Û•Ù†Ø¯ÛŒ Ù†Û•Ú©Ø±Ø§Ùˆ.
+        invalid_client: Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†ÛŒ Ú©Ú•ÛŒØ§Ø± Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆ Ù†Û•Ø¨ÙˆÙˆ Ø¨Û•Ù‡Û†ÛŒ Ú©Ú•ÛŒØ§Ø±ÛŒ Ù†Û•Ù†Ø§Ø³Ø±Ø§ÙˆÛ•ÙˆÛ•ØŒ Ù‡ÛŒÚ† Ú•Û•Ø³Û•Ù†Ø§ÛŒÛ•ØªÛŒ Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†ÛŽÚ©ÛŒ Ú©Ù„Ø§ÛŒÛ•Ù†Øª Ù„Û•Ø®Û†ÙˆÛ• Ù†Û•Ø¯Û•Ú¯Ø±ÛŽØªØŒ ÛŒØ§Ù† Ø´ÛŽÙˆØ§Ø²ÛŒ Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†ÛŒ Ù¾Û•Ø³Û•Ù†Ø¯ Ù†Û•Ú©Ø±Ø§Ùˆ.
+        invalid_grant: Ø¨Û•Ø®Ø´ÛŒÙ† Ù…Û†ÚµÛ•ØªÛŒ Ø¯Ø§Ø¨ÛŒÙ†Ú©Ø±Ø§Ùˆ Ù†Ø§ÛŒØ§Ø³Ø§ÛŒÛŒÛ•ØŒ Ø¨Û•Ø³Û•Ø±Ú†ÙˆÙˆÛ•ØŒ Ù‡Û•ÚµÙˆÛ•Ø´Ø§Ù†Ø¯Ù†Û•ÙˆÛ•ÛŒÛ•ØŒ Ù†Ø§Ú¯ÙˆÙ†Ø¬ÛŽÙ„Û•Ú¯Û•Úµ Ø¦Ø§Ø±Ø§Ø³ØªÛ•ÛŒ URI Ø¨Û•Ú©Ø§Ø±Ù‡Ø§ØªÙˆÙˆ Ù„Û• Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒ Ú•ÛŽÙ¾ÛŽØ¯Ø§Ù†ØŒ ÛŒØ§Ù† Ø¯Û•Ø±Ú†ÙˆÙˆÛ• Ø¨Û† Ú©Ú•ÛŒØ§Ø±ÛŽÚ©ÛŒ ØªØ±.
+        invalid_redirect_uri: Uri Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ø¦Ø§Ú•Ø§Ø³ØªÛ•Ú©Ø±Ø¯Ù†Û•ÙˆÛ•Ú©Û• Ù„Û•Ø®Û†Ø¯Û•Ú¯Ø±ÛŽØª Ø¯Ø±ÙˆØ³Øª Ù†ÛŒÛ•.
+        invalid_request: Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒÛ•Ú©Û• Ù¾Ø§Ø±Ø§Ù…ÛŒØªÛ•Ø±ÛŒ Ø¯Ø§ÙˆØ§Ú©Ø±Ø§ÙˆÛŒ Ø¨Ø²Ø±Û•ØŒ Ø¨Û•Ù‡Ø§ÛŒ Ù¾Ø§Ø±Ø§Ù…ÛŒØªÛ•Ø±ÛŒ Ù¾Ø´ØªÚ¯ÛŒØ±ÛŒ Ù†Û•Ú©Ø±Ø§Ùˆ Ù„Û•Ø®Û† Ø¯Û•Ú¯Ø±ÛŽØªØŒ ÛŒØ§Ù† Ø¨Û• Ù¾ÛŽÚ†Û•ÙˆØ§Ù†Û•ÙˆÛ• Ù†Ø§Ø¯Ø±ÙˆØ³ØªÛ•.
+        invalid_resource_owner: Ø¨Ú•ÙˆØ§Ù¾ÛŽØ¯Ø§Ù†Û•Ú©Ø§Ù†ÛŒ Ø®Ø§ÙˆÛ•Ù†ÛŒ Ø³Û•Ø±Ú†Ø§ÙˆÛ•ÛŒ Ø¯Ø§Ø¨ÛŒÙ†Ú©Ø±Ø§Ùˆ Ø¯Ø±ÙˆØ³Øª Ù†ÛŒÛ•ØŒ ÛŒØ§Ù† Ù†Ø§ØªÙˆØ§Ù†Ø±ÛŽØª Ø®Ø§ÙˆÛ•Ù†ÛŒ Ø³Û•Ø±Ú†Ø§ÙˆÛ• Ø¨Ø¯Û†Ø²Ø±ÛŽØªÛ•ÙˆÛ•
+        invalid_scope: Ø¨ÙˆØ§Ø±ÛŒ Ø¯Ø§ÙˆØ§Ú©Ø±Ø§Ùˆ Ù†Ø§Ø¯Ø±ÙˆØ³ØªÛ•ØŒ Ù†Û•Ù†Ø§Ø³Ø±Ø§ÙˆØŒ ÛŒØ§Ù† ØªÛŽÚ©Ú†ÙˆÙˆÛ•.
+        invalid_token:
+          expired: Ù†ÛŒØ´Ø§Ù†Û•ÛŒ Ú†ÙˆÙˆÙ†Û•Ú˜ÙˆØ±Û•ÙˆÛ• Ø¨Û•Ø³Û•Ø±Ú†ÙˆÙˆÛ•
+          revoked: Ú©Û†Ø¯ÛŒ Ø¯Û•Ø³ØªÙ¾ÛŽÚ¯Û•ÛŒØ´ØªÙ† Ø¨Û•ØªØ§Úµ Ø¨ÙˆÙˆÛ•ØªÛ•ÙˆÛ•
+          unknown: Ø¯Û•Ø³ØªÙ¾ÛŽÚ¯Û•ÛŒØ´ØªÙ† Ø¨Û• Ú©Û†Ø¯ÛŒ Ú†ÙˆÙˆÙ†Û•Ú˜ÙˆÙˆØ± Ø¨Ø§ÙˆÚ•Ù¾ÛŽÙ†Û•Ú©Ø±Ø§ÙˆÛ•
+        resource_owner_authenticator_not_configured: Ø®Ø§ÙˆÛ•Ù†ÛŒ Ø³Û•Ø±Ú†Ø§ÙˆÛ• Ø¨Û•Ù‡Û†ÛŒ Doorkeeper.configure.resource_owner_authenticator Ú©Û†Ù†ÙÛŒÚ¯Ù†Û•Ú©Ø±Ø¯Ù† Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆ Ù†Û•Ø¨ÙˆÙˆ.
+        server_error: Ú•Ø§Ú˜Û•Ú©Ø§Ø±ÛŒ Ú•ÛŽÙ¾ÛŽØ¯Ø§Ù† ØªÙˆÙˆØ´ÛŒ Ù…Û•Ø±Ø¬ÛŽÚ©ÛŒ Ú†Ø§ÙˆÛ•Ú•ÙˆØ§Ù† Ù†Û•Ú©Ø±Ø§Ùˆ Ø¨ÙˆÙˆ Ú©Û• Ø±ÛŽÚ¯Ø±ÛŒ Ø¯Û•Ú©Ø§ Ù„Û• Ø¬ÛŽØ¨Û•Ø¬ÛŽ Ú©Ø±Ø¯Ù†ÛŒ Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒÛ•Ú©Û•.
+        temporarily_unavailable: Ú•Ø§Ú˜Û•Ú©Ø§Ø±ÛŒ Ú•ÛŽÙ¾ÛŽØ¯Ø§Ù† Ù„Û• Ø¦ÛŽØ³ØªØ§Ø¯Ø§ Ù†Ø§ØªÙˆØ§Ù†ÛŽØª Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒÛ•Ú©Û• Ú†Ø§Ø±Û•Ø³Û•Ø± Ø¨Ú©Ø§Øª Ù„Û•Ø¨Û•Ø± Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†ÛŒ Ú©Ø§ØªÛŒ ÛŒØ§Ù† Ú†Ø§Ú©Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø³ÛŽØ±Ú¤Û•Ø±Û•Ú©Û•.
+        unauthorized_client: Ú•Ø§Ú˜Û•Ø®ÙˆØ§Ø²Û•Ú©Û• Ø¯Û•Ø³Û•ÚµØ§ØªÛŒ Ø¦Û•ÙˆÛ•ÛŒ Ù†ÛŒÛŒÛ• Ø¦Û•Ù… Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒÛ• Ø¨Û• Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø§Ù†ÛŒ Ø¦Û•Ù… Ø´ÛŽÙˆØ§Ø²Û• Ø¨Ø¯Ø§Øª.
+        unsupported_grant_type: Ø¬Û†Ø±ÛŒ Ø¨Û•Ø®Ø´ÛŒÙ†Û• Ù…Û†ÚµÛ•ØªÙ¾ÛŽØ¯Ø§Ù†Û•Ú©Û• Ù„Û•Ù„Ø§ÛŒÛ•Ù† Ú•Ø§Ú˜Û•Ú©Ø§Ø±ÛŒ Ù…Û†ÚµÛ•ØªÛ•ÙˆÛ• Ù¾Û•Ø³Û•Ù†Ø¯ Ù†Ø§Ú©Ø±ÛŽØª.
+        unsupported_response_type: Ú•Ø§Ú˜Û•Ú©Ø§Ø±ÛŒ Ú•ÛŽÚ¯Û•Ù¾ÛŽØ¯Ø§Ù† Ù¾Ø´ØªÚ¯ÛŒØ±ÛŒ Ø¦Û•Ù… Ø¬Û†Ø±Û• ÙˆÛ•ÚµØ§Ù…Û• Ù†Ø§Ú©Ø§Øª.
+    flash:
+      applications:
+        create:
+          notice: Ø¨Û•Ø±Ù†Ø§Ù…Û• Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø§.
+        destroy:
+          notice: Ø¨Û•Ø±Ù†Ø§Ù…Û• Ø³Ú•Ø§ÛŒÛ•ÙˆÛ•.
+        update:
+          notice: Ø¨Û•Ø±Ù†Ø§Ù…Û• Ø¨Û•Ú•Û†Ú˜Ú©Ø±Ø§.
+      authorized_applications:
+        destroy:
+          notice: Ø¨Û•Ø±Ù†Ø§Ù…Û• Ù‡Û•ÚµÙˆÛ•Ø´ÛŽÙ†Ú•Ø§.
+    layouts:
+      admin:
+        nav:
+          applications: Ø¨Û•Ø±Ù†Ø§Ù…Û•Ú©Ø§Ù†
+          oauth2_provider: OAuth2 Provider
+      application:
+        title: Ø¯Ø§ÙˆØ§ÛŒ Ú•ÛŽÙ¾ÛŽØ¯Ø§Ù†ÛŒ OAuth
+    scopes:
+      admin:read: Ø®ÙˆÛŽÙ†Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù‡Û•Ù…ÙˆÙˆ Ø¯Ø§ØªØ§Ú©Ø§Ù† Ù„Û•Ø³Û•Ø± Ú•Ø§Ú˜Û•Ú©Ø§Ø±Û•Ú©Û•
+      admin:read:accounts: Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ Ù‡Û•Ø³ØªÛŒØ§Ø±ÛŒ Ù‡Û•Ù…ÙˆÙˆ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Ø§Ù† Ø¨Ø®ÙˆÛŽÙ†Û•ÙˆÛ•
+      admin:read:reports: Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ Ù‡Û•Ø³ØªÛŒØ§Ø±ÛŒ Ù‡Û•Ù…ÙˆÙˆ Ú¯ÙˆØ²Ø§Ø±Ø´Øª Ùˆ Ù‡Û•Ú˜Ù…Ø§Ø±Û• Ú¯ÙˆØ²Ø§Ø±Ø´ØªÚ©Ø±Ø§ÙˆÛ•Ú©Ø§Ù† Ø¨Ø®ÙˆÛŽÙ†Û•ÙˆÛ•
+      admin:write: Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒ Ù‡Û•Ù…ÙˆÙˆ Ø¯Ø§ØªØ§Ú©Ø§Ù† Ø¨Ú©Û• Ù„Û•Ø³Û•Ø± Ú•Ø§Ú˜Û•Ú©Ø§Ø±
+      admin:write:accounts: Ø¦Û•Ù†Ø¬Ø§Ù…Ø¯Ø§Ù†ÛŒ Ú©Ø§Ø±ÛŒ Ù…ÛŒØ§Ù†Ú•Û•ÙˆÛŒ Ù„Û•Ø³Û•Ø± Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Ø§Ù†
+      admin:write:reports: Ø¦Û•Ù†Ø¬Ø§Ù…Ø¯Ø§Ù†ÛŒ Ú©Ø§Ø±ÛŒ Ù…ÛŒØ§Ù†Ú•Û•ÙˆÛŒ Ù„Û•Ø³Û•Ø± Ú¯ÙˆØ²Ø§Ø±Ø´ØªÛ•Ú©Ø§Ù†
+      follow: Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒÚ©Ø±Ø¯Ù†ÛŒ Ù¾Û•ÛŒÙˆÛ•Ù†Ø¯ÛŒÛŒÛ•Ú©Ø§Ù†ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±
+      push: ÙˆÛ•Ø±Ú¯Ø±ØªÙ†ÛŒ Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù†ÛŒ Ù¾Ø§ÚµÙ†Ø§Ù†
+      read: Ù‡Û•Ù…ÙˆÙˆ Ø¯Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ø¨Ø®ÙˆÛŽÙ†Û•ÙˆÛ•
+      read:accounts: Ø¨ÛŒÙ†ÛŒÙ†ÛŒ Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Ø§Ù†
+      read:blocks: Ø¨ÛŒÙ†ÛŒÙ†ÛŒ Ø¨Ù„Û†Ú©Û•Ú©Ø§Ù†Øª
+      read:bookmarks: Ù†ÛŒØ´Ø§Ù†Û•Ú©Ø§Ù† Ø¨Ø¨ÛŒÙ†Û•
+      read:favourites: Ø¨ÛŒÙ†ÛŒÙ†ÛŒ Ø¯ÚµØ®ÙˆØ§Ø²Û•Ú©Ø§Ù†Øª
+      read:filters: Ø¨ÛŒÙ†ÛŒÙ†ÛŒ Ù¾Ø§ÚµØ§ÙØªÙ†Û•Ú©Ø§Ù†Øª
+      read:follows: Ø³Û•ÛŒØ±ÛŒ Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÛ•Ú©Ø§Ù†Øª Ø¨Ú©Û•
+      read:lists: Ø¨ÛŒÙ†ÛŒÙ†ÛŒ Ù„ÛŒØ³ØªÛ•Ú©Ø§Ù†Øª
+      read:mutes: Ø¨ÛŽØ¯Û•Ù†Ú¯Û•Ú©Ø§Ù†Øª Ø¨Ø¨ÛŒÙ†Û•
+      read:notifications: Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù†Øª Ø¨Ø¨ÛŒÙ†Û•
+      read:reports: Ø³Û•ÛŒØ±ÛŒ Ú¯ÙˆØ²Ø§Ø±Ø´Û•Ú©Ø§Ù†Øª Ø¨Ú©Û•
+      read:search: Ú¯Û•Ú•Ø§Ù† Ù„Û• Ø¬ÛŒØ§ØªÛŒ ØªÛ†
+      read:statuses: Ø¨ÛŒÙ†ÛŒÙ†ÛŒ Ù‡Û•Ù…ÙˆÙˆ Ø¨Ø§Ø±ÙˆØ¯Û†Ø®Û•Ú©Ø§Ù†
+      write: Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒ Ù‡Û•Ù…ÙˆÙˆ Ø¯Ø§ØªØ§Ú©Ø§Ù†ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ø¨Ú©Û•
+      write:accounts: Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„Û•Ú©Û•Øª Ø¨Ú©Û•
+      write:blocks: Ø¨Ù„Û†Ú© Ú©Ø±Ø¯Ù†ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•ÛŒ Ø¯Û†Ù…Û•ÛŒÙ†Û•Ú©Ø§Ù†
+      write:bookmarks: Ø¨Ø§Ø±Û•Ú©Ø§Ù†ÛŒ Ù†ÛŒØ´Ø§Ù†Ú©Û•Ø±
+      write:favourites: Ø¯Û†Ø®ÛŒ Ø¯ÚµØ®ÙˆØ§Ø²Û•Ú©Ø§Ù†
+      write:filters: Ù¾Ø§ÚµÛŽÙˆÛ•Ø± Ø¯Ø±ÙˆØ³Øª Ø¨Ú©Û•
+      write:follows: Ø¯ÙˆØ§ÛŒ Ø®Û•ÚµÚ© Ø¨Ú©Û•ÙˆÛ•
+      write:lists: Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯Ù†ÛŒ Ù„ÛŒØ³ØªÛ•Ú©Ø§Ù†
+      write:media: Ù¾Û•Ú•Ú¯Û•ÛŒ Ù…ÛŒØ¯ÛŒØ§ Ø¨Ø§Ø±Ø¨Ú©Û•
+      write:mutes: Ø¨ÛŽØ¯Û•Ù†Ú¯Ú©Ø±Ø¯Ù†ÛŒ Ø®Û•ÚµÚ© Ùˆ Ú¯ÙØªÙˆÚ¯Û†Ú©Ø§Ù†
+      write:notifications: Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù†Øª Ø¨Ø³Ú•ÛŒÛ•ÙˆÛ•
+      write:reports: Ú¯ÙˆØ²Ø§Ø±Ø´ØªÚ©Ø±Ø¯Ù†ÛŒ Ú©Û•Ø³Ø§Ù†ÛŒ ØªØ±
+      write:statuses: Ø¨ÚµØ§ÙˆÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø¨Ø§Ø±ÙˆØ¯Û†Ø®Û•Ú©Ø§Ù†
diff --git a/config/locales/doorkeeper.ml.yml b/config/locales/doorkeeper.ml.yml
index 5dfaa61aec30099be6938d0d24b50e0f03b2b231..21540b9766d90dce18867380de217587cc443ddf 100644
--- a/config/locales/doorkeeper.ml.yml
+++ b/config/locales/doorkeeper.ml.yml
@@ -4,6 +4,7 @@ ml:
     attributes:
       doorkeeper/application:
         name: à´…à´ªàµà´²à´¿à´•àµà´•àµ‡à´·à´¨àµà´±àµ† à´ªàµ‡à´°àµ
+        redirect_uri: à´¯àµ à´†àµ¼ à´Žàµ½ à´µà´´à´¿à´¤à´¿à´°à´¿à´šàµà´šàµ à´µà´¿à´Ÿàµà´•
         website: à´…à´ªàµà´²à´¿à´•àµà´•àµ‡à´·à´¨àµà´±àµ† à´µàµ†à´¬àµà´¸àµˆà´±àµà´±àµ
     errors:
       models:
diff --git a/config/locales/doorkeeper.oc.yml b/config/locales/doorkeeper.oc.yml
index f92b7cd22e77da5efaeef08e17d5949b36cfd72a..d84b5e7d9cd6a5dbcff477610da4a8e3b6804e9e 100644
--- a/config/locales/doorkeeper.oc.yml
+++ b/config/locales/doorkeeper.oc.yml
@@ -142,10 +142,10 @@ oc:
       write:bookmarks: ajustar als marcadors
       write:favourites: metre en favorit
       write:filters: crear de filtres
-      write:follows: sÃ¨gre de monde
+      write:follows: sÃ¨gre de mond
       write:lists: crear de listas
       write:media: mandar de fichiÃ¨rs mÃ¨dias
-      write:mutes: rescondre de monde e de conversacions
+      write:mutes: rescondre de mond e de conversacions
       write:notifications: escafar vÃ²stras notificacions
-      write:reports: senhalar de monde
+      write:reports: senhalar de mond
       write:statuses: publicar dâ€™estatuts
diff --git a/config/locales/doorkeeper.sa.yml b/config/locales/doorkeeper.sa.yml
new file mode 100644
index 0000000000000000000000000000000000000000..07ea4372a3a109674214ba80f2070c9f99fb872d
--- /dev/null
+++ b/config/locales/doorkeeper.sa.yml
@@ -0,0 +1 @@
+sa:
diff --git a/config/locales/doorkeeper.sc.yml b/config/locales/doorkeeper.sc.yml
index 91bd6d92f04580bfea64f85ac0291ed4a4c1fb7c..2a6aeb2c158ffaa606e2c53fd79f2385a8b96f55 100644
--- a/config/locales/doorkeeper.sc.yml
+++ b/config/locales/doorkeeper.sc.yml
@@ -1 +1,151 @@
+---
 sc:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: NÃ²mine de s'aplicatzione
+        redirect_uri: URL de re-indiritzamentu
+        scopes: Ã€mbitos
+        website: Situ web de s'aplicatzione
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: non podet cuntÃ¨nnere un'ascra.
+              invalid_uri: depet Ã¨ssere un'URI vÃ lidu.
+              relative_uri: devet Ã¨ssere un'URI assolutu.
+              secured_uri: depet Ã¨ssere un'URI HTTPS/SSL.
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: Autoriza
+        cancel: Annulla
+        destroy: Distrue
+        edit: ModÃ¬fica
+        submit: Imbia
+      confirmations:
+        destroy: Seguru?
+      edit:
+        title: ModÃ¬fica s'aplicatzione
+      form:
+        error: Controlla si su formulÃ riu tuo tenet faddinas
+      help:
+        native_redirect_uri: Imprea %{native_redirect_uri} pro is tests locales
+        redirect_uri: Imprea una lÃ¬nia pro ogni URI
+        scopes: Iscroba is Ã mbitos cun ispÃ tzios. Lassa bÃ²idu pro impreare is predefinidos.
+      index:
+        application: Aplicatzione
+        callback_url: URL de torrada
+        delete: Cantzella
+        empty: No tenes peruna aplicatzione.
+        name: NÃ²mine
+        new: Aplicatzione noa
+        scopes: Ã€mbitos
+        show: Ammustra
+        title: Is aplicatziones tuas
+      new:
+        title: Aplicatzione noa
+      show:
+        actions: Atziones
+        application_id: ID de s'aplicatzione
+        callback_urls: URLs de torrada
+        scopes: Ã€mbitos
+        secret: Segretu de cliente
+        title: 'Aplicatzione: %{name}'
+    authorizations:
+      buttons:
+        authorize: Autoriza
+        deny: Refuda
+      error:
+        title: Faddina
+      new:
+        able_to: At a pÃ²dere
+        prompt: S'aplicatzione %{client_name} est preguntende atzessu a su contu tuo
+        title: Autorizatzione rechesta
+      show:
+        title: CÃ²pia custu cÃ²dighe de autorizatzione e incollaÂ·ddu a s'aplicatzione.
+    authorized_applications:
+      buttons:
+        revoke: RÃ¨voca
+      confirmations:
+        revoke: Seguru?
+      index:
+        application: Aplicatzione
+        created_at: Autorizada
+        date_format: "%Y-%m-%d %H:%M:%S"
+        scopes: Ã€mbitos
+        title: Is aplicatziones autorizadas tuas
+    errors:
+      messages:
+        access_denied: Sa propiedade sa resursa o su serbidore de autorizatziones at refudadu sa rechesta.
+        credential_flow_not_configured: Su flussu de is credentziales de sa crae de intrada de su mere de sa risursa est fallidu pro neghe de su fatu chi Doorkeeper.configure.resource_owner_from_credentials no est cunfiguradu.
+        invalid_client: S'autenticatzione de su cliente est fallida ca su cliente est disconnotu, s'atzessu a su cliente no est istadu incluidu, o sa manera de autenticatzione no est suportada.
+        invalid_grant: Su permissu de autorizatzione est invÃ lidu, iscadidu, revocadu, non currispondet a s'URI de re-indiritzamentu impreadu in sa rechesta de autorizatzione, o est istadu frunidu a un'Ã teru cliente.
+        invalid_redirect_uri: S'URI de re-indiritzamentu no est vÃ lidu.
+        invalid_request: In sa rechesta mancat unu parÃ metru netzessÃ riu, ddoe est unu valore de unu parÃ metru non suportadu o est fata male in carchi Ã tera manera.
+        invalid_resource_owner: Is credentziales de su mere de sa risursa frunidas non sunt vÃ lidas, o su mere de sa risursa non podet Ã¨ssere agatadu
+        invalid_scope: S'Ã mbitu pedidu est invÃ lidu, disconnotu, o formuladu male.
+        invalid_token:
+          expired: Su getone de atzessu est iscadidu
+          revoked: Su getone de atzessu est istadu revocadu
+          unknown: Su getone de atzessu no est vÃ lidu
+        resource_owner_authenticator_not_configured: Su mere de sa risursa no est istadu agatadu pro neghe de su fatu chi Doorkeeper.configure.resource_owner_authenticator no est configuradu.
+        server_error: Su serbidore de autorizatzione at agatadu una cunditzione no isetada chi dd'at impedidu de esecutare sa rechesta tua.
+        temporarily_unavailable: Su serbidore de autorizatzione no est, in custu momentu, in gradu de gestire sa rechesta pro neghe de unu subracÃ ricu temporÃ neu o de una manutentzione.
+        unauthorized_client: Su cliente no est autorizadu a esecutare custa rechesta in custa manera.
+        unsupported_grant_type: Sa casta de modalidade de autorizatzione no est suportada dae su serbidore de atzessu.
+        unsupported_response_type: Su serbidore de autorizatzione non suportat custa casta de risposta.
+    flash:
+      applications:
+        create:
+          notice: Aplicatzione creada.
+        destroy:
+          notice: Aplicatzione cantzellada.
+        update:
+          notice: Aplicatzione atualizada.
+      authorized_applications:
+        destroy:
+          notice: Aplicatzione revocada.
+    layouts:
+      admin:
+        nav:
+          applications: Aplicatziones
+          oauth2_provider: Frunidore OAuth2
+      application:
+        title: Autorizatzione OAuth netzessÃ ria
+    scopes:
+      admin:read: lÃ¨ghere totu is datos de su serbidore
+      admin:read:accounts: lÃ¨ghere informatziones sensÃ¬biles de totu is contos
+      admin:read:reports: lÃ¨ghere informatziones sensÃ¬biles de totu is sinnalatziones e is contos sinnalados
+      admin:write: modificare totu is datos in su serbidore
+      admin:write:accounts: fÃ ghere atziones de moderatzione in is contos
+      admin:write:reports: fÃ ghere atziones de moderatzione in is sinnalatziones
+      follow: modificare is relatziones intre is contos
+      push: retzire is notÃ¬ficas push tuas
+      read: lÃ¨ghere totu is datos de su contu tuo
+      read:accounts: bÃ¬dere is informatziones in su contu
+      read:blocks: bÃ¬dere is blocos tuos
+      read:bookmarks: cÃ stia is sinnalibros tuos
+      read:favourites: bÃ¬dere is preferidos tuos
+      read:filters: bÃ¬dere is filtros tuos
+      read:follows: bÃ¬dere is sighiduras tuas
+      read:lists: bÃ¬dere is listas tuas
+      read:mutes: bÃ¬dere is utentes chi as postu a sa muda
+      read:notifications: bÃ¬dere is notÃ¬ficas tuas
+      read:reports: bÃ¬dere is sinnalatziones tuas
+      read:search: chircare a nÃ¹mene tuo
+      read:statuses: bÃ¬dere totu is istados
+      write: modificare totu is datos de su contu tuo
+      write:accounts: modificare su profilu tuo
+      write:blocks: blocare contos e domÃ¬nios
+      write:bookmarks: agiunghe is istados a is sinnalibros
+      write:favourites: pÃ²nnere istados in is preferidos
+      write:filters: creare filtros
+      write:follows: sighire persones
+      write:lists: creare listas
+      write:media: cÃ rriga documentos multimediales
+      write:mutes: impostare persones e arresonadas a sa muda
+      write:notifications: isboidare is notÃ¬ficas tuas
+      write:reports: sinnalare Ã teras persones
+      write:statuses: publicare istados
diff --git a/config/locales/doorkeeper.sv.yml b/config/locales/doorkeeper.sv.yml
index d9367ce5ea577a811cfedc4e6bfd0abed8871f70..015f0702f97cd551b017a8800ed2ac191e22b826 100644
--- a/config/locales/doorkeeper.sv.yml
+++ b/config/locales/doorkeeper.sv.yml
@@ -73,6 +73,7 @@ sv:
       index:
         application: Applikation
         created_at: Auktoriserad
+        date_format: "%Y-%m-%d %H:%M:%S"
         scopes: Omfattning
         title: Dina behÃ¶riga ansÃ¶kningar
     errors:
@@ -125,6 +126,7 @@ sv:
       read: lÃ¤sa dina kontodata
       read:accounts: se kontoinformation
       read:blocks: se dina blockeringar
+      read:bookmarks: se dina bokmÃ¤rken
       read:favourites: se dina favoriter
       read:filters: se dina filter
       read:follows: se vem du fÃ¶ljer
@@ -137,6 +139,7 @@ sv:
       write: posta Ã¥t dig
       write:accounts: Ã¤ndra din profil
       write:blocks: blockera konton och domÃ¤ner
+      write:bookmarks: bokmÃ¤rkesstatusar
       write:favourites: favoritmarkera statusar
       write:filters: skapa filter
       write:follows: fÃ¶lj mÃ¤nniskor
diff --git a/config/locales/doorkeeper.th.yml b/config/locales/doorkeeper.th.yml
index 672271728df2221960ad21b1fe7b1d8754ca7f90..ba59444be7d46703643e1e1dd565070ff5405be5 100644
--- a/config/locales/doorkeeper.th.yml
+++ b/config/locales/doorkeeper.th.yml
@@ -81,6 +81,7 @@ th:
           expired: à¹‚à¸—à¹€à¸„à¸™à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¸«à¸¡à¸”à¸à¸²à¸¢à¸¸à¹à¸¥à¹‰à¸§
           revoked: à¹€à¸žà¸´à¸à¸–à¸à¸™à¹‚à¸—à¹€à¸„à¸™à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¹à¸¥à¹‰à¸§
           unknown: à¹‚à¸—à¹€à¸„à¸™à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡
+        unsupported_response_type: à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸à¸²à¸£à¸à¸™à¸¸à¸à¸²à¸•à¹„à¸¡à¹ˆà¸£à¸à¸‡à¸£à¸±à¸šà¸Šà¸™à¸´à¸”à¸à¸²à¸£à¸•à¸à¸šà¸ªà¸™à¸à¸‡à¸™à¸µà¹‰
     flash:
       applications:
         create:
@@ -104,6 +105,8 @@ th:
       admin:read:accounts: à¸à¹ˆà¸²à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸—à¸µà¹ˆà¸¥à¸°à¹€à¸à¸µà¸¢à¸”à¸à¹ˆà¸à¸™à¸‚à¸à¸‡à¸šà¸±à¸à¸Šà¸µà¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”
       admin:read:reports: à¸à¹ˆà¸²à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸—à¸µà¹ˆà¸¥à¸°à¹€à¸à¸µà¸¢à¸”à¸à¹ˆà¸à¸™à¸‚à¸à¸‡à¸£à¸²à¸¢à¸‡à¸²à¸™à¹à¸¥à¸°à¸šà¸±à¸à¸Šà¸µà¸—à¸µà¹ˆà¹„à¸”à¹‰à¸£à¸±à¸šà¸à¸²à¸£à¸£à¸²à¸¢à¸‡à¸²à¸™à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”
       admin:write: à¸›à¸£à¸±à¸šà¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”à¹ƒà¸™à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ
+      admin:write:accounts: à¸—à¸³à¸à¸²à¸£à¸à¸£à¸°à¸—à¸³à¸à¸²à¸£à¸„à¸§à¸šà¸„à¸¸à¸¡à¸šà¸±à¸à¸Šà¸µ
+      admin:write:reports: à¸—à¸³à¸à¸²à¸£à¸à¸£à¸°à¸—à¸³à¸à¸²à¸£à¸„à¸§à¸šà¸„à¸¸à¸¡à¸£à¸²à¸¢à¸‡à¸²à¸™
       follow: à¸›à¸£à¸±à¸šà¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸„à¸§à¸²à¸¡à¸ªà¸±à¸¡à¸žà¸±à¸™à¸˜à¹Œà¸‚à¸à¸‡à¸šà¸±à¸à¸Šà¸µ
       push: à¸£à¸±à¸šà¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™à¹à¸šà¸šà¸œà¸¥à¸±à¸à¸‚à¸à¸‡à¸„à¸¸à¸“
       read: à¸à¹ˆà¸²à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸šà¸±à¸à¸Šà¸µà¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”à¸‚à¸à¸‡à¸„à¸¸à¸“
diff --git a/config/locales/doorkeeper.tr.yml b/config/locales/doorkeeper.tr.yml
index a218e315759437aa89a435779d016246ea0fb8f4..45a5821e47db518aa39c26fde5df9edfe3a1ca42 100644
--- a/config/locales/doorkeeper.tr.yml
+++ b/config/locales/doorkeeper.tr.yml
@@ -4,7 +4,7 @@ tr:
     attributes:
       doorkeeper/application:
         name: Uygulama adÄ±
-        redirect_uri: YÃ¶nlendirme URI'si
+        redirect_uri: YÃ¶nlendirme URL'si
         scopes: Kapsamlar
         website: Uygulama web sitesi
     errors:
@@ -13,15 +13,15 @@ tr:
           attributes:
             redirect_uri:
               fragment_present: parÃ§a iÃ§eremez.
-              invalid_uri: geÃ§erli bir URI olmalÄ±dÄ±r.
-              relative_uri: mutlak bir URI olmalÄ±dÄ±r.
-              secured_uri: HTTPS/SSL URI olmasÄ± gerekir.
+              invalid_uri: geÃ§erli bir URL olmalÄ±dÄ±r.
+              relative_uri: mutlaka bir URL olmalÄ±dÄ±r.
+              secured_uri: HTTPS/SSL URL olmasÄ± gerekir.
   doorkeeper:
     applications:
       buttons:
-        authorize: Yetki ver
-        cancel: Ä°ptal et
-        destroy: Yok et
+        authorize: Ä°zin Ver
+        cancel: Ä°ptal Et
+        destroy: Yok Et
         edit: DÃ¼zenle
         submit: GÃ¶nder
       confirmations:
@@ -29,14 +29,14 @@ tr:
       edit:
         title: UygulamayÄ± dÃ¼zenle
       form:
-        error: TÃ¼h! Muhtemel hatalar iÃ§in formunuzu kontrol edin
+        error: Hata! OlasÄ± hatalar iÃ§in formunuzu kontrol edin
       help:
         native_redirect_uri: Yerel testler iÃ§in %{native_redirect_uri} kullanÄ±n
-        redirect_uri: URl baÅŸÄ±na bir satÄ±r kullanÄ±n
+        redirect_uri: URL baÅŸÄ±na bir satÄ±r kullanÄ±n
         scopes: KapsamlarÄ± boÅŸluklarla ayÄ±rÄ±n. VarsayÄ±lan kapsamlarÄ± kullanmak iÃ§in boÅŸ bÄ±rakÄ±n.
       index:
         application: Uygulama
-        callback_url: Geri DÃ¶nÃ¼ÅŸ URL
+        callback_url: Callback URL
         delete: Sil
         empty: HiÃ§ uygulamanÄ±z yok.
         name: Ä°sim
@@ -48,26 +48,26 @@ tr:
         title: Yeni uygulama
       show:
         actions: Eylemler
-        application_id: Ä°stemci anahtarÄ±
-        callback_urls: Callback URL'si
+        application_id: Client key
+        callback_urls: Callback URL
         scopes: Kapsamlar
-        secret: Ä°stemci anahtarÄ±
+        secret: Client secret
         title: 'Uygulama: %{name}'
     authorizations:
       buttons:
-        authorize: Yetkilendir
+        authorize: Ä°zin Ver
         deny: Reddet
       error:
         title: Bir hata oluÅŸtu
       new:
-        able_to: ÅžunlarÄ± yapabilecek
+        able_to: 'ÅžunlarÄ± yapabilecek:'
         prompt: "%{client_name} uygulamasÄ± hesabÄ±nÄ±za eriÅŸim istiyor"
-        title: Yetkilendirme gerekli
+        title: Ä°zin gerekli
       show:
-        title: Bu yetki kodunu kopyalayÄ±n ve uygulamaya yapÄ±ÅŸtÄ±rÄ±n.
+        title: Bu yetkilendirme kodunu kopyalayÄ±n ve uygulamaya yapÄ±ÅŸtÄ±rÄ±n.
     authorized_applications:
       buttons:
-        revoke: Ä°ptal
+        revoke: Ä°ptal Et
       confirmations:
         revoke: Emin misiniz?
       index:
@@ -79,19 +79,19 @@ tr:
     errors:
       messages:
         access_denied: Kaynak sahibi veya yetkilendirme sunucusu isteÄŸi reddetti.
-        credential_flow_not_configured: Kaynak Sahibi Åžifresinin Bilgi akÄ±ÅŸÄ± Doorkeeper.configure.resource_owner_from_credentials bilgilerinin yapÄ±landÄ±rÄ±lmamÄ±ÅŸ olmasÄ± nedeniyle baÅŸarÄ±sÄ±z oldu.
+        credential_flow_not_configured: Kaynak Sahibi Åžifresi Kimlik Bilgileri akÄ±ÅŸÄ± Doorkeeper.configure.resource_owner_from_credentials 'Ä±n yapÄ±landÄ±rÄ±lmamÄ±ÅŸ olmasÄ± nedeniyle baÅŸarÄ±sÄ±z oldu.
         invalid_client: Ä°stemcinin kimlik doÄŸrulamasÄ± bilinmeyen istemci, istemci kimlik doÄŸrulamasÄ±nÄ±n dahil olmamasÄ± veya desteklenmeyen kimlik doÄŸrulama yÃ¶ntemi nedeniyle baÅŸarÄ±sÄ±z oldu.
-        invalid_grant: SaÄŸlanan yetkilendirme izni geÃ§ersiz, sÃ¼resi dolmuÅŸ, iptal edilmiÅŸ, yetkilendirme isteÄŸinde kullanÄ±lan yÃ¶nlendirme URI'siyle eÅŸleÅŸmiyor veya baÅŸka bir mÃ¼ÅŸteriye verilmiÅŸ.
-        invalid_redirect_uri: Dahil edilmiÅŸ yÃ¶nlendirme Uri'si geÃ§ersiz.
+        invalid_grant: SaÄŸlanan yetkilendirme izni geÃ§ersiz, sÃ¼resi dolmuÅŸ, iptal edilmiÅŸ, yetkilendirme isteÄŸinde kullanÄ±lan yÃ¶nlendirme URL'siyle eÅŸleÅŸmiyor veya baÅŸka bir istemciye verilmiÅŸ.
+        invalid_redirect_uri: Dahil edilmiÅŸ yÃ¶nlendirme URL'si geÃ§ersiz.
         invalid_request: Ä°stekte gerekli bir parametre eksik, desteklenmeyen bir parametre deÄŸeri iÃ§eriyor veya baÅŸka tÃ¼rlÃ¼ hatalÄ± biÃ§imlendirilmiÅŸ.
         invalid_resource_owner: SaÄŸlanan kaynak sahibi kimlik bilgileri geÃ§erli deÄŸil veya kaynak sahibi bulunamÄ±yor
         invalid_scope: Ä°stenen kapsam geÃ§ersiz, bilinmeyen veya hatalÄ± biÃ§imlendirilmiÅŸ olabilir.
         invalid_token:
-          expired: EriÅŸim belirtecinin sÃ¼resi dolmuÅŸ
+          expired: EriÅŸim belirtecinin sÃ¼resi doldu
           revoked: EriÅŸim belirteci iptal edildi
           unknown: EriÅŸim belirteci geÃ§ersiz
         resource_owner_authenticator_not_configured: Kaynak Sahibi yapÄ±landÄ±rÄ±lmamÄ±ÅŸ Doorkeeper.configure.resource_owner_authenticator nedeniyle baÅŸarÄ±sÄ±z oldu.
-        server_error: Yetkilendirme sunucusu, isteÄŸi yerine getirmesini engelleyen beklenmeyen bir koÅŸulla karÅŸÄ±laÅŸtÄ±.
+        server_error: Yetkilendirme sunucunun isteÄŸi yerine getirmesini engelleyen beklenmeyen bir koÅŸulla karÅŸÄ±laÅŸtÄ±.
         temporarily_unavailable: Yetkilendirme sunucusu ÅŸu anda sunucunun geÃ§ici bir aÅŸÄ±rÄ± yÃ¼klenmesi veya bakÄ±mÄ± nedeniyle isteÄŸi yerine getiremiyor.
         unauthorized_client: Ä°stemci bu yÃ¶ntemi kullanarak bu isteÄŸi gerÃ§ekleÅŸtirmek iÃ§in yetkili deÄŸil.
         unsupported_grant_type: Yetkilendirme izni tÃ¼rÃ¼, yetkilendirme sunucusu tarafÄ±ndan desteklenmiyor.
@@ -115,37 +115,37 @@ tr:
       application:
         title: OAuth yetkilendirme gerekli
     scopes:
-      admin:read: sunucudaki tÃ¼m verileri oku
-      admin:read:accounts: tÃ¼m hesaplarÄ±n hassas bilgilerini oku
-      admin:read:reports: tÃ¼m raporlarÄ±n ve raporlanan hesaplarÄ±n hassas bilgilerini oku
+      admin:read: sunucudaki tÃ¼m verileri okuma
+      admin:read:accounts: tÃ¼m hesaplarÄ±n hassas bilgilerini okuma
+      admin:read:reports: tÃ¼m raporlarÄ±n ve raporlanan hesaplarÄ±n hassas bilgilerini okuma
       admin:write: sunucudaki tÃ¼m verileri deÄŸiÅŸtirin
-      admin:write:accounts: hesaplar Ã¼zerinde denetleme eylemleri gerÃ§ekleÅŸtirin
-      admin:write:reports: raporlar Ã¼zerinde denetleme eylemleri gerÃ§ekleÅŸtirin
+      admin:write:accounts: hesaplarda denetleme eylemleri gerÃ§ekleÅŸtirin
+      admin:write:reports: raporlarda denetleme eylemleri gerÃ§ekleÅŸtirin
       follow: hesap iliÅŸkilerini deÄŸiÅŸtirin
       push: anlÄ±k bildirimlerizi alÄ±n
       read: hesabÄ±nÄ±zÄ±n tÃ¼m verilerini okuyun
-      read:accounts: hesap bilgilerini gÃ¶r
+      read:accounts: hesap bilgilerini gÃ¶rÃ¼n
       read:blocks: engellemelerinizi gÃ¶rÃ¼n
       read:bookmarks: yer imlerinizi gÃ¶rÃ¼n
-      read:favourites: favorilerini gÃ¶r
+      read:favourites: beÄŸenilerinizi gÃ¶rÃ¼n
       read:filters: filtrelerinizi gÃ¶rÃ¼n
-      read:follows: izlerini gÃ¶r
+      read:follows: takip ettiklerinizi gÃ¶rÃ¼n
       read:lists: listelerinizi gÃ¶rÃ¼n
       read:mutes: sessize aldÄ±klarÄ±nÄ±zÄ± gÃ¶rÃ¼n
       read:notifications: bildirimlerinizi gÃ¶rÃ¼n
-      read:reports: ÅŸikayetlerinizi gÃ¶rÃ¼n
-      read:search: kendi adÄ±nÄ±za arayÄ±n
+      read:reports: raporlarÄ±nÄ±zÄ± gÃ¶rÃ¼n
+      read:search: kendi adÄ±nÄ±za arama yapÄ±n
       read:statuses: tÃ¼m durumlarÄ± gÃ¶rÃ¼n
       write: hesabÄ±nÄ±zÄ±n tÃ¼m verilerini deÄŸiÅŸtirin
-      write:accounts: profilini deÄŸiÅŸtir
+      write:accounts: profilinizi deÄŸiÅŸtirin
       write:blocks: hesaplarÄ± ve alan adlarÄ±nÄ± engelleyin
-      write:bookmarks: durumlarÄ± yer imlerine ekle
-      write:favourites: favori durumlar
-      write:filters: filtre oluÅŸtur
-      write:follows: insanlarÄ± takip et
-      write:lists: liste oluÅŸtur
-      write:media: medya dosyalarÄ±nÄ± yÃ¼kle
-      write:mutes: insanlarÄ± ve konuÅŸmalarÄ± sustur
+      write:bookmarks: durumlarÄ± yer imleyin
+      write:favourites: durumlarÄ± beÄŸenin
+      write:filters: filtreler oluÅŸturun
+      write:follows: insanlarÄ± takip edin
+      write:lists: listeler oluÅŸturun
+      write:media: medya dosyalarÄ± yÃ¼kleyin
+      write:mutes: insanlarÄ± ve sohbetleri sessize al
       write:notifications: bildirimlerinizi temizleyin
-      write:reports: diÄŸer insanlarÄ± bildir
+      write:reports: diÄŸer insanlarÄ± raporlayÄ±n
       write:statuses: durumlarÄ± yayÄ±nlayÄ±n
diff --git a/config/locales/doorkeeper.tt.yml b/config/locales/doorkeeper.tt.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5eab4abff95e2119202e91e8d75bd785c9ccbdc9
--- /dev/null
+++ b/config/locales/doorkeeper.tt.yml
@@ -0,0 +1 @@
+tt:
diff --git a/config/locales/doorkeeper.vi.yml b/config/locales/doorkeeper.vi.yml
index 12592c0f46f95c4883f85f202b278a200cdb450b..a51891fd01ea2bcd1a97a66e2b7ca1096b332a0b 100644
--- a/config/locales/doorkeeper.vi.yml
+++ b/config/locales/doorkeeper.vi.yml
@@ -4,8 +4,8 @@ vi:
     attributes:
       doorkeeper/application:
         name: TÃªn á»©ng dá»¥ng
-        redirect_uri: Chuyá»ƒn hÆ°á»›ng URI
-        scopes: Pháº¡m vi
+        redirect_uri: URL chuyá»ƒn hÆ°á»›ng
+        scopes: Quyá»n háº¡n
         website: Trang web á»©ng dá»¥ng
     errors:
       models:
@@ -15,7 +15,7 @@ vi:
               fragment_present: khÃ´ng thá»ƒ chá»©a má»™t máº£nh.
               invalid_uri: pháº£i lÃ  má»™t URI há»£p lá»‡.
               relative_uri: pháº£i lÃ  má»™t URI tuyá»‡t Ä‘á»‘i.
-              secured_uri: pháº£i sá» dá»¥ng giao thá»©c HTTPS / SSL.
+              secured_uri: pháº£i lÃ  giao thá»©c HTTPS/SSL.
   doorkeeper:
     applications:
       buttons:
@@ -31,9 +31,9 @@ vi:
       form:
         error: Ráº¥t tiáº¿c! HÃ£y kiá»ƒm tra thÃ´ng tin cá»§a báº¡n bá»Ÿi vÃ¬ nÃ³ cÃ³ lá»—i
       help:
-        native_redirect_uri: Sá» dá»¥ng %{native_redirect_uri} khi kiá»ƒm tra ná»™i bá»™
-        redirect_uri: Sá» dá»¥ng má»™t dÃ²ng trÃªn má»—i URI
-        scopes: Pháº¡m vi riÃªng biá»‡t vá»›i khÃ´ng gian. Äá»ƒ trá»‘ng Ä‘á»ƒ sá» dá»¥ng pháº¡m vi máº·c Ä‘á»‹nh.
+        native_redirect_uri: DÃ¹ng %{native_redirect_uri} khi kiá»ƒm tra ná»™i bá»™
+        redirect_uri: Má»—i dÃ²ng chá»‰ má»™t URL
+        scopes: TÃ¡ch pháº¡m vi ra báº±ng dáº¥u cÃ¡ch. Bá» trá»‘ng Ä‘á»ƒ dÃ¹ng pháº¡m vi máº·c Ä‘á»‹nh.
       index:
         application: á»¨ng dá»¥ng
         callback_url: Gá»i láº¡i URL
@@ -41,7 +41,7 @@ vi:
         empty: Báº¡n khÃ´ng cÃ³ á»©ng dá»¥ng nÃ o.
         name: TÃªn
         new: á»¨ng dá»¥ng má»›i
-        scopes: Pháº¡m vi
+        scopes: Quyá»n háº¡n
         show: Xem
         title: á»¨ng dá»¥ng cá»§a báº¡n
       new:
@@ -50,7 +50,7 @@ vi:
         actions: HÃ nh Ä‘á»™ng
         application_id: MÃ£ Client
         callback_urls: Gá»i láº¡i URLs
-        scopes: Pháº¡m vi
+        scopes: Quyá»n háº¡n
         secret: BÃ áº©n cá»§a Client
         title: 'á»¨ng dá»¥ng: %{name}'
     authorizations:
@@ -67,28 +67,28 @@ vi:
         title: Sao chÃ©p mÃ£ nÃ y vÃ  dÃ¡n nÃ³ vÃ o á»©ng dá»¥ng.
     authorized_applications:
       buttons:
-        revoke: Thu há»“i
+        revoke: Gá»¡
       confirmations:
         revoke: Báº¡n cÃ³ cháº¯c khÃ´ng?
       index:
         application: á»¨ng dá»¥ng
         created_at: ÄÃ£ cho phÃ©p
         date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Pháº¡m vi
+        scopes: Quyá»n háº¡n
         title: CÃ¡c á»©ng dá»¥ng mÃ  báº¡n cho phÃ©p
     errors:
       messages:
         access_denied: Chá»§ sá»Ÿ há»¯u tÃ i nguyÃªn hoáº·c mÃ¡y chá»§ Ä‘Ã£ tá»« chá»‘i yÃªu cáº§u.
         credential_flow_not_configured: Resource Owner Password Credentials khÃ´ng thÃ nh cÃ´ng do Doorkeeper.configure.resource_owner_from_credentials khÃ´ng Ä‘Æ°á»£c Ä‘á»‹nh cáº¥u hÃ¬nh.
         invalid_client: XÃ¡c thá»±c á»©ng dá»¥ng khÃ¡ch khÃ´ng thÃ nh cÃ´ng do mÃ¡y khÃ¡ch mÆ¡ há»“, khÃ´ng bao gá»“m xÃ¡c thá»±c á»©ng dá»¥ng khÃ¡ch hoáº·c phÆ°Æ¡ng thá»©c xÃ¡c thá»±c khÃ´ng Ä‘Æ°á»£c há»— trá»£.
-        invalid_grant: YÃªu cáº§u khÃ´ng há»£p lá»‡, háº¿t háº¡n, bá»‹ thu há»“i hoáº·c khÃ´ng khá»›p vá»›i tÃ i khoáº£n Ä‘Ã£ cung cáº¥p.
-        invalid_redirect_uri: Uri chuyá»ƒn hÆ°á»›ng bao gá»“m khÃ´ng há»£p lá»‡.
+        invalid_grant: YÃªu cáº§u khÃ´ng há»£p lá»‡, háº¿t háº¡n, bá»‹ gá»¡ hoáº·c khÃ´ng khá»›p vá»›i tÃ i khoáº£n Ä‘Ã£ cáº¥p phÃ©p. Hoáº·c xung Ä‘á»™t vá»›i á»©ng dá»¥ng khÃ¡c.
+        invalid_redirect_uri: URL chuyá»ƒn hÆ°á»›ng khÃ´ng há»£p lá»‡.
         invalid_request: YÃªu cáº§u thiáº¿u tham sá»‘ báº¯t buá»™c, bao gá»“m giÃ¡ trá»‹ tham sá»‘ khÃ´ng Ä‘Æ°á»£c há»— trá»£ hoáº·c khÃ´ng Ä‘Ãºng Ä‘á»‹nh dáº¡ng.
         invalid_resource_owner: ThÃ´ng tin xÃ¡c thá»±c chá»§ sá»Ÿ há»¯u tÃ i nguyÃªn Ä‘Æ°á»£c cung cáº¥p khÃ´ng há»£p lá»‡ hoáº·c khÃ´ng thá»ƒ tÃ¬m tháº¥y chá»§ sá»Ÿ há»¯u tÃ i nguyÃªn
-        invalid_scope: Pháº¡m vi yÃªu cáº§u khÃ´ng há»£p lá»‡, khÃ´ng xÃ¡c Ä‘á»‹nh hoáº·c khÃ´ng Ä‘Ãºng Ä‘á»‹nh dáº¡ng.
+        invalid_scope: Quyá»n yÃªu cáº§u khÃ´ng há»£p lá»‡, khÃ´ng cÃ³ tháºt hoáº·c sai Ä‘á»‹nh dáº¡ng.
         invalid_token:
           expired: MÃ£ thÃ´ng bÃ¡o truy cáºp Ä‘Ã£ háº¿t háº¡n
-          revoked: MÃ£ thÃ´ng bÃ¡o truy cáºp Ä‘Ã£ bá»‹ thu há»“i
+          revoked: MÃ£ token Ä‘Äƒng nháºp Ä‘Ã£ bá»‹ há»§y
           unknown: MÃ£ thÃ´ng bÃ¡o truy cáºp khÃ´ng há»£p lá»‡
         resource_owner_authenticator_not_configured: Chá»§ sá»Ÿ há»¯u tÃ i nguyÃªn tÃ¬m tháº¥y tháº¥t báº¡i do Doorkeeper.configure.resource_owner_authenticator khÃ´ng Ä‘Æ°á»£c Ä‘á»‹nh cáº¥u hÃ¬nh.
         server_error: CÃ³ má»™t Ä‘iá»u kiá»‡n khÃ´ng thá»ƒ cháº¥p nháºn khiáº¿n mÃ¡y chá»§ khÃ´ng thá»±c hiá»‡n yÃªu cáº§u.
@@ -106,7 +106,7 @@ vi:
           notice: á»¨ng dá»¥ng cáºp nháºt.
       authorized_applications:
         destroy:
-          notice: á»¨ng dá»¥ng bá»‹ thu há»“i.
+          notice: á»¨ng dá»¥ng bá»‹ gá»¡.
     layouts:
       admin:
         nav:
@@ -117,35 +117,35 @@ vi:
     scopes:
       admin:read: Ä‘á»c táº¥t cáº£ dá»¯ liá»‡u trÃªn mÃ¡y chá»§
       admin:read:accounts: Ä‘á»c thÃ´ng tin nháº¡y cáº£m cá»§a táº¥t cáº£ cÃ¡c tÃ i khoáº£n
-      admin:read:reports: Ä‘á»c thÃ´ng tin nháº¡y cáº£m cá»§a táº¥t cáº£ cÃ¡c bÃ¡o cÃ¡o vÃ  tÃ i khoáº£n bÃ¡o cÃ¡o
+      admin:read:reports: Ä‘á»c thÃ´ng tin cá»§a cÃ¡c bÃ¡o cÃ¡o vÃ  cÃ¡c tÃ i khoáº£n bá»‹ bÃ¡o cÃ¡o
       admin:write: sá»a Ä‘á»•i táº¥t cáº£ dá»¯ liá»‡u trÃªn mÃ¡y chá»§
-      admin:write:accounts: thá»±c hiá»‡n cÃ¡c hÃ nh Ä‘á»™ng kiá»ƒm duyá»‡t trÃªn tÃ i khoáº£n
-      admin:write:reports: thá»±c hiá»‡n cÃ¡c hÃ nh Ä‘á»™ng kiá»ƒm duyá»‡t trÃªn cÃ¡c bÃ¡o cÃ¡o
+      admin:write:accounts: Ã¡p Ä‘áº·t hÃ nh Ä‘á»™ng kiá»ƒm duyá»‡t trÃªn tÃ i khoáº£n
+      admin:write:reports: Ã¡p Ä‘áº·t kiá»ƒm duyá»‡t vá»›i cÃ¡c bÃ¡o cÃ¡o
       follow: sá»a Ä‘á»•i cÃ¡c má»‘i quan há»‡ tÃ i khoáº£n
       push: nháºn thÃ´ng bÃ¡o Ä‘áº©y cá»§a báº¡n
       read: Ä‘á»c táº¥t cáº£ dá»¯ liá»‡u tÃ i khoáº£n cá»§a báº¡n
       read:accounts: xem thÃ´ng tin tÃ i khoáº£n
-      read:blocks: xem khá»‘i cá»§a báº¡n
-      read:bookmarks: xem cÃ¡c má»¥c Ä‘Ã£ lÆ°u
-      read:favourites: xem yÃªu thÃch cá»§a báº¡n
+      read:blocks: xem nhá»¯ng ngÆ°á»i báº¡n cháº·n
+      read:bookmarks: xem nhá»¯ng thá»© báº¡n Ä‘Ã£ lÆ°u
+      read:favourites: xem lÆ°á»£t thÃch
       read:filters: xem bá»™ lá»c cá»§a báº¡n
-      read:follows: xem sau cá»§a báº¡n
+      read:follows: xem lÆ°á»£t theo dÃµi cá»§a báº¡n
       read:lists: xem danh sÃ¡ch cá»§a báº¡n
-      read:mutes: xem nhá»¯ng ngÆ°á»i báº¡n cá»§a báº¡n
+      read:mutes: xem nhá»¯ng ngÆ°á»i báº¡n Ä‘Ã£ áº©n
       read:notifications: xem thÃ´ng bÃ¡o cá»§a báº¡n
       read:reports: xem bÃ¡o cÃ¡o cá»§a báº¡n
       read:search: thay máº·t báº¡n tÃ¬m kiáº¿m
-      read:statuses: xem táº¥t cáº£ cÃ¡c tráº¡ng thÃ¡i
-      write: sá»a Ä‘á»•i táº¥t cáº£ dá»¯ liá»‡u tÃ i khoáº£n cá»§a báº¡n
-      write:accounts: sá»a Ä‘á»•i há»“ sÆ¡ cá»§a báº¡n
-      write:blocks: cháº·n tÃ i khoáº£n vÃ  tÃªn miá»n
-      write:bookmarks: nhá»¯ng tráº¡ng thÃ¡i Ä‘Ã£ lÆ°u
-      write:favourites: tráº¡ng thÃ¡i yÃªu thÃch
+      read:statuses: xem toÃ n bá»™ tÃºt
+      write: sá»a Ä‘á»•i má»i dá»¯ liá»‡u tÃ i khoáº£n cá»§a báº¡n
+      write:accounts: sá»a Ä‘á»•i trang cÃ¡ nhÃ¢n cá»§a báº¡n
+      write:blocks: cháº·n ngÆ°á»i dÃ¹ng vÃ  mÃ¡y chá»§
+      write:bookmarks: sá»a Ä‘á»•i nhá»¯ng thá»© báº¡n lÆ°u
+      write:favourites: lÆ°á»£t thÃch
       write:filters: táº¡o bá»™ lá»c
-      write:follows: theo dÃµi má»i ngÆ°á»i
+      write:follows: theo dÃµi ai Ä‘Ã³
       write:lists: táº¡o danh sÃ¡ch
-      write:media: táº£i lÃªn táºp tin phÆ°Æ¡ng tiá»‡n truyá»n thÃ´ng
-      write:mutes: ngÆ°á»i cÃ¢m vÃ  nÃ³i chuyá»‡n
+      write:media: táº£i lÃªn táºp tin
+      write:mutes: áº©n ngÆ°á»i dÃ¹ng vÃ  cuá»™c Ä‘á»‘i thoáº¡i
       write:notifications: xÃ³a thÃ´ng bÃ¡o cá»§a báº¡n
       write:reports: bÃ¡o cÃ¡o ngÆ°á»i khÃ¡c
-      write:statuses: xuáº¥t báº£n tráº¡ng thÃ¡i
+      write:statuses: Ä‘Äƒng tÃºt
diff --git a/config/locales/doorkeeper.zgh.yml b/config/locales/doorkeeper.zgh.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d34b8109cf1b54c850d176bd882d0aedddffb2a1
--- /dev/null
+++ b/config/locales/doorkeeper.zgh.yml
@@ -0,0 +1,80 @@
+---
+zgh:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: âµ‰âµ™âµ âµ âµœâµ™âµâµ™âµ‰
+        redirect_uri: âµœâ´°âµâµ™â´° âµ âµ“âµ™âµ‰â´¼â´¹
+        website: â´°âµ™âµ‰âµœ âµ¡âµ‰â´± âµ âµœâµ™âµâµ™âµ‰
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: âµ™âµ™âµ“âµ”â´³
+        cancel: âµ™âµ”
+        edit: âµ™âµâ´¼âµ
+        submit: â´°âµ£âµ
+      confirmations:
+        destroy: âµ‰âµ™ âµâµ‰âµœ?
+      edit:
+        title: âµ™âµâ´¼âµ âµœâµ‰âµ™âµâµ™âµ‰
+      help:
+        native_redirect_uri: âµ™âµŽâµ”âµ™ %{native_redirect_uri} âµ‰ âµ‰âµ”âµ‰âµŽâµ âµ‰â´·âµ–â´°âµ”â´°âµœâµ
+        redirect_uri: âµ™âµŽâµ”âµ™ âµ¢â´°âµ âµ“âµ£â´³âµ‰â´³ âµ‰ âµ¢â´°âµœ âµœâµ–âµ“âµâµ‰
+      index:
+        application: âµœâµ‰âµ™âµâµ™âµ‰
+        delete: â´½â´½âµ™
+        empty: âµ“âµ” âµ–âµ“âµ”â´½ â´½âµ”â´° âµ âµœâµ™âµâµ™âµ‰âµ¡âµ‰âµ.
+        name: âµ‰âµ™âµŽ
+        new: âµœâµ‰âµ™âµâµ™âµ‰ âµœâ´°âµŽâ´°âµ¢âµâµ“âµœ
+        show: âµ™âµŽâ´°âµ
+        title: âµœâµ‰âµ™âµâµ™âµ‰âµ¡âµ‰âµ âµâµâ´½
+      new:
+        title: âµœâµ‰âµ™âµâµ™âµ‰ âµœâ´°âµŽâ´°âµ¢âµâµ“âµœ
+      show:
+        actions: âµœâµ‰â´³â´°âµ¡âµ‰âµ
+        title: âµœâµ‰âµ™âµâµ™âµ‰ %{name}
+    authorizations:
+      buttons:
+        authorize: âµ™âµ™âµ“âµ”â´³
+        deny: â´°â´³âµ¢
+      new:
+        prompt: âµœâµ™âµ™âµ“âµœâµ“âµ” âµœâµ™âµâµ™âµ‰ %{client_name} â´°âµ™â´°â´·â´¼ âµ–âµ” âµ“âµŽâµ‰â´¹â´°âµ âµâµâ´½
+    authorized_applications:
+      confirmations:
+        revoke: âµ‰âµ™ âµâµ‰âµœ?
+      index:
+        application: âµœâµ‰âµ™âµâµ™âµ‰
+        created_at: âµœâ´»âµœâµœâµ“âµ™âµ“âµ”â´³
+        date_format: "%d-%m-%Y %H:%M:%S"
+        title: âµœâµ‰âµ™âµâµ™âµ‰âµ¡âµ‰âµ âµâµâ´½ âµ‰âµœâµœâµ“âµ™âµ“âµ”â´·âµ
+    flash:
+      applications:
+        create:
+          notice: âµœâ´»âµœâµœâµ“âµ™âµâ´¼âµâµ“âµ âµœâµ™âµâµ™âµ‰.
+        destroy:
+          notice: âµœâ´»âµœâµœâµ¡â´°â´½â´½âµ™ âµœâµ™âµâµ™âµ‰.
+        update:
+          notice: âµœâ´»âµœâµœâµ“âµ™â´·âµ–âµ‰ âµœâµ™âµâµ™âµ‰.
+    layouts:
+      admin:
+        nav:
+          applications: âµœâµ‰âµ™âµâµ™âµ‰âµ¡âµ‰âµ
+    scopes:
+      admin:read: âµ–âµ” âµ‰â´¼âµ™â´½â´° â´°â´½â´½âµ¯ â´³ âµ“âµŽâ´°â´½â´½â´°âµ¢
+      admin:write: âµ™âµâ´¼âµ âµ‰â´¼âµ™â´½â´° â´°â´½â´½âµ¯ â´³ âµ“âµŽâ´°â´½â´½â´°âµ¢
+      read: âµ–âµ” âµ‰â´¼âµ™â´½â´° â´°â´½â´½âµ¯ âµ âµ“âµŽâµ‰â´¹â´°âµ
+      read:filters: âµ¥âµ• âµ‰âµ™âµœâ´°âµ¢âµ âµâµâ´½
+      read:follows: âµ¥âµ• âµ‰âµŽâ´¹â´¼â´°âµ”âµ âµâµâ´½
+      read:lists: âµ¥âµ• âµœâµ‰âµâ´³â´°âµŽâµ‰âµ âµâµâ´½
+      read:notifications: âµ¥âµ• âµœâµ‰âµâµ–âµŽâµ‰âµ™âµ‰âµ âµâµâ´½
+      read:search: âµ”âµ£âµ“ âµ™ âµ¢âµ‰âµ™âµŽ âµâµâ´½
+      read:statuses: âµ¥âµ• â´°â´·â´·â´°â´·âµ â´°â´½â´½âµ¯
+      write: âµ™âµâ´¼âµ âµ‰â´¼âµ™â´½â´° âµ âµ“âµŽâµ‰â´¹â´°âµ âµâµâ´½
+      write:accounts: âµ™âµâ´¼âµ âµ‰â´¼âµ”âµ™ âµâµâ´½
+      write:blocks: â´³â´·âµ âµ‰âµŽâµ‰â´¹â´°âµâµ â´· âµ¢âµ‰â´³âµ”â´°âµ
+      write:follows: â´¹â´¼âµ• âµŽâµ‰â´·â´·âµ
+      write:lists: âµ™âµâ´¼âµâµ“âµ âµœâµ‰âµâ´³â´°âµŽâµ‰âµ
+      write:mutes: âµ¥âµ¥âµ‰âµ¥âµ âµŽâµ‰â´·â´·âµ â´· âµ‰âµŽâµ™â´°âµ¡â´°âµâµ
+      write:notifications: âµ™â´¼â´¹ âµœâµ‰âµâµ–âµŽâµ‰âµ™âµ‰âµ âµâµâ´½
+      write:reports: âµŽâµ âµŽâµ‰â´·â´·âµ âµâµâµ‰â´¹âµ
+      write:statuses: â´¼âµ™âµ” âµœâµ‰âµ¥âµ•â´°â´³âµ‰âµ
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml
index d59c859a31e5145da67ba005122c871bb28e6cd1..3e0d88c82dffe7076e627587881f5a0e2e2857d0 100644
--- a/config/locales/doorkeeper.zh-CN.yml
+++ b/config/locales/doorkeeper.zh-CN.yml
@@ -33,7 +33,7 @@ zh-CN:
       help:
         native_redirect_uri: æœ¬åœ°æµ‹è¯•è¯·ä½¿ç”¨ %{native_redirect_uri}
         redirect_uri: æ¯è¡Œåªèƒ½æœ‰ä¸€ä¸ª URL
-        scopes: ç”¨ç©ºæ ¼åˆ†å‰²æƒé™èŒƒå›´ï¼Œç•™ç©ºåˆ™ä½¿ç”¨é»˜è®¤è®¾ç½®
+        scopes: ç”¨ç©ºæ ¼åˆ†éš”æƒé™èŒƒå›´ï¼Œç•™ç©ºåˆ™ä½¿ç”¨é»˜è®¤è®¾ç½®ã€‚
       index:
         application: åº”ç”¨
         callback_url: å›žè°ƒ URL
@@ -73,7 +73,7 @@ zh-CN:
       index:
         application: åº”ç”¨
         created_at: æŽˆæƒæ—¶é—´
-        date_format: "%Yå¹´%mæœˆ%dæ—¥ %Hæ—¶%Måˆ†%Sç§’"
+        date_format: "%Yå¹´%mæœˆ%dæ—¥ %H:%M:%S"
         scopes: æƒé™èŒƒå›´
         title: å·²æŽˆæƒçš„åº”ç”¨åˆ—è¡¨
     errors:
diff --git a/config/locales/doorkeeper.zh-HK.yml b/config/locales/doorkeeper.zh-HK.yml
index 38f07b0219fc8f67fb6adad6cd50b05a2bff6029..872727049b24642c7e78c85ce9b2e9b9de9bc866 100644
--- a/config/locales/doorkeeper.zh-HK.yml
+++ b/config/locales/doorkeeper.zh-HK.yml
@@ -3,8 +3,8 @@ zh-HK:
   activerecord:
     attributes:
       doorkeeper/application:
-        name: åç¨±
-        redirect_uri: è½‰æŽ¥ URI
+        name: æ‡‰ç”¨ç¨‹å¼åç¨±
+        redirect_uri: é‡æ–°å°Žå‘ URI
         scopes: æ¬Šé™ç¯„åœ
         website: æ‡‰ç”¨ç¶²ç«™
     errors:
@@ -12,10 +12,10 @@ zh-HK:
         doorkeeper/application:
           attributes:
             redirect_uri:
-              fragment_present: URI ä¸å¯åŒ…å« "#fragment" éƒ¨ä»½ã€‚
-              invalid_uri: å¿…éœ€æœ‰æ£ç¢ºçš„ URIã€‚
-              relative_uri: å¿…éœ€ç‚ºå®Œæ•´ URIã€‚
-              secured_uri: å¿…éœ€ä½¿ç”¨æœ‰ HTTPS/SSL åŠ å¯†çš„ URIã€‚
+              fragment_present: ä¸èƒ½åŒ…å« fragmentã€‚
+              invalid_uri: å¿…éœ€æ˜¯ä¸€å€‹æœ‰æ•ˆçš„ URIã€‚
+              relative_uri: å¿…é ˆç‚ºçµ•å° URIã€‚
+              secured_uri: å¿…é ˆç‚º HTTPS/SSL åŠ å¯†çš„ URIã€‚
   doorkeeper:
     applications:
       buttons:
@@ -32,26 +32,26 @@ zh-HK:
         error: å™¢ï¼è«‹æª¢æŸ¥ä½ è¡¨æ ¼çš„éŒ¯èª¤è¨Šæ¯
       help:
         native_redirect_uri: ä½¿ç”¨ %{native_redirect_uri} ä½œå±€éƒ¨æ¸¬è©¦
-        redirect_uri: æ¯è¡Œè¼¸å…¥ä¸€å€‹ URI
+        redirect_uri: ä¸€è¡Œä¸€å€‹ URI
         scopes: è«‹ç”¨åŠå½¢ç©ºæ ¼åˆ†é–‹æ¬Šé™ç¯„åœ (scope)ã€‚ç•™ç©ºè¡¨ç¤ºä½¿ç”¨é è¨çš„æ¬Šé™ç¯„åœã€‚
       index:
-        application: æ‡‰ç”¨
-        callback_url: å›žå‚³ç¶²å€
+        application: æ‡‰ç”¨ç¨‹å¼
+        callback_url: å›žå‚³ç¶²å€ (Callback URL)
         delete: åˆªé™¤
-        empty: æ‚¨æ²’æœ‰å®‰è£ Appã€‚
+        empty: ä½ æ²’æœ‰æ‡‰ç”¨ç¨‹å¼
         name: åç¨±
         new: æ–°å¢žæ‡‰ç”¨ç¨‹å¼
-        scopes: æ¬Šé™ç¯„åœ
+        scopes: æ¬Šé™ç¯„åœ (Scopes)
         show: é¡¯ç¤º
         title: ä½ çš„æ‡‰ç”¨ç¨‹å¼
       new:
         title: æ–°å¢žæ‡‰ç”¨ç¨‹å¼
       show:
         actions: æ“ä½œ
-        application_id: æ‡‰ç”¨ç¨‹å¼ ID
-        callback_urls: å›žå‚³ç¶²å€
-        scopes: æ¬Šé™ç¯„åœ
-        secret: å¯†ç¢¼
+        application_id: ç”¨æˆ¶ç¨‹å¼é‘°åŒ™ (Client key)
+        callback_urls: å›žå‚³ç¶²å€ (Callback URL)
+        scopes: æ¬Šé™ç¯„åœ (Scopes)
+        secret: ç”¨æˆ¶ç¨‹å¼å¯†ç¢¼ (Client secret)
         title: æ‡‰ç”¨ç¨‹å¼ï¸° %{name}
     authorizations:
       buttons:
@@ -60,7 +60,7 @@ zh-HK:
       error:
         title: ç™¼ç”ŸéŒ¯èª¤
       new:
-        able_to: è¦æ±‚ç²å–æ¬Šé™
+        able_to: å®ƒå°‡å¯ä»¥
         prompt: æ‡‰ç”¨ç¨‹å¼ %{client_name} è¦æ±‚å¾—åˆ°ä½ ç”¨æˆ¶çš„éƒ¨ä»½æ¬Šé™
         title: éœ€è¦ç”¨æˆ¶æŽˆæ¬Š
       show:
@@ -73,27 +73,27 @@ zh-HK:
       index:
         application: æ‡‰ç”¨ç¨‹å¼
         created_at: æŽˆæ¬Šæ—¥æœŸ
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: æ¬Šé™ç¯„åœ
+        date_format: "%Yå¹´%mæœˆ%dæ—¥ %H:%M:%S"
+        scopes: æ¬Šé™ç¯„åœ (Scopes)
         title: å·²ç²ä½ æŽˆæ¬Šçš„ç¨‹ç”¨ç¨‹å¼
     errors:
       messages:
         access_denied: è³‡æºæ“æœ‰è€…æˆ–æŽˆæ¬Šä¼ºæœå™¨ä¸æŽ¥å—è«‹æ±‚ã€‚
         credential_flow_not_configured: è³‡æºæ“æœ‰è€…å¯†ç¢¼èªè‰ç¨‹åº (Resource Owner Password Credentials flow) å¤±æ•—ï¼ŒåŽŸå› æ˜¯ Doorkeeper.configure.resource_owner_from_credentials æ²’æœ‰è¨å®šã€‚
-        invalid_client: ç”¨æˆ¶ç¨‹å¼èªè‰ (Client authentication) å¤±æ•—ï¼ŒåŽŸå› æ˜¯ç”¨æˆ¶ç¨‹å¼æœªæœ‰ç™»è¨˜ã€æ²’æœ‰æŒ‡å®šç”¨æˆ¶ç¨‹å¼ (client)ã€æˆ–è€…ä½¿ç”¨äº†ä¸æ”¯æ´çš„èªè‰æ–¹æ³• (method)ã€‚
-        invalid_grant: æŽˆæ¬Šç”³è«‹ (authorization grant) ä¸æ£ç¢ºã€éŽæœŸã€å·²è¢«å–æ¶ˆï¼Œæˆ–è€…ç„¡æ³•å°æ‡‰æŽˆæ¬Šè«‹æ±‚ (authorization request) å…§çš„è½‰æŽ¥ URIï¼Œæˆ–è€…å±¬æ–¼åˆ¥çš„ç”¨æˆ¶ç¨‹å¼ã€‚
+        invalid_client: ç”¨æˆ¶ç¨‹å¼èªè‰ (Client Authentication) å¤±æ•—ï¼ŒåŽŸå› æ˜¯ä½¿ç”¨äº†æœªçŸ¥çš„ç”¨æˆ¶ç¨‹å¼ã€æ²’æœ‰å‚³å›žç”¨æˆ¶èªè‰è³‡è¨Šã€æˆ–è€…ä½¿ç”¨äº†ä¸æ”¯æ´çš„èªè‰æ–¹æ³• (Authentication Method)ã€‚
+        invalid_grant: æ‰€æä¾›çš„èªè‰ç”³è«‹ (authorization grant) ä¸æ£ç¢ºã€éŽæœŸã€å·²è¢«å–æ¶ˆã€æˆ–è€…ç„¡æ³•å°æ‡‰æŽˆæ¬Šè«‹æ±‚ (authorization request) å…§çš„è½‰æŽ¥ URIï¼Œæˆ–è€…å±¬æ–¼åˆ¥çš„ç”¨æˆ¶ç¨‹å¼ã€‚
         invalid_redirect_uri: ä¸æ£ç¢ºçš„è½‰æŽ¥ç¶²å€ã€‚
-        invalid_request: è«‹æ±‚ç¼ºå°‘äº†å¿…è¦çš„åƒæ•¸ã€åŒ…å«äº†ä¸æ”¯æ´çš„åƒæ•¸ã€æˆ–è€…å…¶ä»–è¼¸å…¥éŒ¯èª¤ã€‚
-        invalid_resource_owner: è³‡æºæ“æœ‰è€…çš„ç™»å…¥è³‡è¨ŠéŒ¯èª¤ã€æˆ–è€…ç„¡æ³•æ‰¾åˆ°è©²è³‡æºæ“æœ‰è€…
-        invalid_scope: è«‹æ±‚çš„æ¬Šé™ç¯„åœ (scope) ä¸æ£ç¢ºã€æœªæœ‰å®šç¾©ã€æˆ–è€…è¼¸å…¥éŒ¯èª¤ã€‚
+        invalid_request: è«‹æ±‚ç¼ºå°‘å¿…è¦çš„åƒæ•¸ã€æœ‰ä¸æ”¯æ´çš„åƒæ•¸ã€æˆ–åŒ…å«å…¶ä»–æ ¼å¼éŒ¯èª¤ã€‚
+        invalid_resource_owner: è³‡æºæ“æœ‰è€…çš„ç™»å…¥è³‡è¨Šç„¡æ•ˆã€æˆ–è€…ç„¡æ³•æ‰¾åˆ°è©²è³‡æºæ“æœ‰è€…
+        invalid_scope: ä½ æ‰€è«‹æ±‚çš„æ¬Šé™ç¯„åœ (scope) ç„¡æ•ˆã€æœªçŸ¥ã€æˆ–æ ¼å¼éŒ¯èª¤ã€‚
         invalid_token:
-          expired: access token å·²ç¶“éŽæœŸ
-          revoked: access token å·²è¢«å–æ¶ˆ
-          unknown: access token ä¸æ£ç¢º
+          expired: å˜å–æ†‘è‰ (access token) å·²éŽæœŸ
+          revoked: å˜å–æ†‘è‰ (access token) å·²è¢«æ’¤éŠ·
+          unknown: å˜å–æ†‘è‰ (access token) ç„¡æ•ˆ
         resource_owner_authenticator_not_configured: ç„¡æ³•æ‰¾åˆ°è³‡æºæ“æœ‰è€…ï¼ŒåŽŸå› æ˜¯ Doorkeeper.configure.resource_owner_authenticator æ²’æœ‰è¨å®šã€‚
-        server_error: èªè‰ä¼ºæœå™¨é‡ä¸ŠæœªçŸ¥ç‹€æ³ï¼Œä»¤è«‹æ±‚ç„¡æ³•é€šéŽã€‚
+        server_error: èªè‰ä¼ºæœå™¨é‡ä¸ŠæœªçŸ¥ç‹€æ³ï¼Œä»¤è«‹æ±‚ç„¡æ³•è¢«æ£ç¢ºè™•ç†ã€‚
         temporarily_unavailable: èªè‰ä¼ºæœå™¨ç”±æ–¼è‡¨æ™‚è² è·éŽé‡æˆ–è€…ç¶è·ï¼Œç›®å‰æœªèƒ½è™•ç†è«‹æ±‚ã€‚
-        unauthorized_client: ç”¨æˆ¶ç¨‹å¼ç„¡æ¬Šç”¨æ¤æ–¹æ³• (method) è«‹è¡Œé€™å€‹è«‹æ±‚ã€‚
+        unauthorized_client: ç”¨æˆ¶ç¨‹å¼ç„¡æ¬Šä½¿ç”¨æ‰€é¸çš„æ–¹æ³• (method) é€²è¡Œé€™å€‹è«‹æ±‚ã€‚
         unsupported_grant_type: æŽˆæ¬Šä¼ºæœå™¨ä¸æ”¯æ´é€™å€‹æŽˆæ¬Šé¡žåž‹ (grant type)ã€‚
         unsupported_response_type: æŽˆæ¬Šä¼ºæœå™¨ä¸æ”¯æ´é€™å€‹å›žæ‡‰é¡žåž‹ (response type)ã€‚
     flash:
@@ -119,33 +119,33 @@ zh-HK:
       admin:read:accounts: è®€å–æ‰€æœ‰å¸³æˆ¶çš„æ•æ„Ÿè³‡è¨Š
       admin:read:reports: è®€å–æ‰€æœ‰å›žå ± / è¢«å›žå ±ä¹‹å¸³æˆ¶çš„æ•æ„Ÿè³‡è¨Š
       admin:write: ä¿®æ”¹ä¼ºæœå™¨çš„æ‰€æœ‰è³‡æ–™
-      admin:write:accounts: å°å¸³æˆ¶é€²è¡Œä»²è£ç®¡ç†å‹•ä½œ
-      admin:write:reports: å°å ±å‘Šé€²è¡Œä»²è£ç®¡ç†å‹•ä½œ
-      follow: é—œæ³¨ã€å°éŽ–ã€è§£é™¤å°éŽ–åŠå–æ¶ˆé—œæ³¨ç”¨æˆ¶
+      admin:write:accounts: å°å¸³è™Ÿé€²è¡Œä»²è£ç®¡ç†å‹•ä½œ
+      admin:write:reports: å°å›žå ±é€²è¡Œä»²è£ç®¡ç†å‹•ä½œ
+      follow: ä¿®æ”¹å¸³è™Ÿçš„å°å¤–è¯ç¹«
       push: æŽ¥æ”¶ä½ çš„å¸³è™Ÿçš„æŽ¨é€é€šçŸ¥
-      read: é–±è®€ä½ çš„ç”¨æˆ¶è³‡æ–™
-      read:accounts: æª¢è¦–å¸³æˆ¶è³‡è¨Š
-      read:blocks: æª¢è¦–æ‚¨çš„å°éŽ–åå–®
-      read:bookmarks: æª¢è¦–æ‚¨çš„æ›¸ç±¤
-      read:favourites: æª¢è¦–æ‚¨çš„æ”¶è—é …ç›®
-      read:filters: æª¢è¦–æ‚¨çš„éŽæ¿¾æ¢ä»¶
-      read:follows: æª¢è¦–æ‚¨é—œæ³¨çš„äºº
-      read:lists: æª¢è¦–æ‚¨çš„åå–®
-      read:mutes: æª¢è¦–æ‚¨éœéŸ³çš„äºº
-      read:notifications: æª¢è¦–æ‚¨çš„é€šçŸ¥
-      read:reports: æª¢è¦–æ‚¨çš„æª¢èˆ‰
-      read:search: ä»¥ä½ çš„èº«ä»½æœå°‹
-      read:statuses: æª¢è¦–æ‰€æœ‰å˜Ÿæ–‡
+      read: é–±è®€ä½ å¸³è™Ÿçš„æ‰€æœ‰è³‡æ–™
+      read:accounts: æª¢è¦–å¸³è™Ÿè³‡è¨Š
+      read:blocks: æª¢è¦–ä½ çš„å°éŽ–åå–®
+      read:bookmarks: æª¢è¦–ä½ çš„æ›¸ç±¤
+      read:favourites: æª¢è¦–ä½ æœ€æ„›çš„æ–‡ç« 
+      read:filters: æª¢è¦–ä½ çš„éŽæ¿¾æ¢ä»¶
+      read:follows: æª¢è¦–ä½ é—œæ³¨çš„äºº
+      read:lists: æª¢è¦–ä½ çš„æ¸…å–®
+      read:mutes: æª¢è¦–è¢«ä½ éœéŸ³çš„äºº
+      read:notifications: æª¢è¦–ä½ çš„é€šçŸ¥
+      read:reports: æª¢è¦–ä½ çš„æª¢èˆ‰
+      read:search: ä»¥ä½ çš„èº«ä»½é€²è¡Œæœå°‹
+      read:statuses: æª¢è¦–æ‰€æœ‰æ–‡ç« 
       write: ä»¥ä½ çš„åç¾©ç™¼ä½ˆæ–‡ç« 
-      write:accounts: ä¿®æ”¹æ‚¨çš„å€‹äººæª”æ¡ˆ
-      write:blocks: å°éŽ–å¸³æˆ¶åŠç«™å°
-      write:bookmarks: æ›¸ç±¤ç‹€æ…‹
-      write:favourites: æ”¶è—å˜Ÿæ–‡
+      write:accounts: ä¿®æ”¹ä½ çš„å€‹äººæª”æ¡ˆ
+      write:blocks: å°éŽ–å¸³è™ŸåŠåŸŸå
+      write:bookmarks: æŠŠæ–‡ç« åŠ å…¥æœ€æ„›
+      write:favourites: å–œæ¡çš„æ–‡ç« 
       write:filters: å»ºç«‹éŽæ¿¾æ¢ä»¶
       write:follows: é—œæ³¨å…¶ä»–äºº
-      write:lists: å»ºç«‹åå–®
+      write:lists: å»ºç«‹æ¸…å–®
       write:media: ä¸Šå‚³åª’é«”æª”æ¡ˆ
       write:mutes: éœéŸ³ä½¿ç”¨è€…åŠå°è©±
-      write:notifications: æ¸…é™¤æ‚¨çš„é€šçŸ¥
+      write:notifications: æ¸…é™¤ä½ çš„é€šçŸ¥
       write:reports: æª¢èˆ‰å…¶ä»–äºº
       write:statuses: ç™¼å¸ƒå˜Ÿæ–‡
diff --git a/config/locales/el.yml b/config/locales/el.yml
index cf6622f10de38b300b92a067cc42bdf9b07f5a48..5442d38b851d803f415f1244b02e3b712f4bccc9 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -98,6 +98,7 @@ el:
       add_email_domain_block: Î•Î³Î³ÏÎ±Ï†Î® Ï„Î¿Î¼ÎÎ± email ÏƒÎµ Î¼Î±ÏÏÎ· Î»Î¯ÏƒÏ„Î±
       approve: ÎˆÎ³ÎºÏÎ¹ÏƒÎ·
       approve_all: ÎˆÎ³ÎºÏÎ¹ÏƒÎ· ÏŒÎ»Ï‰Î½
+      approved_msg: Î•Ï€Î¹Ï„Ï…Ï‡Î®Ï‚ ÎÎ³ÎºÏÎ¹ÏƒÎ· Î±Î¯Ï„Î·ÏƒÎ·Ï‚ ÎµÎ³Î³ÏÎ±Ï†Î®Ï‚ Ï„Î¿Ï…/Ï„Î·Ï‚ %{username}
       are_you_sure: Î£Î¯Î³Î¿Ï…ÏÎ±;
       avatar: Î‘Î²Î±Ï„Î¬Ï
       by_domain: Î¤Î¿Î¼ÎÎ±Ï‚
@@ -111,8 +112,10 @@ el:
       confirm: Î•Ï€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ·
       confirmed: Î•Ï€Î¹Î²ÎµÎ²Î±Î¹ÏŽÎ¸Î·ÎºÎµ
       confirming: Î ÏÎ¿Ï‚ ÎµÏ€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ·
+      delete: Î”Î¹Î±Î³ÏÎ±Ï†Î® Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½
       deleted: Î”Î¹Î±Î³ÏÎ±Î¼Î¼ÎÎ½Î¿Î¹
       demote: Î¥Ï€Î¿Î²Î¯Î²Î±ÏƒÎ·
+      destroyed_msg: Î¤Î± Î´ÎµÎ´Î¿Î¼ÎÎ½Î± Ï„Î¿Ï…/Ï„Î·Ï‚ %{username} ÎµÎºÎºÏÎµÎ¼Î¿ÏÎ½ Î³Î¹Î± Î¬Î¼ÎµÏƒÎ· Î´Î¹Î±Î³ÏÎ±Ï†Î®
       disable: Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·
       disable_two_factor_authentication: Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· 2FA
       disabled: Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿
@@ -123,10 +126,12 @@ el:
       email_status: ÎšÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· email
       enable: Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·
       enabled: Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿
+      enabled_msg: Î•Ï€Î¹Ï„Ï…Ï‡ÎÏ‚ Î¾ÎµÏ€Î¬Î³Ï‰Î¼Î± Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï Ï„Î¿Ï…/Ï„Î·Ï‚ %{username}
       followers: Î‘ÎºÏŒÎ»Î¿Ï…Î¸Î¿Î¹
       follows: Î‘ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯
       header: Î•Ï€Î¹ÎºÎµÏ†Î±Î»Î¯Î´Î±
       inbox_url: URL ÎµÎ¹ÏƒÎµÏÏ‡Î¿Î¼ÎÎ½Ï‰Î½
+      invite_request_text: Î›ÏŒÎ³Î¿Î¹ Î³Î¹Î± ÎµÎ³Î³ÏÎ±Ï†Î®
       invited_by: Î ÏÎ¿ÏƒÎºÎ»Î®Î¸Î·ÎºÎµ Î±Ï€ÏŒ
       ip: IP
       joined: Î“ÏÎ¬Ï†Ï„Î·ÎºÎµ
@@ -138,6 +143,8 @@ el:
       login_status: ÎšÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· ÏƒÏÎ½Î´ÎµÏƒÎ·Ï‚
       media_attachments: Î£Ï…Î½Î·Î¼Î¼ÎÎ½Î± Ï€Î¿Î»Ï…Î¼ÎÏƒÎ±
       memorialize: ÎœÎµÏ„Î±Ï„ÏÎ¿Ï€Î® ÏƒÎµ Î½ÎµÎºÏÎ¿Î»Î¿Î³Î¯Î±
+      memorialized: ÎœÎµÏ„Î±Ï„ÏÎ¿Ï€Î® ÏƒÎµ Î±Î½Î±Î¼Î½Î·ÏƒÏ„Î¹ÎºÏŒ
+      memorialized_msg: Î•Ï€Î¹Ï„Ï…Ï‡Î®Ï‚ Î¼ÎµÏ„Î±Ï„ÏÎ¿Ï€Î® Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï Ï„Î¿Ï…/Ï„Î·Ï‚ %{username} ÏƒÎµ Î±Î½Î±Î¼Î½Î·ÏƒÏ„Î¹ÎºÏŒ
       moderation:
         active: Î•Î½ÎµÏÎ³ÏŒÏ‚/Î®
         all: ÎŒÎ»Î±
@@ -158,10 +165,14 @@ el:
       public: Î”Î·Î¼ÏŒÏƒÎ¹Î¿
       push_subscription_expires: Î— ÎµÎ³Î³ÏÎ±Ï†Î® PuSH Î»Î®Î³ÎµÎ¹
       redownload: Î‘Î½Î±Î½ÎÏ‰ÏƒÎ· Î±Î²Î±Ï„Î¬Ï
+      redownloaded_msg: Î•Ï€Î¹Ï„Ï…Ï‡Î®Ï‚ Î±Î½Î±Î½ÎÏ‰Î· Ï€ÏÎ¿Ï†Î¯Î» Ï„Î¿Ï…/Ï„Î·Ï‚ %{username} Î±Ï€ÏŒ Ï„Î·Î½ Ï€Î·Î³Î®
       reject: Î‘Ï€ÏŒÏÏÎ¹ÏˆÎ·
       reject_all: Î‘Ï€ÏŒÏÏÎ¹ÏˆÎ· ÏŒÎ»Ï‰Î½
+      rejected_msg: Î•Ï€Î¹Ï„Ï…Ï‡Î®Ï‚ Î±Ï€ÏŒÏÏÎ¹ÏˆÎ· Î±Î¯Ï„Î·ÏƒÎ·Ï‚ ÎµÎ³Î³ÏÎ±Ï†Î®Ï‚ Ï„Î¿Ï…/Ï„Î·Ï‚ %{username}
       remove_avatar: Î‘Ï€Î¿Î¼Î±ÎºÏÏ…ÏƒÎ¼ÎÎ½Î¿ Î±Î²Î±Ï„Î¬Ï
       remove_header: Î‘Ï†Î±Î¯ÏÎµÏƒÎ· ÎµÏ€Î¹ÎºÎµÏ†Î±Î»Î¯Î´Î±Ï‚
+      removed_avatar_msg: Î•Ï€Î¹Ï„Ï…Ï‡Î®Ï‚ Î±Ï†Î±Î¯ÏÎµÏƒÎ· ÎµÎ¹ÎºÏŒÎ½Î±Ï‚ Ï€ÏÎ¿Ï†Î¯Î» Ï„Î¿Ï…/Ï„Î·Ï‚%{username}
+      removed_header_msg: Î•Ï€Î¹Ï„Ï…Ï‡Î®Ï‚ Î±Ï†Î±Î¯ÏÎµÏƒÎ· ÎµÎ¹ÎºÏŒÎ½Î±Ï‚ ÎºÎµÏ†Î±Î»Î¯Î´Î±Ï‚ Ï„Î¿Ï…/Ï„Î·Ï‚ %{username}
       resend_confirmation:
         already_confirmed: Î‰Î´Î· ÎµÏ€Î¹Î²ÎµÎ²Î±Î¹Ï‰Î¼ÎÎ½Î¿Ï‚ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚
         send: Î•Ï€Î±Î½Î¬Î»Î·ÏˆÎ· Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®Ï‚ email ÎµÏ€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ·Ï‚
@@ -178,6 +189,8 @@ el:
       search: Î‘Î½Î±Î¶Î®Ï„Î·ÏƒÎ·
       search_same_email_domain: Î†Î»Î»Î¿Î¹ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Î¼Îµ Ï„Î¿Î½ Î¯Î´Î¹Î¿ Ï„Î¿Î¼ÎÎ± e-mail
       search_same_ip: Î¥Ï€ÏŒÎ»Î¿Î¹Ï€Î¿Î¹ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Î¼Îµ Ï„Î·Î½ Î¯Î´Î¹Î± Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP
+      sensitive: Î•Ï…Î±Î¯ÏƒÎ¸Î·Ï„Î¿
+      sensitized: ÏƒÎ®Î¼Î±Î½ÏƒÎ· Ï‰Ï‚ ÎµÏ…Î±Î¯ÏƒÎ¸Î·Ï„Î¿
       shared_inbox_url: URL ÎºÎ¿Î¹Î½ÏŒÏ‡ÏÎ·ÏƒÏ„Ï‰Î½ ÎµÎ¹ÏƒÎµÏÏ‡Î¿Î¼ÎÎ½Ï‰Î½
       show:
         created_reports: Î‘Î½Î±Ï†Î¿ÏÎÏ‚ Î±Ï€ÏŒ Î±Ï…Ï„ÏŒÎ½ Ï„Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ
@@ -187,13 +200,19 @@ el:
       statuses: ÎšÎ±Ï„Î±ÏƒÏ„Î¬ÏƒÎµÎ¹Ï‚
       subscribe: Î•Î³Î³ÏÎ±Ï†Î®
       suspended: Î£Îµ Î±Î½Î±ÏƒÏ„Î¿Î»Î®
+      suspension_irreversible: Î¤Î± Î´ÎµÎ´Î¿Î¼ÎÎ½Î± Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï ÎÏ‡Î¿Ï…Î½ Î´Î¹Î±Î³ÏÎ±Ï†ÎµÎ¯ Î¿ÏÎ¹ÏƒÏ„Î¹ÎºÎ¬. ÎœÏ€Î¿ÏÎµÎ¯Ï‚ Î½Î± Î¬ÏÎµÎ¹Ï‚ Ï„Î·Î½ Î±Î½Î±ÏƒÏ„Î¿Î»Î® Ï„Î¿Ï… Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï Î³Î¹Î± Î½Î± Î¼Ï€Î¿ÏÎÏƒÎµÎ¹ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î·Î¸ÎµÎ¯ Î±Î»Î»Î¬ Î±Ï…Ï„ÏŒ Î´ÎµÎ½ Î¸Î± ÎµÏ€Î±Î½Î±Ï†ÎÏÎµÎ¹ ÏŒÏƒÎ± Î´ÎµÎ´Î¿Î¼ÎÎ½Î± ÎµÎ¯Ï‡Îµ Ï€ÏÎ¿Î·Î³Î¿Ï…Î¼ÎÎ½Ï‰Ï‚.
+      suspension_reversible_hint_html: ÎŸ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ ÎÏ‡ÎµÎ¹ Î±Î½Î±ÏƒÏ„Î±Î»Î»ÎµÎ¯ ÎºÎ±Î¹ Ï„Î± Î´ÎµÎ´Î¿Î¼ÎÎ½Î± Ï„Î¿Ï… Î¸Î± Î´Î¹Î±Î³ÏÎ±Ï†Î¿ÏÎ½ Ï€Î»Î®ÏÏ‰Ï‚ ÏƒÏ„Î¹Ï‚ %{date}. ÎœÎÏ‡ÏÎ¹ Ï„ÏŒÏ„Îµ Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± ÎµÏ€Î±Î½ÎÎ»Î¸ÎµÎ¹ ÎºÎ±Î½Î¿Î½Î¹ÎºÎ¬. Î‘Î½ Î¸ÎÎ»ÎµÎ¹Ï‚ Î½Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÎ¹Ï‚ ÏŒÎ»Î± Ï„Î± Î´ÎµÎ´Î¿Î¼ÎÎ½Î± Ï„Î¿Ï… Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï, Î¼Ï€Î¿ÏÎµÎ¯Ï‚ Î½Î± Ï„Î¿ ÎºÎ¬Î½ÎµÎ¹Ï‚ Ï€Î±ÏÎ±ÎºÎ¬Ï„Ï‰.
       time_in_queue: Î£Îµ Î±Î½Î±Î¼Î¿Î½Î® Î³Î¹Î± %{time}
       title: Î›Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Î¯
       unconfirmed_email: Î‘Î½ÎµÏ€Î¹Î²ÎµÎ²Î±Î¯Ï‰Ï„Î¿ email
+      undo_sensitized: Î‘Î½Î±Î¯ÏÎµÏƒÎ· ÎµÏ…Î±Î¯ÏƒÎ¸Î·Ï„Î¿Ï…
       undo_silenced: Î‘Î½Î±Î¯ÏÎµÏƒÎ· Î±Ï€Î¿ÏƒÎ¹ÏŽÏ€Î·ÏƒÎ·Ï‚
       undo_suspension: Î‘Î½Î±Î¯ÏÎµÏƒÎ· Ï€Î±ÏÏƒÎ·Ï‚
+      unsilenced_msg: Î•Ï€Î¹Ï„Ï…Ï‡Î®Ï‚ Î¬ÏÏƒÎ· Ï€ÎµÏÎ¹Î¿ÏÎ¹ÏƒÎ¼ÏŽÎ½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï Ï„Î¿Ï…/Ï„Î·Ï‚ %{username}
       unsubscribe: ÎšÎ±Ï„Î¬ÏÎ³Î·ÏƒÎ· ÎµÎ³Î³ÏÎ±Ï†Î®Ï‚
+      unsuspended_msg: Î•Ï€Î¹Ï„Ï…Ï‡Î®Ï‚ Î¬ÏÏƒÎ· Î±Î½Î±ÏƒÏ„Î¿Î»Î®Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï Ï„Î¿Ï…/Ï„Î·Ï‚ %{username}
       username: ÎŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î·
+      view_domain: Î ÏÎ¿Î²Î¿Î»Î® Ï€ÎµÏÎ¯Î»Î·ÏˆÎ·Ï‚ Î³Î¹Î± Ï„Î¿Î¼ÎÎ±
       warn: Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·
       web: Î”Î¹Î±Î´Î¯ÎºÏ„Ï…Î¿
       whitelisted: Î•Î³ÎºÎµÎºÏÎ¹Î¼ÎÎ½Î¿Î¹
@@ -208,12 +227,14 @@ el:
         create_domain_allow: Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Î•Ï€Î¹Ï„ÏÎµÏ€Ï„Î¿Ï Î¤Î¿Î¼ÎÎ±
         create_domain_block: Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Î‘Ï€Î¿ÎºÎ»ÎµÎ¹ÏƒÎ¼ÎÎ½Î¿Ï… Î¤Î¿Î¼ÎÎ±
         create_email_domain_block: Î”Î·Î¼Î¿Ï…ÏÎ³Î¯Î± Î‘Ï€Î¿ÎºÎ»ÎµÎ¹ÏƒÎ¼ÎÎ½Î¿Ï… Î¤Î¿Î¼ÎÎ± email
+        create_ip_block: Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± ÎºÎ±Î½ÏŒÎ½Î± IP
         demote_user: Î¥Ï€Î¿Î²Î¹Î²Î±ÏƒÎ¼ÏŒÏ‚ Î§ÏÎ®ÏƒÏ„Î·
         destroy_announcement: Î”Î¹Î±Î³ÏÎ±Ï†Î® Î‘Î½Î±ÎºÎ¿Î¯Î½Ï‰ÏƒÎ·Ï‚
         destroy_custom_emoji: Î”Î¹Î±Î³ÏÎ±Ï†Î® Î ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Î¿Ï… Emoji
         destroy_domain_allow: Î”Î¹Î±Î³ÏÎ±Ï†Î® Î•Ï€Î¹Ï„ÏÎµÏ€Ï„Î¿Ï Î¤Î¿Î¼ÎÎ±
         destroy_domain_block: Î”Î¹Î±Î³ÏÎ±Ï†Î® Î‘Ï€Î¿ÎºÎ»ÎµÎ¹ÏƒÎ¼Î¿Ï Î¤Î¿Î¼ÎÎ±
         destroy_email_domain_block: Î”Î¹Î±Î³ÏÎ±Ï†Î® Î‘Ï€Î¿ÎºÎ»ÎµÎ¹ÏƒÎ¼ÎÎ½Î¿Ï… Î¤Î¿Î¼ÎÎ± email
+        destroy_ip_block: Î”Î¹Î±Î³ÏÎ±Ï†Î® ÎºÎ±Î½ÏŒÎ½Î± IP
         destroy_status: Î”Î¹Î±Î³ÏÎ±Ï†Î® ÎšÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚
         disable_2fa_user: Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· 2FA
         disable_custom_emoji: Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Ï‰Î½ Emoji
@@ -226,9 +247,11 @@ el:
         reopen_report: ÎžÎ±Î½Î¬Î½Î¿Î¹Î³Î¼Î± ÎšÎ±Ï„Î±Î³Î³ÎµÎ»Î¯Î±Ï‚
         reset_password_user: Î•Ï€Î±Î½Î±Ï†Î¿ÏÎ¬ Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï
         resolve_report: Î•Ï€Î¯Î»Ï…ÏƒÎ· ÎšÎ±Ï„Î±Î³Î³ÎµÎ»Î¯Î±Ï‚
+        sensitive_account: Î£Î®Î¼Î±Î½ÏƒÎ· Ï„Ï‰Î½ Ï€Î¿Î»Ï…Î¼ÎÏƒÏ‰Î½ ÏƒÏ„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ±Ï‚ Ï‰Ï‚ ÎµÏ…Î±Î¯ÏƒÎ¸Î·Ï„Ï‰Î½
         silence_account: Î£Î¯Î³Î±ÏƒÎ· Î›Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï
         suspend_account: Î‘Î½Î±ÏƒÏ„Î¿Î»Î® Î›Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï
         unassigned_report: Î‘Ï€Î¿Î´ÎÏƒÎ¼ÎµÏ…ÏƒÎ· ÎšÎ±Ï„Î±Î³Î³ÎµÎ»Î¯Î±Ï‚
+        unsensitive_account: Î‘Ï†Î±Î¯ÏÎµÏƒÎ· ÏƒÎ®Î¼Î±Î½ÏƒÎ·Ï‚ Ï„Ï‰Î½ Ï€Î¿Î»Ï…Î¼ÎÏƒÏ‰Î½ ÏƒÏ„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ±Ï‚ Ï‰Ï‚ ÎµÏ…Î±Î¯ÏƒÎ¸Î·Ï„Ï‰Î½
         unsilence_account: Î†ÏÏƒÎ· Î£Î¯Î³Î±ÏƒÎ·Ï‚ Î›Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï
         unsuspend_account: Î†ÏÏƒÎ· Î‘Î½Î±ÏƒÏ„Î¿Î»Î®Ï‚ Î›Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï
         update_announcement: Î•Î½Î·Î¼ÎÏÏ‰ÏƒÎ· Î‘Î½Î±ÎºÎ¿Î¯Î½Ï‰ÏƒÎ·Ï‚
@@ -244,12 +267,14 @@ el:
         create_domain_allow: ÎŸ/Î— %{name} ÎÎ²Î±Î»Îµ Ï„Î¿Î½ Ï„Î¿Î¼ÎÎ± %{target} ÏƒÎµ Î»ÎµÏ…ÎºÎ® Î»Î¯ÏƒÏ„Î±
         create_domain_block: ÎŸ/Î— %{name} Î¼Ï€Î»ÏŒÎºÎ±ÏÎµ Ï„Î¿Î½ Ï„Î¿Î¼ÎÎ± %{target}
         create_email_domain_block: ÎŸ/Î— %{name} ÎÎ²Î±Î»Îµ Ï„Î¿Î½ Ï„Î¿Î¼ÎÎ± email %{target} ÏƒÎµ Î¼Î±ÏÏÎ· Î»Î¯ÏƒÏ„Î±
+        create_ip_block: ÎŸ/Î— %{name} Î´Î·Î¼Î¹Î¿ÏÏÎ³Î·ÏƒÎµ ÎºÎ±Î½ÏŒÎ½Î± Î³Î¹Î± Ï„Î·Î½ IP %{target}
         demote_user: ÎŸ/Î— %{name} Ï…Ï€Î¿Î²Î¯Î²Î±ÏƒÎµ Ï„Î¿ Ï‡ÏÎ®ÏƒÏ„Î· %{target}
         destroy_announcement: Î”Î¹Î±Î³ÏÎ±Ï†Î® Î±Î½Î±ÎºÎ¿Î¯Î½Ï‰ÏƒÎ·Ï‚ %{target} Î±Ï€ÏŒ %{name}
         destroy_custom_emoji: ÎŸ/Î— %{name} ÎºÎ±Ï„ÎÏƒÏ„ÏÎµÏˆÎµ Ï„Î¿ emoji %{target}
         destroy_domain_allow: ÎŸ/Î— %{name} Î±Ï†Î±Î¯ÏÎµÏƒÎµ Ï„Î¿Î½ Ï„Î¿Î¼ÎÎ± %{target} Î±Ï€ÏŒ Î»Î¯ÏƒÏ„Î± ÎµÎ³ÎºÏÎ¯ÏƒÎµÏ‰Î½
         destroy_domain_block: ÎŸ/Î— %{name} Î¾ÎµÎ¼Ï€Î»ÏŒÎºÎ±ÏÎµ Ï„Î¿Î½ Ï„Î¿Î¼ÎÎ± %{target}
         destroy_email_domain_block: ÎŸ/Î— %{name} ÎÎ²Î±Î»Îµ Ï„Î¿Î½ Ï„Î¿Î¼ÎÎ± email %{target} ÏƒÎµ Î»ÎµÏ…ÎºÎ® Î»Î¯ÏƒÏ„Î±
+        destroy_ip_block: ÎŸ/Î— %{name} Î´Î¹ÎÎ³ÏÎ±ÏˆÎµ ÎºÎ±Î½ÏŒÎ½Î± Î³Î¹Î± Ï„Î·Î½ IP %{target}
         destroy_status: ÎŸ/Î— %{name} Î±Ï†Î±Î¯ÏÎµÏƒÎµ Ï„Î·Î½ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Ï„Î¿Ï…/Ï„Î·Ï‚ %{target}
         disable_2fa_user: ÎŸ/Î— %{name} Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎµ Ï„Î·Î½ Î±Ï€Î±Î¯Ï„Î·ÏƒÎ· Î´ÏÎ¿ Ï€Î±ÏÎ±Î³ÏŒÎ½Ï„Ï‰Î½ Î³Î¹Î± Ï„Î¿ Ï‡ÏÎ®ÏƒÏ„Î· %{target}
         disable_custom_emoji: ÎŸ/Î— %{name} Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎµ Ï„Î¿ emoji %{target}
@@ -434,6 +459,20 @@ el:
         expired: Î›Î·Î³Î¼ÎÎ½ÎµÏ‚
         title: Î¦Î¯Î»Ï„ÏÎ¿
       title: Î ÏÎ¿ÏƒÎºÎ»Î®ÏƒÎµÎ¹Ï‚
+    ip_blocks:
+      add_new: Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± ÎºÎ±Î½ÏŒÎ½Î±
+      created_msg: Î•Ï€Î¹Ï„Ï…Ï‡Î®Ï‚ Ï€ÏÎ¿ÏƒÎ¸Î®ÎºÎ· Î½ÎÎ¿Ï… ÎºÎ±Î½ÏŒÎ½Î± IP
+      delete: Î”Î¹Î±Î³ÏÎ±Ï†Î®
+      expires_in:
+        '1209600': 2 ÎµÎ²Î´Î¿Î¼Î¬Î´ÎµÏ‚
+        '15778476': 6 Î¼Î®Î½ÎµÏ‚
+        '2629746': 1 Î¼Î®Î½Î±Ï‚
+        '31556952': 1 ÎÏ„Î¿Ï‚
+        '86400': 1 Î·Î¼ÎÏÎ±
+        '94670856': 3 ÎÏ„Î·
+      new:
+        title: Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Î½ÎÎ¿Ï… ÎºÎ±Î½ÏŒÎ½Î± IP
+      title: ÎšÎ±Î½ÏŒÎ½ÎµÏ‚ IP
     pending_accounts:
       title: Î›Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Î¯ ÏƒÎµ Î±Î½Î±Î¼Î¿Î½Î® (%{count})
     relationships:
@@ -473,6 +512,8 @@ el:
       comment:
         none: ÎšÎ±Î½ÎÎ½Î±
       created_at: ÎšÎ±Ï„Î±Î³Î³ÎÎ»Î¸Î·ÎºÎµ
+      forwarded: Î ÏÎ¿Ï‰Î¸Î·Î¼ÎÎ½Î±
+      forwarded_to: Î ÏÎ¿ÏŽÎ¸Î·Î¼ÎÎ½Î± Ï€ÏÎ¿Ï‚ %{domain}
       mark_as_resolved: Î£Î·Î¼ÎµÎ¹Ï‰Î¼ÎÎ½Î¿ Ï‰Ï‚ ÎµÏ€Î¹Î»Ï…Î¼ÎÎ½Î¿
       mark_as_unresolved: Î£Î·Î¼ÎµÎ¹Ï‰Î¼ÎÎ½Î¿ Ï‰Ï‚ Î±Î½ÎµÏ€Î¯Î»Ï…Ï„Î¿
       notes:
@@ -516,6 +557,7 @@ el:
       domain_blocks_rationale:
         title: Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· ÏƒÎºÎµÏ€Ï„Î¹ÎºÎ¿Ï
       enable_bootstrap_timeline_accounts:
+        desc_html: ÎŸÎ¹ Î½ÎÎ¿Î¹ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Î½Î± Î±ÎºÎ¿Î»Î¿Ï…Î¸Î¿ÏÎ½ Ï„Î¿Ï…Ï‚ Ï€ÏÎ¿ÏÏ…Î¸Î¼Î¹ÏƒÎ¼ÎÎ½Î¿Ï…Î½Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿ÏÏ‚ ÏŽÏƒÏ„Îµ Î· Î±ÏÏ‡Î¹ÎºÎ® ÏÎ¿Î® Ï„Î¿Ï…Ï‚ Î½Î± Î¼Î·Î½ ÎµÎ¯Î½Î±Î¹ Î¬Î´ÎµÎ¹Î±
         title: Î ÏÎ¿ÎµÏ€Î¹Î»Î¿Î³Î® Ï€Î±ÏÎ±ÎºÎ¿Î»Î¿ÏÎ¸Î·ÏƒÎ·Ï‚ Î³Î¹Î± Ï„Î¿Ï…Ï‚ Î½ÎÎ¿Ï…Ï‚ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚
       hero:
         desc_html: Î•Î¼Ï†Î±Î½Î¯Î¶ÎµÏ„Î±Î¹ ÏƒÏ„Î·Î½ Î¼Ï€ÏÎ¿ÏƒÏ„Î¹Î½Î® ÏƒÎµÎ»Î¯Î´Î±. Î£Ï…Î½Î¯ÏƒÏ„Î±Ï„Î±Î¹ Ï„Î¿Ï…Î»Î¬Ï‡Î¹ÏƒÏ„Î¿Î½ 600x100px. ÎŒÏ„Î±Î½ Î»ÎµÎ¯Ï€ÎµÎ¹, Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î· Î¼Î¹ÎºÏÎ¿Î³ÏÎ±Ï†Î¯Î± Ï„Î¿Ï… ÎºÏŒÎ¼Î²Î¿Ï…
@@ -681,8 +723,11 @@ el:
       prefix_sign_up: Î†Î½Î¿Î¹Î¾Îµ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÏ„Î¿ Mastodon ÏƒÎ®Î¼ÎµÏÎ±!
       suffix: Î‘Î½Î¿Î¯Î³Î¿Î½Ï„Î±Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ Î¸Î± Î¼Ï€Î¿ÏÎµÎ¯Ï‚ Î½Î± Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯Ï‚ Î¬Î»Î»Î¿Ï…Ï‚, Î½Î± Î±Î½ÎµÎ²Î¬Î¶ÎµÎ¹Ï‚ ÎµÎ½Î·Î¼ÎµÏÏŽÏƒÎµÎ¹Ï‚ ÎºÎ±Î¹ Î½Î± Î±Î½Ï„Î±Î»Î»Î¬Î¶ÎµÎ¹Ï‚ Î¼Î·Î½ÏÎ¼Î±Ï„Î± Î¼Îµ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ ÏƒÎµ Î¿Ï€Î¿Î¹Î¿Î´Î®Ï€Î¿Ï„Îµ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® Mastodon, ÎºÎ±Î¸ÏŽÏ‚ ÎºÎ±Î¹ Î¬Î»Î»Î±!
     didnt_get_confirmation: Î”ÎµÎ½ ÎÎ»Î±Î²ÎµÏ‚ Ï„Î¹Ï‚ Î¿Î´Î·Î³Î¯ÎµÏ‚ ÎµÏ€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ·Ï‚;
+    dont_have_your_security_key: Î”ÎµÎ½ ÎÏ‡ÎµÏ„Îµ ÎºÎ»ÎµÎ¹Î´Î¯ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚;
     forgot_password: ÎžÎÏ‡Î±ÏƒÎµÏ‚ Ï„Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ ÏƒÎ¿Ï…;
     invalid_reset_password_token: Î¤Î¿ Î´Î¹Î±ÎºÏÎ¹Ï„Î¹ÎºÏŒ ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬Ï‚ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï ÎµÎ¯Î½Î±Î¹ Î¬ÎºÏ…ÏÎ¿ Î® Î»Î·Î³Î¼ÎÎ½Î¿. Î Î±ÏÎ±ÎºÎ±Î»ÏŽ Î±Î¹Ï„Î®ÏƒÎ¿Ï… Î½ÎÎ¿.
+    link_to_otp: Î“ÏÎ¬ÏˆÎµ Ï„Î¿Î½ ÎºÏ‰Î´Î¹ÎºÏŒ Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚ 2 Ï€Î±ÏÎ±Î³ÏŒÎ½Ï„Ï‰Î½ (2FA) Î±Ï€ÏŒ Ï„Î¿ Ï„Î·Î»ÎÏ†Ï‰Î½ÏŒ ÏƒÎ¿Ï… Î® Ï„Î¿Î½ ÎºÏ‰Î´Î¹ÎºÏŒ ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬Ï‚
+    link_to_webauth: Î§ÏÎ®ÏƒÎ· ÏƒÏ…ÏƒÎºÎµÏ…Î®Ï‚ ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚
     login: Î£ÏÎ½Î´ÎµÏƒÎ·
     logout: Î‘Ï€Î¿ÏƒÏÎ½Î´ÎµÏƒÎ·
     migrate_account: ÎœÎµÏ„Î±ÎºÏŒÎ¼Î¹ÏƒÎ· ÏƒÎµ Î´Î¹Î±Ï†Î¿ÏÎµÏ„Î¹ÎºÏŒ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ
@@ -708,6 +753,7 @@ el:
       pending: Î— ÎµÏ†Î±ÏÎ¼Î¿Î³Î® ÏƒÎ±Ï‚ ÎµÎºÎºÏÎµÎ¼ÎµÎ¯ ÎÎ³ÎºÏÎ¹ÏƒÎ·Ï‚, Ï€Î¹Î¸Î±Î½ÏŒÎ½ Î¸Î± Î´Î¹Î±ÏÎºÎÏƒÎµÎ¹ ÎºÎ¬Ï€Î¿Î¹Î¿ Ï‡ÏÏŒÎ½Î¿. Î˜Î± Î»Î¬Î²ÎµÏ„Îµ email Î±Î½ ÎµÎ³ÎºÏÎ¹Î¸ÎµÎ¯.
       redirecting_to: ÎŸ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ ÏƒÎ¿Ï… ÎµÎ¯Î½Î±Î¹ Î±Î½ÎµÎ½ÎµÏÎ³ÏŒÏ‚ Î³Î¹Î±Ï„Î¯ ÎµÏ€Î¯ Ï„Î¿Ï… Ï€Î±ÏÏŒÎ½Ï„Î¿Ï‚ Î±Î½Î±ÎºÎ±Ï„ÎµÏ…Î¸ÏÎ½ÎµÎ¹ ÏƒÏ„Î¿Î½ %{acct}.
     trouble_logging_in: Î ÏÏŒÎ²Î»Î·Î¼Î± ÏƒÏÎ½Î´ÎµÏƒÎ·Ï‚;
+    use_security_key: Î§ÏÎ®ÏƒÎ· ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚
   authorize_follow:
     already_following: Î‰Î´Î· Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯Ï‚ Î±Ï…Ï„ÏŒ Ï„Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ
     already_requested: ÎˆÏ‡ÎµÏ„Îµ Î®Î´Î· ÏƒÏ„ÎµÎ¯Î»ÎµÎ¹ ÎÎ½Î± Î±Î¯Ï„Î·Î¼Î± Î±ÎºÎ¿Î»Î¿ÏÎ¸Î·ÏƒÎ·Ï‚ ÏƒÎµ Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ
@@ -732,6 +778,7 @@ el:
   date:
     formats:
       default: "%b %d, %Y"
+      with_month_name: "%B %d, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}Ï‰"
@@ -796,6 +843,7 @@ el:
       request: Î‘Î¹Ï„Î®ÏƒÎ¿Ï… Ï„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ ÏƒÎ¿Ï…
       size: ÎœÎÎ³ÎµÎ¸Î¿Ï‚
     blocks: ÎœÏ€Î»Î¿ÎºÎ¬ÏÎµÎ¹Ï‚
+    bookmarks: Î£ÎµÎ»Î¹Î´Î¿Î´ÎµÎ¯ÎºÏ„ÎµÏ‚
     csv: CSV
     domain_blocks: ÎœÏ€Î»Î¿ÎºÎ±ÏÎ¯ÏƒÎ¼Î±Ï„Î± ÎºÏŒÎ¼Î²Ï‰Î½
     lists: Î›Î¯ÏƒÏ„ÎµÏ‚
@@ -863,6 +911,8 @@ el:
     status: ÎšÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· ÎµÏ€Î±Î»Î®Î¸ÎµÏ…ÏƒÎ·Ï‚
     view_proof: Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Î±Ï€ÏŒÎ´ÎµÎ¹Î¾Î·Ï‚
   imports:
+    errors:
+      over_rows_processing_limit: Ï€ÎµÏÎ¹ÎÏ‡ÎµÎ¹ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎµÏ‚ Î±Ï€ÏŒ %{count} Î³ÏÎ±Î¼Î¼ÎÏ‚
     modes:
       merge: Î£Ï…Î³Ï‡ÏŽÎ½ÎµÏ…ÏƒÎ·
       merge_long: Î”Î¹Î±Ï„Î®ÏÎ·ÏƒÎ· Ï„Ï‰Î½ ÎµÎ³Î³ÏÎ¬Ï†Ï‰Î½ Ï€Î¿Ï… Ï…Ï€Î¬ÏÏ‡Î¿Ï…Î½ ÎºÎ±Î¹ Ï€ÏÎ¿ÏƒÎ¸Î·ÎºÎ· Ï„Ï‰Î½ Î½ÎÏ‰Î½
@@ -872,6 +922,7 @@ el:
     success: Î¤Î± Î´ÎµÎ´Î¿Î¼ÎÎ½Î± ÏƒÎ¿Ï… Î¼ÎµÏ„Î±Ï†Î¿ÏÏ„ÏŽÎ¸Î·ÎºÎ±Î½ ÎµÏ€Î¹Ï„Ï…Ï‡ÏŽÏ‚ ÎºÎ±Î¹ Î¸Î± ÎµÏ€ÎµÎ¾ÎµÏÎ³Î±ÏƒÏ„Î¿ÏÎ½ ÎµÎ½ ÎºÎ±Î¹ÏÏŽ
     types:
       blocking: Î›Î¯ÏƒÏ„Î± Î±Ï€Î¿ÎºÎ»ÎµÎ¹ÏƒÎ¼Î¿Ï
+      bookmarks: Î£ÎµÎ»Î¹Î´Î¿Î´ÎµÎ¯ÎºÏ„ÎµÏ‚
       domain_blocking: Î›Î¯ÏƒÏ„Î± Î±Ï€Î¿ÎºÎ»ÎµÎ¹ÏƒÎ¼ÎÎ½Ï‰Î½ Ï„Î¿Î¼ÎÏ‰Î½
       following: Î›Î¯ÏƒÏ„Î± Î±ÎºÎ¿Î»Î¿ÏÎ¸Ï‰Î½
       muting: Î›Î¯ÏƒÏ„Î± Î±Ï€Î¿ÏƒÎ¹Ï‰Ï€Î®ÏƒÎµÏ‰Î½
@@ -992,6 +1043,10 @@ el:
           quadrillion: Ï„ÎµÏ„ÏÎ¬ÎºÎ¹Ï‚.
           thousand: Ï‡.
           trillion: Ï„ÏÎ¹Ï‚.
+  otp_authentication:
+    code_hint: Î“Î¹Î± Î½Î± ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÎ¹Ï‚, Î³ÏÎ¬ÏˆÎµ Ï„Î¿Î½ ÎºÏ‰Î´Î¹ÎºÏŒ Ï€Î¿Ï… Î´Î·Î¼Î¹Î¿ÏÏÎ³Î·ÏƒÎµ Î· ÎµÏ†Î±ÏÎ¼Î¿Î³Î® Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚
+    enable: Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·
+    setup: Î¡ÏÎ¸Î¼Î¹ÏƒÎ·
   pagination:
     newer: ÎÎµÏŒÏ„ÎµÏÎ¿
     next: Î•Ï€ÏŒÎ¼ÎµÎ½Î¿
@@ -1154,6 +1209,8 @@ el:
         other: "%{count} ÏˆÎ®Ï†Î¿Î¹"
       vote: Î¨Î®Ï†Î¹ÏƒÎµ
     show_more: Î”ÎµÎ¯Î¾Îµ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ±
+    show_newer: Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Î½ÎµÏŒÏ„ÎµÏÏ‰Î½
+    show_older: Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï€Î±Î»Î±Î¹ÏŒÏ„ÎµÏÏ‰Î½
     show_thread: Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Î½Î®Î¼Î±Ï„Î¿Ï‚
     sign_in_to_participate: Î£Ï…Î½Î´ÎÏƒÎ¿Ï… Î³Î¹Î± Î½Î± ÏƒÏ…Î¼Î¼ÎµÏ„Î¬ÏƒÏ‡ÎµÎ¹Ï‚ ÏƒÏ„Î· ÏƒÏ…Î¶Î®Ï„Î·ÏƒÎ·
     title: '%{name}: "%{quote}"'
@@ -1262,21 +1319,17 @@ el:
       default: "%b %d, %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Î’Î¬Î»Îµ Ï„Î¿Î½ ÎºÏ‰Î´Î¹ÎºÏŒ Ï€Î¿Ï… Î´Î·Î¼Î¹Î¿ÏÏÎ³Î·ÏƒÎµ Î· ÎµÏ†Î±ÏÎ¼Î¿Î³Î® Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ®Ï‚ ÏƒÎ¿Ï… Î³Î¹Î± ÎµÏ€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ·
-    description_html: Î‘Î½ ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ Ï„Î·Î½ <strong>Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ· 2 Ï€Î±ÏÎ±Î³ÏŒÎ½Ï„Ï‰Î½ (2FA)</strong>, Î³Î¹Î± Î½Î± ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯Ï‚ Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎÏ‡ÎµÎ¹Ï‚ Ï„Î¿ Ï„Î·Î»ÎÏ†Ï‰Î½ÏŒ ÏƒÎ¿Ï…, Ï€Î¿Ï… Î¸Î± ÏƒÎ¿Ï… Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î®ÏƒÎµÎ¹ ÎºÎ»ÎµÎ¹Î´Î¹Î¬ ÎµÎ¹ÏƒÏŒÎ´Î¿Ï….
+    add: Î ÏÎ¿ÏƒÎ¸Î®ÎºÎ·
     disable: Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎµ
-    enable: Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎµ
+    edit: Î•Ï€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î±
     enabled: Î— Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ· 2 Ï€Î±ÏÎ±Î³ÏŒÎ½Ï„Ï‰Î½ (2FA) ÎµÎ¯Î½Î±Î¹ ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î·
     enabled_success: Î— Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ· 2 Ï€Î±ÏÎ±Î³ÏŒÎ½Ï„Ï‰Î½ (2FA) ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎµ ÎµÏ€Î¹Ï„Ï…Ï‡ÏŽÏ‚
     generate_recovery_codes: Î”Î·Î¼Î¹Î¿ÏÏÎ³Î·ÏƒÎµ ÎºÏ‰Î´Î¹ÎºÎ¿ÏÏ‚ Î±Î½Î¬ÎºÏ„Î·ÏƒÎ·Ï‚
-    instructions_html: "<strong>Î£Î¬ÏÏ‰ÏƒÎµ Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ ÎºÏ‰Î´Î¹ÎºÏŒ QR Î¼Îµ Ï„Î·Î½ ÎµÏ†Î±ÏÎ¼Î¿Î³Î® Google Authenticator Î® ÎºÎ¬Ï€Î¿Î¹Î± Î¬Î»Î»Î· Î±Î½Ï„Î¯ÏƒÏ„Î¿Î¹Ï‡Î· ÏƒÏ„Î¿ Ï„Î·Î»ÎÏ†Ï‰Î½ÏŒ ÏƒÎ¿Ï…</strong>. Î‘Ï€ÏŒ ÎµÎ´ÏŽ ÎºÎ±Î¹ ÏƒÏ„Î¿ ÎµÎ¾Î®Ï‚, Î· ÎµÏ†Î±ÏÎ¼Î¿Î³Î® Î±Ï…Ï„Î® Î¸Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³ÎµÎ¯ ÎºÎ»ÎµÎ¹Î´Î¹Î¬ Ï€Î¿Ï… Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¹ÏƒÎ¬Î³ÎµÎ¹Ï‚ ÏŒÏ„Î±Î½ ÏƒÏ…Î½Î´ÎÎµÏƒÎ±Î¹."
     lost_recovery_codes: ÎŸÎ¹ ÎºÏ‰Î´Î¹ÎºÎ¿Î¯ Î±Î½Î¬ÎºÏ„Î·ÏƒÎ·Ï‚ ÏƒÎ¿Ï… ÎµÏ€Î¹Ï„ÏÎÏ€Î¿Ï…Î½ Î½Î± Î±Î½Î±ÎºÏ„Î®ÏƒÎµÎ¹Ï‚ Î¾Î±Î½Î¬ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ· ÏƒÏ„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ¿Ï… Î±Î½ Ï‡Î¬ÏƒÎµÎ¹Ï‚ Ï„Î¿ Ï„Î·Î»ÎÏ†Ï‰Î½ÏŒ ÏƒÎ¿Ï…. Î‘Î½ ÎÏ‡ÎµÎ¹Ï‚ Ï‡Î¬ÏƒÎµÎ¹ Ï„Î¿Ï…Ï‚ ÎºÏ‰Î´Î¹ÎºÎ¿ÏÏ‚ Î±Î½Î¬ÎºÏ„Î·ÏƒÎ·Ï‚, Î¼Ï€Î¿ÏÎµÎ¯Ï‚ Î½Î± Ï„Î¿Ï…Ï‚ Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î®ÏƒÎµÎ¹Ï‚ Î¾Î±Î½Î¬ ÎµÎ´ÏŽ. ÎŸÎ¹ Ï€Î±Î»Î¹Î¿Î¯ ÎºÏ‰Î´Î¹ÎºÎ¿Î¯ ÏƒÎ¿Ï… Î¸Î± Î±ÎºÏ…ÏÏ‰Î¸Î¿ÏÎ½.
-    manual_instructions: 'Î‘Î½ Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯Ï‚ Î½Î± ÏƒÎ±ÏÏŽÏƒÎµÎ¹Ï‚ Ï„Î¿Î½ ÎºÏ‰Î´Î¹ÎºÏŒ QR ÎºÎ±Î¹ Ï‡ÏÎµÎ¹Î¬Î¶ÎµÏƒÎ±Î¹ Î½Î± Ï„Î¿Î½ ÎµÎ¹ÏƒÎ¬Î³ÎµÎ¹Ï‚ Ï‡ÎµÎ¹ÏÎ¿ÎºÎ¯Î½Î·Ï„Î±, Î¿ÏÎ¯ÏƒÏ„Îµ Î· Î¼Ï…ÏƒÏ„Î¹ÎºÎ® Ï†ÏÎ¬ÏƒÎ· ÏƒÎµ Î¼Î¿ÏÏ†Î® ÎºÎµÎ¹Î¼ÎÎ½Î¿Ï…:'
+    otp: Î•Ï†Î±ÏÎ¼Î¿Î³Î® ÎµÏ€Î±Î»Î®Î¸ÎµÏ…ÏƒÎ·Ï‚
     recovery_codes: Î•Ï†ÎµÎ´ÏÎ¹ÎºÎ¿Î¯ ÎºÏ‰Î´Î¹ÎºÎ¿Î¯ Î±Î½Î¬ÎºÏ„Î·ÏƒÎ·Ï‚
     recovery_codes_regenerated: ÎŸÎ¹ ÎµÏ†ÎµÎ´ÏÎ¹ÎºÎ¿Î¯ ÎºÏ‰Î´Î¹ÎºÎ¿Î¯ Î±Î½Î¬ÎºÏ„Î·ÏƒÎ·Ï‚ Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î®Î¸Î·ÎºÎ±Î½ ÎµÏ€Î¹Ï„Ï…Ï‡ÏŽÏ‚
     recovery_instructions_html: Î‘Î½ Ï€Î¿Ï„Î Î´ÎµÎ½ ÎÏ‡ÎµÎ¹Ï‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ· ÏƒÏ„Î¿ ÎºÎ¹Î½Î·Ï„ÏŒ ÏƒÎ¿Ï…, Î¼Ï€Î¿ÏÎµÎ¯Ï‚ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ ÎÎ½Î±Î½ Î±Ï€ÏŒ Ï„Î¿Ï…Ï‚ Ï€Î±ÏÎ±ÎºÎ¬Ï„Ï‰ ÎºÏ‰Î´Î¹ÎºÎ¿ÏÏ‚ Î±Î½Î¬ÎºÏ„Î·ÏƒÎ·Ï‚ Î³Î¹Î± Î½Î± Î±Ï€Î¿ÎºÏ„Î®ÏƒÎµÎ¹Ï‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ· ÏƒÏ„Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ¿Ï…. <strong>Î”Î¹Î±Ï†ÏÎ»Î±Î¾Îµ Ï„Î¿Ï…Ï‚ ÎºÏ‰Î´Î¹ÎºÎ¿ÏÏ‚ Î±Î½Î¬ÎºÏ„Î·ÏƒÎ·Ï‚</strong>. Î“Î¹Î± Ï€Î±ÏÎ¬Î´ÎµÎ¹Î³Î¼Î±, Î¼Ï€Î¿ÏÎµÎ¯Ï‚ Î½Î± Ï„Î¿Ï…Ï‚ ÎµÎºÏ„Ï…Ï€ÏŽÏƒÎµÎ¹Ï‚ ÎºÎ±Î¹ Î½Î± Ï„Î¿Ï…Ï‚ Ï†Ï…Î»Î¬Î¾ÎµÎ¹Ï‚ Î¼Î±Î¶Î¯ Î¼Îµ Î¬Î»Î»Î± ÏƒÎ·Î¼Î±Î½Ï„Î¹ÎºÎ¬ ÏƒÎ¿Ï… ÎÎ³Î³ÏÎ±Ï†Î±.
-    setup: Î£Ï„Î®ÏƒÎ¹Î¼Î¿
-    wrong_code: ÎŸ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ Ï€Î¿Ï… ÎÎ²Î±Î»ÎµÏ‚ Î®Ï„Î±Î½ Î¬ÎºÏ…ÏÎ¿Ï‚! Î¤Î± ÏÎ¿Î»ÏŒÎ³Î¹Î± ÏƒÏ„Î¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® ÎºÎ±Î¹ Ï„Î· ÏƒÏ…ÏƒÎºÎµÏ…Î® ÎµÎ¯Î½Î±Î¹ ÏƒÏ‰ÏƒÏ„Î¬;
   user_mailer:
     backup_ready:
       explanation: Î•Î¯Ï‡ÎµÏ‚ Î¶Î·Ï„Î®ÏƒÎµÎ¹ ÎµÏ†ÎµÎ´ÏÎ¹ÎºÏŒ Î±Î½Ï„Î¯Î³ÏÎ±Ï†Î¿ Ï„Î¿Ï… Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… ÏƒÏ„Î¿ Mastodon. Î•Î¯Î½Î±Î¹ ÎÏ„Î¿Î¹Î¼Î¿ Î³Î¹Î± ÎºÎ±Ï„ÎÎ²Î±ÏƒÎ¼Î±!
@@ -1304,6 +1357,7 @@ el:
       title:
         disable: Î Î±Î³Ï‰Î¼ÎÎ½Î¿Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚
         none: Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·
+        sensitive: Î¤Î¿ Ï€Î¿Î»Ï…Î¼ÎÏƒÎ¿ ÏƒÎ±Ï‚ ÎÏ‡ÎµÎ¹ ÏƒÎ·Î¼Î±Î½Î¸ÎµÎ¯ Ï‰Ï‚ ÎµÏ…Î±Î¯ÏƒÎ¸Î·Ï„Î¿
         silence: Î ÎµÏÎ¹Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚
         suspend: Î›Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ ÏƒÎµ Î±Î½Î±ÏƒÏ„Î¿Î»Î®
     welcome:
@@ -1324,9 +1378,11 @@ el:
       tips: Î£Ï…Î¼Î²Î¿Ï…Î»ÎÏ‚
       title: ÎšÎ±Î»ÏŽÏ‚ ÏŒÏÎ¹ÏƒÎµÏ‚, %{name}!
   users:
+    blocked_email_provider: Î”ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎµÏ€Î¹Ï„ÏÎµÏ€Ï„ÏŒÏ‚ Î±Ï…Ï„ÏŒÏ‚ Î¿ Ï€Î¬ÏÎ¿Ï‡Î¿Ï‚ email
     follow_limit_reached: Î”ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯Ï‚ Î½Î± Î±ÎºÎ¿Î»Î¿Ï…Î¸Î®ÏƒÎµÎ¹Ï‚ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ± Î±Ï€ÏŒ %{limit} Î¬Ï„Î¿Î¼Î±
     generic_access_help_html: Î”Ï…ÏƒÎºÎ¿Î»ÎµÏÎµÏƒÎ±Î¹ Î½Î± Î¼Ï€ÎµÎ¹Ï‚ ÏƒÏ„Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ¿Ï…; ÎœÏ€Î¿ÏÎµÎ¯Ï‚ Î½Î± ÎµÏ€Î¹ÎºÎ¿Î¹Î½Ï‰Î½Î®ÏƒÎµÎ¹Ï‚ ÏƒÏ„Î¿ %{email} Î³Î¹Î± Î²Î¿Î®Î¸ÎµÎ¹Î±
     invalid_email: Î— Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· email ÎµÎ¯Î½Î±Î¹ Î¬ÎºÏ…ÏÎ·
+    invalid_email_mx: Î‘Ï…Ï„Î® Î· Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· email Î´ÎµÎ½ Ï†Î±Î¯Î½ÎµÏ„Î±Î¹ Î½Î± Ï…Ï€Î¬ÏÏ‡ÎµÎ¹
     invalid_otp_token: Î†ÎºÏ…ÏÎ¿Ï‚ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚ 2 Ï€Î±ÏÎ±Î³ÏŒÎ½Ï„Ï‰Î½ (2FA)
     invalid_sign_in_token: Î†ÎºÏ…ÏÎ¿Ï‚ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ Î±ÏƒÏ†Î¬Î»ÎµÎ¹Î±Ï‚
     otp_lost_help_html: Î‘Î½ Ï‡Î¬ÏƒÎµÎ¹Ï‚ ÎºÎ±Î¹ Ï„Î± Î´ÏÎ¿, Î¼Ï€Î¿ÏÎµÎ¯Ï‚ Î½Î± ÎµÏ€Î¹ÎºÎ¿Î¹Î½Ï‰Î½Î®ÏƒÎµÎ¹Ï‚ Î¼Îµ Ï„Î¿Î½/Ï„Î·Î½ %{email}
@@ -1336,3 +1392,13 @@ el:
   verification:
     explanation_html: 'ÎœÏ€Î¿ÏÎµÎ¯Ï‚ Î½Î± <strong>Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ Ï„Î¿Î½ ÎµÎ±Ï…Ï„ÏŒ ÏƒÎ¿Ï… Ï‰Ï‚ Î¹Î´Î¹Î¿ÎºÏ„Î®Ï„Î· Ï„Ï‰Î½ ÏƒÏ…Î½Î´ÎÏƒÎ¼Ï‰Î½ Ï€Î¿Ï… ÎµÎ¼Ï†Î±Î½Î¯Î¶ÎµÎ¹Ï‚ ÏƒÏ„Î± Î¼ÎµÏ„Î±Î´ÎµÎ´Î¿Î¼ÎÎ½Î± Ï„Î¿Ï… Ï€ÏÎ¿Ï†Î¯Î» ÏƒÎ¿Ï…</strong>. Î“Î¹Î± Î½Î± ÏƒÏ…Î¼Î²ÎµÎ¯ Î±Ï…Ï„ÏŒ, Î¿ ÏƒÏ…Î½Î´ÎµÎ´ÎµÎ¼ÎÎ½Î¿Ï‚ Î¹ÏƒÏ„ÏŒÏ„Î¿Ï€Î¿Ï‚ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Ï€ÎµÏÎ¹ÎÏ‡ÎµÎ¹ ÎÎ½Î± ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿ Ï€Î¿Ï… Î½Î± ÎµÏ€Î¹ÏƒÏ„ÏÎÏ†ÎµÎ¹ Ï€ÏÎ¿Ï‚ Ï„Î¿ Ï€ÏÎ¿Ï†Î¯Î» ÏƒÎ¿Ï… ÏƒÏ„Î¿ Mastodon. ÎŸ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿Ï‚ ÎµÏ€Î¹ÏƒÏ„ÏÎ¿Ï†Î®Ï‚ <strong>Ï€ÏÎÏ€ÎµÎ¹</strong> Ï€ÎµÏÎ¹ÎÏ‡ÎµÎ¹ Ï„Î·Î½ Î¹Î´Î¹ÏŒÏ„Î·Ï„Î± (attribute) <code>rel="me"</code>. Î¤Î¿ Ï€ÎµÏÎ¹ÎµÏ‡ÏŒÎ¼ÎµÎ½Î¿ Ï„Î¿Ï… ÎºÎµÎ¹Î¼ÎÎ½Î¿Ï… Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏƒÎ·Î¼Î±ÏƒÎ¯Î±. Î“Î¹Î± Ï€Î±ÏÎ¬Î´ÎµÎ¹Î³Î¼Î±:'
     verification: Î Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ·
+  webauthn_credentials:
+    add: Î ÏÎ¿ÏƒÎ¸Î®ÎºÎ· Î½ÎÎ¿Ï… ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚
+    create:
+      success: Î¤Î¿ ÎºÎ»ÎµÎ¹Î´Î¯ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚ ÏƒÎ±Ï‚ Ï€ÏÎ¿ÏƒÏ„ÎÎ¸Î·ÎºÎµ Î¼Îµ ÎµÏ€Î¹Ï„Ï…Ï‡Î¯Î±.
+    delete: Î”Î¹Î±Î³ÏÎ±Ï†Î®
+    delete_confirmation: Î•Î¯ÏƒÏ„Îµ Î²ÎÎ²Î±Î¹Î¿Î¹ ÏŒÏ„Î¹ Î¸ÎÎ»ÎµÏ„Îµ Î½Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÏ„Îµ Î±Ï…Ï„ÏŒ Ï„Î¿ ÎºÎ»ÎµÎ¹Î´Î¯ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚;
+    destroy:
+      success: Î¤Î¿ ÎºÎ»ÎµÎ¹Î´Î¯ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚ ÏƒÎ±Ï‚ Î´Î¹Î±Î³ÏÎ¬Ï†Î·ÎºÎµ Î¼Îµ ÎµÏ€Î¹Ï„Ï…Ï‡Î¯Î±.
+    invalid_credential: Î†ÎºÏ…ÏÎ¿ ÎºÎ»ÎµÎ¹Î´Î¯ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚
+    registered_on: Î•Î³Î³ÏÎ±Ï†Î® ÏƒÏ„Î¹Ï‚ %{date}
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2cae0a3e3bad355d72efaf046b3fec03e5973721..8245397d7c7915f60d82cc370c961b864ee78c1b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -60,6 +60,7 @@ en:
       one: Follower
       other: Followers
     following: Following
+    instance_actor_flash: This account is a virtual actor used to represent the server itself and not any individual user. It is used for federation purposes and should not be suspended.
     joined: Joined %{date}
     last_active: last active
     link_verified_on: Ownership of this link was checked on %{date}
@@ -98,6 +99,7 @@ en:
       add_email_domain_block: Block e-mail domain
       approve: Approve
       approve_all: Approve all
+      approved_msg: Successfully approved %{username}'s sign-up application
       are_you_sure: Are you sure?
       avatar: Avatar
       by_domain: Domain
@@ -111,22 +113,26 @@ en:
       confirm: Confirm
       confirmed: Confirmed
       confirming: Confirming
+      delete: Delete data
       deleted: Deleted
       demote: Demote
-      disable: Disable
+      destroyed_msg: "%{username}'s data is now queued to be deleted imminently"
+      disable: Freeze
       disable_two_factor_authentication: Disable 2FA
-      disabled: Disabled
+      disabled: Frozen
       display_name: Display name
       domain: Domain
       edit: Edit
       email: Email
       email_status: Email status
-      enable: Enable
+      enable: Unfreeze
       enabled: Enabled
+      enabled_msg: Successfully unfroze %{username}'s account
       followers: Followers
       follows: Follows
       header: Header
       inbox_url: Inbox URL
+      invite_request_text: Reasons for joining
       invited_by: Invited by
       ip: IP
       joined: Joined
@@ -138,6 +144,8 @@ en:
       login_status: Login status
       media_attachments: Media attachments
       memorialize: Turn into memoriam
+      memorialized: Memorialized
+      memorialized_msg: Successfully turned %{username} into a memorial account
       moderation:
         active: Active
         all: All
@@ -158,10 +166,14 @@ en:
       public: Public
       push_subscription_expires: PuSH subscription expires
       redownload: Refresh profile
+      redownloaded_msg: Successfully refreshed %{username}'s profile from origin
       reject: Reject
       reject_all: Reject all
+      rejected_msg: Successfully rejected %{username}'s sign-up application
       remove_avatar: Remove avatar
       remove_header: Remove header
+      removed_avatar_msg: Successfully removed %{username}'s avatar image
+      removed_header_msg: Successfully removed %{username}'s header image
       resend_confirmation:
         already_confirmed: This user is already confirmed
         send: Resend confirmation email
@@ -178,22 +190,30 @@ en:
       search: Search
       search_same_email_domain: Other users with the same e-mail domain
       search_same_ip: Other users with the same IP
+      sensitive: Sensitive
+      sensitized: marked as sensitive
       shared_inbox_url: Shared inbox URL
       show:
         created_reports: Made reports
         targeted_reports: Reported by others
-      silence: Silence
-      silenced: Silenced
+      silence: Limit
+      silenced: Limited
       statuses: Statuses
       subscribe: Subscribe
       suspended: Suspended
+      suspension_irreversible: The data of this account has been irreversibly deleted. You can unsuspend the account to make it usable but it will not recover any data it previously had.
+      suspension_reversible_hint_html: The account has been suspended, and the data will be fully removed on %{date}. Until then, the account can be restored without any ill effects. If you wish to remove all of the account's data immediately, you can do so below.
       time_in_queue: Waiting in queue %{time}
       title: Accounts
       unconfirmed_email: Unconfirmed email
+      undo_sensitized: Undo sensitive
       undo_silenced: Undo silence
       undo_suspension: Undo suspension
+      unsilenced_msg: Successfully unlimited %{username}'s account
       unsubscribe: Unsubscribe
+      unsuspended_msg: Successfully unsuspended %{username}'s account
       username: Username
+      view_domain: View summary for domain
       warn: Warn
       web: Web
       whitelisted: Allowed for federation
@@ -208,12 +228,14 @@ en:
         create_domain_allow: Create Domain Allow
         create_domain_block: Create Domain Block
         create_email_domain_block: Create E-mail Domain Block
+        create_ip_block: Create IP rule
         demote_user: Demote User
         destroy_announcement: Delete Announcement
         destroy_custom_emoji: Delete Custom Emoji
         destroy_domain_allow: Delete Domain Allow
         destroy_domain_block: Delete Domain Block
         destroy_email_domain_block: Delete e-mail domain block
+        destroy_ip_block: Delete IP rule
         destroy_status: Delete Status
         disable_2fa_user: Disable 2FA
         disable_custom_emoji: Disable Custom Emoji
@@ -226,13 +248,16 @@ en:
         reopen_report: Reopen Report
         reset_password_user: Reset Password
         resolve_report: Resolve Report
+        sensitive_account: Mark the media in your account as sensitive
         silence_account: Silence Account
         suspend_account: Suspend Account
         unassigned_report: Unassign Report
+        unsensitive_account: Unmark the media in your account as sensitive
         unsilence_account: Unsilence Account
         unsuspend_account: Unsuspend Account
         update_announcement: Update Announcement
         update_custom_emoji: Update Custom Emoji
+        update_domain_block: Update Domain Block
         update_status: Update Status
       actions:
         assigned_to_self_report: "%{name} assigned report %{target} to themselves"
@@ -244,12 +269,14 @@ en:
         create_domain_allow: "%{name} allowed federation with domain %{target}"
         create_domain_block: "%{name} blocked domain %{target}"
         create_email_domain_block: "%{name} blocked e-mail domain %{target}"
+        create_ip_block: "%{name} created rule for IP %{target}"
         demote_user: "%{name} demoted user %{target}"
         destroy_announcement: "%{name} deleted announcement %{target}"
         destroy_custom_emoji: "%{name} destroyed emoji %{target}"
         destroy_domain_allow: "%{name} disallowed federation with domain %{target}"
         destroy_domain_block: "%{name} unblocked domain %{target}"
         destroy_email_domain_block: "%{name} unblocked e-mail domain %{target}"
+        destroy_ip_block: "%{name} deleted rule for IP %{target}"
         destroy_status: "%{name} removed status by %{target}"
         disable_2fa_user: "%{name} disabled two factor requirement for user %{target}"
         disable_custom_emoji: "%{name} disabled emoji %{target}"
@@ -262,13 +289,16 @@ en:
         reopen_report: "%{name} reopened report %{target}"
         reset_password_user: "%{name} reset password of user %{target}"
         resolve_report: "%{name} resolved report %{target}"
+        sensitive_account: "%{name} marked %{target}'s media as sensitive"
         silence_account: "%{name} silenced %{target}'s account"
         suspend_account: "%{name} suspended %{target}'s account"
         unassigned_report: "%{name} unassigned report %{target}"
+        unsensitive_account: "%{name} unmarked %{target}'s media as sensitive"
         unsilence_account: "%{name} unsilenced %{target}'s account"
         unsuspend_account: "%{name} unsuspended %{target}'s account"
         update_announcement: "%{name} updated announcement %{target}"
         update_custom_emoji: "%{name} updated emoji %{target}"
+        update_domain_block: "%{name} updated domain block for %{target}"
         update_status: "%{name} updated status by %{target}"
       deleted_status: "(deleted status)"
       empty: No logs found.
@@ -372,6 +402,8 @@ en:
           silence: Silence
           suspend: Suspend
         title: New domain block
+      obfuscate: Obfuscate domain name
+      obfuscate_hint: Partially obfuscate the domain name in the list if advertising the list of domain limitations is enabled
       private_comment: Private comment
       private_comment_hint: Comment about this domain limitation for internal use by the moderators.
       public_comment: Public comment
@@ -411,6 +443,7 @@ en:
     instances:
       by_domain: Domain
       delivery_available: Delivery is available
+      empty: No domains found.
       known_accounts:
         one: "%{count} known account"
         other: "%{count} known accounts"
@@ -434,6 +467,21 @@ en:
         expired: Expired
         title: Filter
       title: Invites
+    ip_blocks:
+      add_new: Create rule
+      created_msg: Successfully added new IP rule
+      delete: Delete
+      expires_in:
+        '1209600': 2 weeks
+        '15778476': 6 months
+        '2629746': 1 month
+        '31556952': 1 year
+        '86400': 1 day
+        '94670856': 3 years
+      new:
+        title: Create new IP rule
+      no_ip_block_selected: No IP rules were changed as none were selected
+      title: IP rules
     pending_accounts:
       title: Pending accounts (%{count})
     relationships:
@@ -473,6 +521,8 @@ en:
       comment:
         none: None
       created_at: Reported
+      forwarded: Forwarded
+      forwarded_to: Forwarded to %{domain}
       mark_as_resolved: Mark as resolved
       mark_as_unresolved: Mark as unresolved
       notes:
@@ -516,6 +566,7 @@ en:
       domain_blocks_rationale:
         title: Show rationale
       enable_bootstrap_timeline_accounts:
+        desc_html: Make new users automatically follow configured accounts so their home feed doesn't start out empty
         title: Enable default follows for new users
       hero:
         desc_html: Displayed on the frontpage. At least 600x100px recommended. When not set, falls back to server thumbnail
@@ -542,6 +593,9 @@ en:
         min_invite_role:
           disabled: No one
           title: Allow invitations by
+        require_invite_text:
+          desc_html: When registrations require manual approval, make the â€œWhy do you want to join?â€ text input mandatory rather than optional
+          title: Require new users to enter a reason to join
       registrations_mode:
         modes:
           approved: Approval required for sign up
@@ -681,8 +735,11 @@ en:
       prefix_sign_up: Sign up on Mastodon today!
       suffix: With an account, you will be able to follow people, post updates and exchange messages with users from any Mastodon server and more!
     didnt_get_confirmation: Didn't receive confirmation instructions?
+    dont_have_your_security_key: Don't have your security key?
     forgot_password: Forgot your password?
     invalid_reset_password_token: Password reset token is invalid or expired. Please request a new one.
+    link_to_otp: Enter a two-factor code from your phone or a recovery code
+    link_to_webauth: Use your security key device
     login: Log in
     logout: Logout
     migrate_account: Move to a different account
@@ -707,7 +764,9 @@ en:
       functional: Your account is fully operational.
       pending: Your application is pending review by our staff. This may take some time. You will receive an e-mail if your application is approved.
       redirecting_to: Your account is inactive because it is currently redirecting to %{acct}.
+    too_fast: Form submitted too fast, try again.
     trouble_logging_in: Trouble logging in?
+    use_security_key: Use security key
   authorize_follow:
     already_following: You are already following this account
     already_requested: You have already sent a follow request to that account
@@ -732,6 +791,7 @@ en:
   date:
     formats:
       default: "%b %d, %Y"
+      with_month_name: "%B %d, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}h"
@@ -796,6 +856,7 @@ en:
       request: Request your archive
       size: Size
     blocks: You block
+    bookmarks: Bookmarks
     csv: CSV
     domain_blocks: Domain blocks
     lists: Lists
@@ -809,7 +870,7 @@ en:
   filters:
     contexts:
       account: Profiles
-      home: Home timeline
+      home: Home and lists
       notifications: Notifications
       public: Public timelines
       thread: Conversations
@@ -863,6 +924,8 @@ en:
     status: Verification status
     view_proof: View proof
   imports:
+    errors:
+      over_rows_processing_limit: contains more than %{count} rows
     modes:
       merge: Merge
       merge_long: Keep existing records and add new ones
@@ -872,6 +935,7 @@ en:
     success: Your data was successfully uploaded and will now be processed in due time
     types:
       blocking: Blocking list
+      bookmarks: Bookmarks
       domain_blocking: Domain blocking list
       following: Following list
       muting: Muting list
@@ -993,6 +1057,14 @@ en:
           thousand: K
           trillion: T
           unit: ''
+  otp_authentication:
+    code_hint: Enter the code generated by your authenticator app to confirm
+    description_html: If you enable <strong>two-factor authentication</strong> using an authenticator app, logging in will require you to be in possession of your phone, which will generate tokens for you to enter.
+    enable: Enable
+    instructions_html: "<strong>Scan this QR code into Google Authenticator or a similiar TOTP app on your phone</strong>. From now on, that app will generate tokens that you will have to enter when logging in."
+    manual_instructions: 'If you can''t scan the QR code and need to enter it manually, here is the plain-text secret:'
+    setup: Set up
+    wrong_code: The entered code was invalid! Are server time and device time correct?
   pagination:
     newer: Newer
     next: Next
@@ -1021,6 +1093,7 @@ en:
   relationships:
     activity: Account activity
     dormant: Dormant
+    follow_selected_followers: Follow selected followers
     followers: Followers
     following: Following
     invited: Invited
@@ -1117,6 +1190,7 @@ en:
     profile: Profile
     relationships: Follows and followers
     two_factor_authentication: Two-factor Auth
+    webauthn_authentication: Security keys
   spam_check:
     spam_detected: This is an automated report. Spam has been detected.
   statuses:
@@ -1155,6 +1229,8 @@ en:
         other: "%{count} votes"
       vote: Vote
     show_more: Show more
+    show_newer: Show newer
+    show_older: Show older
     show_thread: Show thread
     sign_in_to_participate: Sign in to participate in the conversation
     title: '%{name}: "%{quote}"'
@@ -1263,21 +1339,20 @@ en:
       default: "%b %d, %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Enter the code generated by your authenticator app to confirm
-    description_html: If you enable <strong>two-factor authentication</strong>, logging in will require you to be in possession of your phone, which will generate tokens for you to enter.
-    disable: Disable
-    enable: Enable
+    add: Add
+    disable: Disable 2FA
+    disabled_success: Two-factor authentication successfully disabled
+    edit: Edit
     enabled: Two-factor authentication is enabled
     enabled_success: Two-factor authentication successfully enabled
     generate_recovery_codes: Generate recovery codes
-    instructions_html: "<strong>Scan this QR code into Google Authenticator or a similiar TOTP app on your phone</strong>. From now on, that app will generate tokens that you will have to enter when logging in."
     lost_recovery_codes: Recovery codes allow you to regain access to your account if you lose your phone. If you've lost your recovery codes, you can regenerate them here. Your old recovery codes will be invalidated.
-    manual_instructions: 'If you can''t scan the QR code and need to enter it manually, here is the plain-text secret:'
+    methods: Two-factor methods
+    otp: Authenticator app
     recovery_codes: Backup recovery codes
     recovery_codes_regenerated: Recovery codes successfully regenerated
     recovery_instructions_html: If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account. <strong>Keep the recovery codes safe</strong>. For example, you may print them and store them with other important documents.
-    setup: Set up
-    wrong_code: The entered code was invalid! Are server time and device time correct?
+    webauthn: Security keys
   user_mailer:
     backup_ready:
       explanation: You requested a full backup of your Mastodon account. It's now ready for download!
@@ -1291,20 +1366,23 @@ en:
       title: Sign in attempt
     warning:
       explanation:
-        disable: While your account is frozen, your account data remains intact, but you cannot perform any actions until it is unlocked.
-        silence: While your account is limited, only people who are already following you will see your toots on this server, and you may be excluded from various public listings. However, others may still manually follow you.
-        suspend: Your account has been suspended, and all of your toots and your uploaded media files have been irreversibly removed from this server, and servers where you had followers.
+        disable: You can no longer login to your account or use it in any other way, but your profile and other data remains intact.
+        sensitive: Your uploaded media files and linked media will be treated as sensitive.
+        silence: You can still use your account but only people who are already following you will see your toots on this server, and you may be excluded from various public listings. However, others may still manually follow you.
+        suspend: You can no longer use your account, and your profile and other data are no longer accessible. You can still login to request a backup of your data until the data is fully removed, but we will retain some data to prevent you from evading the suspension.
       get_in_touch: You can reply to this e-mail to get in touch with the staff of %{instance}.
       review_server_policies: Review server policies
       statuses: 'Specifically, for:'
       subject:
         disable: Your account %{acct} has been frozen
         none: Warning for %{acct}
+        sensitive: Your account %{acct} posting media has been marked as sensitive
         silence: Your account %{acct} has been limited
         suspend: Your account %{acct} has been suspended
       title:
         disable: Account frozen
         none: Warning
+        sensitive: Your media has been marked as sensitive
         silence: Account limited
         suspend: Account suspended
     welcome:
@@ -1325,9 +1403,11 @@ en:
       tips: Tips
       title: Welcome aboard, %{name}!
   users:
+    blocked_email_provider: This e-mail provider isn't allowed
     follow_limit_reached: You cannot follow more than %{limit} people
     generic_access_help_html: Trouble accessing your account? You may get in touch with %{email} for assistance
     invalid_email: The e-mail address is invalid
+    invalid_email_mx: The e-mail address does not seem to exist
     invalid_otp_token: Invalid two-factor code
     invalid_sign_in_token: Invalid security code
     otp_lost_help_html: If you lost access to both, you may get in touch with %{email}
@@ -1337,3 +1417,20 @@ en:
   verification:
     explanation_html: 'You can <strong>verify yourself as the owner of the links in your profile metadata</strong>. For that, the linked website must contain a link back to your Mastodon profile. The link back <strong>must</strong> have a <code>rel="me"</code> attribute. The text content of the link does not matter. Here is an example:'
     verification: Verification
+  webauthn_credentials:
+    add: Add new security key
+    create:
+      error: There was a problem adding your security key. Please try again.
+      success: Your security key was successfully added.
+    delete: Delete
+    delete_confirmation: Are you sure you want to delete this security key?
+    description_html: If you enable <strong>security key authentication</strong>, logging in will require you to use one of your security keys.
+    destroy:
+      error: There was a problem deleting you security key. Please try again.
+      success: Your security key was successfully deleted.
+    invalid_credential: Invalid security key
+    nickname_hint: Enter the nickname of your new security key
+    not_enabled: You haven't enabled WebAuthn yet
+    not_supported: This browser doesn't support security keys
+    otp_required: To use security keys please enable two-factor authentication first.
+    registered_on: Registered on %{date}
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index 1375ebb33ed09d100ba9c3e62945bc6d1a996096..d3461474b16c0423076003cca88fa3419c04efa8 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -600,7 +600,7 @@ en_GB:
       limit: You have already featured the maximum amount of hashtags
   filters:
     contexts:
-      home: Home timeline
+      home: Home and lists
       notifications: Notifications
       public: Public timelines
       thread: Conversations
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 5c11fa6fcce2b9678981a03b0f9f7196f7025e84..64b7ccfc702976cf33adfffb82ee5c9b86126a42 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -35,10 +35,13 @@ eo:
     status_count_before: Kie skribiÄis
     tagline: Sekvi amikojn kaj trovi iujn novajn
     terms: UzkondiÄ‰oj
-    unavailable_content: Nedisponebla enhavo
+    unavailable_content: Kontrolitaj serviloj
     unavailable_content_description:
       domain: Servilo
       reason: 'Kialo:'
+      rejecting_media_title: Filtritaj aÅdovidaÄµoj
+      silenced_title: Silentigitaj serviloj
+      suspended_title: Haltigitaj serviloj
     user_count_after:
       one: uzanto
       other: uzantoj
@@ -86,6 +89,7 @@ eo:
       delete: Forigi
       destroyed_msg: Kontrola noto sukcese detruita!
     accounts:
+      add_email_domain_block: Bloki retadresan domajnon
       approve: Aprobi
       approve_all: Aprobi Ä‰iujn
       are_you_sure: Äˆu vi certas?
@@ -101,6 +105,7 @@ eo:
       confirm: Konfirmi
       confirmed: Konfirmita
       confirming: Konfirmante
+      delete: Forigi datumojn
       deleted: Forigita
       demote: Degradi
       disable: Malebligi
@@ -117,6 +122,7 @@ eo:
       follows: Sekvatoj
       header: Kapa bildo
       inbox_url: Enira URL
+      invite_request_text: ê°€ìž…í•˜ë ¤ëŠ” ì´ìœ 
       invited_by: Invitita de
       ip: IP
       joined: AliÄis
@@ -128,6 +134,7 @@ eo:
       login_status: Ensaluta stato
       media_attachments: Ligitaj aÅdovidaÄµoj
       memorialize: ÅœanÄi al memoro
+      memorialized: Memorita
       moderation:
         active: Aktivaj
         all: Äˆio
@@ -154,7 +161,7 @@ eo:
       remove_header: Forigi kapan bildon
       resend_confirmation:
         already_confirmed: Äˆi tiu uzanto jam estas konfirmita
-        send: Esend konfirmi retpoÅton
+        send: Resendi konfirman retmesaÄon
         success: Konfirma retmesaÄo sukcese sendita!
       reset: Restarigi
       reset_password: Restarigi pasvorton
@@ -167,6 +174,8 @@ eo:
         user: Uzanto
       search: SerÄ‰i
       search_same_ip: Aliaj uzantoj kun la sama IP
+      sensitive: Tikla
+      sensitized: markita tikla
       shared_inbox_url: URL de kunhavigita leterkesto
       show:
         created_reports: Kreitaj signaloj
@@ -179,28 +188,34 @@ eo:
       time_in_queue: Atendado en atendovico %{time}
       title: Kontoj
       unconfirmed_email: Nekonfirmita retadreso
+      undo_sensitized: Malfari sentema
       undo_silenced: Malfari kaÅon
       undo_suspension: Malfari haltigon
       unsubscribe: Malaboni
       username: Uzantnomo
+      view_domain: Vidi la resumon de la domajno
       warn: Averti
       web: Reto
       whitelisted: En la blanka listo
     action_logs:
       action_types:
+        assigned_to_self_report: Atribui Raporton
+        change_email_user: ÅœanÄi retadreson de uzanto
         confirm_user: Konfermi uzanto
         create_account_warning: Krei Averton
         create_announcement: Krei Anoncon
         create_custom_emoji: Krei Propran emoÄion
         create_domain_allow: Krei Domajnan Permeson
-        create_domain_block: Krei Domajnan Blokadon
-        create_email_domain_block: Krei RetpoÅtmesaÄan Domajnan Blokadon
+        create_domain_block: Krei blokadon de domajno
+        create_email_domain_block: Krei blokadon de retpoÅta domajno
+        create_ip_block: Krei IP-regulon
         demote_user: Malpromocii uzanton
         destroy_announcement: Forigi Anoncon
         destroy_custom_emoji: Forigi Propran emoÄion
         destroy_domain_allow: Forigi Domajnan Permeson
-        destroy_domain_block: Forigi Domajnan Blokadon
-        destroy_email_domain_block: Forigi retpoÅtmesaÄan domajnan blokadon
+        destroy_domain_block: Forigi blokadon de domajno
+        destroy_email_domain_block: Forigi blokadon de retpoÅta domajno
+        destroy_ip_block: Forigi IP-regulon
         destroy_status: Forigi mesaÄon
         disable_2fa_user: Malebligi 2FA
         disable_custom_emoji: Malebligi Propran EmoÄion
@@ -212,8 +227,15 @@ eo:
         reopen_report: Remalfermi signalon
         reset_password_user: Restarigi pasvorton
         resolve_report: Solvitaj reporto
+        sensitive_account: Marki tikla la aÅdovidaÄµojn de via konto
         silence_account: Silentigi konton
         suspend_account: Haltigi konton
+        unsilence_account: Malsilentigi konton
+        unsuspend_account: Malhaltigi konton
+        update_announcement: Äœisdatigi anoncon
+        update_custom_emoji: Äœisdatigi proprajn emoÄiojn
+        update_domain_block: Äœigdatigi domajnan blokadon
+        update_status: Äœisdatigi staton
       actions:
         assigned_to_self_report: "%{name} asignis signalon %{target} al si mem"
         change_email_user: "%{name} ÅanÄis retadreson de uzanto %{target}"
@@ -223,13 +245,15 @@ eo:
         create_custom_emoji: "%{name} alÅutis novan emoÄion %{target}"
         create_domain_allow: "%{name} aldonis domajnon %{target} al la blanka listo"
         create_domain_block: "%{name} blokis domajnon %{target}"
-        create_email_domain_block: "%{name} aldonis retadresan domajnon %{target} al la nigra listo"
+        create_email_domain_block: "%{name} blokis retpoÅtan domajnon %{target}"
+        create_ip_block: "%{name} kreis regulon por IP %{target}"
         demote_user: "%{name} degradis uzanton %{target}"
         destroy_announcement: "%{name} forigis anoncon %{target}"
         destroy_custom_emoji: "%{name} neniigis la emoÄion %{target}"
         destroy_domain_allow: "%{name} forigis domajnon %{target} el la blanka listo"
         destroy_domain_block: "%{name} malblokis domajnon %{target}"
-        destroy_email_domain_block: "%{name} aldonis retadresan domajnon %{target} al la blanka listo"
+        destroy_email_domain_block: "%{name} malblokis retpoÅtan domajnon %{target}"
+        destroy_ip_block: "%{name} forigis regulon por IP %{target}"
         destroy_status: "%{name} forigis mesaÄojn de %{target}"
         disable_2fa_user: "%{name} malebligis dufaktoran aÅtentigon por uzanto %{target}"
         disable_custom_emoji: "%{name} malebligis emoÄion %{target}"
@@ -251,6 +275,9 @@ eo:
         update_custom_emoji: "%{name} Äisdatigis emoÄion %{target}"
         update_status: "%{name} Äisdatigis mesaÄon de %{target}"
       deleted_status: "(forigita mesaÄo)"
+      empty: Neniu protokolo trovita.
+      filter_by_action: Filtri per ago
+      filter_by_user: Filtri per uzanto
       title: Kontrola protokolo
     announcements:
       destroyed_msg: Anonco sukcese forigita!
@@ -289,6 +316,7 @@ eo:
       listed: Listigita
       new:
         title: Aldoni novan propran emoÄion
+      not_permitted: Vi ne rajtas plenumi Ä‰i tiun agon
       overwrite: AnstataÅigi
       shortcode: Mallonga kodo
       shortcode_hint: AlmenaÅ 2 signoj, nur literoj, ciferoj kaj substrekoj
@@ -333,7 +361,7 @@ eo:
       destroyed_msg: Domajno estis forigita el la blanka listo
       undo: Forigi el la blanka listo
     domain_blocks:
-      add_new: Aldoni novan
+      add_new: Aldoni novan blokadon de domajno
       created_msg: Domajna blokado en traktado
       destroyed_msg: Domajna blokado malfarita
       domain: Domajno
@@ -366,7 +394,7 @@ eo:
         retroactive:
           silence: MalkaÅi Ä‰iujn kontojn, kiuj ekzistas en Ä‰i tiu domajno
           suspend: Malhaltigi Ä‰iujn kontojn, kiuj ekzistas en Ä‰i tiu domajno
-        title: Malfari domajnan blokadon por %{domain}
+        title: Malfari blokadon de domajno %{domain}
         undo: Malfari
       undo: Malfari
       view: Vidi domajna blokado
@@ -385,6 +413,7 @@ eo:
     instances:
       by_domain: Domajno
       delivery_available: Liverado disponeblas
+      empty: Neniuj domajnoj trovitaj.
       known_accounts:
         one: "%{count} konata konto"
         other: "%{count} konataj kontoj"
@@ -408,6 +437,21 @@ eo:
         expired: Eksvalida
         title: Filtri
       title: Invitoj
+    ip_blocks:
+      add_new: Krei regulon
+      created_msg: Nova IP-regulo sukcese aldonita
+      delete: Forigi
+      expires_in:
+        '1209600': 2 semajnoj
+        '15778476': 6 monatoj
+        '2629746': 1 monato
+        '31556952': 1 jaro
+        '86400': 1 tago
+        '94670856': 3 jaroj
+      new:
+        title: Krei novan IP-regulon
+      no_ip_block_selected: Neniu IP-regulo estis ÅanÄita Ä‰ar neniu estis elektita
+      title: IP-reguloj
     pending_accounts:
       title: Pritraktataj kontoj (%{count})
     relationships:
@@ -662,9 +706,11 @@ eo:
     status:
       account_status: Statuso de la konto
       functional: Via konto estas plene funkcianta.
+    too_fast: Formularo sendita tro rapide, klopodu denove.
     trouble_logging_in: Äœeni ensaluti?
   authorize_follow:
     already_following: Vi jam sekvas tiun konton
+    already_requested: Vi jam sendis peton de sekvado al Ä‰i tiu konto
     error: BedaÅrinde, estis eraro en la serÄ‰ado de la fora konto
     follow: Sekvi
     follow_request: 'Vi sendis peton de sekvado al:'
@@ -745,6 +791,7 @@ eo:
       request: Peti vian arkivon
       size: Grandeco
     blocks: Vi blokas
+    bookmarks: Legosignoj
     csv: CSV
     domain_blocks: Blokoj de domajnoj
     lists: Listoj
@@ -758,7 +805,7 @@ eo:
   filters:
     contexts:
       account: Profiloj
-      home: Hejma templinio
+      home: Hejmo kaj listoj
       notifications: Sciigoj
       public: Publika templinio
       thread: Konversacioj
@@ -818,6 +865,7 @@ eo:
     success: Viaj datumoj estis sukcese alÅutitaj kaj estos traktitaj kiel planite
     types:
       blocking: Listo de blokitoj
+      bookmarks: Legosignoj
       domain_blocking: Listo de blokitaj domajnoj
       following: Listo de sekvatoj
       muting: Listo de silentigitoj
@@ -922,6 +970,8 @@ eo:
           quadrillion: Dd
           thousand: m
           trillion: Dn
+  otp_authentication:
+    enable: Ebligi
   pagination:
     newer: Pli nova
     next: Sekva
@@ -950,6 +1000,7 @@ eo:
   relationships:
     activity: Konta aktiveco
     dormant: Dormanta
+    follow_selected_followers: Forigu selektitajn sekvantojn
     followers: Sekvantoj
     following: Sekvatoj
     invited: Invitita
@@ -965,7 +1016,7 @@ eo:
     status: Statuso de la konto
   remote_follow:
     acct: Enmetu vian uzantnomo@domajno de kie vi volas agi
-    missing_resource: La URL de plusendado ne estis trovita
+    missing_resource: La bezonata URL de plusendado por via konto ne estis trovita
     no_account_html: Äˆu vi ne havas konton? Vi povas <a href='%{sign_up_path}' target='_blank'>registriÄi tie</a>
     proceed: DaÅrigi por eksekvi
     prompt: 'Vi eksekvos:'
@@ -1048,6 +1099,9 @@ eo:
     two_factor_authentication: Dufaktora aÅtentigo
   statuses:
     attached:
+      audio:
+        one: "%{count} aÅdaÄµo"
+        other: "%{count} aÅdaÄµoj"
       description: 'Ligita: %{attached}'
       image:
         one: "%{count} bildo"
@@ -1077,6 +1131,8 @@ eo:
         other: "%{count} voÄ‰donoj"
       vote: VoÄ‰doni
     show_more: Malfoldi
+    show_newer: Montri pli novajn
+    show_older: Montri pli malnovajn
     show_thread: Montri la fadenon
     sign_in_to_participate: Ensaluti por partopreni en la konversacio
     title: "%{name}: â€œ%{quote}â€"
@@ -1104,21 +1160,17 @@ eo:
       default: "%Y-%m-%d %H:%M"
       month: "%b %Y"
   two_factor_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>, vi bezonos vian poÅtelefonon por ensaluti, Ä‰ar Äi kreos nombrojn, kiujn vi devos enmeti.
+    add: Aldoni
     disable: Malebligi
-    enable: Ebligi
+    disabled_success: Dufaktora aÅtentigo sukcese malebligita
+    edit: Redakti
     enabled: Dufaktora aÅtentigo ebligita
     enabled_success: Dufaktora aÅtentigo sukcese ebligita
     generate_recovery_codes: Krei realirajn kodojn
-    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."
     lost_recovery_codes: Realiraj kodoj permesas rehavi aliron al via konto se vi perdis vian telefonon. Se vi perdis viajn realirajn kodojn, vi povas rekrei ilin Ä‰i tie. Viaj malnovaj realiraj kodoj iÄos eksvalidaj.
-    manual_instructions: 'Se vi ne povas skani la QR-kodon kaj bezonas enmeti Äin mane, jen la tut-teksta sekreto:'
     recovery_codes: Realiraj kodoj
     recovery_codes_regenerated: Realiraj kodoj sukcese rekreitaj
     recovery_instructions_html: Se vi perdas aliron al via telefono, vi povas uzi unu el la subaj realiraj kodoj por rehavi aliron al via konto. <strong>Konservu realirajn kodojn sekure</strong>. Ekzemple, vi povas printi ilin kaj konservi ilin kun aliaj gravaj dokumentoj.
-    setup: Agordi
-    wrong_code: La enmetita kodo estis nevalida! Äˆu la servila tempo kaj la aparata tempo Äustas?
   user_mailer:
     backup_ready:
       explanation: Vi petis kompletan arkivon de via Mastodon-konto. Äœi nun pretas por elÅutado!
@@ -1159,7 +1211,7 @@ eo:
       tips: Konsiloj
       title: Bonvenon, %{name}!
   users:
-    follow_limit_reached: Vi ne povas sekvi pli da %{limit} homojn
+    follow_limit_reached: Vi ne povas sekvi pli ol %{limit} homo(j)
     invalid_email: La retadreso estas nevalida
     invalid_otp_token: Nevalida kodo de dufaktora aÅtentigo
     otp_lost_help_html: Se vi perdas aliron al ambaÅ, vi povas kontakti %{email}
@@ -1168,3 +1220,6 @@ eo:
   verification:
     explanation_html: 'Vi povas <strong>pruvi, ke vi estas la posedanto de la ligiloj en viaj profilaj metadatumoj</strong>. Por fari tion, la alligita retejo devas enhavi ligilon reen al via Mastodon-profilo. La religilo <strong>devas</strong> havi la atributon <code>rel="me"</code>. Ne gravas la teksta enhavo de la religilo. Jen ekzemplo:'
     verification: Kontrolo
+  webauthn_credentials:
+    delete: Forigi
+    registered_on: Registrigita je %{date}
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 0a3c6e4ec508d33ab243d066d31eb658fabb1c83..32e07907496774f817885bfa9ff9bbfa9f03224e 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -2,7 +2,7 @@
 es-AR:
   about:
     about_hashtag_html: Estos son toots pÃºblicos etiquetados con <strong>#%{hashtag}</strong>. Si tenÃ©s una cuenta en cualquier parte del fediverso, podÃ©s interactuar con ellos.
-    about_mastodon_html: Mastodon es una red social basada en protocolos abiertos de la web y es software libre y de cÃ³digo abierto. Es descentralizada, como el correo electrÃ³nico.
+    about_mastodon_html: 'La red social del futuro: Â¡sin publicidad, sin vigilancia corporativa, con diseÃ±o Ã©tico y descentralizaciÃ³n! Â¡Con Mastodon vos sos el dueÃ±o de tus datos!'
     about_this: Acerca de Mastodon
     active_count_after: activo
     active_footnote: Usuarios activos mensualmente (MAU)
@@ -18,7 +18,7 @@ es-AR:
     contact_unavailable: No disponible
     discover_users: Descubrir usuarios
     documentation: DocumentaciÃ³n
-    federation_hint_html: Con una cuenta en %{instance} vas a poder seguir a gente de cualquier servidor de Mastodon y mÃ¡s allÃ¡.
+    federation_hint_html: Con una cuenta en %{instance} vas a poder seguir a cuentas de cualquier servidor de Mastodon y mÃ¡s allÃ¡.
     get_apps: ProbÃ¡ una aplicaciÃ³n mÃ³vil
     hosted_on: Mastodon alojado en %{domain}
     instance_actor_flash: |
@@ -30,12 +30,12 @@ es-AR:
     server_stats: 'EstadÃsticas del servidor:'
     source_code: CÃ³digo fuente
     status_count_after:
-      one: estado
-      other: estados
+      one: toot
+      other: toots
     status_count_before: Que enviaron
     tagline: SeguÃ a tus amigos y descubrÃ nueva gente
     terms: TÃ©rminos del servicio
-    unavailable_content: Contenido no disponible
+    unavailable_content: Servidores moderados
     unavailable_content_description:
       domain: Servidor
       reason: RazÃ³n
@@ -53,14 +53,15 @@ es-AR:
     what_is_mastodon: "Â¿QuÃ© es Mastodon?"
   accounts:
     choices_html: 'Recomendados de %{name}:'
-    endorsements_hint: PodÃ©s recomendar a gente que seguÃs desde la interface web, y va aparecer acÃ¡.
+    endorsements_hint: PodÃ©s recomendar a cuentas que seguÃs desde la interface web, y van a aparecer acÃ¡.
     featured_tags_hint: PodÃ©s destacar etiquetas especÃficas que se mostrarÃ¡n acÃ¡.
     follow: Seguir
     followers:
       one: Seguidor
       other: Seguidores
     following: Siguiendo
-    joined: Se uniÃ³ en %{date}
+    instance_actor_flash: Esta cuenta es un actor virtual usado para representar al servidor en sÃ mismo y no a ningÃºn usuario individual. Se usa para propÃ³sitos de la federaciÃ³n y no debe ser suspendido.
+    joined: En este servidor desde %{date}
     last_active: Ãºltima actividad
     link_verified_on: La propiedad de este enlace fue verificada el %{date}
     media: Medios
@@ -71,12 +72,12 @@ es-AR:
     people_followed_by: "%{name} sigue a estas personas"
     people_who_follow: Estas personas siguen a %{name}
     pin_errors:
-      following: Ya tenÃ©s que estar siguiendo a la persona que querÃ©s recomendar
+      following: Ya tenÃ©s que estar siguiendo a la cuenta que querÃ©s recomendar
     posts:
       one: Toot
       other: Toots
     posts_tab_heading: Toots
-    posts_with_replies: Toots con respuestas
+    posts_with_replies: Toots y respuestas
     reserved_username: El nombre de usuario estÃ¡ reservado
     roles:
       admin: Administrador
@@ -95,9 +96,10 @@ es-AR:
       delete: Eliminar
       destroyed_msg: "Â¡Nota de moderaciÃ³n destruÃda exitosamente!"
     accounts:
-      add_email_domain_block: Desaprobar el dominio del correo electrÃ³nico
+      add_email_domain_block: Bloquear el dominio del correo electrÃ³nico
       approve: Aprobar
       approve_all: Aprobar todas
+      approved_msg: Se aprobÃ³ exitosamente la solicitud de registro de %{username}
       are_you_sure: "Â¿EstÃ¡s seguro?"
       avatar: Avatar
       by_domain: Dominio
@@ -110,40 +112,46 @@ es-AR:
         title: Cambiar correo electrÃ³nico para %{username}
       confirm: Confirmar
       confirmed: Confirmado
-      confirming: Confirmando
+      confirming: ConfirmaciÃ³n
+      delete: Eliminar datos
       deleted: Eliminado
       demote: Bajar de nivel
-      disable: Deshabilitar
+      destroyed_msg: Los datos de %{username} estÃ¡n ahora en cola para ser eliminados inminentemente
+      disable: Congelar
       disable_two_factor_authentication: Deshabilitar 2FA
-      disabled: Deshabilitada
+      disabled: Congelada
       display_name: Nombre para mostrar
       domain: Dominio
       edit: Editar
       email: Correo electrÃ³nico
       email_status: Estado del correo
-      enable: Habilitar
+      enable: Descongelar
       enabled: Habilitada
+      enabled_msg: Se descongelÃ³ exitosamente la cuenta de %{username}
       followers: Seguidores
       follows: Seguidores
       header: Cabecera
       inbox_url: DirecciÃ³n web de la bandeja de entrada
+      invite_request_text: Motivos para unirte
       invited_by: Invitado por
       ip: DirecciÃ³n IP
       joined: Se uniÃ³ en
       location:
         all: Todas
-        local: Local
-        remote: Remota
+        local: Locales
+        remote: Remotas
         title: UbicaciÃ³n
       login_status: Estado del inicio de sesiÃ³n
       media_attachments: Adjuntos
-      memorialize: Convertir en recordatorio
+      memorialize: Convertir en cuenta conmemorativa
+      memorialized: Cuenta conmemorativa
+      memorialized_msg: "%{username} se convirtiÃ³ exitosamente en una cuenta conmemorativa"
       moderation:
         active: Activa
         all: Todas
         pending: Pendiente
-        silenced: Silenciados
-        suspended: Suspendidos
+        silenced: Silenciadas
+        suspended: Suspendidas
         title: ModeraciÃ³n
       moderation_notes: Notas de moderaciÃ³n
       most_recent_activity: Actividad mÃ¡s reciente
@@ -153,15 +161,19 @@ es-AR:
       not_subscribed: No suscripto
       pending: RevisiÃ³n pendiente
       perform_full_suspension: Suspender
-      promote: Promocionar
+      promote: Promover
       protocol: Protocolo
       public: PÃºblica
-      push_subscription_expires: La suscripciÃ³n PuSH vence
+      push_subscription_expires: La suscripciÃ³n push vence
       redownload: Recargar perfil
+      redownloaded_msg: Se actualizÃ³ exitosamente el perfil de %{username} desde el origen
       reject: Rechazar
       reject_all: Rechazar todas
+      rejected_msg: Se rechazÃ³ exitosamente la solicitud de registro de %{username}
       remove_avatar: Quitar avatar
       remove_header: Quitar cabecera
+      removed_avatar_msg: Se quitÃ³ exitosamente el avatar de %{username}
+      removed_header_msg: Se quitÃ³ exitosamente el encabezado de %{username}
       resend_confirmation:
         already_confirmed: Este usuario ya estÃ¡ confirmado
         send: Reenviar correo electrÃ³nico de confirmaciÃ³n
@@ -173,30 +185,38 @@ es-AR:
       roles:
         admin: Administrador
         moderator: Moderador
-        staff: Equipo
+        staff: AdministraciÃ³n
         user: Usuario
       search: Buscar
       search_same_email_domain: Otros usuarios con el mismo dominio de correo electrÃ³nico
       search_same_ip: Otros usuarios con la misma direcciÃ³n IP
+      sensitive: Sensible
+      sensitized: marcado como sensible
       shared_inbox_url: DirecciÃ³n web de la bandeja de entrada compartida
       show:
-        created_reports: Informes hechos
+        created_reports: Denuncias hechas
         targeted_reports: Denunciado por otros
-      silence: Silenciar
-      silenced: Silenciadas
-      statuses: Estados
+      silence: Limitar
+      silenced: Limitadas
+      statuses: Toots
       subscribe: Suscribirse
       suspended: Suspendidas
+      suspension_irreversible: Se eliminaron irreversiblemente los datos de esta cuenta. PodÃ©s dejar de suspenderla para hacerla utilizable, pero no se recuperarÃ¡n los datos que tenÃa anteriormente.
+      suspension_reversible_hint_html: La cuenta fue suspendida y los datos se eliminarÃ¡n completamente el %{date}. Hasta entonces, la cuenta puede ser restaurada sin ningÃºn efecto perjudicial. Si querÃ©s eliminar todos los datos de la cuenta inmediatamente, podÃ©s hacerlo abajo.
       time_in_queue: Esperando en cola %{time}
       title: Cuentas
       unconfirmed_email: Correo electrÃ³nico sin confirmar
+      undo_sensitized: Deshacer marcado como sensible
       undo_silenced: Deshacer silenciado
       undo_suspension: Deshacer suspensiÃ³n
+      unsilenced_msg: Se quitÃ³ exitosamente el lÃmite de la cuenta de %{username}
       unsubscribe: Desuscribirse
+      unsuspended_msg: Se quitÃ³ exitosamente la suspensiÃ³n de la cuenta de %{username}
       username: Nombre de usuario
+      view_domain: Ver resumen del dominio
       warn: Advertir
       web: Web
-      whitelisted: Aprobadas
+      whitelisted: Permitidas para federaciÃ³n
     action_logs:
       action_types:
         assigned_to_self_report: Asignar denuncia
@@ -208,32 +228,37 @@ es-AR:
         create_domain_allow: Crear permiso de dominio
         create_domain_block: Crear bloqueo de dominio
         create_email_domain_block: Crear bloqueo de dominio de correo electrÃ³nico
+        create_ip_block: Crear regla de direcciÃ³n IP
         demote_user: Descender usuario
         destroy_announcement: Eliminar anuncio
         destroy_custom_emoji: Eliminar emoji personalizado
         destroy_domain_allow: Eliminar permiso de dominio
         destroy_domain_block: Eliminar bloqueo de dominio
         destroy_email_domain_block: Eliminar bloqueo de dominio de correo electrÃ³nico
-        destroy_status: Eliminar estado
+        destroy_ip_block: Eliminar regla de direcciÃ³n IP
+        destroy_status: Eliminar toot
         disable_2fa_user: Deshabilitar 2FA
         disable_custom_emoji: Deshabilitar emoji personalizado
         disable_user: Deshabilitar usuario
         enable_custom_emoji: Habilitar emoji personalizado
         enable_user: Habilitar usuario
-        memorialize_account: Volver cuenta conmemorativa
+        memorialize_account: Convertir en cuenta conmemorativa
         promote_user: Promover usuario
         remove_avatar_user: Quitar avatar
         reopen_report: Reabrir denuncia
         reset_password_user: Cambiar contraseÃ±a
         resolve_report: Resolver denuncia
+        sensitive_account: Marcar los medios en tu cuenta como sensibles
         silence_account: Silenciar cuenta
         suspend_account: Suspender cuenta
         unassigned_report: Desasignar denuncia
+        unsensitive_account: Desmarcar los medios en tu cuenta como sensibles
         unsilence_account: Dejar de silenciar cuenta
         unsuspend_account: Dejar de suspender cuenta
         update_announcement: Actualizar anuncio
         update_custom_emoji: Actualizar emoji personalizado
-        update_status: Actualizar estado
+        update_domain_block: Actualizar bloque de dominio
+        update_status: Actualizar toot
       actions:
         assigned_to_self_report: "%{name} se asignÃ³ la denuncia %{target} a sÃ"
         change_email_user: "%{name} cambiÃ³ la direcciÃ³n de correo electrÃ³nico del usuario %{target}"
@@ -241,36 +266,41 @@ es-AR:
         create_account_warning: "%{name} enviÃ³ una advertencia a %{target}"
         create_announcement: "%{name} creÃ³ el nuevo anuncio %{target}"
         create_custom_emoji: "%{name} subiÃ³ nuevo emoji %{target}"
-        create_domain_allow: "%{name} aprobÃ³ el dominio %{target}"
+        create_domain_allow: "%{name} permitiÃ³ la federaciÃ³n con el dominio %{target}"
         create_domain_block: "%{name} bloqueÃ³ el dominio %{target}"
-        create_email_domain_block: "%{name} desaprobÃ³ el dominio de correo electrÃ³nico %{target}"
+        create_email_domain_block: "%{name} bloqueÃ³ el dominio de correo electrÃ³nico %{target}"
+        create_ip_block: "%{name} creÃ³ la regla para la direcciÃ³n IP %{target}"
         demote_user: "%{name} bajÃ³ de nivel al usuario %{target}"
         destroy_announcement: "%{name} eliminÃ³ el anuncio %{target}"
         destroy_custom_emoji: "%{name} destruyÃ³ el emoji %{target}"
-        destroy_domain_allow: "%{name} quitÃ³ el dominio %{target} de los permitidos"
+        destroy_domain_allow: "%{name} no permitiÃ³ la federaciÃ³n con el dominio %{target}"
         destroy_domain_block: "%{name} desbloqueÃ³ el dominio %{target}"
-        destroy_email_domain_block: "%{name} aprobÃ³ el dominio de correo electrÃ³nico %{target}"
-        destroy_status: "%{name} eliminÃ³ el estado de %{target}"
+        destroy_email_domain_block: "%{name} desbloqueÃ³ el dominio de correo electrÃ³nico %{target}"
+        destroy_ip_block: "%{name} eliminÃ³ la regla para la direcciÃ³n IP %{target}"
+        destroy_status: "%{name} eliminÃ³ el toot de %{target}"
         disable_2fa_user: "%{name} deshabilitÃ³ el requerimiento de dos factores para el usuario %{target}"
         disable_custom_emoji: "%{name} deshabilitÃ³ el emoji %{target}"
         disable_user: "%{name} deshabilitÃ³ el inicio de sesiÃ³n para el usuario %{target}"
         enable_custom_emoji: "%{name} habilitÃ³ el emoji %{target}"
         enable_user: "%{name} habilitÃ³ el inicio de sesiÃ³n para el usuario %{target}"
-        memorialize_account: "%{name} convirtiÃ³ la cuenta de %{target} en una pÃ¡gina de recordatorio"
+        memorialize_account: "%{name} convirtiÃ³ la cuenta de %{target} en una cuenta conmemorativa"
         promote_user: "%{name} promoviÃ³ al usuario %{target}"
         remove_avatar_user: "%{name} quitÃ³ el avatar de %{target}"
         reopen_report: "%{name} reabriÃ³ la denuncia %{target}"
         reset_password_user: "%{name} cambiÃ³ la contraseÃ±a del usuario %{target}"
         resolve_report: "%{name} resolviÃ³ la denuncia %{target}"
+        sensitive_account: "%{name} marcÃ³ los medios de %{target} como sensibles"
         silence_account: "%{name} silenciÃ³ la cuenta de %{target}"
         suspend_account: "%{name} suspendiÃ³ la cuenta de %{target}"
         unassigned_report: "%{name} desasignÃ³ la denuncia %{target}"
+        unsensitive_account: "%{name} desmarcÃ³ los medios de %{target} como sensibles"
         unsilence_account: "%{name} quitÃ³ el silenciado de la cuenta de %{target}"
         unsuspend_account: "%{name} quitÃ³ la suspensiÃ³n de la cuenta de %{target}"
         update_announcement: "%{name} actualizÃ³ el anuncio %{target}"
         update_custom_emoji: "%{name} actualizÃ³ el emoji %{target}"
-        update_status: "%{name} actualizÃ³ el estado de %{target}"
-      deleted_status: "(estado borrado)"
+        update_domain_block: "%{name} actualizÃ³ el bloqueo de dominio para %{target}"
+        update_status: "%{name} actualizÃ³ el toot de %{target}"
+      deleted_status: "[toot eliminado]"
       empty: No se encontraron registros.
       filter_by_action: Filtrar por acciÃ³n
       filter_by_user: Filtrar por usuario
@@ -288,7 +318,7 @@ es-AR:
       scheduled_for: Programado para %{time}
       scheduled_msg: "Â¡Anuncio programado para su publicaciÃ³n!"
       title: Anuncios
-      unpublished_msg: "Â¡Anuncio dejado de publicar exitosamente!"
+      unpublished_msg: "Â¡Se dejÃ³ de publicar el anuncio exitosamente!"
       updated_msg: "Â¡Anuncio actualizado exitosamente!"
     custom_emojis:
       assign_category: Asignar categorÃa
@@ -308,7 +338,7 @@ es-AR:
       enabled: Habilitado
       enabled_msg: Se habilitÃ³ ese emoji exitosamente
       image_hint: PNG de hasta 50KB
-      list: Lista
+      list: Listar
       listed: Listados
       new:
         title: Agregar nuevo emoji personalizado
@@ -318,7 +348,7 @@ es-AR:
       shortcode_hint: Al menos 2 caracteres, sÃ³lo caracteres alfanumÃ©ricos y subguiones ("_")
       title: Emojis personalizados
       uncategorized: Sin categorÃa
-      unlist: No agregar a lista
+      unlist: No listar
       unlisted: No listado
       update_failed_msg: No se pudo actualizar ese emoji
       updated_msg: "Â¡Emoji actualizado exitosamente!"
@@ -336,26 +366,26 @@ es-AR:
       feature_timeline_preview: PrevisualizaciÃ³n de la lÃnea temporal
       features: Funciones
       hidden_service: FederaciÃ³n con servicios ocultos
-      open_reports: abrir denuncias
+      open_reports: denuncias abiertas
       pending_tags: etiquetas esperando revisiÃ³n
       pending_users: usuarios esperando revisiÃ³n
       recent_users: Usuarios recientes
       search: BÃºsqueda de texto completo
       single_user_mode: Modo de usuario Ãºnico
       software: Software
-      space: Uso del espacio
+      space: Uso de almacenamiento
       title: Panel
       total_users: usuarios en total
       trends: Tendencias
       week_interactions: interacciones esta semana
       week_users_active: activos esta semana
       week_users_new: usuarios esta semana
-      whitelist_mode: Modo de aprobaciÃ³n
+      whitelist_mode: Modo de federaciÃ³n limitada
     domain_allows:
-      add_new: Aprobar dominio
-      created_msg: El dominio se aprobÃ³ exitosamente
-      destroyed_msg: El dominio no se aprobÃ³
-      undo: No aprobado
+      add_new: Permitir federaciÃ³n con el dominio
+      created_msg: El dominio fue exitosamente permitido para la federaciÃ³n
+      destroyed_msg: El dominio no fue permitido para la federaciÃ³n
+      undo: No permitir federaciÃ³n con el dominio
     domain_blocks:
       add_new: Agregar nuevo bloqueo de dominio
       created_msg: Ahora se estÃ¡ procesando el bloqueo de dominio
@@ -372,19 +402,21 @@ es-AR:
           silence: Silenciar
           suspend: Suspender
         title: Nuevo bloqueo de dominio
+      obfuscate: Obfuscar nombre de dominio
+      obfuscate_hint: Obfusca parcialmente el nombre de dominio en la lista si el anuncio de la lista de limitaciones de dominio estÃ¡ habilitado
       private_comment: Comentario privado
       private_comment_hint: Comentario sobre la limitaciÃ³n de este dominio, para uso interno de los moderadores.
       public_comment: Comentario pÃºblico
       public_comment_hint: Comentario sobre la limitaciÃ³n de este dominio para el pÃºblico en general, si estÃ¡ habilitada la publicaciÃ³n de lista de limitaciones de dominio.
-      reject_media: Rechazar archivos de medio
-      reject_media_hint: Quita los archivos de medio almacenados e impide la descarga en el futuro. Irrelevante para suspensiones.
+      reject_media: Rechazar archivos de medios
+      reject_media_hint: Quita los archivos de medios almacenados e impide la descarga en el futuro. Irrelevante para suspensiones
       reject_reports: Rechazar denuncias
-      reject_reports_hint: Ignora todas las denuncias que vengan de este dominio. Irrelevante para suspensiones.
-      rejecting_media: rechazando archivos de medio
-      rejecting_reports: rechazando denuncias
+      reject_reports_hint: Ignora todas las denuncias que vengan de este dominio. Irrelevante para suspensiones
+      rejecting_media: rechazo de archivos de medios
+      rejecting_reports: rechazo de denuncias
       severity:
-        silence: silenciado
-        suspend: suspendido
+        silence: silenciados
+        suspend: suspendidos
       show:
         affected_accounts:
           one: Una cuenta afectada en la base de datos
@@ -398,19 +430,20 @@ es-AR:
       view: Ver bloqueo de dominio
     email_domain_blocks:
       add_new: Agregar nuevo
-      created_msg: Se desaprobÃ³ dominio de correo electrÃ³nico exitosamente
+      created_msg: Se bloqueÃ³ el dominio de correo electrÃ³nico exitosamente
       delete: Eliminar
-      destroyed_msg: Se aprobÃ³ dominio de correo electrÃ³nico exitosamente
+      destroyed_msg: Se desbloqueÃ³ el dominio de correo electrÃ³nico exitosamente
       domain: Dominio
-      empty: Actualmente no hay dominios de correo electrÃ³nico desaprobados.
+      empty: Actualmente no hay dominios de correo electrÃ³nico bloqueados.
       from_html: de %{domain}
       new:
         create: Agregar dominio
-        title: Nueva desaprobaciÃ³n de correo electrÃ³nico
-      title: DesaprobaciÃ³n de correo electrÃ³nico
+        title: Bloquear nuevo dominio de correo electrÃ³nico
+      title: Dominios bloqueados de correo electrÃ³nico
     instances:
       by_domain: Dominio
       delivery_available: La entrega estÃ¡ disponible
+      empty: No se encontraron dominios.
       known_accounts:
         one: "%{count} cuenta conocida"
         other: "%{count} cuentas conocidas"
@@ -422,8 +455,8 @@ es-AR:
       public_comment: Comentario pÃºblico
       title: FederaciÃ³n
       total_blocked_by_us: Bloqueada por nosotros
-      total_followed_by_them: Seguidos por ellos
-      total_followed_by_us: Seguidos por nosotros
+      total_followed_by_them: Seguidas por ellos
+      total_followed_by_us: Seguidas por nosotros
       total_reported: Denuncias sobre ellos
       total_storage: Adjuntos
     invites:
@@ -434,6 +467,21 @@ es-AR:
         expired: Vencidas
         title: Filtrar
       title: Invitaciones
+    ip_blocks:
+      add_new: Crear regla
+      created_msg: Se agregÃ³ exitosamente la nueva regla de direcciÃ³n IP
+      delete: Eliminar
+      expires_in:
+        '1209600': 2 semanas
+        '15778476': 6 meses
+        '2629746': 1 mes
+        '31556952': 1 aÃ±o
+        '86400': 1 dÃa
+        '94670856': 3 aÃ±os
+      new:
+        title: Crear nueva regla de direcciÃ³n IP
+      no_ip_block_selected: No se cambiÃ³ ninguna regla de direcciÃ³n IP, ya que no se seleccionÃ³ ninguna
+      title: Reglas de direcciÃ³n IP
     pending_accounts:
       title: Cuentas pendientes (%{count})
     relationships:
@@ -441,7 +489,7 @@ es-AR:
     relays:
       add_new: Agregar nuevo relÃ©
       delete: Eliminar
-      description_html: Un <strong>relÃ© de federaciÃ³n</strong> es un servidor intermedio que intercambia grandes volÃºmenes de toots pÃºblicos entre servidores que se suscriben y publican en Ã©l. <strong>Puede ayudar a servidores chicos y medianos a descubrir contenido del fediverso</strong>, que de otra manera requerirÃa que los usuarios locales siguiesen manualmente a personas de servidores remotos.
+      description_html: Un <strong>relÃ© de federaciÃ³n</strong> es un servidor intermedio que intercambia grandes volÃºmenes de toots pÃºblicos entre servidores que se suscriben y publican en Ã©l. <strong>Puede ayudar a servidores chicos y medianos a descubrir contenido del fediverso</strong>, que de otra manera requerirÃa que los usuarios locales siguiesen manualmente a cuentas de servidores remotos.
       disable: Deshabilitar
       disabled: Deshabilitado
       enable: Habilitar
@@ -451,7 +499,7 @@ es-AR:
       pending: Esperando aprobaciÃ³n del relÃ©
       save_and_enable: Guardar y habilitar
       setup: Configurar una conexiÃ³n de relÃ©
-      signatures_not_enabled: Los relÃ©s no funcionarÃ¡n correctamente mientras el modo seguro o el de aprobaciÃ³n estÃ©n habilitados
+      signatures_not_enabled: Los relÃ©s no funcionarÃ¡n correctamente mientras el modo seguro o el de federaciÃ³n limitada estÃ©n habilitados
       status: Estado
       title: RelÃ©s
     report_notes:
@@ -473,6 +521,8 @@ es-AR:
       comment:
         none: Ninguno
       created_at: Denunciado
+      forwarded: Reenviado
+      forwarded_to: Reenviado a %{domain}
       mark_as_resolved: Marcar como resuelta
       mark_as_unresolved: Marcar como no resuelta
       notes:
@@ -480,9 +530,9 @@ es-AR:
         create_and_resolve: Resolver con nota
         create_and_unresolve: Reabrir con nota
         delete: Eliminar
-        placeholder: DescribÃ quÃ© acciones se tomaron, o cualquier otra actualizaciÃ³n relacionadaâ€¦
+        placeholder: DescribÃ quÃ© acciones se tomaron, o cualquier otra actualizaciÃ³n relacionada...
       reopen: Reabrir denuncia
-      report: 'Denunciar #%{id}'
+      report: 'Denuncia #%{id}'
       reported_account: Cuenta denunciada
       reported_by: Denunciada por
       resolved: Resueltas
@@ -494,7 +544,7 @@ es-AR:
       updated_at: Actualizada
     settings:
       activity_api_enabled:
-        desc_html: Conteos de estados publicados localmente, usuarios activos y nuevos registros en tandas semanales
+        desc_html: Conteos de toots publicados localmente, usuarios activos y nuevos registros en tandas semanales
         title: Publicar estadÃsticas agregadas sobre la actividad del usuario
       bootstrap_timeline_accounts:
         desc_html: Separar mÃºltiples nombres de usuario con coma. SÃ³lo funcionarÃ¡n las cuentas locales y desbloqueadas. Predeterminadamente, cuando estÃ¡ vacÃo todos los administradores locales.
@@ -516,32 +566,36 @@ es-AR:
       domain_blocks_rationale:
         title: Mostrar razonamiento
       enable_bootstrap_timeline_accounts:
+        desc_html: Hacer que los nuevos usuarios sigan automÃ¡ticamente las cuentas configuradas para que su lÃnea temporal principal no comience vacÃa
         title: Habilitar seguimientos predeterminados para nuevas cuentas
       hero:
-        desc_html: Mostrado en la pÃ¡gina principal. Se recomienda un tamaÃ±o mÃnimo de 600x100 pÃxeles. Predeterminadamente se establece a la miniatura del servidor.
+        desc_html: Mostrado en la pÃ¡gina principal. Se recomienda un tamaÃ±o mÃnimo de 600x100 pÃxeles. Predeterminadamente se establece a la miniatura del servidor
         title: Imagen de portada
       mascot:
-        desc_html: Mostrado en mÃºltiples pÃ¡ginas. Se recomienda un tamaÃ±o mÃnimo de 293x205 pÃxeles. Cuando no se especifica, se muestra la mascota predeterminada.
+        desc_html: Mostrado en mÃºltiples pÃ¡ginas. Se recomienda un tamaÃ±o mÃnimo de 293x205 pÃxeles. Cuando no se especifica, se muestra la mascota predeterminada
         title: Imagen de la mascota
       peers_api_enabled:
         desc_html: Nombres de dominio que este servidor encontrÃ³ en el fediverso
         title: Publicar lista de servidores descubiertos
       preview_sensitive_media:
-        desc_html: Los enlaces de previsualizaciones en otros sitios web mostrarÃ¡n una miniatura incluso si el medio estÃ¡ marcado como contenido sensible
+        desc_html: Las previsualizaciones de enlaces en otros sitios web mostrarÃ¡n una miniatura incluso si el medio estÃ¡ marcado como contenido sensible
         title: Mostrar medios sensibles en previsualizaciones de OpenGraph
       profile_directory:
         desc_html: Permitir que los usuarios puedan ser descubiertos
         title: Habilitar directorio de perfiles
       registrations:
         closed_message:
-          desc_html: Mostrado en la portada cuando los registros estÃ¡n cerrados. PodÃ©s usar etiquetas HTML.
-          title: Mensaje de registro cerrado
+          desc_html: Mostrado en la pÃ¡gina principal cuando los registros de nuevas cuentas estÃ¡n cerrados. PodÃ©s usar etiquetas HTML
+          title: Mensaje de registro de nuevas cuentas cerrado
         deletion:
-          desc_html: Permitor que cualquiera elimine su cuenta
+          desc_html: Permitir que cualquiera elimine su cuenta
           title: Abrir eliminaciÃ³n de cuenta
         min_invite_role:
           disabled: Nadie
           title: Permitir invitaciones de
+        require_invite_text:
+          desc_html: Cuando los registros requieran aprobaciÃ³n manual, hacÃ© que la solicitud de invitaciÃ³n "Â¿Por quÃ© querÃ©s unirte?" sea obligatoria, en vez de opcional
+          title: Requerir que los nuevos usuarios llenen un texto de solicitud de invitaciÃ³n
       registrations_mode:
         modes:
           approved: Se requiere aprobaciÃ³n para registrarse
@@ -552,26 +606,26 @@ es-AR:
         desc_html: Cuando estÃ¡ deshabilitado, restringe la lÃnea temporal pÃºblica enlazada desde la pÃ¡gina de inicio para mostrar sÃ³lo contenido local
         title: Incluir contenido federado en la pÃ¡gina de lÃnea temporal pÃºblica no autenticada
       show_staff_badge:
-        desc_html: Mostrar una insignia de equipo en la pÃ¡gina de un usuario
-        title: Mostrar insignia de equipo
+        desc_html: Mostrar una insignia de administraciÃ³n en la pÃ¡gina de un usuario
+        title: Mostrar insignia de administraciÃ³n
       site_description:
         desc_html: PÃ¡rrafo introductorio en la API. Describe quÃ© hace especial a este servidor de Mastodon y todo lo demÃ¡s que sea importante. PodÃ©s usar etiquetas HTML, en particular <code>&lt;a&gt;</code> y <code>&lt;em&gt;</code>.
         title: DescripciÃ³n del servidor
       site_description_extended:
-        desc_html: Un buen lugar para tu cÃ³digo de conducta, reglas, guÃas y otras cosas que definen tu servidor. PodÃ©s usar etiquets HTML.
+        desc_html: Un buen lugar para tu cÃ³digo de conducta, reglas, guÃas y otras cosas que definen tu servidor. PodÃ©s usar etiquets HTML
         title: InformaciÃ³n extendida personalizada
       site_short_description:
         desc_html: Mostrado en la barra lateral y las etiquetas de metadatos. Describe lo que es Mastodon y quÃ© hace especial a este servidor en un solo pÃ¡rrafo.
         title: DescripciÃ³n corta del servidor
       site_terms:
-        desc_html: PodÃ©s escribir tus propias polÃticas de privacidad, tÃ©rminos de servicio u otras legalidades. PodÃ©s usar etiquetas HTML.
+        desc_html: PodÃ©s escribir tus propias polÃticas de privacidad, tÃ©rminos de servicio u otras legalidades. PodÃ©s usar etiquetas HTML
         title: TÃ©rminos de servicio personalizados
       site_title: Nombre del servidor
       spam_check_enabled:
         desc_html: Mastodon puede denunciar automÃ¡ticamente cuentas que envÃan mensajes no solicitados de forma repetida. PodrÃan haber falsos positivos.
         title: AutomatizaciÃ³n antispam
       thumbnail:
-        desc_html: Usado para previsualizaciones vÃa OpenGraph y APIs. Se recomienda 1200x630 pÃxeles.
+        desc_html: Usado para previsualizaciones vÃa OpenGraph y APIs. Se recomienda 1200x630 pÃxeles
         title: Miniatura del servidor
       timeline_preview:
         desc_html: Mostrar enlace a la lÃnea temporal pÃºblica en la pÃ¡gina de inicio y permitir el acceso a la API a la lÃnea temporal pÃºblica sin autenticaciÃ³n
@@ -582,7 +636,7 @@ es-AR:
         title: Permitir que las etiquetas sean tendencia sin revisiÃ³n previa
       trends:
         desc_html: Mostrar pÃºblicamente etiquetas previamente revisadas que son tendencia actualmente
-        title: Etiquetas tendencias
+        title: Etiquetas en tendencia
     site_uploads:
       delete: Eliminar archivo subido
       destroyed_msg: "Â¡Subida al sitio eliminada exitosamente!"
@@ -597,8 +651,8 @@ es-AR:
       media:
         title: Medios
       no_media: Sin medios
-      no_status_selected: No se cambiÃ³ ningÃºn estado ya que ninguno fue seleccionado
-      title: Estados de la cuenta
+      no_status_selected: No se cambiÃ³ ningÃºn toot ya que ninguno fue seleccionado
+      title: Toots de la cuenta
       with_media: Con medios
     tags:
       accounts_today: Usos Ãºnicos de hoy
@@ -617,7 +671,7 @@ es-AR:
       trending_right_now: En tendencia ahora mismo
       unique_uses_today: "%{count} toots hoy"
       unreviewed: No revisado
-      updated_msg: La configuraciÃ³n de la etiqueta se actualizÃ³ exitosamente
+      updated_msg: La configuraciÃ³n de letiqueta se actualizÃ³ exitosamente
     title: AdministraciÃ³n
     warning_presets:
       add_new: Agregar nuevo
@@ -641,13 +695,13 @@ es-AR:
     deleted_msg: Eliminaste el alias exitosamente. La mudanza de esa cuenta a esta ya no serÃ¡ posible.
     empty: No tenÃ©s alias.
     hint_html: Si querÃ©s mudarte desde otra cuenta a esta, acÃ¡ podÃ©s crear un alias, el cual es necesario antes de empezar a mudar seguidores de la cuenta vieja a esta. Esta acciÃ³n por sÃ misma es <strong>inofensiva y reversible</strong>. <strong>La migraciÃ³n de la cuenta se inicia desde la cuenta anterior</strong>.
-    remove: Desenlazar alias
+    remove: Desvincular alias
   appearance:
     advanced_web_interface: Interface web avanzada
     advanced_web_interface_hint: 'Si querÃ©s hacer uso de todo el ancho de tu pantalla, la interface web avanzada te permite configurar varias columnas diferentes para ver tanta informaciÃ³n al mismo tiempo como quieras: "Principal", "Notificaciones", "LÃnea temporal federada", y cualquier nÃºmero de listas y etiquetas.'
     animations_and_accessibility: Animaciones y accesibilidad
     confirmation_dialogs: DiÃ¡logos de confirmaciÃ³n
-    discovery: Descubrimiento
+    discovery: DescubrÃ
     localization:
       body: Mastodon es localizado por voluntarios.
       guide_link: https://es.crowdin.com/project/mastodon
@@ -663,7 +717,7 @@ es-AR:
     view_status: Ver estado
   applications:
     created: AplicaciÃ³n creada exitosamente
-    destroyed: ApicaciÃ³n eliminada exitosamente
+    destroyed: AplicaciÃ³n eliminada exitosamente
     invalid_url: La direcciÃ³n web ofrecida no es vÃ¡lida
     regenerate_token: Regenerar clave de acceso
     token_regenerated: Clave de acceso regenerada exitosamente
@@ -675,14 +729,17 @@ es-AR:
     checkbox_agreement_html: Acepto las <a href="%{rules_path}" target="_blank">reglas del servidor</a> y los <a href="%{terms_path}" target="_blank">tÃ©rminos del servicio</a>
     checkbox_agreement_without_rules_html: Acepto los <a href="%{terms_path}" target="_blank">tÃ©rminos del servicio</a>
     delete_account: Eliminar cuenta
-    delete_account_html: Si querÃ©s eliminar tu cuenta, podÃ©s <a href="%{path}">seguÃ por acÃ¡</a>. Se te va a pedir una confirmaciÃ³n.
+    delete_account_html: Si querÃ©s eliminar tu cuenta, podÃ©s <a href="%{path}">seguir por acÃ¡</a>. Se te va a pedir una confirmaciÃ³n.
     description:
       prefix_invited_by_user: "Â¡@%{name} te invita para que te unÃ¡s a este servidor de Mastodon!"
       prefix_sign_up: "Â¡Unite a Mastodon hoy!"
-      suffix: Con una cuenta vas a poder seguir gente, escribir estados e intercambiar mensajes Â¡con usuarios de cualquier servidor de Mastodon y mÃ¡s!
+      suffix: Con una cuenta vas a poder seguir gente, escribir toots e intercambiar mensajes Â¡con usuarios de cualquier servidor de Mastodon y mÃ¡s!
     didnt_get_confirmation: "Â¿No recibiste el correo electrÃ³nico de confirmaciÃ³n?"
+    dont_have_your_security_key: "Â¿No tenÃ©s tu llave de seguridad?"
     forgot_password: "Â¿Te olvidaste la contraseÃ±a?"
     invalid_reset_password_token: La clave para cambiar la contraseÃ±a no es vÃ¡lida o venciÃ³. Por favor, solicitÃ¡ una nueva.
+    link_to_otp: IngresÃ¡ un cÃ³digo de dos factores desde tu dispositivo o un cÃ³digo de recuperaciÃ³n
+    link_to_webauth: UsÃ¡ tu dispositivo de llave de seguridad
     login: Iniciar sesiÃ³n
     logout: Cerrar sesiÃ³n
     migrate_account: Mudarse a otra cuenta
@@ -705,9 +762,11 @@ es-AR:
       account_status: Estado de la cuenta
       confirming: Esperando confirmaciÃ³n de correo electrÃ³nico.
       functional: Tu cuenta estÃ¡ totalmente operativa.
-      pending: Tu solicitud estÃ¡ pendiente de revisiÃ³n por nuestro equipo. Eso puede tardar algÃºn tiempo. Si se aprueba tu solicitud, vas a recibir un correo electrÃ³nico.
+      pending: Tu solicitud estÃ¡ pendiente de revisiÃ³n por nuestra administraciÃ³n. Eso puede tardar algÃºn tiempo. Si se aprueba tu solicitud, vas a recibir un correo electrÃ³nico.
       redirecting_to: Tu cuenta se encuentra inactiva porque estÃ¡ siendo redirigida a %{acct}.
+    too_fast: Formulario enviado demasiado rÃ¡pido, probÃ¡ de nuevo.
     trouble_logging_in: "Â¿TenÃ©s problemas para iniciar sesiÃ³n?"
+    use_security_key: Usar la llave de seguridad
   authorize_follow:
     already_following: Ya estÃ¡s siguiendo a esta cuenta
     already_requested: Ya enviaste una solicitud de seguimiento a esa cuenta
@@ -732,19 +791,20 @@ es-AR:
   date:
     formats:
       default: "%Y.%b.%d"
+      with_month_name: "%Y.%B.%d"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}h"
-      about_x_months: "%{count}m"
-      about_x_years: "%{count}a"
-      almost_x_years: "%{count}a"
+      about_x_months: "%{count}M"
+      about_x_years: "%{count}A"
+      almost_x_years: "%{count}A"
       half_a_minute: ReciÃ©n
-      less_than_x_minutes: "%{count}m"
+      less_than_x_minutes: "%{count}min"
       less_than_x_seconds: ReciÃ©n
-      over_x_years: "%{count}a"
-      x_days: "%{count}d"
-      x_minutes: "%{count}m"
-      x_months: "%{count}m"
+      over_x_years: "%{count}A"
+      x_days: "%{count}D"
+      x_minutes: "%{count}min"
+      x_months: "%{count}M"
       x_seconds: "%{count}s"
   deletes:
     challenge_not_passed: La informaciÃ³n que ingresaste no es correcta
@@ -778,7 +838,7 @@ es-AR:
     '422':
       content: FallÃ³ la verificaciÃ³n de seguridad. Â¿EstÃ¡s bloqueando cookies?
       title: FallÃ³ la verificaciÃ³n de seguridad
-    '429': Asfixiado
+    '429': Demasiadas solicitudes
     '500':
       content: Lo sentimos, pero algo saliÃ³ mal en nuestro lado.
       title: Esta pÃ¡gina no es correcta
@@ -792,14 +852,15 @@ es-AR:
       date: Fecha
       download: DescargÃ¡ tu archivo historial
       hint_html: PodÃ©s solicitar un archivo historial de tus <strong>toots y medios subidos</strong>. Los datos exportados estarÃ¡n en formato "ActivityPub", legibles por cualquier software compatible. PodÃ©s solicitar un archivo historial cada 7 dÃas.
-      in_progress: Compilando tu archivo historialâ€¦
+      in_progress: Compilando tu archivo historial...
       request: SolicitÃ¡ tu archivo historial
       size: TamaÃ±o
-    blocks: Tus bloqueos
+    blocks: Cuentas que bloqueaste
+    bookmarks: Marcadores
     csv: CSV
     domain_blocks: Dominios bloqueados
     lists: Listas
-    mutes: Quienes silenciaste
+    mutes: Cuentas que silenciaste
     storage: Almacenamiento de medios
   featured_tags:
     add_new: Agregar nueva
@@ -809,7 +870,7 @@ es-AR:
   filters:
     contexts:
       account: Perfiles
-      home: LÃnea temporal principal
+      home: Inicio y listas
       notifications: Notificaciones
       public: LÃneas temporales pÃºblicas
       thread: Conversaciones
@@ -817,7 +878,7 @@ es-AR:
       title: Editar filtro
     errors:
       invalid_context: Se suministrÃ³ un contexto no vÃ¡lido o vacÃo
-      invalid_irreversible: El filtrado irreversible sÃ³lo funciona con los contextos de "Principal" o de notificaciones
+      invalid_irreversible: El filtrado irreversible sÃ³lo funciona con los contextos de "Principal" o de "Notificaciones"
     index:
       delete: Eliminar
       empty: No tenÃ©s filtros.
@@ -863,20 +924,23 @@ es-AR:
     status: Estado de verificaciÃ³n
     view_proof: Ver prueba
   imports:
+    errors:
+      over_rows_processing_limit: contiene mÃ¡s de %{count} filas
     modes:
       merge: Combinar
       merge_long: Mantener registros existentes y agregar nuevos
       overwrite: Sobrescribir
       overwrite_long: Reemplazar registros actuales con los nuevos
-    preface: PodÃ©s importar ciertos datos que exportaste desde otro servidor, como una lista de las personas que estÃ¡s siguiendo o bloqueando.
+    preface: PodÃ©s importar ciertos datos que exportaste desde otro servidor, como una lista de las cuentas que estÃ¡s siguiendo o bloqueando.
     success: Tus datos se subieron exitosamente y serÃ¡n procesados en brevedad
     types:
       blocking: Lista de bloqueados
+      bookmarks: Marcadores
       domain_blocking: Lista de dominios bloqueados
       following: Lista de seguidos
       muting: Lista de silenciados
     upload: Subir
-  in_memoriam_html: Como recordatorio.
+  in_memoriam_html: Cuenta conmemorativa.
   invites:
     delete: Desactivar
     expired: Vencidas
@@ -904,8 +968,8 @@ es-AR:
       limit: Alcanzaste el mÃ¡ximo de listas
   media_attachments:
     validations:
-      images_and_video: No se puede adjuntar un video a un estado que ya contenga imÃ¡genes
-      not_ready: No se pueden adjuntar archivos que no terminaron de procesarse. Â¡IntentÃ¡ de nuevo en un rato!
+      images_and_video: No se puede adjuntar un video a un toot que ya contenga imÃ¡genes
+      not_ready: No se pueden adjuntar archivos que no se han terminado de procesar. Â¡IntentÃ¡ de nuevo en un rato!
       too_many: No se pueden adjuntar mÃ¡s de 4 archivos
   migrations:
     acct: Mudada a
@@ -955,10 +1019,10 @@ es-AR:
       subject:
         one: "1 nueva notificaciÃ³n desde tu Ãºltima visita \U0001F418"
         other: "%{count} nuevas notificaciones desde tu Ãºltima visita \U0001F418"
-      title: En tu ausenciaâ€¦
+      title: En tu ausencia...
     favourite:
-      body: 'Tu estado fue marcado como favorito por %{name}:'
-      subject: "%{name} marcÃ³ como favorito tu estado"
+      body: 'Tu toot fue marcado como favorito por %{name}:'
+      subject: "%{name} marcÃ³ tu toot como favorito"
       title: Nuevo favorito
     follow:
       body: "Â¡%{name} te estÃ¡ siguiendo!"
@@ -975,8 +1039,8 @@ es-AR:
       subject: Fuiste mencionado por %{name}
       title: Nueva menciÃ³n
     reblog:
-      body: "%{name} retooteÃ³ tu estado:"
-      subject: "%{name} retooteÃ³ tu estado"
+      body: "%{name} retooteÃ³ tu toot:"
+      subject: "%{name} retooteÃ³ tu toot"
       title: Nuevo retoot
   notifications:
     email_events: Eventos para notificaciones por correo electrÃ³nico
@@ -987,11 +1051,19 @@ es-AR:
       decimal_units:
         format: "%n%u"
         units:
-          billion: B
+          billion: MM
           million: M
-          quadrillion: Q
+          quadrillion: C
           thousand: m
           trillion: T
+  otp_authentication:
+    code_hint: IngresÃ¡ el cÃ³digo generado por tu aplicaciÃ³n de autenticaciÃ³n para confirmar
+    description_html: Si habilitÃ¡s la <strong>autenticaciÃ³n de dos factores</strong> usando una aplicaciÃ³n de autenticaciÃ³n, entonces en el inicio de sesiÃ³n se te pedirÃ¡ que estÃ©s con tu dispositivo, el cual generarÃ¡ un cÃ³digo numÃ©rico ("token") para que lo ingresÃ©s.
+    enable: Habilitar
+    instructions_html: <strong>EscaneÃ¡ este cÃ³digo QR en Authy, Google Authenticator o en otra aplicaciÃ³n TOTP en tu dispositivo</strong>. A partir de ahora, esa aplicaciÃ³n generarÃ¡ un cÃ³digo numÃ©rico ("token") para que lo ingresÃ©s.
+    manual_instructions: 'Si no podÃ©s escanear el cÃ³digo QR y necesitÃ¡s ingresarlo manualmente, acÃ¡ estÃ¡ el secreto en texto plano:'
+    setup: Configurar
+    wrong_code: "Â¡El cÃ³digo ingresado no es vÃ¡lido! Â¿La hora del servidor y del dispositivo son correctas?"
   pagination:
     newer: MÃ¡s recientes
     next: Siguiente
@@ -1010,7 +1082,7 @@ es-AR:
       too_few_options: debe tener mÃ¡s de un elemento
       too_many_options: no puede contener mÃ¡s de %{max} elementos
   preferences:
-    other: Otros
+    other: Otras opciones
     posting_defaults: ConfiguraciÃ³n predeterminada de publicaciones
     public_timelines: LÃneas temporales pÃºblicas
   reactions:
@@ -1020,13 +1092,14 @@ es-AR:
   relationships:
     activity: Actividad de la cuenta
     dormant: Inactivas
+    follow_selected_followers: Seguir a los seguidores seleccionados
     followers: Seguidores
     following: Siguiendo
     invited: Invitado
     last_active: Ãšltima actividad
     most_recent: MÃ¡s reciente
     moved: Mudada
-    mutual: Mutuo
+    mutual: Mutua
     primary: Principal
     relationship: RelaciÃ³n
     remove_selected_domains: Quitar todos los seguidores de los dominios seleccionados
@@ -1036,10 +1109,10 @@ es-AR:
   remote_follow:
     acct: IngresÃ¡ tu usuario@dominio desde el que querÃ©s seguir
     missing_resource: No se pudo encontrar la direcciÃ³n web de redireccionamiento requerida para tu cuenta
-    no_account_html: "Â¿No tenÃ©s cuenta? PodÃ©s <a href='%{sign_up_path}' target='_blank'>registrarte acÃ¡</a>."
+    no_account_html: "Â¿No tenÃ©s cuenta? PodÃ©s <a href='%{sign_up_path}' target='_blank'>registrarte acÃ¡</a>"
     proceed: Proceder para seguir
     prompt: 'Vas a seguir a:'
-    reason_html: "Â¿<strong>Â¿Por quÃ© es necesario este paso?</strong> <code>%{instance}</code> puede que no sea el servidor donde estÃ¡s registrado, asÃ que necesitamos redirigirte primero a tu servidor de origen."
+    reason_html: "<strong>Â¿Por quÃ© es necesario este paso?</strong> <code>%{instance}</code> puede que no sea el servidor donde estÃ¡s registrado, asÃ que necesitamos redirigirte primero a tu servidor de origen."
   remote_interaction:
     favourite:
       proceed: Proceder para marcar como favorito
@@ -1063,15 +1136,15 @@ es-AR:
       chrome: Chrome
       edge: Edge
       electron: Electron
-      firefox: Firefox
-      generic: Navegador web desconocido
+      firefox: Mozilla Firefox
+      generic: "[Navegador web desconocido]"
       ie: Internet Explorer
       micro_messenger: MicroMessenger
       nokia: Navegador web de Nokia S40 Ovi
       opera: Opera
       otter: Otter
       phantom_js: PhantomJS
-      qq: Navegador QQ
+      qq: QQ Browser
       safari: Safari
       uc_browser: UC Browser
       weibo: Weibo
@@ -1083,12 +1156,12 @@ es-AR:
       adobe_air: Adobe Air
       android: Android
       blackberry: BlackBerry
-      chrome_os: ChromeOS
+      chrome_os: Chrome OS
       firefox_os: Firefox OS
       ios: iOS
       linux: GNU/Linux
       mac: macOS
-      other: plataforma desconocida
+      other: "[Plataforma desconocida]"
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
@@ -1105,7 +1178,7 @@ es-AR:
     delete: EliminaciÃ³n de la cuenta
     development: Desarrollo
     edit_profile: Editar perfil
-    export: Exportar datos
+    export: ExportaciÃ³n de datos
     featured_tags: Etiquetas destacadas
     identity_proofs: Pruebas de identidad
     import: Importar
@@ -1116,6 +1189,7 @@ es-AR:
     profile: Perfil
     relationships: Seguimientos
     two_factor_authentication: AutenticaciÃ³n de dos factores
+    webauthn_authentication: Llaves de seguridad
   spam_check:
     spam_detected: Este es un informe automatizado. Se detectÃ³ spam.
   statuses:
@@ -1136,7 +1210,7 @@ es-AR:
       one: 'contenÃa una etiqueta no permitida: %{tags}'
       other: 'contenÃa las etiquetas no permitidas: %{tags}'
     errors:
-      in_reply_not_found: El estado al que intentÃ¡s responder no existe.
+      in_reply_not_found: El toot al que intentÃ¡s responder no existe.
     language_detection: Detectar idioma automÃ¡ticamente
     open_in_web: Abrir en web
     over_character_limit: se excediÃ³ el lÃmite de %{max} caracteres
@@ -1154,13 +1228,15 @@ es-AR:
         other: "%{count} votos"
       vote: Votar
     show_more: Mostrar mÃ¡s
+    show_newer: Mostrar mÃ¡s recientes
+    show_older: Mostrar mÃ¡s antiguos
     show_thread: Mostrar hilo
     sign_in_to_participate: IniciÃ¡ sesiÃ³n para participar en la conversaciÃ³n
     title: '%{name}: "%{quote}"'
     visibilities:
       private: SÃ³lo a seguidores
       private_long: SÃ³lo mostrar a seguidores
-      public: PÃºblica
+      public: PÃºblico
       public_long: Todos pueden ver
       unlisted: No listado
       unlisted_long: Todos pueden ver, pero no estÃ¡ listado en las lÃneas temporales pÃºblicas
@@ -1177,7 +1253,7 @@ es-AR:
 
       <ul>
       <li><em>InformaciÃ³n bÃ¡sica de la cuenta</em>: Si te registrÃ¡s en este servidor, se te va a pedir un nombre de usuario, una direcciÃ³n de correo electrÃ³nico y una contraseÃ±a. TambiÃ©n podÃ©s ingresar informaciÃ³n adicional de perfil como un nombre para mostrar y una biografÃa, y subir un avatar y una imagen de cabecera. El nombre de usuario, nombre para mostrar, biografÃa, avatar e imagen de cabecera siempre son visibles pÃºblicamente.</li>
-      <li><em>Toots, seguimiento y otra informaciÃ³n pÃºblica</em>: La lista de gente a la que seguÃs es mostrada pÃºblicamente, al igual que la de tus seguidores. Cuando enviÃ¡s un mensaje, se almacenan la fecha y hora, asÃ como la aplicaciÃ³n desde la cual enviaste el mensaje. Los mensajes pueden contener archivos adjuntos de medios, como imÃ¡genes y videos. Los toots pÃºblicos y no listados estÃ¡n tÃ©cnicamente disponibles para todos. Cuando destacÃ¡s un toot en tu perfil, eso tambiÃ©n se considera informaciÃ³n disponible pÃºblicamente. Tus toots son entregados a tus seguidores, en algunos casos significa que son entregados a diferentes servidores y las copias son almacenadas allÃ. Cuando eliminÃ¡s toots, esto tambiÃ©n afecta a tus seguidores. La acciÃ³n de retootear o marcar como favorito otro toot es siempre pÃºblica.</li>
+      <li><em>Toots, seguimiento y otra informaciÃ³n pÃºblica</em>: La lista de gente a la que seguÃs es mostrada pÃºblicamente, al igual que la de tus seguidores. Cuando enviÃ¡s un mensaje, se almacenan la fecha y hora, asÃ como la aplicaciÃ³n desde la cual enviaste el mensaje. Los mensajes pueden contener archivos adjuntos de medios, como imÃ¡genes y videos. Los toots pÃºblicos y no listados estÃ¡n tÃ©cnicamente disponibles para todos. Cuando destacÃ¡s un toot en tu perfil, eso tambiÃ©n se considera informaciÃ³n disponible pÃºblicamente. Tus toots son entregados a tus seguidores; en algunos casos significa que son entregados a diferentes servidores y las copias son almacenadas allÃ. Cuando eliminÃ¡s toots, esto tambiÃ©n afecta a tus seguidores. La acciÃ³n de retootear o marcar como favorito otro toot es siempre pÃºblica.</li>
       <li><em>Toots directos y sÃ³lo para seguidores</em>: Todos los toots se almacenan y procesan en el servidor. Los toots sÃ³lo para seguidores se entregan a los seguidores y usuarios que se mencionan en ellos, y los mensajes directos se entregan sÃ³lo a los usuarios que se mencionan en ellos. En algunos casos significa que se entregan a diferentes servidores y que las copias se almacenan allÃ. Hacemos un esfuerzo de buena fe para limitar el acceso a esos toots sÃ³lo a las personas autorizadas, pero otros servidores pueden no hacerlo. Por lo tanto, es importante revisar los servidores a los que pertenecen tus seguidores. PodÃ©s cambiar una opciÃ³n para aprobar y rechazar nuevos seguidores manualmente en la configuraciÃ³n. <em>Por favor, tenÃ© en cuenta que los operadores del servidor y de cualquier servidor receptor pueden ver dichos mensajes</em>, y que los destinatarios pueden tomar capturas de pantalla, copiarlos o volver a compartirlos de alguna otra manera. <em>No compartas ninguna informaciÃ³n peligrosa en Mastodon.</em></li>
       <li><em>Direcciones IP y otros metadatos</em>: Cuando iniciÃ¡s sesiÃ³n, registramos la direcciÃ³n IP desde dÃ³nde lo estÃ¡s haciendo, asÃ como el nombre de tu navegador web. Todos los inicios de sesiones estÃ¡n disponibles para tu revisiÃ³n y revocaciÃ³n en la configuraciÃ³n. La Ãºltima direcciÃ³n IP usada se almacena hasta por 12 meses. TambiÃ©n podemos conservar los registros del servidor que incluyen la direcciÃ³n IP de cada solicitud a nuestro servidor.</li>
       </ul>
@@ -1189,7 +1265,7 @@ es-AR:
       <p>Toda la informaciÃ³n que recolectamos de vos puede ser usada de las siguientes maneras:</p>
 
       <ul>
-      <li>Para proporcionar la funcionalidad principal de Mastodon. SÃ³lo puedes interactuar con el contenido de otras personas y publicar tu propio contenido cuando hayÃ¡s iniciado sesiÃ³n. Por ejemplo, podÃ©s seguir a otras personas para ver sus mensajes combinados en tu propia lÃnea temporal personalizada.</li>
+      <li>Para proporcionar la funcionalidad principal de Mastodon. SÃ³lo podÃ©s interactuar con el contenido de otras personas y publicar tu propio contenido cuando hayÃ¡s iniciado sesiÃ³n. Por ejemplo, podÃ©s seguir a otras personas para ver sus mensajes combinados en tu propia lÃnea temporal personalizada.</li>
       <li>Para ayudar a la moderaciÃ³n de la comunidad, por ejemplo, comparando tu direcciÃ³n IP con otras conocidas para determinar la evasiÃ³n de prohibiciones u otras violaciones.</li>
       <li>La direcciÃ³n de correo electrÃ³nico que nos proporcionÃ©s podrÃa usarse para enviarte informaciÃ³n, notificaciones sobre otras personas que interactÃºen con tu contenido o para enviarte mensajes, asÃ como para responder a consultas y/u otras solicitudes o preguntas.</li>
       </ul>
@@ -1198,20 +1274,20 @@ es-AR:
 
       <h3 id="protect">Â¿CÃ³mo protegemos tu informaciÃ³n?</h3>
 
-      <p>Implementamos una variedad de medidas de seguridad para mantener la seguridad de tu informaciÃ³n personal cuando ingresÃ¡s, enviÃ¡s o accedÃ©s a tu informaciÃ³n personal. Entre otras cosas, la sesiÃ³n de tu navegador web, asÃ como el trÃ¡fico entre sus aplicaciones y la API, estÃ¡n protegidos con SSL; y tu contraseÃ±a estÃ¡ protegida mediante un algoritmo unidireccional fuerte. PodÃ©s habilitar la autenticaciÃ³n de dos factores para un acceso mÃ¡s seguro a tu cuenta.</p>
+      <p>Implementamos una variedad de medidas de seguridad para mantener la seguridad de tu informaciÃ³n personal cuando ingresÃ¡s, enviÃ¡s o accedÃ©s a tu informaciÃ³n personal. Entre otras cosas, la sesiÃ³n de tu navegador web, asÃ como el trÃ¡fico entre sus aplicaciones y la API, estÃ¡n protegidos con SSL; y tu contraseÃ±a estÃ¡ protegida mediante un algoritmo unidireccional fuerte. PodÃ©s habilitar la autenticaciÃ³n de dos factores para obtener un acceso mÃ¡s seguro a tu cuenta.</p>
 
       <hr class="spacer" />
 
       <h3 id="data-retention">Â¿CuÃ¡l es nuestra polÃtica de retenciÃ³n de datos?</h3>
 
-      <p>Haremos un esfuerzo de buena fe para:</p>
+      <p>Hacemos un esfuerzo de buena fe para:</p>
 
       <ul>
       <li>Conservar los registros del servidor que contengan la direcciÃ³n IP de todas las solicitudes a este servidor, en la medida en que se mantengan dichos registros, por no mÃ¡s de 90 dÃas.</li>
       <li>Conservar las direcciones IP asociadas a los usuarios registrados, por no mÃ¡s de 12 meses.</li>
       </ul>
 
-      <p>PodÃ© solicitar y descargar un archivo historial de tu contenido, incluyendo tus toots, archivos adjuntos de medios, avatar e imagen de cabecera.</p>
+      <p>PodÃ©s solicitar y descargar un archivo historial de tu contenido, incluyendo tus toots, archivos adjuntos de medios, avatar e imagen de cabecera.</p>
 
       <p>PodÃ©s eliminar tu cuenta de forma irreversible en cualquier momento.</p>
 
@@ -1219,7 +1295,7 @@ es-AR:
 
       <h3 id="cookies">Â¿Usamos cookies?</h3>
 
-      <p>SÃ. Las cookies son pequeÃ±os archivos que un sitio o su proveedor de servicios transfiere a la unidad de almacenamiento de tu computadora a travÃ©s de tu navegador web (si lo permitÃs). Estas cookies permiten al sitio reconocer tu navegador web y, si tenÃ©s una cuenta registrada, asociarla con la misma.</p>
+      <p>SÃ. Las cookies son pequeÃ±os archivos que un sitio o su proveedor de servicios transfiere a la unidad de almacenamiento de tu computadora a travÃ©s de tu navegador web (si asÃ lo permitÃs). Estas cookies permiten al sitio reconocer tu navegador web y, si tenÃ©s una cuenta registrada, asociarla con la misma.</p>
 
       <p>Usamos cookies para entender y guardar tu configuraciÃ³n para futuras visitas.</p>
 
@@ -1229,7 +1305,7 @@ es-AR:
 
       <p>No vendemos, comercializamos ni transferimos de ninguna otra manera a terceros tu informaciÃ³n personal identificable. Esto no incluye a los terceros de confianza que nos asisten en la operaciÃ³n de nuestro sitio, en la realizaciÃ³n de nuestros negocios o en la prestaciÃ³n de servicios, siempre y cuando dichas partes acuerden mantener la confidencialidad de esta informaciÃ³n. TambiÃ©n podrÃamos liberar tu informaciÃ³n cuando creamos que es apropiado para cumplir con la ley, hacer cumplir las polÃticas de nuestro sitio web, o proteger derechos, propiedad o seguridad, nuestros o de otros.</p>
 
-      <p>Tu contenido pÃºblico puede ser descargado por otros servidores de la red. Tus mensajes pÃºblicos y sÃ³lo para seguidores se envÃan a los servidores donde residen tus seguidores, y los mensajes directos se envÃan a los servidores de los destinatarios, en la medida en que dichos seguidores o destinatarios residan en un servidor diferente.</p>
+      <p>Tu contenido pÃºblico puede ser descargado por otros servidores de la red. Tus mensajes pÃºblicos y tus mensajes sÃ³lo para seguidores se envÃan a los servidores donde residen tus seguidores, y los mensajes directos se envÃan a los servidores de los destinatarios, en la medida en que dichos seguidores o destinatarios residan en un servidor diferente.</p>
 
       <p>Cuando autorizÃ¡s a una aplicaciÃ³n a usar tu cuenta, dependiendo del alcance de los permisos que aprobÃ©s, puede acceder a la informaciÃ³n de tu perfil pÃºblico, tu lista de seguimiento, tus seguidores, tus listas, todos tus mensajes y tus favoritos. Las aplicaciones nunca podrÃ¡n acceder a tu direcciÃ³n de correo electrÃ³nico o contraseÃ±a.</p>
 
@@ -1237,9 +1313,9 @@ es-AR:
 
       <h3 id="children">Uso del sitio web por parte de niÃ±os</h3>
 
-      <p>Si este servidor estÃ¡ en la UE o en el EEE: Nuestro sitio web, productos y servicios estÃ¡n dirigidos a personas mayores de 16 aÃ±os. Si tenÃ©s menos de 16 aÃ±os, segÃºn los requisitos de la GDPR (<a href="https://es.wikipedia.org/wiki/Reglamento_General_de_Protecci%C3%B3n_de_Datos">Reglamento General de ProtecciÃ³n de Datos</a>) no usÃ©s este sitio.</p>
+      <p>Si este servidor estÃ¡ en la UE o en el EEE: Nuestro sitio web, productos y servicios estÃ¡n dirigidos a personas mayores de 16 aÃ±os. Si tenÃ©s menos de 16 aÃ±os, segÃºn los requisitos de la GDPR (<a href="https://es.wikipedia.org/wiki/Reglamento_General_de_Protecci%C3%B3n_de_Datos">Reglamento General de ProtecciÃ³n de Datos</a>) entonces, por favor, no usÃ©s este sitio web.</p>
 
-      <p>Si este servidor estÃ¡ en los EE.UU.: Nuestro sitio web, productos y servicios estÃ¡n todos dirigidos a personas que tienen al menos 13 aÃ±os de edad. Si tenÃ©s menos de 13 aÃ±os, segÃºn los requisitos de COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Acta de ProtecciÃ³n de la Privacidad en LÃnea de NiÃ±os [en inglÃ©s]</a>) no usÃ©s este sitio.</p>
+      <p>Si este servidor estÃ¡ en los EE.UU.: Nuestro sitio web, productos y servicios estÃ¡n dirigidos a personas que tienen al menos 13 aÃ±os de edad. Si tenÃ©s menos de 13 aÃ±os, segÃºn los requisitos de COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Acta de ProtecciÃ³n de la Privacidad en LÃnea de NiÃ±os [en inglÃ©s]</a>) entonces, por favor, no usÃ©s este sitio web.</p>
 
       <p>Los requisitos legales pueden ser diferentes si este servidor estÃ¡ en otra jurisdicciÃ³n.</p>
 
@@ -1260,23 +1336,22 @@ es-AR:
   time:
     formats:
       default: "%Y.%b.%d, %H:%M"
-      month: "%b %Y"
+      month: "%b de %Y"
   two_factor_authentication:
-    code_hint: IngresÃ¡ el cÃ³digo generado por tu aplicaciÃ³n de autenticaciÃ³n para confirmar
-    description_html: Si habilitÃ¡s la <strong>autenticaciÃ³n de dos factores</strong>, se requerirÃ¡ estar en posesiÃ³n de tu dispositivo mÃ³vil, lo que generarÃ¡ claves para que las ingresÃ©s.
-    disable: Deshabilitar
-    enable: Habilitar
+    add: Agregar
+    disable: Deshabilitar 2FA
+    disabled_success: AutenticaciÃ³n de dos factores exitosamente deshabilitada
+    edit: Editar
     enabled: La autenticaciÃ³n de dos factores estÃ¡ activada
     enabled_success: Se habilitÃ³ exitosamente la autenticaciÃ³n de dos factores
     generate_recovery_codes: Generar cÃ³digos de recuperaciÃ³n
-    instructions_html: <strong>EscaneÃ¡ este cÃ³digo QR con Authy, FreeOTP, Google Authenticator, Microsoft Authenticator o cualquier otra aplicaciÃ³n de generaciÃ³n de contraseÃ±as por Ãºnica vez basada en el tiempo ("TOTP") en tu dispositivo mÃ³vil</strong>. Desde ahora, esta aplicaciÃ³n va a generar claves que tenÃ©s que ingresar cuando quieras iniciar sesiÃ³n.
-    lost_recovery_codes: Los cÃ³digos de recuperaciÃ³n te permiten recuperar el acceso a tu cuenta, si perdÃ©s tu dispositivo mÃ³vil. Si perdiste tus cÃ³digos de recuperaciÃ³n, podÃ©s regenerarlos acÃ¡. Tus antiguos cÃ³digos de recuperaciÃ³n serÃ¡n invalidados.
-    manual_instructions: 'Si no podÃ©s escanear el cÃ³digo QR y necesitÃ¡s introducirlo manualmente, este es el secreto en texto plano:'
+    lost_recovery_codes: Los cÃ³digos de recuperaciÃ³n te permiten recuperar el acceso a tu cuenta, si no tenÃ©s acceso a la aplicaciÃ³n de 2FA. Si perdiste tus cÃ³digos de recuperaciÃ³n, podÃ©s regenerarlos acÃ¡. Tus antiguos cÃ³digos de recuperaciÃ³n serÃ¡n invalidados.
+    methods: MÃ©todos de dos factores
+    otp: AplicaciÃ³n de autenticaciÃ³n
     recovery_codes: Resguardar cÃ³digos de recuperaciÃ³n
     recovery_codes_regenerated: Los cÃ³digos de recuperaciÃ³n se regeneraron exitosamente
-    recovery_instructions_html: Si alguna vez perdÃ©s el acceso a tu dispositivo mÃ³vil, podÃ©s usar uno de los siguientes cÃ³digos de recuperaciÃ³n para recuperar el acceso a tu cuenta. <strong>Mantenelos a salvo</strong>. Por ejemplo, podÃ©s imprimirlos y guardarlos con otros documentos importantes.
-    setup: Configurar
-    wrong_code: "Â¡El cÃ³digo ingresado no es vÃ¡lido! Â¿La hora en el dispositivo y en el servidor es correcta?"
+    recovery_instructions_html: Si alguna vez perdÃ©s el acceso a tu aplicaciÃ³n de 2FA, podÃ©s usar uno de los siguientes cÃ³digos de recuperaciÃ³n para recuperar el acceso a tu cuenta. <strong>Mantenelos a salvo</strong>. Por ejemplo, podÃ©s imprimirlos y guardarlos con otros documentos importantes.
+    webauthn: Llaves de seguridad
   user_mailer:
     backup_ready:
       explanation: Solicitado un resguardo completo de tu cuenta de Mastodon. Â¡Ya estÃ¡ listo para descargar!
@@ -1290,25 +1365,28 @@ es-AR:
       title: Intento de inicio de sesiÃ³n
     warning:
       explanation:
-        disable: Mientras tu cuenta estÃ© congelada, la informaciÃ³n de la misma permanecerÃ¡ intacta, pero no podÃ©s realizar ninguna acciÃ³n hasta que se desbloquee.
-        silence: Mientras tu cuenta estÃ© limitada, sÃ³lo las personas que ya te estÃ©n siguiendo verÃ¡n tus toots en este servidor, y puede que se te excluya de varios listados pÃºblicos. Sin embargo, otras personas pueden seguirte manualmente.
-        suspend: Tu cuenta fue suspendida, y todos tus toots y tus archivos de medios subidos fueron irreversiblemente eliminados de este servidor, y de los servidores en donde tenÃas seguidores.
-      get_in_touch: PodÃ©s responder a esta direcciÃ³n de correo electrÃ³nico para ponerte en contacto con el equipo de %{instance}.
+        disable: Ya no podÃ©s iniciar sesiÃ³n en tu cuenta o usarla de alguna manera, pero tu perfil y otros datos permanecen intactos.
+        sensitive: Tus archivos de medios subidos y enlaces de medios serÃ¡n tratados como sensibles.
+        silence: TodavÃa podÃ©s usar tu cuenta, pero sÃ³lo las personas que ya te estÃ©n siguiendo verÃ¡n tus toots en este servidor, y puede que se te excluya de varios listados pÃºblicos. Sin embargo, otras personas pueden seguirte manualmente.
+        suspend: Ya no podÃ©s usar tu cuenta; tu perfil y otros datos ya no son accesibles. TodavÃa podÃ©s iniciar sesiÃ³n para solicitar un resguardo de tus datos hasta que los mismos sean totalmente quitados, pero retendremos ciertos datos para prevenirte de evadir la suspensiÃ³n.
+      get_in_touch: PodÃ©s responder a esta direcciÃ³n de correo electrÃ³nico para ponerte en contacto con la administraciÃ³n de %{instance}.
       review_server_policies: Revisar las polÃticas del servidor
       statuses: 'EspecÃficamente, para:'
       subject:
         disable: Tu cuenta %{acct} fue congelada
         none: Advertencia para %{acct}
+        sensitive: Los toots con medios de tu cuenta %{acct} fueron marcados como sensibles
         silence: Tu cuenta %{acct} fue limitada
         suspend: Tu cuenta %{acct} fue suspendida
       title:
         disable: Cuenta congelada
         none: Advertencia
+        sensitive: Tus medios fueron marcados como sensibles
         silence: Cuenta limitada
         suspend: Cuenta suspendida
     welcome:
       edit_profile_action: Configurar perfil
-      edit_profile_step: PodÃ©s personalizar tu perfil subiendo un avatar, una cabecera, cambiando tu nombre para mostrar y mÃ¡s cosas. Si querÃ©s revisar a tus nuevos seguidores antes de que se les permita seguirte, podÃ©s bloquear tu cuenta.
+      edit_profile_step: PodÃ©s personalizar tu perfil subiendo un avatar, una cabecera, cambiando tu nombre para mostrar y mÃ¡s cosas. Si querÃ©s revisar a tus nuevos seguidores antes de que se les permita seguirte, podÃ©s bloquear tu cuenta (esto es, hacerla privada).
       explanation: AquÃ hay algunos consejos para empezar
       final_action: Empezar a tootear
       final_step: Â¡EmpezÃ¡ a tootear! Incluso sin seguidores, tus mensajes pÃºblicos pueden ser vistos por otros, por ejemplo en la linea temporal local y con etiquetas. Capaz que quieras presentarte al mundo con la etiqueta "#presentaciÃ³n".
@@ -1320,13 +1398,15 @@ es-AR:
       tip_federated_timeline: La lÃnea temporal federada es una lÃnea contÃnua global de la red de Mastodon. Pero sÃ³lo incluye gente que tus vecinos estÃ¡n siguiendo, asÃ que no es completa.
       tip_following: Predeterminadamente seguÃs al / a los administrador/es de tu servidor. Para encontrar mÃ¡s gente interesante, revisÃ¡ las lineas temporales local y federada.
       tip_local_timeline: La lÃnea temporal local es una lÃnea contÃnua global de cuentas en %{instance}. Â¡Estos son tus vecinos inmediatos!
-      tip_mobile_webapp: Si tu navegador web mÃ³vil te ofrece agregar Mastodon a tu pÃ¡gina de inicio, podÃ©s recibir notificaciones PuSH. Â¡ActÃºa como una aplicaciÃ³n nativa de muchas maneras!
+      tip_mobile_webapp: Si tu navegador web mÃ³vil te ofrece agregar Mastodon a tu pÃ¡gina de inicio, podÃ©s recibir notificaciones push. Â¡ActÃºa como una aplicaciÃ³n nativa de muchas maneras!
       tips: Consejos
       title: "Â¡Bienvenido a bordo, %{name}!"
   users:
-    follow_limit_reached: No podÃ©s seguir a mÃ¡s de %{limit} personas
+    blocked_email_provider: No estÃ¡ permitido este proveedor de correo electrÃ³nico
+    follow_limit_reached: No podÃ©s seguir a mÃ¡s de %{limit} cuentas
     generic_access_help_html: "Â¿TenÃ©s problemas para acceder a tu cuenta? PodÃ©s ponerte en contacto con %{email} para obtener ayuda"
-    invalid_email: La direcciÃ³n de correo electrÃ³nico no es correcta
+    invalid_email: La direcciÃ³n de correo electrÃ³nico no es vÃ¡lida
+    invalid_email_mx: Parece que esta direcciÃ³n de correo electrÃ³nico no existe
     invalid_otp_token: CÃ³digo de dos factores no vÃ¡lido
     invalid_sign_in_token: CÃ³digo de seguridad no vÃ¡lido
     otp_lost_help_html: Si perdiste al acceso a ambos, podÃ©s ponerte en contacto con %{email}
@@ -1336,3 +1416,20 @@ es-AR:
   verification:
     explanation_html: 'PodÃ©s <strong>verificarte a vos mismo como el propietario de los enlaces en los metadatos de tu perfil</strong>. Para eso, el sitio web del enlace debe contener un enlace de vuelta a tu perfil de Mastodon. El enlace en tu sitio <strong>debe</strong> tener un atributo <code>rel="me"</code>. El contenido del texto del enlace no importa. AcÃ¡ tenÃ©s un ejemplo:'
     verification: VerificaciÃ³n
+  webauthn_credentials:
+    add: Agregar nueva llave de seguridad
+    create:
+      error: Hubo un problema al agregar tu llave de seguridad. Por favor, intentÃ¡ de nuevo.
+      success: Se agregÃ³ exitosamente tu llave de seguridad.
+    delete: Eliminar
+    delete_confirmation: "Â¿EstÃ¡s seguro que querÃ©s eliminar esta llave de seguridad?"
+    description_html: Si habilitÃ¡s la <strong>autenticaciÃ³n de llave de seguridad</strong>, entonces en el inicio de sesiÃ³n se te pedirÃ¡ que usÃ©s una de tus llaves de seguridad.
+    destroy:
+      error: Hubo un problema al eliminar tu llave de seguridad. Por favor, intentÃ¡ de nuevo.
+      success: Se eliminÃ³ exitosamente tu llave de seguridad.
+    invalid_credential: Llave de seguridad no vÃ¡lida
+    nickname_hint: IngresÃ¡ el apodo de tu nueva llave de seguridad
+    not_enabled: TodavÃa no habilitaste WebAuthn
+    not_supported: Este navegador web no soporta llaves de seguridad
+    otp_required: Para usar llaves de seguridad, por favor, primero habilitÃ¡ la autenticaciÃ³n de dos factores.
+    registered_on: Registrado el %{date}
diff --git a/config/locales/es.yml b/config/locales/es.yml
index a87088cbb41a318e3e9265ab04b91056ee8b3425..0582fd1f1b9363b988efdd04cd93bf3b9d1b8143 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -60,6 +60,7 @@ es:
       one: Seguidor
       other: Seguidores
     following: Siguiendo
+    instance_actor_flash: Esta cuenta es un actor virtual utilizado para representar al servidor en sÃ mismo y no a ningÃºn usuario individual. Se utiliza para propÃ³sitos de la federaciÃ³n y no se debe suspender.
     joined: Se uniÃ³ el %{date}
     last_active: Ãºltima conexiÃ³n
     link_verified_on: La propiedad de este vÃnculo fue verificada el %{date}
@@ -98,6 +99,7 @@ es:
       add_email_domain_block: Poner en lista negra el dominio del correo
       approve: Aprobar
       approve_all: Aprobar todos
+      approved_msg: La solicitud de registro de %{username} ha sido aprobada correctamente
       are_you_sure: "Â¿EstÃ¡s seguro?"
       avatar: Avatar
       by_domain: Dominio
@@ -111,8 +113,10 @@ es:
       confirm: Confirmar
       confirmed: Confirmado
       confirming: Confirmando
+      delete: Eliminar datos
       deleted: Borrado
       demote: Degradar
+      destroyed_msg: Los datos de %{username} estÃ¡n ahora en cola para ser eliminados inminentemente
       disable: Deshabilitar
       disable_two_factor_authentication: Desactivar autenticaciÃ³n de dos factores
       disabled: Deshabilitada
@@ -123,10 +127,12 @@ es:
       email_status: E-mail Status
       enable: Habilitar
       enabled: Habilitada
+      enabled_msg: Se ha descongelado correctamente la cuenta de %{username}
       followers: Seguidores
       follows: Sigue
       header: Cabecera
       inbox_url: URL de la bandeja de entrada
+      invite_request_text: Razones para unirse
       invited_by: Invitado por
       ip: IP
       joined: Unido
@@ -138,6 +144,8 @@ es:
       login_status: Estado del login
       media_attachments: Multimedia
       memorialize: Convertir en memorial
+      memorialized: Cuenta conmemorativa
+      memorialized_msg: "%{username} se convirtiÃ³ con Ã©xito en una cuenta conmemorativa"
       moderation:
         active: Activo
         all: Todos
@@ -158,10 +166,14 @@ es:
       public: PÃºblico
       push_subscription_expires: ExpiraciÃ³n de la suscripciÃ³n PuSH
       redownload: Refrescar avatar
+      redownloaded_msg: Se actualizÃ³ correctamente el perfil de %{username} desde el origen
       reject: Rechazar
       reject_all: Rechazar todos
+      rejected_msg: La solicitud de registro de %{username} ha sido rechazada con Ã©xito
       remove_avatar: Eliminar el avatar
       remove_header: Eliminar cabecera
+      removed_avatar_msg: Se ha eliminado exitosamente la imagen del avatar de %{username}
+      removed_header_msg: Se ha eliminado con Ã©xito la imagen de cabecera de %{username}
       resend_confirmation:
         already_confirmed: Este usuario ya estÃ¡ confirmado
         send: Reenviar el correo electrÃ³nico de confirmaciÃ³n
@@ -178,6 +190,8 @@ es:
       search: Buscar
       search_same_email_domain: Otros usuarios con el mismo dominio de correo
       search_same_ip: Otros usuarios con la misma IP
+      sensitive: Sensible
+      sensitized: marcado como sensible
       shared_inbox_url: URL de bandeja compartida
       show:
         created_reports: Reportes hechos por esta cuenta
@@ -187,13 +201,19 @@ es:
       statuses: Estados
       subscribe: Suscribir
       suspended: Suspendido
+      suspension_irreversible: Los datos de esta cuenta han sido irreversiblemente eliminados. Puedes deshacer la suspensiÃ³n de la cuenta para hacerla utilizable, pero no recuperarÃ¡ los datos que tenÃas anteriormente.
+      suspension_reversible_hint_html: La cuenta ha sido suspendida y los datos se eliminarÃ¡n completamente el %{date}. Hasta entonces, la cuenta puede ser restaurada sin ningÃºn efecto perjudicial. Si desea eliminar todos los datos de la cuenta inmediatamente, puede hacerlo a continuaciÃ³n.
       time_in_queue: Esperando en cola %{time}
       title: Cuentas
       unconfirmed_email: Correo electrÃ³nico sin confirmar
+      undo_sensitized: Desmarcar como sensible
       undo_silenced: Des-silenciar
       undo_suspension: Des-suspender
+      unsilenced_msg: Se quitÃ³ con Ã©xito el lÃmite de la cuenta %{username}
       unsubscribe: Desuscribir
+      unsuspended_msg: Se quitÃ³ con Ã©xito la suspensiÃ³n de la cuenta de %{username}
       username: Nombre de usuario
+      view_domain: Ver resumen del dominio
       warn: Adevertir
       web: Web
       whitelisted: AÃ±adido a la lista blanca
@@ -208,12 +228,14 @@ es:
         create_domain_allow: Crear Permiso de Dominio
         create_domain_block: Crear Bloqueo de Dominio
         create_email_domain_block: Crear Bloqueo de Dominio de Correo ElectrÃ³nico
+        create_ip_block: Crear regla IP
         demote_user: Degradar Usuario
         destroy_announcement: Eliminar Anuncio
         destroy_custom_emoji: Eliminar Emoji Personalizado
         destroy_domain_allow: Eliminar Permiso de Dominio
         destroy_domain_block: Eliminar Bloqueo de Dominio
         destroy_email_domain_block: Eliminar Bloqueo de Dominio de Correo ElectrÃ³nico
+        destroy_ip_block: Eliminar regla IP
         destroy_status: Eliminar Estado
         disable_2fa_user: Deshabilitar 2FA
         disable_custom_emoji: Deshabilitar Emoji Personalizado
@@ -226,13 +248,16 @@ es:
         reopen_report: Reabrir Reporte
         reset_password_user: Restablecer ContraseÃ±a
         resolve_report: Resolver Reporte
+        sensitive_account: Marcar multimedia en tu cuenta como sensible
         silence_account: Silenciar Cuenta
         suspend_account: Suspender Cuenta
         unassigned_report: Desasignar Reporte
+        unsensitive_account: Desmarcar multimedia en tu cuenta como sensible
         unsilence_account: Dejar de Silenciar Cuenta
         unsuspend_account: Dejar de Suspender Cuenta
         update_announcement: Actualizar Anuncio
         update_custom_emoji: Actualizar Emoji Personalizado
+        update_domain_block: Actualizar el Bloqueo de Dominio
         update_status: Actualizar Estado
       actions:
         assigned_to_self_report: "%{name} se ha asignado la denuncia %{target} a sÃ mismo"
@@ -244,12 +269,14 @@ es:
         create_domain_allow: "%{name} ha aÃ±adido a la lista blanca el dominio %{target}"
         create_domain_block: "%{name} bloqueÃ³ el dominio %{target}"
         create_email_domain_block: "%{name} puso en lista negra el dominio de correos %{target}"
+        create_ip_block: "%{name} creÃ³ la regla para la IP %{target}"
         demote_user: "%{name} degradÃ³ al usuario %{target}"
         destroy_announcement: "%{name} eliminÃ³ el anuncio %{target}"
         destroy_custom_emoji: "%{name} destruyÃ³ el emoji %{target}"
         destroy_domain_allow: "%{name} ha eliminado el dominio %{target} de la lista blanca"
         destroy_domain_block: "%{name} desbloqueÃ³ el dominio %{target}"
         destroy_email_domain_block: "%{name} puso en lista blanca el dominio de correos %{target}"
+        destroy_ip_block: "%{name} eliminÃ³ la regla para la IP %{target}"
         destroy_status: "%{name} eliminÃ³ el estado de %{target}"
         disable_2fa_user: "%{name} deshabilitÃ³ el requerimiento de dos factores para el usuario %{target}"
         disable_custom_emoji: "%{name} deshabilitÃ³ el emoji %{target}"
@@ -262,13 +289,16 @@ es:
         reopen_report: "%{name} ha reabierto la denuncia %{target}"
         reset_password_user: "%{name} restaurÃ³ la contraseÃ±a del usuario %{target}"
         resolve_report: "%{name} ha resuelto la denuncia %{target}"
+        sensitive_account: "%{name} marcÃ³ multimedia de %{target} como sensible"
         silence_account: "%{name} silenciÃ³ la cuenta de %{target}"
         suspend_account: "%{name} suspendiÃ³ la cuenta de %{target}"
         unassigned_report: "%{name} ha desasignado la denuncia %{target}"
+        unsensitive_account: "%{name} desmarcÃ³ multimedia de %{target} como sensible"
         unsilence_account: "%{name} desactivÃ³ el silenciado de la cuenta de %{target}"
         unsuspend_account: "%{name} desactivÃ³ la suspensiÃ³n de la cuenta de %{target}"
         update_announcement: "%{name} actualizÃ³ el anuncio %{target}"
         update_custom_emoji: "%{name} actualizÃ³ el emoji %{target}"
+        update_domain_block: "%{name} actualizÃ³ el bloqueo de dominio para %{target}"
         update_status: "%{name} actualizÃ³ el estado de %{target}"
       deleted_status: "(estado borrado)"
       empty: No se encontraron registros.
@@ -372,6 +402,8 @@ es:
           silence: Silenciar
           suspend: Suspender
         title: Nuevo bloque de dominio
+      obfuscate: Ocultar nombre de dominio
+      obfuscate_hint: Oculta parcialmente el nombre de dominio en la lista si mostrar la lista de limitaciones de dominio estÃ¡ habilitado
       private_comment: Comentario privado
       private_comment_hint: Comentario sobre esta limitaciÃ³n de dominio para el uso interno por parte de los moderadores.
       public_comment: Comentario pÃºblico
@@ -411,6 +443,7 @@ es:
     instances:
       by_domain: Dominio
       delivery_available: Entrega disponible
+      empty: No se encontraron dominios.
       known_accounts:
         one: "%{count} cuenta conocida"
         other: "%{count} cuentas conocidas"
@@ -434,6 +467,21 @@ es:
         expired: Expiradas
         title: Filtrar
       title: Invitaciones
+    ip_blocks:
+      add_new: Crear regla
+      created_msg: Nueva regla IP aÃ±adida con Ã©xito
+      delete: Eliminar
+      expires_in:
+        '1209600': 2 semanas
+        '15778476': 6 meses
+        '2629746': 1 mes
+        '31556952': 1 aÃ±o
+        '86400': 1 dÃa
+        '94670856': 3 aÃ±os
+      new:
+        title: Crear nueva regla IP
+      no_ip_block_selected: No se han cambiado reglas IP ya que no se ha seleccionado ninguna
+      title: Reglas IP
     pending_accounts:
       title: Cuentas pendientes (%{count})
     relationships:
@@ -473,6 +521,8 @@ es:
       comment:
         none: Ninguno
       created_at: Denunciado
+      forwarded: Reenviado
+      forwarded_to: Reenviado a %{domain}
       mark_as_resolved: Marcar como resuelto
       mark_as_unresolved: Marcar como no resuelto
       notes:
@@ -516,6 +566,7 @@ es:
       domain_blocks_rationale:
         title: Mostrar la razÃ³n de ser
       enable_bootstrap_timeline_accounts:
+        desc_html: Hacer que los nuevos usuarios sigan automÃ¡ticamente las cuentas configuradas para que su lÃnea temporal de inicio no comience vacÃa
         title: Habilitar seguimientos predeterminados para usuarios nuevos
       hero:
         desc_html: Mostrado en la pÃ¡gina principal. Recomendable al menos 600x100px. Por defecto se establece a la miniatura de la instancia
@@ -542,6 +593,9 @@ es:
         min_invite_role:
           disabled: Nadie
           title: Permitir invitaciones de
+        require_invite_text:
+          desc_html: Cuando los registros requieren aprobaciÃ³n manual, haga obligatorio en la invitaciones el campo "Â¿Por quÃ© quieres unirte?" en lugar de opcional
+          title: Requiere a los nuevos usuarios rellenar un texto de solicitud de invitaciÃ³n
       registrations_mode:
         modes:
           approved: Se requiere aprobaciÃ³n para registrarse
@@ -681,8 +735,11 @@ es:
       prefix_sign_up: "Â¡Ãšnete a Mastodon hoy!"
       suffix: "Â¡Con una cuenta podrÃ¡s seguir a gente, publicar novedades e intercambiar mensajes con usuarios de cualquier servidor de Mastodon y mÃ¡s!"
     didnt_get_confirmation: "Â¿No recibiÃ³ el correo de confirmaciÃ³n?"
+    dont_have_your_security_key: "Â¿No tienes tu clave de seguridad?"
     forgot_password: "Â¿Olvidaste tu contraseÃ±a?"
     invalid_reset_password_token: El token de reinicio de contraseÃ±a es invÃ¡lido o expirÃ³. Por favor pide uno nuevo.
+    link_to_otp: Introduce un cÃ³digo de dos factores desde tu telÃ©fono o un cÃ³digo de recuperaciÃ³n
+    link_to_webauth: Utilice su dispositivo de clave de seguridad
     login: Iniciar sesiÃ³n
     logout: Cerrar sesiÃ³n
     migrate_account: Mudarse a otra cuenta
@@ -707,7 +764,9 @@ es:
       functional: Su cuenta estÃ¡ totalmente operativa.
       pending: Su solicitud estÃ¡ pendiente de revisiÃ³n por nuestros administradores. Eso puede tardar algÃºn tiempo. Usted recibirÃ¡ un correo electrÃ³nico si el solicitud sea aprobada.
       redirecting_to: Tu cuenta se encuentra inactiva porque estÃ¡ siendo redirigida a %{acct}.
+    too_fast: Formulario enviado demasiado rÃ¡pido, intÃ©ntelo de nuevo.
     trouble_logging_in: "Â¿Problemas para iniciar sesiÃ³n?"
+    use_security_key: Usar la clave de seguridad
   authorize_follow:
     already_following: Ya estÃ¡s siguiendo a esta cuenta
     already_requested: Ya has enviado una solicitud de seguimiento a esa cuenta
@@ -732,6 +791,7 @@ es:
   date:
     formats:
       default: "%b %d, %Y"
+      with_month_name: "%B %d, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}h"
@@ -796,6 +856,7 @@ es:
       request: Solicitar tu archivo
       size: TamaÃ±o
     blocks: Personas que has bloqueado
+    bookmarks: Marcadores
     csv: CSV
     domain_blocks: Bloqueos de dominios
     lists: Listas
@@ -863,6 +924,8 @@ es:
     status: Estado de la verificaciÃ³n
     view_proof: Ver prueba
   imports:
+    errors:
+      over_rows_processing_limit: contiene mÃ¡s de %{count} filas
     modes:
       merge: Unir
       merge_long: Mantener registros existentes y aÃ±adir nuevos
@@ -872,6 +935,7 @@ es:
     success: Sus datos se han cargado correctamente y serÃ¡n procesados en brevedad
     types:
       blocking: Lista de bloqueados
+      bookmarks: Marcadores
       domain_blocking: Lista de dominios bloqueados
       following: Lista de seguidos
       muting: Lista de silenciados
@@ -992,6 +1056,14 @@ es:
           quadrillion: Q
           thousand: m
           trillion: T
+  otp_authentication:
+    code_hint: Introduce el cÃ³digo generado por tu aplicaciÃ³n de autentificaciÃ³n para confirmar
+    description_html: Si habilitas <strong>autenticaciÃ³n de dos factores</strong> a travÃ©s de una aplicaciÃ³n de autenticaciÃ³n, el ingreso requerirÃ¡ que estÃ©s en posesiÃ³n de tu telÃ©fono, que generarÃ¡ cÃ³digos para que ingreses.
+    enable: Activar
+    instructions_html: "<strong>Escanea este cÃ³digo QR desde Google Authenticator o una aplicaciÃ³n similar en tu telÃ©fono</strong>. A partir de ahora, esta aplicaciÃ³n generarÃ¡ cÃ³digos que tendrÃ¡sque ingresar cuando quieras iniciar sesiÃ³n."
+    manual_instructions: 'Si no puedes escanear el cÃ³digo QR y necesitas introducirlo manualmente, este es el secreto en texto plano:'
+    setup: Configurar
+    wrong_code: "Â¡El cÃ³digo ingresado es invÃ¡lido! Â¿Es correcta la hora del dispositivo y el servidor?"
   pagination:
     newer: MÃ¡s nuevo
     next: PrÃ³ximo
@@ -1020,6 +1092,7 @@ es:
   relationships:
     activity: Actividad de la cuenta
     dormant: Inactivo
+    follow_selected_followers: Seguir a los seguidores seleccionados
     followers: Seguidores
     following: Siguiendo
     invited: Invitado
@@ -1034,7 +1107,7 @@ es:
     remove_selected_follows: Dejar de seguir a los usuarios seleccionados
     status: Estado de la cuenta
   remote_follow:
-    acct: Ingesa tu usuario@dominio desde el que quieres seguir
+    acct: Ingresa tu usuario@dominio desde el que quieres seguir
     missing_resource: No se pudo encontrar la URL de redirecciÃ³n requerida para tu cuenta
     no_account_html: "Â¿No tienes una cuenta? Puedes <a href='%{sign_up_path}' target='_blank'>registrarte aqui</a>"
     proceed: Proceder a seguir
@@ -1116,6 +1189,7 @@ es:
     profile: Perfil
     relationships: Siguiendo y seguidores
     two_factor_authentication: AutenticaciÃ³n de dos factores
+    webauthn_authentication: Claves de seguridad
   spam_check:
     spam_detected: Este es un informe automatizado. Se ha detectado correo no deseado.
   statuses:
@@ -1154,7 +1228,9 @@ es:
         other: "%{count} votos"
       vote: Vota
     show_more: Mostrar mÃ¡s
-    show_thread: Mostrar hilo
+    show_newer: Mostrar mÃ¡s recientes
+    show_older: Mostrar mÃ¡s antiguos
+    show_thread: Mostrar discusiÃ³n
     sign_in_to_participate: RegÃstrate para participar en la conversaciÃ³n
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1262,21 +1338,20 @@ es:
       default: "%d de %b del %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Ingresa el cÃ³digo generado por tu aplicaciÃ³n de autenticaciÃ³n para confirmar
-    description_html: Si habilitas la <strong>autenticaciÃ³n de dos factores</strong>, se requerirÃ¡ estar en posesiÃ³n de su telÃ©fono, lo que generarÃ¡ tokens para que usted pueda iniciar sesiÃ³n.
+    add: AÃ±adir
     disable: Deshabilitar
-    enable: Habilitar
+    disabled_success: AutenticaciÃ³n de doble factor desactivada correctamente
+    edit: Editar
     enabled: La autenticaciÃ³n de dos factores estÃ¡ activada
     enabled_success: VerificaciÃ³n de dos factores activada exitosamente
     generate_recovery_codes: generar cÃ³digos de recuperaciÃ³n
-    instructions_html: "<strong>Escanea este cÃ³digo QR desde Google Authenticator o una aplicaciÃ³n similar en su telÃ©fono</strong>. Desde ahora, esta aplicaciÃ³n va a generar tokens que tienes que ingresar cuando quieras iniciar sesiÃ³n."
     lost_recovery_codes: Los cÃ³digos de recuperaciÃ³n te permiten obtener acceso a tu cuenta si pierdes tu telÃ©fono. Si has perdido tus cÃ³digos de recuperaciÃ³n, puedes regenerarlos aquÃ. Tus viejos cÃ³digos de recuperaciÃ³n se harÃ¡n invÃ¡lidos.
-    manual_instructions: 'Si no puedes escanear el cÃ³digo QR y necesitas introducirlo manualmente, este es el secreto en texto plano:'
+    methods: MÃ©todos de autenticaciÃ³n de doble factor
+    otp: AplicaciÃ³n de autenticaciÃ³n
     recovery_codes: Hacer copias de seguridad de tus cÃ³digos de recuperaciÃ³n
     recovery_codes_regenerated: CÃ³digos de recuperaciÃ³n regenerados con Ã©xito
     recovery_instructions_html: Si pierdes acceso a tu telÃ©fono, puedes usar uno de los siguientes cÃ³digos de recuperaciÃ³n para obtener acceso a tu cuenta. <strong>Mantenlos a salvo</strong>. Por ejemplo, puedes imprimirlos y guardarlos con otros documentos importantes.
-    setup: Configurar
-    wrong_code: "Â¡El cÃ³digo ingresado es invÃ¡lido! Â¿El dispositivo y tiempo del servidor estÃ¡n correctos?"
+    webauthn: Claves de seguridad
   user_mailer:
     backup_ready:
       explanation: Has solicitado una copia completa de tu cuenta de Mastodon. Â¡Ya estÃ¡ preparada para descargar!
@@ -1291,6 +1366,7 @@ es:
     warning:
       explanation:
         disable: Mientras su cuenta estÃ© congelada, la informaciÃ³n de su cuenta permanecerÃ¡ intacta, pero no puede realizar ninguna acciÃ³n hasta que se desbloquee.
+        sensitive: Los archivos multimedia subidos y vinculados serÃ¡n tratados como sensibles.
         silence: Mientras su cuenta estÃ¡ limitada, sÃ³lo las personas que ya le estÃ¡n siguiendo verÃ¡n sus toots en este servidor, y puede que se le excluya de varios listados pÃºblicos. Sin embargo, otros pueden seguirle manualmente.
         suspend: Su cuenta ha sido suspendida, y todos tus toots y tus archivos multimedia subidos han sido irreversiblemente eliminados de este servidor, y de los servidores donde tenÃas seguidores.
       get_in_touch: Puede responder a esta direcciÃ³n de correo electrÃ³nico para ponerse en contacto con el personal de %{instance}.
@@ -1299,11 +1375,13 @@ es:
       subject:
         disable: Su cuenta %{acct} ha sido congelada
         none: Advertencia para %{acct}
+        sensitive: Tu cuenta %{acct} ha sido marcada como sensible
         silence: Su cuenta %{acct} ha sido limitada
         suspend: Su cuenta %{acct} ha sido suspendida
       title:
         disable: Cuenta congelada
         none: Advertencia
+        sensitive: Tu multimedia ha sido marcado como sensible
         silence: Cuenta limitada
         suspend: Cuenta suspendida
     welcome:
@@ -1324,9 +1402,11 @@ es:
       tips: Consejos
       title: Te damos la bienvenida a bordo, %{name}!
   users:
+    blocked_email_provider: Este proveedor de correo electrÃ³nico no estÃ¡ permitido
     follow_limit_reached: No puedes seguir a mÃ¡s de %{limit} personas
     generic_access_help_html: "Â¿Tienes problemas para acceder a tu cuenta? Puedes ponerte en contacto con %{email} para conseguir ayuda"
     invalid_email: La direcciÃ³n de correo es incorrecta
+    invalid_email_mx: La direcciÃ³n de correo electrÃ³nico parece inexistente
     invalid_otp_token: CÃ³digo de dos factores incorrecto
     invalid_sign_in_token: CÃ³digo de seguridad no vÃ¡lido
     otp_lost_help_html: Si perdiste al acceso a ambos, puedes ponerte en contancto con %{email}
@@ -1336,3 +1416,20 @@ es:
   verification:
     explanation_html: 'Puedes <strong> verificarte a ti mismo como el dueÃ±o de los links en los metadatos de tu perfil </strong>. Para eso, el sitio vinculado debe contener un vÃnculo a tu perfil de Mastodon. El vÃnculo en tu sitio <strong> debe </strong> tener un atributo <code> rel="me"</code>. El texto del vÃnculo no importa. AquÃ un ejemplo:'
     verification: VerificaciÃ³n
+  webauthn_credentials:
+    add: Agregar nueva clave de seguridad
+    create:
+      error: Hubo un problema al aÃ±adir su clave de seguridad. Por favor, intÃ©ntalo de nuevo.
+      success: Su clave de seguridad se ha aÃ±adido correctamente.
+    delete: Eliminar
+    delete_confirmation: "Â¿EstÃ¡s seguro de que quieres eliminar esta clave de seguridad?"
+    description_html: Si habilita la <strong>autenticaciÃ³n de clave de seguridad</strong>, iniciar sesiÃ³n requerirÃ¡ que utilice una de sus claves de seguridad.
+    destroy:
+      error: Hubo un problema al aÃ±adir su clave de seguridad. Por favor, intÃ©ntalo de nuevo.
+      success: Su clave de seguridad se ha eliminado correctamente.
+    invalid_credential: Clave de seguridad no vÃ¡lida
+    nickname_hint: Introduzca el apodo de su nueva clave de seguridad
+    not_enabled: AÃºn no has activado WebAuthn
+    not_supported: Este navegador no soporta claves de seguridad
+    otp_required: Para usar claves de seguridad, por favor habilite primero la autenticaciÃ³n de doble factor.
+    registered_on: Registrado el %{date}
diff --git a/config/locales/et.yml b/config/locales/et.yml
index d611059cc04cbc216319295035d6569fb37be69a..17f462da103d44727c640f9935178fb8de4b7b49 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1176,21 +1176,14 @@ et:
       default: "%d. %B, %Y. aastal, kell %H:%M"
       month: "%B %Y"
   two_factor_authentication:
-    code_hint: Sisesta kaheastmelise autentimise kood, mille lÃµi Teie autentimisrakendus, et jÃ¤tkata
-    description_html: Kui Te aktiveerite <strong>kaheastmelise autentimise</strong>, siis sisselogimisel peab teil olema telefon, mis loob Teile koode sisenemiseks.
     disable: LÃ¼lita vÃ¤lja
-    enable: LÃ¼lita sisse
     enabled: Kaheastmeline autentimine on sisse lÃ¼litatud
     enabled_success: Kaheastmeline autentimine on edukalt sisse lÃ¼litatud
     generate_recovery_codes: Loo taastuskoodid
-    instructions_html: "<strong>Skaneeri see QR kood kasutades rakendust Google Authenticator vÃµi muu TOTP rakendus Teie telefonis</strong>. NÃ¼Ã¼dsest alates loob see rakendus Teile koode, mida peate sisestama sisselogimisel."
     lost_recovery_codes: Taastuskoodide abil on Teil vÃµimalik sisse logida kontosse, kui Te kaotate oma telefoni. Kui Te kaotate oma taastuskoodid, saate need uuesti luua siin. Teie vanad taastuskoodid tehakse kehtetuks.
-    manual_instructions: 'Kui Te ei saa seda QR koodi skaneerida ning peate sisestama selle kÃ¤sitsi, on siin tekstiline salavÃµti:'
     recovery_codes: Tagavara taastuskoodid
     recovery_codes_regenerated: Taastuskoodid edukalt taasloodud
     recovery_instructions_html: Kui Te juhtute kunagi kaotama oma telefoni, saate kasutada Ã¼hte allpool olevatest taastuskoodidest, et saada ligipÃ¤Ã¤su oma kontole. <strong>Hoidke taastuskoodid turvaliselt</strong>. NÃ¤iteks vÃµite Te need vÃ¤lja printida ning hoida need koos teiste tÃ¤htsate dokumentidega.
-    setup: SÃ¤testa
-    wrong_code: Sisestatud kood on vale! Kas serveri aeg ja seadme aeg on Ãµiged?
   user_mailer:
     backup_ready:
       explanation: Te taotlesite varukoopia oma Mastodoni kontost. See on nÃ¼Ã¼d valmis allalaadimiseks!
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index fde1a820ead393fb03f8d21b1fe265128a19b15e..cd82a5d9a1952e6aa5c312c0ae995d88d489ce90 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -21,7 +21,9 @@ eu:
     federation_hint_html: "%{instance} instantzian kontu bat izanda edozein Mastodon zerbitzariko jendea jarraitu ahal izango duzu, eta harago ere."
     get_apps: Probatu mugikorrerako aplikazio bat
     hosted_on: Mastodon %{domain} domeinuan ostatatua
-    instance_actor_flash: Kontu hau zerbitzaria bera adierazten duen aktore birtual bat da, ez norbanako bat. Federaziorako erabiltzen da eta ez zenuke blokeatu behar instantzia osoa blokeatu nahi ez baduzu, kasu horretan domeinua blokeatzea egokia litzateke.
+    instance_actor_flash: 'Kontu hau zerbitzaria bera adierazten duen aktore birtual bat da, ez norbanako bat. Federaziorako erabiltzen da eta ez zenuke blokeatu behar instantzia osoa blokeatu nahi ez baduzu, kasu horretan domeinua blokeatzea egokia litzateke.
+
+'
     learn_more: Ikasi gehiago
     privacy_policy: Pribatutasun politika
     see_whats_happening: Ikusi zer gertatzen ari den
@@ -1230,21 +1232,14 @@ eu:
       default: "%Y(e)ko %b %d, %H:%M"
       month: "%Y(e)ko %b"
   two_factor_authentication:
-    code_hint: Sartu zure autentifikazio aplikazioak sortutako kodea berresteko
-    description_html: "<strong>Bi faktoreetako autentifikazioa</strong> gaitzen baduzu, saioa hasteko telefonoa eskura izan beharko duzu, honek zuk sartu behar dituzun kodeak sortuko dituelako."
     disable: Desgaitu
-    enable: Gaitu
     enabled: Bi faktoreetako autentifikazioa gaituta dago
     enabled_success: Bi faktoreetako autentifikazioa ongi gaitu da
     generate_recovery_codes: Sortu berreskuratze kodeak
-    instructions_html: "<strong>Eskaneatu QR kode hau Google Authentiocator edo antzeko TOTTP aplikazio batekin zure telefonoan</strong>. Hortik aurrera, aplikazio horrek saioa hasteko sartu behar dituzun kodeak sortuko ditu."
     lost_recovery_codes: Berreskuratze kodeek telefonoa galtzen baduzu kontura sarbidea berreskuratzea ahalbideko dizute. Berreskuratze kodeak galdu badituzu, hemen birsortu ditzakezu. Zure berreskuratze kode zaharrak indargabetuko dira,.
-    manual_instructions: 'Ezin baduzu QR kodea eskaneatu eta eskuz sartu behar baduzu, hona sekretua testu hutsean:'
     recovery_codes: Berreskuratze kodeen babes-kopia
     recovery_codes_regenerated: Berreskuratze kodeak ongi sortu dira
     recovery_instructions_html: Zure telefonora sarbidea galtzen baduzu, beheko berreskuratze kode bat erabili dezakezu kontura berriro sartu ahal izateko. <strong>Gore barreskuratze kodeak toki seguruan</strong>. Adibidez inprimatu eta dokumentu garrantzitsuekin batera gorde.
-    setup: Ezarri
-    wrong_code: Sartutako kodea baliogabea da! Zerbitzariaren eta gailuaren erlojuak ondo ezarrita daude?
   user_mailer:
     backup_ready:
       explanation: Zure Mastodon kontuaren babes-kopia osoa eskatu duzu. Deskargatzeko prest dago!
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 25e66f328856ea26e798918a162feed1e28d6cd5..cf094478af15ad4a775ccf08cb4496ebbb9bd81f 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -62,6 +62,7 @@ fa:
       one: Ù¾ÛŒÚ¯ÛŒØ±
       other: Ù¾ÛŒÚ¯ÛŒØ±
     following: Ù¾ÛŒ Ù…ÛŒâ€ŒÚ¯ÛŒØ±Ø¯
+    instance_actor_flash: Ø§ÛŒÙ† ØØ³Ø§Ø¨ ÛŒÚ© Ø¹Ø§Ù…Ù„ Ù…Ø¬Ø§Ø²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ø¨Ù‡ Ù†Ù…Ø§ÛŒÙ†Ø¯Ú¯ÛŒ Ø§Ø² Ø®ÙˆØ¯ Ú©Ø§Ø±Ø³Ø§Ø² Ø§Ø³ØªÙØ§Ø¯Ù‡ Ù…ÛŒâ€ŒØ´ÙˆØ¯ Ùˆ Ù†Ù‡ Ù‡ÛŒÚ† ÛŒÚ©ÛŒ Ø§Ø² Ú©Ø§Ø±Ø¨Ø±Ø§Ù†. Ø§ÛŒÙ† ØØ³Ø§Ø¨ Ø¨Ù‡ Ù…Ù†Ø¸ÙˆØ± Ø§ØªØµØ§Ù„ Ø¨Ù‡ ÙØ¯Ø±Ø§Ø³ÛŒÙˆÙ† Ø§Ø³ØªÙØ§Ø¯Ù‡ Ù…ÛŒâ€ŒØ´ÙˆØ¯ Ùˆ Ù†Ø¨Ø§ÛŒØ¯ Ù…Ø¹Ù„Ù‚ Ø´ÙˆØ¯.
     joined: Ú©Ø§Ø±Ø¨Ø± Ø§Ø² %{date}
     last_active: Ø¢Ø®Ø±ÛŒÙ† ÙØ¹Ø§Ù„ÛŒØª
     link_verified_on: Ù…Ø§Ù„Ú©ÛŒØª Ø§ÛŒÙ† Ù¾ÛŒÙˆÙ†Ø¯ Ø¯Ø± %{date} Ø¨Ø±Ø±Ø³ÛŒ Ø´Ø¯
@@ -100,6 +101,7 @@ fa:
       add_email_domain_block: Ù…Ø³Ø¯ÙˆØ¯ Ú©Ø±Ø¯Ù† Ø¯Ø§Ù…Ù†Ù‡Ù” Ø±Ø§ÛŒØ§Ù†Ø§Ù…Ù‡
       approve: Ù¾Ø°ÛŒØ±ÙØªÙ†
       approve_all: Ù¾Ø°ÛŒØ±ÙØªÙ† Ù‡Ù…Ù‡
+      approved_msg: Ú©Ø§Ø±Ù‡Ù” Ø«Ø¨Øªâ€ŒÙ†Ø§Ù… %{username} Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª ØªØ£ÛŒÛŒØ¯ Ø´Ø¯
       are_you_sure: Ù…Ø·Ù…Ø¦Ù†ÛŒØ¯ØŸ
       avatar: ØªØµÙˆÛŒØ± Ù†Ù…Ø§ÛŒÙ‡
       by_domain: Ø¯Ø§Ù…ÛŒÙ†
@@ -113,8 +115,10 @@ fa:
       confirm: ØªØ£ÛŒÛŒØ¯
       confirmed: ØªØ£ÛŒÛŒØ¯ Ø´Ø¯
       confirming: ØªØ£ÛŒÛŒØ¯
+      delete: ØØ°Ù Ø¯Ø§Ø¯Ù‡â€ŒÙ‡Ø§
       deleted: ØØ°Ù Ø´Ø¯Ù‡
       demote: ØªÙ†Ø²Ù„â€ŒØ¯Ø§Ø¯Ù†
+      destroyed_msg: Ø¯Ø§Ø¯Ù‡â€ŒÙ‡Ø§ÛŒ %{username} Ø¯Ø± ØµÙ ØØ¯Ù Ù‚Ø±Ø§Ø± Ú¯Ø±ÙØªÙ†Ø¯
       disable: Ø§Ø² Ú©Ø§Ø± Ø§Ù†Ø¯Ø§Ø®ØªÙ†
       disable_two_factor_authentication: Ø§Ø² Ú©Ø§Ø± Ø§Ù†Ø¯Ø§Ø®ØªÙ† ÙˆØ±ÙˆØ¯ Ø¯ÙˆÙ…Ø±ØÙ„Ù‡â€ŒØ§ÛŒ
       disabled: Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù‡
@@ -125,10 +129,12 @@ fa:
       email_status: ÙˆØ¶Ø¹ÛŒØª Ø§ÛŒÙ…ÛŒÙ„
       enable: Ø¨Ù‡ Ú©Ø§Ø± Ø§Ù†Ø¯Ø§Ø®ØªÙ†
       enabled: Ø¨Ù‡ Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù‡
+      enabled_msg: ØØ³Ø§Ø¨ %{username} Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª Ø¨Ù‡ Ú©Ø§Ø± Ø§Ù†Ø¯Ø§Ø®ØªÙ‡ Ø´Ø¯
       followers: Ù¾ÛŒÚ¯ÛŒØ±Ø§Ù†
       follows: Ù¾ÛŒ Ù…ÛŒâ€ŒÚ¯ÛŒØ±Ø¯
       header: ØªØµÙˆÛŒØ± Ø²Ù…ÛŒÙ†Ù‡
       inbox_url: Ù†Ø´Ø§Ù†ÛŒ ØµÙ†Ø¯ÙˆÙ‚ ÙˆØ±ÙˆØ¯ÛŒ
+      invite_request_text: Ø¯Ù„Ø§ÛŒÙ„â€ŒØªØ§Ù† Ø¨Ø±Ø§ÛŒ Ù¾ÛŒÙˆØ³ØªÙ†
       invited_by: Ø¯Ø¹ÙˆØªâ€ŒØ´Ø¯Ù‡ Ø§Ø² Ø·Ø±Ù
       ip: IP
       joined: Ø¹Ø¶Ùˆ Ø´Ø¯Ù‡ Ø¯Ø±
@@ -140,6 +146,8 @@ fa:
       login_status: ÙˆØ¶Ø¹ÛŒØª ÙˆØ±ÙˆØ¯
       media_attachments: Ù¾ÛŒÙˆØ³Øªâ€ŒÙ‡Ø§ÛŒ Ø±Ø³Ø§Ù†Ù‡â€ŒØ§ÛŒ
       memorialize: ØªØ¨Ø¯ÛŒÙ„ Ø¨Ù‡ ÛŒØ§Ø¯Ù…Ø§Ù†
+      memorialized: ÛŒØ§Ø¯Ù…Ø§Ù†â€ŒØ³Ø§Ø²ÛŒ Ø´Ø¯Ù‡
+      memorialized_msg: "%{username} Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª Ø¨Ù‡ ÛŒÚ© ØØ³Ø§Ø¨ ÛŒØ§Ø¯Ù…Ø§Ù†ÛŒ ØªØ¨Ø¯ÛŒÙ„ Ø´Ø¯"
       moderation:
         active: ÙØ¹Ù‘Ø§Ù„
         all: Ù‡Ù…Ù‡
@@ -160,10 +168,14 @@ fa:
       public: Ø¹Ù…ÙˆÙ…ÛŒ
       push_subscription_expires: Ø¹Ø¶ÙˆÛŒØª Ø§Ø² Ø±Ø§Ù‡ PuSH Ù…Ù†Ù‚Ø¶ÛŒ Ø´Ø¯
       redownload: Ù†ÙˆØ³Ø§Ø²ÛŒ Ù†Ù…Ø§ÛŒÙ‡
+      redownloaded_msg: ØØ³Ø§Ø¨ %{username} Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª Ø§Ø² Ø§Ø¨ØªØ¯Ø§ Ù†ÙˆØ³Ø§Ø²ÛŒ Ø´Ø¯
       reject: Ù†Ù¾Ø°ÛŒØ±ÙØªÙ†
       reject_all: Ù†Ù¾Ø°ÛŒØ±ÙØªÙ† Ù‡ÛŒÚ†Ú©Ø¯Ø§Ù…
+      rejected_msg: Ú©Ø§Ø±Ù‡Ù” Ø«Ø¨Øªâ€ŒÙ†Ø§Ù… %{username} Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª Ø±Ø¯ Ø´Ø¯
       remove_avatar: ØØ°Ù ØªØµÙˆÛŒØ± Ù†Ù…Ø§ÛŒÙ‡
       remove_header: Ø¨Ø±Ø¯Ø§Ø´ØªÙ† ØªØµÙˆÛŒØ± Ø²Ù…ÛŒÙ†Ù‡
+      removed_avatar_msg: ØªØµÙˆÛŒØ± Ø¢ÙˆØ§ØªØ§Ø± %{username} Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒØª Ø¨Ø±Ø¯Ø§Ø´ØªÙ‡ Ø´Ø¯
+      removed_header_msg: ØªØµÙˆÛŒØ± Ø³Ø±Ø§ÛŒÙ†Ø¯ %{username} Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒØª Ø¨Ø±Ø¯Ø§Ø´ØªÙ‡ Ø´Ø¯
       resend_confirmation:
         already_confirmed: Ø§ÛŒÙ† Ú©Ø§Ø±Ø¨Ø± Ù‚Ø¨Ù„Ø§ ØªØ§ÛŒÛŒØ¯ Ø´Ø¯Ù‡ Ø§Ø³Øª
         send: Ø§ÛŒÙ…ÛŒÙ„ ØªØ§ÛŒÛŒØ¯ Ø±Ø§ Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ø¨ÙØ±Ø³ØªÛŒØ¯
@@ -180,6 +192,8 @@ fa:
       search: Ø¬Ø³ØªØ¬Ùˆ
       search_same_email_domain: Ø¯ÛŒÚ¯Ø± Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¨Ø§ Ø¯Ø§Ù…Ù†Ù‡Ù” Ø±Ø§ÛŒØ§Ù†Ø§Ù…Ù‡Ù” ÛŒÚ©Ø³Ø§Ù†
       search_same_ip: Ø¯ÛŒÚ¯Ø± Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¨Ø§ IP ÛŒÚ©Ø³Ø§Ù†
+      sensitive: ØØ³Ø§Ø³
+      sensitized: Ø¹Ù„Ø§Ù…Øªâ€ŒØ²Ø¯Ù‡ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ØØ³Ø§Ø³
       shared_inbox_url: Ù†Ø´Ø§Ù†ÛŒ ØµÙ†Ø¯ÙˆÙ‚ ÙˆØ±ÙˆØ¯ÛŒ Ù…Ø´ØªØ±Ú©
       show:
         created_reports: Ú¯Ø²Ø§Ø±Ø´â€ŒÙ‡Ø§ÛŒ Ø«Ø¨Øª Ú©Ø±Ø¯Ù‡
@@ -189,13 +203,19 @@ fa:
       statuses: Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§
       subscribe: Ø§Ø´ØªØ±Ø§Ú©
       suspended: ØªØ¹Ù„ÛŒÙ‚â€ŒØ´Ø¯Ù‡
+      suspension_irreversible: Ø¯Ø§Ø¯Ù‡â€ŒÙ‡Ø§ÛŒ Ø§ÛŒÙ† ØØ³Ø§Ø¨ Ø¨Ù‡ ØµÙˆØ±Øª Ø¨ÛŒâ€ŒØ¨Ø§Ø²Ú¯Ø´Øª ØØ°Ù Ø´Ø¯. Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ø¨Ø±Ø§ÛŒ Ù‚Ø§Ø¨Ù„ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ø±Ø¯Ù†Ø´ØŒ Ø¢Ù† Ø±Ø§ Ù†Ø§Ù…Ø¹Ù„Ù‘Ù‚ Ú©Ù†ÛŒØ¯ØŒ ÙˆÙ„ÛŒ Ø§ÛŒÙ† Ú©Ø§Ø± Ù‡ÛŒÚ† Ø¯Ø§Ø¯Ù‡â€ŒØ§ÛŒ Ø±Ø§ Ú©Ù‡ Ø§Ø² Ù¾ÛŒØ´ Ø¯Ø§Ø¯Ù‡ØŒ Ø¨Ø±Ù†Ø®ÙˆØ§Ù‡Ø¯ Ú¯Ø±Ø¯Ø§Ù†Ø¯.
+      suspension_reversible_hint_html: ØØ³Ø§Ø¨ Ù…Ø¹Ù„Ù‘Ù‚ Ø´Ø¯ Ùˆ Ø¯Ø§Ø¯Ù‡â€ŒÙ‡Ø§ Ø¨Ù‡ ØµÙˆØ±Øª Ú©Ø§Ù…Ù„ Ø¯Ø± %{date} Ø¨Ø±Ø¯Ø§Ø´ØªÙ‡ Ø®ÙˆØ§Ù‡Ù†Ø¯ Ø´Ø¯. ØªØ§ Ø¢Ù† Ø²Ù…Ø§Ù†ØŒ ØØ³Ø§Ø¨ Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ø¨ÛŒ Ù‡ÛŒÚ† Ø¹ÙˆØ§Ø±Ø¶ÛŒ Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù†Ø¯Ù‡ Ø´ÙˆØ¯. Ø§Ú¯Ø± Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ ÙÙˆØ±Ø§Ù‹ Ù‡Ù…Ù‡Ù” Ø¯Ø§Ø¯Ù‡â€ŒÙ‡Ø§ÛŒ ØØ³Ø§Ø¨ Ø±Ø§ Ø¨Ø±Ø¯Ø§Ø±ÛŒØ¯ØŒ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ø¯Ø± Ù¾Ø§ÛŒÛŒÙ† Ø§ÛŒÙ† Ú©Ø§Ø± Ø±Ø§ Ø¨Ú©Ù†ÛŒØ¯.
       time_in_queue: Ø¯Ø± ØØ§Ù„ Ø§Ù†ØªØ¸Ø§Ø± %{time}
       title: ØØ³Ø§Ø¨â€ŒÙ‡Ø§
       unconfirmed_email: Ø§ÛŒÙ…ÛŒÙ„ ØªØ£ÛŒÛŒØ¯Ù†Ø´Ø¯Ù‡
+      undo_sensitized: Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù†ÛŒ ØØ³Ø§Ø³
       undo_silenced: ÙˆØ§Ú¯Ø±Ø¯Ø§Ù†ÛŒ Ø¨ÛŒâ€ŒØµØ¯Ø§Ú©Ø±Ø¯Ù†
       undo_suspension: ÙˆØ§Ú¯Ø±Ø¯Ø§Ù†ÛŒ ØªØ¹Ù„ÛŒÙ‚
+      unsilenced_msg: ØØ³Ø§Ø¨ %{username} Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒØª Ù†Ø§Ù…ØØ¯ÙˆØ¯ Ø´Ø¯
       unsubscribe: Ù„ØºÙˆ Ø§Ø´ØªØ±Ø§Ú©
+      unsuspended_msg: ØØ³Ø§Ø¨ %{username} Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒØª Ù†Ø§Ù…Ø¹Ù„Ù‘Ù‚ Ø´Ø¯
       username: Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ
+      view_domain: Ù†Ù…Ø§ÛŒØ´ Ø®Ù„Ø§ØµÙ‡Ù” Ø¯Ø§Ù…Ù†Ù‡
       warn: Ù‡Ø´Ø¯Ø§Ø±
       web: ÙˆØ¨
       whitelisted: ÙÙ‡Ø±Ø³Øª Ù…Ø¬Ø§Ø²
@@ -210,12 +230,14 @@ fa:
         create_domain_allow: Ø§ÛŒØ¬Ø§Ø¯ Ø§Ø¬Ø§Ø²Ù‡Ù” Ø¯Ø§Ù…Ù†Ù‡
         create_domain_block: Ø§ÛŒØ¬Ø§Ø¯ Ø§Ù†Ø³Ø¯Ø§Ø¯ Ø¯Ø§Ù…Ù†Ù‡
         create_email_domain_block: Ø§ÛŒØ¬Ø§Ø¯ Ø§Ù†Ø³Ø¯Ø§Ø¯ Ø¯Ø§Ù…Ù†Ù‡Ù” Ø±Ø§ÛŒØ§Ù†Ø§Ù…Ù‡
+        create_ip_block: Ø§ÛŒØ¬Ø§Ø¯ Ù‚Ø§Ø¹Ø¯Ù‡Ù” Ø¢ÛŒâ€ŒÙ¾ÛŒ
         demote_user: ØªÙ†Ø²Ù„ Ú©Ø§Ø±Ø¨Ø±
         destroy_announcement: ØØ°Ù Ø§Ø¹Ù„Ø§Ù…ÛŒÙ‡
         destroy_custom_emoji: ØØ°Ù Ø§Ù…ÙˆØ¬ÛŒ Ø³ÙØ§Ø±Ø´ÛŒ
         destroy_domain_allow: ØØ°Ù Ø§Ø¬Ø§Ø²Ù‡Ù” Ø¯Ø§Ù…Ù†Ù‡
         destroy_domain_block: ØØ°Ù Ø§Ù†Ø³Ø¯Ø§Ø¯ Ø¯Ø§Ù…Ù†Ù‡
         destroy_email_domain_block: ØØ°Ù Ø§Ù†Ø³Ø¯Ø§Ø¯ Ø¯Ø§Ù…Ù†Ù‡Ù” Ø±Ø§ÛŒØ§Ù†Ø§Ù…Ù‡
+        destroy_ip_block: ØØ°Ù Ù‚Ø§Ø¹Ø¯Ù‡Ù” Ø¢ÛŒâ€ŒÙ¾ÛŒ
         destroy_status: ØØ°Ù ÙˆØ¶Ø¹ÛŒØª
         disable_2fa_user: Ø§Ø² Ú©Ø§Ø± Ø§Ù†Ø¯Ø§Ø®ØªÙ† ÙˆØ±ÙˆØ¯ Ø¯ÙˆÙ…Ø±ØÙ„Ù‡â€ŒØ§ÛŒ
         disable_custom_emoji: Ø§Ø² Ú©Ø§Ø± Ø§Ù†Ø¯Ø§Ø®ØªÙ† Ø§Ù…ÙˆØ¬ÛŒ Ø³ÙØ§Ø±Ø´ÛŒ
@@ -228,13 +250,16 @@ fa:
         reopen_report: Ø¨Ø§Ø²Ú¯Ø´Ø§ÛŒÛŒ Ú¯Ø²Ø§Ø±Ø´
         reset_password_user: Ø¨Ø§Ø²Ù†Ø´Ø§Ù†ÛŒ Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡
         resolve_report: Ø±ÙØ¹ Ú¯Ø²Ø§Ø±Ø´
+        sensitive_account: Ø¹Ù„Ø§Ù…Øªâ€ŒÚ¯Ø°Ø§Ø±ÛŒ Ø±Ø³Ø§Ù†Ù‡ Ø¯Ø± ØØ³Ø§Ø¨ØªØ§Ù† Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ØØ³Ø§Ø³
         silence_account: Ø®Ù…ÙˆØ´ÛŒ ØØ³Ø§Ø¨
         suspend_account: ØªØ¹Ù„ÛŒÙ‚ ØØ³Ø§Ø¨
         unassigned_report: Ø±ÙØ¹ ÙˆØ§Ú¯Ø°Ø§Ø±ÛŒ Ú¯Ø²Ø§Ø±Ø´
+        unsensitive_account: Ø¨Ø±Ø¯Ø§Ø´ØªÙ† Ø¹Ù„Ø§Ù…Øª Ø±Ø³Ø§Ù†Ù‡ Ø¯Ø± ØØ³Ø§Ø¨ØªØ§Ù† Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ØØ³Ø§Ø³
         unsilence_account: Ø±ÙØ¹ Ø®Ù…ÙˆØ´ÛŒ ØØ³Ø§Ø¨
         unsuspend_account: Ø±ÙØ¹ ØªØ¹Ù„ÛŒÙ‚ ØØ³Ø§Ø¨
         update_announcement: Ø¨Ù‡â€ŒØ±ÙˆØ² Ø±Ø³Ø§Ù†ÛŒ Ø§Ø¹Ù„Ø§Ù…ÛŒÙ‡
         update_custom_emoji: Ø¨Ù‡â€ŒØ±ÙˆØ² Ø±Ø³Ø§Ù†ÛŒ Ø§Ù…ÙˆØ¬ÛŒ Ø³ÙØ§Ø±Ø´ÛŒ
+        update_domain_block: Ø¨Ù‡â€ŒØ±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ Ù…Ø³Ø¯ÙˆØ¯Ø³Ø§Ø²ÛŒ Ø¯Ø§Ù…Ù†Ù‡
         update_status: Ø¨Ù‡â€ŒØ±ÙˆØ² Ø±Ø³Ø§Ù†ÛŒ ÙˆØ¶Ø¹ÛŒØª
       actions:
         assigned_to_self_report: "%{name} Ø±Ø³ÛŒØ¯Ú¯ÛŒ Ø¨Ù‡ Ú¯Ø²Ø§Ø±Ø´ %{target} Ø±Ø§ Ø¨Ù‡ Ø¹Ù‡Ø¯Ù‡ Ú¯Ø±ÙØª"
@@ -246,12 +271,14 @@ fa:
         create_domain_allow: "%{name} Ø¯Ø§Ù…Ù†Ù‡Ù” %{target} Ø±Ø§ Ù…Ø¬Ø§Ø² Ú©Ø±Ø¯"
         create_domain_block: "%{name} Ø¯Ø§Ù…ÛŒÙ† %{target} Ø±Ø§ Ù…Ø³Ø¯ÙˆØ¯ Ú©Ø±Ø¯"
         create_email_domain_block: "%{name} Ø¯Ø§Ù…ÛŒÙ† Ø§ÛŒÙ…ÛŒÙ„ %{target} Ø±Ø§ Ù…Ø³Ø¯ÙˆØ¯ Ú©Ø±Ø¯"
+        create_ip_block: "%{name} Ø¨Ø±Ø§ÛŒ Ø¢ÛŒâ€ŒÙ¾ÛŒ %{target} Ù‚Ø§Ø¹Ø¯Ù‡â€ŒØ§ÛŒ Ø§ÛŒØ¬Ø§Ø¯ Ú©Ø±Ø¯"
         demote_user: "%{name} Ù…Ù‚Ø§Ù… Ú©Ø§Ø±Ø¨Ø± %{target} Ø±Ø§ ØªÙ†Ø²Ù„ Ø¯Ø§Ø¯"
         destroy_announcement: "%{name} Ø§Ø¹Ù„Ø§Ù…ÛŒÙ‡Ù” %{target} Ø±Ø§ ØØ°Ù Ú©Ø±Ø¯"
         destroy_custom_emoji: "%{name} Ø§Ù…ÙˆØ¬ÛŒ %{target} Ø±Ø§ Ù†Ø§Ø¨ÙˆØ¯ Ú©Ø±Ø¯"
         destroy_domain_allow: "%{name} Ø¯Ø§Ù…Ù†Ù‡Ù” %{target} Ø±Ø§ Ø§Ø² ÙÙ‡Ø±Ø³Øª Ù…Ø¬Ø§Ø² Ø¨Ø±Ø¯Ø§Ø´Øª"
         destroy_domain_block: "%{name} Ø§Ù†Ø³Ø¯Ø§Ø¯ Ø¯Ø§Ù…Ù†Ù‡Ù” %{target} Ø±Ø§ Ø±ÙØ¹ Ú©Ø±Ø¯"
         destroy_email_domain_block: "%{name} Ø¯Ø§Ù…Ù†Ù‡Ù” Ø§ÛŒÙ…ÛŒÙ„ %{target} Ø±Ø§ Ø¨Ù‡ ÙÙ‡Ø±Ø³Øª Ù…Ø¬Ø§Ø² Ø§ÙØ²ÙˆØ¯"
+        destroy_ip_block: "%{name} Ù‚Ø§Ø¹Ø¯Ù‡â€ŒØ§ÛŒ Ø±Ø§ Ø§Ø² Ø¢ÛŒâ€ŒÙ¾ÛŒ %{target} ØØ°Ù Ú©Ø±Ø¯"
         destroy_status: "%{name} Ù†ÙˆØ´ØªÙ‡Ù” %{target} Ø±Ø§ Ù¾Ø§Ú© Ú©Ø±Ø¯"
         disable_2fa_user: "%{name} Ø§Ø¬Ø¨Ø§Ø± ÙˆØ±ÙˆØ¯ Ø¯ÙˆÙ…Ø±ØÙ„Ù‡â€ŒØ§ÛŒ Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ú©Ø§Ø±Ø¨Ø± %{target} ØºÛŒØ±ÙØ¹Ø§Ù„ Ú©Ø±Ø¯"
         disable_custom_emoji: "%{name} Ø´Ú©Ù„Ú© %{target} Ø±Ø§ ØºÛŒØ±ÙØ¹Ø§Ù„ Ú©Ø±Ø¯"
@@ -264,13 +291,16 @@ fa:
         reopen_report: "%{name} Ú¯Ø²Ø§Ø±Ø´ %{target} Ø±Ø§ Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ø¨Ù‡ Ø¬Ø±ÛŒØ§Ù† Ø§Ù†Ø¯Ø§Ø®Øª"
         reset_password_user: "%{name} Ø±Ù…Ø² Ú©Ø§Ø±Ø¨Ø± %{target} Ø±Ø§ Ø¨Ø§Ø²Ù†Ø´Ø§Ù†Ø¯"
         resolve_report: "%{name} Ú¯Ø²Ø§Ø±Ø´ %{target} Ø±Ø§ Ø±ÙØ¹ Ú©Ø±Ø¯"
+        sensitive_account: "%{name} Ø±Ø³Ø§Ù†Ù‡Ù” %{target} Ø±Ø§ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ØØ³Ø§Ø³ Ø¹Ù„Ø§Ù…Øªâ€ŒÚ¯Ø°Ø§Ø±ÛŒ Ú©Ø±Ø¯"
         silence_account: "%{name} ØØ³Ø§Ø¨ Ú©Ø§Ø±Ø¨Ø± %{target} Ø±Ø§ Ø®Ø§Ù…ÙˆØ´ (Ø¨ÛŒâ€ŒØµØ¯Ø§) Ú©Ø±Ø¯"
         suspend_account: "%{name} ØØ³Ø§Ø¨ Ú©Ø§Ø±Ø¨Ø± %{target} Ø±Ø§ ØªØ¹Ù„ÛŒÙ‚ Ú©Ø±Ø¯"
         unassigned_report: "%{name} Ø¨Ø±Ø±Ø³ÛŒ Ú¯Ø²Ø§Ø±Ø´ %{target} Ø±Ø§ Ù…ØªÙˆÙ‚Ù Ú©Ø±Ø¯"
+        unsensitive_account: "%{name} Ø¹Ù„Ø§Ù…Øª ØØ³Ø§Ø³ Ø±Ø³Ø§Ù†Ù‡Ù” %{target} Ø±Ø§ Ø¨Ø±Ø¯Ø§Ø´Øª"
         unsilence_account: "%{name} ØØ³Ø§Ø¨ Ú©Ø§Ø±Ø¨Ø± %{target} Ø±Ø§ Ø±ÙˆØ´Ù† (Ø¨Ø§ØµØ¯Ø§) Ú©Ø±Ø¯"
         unsuspend_account: "%{name} ØØ³Ø§Ø¨ Ú©Ø§Ø±Ø¨Ø± %{target} Ø±Ø§ Ø§Ø² ØªØ¹Ù„ÛŒÙ‚ Ø®Ø§Ø±Ø¬ Ú©Ø±Ø¯"
         update_announcement: "%{name} Ø§Ø¹Ù„Ø§Ù…ÛŒÙ‡Ù” %{target} Ø±Ø§ Ø¨Ù‡â€ŒØ±ÙˆØ² Ú©Ø±Ø¯"
         update_custom_emoji: "%{name} Ø´Ú©Ù„Ú© %{target} Ø±Ø§ Ø¨Ù‡â€ŒØ±ÙˆØ² Ú©Ø±Ø¯"
+        update_domain_block: "%{name} Ù…Ø³Ø¯ÙˆØ¯Ø³Ø§Ø²ÛŒ Ø¯Ø§Ù…Ù†Ù‡ Ø±Ø§ Ø¨Ø±Ø§ÛŒ %{target} Ø¨Ù‡â€ŒØ±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ Ú©Ø±Ø¯"
         update_status: "%{name} Ù†ÙˆØ´ØªÙ‡Ù” %{target} Ø±Ø§ Ø¨Ù‡â€ŒØ±ÙˆØ² Ú©Ø±Ø¯"
       deleted_status: "(Ù†ÙˆØ´ØªÙ‡Ù” Ù¾Ø§Ú©â€ŒØ´Ø¯Ù‡)"
       empty: Ù‡ÛŒÚ† Ú¯Ø²Ø§Ø±Ø´ÛŒ Ù¾ÛŒØ¯Ø§ Ù†Ø´Ø¯.
@@ -413,6 +443,7 @@ fa:
     instances:
       by_domain: Ø¯Ø§Ù…ÛŒÙ†
       delivery_available: Ù¾ÛŒØ§Ù… Ø¢Ù…Ø§Ø¯Ù‡ Ø§Ø³Øª
+      empty: Ù‡ÛŒØ¬ Ø¯Ø§Ù…Ù†Ù‡â€ŒØ§ÛŒ Ù¾ÛŒØ¯Ø§ Ù†Ø´Ø¯.
       known_accounts:
         one: "%{count} ØØ³Ø§Ø¨ Ø´Ù†Ø§Ø®ØªÙ‡â€ŒØ´Ø¯Ù‡"
         other: "%{count} ØØ³Ø§Ø¨ Ø´Ù†Ø§Ø®ØªÙ‡â€ŒØ´Ø¯Ù‡"
@@ -436,6 +467,21 @@ fa:
         expired: Ù…Ù†Ù‚Ø¶ÛŒâ€ŒØ´Ø¯Ù‡
         title: ÙÛŒÙ„ØªØ±
       title: Ø¯Ø¹ÙˆØªâ€ŒÙ‡Ø§
+    ip_blocks:
+      add_new: Ø§ÛŒØ¬Ø§Ø¯ Ù‚Ø§Ù†ÙˆÙ†
+      created_msg: Ù‚Ø§Ù†ÙˆÙ† IP Ø¬Ø¯ÛŒØ¯ Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª Ø§ÙØ²ÙˆØ¯Ù‡ Ø´Ø¯
+      delete: Ù¾Ø§Ú© Ú©Ø±Ø¯Ù†
+      expires_in:
+        '1209600': Û² Ù‡ÙØªÙ‡
+        '15778476': Û¶ Ù…Ø§Ù‡
+        '2629746': Û± Ù…Ø§Ù‡
+        '31556952': Û± Ø³Ø§Ù„
+        '86400': Û± Ø±ÙˆØ²
+        '94670856': Û³ Ø³Ø§Ù„
+      new:
+        title: Ø§ÛŒØ¬Ø§Ø¯ Ù‚Ø§Ù†ÙˆÙ† Ø¬Ø¯ÛŒØ¯ IP
+      no_ip_block_selected: Ù‡ÛŒÚ† Ù‚Ø§Ø¹Ø¯Ù‡Ù” Ø¢ÛŒâ€ŒÙ¾ÛŒâ€ŒØ§ÛŒ ØªØºÛŒÛŒØ±ÛŒ Ù†Ú©Ø±Ø¯ Ø²ÛŒØ±Ø§ Ù‡ÛŒÚ†â€ŒÚ©Ø¯Ø§Ù… Ú¯Ø²ÛŒØ¯Ù‡ Ù†Ø´Ø¯Ù‡ Ø¨ÙˆØ¯Ù†Ø¯
+      title: Ù‚ÙˆØ§Ù†ÛŒÙ† IP
     pending_accounts:
       title: ØØ³Ø§Ø¨â€ŒÙ‡Ø§ÛŒ Ù…Ù†ØªØ¸Ø± (%{count})
     relationships:
@@ -475,6 +521,8 @@ fa:
       comment:
         none: Ù‡ÛŒÚ†
       created_at: Ú¯Ø²Ø§Ø±Ø´â€ŒØ´Ø¯Ù‡
+      forwarded: Ù‡Ø¯Ø§ÛŒØª Ø´Ø¯Ù‡
+      forwarded_to: Ù‡Ø¯Ø§ÛŒØª Ø´Ø¯Ù‡ Ø¨Ù‡ %{domain}
       mark_as_resolved: Ø¹Ù„Ø§Ù…Øªâ€ŒÚ¯Ø°Ø§Ø±ÛŒ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ØÙ„â€ŒØ´Ø¯Ù‡
       mark_as_unresolved: Ø¹Ù„Ø§Ù…Øªâ€ŒÚ¯Ø°Ø§Ø±ÛŒ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ØÙ„â€ŒÙ†Ø´Ø¯Ù‡
       notes:
@@ -544,6 +592,9 @@ fa:
         min_invite_role:
           disabled: Ù‡ÛŒÚ† Ú©Ø³
           title: Ø§Ø¬Ø§Ø²Ù‡Ù” Ø¯Ø¹ÙˆØª Ø¨Ù‡
+        require_invite_text:
+          desc_html: Ø²Ù…Ø§Ù†ÛŒ Ú©Ù‡ Ù†Ø§Ù…â€ŒÙ†ÙˆÛŒØ³ÛŒ Ù†ÛŒØ§Ø²Ù…Ù†Ø¯ ØªØ§ÛŒÛŒØ¯ Ø¯Ø³ØªÛŒ Ø§Ø³ØªØŒ Ù…ØªÙ† Â«Ú†Ø±Ø§ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø¹Ø¶Ùˆ Ø´ÙˆØ¯ØŸÂ» Ø¨Ø®Ø´ Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø¯Ø¹ÙˆØª Ø±Ø§ Ø¨Ù‡ Ø¬Ø§ÛŒ Ø§Ø®ØªÛŒØ§Ø±ÛŒØŒ Ø§Ø¬Ø¨Ø§Ø±ÛŒ Ú©Ù†ÛŒØ¯
+          title: Ù†ÛŒØ§Ø²Ù…Ù†Ø¯ Ù¾Ø± Ú©Ø±Ø¯Ù† Ù…ØªÙ† Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø¯Ø¹ÙˆØª ØªÙˆØ³Ø· Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¬Ø¯ÛŒØ¯
       registrations_mode:
         modes:
           approved: Ø«Ø¨Øª Ù†Ø§Ù… Ù†ÛŒØ§Ø²Ù…Ù†Ø¯ ØªØ£ÛŒÛŒØ¯ Ù…Ø¯ÛŒØ±Ø§Ù† Ø§Ø³Øª
@@ -683,8 +734,11 @@ fa:
       prefix_sign_up: Ù‡Ù…ÛŒÙ† Ø§Ù…Ø±ÙˆØ² Ø¹Ø¶Ùˆ Ù…Ø§Ø³ØªÙˆØ¯ÙˆÙ† Ø´ÙˆÛŒØ¯!
       suffix: Ø¨Ø§ Ø¯Ø§Ø´ØªÙ† ØØ³Ø§Ø¨ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ø¯ÛŒÚ¯Ø±Ø§Ù† Ø±Ø§ Ù¾ÛŒ Ø¨Ú¯ÛŒØ±ÛŒØ¯ØŒ Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ ØªØ§Ø²Ù‡ Ù…Ù†ØªØ´Ø± Ú©Ù†ÛŒØ¯ØŒ Ùˆ Ø¨Ø§ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¯ÛŒÚ¯Ø± Ø§Ø² Ù‡Ø± Ø³Ø±ÙˆØ± Ù…Ø§Ø³ØªÙˆØ¯ÙˆÙ† Ø¯ÛŒÚ¯Ø±ÛŒ Ùˆ ØØªÛŒ Ø³Ø±ÙˆØ±Ù‡Ø§ÛŒ Ø¯ÛŒÚ¯Ø± Ø¯Ø± Ø§Ø±ØªØ¨Ø§Ø· Ø¨Ø§Ø´ÛŒØ¯!
     didnt_get_confirmation: Ø±Ø§Ù‡Ù†Ù…Ø§ÛŒÛŒ Ø¨Ø±Ø§ÛŒ ØªØ£ÛŒÛŒØ¯ Ø±Ø§ Ø¯Ø±ÛŒØ§ÙØª Ù†Ú©Ø±Ø¯ÛŒØ¯ØŸ
+    dont_have_your_security_key: Ú©Ù„ÛŒØ¯ Ø§Ù…Ù†ÛŒØªÛŒØªØ§Ù† Ø±Ø§ Ù†Ø¯Ø§Ø±ÛŒØ¯ØŸ
     forgot_password: Ø±Ù…Ø²ØªØ§Ù† Ø±Ø§ Ú¯Ù… Ú©Ø±Ø¯Ù‡â€ŒØ§ÛŒØ¯ØŸ
     invalid_reset_password_token: Ú©Ø¯ Ø¨Ø§Ø²Ù†Ø´Ø§Ù†ÛŒ Ø±Ù…Ø² Ù†Ø§Ù…Ø¹ØªØ¨Ø± ÛŒØ§ Ù…Ù†Ù‚Ø¶ÛŒ Ø´Ø¯Ù‡ Ø§Ø³Øª. Ù„Ø·ÙØ§Ù‹ Ú©Ø¯ Ø¯ÛŒÚ¯Ø±ÛŒ Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ú©Ù†ÛŒØ¯.
+    link_to_otp: Ø±Ù…Ø² Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù†ÛŒ ÛŒØ§ Ø±Ù…Ø² Ø¯ÙˆØ¹Ø§Ù…Ù„ÛŒ Ø±Ø§ Ø§Ø² ØªÙ„ÙÙ†ØªØ§Ù† ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯
+    link_to_webauth: Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ø§ÙØ²Ø§Ø±Ù‡Ù” Ø§Ù…Ù†ÛŒØªÛŒØªØ§Ù†
     login: ÙˆØ±ÙˆØ¯
     logout: Ø®Ø±ÙˆØ¬
     migrate_account: Ù†Ù‚Ù„ Ù…Ú©Ø§Ù† Ø¨Ù‡ ÛŒÚ© ØØ³Ø§Ø¨ Ø¯ÛŒÚ¯Ø±
@@ -709,7 +763,9 @@ fa:
       functional: ØØ³Ø§Ø¨ Ø´Ù…Ø§ Ù‚Ø§Ø¨Ù„ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø³Øª.
       pending: Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø´Ù…Ø§ Ù…Ù†ØªØ¸Ø± ØªØ£ÛŒÛŒØ¯ Ù…Ø³Ø¦ÙˆÙ„Ø§Ù† Ø³Ø§ÛŒØª Ø§Ø³Øª Ùˆ Ø§ÛŒÙ† ÙØ±Ø§ÛŒÙ†Ø¯ Ù…Ù…Ú©Ù† Ø§Ø³Øª Ú©Ù…ÛŒ Ø·ÙˆÙ„ Ø¨Ú©Ø´Ø¯. Ø§Ú¯Ø± Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø´Ù…Ø§ Ù¾Ø°ÛŒØ±ÙØªÙ‡ Ø´ÙˆØ¯ Ø¨Ù‡ Ø´Ù…Ø§ Ø§ÛŒÙ…ÛŒÙ„ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯.
       redirecting_to: ØØ³Ø§Ø¨ Ø´Ù…Ø§ ØºÛŒØ±ÙØ¹Ø§Ù„ Ø§Ø³Øª Ø²ÛŒØ±Ø§ Ù‡Ù…â€ŒØ§Ú©Ù†ÙˆÙ† Ø¨Ù‡ %{acct} Ù…Ù†ØªÙ‚Ù„ Ø´Ø¯Ù‡ Ø§Ø³Øª.
+    too_fast: ÙØ±Ù… Ø¨Ø§ Ø³Ø±Ø¹Øª Ø¨Ø³ÛŒØ§Ø± Ø²ÛŒØ§Ø¯ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯ØŒ Ø¯ÙˆØ¨Ø§Ø±Ù‡ ØªÙ„Ø§Ø´ Ú©Ù†ÛŒØ¯.
     trouble_logging_in: Ø¨Ø±Ø§ÛŒ ÙˆØ±ÙˆØ¯ Ù…Ø´Ú©Ù„ÛŒ Ø¯Ø§Ø±ÛŒØ¯ØŸ
+    use_security_key: Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ú©Ù„ÛŒØ¯ Ø§Ù…Ù†ÛŒØªÛŒ
   authorize_follow:
     already_following: Ø´Ù…Ø§ Ù‡Ù…ÛŒÙ† Ø§Ù„Ø§Ù† Ù‡Ù… Ø§ÛŒÙ† ØØ³Ø§Ø¨ Ø±Ø§ Ù¾ÛŒâ€ŒÙ…ÛŒâ€ŒÚ¯ÛŒØ±ÛŒØ¯
     already_requested: Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ù¾ÛŒâ€ŒÚ¯ÛŒØ±ÛŒâ€ŒØ§ÛŒ Ø¨Ø±Ø§ÛŒ Ø¢Ù† ØØ³Ø§Ø¨ ÙØ±Ø³ØªØ§Ø¯Ù‡â€Œ Ø¨ÙˆØ¯ÛŒØ¯
@@ -734,6 +790,7 @@ fa:
   date:
     formats:
       default: "%d %b %Y"
+      with_month_name: "%d %B %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count} Ø³Ø§Ø¹Øª"
@@ -798,6 +855,7 @@ fa:
       request: Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø¨Ø§ÛŒÚ¯Ø§Ù†ÛŒ Ø¯Ø§Ø¯Ù‡â€ŒÙ‡Ø§ÛŒØªØ§Ù†
       size: Ø§Ù†Ø¯Ø§Ø²Ù‡
     blocks: ØØ³Ø§Ø¨â€ŒÙ‡Ø§ÛŒ Ù…Ø³Ø¯ÙˆØ¯Ø´Ø¯Ù‡
+    bookmarks: Ù†Ø´Ø§Ù†Ú©â€ŒÙ‡Ø§
     csv: CSV
     domain_blocks: Ø¯Ø§Ù…ÛŒÙ†â€ŒÙ‡Ø§ÛŒ Ù…Ø³Ø¯ÙˆØ¯Ø´Ø¯Ù‡
     lists: ÙÙ‡Ø±Ø³Øªâ€ŒÙ‡Ø§
@@ -874,6 +932,7 @@ fa:
     success: Ø¯Ø§Ø¯Ù‡â€ŒÙ‡Ø§ÛŒ Ø´Ù…Ø§ Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ø´Ø¯ Ùˆ Ø¨Ù‡ Ø²ÙˆØ¯ÛŒ Ù¾Ø±Ø¯Ø§Ø²Ø´ Ù…ÛŒâ€ŒØ´ÙˆØ¯
     types:
       blocking: ÙÙ‡Ø±Ø³Øª Ù…Ø³Ø¯ÙˆØ¯Ø´Ø¯Ù‡â€ŒÙ‡Ø§
+      bookmarks: Ù†Ø´Ø§Ù†Ú©â€ŒÙ‡Ø§
       domain_blocking: ÙÙ‡Ø±Ø³Øª Ø¯Ø§Ù…ÛŒÙ†â€ŒÙ‡Ø§ÛŒ Ù…Ø³Ø¯ÙˆØ¯Ø´Ø¯Ù‡
       following: ÙÙ‡Ø±Ø³Øª Ù¾ÛŒâ€ŒÚ¯ÛŒØ±ÛŒâ€ŒÙ‡Ø§
       muting: ÙÙ‡Ø±Ø³Øª Ø¨ÛŒâ€ŒØµØ¯Ø§Ø´Ø¯Ù‡â€ŒÙ‡Ø§
@@ -994,6 +1053,14 @@ fa:
           quadrillion: Q
           thousand: K
           trillion: T
+  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: Ø¨Ø¹Ø¯ÛŒ
@@ -1022,6 +1089,7 @@ fa:
   relationships:
     activity: ÙØ¹Ø§Ù„ÛŒØª ØØ³Ø§Ø¨
     dormant: ØºÛŒØ±ÙØ¹Ø§Ù„
+    follow_selected_followers: Ù¾ÛŒÚ¯ÛŒØ±ÛŒ Ù¾ÛŒÚ¯ÛŒØ±Ø§Ù† Ø§Ù†ØªØ®Ø§Ø¨ Ø´Ø¯Ù‡
     followers: Ù¾ÛŒâ€ŒÚ¯ÛŒØ±Ø§Ù†
     following: Ù¾ÛŒ Ù…ÛŒâ€ŒÚ¯ÛŒØ±Ø¯
     invited: Ù…Ø¯Ø¹Ùˆ
@@ -1118,6 +1186,7 @@ fa:
     profile: Ù†Ù…Ø§ÛŒÙ‡
     relationships: Ù¾ÛŒÚ¯ÛŒØ±ÛŒâ€ŒÙ‡Ø§ Ùˆ Ù¾ÛŒÚ¯ÛŒØ±Ø§Ù†
     two_factor_authentication: ÙˆØ±ÙˆØ¯ Ø¯ÙˆÙ…Ø±ØÙ„Ù‡â€ŒØ§ÛŒ
+    webauthn_authentication: Ú©Ù„ÛŒØ¯Ù‡Ø§ÛŒ Ø§Ù…Ù†ÛŒØªÛŒ
   spam_check:
     spam_detected: Ø§ÛŒÙ† ÛŒÚ© Ú¯Ø²Ø§Ø±Ø´ Ø®ÙˆØ¯Ú©Ø§Ø± Ø¨Ø±Ø§ÛŒ ØªØ´Ø®ÛŒØµ Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡ Ø§Ø³Øª.
   statuses:
@@ -1156,6 +1225,8 @@ fa:
         other: "%{count} Ø±Ø£ÛŒ"
       vote: Ø±Ø£ÛŒ
     show_more: Ù†Ù…Ø§ÛŒØ´
+    show_newer: Ù†Ù…Ø§ÛŒØ´ Ø¬Ø¯ÛŒØ¯ØªØ±
+    show_older: Ù†Ù…Ø§ÛŒØ´ Ù‚Ø¯ÛŒÙ…ÛŒâ€ŒØªØ±
     show_thread: Ù†Ù…Ø§ÛŒØ´ Ø±Ø´ØªÙ‡
     sign_in_to_participate: Ø¨Ø±Ø§ÛŒ Ø´Ø±Ú©Øª Ø¯Ø± Ú¯ÙØªÚ¯Ùˆ ÙˆØ§Ø±Ø¯ ØØ³Ø§Ø¨ Ø®ÙˆØ¯ Ø´ÙˆÛŒØ¯
     title: '%{name}: "%{quote}"'
@@ -1264,21 +1335,20 @@ fa:
       default: "%d %b %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Ø¨Ø±Ø§ÛŒ ØªØ£ÛŒÛŒØ¯ØŒ Ú©Ø¯ÛŒ Ø±Ø§ Ú©Ù‡ Ø¨Ø±Ù†Ø§Ù…Ù‡Ù” ØªØ£ÛŒÛŒØ¯Ú©Ù†Ù†Ø¯Ù‡ Ø³Ø§Ø®ØªÙ‡ Ø§Ø³Øª ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯
-    description_html: Ø§Ú¯Ø± <strong>ÙˆØ±ÙˆØ¯ Ø¯ÙˆÙ…Ø±ØÙ„Ù‡â€ŒØ§ÛŒ</strong> Ø±Ø§ ÙØ¹Ø§Ù„ Ú©Ù†ÛŒØ¯ØŒ Ø¨Ø±Ø§ÛŒ ÙˆØ±ÙˆØ¯ Ø¨Ù‡ Ø³ÛŒØ³ØªÙ… Ø¨Ù‡ ØªÙ„ÙÙ† Ø®ÙˆØ¯ Ù†ÛŒØ§Ø² Ø®ÙˆØ§Ù‡ÛŒØ¯ Ø¯Ø§Ø´Øª ØªØ§ Ø¨Ø±Ø§ÛŒØªØ§Ù† ÛŒÚ© Ú©Ø¯ Ù…ÙˆÙ‚ØªÛŒ Ø¨Ø³Ø§Ø²Ø¯.
+    add: Ø§ÙØ²ÙˆØ¯Ù†
     disable: ØºÛŒØ±ÙØ¹Ø§Ù„â€ŒÚ©Ø±Ø¯Ù†
-    enable: ÙØ¹Ø§Ù„â€ŒÚ©Ø±Ø¯Ù†
+    disabled_success: ÙˆØ±ÙˆØ¯ Ø¯ÙˆÙ…Ø±ØÙ„Ù‡â€ŒØ§ÛŒ Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯
+    edit: ÙˆÛŒØ±Ø§ÛŒØ´
     enabled: ÙˆØ±ÙˆØ¯ Ø¯ÙˆÙ…Ø±ØÙ„Ù‡â€ŒØ§ÛŒ ÙØ¹Ø§Ù„ Ø§Ø³Øª
     enabled_success: ÙˆØ±ÙˆØ¯ Ø¯ÙˆÙ…Ø±ØÙ„Ù‡â€ŒØ§ÛŒ Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª ÙØ¹Ø§Ù„ Ø´Ø¯
     generate_recovery_codes: Ø³Ø§Ø®Øª Ú©Ø¯Ù‡Ø§ÛŒ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ
-    instructions_html: "<strong>Ø§ÛŒÙ† Ú©Ø¯ QR Ø±Ø§ Ø¨Ø§ Ø¨Ø±Ù†Ø§Ù…Ù‡Ù” Google Authenticator ÛŒØ§ Ø¨Ø±Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ TOTP Ù…Ø´Ø§Ø¨Ù‡ Ø§Ø³Ú©Ù† Ú©Ù†ÛŒØ¯</strong>. Ø§Ø² Ø§ÛŒÙ† Ø¨Ù‡ Ø¨Ø¹Ø¯ØŒ Ø¢Ù† Ø¨Ø±Ù†Ø§Ù…Ù‡ Ú©Ø¯Ù‡Ø§ÛŒÛŒ Ù…ÙˆÙ‚ØªÛŒ Ø®ÙˆØ§Ù‡Ø¯ Ø³Ø§Ø®Øª Ú©Ù‡ Ø¨Ø±Ø§ÛŒ ÙˆØ±ÙˆØ¯ Ø¨Ø§ÛŒØ¯ Ø¢Ù†â€ŒÙ‡Ø§ Ø±Ø§ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯."
     lost_recovery_codes: Ø¨Ø§ Ú©Ø¯Ù‡Ø§ÛŒ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ø§Ú¯Ø± ØªÙ„ÙÙ† Ø®ÙˆØ¯ Ø±Ø§ Ú¯Ù… Ú©Ø±Ø¯ÛŒØ¯ Ø¨Ù‡ ØØ³Ø§Ø¨ Ø®ÙˆØ¯ Ø¯Ø³ØªØ±Ø³ÛŒ Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´ÛŒØ¯. Ø§Ú¯Ø± Ú©Ø¯Ù‡Ø§ÛŒ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ø®ÙˆØ¯ Ø±Ø§ Ú¯Ù… Ú©Ø±Ø¯ÛŒØ¯ØŒ Ø¢Ù†â€ŒÙ‡Ø§ Ø±Ø§ Ø§ÛŒÙ†â€ŒØ¬Ø§ Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ø¨Ø³Ø§Ø²ÛŒØ¯. Ú©Ø¯Ù‡Ø§ÛŒ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ù‚Ø¨Ù„ÛŒ Ø´Ù…Ø§ Ù†Ø§Ù…Ø¹ØªØ¨Ø± Ø®ÙˆØ§Ù‡Ù†Ø¯ Ø´Ø¯.
-    manual_instructions: 'Ø§Ú¯Ø± Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ú©Ø¯Ù‡Ø§ Ø±Ø§ Ø§Ø³Ú©Ù† Ú©Ù†ÛŒØ¯ Ùˆ Ø¨Ø§ÛŒØ¯ Ø¢Ù†â€ŒÙ‡Ø§ Ø±Ø§ Ø¯Ø³ØªÛŒ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯ØŒ Ù…ØªÙ† Ú©Ø¯ Ø§Ù…Ù†ÛŒØªÛŒ Ø§ÛŒÙ†â€ŒØ¬Ø§Ø³Øª:'
+    methods: Ø±ÙˆØ´â€ŒÙ‡Ø§ÛŒ ÙˆØ±ÙˆØ¯ Ø¯ÙˆÙ…Ø±ØÙ„Ù‡â€ŒØ§ÛŒ
+    otp: Ú©Ø§Ø±Ù‡Ù” ØªØ£ÛŒÛŒØ¯ Ú©Ù†Ù†Ø¯Ù‡
     recovery_codes: Ù¾Ø´ØªÛŒØ¨Ø§Ù†â€ŒÚ¯ÛŒØ±ÛŒ Ø§Ø² Ú©Ø¯Ù‡Ø§ÛŒ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ
     recovery_codes_regenerated: Ú©Ø¯Ù‡Ø§ÛŒ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª Ø³Ø§Ø®ØªÙ‡ Ø´Ø¯Ù†Ø¯
     recovery_instructions_html: Ø§Ú¯Ø± ØªÙ„ÙÙ† Ø®ÙˆØ¯ Ø±Ø§ Ú¯Ù… Ú©Ø±Ø¯ÛŒØ¯ØŒ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ø¨Ø§ ÛŒÚ©ÛŒ Ø§Ø² Ú©Ø¯Ù‡Ø§ÛŒ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ø²ÛŒØ± Ú©Ù†ØªØ±Ù„ ØØ³Ø§Ø¨ Ø®ÙˆØ¯ Ø±Ø§ Ø¨Ù‡ Ø¯Ø³Øª Ø¨Ú¯ÛŒØ±ÛŒØ¯. <strong>Ø§ÛŒÙ† Ú©Ø¯Ù‡Ø§ Ø±Ø§ Ø¯Ø± Ø¬Ø§ÛŒ Ø§Ù…Ù†ÛŒ Ù†Ú¯Ù‡ Ø¯Ø§Ø±ÛŒØ¯.</strong> Ù…Ø«Ù„Ø§Ù‹ Ø¢Ù†â€ŒÙ‡Ø§ Ø±Ø§ Ú†Ø§Ù¾ Ú©Ù†ÛŒØ¯ Ùˆ Ú©Ù†Ø§Ø± Ø³Ø§ÛŒØ± Ù…Ø¯Ø§Ø±Ú© Ù…Ù‡Ù… Ø®ÙˆØ¯ Ù‚Ø±Ø§Ø± Ø¯Ù‡ÛŒØ¯.
-    setup: Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ
-    wrong_code: Ú©Ø¯ÛŒ Ú©Ù‡ ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯ÛŒØ¯ Ù†Ø§Ù…Ø¹ØªØ¨Ø± Ø¨ÙˆØ¯! Ø¢ÛŒØ§ Ø³Ø§Ø¹Øª Ú©Ø§Ø±Ø³Ø§Ø² Ùˆ Ø³Ø§Ø¹Øª Ø¯Ø³ØªÚ¯Ø§Ù‡ Ø´Ù…Ø§ Ø¯Ø±Ø³Øª ØªÙ†Ø¸ÛŒÙ… Ø´Ø¯Ù‡â€ŒØ§Ù†Ø¯ØŸ
+    webauthn: Ú©Ù„ÛŒØ¯Ù‡Ø§ÛŒ Ø§Ù…Ù†ÛŒØªÛŒ
   user_mailer:
     backup_ready:
       explanation: Ø´Ù…Ø§ ÛŒÚ© Ù†Ø³Ø®Ù‡Ù” Ù¾Ø´ØªÛŒØ¨Ø§Ù† Ú©Ø§Ù…Ù„ Ø§Ø² ØØ³Ø§Ø¨ Ø®ÙˆØ¯ Ø±Ø§ Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ú©Ø±Ø¯ÛŒØ¯. Ø§ÛŒÙ† Ù¾Ø´ØªÛŒØ¨Ø§Ù† Ø§Ù„Ø§Ù† Ø¢Ù…Ø§Ø¯Ù‡Ù” Ø¨Ø§Ø±Ú¯ÛŒØ±ÛŒ Ø§Ø³Øª!
@@ -1293,6 +1363,7 @@ fa:
     warning:
       explanation:
         disable: ØªØ§ ÙˆÙ‚ØªÛŒ ØØ³Ø§Ø¨ Ø´Ù…Ø§ Ù…ØªÙˆÙ‚Ù Ø¨Ø§Ø´Ø¯ØŒ Ø¯Ø§Ø¯Ù‡â€ŒÙ‡Ø§ÛŒ Ø´Ù…Ø§ Ø¯Ø³Øªâ€ŒÙ†Ø®ÙˆØ±Ø¯Ù‡ Ø¨Ø§Ù‚ÛŒ Ù…ÛŒâ€ŒÙ…Ø§Ù†Ù†Ø¯ØŒ ÙˆÙ„ÛŒ ØªØ§ ÙˆÙ‚ØªÛŒ Ú©Ù‡ ØØ³Ø§Ø¨ØªØ§Ù† Ø¨Ø§Ø² Ù†Ø´Ø¯Ù‡ØŒ Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ù‡ÛŒÚ† Ú©Ø§Ø±ÛŒ Ø¨Ø§ Ø¢Ù† Ø¨Ú©Ù†ÛŒØ¯.
+        sensitive: Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€ŒÙ‡Ø§ÛŒ Ø±Ø³Ø§Ù†Ù‡Ù” Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒâ€ŒØ´Ø¯Ù‡ Ùˆ Ø±Ø³Ø§Ù†Ù‡â€ŒÙ‡Ø§ÛŒ Ù¾ÛŒÙˆØ³ØªÙ‡ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ØØ³Ø§Ø³ Ø¯Ø± Ù†Ø¸Ø± Ú¯Ø±ÙØªÙ‡ Ø®ÙˆØ§Ù‡Ù†Ø¯ Ø´Ø¯.
         silence: ØªØ§ ÙˆÙ‚ØªÛŒ ØØ³Ø§Ø¨ Ø´Ù…Ø§ Ù…ØØ¯ÙˆØ¯ Ø¨Ø§Ø´Ø¯ØŒ ØªÙ†Ù‡Ø§ Ú©Ø³Ø§Ù†ÛŒ Ú©Ù‡ Ø§Ø² Ù‚Ø¨Ù„ Ù¾ÛŒÚ¯ÛŒØ± Ø´Ù…Ø§ Ø¨ÙˆØ¯Ù†Ø¯ Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ø´Ù…Ø§ Ø¯Ø± Ø§ÛŒÙ† Ú©Ø§Ø±Ø³Ø§Ø² Ø±Ø§ Ù…ÛŒâ€ŒØ¨ÛŒÙ†Ù†Ø¯ Ùˆ Ø´Ø§ÛŒØ¯ Ø´Ù…Ø§ Ø¯Ø± Ø¨Ø±Ø®ÛŒ Ø§Ø² ÙÙ‡Ø±Ø³Øªâ€ŒÙ‡Ø§ÛŒ Ø¹Ù…ÙˆÙ…ÛŒ Ø¯ÛŒØ¯Ù‡ Ù†Ø´ÙˆÛŒØ¯. ÙˆÙ„ÛŒ Ø¯ÛŒÚ¯Ø±Ø§Ù† Ù‡Ù…Ú†Ù†Ø§Ù† Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ù†Ø¯ Ø¨Ù‡ Ø¯Ù„Ø®ÙˆØ§Ù‡ Ø®ÙˆØ¯Ø´Ø§Ù† Ù¾ÛŒÚ¯ÛŒØ± Ø´Ù…Ø§ Ø´ÙˆÙ†Ø¯.
         suspend: ØØ³Ø§Ø¨ØªØ§Ù† Ù…Ø¹Ù„Ù‚ Ø´Ø¯Ù‡ Ùˆ ØªÙ…Ø§Ù… Ø¨ÙˆÙ‚â€ŒÙ‡Ø§ Ùˆ Ø±Ø³Ø§Ù†Ù‡â€ŒÙ‡Ø§ÛŒ Ø¨Ø§Ø±Ú¯Ø°Ø§Ø´ØªÙ‡â€ŒØªØ§Ù†ØŒ Ø§Ø² Ø±ÙˆÛŒ Ø§ÛŒÙ† Ú©Ø§Ø±Ø³Ø§Ø² Ùˆ Ú©Ø§Ø±Ø³Ø§Ø²Ù‡Ø§ÛŒÛŒ Ú©Ù‡ Ù¾ÛŒÚ¯ÛŒØ±Ø§Ù†ÛŒ Ø±ÙˆÛŒØ´Ø§Ù† Ø¯Ø§Ø´ØªÛŒØ¯ØŒ Ø¨Ù‡ Ø·ÙˆØ± Ø¨Ø§Ø²Ú¯Ø´Øªâ€ŒÙ†Ø§Ù¾Ø°ÛŒØ±ÛŒ Ø¨Ø±Ø¯Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡â€ŒØ§Ù†Ø¯.
       get_in_touch: Ø¨Ø§ Ù¾Ø§Ø³Ø® Ø¨Ù‡ Ø§ÛŒÙ† Ø§ÛŒÙ…ÛŒÙ„ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ø¨Ø§ Ø¯Ø³Øªâ€ŒØ§Ù†Ø¯Ø±Ú©Ø§Ø±Ø§Ù† %{instance} Ø¯Ø± ØªÙ…Ø§Ø³ Ø¨Ø§Ø´ÛŒØ¯.
@@ -1301,11 +1372,13 @@ fa:
       subject:
         disable: ØØ³Ø§Ø¨ %{acct} Ø´Ù…Ø§ Ù…ØªÙˆÙ‚Ù Ø´Ø¯Ù‡ Ø§Ø³Øª
         none: Ù‡Ø´Ø¯Ø§Ø± Ø¨Ø±Ø§ÛŒ %{acct}
+        sensitive: Ø±Ø³Ø§Ù†Ù‡â€ŒÙ‡Ø§ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡ ØªÙˆØ³Ø· ØØ³Ø§Ø¨ %{acct} Ø´Ù…Ø§ Ø¨Ø±Ú†Ø³Ø¨ ØØ³Ø§Ø³ Ø®ÙˆØ±Ø¯Ù‡â€ŒØ§Ù†Ø¯
         silence: ØØ³Ø§Ø¨ %{acct} Ø´Ù…Ø§ Ù…ØØ¯ÙˆØ¯ Ø´Ø¯Ù‡ Ø§Ø³Øª
         suspend: ØØ³Ø§Ø¨ %{acct}  Ø´Ù…Ø§ Ù…Ø¹Ù„Ù‚ Ø´Ø¯Ù‡ Ø§Ø³Øª
       title:
         disable: ØØ³Ø§Ø¨ Ù…ØªÙˆÙ‚Ù Ø´Ø¯Ù‡ Ø§Ø³Øª
         none: Ù‡Ø´Ø¯Ø§Ø±
+        sensitive: Ø±Ø³Ø§Ù†Ù‡â€ŒØªØ§Ù† Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ØØ³Ø§Ø³ Ø¯Ø± Ù†Ø¸Ø± Ú¯Ø±ÙØªÙ‡ Ø´Ø¯
         silence: ØØ³Ø§Ø¨ Ù…ØØ¯ÙˆØ¯ Ø´Ø¯Ù‡ Ø§Ø³Øª
         suspend: ØØ³Ø§Ø¨ Ù…Ø¹Ù„Ù‚ Ø´Ø¯Ù‡ Ø§Ø³Øª
     welcome:
@@ -1326,9 +1399,11 @@ fa:
       tips: Ù†Ú©ØªÙ‡â€ŒÙ‡Ø§
       title: Ø®ÙˆØ´ Ø¢Ù…Ø¯ÛŒØ¯ØŒ Ú©Ø§Ø±Ø¨Ø± %{name}!
   users:
+    blocked_email_provider: ÙØ±Ø§Ù‡Ù…â€ŒÚ©Ù†Ù†Ø¯Ù‡Ù” Ø±Ø§ÛŒØ§Ù†Ø§Ù…Ù‡ Ù…Ø¬Ø§Ø² Ù†ÛŒØ³Øª
     follow_limit_reached: Ø´Ù…Ø§ Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ø¨ÛŒØ´ Ø§Ø² %{limit} Ù†ÙØ± Ø±Ø§ Ù¾ÛŒ Ø¨Ú¯ÛŒØ±ÛŒØ¯
     generic_access_help_html: Ù…Ø´Ú©Ù„ Ø¯Ø± Ø¯Ø³ØªØ±Ø³ÛŒ Ø¨Ù‡ ØØ³Ø§Ø¨ØªØ§Ù†ØŸ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ø¨Ø±Ø§ÛŒ Ú©Ù…Ú© Ø¨Ø§ %{email} ØªÚ©Ø§Ø³ Ø¨Ú¯ÛŒØ±ÛŒØ¯
     invalid_email: Ù†Ø´Ø§Ù†ÛŒ Ø§ÛŒÙ…ÛŒÙ„ Ù†Ø§Ù…Ø¹ØªØ¨Ø± Ø§Ø³Øª
+    invalid_email_mx: Ø¨Ù‡ Ù†Ø¸Ø± Ù†Ù…ÛŒâ€ŒØ±Ø³Ø¯ Ù†Ø´Ø§Ù†ÛŒ Ø±Ø§ÛŒØ§Ù†Ø§Ù…Ù‡ ÙˆØ¬ÙˆØ¯ Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´Ø¯
     invalid_otp_token: Ú©Ø¯ ÙˆØ±ÙˆØ¯ Ø¯ÙˆÙ…Ø±ØÙ„Ù‡â€ŒØ§ÛŒ Ù†Ø§Ù…Ø¹ØªØ¨Ø± Ø§Ø³Øª
     invalid_sign_in_token: Ú©Ø¯ Ø§Ù…Ù†ÛŒØªÛŒ Ù†Ø§Ø¯Ø±Ø³Øª
     otp_lost_help_html: Ø§Ú¯Ø± Ø´Ù…Ø§ Ø¯Ø³ØªØ±Ø³ÛŒ Ø¨Ù‡ Ù‡ÛŒÚ†â€ŒÚ©Ø¯Ø§Ù…Ø´Ø§Ù† Ù†Ø¯Ø§Ø±ÛŒØ¯ØŒ Ø¨Ø§ÛŒØ¯ Ø¨Ø§ Ø§ÛŒÙ…ÛŒÙ„ %{email} ØªÙ…Ø§Ø³ Ø¨Ú¯ÛŒØ±ÛŒØ¯
@@ -1338,3 +1413,20 @@ fa:
   verification:
     explanation_html: 'Ø´Ù…Ø§ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ <strong>Ø®ÙˆØ¯ Ø±Ø§ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† Ù…Ø§Ù„Ú© ØµÙØÙ‡â€ŒØ§ÛŒ Ú©Ù‡ Ø¯Ø± Ù†Ù…Ø§ÛŒÙ‡â€ŒØªØ§Ù† Ø¨Ù‡ Ø¢Ù† Ù¾ÛŒÙˆÙ†Ø¯ Ø¯Ø§Ø¯Ù‡â€ŒØ§ÛŒØ¯ ØªØ£ÛŒÛŒØ¯ Ú©Ù†ÛŒØ¯.</strong> Ø¨Ø±Ø§ÛŒ Ø§ÛŒÙ† Ú©Ø§Ø±ØŒ ØµÙØÙ‡â€ŒØ§ÛŒ Ú©Ù‡ Ø¨Ù‡ Ø¢Ù† Ù¾ÛŒÙˆÙ†Ø¯ Ø¯Ø§Ø¯Ù‡â€ŒØ§ÛŒØ¯ØŒ Ø®ÙˆØ¯Ø´ Ø¨Ø§ÛŒØ¯ Ù¾ÛŒÙˆÙ†Ø¯ÛŒ Ø¨Ù‡ Ù†Ù…Ø§ÛŒÙ‡Ù” Ù…Ø§Ø³ØªÙˆØ¯ÙˆÙ† Ø´Ù…Ø§ Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´Ø¯. Ù¾ÛŒÙˆÙ†Ø¯ Ø¯Ø± Ø¢Ù† ØµÙØÙ‡ <strong>Ø¨Ø§ÛŒØ¯</strong> Ø¹Ø¨Ø§Ø±Øª <code>rel="me"â€Ž</code> Ø±Ø§ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† Ù…Ø´Ø®Ù‘ØµÙ‡Ù” (attribute) Ø¯Ø± Ø®ÙˆØ¯ Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´Ø¯. Ù…ØØªÙˆØ§ÛŒ Ù…ØªÙ† Ù¾ÛŒÙˆÙ†Ø¯ Ø§Ù‡Ù…ØªÛŒ Ù†Ø¯Ø§Ø±Ø¯. ÛŒÚ© Ù†Ù…ÙˆÙ†Ù‡ Ø§Ø² Ú†Ù†ÛŒÙ† Ù¾ÛŒÙˆÙ†Ø¯ÛŒ:'
     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}
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index c5703e596a592d56e243de094ab002c588c18191..9eb0d9397fb4b959673d5ea903170ac61e837e3b 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -4,10 +4,12 @@ fi:
     about_hashtag_html: NÃ¤mÃ¤ ovat hashtagilla <strong>#%{hashtag}</strong> merkittyjÃ¤ julkisia tuuttauksia. Voit vastata niihin, jos sinulla on tili jossain pÃ¤in fediversumia.
     about_mastodon_html: Mastodon on sosiaalinen verkosto. Se on toteutettu avoimilla verkkoprotokollilla ja vapailla, avoimen lÃ¤hdekoodin ohjelmistoilla, ja se toimii hajautetusti samaan tapaan kuin sÃ¤hkÃ¶posti.
     about_this: Tietoja tÃ¤stÃ¤ palvelimesta
+    active_count_after: aktiivinen
     administered_by: 'YllÃ¤pitÃ¤jÃ¤:'
     api: API
     apps: Mobiili sovellukset
     apps_platforms: KÃ¤ytÃ¤ Mastodonia iOS:llÃ¤, Androidilla tai muilla alustoilla
+    browse_directory: Selaa profiilihakemistoa ja suodata kiinnostuksen kohteiden mukaan
     contact: Ota yhteyttÃ¤
     contact_missing: Ei asetettu
     contact_unavailable: Ei saatavilla
@@ -17,6 +19,7 @@ fi:
     hosted_on: Mastodon palvelimella %{domain}
     learn_more: LisÃ¤tietoja
     privacy_policy: Tietosuojaseloste
+    see_whats_happening: NÃ¤e mitÃ¤ tapahtuu
     server_stats: 'Palvelimen tilastot:'
     source_code: LÃ¤hdekoodi
     status_count_after:
@@ -28,6 +31,10 @@ fi:
     unavailable_content_description:
       domain: Palvelin
       reason: Syy
+      rejecting_media_title: Media suodatettu
+      silenced: 'Julkaisut nÃ¤iltÃ¤ palvelimilta piilotetaan julkisilta aikajanoilta ja keskusteluista, ilmoituksia ei luoda nÃ¤iden kÃ¤yttÃ¤jien tekemistÃ¤ toiminnoista, jos et seuraa heitÃ¤:'
+      silenced_title: Hiljennetyt palvelimet
+      suspended: 'Dataa nÃ¤iltÃ¤ palvelimilta ei tulla kÃ¤sittelemÃ¤Ã¤n, tallentamaan tai jakamaan. TÃ¤mÃ¤ tekee kommunikoinnin nÃ¤iden kÃ¤yttÃ¤jien kanssa mahdottomaksi:'
     user_count_after:
       one: kÃ¤yttÃ¤jÃ¤
       other: kÃ¤yttÃ¤jÃ¤t
@@ -35,6 +42,7 @@ fi:
     what_is_mastodon: MikÃ¤ on Mastodon?
   accounts:
     choices_html: "%{name} valinnat:"
+    endorsements_hint: Voit suositella seuraamiasi henkilÃ¶itÃ¤ web kÃ¤yttÃ¶liittymÃ¤n kautta, ne tulevat nÃ¤kymÃ¤Ã¤n tÃ¤hÃ¤n.
     follow: Seuraa
     followers:
       one: Seuraaja
@@ -66,8 +74,10 @@ fi:
     unavailable: Profiili ei saatavilla
     unfollow: Lopeta seuraaminen
   admin:
+    account_actions:
+      action: Suorita toimenpide
     account_moderation_notes:
-      create: Luo
+      create: JÃ¤tÃ¤ muistiinpano
       created_msg: ModerointimerkinnÃ¤n luonti onnistui!
       delete: Poista
       destroyed_msg: ModerointimerkinnÃ¤n poisto onnistui!
@@ -101,7 +111,9 @@ fi:
       enabled: KÃ¤ytÃ¶ssÃ¤
       followers: Seuraajat
       follows: Seuraa
+      header: Otsakekuva
       inbox_url: Saapuvan postilaatikon osoite
+      invited_by: Kutsuja
       ip: IP
       joined: Liittynyt
       location:
@@ -122,7 +134,9 @@ fi:
       moderation_notes: ModerointimerkinnÃ¤t
       most_recent_activity: Viimeisin toiminta
       most_recent_ip: Viimeisin IP
+      no_limits_imposed: Rajoituksia ei ole asetettu
       not_subscribed: Ei tilaaja
+      pending: Odottaa tarkistusta
       perform_full_suspension: SiirrÃ¤ kokonaan jÃ¤Ã¤hylle
       promote: YlennÃ¤
       protocol: Protokolla
@@ -132,6 +146,7 @@ fi:
       reject: HylkÃ¤Ã¤
       reject_all: HylkÃ¤Ã¤ kaikki
       remove_avatar: Poista profiilikuva
+      remove_header: Poista otsakekuva
       resend_confirmation:
         already_confirmed: TÃ¤mÃ¤ kÃ¤yttÃ¤jÃ¤ on jo vahvistettu
         send: LÃ¤hetÃ¤ varmistusviesti uudelleen
@@ -146,6 +161,7 @@ fi:
         staff: HenkilÃ¶stÃ¶
         user: KÃ¤yttÃ¤jÃ¤
       search: Hae
+      search_same_ip: Muut kÃ¤yttÃ¤jÃ¤t samalla IP-osoitteella
       shared_inbox_url: Jaetun saapuvan postilaatikon osoite
       show:
         created_reports: TÃ¤mÃ¤n tilin luomat raportit
@@ -155,6 +171,7 @@ fi:
       statuses: Tilat
       subscribe: Tilaa
       suspended: JÃ¤Ã¤hyllÃ¤
+      time_in_queue: Odottaa jonossa %{time}
       title: Tilit
       unconfirmed_email: SÃ¤hkÃ¶postia ei vahvistettu
       undo_silenced: Peru hiljennys
@@ -164,6 +181,22 @@ fi:
       warn: Varoita
       web: Verkko
     action_logs:
+      action_types:
+        confirm_user: Vahvista kÃ¤yttÃ¤jÃ¤
+        create_account_warning: Luo varoitus
+        create_announcement: Luo ilmoitus
+        create_custom_emoji: Luo mukautettu emoji
+        demote_user: Alenna kÃ¤yttÃ¤jÃ¤
+        destroy_announcement: Poista ilmoitus
+        destroy_custom_emoji: Poista mukautettu emoji
+        destroy_status: Poista tilapÃ¤ivitys
+        disable_2fa_user: Poista kaksivaiheinen tunnistautuminen kÃ¤ytÃ¶stÃ¤
+        disable_user: Tili poistettu kÃ¤ytÃ¶stÃ¤
+        enable_custom_emoji: KÃ¤ytÃ¤ mukautettuja emojeita
+        enable_user: Tili otettu kÃ¤yttÃ¶Ã¶n
+        promote_user: KÃ¤yttÃ¤jÃ¤ ylennetty
+        remove_avatar_user: Profiilikuvan poisto
+        silence_account: HiljennÃ¤ tili
       actions:
         assigned_to_self_report: "%{name} otti raportin %{target} tehtÃ¤vÃ¤kseen"
         change_email_user: "%{name} vaihtoi kÃ¤yttÃ¤jÃ¤n %{target} sÃ¤hkÃ¶postiosoitteen"
@@ -192,8 +225,20 @@ fi:
         unsuspend_account: "%{name} perui kÃ¤yttÃ¤jÃ¤n %{target} jÃ¤Ã¤hyn"
         update_custom_emoji: "%{name} pÃ¤ivitti emojin %{target}"
         update_status: "%{name} pÃ¤ivitti kÃ¤yttÃ¤jÃ¤n %{target} tilan"
+      deleted_status: "(poistettu tilapÃ¤ivitys)"
+      empty: Lokeja ei lÃ¶ytynyt.
+      filter_by_action: Suodata tapahtuman mukaan
+      filter_by_user: Suodata kÃ¤yttÃ¤jÃ¤n mukaan
       title: Auditointiloki
     announcements:
+      destroyed_msg: Ilmoitus poistettu onnistuneesti!
+      edit:
+        title: Muokkaa ilmoitusta
+      empty: YhtÃ¤Ã¤n ilmoitusta ei lÃ¶ytynyt.
+      new:
+        create: Luo ilmoitus
+        title: Uusi ilmoitus
+      published_msg: Ilmoitus julkaistu onnistuneesti!
       title: Ilmoitukset
     custom_emojis:
       assign_category: Aseta kategoria
@@ -217,6 +262,7 @@ fi:
       listed: Listassa
       new:
         title: LisÃ¤Ã¤ uusi mukautettu emoji
+      not_permitted: Sinulla ei ole oikeutta suorittaa tÃ¤tÃ¤ toimintoa
       overwrite: Kirjoita yli
       shortcode: Lyhennekoodi
       shortcode_hint: VÃ¤hintÃ¤Ã¤n kaksi merkkiÃ¤, vain kirjaimia, numeroita ja alaviivoja
@@ -234,7 +280,18 @@ fi:
       feature_invites: Kutsulinkit
       feature_profile_directory: Profiilihakemisto
       feature_registrations: RekisterÃ¶itymiset
+      feature_spam_check: Roskapostin esto
+      feature_timeline_preview: Aikajanan esikatselu
+      features: Ominaisuudet
+      recent_users: Viimeaikaiset kÃ¤yttÃ¤jÃ¤t
+      search: Haku koko tekstistÃ¤
+      software: Ohjelmisto
+      space: TilankÃ¤yttÃ¶
       title: Hallintapaneeli
+      total_users: kÃ¤yttÃ¤jiÃ¤ yhteensÃ¤
+      trends: Trendit
+      week_users_active: aktiivinen tÃ¤llÃ¤ viikolla
+      week_users_new: kÃ¤yttÃ¤jiÃ¤ tÃ¤llÃ¤ viikolla
     domain_blocks:
       add_new: LisÃ¤Ã¤ uusi
       created_msg: Verkkotunnuksen estoa kÃ¤sitellÃ¤Ã¤n
@@ -249,8 +306,13 @@ fi:
           silence: Hiljennys
           suspend: JÃ¤Ã¤hy
         title: Uusi verkkotunnuksen esto
+      private_comment: Yksityinen kommentti
+      public_comment: Julkinen kommentti
       reject_media: HylkÃ¤Ã¤ mediatiedostot
       reject_media_hint: Poistaa paikallisesti tallennetut mediatiedostot eikÃ¤ lataa niitÃ¤ enÃ¤Ã¤ jatkossa. Ei merkitystÃ¤ jÃ¤Ã¤hyn kohdalla
+      severity:
+        silence: hiljennetty
+        suspend: jÃ¤Ã¤hyllÃ¤
       show:
         affected_accounts:
           one: Vaikuttaa yhteen tiliin tietokannassa
@@ -272,14 +334,33 @@ fi:
         title: Uusi sÃ¤hkÃ¶postiestolistan merkintÃ¤
       title: SÃ¤hkÃ¶postiestolista
     instances:
+      moderation:
+        all: Kaikki
+        limited: Rajoitettu
+        title: Moderointi
+      private_comment: Yksityinen kommentti
+      public_comment: Julkinen kommentti
       title: Tiedossa olevat instanssit
+      total_blocked_by_us: Estetty meidÃ¤n toimesta
+      total_followed_by_them: HeidÃ¤n seuraama
+      total_followed_by_us: MeidÃ¤n seuraama
+      total_storage: Medialiitteet
     invites:
+      deactivate_all: Poista kaikki kÃ¤ytÃ¶stÃ¤
       filter:
         all: Kaikki
         available: Saatavilla
         expired: Vanhentunut
         title: Suodata
       title: Kutsut
+    relays:
+      delete: Poista
+      disable: Poista kÃ¤ytÃ¶stÃ¤
+      disabled: Poistettu kÃ¤ytÃ¶stÃ¤
+      enable: Ota kÃ¤yttÃ¶Ã¶n
+      enabled: KÃ¤ytÃ¶ssÃ¤
+      save_and_enable: Tallenna ja ota kÃ¤yttÃ¶Ã¶n
+      status: Tila
     report_notes:
       created_msg: Muistiinpano onnistuneesti lisÃ¤tty raporttiin!
       destroyed_msg: Muistiinpano onnistuneesti poistettu raportista!
@@ -318,11 +399,21 @@ fi:
       contact_information:
         email: TyÃ¶sÃ¤hkÃ¶posti
         username: YhteyshenkilÃ¶n kÃ¤yttÃ¤jÃ¤nimi
+      custom_css:
+        title: Mukautettu CSS
+      domain_blocks:
+        all: Kaikille
+        disabled: Ei kenellekkÃ¤Ã¤n
+        title: NÃ¤ytÃ¤ domainestot
+      domain_blocks_rationale:
+        title: NÃ¤ytÃ¤ syy
       enable_bootstrap_timeline_accounts:
         title: Uudet kÃ¤yttÃ¤jÃ¤t seuraavat oletuksena tilejÃ¤
       hero:
         desc_html: NÃ¤ytetÃ¤Ã¤n etusivulla. Suosituskoko vÃ¤hintÃ¤Ã¤n 600x100 pikseliÃ¤. Jos kuvaa ei aseteta, kÃ¤ytetÃ¤Ã¤n instanssin pikkukuvaa
         title: Sankarin kuva
+      mascot:
+        title: Maskottikuva
       peers_api_enabled:
         desc_html: Verkkotunnukset, jotka tÃ¤mÃ¤ instanssi on kohdannut fediversumissa
         title: Julkaise lÃ¶ydettyjen instanssien luettelo
@@ -336,6 +427,11 @@ fi:
         min_invite_role:
           disabled: Ei kukaan
           title: Salli kutsut kÃ¤yttÃ¤jÃ¤ltÃ¤
+      registrations_mode:
+        modes:
+          approved: RekisterÃ¶inti vaatii hyvÃ¤ksynnÃ¤n
+          none: Kukaan ei voi rekisterÃ¶ityÃ¤
+          open: Kaikki voivat rekisterÃ¶ityÃ¤
       show_known_fediverse_at_about_page:
         desc_html: Kun tÃ¤mÃ¤ on valittu, esikatselussa nÃ¤ytetÃ¤Ã¤n tuuttaukset kaikkialta tunnetusta fediversumista. Muutoin nÃ¤ytetÃ¤Ã¤n vain paikalliset tuuttaukset.
         title: NÃ¤ytÃ¤ aikajanan esikatselussa koko tunnettu fediversumi
@@ -348,6 +444,8 @@ fi:
       site_description_extended:
         desc_html: HyvÃ¤ paikka kÃ¤ytÃ¶sohjeille, sÃ¤Ã¤nnÃ¶ille, ohjeistuksille ja muille instanssin muista erottaville asioille. HTML-tagit kÃ¤ytÃ¶ssÃ¤
         title: Omavalintaiset laajat tiedot
+      site_short_description:
+        title: Lyhyt instanssin kuvaus
       site_terms:
         desc_html: TÃ¤hÃ¤n voi kirjoittaa instanssin tietosuojakÃ¤ytÃ¤nnÃ¶stÃ¤, kÃ¤yttÃ¶ehdoista ja sen sellaisista asioista. HTML-tagit kÃ¤ytÃ¶ssÃ¤
         title: Omavalintaiset kÃ¤yttÃ¶ehdot
@@ -359,24 +457,53 @@ fi:
         desc_html: NÃ¤ytÃ¤ julkinen aikajana aloitussivulla
         title: Aikajanan esikatselu
       title: Sivuston asetukset
+      trends:
+        title: Trendaavat aihetunnisteet
+    site_uploads:
+      delete: Poista ladattu tiedosto
     statuses:
       back_to_account: Takaisin tilin sivulle
       batch:
         delete: Poista
         nsfw_off: NSFW POIS
         nsfw_on: NSFW PÃ„Ã„LLÃ„
+      deleted: Poistettu
       failed_to_execute: Suoritus epÃ¤onnistui
+      media:
+        title: Media
       no_media: Ei mediaa
       title: Tilin tilat
       with_media: SisÃ¤ltÃ¤Ã¤ mediaa
+    tags:
+      context: Konteksti
+      last_active: Aktiivinen viimeksi
+      most_popular: Suosituimmat
+      most_recent: ViimeisimmÃ¤t
+      name: Aihetunniste
+      reviewed: Tarkistetut
+      title: Aihetunnisteet
+      trending_right_now: Trendaa juuri nyt
     title: YllÃ¤pito
+    warning_presets:
+      add_new: LisÃ¤Ã¤ uusi
+      delete: Poista
   admin_mailer:
     new_report:
       body: "%{reporter} on raportoinut kohteen %{target}"
       body_remote: Joku osoitteesta %{domain} on raportoinut kohteen %{target}
       subject: Uusi raportti instanssista %{instance} (nro %{id})
+  aliases:
+    add_new: Luo alias
+    empty: Sinulla ei ole aliaksia.
+    remove: Poista aliaksen linkitys
+  appearance:
+    localization:
+      body: Mastodonin ovat kÃ¤Ã¤ntÃ¤neet vapaaehtoiset.
+      guide_link_text: Kaikki voivat osallistua.
+    sensitive_content: Arkaluontoista sisÃ¤ltÃ¶Ã¤
   application_mailer:
     notification_preferences: Muuta sÃ¤hkÃ¶postiasetuksia
+    salutation: "%{name},"
     settings: 'Muuta sÃ¤hkÃ¶postiasetuksia: %{link}'
     view: 'NÃ¤ytÃ¤:'
     view_profile: NÃ¤ytÃ¤ profiili
@@ -390,9 +517,13 @@ fi:
     warning: SÃ¤ilytÃ¤ tietoa hyvin. Ã„lÃ¤ milloinkaan jaa sitÃ¤ muille!
     your_token: PÃ¤Ã¤sytunnus
   auth:
+    apply_for_account: PyydÃ¤ kutsu
     change_password: Salasana
     delete_account: Poista tili
     delete_account_html: Jos haluat poistaa tilisi, <a href="%{path}">paina tÃ¤stÃ¤</a>. Poisto on vahvistettava.
+    description:
+      prefix_sign_up: Liity Mastodoniin tÃ¤nÃ¤Ã¤n!
+      suffix: TilillÃ¤ voit seurata ihmisiÃ¤, julkaista pÃ¤ivityksiÃ¤ ja lÃ¤hetellÃ¤ viestejÃ¤ muille kÃ¤yttÃ¤jille miltÃ¤ palvelimelta tahansa ja paljon muuta!
     didnt_get_confirmation: EtkÃ¶ saanut vahvistusohjeita?
     forgot_password: Unohditko salasanasi?
     invalid_reset_password_token: Salasananpalautustunnus on virheellinen tai vanhentunut. PyydÃ¤ uusi.
@@ -406,6 +537,10 @@ fi:
     reset_password: Palauta salasana
     security: Tunnukset
     set_new_password: Aseta uusi salasana
+    status:
+      account_status: Tilin tila
+      functional: Tilisi on tÃ¤ysin toimiva.
+    trouble_logging_in: Ongelmia kirjautumisessa?
   authorize_follow:
     already_following: SinÃ¤ seuraat jo tÃ¤tÃ¤ tiliÃ¤
     error: Valitettavasti etÃ¤tilin haussa tapahtui virhe
@@ -417,6 +552,8 @@ fi:
       return: Palaa kÃ¤yttÃ¤jÃ¤n profiiliin
       web: Siirry verkkosivulle
     title: Seuraa kÃ¤yttÃ¤jÃ¤Ã¤ %{acct}
+  challenge:
+    confirm: Jatka
   datetime:
     distance_in_words:
       about_x_hours: "%{count} h"
@@ -435,6 +572,16 @@ fi:
     confirm_password: Tunnistaudu syÃ¶ttÃ¤mÃ¤llÃ¤ nykyinen salasanasi
     proceed: Poista tili
     success_msg: Tilin poisto onnistui
+    warning:
+      more_details_html: LisÃ¤tietoja saat <a href="%{terms_path}">tietosuojakÃ¤ytÃ¤nnÃ¶stÃ¤mme</a>.
+      username_available: KÃ¤yttÃ¤jÃ¤nimesi tulee saataville uudestaan
+      username_unavailable: KÃ¤yttÃ¤jÃ¤nimesi ei tule saataville enÃ¤Ã¤ uudestaan
+  directories:
+    directory: Profiilihakemisto
+    explanation: LÃ¶ydÃ¤ kÃ¤yttÃ¤jiÃ¤ hiedÃ¤n kiinnostuksiensa kautta
+    explore_mastodon: Tutki %{title}
+  domain_validator:
+    invalid_domain: ei ole kelvollinen toimialueen nimi
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': Sinulla ei ole lupaa nÃ¤hdÃ¤ tÃ¤tÃ¤ sivua.
@@ -459,14 +606,44 @@ fi:
       request: PyydÃ¤ arkisto
       size: Koko
     blocks: Estot
+    lists: Listat
     mutes: Mykistetyt
     storage: Media-arkisto
+  featured_tags:
+    add_new: LisÃ¤Ã¤ uusi
+  filters:
+    contexts:
+      account: Profiilit
+      home: Kotiaikajana
+      notifications: Ilmoitukset
+      public: Julkiset aikajanat
+      thread: Keskustelut
+    edit:
+      title: Muokkaa suodatinta
+    index:
+      delete: Poista
+      empty: Sinulla ei ole suodattimia.
+      title: Suodattimet
+    new:
+      title: LisÃ¤Ã¤ uusi suodatin
+  footer:
+    developers: KehittÃ¤jille
+    more: LisÃ¤Ã¤â€¦
+    resources: Resurssit
+    trending_now: Suosittua nyt
   generic:
+    all: Kaikki
     changes_saved_msg: Muutosten tallennus onnistui!
+    copy: Kopioi
+    delete: Poista
+    order_by: JÃ¤rjestÃ¤
     save_changes: Tallenna muutokset
     validation_errors:
       one: Kaikki ei ole aivan oikein! Tarkasta alla oleva virhe
       other: Kaikki ei ole aivan oikein! Tarkasta alla olevat %{count} virhettÃ¤
+  identity_proofs:
+    active: Aktiivinen
+    authorize: KyllÃ¤, valtuuta
   imports:
     preface: Voit tuoda toisesta instanssista viemiÃ¤si tietoja, kuten esimerkiksi seuraamiesi tai estÃ¤miesi henkilÃ¶iden listan.
     success: Tietojen lÃ¤hettÃ¤minen onnistui, ja ne kÃ¤sitellÃ¤Ã¤n kohtapuoliin
@@ -506,6 +683,16 @@ fi:
       too_many: Tiedostoja voi liittÃ¤Ã¤ enintÃ¤Ã¤n 4
   migrations:
     acct: uuden tilin kÃ¤yttÃ¤jÃ¤tunnus@verkkotunnus
+    errors:
+      move_to_self: ei voi olla nykyinen tili
+      not_found: ei voitu lÃ¶ytÃ¤Ã¤
+      on_cooldown: SinÃ¤ olet jÃ¤Ã¤hyllÃ¤
+    followers_count: Seuraajat muuton aikana
+    past_migrations: Edelliset migraatiot
+    proceed_with_move: SiirrÃ¤ seuraajat
+    set_redirect: Aseta uudelleenohjaus
+    warning:
+      before: 'Ennen jatkamista, lue nÃ¤mÃ¤ huomautukset huolellisesti:'
   moderation:
     title: Moderointi
   notification_mailer:
@@ -548,6 +735,7 @@ fi:
         format: "%n %u"
         units:
           billion: Mrd
+          million: M
           quadrillion: Brd
           thousand: k
           trillion: B
@@ -556,8 +744,22 @@ fi:
     next: Seuraava
     older: Vanhemmat
     prev: Edellinen
+  polls:
+    errors:
+      duration_too_long: on liian kaukana tulevaisuudessa
+      duration_too_short: on liian aikainen
+      expired: Ã„Ã¤nestys on jo loppunut
   preferences:
     other: Muut
+    public_timelines: Julkiset aikajanat
+  reactions:
+    errors:
+      unrecognized_emoji: ei ole tunnistettu emoji
+  relationships:
+    activity: Tilin tapahtumat
+    followers: Seuraajat
+    following: Seuratut
+    invited: Kutsuttu
   remote_follow:
     acct: SyÃ¶tÃ¤ se kÃ¤yttÃ¤jÃ¤tunnus@verkkotunnus, josta haluat seurata
     missing_resource: Vaadittavaa uudelleenohjaus-URL:Ã¤Ã¤ tiliisi ei lÃ¶ytynyt
@@ -567,27 +769,62 @@ fi:
     activity: Viimeisin toiminta
     browser: Selain
     browsers:
+      alipay: Alipay
+      blackberry: Blackberry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
       generic: Tuntematon selain
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
       nokia: Nokia S40 Ovi -selain
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UCBrowser
+      weibo: Weibo
     current_session: Nykyinen istunto
     description: "%{browser}, %{platform}"
     explanation: NÃ¤mÃ¤ verkkoselaimet ovat tÃ¤llÃ¤ hetkellÃ¤ kirjautuneet Mastodon-tilillesi.
+    ip: IP-osoite
     platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: Blackberry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: macOS
       other: tuntematon jÃ¤rjestelmÃ¤
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
     revoke: HylkÃ¤Ã¤
     revoke_success: Istunnon hylkÃ¤ys onnistui
     title: Istunnot
   settings:
+    account: Tili
+    account_settings: Tilin asetukset
+    aliases: Tilin aliakset
+    appearance: Ulkoasu
     authorized_apps: Valtuutetut sovellukset
     back: Takaisin Mastodoniin
     delete: Tilin poisto
     development: KehittÃ¤minen
     edit_profile: Muokkaa profiilia
     export: Vie tietoja
+    featured_tags: Esitellyt aihetunnisteet
     import: Tuo
+    import_and_export: Tuo / Vie
     migrate: Tilin muutto muualle
     notifications: Ilmoitukset
     preferences: Ominaisuudet
+    profile: Profiili
+    relationships: Seurattavat ja seuraajat
     two_factor_authentication: Kaksivaiheinen todentaminen
   statuses:
     attached:
@@ -599,6 +836,7 @@ fi:
     disallowed_hashtags:
       one: 'sisÃ¤lsi aihetunnisteen jota ei sallita: %{tags}'
       other: 'sisÃ¤lsi aihetunnisteet joita ei sallita: %{tags}'
+    language_detection: Tunnista kieli automaattisesti
     open_in_web: Avaa selaimessa
     over_character_limit: merkkimÃ¤Ã¤rÃ¤n rajoitus %{max} ylitetty
     pin_errors:
@@ -606,7 +844,17 @@ fi:
       ownership: Muiden tuuttauksia ei voi kiinnittÃ¤Ã¤
       private: Piilotettua tuuttausta ei voi kiinnittÃ¤Ã¤
       reblog: Buustausta ei voi kiinnittÃ¤Ã¤
+    poll:
+      total_people:
+        one: "%{count} henkilÃ¶"
+        other: "%{count} henkilÃ¶Ã¤"
+      total_votes:
+        one: "%{count} Ã¤Ã¤ni"
+        other: "%{count} Ã¤Ã¤ntÃ¤"
+      vote: Ã„Ã¤nestÃ¤
     show_more: NÃ¤ytÃ¤ lisÃ¤Ã¤
+    show_thread: NÃ¤ytÃ¤ ketju
+    sign_in_to_participate: Kirjaudu sisÃ¤Ã¤n osallistuaksesi keskusteluun
     title: "%{name}: â€%{quote}â€"
     visibilities:
       private: Vain seuraajille
@@ -627,21 +875,14 @@ fi:
     formats:
       default: "%d.%m.%Y klo %H.%M"
   two_factor_authentication:
-    code_hint: Vahvista syÃ¶ttÃ¤mÃ¤llÃ¤ todentamissovelluksen generoima koodi
-    description_html: Jos otat kÃ¤yttÃ¶Ã¶n <strong>kaksivaiheisen todentamisen</strong>, kirjautumiseen vaaditaan puhelin, jolla voidaan luoda kirjautumistunnuksia.
     disable: Poista kÃ¤ytÃ¶stÃ¤
-    enable: Ota kÃ¤yttÃ¶Ã¶n
     enabled: Kaksivaiheinen todentaminen kÃ¤ytÃ¶ssÃ¤
     enabled_success: Kaksivaiheisen todentamisen kÃ¤yttÃ¶Ã¶notto onnistui
     generate_recovery_codes: Luo palautuskoodit
-    instructions_html: "<strong>Lue tÃ¤mÃ¤ QR-koodi puhelimen Google Authenticator- tai vastaavalla TOTP-sovelluksella</strong>. Sen jÃ¤lkeen sovellus luo tunnuksia, joita tarvitset sisÃ¤Ã¤nkirjautuessasi."
     lost_recovery_codes: Palautuskoodien avulla voit kÃ¤yttÃ¤Ã¤ tiliÃ¤, jos menetÃ¤t puhelimesi. Jos olet hukannut palautuskoodit, voit luoda uudet tÃ¤stÃ¤. Vanhat palautuskoodit poistetaan kÃ¤ytÃ¶stÃ¤.
-    manual_instructions: 'Jos et voi lukea QR-koodia ja haluat syÃ¶ttÃ¤Ã¤ sen kÃ¤sin, tÃ¤ssÃ¤ on salainen koodi tekstinÃ¤:'
     recovery_codes: Varapalautuskoodit
     recovery_codes_regenerated: Uusien palautuskoodien luonti onnistui
     recovery_instructions_html: Jos menetÃ¤t puhelimesi, voit kirjautua tilillesi jollakin alla olevista palautuskoodeista. <strong>PidÃ¤ palautuskoodit hyvÃ¤ssÃ¤ tallessa</strong>. Voit esimerkiksi tulostaa ne ja sÃ¤ilyttÃ¤Ã¤ muiden tÃ¤rkeiden papereiden joukossa.
-    setup: Ota kÃ¤yttÃ¶Ã¶n
-    wrong_code: Annettu koodi oli virheellinen! Ovatko palvelimen aika ja laitteen aika oikein?
   user_mailer:
     backup_ready:
       explanation: Pyysit tÃ¤ydellistÃ¤ varmuuskopiota Mastodon-tilistÃ¤si. Voit nyt ladata sen!
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 224fefd9e8f36b4cddcb704b3c29822704749e15..0c96d462d7de88cb3192fca5d4d92a87719959e5 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -15,7 +15,7 @@ fr:
     browse_public_posts: Parcourir un flux en direct de messages publics sur Mastodon
     contact: Contact
     contact_missing: Non dÃ©fini
-    contact_unavailable: N/D
+    contact_unavailable: Non disponible
     discover_users: DÃ©couvrez des utilisateurÂ·riceÂ·s
     documentation: Documentation
     federation_hint_html: Avec un compte sur %{instance}, vous pourrez suivre les gens sur nâ€™importe quel serveur Mastodon et au-delÃ .
@@ -33,14 +33,14 @@ fr:
       one: statut
       other: statuts
     status_count_before: Ayant publiÃ©
-    tagline: Suivez vos amiÂ·eÂ·s et dÃ©couvrez-en de nouveauxÂ·elles
+    tagline: Suivez vos amiÂ·eÂ·s et dÃ©couvrez en de nouveauxÂ·elles
     terms: Conditions dâ€™utilisation
-    unavailable_content: Contenu non disponible
+    unavailable_content: Serveurs modÃ©rÃ©s
     unavailable_content_description:
       domain: Serveur
       reason: Motif
       rejecting_media: 'Les fichiers mÃ©dia de ces serveurs ne seront pas traitÃ©s ou stockÃ©s et aucune miniature ne sera affichÃ©e, nÃ©cessitant un clic vers le fichier dâ€™origine :'
-      rejecting_media_title: MÃ©dia filtrÃ©
+      rejecting_media_title: MÃ©dias filtrÃ©s
       silenced: 'Les messages de ces serveurs seront cachÃ©s des flux publics et conversations, et les interactions de leurs utilisateurÂ·riceÂ·s ne donneront lieu Ã  aucune notification, Ã  moins que vous ne les suiviezÂ :'
       silenced_title: Serveurs masquÃ©s
       suspended: 'Aucune donnÃ©e venant de ces serveurs ne sera traitÃ©e, stockÃ©e ou Ã©changÃ©e, rendant toute interaction ou communication avec les utilisateurÂ·riceÂ·s de ces serveurs impossibleÂ :'
@@ -60,6 +60,7 @@ fr:
       one: AbonnÃ©Â·e
       other: AbonnÃ©Â·eÂ·s
     following: Abonnements
+    instance_actor_flash: Ce compte est un acteur virtuel utilisÃ© pour reprÃ©senter le serveur lui-mÃªme et non un utilisateur individuel. Il est utilisÃ© Ã  des fins de fÃ©dÃ©ration et ne doit pas Ãªtre suspendu.
     joined: InscritÂ·e en %{date}
     last_active: derniÃ¨re activitÃ©
     link_verified_on: La propriÃ©tÃ© de ce lien a Ã©tÃ© vÃ©rifiÃ©e le %{date}
@@ -98,6 +99,7 @@ fr:
       add_email_domain_block: Mettre le domaine du courriel sur liste noire
       approve: Approuver
       approve_all: Tout approuver
+      approved_msg: La demande dâ€™inscription de %{username} a Ã©tÃ© approuvÃ©e avec succÃ¨s
       are_you_sure: Voulez-vous vraiment faire Ã§aÂ ?
       avatar: Avatar
       by_domain: Domaine
@@ -111,8 +113,10 @@ fr:
       confirm: Confirmer
       confirmed: ConfirmÃ©
       confirming: Confirmation
+      delete: Supprimer les donnÃ©es
       deleted: SupprimÃ©
       demote: RÃ©trograder
+      destroyed_msg: Les donnÃ©es de %{username} sont maintenant en file dâ€™attente pour Ãªtre supprimÃ©es imminemment
       disable: DÃ©sactiver
       disable_two_factor_authentication: DÃ©sactiver lâ€™authentification Ã  deux facteurs
       disabled: DÃ©sactivÃ©
@@ -123,10 +127,12 @@ fr:
       email_status: Ã‰tat du courriel
       enable: Activer
       enabled: ActivÃ©
+      enabled_msg: Le compte de %{username} a Ã©tÃ© dÃ©bloquÃ© avec succÃ¨s
       followers: AbonnÃ©Â·eÂ·s
       follows: Abonnements
       header: EntÃªte
       inbox_url: URL dâ€™entrÃ©e
+      invite_request_text: Raisons de lâ€™adhÃ©sion
       invited_by: InvitÃ© par
       ip: Adresse IP
       joined: InscritÂ·e depuis
@@ -138,6 +144,8 @@ fr:
       login_status: Statut de connexion
       media_attachments: Fichiers mÃ©dias
       memorialize: Convertir en mÃ©morial
+      memorialized: MÃ©morialisÃ©
+      memorialized_msg: Transformation rÃ©ussie de %{username} en un compte mÃ©morial
       moderation:
         active: ActifÂ·veÂ·s
         all: Tous
@@ -158,10 +166,14 @@ fr:
       public: Publique
       push_subscription_expires: Expiration de lâ€™abonnement PuSH
       redownload: RafraÃ®chir le profil
+      redownloaded_msg: Le profil de %{username} a Ã©tÃ© actualisÃ© avec succÃ¨s depuis lâ€™origine
       reject: Rejeter
       reject_all: Tout rejeter
+      rejected_msg: La demande dâ€™inscription de %{username} a Ã©tÃ© rejetÃ©e avec succÃ¨s
       remove_avatar: Supprimer lâ€™avatar
       remove_header: Supprimer lâ€™entÃªte
+      removed_avatar_msg: Lâ€™avatar de %{username} a Ã©tÃ© supprimÃ© avec succÃ¨s
+      removed_header_msg: Lâ€™image dâ€™en-tÃªte de %{username} a Ã©tÃ© supprimÃ©e avec succÃ¨s
       resend_confirmation:
         already_confirmed: CetÂ·te utilisateurÂ·rice est dÃ©jÃ  confirmÃ©Â·e
         send: Renvoyer un courriel de confirmation
@@ -178,6 +190,8 @@ fr:
       search: Rechercher
       search_same_email_domain: Autres utilisateursÂ·trices avec le mÃªme domaine de courriel
       search_same_ip: Autres utilisateurÂ·riceÂ·s avec la mÃªme IP
+      sensitive: Sensible
+      sensitized: marquÃ© comme sensible
       shared_inbox_url: URL de la boite de rÃ©ception partagÃ©e
       show:
         created_reports: Signalements faits
@@ -187,13 +201,19 @@ fr:
       statuses: Statuts
       subscribe: Sâ€™abonner
       suspended: Suspendu
+      suspension_irreversible: Les donnÃ©es de ce compte ont Ã©tÃ© irrÃ©versiblement supprimÃ©es. Vous pouvez annuler la suspension du compte pour le rendre utilisable, mais il ne rÃ©cupÃ©rera aucune donnÃ©e quâ€™il avait auparavant.
+      suspension_reversible_hint_html: Le compte a Ã©tÃ© suspendu et les donnÃ©es seront complÃ¨tement supprimÃ©es le %{date}. Dâ€™ici lÃ , le compte peut Ãªtre restaurÃ© sans aucun effet nÃ©faste. Si vous souhaitez supprimer toutes les donnÃ©es du compte immÃ©diatement, vous pouvez le faire ci-dessous.
       time_in_queue: En file dâ€™attente %{time}
       title: Comptes
       unconfirmed_email: Courriel non confirmÃ©
+      undo_sensitized: Annuler sensible
       undo_silenced: Ne plus masquer
       undo_suspension: Annuler la suspension
+      unsilenced_msg: Le compte de %{username} a Ã©tÃ© illimitÃ© avec succÃ¨s
       unsubscribe: Se dÃ©sabonner
+      unsuspended_msg: Le compte de %{username} a Ã©tÃ© dÃ©suspendu avec succÃ¨s
       username: Nom dâ€™utilisateurÂ·ice
+      view_domain: Voir le rÃ©sumÃ© du domaine
       warn: Avertissement
       web: Web
       whitelisted: Sur liste blanche
@@ -208,12 +228,14 @@ fr:
         create_domain_allow: CrÃ©er un domaine autorisÃ©
         create_domain_block: CrÃ©er un blocage de domaine
         create_email_domain_block: CrÃ©er un blocage de domaine de courriel
+        create_ip_block: CrÃ©er une rÃ¨gle IP
         demote_user: RÃ©trograder lâ€™utilisateurÂ·ice
         destroy_announcement: Supprimer lâ€™annonce
         destroy_custom_emoji: Supprimer des Ã©mojis personnalisÃ©s
         destroy_domain_allow: Supprimer le domaine autorisÃ©
         destroy_domain_block: Supprimer le blocage de domaine
         destroy_email_domain_block: Supprimer le blocage de domaine de courriel
+        destroy_ip_block: Supprimer la rÃ¨gle IP
         destroy_status: Supprimer le statut
         disable_2fa_user: DÃ©sactiver lâ€™A2F
         disable_custom_emoji: DÃ©sactiver les Ã©mojis personnalisÃ©s
@@ -226,13 +248,16 @@ fr:
         reopen_report: Rouvrir le signalement
         reset_password_user: RÃ©initialiser le mot de passe
         resolve_report: RÃ©soudre le signalement
+        sensitive_account: Marquer les mÃ©dias de votre compte comme sensibles
         silence_account: Masque le compte
         suspend_account: Suspendre le compte
         unassigned_report: Ne plus assigner le signalement
+        unsensitive_account: Ne pas marquer les mÃ©dias de votre compte comme sensibles
         unsilence_account: Ne plus masquer le compte
         unsuspend_account: Annuler la suspension du compte
         update_announcement: Modifier lâ€™annonce
         update_custom_emoji: Mettre Ã  jour les Ã©mojis personnalisÃ©s
+        update_domain_block: Mettre Ã  jour le blocage de domaine
         update_status: Mettre Ã  jour le statut
       actions:
         assigned_to_self_report: "%{name} sâ€™est assignÃ©Â·e le signalement de %{target}"
@@ -244,12 +269,14 @@ fr:
         create_domain_allow: "%{name} a inscrit le domaine %{target} sur liste blanche"
         create_domain_block: "%{name} a bloquÃ© le domaine %{target}"
         create_email_domain_block: "%{name} a mis le domaine de courriel %{target} sur liste noire"
+        create_ip_block: "%{name} a crÃ©Ã© une rÃ¨gle pour lâ€™IP %{target}"
         demote_user: "%{name} a rÃ©trogradÃ© lâ€™utilisateurÂ·rice %{target}"
         destroy_announcement: "%{name} a supprimÃ© lâ€™annonce %{target}"
         destroy_custom_emoji: "%{name} a dÃ©truit lâ€™Ã©moticÃ´ne %{target}"
         destroy_domain_allow: "%{name} a supprimÃ© le domaine %{target} de la liste blanche"
         destroy_domain_block: "%{name} a dÃ©bloquÃ© le domaine %{target}"
         destroy_email_domain_block: "%{name} a mis le domaine de courriel %{target} sur liste blanche"
+        destroy_ip_block: "%{name} a supprimÃ© la rÃ¨gle pour lâ€™IP %{target}"
         destroy_status: "%{name} a enlevÃ© le statut de %{target}"
         disable_2fa_user: "%{name} a dÃ©sactivÃ© lâ€™authentification Ã  deux facteurs pour lâ€™utilisateurÂ·rice %{target}"
         disable_custom_emoji: "%{name} a dÃ©sactivÃ© lâ€™Ã©moji %{target}"
@@ -262,13 +289,16 @@ fr:
         reopen_report: "%{name} a rouvert le signalement %{target}"
         reset_password_user: "%{name} a rÃ©initialisÃ© le mot de passe de %{target}"
         resolve_report: "%{name} a rÃ©solu le signalement %{target}"
+        sensitive_account: "%{name} a marquÃ© le mÃ©dia de %{target} comme sensible"
         silence_account: "%{name} a masquÃ© le compte de %{target}"
         suspend_account: "%{name} a suspendu le compte %{target}"
         unassigned_report: "%{name} a dÃ©sassignÃ© le signalement %{target}"
+        unsensitive_account: "%{name} a enlevÃ© le marquage du mÃ©dia de %{target} comme sensible"
         unsilence_account: "%{name} ne masque plus le compte de %{target}"
         unsuspend_account: "%{name} a rÃ©activÃ© le compte de %{target}"
         update_announcement: "%{name} a actualisÃ© lâ€™annonce %{target}"
         update_custom_emoji: "%{name} a mis Ã  jour lâ€™Ã©moji %{target}"
+        update_domain_block: "%{name} a mis Ã  jour le blocage de domaine pour %{target}"
         update_status: "%{name} a mis Ã  jour le statut de %{target}"
       deleted_status: "(statut supprimÃ©)"
       empty: Aucun journal trouvÃ©.
@@ -372,6 +402,8 @@ fr:
           silence: MasquÃ©
           suspend: Suspendre
         title: Nouveau blocage de domaine
+      obfuscate: Obfusquer le nom de domaine
+      obfuscate_hint: Obfusquer partiellement le nom de domaine dans la liste si la liste des limitations de domaine est activÃ©e
       private_comment: Commentaire privÃ©
       private_comment_hint: Commenter sur cette limitation de domaine pour informer les modÃ©rateurs internes.
       public_comment: Commentaire public
@@ -411,6 +443,7 @@ fr:
     instances:
       by_domain: Domaine
       delivery_available: Livraison disponible
+      empty: Aucun domaine trouvÃ©.
       known_accounts:
         one: "%{count} compte connu"
         other: "%{count} comptes connus"
@@ -434,6 +467,21 @@ fr:
         expired: ExpirÃ©
         title: Filtre
       title: Invitations
+    ip_blocks:
+      add_new: CrÃ©er une rÃ¨gle
+      created_msg: Nouvelle rÃ¨gle IP ajoutÃ©e avec succÃ¨s
+      delete: Supprimer
+      expires_in:
+        '1209600': 2 semaines
+        '15778476': 6 mois
+        '2629746': 1 mois
+        '31556952': 1 an
+        '86400': 1 jour
+        '94670856': 3 ans
+      new:
+        title: CrÃ©er une nouvelle rÃ¨gle IP
+      no_ip_block_selected: Aucune rÃ¨gle IP nâ€™a Ã©tÃ© modifiÃ©e car aucune nâ€™a Ã©tÃ© sÃ©lectionnÃ©e
+      title: RÃ¨gles IP
     pending_accounts:
       title: Comptes en attente (%{count})
     relationships:
@@ -473,6 +521,8 @@ fr:
       comment:
         none: Aucun
       created_at: SignalÃ©
+      forwarded: TransfÃ©rÃ©
+      forwarded_to: TransfÃ©rÃ© Ã  %{domain}
       mark_as_resolved: Marquer comme rÃ©solu
       mark_as_unresolved: Marquer comme non-rÃ©solu
       notes:
@@ -516,6 +566,7 @@ fr:
       domain_blocks_rationale:
         title: Montrer la raison
       enable_bootstrap_timeline_accounts:
+        desc_html: Faire suivre automatiquement les comptes configurÃ©s aux nouveauxÂ·lles utilisateursÂ·rices afin que leur flux personnel ne dÃ©marre pas vide
         title: Activer les abonnements par dÃ©faut pour les nouveauxÂ·elles utilisateurÂ·riceÂ·s
       hero:
         desc_html: AffichÃ©e sur la page dâ€™accueil. Au moins 600x100px recommandÃ©. Lorsquâ€™elle nâ€™est pas dÃ©finie, se rabat sur la vignette du serveur
@@ -527,7 +578,7 @@ fr:
         desc_html: Noms des domaines que ce serveur a dÃ©couvert dans le fediverse
         title: Publier la liste des serveurs dÃ©couverts
       preview_sensitive_media:
-        desc_html: Les liens de prÃ©visualisation sur les autres sites web afficheront une vignette mÃªme si le mÃ©dia est sensible
+        desc_html: Les aperÃ§us de lien sur les autres sites web afficheront une vignette mÃªme si les mÃ©dias sont marquÃ©s comme sensibles
         title: Montrer les mÃ©dias sensibles dans les prÃ©visualisations OpenGraph
       profile_directory:
         desc_html: Permettre aux utilisateurÂ·iceÂ·s dâ€™Ãªtre dÃ©couvertÂ·eÂ·s
@@ -542,6 +593,9 @@ fr:
         min_invite_role:
           disabled: Personne
           title: Autoriser les invitations par
+        require_invite_text:
+          desc_html: Lorsque les enregistrements nÃ©cessitent une approbation manuelle, rendre le texte de lâ€™invitation "Pourquoi voulez-vous vous inscrire ?" obligatoire plutÃ´t que facultatif
+          title: Exiger que les nouveaux utilisateurs remplissent un texte de demande dâ€™invitation
       registrations_mode:
         modes:
           approved: Approbation requise pour sâ€™inscrire
@@ -599,7 +653,7 @@ fr:
       no_media: Aucun mÃ©dia
       no_status_selected: Aucun statut nâ€™a Ã©tÃ© modifiÃ© car aucun nâ€™a Ã©tÃ© sÃ©lectionnÃ©
       title: Statuts du compte
-      with_media: avec mÃ©dias
+      with_media: Avec mÃ©dias
     tags:
       accounts_today: Utilisations uniques aujourd'hui
       accounts_week: Utilisation unique cette semaine
@@ -681,8 +735,11 @@ fr:
       prefix_sign_up: Inscrivez-vous aujourdâ€™hui sur Mastodon !
       suffix: Avec un compte, vous pourrez suivre des gens, publier des statuts et Ã©changer des messages avec les utilisateurÂ·riceÂ·s de n'importe quel serveur Mastodon et bien plusÂ !
     didnt_get_confirmation: Vous nâ€™avez pas reÃ§u les consignes de confirmationâ€¯?
+    dont_have_your_security_key: Vous n'avez pas votre clÃ© de sÃ©curitÃ©?
     forgot_password: Mot de passe oubliÃ©â€¯?
     invalid_reset_password_token: Le lien de rÃ©initialisation du mot de passe est invalide ou a expirÃ©. Merci de rÃ©essayer.
+    link_to_otp: Entrez un code Ã  deux facteurs de votre tÃ©lÃ©phone ou un code de rÃ©cupÃ©ration
+    link_to_webauth: Utilisez votre appareil de clÃ© de sÃ©curitÃ©
     login: Se connecter
     logout: Se dÃ©connecter
     migrate_account: DÃ©mÃ©nager vers un compte diffÃ©rent
@@ -707,7 +764,9 @@ fr:
       functional: Votre compte est entiÃ¨rement opÃ©rationnel.
       pending: Votre demande est en attente d'examen par notre personnel. Cela peut prendre un certain temps. Vous recevrez un courriel si votre demande est approuvÃ©e.
       redirecting_to: Votre compte est inactif car il est actuellement redirigÃ© vers %{acct}.
+    too_fast: Formulaire envoyÃ© trop rapidement, veuillez rÃ©essayer.
     trouble_logging_in: Vous avez un problÃ¨me pour vous connecter ?
+    use_security_key: Utiliser la clÃ© de sÃ©curitÃ©
   authorize_follow:
     already_following: Vous suivez dÃ©jÃ  ce compte
     already_requested: Vous avez dÃ©jÃ  envoyÃ© une demande dâ€™abonnement Ã  ce compte
@@ -732,6 +791,7 @@ fr:
   date:
     formats:
       default: "%d %b %Y"
+      with_month_name: "%B %d, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}â€¯h"
@@ -796,6 +856,7 @@ fr:
       request: Demandez vos archives
       size: Taille
     blocks: Vous bloquez
+    bookmarks: Signets
     csv: CSV
     domain_blocks: Bloqueurs de domaine
     lists: Listes
@@ -809,7 +870,7 @@ fr:
   filters:
     contexts:
       account: Profils
-      home: Accueil
+      home: Accueil et listes
       notifications: Notifications
       public: Fils publics
       thread: Conversations
@@ -863,6 +924,8 @@ fr:
     status: Ã‰tat de la vÃ©rification
     view_proof: Voir la preuve
   imports:
+    errors:
+      over_rows_processing_limit: contient plus de %{count} lignes
     modes:
       merge: Fusionner
       merge_long: Garder les enregistrements existants et ajouter les nouveaux
@@ -872,6 +935,7 @@ fr:
     success: Vos donnÃ©es ont Ã©tÃ© importÃ©es avec succÃ¨s et seront traitÃ©es en temps et en heure
     types:
       blocking: Liste de comptes bloquÃ©s
+      bookmarks: Signets
       domain_blocking: Liste des serveurs bloquÃ©s
       following: Liste dâ€™utilisateurÂ·riceÂ·s suiviÂ·eÂ·s
       muting: Liste dâ€™utilisateurÂ·riceÂ·s que vous masquez
@@ -992,6 +1056,14 @@ fr:
           quadrillion: P
           thousand: K
           trillion: T
+  otp_authentication:
+    code_hint: Entrez le code gÃ©nÃ©rÃ© par votre application d'authentification pour confirmer
+    description_html: Si vous activez <strong>lâ€™authentification Ã  deux facteurs</strong> en utilisant une application d'authentification, votre connexion vous imposera d'Ãªtre en possession de votre tÃ©lÃ©phone, ce qui gÃ©nÃ¨rera des jetons que vous devrez saisir.
+    enable: Activer
+    instructions_html: "<strong>Scannez ce code QR dans Google Authenticator ou une application TOTP similiaire sur votre tÃ©lÃ©phone</strong>. Ã€ partir de maintenant, cette application gÃ©nÃ©rera des jetons que vous devrez entrer lorsque vous vous connecterez."
+    manual_instructions: 'Si vous ne pouvez pas scanner le QR code et que vous devez le saisir manuellement, voici le texte secret en brut :'
+    setup: Mise en place
+    wrong_code: Le code saisi est invalide. L'heure du serveur et l'heure de l'appareil sont-ils corrects ?
   pagination:
     newer: Plus rÃ©cent
     next: Suivant
@@ -1020,6 +1092,7 @@ fr:
   relationships:
     activity: ActivitÃ© du compte
     dormant: Dormant
+    follow_selected_followers: Suivre les abonnÃ©Â·eÂ·s sÃ©lectionnÃ©Â·eÂ·s
     followers: AbonnÃ©Â·eÂ·s
     following: Abonnements
     invited: InvitÃ©Â·e
@@ -1035,7 +1108,7 @@ fr:
     status: Ã‰tat du compte
   remote_follow:
     acct: Entrez lâ€™adresse profil@serveur depuis laquelle vous voulez effectuer cette action
-    missing_resource: Lâ€™URL de redirection nâ€™a pas pu Ãªtre trouvÃ©e
+    missing_resource: Lâ€™URL de redirection requise pour votre compte nâ€™a pas pu Ãªtre trouvÃ©e
     no_account_html: Vous nâ€™avez pas de compteâ€¯? Vous pouvez <a href='%{sign_up_path}' target='_blank'>vous inscrire ici</a>
     proceed: Confirmer lâ€™abonnement
     prompt: 'Vous allez suivreâ€¯:'
@@ -1116,6 +1189,7 @@ fr:
     profile: Profil
     relationships: Abonnements et abonnÃ©Â·eÂ·s
     two_factor_authentication: Identification Ã  deux facteurs
+    webauthn_authentication: ClÃ©s de sÃ©curitÃ©
   spam_check:
     spam_detected: Ceci est un rapport automatisÃ©. Des pollupostages ont Ã©tÃ© dÃ©tectÃ©s.
   statuses:
@@ -1154,6 +1228,8 @@ fr:
         other: "%{count} votes"
       vote: Voter
     show_more: DÃ©plier
+    show_newer: Plus rÃ©cents
+    show_older: Plus anciens
     show_thread: Afficher le fil de discussion
     sign_in_to_participate: Inscrivez-vous pour prendre part Ã  la conversation
     title: '%{name}â€¯: "%{quote}"'
@@ -1262,21 +1338,20 @@ fr:
       default: "%d %b %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Entrez le code gÃ©nÃ©rÃ© par votre application pour confirmer
-    description_html: Si vous activez <strong>lâ€™identification Ã  deux facteurs</strong>, vous devrez Ãªtre en possession de votre tÃ©lÃ©phone afin de gÃ©nÃ©rer un code de connexion.
+    add: Ajouter
     disable: DÃ©sactiver
-    enable: Activer
+    disabled_success: L'authentification Ã  deux facteurs a Ã©tÃ© dÃ©sactivÃ©e avec succÃ¨s
+    edit: Modifier
     enabled: Lâ€™authentification Ã  deux facteurs est activÃ©e
     enabled_success: Identification Ã  deux facteurs activÃ©e avec succÃ¨s
     generate_recovery_codes: GÃ©nÃ©rer les codes de rÃ©cupÃ©ration
-    instructions_html: "<strong>Scannez ce QR code grÃ¢ce Ã  Google Authenticator, Authy ou une application similaire sur votre tÃ©lÃ©phone</strong>. DÃ©sormais, cette application gÃ©nÃ¨rera des jetons que vous devrez saisir Ã  chaque connexion."
     lost_recovery_codes: Les codes de rÃ©cupÃ©ration vous permettent de retrouver les accÃ¨s Ã  votre compte si vous perdez votre tÃ©lÃ©phone. Si vous perdez vos codes de rÃ©cupÃ©ration, vous pouvez les gÃ©nÃ©rer Ã  nouveau ici. Vos anciens codes de rÃ©cupÃ©ration seront invalidÃ©s.
-    manual_instructions: 'Si vous ne pouvez pas scanner le code QR et devez lâ€™entrer manuellement, voici le secret en texte-plein :'
+    methods: MÃ©thodes Ã  deux facteurs
+    otp: Application d'authentification
     recovery_codes: Codes de rÃ©cupÃ©ration
     recovery_codes_regenerated: Codes de rÃ©cupÃ©ration rÃ©gÃ©nÃ©rÃ©s avec succÃ¨s
     recovery_instructions_html: Si vous perdez lâ€™accÃ¨s Ã  votre tÃ©lÃ©phone, vous pouvez utiliser un des codes de rÃ©cupÃ©ration ci-dessous pour retrouver lâ€™accÃ¨s Ã  votre compte. <strong>Conservez les codes de rÃ©cupÃ©ration en sÃ©curitÃ©</strong>. Par exemple, en les imprimant et en les stockant avec vos autres documents importants.
-    setup: Installer
-    wrong_code: Les codes entrÃ©s sont incorrectsâ€¯! Lâ€™heure du serveur et celle de votre appareil sont-elles correctesâ€¯?
+    webauthn: ClÃ©s de sÃ©curitÃ©
   user_mailer:
     backup_ready:
       explanation: Vous avez demandÃ© une sauvegarde complÃ¨te de votre compte Mastodon. Elle est maintenant prÃªte Ã  Ãªtre tÃ©lÃ©chargÃ©eâ€¯!
@@ -1291,6 +1366,7 @@ fr:
     warning:
       explanation:
         disable: Lorsque votre compte est gelÃ©, les donnÃ©es de votre compte demeurent intactes, mais vous ne pouvez effectuer aucune action jusquâ€™Ã  ce quâ€™il soit dÃ©bloquÃ©.
+        sensitive: Vos fichiers mÃ©dias tÃ©lÃ©versÃ©s et vos mÃ©dias liÃ©s seront traitÃ©s comme sensibles.
         silence: Lorsque votre compte est limitÃ©, seulÂ·eÂ·s les utilisateurÂ·riceÂ·s qui vous suivent dÃ©jÃ  verront vos pouets sur ce serveur, et vous pourriez Ãªtre exclu de plusieurs listes publiques. NÃ©anmoins, dâ€™autres utilisateurÂ·riceÂ·s peuvent vous suivre manuellement.
         suspend: Votre compte a Ã©tÃ© suspendu, et tous vos pouets et vos fichiers multimÃ©dia tÃ©lÃ©versÃ©s ont Ã©tÃ© supprimÃ©s irrÃ©versiblement de ce serveur, et des serveurs oÃ¹ vous aviez des abonnÃ©Â·eÂ·s.
       get_in_touch: Vous pouvez rÃ©pondre Ã  cette adresse pour entrer en contact avec lâ€™Ã©quipe de %{instance}.
@@ -1299,11 +1375,13 @@ fr:
       subject:
         disable: Votre compte %{acct} a Ã©tÃ© gelÃ©
         none: Avertissement pour %{acct}
+        sensitive: Les mÃ©dias publiÃ©s depuis votre compte %{acct} ont Ã©tÃ© marquÃ©s comme Ã©tant sensibles
         silence: Votre compte %{acct} a Ã©tÃ© limitÃ©
         suspend: Votre compte %{acct} a Ã©tÃ© suspendu
       title:
         disable: Compte gelÃ©
         none: Avertissement
+        sensitive: Vos mÃ©dias ont Ã©tÃ© marquÃ©s comme sensibles
         silence: Compte limitÃ©
         suspend: Compte suspendu
     welcome:
@@ -1324,9 +1402,11 @@ fr:
       tips: Astuces
       title: Bienvenue Ã  bord, %{name}â€¯!
   users:
+    blocked_email_provider: Ce fournisseur de courriel n'est pas autorisÃ©
     follow_limit_reached: Vous ne pouvez pas suivre plus de %{limit} personnes
     generic_access_help_html: Rencontrez-vous des difficultÃ©s dâ€™accÃ¨s Ã  votre compte ? Vous pouvez contacter %{email} pour obtenir de lâ€™aide
     invalid_email: Lâ€™adresse courriel est invalide
+    invalid_email_mx: Lâ€™adresse courriel nâ€™existe pas
     invalid_otp_token: Le code dâ€™authentification Ã  deux facteurs est invalide
     invalid_sign_in_token: Code de sÃ©curitÃ© non valide
     otp_lost_help_html: Si vous perdez accÃ¨s aux deux, vous pouvez contacter %{email}
@@ -1336,3 +1416,20 @@ fr:
   verification:
     explanation_html: 'Vous pouvez <strong>vous vÃ©rifier en tant que propriÃ©taire des liens dans les mÃ©tadonnÃ©es de votre profil</strong>. Pour cela, le site web liÃ© doit contenir un lien vers votre profil Mastodon. Le lien de retour <strong>doit</strong> avoir un attribut <code>rel="me"</code> . Le texte du lien nâ€™a pas dâ€™importance. Voici un exemple :'
     verification: VÃ©rification
+  webauthn_credentials:
+    add: Ajouter une nouvelle clÃ© de sÃ©curitÃ©
+    create:
+      error: Il y a eu un problÃ¨me en ajoutant votre clÃ© de sÃ©curitÃ©. Veuillez rÃ©essayer.
+      success: Votre clÃ© de sÃ©curitÃ© a Ã©tÃ© ajoutÃ©e avec succÃ¨s.
+    delete: Supprimer
+    delete_confirmation: ÃŠtes-vous sÃ»r de vouloir supprimer cette clÃ© de sÃ©curitÃ© ?
+    description_html: Si vous activez l' <strong>authentification de la clÃ© de sÃ©curitÃ©</strong>, la connexion vous demandera d'utiliser l'une de vos clÃ©s de sÃ©curitÃ©.
+    destroy:
+      error: Il y a eu un problÃ¨me en supprimant votre clÃ© de sÃ©curitÃ©. Veuillez rÃ©essayer.
+      success: Votre clÃ© de sÃ©curitÃ© a Ã©tÃ© supprimÃ©e avec succÃ¨s.
+    invalid_credential: ClÃ© de sÃ©curitÃ© invalide
+    nickname_hint: Entrez le surnom de votre nouvelle clÃ© de sÃ©curitÃ©
+    not_enabled: Vous n'avez pas encore activÃ© WebAuthn
+    not_supported: Ce navigateur ne prend pas en charge les clÃ©s de sÃ©curitÃ©
+    otp_required: Pour utiliser les clÃ©s de sÃ©curitÃ©, veuillez d'abord activer l'authentification Ã  deux facteurs.
+    registered_on: Inscrit le %{date}
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index c2fb18d5743e9d48c6bcfe134ffaabf385c4d8bb..48aaff0ad3da30c9a86c896c636af91aa1895431 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -21,7 +21,9 @@ gl:
     federation_hint_html: Cunha conta en %{instance} poderÃ¡s seguir Ã¡s persoas en calquera servidor do Mastodon e alÃ©n.
     get_apps: Probar unha aplicaciÃ³n mÃ³bil
     hosted_on: Mastodon aloxado en %{domain}
-    instance_actor_flash: Esta conta Ã© un actor virtual utilizado para representar ao servidor e non a unha usuaria individual. UtilÃzase para propÃ³sitos de federaciÃ³n e non deberÃa estar bloqueada a menos que queiras bloquear a toda a instancia, en tal caso deberÃas utilizar o bloqueo do dominio.
+    instance_actor_flash: 'Esta conta Ã© un actor virtual utilizado para representar ao servidor e non a unha usuaria individual. UtilÃzase para propÃ³sitos de federaciÃ³n e non deberÃa estar bloqueada a menos que queiras bloquear a toda a instancia, en tal caso deberÃas utilizar o bloqueo do dominio.
+
+'
     learn_more: Saber mÃ¡is
     privacy_policy: PolÃtica de privacidade
     see_whats_happening: Ver o que estÃ¡ a acontecer
@@ -58,6 +60,7 @@ gl:
       one: Seguidora
       other: Seguidoras
     following: Seguindo
+    instance_actor_flash: Esta conta Ã© un actor virtual utilizado para representar Ã³ servidor mesmo e non a unha usuaria individual. UtilÃzase por motivos de federaciÃ³n e non deberÃa estar suspendida.
     joined: Uniuse en %{date}
     last_active: Ãºltima actividade
     link_verified_on: A propiedade desta ligazÃ³n foi verificada en %{date}
@@ -96,6 +99,7 @@ gl:
       add_email_domain_block: Bloquear o dominio do email
       approve: Aprobar
       approve_all: Aprobar todos
+      approved_msg: Aprobada a solicitude da aplicaciÃ³n de conexiÃ³n de %{username}
       are_you_sure: EstÃ¡ segura?
       avatar: Imaxe de perfil
       by_domain: Dominio
@@ -109,8 +113,10 @@ gl:
       confirm: Confirmar
       confirmed: Confirmado
       confirming: Estase a confirmar
+      delete: Eliminar datos
       deleted: Eliminado
       demote: Rebaixar
+      destroyed_msg: Os datos de %{username} estÃ¡n na cola para ser eliminados axiÃ±a
       disable: Desactivar
       disable_two_factor_authentication: Desactivar 2FA
       disabled: Desactivado
@@ -121,10 +127,12 @@ gl:
       email_status: Estado do email
       enable: Activar
       enabled: Activado
+      enabled_msg: Desbloqueada a conta de %{username}
       followers: Seguidoras
       follows: Seguindo
       header: Cabeceira
       inbox_url: URL da caixa de entrada
+      invite_request_text: RazÃ³ns para unirte
       invited_by: Convidada por
       ip: IP
       joined: Uniuse
@@ -136,6 +144,8 @@ gl:
       login_status: Estado da sesiÃ³n
       media_attachments: Multimedia adxunta
       memorialize: Converter en lembranza
+      memorialized: Na lembranza
+      memorialized_msg: Convertiuse %{username} nunha conta para a lembranza
       moderation:
         active: Activa
         all: Todo
@@ -156,10 +166,14 @@ gl:
       public: PÃºblico
       push_subscription_expires: A subscriciÃ³n PuSH expira
       redownload: Actualizar perfil
+      redownloaded_msg: Actualizado o perfil de %{username} desde a orixe
       reject: Rexeitar
       reject_all: Rexeitar todo
+      rejected_msg: Rexeitada a solicitude da aplicaciÃ³n de conexiÃ³n de %{username}
       remove_avatar: Eliminar imaxe de perfil
       remove_header: Eliminar cabeceira
+      removed_avatar_msg: Eliminado a imaxe de avatar de %{username}
+      removed_header_msg: Eliminada a imaxe de cabeceira de %{username}
       resend_confirmation:
         already_confirmed: Esta usuaria xa estÃ¡ confirmada
         send: Reenviar o email de confirmaciÃ³n
@@ -176,22 +190,30 @@ gl:
       search: Procurar
       search_same_email_domain: Outras usuarias co mesmo dominio de email
       search_same_ip: Outras usuarias co mesmo IP
+      sensitive: Sensible
+      sensitized: marcado como sensible
       shared_inbox_url: URL da caixa de entrada compartida
       show:
         created_reports: Denuncias feitas
         targeted_reports: Denuncias feitas por outros
-      silence: Acalar
-      silenced: Acalada
+      silence: Silenciar
+      silenced: Silenciado
       statuses: Estados
       subscribe: Subscribirse
       suspended: Suspendida
+      suspension_irreversible: EliminÃ¡ronse de xeito irreversible os datos desta conta. Podes reactivar a conta para facela usable novamente pero non recuperarÃ¡ os datos eliminados.
+      suspension_reversible_hint_html: Esta conta foi suspendida, e os datos serÃ¡n totalmente eliminados o %{date}. Ata entÃ³n, a conta pode ser restaurada sen danos. Se desexas eliminar agora mesmo todos os datos da conta, podes facelo aquÃ embaixo.
       time_in_queue: Agardando na cola %{time}
       title: Contas
       unconfirmed_email: Email non confirmado
+      undo_sensitized: Desmarcar sensible
       undo_silenced: Desfacer acalar
       undo_suspension: Desfacer suspensiÃ³n
+      unsilenced_msg: Retirado o lÃmite da conta %{username}
       unsubscribe: Desbotar a subscriciÃ³n
+      unsuspended_msg: Desbloqueada a conta de %{username}
       username: Nome de usuaria
+      view_domain: Ver resumo para o dominio
       warn: Aviso
       web: Web
       whitelisted: Listaxe branca
@@ -206,12 +228,14 @@ gl:
         create_domain_allow: Crear permiso de dominio
         create_domain_block: Crear bloqueo de dominio
         create_email_domain_block: Crear bloqueo de dominio de correo electrÃ³nico
+        create_ip_block: Crear regra IP
         demote_user: Degradar usuaria
         destroy_announcement: Eliminar anuncio
         destroy_custom_emoji: Eliminar emoticona personalizada
         destroy_domain_allow: Eliminar permiso de dominio
         destroy_domain_block: Eliminar bloqueo de dominio
         destroy_email_domain_block: Eliminar bloqueo de dominio de correo electrÃ³nico
+        destroy_ip_block: Eliminar regra IP
         destroy_status: Eliminar estado
         disable_2fa_user: Desactivar 2FA
         disable_custom_emoji: Desactivar emoticona personalizada
@@ -224,13 +248,16 @@ gl:
         reopen_report: Reabrir denuncia
         reset_password_user: Restabelecer contrasinal
         resolve_report: Resolver denuncia
+        sensitive_account: Marca o multimedia da tÃºa conta como sensible
         silence_account: Silenciar conta
         suspend_account: Suspender conta
         unassigned_report: Desasignar denuncia
+        unsensitive_account: Retira a marca de sensible do multimedia da conta
         unsilence_account: Deixar de silenciar conta
         unsuspend_account: Retirar suspensiÃ³n de conta
         update_announcement: Actualizar anuncio
         update_custom_emoji: Actualizar emoticona personalizada
+        update_domain_block: Actualizar bloqueo do dominio
         update_status: Actualizar estado
       actions:
         assigned_to_self_report: "%{name} atribuÃu a denuncia %{target} a el mesmo"
@@ -242,12 +269,14 @@ gl:
         create_domain_allow: "%{name} engadiu Ã¡ listaxe branca o dominio %{target}"
         create_domain_block: "%{name} bloqueou o dominio %{target}"
         create_email_domain_block: "%{name} engadiu Ã¡ listaxe negra o dominio de email %{target}"
+        create_ip_block: "%{name} creou regra para IP %{target}"
         demote_user: "%{name} degradou a usuaria %{target}"
         destroy_announcement: "%{name} eliminou o anuncio %{target}"
         destroy_custom_emoji: "%{name} eliminou a emoticona %{target}"
         destroy_domain_allow: "%{name} eliminou o dominio %{target} da listaxe branca"
         destroy_domain_block: "%{name} desbloqueou o dominio %{target}"
         destroy_email_domain_block: "%{name} engadiu Ã¡ lista branca o dominio de email %{target}"
+        destroy_ip_block: "%{name} eliminou regra para IP %{target}"
         destroy_status: "%{name} eliminou o estado de %{target}"
         disable_2fa_user: "%{name} desactivou o requirimento de dobre factor para a usuaria %{target}"
         disable_custom_emoji: "%{name} desactivou a emoticona %{target}"
@@ -260,13 +289,16 @@ gl:
         reopen_report: "%{name} reabriu a denuncia %{target}"
         reset_password_user: "%{name} restableceu o contrasinal da usuaria %{target}"
         resolve_report: "%{name} resolveu a denuncia %{target}"
+        sensitive_account: "%{name} marcou o multimedia de %{target} como sensible"
         silence_account: "%{name} silenciou a conta de %{target}"
         suspend_account: "%{name} suspendeu a conta de %{target}"
         unassigned_report: "%{name} deixou de atribuÃr a denuncia %{target}"
+        unsensitive_account: "%{name} desmarcou o multimedia de %{target} como sensible"
         unsilence_account: "%{name} deixou de silenciar a conta de %{target}"
         unsuspend_account: "%{name} desactivou a suspensiÃ³n da conta de %{target}"
         update_announcement: "%{name} actualizou o anuncio %{target}"
         update_custom_emoji: "%{name} actualizou a emoticona %{target}"
+        update_domain_block: "%{name} actualizou o bloqueo do dominio %{target}"
         update_status: "%{name} actualizou o estado de %{target}"
       deleted_status: "(estado eliminado)"
       empty: Non se atoparon rexistros.
@@ -370,6 +402,8 @@ gl:
           silence: Silenciar
           suspend: Suspender
         title: Novo bloqueo de dominio
+      obfuscate: Ofuscar o nome de dominio
+      obfuscate_hint: Ofuscar parcialmente o nome do dominio na lista se estÃ¡ activada a publicaciÃ³n da lista de limitaciÃ³ns de dominio
       private_comment: Comentario privado
       private_comment_hint: Comentar sobre esta limitaciÃ³n de dominio para uso interno polos moderadores.
       public_comment: Comentario pÃºblico
@@ -409,6 +443,7 @@ gl:
     instances:
       by_domain: Dominio
       delivery_available: Entrega dispoÃ±Ãbel
+      empty: Non se atopan dominios.
       known_accounts:
         one: "%{count} conta coÃ±ecida"
         other: "%{count} contas coÃ±ecidas"
@@ -432,6 +467,21 @@ gl:
         expired: Expirado
         title: Filtro
       title: Convites
+    ip_blocks:
+      add_new: Crear regra
+      created_msg: Engadeuse a nova regra IP
+      delete: Eliminar
+      expires_in:
+        '1209600': 2 semanas
+        '15778476': 6 meses
+        '2629746': 1 mes
+        '31556952': 1 ano
+        '86400': 1 dÃa
+        '94670856': 3 anos
+      new:
+        title: Crear nova regra IP
+      no_ip_block_selected: Non se cambiou ningunha regra iP porque non seleccionaches ningunha
+      title: Regras IP
     pending_accounts:
       title: Contas pendentes (%{count})
     relationships:
@@ -471,6 +521,8 @@ gl:
       comment:
         none: NingÃºn
       created_at: Denunciado
+      forwarded: Reenviado
+      forwarded_to: Reenviado a %{domain}
       mark_as_resolved: Marcar como resolto
       mark_as_unresolved: Marcar como non resolto
       notes:
@@ -514,6 +566,7 @@ gl:
       domain_blocks_rationale:
         title: Amosar motivo
       enable_bootstrap_timeline_accounts:
+        desc_html: Facer que as novas usuarias sigan automÃ¡ticamente certas contas para que asÃ a cronoloxÃa inicial non estÃ© baleira
         title: Activar seguimentos por omisiÃ³n para novas usuarias
       hero:
         desc_html: Amosado na pÃ¡xina principal. Polo menos 600x100px recomendados. Se non estÃ¡ definido, estarÃ¡ por defecto a miniatura do servidor
@@ -540,6 +593,9 @@ gl:
         min_invite_role:
           disabled: NinguÃ©n
           title: Permitir convites por
+        require_invite_text:
+          desc_html: Cando os rexistros requiren aprobaciÃ³n manual, facer que o texto "Por que te queres rexistrar?" do convite sexa obrigatorio en lugar de optativo
+          title: Require que as novas usuarias completen solicitude de texto do convite
       registrations_mode:
         modes:
           approved: Precisa aprobaciÃ³n para rexistrarse
@@ -585,7 +641,7 @@ gl:
       delete: Eliminar o ficheiro subido
       destroyed_msg: Eliminado correctamente o subido!
     statuses:
-      back_to_account: Voltar a pÃ¡xina da conta
+      back_to_account: Volver a pÃ¡xina da conta
       batch:
         delete: Eliminar
         nsfw_off: Marcar como non sensible
@@ -679,8 +735,11 @@ gl:
       prefix_sign_up: RexÃstrate agora en Mastodon!
       suffix: Ao abrir unha conta, poderÃ¡s seguir a xente, actualizaciÃ³ns das publicaciÃ³ns e intercambiar mensaxes coas usuarias de calquera servidor de Mastodon e moito mÃ¡is!
     didnt_get_confirmation: Non recibeu as instrucciÃ³ns de confirmaciÃ³n?
+    dont_have_your_security_key: "Â¿Non tes a tÃºa chave de seguridade?"
     forgot_password: Esqueceu o contrasinal?
     invalid_reset_password_token: O testemuÃ±o para restablecer o contrasinal non Ã© vÃ¡lido ou caducou. Por favor solicite un novo.
+    link_to_otp: Escribe o cÃ³digo do segundo factor do mÃ³bil ou un cÃ³digo de recuperaciÃ³n
+    link_to_webauth: Usa o teu dispositivo de chave de seguridade
     login: Conectar
     logout: Desconectar
     migrate_account: Mover a unha conta diferente
@@ -691,7 +750,7 @@ gl:
       saml: SAML
     register: Rexistro
     registration_closed: "%{instance} non estÃ¡ a aceptar novas usuarias"
-    resend_confirmation: Voltar a enviar intrucciÃ³ns de confirmaciÃ³n
+    resend_confirmation: Reenviar as intrucciÃ³ns de confirmaciÃ³n
     reset_password: Restablecer contrasinal
     security: Seguranza
     set_new_password: Estabelecer novo contrasinal
@@ -705,7 +764,9 @@ gl:
       functional: A sÃºa conta estÃ¡ totalmente operativa.
       pending: A tÃºa aplicaciÃ³n estÃ¡ pendente de revisiÃ³n. PoderÃanos levar algÃºn tempo. RecibirÃ¡s un correo se a aplicaciÃ³n estÃ¡ aprobada.
       redirecting_to: A tÃºa conta estÃ¡ inactiva porque estÃ¡ redirixida a %{acct}.
+    too_fast: Formulario enviado demasiado rÃ¡pido, intÃ©ntao outra vez.
     trouble_logging_in: Problemas para conectar?
+    use_security_key: Usa chave de seguridade
   authorize_follow:
     already_following: Xa estÃ¡ a seguir esta conta
     already_requested: Xa tes enviada unha solicitude de seguimento a esa conta
@@ -730,6 +791,7 @@ gl:
   date:
     formats:
       default: "%d %b, %Y"
+      with_month_name: "%d %B, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}h"
@@ -794,6 +856,7 @@ gl:
       request: Solicite o ficheiro
       size: TamaÃ±o
     blocks: Bloqueos
+    bookmarks: Marcadores
     csv: CSV
     domain_blocks: Bloqueos de dominio
     lists: Listaxes
@@ -861,6 +924,8 @@ gl:
     status: Estado da validaciÃ³n
     view_proof: Ver proba
   imports:
+    errors:
+      over_rows_processing_limit: contÃ©n mÃ¡is de %{count} filas
     modes:
       merge: Fusionar
       merge_long: Manter os rexistros actuais e engadir novos
@@ -870,6 +935,7 @@ gl:
     success: Os seus datos foron correctamente subidos e serÃ¡n procesados ao momento
     types:
       blocking: Lista de bloqueo
+      bookmarks: Marcadores
       domain_blocking: Lista de bloqueo de dominios
       following: Lista de seguimento
       muting: Lista de usuarias acaladas
@@ -930,7 +996,7 @@ gl:
     warning:
       backreference_required: Tes que configurar primeiro a nova conta para referenciar hacia esta
       before: 'Antes de seguir, por favor lÃ© estas notas con atenciÃ³n:'
-      cooldown: Tras a migraciÃ³n existe un perÃodo de calma durante o cal non poderÃ¡s voltar a migrar de novo
+      cooldown: Tras a migraciÃ³n existe un perÃodo de calma durante o cal non poderÃ¡s volver a migrar de novo
       disabled_account: Tras o cambio a tÃºa conta actual non serÃ¡ totalmente usable, pero terÃ¡s acceso a exportar os datos e tamÃ©n a reactivaciÃ³n.
       followers: Esta acciÃ³n moverÃ¡ todas as tÃºas seguidoras desde a conta actual a nova conta
       only_redirect_html: De xeito alternativo, podes <a href="%{path}">simplemente por unha redirecciÃ³n no perfil</a>.
@@ -990,6 +1056,14 @@ gl:
           quadrillion: Q
           thousand: K
           trillion: T
+  otp_authentication:
+    code_hint: Escribe o cÃ³digo creado pola app de autenticaciÃ³n para confirmar
+    description_html: Se activas a <strong>autenticaciÃ³n con dous factores</strong> utilizando unha app de autenticaciÃ³n, Ã³ conectarte pedirÃ©mosche que teÃ±as o mÃ³bil Ã¡ man, para crear o cÃ³digo que precisas para conectarte.
+    enable: Activar
+    instructions_html: "<strong>Escanea este cÃ³digo QR na tÃºa app TOTP no mÃ³bil ou Google Authenticator</strong>. A partir de agora, a app crearÃ¡ cÃ³digos que terÃ¡s que escribir cando te conectes."
+    manual_instructions: 'Se non podes escanear o cÃ³digo QR e tes que escribilo Ã¡ man, aquÃ tes o cÃ³digo en texto plano:'
+    setup: Configurar
+    wrong_code: O cÃ³digo escrito non Ã© vÃ¡lido! Â¿Ã© correcta a hora no dispositivo e no servidor?
   pagination:
     newer: MÃ¡is novo
     next: Seguinte
@@ -1018,6 +1092,7 @@ gl:
   relationships:
     activity: Actividade da conta
     dormant: En repouso
+    follow_selected_followers: Seguir seguidoras seleccionadas
     followers: Seguidoras
     following: Seguindo
     invited: Convidado
@@ -1099,7 +1174,7 @@ gl:
     aliases: Alcumes da conta
     appearance: Aparencia
     authorized_apps: Apps autorizadas
-    back: Voltar a Mastodon
+    back: Volver a Mastodon
     delete: EliminaciÃ³n da conta
     development: Desenvolvemento
     edit_profile: Editar perfil
@@ -1114,6 +1189,7 @@ gl:
     profile: Perfil
     relationships: Seguindo e seguidoras
     two_factor_authentication: Validar Dobre Factor
+    webauthn_authentication: Chaves de seguridade
   spam_check:
     spam_detected: Esto Ã© un informe automatizado. Detectouse Spam.
   statuses:
@@ -1152,6 +1228,8 @@ gl:
         other: "%{count} votos"
       vote: Votar
     show_more: Mostrar mÃ¡is
+    show_newer: Mostrar o mÃ¡is novo
+    show_older: Mostrar o mÃ¡is vello
     show_thread: Amosar fÃo
     sign_in_to_participate: ConÃ©ctese para participar na conversa
     title: '%{name}: "%{quote}"'
@@ -1164,19 +1242,19 @@ gl:
       unlisted_long: Visible para calquera, pero non listado en liÃ±as de tempo pÃºblicas
   stream_entries:
     pinned: Mensaxe fixada
-    reblogged: promovida
+    reblogged: comparteu
     sensitive_content: Contido sensible
   tags:
     does_not_match_previous_name: non concorda co nome anterior
   terms:
     body_html: |
-      <h2>Intimidade</h2>
+      <h2>Privacidade</h2>
       <h3 id="collect">QuÃ© informaciÃ³n recollemos?</h3>
 
       <ul>
       <li><em>InformaciÃ³n bÃ¡sica da conta</em>: Se se rexistra en este servidor, pedirÃ¡selle un nome de usuaria, un enderezo de correo electrÃ³nico e un contrasinal. De xeito adicional tamÃ©n poderÃ¡ introducir informaciÃ³n como un nome pÃºblico e biografÃa, tamÃ©n subir unha fotografÃa de perfil e unha imaxe para a cabeceira. O nome de usuaria, o nome pÃºblico, a biografÃa e as imaxes de perfil e cabeceira sempre se mostran publicamente.</li>
-      <li><em>PublicaciÃ³ns, seguimento e outra informaciÃ³n pÃºblica</em>: O listado das persoas que segue Ã© un listado pÃºblico, o mesmo acontece coas sÃºas seguidoras. Cando evÃa unha mensaxe, a data e hora gÃ¡rdanse asÃ como o aplicativo que utilizou para enviar a mensaxe. As publicaciÃ³ns poderÃan conter ficheiros de medios anexos, como fotografÃas e vÃdeos. As publicaciÃ³ns pÃºblicas e as non listadas estÃ¡n dispoÃ±ibles de xeito pÃºblico. Cando destaca unha publicaciÃ³n no seu perfil tamÃ©n Ã© pÃºblica. As publicaciÃ³ns son enviadas as sÃºas seguidoras, en algÃºns casos pode acontecer que estÃ©n en diferentes servidores e gÃ¡rdanse copias neles. Cando elemina unha publicaciÃ³n tamÃ©n se envÃa as sÃºas seguidoras. A acciÃ³n de voltar a publicar ou marcar como favorita outra publicaciÃ³n sempre Ã© pÃºblica.</li>
-      <li><em>Mensaxes directas e sÃ³ para seguidoras</em>: Todas as mensaxes gÃ¡rdanse e procÃ©sanse no servidor. As mensaxes sÃ³ para seguidoras son entregadas as sÃºas seguidoras e as usuarias que son mencionadas en elas, e as mensaxes directas entrÃ©ganse sÃ³ as usuarias mencionadas en elas. En algÃºns casos esto implica que son entregadas a diferentes servidores e gÃ¡rdanse copias alÃ. Facemos un esforzo sincero para limitar o acceso a esas publicaciÃ³ns sÃ³ as persoas autorizadas, pero outros servidores poderÃan non ser tan escrupulosos. Polo tanto, Ã© importante revisar os servidores onde se hospedan as sÃºas seguidoras. Nos axustes pode activar a opciÃ³n de aprovar ou rexeitar novas seguidoras de xeito manual. <em>TeÃ±a en conta que a administraciÃ³n do servidor e todos os outros servidores implicados poden ver as mensaxes.</em>, e as destinatarias poderÃan facer capturas de pantalla, copiar e voltar a compartir as mensaxes. <em>Non comparta informaciÃ³n comprometida en Mastodon.</em></li>
+      <li><em>PublicaciÃ³ns, seguimento e outra informaciÃ³n pÃºblica</em>: O listado das persoas que segue Ã© un listado pÃºblico, o mesmo acontece coas sÃºas seguidoras. Cando evÃa unha mensaxe, a data e hora gÃ¡rdanse asÃ como o aplicativo que utilizou para enviar a mensaxe. As publicaciÃ³ns poderÃan conter ficheiros de medios anexos, como fotografÃas e vÃdeos. As publicaciÃ³ns pÃºblicas e as non listadas estÃ¡n dispoÃ±ibles de xeito pÃºblico. Cando destaca unha publicaciÃ³n no seu perfil tamÃ©n Ã© pÃºblica. As publicaciÃ³ns son enviadas as sÃºas seguidoras, en algÃºns casos pode acontecer que estÃ©n en diferentes servidores e gÃ¡rdanse copias neles. Cando elemina unha publicaciÃ³n tamÃ©n se envÃa as sÃºas seguidoras. A acciÃ³n de volver a publicar ou marcar como favorita outra publicaciÃ³n sempre Ã© pÃºblica.</li>
+      <li><em>Mensaxes directas e sÃ³ para seguidoras</em>: Todas as mensaxes gÃ¡rdanse e procÃ©sanse no servidor. As mensaxes sÃ³ para seguidoras son entregadas as sÃºas seguidoras e as usuarias que son mencionadas en elas, e as mensaxes directas entrÃ©ganse sÃ³ as usuarias mencionadas en elas. En algÃºns casos esto implica que son entregadas a diferentes servidores e gÃ¡rdanse copias alÃ. Facemos un esforzo sincero para limitar o acceso a esas publicaciÃ³ns sÃ³ as persoas autorizadas, pero outros servidores poderÃan non ser tan escrupulosos. Polo tanto, Ã© importante revisar os servidores onde se hospedan as sÃºas seguidoras. Nos axustes pode activar a opciÃ³n de aprovar ou rexeitar novas seguidoras de xeito manual. <em>TeÃ±a en conta que a administraciÃ³n do servidor e todos os outros servidores implicados poden ver as mensaxes.</em>, e as destinatarias poderÃan facer capturas de pantalla, copiar e volver a compartir as mensaxes. <em>Non comparta informaciÃ³n comprometida en Mastodon.</em></li>
       <li><em>IPs e outros metadatos</em>: Cando se conecta, gravamos o IP desde onde se conecta, asÃ como o nome do aplicativo desde onde o fai. Todas as sesiÃ³ns conectadas estÃ¡n dispoÃ±ibles para revisar e revogar nos axustes. O Ãºltimo enderezo IP utilizado gÃ¡rdase ate por 12 meses. TamÃ©n poderiamos gardar informes do servidor que inclÃºan o enderezo IP de cada peticiÃ³n ao servidor.</li>
       </ul>
 
@@ -1260,25 +1338,24 @@ gl:
       default: "%d %b, %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Introducir o cÃ³digo xerado polo seu aplicativo de autenticaciÃ³n para confirmar
-    description_html: Se activa a <strong>autenticaciÃ³n de dobre factor</strong>, a conexiÃ³n pediralle estar en posesiÃ³n do seu telÃ©fono, que crearÃ¡ testemuÃ±os para poder entrar.
+    add: Engadir
     disable: Deshabilitar
-    enable: Habilitar
+    disabled_success: AutenticaciÃ³n con doble factor desactivada
+    edit: Editar
     enabled: A autenticaciÃ³n de dobre-factor estÃ¡ activada
     enabled_success: Activouse con Ã©xito a autenticaciÃ³n de dobre-factor
     generate_recovery_codes: Xerar cÃ³digos de recuperaciÃ³n
-    instructions_html: "<strong>Escanea este cÃ³digo QR en Google Authenticator ou aplicaciÃ³n TOTP no teu telÃ©fono</strong>. Desde agora, esta aplicaciÃ³n proporcionarÃ¡ testemuÃ±os que debes introducir ao conectarte."
     lost_recovery_codes: Os cÃ³digos de recuperaciÃ³n permÃtenlle recuperar o acceso a sÃºa conta si perde o telÃ©fono. Si perde os cÃ³digos de recuperaciÃ³n, pode restauralos aquÃ. Os seus cÃ³digos de recuperaciÃ³n anteriores serÃ¡n invalidados.
-    manual_instructions: 'Si non pode escanear o cÃ³digo QR e precisa introducilo manualmente, aquÃ estÃ¡ o testemuÃ±o secreto en texto plano:'
+    methods: MÃ©todos para o segundo factor
+    otp: App autenticadora
     recovery_codes: CÃ³digos de recuperaciÃ³n do respaldo
     recovery_codes_regenerated: CÃ³digos de recuperaciÃ³n xerados correctamente
     recovery_instructions_html: Si perdese o acceso ao seu telÃ©fono, pode utilizar un dos cÃ³digos inferiores de recuperaciÃ³n para recuperar o acceso a sÃºa conta. <strong>Garde os cÃ³digos en lugar seguro</strong>. Por exemplo, pode imprimilos e gardalos xunto con outros documentos importantes.
-    setup: Configurar
-    wrong_code: O cÃ³digo introducido non Ã© vÃ¡lido! Son correctas as horas no dispositivo e o servidor?
+    webauthn: Chaves de seguridade
   user_mailer:
     backup_ready:
-      explanation: Solicitou un respaldo completo da sÃºa conta de Mastodon. Xa estÃ¡ listo para descargar!
-      subject: O seu ficheiro xa estÃ¡ listo para descargar
+      explanation: Solicitaches os datos completos da tÃºa conta de Mastodon. Xa estÃ¡ preparados para descargar!
+      subject: O teu ficheiro xa estÃ¡ preparado para descargar
       title: Leve o ficheiro
     sign_in_token:
       details: 'Detalles sobre o intento:'
@@ -1289,6 +1366,7 @@ gl:
     warning:
       explanation:
         disable: Cando a sÃºa conta estÃ¡ conxelada, os datos permanecen intactos, pero non pode levar a fin acciÃ³ns ate que se desbloquea.
+        sensitive: Os teus ficheiros e ligazÃ³ns a multimedia serÃ¡n tratados como sensibles.
         silence: Mentras a conta estÃ¡ limitada, sÃ³ a xente que actualmente te segue verÃ¡ os teus toots en este servidor, e poderÃas estar excluÃda de varias listaxes pÃºblicas. PorÃ©n, outras persoas poderÃante seguir de xeito manual.
         suspend: A sÃºa conta foi suspendida, e todos os seus toots e medios subidos foron eliminados de este servidor de xeito irreversible, e dos servidores onde tivese seguidoras.
       get_in_touch: Pode responder a este correo para contactar coa administraciÃ³n de %{instance}.
@@ -1297,16 +1375,18 @@ gl:
       subject:
         disable: A sÃºa conta %{acct} foi conxelada
         none: Aviso para %{acct}
+        sensitive: Ã“ publicar multimedia a tÃºa conta %{acct} foi marcada como sensible
         silence: A sÃºa conta %{acct} foi limitada
         suspend: A sÃºa conta %{acct} foi suspendida
       title:
         disable: Conta conxelada
         none: Aviso
+        sensitive: O teu multimedia foi marcado como sensible
         silence: Conta limitada
         suspend: Conta suspendida
     welcome:
       edit_profile_action: Configurar perfil
-      edit_profile_step: Podes personalizar o teu perfil subindo un avatar, cabeceira, cambiar o nome pÃºblico e aÃnda mÃ¡is. Se restrinxes a tua conta podes revisar a conta das persoas que solicitan seguirte antes de permitirlles o acceso aos teus toots.
+      edit_profile_step: Podes personalizar o teu perfil subindo un avatar, cabeceira, cambiar o nome pÃºblico e aÃnda mÃ¡is. Se restrinxes a tÃºa conta podes revisar a conta das persoas que solicitan seguirte antes de permitirlles o acceso aos teus toots.
       explanation: AquÃ ten alunhas endereitas para ir aprendendo
       final_action: Comece a publicar
       final_step: 'Publica! Incluso sen seguidoras as tÃºas mensaxes serÃ¡n vistas por outras, por exemplo na liÃ±a temporal local e nos cancelos. PoderÃas presentarte ao #fediverso utilizando o cancelo #introductions.'
@@ -1322,9 +1402,11 @@ gl:
       tips: Consellos
       title: Benvida, %{name}!
   users:
+    blocked_email_provider: Este provedor de email non estÃ¡ permitido
     follow_limit_reached: Non pode seguir a mÃ¡is de %{limit} persoas
     generic_access_help_html: Problemas para acceder a conta? Podes contactar con %{email} para obter axuda
     invalid_email: O enderezo de correo non Ã© vÃ¡lido
+    invalid_email_mx: Semella que o enderezo de email non existe
     invalid_otp_token: O cÃ³digo do segundo factor non Ã© vÃ¡lido
     invalid_sign_in_token: CÃ³digo de seguridade non vÃ¡lido
     otp_lost_help_html: Si perde o acceso a ambos, pode contactar con %{email}
@@ -1334,3 +1416,20 @@ gl:
   verification:
     explanation_html: 'Podes <strong>validarte a ti mesma como a dona das ligazÃ³ns nos metadatos do teu perfil</strong>. Para esto, o sitio web ligado debe conter unha ligazÃ³n de retorno ao perfil de Mastodon. Esta ligazÃ³n de retorno <strong>ten que</strong> ter un atributo <code>rel="me"</code>. O texto da ligazÃ³n non importa. AquÃ tes un exemplo:'
     verification: ValidaciÃ³n
+  webauthn_credentials:
+    add: Engadir nova chave de seguridade
+    create:
+      error: Houbo un problema Ã³ engadir a chave de seguridade, intÃ©ntao outra vez.
+      success: Engadeuse correctamente a chave de seguridade.
+    delete: Eliminar
+    delete_confirmation: "Â¿Tes a certeza de que queres eliminar a chave de seguridade?"
+    description_html: Se activas a <strong>autenticaciÃ³n con chave de seguridade</strong>, Ã³ conectarte pedirÃ¡seche que uses unha das tÃºas chaves.
+    destroy:
+      error: Houbo un problema Ã³ eliminar a tÃºa chave de seguridade, intÃ©ntao outra vez.
+      success: Eliminouse correctamente a chave de seguridade.
+    invalid_credential: Chave de seguridade non vÃ¡lida
+    nickname_hint: Escribe un alcume para a tÃºa nova chave de seguridade
+    not_enabled: AÃnda non tes activado WebAuthn
+    not_supported: Este navegador non ten soporte para chaves de seguridade
+    otp_required: Para usar chaves de seguridade tes que activar primeiro o segundo factor.
+    registered_on: Rexistrado o %{date}
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 2bdc816f34d5443460f7b1fa229177d19ab6ae62..7fa884cb31abb7449e0cd54a50e4c8231da68272 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -229,14 +229,6 @@ he:
       following: ×¨×©×™×ž×ª × ×¢×§×‘×™×
       muting: ×¨×©×™×ž×ª ×”×©×ª×§×•×ª
     upload: ×™×‘×•×
-  invites:
-    expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
   media_attachments:
     validations:
       images_and_video: ×œ× × ×™×ª×Ÿ ×œ×”×•×¡×™×£ ×•×™×“××• ×œ×—×¦×¨×•×¥ ×©×›×‘×¨ ×ž×›×™×œ ×ª×ž×•× ×•×ª
@@ -294,19 +286,12 @@ he:
     formats:
       default: "%d %b %Y, %H:%M"
   two_factor_authentication:
-    code_hint: ×œ××™×©×•×¨, ×™×© ×œ×”×§×œ×™×“ ××ª ×”×§×•×“ ×©×™×•×¦×¨ ×¢×œ ×™×“×™ ×™×©×•× ×”××™×ž×•×ª
-    description_html: ×œ××—×¨ ×”×¤×¢×œ×ª <strong>××™×ž×•×ª ×“×•-×©×œ×‘×™</strong>, × ×™×ª×Ÿ ×™×”×™×” ×œ×”×›× ×¡ ×¨×§ ×›×œ ×¢×•×“ ×‘×¨×©×•×ª×š ×˜×œ×¤×•×Ÿ, ×©×™×™×¦×¨ ×¢×‘×•×¨×š ×§×•×“×™× ×©×™××¤×©×¨×• ×›× ×™×¡×”.
     disable: ×›×™×‘×•×™
-    enable: ×”×¤×¢×œ×”
     enabled_success: ××™×ž×•×ª ×“×•-×©×œ×‘×™ ×”×•×¤×¢×œ ×‘×”×¦×œ×—×”
     generate_recovery_codes: ×™×™×¦×•×¨ ×§×•×“×™ ××—×–×•×¨
-    instructions_html: "<strong>×™×© ×œ×¡×¨×•×§ ×§×•×“ QR ×–×” ×‘×¢×–×¨×ª Google Authenticator ××• ×™×©×•× TOTP ×“×•×ž×” ×¢×œ ×˜×œ×¤×•× ×š</strong>. ×ž×¢×ª×” ×•××™×œ×š, ×™×©×•× ×–×” ×™×•×›×œ ×œ×™×¦×¨ ×§×•×“×™× ×œ×©×™×ž×•×© ×œ×¦×•×¨×š ×›× ×™×¡×”."
     lost_recovery_codes: ×§×•×“×™ ×”××—×–×•×¨ ×ž××¤×©×¨×™× ××—×–×•×¨ ×’×™×©×” ×œ×—×©×‘×•×Ÿ ×‘×ž×™×“×” ×•×ž×›×©×™×¨×š ××‘×“. ×‘×ž×™×“×” ×•×§×•×“×™ ×”××—×–×•×¨ ××‘×“×•, × ×™×ª×Ÿ ×œ×™×™×¦×¨× ×ž×—×“×© ×›××Ÿ. ×ª×•×§×£ ×§×•×“×™ ×”××—×–×•×¨ ×”×™×©× ×™× ×™×¤×•×’.
-    manual_instructions: '×‘×ž×™×“×” ×•×œ× × ×™×ª×Ÿ ×œ×¡×¨×•×§ ××ª ×§×•×“ ×”-QR ××œ× ×™×© ×¦×•×¨×š ×œ×”×§×œ×™×“ ××•×ª×• ×™×“× ×™×ª, ×œ×”×œ×Ÿ ×¡×•×“ ×›×ž×•×¡ ×‘×œ×ª×™ ×ž×•×¦×¤×Ÿ:'
     recovery_codes_regenerated: ×§×•×“×™ ×”××—×–×•×¨ ×™×•×¦×¨×• ×‘×”×¦×œ×—×”
     recovery_instructions_html: ×‘×ž×™×“×” ×•×”×’×™×©×” ×œ×ž×›×©×™×¨×š ×ª××‘×“, × ×™×ª×Ÿ ×œ×™×™×¦×¨ ×§×•×“×™ ××—×–×•×¨ ×œ×ž×˜×” ×¢×œ ×ž× ×ª ×œ××—×–×¨ ×’×™×©×” ×œ×—×©×‘×•× ×š ×‘×›×œ ×¢×ª. <strong>× × ×œ×©×ž×•×¨ ×¢×œ ×§×•×“×™ ×”×’×™×©×” ×‘×ž×§×•× ×‘×˜×•×—</strong>. ×œ×“×•×’×ž× ×¢×œ ×™×“×™ ×”×“×¤×¡×ª× ×•×©×ž×™×¨×ª× ×¢× ×ž×¡×ž×›×™× ×—×©×•×‘×™× ××—×¨×™×, ××• ×©×™×ž×•×© ×‘×ª×•×›× ×” ×™×™×¢×•×“×™×ª ×œ× ×™×”×•×œ ×¡×™×¡×ž××•×ª ×•×¡×•×“×•×ª.
-    setup: ×”×›× ×”
-    wrong_code: ×”×§×•×“ ×©×”×•×–×Ÿ ×©×’×•×™! ×”×× ×”×–×ž×Ÿ ×‘×©×¨×ª ×•×”×–×ž×Ÿ ×‘×ž×›×©×™×¨×š × ×›×•× ×™×?
   users:
     invalid_email: ×›×ª×•×‘×ª ×”×“×•×"×œ ××™× ×” ×—×•×§×™×ª
     invalid_otp_token: ×§×•×“ ×“×•-×©×œ×‘×™ ×©×’×•×™
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index fc4805625672b9e2581c13f73a345742c6f9b91e..d0b1082fcd761c468f6f9288f7cf34309ffffb59 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -22,11 +22,3 @@ hi:
     '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
-  invites:
-    expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index d7bd91c7a91d8d301a8f310c7331da7cd22dc374..f8a659ac20895a9bdaa0b749dd4b2b4cffeb084d 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1,48 +1,124 @@
 ---
 hr:
   about:
-    about_mastodon_html: Mastodon je <em>besplatna, open-source</em> socijalna mreÅ¾a. <em>Decentralizirana</em> alternativa komercijalnim platformama, izbjegava rizik toga da jedna tvrtka monopolizira vaÅ¡u komunikaciju. Izaberite server kojem Ä‡ete vjerovati &mdash; koji god odabrali, moÄ‡i Ä‡ete komunicirati sa svima ostalima. Bilo tko moÅ¾e imati svoju vlastitu Mastodon instancu i sudjelovati u <em>socijalnoj mreÅ¾i</em> bez problema.
-    about_this: O ovoj instanci
+    about_hashtag_html: Ovo su javni tootovi oznaÄeni s <strong>#%{hashtag}</strong>. MoÅ¾ete biti u interakciji s njima, ako imate raÄun bilo gdje u fediverzumu.
+    about_mastodon_html: 'DruÅ¡tvena mreÅ¾a buduÄ‡nosti: bez oglasa, bez korporativnog nadzora, etiÄki dizajn i decentralizacija! Budite u vlasniÅ¡tvu svojih podataka pomoÄ‡u Mastodona!'
+    about_this: Dodatne informacije
+    active_count_after: aktivnih
+    active_footnote: MjeseÄno aktivnih korisnika (MAU)
+    api: API
+    apps: Mobilne aplikacije
+    apps_platforms: Koristite Mastodon na iOS-u, Androidu i drugim platformama
     contact: Kontakt
-    source_code: Izvorni kod
-    status_count_before: Tko je autor
+    contact_missing: Nije postavljeno
+    discover_users: Otkrijte korisnike
+    documentation: Dokumentacija
+    get_apps: Isprobajte mobilnu aplikaciju
+    learn_more: Saznajte viÅ¡e
+    privacy_policy: Politika privatnosti
+    server_stats: 'Statistika posluÅ¾itelja:'
+    source_code: Izvorni kÃ´d
+    status_count_before: Koji su objavili
+    terms: Uvjeti pruÅ¾anja usluga
+    unavailable_content: Moderirani posluÅ¾itelji
   accounts:
-    follow: Slijedi
-    following: Slijedim
+    follow: Prati
+    following: PraÄ‡enih
+    last_active: posljednja aktivnost
+    media: Medijski sadrÅ¾aj
+    never_active: Nikad
     nothing_here: Ovdje nema niÄeg!
-    people_followed_by: Ljudi koje %{name} slijedi
-    people_who_follow: Ljudi koji slijede %{name}
-    unfollow: Prestani slijediti
+    people_followed_by: Ljudi koje %{name} prati
+    people_who_follow: Ljudi koji prate %{name}
+    posts:
+      few: Toota
+      one: Toot
+      other: Tootova
+    posts_tab_heading: Tootovi
+    posts_with_replies: Tootovi i odgovori
+    reserved_username: KorisniÄko ime je rezervirano
+    roles:
+      admin: Admin
+      bot: Bot
+      group: Grupa
+      moderator: Mod
+    unavailable: Profil nije dostupan
+    unfollow: Prestani pratiti
+  admin:
+    account_actions:
+      action: IzvrÅ¡i radnju
+    account_moderation_notes:
+      create: Ostavi biljeÅ¡ku
+    accounts:
+      approve: Odobri
+      approve_all: Odobri sve
+      are_you_sure: Jeste li sigurni?
+      avatar: Avatar
+      by_domain: Domena
+      change_email:
+        changed_msg: E-poÅ¡ta raÄuna uspjeÅ¡no je promijenjena!
+        current_email: Trenutna e-poÅ¡ta
+        label: Promijeni e-poÅ¡tu
+        new_email: Nova e-poÅ¡ta
+        submit: Promijeni e-poÅ¡tu
+        title: Promjena e-poÅ¡te za %{username}
+      confirm: Potvrdi
+      confirmed: PotvrÄ‘eno
+      confirming: PotvrÄ‘ivanje
+      delete: IzbriÅ¡i podatke
+      deleted: Izbrisano
+      display_name: Prikazano ime
+      domain: Domena
+      edit: Uredi
+      email: E-poÅ¡ta
+      email_status: Status e-poÅ¡te
+      enabled: OmoguÄ‡eno
+      followers: Pratitelji
+      follows: PraÄ‡eni
+      header: Zaglavlje
+      ip: IP
+      location:
+        all: Sve
+        local: Lokalno
+        remote: Udaljeno
+        title: Lokacija
+      moderation:
+        all: Sve
+    action_logs:
+      deleted_status: "(izbrisani status)"
+      empty: Nema pronaÄ‘enih izvjeÅ¡Ä‡a.
+      filter_by_action: Filtriraj prema radnji
+      filter_by_user: Filtriraj prema korisniku
   application_mailer:
-    settings: 'Promijeni e-mail postavke: %{link}'
+    settings: 'Promijeni postavke e-poÅ¡te: %{link}'
     view: 'Vidi:'
   applications:
-    invalid_url: Uneseni link nije valjan
+    invalid_url: Unesena poveznica nije valjana
   auth:
-    didnt_get_confirmation: Niste primili instrukcije za potvrÄ‘ivanje?
+    didnt_get_confirmation: Niste primili upute za potvrÄ‘ivanje?
     forgot_password: Zaboravljena lozinka?
     login: Prijavi se
     logout: Odjavi se
     register: Registriraj se
-    resend_confirmation: Ponovo poÅ¡alji instrukcije za potvrÄ‘ivanje
-    reset_password: Resetiraj lozinku
-    security: Vjerodajnica
+    resend_confirmation: Ponovo poÅ¡alji upute za potvrÄ‘ivanje
+    reset_password: Ponovno postavi lozinku
+    security: Sigurnost
     set_new_password: Postavi novu lozinku
   authorize_follow:
-    error: NaÅ¾alost, doÅ¡lo je do greÅ¡ke looking up the remote raÄun
-    follow: Slijedi
-    title: Slijedi %{acct}
+    error: NaÅ¾alost, doÅ¡lo je do greÅ¡ke tijekom traÅ¾enja udaljenog raÄuna
+    follow: Prati
+    title: Prati %{acct}
   datetime:
     distance_in_words:
-      about_x_hours: "%{count}s"
+      about_x_hours: "%{count}h"
       about_x_months: "%{count}mj"
-      about_x_years: "%{count}g"
-      almost_x_years: "%{count}g"
-      half_a_minute: upravo
-      less_than_x_seconds: upravo
-      over_x_years: "%{count}g"
+      about_x_years: "%{count}god"
+      almost_x_years: "%{count}god"
+      half_a_minute: Upravo sada
+      less_than_x_seconds: Upravo sada
+      over_x_years: "%{count}god"
       x_months: "%{count}mj"
-      x_seconds: "%{count}sek"
+      x_seconds: "%{count}s"
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': You don't have permission to view this page.
@@ -54,77 +130,178 @@ hr:
     '500': 
     '503': The page could not be served due to a temporary server failure.
   exports:
-    blocks: Blokirao si
-    storage: Pohrana media zapisa
+    archive_takeout:
+      date: Datum
+      download: Preuzmite svoju arhivu
+      size: VeliÄina
+    blocks: Blokirali ste
+    csv: CSV
+    lists: Liste
+    storage: Pohrana medijskih sadrÅ¾aja
+  filters:
+    contexts:
+      notifications: Obavijesti
+    index:
+      empty: Nemate filtera.
+      title: Filteri
+    new:
+      title: Dodaj novi filter
+  footer:
+    developers: Razvijatelji
+    more: ViÅ¡eâ€¦
+    resources: Resursi
+    trending_now: Popularno
   generic:
+    all: Sve
     changes_saved_msg: Izmjene su uspjeÅ¡no saÄuvane!
+    copy: Kopiraj
+    delete: ObriÅ¡i
     save_changes: SaÄuvaj izmjene
+  identity_proofs:
+    authorize: Da, autoriziraj
+    identity: Identitet
   imports:
-    preface: MoÅ¾eÅ¡ uvesti odreÄ‘ene podatke kao Å¡to su svi ljudi koje slijediÅ¡ ili blokiraÅ¡ u svoj raÄun na ovoj instanci, sa fajlova kreiranih izvozom sa druge instance.
-    success: Tvoji podaci su uspjeÅ¡no uploadani i bit Ä‡e obraÄ‘eni u dogledno vrijeme
+    preface: MoÅ¾ete uvesti podatke koje ste izveli s drugog posluÅ¾itelja, kao Å¡to su liste ljudi koje pratite ili blokirate.
+    success: VaÅ¡i podatci uspjeÅ¡no su preneseni i bit Ä‡e obraÄ‘eni u dogledno vrijeme
     types:
       blocking: Lista blokiranih
-      following: Lista onih koje slijedim
+      following: Lista praÄ‡enih
       muting: Lista utiÅ¡anih
   invites:
+    expired: Isteklo
     expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
+      '1800': 30 minuta
+      '21600': 6 sati
+      '3600': 1 sat
+      '43200': 12 sati
+      '604800': 1 tjedan
+      '86400': 1 dan
+    expires_in_prompt: Nikad
+    generate: Generiraj poveznicu za pozivanje
+    invited_by: 'Poziva Vas:'
+    max_uses:
+      few: "%{count} koriÅ¡tenja"
+      one: 1 koriÅ¡tenje
+      other: "%{count} koriÅ¡tenja"
   notification_mailer:
     digest:
-      body: Ovo je kratak saÅ¾etak propuÅ¡tenog od tvog proÅ¡log posjeta %{since}
-      mention: "%{name} te je spomenuo:"
+      body: Ovo je kratak saÅ¾etak propuÅ¡tenih poruka od VaÅ¡eg proÅ¡log posjeta %{since}
+      mention: "%{name} Vas je spomenuo/la:"
     favourite:
-      body: 'Tvoj status je %{name} oznaÄio kao omiljen:'
-      subject: "%{name} je oznaÄio kao omiljen tvoj status"
+      body: "%{name} je oznaÄio/la VaÅ¡ status favoritom:"
+      subject: "%{name} je oznaÄio/la VaÅ¡ status favoritom"
     follow:
-      body: "%{name} te sada slijedi!"
-      subject: "%{name} te sada slijedi"
+      body: "%{name} Vas sada prati!"
+      subject: "%{name} Vas sada prati"
     follow_request:
-      body: "%{name} je zatraÅ¾io da te slijedi"
-      subject: 'Sljedbenik na Äekanju: %{name}'
+      body: "%{name} je zatraÅ¾io/la da Vas prati"
+      subject: 'Pratitelj na Äekanju: %{name}'
     mention:
-      body: 'Spomenuo te je %{name} u:'
-      subject: Spomenuo te je %{name}
+      body: 'Spomenuo/la Vas je %{name} u:'
+      subject: Spomenuo/la Vas je %{name}
     reblog:
-      body: 'Tvoj status je potaknut od %{name}:'
-      subject: "%{name} je potakao tvoj status"
+      body: 'VaÅ¡ status boostao/la je %{name}:'
+      subject: "%{name} boostao/la je VaÅ¡ status"
+  number:
+    human:
+      decimal_units:
+        units:
+          billion: mrd
+          million: mil
+          thousand: tis
+          trillion: bil
+  otp_authentication:
+    setup: Postavi
   pagination:
-    next: SljedeÄ‡i
-    prev: ProÅ¡li
+    newer: Novije
+    next: SljedeÄ‡e
+    older: Starije
+    prev: Prethodno
+    truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: VeÄ‡ ste glasali u ovoj anketi
   remote_follow:
-    acct: Unesi svoje username@domain sa koje Å¾eliÅ¡ slijediti
-    missing_resource: TraÅ¾eni redirect link za tvoj raÄun nije mogao biti naÄ‘en
-    proceed: Nastavi slijediti
-    prompt: 'Slijediti Ä‡eÅ¡:'
+    acct: Unesite VaÅ¡e KorisniÄkoIme@domena s kojim Å¾elite izvrÅ¡iti radnju
+    missing_resource: Nije moguÄ‡e pronaÄ‡i traÅ¾eni URL preusmjeravanja za VaÅ¡ raÄun
+    proceed: Dalje
+    prompt: 'Pratit Ä‡ete:'
+  sessions:
+    platforms:
+      android: Android
+      blackberry: Blackberry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: macOS
+      other: nepoznata platforma
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    revoke: Opozovi
+    revoke_success: Sesija je uspjeÅ¡no opozvana
+    title: Sesije
   settings:
+    account: RaÄun
+    account_settings: Postavke raÄuna
+    aliases: Pseudonimi raÄuna
+    appearance: Izgled
     authorized_apps: Autorizirane aplikacije
     back: Natrag na Mastodon
+    delete: Brisanje raÄuna
+    development: Razvijanje
     edit_profile: Uredi profil
     export: Izvoz podataka
+    featured_tags: Istaknuti hashtagovi
     import: Uvezi
+    notifications: Obavijesti
     preferences: Postavke
-    two_factor_authentication: Dvo-faktorska Autentifikacija
+    profile: Profil
+    two_factor_authentication: Dvofaktorska autentifikacija
   statuses:
     open_in_web: Otvori na webu
-    over_character_limit: prijeÄ‘en je limit od %{max} znakova
+    over_character_limit: prijeÄ‘eno je ograniÄenje od %{max} znakova
+    poll:
+      total_people:
+        few: "%{count} osobe"
+        one: "%{count} osoba"
+        other: "%{count} ljudi"
+      total_votes:
+        few: "%{count} glasa"
+        one: "%{count} glas"
+        other: "%{count} glasova"
+      vote: Glasaj
     show_more: PrikaÅ¾i viÅ¡e
+    show_thread: PrikaÅ¾i nit
     visibilities:
-      private: PokaÅ¾i samo sljedbenicima
+      private: Samo pratitelji
       public: Javno
-      unlisted: Javno, no nemoj prikazati na javnom timelineu
+      unlisted: Neprikazano
   stream_entries:
-    reblogged: potaknut
+    reblogged: boostano
     sensitive_content: Osjetljivi sadrÅ¾aj
   two_factor_authentication:
-    description_html: Ako omoguÄ‡iÅ¡ <strong>dvo-faktorsku autentifikaciju</strong>, prijavljivanje Ä‡e zahtjevati da kod sebe imaÅ¡ svoj mobitel, koji Ä‡e generirati tokene koje Ä‡eÅ¡ unijeti.
-    disable: OnemoguÄ‡i
-    enable: OmoguÄ‡i
-    instructions_html: "<strong>Skeniraj ovaj QR kod u Google Authenticator ili sliÄnu aplikaciju na svom telefonu</strong>. Od sada, ta aplikacija Ä‡e generirati tokene koje Ä‡eÅ¡ unijeti pri prijavljivanju."
+    disable: OnemoguÄ‡i 2FA
+  user_mailer:
+    warning:
+      title:
+        disable: RaÄun je zamrznut
+        none: Upozorenje
+        silence: RaÄun je ograniÄen
+        suspend: RaÄun je suspendiran
+    welcome:
+      edit_profile_action: Postavi profil
+      review_preferences_action: Promijeni postavke
+      subject: Dobro doÅ¡li na Mastodon
+      tips: Savjeti
   users:
-    invalid_email: E-mail adresa nije valjana
-    invalid_otp_token: Nevaljani dvo-faktorski kod
+    invalid_email: Adresa e-poÅ¡te nije valjana
+    invalid_otp_token: NevaÅ¾eÄ‡i dvo-faktorski kÃ´d
+    invalid_sign_in_token: NevaÅ¾eÄ‡i sigurnosni kÃ´d
+    signed_in_as: 'Prijavljeni kao:'
+  verification:
+    verification: Verifikacija
+  webauthn_credentials:
+    add: Dodaj novi sigurnosni kljuÄ
+    delete: ObriÅ¡i
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 9ae551a34500f445bdb7c0c734565ab552895daa..97596ff0cd6b3b4b53583f46f4243692f2fa7e92 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -21,7 +21,9 @@ hu:
     federation_hint_html: Egy %{instance} fiÃ³kkal bÃ¡rmely mÃ¡s Mastodon szerveren vagy a fÃ¶derÃ¡ciÃ³ban lÃ©vÅ‘ felhasznÃ¡lÃ³t kÃ¶vetni tudsz.
     get_apps: PrÃ³bÃ¡lj ki egy mobil appot
     hosted_on: "%{domain} Mastodon szerver"
-    instance_actor_flash: Ez a fiÃ³k egy virtuÃ¡lis szereplÅ‘, mely magÃ¡t a szervert reprezentÃ¡lja, nem egy felhasznÃ¡lÃ³t. Ez a fÃ¶derÃ¡ciÃ³ tÃ¡mogatÃ¡sÃ¡ra kÃ©szÃ¼lt, ezÃ©rt nem szabad blokkolni, hacsak egy teljes szervert nem akarsz kitiltani, amire persze a domain blokkolÃ¡sa jobb megoldÃ¡s.
+    instance_actor_flash: |
+      Ez a fiÃ³k virtuÃ¡lis, magÃ¡t a szervert reprezentÃ¡lja, nem pedig konkrÃ©t
+      felhasznÃ¡lÃ³t. FÃ¶derÃ¡ciÃ³s cÃ©lokra szolgÃ¡l, nem szabad tehÃ¡t felfÃ¼ggeszteni, hacsak nem akarod a teljes szervert kitiltani, mely esetben a domain tiltÃ¡sÃ¡nak hasznÃ¡lata javasolt.
     learn_more: Tudj meg tÃ¶bbet
     privacy_policy: AdatvÃ©delmi szabÃ¡lyzat
     see_whats_happening: NÃ©zd, mi tÃ¶rtÃ©nik
@@ -51,13 +53,16 @@ hu:
     what_is_mastodon: Mi a Mastodon?
   accounts:
     choices_html: "%{name} vÃ¡lasztÃ¡sai:"
-    endorsements_hint: A webes felÃ¼leten jÃ³vÃ¡hagyhatod a kÃ¶vetett embereket, Ã©s itt jelennek meg.
+    endorsements_hint: A webes felÃ¼leten promÃ³zhatsz Ã¡ltalad kÃ¶vetett embereket, akik itt fognak megjelenni.
     featured_tags_hint: Szerepeltethetsz bizonyos hashtageket, melyek itt jelennek majd meg.
     follow: KÃ¶vetÃ©s
     followers:
       one: KÃ¶vetÅ‘
       other: KÃ¶vetÅ‘
     following: KÃ¶vetett
+    instance_actor_flash: |-
+      Ez a fiÃ³k virtuÃ¡lis, magÃ¡t a szervert reprezentÃ¡lja, nem pedig konkrÃ©t
+      felhasznÃ¡lÃ³t. FÃ¶derÃ¡ciÃ³s cÃ©lokra szolgÃ¡l, nem szabad tehÃ¡t felfÃ¼ggeszteni.
     joined: Csatlakozott %{date}
     last_active: utoljÃ¡ra aktÃv
     link_verified_on: A link tulajdonosÃ¡t %{date} -n ellenÅ‘riztÃ¼k
@@ -96,6 +101,7 @@ hu:
       add_email_domain_block: Email domain tiltÃ³listÃ¡ra vÃ©tele
       approve: JÃ³vÃ¡hagyÃ¡s
       approve_all: Mindet jÃ³vÃ¡hagy
+      approved_msg: A %{username} fiÃ³k regisztrÃ¡ciÃ³s kÃ©relmÃ©t sikeresen elfogadtuk
       are_you_sure: Biztos vagy benne?
       avatar: ProfilkÃ©p
       by_domain: Domain
@@ -109,8 +115,10 @@ hu:
       confirm: MegerÅ‘sÃtÃ©s
       confirmed: MegerÅ‘sÃtve
       confirming: MegerÅ‘sÃtÃ©s alatt
+      delete: Adatok tÃ¶rlÃ©se
       deleted: TÃ¶rÃ¶lve
       demote: LefokozÃ¡s
+      destroyed_msg: A %{username} fiÃ³k adatai bekerÃ¼ltek a vÃ©gleges tÃ¶rlÃ©se vÃ¡rÃ³ sorba
       disable: KikapcsolÃ¡s
       disable_two_factor_authentication: KÃ©tlÃ©pcsÅ‘s hitelesÃtÃ©s kikapcsolÃ¡sa
       disabled: Kikapcsolva
@@ -121,10 +129,12 @@ hu:
       email_status: E-mail Ã¡llapot
       enable: BekapcsolÃ¡s
       enabled: Bekapcsolva
+      enabled_msg: A %{username} fiÃ³k fagyasztÃ¡sÃ¡t sikeresen visszavontuk
       followers: KÃ¶vetÅ‘
       follows: KÃ¶vetett
       header: FejlÃ©c
       inbox_url: BeÃ©rkezett Ã¼zenetek URL-je
+      invite_request_text: CsatlakozÃ¡s oka
       invited_by: MeghÃvta
       ip: IP
       joined: Csatlakozott
@@ -134,8 +144,10 @@ hu:
         remote: TÃ¡voli
         title: Hely
       login_status: BejelentkezÃ©si Ã¡llapot
-      media_attachments: MÃ©dia-csatolmÃ¡nyok
+      media_attachments: MÃ©diamellÃ©kletek
       memorialize: EmlÃ©kÃ¡llÃtÃ¡s
+      memorialized: EmlÃ©kezetÃ¼nkben
+      memorialized_msg: A %{username} fiÃ³kot sikeresen emlÃ©kkÃ© nyilvÃ¡nÃtottuk
       moderation:
         active: AktÃv
         all: Ã–sszes
@@ -156,10 +168,14 @@ hu:
       public: NyilvÃ¡nos
       push_subscription_expires: A PuSH feliratkozÃ¡s elÃ©vÃ¼l
       redownload: ProfilkÃ©p frissÃtÃ©se
+      redownloaded_msg: "%{username} profiljÃ¡t sikeresen frissÃtettÃ¼k az eredetibÅ‘l"
       reject: ElutasÃtÃ¡s
       reject_all: Ã–sszes elutasÃtÃ¡sa
+      rejected_msg: A %{username} fiÃ³k regisztrÃ¡ciÃ³s kÃ©relmÃ©t sikeresen elutasÃtottuk
       remove_avatar: ProfilkÃ©p eltÃ¡volÃtÃ¡sa
       remove_header: FejlÃ©c tÃ¶rlÃ©se
+      removed_avatar_msg: A %{username} fiÃ³k avatÃ¡rjÃ¡t sikeresen tÃ¶rÃ¶ltÃ¼k
+      removed_header_msg: A %{username} fiÃ³k fejlÃ©cÃ©t sikeresen tÃ¶rÃ¶ltÃ¼k
       resend_confirmation:
         already_confirmed: Ezt a felhasznÃ¡lÃ³t mÃ¡r megerÅ‘sÃtettÃ©k
         send: KÃ¼ldd Ãºjra a megerÅ‘sÃtÅ‘ e-mailt
@@ -176,6 +192,8 @@ hu:
       search: KeresÃ©s
       search_same_email_domain: FelhasznÃ¡lÃ³k ugyanezzel az email domainnel
       search_same_ip: MÃ¡s felhasznÃ¡lÃ³k ugyanezzel az IP-vel
+      sensitive: SzenzitÃv
+      sensitized: szenzitÃvnek jelÃ¶lve
       shared_inbox_url: Megosztott bejÃ¶vÅ‘ Ã¼zenetek URL
       show:
         created_reports: LÃ©trehozott jelentÃ©sek
@@ -185,13 +203,19 @@ hu:
       statuses: TÃ¼lkÃ¶k
       subscribe: FeliratkozÃ¡s
       suspended: FelfÃ¼ggesztett
+      suspension_irreversible: Ennek a fiÃ³knak az adatait visszaÃ¡llÃthatatlanul tÃ¶rÃ¶ltÃ©k. Visszavonhatod a fiÃ³k felfÃ¼ggesztÃ©sÃ©t, hogy Ãºjra hasznÃ¡lhatÃ³ legyen, de a rÃ©gi adatok ettÅ‘l mÃ©g nem fognak visszatÃ©rni.
+      suspension_reversible_hint_html: A fiÃ³kot felfÃ¼ggesztettÃ¼k, az adatait %{date}-n teljesen eltÃ¡volÃtjuk. Eddig az idÅ‘pontig a fiÃ³k problÃ©ma nÃ©lkÃ¼l visszaÃ¡llÃthatÃ³. Ha mÃ©gis azonnal tÃ¶rÃ¶lni szeretnÃ©d a fiÃ³kot, alÃ¡bb megteheted.
       time_in_queue: VÃ¡rakozÃ¡s a sorban %{time}
       title: FiÃ³kok
       unconfirmed_email: Nem megerÅ‘sÃtett e-mail
+      undo_sensitized: SzenzitÃv jelÃ¶lÃ©s levÃ©tele
       undo_silenced: NÃ©mÃtÃ¡s visszavonÃ¡sa
       undo_suspension: FelfÃ¼ggesztÃ©s visszavonÃ¡sa
+      unsilenced_msg: A %{username} fiÃ³k korlÃ¡tozÃ¡sait sikeresen levettÃ¼k
       unsubscribe: LeiratkozÃ¡s
+      unsuspended_msg: A %{username} fiÃ³k felfÃ¼ggesztÃ©sÃ©t sikeresen visszavontuk
       username: FelhasznÃ¡lÃ³nÃ©v
+      view_domain: Domain Ã¶sszefoglalÃ³jÃ¡nak megtekintÃ©se
       warn: FigyelmeztetÃ©s
       web: Web
       whitelisted: EngedÃ©lyezÅ‘-listÃ¡n
@@ -204,14 +228,16 @@ hu:
         create_announcement: KÃ¶zlemÃ©ny lÃ©trehozÃ¡sa
         create_custom_emoji: EgyÃ©ni emodzsi lÃ©trehozÃ¡sa
         create_domain_allow: Domain engedÃ©lyezÃ©s lÃ©trehozÃ¡sa
-        create_domain_block: Domain blokkolÃ¡s lÃ©trehozÃ¡sa
-        create_email_domain_block: E-mail domain blokkolÃ¡s lÃ©trehozÃ¡sa
+        create_domain_block: Domain tiltÃ¡s lÃ©trehozÃ¡sa
+        create_email_domain_block: E-mail domain tiltÃ¡s lÃ©trehozÃ¡sa
+        create_ip_block: IP szabÃ¡ly lÃ©trehozÃ¡sa
         demote_user: FelhasznÃ¡lÃ³ lefokozÃ¡sa
         destroy_announcement: KÃ¶zlemÃ©ny tÃ¶rlÃ©se
         destroy_custom_emoji: EgyÃ©ni emodzsi tÃ¶rlÃ©se
         destroy_domain_allow: Domain engedÃ©lyezÃ©s tÃ¶rlÃ©se
-        destroy_domain_block: Domain blokkolÃ¡s tÃ¶rlÃ©se
-        destroy_email_domain_block: E-mail domain blokkolÃ¡s tÃ¶rlÃ©se
+        destroy_domain_block: Domain tiltÃ¡s tÃ¶rlÃ©se
+        destroy_email_domain_block: E-mail domain tiltÃ¡s tÃ¶rlÃ©se
+        destroy_ip_block: IP szabÃ¡ly tÃ¶rlÃ©se
         destroy_status: Ãllapot tÃ¶rlÃ©se
         disable_2fa_user: KÃ©tlÃ©pcsÅ‘s hitelesÃtÃ©s letiltÃ¡sa
         disable_custom_emoji: EgyÃ©ni emodzsi letiltÃ¡sa
@@ -224,13 +250,16 @@ hu:
         reopen_report: JelentÃ©s ÃºjranyitÃ¡sa
         reset_password_user: JelszÃ³ visszaÃ¡llÃtÃ¡sa
         resolve_report: JelentÃ©s megoldÃ¡sa
+        sensitive_account: A fiÃ³kodban minden mÃ©dia szenzitÃvnek jelÃ¶lÃ©se
         silence_account: FiÃ³k nÃ©mÃtÃ¡sa
         suspend_account: FiÃ³k felfÃ¼ggesztÃ©se
         unassigned_report: JelentÃ©s hozzÃ¡rendelÃ©sÃ©nek megszÃ¼ntetÃ©se
+        unsensitive_account: A fiÃ³kodban minden mÃ©dia szenzitÃv Ã¡llapotÃ¡nak tÃ¶rlÃ©se
         unsilence_account: FiÃ³k nÃ©mÃtÃ¡sÃ¡nak feloldÃ¡sa
         unsuspend_account: FiÃ³k felfÃ¼ggesztÃ©sÃ©nek feloldÃ¡sa
         update_announcement: KÃ¶zlemÃ©ny frissÃtÃ©se
         update_custom_emoji: EgyÃ©ni emodzsi frissÃtÃ©se
+        update_domain_block: Domain tiltÃ¡s frissÃtÃ©se
         update_status: Ãllapot frissÃtÃ©se
       actions:
         assigned_to_self_report: "%{name} a %{target} bejelentÃ©st magÃ¡hoz rendelte"
@@ -241,13 +270,15 @@ hu:
         create_custom_emoji: "%{name} Ãºj emodzsit tÃ¶ltÃ¶tt fel: %{target}"
         create_domain_allow: "%{name} engedÃ©lyezÅ‘ listÃ¡ra vette %{target} domaint"
         create_domain_block: "%{name} letiltotta az alÃ¡bbi domaint: %{target}"
-        create_email_domain_block: "%{name} feketelistÃ¡ra tette az alÃ¡bbi e-mail domaint: %{target}"
+        create_email_domain_block: "%{name} letiltotta az e-mail domaint: %{target}"
+        create_ip_block: "%{name} lÃ©trehozott egy szabÃ¡lyt a %{target} IP-vel kapcsolatban"
         demote_user: "%{name} lefokozta az alÃ¡bbi felhasznÃ¡lÃ³t: %{target}"
         destroy_announcement: "%{name} tÃ¶rÃ¶lte a kÃ¶zlemÃ©nyt %{target}"
         destroy_custom_emoji: "%{name} tÃ¶rÃ¶lte az emodzsit: %{target}"
         destroy_domain_allow: "%{name} leszedte %{target} domaint az engedÃ©lyezÅ‘ listÃ¡rÃ³l"
         destroy_domain_block: "%{name} engedÃ©lyezte az alÃ¡bbi domaint: %{target}"
-        destroy_email_domain_block: "%{name} fehÃ©rlistÃ¡ra tette az alÃ¡bbi e-mail domaint: %{target}"
+        destroy_email_domain_block: "%{name} engedÃ©lyezte az e-mail domaint: %{target}"
+        destroy_ip_block: "%{name} tÃ¶rÃ¶lt egy szabÃ¡lyt a %{target} IP-vel kapcsolatban"
         destroy_status: "%{name} eltÃ¡volÃtotta az alÃ¡bbi felhasznÃ¡lÃ³ tÃ¼lkjÃ©t: %{target}"
         disable_2fa_user: "%{name} kikapcsolta a kÃ©tlÃ©pcsÅ‘s azonosÃtÃ¡st %{target} felhasznÃ¡lÃ³ fiÃ³kjÃ¡n"
         disable_custom_emoji: "%{name} letiltotta az alÃ¡bbi emodzsit: %{target}"
@@ -260,13 +291,16 @@ hu:
         reopen_report: "%{name} Ãºjranyitotta a bejelentÃ©st: %{target}"
         reset_password_user: "%{name} visszaÃ¡llÃtotta az alÃ¡bbi felhasznÃ¡lÃ³ jelszavÃ¡t: %{target}"
         resolve_report: "%{name} megoldotta alÃ¡bbi bejelentÃ©st: %{target}"
+        sensitive_account: "%{name} szenzitÃvnek jelÃ¶lte %{target} mÃ©diatartalmÃ¡t"
         silence_account: "%{name} lenÃ©mÃtotta %{target} felhasznÃ¡lÃ³i fiÃ³kjÃ¡t"
         suspend_account: "%{name} felfÃ¼ggesztette %{target} felhasznÃ¡lÃ³i fiÃ³kjÃ¡t"
         unassigned_report: "%{name} tÃ¶rÃ¶lte a %{target} bejelentÃ©s hozzÃ¡rendelÃ©sÃ©t"
+        unsensitive_account: "%{name} levette a szenzitÃv jelÃ¶lÃ©st %{target} mÃ©diatartalmÃ¡rÃ³l"
         unsilence_account: "%{name} feloldotta a nÃ©mÃtÃ¡st %{target} felhasznÃ¡lÃ³i fiÃ³kjÃ¡n"
         unsuspend_account: "%{name} feloldotta %{target} felhasznÃ¡lÃ³i fiÃ³kjÃ¡nak felfÃ¼ggesztÃ©sÃ©t"
         update_announcement: "%{name} frissÃtette a kÃ¶zlemÃ©nyt %{target}"
         update_custom_emoji: "%{name} frissÃtette az alÃ¡bbi emodzsit: %{target}"
+        update_domain_block: "%{name} frissÃtette a %{target} domain tiltÃ¡sÃ¡t"
         update_status: "%{name} frissÃtette %{target} felhasznÃ¡lÃ³ tÃ¼lkjÃ©t"
       deleted_status: "(tÃ¶rÃ¶lt tÃ¼lk)"
       empty: Nem talÃ¡lhatÃ³ naplÃ³.
@@ -370,6 +404,8 @@ hu:
           silence: NÃ©mÃtÃ¡s
           suspend: FelfÃ¼ggesztÃ©s
         title: Ãšj domain tiltÃ¡sa
+      obfuscate: Domain nÃ©v Ã¡lcÃ¡zÃ¡sa
+      obfuscate_hint: RÃ©szlegesen Ã¡lcÃ¡zza a domain nevet a listÃ¡ban, ha a domain korlÃ¡tozÃ¡sok listÃ¡jÃ¡nak kÃ¶zzÃ©tÃ©tele engedÃ©lyezett
       private_comment: PrivÃ¡t megjegyzÃ©s
       private_comment_hint: MegjegyzÃ©s domain tiltÃ¡sÃ¡val kapcsolatban belsÅ‘ hasznÃ¡latra, a tÃ¶bbi moderÃ¡tor rÃ©szÃ©re.
       public_comment: NyilvÃ¡nos megjegyzÃ©s
@@ -396,19 +432,20 @@ hu:
       view: Domain tiltÃ¡sÃ¡nak megtekintÃ©se
     email_domain_blocks:
       add_new: Ãšj hozzÃ¡adÃ¡sa
-      created_msg: E-mail domain sikeresen hozzÃ¡adva a feketelistÃ¡hoz
+      created_msg: E-mail domain sikeresen letiltva
       delete: TÃ¶rlÃ©s
-      destroyed_msg: E-mail domain sikeresen eltÃ¡volÃtva a feketelistÃ¡rÃ³l
+      destroyed_msg: E-mail domain sikeresen engedÃ©lyezve
       domain: Domain
-      empty: Nincs email domain a feketelistÃ¡n.
+      empty: Nincs letiltott email domain.
       from_html: "%{domain}-rÃ³l"
       new:
         create: Domain hozzÃ¡adÃ¡sa
-        title: Ãšj e-mail feketelista bejegyzÃ©s
-      title: E-mail feketelista
+        title: Ãšj e-mail domain tiltÃ¡sa
+      title: Tiltott e-mail domainek
     instances:
       by_domain: Domain
       delivery_available: KÃ©zbesÃtÃ©s elÃ©rhetÅ‘
+      empty: Nem talÃ¡lhatÃ³ domain.
       known_accounts:
         one: "%{count} ismert fiÃ³k"
         other: "%{count} ismert fiÃ³k"
@@ -432,6 +469,21 @@ hu:
         expired: ElÃ©vÃ¼lt
         title: SzÅ±rÅ‘
       title: MeghÃvÃ¡sok
+    ip_blocks:
+      add_new: SzabÃ¡ly lÃ©trehozÃ¡sa
+      created_msg: Az Ãºj IP szabÃ¡lyt sikeresen felvettÃ¼k
+      delete: TÃ¶rlÃ©s
+      expires_in:
+        '1209600': 2 hÃ©t
+        '15778476': 6 hÃ³nap
+        '2629746': 1 hÃ³nap
+        '31556952': 1 Ã©v
+        '86400': 1 nap
+        '94670856': 3 Ã©v
+      new:
+        title: Ãšj IP szabÃ¡ly lÃ©trehozÃ¡sa
+      no_ip_block_selected: Nem vÃ¡ltoztattunk egy IP szabÃ¡lyon sem, mivel egy sem volt kivÃ¡lasztva
+      title: IP szabÃ¡ly
     pending_accounts:
       title: FÃ¼ggÅ‘ben lÃ©vÅ‘ fiÃ³kok (%{count})
     relationships:
@@ -471,6 +523,8 @@ hu:
       comment:
         none: Egyik sem
       created_at: Jelentve
+      forwarded: TovÃ¡bbÃtva
+      forwarded_to: 'TovÃ¡bbÃtva ide: %{domain}'
       mark_as_resolved: MegjelÃ¶lÃ©s megoldottkÃ©nt
       mark_as_unresolved: MegjelÃ¶lÃ©s megoldatlankÃ©nt
       notes:
@@ -514,6 +568,7 @@ hu:
       domain_blocks_rationale:
         title: Mutasd meg az indokolÃ¡st
       enable_bootstrap_timeline_accounts:
+        desc_html: Az Ãºj felhasznÃ¡lÃ³k automatikusan kÃ¶vetik a beÃ¡llÃtott fiÃ³kokat, Ãgy a SajÃ¡t idÅ‘vonaluk kezdÃ©skor nem lesz Ã¼res
         title: AlapÃ©rtelmezett kÃ¶vetÃ©s engedÃ©lyezÃ©se Ãºj felhasznÃ¡lÃ³knak
       hero:
         desc_html: A kezdÅ‘oldalon lÃ¡tszik. LegalÃ¡bb 600x100px mÃ©ret javasolt. Ha nincs beÃ¡llÃtva, a szerver bÃ©lyegkÃ©pet hasznÃ¡ljuk
@@ -540,6 +595,9 @@ hu:
         min_invite_role:
           disabled: Senki
           title: MeghÃvÃ¡sok engedÃ©lyezÃ©se
+        require_invite_text:
+          desc_html: Ha a regisztrÃ¡ciÃ³hoz kÃ©zi jÃ³vÃ¡hagyÃ¡sra van szÃ¼ksÃ©g, akkor a â€žMiÃ©rt akarsz csatlakozni?â€ vÃ¡lasz kitÃ¶ltÃ©se legyen kÃ¶telezÅ‘, Ã©s ne opcionÃ¡lis
+          title: Az Ãºj felhasznÃ¡lÃ³ktÃ³l legyen megkÃ¶vetelve a meghÃvÃ¡si kÃ©rÃ©s szÃ¶vegÃ©nek kitÃ¶ltÃ©se
       registrations_mode:
         modes:
           approved: A regisztrÃ¡ciÃ³ engedÃ©lyhez kÃ¶tÃ¶tt
@@ -679,8 +737,11 @@ hu:
       prefix_sign_up: RegisztrlÃ¡j mÃ©g ma a Mastodonra!
       suffix: Egy fiÃ³kkal kÃ¶vethetsz mÃ¡sokat, tÃ¼lkÃ¶lhetsz, eszmÃ©t cserÃ©lhetsz mÃ¡s Mastodon szerverek felhasznÃ¡lÃ³ival!
     didnt_get_confirmation: Nem kaptad meg a megerÅ‘sÃtÃ©si lÃ©pÃ©seket?
+    dont_have_your_security_key: Nincs biztonsÃ¡gi kulcsod?
     forgot_password: Elfelejtetted a jelszavad?
     invalid_reset_password_token: A jelszÃ³-visszaÃ¡llÃtÃ¡si kulcs nem megfelelÅ‘ vagy lejÃ¡rt. KÃ©rlek generÃ¡lj egy Ãºjat.
+    link_to_otp: Ãrj be egy kÃ©tlÃ©pcsÅ‘s azonosÃtÃ³ kÃ³dot a telefonodrÃ³l vagy egy visszaÃ¡llÃtÃ³ kÃ³dot
+    link_to_webauth: HasznÃ¡ld a biztonsÃ¡gi kulcs eszkÃ¶zÃ¶det
     login: BejelentkezÃ©s
     logout: KijelentkezÃ©s
     migrate_account: FelhasznÃ¡lÃ³i fiÃ³k kÃ¶ltÃ¶ztetÃ©se
@@ -705,7 +766,9 @@ hu:
       functional: A fiÃ³kod teljesen mÅ±kÃ¶dÅ‘kÃ©pes.
       pending: A jelentkezÃ©sed engedÃ©lyezÃ©sre vÃ¡r. Ez eltarthat egy ideig. Kapsz egy e-mailt, ha az elbÃrÃ¡lÃ¡s megtÃ¶rtÃ©nt.
       redirecting_to: A fiÃ³kod inaktÃv, mert jelenleg ide %{acct} van Ã¡tirÃ¡nyÃtva.
+    too_fast: TÃºl gyorsan kÃ¼ldted el az Å±rlapot, prÃ³bÃ¡ld kÃ©sÅ‘bb.
     trouble_logging_in: ProblÃ©mÃ¡d van a bejelentkezÃ©ssel?
+    use_security_key: BiztonsÃ¡gi kulcs hasznÃ¡lata
   authorize_follow:
     already_following: MÃ¡r kÃ¶veted ezt a felhasznÃ¡lÃ³t
     already_requested: MÃ¡r kÃ¼ldtÃ©l kÃ¶vetÃ©si kÃ©relmet ennek a fiÃ³knak
@@ -730,6 +793,7 @@ hu:
   date:
     formats:
       default: "%Y.%b.%d."
+      with_month_name: "%Y. %B %d"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}Ã³"
@@ -794,6 +858,7 @@ hu:
       request: ArchÃv kÃ©rÃ©se
       size: MÃ©ret
     blocks: TiltÃ³listÃ¡don
+    bookmarks: KÃ¶nyvjelzÅ‘k
     csv: CSV
     domain_blocks: Tiltott domainjeid
     lists: ListÃ¡id
@@ -836,8 +901,8 @@ hu:
     order_by: RendezÃ©s
     save_changes: VÃ¡ltozÃ¡sok mentÃ©se
     validation_errors:
-      one: Valami nincs rendjÃ©n! KÃ©rlek tekintsd meg a hibÃ¡t alant
-      other: Valami nincs rendjÃ©n! KÃ©rlek tekintsd meg a %{count} darab hibÃ¡t alant
+      one: Valami nincs rendjÃ©n! Tekintsd meg a hibÃ¡t lent
+      other: Valami nincs rendjÃ©n! Tekintsd meg a(z) %{count} hibÃ¡t lent
   html_validator:
     invalid_markup: 'hibÃ¡s HTML leÃrÃ³: %{error}'
   identity_proofs:
@@ -861,6 +926,8 @@ hu:
     status: EllenÅ‘rzÃ©s Ã¡llapota
     view_proof: TanÃºsÃtÃ¡s megtekintÃ©se
   imports:
+    errors:
+      over_rows_processing_limit: tÃ¶bb mint %{count} sort tartalmaz
     modes:
       merge: Ã–sszefÃ©sÃ¼lÃ©s
       merge_long: Megtartjuk a meglÃ©vÅ‘ bejegyzÃ©seket Ã©s hozzÃ¡vesszÃ¼k az Ãºjakat
@@ -870,6 +937,7 @@ hu:
     success: Adataidat sikeresen feltÃ¶ltÃ¶ttÃ¼k Ã©s feldolgozÃ¡sukat megkezdtÃ¼k
     types:
       blocking: Letiltottak listÃ¡ja
+      bookmarks: KÃ¶nyvjelzÅ‘k
       domain_blocking: Letiltott domainek listÃ¡ja
       following: KÃ¶vetettjeid listÃ¡ja
       muting: NÃ©mÃtott felhasznÃ¡lÃ³k listÃ¡ja
@@ -939,7 +1007,7 @@ hu:
   moderation:
     title: ModerÃ¡ciÃ³
   move_handler:
-    carry_blocks_over_text: Ez a fiÃ³k elkÃ¶ltÃ¶zÃ¶tt innen %{acct}, melyet blokkoltatok.
+    carry_blocks_over_text: Ez a fiÃ³k elkÃ¶ltÃ¶zÃ¶tt innen %{acct}, melyet letiltottatok.
     carry_mutes_over_text: Ez a fiÃ³k elkÃ¶ltÃ¶zÃ¶tt innen %{acct}, melyet lenÃ©mÃtottatok.
     copy_account_note_text: 'Ez a fiÃ³k elkÃ¶ltÃ¶zÃ¶tt innen %{acct}, itt vannak a bejegyzÃ©seitek rÃ³la:'
   notification_mailer:
@@ -990,6 +1058,14 @@ hu:
           quadrillion: Q
           thousand: K
           trillion: T
+  otp_authentication:
+    code_hint: JÃ³vÃ¡hagyÃ¡shoz Ãrd be a hitelesÃtÅ‘ alkalmazÃ¡s Ã¡ltal generÃ¡lt kÃ³dot
+    description_html: Ha engedÃ©lyezed a <strong>kÃ©tlÃ©pcsÅ‘s azonosÃtÃ¡st</strong>, a bejelentkezÃ©shez szÃ¼ksÃ©ged lesz a telefonodra Ã©s egy alkalmazÃ¡sra, amely hozzÃ¡fÃ©rÃ©si kÃ³dot generÃ¡l szÃ¡modra.
+    enable: EngedÃ©lyezÃ©s
+    instructions_html: "<strong>Olvasd be ezt a QR-kÃ³dot a telefonodon futÃ³ Google Authenticator vagy egyÃ©b TOTP alkalmazÃ¡ssal</strong>. A jÃ¶vÅ‘ben ez az alkalmazÃ¡s fog szÃ¡modra hozzÃ¡fÃ©rÃ©si kÃ³dot generÃ¡lni a belÃ©pÃ©shez."
+    manual_instructions: 'Ha nem sikerÃ¼lt a QR-kÃ³d beolvasÃ¡sa, itt a szÃ¶veges kulcs, amelyet manuÃ¡lisan kell begÃ©pelned:'
+    setup: BeÃ¡llÃtÃ¡s
+    wrong_code: A beÃrt kÃ³d nem Ã©rvÃ©nyes! A szerver Ã³rÃ¡ja Ã©s az eszkÃ¶zÃ¶d Ã³rÃ¡ja szinkronban jÃ¡r?
   pagination:
     newer: Ãšjabb
     next: KÃ¶vetkezÅ‘
@@ -1018,6 +1094,7 @@ hu:
   relationships:
     activity: FiÃ³k aktivitÃ¡s
     dormant: Elhagyott
+    follow_selected_followers: KivÃ¡lasztott kÃ¶vetÅ‘k bekÃ¶vetÃ©se
     followers: KÃ¶vetÅ‘k
     following: KÃ¶vetve
     invited: MeghÃvva
@@ -1113,7 +1190,8 @@ hu:
     preferences: BeÃ¡llÃtÃ¡sok
     profile: Profil
     relationships: KÃ¶vetÃ©sek Ã©s kÃ¶vetÅ‘k
-    two_factor_authentication: KÃ©tlÃ©pcsÅ‘s azonosÃtÃ¡s
+    two_factor_authentication: KÃ©tlÃ©pcsÅ‘s hitelesÃtÃ©s
+    webauthn_authentication: BiztonsÃ¡gi kulcsok
   spam_check:
     spam_detected: Ez egy automatikus jelentÃ©s. Spamet Ã©rzÃ©keltÃ¼nk.
   statuses:
@@ -1151,7 +1229,9 @@ hu:
         one: "%{count} szavazat"
         other: "%{count} szavazat"
       vote: SzavazÃ¡s
-    show_more: Mutass tÃ¶bbet
+    show_more: TÃ¶bb megjelenÃtÃ©se
+    show_newer: Ãšjabbak mutatÃ¡sa
+    show_older: RÃ©gebbiek mutatÃ¡sa
     show_thread: SzÃ¡l mutatÃ¡sa
     sign_in_to_participate: Jelentkezz be, hogy rÃ©szt vehess a beszÃ©lgetÃ©sben
     title: '%{name}: "%{quote}"'
@@ -1260,21 +1340,20 @@ hu:
       default: "%Y. %b %d., %H:%M"
       month: "%Y %b"
   two_factor_authentication:
-    code_hint: MegerÅ‘sÃtÃ©shez Ãrd be az alkalmazÃ¡s Ã¡ltal generÃ¡lt kÃ³dot
-    description_html: He engedÃ©lyezed a <strong>kÃ©tlÃ©pcsÅ‘s azonosÃtÃ¡st</strong>, a bejelentkezÃ©shez szÃ¼ksÃ©ged lesz a telefonodra Ã©s egy alkalmazÃ¡sra, amely hozzÃ¡fÃ©rÃ©si kÃ³dot generÃ¡l szÃ¡modra.
+    add: HozzÃ¡adÃ¡s
     disable: KikapcsolÃ¡s
-    enable: EngedÃ©lyezÃ©s
+    disabled_success: A kÃ©tlÃ©pcsÅ‘s azonosÃtÃ¡st sikeresen letiltottuk
+    edit: SzerkesztÃ©s
     enabled: KÃ©tlÃ©pcsÅ‘s azonosÃtÃ¡s engedÃ©lyezve
     enabled_success: A kÃ©tlÃ©pcsÅ‘s azonosÃtÃ¡st sikeresen engedÃ©lyezted
     generate_recovery_codes: VisszaÃ¡llÃtÃ¡si kÃ³dok generÃ¡lÃ¡sa
-    instructions_html: "<strong>Olvasd be ezt a QR-kÃ³dot a telefonodon futÃ³ Google Authenticator vagy egyÃ©b TOTP alkalmazÃ¡ssal</strong>. A jÃ¶vÅ‘ben ez az alkalmazÃ¡s fog szÃ¡modra hozzÃ¡fÃ©rÃ©si kÃ³dot generÃ¡lni a belÃ©pÃ©shez."
     lost_recovery_codes: A visszaÃ¡llÃtÃ¡si kÃ³dok segÃtsÃ©gÃ©vel tudsz belÃ©pni, ha elveszÃtenÃ©d a telefonod. Ha a visszaÃ¡llÃtÃ¡si kÃ³djaidat hagytad el, itt generÃ¡lhatsz Ãºjakat. A rÃ©gi kÃ³dokat ebben az esetben Ã©rvÃ©nytelenÃtjÃ¼k.
-    manual_instructions: 'Ha nem sikerÃ¼lt a QR-kÃ³d beolvasÃ¡sa, itt a szÃ¶veges kulcs, amelyet manuÃ¡lisan kell begÃ©pelned:'
+    methods: KÃ©tlÃ©pcsÅ‘s eljÃ¡rÃ¡sok
+    otp: HitelesÃtÅ‘ alkalmazÃ¡s
     recovery_codes: VisszaÃ¡llÃtÃ¡si kÃ³dok biztonsÃ¡gi mentÃ©se
     recovery_codes_regenerated: A visszaÃ¡llÃtÃ¡si kÃ³dokat sikeresen ÃºjragenerÃ¡ltuk
     recovery_instructions_html: A visszaÃ¡llÃtÃ¡si kÃ³dok egyikÃ©nek segÃtsÃ©gÃ©vel tudsz majd belÃ©pni, ha elveszÃtenÃ©d a telefonod. <strong>Tartsd biztos helyen a visszaÃ¡llÃtÃ¡si kÃ³djaid</strong>! PÃ©ldÃ¡ul nyomtasd ki Å‘ket Ã©s tÃ¡rold a tÃ¶bbi fontos iratoddal egyÃ¼tt.
-    setup: BeÃ¡llÃtÃ¡s
-    wrong_code: A beÃrt kÃ³d nem Ã©rvÃ©nyes! A szerver Ã³rÃ¡ja Ã©s az eszkÃ¶zÃ¶d Ã³rÃ¡ja szinkronban jÃ¡r?
+    webauthn: BiztonsÃ¡gi kulcsok
   user_mailer:
     backup_ready:
       explanation: A Mastodon fiÃ³kod teljes mentÃ©sÃ©t kÃ©rted. A mentÃ©s kÃ©sz Ã¡s letÃ¶lthetÅ‘!
@@ -1289,6 +1368,7 @@ hu:
     warning:
       explanation:
         disable: A fiÃ³kod befagyasztott Ã¡llapotban megtartja minden adatÃ¡t, de feloldÃ¡sig nem csinÃ¡lhatsz vele semmit.
+        sensitive: A feltÃ¶ltÃ¶tt Ã©s hivatkozott mÃ©diatartalmaidat szenzitÃvkÃ©nt kezeljÃ¼k.
         silence: A fiÃ³kod korlÃ¡tozott Ã¡llapotÃ¡ban csak a kÃ¶vetÅ‘id lÃ¡thatjÃ¡k a tÃ¼lkjeidet, valamint nem kerÃ¼lsz rÃ¡ nyilvÃ¡nos idÅ‘vonalakra. Ugyanakkor mÃ¡sok manuÃ¡lisan mÃ©g kÃ¶vethetnek.
         suspend: A fiÃ³kodat felfÃ¼ggesztettÃ©k, Ãgy minden tÃ¼lkÃ¶d Ã©s feltÃ¶ltÃ¶tt fÃ¡jlod menthetetlenÃ¼l elveszett errÅ‘l a szerverrÅ‘l Ã©s minden olyanrÃ³l is, ahol voltak kÃ¶vetÅ‘id.
       get_in_touch: VÃ¡laszolhatsz erre az emailre, hogy kapcsolatba lÃ©pj a %{instance} csapatÃ¡val.
@@ -1297,11 +1377,13 @@ hu:
       subject:
         disable: A fiÃ³kodat %{acct} befagyasztottÃ¡k
         none: FigyelmeztetÃ©s a %{acct} fiÃ³knak
+        sensitive: A %{acct} fiÃ³kod mÃ©diatartalmait szenzitÃvnek jelÃ¶ltÃ©k
         silence: A fiÃ³kodat %{acct} korlÃ¡toztÃ¡k
         suspend: A fiÃ³kodat %{acct} felfÃ¼ggesztettÃ©k
       title:
         disable: Befagyasztott fiÃ³k
         none: Figyelem
+        sensitive: MÃ©diatartalmadat szenzitÃvnek jelÃ¶ltÃ©k
         silence: LekorlÃ¡tozott fiÃ³k
         suspend: FelfÃ¼ggesztett fiÃ³k
     welcome:
@@ -1322,9 +1404,11 @@ hu:
       tips: Tippek
       title: Ãœdv a fedÃ©lzeten, %{name}!
   users:
+    blocked_email_provider: Ez az email szolgÃ¡ltatÃ³ nem engedÃ©lyezett
     follow_limit_reached: Nem kÃ¶vethetsz tÃ¶bb, mint %{limit} embert
     generic_access_help_html: Nem tudod elÃ©rni a fiÃ³kodat? SegÃtsÃ©gÃ©rt lÃ©pj kapcsolatba velÃ¼nk ezen %{email}
     invalid_email: A megadott e-mail cÃm helytelen
+    invalid_email_mx: Az email cÃm nem tÅ±nik lÃ©tezÅ‘nek
     invalid_otp_token: Ã‰rvÃ©nytelen ellenÅ‘rzÅ‘ kÃ³d
     invalid_sign_in_token: Ã‰rvÃ©nytelen biztonsÃ¡gi kÃ³d
     otp_lost_help_html: Ha mindkettÅ‘t elvesztetted, kÃ©rhetsz segÃtsÃ©get itt %{email}
@@ -1334,3 +1418,20 @@ hu:
   verification:
     explanation_html: 'A profilodon <strong>hitelesÃtheted magad, mint az itt talÃ¡lhatÃ³ linkek tulajdonosa</strong>. Ehhez a linkelt weboldalnak tartalmaznia kell egy linket vissza a Mastodon profilodra. Ennek <strong>tartalmaznia kell</strong> a <code>rel="me"</code> attribÃºtumot. A link szÃ¶vege bÃ¡rmi lehet. Itt egy pÃ©lda:'
     verification: HitelesÃtÃ©s
+  webauthn_credentials:
+    add: BiztonsÃ¡gi kulcs hozzÃ¡adÃ¡sa
+    create:
+      error: A biztonsÃ¡gi kulcs hozzÃ¡adÃ¡sa kÃ¶zben hiba tÃ¶rtÃ©nt. KÃ©rlek, prÃ³bÃ¡ld Ãºjra.
+      success: A biztonsÃ¡gi kulcsodat sikeresen felvettÃ¼k.
+    delete: TÃ¶rlÃ©s
+    delete_confirmation: Biztos, hogy le akarod tÃ¶rÃ¶lni ezt a biztonsÃ¡gi kulcsot?
+    description_html: Ha engedÃ©lyezed a <strong>biztonsÃ¡gi kulcsos hitelesÃtÃ©st</strong>, a bejelentkezÃ©shez szÃ¼ksÃ©ged lesz az egyik kulcsodra.
+    destroy:
+      error: A biztonsÃ¡gi kulcs tÃ¶rlÃ©se kÃ¶zben hiba tÃ¶rtÃ©nt. KÃ©rlek, prÃ³bÃ¡ld Ãºjra.
+      success: A biztonsÃ¡gi kulcsodat sikeresen tÃ¶rÃ¶ltÃ¼k.
+    invalid_credential: Ã‰rvÃ©nytelen biztonsÃ¡gi kulcs
+    nickname_hint: Ãrd be az Ãºj biztonsÃ¡gi kulcsod becenevÃ©t
+    not_enabled: MÃ©g nem engedÃ©lyezted a WebAuthn-t
+    not_supported: Ez a bÃ¶ngÃ©szÅ‘ nem tÃ¡mogatja a biztonsÃ¡gi kulcsokat
+    otp_required: A biztonsÃ¡gi kulcsok hasznÃ¡latÃ¡hoz elÅ‘szÃ¶r engedÃ©lyezd a kÃ©tlÃ©pcsÅ‘s azonosÃtÃ¡st.
+    registered_on: 'RegisztrÃ¡lt ekkor: %{date}'
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index 477b0fda214b4821a6743010c9571c0f4488fe2c..0cfae56efd482a1dba4cd6bf0299e42656429097 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -1,17 +1,29 @@
 ---
 hy:
   about:
+    about_hashtag_html: ÕÖ€Õ¡Õ¶Ö„ <strong>#%{hashtag}</strong> Õ°Õ¥Õ·Õ©Õ¥Õ£Õ¸Õ¾ Õ°Õ¡Õ¶Ö€Õ¡ÕµÕ«Õ¶ Õ©Õ©Õ¥Ö€Õ¶ Õ¥Õ¶Ö‰ Ô¿Õ¡Ö€Õ¸Õ² Õ¥Ö„ ÖƒÕ¸ÕÕ£Õ¸Ö€Õ®Õ¡Õ¯ÖÕ¥Õ¬ Õ¤Ö€Õ¡Õ¶Ö Õ°Õ¥Õ¿ Õ¥Õ©Õ¥ Õ¸Ö‚Õ¶Õ¥Ö„ Õ¸Ö€Õ¥Ö‚Õ§ Õ°Õ¡Õ·Õ«Õ¸Ö‚ Õ¤Õ¡Õ·Õ¿Õ¥Õ¦Õ¥Ö€Ö„Õ¸Ö‚Õ´Ö‰
+    about_mastodon_html: Ô±ÕºÕ¡Õ£Õ¡ÕµÕ« Õ½Õ¸ÖÖÕ¡Õ¶ÖÕ¨Ö‰ ÕˆÕ¹ Õ´Õ« Õ£Õ¸Õ¾Õ¡Õ¦Õ¤, Õ¸Õ¹ Õ´Õ« Õ¯Õ¸Ö€ÕºÕ¸Ö€Õ¡Õ¿Õ«Õ¾ Õ¾Õ¥Ö€Õ¡Õ°Õ½Õ¯Õ¸Õ²Õ¸Ö‚Õ©Õ«Ö‚Õ¶, Õ§Õ©Õ«Õ¯Õ¡Õ¯Õ¡Õ¶ Õ¤Õ«Õ¦Õ¡ÕµÕ¶, Õ¥Ö‚ Õ¡ÕºÕ¡Õ¯Õ¥Õ¶Õ¿Ö€Õ¸Õ¶Õ¡ÖÕ¸Ö‚Õ´Ö‰ Õ„Õ¡Õ½Õ¿Õ¡Õ¤Õ¸Õ¶Õ¸Ö‚Õ´ Õ¤Õ¸Ö‚ Õ¥Õ½ Ö„Õ¸ Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¿Õ§Ö€Õ¨Ö‰
     about_this: Õ„Õ¥Ö€ Õ´Õ¡Õ½Õ«Õ¶
     active_count_after: Õ¡Õ¯Õ¿Õ«Õ¾
+    active_footnote: Ô±Õ´Õ½Õ¥Õ¯Õ¡Õ¶ Õ¡Õ¯Õ¿Õ«Ö‚ Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€ (MAU)
     administered_by: Ô±Õ¤Õ´Õ«Õ¶Õ«Õ½Õ¿Ö€Õ¡Õ¿Õ¸Ö€Õ
     api: API
     apps: Ô²Õ»Õ»Õ¡ÕµÕ«Õ¶ Õ°Õ¡Õ¾Õ¥Õ¬Õ¾Õ¡Õ®Õ¶Õ¥Ö€
+    apps_platforms: Õ„Õ¡Õ½Õ¿Õ¡Õ¤Õ¸Õ¶Õ¨ Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ§ iOS, Android Õ¥Ö‚ Õ¡ÕµÕ¬ Õ¿Õ¡Ö€Õ¢Õ¥Ö€ Õ°Õ¥Õ¶Ö„Õ¥Ö€Õ¸Ö‚Õ´
+    browse_directory: ÕŠÖ€ÕºÕ¿Õ«Ö€ Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€Õ« Õ·Õ¿Õ¥Õ´Õ¡Ö€Õ¡Õ¶Õ¨ Õ¥Ö‚ Õ£Õ¿Õ«Ö€ Õ°Õ¥Õ¿Õ¡Ö„Ö€Ö„Õ«Ö€ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö
+    browse_local_posts: ÕÕ¥Õ½ Õ¡ÕµÕ½ Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ« Õ°Õ¡Õ¶Ö€Õ¡ÕµÕ«Õ¶ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ°Õ¸Õ½Ö„Õ¨
+    browse_public_posts: Ô´Õ«Õ¿Õ«Ö€ Õ„Õ¡Õ½Õ¿Õ¡Õ¤Õ¸Õ¶Õ« Õ°Õ¡Õ¶Ö€Õ¡ÕµÕ«Õ¶ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ°Õ¸Õ½Ö„Õ¨
     contact: Ô¿Õ¸Õ¶Õ¿Õ¡Õ¯Õ¿
     contact_missing: ÕÕ¡Õ°Õ´Õ¡Õ¶Õ¾Õ¡Õ® Õ¹Õ§
     contact_unavailable: ÕˆÕ¹Õ«Õ¶Õ¹ Õ¹Õ¯Õ¡
     discover_users: Ô³Õ¿Õ¶Õ¥Õ¬ Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€Õ¶Õ¥Ö€
     documentation: Õ“Õ¡Õ½Õ¿Õ¡Õ©Õ²Õ©Õ¥Ö€
+    federation_hint_html: "%{instance} Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ¸Ö‚Õ´ Õ°Õ¡Õ·Õ«Ö‚ Õ¢Õ¡ÖÕ¥Õ¬Õ¸Õ¾ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬ Õ¡ÕµÕ¬ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö Õ„Õ¡Õ½Õ¿Õ¡Õ¤Õ¸Õ¶Õ« ÖÕ¡Õ¶Õ¯Õ¡ÖÕ¡Õ® Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ«Ö Ö‡ Õ¸Õ¹ Õ´Õ«Õ¡ÕµÕ¶Ö‰"
     get_apps: Õ“Õ¸Ö€Õ±Õ¥Ö„ Õ¢Õ»Õ»Õ¡ÕµÕ«Õ¶ Õ°Õ¡Õ¾Õ¥Õ¬Õ¾Õ¡Õ®Õ¨
+    hosted_on: Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶Õ¨ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¸Ö‚Õ¡Õ® Õ§ %{domain}Õ¸Ö‚Õ´
+    instance_actor_flash: 'Ô±ÕµÕ½ Õ°Õ¡Õ·Õ«Ö‚ Õ¾Õ«Ö€Õ¿Õ¸Ö‚Õ¡Õ¬ Õ¤Õ¥Ö€Õ¡Õ½Õ¡Õ¶ Õ§, Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ¸Ö‚Õ´ Õ§ Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ«Õ¹Õ¨, Õ¡ÕµÕ¬ Õ¸Õ¹ Õ¡Õ¶Õ°Õ¡Õ¿ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ»Õ¨ Õ¶Õ¥Ö€Õ¯Õ¡ÕµÕ¡ÖÕ¶Õ¥Õ¬Õ¸Ö‚, Õ°Õ¡Õ´Õ¡Ö€Ö‰ Õ•Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ¸Ö‚Õ´ Õ§ Ö†Õ¥Õ¤Õ¥Ö€Õ¡ÖÕ«Õ¡ÕµÕ« Õ¶ÕºÕ¡Õ¿Õ¡Õ¯Õ¸Õ¾, Õ¸Ö‚ Õ¹ÕºÕ§Õ¿Ö„ Õ§ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ«, Õ¥Õ©Õ§ Õ¹Õ§Ö„ ÖÕ¡Õ¶Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬ Õ¸Õ²Õ» Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ¨, Õ¸Ö€Õ« Õ¤Õ§ÕºÖ„Õ¸Ö‚Õ´ ÕºÕ§Õ¿Ö„ Õ§ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ§Ö„ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´Õ¨Ö‰
+
+'
     learn_more: Ô»Õ´Õ¡Õ¶Õ¡Õ¬ Õ¡Õ¾Õ¥Õ¬Õ«Õ¶
     privacy_policy: Ô³Õ¡Õ²Õ¿Õ¶Õ«Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Ö„Õ¡Õ²Õ¡Ö„Õ¡Õ¯Õ¡Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶
     see_whats_happening: ÕÕ¥Õ½ Õ«Õ¶Õ¹ Õ¡ Õ¯Õ¡Õ¿Õ¡Ö€Õ¾Õ¸Ö‚Õ´
@@ -20,28 +32,53 @@ hy:
     status_count_after:
       one: Õ½Õ¿Õ¡Õ¿Õ¸Ö‚Õ½
       other: Õ½Õ¿Õ¡Õ¿Õ¸Ö‚Õ½
+    status_count_before: ÕˆÕ¾Ö„Õ¥Ö€ Õ£Ö€Õ¥Õ¬ Õ¥Õ¶Õ
+    tagline: Õ€Õ¥Õ¿Õ¥Ö‚Õ«Ö€ Õ¨Õ¶Õ¯Õ¥Ö€Õ¶Õ¥Ö€Õ«Õ¤ Õ¥Ö‚ Õ£Õ¿Õ«Ö€ Õ¶Õ¸Ö€Õ¥Ö€Õ«Õ¶
+    terms: Ô¾Õ¡Õ¼Õ¡ÕµÕ¸Ö‚Õ©Õ¥Õ¡Õ¶ ÕºÕ¡ÕµÕ´Õ¡Õ¶Õ¶Õ¥Ö€Õ¨
+    unavailable_content: Õ„Õ¸Õ¤Õ¥Ö€Õ¡ÖÕ¸Ö‚Õ¸Õ² Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ«Õ¹Õ¶Õ¥Ö€
     unavailable_content_description:
       domain: ÕÕºÕ¡Õ½Õ¡Ö€Õ¯Õ«Õ¹
+      reason: ÕŠÕ¡Õ¿Õ³Õ¡Õ¼Õ¨Õ
+      rejecting_media: Ô±ÕµÕ½ Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ¶Õ¥Ö€Õ« Õ¶Õ«Ö‚Õ©Õ¥Ö€Õ¨ Õ¹Õ¥Õ¶ Õ´Õ·Õ¡Õ¯Õ¸Ö‚Õ« Õ¯Õ¡Õ´ ÕºÕ¡Õ°Õ¸Ö‚Õ«Ö‰ Õ‰Õ¥Õ¶ ÖÕ¸Ö‚ÖÕ¡Õ¤Ö€Õ¸Ö‚Õ« Õ¶Õ¡Ö‡ Õ´Õ¡Õ¶Ö€Õ¡ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ¶Õ¥Ö€Õ¨, ÕºÕ¡Õ°Õ¡Õ¶Õ»Õ¥Õ¬Õ¸Õ¾ Õ«Õ¶Ö„Õ¶Õ¸Ö‚Ö€Õ¸ÕµÕ¶ Õ¡Õ¶ÖÕ¸Ö‚Õ´ Õ¤Õ§ÕºÕ« Õ¢Õ¶Ö…Ö€Õ«Õ¶Õ¡Õ¯ Õ¶Õ«Ö‚Õ©Õ¨Ö‰
+      rejecting_media_title: Ô¶Õ¿Õ¸Ö‚Õ¡Õ® Õ´Õ¥Õ¤Õ«Õ¡
+      silenced: Ô±ÕµÕ½ Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ¹Õ« Õ°Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ©Õ¡Ö„ÖÕ¸Ö‚Õ¡Õ® Õ¥Õ¶ Õ°Õ¡Õ¶Ö€Õ¡ÕµÕ«Õ¶ Õ°Õ¸Õ½Ö„Õ«Ö Õ¥Ö‚ Õ¦Ö€Õ¸ÕµÖÕ¶Õ¥Ö€Õ«Ö, Õ¥Ö‚ Õ¸Õ¹ Õ´Õ« Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´ Õ¹Õ« Õ£Õ¥Õ¶Õ¥Ö€Õ¡ÖÕ¸Ö‚Õ¸Ö‚Õ´ Õ¶Ö€Õ¡Õ¶Ö Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€Õ« Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ«Ö, Õ¥Õ©Õ§ Õ¶Ö€Õ¡Õ¶Ö Õ¹Õ§Ö„ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´â€¤
+      silenced_title: Ô¼Õ¼Õ¥ÖÕ¸Ö‚Õ¡Õ® Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ«Õ¹Õ¶Õ¥Ö€
+      suspended: ÕˆÕ¹ Õ´Õ« Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬ Õ¡ÕµÕ½ Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ«Õ¹Õ¶Õ¥Ö€Õ«Ö Õ¹Õ« Õ£Õ¸Ö€Õ®Õ¡Ö€Õ¯Õ¸Ö‚Õ¸Ö‚Õ´, ÕºÕ¡Õ°Õ¸Ö‚Õ¸Ö‚Õ´ Õ¯Õ¡Õ´ ÖƒÕ¸ÕÕ¡Õ¶Õ¡Õ¯Õ¸Ö‚Õ¸Ö‚Õ´, Õ¯Õ¡Õ¿Õ¡Ö€Õ¥Õ¬ Õ¸Ö€Õ¥Ö‚Õ§ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¯Õ¡Õ´ Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ¯ÖÕ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¡ÕµÕ½ Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ«Õ¹Õ« Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€Õ« Õ°Õ¥Õ¿ Õ¡Õ¶Õ°Õ¶Õ¡Ö€ Õ§â€¤
+      suspended_title: Ô¿Õ¡Õ½Õ¥ÖÕ¸Ö‚Õ¡Õ® Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ«Õ¹Õ¶Õ¥Ö€
+    unavailable_content_html: Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶Õ¶ Õ¨Õ¶Õ¤Õ°Õ¡Õ¶Ö€Õ¡ÕºÕ§Õ½ Õ©Õ¸ÕµÕ¬Õ¡Õ¿Ö€Õ¸Ö‚Õ´ Õ§ Õ¿Õ¥Õ½Õ¶Õ¥Õ¬ Õ¢Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ¥Ö‚ Õ·ÖƒÕ¸Ö‚Õ¥Õ¬ Õ¡ÕµÕ¬ Õ¤Õ¡Õ·Õ¶Õ¥Õ¦Õ¥Ö€Ö„Õ« Õ¡ÕµÕ¬ Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ¶Õ¥Ö€Õ« Õ°Õ¥Õ¿Ö‰ ÕÖ€Õ¡Õ¶Ö„ Õ¢Õ¡ÖÕ¡Õ¼Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¶ Õ¥Õ¶, Õ¸Ö€Õ¸Õ¶Ö„ Õ¯Õ«Ö€Õ¡Õ¼Õ¸Ö‚Õ¥Õ¬ Õ¥Õ¶ Õ°Õ§Õ¶Ö Õ¡ÕµÕ½ Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ« Õ°Õ¡Õ´Õ¡Ö€Ö‰
     user_count_after:
       one: Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€
       other: Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€Õ¥Ö€
     user_count_before: Ô±ÕµÕ½Õ¿Õ¥Õ² Õ¥Õ¶
     what_is_mastodon: Ô»ÕžÕ¶Õ¹ Õ§ Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶Õ¨
   accounts:
+    choices_html: "%{name}-Õ« Õ¨Õ¶Õ¿Ö€Õ¡Õ¶Õ«Õ"
+    endorsements_hint: ÕŽÕ§Õ¢ Õ«Õ¶Õ¿Õ¥Ö€Ö†Õ§ÕµÕ½Õ«Ö Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ ÖÕ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö, Õ¸Ö€Õ¸Õ¶Ö Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´ Õ¥Õ½, Õ¥Ö‚ Õ¶Ö€Õ¡Õ¶Ö„ Õ¯Õ¨ ÖÕ¸Ö‚ÖÕ¡Õ¤Ö€Õ¸Ö‚Õ¥Õ¶ Õ¡ÕµÕ½Õ¿Õ¥Õ²Ö‰
+    featured_tags_hint: Ô´Õ¸Ö‚ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ ÖÕ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ ÕµÕ¡Õ¿Õ¸Ö‚Õ¯ ÕºÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€, Õ¸Ö€Õ¸Õ¶Ö„ Õ¯Õ¨ ÖÕ¸Ö‚ÖÕ¡Õ¤Ö€Õ¸Ö‚Õ¥Õ¶ Õ¡ÕµÕ½Õ¿Õ¥Õ²Ö‰
     follow: Õ€Õ¥Õ¿Ö‡Õ¥Õ¬
     followers:
       one: Õ€Õ¥Õ¿Ö‡Õ¸Ö€Õ¤
       other: Õ€Õ¥Õ¿Ö‡Õ¸Ö€Õ¤Õ¶Õ¥Ö€
     following: Õ€Õ¥Õ¿Ö‡Õ¸Ö‚Õ´ Õ¥Ö„
+    instance_actor_flash: Ô±ÕµÕ½ Õ°Õ¡Õ·Õ«Ö‚Õ¨ Õ¾Õ«Ö€Õ¿Õ¸Ö‚Õ¡Õ¬ Õ¤Õ¥Ö€Õ¡Õ½Õ¡Õ¶ Õ§, Õ¸Ö€Õ¨ Õ¶Õ¥Ö€Õ¯Õ¡ÕµÕ¡ÖÕ¶Õ¸Ö‚Õ´ Õ§ Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ¨, Õ¥Ö‚ Õ¸Õ¹ Õ¸Ö€Õ¥Ö‚Õ§ Õ¡Õ¶Õ°Õ¡Õ¿ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ»Ö‰ Ô±ÕµÕ¶ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ¸Ö‚Õ´ Õ§ Ö†Õ¥Õ¤Õ¥Ö€Õ¡ÖÕ«Õ¡ÕµÕ« Õ¶ÕºÕ¡Õ¿Õ¡Õ¯Õ¶Õ¥Ö€Õ¸Õ¾ Õ¥Ö‚ Õ¹ÕºÕ§Õ¿Ö„ Õ§ Õ¯Õ¡Õ½Õ¥ÖÕ¸Ö‚Õ«Ö‰
     joined: Õ„Õ«Õ¡ÖÕ¥Õ¬ Õ¥Õ¶ %{date}
     last_active: Õ¾Õ¥Ö€Õ»Õ«Õ¶ Õ©Õ¸Ö‚Õ©Õ¨
+    link_verified_on: ÕÕ¸ÕµÕ¶ ÕµÕ²Õ´Õ¡Õ¶ Õ¿Õ«Ö€Õ¡ÕºÕ¥Õ¿Õ¸Ö‚Õ´Õ¨ Õ½Õ¿Õ¸Ö‚Õ£Õ¸Ö‚Õ¡Õ® Õ§Õ %{date}ÖŠÕ«Õ¶
     media: Õ„Õ¥Õ¤Õ«Õ¡
+    moved_html: "%{name} Õ¿Õ¥Õ²Õ¡ÖƒÕ¸ÕÕ¸Ö‚Õ¥Õ¬ Õ§ %{new_profile_link}"
+    network_hidden: Ô±ÕµÕ½ Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬Õ¨ Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ¹Õ§
     never_active: ÔµÖ€Õ¢Õ¥Ö„
+    nothing_here: Ô±ÕµÕ½Õ¿Õ¥Õ² Õ¢Õ¡Õ¶ Õ¹Õ¯Õ¡Õµ
+    people_followed_by: Õ„Õ¡Ö€Õ¤Õ«Õ¯, Õ¸Ö€Õ¸Õ¶Ö %{name}Õ¨ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´ Õ§
+    people_who_follow: Õ„Õ¡Ö€Õ¤Õ«Õ¯, Õ¸Ö€Õ¸Õ¶Ö„ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶ %{name}Õ«Õ¶
+    pin_errors:
+      following: Ô´Õ¸Ö‚ ÕºÕ§Õ¿Ö„ Õ§ Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ½ Õ´Õ¡Ö€Õ¤Õ¸Ö‚Õ¶, Õ¸Ö€Õ«Õ¶ ÖÕ¡Õ¶Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ¥Õ½ ÕÖ€Õ¡ÕÕ¸Ö‚Õ½Õ¥Õ¬
     posts:
       one: Ô¹Õ¸Ö‚Õ©
       other: Ô¹Õ¸Ö‚Õ©Õ¥Ö€Õ«Ö
     posts_tab_heading: Ô¹Õ©Õ¥Ö€
     posts_with_replies: Ô¹Õ©Õ¥Ö€ Õ¥Ö‚ ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¶Õ¥Ö€
+    reserved_username: Ô¾Õ¡Õ®Õ¯Õ¡Õ¶Õ¸Ö‚Õ¶Õ¶ Õ¡Ö€Õ¤Õ§Õ¶ Õ¾Õ¥Ö€ÖÕ¸Ö‚Õ¡Õ® Õ§
     roles:
       admin: Ô±Õ¤Õ´Õ«Õ¶Õ«Õ½Õ¿Ö€Õ¡Õ¿Õ¸Ö€
       bot: Ô²Õ¸Õ¿
@@ -50,13 +87,36 @@ hy:
     unavailable: ÕŠÖ€Õ¸Ö†Õ«Õ¬Õ¨ Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ¹Õ«
     unfollow: Õ‰Õ°Õ¥Õ¿Ö‡Õ¥Õ¬
   admin:
+    account_actions:
+      action: Ô¿Õ¡Õ¿Õ¡Ö€Õ¥Õ¬ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©Õ«Ö‚Õ¶
+      title: Ô»Ö€Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¶Õ¥Õ¬ Õ´Õ¸Õ¤Õ¥Ö€Õ¡Õ¿Õ¸Ö€Õ¡Õ¯Õ¡Õ¶ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€ %{acct}-Õ« Õ¾Ö€Õ¡Õµ
     account_moderation_notes:
       create: Ô¹Õ¸Õ²Õ¶Õ¥Õ¬ Õ¶Õ·Õ¸Ö‚Õ´
+      created_msg: Õ„Õ¸Õ¤Õ¥Ö€Õ¡ÖÕ«Õ¸Õ¶ Õ¶Õ¸Õ©Õ¨ Õ¢Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ½Õ¿Õ¥Õ²Õ®Õ¸Ö‚Õ¥Ö
       delete: Õ‹Õ¶Õ»Õ¥Õ¬
+      destroyed_msg: Õ„Õ¸Õ¤Õ¥Ö€Õ¡ÖÕ«Õ¸Õ¶ Õ¶Õ¸Õ©Õ¨ Õ¢Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ¾Õ¥Ö€Õ¡ÖÕ¸Ö‚Õ¥Ö
     accounts:
+      add_email_domain_block: Ô±Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬ Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ« Õ¿Õ«Ö€Õ¸ÕµÕ©Õ¨
+      approve: Ô¸Õ¶Õ¤Õ¸Ö‚Õ¶Õ¥Õ¬
+      approve_all: Ô¸Õ¶Õ¤Õ¸Ö‚Õ¶Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€Õ¨
+      approved_msg: Õ…Õ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¸Ö‚Õ¥Ö %{username}ÖŠÕ« Õ£Ö€Õ¡Õ¶ÖÕ´Õ¡Õ¶ ÕµÕ¡ÕµÕ¿Õ¨
+      are_you_sure: ÕŽÕ½Õ¿Õ¡ÕžÕ° Õ¥Õ½
+      avatar: Ô±Ö‚Õ¡Õ¿Õ¡Ö€
+      by_domain: Ô´Õ¸Õ´Õ§Õ¶
+      change_email:
+        changed_msg: Õ€Õ¡Õ·Õ¸Ö‚Õ« Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§Õ¶ Õ¢Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² ÖƒÕ¸ÖƒÕ¸ÕÕ¸Ö‚Õ¥Ö
+        current_email: Õ†Õ¥Ö€Õ¯Õ¡ÕµÕ«Õ½ Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§
+        label: Õ“Õ¸ÕÕ¥Õ¬ Õ§Õ¬. Õ°Õ¡Õ½ÖÕ§Õ¶
+        new_email: Õ†Õ¸Ö€ Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿
+        submit: Õ“Õ¸ÕÕ¥Õ¬ Õ§Õ¬. Õ°Õ¡Õ½ÖÕ§Õ¶
+        title: Õ“Õ¸ÕÕ¥Õ¬ Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ¨ %{username}Õ« Õ°Õ¡Õ´Õ¡Ö€
+      confirm: Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬
       confirmed: Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¾Õ¡Õ® Õ§
       confirming: Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¸Ö‚Õ´
+      delete: Õ‹Õ¶Õ»Õ¥Õ¬ Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ¨
       deleted: Õ‹Õ¶Õ»Õ¾Õ¡Õ® Õ§
+      demote: Ô±Õ½Õ¿Õ«Õ³Õ¡Õ¶Õ¡Õ¦Ö€Õ¯Õ¥Õ¬
+      destroyed_msg: "%{username}ÖŠÕ« Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬Õ¶Õ¥Ö€Õ¨ Õ°Õ¥Ö€Õ©Õ¡Õ£Ö€Õ¸Ö‚Õ¥Õ¬ Õ§ Õ¡Õ¶ÕµÕ¡ÕºÕ¡Õ² Õ»Õ¶Õ»Õ¸Ö‚Õ¸Õ²Õ¶Õ¥Ö€Õ« Õ·Õ¡Ö€Ö„Õ¸Ö‚Õ´"
       disable: Ô±Õ¶Õ»Õ¡Õ¿Õ¥Õ¬
       disable_two_factor_authentication: Ô±Õ¶Õ»Õ¡Õ¿Õ¥Õ¬ 2FA
       disabled: Ô±Õ¶Õ»Õ¡Õ¿Õ¾Õ¡Õ® Õ§
@@ -64,12 +124,16 @@ hy:
       domain: Ô´Õ¸Õ´Õ¥Õ¶
       edit: Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬
       email: Ô·Õ¬. ÖƒÕ¸Õ½Õ¿
+      email_status: Ô·Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ« Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ«Õ³Õ¡Õ¯
       enable: Õ„Õ«Õ¡ÖÕ¶Õ¥Õ¬
       enabled: Õ„Õ«Õ¡ÖÕ¾Õ¡Õ® Õ§
+      enabled_msg: "%{username}ÖŠÕ« Õ°Õ¡Õ·Õ«Ö‚Õ¨ Õ¢Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ¡ÕºÕ¡Õ½Õ¡Õ¼Õ¥ÖÕ¸Ö‚Õ¥Ö"
       followers: Õ€Õ¥Õ¿Ö‡Õ¸Ö€Õ¤Õ¶Õ¥Ö€
       follows: Õ€Õ¥Õ¿Ö‡Õ¸Õ²Õ¶Õ¥Ö€
       header: ÕŽÕ¥Ö€Õ¶Õ¡Õ£Õ«Ö€
       inbox_url: Õ„Õ¸Ö‚Õ¿Ö„Õ¡ÕµÕ«Õ¶ URL
+      invite_request_text: Õ„Õ«Õ¡Õ¶Õ¡Õ¬Õ¸Ö‚ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¶Õ¥Ö€Õ¨
+      invited_by: Õ€Ö€Õ¡Ö‚Õ«Ö€Õ¸Ö‚Õ¥Õ¬ Õ§
       ip: IP
       joined: Õ„Õ«Õ¡ÖÕ¡Õ® Õ§
       location:
@@ -77,89 +141,525 @@ hy:
         local: ÕÕ¥Õ²Õ¡ÕµÕ«Õ¶
         remote: Õ€Õ¥Õ¼Õ¡Õ¯Õ¡
         title: ÕÕ¥Õ²Õ¡Õ¤Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨
+      login_status: Õ„Õ¸Ö‚Õ¿Ö„Õ« Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ«Õ³Õ¡Õ¯
+      media_attachments: Õ„Õ¥Õ¤Õ«Õ¡ Õ¯ÖÕ¸Ö€Õ¤Õ¶Õ¥Ö€
+      memorialize: Ô´Õ¡Ö€Õ±Õ¶Õ¥Õ¬ Õ°Õ«Õ·Õ¡Õ¿Õ¡Õ¯Õ¡Ö€Õ¡Õ¶
+      memorialized: Õ…Õ«Õ·Õ¥ÖÕ¸Ö‚Õ¡Õ®
+      memorialized_msg: Ô²Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² %{username}ÖŠÕ¨ ÖƒÕ¸ÕÕ¸Ö‚Õ¥Ö ÕµÕ«Õ·Õ¡Õ¿Õ¡Õ¯Õ« Õ°Õ¡Õ·Õ¸Ö‚Õ«
       moderation:
         active: Ô±Õ¯Õ¿Õ«Õ¾
         all: Ô²Õ¸Õ¬Õ¸Ö€Õ¨
         pending: ÕÕºÕ¡Õ½Õ¸Ö‚Õ´
+        silenced: Ô¼Õ¼Õ¥ÖÕ¸Ö‚Õ¡Õ®
+        suspended: Ô¿Õ¡Õ½Õ¥ÖÕ¸Ö‚Õ¡Õ®
+        title: Õ„Õ¸Õ¤Õ¥Ö€Õ¡ÖÕ«Õ¡
+      moderation_notes: Õ„Õ¸Õ¤Õ¥Ö€Õ¡ÖÕ«Õ¡ÕµÕ« Õ¶Õ·Õ¸Ö‚Õ´Õ¶Õ¥Ö€
+      most_recent_activity: ÕŽÕ¥Ö€Õ»Õ«Õ¶ Õ¡Õ¯Õ¿Õ«Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨
+      most_recent_ip: ÕŽÕ¥Ö€Õ»Õ«Õ¶ IP
+      no_account_selected: ÕˆÕ¹ Õ´Õ« Õ°Õ¡Õ·Õ«Ö‚ Õ¹Õ« ÖƒÕ¸ÕÕ¸Ö‚Õ¥Õ¬, Õ«Õ¶Õ¹ÕºÕ§Õ½ Õ¶Õ¡Õ¥Ö‚, Õ¸Õ¹ Õ´Õ¥Õ¯Õ¨ Õ¹Õ« Õ¨Õ¶Õ¿Ö€Õ¸Ö‚Õ¥Õ¬
+      no_limits_imposed: ÕÕ¡Õ°Õ´Õ¡Õ¶Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´Õ¶Õ¥Ö€ Õ¹Õ¯Õ¡Õ¶
+      not_subscribed: Ô²Õ¡ÕªÕ¡Õ¶Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ¡Õ® Õ¹Õ§
+      pending: ÕÕºÕ¡Õ½Õ¸Ö‚Õ´ Õ§ Õ¾Õ¥Ö€Õ¡Õ¶Õ¡ÕµÕ´Õ¡Õ¶
+      perform_full_suspension: Ô¿Õ¡Õ½Õ¥ÖÕ¸Ö‚Õ´
+      promote: Ô±Õ»Õ¡Õ¯ÖÕ¥Õ¬
+      protocol: Õ€Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ¯Õ¡Ö€Õ£
       public: Õ€Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¡ÕµÕ«Õ¶
+      push_subscription_expires: PuSH Õ¢Õ¡ÕªÕ¡Õ¶Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ½ÕºÕ¡Õ¼Õ¸Ö‚Õ¸Ö‚Õ´ Õ§
+      redownload: Ô¹Õ¡Ö€Õ´Õ¡ÖÕ¶Õ¥Õ¬ Õ°Õ¡Õ·Õ«Ö‚Õ¨
+      redownloaded_msg: "%{username}ÖŠÕ« Õ°Õ¡Õ·Õ«Ö‚Õ¨ Õ½Õ¯Õ¦Õ¢Õ¶Õ¡Õ²Õ¢Õ«Ö‚Ö€Õ«Ö Õ¢Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ©Õ¡Ö€Õ´Õ¡ÖÕ¸Ö‚Õ¥Ö"
+      reject: Õ„Õ¥Ö€ÕªÕ¥Õ¬
+      reject_all: Õ„Õ¥Ö€ÕªÕ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€Õ¨
+      rejected_msg: Õ…Õ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢ Õ´Õ¥Ö€ÕªÕ¸Ö‚Õ¥Ö %{username}ÖŠÕ« Õ£Ö€Õ¡Õ¶ÖÕ´Õ¡Õ¶ ÕµÕ¡ÕµÕ¿Õ¨
+      remove_avatar: Õ€Õ¥Õ¼Õ¡ÖÕ¶Õ¥Õ¬ Õ¡Ö‚Õ¡Õ¿Õ¡Ö€Õ¨
+      remove_header: Õ€Õ¥Õ¼Õ¡ÖÕ¶Õ¥Õ¬ Õ£Õ¬ÕÕ¡Õ£Õ«Ö€Õ¨
+      removed_avatar_msg: Õ…Õ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢ Õ°Õ¥Õ¼Õ¡ÖÕ¸Ö‚Õ¥Ö %{username}ÖŠÕ« Õ¡Ö‚Õ¡Õ¿Õ¡Ö€Õ¨
+      removed_header_msg: Õ…Õ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢ Õ°Õ¥Õ¼Õ¡ÖÕ¸Ö‚Õ¥Ö %{username}ÖŠÕ« Õ£Õ¬ÕÕ¡Õ¶Õ¯Õ¡Ö€Õ¨
+      resend_confirmation:
+        already_confirmed: Õ•Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¶ Õ¡Ö€Õ¤Õ§Õ¶ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¸Ö‚Õ¡Õ® Õ§
+        send: Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ´Õ¡Õ¶ Õ«Õ´Õ¡Õ¯Õ¶ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¥Õ¬ Õ¯Ö€Õ¯Õ«Õ¶
+        success: Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ´Õ¡Õ¶ Õ«Õ´Õ¡Õ¯Õ¨ Õ¢Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¸Ö‚Õ¥Ö
+      reset: ÕŽÕ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ¥Õ¬
+      reset_password: ÕŽÕ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ¥Õ¬ Õ£Õ¡Õ²Õ¿Õ¡Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨
+      resubscribe: Ô¿Ö€Õ¯Õ«Õ¶ Õ¢Õ¡ÕªÕ¡Õ¶Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ¥Õ¬
+      role: Ô¹Õ¸ÕµÕ¬Õ¿Õ¸Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€
+      roles:
+        admin: Ô±Õ¤Õ´Õ«Õ¶Õ«Õ½Õ¿Ö€Õ¡Õ¿Õ¸Ö€
+        moderator: Õ„Õ¸Õ¤Õ¥Ö€Õ¡Õ¿Õ¸Ö€
+        staff: Ô±Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¦Õ´
+        user: OÕ£Õ¿Õ¡Õ¿Õ§Ö€
+      search: ÕˆÖ€Õ¸Õ¶Õ¥Õ¬
+      search_same_email_domain: Ô±ÕµÕ¬ Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€ Õ¶Õ¸ÕµÕ¶ Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ« Õ¤Õ¸Õ´Õ§ÕµÕ¶Õ¸Õ¾
+      search_same_ip: Ô±ÕµÕ¬ Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€ Õ¶Õ¸ÕµÕ¶ IPÖŠÕ¸Õ¾
+      sensitive: Ô¶Õ£Õ¡ÕµÕ¸Ö‚Õ¶
+      sensitized: Õ¶Õ·Õ¸Ö‚Õ¥Ö Õ¸Ö€ÕºÕ§Õ½ Õ¤Õ«Ö‚Ö€Õ¡Õ¦Õ£Õ¡Ö
+      shared_inbox_url: Ô¸Õ¶Õ¤Õ°Õ¡Õ¶Õ¸Ö‚Ö€ Õ´Õ¸Ö‚Õ¿Ö„Õ¡ÕµÕ«Õ¶ URL
+      show:
+        created_reports: Ô¿Õ¡Õ¦Õ´Õ¥Õ¬ Õ¢Õ¸Õ²Õ¸Ö„Õ¶Õ¥Ö€
+        targeted_reports: Ô±ÕµÕ¬Õ¸Ö Õ¯Õ¸Õ²Õ´Õ«Ö Õ¢Õ¸Õ²Õ¸Ö„Õ¡Ö€Õ¯Õ¸Ö‚Õ¡Õ®
+      silence: Ô¼Õ¼Õ¸Ö‚Õ©Õ«Ö‚Õ¶
+      silenced: Ô¼Õ¼Õ¥ÖÕ¸Ö‚Õ¡Õ®
+      statuses: Ô³Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€
+      subscribe: Ô²Õ¡ÕªÕ¡Õ¶Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ¥Õ¬
+      suspended: Ô¿Õ¡Õ½Õ¥ÖÕ¸Ö‚Õ¡Õ®
+      suspension_irreversible: Õ€Õ¡Õ·Õ¸Ö‚Õ« Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬Õ¶Õ¥Ö€Õ¨ Õ¡Õ¶Õ¤Õ¡Ö€Õ± Õ»Õ¶Õ»Õ¸Ö‚Õ¥ÖÕ«Õ¶Ö‰ Ô´Õ¸Ö‚ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ¡ÕºÕ¡Õ¯Õ¡Õ½Õ¥ÖÕ¶Õ¥Õ¬ Õ°Õ¡Õ·Õ«Ö‚Õ¨Õ Õ¤Õ¡Ö€Õ±Õ¶Õ¥Õ¬Õ¸Õ¾ Õ¡ÕµÕ¶ Õ¯Õ«Ö€Õ¡Õ¼Õ¥Õ¬Õ«, Õ¢Õ¡ÕµÖ Õ¡ÕµÕ¶ Õ¹Õ« Õ¾Õ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ« Õ¶Õ¡ÕÕ¯Õ«Õ¶ Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬Õ¶Õ¥Ö€Õ¨Ö‰
+      suspension_reversible_hint_html: Õ€Õ¡Õ·Õ«Ö‚Õ¨ Õ¯Õ¡Õ½Õ¥ÖÕ¸Ö‚Õ¥Ö, Õ¥Ö‚ Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬Õ¶Õ¥Ö€Õ¶ Õ¡Õ´Õ¢Õ¸Õ²Õ»Õ¡ÕºÕ§Õ½ Õ¯Õ¨ Õ¾Õ¥Ö€Õ¡ÖÕ¸Ö‚Õ« %{date}Õ«Õ¶Ö‰ Õ„Õ«Õ¶Õ¹Õ¥Ö‚ Õ¡ÕµÕ¤, Õ°Õ¡Õ·Õ«Ö‚Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ§ Õ¾Õ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ¸Ö‚Õ¥Õ¬Õ Õ¡Õ¼Õ¡Õ¶Ö Õ¯Õ¸Õ²Õ´Õ¶Õ¡Õ¯Õ« Õ¡Õ¦Õ¤Õ¥ÖÕ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ«Ö‰ ÔµÕ©Õ§ ÖÕ¡Õ¶Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ¥Õ½ Õ¾Õ¥Ö€Õ¡ÖÕ¶Õ¥Õ¬ Õ°Õ¡Õ·Õ¸Ö‚Õ« Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬Õ¶Õ¥Ö€Õ¨ Õ´Õ«Õ¡Õ¶Õ£Õ¡Õ´Õ«Ö, Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ¤Õ¡ Õ¡Õ¶Õ¥Õ¬ Õ¶Õ¥Ö€Ö„Õ¥Ö‚Õ¸Ö‚Õ´Ö‰
+      time_in_queue: Õ€Õ¥Ö€Õ©Õ¸Ö‚Õ´ Õ§ %{time}
+      title: Õ€Õ¡Õ·Õ«Ö‚Õ¶Õ¥Ö€
+      unconfirmed_email: Õ‰Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¸Ö‚Õ¡Õ® Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§
+      undo_sensitized: ÔµÕ¿Õ¡Ö€Õ¯Õ¥Õ¬ Õ¤Õ«Ö‚Ö€Õ¡Õ¦Õ£Õ¡ÖÕ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨
+      undo_silenced: ÔµÕ¿Õ¡Ö€Õ¯Õ¥Õ¬ Õ¬Õ¼Õ¥ÖÕ¸Ö‚Õ´Õ¨
+      undo_suspension: ÔµÕ¿Õ¡Ö€Õ¯Õ¥Õ¬ Õ¯Õ¡Õ½Õ¥ÖÕ¸Ö‚Õ´Õ¨
+      unsilenced_msg: "%{username}ÖŠÕ« Õ°Õ¡Õ·Õ«Ö‚Õ¨ Õ¢Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ¤Õ¡Ö€Õ±Õ¡Ö‚ Õ¡Õ¶Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¡ÖƒÕ¡Õ¯"
+      unsubscribe: Ô±ÕºÕ¡Õ¢Õ¡ÕªÕ¡Õ¶Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ¥Õ¬
+      unsuspended_msg: "%{username}ÖŠÕ« Õ°Õ¡Õ·Õ«Ö‚ Õ¢Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ¡ÕºÕ¡Õ¯Õ¡Õ½Õ¥ÖÕ¸Ö‚Õ¥ÖÖ‰"
       username: Õ„Õ¸Ö‚Õ¿Ö„Õ¡Õ¶Õ¸Ö‚Õ¶
+      view_domain: ÕÕ¥Õ½Õ¶Õ¥Õ¬ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ¡Õ´ÖƒÕ¸ÖƒÕ¸Ö‚Õ´Õ¨
       warn: Õ†Õ¡ÕÕ¡Õ¦Õ£Õ¸Ö‚Õ·Õ¡ÖÕ¸Ö‚Õ´
       web: ÕŽÕ¥Õ¢
+      whitelisted: Ô¹Õ¸ÕµÕ¬Õ¡Õ¿Ö€Õ¥Õ¬ Ö†Õ¥Õ¤Õ¥Ö€Õ¡ÖÕ«Õ¡ÕµÕ« Õ°Õ¡Õ´Õ¡Ö€
     action_logs:
       action_types:
+        assigned_to_self_report: Ô²Õ¸Õ²Õ¸Ö„Õ¥Õ¬
+        change_email_user: Õ“Õ¸ÕÕ¥Õ¬ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ» Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§Õ¶
+        confirm_user: Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ»Õ¨
+        create_account_warning: ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ¦Õ£Õ¸Ö‚Õ·Õ¡ÖÕ¸Ö‚Õ´
+        create_announcement: ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬ ÕµÕ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶
+        create_custom_emoji: ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ½Õ¥ÖƒÕ¡Õ¯Õ¡Õ¶ Õ§Õ´Õ¸Õ»Õ«Õ¶Õ¥Ö€Õ¨
+        create_domain_allow: ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ©Õ¸ÕµÕ¬Õ¿Õ¸Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶
+        create_domain_block: ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´
+        create_email_domain_block: ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§Õ« Õ¤Õ¸Õ´Õ§ÕµÕ¶Õ« Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´
+        create_ip_block: ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬ IP Õ¯Õ¡Õ¶Õ¸Õ¶
+        demote_user: Ô±Õ½Õ¿Õ«Õ³Õ¡Õ¶Õ¡Õ¦Ö€Õ¯Õ¥Õ¬ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ»Õ¨
+        destroy_announcement: Õ‹Õ¶Õ»Õ¥Õ¬ ÕµÕ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨
+        destroy_custom_emoji: Õ‹Õ¶Õ»Õ¥Õ¬ Õ§Õ´Õ¸Õ»Õ«Õ¶
+        destroy_domain_allow: Õ‹Õ¶Õ»Õ¥Õ¬ Õ¤Õ¸Õ´Õ§Õ¶Õ« Õ©Õ¸ÕµÕ¬Õ¿Õ¸Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨
+        destroy_domain_block: Ô±ÕºÕ¡Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬ Õ¤Õ¸Õ´Õ§Õ¶Õ¨
+        destroy_email_domain_block: Ô±ÕºÕ¡Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬ Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§Õ« Õ¤Õ¸Õ´Õ§Õ¶Õ¨
+        destroy_ip_block: Õ‹Õ¶Õ»Õ¥Õ¬ IP Õ¯Õ¡Õ¶Õ¸Õ¶Õ¨
+        destroy_status: Õ‹Õ¶Õ»Õ¥Õ¬ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¨
         disable_2fa_user: Ô±Õ¶Õ»Õ¡Õ¿Õ¥Õ¬ 2FA
+        disable_custom_emoji: Ô±Õ¶Õ»Õ¡Õ¿Õ¥Õ¬ Õ½Õ¥ÖƒÕ¡Õ¯Õ¡Õ¶ Õ§Õ´Õ¸Õ»Õ«Õ¶Õ¥Ö€Õ¨
+        disable_user: Ô±ÕºÕ¡Õ¡Õ¯Õ¿Õ«Ö‚Õ¡ÖÕ¶Õ¥Õ¬ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ»Õ¨
+        enable_custom_emoji: Õ„Õ«Õ¡ÖÕ¶Õ¥Õ¬ Õ½Õ¥ÖƒÕ¡Õ¯Õ¡Õ¶ Õ§Õ´Õ¸Õ»Õ«Õ¶Õ¥Ö€Õ¨
+        enable_user: Ô±Õ¯Õ¿Õ«Ö‚Õ¡ÖÕ¶Õ¥Õ¬ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ»Õ¨
+        memorialize_account: Õ…Õ«Õ·Õ¥Õ¬ Õ°Õ¡Õ·Õ«Ö‚Õ¨
+        promote_user: Ô±Õ»Õ¡Õ¯ÖÕ¥Õ¬ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ»Õ¨
+        remove_avatar_user: Õ€Õ¥Õ¼Õ¡ÖÕ¶Õ¥Õ¬ Õ¡Ö‚Õ¡Õ¿Õ¡Ö€Õ¨
+        reopen_report: ÕŽÕ¥Ö€Õ¡Õ¢Õ¡ÖÕ¥Õ¬ Õ¢Õ¸Õ²Õ¸Ö„Õ¨
+        reset_password_user: ÕŽÕ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ¥Õ¬ Õ£Õ¡Õ²Õ¿Õ¡Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨
+        resolve_report: Ô¼Õ¸Ö‚Õ®Õ¡Ö€Õ¥Õ¬ Õ¦Õ¥Õ¯Õ¸ÕµÖÕ¨
+        sensitive_account: Õ€Õ¡Õ·Õ¸Ö‚Õ« Õ´Õ¥Õ¤Õ«Õ¡Õ¶ Õ¶Õ·Õ¥Õ¬ Õ¸Ö€ÕºÕ§Õ½ Õ¤Õ«Ö‚Ö€Õ¡Õ¦Õ£Õ¡Ö
+        silence_account: Ô¼Õ¼Õ¥ÖÕ¶Õ¥Õ¬ Õ°Õ¡Õ·Õ«Ö‚Õ¨
+        suspend_account: Ô¿Õ¡Õ½Õ¥ÖÕ¶Õ¥Õ¬ Õ°Õ¡Õ·Õ«Ö‚Õ¨
+        unassigned_report: Õ€Õ¡Õ¶Õ¥Õ¬ Õ¢Õ¸Õ²Õ¸Ö„Õ¨
+        unsensitive_account: Õ€Õ¡Õ·Õ¸Ö‚Õ« Õ´Õ¥Õ¤Õ«Õ¡Õ¶ Õ¹Õ¶Õ·Õ¥Õ¬ Õ¸Ö€ÕºÕ§Õ½ Õ¤Õ«Ö‚Ö€Õ¡Õ¦Õ£Õ¡Ö
+        unsilence_account: Ô¼Õ½Õ¥Õ¬ Õ°Õ¡Õ·Õ¸Ö‚Õ«Õ¶
+        unsuspend_account: Ô±ÕºÕ¡Õ¯Õ¡Õ½Õ¥ÖÕ¶Õ¥Õ¬ Õ°Õ¡Õ·Õ«Ö‚Õ¨
+        update_announcement: Ô¹Õ¡Ö€Õ´Õ¡ÖÕ¶Õ¥Õ¬ ÕµÕ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨
+        update_custom_emoji: Ô¹Õ¡Ö€Õ´Õ¡ÖÕ¶Õ¥Õ¬ Õ½Õ¥ÖƒÕ¡Õ¯Õ¡Õ¶ Õ§Õ´Õ¸Õ»Õ«Õ¶Õ¥Ö€Õ¨
+        update_domain_block: Ô¹Õ¡Ö€Õ´Õ¡ÖÕ¶Õ¥Õ¬ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´Õ¨
+        update_status: Ô¹Õ¡Ö€Õ´Õ¡ÖÕ¶Õ¥Õ¬ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¨
+      actions:
+        assigned_to_self_report: "%{name} Õ¢Õ¸Õ²Õ¸Ö„Õ¥Õ¬ Õ§ %{target} Õ«Ö€Õ¥Õ¶Ö Õ°Õ¡Õ´Õ¡Ö€"
+        change_email_user: "%{name} ÖƒÕ¸ÖƒÕ¸ÕÕ¥Õ¬ Õ§ %{target} Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ» Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§Õ¶"
+        confirm_user: "%{name} Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬ Õ§ %{target} Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ» Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§Õ¶"
+        create_account_warning: "%{name} Õ¦Õ£Õ¸Ö‚Õ·Õ¡ÖÖ€Õ¥Õ¬ Õ§ %{target}Õ«Õ¶"
+        create_announcement: "%{name} Õ½Õ¿Õ¥Õ²Õ®Õ¥Ö Õ¶Õ¸Ö€ ÕµÕ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶ %{target}"
+        create_custom_emoji: "%{name} Õ¾Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ Õ§ Õ¶Õ¸Ö€ Õ§Õ´Õ¸Õ»Õ«Õ %{target}"
+        create_domain_allow: "%{name} Õ©Õ¸ÕµÕ¬Õ¡Õ¿Ö€Õ¥Õ¬ Ö†Õ¥Õ¤Õ¥Ö€Õ¡ÖÕ«Õ¡Õ¶ %{target} Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ°Õ¥Õ¿"
+        create_domain_block: "%{name} Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Ö %{target} Õ¿Õ«Ö€Õ¸ÕµÕ©Õ¨"
+        create_email_domain_block: "%{name} Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Ö Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ« Õ¿Õ«Ö€Õ¸ÕµÕ© %{target}"
+        create_ip_block: "%{name} Õ½Õ¿Õ¥Õ²Õ®Õ¥Ö Õ¯Õ¡Õ¶Õ¸Õ¶ %{target} IPÖŠÕ« Õ°Õ¡Õ´Õ¡Ö€"
+        demote_user: "%{name} Õ¡Õ½Õ¿Õ«Õ³Õ¡Õ¶Õ¡Õ¦Ö€Õ¯Õ¥Ö Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ» %{target}"
+        destroy_announcement: "%{name} Õ»Õ¶Õ»Õ¥Ö ÕµÕ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶ %{target}"
+        destroy_custom_emoji: "%{name} Õ»Õ¶Õ»Õ¥Õ¬ Õ§ %{target} Õ§Õ´Õ¸Õ»Õ«Õ¶"
+        destroy_domain_allow: "%{name} Õ¹Õ©Õ¸ÕµÕ¬Õ¡Õ¿Ö€Õ¥Ö Ö†Õ¥Õ¤Õ¥Ö€Õ¡ÖÕ«Õ¡Õ¶ %{target} Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ°Õ¥Õ¿"
+        destroy_domain_block: "%{name} Õ¡ÕºÕ¡Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Ö Õ¿Õ«Ö€Õ¸ÕµÕ© %{target}"
+        destroy_email_domain_block: "%{name} Õ¡ÕºÕ¡Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Ö Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ« Õ¿Õ«Ö€Õ¸ÕµÕ© %{target}"
+        destroy_ip_block: "%{name} Õ»Õ¶Õ»Õ¥Ö Õ¯Õ¡Õ¶Õ¸Õ¶Õ¨ %{target} IPÖŠÕ« Õ°Õ¡Õ´Õ¡Ö€"
+        destroy_status: "%{name} Õ»Õ¶Õ»Õ¥Ö %{target}Õ« Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´"
+        disable_2fa_user: "%{name}Õ¨ Õ¯Õ¡Õ½Õ¥ÖÖ€Õ¥Ö 2F ÕºÕ¡Õ°Õ¡Õ¶Õ»Õ¨ %{target} Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ» Õ°Õ¡Õ´Õ¡Ö€"
+        disable_custom_emoji: "%{name} Õ¡ÕºÕ¡Õ¯Õ¿Õ«Ö‚Õ¡ÖÖ€Õ¥Õ¬ Õ§ %{target} Õ§Õ´Õ¸Õ»Õ«Õ¶"
+        disable_user: "%{name} Õ¡Õ¶Õ»Õ¡Õ¿Õ¥Õ¬ Õ§ Õ´Õ¸Ö‚Õ¿Ö„Õ¨ %{target} Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ» Õ°Õ¡Õ´Õ¡Ö€"
+        enable_custom_emoji: "%{name} Õ¡Õ¯Õ¿Õ«Õ¾Õ¡ÖÖ€Õ¥Õ¬ Õ§ %{target} Õ§Õ´Õ¸Õ»Õ«Õ¶"
+        enable_user: "%{name} Õ©Õ¸ÕµÕ¬Õ¡Õ¿Ö€Õ¥Ö Õ´Õ¸Ö‚Õ¿Ö„ %{target} Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ» Õ°Õ¡Õ´Õ¡Ö€"
+        memorialize_account: "%{name} Õ¤Õ¡Ö€Õ±Ö€Õ¥Ö %{target}Õ« Õ°Õ¡Õ·Õ«Ö‚Õ¨ ÕµÕ«Õ·Õ¡Õ¿Õ¡Õ¯Õ« Õ§Õ»"
+        promote_user: "%{name} Õ¡Õ»Õ¡Õ¯ÖÕ¥Ö Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ»Õ¨ %{target}"
+        remove_avatar_user: "%{name} Õ°Õ¥Õ¼Õ¡ÖÖ€Õ¥Ö %{target}Õ« Õ¡Ö‚Õ¡Õ¿Õ¡Ö€Õ¨"
+        reopen_report: "%{name} Õ¾Õ¥Ö€Õ¡Õ¢Õ¡ÖÕ¥Ö Õ¢Õ¸Õ²Õ¸Ö„ %{target}"
+        reset_password_user: "%{name} Õ¾Õ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ¥Ö Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ» Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨ %{target}"
+        resolve_report: "%{name} Õ¬Õ¸Ö‚Õ®Õ¡Ö€Õ¥Ö Õ¢Õ¸Õ²Õ¸Ö„Õ¨ %{target}"
+        sensitive_account: "%{name}Õ¨ Õ¶Õ·Õ¥Ö %{target}Õ« Õ´Õ¥Õ¤Õ«Õ¡Õ¶ Õ¸Ö€ÕºÕ§Õ½ Õ¦Õ£Õ¡ÕµÕ¸Ö‚Õ¶"
+        silence_account: "%{name} Õ¬Õ¼Õ¥ÖÖ€Õ¥Ö %{target}Õ« Õ°Õ¡Õ·Õ«Ö‚Õ¨"
+        suspend_account: "%{name} Õ¬Õ¼Õ¥ÖÖ€Õ¥Ö %{target}Õ« Õ°Õ¡Õ·Õ«Ö‚Õ¨"
+        unassigned_report: "%{name} Õ¹Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¸Ö‚Õ¡Õ® Õ¢Õ¸Õ²Õ¸Ö„ %{target}"
+        unsensitive_account: "%{name}Õ¨ Õ°Õ¥Õ¼Õ¡ÖÖ€Õ¥Ö %{target}ÖŠÕ« Õ´Õ¥Õ¤Õ«Õ¡ÕµÕ« Õ¦Õ£Õ¡ÕµÕ¸Ö‚Õ¶ Õ¶Õ·Õ¸Ö‚Õ´Õ¨"
+        unsilence_account: "%{name}ÖŠÕ¨ Õ°Õ¡Õ¶Õ¥Ö Õ¬Õ¼Õ¥ÖÕ¸Ö‚Õ´Õ¨ %{target}ÖŠÕ« Õ°Õ¡Õ·Õ¸Ö‚Õ«Ö"
+        unsuspend_account: "%{name}Õ¨ Õ¡ÕºÕ¡Õ¯Õ¡Õ½Õ¥ÖÖ€Õ¥Ö %{target}Õ« Õ°Õ¡Õ·Õ«Ö‚Õ¨"
+        update_announcement: "%{name}Õ¨ Õ©Õ¡Ö€Õ´Õ¡ÖÖ€Õ¥Ö %{target}Õ« ÕµÕ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨"
+        update_custom_emoji: "%{name} Õ©Õ¡Ö€Õ´Õ¡ÖÖ€Õ¥Õ¬ Õ§ %{target} Õ§Õ´Õ¸Õ»Õ«Õ¶"
+        update_domain_block: "%{name}Õ¨ Õ©Õ¡Ö€Õ´Õ¡ÖÖ€Õ¥Ö %{target}Õ« Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´Õ¨"
+        update_status: "%{name}Õ¨ Õ©Õ¡Ö€Õ´Õ¡ÖÖ€Õ¥Ö %{target}Õ« Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ«Õ³Õ¡Õ¯Õ¨"
+      deleted_status: "(Õ»Õ¶Õ»Õ¸Ö‚Õ¡Õ® Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´)"
+      empty: ÕˆÕ¹ Õ´Õ« Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´ Õ¹Õ¯Õ¡ÕµÖ‰
+      filter_by_action: Ô¶Õ¿Õ¥Õ¬ Õ¨Õ½Õ¿ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©Õ¥Õ¡Õ¶
+      filter_by_user: Ô¶Õ¿Õ¥Õ¬ Õ¨Õ½Õ¿ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ»
+      title: ÕÕ¿Õ¸Ö‚Õ£Õ´Õ¡Õ¶ Õ´Õ¡Õ¿Õ¥Õ¡Õ¶
     announcements:
+      destroyed_msg: Õ…Õ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ¢Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ»Õ¶Õ»Õ¸Ö‚Õ¥Ö
+      edit:
+        title: Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬ ÕµÕ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨
+      empty: ÕˆÕ¹ Õ´Õ« ÕµÕ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¹Õ£Õ¿Õ¶Õ¸Ö‚Õ¥Ö
       live: ÕˆÖ‚Õ²Õ«Õ²
+      new:
+        create: ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬ ÕµÕ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶
+        title: Õ†Õ¸Ö€ ÕµÕ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶
+      published_msg: Õ…Õ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ¢Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ°Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¸Ö‚Õ¥Ö
+      scheduled_for: ÕŠÕ¬Õ¡Õ¶Õ¡Ö‚Õ¸Ö€Õ¸Ö‚Õ¡Õ® Õ§ %{time}Õ«Õ¶
+      scheduled_msg: Õ…Õ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ¶Õ¡ÕÕ¡ÕºÕ¡Õ¿Ö€Õ¡Õ½Õ¿Õ¸Ö‚Õ¥Ö Õ°Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ´Õ¡Õ¶
+      title: Õ…Õ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€
+      unpublished_msg: Õ…Õ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ¢Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ¡ÕºÕ¡Õ°Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¸Ö‚Õ¥Ö
+      updated_msg: Õ…Õ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ¢Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ©Õ¡Ö€Õ´Õ¡ÖÕ¸Ö‚Õ¥Ö
     custom_emojis:
+      assign_category: Ô¿ÖÕ¥Õ¬ Õ¯Õ¡Õ¿Õ¥Õ£Õ¸Ö€Õ«Õ¡
+      by_domain: ÕÕ«Ö€Õ¸ÕµÕ©
+      copied_msg: Ô·Õ´Õ¸Õ»Õ«Õ« Õ¿Õ¥Õ²Õ¡Õ¯Õ¡Õ¶ Ö…Ö€Õ«Õ¶Õ¡Õ¯Õ¨ Õ°Õ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢ Õ½Õ¿Õ¥Õ²Õ®Õ¸Ö‚Õ¡Õ® Õ§
       copy: ÕŠÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Õ¬
+      copy_failed_msg: Õ‰ÕµÕ¡Õ»Õ¸Õ²Ö‚Õ¥Ö Õ½Õ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ§Õ´Õ¸Õ»Õ«Õ« Õ¿Õ¥Õ²Õ¡Õ¯Õ¡Õ¶ Ö…Ö€Õ«Õ¶Õ¡Õ¯
+      create_new_category: ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ¶Õ¸Ö€ Õ¯Õ¡Õ¿Õ¥Õ£Õ¸Ö€Õ«Õ¡
+      created_msg: Ô·Õ´Õ¸Õ»Õ«Õ¶ ÕµÕ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢ Õ½Õ¿Õ¥Õ²Õ®Õ¸Ö‚Õ¥Ö
       delete: Õ‹Õ¶Õ»Õ¥Õ¬
+      destroyed_msg: Ô·Õ´Õ¸Õ»Õ«Õ¶ ÕµÕ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢ Õ»Õ¶Õ»Õ¸Ö‚Õ¥Ö
       disable: Ô±Õ¶Õ»Õ¡Õ¿Õ¥Õ¬
+      disabled: Ô±Õ¶Õ»Õ¡Õ¿Õ¸Ö‚Õ¡Õ®
+      disabled_msg: Õ…Õ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢ Õ¯Õ¡Õ½Õ¥ÖÕ¸Ö‚Õ¥Ö Õ§Õ´Õ¸Õ»Õ«Õ¶
+      emoji: Ô¶Õ´Õ¡ÕµÕ¬Õ«Õ¯
+      enable: Õ„Õ«Õ¡ÖÕ¶Õ¥Õ¬
+      enabled: Õ„Õ«Õ¡ÖÕ¸Ö‚Õ¡Õ®
+      enabled_msg: Õ…Õ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢ Õ´Õ«Õ¡ÖÕ¸Ö‚Õ¥Ö Õ§Õ´Õ¸Õ»Õ«Õ¶
+      image_hint: PNG Õ´Õ«Õ¶Õ¹Õ¥Ö‚ 50KB
       list: Õ‘Õ¡Õ¶Õ¯
+      listed: Õ‘Õ¸Ö‚ÖÕ¡Õ¯Õ¡Õ£Ö€Õ¸Ö‚Õ¡Õ®
+      new:
+        title: Ô±Ö‚Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ Õ¶Õ¸Ö€ Õ§Õ´Õ¸Õ»Õ«
+      not_permitted: ÕÕ¸Ö‚Õ¥Õ¡Õ¬ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶ Õ¡Õ¶Õ¥Õ¬Õ¸Ö‚ Õ©Õ¸ÕµÕ¬Õ¿Õ¸Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¹Õ¸Ö‚Õ¶Õ¥Õ½
       overwrite: ÕŽÕ¥Ö€Õ¡Õ£Ö€Õ¥Õ¬
+      shortcode: Õ€Õ¡ÕºÕ¡Õ¾Õ¸Ö‚Õ´
+      shortcode_hint: Ô±Õ´Õ¥Õ¶Õ¡Ö„Õ«Õ¹Õ¨ 2 Õ¶Õ«Õ·, Õ´Õ«Õ¡ÕµÕ¶ Õ¡ÕµÕ¢Õ¢Õ¥Õ¶Õ¡Õ¯Õ¡Õ¶ Õ¶Õ«Õ·Õ¥Ö€, Õ©Õ¸Ö‚Õ¥Ö€ Õ¥Ö‚ Õ¨Õ¶Õ¤Õ£Õ®Õ«Õ¯Õ¶Õ¥Ö€
+      title: ÕÕ¥ÖƒÕ¡Õ¯Õ¡Õ¶ Õ§Õ´Ö…Õ»Õ«Õ¶Õ¥Ö€
+      uncategorized: Õ‰Õ¤Õ¡Õ½Õ¡Õ¯Õ¡Ö€Õ£Õ¸Ö‚Õ¡Õ®
+      unlist: Ô±ÕºÕ¡ÖÕ¸Ö‚ÖÕ¡Õ¯Õ¡Õ£Ö€Õ¸Ö‚Õ´
+      unlisted: Ô¾Õ¡Õ®Õ¸Ö‚Õ¯
+      update_failed_msg: Ô·Õ´Õ¸Õ»Õ«Õ¶ Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ©Õ¡Ö€Õ´Õ¡ÖÕ¸Ö‚Õ¥Õ¬
+      updated_msg: Ô·Õ´Õ¸Õ»Õ«Õ¶ Õ©Õ¡Ö€Õ´Õ¡ÖÕ¸Ö‚Õ¥Ö
       upload: ÕŽÕ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬
+    dashboard:
+      authorized_fetch_mode: Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£ Õ¥Õ²Õ¡Õ¶Õ¡Õ¯
+      config: Ô¿Õ¡Ö€Õ£Õ¡Ö‚Õ¸Ö€Õ¸Ö‚Õ´
+      feature_deletions: Õ€Õ¡Õ·Õ¸Ö‚Õ« Õ°Õ¥Õ¼Õ¡ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€
+      feature_invites: Õ€Ö€Õ¡Ö‚Õ§Ö€Õ« ÕµÕ²Õ¸Ö‚Õ´Õ¶Õ¥Ö€
+      feature_profile_directory: Õ•Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ» Õ´Õ¡Õ¿Õ¥Õ¡Õ¶
+      feature_registrations: Ô³Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€
+      feature_relay: Õ–Õ¥Õ¤Õ¥Ö€Õ¡ÖÕ«Õ¡ÕµÕ« Õ·Õ¥Ö€Õ¿
+      feature_spam_check: Õ€Õ¡Õ¯Õ¡-Õ½ÕºÕ¡Õ´
+      feature_timeline_preview: Õ€Õ¸Õ½Ö„Õ« Õ¶Õ¡ÕÕ¡Õ¤Õ«Õ¿Õ¸Ö‚Õ´
+      features: Õ…Õ¡Õ¿Õ¯Õ¡Õ¶Õ«Õ·Õ¶Õ¥Ö€
+      hidden_service: Õ–Õ¥Õ¤Õ¥Ö€Õ¡ÖÕ«Õ¡ Õ©Õ¡Ö„Õ¶Õ¸Ö‚Õ¡Õ® Õ®Õ¡Õ¼Õ¡ÕµÕ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ« Õ°Õ¥Õ¿
+      open_reports: Õ¢Õ¡Ö Õ¢Õ¸Õ²Õ¸Ö„Õ¶Õ¥Ö€
+      pending_tags: ÕºÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€Õ¶ Õ½ÕºÕ¡Õ½Õ¸Ö‚Õ´ Õ¥Õ¶ Õ¾Õ¥Ö€Õ¡Õ¶Õ¡ÕµÕ´Õ¡Õ¶
+      pending_users: Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€Õ¶ Õ½ÕºÕ¡Õ½Õ¸Ö‚Õ´ Õ¥Õ¶ Õ¾Õ¥Ö€Õ¡Õ¶Õ¡ÕµÕ´Õ¡Õ¶
+      recent_users: ÕŽÕ¥Ö€Õ»Õ«Õ¶ Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€Õ¨
+      search: ÕÕ¥Ö„Õ½Õ¿Õ¡ÕµÕ«Õ¶ Õ¸Ö€Õ¸Õ¶Õ¸Ö‚Õ´
+      single_user_mode: Õ„Õ§Õ¯ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ» Õ¼Õ¥ÕªÕ«Õ´
+      software: Ô¾Ö€Õ¡Õ£Ö€Õ¡ÕµÕ«Õ¶ Õ¡ÕºÕ¡Õ°Õ¸Õ¾Õ¸Ö‚Õ´
+      space: ÕÕ¡Ö€Õ¡Õ®Ö„Õ« Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ´
+      title: Ô³Õ¸Ö€Õ®Õ«Ö„Õ¶Õ¥Ö€Õ« Õ¾Õ¡Õ°Õ¡Õ¶Õ¡Õ¯
+      total_users: Õ¨Õ¶Õ¤Õ°Õ¡Õ¶Õ¸Ö‚Ö€ Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€
+      trends: Ô¹Ö€Õ¥Õ¶Õ¤Õ¶Õ¥Ö€
+      week_interactions: Õ·Õ¡Õ¢Õ¡Õ©Õ¸Ö‚Õ¡Õµ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€
+      week_users_active: Õ·Õ¡Õ¢Õ¡Õ©Õ¸Ö‚Õ¡Õµ Õ¡Õ¯Õ¿Õ«Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶
+      week_users_new: Õ·Õ¡Õ¢Õ¡Õ©Õ¸Ö‚Õ¡Õµ Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€
+      whitelist_mode: ÕÕ¡Õ°Õ´Õ¡Õ¶Õ¡ÖƒÕ¡Õ¯ Ö†Õ¥Õ¤Õ¥Ö€Õ¡ÖÕ«Õ¡ÕµÕ« Õ¼Õ¥ÕªÕ«Õ´
+    domain_allows:
+      add_new: Ô¹Õ¸ÕµÕ¬Õ¡Õ¿Ö€Õ¥Õ¬ Ö†Õ¥Õ¤Õ¥Ö€Õ¡ÖÕ«Õ¡ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ°Õ¥Õ¿
+      created_msg: ÕÕ«Ö€Õ¸ÕµÕ©Õ¨ ÕµÕ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢ Õ©Õ¸ÕµÕ¬Õ¡Õ¿Ö€Õ¸Ö‚Õ¥Ö Ö†Õ¥Õ¤Õ¥Ö€Õ¡ÖÕ¸Ö‚Õ¥Õ¬Õ¸Ö‚
+      undo: Õ‰Õ©Õ¸ÕµÕ¬Õ¡Õ¿Ö€Õ¥Õ¬ Ö†Õ¥Õ¤Õ¥Ö€Õ¡ÖÕ«Õ¡Õ¶ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ°Õ¥Õ¿
     domain_blocks:
+      add_new: Ô±Ö‚Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ Õ¶Õ¸Ö€ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´
+      created_msg: ÕÕ«Ö€Õ¸ÕµÕ©Õ« Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´Õ¶ Õ¨Õ¶Õ©Õ¡ÖÕ¡Ö‚
+      destroyed_msg: ÕÕ«Ö€Õ¸ÕµÕ©Õ« Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´Õ¨ Õ¥Õ¿Õ¡Ö€Õ¯Õ¸Ö‚Õ¥Ö
+      domain: ÕÕ«Ö€Õ¸ÕµÕ©
+      edit: Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´Õ¨
       new:
+        create: ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´
         severity:
           noop: ÕˆÕ¹ Õ´Õ«
           silence: Ô¼Õ¸Ö‚Õ¼
+          suspend: Ô¿Õ¡Õ½Õ¥ÖÕ¸Ö‚Õ´
+        title: Õ†Õ¸Ö€ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´
+      private_comment: Õ“Õ¡Õ¯ Õ´Õ¥Õ¯Õ¶Õ¡Õ¢Õ¡Õ¶Õ¸Ö‚Õ©Õ«Ö‚Õ¶
+      public_comment: Õ€Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¡ÕµÕ«Õ¶ Õ´Õ¥Õ¯Õ¶Õ¡Õ¢Õ¡Õ¶Õ¸Ö‚Õ©Õ«Ö‚Õ¶
+      reject_media: Õ„Õ¥Ö€ÕªÕ¥Õ¬ Õ´Õ¥Õ¤Õ«Õ¡ Ö†Õ¡ÕµÕ¬Õ¥Ö€Õ¨
+      reject_reports: Õ„Õ¥Ö€ÕªÕ¥Õ¬ Õ¢Õ¸Õ²Õ¸Ö„Õ¶Õ¥Ö€Õ¨
+      rejecting_media: Õ´Õ¥Ö€ÕªÕ¸Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶ Õ´Õ¥Õ¤Õ«Õ¡ Ö†Õ¡ÕµÕ¬Õ¥Ö€
+      rejecting_reports: Õ´Õ¥Ö€ÕªÕ¸Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶ Õ¢Õ¸Õ²Õ¸Ö„Õ¶Õ¥Ö€
+      severity:
+        silence: Õ¬Õ¼Õ¥ÖÕ¸Ö‚Õ¡Õ®
+        suspend: Õ¯Õ¡Õ½Õ¥ÖÕ¸Ö‚Õ¡Õ®
       show:
+        title: ÔµÕ¿Õ¡Ö€Õ¯Õ¥Õ¬ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´Õ¨ %{domain}Õ« Õ°Õ¡Õ´Õ¡Ö€
         undo: ÔµÕ¿Õ¡Ö€Õ¯Õ¥Õ¬
+      undo: ÔµÕ¿Õ¡Ö€Õ¯Õ¥Õ¬ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´Õ¨
+      view: ÕÕ¥Õ½Õ¶Õ¥Õ¬ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´Õ¨
     email_domain_blocks:
       add_new: Ô±Õ¾Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ Õ¶Õ¸Ö€Õ¨
+      created_msg: Ô²Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ¥Ö Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ« Õ¿Õ«Ö€Õ¸ÕµÕ©
       delete: Õ‹Õ¶Õ»Õ¥Õ¬
+      destroyed_msg: Ô²Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ¡ÕºÕ¡Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ¥Ö Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ« Õ¿Õ«Ö€Õ¸ÕµÕ©
       domain: Ô´Õ¸Õ´Õ¥Õ¶
+      empty: ÕˆÕ¹ Õ´Õ« Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ« Õ¿Õ«Ö€Õ¸ÕµÕ© Õ¡ÕµÕªÕ´ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ¡Õ® Õ¹Õ§Ö‰
+      from_html: "%{domain}Õ«Ö"
       new:
         create: Ô±Õ¾Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ Õ¤Õ¸Õ´Õ¥Õ¶
+        title: Ô±Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬ Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ« Õ¶Õ¸Ö€ Õ¿Õ«Ö€Õ¸ÕµÕ©
+      title: Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿Õ« Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ¡Õ® Õ¿Õ«Ö€Õ¸ÕµÕ©Õ¶Õ¥Ö€
     instances:
       by_domain: Ô´Õ¸Õ´Õ¥Õ¶
+      empty: Ô´Õ¸Õ´Õ¥ÕµÕ¶Õ¶Õ¥Ö€Õ¨ Õ¹Õ¥Õ¶ Õ£Õ¿Õ¶Õ¸Ö‚Õ¥Õ¬
+      known_accounts:
+        one: "%{count} ÕµÕ¡ÕµÕ¿Õ¶Õ« Õ°Õ¡Õ·Õ«Ö‚"
+        other: "%{count} ÕµÕ¡ÕµÕ¿Õ¶Õ« Õ°Õ¡Õ·Õ«Ö‚Õ¶Õ¥Ö€"
       moderation:
         all: Ô²Õ¸Õ¬Õ¸Ö€Õ¨
         limited: ÕÕ¡Õ°Õ¡Õ´Õ¡Õ¶ÖƒÕ¡Õ¯
+        title: Õ„Õ¸Õ¤Õ¥Ö€Õ¡ÖÕ«Õ¡
+      private_comment: Õ“Õ¡Õ¯ Õ´Õ¥Õ¯Õ¶Õ¡Õ¢Õ¡Õ¶Õ¸Ö‚Õ©Õ«Ö‚Õ¶
+      public_comment: Õ€Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¡ÕµÕ«Õ¶ Õ´Õ¥Õ¯Õ¶Õ¡Õ¢Õ¡Õ¶Õ¸Ö‚Õ©Õ«Ö‚Õ¶
+      title: Ô´Õ¡Õ·Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶
+      total_blocked_by_us: Õ„Õ¥Õ¶Ö„ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬ Õ¥Õ¶Ö„
+      total_followed_by_them: Õ†Ö€Õ¡Õ¶Ö„ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶
+      total_followed_by_us: Õ„Õ¥Õ¶Ö„ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶Ö„
+      total_reported: Ô²Õ¸Õ²Õ¸Ö„Õ¶Õ¥Ö€ Õ¶Ö€Õ¡Õ¶Ö Õ´Õ¡Õ½Õ«Õ¶
+      total_storage: Õ„Õ¥Õ¤Õ«Õ¡ Õ¯ÖÕ¸Ö€Õ¤Õ¶Õ¥Ö€
+    invites:
+      deactivate_all: Ô±ÕºÕ¡Õ¡Õ¯Õ¿Õ«Ö‚Õ¡ÖÕ¶Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€Õ«Õ¶
+      filter:
+        all: Ô²Õ¸Õ¬Õ¸Ö€Õ¨
+        available: Õ€Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ«
+        expired: ÕÕºÕ¡Õ¼Õ¸Ö‚Õ¡Õ®
+        title: Ô¶Õ¿Õ«Õ¹
+      title: Õ€Ö€Õ¡Ö‚Õ§Ö€Õ¶Õ¥Ö€
+    ip_blocks:
+      add_new: ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ¯Õ¡Õ¶Õ¸Õ¶
+      created_msg: Ô²Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ¡Ö‚Õ¥Õ¬Õ¡ÖÕ¸Ö‚Õ¥Ö Õ¶Õ¸Ö€ IP Õ¯Õ¡Õ¶Õ¸Õ¶
+      delete: Õ‹Õ¶Õ»Õ¥Õ¬
+      expires_in:
+        '1209600': 2 Õ·Õ¡Õ¢Õ¡Õ©
+        '15778476': 6 Õ¡Õ´Õ«Õ½
+        '2629746': 1 Õ¡Õ´Õ«Õ½
+        '31556952': 1 Õ¿Õ¡Ö€Õ«
+        '86400': 1 Ö…Ö€
+        '94670856': 3 Õ¿Õ¡Ö€Õ«
+      new:
+        title: ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ¶Õ¸Ö€ IP Õ¯Õ¡Õ¶Õ¸Õ¶
+      title: IP Õ¯Õ¡Õ¶Õ¸Õ¶Õ¶Õ¥Ö€
+    pending_accounts:
+      title: ÕÕºÕ¡Õ½Õ¸Õ² Õ°Õ¡Õ·Õ«Ö‚Õ¶Õ¥Ö€ (%{count})
+    relationships:
+      title: "%{acct}Õ« ÕµÕ¡Ö€Õ¡Õ¢Õ¥Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€"
     relays:
+      add_new: Ô±Ö‚Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ Õ¶Õ¸Ö€ Õ¾Õ¥Ö€Õ¡Õ°Õ¥Õ¼Õ¡Ö€Õ±Õ¡Õ¯Õ¸Ö‚Õ«Õ¹
+      delete: Õ‹Õ¶Õ»Õ¥Õ¬
       disable: Ô±Õ¶Õ»Õ¡Õ¿Õ¥Õ¬
       disabled: Ô±Õ¶Õ»Õ¡Õ¿Õ¾Õ¡Õ® Õ§
       enable: Õ„Õ«Õ¡ÖÕ¶Õ¥Õ¬
       enabled: Õ„Õ«Õ¡ÖÕ¾Õ¡Õ® Õ§
+      save_and_enable: ÕŠÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬ Õ¥Ö‚ Õ´Õ«Õ¡ÖÕ¶Õ¥Õ¬
       status: Ô¿Õ¡Ö€Õ£Õ¡Õ¾Õ«Õ³Õ¡Õ¯
+      title: ÕŽÕ¥Ö€Õ¡Õ°Õ¥Õ¼Õ¡Ö€Õ±Õ¡Õ¯Õ«Õ¹Õ¶Õ¥Ö€
     reports:
+      account:
+        notes:
+          one: "%{count} Õ¶Õ¸Õ©"
+          other: "%{count} Õ¶Õ¸Õ©Õ¥Ö€"
+        reports:
+          one: "%{count} Õ¦Õ¥Õ¯Õ¸ÕµÖ"
+          other: "%{count} Õ¦Õ¥Õ¯Õ¸ÕµÖ"
+      action_taken_by: Ô³Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ¯Õ¡Õ¿Õ¡Ö€Õ¥Õ¬ Õ§
+      are_you_sure: ÕŽÕ½Õ¿Õ¡ÕžÕ° Õ¥Õ½
+      assign_to_self: Ô»Õ¶Õ± ÕµÕ¡Õ¶Õ±Õ¶Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ¡Õ®
+      assigned: Õ†Õ·Õ¡Õ¶Õ¡Õ¯Õ¥Õ¬ Õ´Õ¸Õ¤Õ¥Ö€Õ¡Õ¿Õ¸Ö€
       comment:
         none: ÕˆÕ¹ Õ´Õ«
+      created_at: Ô²Õ¸Õ²Õ¸Ö„Õ¡Ö€Õ¯Õ¸Ö‚Õ¡Õ®
+      mark_as_resolved: Õ†Õ·Õ¥Õ¬ Õ¸Ö€ÕºÕ§Õ½ Õ¬Õ¸Ö‚Õ®Õ¸Ö‚Õ¡Õ®
+      mark_as_unresolved: Õ†Õ·Õ¥Õ¬ Õ¸Ö€ÕºÕ§Õ½ Õ¹Õ¬Õ¸Ö‚Õ®Õ¸Ö‚Õ¡Õ®
       notes:
         create: Ô±Õ¾Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ Õ¶Õ·Õ¸Ö‚Õ´
         delete: Õ‹Õ¶Õ»Õ¥Õ¬
+      reopen: ÕŽÕ¥Ö€Õ¡Õ¢Õ¡ÖÕ¥Õ¬ Õ¢Õ¸Õ²Õ¸Ö„Õ¨
+      report: 'Ô²Õ¸Õ²Õ¸Ö„ #%{id}'
+      reported_account: Ô²Õ¸Õ²Õ¸Ö„Õ¡Ö€Õ¯Õ¸Ö‚Õ¡Õ® Õ°Õ¡Õ·Õ«Ö‚
+      reported_by: Ô²Õ¸Õ²Õ¸Ö„Õ¡Ö€Õ¯Õ¸Ö‚Õ¡Õ® Õ§
+      resolved: Ô¼Õ¸Ö‚Õ®Õ¸Ö‚Õ¡Õ®
       status: Ô¿Õ¡Ö€Õ£Õ¡Õ¾Õ«Õ³Õ¡Õ¯
+      title: Ô²Õ¸Õ²Õ¸Ö„Õ¶Õ¥Ö€
+      unassign: Õ‰Õ¶Õ·Õ¡Õ¶Õ¡Õ¯Õ¥Õ¬
+      unresolved: Õ‰Õ¬Õ¸Ö‚Õ®Õ¸Ö‚Õ¡Õ®
+      updated_at: Ô¹Õ¡Ö€Õ´Õ¡ÖÕ¸Ö‚Õ¡Õ®
     settings:
+      contact_information:
+        email: Ô³Õ¸Ö€Õ®Õ¶Õ¡Õ¯Õ¡Õ¶ Õ§Õ¬ÖƒÕ¸Õ½Õ¿
+        username: Ô¿Õ¸Õ¶Õ¿Õ¡Õ¯Õ¿Õ« Õ®Õ¡Õ®Õ¯Õ¡Õ¶Õ¸Ö‚Õ¶
+      custom_css:
+        title: ÕÕ¥ÖƒÕ¡Õ¯Õ¡Õ¶ CSS
+      domain_blocks:
+        all: Ô²Õ¸Õ¬Õ¸Ö€Õ«Õ¶
+        disabled: ÕˆÕ¹ Õ´Õ§Õ¯Õ«Õ¶
+        title: Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ¨ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨
+      hero:
+        title: Õ€Õ¥Ö€Õ¸Õ½Õ« ÕºÕ¡Õ¿Õ¯Õ¥Ö€
+      profile_directory:
+        desc_html: Ô¹Õ¸ÕµÕ¬Õ¡Õ¿Ö€Õ¥Õ¬ Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¥Ö€Õ«Õ¶ Õ¢Õ¡ÖÕ¡ÕµÕ¡ÕµÕ¿Õ¸Ö‚Õ¥Õ¬
+        title: Õ„Õ«Õ¡ÖÕ¶Õ¥Õ¬ Õ°Õ¡Õ·Õ¸Ö‚Õ« Õ´Õ¡Õ¿Õ¥Õ¡Õ¶Õ¨
       registrations:
+        closed_message:
+          desc_html: Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¸Ö‚Õ¸Ö‚Õ´ Õ§ Õ¡Ö€Õ¿Õ¡Ö„Õ«Õ¶ Õ§Õ»Õ¸Ö‚Õ´, Õ¥Ö€Õ¢ Õ£Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ ÖƒÕ¡Õ¯ Õ¥Õ¶Ö‰ Ô¿Õ¡Ö€Õ¸Õ² Õ¥Õ½ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ¶Õ¡Õ¥Ö‚ HTML Õ©Õ§Õ£Õ¥Ö€
+          title: Õ“Õ¡Õ¯ Õ£Ö€Õ¡Õ¶ÖÕ´Õ¡Õ¶ Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶
+        deletion:
+          desc_html: Ô²Õ¸Õ¬Õ¸Ö€Õ«Õ¶ Õ©Õ¸ÕµÕ¬Õ¡Õ¿Ö€Õ¥Õ¬ Õ»Õ¶Õ»Õ¥Õ¬ Õ«Ö€Õ¥Õ¶Ö Õ°Õ¡Õ·Õ«Ö‚Õ¨
+          title: Ô²Õ¡ÖÕ¥Õ¬ Õ°Õ¡Õ·Õ¸Ö‚Õ« Õ»Õ¶Õ»Õ¸Ö‚Õ´Õ¨
         min_invite_role:
           disabled: ÕˆÕ¹ Õ¸Ö„
+          title: Ô¹Õ¸ÕµÕ¬Õ¡Õ¿Ö€Õ¥Õ¬ Õ°Ö€Õ¡Ö‚Õ§Ö€Õ¶Õ¥Ö€
+      registrations_mode:
+        modes:
+          approved: Ô³Ö€Õ¡Õ¶ÖÕ´Õ¡Õ¶ Õ°Õ¡Õ´Õ¡Ö€ Õ¡Õ¶Õ°Ö€Õ¡ÕªÕ¥Õ·Õ¿ Õ§ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¸Ö‚Õ´
+          none: ÕˆÕ¹ Õ¸Ö„ Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ£Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ¥Õ¬
+          open: Ô²Õ¸Õ¬Õ¸Ö€Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Õ£Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ¥Õ¬
+        title: Ô³Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ´Õ¡ÕµÕ«Õ¶ Õ¼Õ¥ÕªÕ«Õ´
+      show_staff_badge:
+        desc_html: Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¦Õ´Õ« Õ¡Õ¶Õ¤Õ¡Õ´Õ« Õ¶Õ·Õ¡Õ¶Õ¨ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ» Õ§Õ»Õ¸Ö‚Õ´
+        title: Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¦Õ´Õ« Õ¡Õ¶Õ¤Õ¡Õ´Õ« Õ¶Õ·Õ¡Õ¶Õ¨
+      site_description:
+        title: Ô¿Õ¡ÕµÖ„Õ« Õ¶Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶
+      site_short_description:
+        title: Ô¿Õ¡ÕµÖ„Õ« Õ°Õ¡Õ¯Õ«Ö€Õ³ Õ¶Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶
+      site_terms:
+        desc_html: Ô´Õ¸Ö‚ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ£Ö€Õ¥Õ¬ Ö„Õ¸ Õ½Õ¥ÖƒÕ¡Õ¯Õ¡Õ¶ Õ£Õ¡Õ²Õ¿Õ¶Õ«Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Ö„Õ¡Õ²Õ¡Ö„Õ¡Õ¯Õ¡Õ¶Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨, Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ´Õ¡Õ¶ ÕºÕ¡ÕµÕ´Õ¡Õ¶Õ¶Õ¥Ö€Õ¨ Õ¥Ö‚ Õ¡ÕµÕ¬ Õ¯Õ¡Õ¶Õ¸Õ¶Õ¶Õ¥Ö€Ö‰ Ô¿Õ¡Ö€Õ¸Õ² Õ¥Õ½ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ HTML Õ©Õ¥Õ£Õ¥Ö€
+      site_title: ÕÕºÕ¡Õ½Õ¡Ö€Õ¯Õ¹Õ« Õ¡Õ¶Õ¸Ö‚Õ¶
+      thumbnail:
+        title: Õ€Õ¡Õ¶Õ£Õ¸ÕµÖÕ« Õ¶Õ¯Õ¡Ö€Õ¨
+      title: Ô¿Õ¡ÕµÖ„Õ« Õ¯Õ¡Ö€Õ£Õ¡Ö‚Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€
+      trends:
+        title: Ô¹Ö€Õ¥Õ¶Õ¤Õ¡ÕµÕ«Õ¶ ÕºÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€
+    site_uploads:
+      delete: Õ‹Õ¶Õ»Õ¥Õ¬ Õ¾Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¸Ö‚Õ¡Õ® Ö†Õ¡ÕµÕ¬Õ¨
+      destroyed_msg: Ô¿Õ¡ÕµÖ„Õ« Õ¾Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¸Ö‚Õ´Õ¨ Õ¢Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ»Õ¶Õ»Õ¸Ö‚Õ¥Ö
     statuses:
+      back_to_account: ÕŽÕ¥Ö€Õ¡Õ¤Õ¡Õ¼Õ¶Õ¡Õ¬ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ§Õ»
       batch:
         delete: Õ‹Õ¶Õ»Õ¥Õ¬
+        nsfw_on: Õ†Õ·Õ¥Õ¬ Õ¸Ö€ÕºÕ§Õ½ Õ¤Õ«Ö‚Ö€Õ¡Õ¦Õ£Õ¡Ö
       deleted: Õ‹Õ¶Õ»Õ¾Õ¡Õ® Õ§
+      failed_to_execute: Ô¿Õ¡Õ¿Õ¡Ö€Õ¸Ö‚Õ´Õ¨ Õ±Õ¡ÕÕ¸Õ²Õ¸Ö‚Õ¥Ö
+      media:
+        title: Õ„Õ¥Õ¤Õ«Õ¡
+      no_media: Õ„Õ¥Õ¤Õ«Õ¡ Õ¹Õ¯Õ¡Õµ
+      title: Õ•Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ» Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨
+      with_media: Õ„Õ¥Õ¤Õ«Õ¡ÕµÕ« Õ°Õ¥Õ¿
     tags:
       context: Õ€Õ¡Õ´Õ¡Õ¿Õ¥Ö„Õ½Õ¿
+      last_active: ÕŽÕ¥Ö€Õ»Õ«Õ¶ Õ¡Õ¯Õ¿Õ«Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨
+      most_popular: Ô±Õ´Õ§Õ¶Õ¡ÕµÕ¡ÕµÕ¿Õ¶Õ«
+      most_recent: ÕŽÕ¥Ö€Õ»Õ«Õ¶
+      name: ÕŠÕ«Õ¿Õ¡Õ¯
+      review: ÕŽÕ¥Ö€Õ¡Õ¶Õ¡ÕµÕ¥Õ¬ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¨
+      reviewed: ÕŽÕ¥Ö€Õ¡Õ¶Õ¡ÕµÕ¸Ö‚Õ¡Õ®
+      title: ÕŠÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€
+      trending_right_now: Ô±ÕµÕªÕ´ Õ©Ö€Õ¥Õ¶Õ¤Õ« Õ´Õ§Õ» Õ§
+      unique_uses_today: "%{count} Õ°Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¸Ö‚Õ¥Õ¬ Õ§ Õ¡ÕµÕ½Ö…Ö€"
+      unreviewed: ÕŽÕ¥Ö€Õ¡Õ¶Õ¡ÕµÕ¸Ö‚Õ¡Õ® Õ¹Õ§
     title: Ô±Õ¤Õ´Õ«Õ¶Õ«Õ½Õ¿Õ¡Ö€ÖÕ«Õ¡
     warning_presets:
       add_new: Ô±Õ¾Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ Õ¶Õ¸Ö€Õ¨
       delete: Õ‹Õ¶Õ»Õ¥Õ¬
+  admin_mailer:
+    new_report:
+      subject: Õ†Õ¸Ö€ Õ¢Õ¸Õ²Õ¸Ö„ %{instance}Õ« Õ°Õ¡Õ´Õ¡Ö€(#%{id})
+  appearance:
+    advanced_web_interface: ÕÕµÕ¸Ö‚Õ¶Õ¡Õ¯Õ¡Õ¾Õ¸Ö€ Õ«Õ¶Õ¿Õ¥Ö€Ö†Õ¥ÕµÕ½
+    advanced_web_interface_hint: ÔµÕ©Õ§ ÖÕ¡Õ¶Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ¥Õ½ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ§Õ¯Ö€Õ¡Õ¶Õ«Õ¤ Õ¡Õ´Õ¢Õ¸Õ²Õ» Õ¬Õ¡ÕµÕ¶Ö„Õ¨, Õ¡ÕºÕ¡ Õ¨Õ¶Õ¤Õ¬Õ¡ÕµÕ¶Õ¸Ö‚Õ¡Õ® Õ¾Õ¥Õ¢ Õ«Õ¶Õ¿Õ¥Ö€Ö†Õ¥ÕµÕ½Õ¸Õ¾ Õ°Õ¶Õ¡Ö€Õ¡Ö‚Õ¸Ö€ Õ§ Õ§Õ¯Ö€Õ¡Õ¶Õ¨ Õ¢Õ¡ÕªÕ¡Õ¶Õ¥Õ¬ Õ½Õ«Ö‚Õ¶Õ¡Õ¯Õ¶Õ¥Ö€Õ«Õ Õ¦Õ¸Ö‚Õ£Õ¡Õ°Õ¥Õ¼ Õ¿Õ¥Õ½Õ¶Õ¥Õ¬Õ¸Ö‚ Õ¿Õ¡Ö€Õ¢Õ¥Ö€ Õ¿Õ«ÕºÕ« Õ«Õ¶Ö†Õ¸Ö€Õ´Õ¡ÖÕ«Õ¡Õ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡Õ¶ Õ°Õ¸Õ½Ö„Õ¨, Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨, Ö†Õ¥Õ¤Õ¥Ö€Õ¡ÖÕ¾Õ¡Õ® Õ°Õ¸Õ½Ö„Õ¨, Ö‡ ÖÕ¡Õ¶Õ¯Õ¡ÖÕ¡Õ® Õ©Õ¾Õ« ÖÕ¸Ö‚ÖÕ¡Õ¯ Õ¸Ö‚ Õ°Õ¥Õ·Õ©Õ¥Õ£Ö‰
+    animations_and_accessibility: Ô±Õ¶Õ«Õ´Õ¡ÖÕ«Õ¡Õ¶Õ¥Ö€ Õ¥Ö‚ Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ«Õ¸Ö‚Õ©Õ«Ö‚Õ¶
+    confirmation_dialogs: Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ´Õ¡Õ¶ ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ¶Õ¥Ö€
+    discovery: Ô²Õ¡ÖÕ¡ÕµÕ¡ÕµÕ¿Õ¸Ö‚Õ´
+    localization:
+      body: Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶Õ¨ Õ©Õ¡Ö€Õ£Õ´Õ¡Õ¶Õ¸Ö‚Õ¸Ö‚Õ´ Õ§ Õ¯Õ¡Õ´Õ¡Ö‚Õ¸Ö€Õ¶Õ¥Ö€Õ« Õ¯Õ¸Õ²Õ´Õ«ÖÖ‰
+      guide_link: https://crowdin.com/project/mastodon
+      guide_link_text: Ô±Õ»Õ¡Õ¯ÖÕ¥Õ¬ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Õ¢Õ¸Õ¬Õ¸Ö€Õ¨Ö‰
+    sensitive_content: Ô¶Õ£Õ¡ÕµÕ¸Ö‚Õ¶ Õ¢Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸Ö‚Õ©Õ«Ö‚Õ¶
+  application_mailer:
+    salutation: "%{name},"
+    view: Õ†Õ¡ÕµÕ¥Õ¬â€¤
+    view_profile: Õ†Õ¡ÕµÕ¥Õ¬ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ§Õ»Õ¨
+    view_status: Õ†Õ¡ÕµÕ¥Õ¬ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¨
+  applications:
+    invalid_url: ÕÖ€Õ¡Õ´Õ¡Õ¤Ö€Õ¸Ö‚Õ¡Õ® URL Õ¡Õ¶Õ¾Õ¡Ö‚Õ¥Ö€ Õ§
+    your_token: Õ”Õ¸ Õ´Õ¸Ö‚Õ¿Ö„Õ« Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶
   auth:
+    apply_for_account: Õ€Ö€Õ¡Ö‚Õ§Ö€Õ« Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´
     change_password: Ô³Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼
     checkbox_agreement_html: ÔµÕ½ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶ Õ¥Õ´ <a href="%{rules_path}" target="_blank">Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ¹Õ« Õ¯Õ¡ÕµÕ¡Õ¶Ö„Õ¶Õ¥Ö€Õ«Õ¶</a> Ö‡ <a href="%{terms_path}" target="_blank">Õ®Õ¡Õ¼Õ¡ÕµÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ« ÕºÕ¡ÕµÕ´Õ¡Õ¶Õ¶Õ¥Ö€Õ«Õ¶</a>
     checkbox_agreement_without_rules_html: ÔµÕ½ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶ Õ¥Õ´ <a href="%{terms_path}" target="_blank">Õ®Õ¡Õ¼Õ¡ÕµÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ« ÕºÕ¡ÕµÕ´Õ¡Õ¶Õ¶Õ¥Ö€Õ«Õ¶</a>
     delete_account: Õ‹Õ¶Õ»Õ¥Õ¬ Õ°Õ¡Õ·Õ«Õ¾Õ¨
+    description:
+      prefix_sign_up: Ô³Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ«Õ›Ö€ Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶Õ¸Ö‚Õ´ Õ°Õ¥Õ¶Ö Õ¡ÕµÕ½Ö…Ö€
+    forgot_password: Õ„Õ¸Õ¼Õ¡ÖÕ¥ÕžÕ¬ Õ¥Õ½ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¤
     login: Õ„Õ¿Õ¶Õ¥Õ¬
     logout: Ô´Õ¸Ö‚Ö€Õ½ Õ£Õ¡Õ¬
+    migrate_account: ÕÕ¥Õ²Õ¡ÖƒÕ¸ÕÕ¸Ö‚Õ¥Õ¬ Õ¡ÕµÕ¬ Õ°Õ¡Õ·Õ«Ö‚
+    or_log_in_with: Ô¿Õ¡Õ´ Õ´Õ¸Ö‚Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ¥Õ¬ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬Õ¸Õ¾Õ
     providers:
       cas: CAS
       saml: SAML
     register: Ô³Ö€Õ¡Õ¶ÖÕ¾Õ¥Õ¬
+    registration_closed: "%{instance}Õ¨ Õ¹Õ« Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¸Ö‚Õ´ Õ¶Õ¸Ö€ Õ¡Õ¶Õ¤Õ¡Õ´Õ¶Õ¥Ö€"
+    reset_password: ÕŽÕ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ¥Õ¬ Õ£Õ¡Õ²Õ¿Õ¡Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨
     security: Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶
+    set_new_password: ÕÕ¡Õ°Õ´Õ¡Õ¶Õ¥Õ¬ Õ¶Õ¸Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼
     setup:
       title: Ô¿Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´
+    status:
+      account_status: Õ€Õ¡Õ·Õ¸Ö‚Õ« Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ«Õ³Õ¡Õ¯
+      pending: Ô´Õ«Õ´Õ¸Ö‚Õ´Õ¨ ÕºÕ§Õ¿Ö„ Õ§ Ö„Õ¶Õ¶Õ¸Ö‚Õ« Õ´Õ¥Ö€ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¦Õ´Õ« Õ¯Õ¸Õ²Õ´Õ«Ö, Õ«Õ¶Õ¹Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ§ Õ´Õ« ÖƒÕ¸Ö„Ö€ ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯ ÕÕ¬Õ¥Õ¬Ö‰ Ô´Õ«Õ´Õ¸Ö‚Õ´Õ« Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¸Ö‚Õ¥Õ¬Õ¸Ö‚ Õ¤Õ§ÕºÖ„Õ¸Ö‚Õ´, Õ¯Õ¿Õ¥Õ²Õ¥Õ¯Õ¡ÖÕ¶Õ¥Õ¶Ö„ Õ¶Õ¡Õ´Õ¡Õ¯Õ¸Õ¾Ö‰
   authorize_follow:
     follow: Õ€Õ¥Õ¿Ö‡Õ¥Õ¬
+    following: Õ…Õ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ«ÕœÖ‚Õ¶Ö‰ Ô´Õ¸Ö‚ Õ¡ÕµÕªÕ´ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´ Õ¥Õ½â€¤
+    post_follow:
+      close: Ô¿Õ¡Õ´, Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ ÕºÕ¡Ö€Õ¦Õ¡ÕºÕ§Õ½ ÖƒÕ¡Õ¯Õ¥Õ¬ Õ¡ÕµÕ½ ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ¨Ö‰
+      return: Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ» Õ§Õ»Õ¨
+      web: Ô±Õ¶ÖÕ¶Õ¥Õ¬ Õ¾Õ§Õ¢Õ«Õ¶
+    title: Õ€Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬ %{acct}
+  challenge:
+    confirm: Õ‡Õ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¥Õ¬
+    invalid_password: Ô±Õ¶Õ¾Õ¡Ö‚Õ¥Ö€ Õ®Õ¡Õ®Õ¯Õ¡Õ£Õ«Ö€
+    prompt: Õ‡Õ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ´Õ¸Ö‚Õ¿Ö„Õ¡Õ£Ö€Õ«Ö€ Õ®Õ¡Õ®Õ¯Õ¡Õ£Õ«Ö€Õ¤
+  crypto:
+    errors:
+      invalid_key: Õ¡Õ¶Õ¾Õ¡Ö‚Õ¥Ö€ Ed25519 Õ¯Õ¡Õ´ Curve25519 Õ¢Õ¡Õ¶Õ¡Õ¬Õ«
+      invalid_signature: Õ¡Õ¶Õ¾Õ¡Ö‚Õ¥Ö€ Ed25519 Õ¢Õ¡Õ¶Õ¡Õ¬Õ«
+  date:
+    formats:
+      default: "%b %d, %Y"
+      with_month_name: "%d %B %Y"
   datetime:
     distance_in_words:
+      about_x_hours: "%{count}Õª"
+      about_x_months: "%{count}Õ¡Õ´"
+      about_x_years: "%{count}Õ¿"
+      almost_x_years: "%{count}Õ¿"
+      half_a_minute: Õ€Õ§Õ¶Ö Õ°Õ«Õ´Õ¡
+      less_than_x_minutes: "%{count}Õ¡"
       less_than_x_seconds: Õ€Õ¥Õ¶Ö Õ°Õ«Õ´Õ¡
       over_x_years: "%{count}Õ¿"
       x_days: "%{count}Ö…"
@@ -167,25 +667,53 @@ hy:
       x_months: "%{count}Õ¡"
       x_seconds: "%{count}Õ¾Ö€Õ¯"
   deletes:
+    challenge_not_passed: Õ„Õ¸Ö‚Õ¿Ö„Õ¡Õ£Ö€Õ¸Ö‚Õ¡Õ® Õ¿Õ¥Õ²Õ¥Õ¯Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ½Õ¿Õ¸ÕµÕ£ Õ¹Õ§
+    confirm_password: Õ†Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ´Õ¡Õ¶ Õ°Õ¡Õ´Õ¡Ö€ Õ´Õ¸Ö‚Õ¿Ö„Õ¡Õ£Ö€Õ«Ö€ Õ®Õ¡Õ®Õ¯Õ¡Õ£Õ«Ö€Õ¤
     proceed: Õ‹Õ¶Õ»Õ¥Õ¬ Õ°Õ¡Õ·Õ«Õ¾Õ¨
+    success_msg: Õ€Õ¡Õ·Õ«Ö‚Õ¤ Õ¢Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ»Õ¶Õ»Õ¸Ö‚Õ¥Ö
+  directories:
+    directory: Õ€Õ¡Õ·Õ¸Ö‚Õ« Õ´Õ¡Õ¿Õ¥Õ¡Õ¶
+    explore_mastodon: Ô²Õ¡ÖÕ¡ÕµÕ¡ÕµÕ¿Õ¥Õ¬ %{title}
+  domain_validator:
+    invalid_domain: Õ¡Õ¶Õ¾Õ¡Ö‚Õ§Ö€ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ¡Õ¶Õ¸Ö‚Õ¶
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': You don't have permission to view this page.
-    '404': The page you are looking for isn't here.
+    '404': Ô·Õ»Õ¨, Õ¸Ö€Õ¨ ÖƒÕ¶Õ¿Ö€Õ¸Ö‚Õ´ Õ¥Õ½ Õ£Õ¸ÕµÕ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¹Õ¸Ö‚Õ¶Õ«Ö‰
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Too many requests
-    '500': 
+    '429': Õ‰Õ¡ÖƒÕ¡Õ¦Õ¡Õ¶Ö Õ·Õ¡Õ¿ Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€
+    '500':
+      title: Ô·Õ»Õ¨ Õ³Õ«Õ·Õ¿ Õ¹Õ§
     '503': The page could not be served due to a temporary server failure.
+  existing_username_validator:
+    not_found: Õ¹ÕµÕ¡Õ»Õ¸Õ²Õ¸Ö‚Õ¥Ö Õ£Õ¿Õ¶Õ¥Õ¬ Õ¡ÕµÕ½ Õ®Õ¡Õ®Õ¯Õ¡Õ£Ö€Õ¸Õ¾ Õ¬Õ¸Õ¯Õ¡Õ¬ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ»
+    not_found_multiple: Õ¹ÕµÕ¡Õ»Õ¸Õ²Õ¸Ö‚Õ¥Ö Õ£Õ¿Õ¶Õ¥Õ¬ %{usernames}
   exports:
     archive_takeout:
       date: Ô±Õ´Õ½Õ¡Õ©Õ«Õ¾
       download: Õ†Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¥Ö„ ÕÕ¥Ö€ Õ¡Ö€ÕÕ«Õ¾Õ¨
+      request: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¥Õ¬ Ö„Õ¸ Õ¡Ö€Ö„Õ«Ö‚Õ¨
       size: Õ‰Õ¡ÖƒÕ¨
+    blocks: Ô±Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬
+    bookmarks: Ô·Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€
     csv: CSV
+    domain_blocks: ÕÕ«Ö€Õ¸ÕµÕ©Õ« Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´Õ¶Õ¥Ö€
     lists: Õ‘Õ¡Õ¶Õ¯Õ¥Ö€
+    mutes: Ô¼Õ¼Õ¥ÖÖ€Õ¥Õ¬ Õ¥Õ½
+    storage: Õ„Õ¥Õ¤Õ«Õ¡ ÕºÕ¡Õ°Õ¸Ö
+  featured_tags:
+    add_new: Ô±Ö‚Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ Õ¶Õ¸Ö€Õ¨
   filters:
+    contexts:
+      account: ÕŠÖ€Õ¸Ö†Õ«Õ¬Õ¶Õ¥Ö€
+      home: ÕÕ¥Õ²Õ¡Õ¯Õ¡Õ¶ Õ°Õ¸Õ½Ö„
+      notifications: Ô¾Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€
+      public: Õ€Õ¡Õ¶Ö€Õ¡ÕµÕ«Õ¶ Õ°Õ¸Õ½Ö„Õ¥Ö€
+      thread: Ô¶Ö€Õ¸ÕµÖÕ¶Õ¥Ö€
+    edit:
+      title: Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬ Õ¦Õ¿Õ«Õ¹Õ¨
     index:
       delete: Õ‹Õ¶Õ»Õ¥Õ¬
       title: Õ–Õ«Õ¬Õ¿Ö€Õ¥Ö€
@@ -198,43 +726,130 @@ hy:
     trending_now: Ô±ÕµÕªÕ´ Õ¡Ö€Õ¤Õ«Õ¡Õ¯Õ¡Õ¶
   generic:
     all: Ô²Õ¸Õ¬Õ¸Ö€Õ¨
+    changes_saved_msg: Õ“Õ¸ÖƒÕ¸ÕÕ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ ÕµÕ¡Õ»Õ¸Õ² ÕºÕ¡Õ°Õ¸Ö‚Õ¡Õ® Õ¥Õ¶
     copy: ÕŠÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Õ¬
     delete: Õ‹Õ¶Õ»Õ¥Õ¬
+    order_by: Ô´Õ¡Õ½Õ¡Ö‚Õ¸Ö€Õ¥Õ¬ Õ¨Õ½Õ¿
+    save_changes: ÕŠÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬ ÖƒÕ¸ÖƒÕ¸ÕÕ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¨
   identity_proofs:
     active: Ô±Õ¯Õ¿Õ«Õ¾
+    authorize: Ô±ÕµÕ¸, Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¶Õ¥Õ¬
+    authorize_connection_prompt: Õ€Õ¡Ö‚Õ¡Õ½Õ¿Õ¡Õ£Ö€Õ§ÕžÕ¬ Õ¡ÕµÕ½ Õ®Õ¡Õ®Õ¯Õ¡Õ£Ö€Õ´Õ¡Õ¶ Õ¯Õ¡ÕºÕ¡Õ¯ÖÕ¸Ö‚Õ´Õ¨
+    i_am_html: ÔµÕ½ %{username}Õ¶ Õ¥Õ´ %{service}Õ¸Ö‚Õ´Ö‰
+    identity: Ô»Õ¶Ö„Õ¶Õ¸Ö‚Õ©Õ«Ö‚Õ¶
+    inactive: ÕˆÕ¹ Õ¡Õ¯Õ¿Õ«Ö‚
+    publicize_checkbox: Ô¹Õ©Õ¥Õ¬ Õ½Õ¡â€¤
+    publicize_toot: 'Ô±ÕºÕ¡ÖÕ¸Ö‚ÖÕ¸Ö‚Õ¡ÕœÕ® Õ§â€¤ ÔµÕ½%{username} Õ¥Õ´ %{service}Õ¸Ö‚Õ´â€¤ %{url} '
+    remove: Õ€Õ¡Õ·Õ¸Ö‚Õ«Ö Õ°Õ¥Õ¼Õ¡ÖÕ¶Õ¥Õ¬ Õ¡ÕºÕ¡ÖÕ¸ÕµÖÕ¨
+    removed: Ô±ÕºÕ¡ÖÕ¸ÕµÖÕ¨ Õ¢Õ¡Ö€Õ¥ÕµÕ¡Õ»Õ¸Õ² Õ°Õ¥Õ¼Õ¡ÖÕ¸Ö‚Õ¥Ö Õ°Õ¡Õ·Õ¸Ö‚Õ«Ö
+    status: Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ´Õ¡Õ¶ Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ«Õ³Õ¡Õ¯
+    view_proof: Õ†Õ¡ÕµÕ¥Õ¬ Õ¡ÕºÕ¡ÖÕ¸ÕµÖÕ¨
   imports:
+    errors:
+      over_rows_processing_limit: Õ¿Õ¸Õ²Õ¥Ö€Õ« Ö„Õ¡Õ¶Õ¡Õ¯Õ¨ Õ¡Ö‚Õ¥Õ¬Õ«Õ¶ Õ§ Ö„Õ¡Õ¶ %{count}-Õ¨
     modes:
+      merge: Õ„Õ«Õ¡Ö‚Õ¸Ö€Õ¥Õ¬
       overwrite: ÕŽÕ¥Ö€Õ¡Õ£Ö€Õ¥Õ¬
+    types:
+      blocking: Ô±Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« ÖÕ¸Ö‚ÖÕ¡Õ¯
+      bookmarks: Ô·Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€
+      domain_blocking: ÕÕ«Ö€Õ¸ÕµÕ©Õ« Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« ÖÕ¸Ö‚ÖÕ¡Õ¯
+      following: Õ€Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« ÖÕ¡Õ¶Õ¯
     upload: ÕŽÕ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬
   invites:
+    delete: Ô±ÕºÕ¡Õ¡Õ¯Õ¿Õ«Ö‚Õ¡ÖÕ¶Õ¥Õ¬
+    expired: ÔºÕ¡Õ´Õ¯Õ¥Õ¿Õ¡Õ¶Ö
     expires_in:
       '1800': 30 Ö€Õ¸ÕºÕ¥
       '21600': 6 ÕªÕ¡Õ´
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
+      '3600': 1 ÕªÕ¡Õ´
+      '43200': 12 ÕªÕ¡Õ´
+      '604800': 1 Õ·Õ¡Õ¢Õ¡Õ©
+      '86400': 1 Ö…Ö€
+    expires_in_prompt: ÔµÖ€Õ¢Õ¥Ö„
+    generate: Ô³Õ¥Õ¶Õ¥Ö€Õ¡ÖÕ¶Õ¥Õ¬ Õ°Ö€Õ¡Ö‚Õ§Ö€Õ« ÕµÕ²Õ¸Ö‚Õ´
+    max_uses:
+      one: "%{count} Õ¯Õ«Ö€Õ¡Õ¼Õ¸Ö‚Õ´"
+      other: "%{count} Õ¯Õ«Ö€Õ¡Õ¼Õ¸Ö‚Õ´"
+    max_uses_prompt: ÕÕ¡Õ°Õ´Õ¡Õ¶Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´ Õ¹Õ¯Õ¡Õµ
+    table:
+      expires_at: ÕÕºÕ¡Õ¼Ö‚Õ¸Ö‚Õ´ Õ§
+      uses: Ô¿Õ«Ö€Õ¡Õ¼Õ¸Ö‚Õ´
+    title: Õ€Ö€Õ¡Ö‚Õ«Ö€Õ¥Õ¬ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö
+  media_attachments:
+    validations:
+      too_many: 4-Õ«Ö Õ¡Ö‚Õ¥Õ¬ Ö†Õ¡ÕµÕ¬ Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¯ÖÕ¸Ö‚Õ¥Õ¬
+  migrations:
+    acct: ÕÕ¥Õ²Õ¡ÖƒÕ¸ÕÕ¥Õ¬ Õ¤Õ¥ÕºÕ«
+    errors:
+      not_found: Õ¹Õ£Õ¿Õ¶Õ¸Ö‚Õ¥Ö
+    past_migrations: Õ†Õ¡ÕÕ¸Õ¤ Õ´Õ«Õ£Ö€Õ¡ÖÕ«Õ¡Õ¶Õ¥Ö€Õ¨
+    proceed_with_move: ÕÕ¥Õ²Õ¡ÖƒÕ¸ÕÕ¥Õ¬ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ«Õ¶
+    redirecting_to: Õ”Õ¸ Õ°Õ¡Õ·Õ«Ö‚Õ¨ Õ¾Õ¥Ö€Õ¡Õ°Õ¡Õ½ÖÕ¥Õ¡Õ¸Ö€Õ¸Ö‚Õ´ Õ§ %{acct}-Õ«Õ¶
+    warning:
+      followers: Ô±ÕµÕ½ Ö„Õ¡ÕµÕ¬Õ¸Õ¾ Ö„Õ¸ Õ¢Õ¸Õ¬Õ¸Ö€ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ«Õ¶ Õ¡ÕµÕ½ Õ°Õ¡Õ·Õ¸Ö‚Õ«Ö Õ¯Õ¨ Õ¿Õ¥Õ²Õ¡ÖƒÕ¸ÕÕ¥Õ½ Õ¤Õ§ÕºÕ« Õ¶Õ¸Ö€Õ¨
+  moderation:
+    title: Õ„Õ¸Õ¤Õ¥Ö€Õ¡ÖÕ«Õ¡
   notification_mailer:
+    digest:
+      title: ÔµÖ€Õ¢ Õ¢Õ¡ÖÕ¡Õ¯Õ¡Õµ Õ§Õ«Ö€...
+    favourite:
+      title: Õ†Õ¸Ö€ Õ°Õ¡Ö‚Õ¡Õ¶Õ¸Ö‚Õ´
+    follow:
+      body: "%{name}Õ¨ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´ Õ§ Ö„Õ¥Õ¦!"
+      subject: "%{name}Õ¨ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´ Õ§ Ö„Õ¥Õ¦"
+      title: Õ†Õ¸Ö€ Õ°Õ¥Õ¿Ö‡Õ¸Ö€Õ¤Õ¶Õ¥Ö€
+    follow_request:
+      title: Õ†Õ¸Ö€ Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡ÕµÖÕ¥Ö€
     mention:
       action: ÕŠÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¥Õ¬
+  notifications:
+    other_settings: Ô¾Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ¡ÕµÕ¬ Õ¯Õ¡Ö€Õ£Õ¡Ö‚Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€
   number:
     human:
       decimal_units:
+        format: "%n %u"
         units:
           billion: Õ„Õ¬Ö€
           million: Õ„Õ¬Õ¶
           quadrillion: Õ”Õ¬Ö€
           thousand: Õ€Õ¡Õ¦
           trillion: ÕÖ€Õ¬
+  otp_authentication:
+    enable: Õ„Õ«Õ¡ÖÕ¶Õ¥Õ¬
+    setup: Ô¿Õ¡Ö€Õ£Õ¡Ö‚Õ¸Ö€Õ¥Õ¬
   pagination:
     newer: Ô±Õ¾Õ¥Õ¬Õ« Õ¶Õ¸Ö€
     next: Õ€Õ¡Õ»Õ¸Ö€Õ¤
     older: Ô±Õ¾Õ¥Õ¬Õ« Õ°Õ«Õ¶
     prev: Õ†Õ¡ÕÕ¸Ö€Õ¤
     truncate: "&hellip;"
+  polls:
+    errors:
+      duration_too_short: Õ·Õ¡Õ¿ Õ¯Õ¡Ö€Õ³ Õ§
   preferences:
     other: Ô±ÕµÕ¬
+    posting_defaults: Ô¿Õ¡Õ¶ÕÕ¡Õ¤Õ«Ö€ Õ¯Õ¡Ö€Õ£Õ¡Ö‚Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€
+    public_timelines: Õ€Õ¡Õ¶Ö€Õ¡ÕµÕ«Õ¶ Õ°Õ¸Õ½Ö„
+  relationships:
+    activity: Õ€Õ¡Õ·Õ¸Ö‚Õ« Õ¡Õ¯Õ¿Õ«Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨
+    dormant: Õ‰Õ£Ö…Ö€Õ®Õ¸Õ²
+    followers: Õ€Õ¥Õ¿Õ¥Ö‚Õ¸Ö€Õ¤Õ¶Õ¥Ö€
+    following: Õ€Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´ Õ¥Õ½
+    invited: Õ€Ö€Õ¡Ö‚Õ«Ö€Õ¸Ö‚Õ¡Õ® Õ§
+    last_active: ÕŽÕ¥Ö€Õ»Õ«Õ¶ Õ¡Õ¯Õ¿Õ«Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨
+    most_recent: ÕŽÕ¥Ö€Õ»Õ«Õ¶
+    moved: ÕÕ¥Õ²Õ¡ÖƒÕ¸ÕÕ¸Ö‚Õ¡Õ®
+    mutual: Õ“Õ¸ÕÕ¡Õ¤Õ¡Ö€Õ±
+    primary: Õ€Õ«Õ´Õ¶Õ¡Õ¯Õ¡Õ¶
+    relationship: Ô¿Õ¡Õº
+    remove_selected_domains: Õ€Õ¥Õ¼Õ¡ÖÕ¶Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ«Õ¶ Õ¶Õ·Õ¸Ö‚Õ¡Õ® Õ¤Õ¸Õ´Õ¥ÕµÕ¶Õ¶Õ¥Ö€Õ«Ö
+    remove_selected_followers: Õ€Õ¥Õ¼Õ¡ÖÕ¶Õ¥Õ¬ Õ¶Õ·Õ¸Ö‚Õ¡Õ® Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ«Õ¶
+    status: Õ€Õ¡Õ·Õ¸Ö‚Õ« Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ«Õ³Õ¡Õ¯
+  scheduled_statuses:
+    too_soon: Õ†Õ¡ÕÕ¡Õ¤Ö€Õ¸Ö‚Õ¡Õ® Õ¡Õ´Õ½Õ¡Õ©Õ«Ö‚Õ¨ ÕºÕ§Õ¿Ö„ Õ§ Õ¬Õ«Õ¶Õ« Õ¡ÕºÕ¡Õ£Õ¡ÕµÕ¸Ö‚Õ´
   sessions:
+    activity: ÕŽÕ¥Ö€Õ»Õ«Õ¶ Õ©Õ¸Ö‚Õ©Õ¨
     browser: Ô´Õ«Õ¿Õ¡Ö€Õ¯Õ«Õ¹
     browsers:
       alipay: Alipay
@@ -254,6 +869,7 @@ hy:
       safari: Safari
       uc_browser: UCBrowser
       weibo: Weibo
+    description: "%{browser}, %{platform}"
     ip: IP
     platforms:
       adobe_air: Adobe Air
@@ -269,14 +885,151 @@ hy:
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
     revoke: Õ‰Õ¥Õ²Õ¡Ö€Õ¯Õ¥Õ¬
+    title: ÕÕ¥Õ½Õ½Õ«Õ¡
   settings:
     account: Õ€Õ¡Õ·Õ«Õ¾
+    account_settings: Õ€Õ¡Õ·Õ¸Ö‚Õ« Õ¯Õ¡Ö€Õ£Õ¡Ö‚Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€
+    appearance: ÕÕ¥Õ½Ö„
+    back: ÔµÕ¿ Õ£Õ¶Õ¡Õ¬ Õ´Õ¡Õ½Õ¿Õ¡Õ¤Õ¸Õ¶
+    delete: Õ€Õ¡Õ·Õ¸Ö‚Õ« Õ»Õ¶Õ»Õ¸Ö‚Õ´
+    development: Ô¾Ö€Õ¡Õ£Ö€Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´
     edit_profile: Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬ ÕºÖ€Õ¸Ö†Õ«Õ¬Õ¨
+    export: ÕÕ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¡Ö€Õ¿Õ¡Õ°Õ¡Õ¶Õ¸Ö‚Õ´
+    featured_tags: Ô¸Õ¶Õ¿Ö€Õ¸Ö‚Õ¡Õ® Õ°Õ§Õ·Õ©Õ¥Õ£Õ¥Ö€
+    identity_proofs: Ô±Õ¶Õ±Õ« Õ¶Õ¸ÕµÕ¶Õ¡ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€
     import: Õ†Õ¥Ö€Õ´Õ¸Ö‚Õ®Õ¥Õ¬
     import_and_export: Õ†Õ¥Ö€Õ´Õ¸Ö‚Õ®Õ¥Õ¬ Ö‡ Õ¡Ö€Õ¿Õ¡Õ°Õ¡Õ¶Õ¥Õ¬
+    migrate: Õ€Õ¡Õ·Õ¸Ö‚Õ« Õ¿Õ¥Õ²Õ¡ÖƒÕ¸ÕÕ¸Ö‚Õ´
+    notifications: Ô¾Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€
+    preferences: Ô¿Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€
+    profile: Õ€Õ¡Õ·Õ«Ö‚
+    relationships: Õ€Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´Õ¶Õ¥Ö€ Ö‡ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö€Õ¤Õ¶Õ¥Ö€
+    two_factor_authentication: ÔµÖ€Õ¯Ö„Õ¡ÕµÕ¬ Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¸Ö‚Õ´
+    webauthn_authentication: Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶Õ¥Ö€
+  statuses:
+    attached:
+      audio:
+        one: "%{count} Õ±Õ¡ÕµÕ¶Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶"
+        other: "%{count} Õ±Õ¡ÕµÕ¶Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶"
+      image:
+        one: "%{count} Õ¶Õ¯Õ¡Ö€"
+        other: "%{count} Õ¶Õ¯Õ¡Ö€"
+      video:
+        one: "%{count} Õ¾Õ«Õ¤Õ¥Õ¸"
+        other: "%{count} Õ¾Õ«Õ¤Õ¥Õ¸"
+    language_detection: Ô»Õ¶Ö„Õ¶Õ¸Ö‚Ö€Õ¸ÕµÕ¶ Õ³Õ¡Õ¶Õ¡Õ¹Õ¥Õ¬ Õ¬Õ¥Õ¦Õ¸Ö‚Õ¶
+    open_in_web: Ô²Õ¡ÖÕ¥Õ¬ Õ¾Õ§Õ¢Õ¸Ö‚Õ´
+    over_character_limit: "%{max} Õ¶Õ«Õ·Õ« Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¨ Õ£Õ¥Ö€Õ¡Õ¦Õ¡Õ¶ÖÕ¸Ö‚Õ¡Õ® Õ§"
+    poll:
+      total_people:
+        one: "%{count} Õ´Õ¡Ö€Õ¤"
+        other: "%{count} Õ´Õ¡Ö€Õ¤Õ«Õ¯"
+      total_votes:
+        one: "%{count} Õ±Õ¡ÕµÕ¶"
+        other: "%{count} Õ±Õ¡ÕµÕ¶Õ¥Ö€"
+      vote: Õ”Õ¸Ö‚Õ§Õ¡Ö€Õ¯Õ¥Õ¬
+    show_more: Ô±Ö‚Õ¥Õ¬Õ«Õ¶
+    show_thread: Ô²Õ¡ÖÕ¥Õ¬ Õ·Õ²Õ©Õ¡Õ¶
+    sign_in_to_participate: Õ„Õ¸Ö‚Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ§Ö„Õ Õ¦Ö€Õ¸ÕµÖÕ«Õ¶ Õ´Õ«Õ¡Õ¶Õ¡Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€
+    title: '%{name}: "%{quote}"'
+    visibilities:
+      private: Õ„Õ«Õ¡ÕµÕ¶ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Õ²Õ¶Õ¥Ö€Õ«Õ¶
+      private_long: Õ€Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ´Õ«Õ¡ÕµÕ¶ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ«Õ¶
+      public: Õ€Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¡ÕµÕ«Õ¶
+      public_long: ÕÕ¥Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ¢Õ¸Õ¬Õ¸Ö€Õ«Õ¶
+      unlisted: Ô¾Õ¡Õ®Õ¸Ö‚Õ¯
+      unlisted_long: ÕÕ¥Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ§ Õ¢Õ¸Õ¬Õ¸Ö€Õ«Õ¶, Õ¢Õ¡ÕµÖ Õ¹Õ« ÕµÕ¡ÕµÕ¿Õ¶Ö‚Õ¸Ö‚Õ´ Õ°Õ¡Õ¶Ö€Õ¡ÕµÕ«Õ¶ Õ°Õ¸Õ½Ö„Õ¥Ö€Õ¸Ö‚Õ´
   stream_entries:
+    pinned: Ô±Õ´Ö€Õ¡ÖÕ¸Ö‚Õ¡Õ® Õ©Õ¸Ö‚Õ©
+    reblogged: Õ¿Õ¡Ö€Õ¡Õ®Õ¸Ö‚Õ¡Õ®
     sensitive_content: Ô¿Õ¡Õ½Õ¯Õ¡Õ®Õ¥Õ¬Õ« Õ¢Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸Ö‚Õ©Õ«Ö‚Õ¶
+  terms:
+    body_html: |
+      <h2>Ô³Õ¡Õ²Õ¿Õ¶Õ«Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Ö„Õ¡Õ²Õ¡Ö„Õ¡Õ¯Õ¡Õ¶Õ¸Ö‚Õ©Õ«Ö‚Õ¶</h2>
+      <p><strong>ÕˆÕ¹ ÕºÕ¡Õ·Õ¿Ö…Õ¶Õ¡Õ¯Õ¡Õ¶, Õ¸Õ¹ Õ«Ö€Õ¡Ö‚Õ¡Õ¯Õ¡Õ¶ Õ©Õ¡Ö€Õ£Õ´Õ¡Õ¶Õ¸Ö‚Õ©Õ«Ö‚Õ¶</strong></p>
+      <h3 id="collect">Ô»Õ¶Õ¹ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ¿Õ¥Õ²Õ¥Õ¯Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€ Õ¥Õ¶Ö„ Õ´Õ¥Õ¶Ö„ Õ°Õ¡Ö‚Õ¡Ö„Õ¸Ö‚Õ´</h3>
+
+      <ul>
+      <li><em>Ô±Õ¼Õ¡Õ»Õ¶Õ¡ÕµÕ«Õ¶ Õ°Õ¡Ö‚Õ¡Ö„Õ¾Õ¸Õ² Õ¿Ö‚Õ¡Õ¬Õ¶Õ¥Ö€</em>: ÔµÕ©Õ¥ Õ¤Õ¸Ö‚Ö„ Õ£Ö€Õ¡Õ¶ÖÕ¾Õ¥Ö„ Õ§Ö„ Õ¡ÕµÕ½ Õ½Õ¥Ö€Ö‚Õ¥Ö€Õ¸Ö‚Õ´, Õ±Õ¥Õ¦Õ¡Õ¶Õ«Ö Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ ÕºÕ¡Õ°Õ¡Õ¶Õ»Õ¥Õ¬ Õ´Õ¸Ö‚Õ¿Ö„Õ¡Õ£Ö€Õ¥Õ¬ Ö…Õ£Õ¿Õ¸Ö‚Õ¸Õ²Õ« Õ¡Õ¶Õ¸Ö‚Õ¶, Õ§Õ¬ÖƒÕ¸Õ½Õ¿Õ« Õ°Õ¡Õ½ÖÕ§ Ö‡ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Ö‰ Ô´Õ¸Ö‚Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ§Ö„ Õ¶Õ¡Ö‡ Õ´Õ¸Ö‚Õ¿Ö„Õ¡Õ£Ö€Õ¥Õ¬ Õ°Õ¡Õ¾Õ¥Õ¬ÕµÕ¡Õ¬ Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€, Õ«Õ¶Õ¹ÕºÕ«Õ½Õ«Ö„ Õ¥Õ¶ Ö…Ö€Õ«Õ¶Õ¡Õ¯Õ ÖÕ¸Ö‚ÖÕ¡Õ¤Ö€Õ¸Ö‚Õ¸Õ² Õ¡Õ¶Õ¸Ö‚Õ¶Õ¨ Õ¥Ö‚ Õ¯Õ¥Õ¶Õ½Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨, Õ¶Õ¡Ö‡ Õ¾Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ Õ£Õ¬ÕÕ¡Õ¶Õ¯Õ¡Ö€ Ö‡ Õ¥Õ¿Õ¶Õ¡Õ¶Õ¡Õ¯Õ¡Ö€Ö‰ Õ•Õ£Õ¿Õ¸Ö‚Õ¸Õ²Õ« Õ¡Õ¶Õ¸Ö‚Õ¶Õ¨, Õ¯Õ¥Õ¶Õ½Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨, Õ£Õ¬ÕÕ¡Õ¶Õ¯Õ¡Ö€Õ¨ Ö‡ Õ¥Õ¿Õ¶Õ¡Õ¶Õ¯Õ¡Ö€Õ¨ Õ°Õ¡Õ´Õ¡Ö€Õ¾Õ¸Ö‚Õ´ Õ¥Õ¶ Õ°Õ¡Õ¶Ö€Õ¡ÕµÕ«Õ¶ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ¿Õ¸Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶Ö‰</li>
+      <li><em>Ô³Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨, Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Ö‡ Õ¡ÕµÕ¬ Õ°Õ¡Õ¶Ö€Õ¡ÕµÕ«Õ¶ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ¿Õ¸Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨Ö‰ </em>: ÕÕ¥Ö€ Õ°Õ¥Õ¿Ö‡Õ¡Õ® Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö ÖÕ¸Ö‚ÖÕ¡Õ¯Õ¨ Õ¶Õ¥Ö€Õ¯Õ¡ÕµÕ¡ÖÕ¸Ö‚Õ¡Õ® Õ§ Õ°Õ¡Õ¶Ö€Õ¡ÕµÕ¶Õ¸Ö€Õ¥Õ¶, Õ¶Õ¸ÕµÕ¶Õ¨ Õ³Õ·Õ´Õ¡Ö€Õ«Õ¿ Õ§ Õ¶Õ¡Ö‡ Õ°Õ¥Õ¿Ö‡Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€Ö‰ ÔµÖ€Õ¢ Õ¤Õ¸Ö‚Ö„ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¸Ö‚Õ´ Õ¥Ö„ Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶, Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ´Õ¡Õ¶ Õ¡Õ´Õ½Õ¡Õ©Õ«Ö‚Õ¨ Ö‡ ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ¨, Õ«Õ¶Õ¹ÕºÕ§Õ½ Õ¶Õ¡Ö‡ Õ°Õ¡Õ¾Õ¥Õ¬Õ¾Õ¡Õ®Õ¨ Õ¸Ö€Õ«Ö Õ¡ÕµÕ¶ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¸Ö‚Õ¥Õ¬ Õ§, ÕºÕ¡Õ°Ö‚Õ¸Ö‚Õ´ Õ§Ö‰ Õ€Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ ÕºÕ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¥Õ¬ Õ´Õ¥Õ¤Õ«Õ¡ Õ¯ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€, Õ«Õ¶Õ¹ÕºÕ«Õ½Õ«Ö„ Õ¥Õ¶ Õ¶Õ¯Õ¡Ö€Õ¶Õ¥Ö€Õ¨ Ö‡ Õ¿Õ¥Õ½Õ¡Õ¶Õ«Ö‚Õ©Õ¥Ö€Õ¨Ö‰ Õ€Õ¡Õ¶Ö€Õ¡ÕµÕ«Õ¶ Ö‡ Õ®Õ¡Õ®Õ¸Ö‚Õ¯ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ°Õ¡Õ¶Ö€Õ¡ÕµÕ¶Õ¸Ö€Õ¥Õ¶ Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ¥Õ¶Ö‰ Ô±Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ§Õ»Õ¸Ö‚Õ´ Õ¯ÖÕ¸Ö‚Õ¡Õ® Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¶Õ¸Ö‚ÕµÕ¶ÕºÕ¥Õ½ Õ°Õ¡Õ¶Ö€Õ¡ÕµÕ¶Õ¸Ö€Õ¥Õ¶ Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ¿Õ¸Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ§Ö‰ ÕÕ¥Ö€ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶ Õ±Õ¥Ö€ Õ°Õ¥Õ¿Ö‡Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ«Õ¶, Õ«Õ¶Õ¹Õ¨ Õ¶Õ·Õ¡Õ¶Õ¡Õ¯Õ¸Ö‚Õ´ Õ§, Õ¸Ö€ Õ¸Ö€Õ¸Õ· Õ¤Õ§ÕºÖ„Õ¥Ö€Õ¸Ö‚Õ´ Õ¤Ö€Õ¡Õ¶Ö„ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶ Õ¡ÕµÕ¬ Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ¶Õ¥Ö€ Ö‡ ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Ö€Õ¨ ÕºÕ¡Õ°Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶ Õ¡ÕµÕ¶Õ¿Õ¥Õ²Ö‰ ÔµÖ€Õ¢ Õ¤Õ¸Ö‚Ö„ Õ»Õ¶Õ»Õ¸Ö‚Õ´ Õ§Ö„ Õ±Õ¥Ö€ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨, Õ½Õ¡ Õ¶Õ¸Ö‚ÕµÕ¶ÕºÕ¥Õ½ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Ö‚Õ¸Ö‚Õ´ Õ§ Õ±Õ¥Ö€ Õ°Õ¥Õ¿Ö‡Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ«Õ¶Ö‰ Õ„Õ¥Õ¯ Õ¡ÕµÕ¬ Õ£Ö€Õ¡Õ¼Õ´Õ¡Õ¶ Õ¿Õ¡Ö€Õ¡Õ®Õ¸Ö‚Õ´Õ¨ Õ¯Õ¡Õ´ Õ°Õ¡Ö‚Õ¡Õ¶Õ¸Ö‚Õ´Õ¨ Õ´Õ«Õ·Õ¿ Õ°Õ¡Õ¶Ö€Õ¡ÕµÕ«Õ¶ Õ§Ö‰</li>
+      <li><em>Õ€Õ¡Õ½ÖÕ§Õ¡Õ£Ö€Õ¡Õ® Ö‡ Õ´Õ«Õ¡ÕµÕ¶ Õ°Õ¥Õ¿Ö‡Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ«Õ¶ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨</em>: Ô²Õ¸Õ¬Õ¸Ö€ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ ÕºÕ¡Õ°Ö‚Õ¸Ö‚Õ´ Ö‡ Õ´Õ·Õ¡Õ¯Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶ Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ« Õ¾Ö€Õ¡ÕµÖ‰ Õ„Õ«Õ¡ÕµÕ¶ Õ°Õ¥Õ¿Ö‡Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ«Õ¶ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶ Õ´Õ«Õ¡ÕµÕ¶ Õ±Õ¥Ö€ Õ°Õ¥Õ¿Ö‡Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ«Õ¶ Ö‡ Õ¡ÕµÕ¶ Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€Õ¥Ö€Õ«Õ¶ Õ¸Õ¾Ö„Õ¥Ö€ Õ¶Õ·Õ¸Ö‚Õ¡Õ® Õ¥Õ¶ Õ£Ö€Õ¡Õ¼Õ´Õ¡Õ¶ Õ´Õ§Õ», Õ«Õ½Õ¯ Õ°Õ¡Õ½ÖÕ§Õ¡Õ£Ö€Õ¥ÖÕ¸Ö‚Õ¡Õ® Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶ Õ´Õ«Õ¡ÕµÕ¶ Õ¤Ö€Õ¡Õ¶Õ¸Ö‚Õ´ Õ¶Õ·Õ¸Ö‚Õ¡Õ® Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€Õ¥Ö€Õ«Õ¶Ö‰ ÕˆÖ€Õ¸Õ· Õ¤Õ§ÕºÖ„Õ¥Ö€Õ¸Ö‚Õ´ Õ¤Õ¡ Õ¶Õ·Õ¡Õ¶Õ¡Õ¯Õ¸Ö‚Õ´ Õ§, Õ¸Ö€ Õ¡ÕµÕ¤ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶ Õ¡ÕµÕ¬ Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ¶Õ¥Ö€ Ö‡ ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Ö€Õ¨ ÕºÕ¡Õ°Ö‚Õ¸Ö‚Õ´ Õ¡ÕµÕ¶Õ¿Õ¥Õ²Ö‰ Õ„Õ¥Õ¶Ö„ Õ¢Õ¡Ö€Õ¥ÕÕ«Õ²Õ³ Õ»Õ¡Õ¶Ö„ Õ¥Õ¶ Õ£Õ¸Ö€Õ®Õ¡Õ¤Ö€Õ¸Ö‚Õ´ Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬Õ¸Ö‚ Õ¡ÕµÕ¤ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ´Õ¸Ö‚Õ¿Ö„Õ¨ Õ´Õ«Õ¡ÕµÕ¶ Õ¬Õ«Õ¡Õ¦Ö…Ö€Õ¸Ö‚Õ¡Õ® Õ¡Õ¶Õ±Õ¡Õ¶Ö, Õ¢Õ¡ÕµÖ Õ¡ÕµÕ¬ Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ¶Õ¥Ö€ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Õ±Õ¡ÕÕ¸Õ²Õ¥Õ¬ Õ¤Ö€Õ¡ Õ¯Õ¡Õ¿Õ¡Ö€Õ¸Ö‚Õ´Õ¨Ö‰ Ô±ÕµÕ¤ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¸Õ¾ Õ¯Õ¡Ö€Ö‡Õ¸Ö€ Õ§ Õ¾Õ¥Ö€Õ¡Õ¶Õ¡ÕµÕ¥Õ¬ Õ¡ÕµÕ¶ Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ¶Õ¥Ö€Õ¨ Õ¸Ö€Õ«Õ¶ Õ±Õ¥Ö€ Õ°Õ¥Õ¿Ö‡Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ¨ ÕºÕ¡Õ¿Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ¥Õ¶Ö‰ Ô´Õ¸Ö‚Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ§Ö„ Õ¯Õ¡Ö€Õ£Õ¡Ö‚Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ«Ö Õ´Õ«Õ¡ÖÕ¶Õ¥Õ¬ Õ¶Õ¸Ö€ Õ°Õ¥Õ¿Ö‡Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ«Õ¶ Õ«Õ¶Ö„Õ¶Õ¸Ö‚Ö€Õ¸ÕµÕ¶ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¥Õ¬Õ¸Ö‚ Ö‡ Õ´Õ¥Ö€ÕªÕ¥Õ¬Õ¸Ö‚ Õ¨Õ¶Õ¿Ö€Õ¡Õ¶Ö„Õ¨Ö‰ <em>Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ ÕµÕ«Õ·Õ¥Õ¬, Õ¸Ö€ Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ« Õ£Õ¸Ö€Õ®Õ¡Ö€Õ¯Õ¸Ö‚Õ¶ Ö‡ ÖÕ¡Õ¶Õ¯Õ¡ÖÕ¡Õ® Õ½Õ¿Õ¡ÖÕ¸Õ² Õ½Õ¥Ö€Õ¾Õ¥Ö€ Õ¯Õ¡Ö€Õ¸Õ² Õ§ Õ¤Õ«Õ¿Õ¥Õ¬ Õ¡ÕµÕ¤ Õ¿Õ¥Õ½Õ¡Õ¯ Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¨</em>, Õ«Õ½Õ¯ Õ½Õ¿Õ¡ÖÕ¸Õ²Õ¶Õ¥Ö€Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Õ§Õ¯Ö€Õ¡Õ¶Õ¡Õ°Õ¡Õ¶Õ¥Õ¬, ÕºÕ¡Õ¿Õ³Õ§Õ¶Õ¥Õ¬ Ö‡ Õ¡ÕµÕ¬ Õ¯Õ¥Ö€Õº Õ¾Õ¥Ö€Õ¡Õ¿Õ¡Ö€Õ¡Õ®Õ¥Õ¬ Õ¤Ö€Õ¡Õ¶Ö„Ö‰<em>Õ„Õ¡Õ½Õ¿Õ¡Õ¤Õ¸Õ¶Õ¸Õ¾ Õ´Õ« Õ¯Õ«Õ½Õ¾Õ¥Ö„ Õ¸Ö€Ö‡Õ§ Õ¾Õ¿Õ¡Õ¶Õ£Õ¡Ö‚Õ¸Ö€ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ¿Õ¸Ö‚Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢Ö‰ </em></li>
+      <li><em>IP Õ°Õ¡Õ½ÖÕ§Õ¶Õ¥Ö€ Ö‡ Õ¡ÕµÕ¬ Õ´Õ¥Õ¿Õ¡Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€</em>: ÔµÖ€Õ¢ Õ¤Õ¸Ö‚Ö„ Õ´Õ¸Ö‚Õ¿Ö„ Õ§Ö„ Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ´, Õ´Õ¥Õ¶Ö„ ÕºÕ¡Õ°Õ¸Ö‚Õ´ Õ¥Õ¶ Õ±Õ¥Ö€ Õ´Õ¸Ö‚Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ¥Õ¬Õ¸Ö‚ IP Õ°Õ¡Õ½ÖÕ§Õ¶, Õ«Õ¶Õ¹ÕºÕ§Õ½ Õ¶Õ¡Ö‡ Õ¦Õ¶Õ¶Õ¡Ö€Õ¯Õ«Õ¹Õ« Õ¿Õ¥Õ½Õ¡Õ¯Õ¨Ö‰ Ô¿Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´Õ¥Õ¶Õ¸Ö‚Õ´ Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ§ Õ´Õ¸Ö‚Õ¿Ö„Õ« Õ¢Õ¸Õ¬Õ¸Ö€ Õ½Õ¥Õ½Õ½Õ«Õ¡Õ¶Õ¥Ö€Õ« Õ¾Õ¥Ö€Õ¡Õ¶Õ¡ÕµÕ´Õ¡Õ¶ Ö‡ Õ´Õ¡Ö€Õ´Õ¡Õ¶ Õ°Õ¶Õ¡Ö€Õ¡Ö‚Õ¸Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨Ö‰ ÕŽÕ¥Ö€Õ»Õ«Õ¶ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ¡Õ® IP Õ°Õ¡Õ½ÖÕ§Õ¶ ÕºÕ¡Õ°Ö‚Õ¸Ö‚Õ´ Õ§ Õ´Õ«Õ¶Õ¹Ö‡ 12 Õ¡Õ´Õ«Õ½ ÕªÕ¡Õ´Õ¯Õ§Õ¿Õ¸Õ¾Ö‰ Õ„Õ¥Õ¶Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶Ö„ Õ¶Õ¡Ö‡ ÕºÕ¡Õ°Õ¥Õ¬ Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ« Õ´Õ¡Õ¿Õ¥Õ¡Õ¶Õ« Õ¶Õ«Õ·Ö„Õ¥Ö€Õ¨, Õ¸Ö€Õ¨ ÕºÕ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¸Ö‚Õ´ Õ§ Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ«Õ¶ Õ¡Ö€Õ¸Ö‚Õ¡Õ® Õ«Ö‚Ö€Õ¡Ö„Õ¡Õ¶Õ¹Õ«Ö‚Ö€ Õ°Õ¡Ö€ÖÕ´Õ¡Õ¶ IP Õ°Õ¡Õ½ÖÕ§Õ¶Ö‰</li>
+      </ul>
+
+      <hr class="spacer" />
+
+      <h3 id="use"> Ô»Õ¶Õ¹ÕºÕ§Õ½ Õ¥Õ¶Ö„ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ´ Õ±Õ¥Ö€ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ¿Õ¥Õ²Õ¥Õ¯Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¨</h3>
+
+      <p>Õ‘Õ¡Õ¶Õ¯Õ¡ÖÕ¡Õ® Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬, Õ¸Ö€Õ¨ Õ´Õ¥Õ¶Ö„ Õ°Õ¡Ö‚Õ¡Ö„Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ±Õ¥Õ¦Õ¶Õ«Ö Õ¯Õ¡Ö€Õ¸Õ² Õ§ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ¥Õ¬ Õ°Õ¥Õ¿Ö‡Õ¡ÕµÕ¬ Õ¶ÕºÕ¡Õ¿Õ¡Õ¯Õ¶Õ¥Ö€Õ¸Õ¾Õ</p>
+
+      <ul>
+      <li>Õ„Õ¡Õ¿Õ¸Ö‚ÖÕ¥Õ¬Õ¸Ö‚ Õ„Õ¡Õ½Õ¿Õ¡Õ¤Õ¸Õ¶Õ« Õ°Õ«Õ´Õ¶Õ¡Õ¯Õ¡Õ¶ Õ£Õ¸Ö€Õ®Õ¡Õ¼Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¨Ö‰ Ô´Õ¸Ö‚Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Ö„ ÖƒÕ¸ÕÕ£Õ¸Ö€Õ®Õ¡Õ¯ÖÕ¥Õ¬ Õ¡ÕµÕ¬ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö Õ¢Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ°Õ¥Õ¿ Ö‡ Õ¿Õ¥Õ²Õ¡Õ¤Ö€Õ¥Õ¬ Õ±Õ¥Ö€ Õ½Õ¥ÖƒÕ¡Õ¯Õ¡Õ¶ Õ¢Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ´Õ«Õ¡ÕµÕ¶ Õ´Õ¸Ö‚Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ¥Õ¬Õ¸Ö‚Ö ÕµÕ¥Õ¿Õ¸ÕµÖ‰ Õ•Ö€Õ«Õ¶Õ¡Õ¯Õ Õ¤Õ¸Ö‚Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ§Ö„ Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬ Õ¡ÕµÕ¬ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö Õ¶Ö€Õ¡Õ¶Ö Õ°Õ¡Õ´Õ¡Õ¯ÖÕ¸Ö‚Õ¡Õ® Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ±Õ¥Ö€ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ°Õ¸Õ½Ö„Õ¸Ö‚Õ´ Õ¿Õ¥Õ½Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Ö‰</li>
+      <li>Õ†ÕºÕ¡Õ½Õ¿Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡ÕµÕ¶Ö„Õ« Õ´Õ¸Õ¤Õ¥Ö€Õ¡ÖÕ«Õ¡ÕµÕ«Õ¶Ö‰ Õ•Ö€Õ«Õ¶Õ¡Õ¯Õ Õ°Õ¡Õ´Õ¥Õ´Õ¡Õ¿Õ¥Õ¬Õ¸Ö‚ Õ±Õ¥Ö€ IP Õ°Õ¡Õ½ÖÕ§Õ¶ Õ¡ÕµÕ¬ Õ¡Ö€Õ¤Õ¥Õ¶ ÕµÕ¡ÕµÕ¿Õ¶Õ« Õ°Õ¡Õ½ÖÕ§Õ« Õ°Õ¥Õ¿Õ Õ¢Õ¡ÖÕ¡ÕµÕ¡ÕµÕ¿Õ¥Õ¬Õ¸Ö‚ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´Õ«Ö ÕÕ¸Ö‚Õ½Õ¡ÖƒÕ¥Õ¬Õ¸Ö‚ Õ¯Õ¡Õ´ Õ¡ÕµÕ¬ ÕÕ¡ÕÕ¿Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ¤Õ¥ÕºÖ„Õ¥Ö€Õ¨ Ö‰</li>
+      <li>ÕÕ¥Ö€ Õ¿Ö€Õ¡Õ´Õ¡Õ¤Ö€Õ¡Õ® Õ§Õ¬ÖƒÕ¸Õ½Õ¿Õ« Õ°Õ¡Õ½ÖÕ§Õ¶ Õ¯Õ¡Ö€Õ¸Õ² Õ§ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ¥Õ¬ Õ±Õ¥Õ¦ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ¿Õ¸Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¿Ö€Õ¡Õ´Õ¡Õ¤Ö€Õ¥Õ¬Õ¸Ö‚, Õ¡ÕµÕ¬ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶ÖÕ Õ±Õ¥Ö€ Õ¢Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ°Õ¥Õ¿ ÖƒÕ¸ÕÕ£Õ¸Ö€Õ®Õ¡Õ¯ÖÕ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¯Õ¡Õ´ Õ±Õ¥Õ¦ Õ°Õ¡Õ½ÖÕ§Õ¡Õ£Ö€Õ¡Õ® Õ¶Õ¡Õ´Õ¡Õ¯Õ« Õ´Õ¡Õ½Õ«Õ¶ Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¥Õ¬Õ¸Ö‚, Õ«Õ¶Õ¹ÕºÕ§Õ½ Õ¶Õ¡Ö‡ Õ°Õ¡ÕµÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ«Õ¶ Õ¯Õ¡Õ´ Õ¡ÕµÕ¬ ÕµÕ¡ÕµÕ¿Õ¥Ö€Õ«Õ¶ Õ¸Ö‚ Õ°Õ¡Ö€ÖÕ¥Ö€Õ«Õ¶ ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰</li>
+      </ul>
+
+      <hr class="spacer" />
+
+      <h3 id="protect"> Ô»Õ¶Õ¹ÕºÕ¥Õ½ Õ¥Õ¶Ö„ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ¸Ö‚Õ´ Õ±Õ¥Ö€ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶</h3>
+
+      <p>Õ„Õ¥Õ¶Ö„ Õ¯Õ«Ö€Õ¡Õ¼Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¿Õ¡Ö€Õ¢Õ¥Ö€ Õ¡Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ´Õ«Õ»Õ¸ÖÕ¶Õ¥Ö€Õ« ÕºÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬Õ¸Ö‚ Õ±Õ¥Ö€ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¡Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨, Õ¥Ö€Õ¢ Õ¤Õ¸Ö‚Ö„ Õ´Õ¸Ö‚Õ¿Ö„Õ¡Õ£Ö€Õ¸Ö‚Õ´, Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¸Ö‚Õ´ Õ¯Õ¡Õ´ Õ¤Õ«Õ¿Õ¸Ö‚Õ´ Õ§Õ£ Õ±Õ¥Ö€ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ¿Õ¥Õ²Õ¥Õ¯Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¨Ö‰ Ô» Õ©Õ«Ö‚Õ½ Õ´Õ¶Õ¡ÖÕ¡Õ® Õ¢Õ¡Õ¶Õ¥Ö€Õ«, Õ±Õ¥Ö€ Õ¤Õ«Õ¿Õ¡Ö€Õ¯Õ¹Õ« Õ½Õ¥Õ½Õ½Õ«Õ¡Õ¶, Õ«Õ¶Õ¹ÕºÕ§Õ½ Õ¶Õ¡Ö‡ Õ±Õ¥Ö€ Õ°Õ¡Õ¾Õ¥Õ¬Õ¾Õ¡Õ®Õ« Ö‡ API Õ´Õ«Õ»Ö‡ Õ¿Ö€Õ¡Ö†Õ«Õ¯Õ¨ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ¸Ö‚Õ¡Õ® Õ¥Õ¶ SSL-Õ¸Õ¾, Õ«Õ½Õ¯ Õ±Õ¥Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨ ÕºÕ¡Õ¿Õ¡Õ°Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¾Õ¡Õ® Õ§ Õ´Õ«Õ¡Õ¯Õ¸Õ²Õ´Õ¡Õ¶Õ« Õ¡Õ¬Õ£Õ¸Ö€Õ«Õ©Õ´Õ¸Õ¾Ö‰ Ô´Õ¸Ö‚Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ§Ö„ Õ´Õ«Õ¡ÖÕ¶Õ¥Õ¬ Õ¥Ö€Õ¯Õ¡Õ½Õ¿Õ«Õ³Õ¡Õ¶ Õ«Õ¶Ö„Õ¶Õ¸Ö€Õ¸Õ·Õ¸Ö‚Õ´Õ¨, Õ±Õ¥Ö€ Õ°Õ¡Õ·Õ¸Ö‚Õ« Õ´Õ¸Ö‚Õ¿Ö„Õ¨ Õ¡Ö‚Õ¥Õ¬Õ« ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ¸Ö‚Õ¡Õ® Õ¤Õ¡Ö€Õ±Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰</p>
+
+      <hr class="spacer" />
+
+      <h3 id="data-retention">ÕÕ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€ ÕºÕ¡Õ°ÕºÕ¡Õ¶Õ´Õ¡Õ¶ Ö„Õ¡Õ²Õ¡Ö„Õ¡Õ¯Õ¡Õ¶Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨</h3>
+
+      <p>Õ„Õ¥Õ¶Ö„ Õ£Õ¸Ö€Õ®Õ¡Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¢Õ¡Ö€Õ¥ÕÕ«Õ²Õ³ Õ»Õ¡Õ¶Ö„Õ</p>
+
+      <ul>
+      <li>ÕºÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬Õ¸Ö‚ Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ« Õ´Õ¡Õ¿Õ¥Õ¡Õ¶Õ« Õ¶Õ«Õ·Ö„Õ¥Ö€Õ¨Õ Õ¡ÕµÕ½ Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ«Õ¶ Õ¡Ö€Õ¸Ö‚Õ¡Õ® Õ¢Õ¸Õ¬Õ¸Ö€ Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« IP Õ°Õ¡Õ½ÖÕ§Õ¶Õ¥Ö€Õ¸Õ¾, Õ¡ÕµÕ¶Ö„Õ¡Õ¶Õ¸Õ¾ Õ¸Ö€Ö„Õ¡Õ¶Õ¸Õ¾ Õ¶Õ´Õ¡Õ¶ Õ¶Õ«Õ·Ö„Õ¥Ö€Õ¨ ÕºÕ¡Õ°Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶, Õ¸Õ¹ Õ¡Ö‚Õ¥Õ¬ Ö„Õ¡Õ¶ 90 Ö…Ö€ ÕªÕ¡Õ´Õ¯Õ§Õ¿Õ¸Õ¾Ö‰</li>
+      <li>ÕºÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬Õ¸Ö‚ Õ£Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ¡Õ® Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€Õ« Õ°Õ¡Õ·Õ¸Ö‚Õ« Õ°Õ¥Õ¿ Õ¯Õ¡ÕºÕ¡Õ¯ÖÕ¸Ö‚Õ¡Õ® IP Õ°Õ¡Õ½ÖÕ§Õ¶Õ¥Ö€Õ¨, Õ¸Õ¹ Õ¡Ö‚Õ¥Õ¬ Ö„Õ¡Õ¶ 12 Õ¡Õ´Õ«Õ½ ÕªÕ¡Õ´Õ¯Õ§Õ¿Õ¸Õ¾Ö‰</li>
+      </ul>
+
+      <p>Ô´Õ¸Ö‚Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ§Ö„ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¥Õ¬ Õ°Õ¡ÕµÖ Õ¶Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬Õ¸Ö‚ Õ±Õ¥Ö€ Õ¢Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ ÕºÕ¡Õ¿Õ³Õ§Õ¶Õ Õ¶Õ¥Ö€Õ¡Õ¼Õ¥Õ¡Õ¬ Õ±Õ¥Ö€ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨, Õ´Õ¥Õ¤Õ«Õ¡ Õ¯ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨, Õ£Õ¬ÕÕ¡Õ¶Õ¯Õ¡Ö€Õ¨ Ö‡ Õ¥Õ¿Õ¶Õ¡Õ¶Õ¯Õ¡Ö€Õ¨Ö‰</p>
+
+      <p>Ô´Õ¸Ö‚Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ§Ö„ Õ¨Õ¶Õ¤Õ´Õ«Õ·Õ¿ Õ»Õ¶Õ»Õ¥Õ¬ Õ±Õ¥Ö€ Õ°Õ¡Õ·Õ«Ö‚Õ¨ ÖÕ¡Õ¶Õ¯Õ¡ÖÕ¡Õ® ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯</p>
+
+      <hr class="spacer"/>
+
+      <h3 id="cookies">Õ•Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ´ Õ§Ö„ Õ¡Ö€Õ¤ÕµÕ¸ÕžÖ„ Õ©ÕÕ¸Ö‚Õ¯Õ¶Õ¥Ö€</h3>
+
+      <p>Ô±ÕµÕ¸Ö‰ Ô¹ÕÕ¸Ö‚Õ¯Õ¶Õ¥Ö€Õ¨ ÖƒÕ¸Ö„Ö€ Ö†Õ¡ÕµÕ¬Õ¥Ö€ Õ¥Õ¶ Õ¸Ö€Õ¨ Õ¯Õ¡ÕµÖ„Õ¨ Õ¯Õ¡Õ´ Õ¶Ö€Õ¡Õ¶ Õ®Õ¡Õ¼Õ¡ÕµÕ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ´Õ¡Õ¿Õ¸Ö‚ÖÕ¸Õ²Õ¨ ÖƒÕ¸ÕÕ¡Õ¶ÖÕ¸Ö‚Õ´ Õ§ Õ±Õ¥Ö€ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ¹Õ« Õ¯Õ¸Õ·Õ¿ Õ½Õ¯Õ¡Ö‚Õ¡Õ¼Õ¡Õ¯Õ«Õ¶ Õ¤Õ«Õ¿Õ¡Ö€Õ¯Õ¹Õ« Õ´Õ«Õ»Õ¸ÖÕ¸Õ¾ (Õ±Õ¥Ö€ Õ©Õ¸ÕµÕ¬Õ¡Õ¿Õ¸Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶)Ö‰ Ô¹ÕÕ¸Ö‚Õ¯Õ¶Õ¥Ö€Õ¨ Õ°Õ¶Õ¡Ö€Õ¡Ö‚Õ¸Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¥Õ¶ Õ¿Õ¡Õ¬Õ«Õ½ Õ¯Õ¡ÕµÖ„Õ«Õ¶ Õ³Õ¡Õ¶Õ¡Õ¹Õ¥Õ¬Õ¸Ö‚ Õ±Õ¥Ö€ Õ¤Õ«Õ¿Õ¡Ö€Õ¯Õ«Õ¹Õ¨, Ö‡ Õ£Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ¡Õ® Õ°Õ¡Õ·Õ¸Ö‚Õ« Õ¤Õ§ÕºÖ„Õ¸Ö‚Õ´Õ Õ¶Õ¸ÕµÕ¶Õ¡ÖÕ¶Õ¥Õ¬Õ¸Ö‚ Õ¡ÕµÕ¶ Õ±Õ¥Ö€ Õ°Õ¡Õ·Õ¸Ö‚Õ« Õ°Õ¥Õ¿Ö‰
+
+      Õ„Õ¥Õ¶Ö„ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ©ÕÕ¸Ö‚Õ¯Õ¶Õ¥Ö€Õ¨ Õ°Õ¡Õ½Õ¯Õ¡Õ¶Õ¡Õ¬Õ¸Ö‚ Ö‡ ÕºÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬Õ¸Ö‚ Õ±Õ¥Ö€ Õ¶Õ¡ÕÕ¨Õ¶Õ¿Ö€Õ¡Õ¶Ö„Õ¶Õ¥Ö€Õ¨ Õ¡ÕºÕ¡Õ£Õ¡Õµ Õ¡ÕµÖÕ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€Ö‰</p>
+
+      <hr class="spacer" />
+
+      <h3 id="disclose"> Ô²Õ¡ÖÕ¡ÕµÕ¡ÕµÕ¿Õ¸Ö‚Õ´ Õ¥Ö€Ö€Õ¸Ö€Õ¤ Õ¯Õ¸Õ²Õ´Õ¥Ö€Õ«Õ¶ </h3>
+
+      <p>Õ„Õ¥Õ¶Ö„ Õ¹Õ¥Õ¶Ö„ Õ¾Õ¡Õ³Õ¡Õ¼Õ¸Ö‚Õ´, ÖƒÕ¸ÕÕ¡Õ¶Õ¡Õ¯Õ¸Ö‚Õ´, Õ¯Õ¡Õ´ Õ¡ÕµÕ¬ Õ¯Õ¥Ö€Õº ÖƒÕ¸ÕÕ¡Õ¶ÖÕ¸Ö‚Õ´ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ¶Õ¸ÕµÕ¶Õ¡ÖÕ¶Õ¸Õ² Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ¿Õ¸Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¥Ö€Ö€Õ¸Ö€Õ¤ Õ¯Õ¸Õ²Õ´Õ¥Ö€Õ«Õ¶Ö‰ ÕÕ¡ Õ¹Õ« Õ¶Õ¥Ö€Õ¡Õ¼Õ¸Ö‚Õ´ Õ¾Õ½Õ¿Õ¡Õ°Õ¥Õ¬Õ« Õ¥Ö€Ö€Õ¸Ö€Õ¤ Õ¯Õ¸Õ²Õ´Õ¥Ö€Õ«Õ¶ Õ¸Ö€Õ¸Õ¶Ö„ Ö…Õ£Õ¿Õ¶Õ¸Ö‚Õ´ Õ¥Õ¶ Õ¯Õ¡ÕµÖ„Õ« Õ£Õ¸Ö€Õ®Õ¡Ö€Õ¯Õ´Õ¡Õ¶, Õ´Õ¥Ö€ Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ¶Õ¥Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ®Õ¡Õ¾Õ¡Õ¬Õ´Õ¡Õ¶, Õ¯Õ¡Õ´ Õ±Õ¥Õ¦ Õ®Õ¡Õ¼Õ¡ÕµÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€, Õ¡ÕµÕ¶Ö„Õ¡Õ¶ ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯ Õ¸Ö€Ö„Õ¡Õ¶ Õ¡ÕµÕ¤ Õ¥Ö€Ö€Õ¸Ö€Õ¤ Õ¯Õ¸Õ²Õ´Õ¥Ö€Õ¨ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶ Õ¥Õ¶ Õ£Õ¡Õ²Õ¿Õ¶Õ« ÕºÕ¡Õ°Õ¥Õ¬ Õ¡ÕµÕ¤ Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ¨Ö‰ Õ„Õ¥Õ¶Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶Ö„ Õ¶Õ¡Ö‡ Õ°Õ¡Õ¶Ö€Õ¡ÕµÕ¶Õ¡ÖÕ¶Õ¥Õ¬ Õ±Õ¥Ö€ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ¿Õ¸Ö‚Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ¥Ö€Õ¢ Õ°Õ¡Ö‚Õ¡Õ¿Õ¡ÖÕ¡Õ® Õ¥Õ¶Ö„ Õ¸Ö€ Õ¤Ö€Õ¡ Õ°Õ¡Õ¶Ö€Õ¡ÕµÕ¶Õ¡ÖÕ¸Ö‚Õ´Õ¨ Õ¡Õ¶Õ°Ö€Õ¡ÕªÕ¥Õ·Õ¿ Õ§ Ö…Ö€Õ§Õ¶Ö„Õ« ÕºÕ¡Õ°Õ¡Õ¶Õ»Õ¶Õ¥Ö€Õ« Õ¯Õ¡Õ¿Õ¡Ö€Õ´Õ¡Õ¶, Õ¯Õ¡Õ´ Õ¯Õ¡ÕµÖ„Õ« Ö„Õ¡Õ²Õ¡Ö„Õ¡Õ¯Õ¡Õ¶Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¯Õ«Ö€Õ¡Õ¼Õ´Õ¡Õ¶ Õ°Õ¡Õ´Õ¡Ö€, Õ¯Õ¡Õ´ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ¥Õ¬Õ¸Ö‚ Õ´Õ¥Ö€ Õ¯Õ¡Õ´ Õ¡ÕµÕ¬Õ¸Ö Õ«Ö€Õ¡Ö‚Õ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€Õ¨, Õ½Õ¥ÖƒÕ¡Õ¯Õ¡Õ¶Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ¯Õ¡Õ´ Õ¡Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨Ö‰</p>
+
+      <p>ÕÕ¥Ö€ Õ°Õ¡Õ¶Ö€Õ¡ÕµÕ«Õ¶ Õ¢Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ§ Õ¢Õ¥Õ¼Õ¶Õ¸Ö‚Õ¥Õ¬ ÖÕ¡Õ¶ÖÕ« Õ´Õ«Ö‚Õ½ Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ¶Õ¥Ö€Õ« Õ¯Õ¸Õ²Õ´Õ«ÖÖ‰ ÕÕ¥Ö€ Õ°Õ¡Õ¶Ö€Õ¡ÕµÕ«Õ¶ Ö‡ Õ´Õ«Õ¡ÕµÕ¶ Õ°Õ¥Õ¿Ö‡Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ«Õ¶ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶ Õ¡ÕµÕ¶ Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ¶Õ¥Ö€Õ«Õ¶ Õ¸Ö€Õ¿Õ¥Õ² Õ£Ö€Õ¡Õ¶ÖÕ¡Õ® Õ¥Õ¶ Õ±Õ¥Ö€ Õ°Õ¥Õ¿Ö‡Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ¨, Ö‡ Õ°Õ¡Õ½ÖÕ¥Õ¡Õ¯Õ¡Õ¶ Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶ Õ°Õ¡Õ½ÖÕ§Õ¡Õ¿Õ§Ö€Õ¥Ö€Õ« Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ¶Õ¥Ö€Õ«Õ¶, Õ¡ÕµÕ¶ Õ¤Õ§ÕºÖ„Õ¸Ö‚Õ´ Õ¥Ö€Õ¢ Õ¡ÕµÕ¤ Õ°Õ¥Õ¿Ö‡Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ¨ Õ¯Õ¡Õ´ Õ°Õ¡Õ½ÖÕ§Õ¡Õ¿Õ§Ö€Õ¥Ö€Õ¨ Õ£Õ¿Õ¶Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶ Õ¡ÕµÕ½ Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ«Ö Õ¿Õ¡Ö€Õ¢Õ¥Ö€ Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ« Õ¾Ö€Õ¡ÕµÖ‰</p>
+
+      <p>ÔµÖ€Õ¢ Õ¤Õ¸Ö‚Ö„ Õ©Õ¸ÕµÕ¬Õ¡Õ¿Ö€Õ¸Ö‚Õ´ Õ§Ö„ Õ°Õ¡Õ¾Õ¥Õ¬Õ¾Õ¡Õ®Õ« Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ±Õ¥Ö€ Õ°Õ¡Õ·Õ«Ö‚Õ¨, Õ¯Õ¡ÕÕ¸Ö‚Õ¡Õ® Õ©Õ¸Ö‚ÕµÕ¬Õ¿Õ¾Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ« Õ·Ö€Õ»Õ¡Õ¶Õ¡Õ¯Õ«Ö, Õ¡ÕµÕ¶ Õ¯Õ¡Ö€Õ¸Õ² Õ§ Õ´Õ¸Ö‚Õ¿Ö„ Õ¸Ö‚Õ¶Õ¥Õ¶Õ¡Õ¬ Õ±Õ¥Ö€ Õ°Õ¡Õ·Õ«Ö‚ Õ°Õ¡Õ¶Ö€Õ¡ÕµÕ«Õ¶ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ¿Õ¾Õ¸Ö‚Õ©ÕµÕ¡Õ¶Õ¨, Õ±Õ¥Ö€ Õ°Õ¥Õ¿Ö‡Õ¸Õ²Õ¶Õ¥Ö€Õ« ÖÕ¡Õ¶Õ¯Õ«Õ¶, Õ±Õ¥Ö€ Õ°Õ¥Õ¿Ö‡Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ«Ö ÖÕ¡Õ¶Õ¯Õ«Õ¶, ÖÕ¡Õ¶Õ¯Õ¥Ö€Õ«Õ¶, Õ±Õ¥Ö€ Õ¢Õ¸Õ¬Õ¸Ö€ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ«Õ¶, Ö‡ Õ±Õ¥Ö€ Õ°Õ¡Ö‚Õ¡Õ¶Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ«Õ¶Ö‰ Õ€Õ¡Õ¾Õ¥Õ¬Õ¾Õ¡Õ®Õ¶Õ¥Ö€Õ¨ Õ¥Ö€Õ¢Õ¥Ö„ Õ¹Õ¥Õ¶Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ´Õ¸Ö‚Õ¿Ö„ Õ¸Ö‚Õ¶Õ¥Õ¶Õ¡Õ¬ Õ±Õ¥Ö€ Õ§Õ¬ÖƒÕ¸Õ½Õ¿Õ« Õ°Õ¡Õ½ÖÕ§Õ«Õ¶ Õ¯Õ¡Õ´ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ«Õ¶Ö‰</p>
+
+      <hr class="spacer" />
+
+      <h3 id="children">Ô¿Õ¡ÕµÖ„Õ« Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ´Õ¨ Õ¥Ö€Õ¥ÕÕ¡Õ¶Õ¥Ö€Õ« Õ¯Õ¸Õ²Õ´Õ«Ö</h3>
+
+      <p>ÔµÕ©Õ§ Õ¡ÕµÕ½ Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ¨ Õ£Õ¿Õ¶Õ¸Ö‚Õ´ Õ§ ÔµÕ„-Õ¸Ö‚Õ´ Õ¯Õ¡Õ´ ÔµÕÔ³-Õ¸Ö‚Õ´. Õ„Õ¥Ö€ Õ¯Õ¡ÕµÖ„Õ¨, Õ¡Ö€Õ¿Õ¡Õ¤Ö€Õ¡Õ¶Ö„Õ¶Õ¥Ö€Õ¨ Ö‡ Õ®Õ¡Õ¼Õ¡ÕµÕ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¶Õ¡ÕÕ¡Õ¿Õ¥Õ½Õ¸Ö‚Õ¡Õ® Õ¥Õ¶ 16 Õ¿Õ¡Ö€Õ«Õ¶ Õ¬Ö€Õ¡ÖÕ¡Õ® Õ¡Õ¶Õ±Õ¡Õ¶Ö Õ°Õ¡Õ´Õ¡Ö€: ÔµÕ©Õ§ Õ±Õ¥Ö€ 16 Õ¿Õ¡Ö€Õ¥Õ¯Õ¡Õ¶Õ¨ Õ¹Õ« Õ¬Ö€Õ¡ÖÕ¥Õ¬, Õ¡ÕºÕ¡ Õ°Õ¥Õ¿Ö‡Õ¥Õ¬Õ¸Õ¾ GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) ÕºÕ¡Õ°Õ¡Õ¶Õ»Õ¶Õ¥Ö€Õ«Õ¶Õ Õ´Õ« Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ§Ö„ Õ¡ÕµÕ½ Õ¯Õ¡ÕµÖ„Õ¨Ö‰</p>
+
+      <p>ÔµÕ©Õ§ Õ¡ÕµÕ½ Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ¨ Õ£Õ¿Õ¶Ö‚Õ¸Ö‚Õ´ Õ§ Ô±Õ„Õ†-Õ¸Ö‚Õ´. Õ„Õ¥Ö€ Õ¯Õ¡ÕµÖ„Õ¨, Õ¡Ö€Õ¿Õ¡Õ¤Ö€Õ¡Õ¶Ö„Õ¶Õ¥Ö€Õ¨ Ö‡ Õ®Õ¡Õ¼Õ¡ÕµÕ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¶Õ¡ÕÕ¡Õ¿Õ¥Õ½Õ¸Ö‚Õ¡Õ® Õ¥Õ¶ 13 Õ¿Õ¡Ö€Õ«Õ¶ Õ¬Ö€Õ¡ÖÕ¡Õ® Õ¡Õ¶Õ±Õ¡Õ¶Ö Õ°Õ¡Õ´Õ¡Ö€: ÔµÕ©Õ§ Õ±Õ¥Ö€ 16 Õ¿Õ¡Ö€Õ¥Õ¯Õ¡Õ¶Õ¨ Õ¹Õ« Õ¬Ö€Õ¡ÖÕ¥Õ¬, Õ¡ÕºÕ¡ Õ°Õ¥Õ¿Ö‡Õ¥Õ¬Õ¸Õ¾ COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) ÕºÕ¡Õ°Õ¡Õ¶Õ»Õ¶Õ¥Ö€Õ«Õ¶Õ Õ´Õ« Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ§Ö„ Õ¡ÕµÕ½ Õ¯Õ¡ÕµÖ„Õ¨Ö‰
+
+      <p>Ô±ÕµÕ¬ Õ¥Ö€Õ¯Ö€Õ¶Õ¥Ö€Õ« Õ«Ö€Õ¡Ö‚Õ¡Õ½Õ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ·Ö€Õ»Õ¡Õ¶Õ¶Õ¥Ö€Õ¸Ö‚Õ´ Ö…Ö€Õ§Õ¶Ö„Õ« ÕºÕ¡Õ°Õ¡Õ¶Õ»Õ¶Õ¥Ö€Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¸Ö‚Õ¥Õ¬Ö‰</p>
+
+      <hr class="spacer" />
+
+      <h3 id="changes">Ô³Õ¡Õ²Õ¿Õ¶Õ«Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Ö„Õ¡Õ²Õ¡Ö„Õ¡Õ¯Õ¡Õ¶Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ ÖƒÕ¸ÖƒÕ¸ÕÕ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¨</h3>
+
+      <p>ÔµÕ©Õ§ Õ´Õ¥Õ¶Ö„ Õ¸Ö€Õ¸Õ·Õ¥Õ¶Ö„ ÖƒÕ¸ÖƒÕ¸ÕÕ¥Õ¬ Õ´Õ¥Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ«Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Ö„Õ¡Õ²Õ¡Ö„Õ¡Õ¯Õ¡Õ¶Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨, Õ¡ÕºÕ¡ Õ¡ÕµÕ¤ ÖƒÕ¸ÖƒÕ¸ÕÕ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¯Õ°Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¥Õ¶Ö„ Õ¡ÕµÕ½ Õ§Õ»Õ¸Ö‚Õ´Ö‰ </p>
+
+      <p>Ô±ÕµÕ½ ÖƒÕ¡Õ½Õ¿Õ¡Õ©Õ¸Ö‚Õ²Õ©Õ¨ Õ¬Õ«Õ¡Õ¦Ö…Ö€Õ¸Ö‚Õ¡Õ® Õ§ CC-BY-SA Õ¬Õ«ÖÕ¥Õ¶Õ¦Õ«Õ¡ÕµÕ¸Õ¾Ö‰ ÕŽÕ¥Ö€Õ»Õ«Õ¶ Õ©Õ¡Ö€Õ´Õ¡ÖÕ¸Ö‚Õ´Õ¨Õ 7-Õ¨ Õ´Õ¡Ö€Õ¿Õ« 2018</p>
+
+      <p>Õ“Õ¸ÕÕ¡Õ¼Õ¶Õ¸Ö‚Õ¡Õ® Õ§ <a href="https://github.com/discourse/discourse">Discourse-Õ« Õ£Õ¡Õ²Õ¿Õ¶Õ«Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Ö„Õ¡Õ²Õ¡Ö„Õ¡Õ¯Õ¡Õ¶Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ«Ö</a>.</p>
+
+      <p><strong>ÕˆÕ¹ ÕºÕ¡Õ·Õ¿Ö…Õ¶Õ¡Õ¯Õ¡Õ¶, Õ¸Õ¹ Õ«Ö€Õ¡Ö‚Õ¡Õ¯Õ¡Õ¶ Õ©Õ¡Ö€Õ£Õ´Õ¡Õ¶Õ¸Ö‚Õ©Õ«Ö‚Õ¶</strong></p>
   themes:
+    contrast: Mastodon (Õ¢Õ¡Ö€Õ±Ö€ Õ¯Õ¸Õ¶Õ¿Ö€Õ¡Õ½Õ¿Õ¸Õ¾)
     default: Mastodon (Õ„Õ¸Ö‚Õ£)
     mastodon-light: Mastodon (Ô¼Õ¸Ö‚Õ½Õ¡Õ¾Õ¸Ö€)
   time:
@@ -284,14 +1037,50 @@ hy:
       default: "%b %d, %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
+    add: Ô±Õ¾Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬
     disable: Ô±Õ¶Õ»Õ¡Õ¿Õ¥Õ¬
-    enable: Õ„Õ«Õ¡ÖÕ¶Õ¥Õ¬
-    setup: Ô¿Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¥Õ¬
+    disabled_success: ÔµÖ€Õ¯Ö„Õ¡ÕµÕ¬ Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¸Ö‚Õ´Õ¨ Õ°Õ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢ Õ¡Õ¶Õ»Õ¸Ö‚Õ¡Õ® Õ§
+    edit: Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬
+    enabled: ÔµÖ€Õ¯Ö„Õ¡ÕµÕ¬ Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¸Ö‚Õ´Õ¨ Õ´Õ«Õ¡ÖÕ¸Ö‚Õ¡Õ® Õ§
+    enabled_success: ÔµÖ€Õ¯Ö„Õ¡ÕµÕ¬ Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¸Ö‚Õ´Õ¨ Õ°Õ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢ Õ´Õ«Õ¡ÖÕ¸Ö‚Õ¡Õ® Õ§
+    generate_recovery_codes: ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ¾Õ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ´Õ¡Õ¶ Õ¯Õ¸Õ¤Õ¥Ö€
+    lost_recovery_codes: ÕŽÕ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ´Õ¡Õ¶ Õ¯Õ¸Õ¤Õ¥Ö€Õ¨ Õ°Õ¶Õ¡Ö€Õ¡Ö‚Õ¸Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¥Õ¶ Õ¿Õ¡Õ¬Õ«Õ½ Õ´Õ¸Ö‚Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ°Õ¡Õ·Õ«Ö‚Õ Õ°Õ¥Õ¼Õ¡ÕÖ…Õ½Õ« Õ¯Õ¸Ö€Õ½Õ¿Õ« Õ¤Õ§ÕºÖ„Õ¸Ö‚Õ´Ö‰ ÔµÕ©Õ§ Õ¯Õ¸Ö€ÖÖ€Õ¥Õ¬ Õ¥Õ½ Õ¾Õ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ´Õ¡Õ¶ Õ¯Õ¸Õ¤Õ¥Ö€Õ¨, Õ¡ÕµÕ½Õ¿Õ¥Õ² Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ½Õ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ¶Õ¸Ö€Õ¥Ö€Õ¨Ö‰ Õ†Õ¡ÕÕ¯Õ«Õ¶ Õ¾Õ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ´Õ¡Õ¶ Õ¯Õ¸Õ¤Õ¥Ö€Õ¨ Õ¯Õ¹Õ¥Õ²Õ¡Ö€Õ¯Õ¾Õ¥Õ¶Ö‰
+    methods: ÔµÖ€Õ¯Ö„Õ¡ÕµÕ¬ Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ¸Ö‚Õ´ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ¶Õ¥Ö€
+    otp: Õ†Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ´Õ¡Õ¶ Õ°Õ¡Õ¾Õ¥Õ¬Õ¾Õ¡Õ®
+    recovery_codes: ÕŽÕ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ´Õ¡Õ¶ Õ¯Õ¸Õ¤Õ¥Ö€
+    recovery_codes_regenerated: ÕŽÕ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ´Õ¡Õ¶ Õ¯Õ¸Õ¤Õ¥Ö€Õ¨ Õ°Õ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢ Õ½Õ¿Õ¥Õ²Õ®Õ¸Ö‚Õ¥Õ¬ Õ¥Õ¶
+    webauthn: Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶Õ¥Ö€
   user_mailer:
+    sign_in_token:
+      title: Õ„Õ¸Ö‚Õ¿Ö„Õ« ÖƒÕ¸Ö€Õ±
     warning:
+      get_in_touch: Ô¿Õ¡Ö€Õ¸Õ² Õ§Ö„ Õ¯Õ¡ÕºÕ¸Ö‚Õ¥Õ¬ %{instance} Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ« Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¦Õ´Õ« Õ°Õ¥Õ¿ ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¥Õ¬Õ¸Õ¾ Õ¡ÕµÕ½ Õ¶Õ¡Õ´Õ¡Õ¯Õ«Õ¶Ö‰
+      statuses: Õ„Õ¡Õ½Õ¶Õ¡Ö‚Õ¸Ö€Õ¡ÕºÕ§Õ½, Õ´Õ«Õ¡ÕµÕ¶Õ
       title:
         none: Ô¶Õ£Õ¸Ö‚Õ·Õ¡ÖÕ¸Ö‚Õ´
+        sensitive: Õ„Õ¥Õ¤Õ«Õ¡Ö†Õ¡ÕµÕ¬Õ¨ ÕºÕ«Õ¿Õ¡Õ¯Õ¸Ö‚Õ¥Õ¬ Õ§ Õ¸Ö€ÕºÕ§Õ½ Õ¦Õ£Õ¡ÕµÕ¸Ö‚Õ¶Ö‰
+        suspend: Õ€Õ¡Õ·Õ«Ö‚Õ¨ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ¡Õ® Õ§
     welcome:
+      edit_profile_action: Ô¿Õ¡Ö€Õ£Õ¡Ö‚Õ¸Ö€Õ¥Õ¬ Õ°Õ¡Õ·Õ«Ö‚Õ¨
+      final_action: ÕÕ¯Õ½Õ¥Õ¬ Õ©Õ©Õ¥Õ¬
+      final_step: 'ÕÕ¯Õ½Õ«Ö€ Õ©Õ©Õ¥Õ›Õ¬Ö‰ Ô±Õ¶Õ£Õ¡Õ´ Õ¡Õ¼Õ¡Õ¶Ö Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ« Ö„Õ¸ Õ°Õ¡Õ¶Ö€Õ¡ÕµÕ«Õ¶ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Õ¥Ö€Ö‡Õ¡Õ¬ Õ¸Ö‚Ö€Õ«Õ·Õ¶Õ¥Ö€Õ« Õ´Ö…Õ¿, Ö…Ö€Õ«Õ¶Õ¡Õ¯Õ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡Õ¶ Õ°Õ¸Õ½Õ¸Ö‚Õ´ Õ¯Õ¡Õ´ Õ°Õ¥Õ·Õ©Õ¥Õ£Õ¥Ö€Õ¸Ö‚Õ´Ö‰ Ô¹Õ§ ÖÕ¡Õ¶Õ¯Õ¡Õ¶Õ¡Õ½, Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ ÕµÕ¡ÕµÕ¿Õ¶Õ¥Õ¬ Ö„Õ¸ Õ´Õ¡Õ½Õ«Õ¶ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬Õ¸Õ¾ #Õ¥Õ½Õ¶Õ¸Ö€Õ¥Õ¯Õ¥Õ´ Õ°Õ¥Õ·Õ©Õ¥Õ£Õ¨Ö‰'
+      review_preferences_action: Õ“Õ¸ÖƒÕ¸ÕÕ¥Õ¬ Õ¯Õ¡Ö€Õ£Õ¡Ö‚Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨
+      subject: Ô²Õ¡Ö€Õ« Õ£Õ¡Õ¬Õ¸Ö‚Õ½Õ¿ Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶
+      tip_federated_timeline: Ô´Õ¡Õ·Õ¶Õ¡ÕµÕ«Õ¶ Õ°Õ¸Õ½Ö„Õ¸Ö‚Õ´ Õ¥Ö€Ö‡Õ¸Ö‚Õ´ Õ§ Õ¡Õ´Õ¢Õ¸Õ²Õ» Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶Õ« ÖÕ¡Õ¶ÖÕ¨Ö‰ Ô²Õ¡ÕµÖ Õ¡ÕµÕ¶ Õ¶Õ¥Ö€Õ¡Õ¼Õ¸Ö‚Õ´ Õ§ Õ´Õ«Õ¡ÕµÕ¶ Õ¡ÕµÕ¶ Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€Õ¥Ö€Õ«Õ¶ Õ¸Ö€Õ¸Õ¶Ö Õ¢Õ¡ÕªÕ¡Õ¶Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ¡Õ® Õ¥Õ¶ Õ±Õ¥Ö€ Õ°Õ¡Ö€Ö‡Õ¡Õ¶Õ¶Õ¥Ö€, Õ¡ÕµÕ¤ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¸Õ¾ Õ¡ÕµÕ¶ Õ¯Õ¡Ö€Õ¸Õ² Õ§ Õ¬Õ«Õ¶Õ¥Õ¬ Õ¸Õ¹ Õ¡Õ´Õ¢Õ¸Õ²Õ»Õ¡Õ¯Õ¡Õ¶Ö‰
+      tip_following: Ô´Õ¸Ö‚ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´ Õ§Õ½ Ö„Õ¸ Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ« Õ¡Õ¤Õ´Õ«Õ¶(Õ¶Õ¥Ö€)Õ«Õ¶ Õ¬Õ¼Õ¥Õ¬Õ¡ÕµÕ¶Ö‰ Ô±ÕµÕ¬ Õ°Õ¥Õ¿Õ¡Ö„Ö€Ö„Õ«Ö€ Õ¡Õ¶Õ±Õ¡Õ¶Ö Õ£Õ¿Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Õ Õ©Õ¥Ö€Õ©Õ«Ö€ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡Õ¶ Ö‡ Õ¤Õ¡Õ·Õ¶Õ¡ÕµÕ«Õ¶ Õ°Õ¸Õ½Ö„Õ¥Ö€Õ¨Ö‰
+      tip_local_timeline: ÕÕ¥Õ²Õ¡Õ¯Õ¡Õ¶ Õ°Õ¸Õ½Ö„Õ¸Ö‚Õ´ Õ¥Ö€Ö‡Õ¸Ö‚Õ´ Õ¥Õ¶ %{instance} Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ« Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€Õ« Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨Ö‰ Õ†Ö€Õ¡Õ¶Ö„ Ö„Õ¸ Õ°Õ¡Õ¶Õ£Õ¸ÕµÖÕ« Õ°Õ¡Ö€Ö‡Õ¡Õ¶Õ¶Õ¥Ö€Õ¶ Õ¥Õ¶Ö‰
       tips: Õ€Õ¸Ö‚Õ·Õ¸Ö‚Õ´Õ¶Õ¥Ö€
+  users:
+    blocked_email_provider: ÕÕ¸Ö‚ÕµÕ¶ Õ§Õ¬ÖƒÕ¸Õ½Õ¿Õ« Õ¿Ö€Õ¡Õ´Õ¡Õ¤Ö€Õ¸Õ²Õ¨ Õ¡Ö€Õ£Õ¥Õ¬Õ¾Õ¡Õ® Õ§
+    invalid_email: Ô·Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§Õ¶ Õ¡Õ¶Õ¾Õ¡Ö‚Õ¥Ö€ Õ§
+    invalid_email_mx: Ô±ÕµÕ½ Õ°Õ¡Õ½ÖÕ§Õ¶ Õ¯Õ¡Ö€Õ®Õ¥Õ½ Õ©Õ§ Õ£Õ¸ÕµÕ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¹Õ¸Ö‚Õ¶Õ«
+    invalid_otp_token: Ô±Õ¶Õ¾Õ¡Ö‚Õ¥Ö€ 2F Õ¯Õ¸Õ¤
+    invalid_sign_in_token: Ô±Õ¶Õ¾Õ¡Ö‚Õ¥Ö€ Õ¡Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¯Õ¸Õ¤
+    signed_in_as: Õ„Õ¸Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ¸Ö€ÕºÕ§Õ½â€¤
   verification:
+    explanation_html: ÕŠÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€Õ« ÕµÕ²Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ°Õ¥Õ²Õ«Õ¶Õ¡Õ¯Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ¯Õ¡Ö€Õ¥Õ¬Õ« Õ§ Õ¾Õ¡Ö‚Õ¥Ö€Õ¡ÖÕ¶Õ¥Õ¬Ö‰ Ô±Õ¶Õ°Ö€Õ¡ÕªÕ¥Õ·Õ¿ Õ§ Õ¸Ö€ ÕµÕ²Õ¸Ö‚Õ¡Õ® Õ¯Õ¡ÕµÖ„Õ¨ ÕºÕ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ« ÕµÕ¥Õ¿Õ¡Õ¤Õ¡Ö€Õ± ÕµÕ²Õ¸Ö‚Õ´ Õ±Õ¥Ö€ Õ´Õ¡Õ½Õ¿Õ¡Õ¤Õ¸Õ¶Õ« Õ§Õ»Õ«Õ¶, Õ¸Ö€Õ¨ <strong>ÕºÕ§Õ¿Ö„ Õ§</strong> Õ¸Ö‚Õ¶Õ¥Õ¶Õ¡Õµ <code>rel="me"</code> Õ¶Õ«Õ·Ö„Õ¨Ö‰ Õ…Õ²Õ´Õ¡Õ¶ Õ¢Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ¯Õ¡Ö€Ö‡Õ¸Ö€ Õ¹Õ§Ö‰ Õ•Ö€Õ«Õ¶Õ¡Õ¯Õ
     verification: ÕÕ¿Õ¸Ö‚Õ£Õ¸Ö‚Õ´
+  webauthn_credentials:
+    delete: Õ‹Õ¶Õ»Õ¥Õ¬
+    not_enabled: WebAuthn-Õ¨ Õ¤Õ¥Õ¼ Õ´Õ«Õ¡ÖÕ¸Ö‚Õ¡Õ® Õ¹Õ§
+    registered_on: Ô³Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ¥Õ¬ Õ§ %{date}
diff --git a/config/locales/id.yml b/config/locales/id.yml
index ad18cefb77e8f8484721306929da531235a3b82e..bf63f62a48a4b54d823e574615a25c0e13bba719 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1,7 +1,7 @@
 ---
 id:
   about:
-    about_hashtag_html: Ini adalah toot public yang ditandai dengan <strong>#%{hashtag}</strong>. Anda bisa berinteraksi dengan mereka jika anda memiliki akun dimanapun di fediverse.
+    about_hashtag_html: Ini adalah toot publik yang ditandai dengan <strong>#%{hashtag}</strong>. Anda bisa berinteraksi dengan mereka jika anda memiliki akun dimanapun di fediverse.
     about_mastodon_html: Mastodon adalah sebuah jejaring sosial <em>terbuka, open-source</em. Sebuah alternatif <em>desentralisasi</em> dari platform komersial, menjauhkan anda resiko dari sebuah perusahaan yang memonopoli komunikasi anda. Pilih server yang anda percayai &mdash; apapun yang anda pilih, anda tetap dapat berinteraksi dengan semua orang. Semua orang dapat menjalankan server Mastodon sendiri dan berpartisipasi dalam <em>jejaring sosial</em> dengan mudah.
     about_this: Tentang server ini
     active_count_after: aktif
@@ -21,7 +21,9 @@ id:
     federation_hint_html: Dengan akun di %{instance} Anda dapat mengikuti orang di server Mastodon mana pun dan di luarnya.
     get_apps: Coba aplikasi mobile
     hosted_on: Mastodon dihosting di %{domain}
-    instance_actor_flash: Akun ini adalah aktor virtual yang dipakai untuk merepresentasikan server, bukan pengguna individu. Ini dipakai untuk tujuan federasi dan jangan diblokir kecuali Anda ingin memblokir seluruh instansi, yang seharusnya Anda pakai blokir domain.
+    instance_actor_flash: 'Akun ini adalah aktor virtual yang dipakai untuk merepresentasikan server, bukan pengguna individu. Ini dipakai untuk tujuan federasi dan jangan diblokir kecuali Anda ingin memblokir seluruh instansi, yang seharusnya Anda pakai blokir domain.
+
+'
     learn_more: Pelajari selengkapnya
     privacy_policy: Kebijakan Privasi
     see_whats_happening: Lihat apa yang sedang terjadi
@@ -37,8 +39,11 @@ id:
       domain: Server
       reason: Alasan
       rejecting_media: 'Berkas media dari server ini tak akan diproses dan disimpan, dan tak akan ada gambar kecil yang ditampilkan, perlu klik manual utk menuju berkas asli:'
+      rejecting_media_title: Media yang disaring
       silenced: 'Pos dari server ini akan disembunyikan dari linimasa publik dan percakapan, dan takkan ada notifikasi yang dibuat dari interaksi pengguna mereka, kecuali Anda mengikuti mereka:'
+      silenced_title: Server yang dibisukan
       suspended: 'Takkan ada data yang diproses, disimpan, dan ditukarkan dari server ini, sehingga interaksi atau komunikasi dengan pengguna dari server ini tak mungkin dilakukan:'
+      suspended_title: Server yang ditangguhkan
     unavailable_content_html: Mastodon umumnya mengizinkan Anda untuk melihat konten dan berinteraksi dengan pengguna dari server lain di fediverse. Ini adalah pengecualian yang dibuat untuk beberapa server.
     user_count_after:
       other: pengguna
@@ -52,6 +57,7 @@ id:
     followers:
       other: Pengikut
     following: Mengikuti
+    instance_actor_flash: Akun ini adalah aktor virtual yang merepresentasikan server itu sendiri dan bukan pengguna individu. Ini dipakai untuk tujuan gabungan dan seharusnya tidak ditangguhkan.
     joined: Bergabung pada %{date}
     last_active: terakhir aktif
     link_verified_on: Kepemilikan tautan ini telah dicek pada %{date}
@@ -86,9 +92,10 @@ id:
       delete: Hapus
       destroyed_msg: Catatan moderasi berhasil dihapus!
     accounts:
-      add_email_domain_block: Masukkan domain surel ke daftar hitam
+      add_email_domain_block: Masukkan domain email ke daftar hitam
       approve: Terima
       approve_all: Terima semua
+      approved_msg: Berhasil menerima pendaftaran %{username}
       are_you_sure: Anda yakin?
       avatar: Avatar
       by_domain: Domian
@@ -102,8 +109,10 @@ id:
       confirm: Konfirmasi
       confirmed: Dikonfirmasi
       confirming: Mengkonfirmasi
+      delete: Hapus data
       deleted: Terhapus
       demote: Turunkan
+      destroyed_msg: Data %{username} masuk antrean untuk dihapus segera
       disable: Nonaktifkan
       disable_two_factor_authentication: Nonaktifkan 2FA
       disabled: Dinonaktifkan
@@ -114,10 +123,12 @@ id:
       email_status: Status Email
       enable: Aktifkan
       enabled: Diaktifkan
+      enabled_msg: Berhasil mencairkan akun %{username}
       followers: Pengikut
       follows: Mengikut
       header: Tajuk
       inbox_url: URL Kotak masuk
+      invite_request_text: Alasan bergabung
       invited_by: Diundang oleh
       ip: IP
       joined: Bergabung
@@ -129,6 +140,8 @@ id:
       login_status: Status login
       media_attachments: Lampiran media
       memorialize: Ubah menjadi memoriam
+      memorialized: Dikenang
+      memorialized_msg: Berhasil mengubah akun %{username} menjadi akun memorial
       moderation:
         active: Aktif
         all: Semua
@@ -149,10 +162,14 @@ id:
       public: Publik
       push_subscription_expires: Langganan PuSH telah kadaluarsa
       redownload: Muat ulang profil
+      redownloaded_msg: Berhasil menyegarkan profil %{username} dari asal
       reject: Tolak
       reject_all: Tolak semua
+      rejected_msg: Berhasil menolak permintaan pendaftaran %{username}
       remove_avatar: Hapus avatar
       remove_header: Hapus header
+      removed_avatar_msg: Berhasil menghapus gambar avatar %{username}
+      removed_header_msg: Berhasil menghapus gambar header %{username}
       resend_confirmation:
         already_confirmed: Pengguna ini sudah dikonfirmasi
         send: Kirim ulang email konfirmasi
@@ -167,8 +184,10 @@ id:
         staff: Staf
         user: Pengguna
       search: Cari
-      search_same_email_domain: Pengguna lain dengan domain surel yang sama
+      search_same_email_domain: Pengguna lain dengan domain email yang sama
       search_same_ip: Pengguna lain dengan IP yang sama
+      sensitive: Sensitif
+      sensitized: ditandai sebagai sensitif
       shared_inbox_url: URL kotak masuk bersama
       show:
         created_reports: Laporan yang dibuat oleh akun ini
@@ -178,65 +197,82 @@ id:
       statuses: Status
       subscribe: Langganan
       suspended: Disuspen
+      suspension_irreversible: Data akun ini telah dihapus secara permanen. Anda dapat mengaktifkan akun agar tetap bisa dipakai lagi tapi data sebelumnya tidak dapat dikembalikan.
+      suspension_reversible_hint_html: Akun telah ditangguhkan, dan data akan dihapus total pada %{date}. Sebelum tanggal tersebut, akun dapat dikembalikan tanpa efek apapun. Jika Anda ingin menghapus segera semua data, Anda dapat melakukan sesuai keterangan di bawah.
       time_in_queue: Menunggu dalam antrean %{time}
       title: Akun
       unconfirmed_email: Email belum dikonfirmasi
+      undo_sensitized: Batalkan sensitif
       undo_silenced: Undo mendiamkan
       undo_suspension: Undo suspen
+      unsilenced_msg: Berhasil membuka batasan akun %{username}
       unsubscribe: Berhenti langganan
+      unsuspended_msg: Berhasil membuka penangguhan akun %{username}
       username: Nama pengguna
+      view_domain: Tampilkan ringkasan domain
       warn: Beri Peringatan
       web: Web
       whitelisted: Masuk daftar putih
     action_logs:
       action_types:
-        change_email_user: Ubah Surel untuk Pengguna
+        assigned_to_self_report: Berikan laporan
+        change_email_user: Ubah Email untuk Pengguna
         confirm_user: Konfirmasi Pengguna
         create_account_warning: Buat Peringatan
         create_announcement: Buat Pengumuman
         create_custom_emoji: Buat Emoji Khusus
         create_domain_allow: Buat Izin Domain
         create_domain_block: Buat Blokir Domain
-        create_email_domain_block: Buat Surel Blokir Domain
+        create_email_domain_block: Buat Email Blokir Domain
+        create_ip_block: Buat aturan IP
         demote_user: Turunkan Pengguna
         destroy_announcement: Hapus Pengumuman
         destroy_custom_emoji: Hapus Emoji Khusus
         destroy_domain_allow: Hapus Izin Domain
         destroy_domain_block: Hapus Blokir Domain
-        destroy_email_domain_block: Hapus surel blokir domain
+        destroy_email_domain_block: Hapus email blokir domain
+        destroy_ip_block: Hapus aturan IP
         destroy_status: Hapus Status
         disable_2fa_user: Nonaktifkan 2FA
         disable_custom_emoji: Nonaktifkan Emoji Khusus
         disable_user: Nonaktifkan Pengguna
         enable_custom_emoji: Aktifkan Emoji Khusus
         enable_user: Aktifkan Pengguna
+        memorialize_account: Kenang Akun
         promote_user: Promosikan Pengguna
         remove_avatar_user: Hapus Avatar
         reopen_report: Buka Lagi Laporan
         reset_password_user: Atur Ulang Kata sandi
+        resolve_report: Selesaikan Laporan
+        sensitive_account: Tandai media di akun Anda sebagai sensitif
         silence_account: Bisukan Akun
         suspend_account: Tangguhkan Akun
+        unassigned_report: Batalkan Pemberian Laporan
+        unsensitive_account: Batalkan tanda media di akun Anda dari sensitif
         unsilence_account: Lepas Status Bisu Akun
         unsuspend_account: Lepas Status Tangguh Akun
         update_announcement: Perbarui Pengumuman
         update_custom_emoji: Perbarui Emoji Khusus
+        update_domain_block: Perbarui Blokir Domain
         update_status: Perbarui Status
       actions:
         assigned_to_self_report: "%{name} menugaskan laporan %{target} kpd dirinya sendiri"
-        change_email_user: "%{name} mengubah alamat surel pengguna %{target}"
-        confirm_user: "%{name} mengonfirmasi alamat surel pengguna %{target}"
+        change_email_user: "%{name} mengubah alamat email pengguna %{target}"
+        confirm_user: "%{name} mengonfirmasi alamat email pengguna %{target}"
         create_account_warning: "%{name} mengirim peringatan untuk %{target}"
         create_announcement: "%{name} membuat pengumuman baru %{target}"
         create_custom_emoji: "%{name} mengunggah emoji baru %{target}"
         create_domain_allow: "%{name} memasukkan ke daftar putih domain %{target}"
         create_domain_block: "%{name} memblokir domain %{target}"
-        create_email_domain_block: "%{name} memasukkan ke daftar hitam domain surel %{target}"
+        create_email_domain_block: "%{name} memblokir domain email %{target}"
+        create_ip_block: "%{name} membuat aturan untuk IP %{target}"
         demote_user: "%{name} menurunkan pengguna %{target}"
         destroy_announcement: "%{name} menghapus pengumuman %{target}"
         destroy_custom_emoji: "%{name} menghapus emoji %{target}"
         destroy_domain_allow: "%{name} menghapus domain %{target} dari daftar putih"
         destroy_domain_block: "%{name} membuka blokir domain %{target}"
-        destroy_email_domain_block: "%{name} memasukkan ke daftar putih surel domain %{target}"
+        destroy_email_domain_block: "%{name} membuka blokir domain email %{target}"
+        destroy_ip_block: "%{name} menghapus aturan untuk IP %{target}"
         destroy_status: "%{name} menghapus status %{target}"
         disable_2fa_user: "%{name} mematikan syarat dua faktor utk pengguna %{target}"
         disable_custom_emoji: "%{name} mematikan emoji %{target}"
@@ -249,13 +285,16 @@ id:
         reopen_report: "%{name} membuka ulang laporan %{target}"
         reset_password_user: "%{name} mereset kata sandi pengguna %{target}"
         resolve_report: "%{name} menyelesaikan laporan %{target}"
+        sensitive_account: "%{name} menandai media %{target} sebagai sensitif"
         silence_account: "%{name} membungkam akun %{target}"
         suspend_account: "%{name} menangguhkan akun %{target}"
         unassigned_report: "%{name} tidak menugaskan laporan %{target}"
+        unsensitive_account: "%{name} membatalkan tanda media %{target} sebagai sensitif"
         unsilence_account: "%{name} menghapus bungkaman akun %{target}"
         unsuspend_account: "%{name} menghapus penangguhan akun %{target}"
         update_announcement: "%{name} memperbarui pengumuman %{target}"
         update_custom_emoji: "%{name} memperbarui emoji %{target}"
+        update_domain_block: "%{name} memperbarui blokir domain untuk %{target}"
         update_status: "%{name} memperbarui status %{target}"
       deleted_status: "(status dihapus)"
       empty: Log tidak ditemukan.
@@ -299,6 +338,7 @@ id:
       listed: Terdaftar
       new:
         title: Tambah emoji kustom baru
+      not_permitted: Anda tidak diizinkan untuk melakukan tindakan ini
       overwrite: Timpa
       shortcode: Kode pendek
       shortcode_hint: Sedikitnya 2 karakter, hanya karakter alfanumerik dan garis bawah
@@ -383,19 +423,20 @@ id:
       view: Lihat blokir domain
     email_domain_blocks:
       add_new: Tambah baru
-      created_msg: Berhasil menambahkan domain surel ke daftar hitam
+      created_msg: Berhasil memblokir domain email
       delete: Hapus
-      destroyed_msg: Berhasil menghapus domain surel dari daftar hitam
+      destroyed_msg: Berhasil membuka blokiran domain email
       domain: Domain
-      empty: Tidak ada domain surel yang masuk daftar hitam.
+      empty: Tidak ada domain email yang diblokir.
       from_html: dari %{domain}
       new:
         create: Tambah domain
-        title: Entri daftar hitam surel baru
-      title: Daftar hitam surel
+        title: Blokir domain email baru
+      title: Domain email terblokir
     instances:
       by_domain: Domain
       delivery_available: Pengiriman tersedia
+      empty: Domain tidak ditemukan.
       known_accounts:
         other: "%{count} akun yang dikenal"
       moderation:
@@ -418,6 +459,21 @@ id:
         expired: Kedaluwarsa
         title: Saring
       title: Undang
+    ip_blocks:
+      add_new: Buat aturan
+      created_msg: Berhasil menambah aturan IP baru
+      delete: Hapus
+      expires_in:
+        '1209600': 2 minggu
+        '15778476': 6 bulan
+        '2629746': 1 bulan
+        '31556952': 1 tahun
+        '86400': 1 hari
+        '94670856': 3 tahun
+      new:
+        title: Buat aturan IP baru
+      no_ip_block_selected: Tak ada aturan IP yang berubah karena tak ada yang dipilih
+      title: Aturan IP
     pending_accounts:
       title: Akun tertunda (%{count})
     relationships:
@@ -455,6 +511,8 @@ id:
       comment:
         none: Tidak ada
       created_at: Dilaporkan
+      forwarded: Diteruskan
+      forwarded_to: Diteruskan ke %{domain}
       mark_as_resolved: Tandai telah diseleseikan
       mark_as_unresolved: Tandai belum terselesaikan
       notes:
@@ -498,6 +556,7 @@ id:
       domain_blocks_rationale:
         title: Tampilkan alasan
       enable_bootstrap_timeline_accounts:
+        desc_html: Buat pengguna baru mengikuti akun yang sudah dipilih agar beranda mereka tidak kosong
         title: Aktifkan opsi ikuti otomatis untuk pengguna baru
       hero:
         desc_html: Ditampilkan di halaman depan. Direkomendasikan minimal 600x100px. Jika tidak diatur, kembali ke server gambar kecil
@@ -524,6 +583,9 @@ id:
         min_invite_role:
           disabled: Tidak ada satu pun
           title: Izinkan undangan oleh
+        require_invite_text:
+          desc_html: Saat pendaftaran harus disetujui manual, buat input teks "Mengapa Anda ingin bergabung?" sebagai hal wajib bukan opsional
+          title: Pengguna baru harus memasukkan alasan bergabung
       registrations_mode:
         modes:
           approved: Persetujuan diperlukan untuk mendaftar
@@ -621,6 +683,7 @@ id:
     add_new: Buat alias
     created_msg: Berhasil membuat alias baru. Sekarang Anda dapat memulai pindah dari akun lama.
     deleted_msg: Berhasil menghapus alias. Pindah dari akun tersebut ke sini tidak akan lagi bisa dilakukan.
+    empty: Anda tidak memiliki alias.
     hint_html: Jika Anda ingin pindah dari akun lain ke sini, Anda dapat membuat alias, yang dilakukan sebelum Anda setuju dengan memindah pengikut dari akun lama ke akun sini. Aksi ini <strong>tidak berbahaya dan tidak bisa dikembalikan</strong>. <strong>Pemindahan akun dimulai dari akun lama</strong>.
     remove: Hapus tautan alias
   appearance:
@@ -662,8 +725,11 @@ id:
       prefix_sign_up: Daftar ke Mastodon hari ini!
       suffix: Dengan sebuah akun, Anda dapat mengikuti orang, mengirim pembaruan, dan bertukar pesan dengan pengguna dari server Mastodon mana pun dan lainnya!
     didnt_get_confirmation: Tidak menerima petunjuk konfirmasi?
+    dont_have_your_security_key: Tidak memiliki kunci keamanan?
     forgot_password: Lupa kata sandi?
     invalid_reset_password_token: Token reset kata sandi tidak valid atau kedaluwarsa. Silakan minta yang baru.
+    link_to_otp: Masukkan kode dua-faktor dari ponsel Anda atau dari kode pemulihan
+    link_to_webauth: Gunakan perangkat kunci keamanan Anda
     login: Masuk
     logout: Keluar
     migrate_account: Pindah ke akun berbeda
@@ -679,16 +745,18 @@ id:
     security: Identitas
     set_new_password: Tentukan kata sandi baru
     setup:
-      email_below_hint_html: Jika alamat surel di bawah tidak benar, Anda dapat menggantinya di sini dan menerima konfirmasi surel baru.
-      email_settings_hint_html: Konfirmasi surel telah dikirim ke %{email}. Jika alamat surel tidak benar, Anda dapat mengubahnya di setelan akun.
+      email_below_hint_html: Jika alamat email di bawah tidak benar, Anda dapat menggantinya di sini dan menerima email konfirmasi baru.
+      email_settings_hint_html: Email konfirmasi telah dikirim ke %{email}. Jika alamat email tidak benar, Anda dapat mengubahnya di pengaturan akun.
       title: Atur
     status:
       account_status: Status akun
-      confirming: Menunggu konfirmasi surel diselesaikan.
+      confirming: Menunggu konfirmasi email diselesaikan.
       functional: Akun Anda kini beroperasi penuh.
-      pending: Lamaran Anda sedang ditinjau oleh staf kami. Ini mungkin butuh beberapa waktu. Anda akan menerima sebuah surel jika lamaran Anda diterima.
+      pending: Permintaan Anda sedang ditinjau oleh staf kami. Ini mungkin butuh beberapa waktu. Anda akan menerima email jika permintaan Anda diterima.
       redirecting_to: Akun Anda tidak aktif karena sekarang dialihkan ke %{acct}.
+    too_fast: Formulir dikirim terlalu cepat, coba lagi.
     trouble_logging_in: Kesulitan masuk?
+    use_security_key: Gunakan kunci keamanan
   authorize_follow:
     already_following: Anda sudah mengikuti akun ini
     already_requested: Anda sudah mengirimkan permintaan untuk mengikuti akun tersebut
@@ -706,9 +774,14 @@ id:
     hint_html: "<strong>Tip:</strong> Kami tidak akan meminta kata sandi Anda lagi untuk beberapa jam ke depan."
     invalid_password: Kata sandi tidak valid
     prompt: Konfirmasi kata sandi untuk melanjutkan
+  crypto:
+    errors:
+      invalid_key: bukan kunci Ed25519 atau Curve25519 yang valid
+      invalid_signature: bukan tanda tangan Ed25519 yang valid
   date:
     formats:
       default: "%d %b %Y"
+      with_month_name: "%d %B %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}j"
@@ -733,9 +806,9 @@ id:
       before: 'Sebelum melanjutkan, silakan baca catatan ini dengan hati-hati:'
       caches: Konten yang telah tersimpan di server lain mungkin akan tetap di sana
       data_removal: Kiriman Anda dan data lainnya akan dihapus secara permanen
-      email_change_html: Anda dapat <a href="%{path}">mengubah alamat surel Anda</a> tanpa perlu menghapus akun
-      email_contact_html: Jika pesan belum diterima, Anda dapat mengirim surel <a href="mailto:%{email}">%{email}</a> sebagai bantuan
-      email_reconfirmation_html: Jika Anda tidak menerima konfirmasi surel, <a href="%{path}">Anda dapat memintanya lagi</a>
+      email_change_html: Anda dapat <a href="%{path}">mengubah alamat email Anda</a> tanpa perlu menghapus akun
+      email_contact_html: Jika pesan belum diterima, Anda dapat mengirim email ke <a href="mailto:%{email}">%{email}</a> untuk mencari bantuan
+      email_reconfirmation_html: Jika Anda tidak menerima email konfirmasi, <a href="%{path}">Anda dapat memintanya lagi</a>
       irreversible: Anda tidak akan bisa lagi mengembalikan atau mengaktifkan kembali akun Anda
       more_details_html: Lebih detailnya, lihat <a href="%{terms_path}">kebijakan privasi</a>.
       username_available: Nama pengguna Anda akan tersedia lagi
@@ -773,6 +846,7 @@ id:
       request: Meminta arsip Anda
       size: Ukuran
     blocks: Anda blokir
+    bookmarks: Markah
     csv: CSV
     domain_blocks: Blokir domain
     lists: Daftar
@@ -834,9 +908,13 @@ id:
     inactive: Tidak aktif
     publicize_checkbox: 'Dan toot ini:'
     publicize_toot: 'Terbukti! Saya adalah %{username} di %{service}: %{url}'
+    remove: Hapus bukti dari akun
+    removed: Berhasil menghapus bukti dari akun
     status: Status verifikasi
     view_proof: Lihat bukti
   imports:
+    errors:
+      over_rows_processing_limit: berisi lebih dari %{count} baris
     modes:
       merge: Gabung
       merge_long: Pertahankan rekaman yang sudah ada dan buat baru
@@ -846,6 +924,7 @@ id:
     success: Data anda berhasil diupload dan akan diproses sesegera mungkin
     types:
       blocking: Daftar diblokir
+      bookmarks: Markah
       domain_blocking: Daftar blokir domain
       following: Daftar diikuti
       muting: Daftar didiamkan
@@ -899,6 +978,7 @@ id:
     on_cooldown: Anda baru saja memindahkan akun Anda. Fungsi ini akan tersedia kembali %{count} hari lagi.
     past_migrations: Migrasi lampau
     proceed_with_move: Pindahkan pengikut
+    redirected_msg: Akun Anda sedang dialihkan ke %{acct}.
     redirecting_to: Akun Anda dialihkan ke %{acct}.
     set_redirect: Atur peralihan
     warning:
@@ -912,6 +992,10 @@ id:
       redirect: Pemberitahuan peralihan akan dimunculkan pada akun profil Anda dan akun akan dikecualikan dari pencarian
   moderation:
     title: Moderasi
+  move_handler:
+    carry_blocks_over_text: Pengguna ini pindah dari %{acct}, yang telah Anda blokir sebelumnya.
+    carry_mutes_over_text: Pengguna ini pindah dari %{acct}, yang telah Anda bisukan sebelumnya.
+    copy_account_note_text: 'Pengguna ini pindah dari %{acct}, ini dia pesan Anda sebelumnya tentang mereka:'
   notification_mailer:
     digest:
       action: Lihat semua notifikasi
@@ -945,7 +1029,7 @@ id:
       subject: "%{name} mem-boost status anda"
       title: Boost baru
   notifications:
-    email_events: Event untuk notifikasi surel
+    email_events: Event untuk notifikasi email
     email_events_hint: 'Pilih event yang ingin Anda terima notifikasinya:'
     other_settings: Pengaturan notifikasi lain
   number:
@@ -958,6 +1042,14 @@ id:
           quadrillion: Kdt
           thousand: Rb
           trillion: T
+  otp_authentication:
+    code_hint: Masukkan kode yang dibuat oleh aplikasi autentikator sebagai konfirmasi
+    description_html: Jika Anda mengaktifkan <strong>autentikasi dua-faktor</strong> menggunakan aplikasi autentikator, Anda membutuhkan ponsel untuk masuk akun, yang akan membuat token untuk dimasukkan.
+    enable: Aktifkan
+    instructions_html: "<strong>Pindai kode QR ini dengan Google Authenticator anda atau aplikasi TOTP lainnya di ponsel anda</strong>. Mulai sekarang, aplikasi tersebut akan membuat token yang bisa anda gunakan untuk masuk akun."
+    manual_instructions: 'Jika anda tidak bisa memindai kode QR dan harus memasukkannya secara manual, ini dia kode rahasia yang harus dimasukkan:'
+    setup: Persiapan
+    wrong_code: Kode yang dimasukkan tidak cocok! Apakah waktu server dan waktu di ponsel sudah benar?
   pagination:
     newer: Lebih baru
     next: Selanjutnya
@@ -986,6 +1078,7 @@ id:
   relationships:
     activity: Aktivitas akun
     dormant: Terbengkalai
+    follow_selected_followers: Ikuti pengikut yang dipilih
     followers: Pengikut
     following: Mengikuti
     invited: Diundang
@@ -1082,10 +1175,13 @@ id:
     profile: Profil
     relationships: Ikuti dan pengikut
     two_factor_authentication: Autentikasi Two-factor
+    webauthn_authentication: Kunci keamanan
   spam_check:
     spam_detected: Ini adalah laporan otomatis. Spam terdeteksi.
   statuses:
     attached:
+      audio:
+        other: "%{count} audio"
       description: 'Terlampir: %{attached}'
       image:
         other: "%{count} gambar"
@@ -1112,6 +1208,8 @@ id:
         other: "%{count} memilih"
       vote: Memilih
     show_more: Tampilkan selengkapnya
+    show_newer: Tampilkan lebih baru
+    show_older: Tampilkan lebih lama
     show_thread: Tampilkan utas
     sign_in_to_participate: Masuk untuk mengikuti percakapan
     title: '%{name}: "%{quote}"'
@@ -1129,6 +1227,87 @@ id:
   tags:
     does_not_match_previous_name: tidak cocok dengan nama sebelumnya
   terms:
+    body_html: |
+      <h2>Privacy Policy</h2>
+      <h3 id="collect">What information do we collect?</h3>
+
+      <ul>
+      <li><em>Basic account information</em>: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.</li>
+      <li><em>Posts, following and other public information</em>: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.</li>
+      <li><em>Direct and followers-only posts</em>: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. <em>Please keep in mind that the operators of the server and any receiving server may view such messages</em>, and that recipients may screenshot, copy or otherwise re-share them. <em>Do not share any dangerous information over Mastodon.</em></li>
+      <li><em>IPs and other metadata</em>: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.</li>
+      </ul>
+
+      <hr class="spacer" />
+
+      <h3 id="use">What do we use your information for?</h3>
+
+      <p>Any of the information we collect from you may be used in the following ways:</p>
+
+      <ul>
+      <li>To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.</li>
+      <li>To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.</li>
+      <li>The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.</li>
+      </ul>
+
+      <hr class="spacer" />
+
+      <h3 id="protect">How do we protect your information?</h3>
+
+      <p>We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL, and your password is hashed using a strong one-way algorithm. You may enable two-factor authentication to further secure access to your account.</p>
+
+      <hr class="spacer" />
+
+      <h3 id="data-retention">What is our data retention policy?</h3>
+
+      <p>We will make a good faith effort to:</p>
+
+      <ul>
+      <li>Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.</li>
+      <li>Retain the IP addresses associated with registered users no more than 12 months.</li>
+      </ul>
+
+      <p>You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.</p>
+
+      <p>You may irreversibly delete your account at any time.</p>
+
+      <hr class="spacer"/>
+
+      <h3 id="cookies">Do we use cookies?</h3>
+
+      <p>Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.</p>
+
+      <p>We use cookies to understand and save your preferences for future visits.</p>
+
+      <hr class="spacer" />
+
+      <h3 id="disclose">Do we disclose any information to outside parties?</h3>
+
+      <p>We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety.</p>
+
+      <p>Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.</p>
+
+      <p>When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.</p>
+
+      <hr class="spacer" />
+
+      <h3 id="children">Site usage by children</h3>
+
+      <p>If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) do not use this site.</p>
+
+      <p>If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) do not use this site.</p>
+
+      <p>Law requirements can be different if this server is in another jurisdiction.</p>
+
+      <hr class="spacer" />
+
+      <h3 id="changes">Changes to our Privacy Policy</h3>
+
+      <p>If we decide to change our privacy policy, we will post those changes on this page.</p>
+
+      <p>This document is CC-BY-SA. It was last updated March 7, 2018.</p>
+
+      <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
     title: "%{instance} Ketentuan Layanan dan Kebijakan Privasi"
   themes:
     contrast: Mastodon (Kontras tinggi)
@@ -1139,42 +1318,50 @@ id:
       default: "%d %b %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Masukkan kode yang dibuat oleh app autentikator sebagai konfirmasi
-    description_html: Jika anda menaktifkan ototentikasi dua faktor, saat login anda harus menggunakan telepon anda  untuk membuat token supaya anda bisa masuk.
+    add: Tambah
     disable: Matikan
-    enable: Aktifkan
+    disabled_success: Autentikasi dua-faktor berhasil dinonaktifkan
+    edit: Edit
     enabled: Otentifikasi dua faktor aktif
     enabled_success: Ototentikasi dua faktor telah diaktifkan
     generate_recovery_codes: Buat Kode Pemulihan
-    instructions_html: "<strong>Pindai kode QR ini pada Otentikator Google anda atau aplikasi TOTP lainnya di telepon anda</strong>. Mulai sekarang, aplikasi tersebut akan membuat token yang bisa anda gunakan untuk login."
     lost_recovery_codes: Kode pemulihan bisa anda gunakan untuk mendapatkan kembali akses pada akun anda jika anda kehilangan handphone anda. Jika anda kehilangan kode pemulihan, anda bisa membuatnya ulang disini. Kode pemulihan anda yang lama tidak akan bisa digunakan lagi.
-    manual_instructions: 'Jika anda tidak bisa memindai kode QR dan harus memasukkannya secara manual, ini dia kode yang harus dimasukkan:'
+    methods: Metode dua-faktor
+    otp: Aplikasi autentikator
     recovery_codes: Kode pemulihan cadangan
     recovery_codes_regenerated: Kode Pemulihan berhasil dibuat ulang
     recovery_instructions_html: Jika anda kehilangan akses pada handphone anda, anda bisa menggunakan kode pemulihan dibawah ini untuk mendapatkan kembali akses pada akun anda. Simpan kode pemulihan anda baik-baik, misalnya dengan mencetaknya atau menyimpannya bersama dokumen penting lainnya.
-    setup: Persiapan
-    wrong_code: Kode yang dimasukkan tidak cocok! Apa waktu server dan waktu di handphone sudah cocok?
+    webauthn: Kunci keamanan
   user_mailer:
     backup_ready:
       explanation: Cadangan penuh akun Mastodon Anda sudah dapat diunduh!
       subject: Arsip Anda sudah siap diunduh
       title: Ambil arsip
+    sign_in_token:
+      details: 'Ini dia rincian usaha masuk akun:'
+      explanation: 'Kami mendeteksi usaha masuk ke akun Anda dari alamat IP tak dikenal. Jika ini Anda, mohon masukkan kode keamanan di bawah pada halaman masuk:'
+      further_actions: 'Jika ini bukan Anda, mohon ganti kata sandi dan aktifkan autentikasi dua-faktor pada akun Anda. Anda bisa melakukannya di sini:'
+      subject: Harap konfirmasi usaha masuk akun
+      title: Usaha masuk akun
     warning:
       explanation:
         disable: Saat akun Anda beku, data Anda tetap utuh. Anda tidak akan dapat melakukan apa-apa sampai akun Anda tidak lagi dikunci.
+        sensitive: Berkas media dan media tertaut yang Anda unggah akan dianggap sebagai sensitif.
         silence: Saat akun Anda dibatasi, hanya akun yang Anda ikuti yang dapat melihat toot Anda di server ini. Akun Anda mungkin akan dikecualikan dari daftar publik. Akun lain dapat mengikuti akun Anda secara manual.
         suspend: Akun Anda telah ditangguhkan. Semua toot dan media yang Anda unggah dihapus secara permanen dari server ini, dan server tempat Anda memiliki pengikut.
-      get_in_touch: Anda dapat membalas surel ini untuk menghubungi pengurus %{instance}.
+      get_in_touch: Anda dapat membalas email ini untuk menghubungi pengurus %{instance}.
       review_server_policies: Tinjau kebijakan server
       statuses: 'Khususnya untuk:'
       subject:
         disable: Akun Anda %{acct} telah dibekukan
         none: Peringatan untuk %{acct}
+        sensitive: Postingan media akun Anda %{acct} telah ditandai sebagai sensitif
         silence: Akun Anda %{acct} telah dibatasi
         suspend: Akun Anda %{acct} telah ditangguhkan
       title:
         disable: Akun dibekukan
         none: Peringatan
+        sensitive: Media Anda telah ditandai sebagai sensitif
         silence: Akun dibatasi
         suspend: Akun ditangguhkan
     welcome:
@@ -1186,7 +1373,7 @@ id:
       full_handle: Penanganan penuh Anda
       full_handle_hint: Ini yang dapat Anda sampaikan kepada teman agar mereka dapat mengirim pesan atau mengikuti Anda dari server lain.
       review_preferences_action: Ubah preferensi
-      review_preferences_step: Pastikan Anda telah mengatur preferensi Anda, seperti surel untuk menerima pesan, atau tingkat privasi bawaan untuk kiriman Anda. Jika Anda tidak alergi dengan gerakan gambar, Anda dapat mengaktifkan opsi mainkan otomatis GIF.
+      review_preferences_step: Pastikan Anda telah mengatur preferensi Anda, seperti email untuk menerima pesan, atau tingkat privasi bawaan untuk postingan Anda. Jika Anda tidak alergi dengan gerakan gambar, Anda dapat mengaktifkan opsi mainkan otomatis GIF.
       subject: Selamat datang di Mastodon
       tip_federated_timeline: Linimasa gabungan adalah ruang yang menampilkan jaringan Mastodon. Tapi ini hanya berisi tetangga orang-orang yang Anda ikuti, jadi tidak sepenuhnya komplet.
       tip_following: Anda secara otomatis mengikuti admin server. Untuk mencari akun-akun yang menarik, silakan periksa linimasa lokal dan gabungan.
@@ -1195,12 +1382,34 @@ id:
       tips: Tips
       title: Selamat datang, %{name}!
   users:
+    blocked_email_provider: Layanan email ini tidak diizinkan
     follow_limit_reached: Anda tidak dapat mengikuti lebih dari %{limit} orang
+    generic_access_help_html: Mengalami masalah saat akses akun? Anda mungkin perlu menghubungi %{email} untuk mencari bantuan
     invalid_email: Alamat email tidak cocok
+    invalid_email_mx: Alamat email ini sepertinya tidak ada
     invalid_otp_token: Kode dua faktor tidak cocok
+    invalid_sign_in_token: Kode keamanan tidak valid
     otp_lost_help_html: Jika Anda kehilangan akses keduanya, Anda dapat menghubungi %{email}
-    seamless_external_login: Anda masuk via layanan eksternal, sehingga setelan kata sandi dan surel tidak tersedia.
+    seamless_external_login: Anda masuk via layanan eksternal, sehingga pengaturan kata sandi dan email tidak tersedia.
     signed_in_as: 'Masuk sebagai:'
+    suspicious_sign_in_confirmation: Anda terlihat belum pernah masuk dari perangkat ini, dan sudah lama Anda tidak masuk akun, sehingga kami mengirim kode keamanan ke alamat email Anda untuk mengonfirmasi bahwa ini adalah Anda.
   verification:
     explanation_html: 'Anda dapat <strong>memverifikasi diri Anda sebagai pemiliki tautan pada metadata profil</strong>. Situsweb yang ditautkan haruslah berisi tautan ke profil Mastodon Anda. Tautan tersebut <strong>harus</strong> memiliki atribut <code>rel="me"</code>. Isi teks tautan tidaklah penting. Ini contohnya:'
     verification: Verifikasi
+  webauthn_credentials:
+    add: Tambahkan kunci keamanan baru
+    create:
+      error: Terjadi masalah saat menambahkan kunci keamanan. Silakan coba lagi.
+      success: Kunci keamanan Anda berhasil ditambahkan.
+    delete: Hapus
+    delete_confirmation: Yakin ingin menghapus kunci keamanan ini?
+    description_html: Jika Anda mengaktifkan <strong>autentikasi kunci keamanan</strong>, proses masuk Anda akan memerlukan salah satu kunci keamanan Anda.
+    destroy:
+      error: Terjadi masalah saat menghapus kunci keamanan Anda. Silakan coba lagi.
+      success: Kunci keamanan Anda berhasil dihapus.
+    invalid_credential: Kunci keamanan tidak valid
+    nickname_hint: Masukkan panggilan kunci keamanan baru Anda
+    not_enabled: Anda belum mengaktifkan WebAuthn
+    not_supported: Peramban ini tidak mendukung kunci keamanan
+    otp_required: Untuk menggunakan kunci keamanan harap aktifkan autentikasi dua-faktor.
+    registered_on: Terdaftar pada %{date}
diff --git a/config/locales/io.yml b/config/locales/io.yml
index 0b09134bb651b5e965756f30e05b7a9011724306..a99c4a96652d389be08f0652bb129084348e8c1b 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -98,14 +98,6 @@ io:
       blocking: Listo de blokusiti
       following: Listo de sequati
     upload: Kargar
-  invites:
-    expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
   notification_mailer:
     digest:
       body: Yen mikra rezumo di to, depos ke tu laste vizitis en %{since}
@@ -159,11 +151,8 @@ io:
     reblogged: diskonocigita
     sensitive_content: Titiliva kontenajo
   two_factor_authentication:
-    description_html: Se tu posibligas <strong>dufaktora autentikigo</strong>, tu bezonos tua poshtelefonilo por enirar, nam ol kreos nombri, quin tu devos enskribar.
     disable: Extingar
-    enable: Acendar
     generate_recovery_codes: Generate Recovery Codes
-    instructions_html: "<strong>Skanez ta QR-kodexo per Google Authenticator o per simila apliko di tua poshtelefonilo</strong>. De lore, la apliko kreos nombri, quin tu devos enskribar."
     recovery_instructions_html: If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account. Keep the recovery codes safe, for example by printing them and storing them with other important documents.
   users:
     invalid_email: La retpost-adreso ne esas valida
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 1da4b69cdbe838c19a820b31a57cbcc4b4850b92..2d6102d98dee3ce2446fefeb848d0b977de46861 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -60,10 +60,11 @@ is:
       one: fylgjandi
       other: fylgjendur
     following: Fylgist meÃ°
+    instance_actor_flash: Ãžessi notandaaÃ°gangur er sÃ½ndarnotandi sem stendur fyrir sjÃ¡lfan netÃ¾jÃ³ninn en ekki neinn einstakling. Hann er notaÃ°ur viÃ° skÃ½jasambandsmiÃ°lun og Ã¦tti ekki aÃ° setja hann Ã biÃ° eÃ°a banna.
     joined: GerÃ°ist Ã¾Ã¡tttakandi %{date}
     last_active: sÃÃ°asta virkni
     link_verified_on: Eignarhald Ã¡ Ã¾essum tengli var athugaÃ° Ã¾ann %{date}
-    media: MyndskrÃ¡r
+    media: Myndefni
     moved_html: "%{name} hefur veriÃ° fÃ¦rÃ°ur Ã %{new_profile_link}:"
     network_hidden: Ãžessar upplÃ½singar ekki tiltÃ¦kar
     never_active: Aldrei
@@ -98,6 +99,7 @@ is:
       add_email_domain_block: Ãštiloka tÃ¶lvupÃ³stlÃ©n
       approve: SamÃ¾ykkja
       approve_all: SamÃ¾ykkja allt
+      approved_msg: TÃ³kst aÃ° samÃ¾ykkja skrÃ¡ningu fyrir %{username}
       are_you_sure: Ertu viss?
       avatar: AuÃ°kennismynd
       by_domain: LÃ©n
@@ -111,8 +113,10 @@ is:
       confirm: StaÃ°festa
       confirmed: StaÃ°fest
       confirming: StaÃ°festi
+      delete: EyÃ°a gÃ¶gnum
       deleted: Eytt
       demote: LÃ¦kka Ã tign
+      destroyed_msg: GÃ¶gn notandans %{username} eru nÃºna Ã biÃ° eftir aÃ° vera endanlega eytt
       disable: Gera Ã³virkt
       disable_two_factor_authentication: Gera tveggja-Ã¾Ã¡tta auÃ°kenningu Ã³virka
       disabled: Ã“virkt
@@ -123,10 +127,12 @@ is:
       email_status: StaÃ°a tÃ¶lvupÃ³sts
       enable: Virkja
       enabled: Virkt
+      enabled_msg: TÃ³kst aÃ° affrysta aÃ°gang notandans %{username}
       followers: Fylgjendur
       follows: Fylgist meÃ°
       header: Haus
       inbox_url: SlÃ³Ã° Ã¡ innhÃ³lf
+      invite_request_text: ÃstÃ¦Ã°ur fyrir Ã¾Ã¡tttÃ¶ku
       invited_by: BoÃ°iÃ° af
       ip: IP-vistfang
       joined: GerÃ°ist Ã¾Ã¡tttakandi
@@ -138,6 +144,8 @@ is:
       login_status: StaÃ°a innskrÃ¡ningar
       media_attachments: MyndaviÃ°hengi
       memorialize: Breyta Ã minningargrein
+      memorialized: Breytt Ã minningargrein
+      memorialized_msg: TÃ³kst aÃ° breyta %{username} Ã minningaraÃ°gang
       moderation:
         active: Virkur
         all: Allt
@@ -158,10 +166,14 @@ is:
       public: Opinber
       push_subscription_expires: PuSH-Ã¡skrift rennur Ãºt
       redownload: Endurlesa notandasniÃ°
+      redownloaded_msg: TÃ³kst aÃ° endurlesa notandasniÃ° %{username} Ãºr upphaflegu sniÃ°i
       reject: Hafna
       reject_all: Hafna Ã¶llu
+      rejected_msg: TÃ³kst aÃ° hafna skrÃ¡ningu fyrir %{username}
       remove_avatar: FjarlÃ¦gja auÃ°kennismynd
       remove_header: FjarlÃ¦gja haus
+      removed_avatar_msg: TÃ³kst aÃ° fjarlÃ¦gja auÃ°kennismynd notandans %{username}
+      removed_header_msg: TÃ³kst aÃ° fjarlÃ¦gja forsÃÃ°umynd notandans %{username}
       resend_confirmation:
         already_confirmed: Ãžessi notandi hefur Ã¾egar veriÃ° staÃ°festur
         send: Senda staÃ°festingartÃ¶lvupÃ³st aftur
@@ -178,6 +190,8 @@ is:
       search: Leita
       search_same_email_domain: AÃ°ra notendur meÃ° sama tÃ¶lvupÃ³stlÃ©n
       search_same_ip: AÃ°rir notendur meÃ° sama IP-vistfang
+      sensitive: ViÃ°kvÃ¦mt
+      sensitized: merkt sem viÃ°kvÃ¦mt
       shared_inbox_url: SlÃ³Ã° Ã¡ sameiginlegt innhÃ³lf
       show:
         created_reports: GerÃ°ar kÃ¦rur
@@ -187,13 +201,19 @@ is:
       statuses: StÃ¶Ã°ufÃ¦rslur
       subscribe: Gerast Ã¡skrifandi
       suspended: Ã biÃ°
+      suspension_irreversible: GÃ¶gnunum Ã¡ Ã¾essum notandaaÃ°gangi hefur veriÃ° eytt Ã³afturkrÃ¦ft. ÃžÃº getur tekiÃ° aÃ°ganginn Ãºr biÃ° svo hÃ¦gt sÃ© aÃ° nota hann, en Ã¾aÃ° mun ekki endurheimta neitt af Ã¾eim gÃ¶gnum sem Ã¡ honum voru Ã¡Ã°ur.
+      suspension_reversible_hint_html: NotandaaÃ°gangurin hefur veriÃ° settur Ã biÃ°stÃ¶Ã°u og gÃ¶gnunum Ã¡ honum verÃ°ur eytt aÃ° fullu Ã¾ann %{date}. ÃžangaÃ° til vÃ¦ri hÃ¦gt aÃ° endurheimta aÃ°ganginn Ãºr biÃ° Ã¡n nokkurra breytinga. Ef Ã¾Ãº vilt eyÃ°a Ã¶llum gÃ¶gnum af honum strax, geturÃ°u gert Ã¾aÃ° hÃ©r fyrir neÃ°an.
       time_in_queue: BÃÃ°ur Ã biÃ°rÃ¶Ã° %{time}
       title: NotandaaÃ°gangar
       unconfirmed_email: Ã“staÃ°festur tÃ¶lvupÃ³stur
+      undo_sensitized: Afturkalla merkingu sem viÃ°kvÃ¦mt
       undo_silenced: HÃ¦tta aÃ° hylja
       undo_suspension: Taka Ãºr biÃ°
+      unsilenced_msg: TÃ³kst aÃ° fjarlÃ¦gja takmarkanir af notandaaÃ°gangnum fyrir %{username}
       unsubscribe: Taka Ãºr Ã¡skrift
+      unsuspended_msg: TÃ³kst aÃ° taka notandaaÃ°ganginn fyrir %{username} Ãºr biÃ°
       username: Notandanafn
+      view_domain: SkoÃ°a yfirlit fyrir lÃ©n
       warn: AÃ°vara
       web: Vefur
       whitelisted: Ã lista yfir leyft
@@ -208,12 +228,14 @@ is:
         create_domain_allow: BÃºa til lÃ©n leyft
         create_domain_block: BÃºa til lÃ©n bannaÃ°
         create_email_domain_block: BÃºa til tÃ¶lvupÃ³stfang bannaÃ°
+        create_ip_block: BÃºa til IP-reglu
         demote_user: LÃ¦kka notanda Ã tign
         destroy_announcement: EyÃ°a tilkynningu
         destroy_custom_emoji: EyÃ°a sÃ©rsniÃ°nu tjÃ¡ningartÃ¡kni
         destroy_domain_allow: EyÃ°a lÃ©ni leyft
         destroy_domain_block: EyÃ°a lÃ©ni bannaÃ°
         destroy_email_domain_block: EyÃ°a tÃ¶lvupÃ³stfangi bannaÃ°
+        destroy_ip_block: EyÃ°a IP-reglu
         destroy_status: EyÃ°a stÃ¶Ã°ufÃ¦rslu
         disable_2fa_user: Gera tveggja-Ã¾Ã¡tta auÃ°kenningu Ã³virka
         disable_custom_emoji: Gera sÃ©rsniÃ°iÃ° tjÃ¡ningartÃ¡kn Ã³virkt
@@ -226,13 +248,16 @@ is:
         reopen_report: Enduropna kÃ¦ru
         reset_password_user: Endurstilla lykilorÃ°
         resolve_report: Leysa kÃ¦ru
+        sensitive_account: Merkja myndefni Ã¡ aÃ°gangnum Ã¾Ãnum sem viÃ°kvÃ¦mt
         silence_account: Hylja notandaaÃ°gang
         suspend_account: Setja notandaaÃ°gang Ã biÃ°
         unassigned_report: Aftengja Ãºthlutun kÃ¦ru
+        unsensitive_account: Afmerkja myndefni Ã¡ aÃ°gangnum Ã¾Ãnum sem viÃ°kvÃ¦mt
         unsilence_account: HÃ¦tta aÃ° hylja notandaaÃ°gang
         unsuspend_account: Taka notandaaÃ°gang Ãºr biÃ°
         update_announcement: UppfÃ¦ra tilkynningu
         update_custom_emoji: UppfÃ¦ra sÃ©rsniÃ°iÃ° tjÃ¡ningartÃ¡kn
+        update_domain_block: UppfÃ¦ra Ãºtilokun lÃ©ns
         update_status: UppfÃ¦ra stÃ¶Ã°ufÃ¦rslu
       actions:
         assigned_to_self_report: "%{name} ÃºthlutaÃ°i skÃ½rslu %{target} til sÃn"
@@ -244,12 +269,14 @@ is:
         create_domain_allow: "%{name} setti lÃ©n %{target} Ã¡ lista yfir leyft"
         create_domain_block: "%{name} ÃºtilokaÃ°i lÃ©niÃ° %{target}"
         create_email_domain_block: "%{name} setti pÃ³stlÃ©n %{target} Ã¡ lista yfir bannaÃ°"
+        create_ip_block: "%{name} bjÃ³ til reglu fyrir IP-vistfangiÃ° %{target}"
         demote_user: "%{name} lÃ¦kkaÃ°i notandann %{target} Ã tign"
         destroy_announcement: "%{name} eyddi auglÃ½singu %{target}"
         destroy_custom_emoji: "%{name} henti Ãºt tjÃ¡ningartÃ¡kninu %{target}"
         destroy_domain_allow: "%{name} fjarlÃ¦gÃ°i lÃ©n %{target} af lista yfir leyft"
         destroy_domain_block: "%{name} aflÃ©tti Ãºtilokun af lÃ©ninu %{target}"
         destroy_email_domain_block: "%{name} setti pÃ³stlÃ©n %{target} Ã¡ lista yfir leyft"
+        destroy_ip_block: "%{name} eyddi reglu fyrir IP-vistfangiÃ° %{target}"
         destroy_status: "%{name} fjarlÃ¦gÃ°i stÃ¶Ã°ufÃ¦rslu frÃ¡ %{target}"
         disable_2fa_user: "%{name} gerÃ°i tveggja-Ã¾Ã¡tta auÃ°kenningu Ã³virka fyrir notandann %{target}"
         disable_custom_emoji: "%{name} gerÃ°i tjÃ¡ningartÃ¡kniÃ° %{target} Ã³virkt"
@@ -262,13 +289,16 @@ is:
         reopen_report: "%{name} enduropnaÃ°i skÃ½rslu %{target}"
         reset_password_user: "%{name} endurstillti lykilorÃ° fyrir notandann %{target}"
         resolve_report: "%{name} leysti skÃ½rslu %{target}"
+        sensitive_account: "%{name} merkti myndefni frÃ¡ %{target} sem viÃ°kvÃ¦mt"
         silence_account: "%{name} gerÃ°i notandaaÃ°ganginn %{target} hulinn"
         suspend_account: "%{name} setti notandaaÃ°ganginn %{target} Ã biÃ°"
         unassigned_report: "%{name} fjarlÃ¦gÃ°i Ãºthlutun af skÃ½rslu %{target}"
+        unsensitive_account: "%{name} afmerkti myndefni frÃ¡ %{target} sem viÃ°kvÃ¦mt"
         unsilence_account: "%{name} hÃ¦tti aÃ° hylja notandaaÃ°ganginn %{target}"
         unsuspend_account: "%{name} tÃ³k notandaaÃ°ganginn %{target} Ãºr biÃ°"
         update_announcement: "%{name} uppfÃ¦rÃ°i auglÃ½singu %{target}"
         update_custom_emoji: "%{name} uppfÃ¦rÃ°i tjÃ¡ningartÃ¡kn %{target}"
+        update_domain_block: "%{name} uppfÃ¦rÃ°i Ãºtilokun lÃ©nsins %{target}"
         update_status: "%{name} uppfÃ¦rÃ°i stÃ¶Ã°ufÃ¦rslu frÃ¡ %{target}"
       deleted_status: "(eydd stÃ¶Ã°ufÃ¦rsla)"
       empty: Engar atvikaskrÃ¡r fundust.
@@ -372,6 +402,8 @@ is:
           silence: Hylja
           suspend: Setja Ã biÃ°
         title: NÃ½ Ãºtilokun Ã¡ lÃ©ni
+      obfuscate: Gera heiti lÃ©ns Ã³lÃ¦silegt
+      obfuscate_hint: Gera heiti lÃ©ns Ã³lÃ¦silegt aÃ° hluta Ã listanum ef auglÃ½sing er virk fyrir lista yfir takmarkanir lÃ©na
       private_comment: Einkaathugasemd
       private_comment_hint: Athugasemd um Ã¾essa Ãºtilokun Ã¡ lÃ©ni til innanhÃºssnotkunar fyrir umsjÃ³narmenn.
       public_comment: Opinber athugasemd
@@ -411,6 +443,7 @@ is:
     instances:
       by_domain: LÃ©n
       delivery_available: Afhending er til taks
+      empty: Engin lÃ©n fundust.
       known_accounts:
         one: "%{count} Ã¾ekktur notandaaÃ°gangur"
         other: "%{count} Ã¾ekktir notendaaÃ°gangar"
@@ -434,6 +467,21 @@ is:
         expired: ÃštrunniÃ°
         title: SÃa
       title: BoÃ°sgestir
+    ip_blocks:
+      add_new: BÃºa til reglu
+      created_msg: TÃ³kst aÃ° bÃºa til nÃ½ja IP-reglu
+      delete: EyÃ°a
+      expires_in:
+        '1209600': 2 vikur
+        '15778476': 6 mÃ¡nuÃ°ir
+        '2629746': 1 mÃ¡nuÃ°ur
+        '31556952': 1 Ã¡r
+        '86400': 1 dagur
+        '94670856': 3 Ã¡r
+      new:
+        title: BÃºa til nÃ½ja IP-reglu
+      no_ip_block_selected: Engum IP-reglum var breytt Ã¾vÃ ekkert var valiÃ°
+      title: IP-reglur
     pending_accounts:
       title: NotendaaÃ°gangar Ã biÃ° (%{count})
     relationships:
@@ -473,6 +521,8 @@ is:
       comment:
         none: Ekkert
       created_at: Tilkynnt
+      forwarded: Ãframsent
+      forwarded_to: Ãframsent Ã¡ %{domain}
       mark_as_resolved: Merkja sem leyst
       mark_as_unresolved: Merkja sem Ã³leyst
       notes:
@@ -516,6 +566,7 @@ is:
       domain_blocks_rationale:
         title: Birta rÃ¶ksemdafÃ¦rslu
       enable_bootstrap_timeline_accounts:
+        desc_html: LÃ¡ta nÃ½ja notendur sjÃ¡lfkrafa fylgjast meÃ° uppsettum aÃ°gÃ¶ngum svo aÃ° heimastreymi Ã¾eirra byrji ekki autt
         title: Virkja sjÃ¡lfgefnar fylgnistillingar fyrir nÃ½ja notendur
       hero:
         desc_html: Birt Ã¡ forsÃÃ°unni. MÃ¦lt meÃ° aÃ° hÃºn sÃ© a.m.k. 600Ã—100 mynddÃlar. Ãžegar Ã¾etta er ekki stillt, er notuÃ° smÃ¡mynd netÃ¾jÃ³nsins
@@ -542,6 +593,9 @@ is:
         min_invite_role:
           disabled: Enginn
           title: Leyfa boÃ° frÃ¡
+        require_invite_text:
+          desc_html: Ãžegar nÃ½skrÃ¡ningar krefjast handvirks samÃ¾ykkis, skal gera "Hvers vegna viltu taka Ã¾Ã¡tt?" boÃ°stexta aÃ° skyldu fremur en valkvÃ¦Ã°an
+          title: Krefja nÃ½ja notendur um aÃ° fylla Ãºt boÃ°stexta
       registrations_mode:
         modes:
           approved: Krafist er samÃ¾ykkt nÃ½skrÃ¡ningar
@@ -681,8 +735,11 @@ is:
       prefix_sign_up: SkrÃ¡Ã°u Ã¾ig Ã¡ Mastodon strax Ã dag!
       suffix: MeÃ° notandaaÃ°gangi geturÃ°u fylgst meÃ° fÃ³lki, sent inn stÃ¶Ã°ufÃ¦rslur og skipst Ã¡ skilaboÃ°um viÃ° notendur Ã¡ hvaÃ°a Mastodon-vefÃ¾jÃ³ni sem er, auk margs fleira!
     didnt_get_confirmation: FÃ©kkstu ekki leiÃ°beiningar um hvernig eigi aÃ° staÃ°festa aÃ°ganginn?
+    dont_have_your_security_key: Ertu ekki meÃ° Ã¶ryggislykilinn Ã¾inn?
     forgot_password: GleymdirÃ°u lykilorÃ°inu?
     invalid_reset_password_token: Teikn fyrir endurstillingu lykilorÃ°s er Ã³gilt eÃ°a ÃºtrunniÃ°. Biddu um nÃ½tt teikn.
+    link_to_otp: Settu inn tveggja-Ã¾Ã¡tta kÃ³Ã°a Ãºr farsÃmanum Ã¾Ãnum eÃ°a endurheimtukÃ³Ã°a
+    link_to_webauth: NotaÃ°u tÃ¦ki meÃ° Ã¶ryggislykli
     login: SkrÃ¡ inn
     logout: SkrÃ¡ Ãºt
     migrate_account: FÃ¦ra Ã¡ annan notandaaÃ°gang
@@ -707,7 +764,9 @@ is:
       functional: NotandaaÃ°gangurinn Ã¾inn er meÃ° fulla virkni.
       pending: UmsÃ³knin Ã¾Ãn bÃÃ°ur eftir aÃ° starfsfÃ³lkiÃ° okkar fari yfir hana. ÃžaÃ° gÃ¦ti tekiÃ° nokkurn tÃma. ÃžÃº munt fÃ¡ tÃ¶lvupÃ³st ef umsÃ³knin er samÃ¾ykkt.
       redirecting_to: NotandaaÃ°gangurinn Ã¾inn er Ã³virkur vegna Ã¾ess aÃ° hann endurbeinist Ã¡ %{acct}.
+    too_fast: Innfyllingarform sent inn of hratt, prÃ³faÃ°u aftur.
     trouble_logging_in: VandrÃ¦Ã°i viÃ° aÃ° skrÃ¡ inn?
+    use_security_key: Nota Ã¶ryggislykil
   authorize_follow:
     already_following: ÃžÃº ert aÃ° Ã¾egar fylgjast meÃ° Ã¾essum aÃ°gangi
     already_requested: ÃžÃº ert Ã¾egar bÃºin/n aÃ° senda fylgjendabeiÃ°ni Ã¡ Ã¾ennan notanda
@@ -732,6 +791,7 @@ is:
   date:
     formats:
       default: "%d. %b, %Y"
+      with_month_name: "%d. %B, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}kl."
@@ -796,6 +856,7 @@ is:
       request: Biddu um safnskrÃ¡na Ã¾Ãna
       size: StÃ¦rÃ°
     blocks: ÃžÃº Ãºtilokar
+    bookmarks: BÃ³kamerki
     csv: CSV
     domain_blocks: Ãštilokanir Ã¡ lÃ©num
     lists: Listar
@@ -863,6 +924,8 @@ is:
     status: StaÃ°a sannvottunar
     view_proof: SkoÃ°a sÃ¶nnun
   imports:
+    errors:
+      over_rows_processing_limit: inniheldur meira en %{count} raÃ°ir
     modes:
       merge: Sameina
       merge_long: Halda fyrirliggjandi fÃ¦rslum og bÃ¦ta viÃ° nÃ½jum
@@ -872,6 +935,7 @@ is:
     success: ÃžaÃ° tÃ³kst aÃ° senda inn gÃ¶gnin Ã¾Ãn og verÃ°ur unniÃ° meÃ° Ã¾au Ã¾egar fÃ¦ri gefst
     types:
       blocking: Listi yfir Ãºtilokanir
+      bookmarks: BÃ³kamerki
       domain_blocking: Listi yfir Ãºtilokanir lÃ©na
       following: Listi yfir Ã¾Ã¡ sem fylgst er meÃ°
       muting: Listi yfir Ã¾agganir
@@ -992,6 +1056,14 @@ is:
           quadrillion: qi.
           thousand: Ã¾Ãºs
           trillion: tr.
+  otp_authentication:
+    code_hint: Settu inn kÃ³Ã°ann sem auÃ°kenningarforritiÃ° ÃºtbjÃ³ til staÃ°festingar
+    description_html: Ef Ã¾Ãº virkjar <strong>tveggja-Ã¾Ã¡tta auÃ°kenningu</strong> meÃ° auÃ°kenningarforriti, mun innskrÃ¡ning krefjast Ã¾ess aÃ° Ã¾Ãº hafir sÃmann Ã¾inn viÃ° hendina, meÃ° honum Ã¾arf aÃ° ÃºtbÃºa Ã¶ryggisteikn sem Ã¾Ãº Ã¾arft aÃ° setja inn.
+    enable: Virkja
+    instructions_html: "<strong>SkannaÃ°u Ã¾ennar QR-kÃ³Ã°a inn Ã Google Authenticator eÃ°a Ã¡lÃka TOTP-forrit Ã¡ sÃmanum Ã¾Ãnum</strong>. HÃ©Ã°an Ã frÃ¡ mun Ã¾aÃ° forrit ÃºtbÃºa teikn sem Ã¾Ãº verÃ°ur aÃ° setja inn til aÃ° geta skrÃ¡Ã° Ã¾ig inn."
+    manual_instructions: 'Ef Ã¾Ãº getur ekki skannaÃ° QR-kÃ³Ã°ann og verÃ°ur aÃ° setja hann inn handvirkt, Ã¾Ã¡ er hÃ©r leyniorÃ°iÃ° Ã¡ textaformi:'
+    setup: Setja upp
+    wrong_code: KÃ³Ã°inn sem Ã¾Ãº settir inn er Ã³gildur! Eru klukkur netÃ¾jÃ³nsins og tÃ¦kisins rÃ©ttar?
   pagination:
     newer: NÃ½rra
     next: NÃ¦sta
@@ -1020,6 +1092,7 @@ is:
   relationships:
     activity: Virkni aÃ°gangs
     dormant: Sofandi
+    follow_selected_followers: Fylgjast meÃ° vÃ¶ldum fylgjendum
     followers: Fylgjendur
     following: Fylgist meÃ°
     invited: BoÃ°iÃ°
@@ -1115,7 +1188,8 @@ is:
     preferences: KjÃ¶rstillingar
     profile: NotandasniÃ°
     relationships: Fylgist meÃ° og fylgjendur
-    two_factor_authentication: Teggja-Ã¾Ã¡tta auÃ°kenning
+    two_factor_authentication: Tveggja-Ã¾Ã¡tta auÃ°kenning
+    webauthn_authentication: Ã–ryggislyklar
   spam_check:
     spam_detected: Ãžetta er sjÃ¡lfvirk kÃ¦ra. RuslpÃ³stur hefur fundist.
   statuses:
@@ -1154,6 +1228,8 @@ is:
         other: "%{count} atkvÃ¦Ã°i"
       vote: GreiÃ°a atkvÃ¦Ã°i
     show_more: SÃ½na meira
+    show_newer: SÃ½na nÃ½rri
+    show_older: SÃ½na eldri
     show_thread: Birta Ã¾rÃ¡Ã°
     sign_in_to_participate: SkrÃ¡Ã°u Ã¾ig inn til aÃ° taka Ã¾Ã¡tt Ã samtalinu
     title: "%{name}: â€ž%{quote}â€Ÿ"
@@ -1262,21 +1338,20 @@ is:
       default: "%d. %b, %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Settu inn kÃ³Ã°ann sem auÃ°kenningarforritiÃ° ÃºtbjÃ³ til staÃ°festingar
-    description_html: Ef Ã¾Ãº virkjar <strong>tvÃÃ¾Ã¡tta auÃ°kenningu</strong> mun innskrÃ¡ning krefjast Ã¾ess aÃ° Ã¾Ãº hafir sÃmann Ã¾inn viÃ° hendina, meÃ° honum Ã¾arf aÃ° ÃºtbÃºa Ã¶ryggisteikn sem Ã¾Ãº Ã¾arft aÃ° setja inn.
+    add: BÃ¦ta viÃ°
     disable: Gera Ã³virkt
-    enable: Virkja
+    disabled_success: ÃžaÃ° tÃ³kst aÃ° gera tveggja-Ã¾Ã¡tta auÃ°kenningu Ã³virka
+    edit: Breyta
     enabled: Tveggja-Ã¾Ã¡tta auÃ°kenning er virk
     enabled_success: ÃžaÃ° tÃ³kst aÃ° virkja tveggja-Ã¾Ã¡tta auÃ°kenningu
     generate_recovery_codes: ÃštbÃºa endurheimtukÃ³Ã°a
-    instructions_html: "<strong>SkannaÃ°u Ã¾ennar QR-kÃ³Ã°a inn Ã Google Authenticator eÃ°a Ã¡lÃka TOTP-forrit Ã¡ sÃmanum Ã¾Ãnum</strong>. HÃ©Ã°an Ã frÃ¡ mun Ã¾aÃ° forrit ÃºtbÃºa teikn sem Ã¾Ãº verÃ°ur aÃ° setja inn til aÃ° geta skrÃ¡Ã° Ã¾ig inn."
     lost_recovery_codes: EndurheimtukÃ³Ã°ar gera Ã¾Ã©r kleift aÃ° fÃ¡ aftur samband viÃ° notandaaÃ°ganginn Ã¾inn ef Ã¾Ãº tapar sÃmanum Ã¾Ãnum. Ef Ã¾Ãº aftur hefur tapaÃ° endurheimtukÃ³Ã°unum, geturÃ°u endurgert Ã¾Ã¡ hÃ©r. GÃ¶mlu endurheimtukÃ³Ã°arnir verÃ°a Ã¾Ã¡ Ã³giltir.
-    manual_instructions: 'Ef Ã¾Ãº getur ekki skannaÃ° QR-kÃ³Ã°ann og verÃ°ur aÃ° setja hann inn handvirkt, Ã¾Ã¡ er hÃ©r leyniorÃ°iÃ° Ã¡ textaformi:'
+    methods: Tveggja-Ã¾Ã¡tta auÃ°kenningaraÃ°ferÃ°ir
+    otp: AuÃ°kenningarforrit
     recovery_codes: KÃ³Ã°ar fyrir endurheimtingu Ã¶ryggisafrits
     recovery_codes_regenerated: ÃžaÃ° tÃ³kst aÃ° endurgera endurheimtukÃ³Ã°a
     recovery_instructions_html: Ef Ã¾Ãº tapar sÃmanum Ã¾Ãnum geturÃ°u notaÃ° einn af endurheimtukÃ³Ã°unum hÃ©r fyrir neÃ°an til aÃ° fÃ¡ aftur samband viÃ° notandaaÃ°ganginn Ã¾inn. <strong>Geymdu endurheimtukÃ³Ã°ana Ã¡ Ã¶ruggum staÃ°</strong>. Sem dÃ¦mi gÃ¦tirÃ°u prentaÃ° Ã¾Ã¡ Ãºt og geymt meÃ° Ã¶Ã°rum mikilvÃ¦gum skjÃ¶lum.
-    setup: Setja upp
-    wrong_code: KÃ³Ã°inn sem Ã¾Ãº settir inn er Ã³gildur! Eru klukkur netÃ¾jÃ³nsins og tÃ¦kisins rÃ©ttar?
+    webauthn: Ã–ryggislyklar
   user_mailer:
     backup_ready:
       explanation: ÃžÃº baÃ°st um fullt Ã¶ryggisafrit af Mastodon notandaaÃ°gangnum Ã¾Ãnum. ÃžaÃ° er nÃºna tilbÃºiÃ° til niÃ°urhals!
@@ -1291,6 +1366,7 @@ is:
     warning:
       explanation:
         disable: Ã meÃ°an aÃ°gangurinn Ã¾inn er frystur, eru gÃ¶gn aÃ°gangsins Ã³snert, en Ã¾Ãº getur ekki framkvÃ¦mt neinar aÃ°gerÃ°ir fyrr en honum hefur veriÃ° aflÃ¦st.
+        sensitive: Innsent myndefni sem Ã¾Ãº sendir inn og tengt myndefni verÃ°ur fariÃ° meÃ° sem viÃ°kvÃ¦mt efni.
         silence: Ã meÃ°an aÃ°gangurinn Ã¾inn er takmarkaÃ°ur, mun aÃ°eins fÃ³lk sem Ã¾egar fylgist meÃ° Ã¾Ã©r sjÃ¡ tÃstin Ã¾Ãn Ã¡ Ã¾essum vefÃ¾jÃ³ni, auk Ã¾ess sem lokaÃ° gÃ¦ti veriÃ° Ã¡ Ã¾ig Ã¡ Ã½msum opinberum listum. Aftur Ã¡ mÃ³ti geta aÃ°rir gerst fylgjendur Ã¾Ãnir handvirkt.
         suspend: AÃ°gangurinn Ã¾inn hefur veriÃ° settur Ã biÃ°stÃ¶Ã°u, Ã¶ll Ã¾Ãn tÃst og innsent myndefni hafa veriÃ° Ã³afturkrÃ¦ft fjarlÃ¦gÃ° af Ã¾essum vefÃ¾jÃ³ni, sem og af Ã¾eim vefÃ¾jÃ³num Ã¾ar sem Ã¾Ãº Ã¡ttir Ã¾Ã©r fylgjendur.
       get_in_touch: ÃžÃº getur svaraÃ° Ã¾essum tÃ¶lvupÃ³sti til aÃ° setja Ã¾ig Ã samband viÃ° umsjÃ³narmenn %{instance}.
@@ -1299,11 +1375,13 @@ is:
       subject:
         disable: NotandaaÃ°gangurinn Ã¾inn %{acct} hefur veriÃ° frystur
         none: AÃ°vÃ¶run fyrir %{acct}
+        sensitive: Myndefni sent frÃ¡ %{acct} aÃ°gangnum Ã¾Ãnum hefur veriÃ° merkt sem viÃ°kvÃ¦mt
         silence: NotandaaÃ°gangurinn Ã¾inn %{acct} hefur veriÃ° takmarkaÃ°ur
         suspend: NotandaaÃ°gangurinn Ã¾inn %{acct} hefur veriÃ° settur Ã biÃ°
       title:
         disable: NotandaaÃ°gangur frystur
         none: AÃ°vÃ¶run
+        sensitive: MyndefniÃ° Ã¾itt hefur veriÃ° merkt sem viÃ°kvÃ¦mt
         silence: NotandaaÃ°gangur takmarkaÃ°ur
         suspend: NotandaaÃ°gangur Ã biÃ°
     welcome:
@@ -1324,9 +1402,11 @@ is:
       tips: Ãbendingar
       title: Velkomin/n um borÃ°, %{name}!
   users:
+    blocked_email_provider: Ãžessi tÃ¶lvupÃ³stÃ¾jÃ³nusta er ekki leyfileg
     follow_limit_reached: ÃžÃº getur ekki fylgst meÃ° fleiri en %{limit} aÃ°ilum
     generic_access_help_html: VandamÃ¡l viÃ° aÃ° tengjast aÃ°gangnum Ã¾Ãnum? ÃžÃº getur sett Ã¾ig Ã samband viÃ° %{email} til aÃ° fÃ¡ aÃ°stoÃ°
     invalid_email: TÃ¶lvupÃ³stfangiÃ° er Ã³gilt
+    invalid_email_mx: TÃ¶lvupÃ³stfangiÃ° virÃ°ist ekki vera til
     invalid_otp_token: Ã“gildur tveggja-Ã¾Ã¡tta kÃ³Ã°i
     invalid_sign_in_token: Ã“gildur Ã¶ryggiskÃ³Ã°i
     otp_lost_help_html: Ef Ã¾Ãº hefur misst aÃ°ganginn aÃ° hvoru tveggja, geturÃ°u sett Ã¾ig Ã samband viÃ° %{email}
@@ -1336,3 +1416,20 @@ is:
   verification:
     explanation_html: 'ÃžÃº getur <strong>vottaÃ° aÃ° Ã¾Ãº sÃ©rt eigandi og Ã¡byrgur fyrir tenglunum Ã lÃ½sigÃ¶gnum notandasniÃ°sins Ã¾Ãns</strong>. Til aÃ° Ã¾aÃ° virki, Ã¾urfa vefsvÃ¦Ã°in sem vÃsaÃ° er Ã aÃ° innihalda tengil til baka Ã Mastodon-notandasniÃ°iÃ°. Tengillinn sem vÃsar til baka <strong>verÃ°ur</strong> aÃ° vera meÃ° <code>rel="me"</code> eigindi. Textinn Ã tenglinum skiptir ekki mÃ¡li. HÃ©rna er dÃ¦mi:'
     verification: SannprÃ³fun
+  webauthn_credentials:
+    add: BÃ¦ta viÃ° nÃ½jum Ã¶ryggislykli
+    create:
+      error: ÃžaÃ° kom upp villa viÃ° aÃ° bÃ¦ta viÃ° Ã¶ryggislyklinum Ã¾Ãnum. Reyndu aftur.
+      success: TÃ³kst aÃ° bÃ¦ta viÃ° Ã¶ryggislyklinum Ã¾Ãnum.
+    delete: EyÃ°a
+    delete_confirmation: Ertu viss um aÃ° Ã¾Ãº viljir eyÃ°a Ã¾essum Ã¶ryggislykli?
+    description_html: Ef Ã¾Ãº virkjar <strong>auÃ°kenningu meÃ° Ã¶ryggislykli</strong> mun innskrÃ¡ning krefjast Ã¾ess aÃ° Ã¾Ãº einn af Ã¶ryggislyklunum Ã¾Ãnum.
+    destroy:
+      error: ÃžaÃ° kom upp villa viÃ° aÃ° eyÃ°a Ã¶ryggislyklinum Ã¾Ãnum. Reyndu aftur.
+      success: TÃ³kst aÃ° eyÃ°a Ã¶ryggislyklinum Ã¾Ãnum.
+    invalid_credential: Ã“gildur Ã¶ryggislykill
+    nickname_hint: Settu inn stuttnefni fyrir nÃ½ja Ã¶ryggislykilinn Ã¾inn
+    not_enabled: ÃžÃº hefur ennÃ¾Ã¡ ekki virkjaÃ° WebAuthn
+    not_supported: Ãžessi vafri styÃ°ur ekki Ã¶ryggislykla
+    otp_required: Til aÃ° nota Ã¶ryggislykla skaltu fyrst virkja tveggja-Ã¾Ã¡tta auÃ°kenningu.
+    registered_on: NÃ½skrÃ¡Ã°ur %{date}
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 30c7e3c66f09bdef9066ea57fc5bf679d65ac8b4..1e0ab42f09a26bcb4998cce9199a8b45f45ae852 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -60,6 +60,7 @@ it:
       one: Seguace
       other: Seguaci
     following: Segui
+    instance_actor_flash: Questo account Ã¨ un attore virtuale usato per rappresentare il server stesso e non un singolo utente. Viene utilizzato per scopi federativi e non dovrebbe essere sospeso.
     joined: Dal %{date}
     last_active: ultima attivitÃ 
     link_verified_on: La proprietÃ  di questo link Ã¨ stata controllata il %{date}
@@ -98,6 +99,7 @@ it:
       add_email_domain_block: Inserisci il dominio email nella blacklist
       approve: Approva
       approve_all: Approva tutto
+      approved_msg: Richiesta di registrazione di %{username} approvata
       are_you_sure: Sei sicuro?
       avatar: Immagine di profilo
       by_domain: Dominio
@@ -111,8 +113,10 @@ it:
       confirm: Conferma
       confirmed: Confermato
       confirming: Confermando
+      delete: Elimina dati
       deleted: Cancellato
       demote: Declassa
+      destroyed_msg: I dati di %{username} sono ora in coda per essere eliminati tra poco
       disable: Disabilita
       disable_two_factor_authentication: Disabilita l'autenticazione a due fattori
       disabled: Disabilitato
@@ -123,10 +127,12 @@ it:
       email_status: Stato email
       enable: Abilita
       enabled: Abilitato
+      enabled_msg: L'account di %{username} Ã¨ stato scongelato
       followers: Follower
       follows: Segue
       header: Intestazione
       inbox_url: URL inbox
+      invite_request_text: Motivi per l'iscrizione
       invited_by: Invitato da
       ip: IP
       joined: Iscritto da
@@ -138,6 +144,8 @@ it:
       login_status: Stato login
       media_attachments: Media allegati
       memorialize: Trasforma in memoriam
+      memorialized: Memorializzato
+      memorialized_msg: Hai trasformato %{username} in un account commemorativo
       moderation:
         active: Attivo
         all: Tutto
@@ -158,10 +166,14 @@ it:
       public: Pubblico
       push_subscription_expires: Sottoscrizione PuSH scaduta
       redownload: Aggiorna avatar
+      redownloaded_msg: Il profilo di %{username} Ã¨ stato aggiornato dall'origine
       reject: Rifiuta
       reject_all: Rifiuta tutto
+      rejected_msg: Richiesta di registrazione di %{username} rifiutata
       remove_avatar: Rimuovi avatar
       remove_header: Rimuovi intestazione
+      removed_avatar_msg: Immagine dell'avatar di %{username} eliminata
+      removed_header_msg: Immagine di intestazione di %{username} eliminata
       resend_confirmation:
         already_confirmed: Questo utente Ã¨ giÃ  confermato
         send: Reinvia email di conferma
@@ -178,6 +190,8 @@ it:
       search: Cerca
       search_same_email_domain: Altri utenti con lo stesso dominio e-mail
       search_same_ip: Altri utenti con lo stesso IP
+      sensitive: Sensibile
+      sensitized: contrassegnato come sensibile
       shared_inbox_url: URL Inbox Condiviso
       show:
         created_reports: Rapporti creati da questo account
@@ -187,13 +201,19 @@ it:
       statuses: Stati
       subscribe: Sottoscrivi
       suspended: Sospeso
+      suspension_irreversible: I dati di questo account sono stati cancellati in modo irreversibile. Ãˆ possibile annullare la sospensione dell'account per renderlo utilizzabile, ma non recupererÃ  alcuno dei dati precedenti.
+      suspension_reversible_hint_html: L'account Ã¨ stato sospeso e i dati saranno completamente eliminati il %{date}. Fino ad allora, l'account puÃ² essere ripristinato senza effetti negativi. Se si desidera eliminare immediatamente tutti i dati dell'account, Ã¨ possibile farlo qui sotto.
       time_in_queue: Attesa in coda %{time}
       title: Account
       unconfirmed_email: Email non confermata
+      undo_sensitized: Annulla sensibile
       undo_silenced: Rimuovi silenzia
       undo_suspension: Rimuovi sospensione
+      unsilenced_msg: Sono stati tolti i limiti dell'account di %{username}
       unsubscribe: Annulla l'iscrizione
+      unsuspended_msg: Ãˆ stata eliminata la sospensione dell'account di %{username}
       username: Nome utente
+      view_domain: Visualizza riepilogo per dominio
       warn: Avverti
       web: Web
       whitelisted: Nella whitelist
@@ -208,12 +228,14 @@ it:
         create_domain_allow: Crea permesso di dominio
         create_domain_block: Crea blocco di dominio
         create_email_domain_block: Crea blocco dominio e-mail
+        create_ip_block: Crea regola IP
         demote_user: Degrada l'utente
         destroy_announcement: Cancella annuncio
         destroy_custom_emoji: Cancella emoji personalizzata
         destroy_domain_allow: Cancella permesso di dominio
         destroy_domain_block: Cancella blocco di dominio
         destroy_email_domain_block: Cancella blocco dominio e-mail
+        destroy_ip_block: Elimina regola IP
         destroy_status: Cancella stato
         disable_2fa_user: Disabilita l'autenticazione a due fattori
         disable_custom_emoji: Disabilita emoji personalizzata
@@ -226,13 +248,16 @@ it:
         reopen_report: Riapri report
         reset_password_user: Reimposta password
         resolve_report: Risolvi report
+        sensitive_account: Contrassegna il media nel tuo profilo come sensibile
         silence_account: Silenzia account
         suspend_account: Sospendi account
         unassigned_report: Disassegna report
+        unsensitive_account: Deseleziona il media nel tuo profilo come sensibile
         unsilence_account: De-silenzia account
         unsuspend_account: Annulla la sospensione dell'account
         update_announcement: Aggiorna annuncio
         update_custom_emoji: Aggiorna emoji personalizzata
+        update_domain_block: Aggiorna blocco di dominio
         update_status: Aggiorna stato
       actions:
         assigned_to_self_report: "%{name} ha assegnato il rapporto %{target} a se stesso"
@@ -244,12 +269,14 @@ it:
         create_domain_allow: "%{name} ha messo il dominio %{target} nella whitelist"
         create_domain_block: "%{name} ha bloccato il dominio %{target}"
         create_email_domain_block: "%{name} ha messo il dominio email %{target} nella blacklist"
+        create_ip_block: "%{name} ha creato la regola per l'IP %{target}"
         demote_user: "%{name} ha degradato l'utente %{target}"
         destroy_announcement: "%{name} ha eliminato l'annuncio %{target}"
         destroy_custom_emoji: "%{name} ha distrutto l'emoji %{target}"
         destroy_domain_allow: "%{name} ha tolto il dominio %{target} dalla whitelist"
         destroy_domain_block: "%{name} ha sbloccato il dominio %{target}"
         destroy_email_domain_block: "%{name}ha messo il dominio email %{target} nella whitelist"
+        destroy_ip_block: "%{name} ha eliminato la regola per l'IP %{target}"
         destroy_status: "%{name} ha eliminato lo status di %{target}"
         disable_2fa_user: "%{name} ha disabilitato l'obbligo dei due fattori per l'utente %{target}"
         disable_custom_emoji: "%{name} ha disabilitato l'emoji %{target}"
@@ -262,13 +289,16 @@ it:
         reopen_report: "%{name} ha riaperto il rapporto %{target}"
         reset_password_user: "%{name} ha reimpostato la password dell'utente %{target}"
         resolve_report: "%{name} ha risolto il rapporto %{target}"
+        sensitive_account: "%{name} ha contrassegnato il media di %{target} come sensibile"
         silence_account: "%{name} ha silenziato l'account di %{target}"
         suspend_account: "%{name} ha sospeso l'account di %{target}"
         unassigned_report: "%{name} report non assegnato %{target}"
+        unsensitive_account: "%{name} ha deselezionato il media di %{target} come sensibile"
         unsilence_account: "%{name} ha de-silenziato l'account di %{target}"
         unsuspend_account: "%{name} ha annullato la sospensione dell'account di %{target}"
         update_announcement: "%{name} ha aggiornato l'annuncio %{target}"
         update_custom_emoji: "%{name} ha aggiornato l'emoji %{target}"
+        update_domain_block: "%{name} ha aggiornato il blocco di dominio per %{target}"
         update_status: "%{name} stato aggiornato da %{target}"
       deleted_status: "(stato cancellato)"
       empty: Nessun log trovato.
@@ -372,6 +402,8 @@ it:
           silence: Silenzia
           suspend: Sospendi
         title: Nuovo blocco dominio
+      obfuscate: Nascondi nome di dominio
+      obfuscate_hint: Nascondere parzialmente il nome di dominio, se Ã¨ abilitata la visualizzazione pubblica dell'elenco delle limitazioni di dominio
       private_comment: Commento privato
       private_comment_hint: Commento su questa limitazione di dominio per uso interno da parte dei moderatori.
       public_comment: Commento pubblico
@@ -411,6 +443,7 @@ it:
     instances:
       by_domain: Dominio
       delivery_available: Distribuzione disponibile
+      empty: Nessun dominio trovato.
       known_accounts:
         one: "%{count} account noto"
         other: "%{count} account noti"
@@ -434,6 +467,21 @@ it:
         expired: Scaduto
         title: Filtro
       title: Inviti
+    ip_blocks:
+      add_new: Crea regola
+      created_msg: Nuova regola IP aggiunta
+      delete: Elimina
+      expires_in:
+        '1209600': 2 settimane
+        '15778476': 6 mesi
+        '2629746': 1 mese
+        '31556952': 1 anno
+        '86400': 1 giorno
+        '94670856': 3 anni
+      new:
+        title: Crea una nuova regola IP
+      no_ip_block_selected: Nessuna regola IP Ã¨ stata modificata poichÃ© nessuna Ã¨ stata selezionata
+      title: Regole IP
     pending_accounts:
       title: Account in attesa (%{count})
     relationships:
@@ -473,6 +521,8 @@ it:
       comment:
         none: Nessuno
       created_at: Segnalato
+      forwarded: Inoltrato
+      forwarded_to: Inoltrato a %{domain}
       mark_as_resolved: Segna come risolto
       mark_as_unresolved: Segna come non risolto
       notes:
@@ -516,6 +566,7 @@ it:
       domain_blocks_rationale:
         title: Mostra motivazione
       enable_bootstrap_timeline_accounts:
+        desc_html: I nuovi utenti seguiranno automaticamente gli account configurati, in modo che il loro home feed all'inizio non sia vuoto
         title: Abilita seguiti predefiniti per i nuovi utenti
       hero:
         desc_html: Mostrata nella pagina iniziale. Almeno 600x100 px consigliati. Se non impostata, sarÃ  usato il thumbnail del server
@@ -542,6 +593,9 @@ it:
         min_invite_role:
           disabled: Nessuno
           title: Permetti inviti da
+        require_invite_text:
+          desc_html: Quando le iscrizioni richiedono l'approvazione manuale, rendere la richiesta â€œPerchÃ© si desidera iscriversi?â€ obbligatoria invece che opzionale
+          title: Richiedi ai nuovi utenti di rispondere alla richiesta di motivazione per l'iscrizione
       registrations_mode:
         modes:
           approved: Approvazione richiesta per le iscrizioni
@@ -683,8 +737,11 @@ it:
       prefix_sign_up: Iscriviti oggi a Mastodon!
       suffix: Con un account, sarai in grado di seguire le persone, pubblicare aggiornamenti e scambiare messaggi con gli utenti da qualsiasi server di Mastodon e altro ancora!
     didnt_get_confirmation: Non hai ricevuto le istruzioni di conferma?
+    dont_have_your_security_key: Non hai la tua chiave di sicurezza?
     forgot_password: Hai dimenticato la tua password?
     invalid_reset_password_token: Il token di reimpostazione della password non Ã¨ valido o Ã¨ scaduto. Per favore richiedine uno nuovo.
+    link_to_otp: Inserisci un codice a due fattori dal tuo telefono o un codice di recupero
+    link_to_webauth: Usa il tuo dispositivo chiave di sicurezza
     login: Entra
     logout: Esci da Mastodon
     migrate_account: Sposta ad un account differente
@@ -709,7 +766,9 @@ it:
       functional: Il tuo account Ã¨ pienamente operativo.
       pending: La tua richiesta Ã¨ in attesa di esame da parte del nostro staff. Potrebbe richiedere un po' di tempo. Riceverai una e-mail se la richiesta Ã¨ approvata.
       redirecting_to: Il tuo account Ã¨ inattivo perchÃ© attualmente reindirizza a %{acct}.
+    too_fast: Modulo inviato troppo velocemente, riprova.
     trouble_logging_in: Problemi di accesso?
+    use_security_key: Usa la chiave di sicurezza
   authorize_follow:
     already_following: Stai giÃ  seguendo questo account
     already_requested: Hai giÃ  mandato una richiesta di seguire questo account
@@ -734,6 +793,7 @@ it:
   date:
     formats:
       default: "%d %b %Y"
+      with_month_name: "%d %B %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count} ore"
@@ -798,6 +858,7 @@ it:
       request: Chiedi il tuo archivio
       size: Dimensioni
     blocks: Stai bloccando
+    bookmarks: Segnalibri
     csv: CSV
     domain_blocks: Blocchi di dominio
     lists: Liste
@@ -865,6 +926,8 @@ it:
     status: Stato della verifica
     view_proof: Vedi prova
   imports:
+    errors:
+      over_rows_processing_limit: contiene piÃ¹ di %{count} righe
     modes:
       merge: Fondi
       merge_long: Mantieni record esistenti e aggiungine di nuovi
@@ -874,6 +937,7 @@ it:
     success: Le tue impostazioni sono state importate correttamente e verranno applicate in breve tempo
     types:
       blocking: Lista dei bloccati
+      bookmarks: Segnalibri
       domain_blocking: Lista dei domini bloccati
       following: Lista dei seguiti
       muting: Lista dei silenziati
@@ -994,6 +1058,14 @@ it:
           quadrillion: P
           thousand: k
           trillion: T
+  otp_authentication:
+    code_hint: Inserisci il codice generato dall'app di autenticazione per confermare
+    description_html: Se abiliti <strong>l'autenticazione a due fattori</strong> utilizzando un'app di autenticazione, per accedere sarÃ  necessario essere in possesso del telefono, che genererÃ  dei codici per l'accesso.
+    enable: Abilita
+    instructions_html: "<strong>Scansiona questo codice QR in Google Authenticator o in un'applicazione TOTP simile sul tuo telefono</strong>. D'ora in poi, quell'app genererÃ  i codici che dovrai inserire quando accedi."
+    manual_instructions: 'Se non riesci a scansionare il codice QR e hai bisogno di inserirlo manualmente, questo Ã¨ il codice segreto in chiaro:'
+    setup: Configura
+    wrong_code: Il codice inserito non Ã¨ valido! Controlla che l'ora del server e l'ora del dispositivo siano esatte.
   pagination:
     newer: PiÃ¹ recente
     next: Avanti
@@ -1022,6 +1094,7 @@ it:
   relationships:
     activity: AttivitÃ  dell'account
     dormant: Dormiente
+    follow_selected_followers: Segui i seguaci selezionati
     followers: Seguaci
     following: Seguiti
     invited: Invitato
@@ -1118,6 +1191,7 @@ it:
     profile: Profilo
     relationships: Follows e followers
     two_factor_authentication: Autenticazione a due fattori
+    webauthn_authentication: Chiavi di sicurezza
   spam_check:
     spam_detected: Questo Ã¨ un rapporto automatico. Ãˆ stato rilevato dello spam.
   statuses:
@@ -1156,6 +1230,8 @@ it:
         other: "%{count} voti"
       vote: Vota
     show_more: Mostra di piÃ¹
+    show_newer: Mostra piÃ¹ nuovi
+    show_older: Mostra piÃ¹ vecchi
     show_thread: Mostra thread
     sign_in_to_participate: Accedi per partecipare alla conversazione
     title: '%{name}: "%{quote}"'
@@ -1267,21 +1343,20 @@ it:
       default: "%b %d, %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Inserisci il codice generato dalla tua app di autenticazione
-    description_html: Se abiliti <strong>l'autorizzazione a due fattori</strong>, entrare nel tuo account ti richiederÃ  di avere vicino il tuo telefono, il quale ti genererÃ  un codice per eseguire l'accesso.
+    add: Aggiungi
     disable: Disabilita
-    enable: Abilita
+    disabled_success: Autenticazione a due fattori disattivata
+    edit: Modifica
     enabled: Ãˆ abilitata l'autenticazione a due fattori
     enabled_success: Autenticazione a due fattori attivata con successo
     generate_recovery_codes: Genera codici di recupero
-    instructions_html: "<strong>Scannerizza questo QR code con Google Authenticator o un'app TOTP simile sul tuo telefono</strong>. Da ora in poi, quell'applicazione genererÃ  codici da inserire necessariamente per eseguire l'accesso."
     lost_recovery_codes: I codici di recupero ti permettono di accedere al tuo account se perdi il telefono. Se hai perso i tuoi codici di recupero, puoi rigenerarli qui. Quelli vecchi saranno annullati.
-    manual_instructions: 'Se non puoi scannerizzare il QR code e hai bisogno di inserirlo manualmente, questo Ã¨ il codice segreto in chiaro:'
+    methods: Metodi a due fattori
+    otp: App di autenticazione
     recovery_codes: Codici di recupero del backup
     recovery_codes_regenerated: I codici di recupero sono stati rigenerati
     recovery_instructions_html: Se perdi il telefono, puoi usare uno dei codici di recupero qui sotto per riottenere l'accesso al tuo account. <strong>Conserva i codici di recupero in un posto sicuro</strong>. Ad esempio puoi stamparli e conservarli insieme ad altri documenti importanti.
-    setup: Configura
-    wrong_code: Il codice inserito non Ã¨ corretto! Assicurati che l'orario del server e l'orario del dispositivo siano corretti.
+    webauthn: Chiavi di sicurezza
   user_mailer:
     backup_ready:
       explanation: Hai richiesto un backup completo del tuo account Mastodon. Ãˆ pronto per essere scaricato!
@@ -1296,6 +1371,7 @@ it:
     warning:
       explanation:
         disable: Mentre il tuo account Ã¨ congelato, i tuoi dati dell'account rimangono intatti, ma non potrai eseguire nessuna azione fintanto che non viene sbloccato.
+        sensitive: I tuoi file multimediali caricati e multimedia collegati saranno trattati come sensibili.
         silence: Mentre il tuo account Ã¨ limitato, solo le persone che giÃ  ti seguono possono vedere i tuoi toot su questo server, e potresti essere escluso da vari elenchi pubblici. Comunque, altri possono manualmente seguirti.
         suspend: Il tuo account Ã¨ stato sospeso, e tutti i tuoi toot ed i tuoi file media caricati sono stati irreversibilmente rimossi da questo server, e dai server dove avevi dei seguaci.
       get_in_touch: Puoi rispondere a questa email per entrare in contatto con lo staff di %{instance}.
@@ -1304,11 +1380,13 @@ it:
       subject:
         disable: Il tuo account %{acct} Ã¨ stato congelato
         none: Avviso per %{acct}
+        sensitive: Il multimedia in pubblicazione del tuo profilo %{acct} Ã¨ stato contrassegnato come sensibile
         silence: Il tuo account %{acct} Ã¨ stato limitato
         suspend: Il tuo account %{acct} Ã¨ stato sospeso
       title:
         disable: Account congelato
         none: Avviso
+        sensitive: Il tuo multimedia Ã¨ stato contrassegnato come sensibile
         silence: Account limitato
         suspend: Account sospeso
     welcome:
@@ -1329,9 +1407,11 @@ it:
       tips: Suggerimenti
       title: Benvenuto a bordo, %{name}!
   users:
+    blocked_email_provider: Questo provider di posta non Ã¨ consentito
     follow_limit_reached: Non puoi seguire piÃ¹ di %{limit} persone
     generic_access_help_html: Problemi nell'accesso al tuo account? Puoi contattare %{email} per assistenza
     invalid_email: L'indirizzo email inserito non Ã¨ valido
+    invalid_email_mx: L'indirizzo e-mail non sembra esistere
     invalid_otp_token: Codice d'accesso non valido
     invalid_sign_in_token: Codice di sicurezza non valido
     otp_lost_help_html: Se perdessi l'accesso ad entrambi, puoi entrare in contatto con %{email}
@@ -1341,3 +1421,20 @@ it:
   verification:
     explanation_html: 'Puoi <strong>certificare te stesso come proprietario dei link nei metadati del tuo profilo</strong>. Per farlo, il sito a cui punta il link deve contenere un link che punta al tuo profilo Mastodon. Il link di ritorno <strong>deve</strong> avere l''attributo <code>rel="me"</code>. Il testo del link non ha importanza. Ecco un esempio:'
     verification: Verifica
+  webauthn_credentials:
+    add: Aggiungi una nuova chiave di sicurezza
+    create:
+      error: Si Ã¨ verificato un problema durante l'aggiunta della chiave di sicurezza. Dovresti riprovare.
+      success: La chiave di sicurezza Ã¨ stata aggiunta.
+    delete: Cancella
+    delete_confirmation: Sei sicuro di voler cancellare questa chiave di sicurezza?
+    description_html: Se abiliti <strong>l'autenticazione con chiave di sicurezza</strong>, per accedere sarÃ  necessario utilizzare una delle tue chiavi di sicurezza.
+    destroy:
+      error: Si Ã¨ verificato un problema durante la cancellazione della chiave di sicurezza. Dovresti riprovare.
+      success: La chiave di sicurezza Ã¨ stata cancellata.
+    invalid_credential: Chiave di sicurezza non valida
+    nickname_hint: Inserisci il soprannome della tua nuova chiave di sicurezza
+    not_enabled: Non hai ancora abilitato WebAuthn
+    not_supported: Questo browser non supporta le chiavi di sicurezza
+    otp_required: Per utilizzare le chiavi di sicurezza, prima abilita l'autenticazione a due fattori.
+    registered_on: Registrato il %{date}
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index fb6255546776a958d6a417f58dcd95b20f5f3cec..1b5eeec8d20eb77e02a4ac6bd95d426a8c86d090 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -21,7 +21,9 @@ ja:
     federation_hint_html: "%{instance} ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã²ã¨ã¤ã§ã©ã‚“ãªMastodonäº’æ›ã‚µãƒ¼ãƒãƒ¼ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã§ã‚‚ãƒ•ã‚©ãƒãƒ¼ã§ãã‚‹ã§ã—ã‚‡ã†ã€‚"
     get_apps: ãƒ¢ãƒã‚¤ãƒ«ã‚¢ãƒ—ãƒªã‚’è©¦ã™
     hosted_on: Mastodon hosted on %{domain}
-    instance_actor_flash: ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯ã‚µãƒ¼ãƒãƒ¼ãã®ã‚‚ã®ã‚’ç¤ºã™ä»®æƒ³çš„ãªã‚‚ã®ã§ã€ç‰¹å®šã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’ç¤ºã™ã‚‚ã®ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚ã“ã‚Œã¯ã‚µãƒ¼ãƒãƒ¼ã®é€£åˆã®ãŸã‚ã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚ã‚µãƒ¼ãƒãƒ¼å…¨ä½“ã‚’ãƒ–ãƒãƒƒã‚¯ã™ã‚‹ã¨ãã¯ã€ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’ãƒ–ãƒãƒƒã‚¯ã›ãšã«ã€ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯ã‚’ä½¿ç”¨ã—ã¦ãã ã•ã„ã€‚
+    instance_actor_flash: 'ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯ã‚µãƒ¼ãƒãƒ¼ãã®ã‚‚ã®ã‚’ç¤ºã™ä»®æƒ³çš„ãªã‚‚ã®ã§ã€ç‰¹å®šã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’ç¤ºã™ã‚‚ã®ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚ã“ã‚Œã¯ã‚µãƒ¼ãƒãƒ¼ã®é€£åˆã®ãŸã‚ã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚ã‚µãƒ¼ãƒãƒ¼å…¨ä½“ã‚’ãƒ–ãƒãƒƒã‚¯ã™ã‚‹ã¨ãã¯ã€ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’ãƒ–ãƒãƒƒã‚¯ã›ãšã«ã€ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯ã‚’ä½¿ç”¨ã—ã¦ãã ã•ã„ã€‚
+
+'
     learn_more: ã‚‚ã£ã¨è©³ã—ã
     privacy_policy: ãƒ—ãƒ©ã‚¤ãƒã‚·ãƒ¼ãƒãƒªã‚·ãƒ¼
     see_whats_happening: ã‚„ã‚Šã¨ã‚Šã‚’è¦‹ã¦ã¿ã‚‹
@@ -55,6 +57,7 @@ ja:
     followers:
       other: ãƒ•ã‚©ãƒãƒ¯ãƒ¼
     following: ãƒ•ã‚©ãƒãƒ¼ä¸
+    instance_actor_flash: ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯ã€å€‹ã€…ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã§ã¯ãªãã€ã‚µãƒ¼ãƒãƒ¼è‡ªä½“ã‚’è¡¨ã™ãŸã‚ã«ä½¿ç”¨ã•ã‚Œã‚‹ä»®æƒ³ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã§ã™ã€‚ é€£åˆã®ãŸã‚ã«ä½¿ç”¨ã•ã‚Œã‚‹ãŸã‚ã€åœæ¢ã—ãªã„ã§ä¸‹ã•ã„ã€‚
     joined: "%{date} ã«ç™»éŒ²"
     last_active: æœ€å¾Œã®æ´»å‹•
     link_verified_on: ã“ã®ãƒªãƒ³ã‚¯ã®æ‰€æœ‰æ¨©ã¯ %{date} ã«ç¢ºèªã•ã‚Œã¾ã—ãŸ
@@ -92,6 +95,7 @@ ja:
       add_email_domain_block: ãƒ¡ãƒ¼ãƒ«ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯ã«è¿½åŠ 
       approve: æ‰¿èª
       approve_all: ã™ã¹ã¦æ‰¿èª
+      approved_msg: "%{username} ã®ç™»éŒ²ç”³è«‹ã‚’æ‰¿èªã—ã¾ã—ãŸ"
       are_you_sure: æœ¬å½“ã«å®Ÿè¡Œã—ã¾ã™ã‹ï¼Ÿ
       avatar: ã‚¢ã‚¤ã‚³ãƒ³
       by_domain: ãƒ‰ãƒ¡ã‚¤ãƒ³
@@ -105,8 +109,10 @@ ja:
       confirm: ç¢ºèª
       confirmed: ç¢ºèªæ¸ˆã¿
       confirming: ç¢ºèªä¸
+      delete: ãƒ‡ãƒ¼ã‚¿ã‚’å‰Šé™¤ã™ã‚‹
       deleted: å‰Šé™¤æ¸ˆã¿
       demote: é™æ ¼
+      destroyed_msg: "%{username} ã®ãƒ‡ãƒ¼ã‚¿ã¯å®Œå…¨ã«å‰Šé™¤ã•ã‚Œã‚‹ã‚ˆã†ç™»éŒ²ã•ã‚Œã¾ã—ãŸ"
       disable: ç„¡åŠ¹åŒ–
       disable_two_factor_authentication: äºŒæ®µéšŽèªè¨¼ã‚’ç„¡åŠ¹ã«ã™ã‚‹
       disabled: ç„¡åŠ¹
@@ -117,10 +123,12 @@ ja:
       email_status: ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®çŠ¶æ…‹
       enable: æœ‰åŠ¹åŒ–
       enabled: æœ‰åŠ¹
+      enabled_msg: "%{username} ã®ç„¡åŠ¹åŒ–ã‚’è§£é™¤ã—ã¾ã—ãŸ"
       followers: ãƒ•ã‚©ãƒãƒ¯ãƒ¼æ•°
       follows: ãƒ•ã‚©ãƒãƒ¼æ•°
       header: ãƒ˜ãƒƒãƒ€ãƒ¼
       inbox_url: Inbox URL
+      invite_request_text: æ„æ°—è¾¼ã¿
       invited_by: æ‹›å¾…ã—ãŸäºº
       ip: IP
       joined: ç™»éŒ²æ—¥
@@ -132,6 +140,8 @@ ja:
       login_status: ãƒã‚°ã‚¤ãƒ³
       media_attachments: æ·»ä»˜ã•ã‚ŒãŸãƒ¡ãƒ‡ã‚£ã‚¢
       memorialize: è¿½æ‚¼ã‚¢ã‚«ã‚¦ãƒ³ãƒˆåŒ–
+      memorialized: è¿½æ‚¼åŒ–æ¸ˆã¿
+      memorialized_msg: "%{username} ã‚’è¿½æ‚¼ã‚¢ã‚«ã‚¦ãƒ³ãƒˆåŒ–ã—ã¾ã—ãŸ"
       moderation:
         active: ã‚¢ã‚¯ãƒ†ã‚£ãƒ–
         all: ã™ã¹ã¦
@@ -152,10 +162,14 @@ ja:
       public: ãƒ‘ãƒ–ãƒªãƒƒã‚¯
       push_subscription_expires: PuSHè³¼èªæœŸé™
       redownload: ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’æ›´æ–°
+      redownloaded_msg: "%{username} ã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’æ£å¸¸ã«æ›´æ–°ã—ã¾ã—ãŸ"
       reject: å´ä¸‹
       reject_all: ã™ã¹ã¦å´ä¸‹
+      rejected_msg: "%{username} ã®ç™»éŒ²ç”³è«‹ã‚’å´ä¸‹ã—ã¾ã—ãŸ"
       remove_avatar: ã‚¢ã‚¤ã‚³ãƒ³ã‚’å‰Šé™¤
       remove_header: ãƒ˜ãƒƒãƒ€ãƒ¼ã‚’å‰Šé™¤
+      removed_avatar_msg: "%{username} ã®ã‚¢ãƒã‚¿ãƒ¼ç”»åƒã‚’å‰Šé™¤ã—ã¾ã—ãŸ"
+      removed_header_msg: "%{username} ã®ãƒ˜ãƒƒãƒ€ãƒ¼ç”»åƒã‚’å‰Šé™¤ã—ã¾ã—ãŸ"
       resend_confirmation:
         already_confirmed: ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã¯ç¢ºèªæ¸ˆã¿ã§ã™
         send: ç¢ºèªãƒ¡ãƒ¼ãƒ«ã‚’å†é€
@@ -172,6 +186,8 @@ ja:
       search: æ¤œç´¢
       search_same_email_domain: åŒã˜ãƒ‰ãƒ¡ã‚¤ãƒ³ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’ä½¿ç”¨ã—ã¦ã„ã‚‹ãƒ¦ãƒ¼ã‚¶ãƒ¼
       search_same_ip: åŒã˜ IP ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’æ¤œç´¢
+      sensitive: é–²è¦§æ³¨æ„
+      sensitized: é–²è¦§æ³¨æ„æ¸ˆã¿
       shared_inbox_url: Shared inbox URL
       show:
         created_reports: ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§ä½œã‚‰ã‚ŒãŸé€šå ±
@@ -181,13 +197,19 @@ ja:
       statuses: ãƒˆã‚¥ãƒ¼ãƒˆæ•°
       subscribe: è³¼èªã™ã‚‹
       suspended: åœæ¢æ¸ˆã¿
+      suspension_irreversible: ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ãƒ‡ãƒ¼ã‚¿ã¯å‰Šé™¤ã•ã‚Œå…ƒã«æˆ»ã›ãªããªã‚Šã¾ã™ã€‚å¾Œæ—¥ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®å‡çµã‚’è§£é™¤ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã™ãŒãƒ‡ãƒ¼ã‚¿ã¯å…ƒã«æˆ»ã›ã¾ã›ã‚“ã€‚
+      suspension_reversible_hint_html: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯åœæ¢ã•ã‚Œã¦ãŠã‚Šã€ãƒ‡ãƒ¼ã‚¿ã¯ %{date} ã«å®Œå…¨ã«å‰Šé™¤ã•ã‚Œã¾ã™ã€‚ãã‚Œã¾ã§ã¯ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’å…ƒã«æˆ»ã™ã“ã¨ãŒã§ãã¾ã™ã€‚ä»Šã™ãå®Œå…¨ã«å‰Šé™¤ã—ãŸã„å ´åˆã¯ä»¥ä¸‹ã‹ã‚‰è¡Œã†ã“ã¨ãŒã§ãã¾ã™ã€‚
       time_in_queue: "%{time} å¾…ã¡"
       title: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ
       unconfirmed_email: ç¢ºèªå¾…ã¡ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹
+      undo_sensitized: é–²è¦§æ³¨æ„ã‹ã‚‰æˆ»ã™
       undo_silenced: ã‚µã‚¤ãƒ¬ãƒ³ã‚¹ã‹ã‚‰æˆ»ã™
       undo_suspension: åœæ¢ã‹ã‚‰æˆ»ã™
+      unsilenced_msg: "%{username} ã®ã‚µã‚¤ãƒ¬ãƒ³ã‚¹è§£é™¤ã«æˆåŠŸã—ã¾ã—ãŸ"
       unsubscribe: è³¼èªã®è§£é™¤
+      unsuspended_msg: "%{username} ã®ç„¡åŠ¹åŒ–ã‚’è§£é™¤ã—ã¾ã—ãŸ"
       username: ãƒ¦ãƒ¼ã‚¶ãƒ¼å
+      view_domain: ãƒ‰ãƒ¡ã‚¤ãƒ³ã®æ¦‚è¦ã‚’è¡¨ç¤º
       warn: è¦å‘Š
       web: Web
       whitelisted: é€£åˆè¨±å¯æ¸ˆã¿
@@ -202,31 +224,36 @@ ja:
         create_domain_allow: é€£åˆã‚’è¨±å¯
         create_domain_block: ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯ã‚’ä½œæˆ
         create_email_domain_block: ãƒ¡ãƒ¼ãƒ«ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯ã‚’ä½œæˆ
+        create_ip_block: IPãƒ«ãƒ¼ãƒ«ã‚’ä½œæˆ
         demote_user: ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’é™æ ¼
         destroy_announcement: ãŠçŸ¥ã‚‰ã›ã‚’å‰Šé™¤
         destroy_custom_emoji: ã‚«ã‚¹ã‚¿ãƒ çµµæ–‡å—ã‚’å‰Šé™¤
         destroy_domain_allow: é€£åˆè¨±å¯ã‚’å¤–ã™
         destroy_domain_block: ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯ã‚’å‰Šé™¤
         destroy_email_domain_block: ãƒ¡ãƒ¼ãƒ«ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯ã‚’å‰Šé™¤
+        destroy_ip_block: IPãƒ«ãƒ¼ãƒ«ã‚’å‰Šé™¤
         destroy_status: ãƒˆã‚¥ãƒ¼ãƒˆã‚’å‰Šé™¤
         disable_2fa_user: äºŒæ®µéšŽèªè¨¼ã‚’ç„¡åŠ¹åŒ–
         disable_custom_emoji: ã‚«ã‚¹ã‚¿ãƒ çµµæ–‡å—ã‚’ç„¡åŠ¹åŒ–
         disable_user: ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’ç„¡åŠ¹åŒ–
         enable_custom_emoji: ã‚«ã‚¹ã‚¿ãƒ çµµæ–‡å—ã‚’æœ‰åŠ¹åŒ–
         enable_user: ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’æœ‰åŠ¹åŒ–
-        memorialize_account: è¿½æ‚¼ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ
+        memorialize_account: è¿½æ‚¼ã‚¢ã‚«ã‚¦ãƒ³ãƒˆåŒ–
         promote_user: ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’æ˜‡æ ¼
         remove_avatar_user: ã‚¢ã‚¤ã‚³ãƒ³ã‚’å‰Šé™¤
         reopen_report: é€šå ±ã‚’å†åº¦é–‹ã
         reset_password_user: ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ãƒªã‚»ãƒƒãƒˆ
         resolve_report: é€šå ±ã‚’è§£æ±ºæ¸ˆã¿ã«ã™ã‚‹
+        sensitive_account: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’é–²è¦§æ³¨æ„ã«ãƒžãƒ¼ã‚¯
         silence_account: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’ã‚µã‚¤ãƒ¬ãƒ³ã‚¹
         suspend_account: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’åœæ¢
         unassigned_report: é€šå ±ã®æ‹…å½“ã‚’è§£é™¤
+        unsensitive_account: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ãƒ¡ãƒ‡ã‚£ã‚¢ã®é–²è¦§æ³¨æ„ãƒžãƒ¼ã‚¯ã‚’è§£é™¤
         unsilence_account: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ã‚µã‚¤ãƒ¬ãƒ³ã‚¹ã‚’è§£é™¤
         unsuspend_account: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®åœæ¢ã‚’è§£é™¤
         update_announcement: ãŠçŸ¥ã‚‰ã›ã‚’æ›´æ–°
         update_custom_emoji: ã‚«ã‚¹ã‚¿ãƒ çµµæ–‡å—ã‚’æ›´æ–°
+        update_domain_block: ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯ã‚’æ›´æ–°
         update_status: ãƒˆã‚¥ãƒ¼ãƒˆã‚’æ›´æ–°
       actions:
         assigned_to_self_report: "%{name} ã•ã‚“ãŒé€šå ± %{target} ã‚’è‡ªèº«ã®æ‹…å½“ã«å‰²ã‚Šå½“ã¦ã¾ã—ãŸ"
@@ -238,12 +265,14 @@ ja:
         create_domain_allow: "%{name} ã•ã‚“ãŒ %{target} ã®é€£åˆã‚’è¨±å¯ã—ã¾ã—ãŸ"
         create_domain_block: "%{name} ã•ã‚“ãŒãƒ‰ãƒ¡ã‚¤ãƒ³ %{target} ã‚’ãƒ–ãƒãƒƒã‚¯ã—ã¾ã—ãŸ"
         create_email_domain_block: "%{name} ã•ã‚“ãŒ %{target} ã‚’ãƒ¡ãƒ¼ãƒ«ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯ã«è¿½åŠ ã—ã¾ã—ãŸ"
+        create_ip_block: "%{name} ã•ã‚“ãŒ IP %{target} ã®ãƒ«ãƒ¼ãƒ«ã‚’ä½œæˆã—ã¾ã—ãŸ"
         demote_user: "%{name} ã•ã‚“ãŒ %{target} ã•ã‚“ã‚’é™æ ¼ã—ã¾ã—ãŸ"
         destroy_announcement: "%{name} ã•ã‚“ãŒãŠçŸ¥ã‚‰ã› %{target} ã‚’å‰Šé™¤ã—ã¾ã—ãŸ"
         destroy_custom_emoji: "%{name} ã•ã‚“ãŒã‚«ã‚¹ã‚¿ãƒ çµµæ–‡å— %{target} ã‚’å‰Šé™¤ã—ã¾ã—ãŸ"
         destroy_domain_allow: "%{name} ã•ã‚“ãŒ %{target} ã®é€£åˆè¨±å¯ã‚’å¤–ã—ã¾ã—ãŸ"
         destroy_domain_block: "%{name} ã•ã‚“ãŒãƒ‰ãƒ¡ã‚¤ãƒ³ %{target} ã®ãƒ–ãƒãƒƒã‚¯ã‚’å¤–ã—ã¾ã—ãŸ"
         destroy_email_domain_block: "%{name} ã•ã‚“ãŒ %{target} ã‚’ãƒ¡ãƒ¼ãƒ«ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯ã‹ã‚‰å¤–ã—ã¾ã—ãŸ"
+        destroy_ip_block: "%{name} ã•ã‚“ãŒ IP %{target} ã®ãƒ«ãƒ¼ãƒ«ã‚’å‰Šé™¤ã—ã¾ã—ãŸ"
         destroy_status: "%{name} ã•ã‚“ãŒ %{target} ã•ã‚“ã®ãƒˆã‚¥ãƒ¼ãƒˆã‚’å‰Šé™¤ã—ã¾ã—ãŸ"
         disable_2fa_user: "%{name} ã•ã‚“ãŒ %{target} ã•ã‚“ã®äºŒæ®µéšŽèªè¨¼ã‚’ç„¡åŠ¹åŒ–ã—ã¾ã—ãŸ"
         disable_custom_emoji: "%{name} ã•ã‚“ãŒã‚«ã‚¹ã‚¿ãƒ çµµæ–‡å— %{target} ã‚’ç„¡åŠ¹åŒ–ã—ã¾ã—ãŸ"
@@ -256,13 +285,16 @@ ja:
         reopen_report: "%{name} ã•ã‚“ãŒé€šå ± %{target} ã‚’å†ã³é–‹ãã¾ã—ãŸ"
         reset_password_user: "%{name} ã•ã‚“ãŒ %{target} ã•ã‚“ã®ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ãƒªã‚»ãƒƒãƒˆã—ã¾ã—ãŸ"
         resolve_report: "%{name} ã•ã‚“ãŒé€šå ± %{target} ã‚’è§£æ±ºæ¸ˆã¿ã«ã—ã¾ã—ãŸ"
+        sensitive_account: "%{name} ã•ã‚“ãŒ %{target} ã•ã‚“ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’é–²è¦§æ³¨æ„ã«ãƒžãƒ¼ã‚¯ã—ã¾ã—ãŸ"
         silence_account: "%{name} ã•ã‚“ãŒ %{target} ã•ã‚“ã‚’ã‚µã‚¤ãƒ¬ãƒ³ã‚¹ã«ã—ã¾ã—ãŸ"
         suspend_account: "%{name} ã•ã‚“ãŒ %{target} ã•ã‚“ã‚’åœæ¢ã—ã¾ã—ãŸ"
         unassigned_report: "%{name} ã•ã‚“ãŒé€šå ± %{target} ã®æ‹…å½“ã‚’å¤–ã—ã¾ã—ãŸ"
+        unsensitive_account: "%{name} ã•ã‚“ãŒ %{target} ã•ã‚“ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã®é–²è¦§æ³¨æ„ã‚’è§£é™¤ã—ã¾ã—ãŸ"
         unsilence_account: "%{name} ã•ã‚“ãŒ %{target} ã•ã‚“ã®ã‚µã‚¤ãƒ¬ãƒ³ã‚¹ã‚’è§£é™¤ã—ã¾ã—ãŸ"
         unsuspend_account: "%{name} ã•ã‚“ãŒ %{target} ã•ã‚“ã®åœæ¢ã‚’è§£é™¤ã—ã¾ã—ãŸ"
         update_announcement: "%{name} ã•ã‚“ãŒãŠçŸ¥ã‚‰ã› %{target} ã‚’æ›´æ–°ã—ã¾ã—ãŸ"
         update_custom_emoji: "%{name} ã•ã‚“ãŒã‚«ã‚¹ã‚¿ãƒ çµµæ–‡å— %{target} ã‚’æ›´æ–°ã—ã¾ã—ãŸ"
+        update_domain_block: "%{name} ãŒ %{target} ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯ã‚’æ›´æ–°ã—ã¾ã—ãŸ"
         update_status: "%{name} ã•ã‚“ãŒ %{target} ã•ã‚“ã®ãƒˆã‚¥ãƒ¼ãƒˆã‚’æ›´æ–°ã—ã¾ã—ãŸ"
       deleted_status: "(å‰Šé™¤æ¸ˆ)"
       empty: ãƒã‚°ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ
@@ -366,6 +398,8 @@ ja:
           silence: ã‚µã‚¤ãƒ¬ãƒ³ã‚¹
           suspend: åœæ¢
         title: æ–°è¦ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯
+      obfuscate: ãƒ‰ãƒ¡ã‚¤ãƒ³åã‚’ä¼ã›å—ã«ã™ã‚‹
+      obfuscate_hint: ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯ã®ãƒªã‚¹ãƒˆã‚’å…¬é–‹ã—ã¦ã„ã‚‹å ´åˆã€ãƒ‰ãƒ¡ã‚¤ãƒ³åã®ä¸€éƒ¨ã‚’ä¼ã›å—ã«ã—ã¾ã™
       private_comment: ã‚³ãƒ¡ãƒ³ãƒˆ (éžå…¬é–‹)
       private_comment_hint: ã“ã®ã‚³ãƒ¡ãƒ³ãƒˆã¯åŒã˜ã‚µãƒ¼ãƒãƒ¼ã®ãƒ¢ãƒ‡ãƒ¬ãƒ¼ã‚¿ãƒ¼ã‚‚é–²è¦§ã§ãã¾ã™ã€‚
       public_comment: ã‚³ãƒ¡ãƒ³ãƒˆ (å…¬é–‹)
@@ -404,6 +438,7 @@ ja:
     instances:
       by_domain: ãƒ‰ãƒ¡ã‚¤ãƒ³
       delivery_available: é…é€å¯èƒ½
+      empty: ãƒ‰ãƒ¡ã‚¤ãƒ³ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚
       known_accounts:
         other: æ—¢çŸ¥ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆæ•° %{count}
       moderation:
@@ -426,6 +461,21 @@ ja:
         expired: æœŸé™åˆ‡ã‚Œ
         title: ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼
       title: æ‹›å¾…
+    ip_blocks:
+      add_new: ãƒ«ãƒ¼ãƒ«ã‚’ä½œæˆ
+      created_msg: IPãƒ«ãƒ¼ãƒ«ã‚’è¿½åŠ ã—ã¾ã—ãŸ
+      delete: å‰Šé™¤
+      expires_in:
+        '1209600': 2é€±é–“
+        '15778476': 6ãƒ¶æœˆ
+        '2629746': 1ãƒ¶æœˆ
+        '31556952': 1å¹´
+        '86400': 1æ—¥
+        '94670856': 3å¹´
+      new:
+        title: æ–°è¦IPãƒ«ãƒ¼ãƒ«
+      no_ip_block_selected: ä½•ã‚‚é¸æŠžã•ã‚Œã¦ã„ãªã„ãŸã‚IPãƒ«ãƒ¼ãƒ«ã‚’å¤‰æ›´ã—ã¾ã›ã‚“ã§ã—ãŸ
+      title: IPãƒ«ãƒ¼ãƒ«
     pending_accounts:
       title: æ‰¿èªå¾…ã¡ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ (%{count})
     relationships:
@@ -463,6 +513,8 @@ ja:
       comment:
         none: ãªã—
       created_at: é€šå ±æ—¥æ™‚
+      forwarded: è»¢é€æ¸ˆã¿
+      forwarded_to: "%{domain} ã«è»¢é€ã•ã‚Œã¾ã—ãŸ"
       mark_as_resolved: è§£æ±ºæ¸ˆã¿ã¨ã—ã¦ãƒžãƒ¼ã‚¯
       mark_as_unresolved: æœªè§£æ±ºã¨ã—ã¦å†ã³é–‹ã
       notes:
@@ -506,6 +558,7 @@ ja:
       domain_blocks_rationale:
         title: ã‚³ãƒ¡ãƒ³ãƒˆã‚’è¡¨ç¤º
       enable_bootstrap_timeline_accounts:
+        desc_html: æ–°è¦ãƒ¦ãƒ¼ã‚¶ãƒ¼ãŒè¨å®šã—ãŸã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’è‡ªå‹•çš„ã«ãƒ•ã‚©ãƒãƒ¼ã—ã¦ã€ãƒ›ãƒ¼ãƒ ãƒ•ã‚£ãƒ¼ãƒ‰ãŒç©ºã«ãªã‚‰ãªã„ã‚ˆã†ã«ã™ã‚‹
         title: æ–°è¦ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®è‡ªå‹•ãƒ•ã‚©ãƒãƒ¼ã‚’æœ‰åŠ¹ã«ã™ã‚‹
       hero:
         desc_html: ãƒ•ãƒãƒ³ãƒˆãƒšãƒ¼ã‚¸ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ã‚µã‚¤ã‚ºã¯600x100pxä»¥ä¸ŠæŽ¨å¥¨ã§ã™ã€‚æœªè¨å®šã®å ´åˆã€æ¨™æº–ã®ã‚µãƒ ãƒã‚¤ãƒ«ãŒä½¿ç”¨ã•ã‚Œã¾ã™
@@ -532,6 +585,9 @@ ja:
         min_invite_role:
           disabled: èª°ã«ã‚‚è¨±å¯ã—ãªã„
           title: æ‹›å¾…ã®ä½œæˆã‚’è¨±å¯
+        require_invite_text:
+          desc_html: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆç™»éŒ²ãŒæ‰¿èªåˆ¶ã®å ´åˆã€ã€Œæ„æ°—è¾¼ã¿ã‚’ãŠèžã‹ã›ãã ã•ã„ã€ã®ãƒ†ã‚ã‚¹ãƒˆã‚’å¿…é ˆå…¥åŠ›ã«ã™ã‚‹
+          title: æ–°è¦ãƒ¦ãƒ¼ã‚¶ãƒ¼ç™»éŒ²æ™‚ã®ç†ç”±ã‚’å¿…é ˆå…¥åŠ›ã«ã™ã‚‹
       registrations_mode:
         modes:
           approved: ç™»éŒ²ã«ã¯æ‰¿èªãŒå¿…è¦
@@ -671,8 +727,11 @@ ja:
       prefix_sign_up: ä»Šã™ã Mastodon ã‚’å§‹ã‚ã‚ˆã†ï¼
       suffix: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒã‚ã‚Œã°ã€ã©ã‚“ãª Mastodon äº’æ›ã‚µãƒ¼ãƒãƒ¼ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã§ã‚‚ãƒ•ã‚©ãƒãƒ¼ã—ãŸã‚Šãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’ã‚„ã‚Šå–ã‚Šã§ãã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ï¼
     didnt_get_confirmation: ç¢ºèªãƒ¡ãƒ¼ãƒ«ã‚’å—ä¿¡ã§ãã¾ã›ã‚“ã‹ï¼Ÿ
+    dont_have_your_security_key: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã‚’æŒã£ã¦ã„ã¾ã›ã‚“ã‹ï¼Ÿ
     forgot_password: ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ãŠå¿˜ã‚Œã§ã™ã‹ï¼Ÿ
     invalid_reset_password_token: ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ãƒªã‚»ãƒƒãƒˆãƒˆãƒ¼ã‚¯ãƒ³ãŒæ£ã—ããªã„ã‹æœŸé™åˆ‡ã‚Œã§ã™ã€‚ã‚‚ã†ä¸€åº¦ãƒªã‚¯ã‚¨ã‚¹ãƒˆã—ã¦ãã ã•ã„ã€‚
+    link_to_otp: æºå¸¯é›»è©±ã‹ã‚‰äºŒæ®µéšŽèªè¨¼ã‚³ãƒ¼ãƒ‰ã‚’å…¥åŠ›ã™ã‚‹ã‹ã€ãƒªã‚«ãƒãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã‚’å…¥åŠ›ã—ã¦ãã ã•ã„
+    link_to_webauth: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã‚’ä½¿ç”¨ã™ã‚‹
     login: ãƒã‚°ã‚¤ãƒ³
     logout: ãƒã‚°ã‚¢ã‚¦ãƒˆ
     migrate_account: åˆ¥ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«å¼•ã£è¶Šã™
@@ -697,7 +756,9 @@ ja:
       functional: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯å®Œå…¨ã«æ©Ÿèƒ½ã—ã¦ã„ã¾ã™ã€‚
       pending: ã‚ãªãŸã®ç”³è«‹ã¯ç¾åœ¨ã‚µãƒ¼ãƒãƒ¼ç®¡ç†è€…ã«ã‚ˆã‚‹å¯©æŸ»å¾…ã¡ã§ã™ã€‚ã“ã‚Œã«ã¯ã—ã°ã‚‰ãã‹ã‹ã‚Šã¾ã™ã€‚ç”³è«‹ãŒæ‰¿èªã•ã‚Œã‚‹ã¨ãƒ¡ãƒ¼ãƒ«ãŒå±Šãã¾ã™ã€‚
       redirecting_to: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯ %{acct} ã«å¼•ã£è¶Šã—è¨å®šã•ã‚Œã¦ã„ã‚‹ãŸã‚éžã‚¢ã‚¯ãƒ†ã‚£ãƒ–ã«ãªã£ã¦ã„ã¾ã™ã€‚
+    too_fast: ãƒ•ã‚©ãƒ¼ãƒ ã®é€ä¿¡ãŒé€Ÿã™ãŽã¾ã™ã€‚ã‚‚ã†ä¸€åº¦ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„ã€‚
     trouble_logging_in: ãƒã‚°ã‚¤ãƒ³ã§ãã¾ã›ã‚“ã‹ï¼Ÿ
+    use_security_key: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã‚’ä½¿ç”¨
   authorize_follow:
     already_following: ã‚ãªãŸã¯æ—¢ã«ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’ãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„ã¾ã™
     already_requested: æ—¢ã«ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¸ãƒ•ã‚©ãƒãƒ¼ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’é€ä¿¡ã—ã¦ã„ã¾ã™
@@ -722,6 +783,7 @@ ja:
   date:
     formats:
       default: "%Yå¹´%mæœˆ%dæ—¥"
+      with_month_name: "%Yå¹´%mæœˆ%dæ—¥"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}æ™‚é–“"
@@ -786,6 +848,7 @@ ja:
       request: ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã‚’ãƒªã‚¯ã‚¨ã‚¹ãƒˆ
       size: å®¹é‡
     blocks: ãƒ–ãƒãƒƒã‚¯
+    bookmarks: ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯
     csv: CSV
     domain_blocks: éžè¡¨ç¤ºã«ã—ãŸãƒ‰ãƒ¡ã‚¤ãƒ³
     lists: ãƒªã‚¹ãƒˆ
@@ -852,6 +915,8 @@ ja:
     status: èªè¨¼çŠ¶æ…‹
     view_proof: è¨¼æ˜Žã‚’è¡¨ç¤º
   imports:
+    errors:
+      over_rows_processing_limit: "%{count} è¡Œä»¥ä¸Š"
     modes:
       merge: çµ±åˆ
       merge_long: ç¾åœ¨ã®ãƒ¬ã‚³ãƒ¼ãƒ‰ã‚’ä¿æŒã—ãŸã¾ã¾æ–°ã—ã„ã‚‚ã®ã‚’è¿½åŠ ã—ã¾ã™
@@ -861,6 +926,7 @@ ja:
     success: ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ£å¸¸ã«ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚Œã€ç¾åœ¨å‡¦ç†ä¸ã§ã™ã€‚ã—ã°ã‚‰ãã—ã¦ã‹ã‚‰ç¢ºèªã—ã¦ãã ã•ã„
     types:
       blocking: ãƒ–ãƒãƒƒã‚¯ã—ãŸã‚¢ã‚«ã‚¦ãƒ³ãƒˆãƒªã‚¹ãƒˆ
+      bookmarks: ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯
       domain_blocking: éžè¡¨ç¤ºã«ã—ãŸãƒ‰ãƒ¡ã‚¤ãƒ³ãƒªã‚¹ãƒˆ
       following: ãƒ•ã‚©ãƒãƒ¼ä¸ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãƒªã‚¹ãƒˆ
       muting: ãƒŸãƒ¥ãƒ¼ãƒˆã—ãŸã‚¢ã‚«ã‚¦ãƒ³ãƒˆãƒªã‚¹ãƒˆ
@@ -978,6 +1044,14 @@ ja:
           quadrillion: Q
           thousand: K
           trillion: T
+  otp_authentication:
+    code_hint: ç¶šè¡Œã™ã‚‹ã«ã¯èªè¨¼ã‚¢ãƒ—ãƒªã§è¡¨ç¤ºã•ã‚ŒãŸã‚³ãƒ¼ãƒ‰ã‚’å…¥åŠ›ã—ã¦ãã ã•ã„
+    description_html: "<strong>äºŒè¦ç´ èªè¨¼</strong>ã‚’æœ‰åŠ¹ã«ã™ã‚‹ã¨ã€ãƒã‚°ã‚¤ãƒ³æ™‚ã«èªè¨¼ã‚¢ãƒ—ãƒªã‹ã‚‰ã‚³ãƒ¼ãƒ‰ã‚’å…¥åŠ›ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
+    enable: æœ‰åŠ¹åŒ–
+    instructions_html: "<strong>Google Authenticatorã‹ã€ã‚‚ã—ãã¯ã»ã‹ã®TOTPã‚¢ãƒ—ãƒªã§ã“ã®QRã‚³ãƒ¼ãƒ‰ã‚’ã‚¹ã‚ãƒ£ãƒ³ã—ã¦ãã ã•ã„ã€‚</strong>ã“ã‚Œä»¥é™ã€ãƒã‚°ã‚¤ãƒ³ã™ã‚‹ã¨ãã¯ãã®ã‚¢ãƒ—ãƒªã§ç”Ÿæˆã•ã‚Œã‚‹ã‚³ãƒ¼ãƒ‰ãŒå¿…è¦ã«ãªã‚Šã¾ã™ã€‚"
+    manual_instructions: 'QRã‚³ãƒ¼ãƒ‰ãŒã‚¹ã‚ãƒ£ãƒ³ã§ããšã€æ‰‹å‹•ã§ã®ç™»éŒ²ã‚’å¸Œæœ›ã®å ´åˆã¯ã“ã®ã‚·ãƒ¼ã‚¯ãƒ¬ãƒƒãƒˆã‚³ãƒ¼ãƒ‰ã‚’åˆ©ç”¨ã—ã¦ãã ã•ã„ã€‚:'
+    setup: ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—
+    wrong_code: ã‚³ãƒ¼ãƒ‰ãŒé–“é•ã£ã¦ã„ã¾ã™ã€‚ã‚µãƒ¼ãƒãƒ¼ã¨ãƒ‡ãƒã‚¤ã‚¹ã®æ™‚è¨ˆã«ãšã‚ŒãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ã€‚
   pagination:
     newer: æ–°ã—ã„ãƒˆã‚¥ãƒ¼ãƒˆ
     next: æ¬¡
@@ -1006,6 +1080,7 @@ ja:
   relationships:
     activity: æ´»å‹•
     dormant: éžã‚¢ã‚¯ãƒ†ã‚£ãƒ–
+    follow_selected_followers: é¸æŠžã—ãŸãƒ•ã‚©ãƒãƒ¯ãƒ¼ã‚’ãƒ•ã‚©ãƒãƒ¼
     followers: ãƒ•ã‚©ãƒãƒ¯ãƒ¼
     following: ãƒ•ã‚©ãƒãƒ¼ä¸
     invited: æ‹›å¾…æ¸ˆã¿
@@ -1102,6 +1177,7 @@ ja:
     profile: ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«
     relationships: ãƒ•ã‚©ãƒãƒ¼ãƒ»ãƒ•ã‚©ãƒãƒ¯ãƒ¼
     two_factor_authentication: äºŒæ®µéšŽèªè¨¼
+    webauthn_authentication: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼
   spam_check:
     spam_detected: ã“ã‚Œã¯è‡ªå‹•çš„ã«ä½œæˆã•ã‚ŒãŸé€šå ±ã§ã™ã€‚ã‚¹ãƒ‘ãƒ ãŒæ¤œå‡ºã•ã‚Œã¦ã„ã¾ã™ã€‚
   statuses:
@@ -1134,6 +1210,8 @@ ja:
         other: "%{count}ç¥¨"
       vote: æŠ•ç¥¨
     show_more: ã‚‚ã£ã¨è¦‹ã‚‹
+    show_newer: æ–°ã—ã„ã‚‚ã®ã‹ã‚‰è¡¨ç¤º
+    show_older: å¤ã„ã‚‚ã®ã‹ã‚‰è¡¨ç¤º
     show_thread: ã‚¹ãƒ¬ãƒƒãƒ‰ã‚’è¡¨ç¤º
     sign_in_to_participate: ãƒã‚°ã‚¤ãƒ³ã—ã¦ä¼šè©±ã«å‚åŠ 
     title: '%{name}: "%{quote}"'
@@ -1242,21 +1320,20 @@ ja:
       default: "%Yå¹´%mæœˆ%dæ—¥ %H:%M"
       month: "%Yå¹´ %b"
   two_factor_authentication:
-    code_hint: ç¶šè¡Œã™ã‚‹ã«ã¯èªè¨¼ã‚¢ãƒ—ãƒªã§è¡¨ç¤ºã•ã‚ŒãŸã‚³ãƒ¼ãƒ‰ã‚’å…¥åŠ›ã—ã¦ãã ã•ã„
-    description_html: "<strong>äºŒæ®µéšŽèªè¨¼</strong>ã‚’æœ‰åŠ¹ã«ã™ã‚‹ã¨ãƒã‚°ã‚¤ãƒ³æ™‚ã€èªè¨¼ã‚¢ãƒ—ãƒªã‹ã‚‰ã‚³ãƒ¼ãƒ‰ã‚’å…¥åŠ›ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
+    add: è¿½åŠ 
     disable: ç„¡åŠ¹åŒ–
-    enable: æœ‰åŠ¹
+    disabled_success: äºŒæ®µéšŽèªè¨¼ãŒç„¡åŠ¹ã«ãªã‚Šã¾ã—ãŸ
+    edit: ç·¨é›†
     enabled: äºŒæ®µéšŽèªè¨¼ã¯æœ‰åŠ¹ã«ãªã£ã¦ã„ã¾ã™
     enabled_success: äºŒæ®µéšŽèªè¨¼ãŒæœ‰åŠ¹ã«ãªã‚Šã¾ã—ãŸ
     generate_recovery_codes: ãƒªã‚«ãƒãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã‚’ç”Ÿæˆ
-    instructions_html: "<strong>Google Authenticatorã‹ã€ã‚‚ã—ãã¯ã»ã‹ã®TOTPã‚¢ãƒ—ãƒªã§ã“ã®QRã‚³ãƒ¼ãƒ‰ã‚’ã‚¹ã‚ãƒ£ãƒ³ã—ã¦ãã ã•ã„ã€‚</strong>ã“ã‚Œä»¥é™ã€ãƒã‚°ã‚¤ãƒ³ã™ã‚‹ã¨ãã¯ãã®ã‚¢ãƒ—ãƒªã§ç”Ÿæˆã•ã‚Œã‚‹ã‚³ãƒ¼ãƒ‰ãŒå¿…è¦ã«ãªã‚Šã¾ã™ã€‚"
     lost_recovery_codes: ãƒªã‚«ãƒãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã‚’ä½¿ç”¨ã™ã‚‹ã¨æºå¸¯é›»è©±ã‚’ç´›å¤±ã—ãŸå ´åˆã§ã‚‚ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚ ãƒªã‚«ãƒãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã‚’ç´›å¤±ã—ãŸå ´åˆã‚‚ã“ã“ã§å†ç”Ÿæˆã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ãŒã€å¤ã„ãƒªã‚«ãƒãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã¯ç„¡åŠ¹ã«ãªã‚Šã¾ã™ã€‚
-    manual_instructions: 'QRã‚³ãƒ¼ãƒ‰ãŒã‚¹ã‚ãƒ£ãƒ³ã§ããšã€æ‰‹å‹•ã§ã®ç™»éŒ²ã‚’å¸Œæœ›ã®å ´åˆã¯ã“ã®ã‚·ãƒ¼ã‚¯ãƒ¬ãƒƒãƒˆã‚³ãƒ¼ãƒ‰ã‚’åˆ©ç”¨ã—ã¦ãã ã•ã„ã€‚:'
+    methods: æ–¹å¼
+    otp: èªè¨¼ã‚¢ãƒ—ãƒª
     recovery_codes: ãƒªã‚«ãƒãƒªãƒ¼ã‚³ãƒ¼ãƒ‰
     recovery_codes_regenerated: ãƒªã‚«ãƒãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ãŒå†ç”Ÿæˆã•ã‚Œã¾ã—ãŸ
     recovery_instructions_html: æºå¸¯é›»è©±ã‚’ç´›å¤±ã—ãŸå ´åˆã€ä»¥ä¸‹ã®å†…ã©ã‚Œã‹ã®ãƒªã‚«ãƒãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã‚’ä½¿ç”¨ã—ã¦ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¸ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚<strong>ãƒªã‚«ãƒãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã¯å¤§åˆ‡ã«ä¿å…¨ã—ã¦ãã ã•ã„ã€‚</strong>ãŸã¨ãˆã°å°åˆ·ã—ã¦ã»ã‹ã®é‡è¦ãªæ›¸é¡žã¨ä¸€ç·’ã«ä¿ç®¡ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
-    setup: åˆæœŸè¨å®š
-    wrong_code: ã‚³ãƒ¼ãƒ‰ãŒé–“é•ã£ã¦ã„ã¾ã™ã€‚ã‚µãƒ¼ãƒãƒ¼ä¸Šã®æ™‚é–“ã¨ãƒ‡ãƒã‚¤ã‚¹ä¸Šã®æ™‚é–“ãŒä¸€è‡´ã—ã¦ã„ã¾ã™ã‹ï¼Ÿ
+    webauthn: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼
   user_mailer:
     backup_ready:
       explanation: Mastodonã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã‚’å—ã‘ä»˜ã‘ã¾ã—ãŸã€‚ä»Šã™ããƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã§ãã¾ã™ï¼
@@ -1270,20 +1347,23 @@ ja:
       title: ãƒã‚°ã‚¤ãƒ³ã‚’æ¤œå‡ºã—ã¾ã—ãŸ
     warning:
       explanation:
-        disable: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒå‡çµã•ã‚Œã¦ã„ã‚‹é–“ã€ãƒ‡ãƒ¼ã‚¿ã¯ãã®ã¾ã¾æ®‹ã‚Šã¾ã™ãŒã€å‡çµãŒè§£é™¤ã•ã‚Œã‚‹ã¾ã§ã¯ä½•ã®æ“ä½œã‚‚ã§ãã¾ã›ã‚“ã€‚
-        silence: ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯åˆ¶é™ã•ã‚Œã¦ã„ã¾ã™ãŒã€ã‚ãªãŸã‚’ãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„ã‚‹ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ã¿ã€ã“ã®ã‚µãƒ¼ãƒãƒ¼ä¸Šã®æŠ•ç¨¿ã‚’è¦‹ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ãã—ã¦ã‚ãªãŸã¯æ§˜ã€…ãªå…¬é–‹ãƒªã‚¹ãƒˆã‹ã‚‰é™¤å¤–ã•ã‚Œã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ã€‚ãŸã ã—ã€ä»–ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¯æ‰‹å‹•ã§ã‚ãªãŸã‚’ãƒ•ã‚©ãƒãƒ¼ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
-        suspend: ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯åœæ¢ã•ã‚Œã¦ã„ã¾ã™ã€‚ã‚ãªãŸã®æŠ•ç¨¿ã¨ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚ŒãŸãƒ¡ãƒ‡ã‚£ã‚¢ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ã“ã®ã‚µãƒ¼ãƒãƒ¼ã¨ã‚ãªãŸã®ãƒ•ã‚©ãƒãƒ¯ãƒ¼ãŒå‚åŠ ã—ã¦ã„ãŸã‚µãƒ¼ãƒãƒ¼ã‹ã‚‰å®Œå…¨ã«å‰Šé™¤ã•ã‚Œã¾ã—ãŸã€‚
+        disable: ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯ãƒã‚°ã‚¤ãƒ³ãŒç¦æ¢ã•ã‚Œä½¿ç”¨ã§ããªããªã‚Šã¾ã—ãŸã€‚ã—ã‹ã—ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ãƒ‡ãƒ¼ã‚¿ã¯ãã®ã¾ã¾æ®‹ã£ã¦ã„ã¾ã™ã€‚
+        sensitive: ã‚ãªãŸã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ãƒ•ã‚¡ã‚¤ãƒ«ã¨ãƒªãƒ³ã‚¯å…ˆã®ãƒ¡ãƒ‡ã‚£ã‚¢ã¯ã€é–²è¦§æ³¨æ„ã¨ã—ã¦æ‰±ã‚ã‚Œã¾ã™ã€‚
+        silence: ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯åˆ¶é™ã•ã‚Œã¾ã—ãŸãŒãã®ã¾ã¾ä½¿ç”¨ã§ãã¾ã™ã€‚ãŸã ã—æ—¢ã«ãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„ã‚‹äººã¯ã‚ãªãŸã®ãƒˆã‚¥ãƒ¼ãƒˆã‚’è¦‹ã‚‹ã“ã¨ãŒã§ãã¾ã™ãŒã€æ§˜ã€…ãªå…¬é–‹ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã«ã¯è¡¨ç¤ºã•ã‚Œãªã„å ´åˆãŒã‚ã‚Šã¾ã™ã€‚ã¾ãŸä»–ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¯ä»Šå¾Œã‚‚æ‰‹å‹•ã§ã‚ãªãŸã‚’ãƒ•ã‚©ãƒãƒ¼ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
+        suspend: ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯ä½¿ç”¨ã§ããªããªã‚Šãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚„ãã®ä»–ãƒ‡ãƒ¼ã‚¿ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ããªããªã‚Šã¾ã—ãŸã€‚ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒå®Œå…¨ã«å‰Šé™¤ã•ã‚Œã‚‹ã¾ã§ã¯ãƒã‚°ã‚¤ãƒ³ã—ã¦ãƒ‡ãƒ¼ã‚¿ã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã‚’ãƒªã‚¯ã‚¨ã‚¹ãƒˆã§ãã¾ã™ã€‚è¨¼æ‹ éš æ»…ã‚’é˜²ããŸã‚ä¸€éƒ¨ã®ãƒ‡ãƒ¼ã‚¿ã¯å‰Šé™¤ã•ã‚Œãšæ®‹ã‚Šã¾ã™ã€‚
       get_in_touch: ã“ã®ãƒ¡ãƒ¼ãƒ«ã«è¿”ä¿¡ã™ã‚‹ã“ã¨ã§ %{instance} ã®ã‚¹ã‚¿ãƒƒãƒ•ã¨é€£çµ¡ã‚’å–ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
       review_server_policies: ã‚µãƒ¼ãƒãƒ¼ã®ãƒãƒªã‚·ãƒ¼ã‚’ç¢ºèª
       statuses: 'ç‰¹ã«æ¬¡ã®ãƒˆã‚¥ãƒ¼ãƒˆ:'
       subject:
         disable: ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ %{acct} ã¯å‡çµã•ã‚Œã¾ã—ãŸ
         none: "%{acct} ã«å¯¾ã™ã‚‹è¦å‘Š"
+        sensitive: ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ %{acct} ã®æŠ•ç¨¿ãƒ¡ãƒ‡ã‚£ã‚¢ã¯é–²è¦§æ³¨æ„ã¨ãƒžãƒ¼ã‚¯ã•ã‚Œã¾ã—ãŸ
         silence: ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ %{acct} ã¯ã‚µã‚¤ãƒ¬ãƒ³ã‚¹ã«ã•ã‚Œã¾ã—ãŸ
         suspend: ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ %{acct} ã¯åœæ¢ã•ã‚Œã¾ã—ãŸ
       title:
         disable: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒå‡çµã•ã‚Œã¾ã—ãŸ
         none: è¦å‘Š
+        sensitive: ã‚ãªãŸã®ãƒ¡ãƒ‡ã‚£ã‚¢ãŒé–²è¦§æ³¨æ„ã¨ãƒžãƒ¼ã‚¯ã•ã‚Œã¾ã—ãŸ
         silence: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒã‚µã‚¤ãƒ¬ãƒ³ã‚¹ã«ã•ã‚Œã¾ã—ãŸ
         suspend: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒåœæ¢ã•ã‚Œã¾ã—ãŸ
     welcome:
@@ -1304,9 +1384,11 @@ ja:
       tips: è±†çŸ¥è˜
       title: ã‚ˆã†ã“ãã€%{name}ï¼
   users:
+    blocked_email_provider: ã“ã®ãƒ¡ãƒ¼ãƒ«ãƒ—ãƒãƒã‚¤ãƒ€ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“
     follow_limit_reached: ã‚ãªãŸã¯ç¾åœ¨ %{limit} äººä»¥ä¸Šãƒ•ã‚©ãƒãƒ¼ã§ãã¾ã›ã‚“
     generic_access_help_html: ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“ã‹ï¼Ÿ %{email} ã«å•ã„åˆã‚ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
     invalid_email: ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒç„¡åŠ¹ã§ã™
+    invalid_email_mx: ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒå˜åœ¨ã—ãªã„ã‚ˆã†ã§ã™
     invalid_otp_token: äºŒæ®µéšŽèªè¨¼ã‚³ãƒ¼ãƒ‰ãŒé–“é•ã£ã¦ã„ã¾ã™
     invalid_sign_in_token: ç„¡åŠ¹ãªã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚³ãƒ¼ãƒ‰ã§ã™
     otp_lost_help_html: ã©ã¡ã‚‰ã‚‚ä½¿ç”¨ã§ããªã„å ´åˆã€%{email} ã«é€£çµ¡ã‚’å–ã‚‹ã¨è§£æ±ºã§ãã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“
@@ -1316,3 +1398,20 @@ ja:
   verification:
     explanation_html: <strong>ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«å†…ã®ãƒªãƒ³ã‚¯ã®æ‰€æœ‰è€…ã§ã‚ã‚‹ã“ã¨ã‚’èªè¨¼ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™</strong>ã€‚ãã®ãŸã‚ã«ã¯ãƒªãƒ³ã‚¯ã•ã‚ŒãŸã‚¦ã‚§ãƒ–ã‚µã‚¤ãƒˆã«Mastodonãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã¸ã®ãƒªãƒ³ã‚¯ãŒå«ã¾ã‚Œã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ãƒªãƒ³ã‚¯ã«ã¯<code>rel="me"</code>å±žæ€§ã‚’<strong>å¿…ãš</strong>ä¸Žãˆãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“ã€‚ãƒªãƒ³ã‚¯ã®ãƒ†ã‚ã‚¹ãƒˆã«ã¤ã„ã¦ã¯é‡è¦ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚ä»¥ä¸‹ã¯ä¾‹ã§ã™ï¼š
     verification: èªè¨¼
+  webauthn_credentials:
+    add: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã‚’è¿½åŠ 
+    create:
+      error: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã®è¿½åŠ ä¸ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„ã€‚
+      success: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã‚’è¿½åŠ ã—ã¾ã—ãŸã€‚
+    delete: å‰Šé™¤
+    delete_confirmation: æœ¬å½“ã«ã“ã®ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã‚’å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ
+    description_html: "<strong>ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã«ã‚ˆã‚‹èªè¨¼</strong>ã‚’æœ‰åŠ¹ã«ã™ã‚‹ã¨ã€ãƒã‚°ã‚¤ãƒ³æ™‚ã«ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã‚’è¦æ±‚ã™ã‚‹ã‚ˆã†ã«ã§ãã¾ã™ã€‚"
+    destroy:
+      error: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã®å‰Šé™¤ä¸ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„ã€‚
+      success: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã‚’å‰Šé™¤ã—ã¾ã—ãŸã€‚
+    invalid_credential: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ãŒé–“é•ã£ã¦ã„ã¾ã™
+    nickname_hint: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã®åå‰ã‚’å…¥åŠ›ã—ã¦ãã ã•ã„
+    not_enabled: ã¾ã ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã‚’æœ‰åŠ¹ã«ã—ã¦ã„ã¾ã›ã‚“
+    not_supported: ã“ã®ãƒ–ãƒ©ã‚¦ã‚¶ã¯ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã«å¯¾å¿œã—ã¦ã„ãªã„ã‚ˆã†ã§ã™
+    otp_required: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã‚’ä½¿ç”¨ã™ã‚‹ã«ã¯ã€ã¾ãšäºŒæ®µéšŽèªè¨¼ã‚’æœ‰åŠ¹ã«ã—ã¦ãã ã•ã„ã€‚
+    registered_on: "%{date} ã«ç™»éŒ²"
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 3a3a338589534e6be09523afdefe58f51cc6947a..523d2bdd5048562e3763c6989ed3f31674f31295 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -752,21 +752,14 @@ ka:
     default: áƒ›áƒáƒ¡áƒ¢áƒáƒ“áƒáƒœáƒ˜
     mastodon-light: áƒ›áƒáƒ¡áƒ¢áƒáƒ“áƒáƒœáƒ˜ (áƒ¦áƒ˜áƒ)
   two_factor_authentication:
-    code_hint: áƒ“áƒáƒ¡áƒáƒ›áƒáƒ¬áƒ›áƒ”áƒ‘áƒšáƒáƒ“ áƒ¨áƒ”áƒ˜áƒ§áƒ•áƒáƒœáƒ”áƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒ£áƒ¢áƒ”áƒœáƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒáƒ  áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡áƒ’áƒáƒœ áƒ’áƒ”áƒœáƒ”áƒ áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ™áƒáƒ“áƒ˜
-    description_html: áƒ—áƒ£ áƒ©áƒáƒ áƒ—áƒáƒ•áƒ— <strong>áƒ›áƒ”áƒáƒ áƒ”-áƒ¤áƒáƒ¥áƒ¢áƒáƒ áƒ˜áƒ¡ áƒáƒ£áƒ¢áƒ”áƒœáƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒáƒ¡</strong>, áƒ¨áƒ”áƒ¡áƒ•áƒšáƒ˜áƒ¡áƒáƒ¡ áƒáƒ£áƒªáƒ˜áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ˜áƒ¥áƒœáƒ”áƒ‘áƒ áƒ¤áƒšáƒáƒ‘áƒ“áƒ”áƒ— áƒ¢áƒ”áƒšáƒ”áƒ¤áƒáƒœáƒ¡, áƒ áƒáƒ›áƒ”áƒšáƒ˜áƒª áƒ“áƒáƒáƒ’áƒ”áƒœáƒ”áƒ áƒ˜áƒ áƒ”áƒ‘áƒ¡ áƒ¨áƒ”áƒ¡áƒ•áƒšáƒ˜áƒ¡ áƒ¢áƒáƒ™áƒ”áƒœáƒ”áƒ‘áƒ¡.
     disable: áƒ’áƒáƒ—áƒ˜áƒ¨áƒ•áƒ
-    enable: áƒ©áƒáƒ áƒ—áƒ•áƒ
     enabled: áƒ›áƒ”áƒáƒ áƒ”-áƒ¤áƒáƒ¥áƒ¢áƒáƒ áƒ˜áƒ¡ áƒáƒ£áƒ¢áƒ”áƒœáƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒ áƒ©áƒáƒ áƒ—áƒ£áƒšáƒ˜áƒ
     enabled_success: áƒ›áƒ”áƒáƒ áƒ”-áƒ¤áƒáƒ¥áƒ¢áƒáƒ áƒ˜áƒ¡ áƒáƒ£áƒ¢áƒ”áƒœáƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ©áƒáƒ˜áƒ áƒ—áƒ
     generate_recovery_codes: áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ™áƒáƒ“áƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒ”áƒœáƒ”áƒ áƒáƒªáƒ˜áƒ
-    instructions_html: "<strong>áƒ“áƒáƒáƒ¡áƒ™áƒáƒœáƒ˜áƒ áƒ”áƒ— áƒ”áƒ¡ áƒ¥áƒ  áƒ™áƒáƒ“áƒ˜ áƒ’áƒ£áƒ’áƒš áƒáƒ£áƒ¢áƒ”áƒœáƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒáƒ áƒ¨áƒ˜ áƒáƒœ áƒ›áƒ¡áƒ’áƒáƒ•áƒ¡ áƒ¢áƒáƒ¢áƒž áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒáƒ¨áƒ˜ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒ¢áƒ”áƒšáƒ”áƒ¤áƒáƒœáƒ–áƒ”</strong>. áƒáƒ›áƒ˜áƒ”áƒ áƒ˜áƒ“áƒáƒœ, áƒ”áƒ¡ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ áƒ“áƒáƒáƒ’áƒ”áƒœáƒ”áƒ áƒ˜áƒ áƒ”áƒ‘áƒ¡ áƒ¢áƒáƒ™áƒ”áƒœáƒ”áƒ‘áƒ¡ áƒ›áƒáƒ¨áƒ˜áƒœ áƒ áƒáƒ“áƒ”áƒ¡áƒáƒª áƒ“áƒáƒ’áƒáƒ˜áƒ áƒ“áƒ”áƒ‘áƒáƒ— áƒáƒ•áƒ¢áƒáƒ áƒ˜áƒ–áƒáƒªáƒ˜áƒ."
     lost_recovery_codes: áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ™áƒáƒ“áƒ”áƒ‘áƒ˜ áƒ£áƒ¤áƒšáƒ”áƒ‘áƒáƒ¡ áƒ’áƒáƒ«áƒšáƒ”áƒ•áƒ— áƒ›áƒ˜áƒ˜áƒ¦áƒáƒ— áƒ®áƒ”áƒšáƒ›áƒ”áƒáƒ áƒ” áƒ¬áƒ•áƒ“áƒáƒ›áƒ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡áƒáƒ“áƒ›áƒ˜ áƒ—áƒ£ áƒ“áƒáƒ™áƒáƒ áƒ’áƒáƒ•áƒ— áƒ¢áƒ”áƒšáƒ”áƒ¤áƒáƒœáƒ¡. áƒ—áƒ£ áƒ“áƒáƒ™áƒáƒ áƒ’áƒ”áƒ— áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ™áƒáƒ“áƒ”áƒ‘áƒ˜, áƒ›áƒáƒ— áƒ áƒ”áƒ’áƒ”áƒœáƒ”áƒ áƒáƒªáƒ˜áƒ áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒáƒ— áƒáƒ¥. áƒ«áƒ•áƒ”áƒšáƒ˜ áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ™áƒáƒ“áƒ”áƒ‘áƒ˜ áƒáƒ¦áƒáƒ  áƒ˜áƒ¥áƒœáƒ”áƒ‘áƒ áƒ•áƒáƒšáƒ˜áƒ“áƒ£áƒ áƒ˜.
-    manual_instructions: 'áƒ—áƒ£ áƒ•áƒ”áƒ  áƒáƒ¡áƒ™áƒáƒœáƒ˜áƒ áƒ”áƒ‘áƒ— áƒ¥áƒ  áƒ™áƒáƒ“áƒ¡ áƒ“áƒ áƒ¡áƒáƒáƒ˜áƒ áƒáƒ”áƒ‘áƒ— áƒ›áƒ˜áƒ¡ áƒ›áƒ”áƒ¥áƒáƒœáƒ˜áƒ™áƒ£áƒ  áƒ áƒ”áƒŸáƒ˜áƒ›áƒ¨áƒ˜ áƒ¨áƒ”áƒ§áƒ•áƒáƒœáƒáƒ¡, áƒáƒ¥ áƒáƒ áƒ˜áƒ¡ áƒ©áƒ•áƒ”áƒ£áƒšáƒ”áƒ‘áƒ áƒ˜áƒ•áƒ˜ áƒ¢áƒ”áƒ¥áƒ¡áƒ¢áƒ£áƒ áƒ˜ áƒ¡áƒáƒ˜áƒ“áƒ£áƒ›áƒšáƒ:'
     recovery_codes: áƒ’áƒáƒ£áƒ¬áƒ˜áƒ”áƒ— áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ™áƒáƒ“áƒ”áƒ‘áƒ¡ áƒ áƒ”áƒ–áƒ”áƒ áƒ•áƒáƒªáƒ˜áƒ
     recovery_codes_regenerated: áƒáƒ¦áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ™áƒáƒ“áƒ”áƒ‘áƒ˜áƒ¡ áƒ áƒ”áƒ’áƒ”áƒœáƒ”áƒ áƒáƒªáƒ˜áƒ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ¨áƒ”áƒ¡áƒ áƒ£áƒšáƒ“áƒ
     recovery_instructions_html: áƒ—áƒ£ áƒ áƒáƒ“áƒ”áƒ¡áƒ›áƒ” áƒ“áƒáƒ™áƒáƒ áƒ’áƒáƒ•áƒ— áƒ¬áƒ•áƒ“áƒáƒ›áƒáƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒ¢áƒ”áƒšáƒ”áƒ¤áƒáƒœáƒ—áƒáƒœ, áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒáƒ— áƒ¥áƒ•áƒ”áƒ›áƒáƒ— áƒ›áƒáƒªáƒ”áƒ›áƒ£áƒšáƒ˜ áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ™áƒáƒ“áƒ”áƒ‘áƒ˜ áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒáƒ—, áƒ áƒáƒ—áƒ áƒ›áƒáƒ˜áƒžáƒáƒ•áƒáƒ— áƒ®áƒ”áƒšáƒ›áƒ”áƒáƒ áƒ” áƒ¬áƒ•áƒ“áƒáƒ›áƒ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡áƒáƒ“áƒ›áƒ˜. <strong>áƒ˜áƒ¥áƒáƒœáƒ˜áƒ”áƒ— áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ™áƒáƒ“áƒ”áƒ‘áƒ˜ áƒ“áƒáƒªáƒ£áƒšáƒáƒ“</strong>. áƒ›áƒáƒ’áƒáƒšáƒ˜áƒ—áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡, áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒáƒ— áƒáƒ›áƒáƒ‘áƒ”áƒáƒ“áƒáƒ— áƒ“áƒ áƒ¨áƒ”áƒ˜áƒœáƒáƒ®áƒáƒ— áƒ¡áƒ®áƒ•áƒ áƒ¡áƒáƒ‘áƒ£áƒ—áƒ”áƒ‘áƒ—áƒáƒœ áƒ”áƒ áƒ—áƒáƒ“.
-    setup: áƒ“áƒáƒ§áƒ”áƒœáƒ”áƒ‘áƒ
-    wrong_code: áƒ¨áƒ”áƒ§áƒ•áƒáƒœáƒ˜áƒšáƒ˜ áƒ™áƒáƒ“áƒ˜ áƒáƒ  áƒ˜áƒ§áƒ áƒ¡áƒ¬áƒáƒ áƒ˜! áƒ¡áƒ¬áƒáƒ áƒ˜áƒ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ áƒ“áƒ áƒ›áƒáƒ¬áƒ§áƒáƒ‘áƒ˜áƒšáƒáƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒ?
   user_mailer:
     backup_ready:
       explanation: áƒ—áƒ¥áƒ•áƒ”áƒœ áƒ›áƒáƒ˜áƒ—áƒ®áƒáƒ•áƒ”áƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ›áƒáƒ¡áƒ¢áƒáƒ“áƒáƒœáƒ˜áƒ¡ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ¡áƒ áƒ£áƒšáƒ˜ áƒ áƒ”áƒ–áƒ”áƒ áƒ•áƒáƒªáƒ˜áƒ. áƒ˜áƒ¡ áƒáƒ®áƒšáƒ áƒ£áƒ™áƒ•áƒ” áƒ›áƒ–áƒáƒ“áƒáƒ áƒ’áƒáƒ“áƒ›áƒáƒ¡áƒáƒ¬áƒ”áƒ áƒáƒ“!
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 1d34355b3d54c86515f439b95f73461158873e6b..af83d5fc6dc2a4b80b1d1650bc27de822b091d6d 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -35,6 +35,7 @@ kab:
       domain: Aqeddac
       reason: TaÉ£zent
       silenced: 'TisuffÉ£in ara d-yekken seg yiqeddacen-agi ad ttwaffrent deg tsuddmin tizuyaz d yidiwenniten, daÉ£en ur ttilin ara telÉ£a É£ef usedmer n yimseqdacen-nsen, skud ur ten-teá¸fiá¹›eá¸ ara:'
+      silenced_title: Imeáº“la yeggugmen
     unavailable_content_html: Maá¹£á¹udun s umata yeá¸men-ak ad teáº“reá¸ agbur, ad tesdemreá¸ akked yimseqdacen-nniá¸en seg yal aqeddac deg fedivers. Ha-tent-an É£ur-k tsuraf i yellan deg uqeddac-agi.
     user_count_after:
       one: amseqdac
@@ -42,6 +43,7 @@ kab:
     user_count_before: Amagger n
     what_is_mastodon: D acu-t Maá¹£á¹udun?
   accounts:
+    choices_html: 'Afranen n %{name}:'
     follow: á¸Œfeá¹›
     followers:
       one: Umeá¸faá¹›
@@ -66,9 +68,12 @@ kab:
       admin: Anedbal
       bot: Aá¹›ubut
       group: Agraw
+      moderator: Atrar
     unavailable: Ur nufi ara amaÉ£nu-a
     unfollow: Ur á¹á¹afaá¹› ara
   admin:
+    account_actions:
+      action: Eg tigawt
     account_moderation_notes:
       create: EÇ§Ç§ tazmilt
       delete: Kkes
@@ -88,6 +93,7 @@ kab:
       confirm: Sentem
       confirmed: Yettwasentem
       confirming: Asentem
+      delete: Kkes isefka
       deleted: Yettwakkes
       demote: Sider s weswir
       disable: Gdel
@@ -104,6 +110,8 @@ kab:
       follows: Yeá¹afaá¹›
       header: Ixef
       inbox_url: URL n yinekcam
+      invite_request_text: Timental n tmerna
+      invited_by: Inced-it-id
       ip: Tansa IP
       joined: Ikcemed deg
       location:
@@ -123,6 +131,7 @@ kab:
       most_recent_ip: Tansa IP taneggarut
       no_account_selected: Ula yiwen n umiá¸an ur yettwabeddel acku ula yiwen ur yettwafren
       no_limits_imposed: War tilisa
+      not_subscribed: Ur imulteÉ£ ara
       pending: IttraÇ§u acegger
       perform_full_suspension: á¸¤bes di leÎµá¸il
       promote: Ali s uswir
@@ -132,19 +141,26 @@ kab:
       reject: Aggi
       reject_all: Aggi-ten akk
       remove_avatar: Kkes tugna n umaÉ£nu
+      remove_header: Kkes tacacit
       resend_confirmation:
         already_confirmed: Amseqdac-agi yettwasentem yakan
         send: Azen tikelt-nniá¸en imayl n usentem
         success: Imayl n usentem yettwazen mebla ugur!
       reset: Wennez
       reset_password: Beddel awal uffir
+      resubscribe: Ales ajerred
       role: Tisirag
       roles:
         admin: Anedbal
+        moderator: AseÉ£yad
         staff: TarbaÉ›t
         user: Amseqdac
       search: Nadi
       search_same_ip: Imseqdacen-nniá¸en s tansa IP am tinn-ik
+      shared_inbox_url: Bá¸u URL n tbewwaá¸t
+      show:
+        created_reports: Eg ineqqisen
+        targeted_reports: Yettwazen uneqqis sÉ£ur wiyaá¸
       silence: Sgugem
       silenced: Yettwasgugem
       statuses: TisuffÉ£in
@@ -160,34 +176,54 @@ kab:
       whitelisted: Deg tebdert tamellalt
     action_logs:
       action_types:
+        change_email_user: Beddel imayl i useqdac
+        confirm_user: Sentem aseqdac
+        create_custom_emoji: Rnu imujit udmawan
+        create_ip_block: Rnu alugen n IP
+        destroy_ip_block: Kkes alugen n IP
         disable_2fa_user: Gdel 2FA
+        enable_user: Rmed aseqdac
         remove_avatar_user: Kkes avaá¹ar
         reset_password_user: Ales awennez n wawal n uffir
         silence_account: Sgugem amiá¸an
+        update_domain_block: Leqqem iá¸¥der n taÉ£ult
       actions:
+        assigned_to_self_report: "%{name} imudd aneqqis %{target} i yiman-nsen"
         change_email_user: "%{name} ibeddel imayl n umseqdac %{target}"
         confirm_user: "%{name} isentem tansa imayl n umseqdac %{target}"
         create_account_warning: "%{name} yuzen alÉ£u i %{target}"
+        create_announcement: "%{name} yerna taselÉ£ut tamaynut %{target}"
         create_custom_emoji: "%{name} yessuli-d imujiten imaynuten %{target}"
         create_domain_allow: "%{name} yerna taÉ£ult %{target} É£er tebdart tamellalt"
         create_domain_block: "%{name} yesseá¸¥bes taÉ£ult %{target}"
         create_email_domain_block: "%{name} yerna taÉ£ult n imayl %{target} É£er tebdart taberkant"
+        create_ip_block: "%{name} rnu alugen i IP %{target}"
+        demote_user: "%{name} iá¹£ubb-d deg usellun aseqdac %{target}"
+        destroy_announcement: "%{name} yekkes taselÉ£ut %{target}"
         destroy_custom_emoji: "%{name} ihudd imuji %{target}"
         destroy_domain_allow: "%{name} yekkes taÉ£ult %{target} seg tebdart tamellalt"
         destroy_domain_block: "%{name} yekkes aseá¸¥bes n taÉ£ult %{target}"
         destroy_email_domain_block: "%{name} yerna taÉ£ult n imayl %{target} É£er tebdart tamellalt"
+        destroy_ip_block: "%{name} kkes alugen i IP %{target}"
         destroy_status: "%{name} yekkes tasuffeÉ£t n %{target}"
         disable_custom_emoji: "%{name} yessens imuji %{target}"
         disable_user: "%{name} yessens tuqqna i umseqdac %{target}"
         enable_custom_emoji: "%{name} yermed imuji %{target}"
         enable_user: "%{name} yermed tuqqna i umseqdac %{target}"
         memorialize_account: "%{name} yerra amiá¸an n %{target} d asebter n usmekti"
+        promote_user: "%{name} yerna deg usellun n useqdac %{target}"
+        remove_avatar_user: "%{name} yekkes avaá¹ar n %{target}"
+        reset_password_user: "%{name} iwennez awal uffir n useqdac %{target}"
+        resolve_report: "%{name} yefra aneqqis %{target}"
         silence_account: "%{name} yesgugem amiá¸an n %{target}"
         unsilence_account: "%{name} yekkes asgugem n umiá¸an n %{target}"
+        update_announcement: "%{name} ileqqem taselÉ£ut %{target}"
         update_custom_emoji: "%{name} yelqem imuji %{target}"
+        update_domain_block: "%{name} ileqqem iá¸¥der n taÉ£ult i %{target}"
         update_status: "%{name} yelqem tasuffeÉ£t n %{target}"
       deleted_status: "(tasuffeÉ£t tettwakkes)"
       empty: Ulac iÉ£misen i yellan.
+      filter_by_user: Sizdeg s useqdac
       title: AÉ£mis n usenqed
     announcements:
       edit:
@@ -227,6 +263,7 @@ kab:
       upload: Sali
     dashboard:
       config: Tawila
+      feature_deletions: Imiá¸an yettwaksen
       feature_invites: IseÉ£wan n iÉ›aá¹›uá¸en
       feature_profile_directory: Akaram n imaÉ£nuten
       feature_registrations: Ajerred
@@ -246,6 +283,7 @@ kab:
       destroyed_msg: TaÎ³ult-a tettwakkes seg umuÎ³ amellal
       undo: Kkes seg tebdart tamellalt
     domain_blocks:
+      add_new: Rni iá¸¥der amaynut n taÉ£ult
       domain: TaÎ³ult
       new:
         severity:
@@ -271,11 +309,13 @@ kab:
     instances:
       by_domain: TaÎ³ult
       delivery_available: Yella usiweá¸
+      empty: Ulac taÉ£ultin yettwafen.
       known_accounts:
         one: "%{count} n umiá¸an i yettwasnen"
         other: "%{count} n yimiá¸anen i yettwassnen"
       moderation:
         all: Akk
+        limited: Yettwasgugem
       private_comment: Awennit uslig
       public_comment: Awennit azayez
       title: Tamatut
@@ -289,8 +329,25 @@ kab:
         expired: Ifat
         title: Asizdeg
       title: IÉ›aruá¸en
+    ip_blocks:
+      add_new: Rnu alugen
+      created_msg: Yettwarna ulugen amaynut n IP akken iwata
+      delete: Kkes
+      expires_in:
+        '1209600': 2 yimalasen
+        '15778476': 6 wayyuren
+        '2629746': 1 wayyur
+        '31556952': 1 useggas
+        '86400': 1 wass
+        '94670856': 3 yiseggasen
+      new:
+        title: Rnu alugen n IP amaynut
+      no_ip_block_selected: Ula yiwen n ulugen n IP ur yettwabeddel acku ula yiwen ur yettwafren
+      title: Ilugan n IP
     pending_accounts:
       title: Imiá¸anen yettrajun (%{count})
+    relationships:
+      title: AssaÉ£en n %{acct}
     relays:
       add_new: Rnu anmegli amaynut
       delete: Kkes
@@ -310,6 +367,7 @@ kab:
         reports:
           one: "%{count} uneqqis"
           other: "%{count} n ineqqisen"
+      action_taken_by: Tigawt yettwaá¹á¹fen sÉ£ur
       are_you_sure: Tetá¸¥aq-eá¸?
       comment:
         none: Ula yiwen
@@ -367,12 +425,14 @@ kab:
       name: Ahacá¹ag
       reviewed: Yettwacegger
       title: Ihacá¹agen
+      unique_uses_today: "%{count} i d-yeffen ass-a"
     title: Tadbelt
     warning_presets:
       add_new: Rnu amaynut
       delete: Kkes
   admin_mailer:
     new_report:
+      body: "%{reporter} yettwazen É£ef %{target}"
       subject: Aneqqis amaynut i %{instance} (#%{id})
   appearance:
     discovery: Asnirem
@@ -385,6 +445,8 @@ kab:
     view: 'áº’aá¹›:'
     view_profile: Ssken-d amaÉ£nu
     view_status: Ssken-d tasuffiÉ£t
+  applications:
+    token_regenerated: Ajuá¹u n unekcum yettusirew i tikkelt-nniá¸en akken iwata
   auth:
     apply_for_account: Suter asnebgi
     change_password: Awal uffir
@@ -392,6 +454,7 @@ kab:
     checkbox_agreement_without_rules_html: QebleÎ³ <a href="%{terms_path}" target="_blank">tiwtilin n useqdec</a>
     delete_account: Kkes amiá¸an
     description:
+      prefix_invited_by_user: "@%{name} inced-ikÂ·ikem ad ternuá¸ É£er uqeddac-a n Mastodon!"
       prefix_sign_up: Zeddi di Maá¹£á¹udun assa!
     forgot_password: Tettud awal-ik uffir?
     login: Qqen
@@ -402,6 +465,7 @@ kab:
       cas: CAS
       saml: SAML
     register: Jerred
+    registration_closed: "%{instance} ur yeqbil ara imttekkiyen imaynuten"
     reset_password: Wennez awal uffir
     security: TaÎ³ellist
     set_new_password: Egr-d awal uffir amaynut
@@ -411,6 +475,7 @@ kab:
       account_status: Addad n umiá¸an
       functional: Amiá¸an-inekÂ·m yettwaheyya.
     trouble_logging_in: Î“ur-k uguren n tuqqna?
+    use_security_key: Seqdec tasarut n teÉ£list
   authorize_follow:
     already_following: Teá¹afareá¸ ya kan amiá¸an-a
     follow: á¸Œfeá¹›
@@ -426,6 +491,7 @@ kab:
   date:
     formats:
       default: "%d %b %Y"
+      with_month_name: "%B %d, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}isr"
@@ -442,6 +508,9 @@ kab:
       x_seconds: "%{count}tas"
   deletes:
     proceed: Kkes amiá¸an
+    warning:
+      username_available: Isem-ikÂ·im n useqdac ad yuÉ£al yella i tikkelt-nniá¸en
+      username_unavailable: Isem-ikÂ·im n useqdac ad yeqqim ulac-it
   directories:
     directory: Akaram n imaÎ³nuten
     explore_mastodon: Snirem %{title}
@@ -517,6 +586,10 @@ kab:
       '604800': 1 umalas
       '86400': 1 wass
     expires_in_prompt: WerÇ§in
+    invited_by: 'TettwaÉ›raá¸eá¸ s É£ur:'
+    max_uses:
+      one: 1 uuseqdec
+      other: "%{count} yiseqdac"
     max_uses_prompt: Ulac talast
     table:
       expires_at: Ad ifat di
@@ -529,36 +602,51 @@ kab:
     digest:
       action: Wali akk tilÎ³a
       mention: 'Yuder-ik-id %{name} deg:'
+      subject:
+        one: "1 wulÉ£u seg tirza-inekÂ·inm taneqqarut ar tura \U0001F418"
+        other: "%{count} ilÉ£a imaynuten seg tirza-nekÂ·inem taneggarut ar tura \U0001F418"
+    favourite:
+      subject: "%{name} yesmenyaf addad-ikÂ·im"
     follow:
       body: "%{name} yeá¹afaá¹›-ik-id tura!"
       subject: "%{name} yeá¹afaá¹›-ik-id tura"
       title: Ameá¸faá¹› amaynut
     follow_request:
+      body: "%{name} yessuter-d ad akÂ·akem-yeá¸fer"
       title: Asuter amaynut n teá¸feá¹›t
     mention:
       action: Err
       body: 'Yuder-ikÂ·ikem-id %{name} deg:'
       subject: Yuder-ikÂ·ikem-id %{name}
+    reblog:
+      subject: "%{name} yesselha addad-ikÂ·im"
   notifications:
     other_settings: IÎ³ewwaá¹›en nniá¸en n tilÎ³a
   number:
     human:
       decimal_units:
+        format: "%n%u"
         units:
+          billion: Aá¹¬
           million: A
+          thousand: K
           trillion: Am
+  otp_authentication:
+    enable: Rmed
+    setup: Sbadu
   pagination:
     newer: Amaynut
     next: Wayed
     older: Aqbuá¹›
     prev: Win iÉ›eddan
-    truncate: d
+    truncate: "&hellip;"
   preferences:
     other: Wiyaá¸
   relationships:
     activity: Armud n umiá¸an
     followers: Imeá¸faá¹›en
     following: Yeá¹afaá¹›
+    invited: Yettwancad
     last_active: Armud aneggaru
     most_recent: Melmi kan
     moved: Igujj
@@ -571,6 +659,8 @@ kab:
   remote_interaction:
     favourite:
       proceed: Kemmel asmenyef
+    reblog:
+      proceed: Sentem beá¹á¹u
     reply:
       proceed: Kemmel tiririt
   sessions:
@@ -605,7 +695,7 @@ kab:
       firefox_os: Firefox OS
       ios: iOS
       linux: Linux
-      mac: Mac
+      mac: macOS
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: TiliÎ³ri Windows Phone
@@ -623,12 +713,17 @@ kab:
     export: Taktert n yisefka
     import: Kter
     import_and_export: Taktert d usifeá¸
+    migrate: Tunigin n umiá¸an
     notifications: TilÎ³a
     preferences: Imenyafen
     profile: AmeÎ³nu
     relationships: Imeá¸faá¹›en akked wid i teá¹á¹afaá¹›eá¸
+    webauthn_authentication: Tisura n teÉ£list
   statuses:
     attached:
+      audio:
+        one: "%{count} n imesli"
+        other: "%{count} n imesliyen"
       image:
         one: "%{count} tugna"
         other: "%{count} tugniwin"
@@ -641,6 +736,9 @@ kab:
       total_people:
         one: "%{count} n wemdan"
         other: "%{count} n yemdanen"
+      total_votes:
+        one: "%{count} n wedÉ£ar"
+        other: "%{count} n yedÉ£aren"
       vote: DÉ£eá¹›
     show_more: Ssken-d ugar
     show_thread: Ssken-d lxiá¸
@@ -666,12 +764,19 @@ kab:
       default: "%b %d, %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
+    add: Rnu
     disable: Gdel
-    enable: Rmed
+    disabled_success: Asesteb s snat n tarrayin yensa akken iwata
+    edit: áº’reg
+    otp: Asnas n usesteb
+    webauthn: Tisura n teÉ£list
   user_mailer:
     warning:
       title:
+        disable: Amiá¸an i igersen
         none: Î“ur-wat
+        silence: Amiá¸an yesÉ›a talast
+        suspend: Amiá¸an yettwaá¸¥ebsen
     welcome:
       full_handle: Tansa umiá¸an-ik takemmalit
       review_preferences_action: Beddel imenyafen
@@ -682,3 +787,6 @@ kab:
     signed_in_as: 'Teqqneá¸ amzun d:'
   verification:
     verification: Asenqed
+  webauthn_credentials:
+    add: Rnu tasarut n teÉ£list tamaynut
+    delete: Kkes
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index bb7a57e87846166edded5a369bfa51993be2f776..5f0da18883966abe7cffaf94ef5555ae41d48a0d 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -519,6 +519,9 @@ kk:
       trends:
         desc_html: Ð‘Ò±Ñ€Ñ‹Ð½ Ò›Ð°Ñ€Ð°ÑÑ‚Ñ‹Ñ€Ñ‹Ð»Ò“Ð°Ð½ Ñ…ÑÑˆÑ‚ÐµÐ³Ñ‚ÐµÑ€Ð´Ñ– Ò›Ð°Ð·Ñ–Ñ€Ð³Ñ– ÑƒÐ°Ò›Ñ‹Ñ‚Ñ‚Ð° Ñ‚Ñ€ÐµÐ½Ð´Ñ‚Ðµ ÐºÓ©Ð¿ÑˆÑ–Ð»Ñ–ÐºÐºÐµ ÐºÓ©Ñ€ÑÐµÑ‚Ñƒ
         title: Ð¢Ñ€ÐµÐ½Ð´ Ñ…ÐµÑˆÑ‚ÐµÐ³Ñ‚ÐµÑ€
+    site_uploads:
+      delete: Ð–Ò¯ÐºÑ‚ÐµÐ»Ð³ÐµÐ½ Ñ„Ð°Ð¹Ð»Ð´Ñ‹ Ó©ÑˆÑ–Ñ€
+      destroyed_msg: Ð–Ò¯ÐºÑ‚ÐµÐ»Ð³ÐµÐ½ Ñ„Ð°Ð¹Ð» ÑÓ™Ñ‚Ñ‚Ñ– Ó©ÑˆÑ–Ñ€Ñ–Ð»Ð´Ñ–!
     statuses:
       back_to_account: ÐÐºÐºÐ°ÑƒÐ½Ñ‚ Ð±ÐµÑ‚Ñ–Ð½Ðµ Ð¾Ñ€Ð°Ð»Ñ‹
       batch:
@@ -1166,21 +1169,14 @@ kk:
       default: "%b %d, %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Ð Ð°ÑÑ‚Ð°Ñƒ Ò¯ÑˆÑ–Ð½ Ñ‚Ò¯Ð¿Ð½Ò±ÑÒ›Ð°Ð»Ñ‹Ò›Ñ‚Ñ‹ Ñ€Ð°ÑÑ‚Ð°Ñƒ Ð±Ð°Ò“Ð´Ð°Ñ€Ð»Ð°Ð¼Ð°ÑÑ‹ Ð°Ñ€Ò›Ñ‹Ð»Ñ‹ Ð¶Ð°ÑÐ°Ð»Ò“Ð°Ð½ ÐºÐ¾Ð´Ñ‚Ñ‹ ÐµÐ½Ð³Ñ–Ð·Ñ–Ò£Ñ–Ð·
-    description_html: "<strong>ÐµÐºÑ– Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð»Ñ‹ Ñ‚Ò¯Ð¿Ð½Ò±ÑÒ›Ð°Ð»Ñ‹Ò›Ñ‚Ñ‹ Ñ€Ð°ÑÑ‚Ð°ÑƒÐ´Ñ‹</strong> Ò›Ð¾ÑÑÐ°Ò£Ñ‹Ð·, ÐºÑ–Ñ€Ñƒ Ò¯ÑˆÑ–Ð½ ÑÑ–Ð·Ð³Ðµ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ò“Ð° ÐºÑ–Ñ€ÑƒÑ–Ò£Ñ–Ð·Ð´Ñ– Ñ‚Ð°Ð»Ð°Ð¿ ÐµÑ‚ÐµÐ´Ñ–, ÑÑ–Ð·Ð³Ðµ Ð°Ñ€Ð½Ð°Ð¹Ñ‹ Ñ‚Ð¾ÐºÐµÐ½ Ð±ÐµÑ€Ñ–Ð»ÐµÐ´Ñ–."
     disable: ÐÐ¶Ñ‹Ñ€Ð°Ñ‚Ñƒ
-    enable: ÒšÐ¾ÑÑƒ
     enabled: Ð•ÐºÑ–-Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð»Ñ‹ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ñ Ò›Ð¾ÑÑ‹Ð»Ò“Ð°Ð½
     enabled_success: Ð•ÐºÑ–-Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð»Ñ‹ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ñ ÑÓ™Ñ‚Ñ‚Ñ– Ò›Ð¾ÑÑ‹Ð»Ð´Ñ‹
     generate_recovery_codes: ÒšÐ°Ð»Ð¿Ñ‹Ð½Ð° ÐºÐµÐ»Ñ‚Ñ–Ñ€Ñƒ ÐºÐ¾Ð´Ñ‚Ð°Ñ€Ñ‹Ð½ Ð¶Ð°ÑÐ°Ò£Ñ‹Ð·
-    instructions_html: "<strong>ÐœÑ‹Ð½Ð° QR ÐºÐ¾Ð´Ñ‚Ñ‹ Google Authenticator Ð°Ñ€Ò›Ñ‹Ð»Ñ‹ ÑÐºÐ°Ð½Ð´Ð°Ò£Ñ‹Ð· Ð½ÐµÐ¼ÐµÑÐµ Ò±Ò›ÑÐ°Ñ TOTP Ð±Ð°Ò“Ð´Ð°Ñ€Ð»Ð°Ð¼Ð°Ð»Ð°Ñ€Ñ‹ Ð°Ñ€Ò›Ñ‹Ð»Ñ‹</strong>. ÐžÐ´Ð°Ð½ ÐºÐµÐ¹Ñ–Ð½ Ð¶ÐµÐ»Ñ–Ð³Ðµ ÐºÑ–Ñ€Ñƒ Ò¯ÑˆÑ–Ð½ Ñ‚Ð¾ÐºÐµÐ½Ð´ÐµÑ€ Ð±ÐµÑ€Ñ–Ð»ÐµÑ‚Ñ–Ð½ Ð±Ð¾Ð»Ð°Ð´Ñ‹."
     lost_recovery_codes: ÒšÐ°Ð»Ð¿Ñ‹Ð½Ð° ÐºÐµÐ»Ñ‚Ñ–Ñ€Ñƒ ÐºÐ¾Ð´Ñ‚Ð°Ñ€Ñ‹ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð´Ñ‹ Ð¶Ð¾Ò“Ð°Ð»Ñ‚ÑÐ°Ò£Ñ‹Ð·, Ñ‚Ñ–Ñ€ÐºÐµÐ»Ð³Ñ–Ò£Ñ–Ð·Ð³Ðµ Ò›Ð°Ð¹Ñ‚Ð° ÐºÑ–Ñ€ÑƒÐ³Ðµ Ð¼Ò¯Ð¼ÐºÑ–Ð½Ð´Ñ–Ðº Ð±ÐµÑ€ÐµÐ´Ñ–. ÒšÐ°Ð»Ð¿Ñ‹Ð½Ð° ÐºÐµÐ»Ñ‚Ñ–Ñ€Ñƒ ÐºÐ¾Ð´Ñ‚Ð°Ñ€Ñ‹Ð½ Ð¶Ð¾Ò“Ð°Ð»Ñ‚ÑÐ°Ò£Ñ‹Ð·, Ð¾Ð»Ð°Ñ€Ð´Ñ‹ Ð¾ÑÑ‹Ð½Ð´Ð° Ò›Ð°Ð»Ð¿Ñ‹Ð½Ð° ÐºÐµÐ»Ñ‚Ñ–Ñ€Ðµ Ð°Ð»Ð°ÑÑ‹Ð·. Ð•ÑÐºÑ– Ò›Ð°Ð»Ð¿Ñ‹Ð½Ð° ÐºÐµÐ»Ñ‚Ñ–Ñ€Ñƒ ÐºÐ¾Ð´Ñ‚Ð°Ñ€Ñ‹ Ð¶Ð°Ñ€Ð°Ð¼ÑÑ‹Ð· Ð±Ð¾Ð»Ð°Ð´Ñ‹.
-    manual_instructions: 'Ð•Ð³ÐµÑ€ ÑÑ–Ð· QR-ÐºÐ¾Ð´Ñ‚Ñ‹ ÑÐºÐ°Ð½ÐµÑ€Ð»ÐµÐ¹ Ð°Ð»Ð¼Ð°ÑÐ°Ò£Ñ‹Ð· Ð¶Ó™Ð½Ðµ Ð¾Ð½Ñ‹ Ò›Ð¾Ð»Ð¼ÐµÐ½ ÐµÐ½Ð³Ñ–Ð·ÑƒÑ–Ò£Ñ–Ð· Ò›Ð°Ð¶ÐµÑ‚ Ð±Ð¾Ð»ÑÐ°, Ð¼Ò±Ð½Ð´Ð° Ò›Ð°Ñ€Ð°Ð¿Ð°Ð¹Ñ‹Ð¼ Ð½Ò±ÑÒ›Ð°ÑƒÐ»Ñ‹Ò›:'
     recovery_codes: ÒšÐ°Ð»Ð¿Ñ‹Ð½Ð° ÐºÐµÐ»Ñ‚Ñ–Ñ€Ñƒ ÐºÐ¾Ð´Ñ‚Ð°Ñ€Ñ‹Ð½ Ñ€ÐµÐ·ÐµÑ€Ð²Ñ‚Ñ–Ðº ÐºÓ©ÑˆÑ–Ñ€Ñƒ
     recovery_codes_regenerated: ÒšÐ°Ð»Ð¿Ñ‹Ð½Ð° ÐºÐµÐ»Ñ‚Ñ–Ñ€Ñƒ ÐºÐ¾Ð´Ñ‚Ð°Ñ€Ñ‹ Ò›Ð°Ð»Ð¿Ñ‹Ð½Ð° ÐºÐµÐ»Ñ‚Ñ–Ñ€Ñ–Ð»Ð´Ñ–
     recovery_instructions_html: Ð•Ð³ÐµÑ€ ÑÑ–Ð· Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ò“Ð° ÐºÑ–Ñ€ÑƒÐ´Ñ– Ð¶Ð¾Ò“Ð°Ð»Ñ‚ÑÐ°Ò£Ñ‹Ð·, Ñ‚Ñ–Ñ€ÐºÐµÐ»Ð³Ñ–Ò£Ñ–Ð·Ð³Ðµ ÐºÑ–Ñ€Ñƒ Ò¯ÑˆÑ–Ð½ Ñ‚Ó©Ð¼ÐµÐ½Ð´ÐµÐ³Ñ– Ò›Ð°Ð»Ð¿Ñ‹Ð½Ð° ÐºÐµÐ»Ñ‚Ñ–Ñ€Ñƒ ÐºÐ¾Ð´Ñ‚Ð°Ñ€Ñ‹Ð½Ñ‹Ò£ Ð±Ñ–Ñ€Ñ–Ð½ Ð¿Ð°Ð¹Ð´Ð°Ð»Ð°Ð½ÑƒÒ“Ð° Ð±Ð¾Ð»Ð°Ð´Ñ‹. <strong>ÒšÐ°Ð»Ð¿Ñ‹Ð½Ð° ÐºÐµÐ»Ñ‚Ñ–Ñ€Ñƒ ÐºÐ¾Ð´Ñ‚Ð°Ñ€Ñ‹Ð½ Ò›Ð°ÑƒÑ–Ð¿ÑÑ–Ð· Ò±ÑÑ‚Ð°Ò£Ñ‹Ð· </strong>. ÐœÑ‹ÑÐ°Ð»Ñ‹, Ð¾Ð»Ð°Ñ€Ð´Ñ‹ Ð±Ð°ÑÑ‹Ð¿ ÑˆÑ‹Ò“Ð°Ñ€Ñ‹Ð¿, Ð¾Ð»Ð°Ñ€Ð´Ñ‹ Ð±Ð°ÑÒ›Ð° Ð¼Ð°Ò£Ñ‹Ð·Ð´Ñ‹ Ò›Ò±Ð¶Ð°Ñ‚Ñ‚Ð°Ñ€Ð¼ÐµÐ½ ÑÐ°Ò›Ñ‚Ð°ÑƒÒ“Ð° Ð±Ð¾Ð»Ð°Ð´Ñ‹.
-    setup: ÐžÑ€Ð½Ð°Ñ‚Ñƒ
-    wrong_code: Ð•Ð½Ð³Ñ–Ð·Ñ–Ð»Ð³ÐµÐ½ ÐºÐ¾Ð´ Ð¶Ð°Ñ€Ð°Ð¼ÑÑ‹Ð·! Ð¡ÐµÑ€Ð²ÐµÑ€ ÑƒÐ°Ò›Ñ‹Ñ‚Ñ‹ Ð¼ÐµÐ½ Ò›Ò±Ñ€Ñ‹Ð»Ò“Ñ‹Ð½Ñ‹Ò£ ÑƒÐ°Ò›Ñ‹Ñ‚Ñ‹ Ð´Ò±Ñ€Ñ‹Ñ Ð¿Ð°?
   user_mailer:
     backup_ready:
       explanation: Ð¡Ñ–Ð· Mastodon Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ñ‹Ò£Ñ‹Ð·Ð´Ñ‹Ò£ Ñ‚Ð¾Ð»Ñ‹Ò› Ð¼Ò±Ñ€Ð°Ò“Ð°Ñ‚Ñ‹Ð½ ÑÒ±Ñ€Ð°Ð´Ñ‹Ò£Ñ‹Ð·. ÒšÐ°Ð·Ñ–Ñ€ Ð¶Ò¯ÐºÑ‚ÐµÑƒÐ³Ðµ Ð´Ð°Ð¹Ñ‹Ð½!
diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index 25bee609a2d6fe3611350d41741cbd114fab7442..d44eb868f3955f075ea9cad7dd335042a9b5b0fc 100644
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -10,11 +10,3 @@ kn:
     '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
-  invites:
-    expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 1742e5d0870353b1f432ba060e193347973737fe..042660432ee51adfbfd4d173754cfc62f4631a4c 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -57,6 +57,7 @@ ko:
     followers:
       other: íŒ”ë¡œì›Œ
     following: íŒ”ë¡œìž‰
+    instance_actor_flash: ì´ ê³„ì •ì€ ì„œë²„ ìžì‹ ì„ ë‚˜íƒ€ë‚´ê¸° ìœ„í•œ ê°€ìƒì˜ ê³„ì •ì´ë©° ê°œì¸ ì‚¬ìš©ìžê°€ ì•„ë‹™ë‹ˆë‹¤. ì´ ê³„ì •ì€ ì—°í•©ì„ ìœ„í•´ ì‚¬ìš©ë˜ë©° ì •ì§€ë˜ì§€ ì•Šì•„ì•¼ í•©ë‹ˆë‹¤.
     joined: "%{date}ì— ê°€ìž…í•¨"
     last_active: ìµœê·¼ í™œë™
     link_verified_on: "%{date}ì— ì´ ë§í¬ì˜ ì†Œìœ ê°€ í™•ì¸ë˜ì—ˆìŠµë‹ˆë‹¤"
@@ -94,6 +95,7 @@ ko:
       add_email_domain_block: ì´ ì´ë©”ì¼ ë„ë©”ì¸ì„ ì°¨ë‹¨í•˜ê¸°
       approve: ìŠ¹ì¸
       approve_all: ëª¨ë‘ ìŠ¹ì¸
+      approved_msg: ì„±ê³µì ìœ¼ë¡œ %{username}ì˜ ê°€ìž… ì‹ ì²ì„œë¥¼ ìŠ¹ì¸í–ˆìŠµë‹ˆë‹¤
       are_you_sure: ì •ë§ë¡œ ì‹¤í–‰í•˜ì‹œê² ìŠµë‹ˆê¹Œ?
       avatar: ì•„ë°”íƒ€
       by_domain: ë„ë©”ì¸
@@ -107,8 +109,10 @@ ko:
       confirm: í™•ì¸
       confirmed: í™•ì¸ë¨
       confirming: í™•ì¸ ì¤‘
+      delete: ë°ì´í„° ì‚ì œ
       deleted: ì‚ì œë¨
       demote: ê°•ë“±
+      destroyed_msg: "%{username}ì˜ ë°ì´í„°ëŠ” ê³§ ì‚ì œë˜ë„ë¡ íì— ë“¤ì–´ê°”ìŠµë‹ˆë‹¤"
       disable: ë¹„í™œì„±í™”
       disable_two_factor_authentication: 2ë‹¨ê³„ ì¸ì¦ì„ ë¹„í™œì„±í™”
       disabled: ë¹„í™œì„±í™”ëœ
@@ -119,10 +123,12 @@ ko:
       email_status: ì´ë©”ì¼ ìƒíƒœ
       enable: í™œì„±í™”
       enabled: í™œì„±
+      enabled_msg: "%{username}ì˜ ê³„ì •ì„ ì„±ê³µì ìœ¼ë¡œ ì–¼ë¦¬ê¸° í•´ì œí•˜ì˜€ìŠµë‹ˆë‹¤"
       followers: íŒ”ë¡œì›Œ ìˆ˜
       follows: íŒ”ë¡œìž‰ ìˆ˜
       header: í—¤ë”
       inbox_url: ìˆ˜ì‹ í•¨ URL
+      invite_request_text: ê°€ìž… í•˜ë ¤ëŠ” ì´ìœ 
       invited_by: ì´ˆëŒ€ìž
       ip: IP
       joined: ê°€ìž…
@@ -134,6 +140,8 @@ ko:
       login_status: ë¡œê·¸ì¸ ìƒíƒœ
       media_attachments: ì²¨ë¶€ëœ ë¯¸ë””ì–´
       memorialize: ë©”ëª¨ë¦¬ì—„ìœ¼ë¡œ ì „í™˜
+      memorialized: ê¸°ë…ë¹„í™” ë¨
+      memorialized_msg: ì„±ê³µì ìœ¼ë¡œ %{username}ë¥¼ ê¸°ë…ë¹„ ê³„ì •ìœ¼ë¡œ ì „í™˜í•˜ì˜€ìŠµë‹ˆë‹¤
       moderation:
         active: í™œë™
         all: ì „ì²´
@@ -154,13 +162,17 @@ ko:
       public: ì „ì²´ ê³µê°œ
       push_subscription_expires: PuSH êµ¬ë… ê¸°ê°„ ë§Œë£Œ
       redownload: í”„ë¡œí•„ ì—…ë°ì´íŠ¸
+      redownloaded_msg: ì„±ê³µì ìœ¼ë¡œ %{username}ì˜ í”„ë¡œí•„ì„ ì›ë³¸ìœ¼ë¡œë¶€í„° ì—…ë°ì´íŠ¸ í•˜ì˜€ìŠµë‹ˆë‹¤
       reject: ê±°ë¶€
       reject_all: ëª¨ë‘ ê±°ë¶€
+      rejected_msg: ì„±ê³µì ìœ¼ë¡œ %{username}ì˜ ê°€ìž… ì‹ ì²ì„œë¥¼ ë°˜ë ¤í•˜ì˜€ìŠµë‹ˆë‹¤
       remove_avatar: ì•„ë°”íƒ€ ì§€ìš°ê¸°
       remove_header: í—¤ë” ì‚ì œ
+      removed_avatar_msg: ì„±ê³µì ìœ¼ë¡œ %{username}ì˜ ì•„ë°”íƒ€ ì´ë¯¸ì§€ë¥¼ ì‚ì œí•˜ì˜€ìŠµë‹ˆë‹¤
+      removed_header_msg: ì„±ê³µì ìœ¼ë¡œ %{username}ì˜ í—¤ë” ì´ë¯¸ì§€ë¥¼ ì‚ì œí•˜ì˜€ìŠµë‹ˆë‹¤
       resend_confirmation:
         already_confirmed: ì´ ì‚¬ìš©ìžëŠ” ì´ë¯¸ í™•ì¸ë˜ì—ˆìŠµë‹ˆë‹¤
-        send: ë‹¤ì‹œ í™•ì¸ ì´ë©”ì¼
+        send: í™•ì¸ ë©”ì¼ ë‹¤ì‹œ ë³´ë‚´ê¸°
         success: í™•ì¸ ì´ë©”ì¼ì´ ì „ì†¡ë˜ì—ˆìŠµë‹ˆë‹¤!
       reset: ì´ˆê¸°í™”
       reset_password: ì•”í˜¸ ì´ˆê¸°í™”
@@ -174,6 +186,8 @@ ko:
       search: ê²€ìƒ‰
       search_same_email_domain: ê°™ì€ ì´ë©”ì¼ ë„ë©”ì¸ì„ ê°€ì§„ ë‹¤ë¥¸ ì‚¬ìš©ìžë“¤
       search_same_ip: ê°™ì€ IPì˜ ë‹¤ë¥¸ ì‚¬ìš©ìžë“¤
+      sensitive: ë¯¼ê°í•¨
+      sensitized: ë¯¼ê°í•¨ìœ¼ë¡œ ì„¤ì •ë¨
       shared_inbox_url: ê³µìœ ëœ inbox URL
       show:
         created_reports: ì´ ê³„ì •ì—ì„œ ì œì¶œëœ ì‹ ê³ 
@@ -183,13 +197,19 @@ ko:
       statuses: íˆ¿ ìˆ˜
       subscribe: êµ¬ë…í•˜ê¸°
       suspended: ì •ì§€ ë¨
+      suspension_irreversible: ì´ ê³„ì •ì˜ ë°ì´í„°ëŠ” ë³µêµ¬í•  ìˆ˜ ì—†ë„ë¡ ì‚ì œ ë©ë‹ˆë‹¤. ê³„ì •ì„ ì •ì§€ í•´ì œí•¨ìœ¼ë¡œì„œ ê³„ì •ì„ ë‹¤ì‹œ ì‚¬ìš© ê°€ëŠ¥í•˜ê²Œ í•  ìˆ˜ ìžˆì§€ë§Œ ì´ì „ì— ì‚ì œí•œ ì–´ë–¤ ë°ì´í„°ë„ ë³µêµ¬ë˜ì§€ ì•ŠìŠµë‹ˆë‹¤.
+      suspension_reversible_hint_html: ê³„ì •ì´ ì •ì§€ë˜ì—ˆìŠµë‹ˆë‹¤, ê·¸ë¦¬ê³  %{date}ì— ë°ì´í„°ê°€ ì™„ì „ížˆ ì‚ì œë  ê²ƒìž…ë‹ˆë‹¤. ê·¸ ë•Œê¹Œì§€ëŠ” ì–´ë–¤ ì•ˆ ì¢‹ì€ íš¨ê³¼ ì—†ì´ ê³„ì •ì´ ë³µêµ¬ ë  ìˆ˜ ìžˆìŠµë‹ˆë‹¤. ë§Œì•½ ì§€ê¸ˆ ë‹¹ìž¥ ê³„ì •ì˜ ëª¨ë“  ë°ì´í„°ë¥¼ ì‚ì œí•˜ê³  ì‹¶ë‹¤ë©´, ì•„ëž˜ì—ì„œ í–‰í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤.
       time_in_queue: "%{time}ë™ì•ˆ ê¸°ë‹¤ë¦¼"
       title: ê³„ì •
       unconfirmed_email: ë¯¸í™•ì¸ ëœ ì´ë©”ì¼ ì£¼ì†Œ
+      undo_sensitized: ë¯¼ê°í•¨ìœ¼ë¡œ ì„¤ì • ì·¨ì†Œ
       undo_silenced: ì¹¨ë¬µ í•´ì œ
       undo_suspension: ì •ì§€ í•´ì œ
+      unsilenced_msg: ì„±ê³µì ìœ¼ë¡œ %{username} ê³„ì •ì„ ì œí•œ í•´ì œí–ˆìŠµë‹ˆë‹¤
       unsubscribe: êµ¬ë… í•´ì œ
+      unsuspended_msg: ì„±ê³µì ìœ¼ë¡œ %{username} ê³„ì •ì„ ì •ì§€ í•´ì œí–ˆìŠµë‹ˆë‹¤
       username: ì•„ì´ë””
+      view_domain: ë„ë©”ì¸ì˜ ìš”ì•½ ë³´ê¸°
       warn: ê²½ê³ 
       web: ì›¹
       whitelisted: í—ˆìš© ëª©ë¡
@@ -204,12 +224,14 @@ ko:
         create_domain_allow: ë„ë©”ì¸ í—ˆìš© ìƒì„±
         create_domain_block: ë„ë©”ì¸ ì°¨ë‹¨ ì¶”ê°€
         create_email_domain_block: ì´ë©”ì¼ ë„ë©”ì¸ ì°¨ë‹¨ ìƒì„±
+        create_ip_block: IP ê·œì¹™ ë§Œë“¤ê¸°
         demote_user: ì‚¬ìš©ìž ê°•ë“±
         destroy_announcement: ê³µì§€ì‚¬í• ì‚ì œ
         destroy_custom_emoji: ì»¤ìŠ¤í…€ ì—ëª¨ì§€ ì‚ì œ
         destroy_domain_allow: ë„ë©”ì¸ í—ˆìš© ì‚ì œ
         destroy_domain_block: ë„ë©”ì¸ ì°¨ë‹¨ ì‚ì œ
         destroy_email_domain_block: ì´ë©”ì¼ ë„ë©”ì¸ ì°¨ë‹¨ ì‚ì œ
+        destroy_ip_block: IP ê·œì¹™ ì‚ì œ
         destroy_status: ê²Œì‹œë¬¼ ì‚ì œ
         disable_2fa_user: 2ë‹¨ê³„ ì¸ì¦ ë¹„í™œì„±í™”
         disable_custom_emoji: ì»¤ìŠ¤í…€ ì—ëª¨ì§€ ë¹„í™œì„±í™”
@@ -222,13 +244,16 @@ ko:
         reopen_report: ì‹ ê³  ë‹¤ì‹œ ì—´ê¸°
         reset_password_user: ì•”í˜¸ ìž¬ì„¤ì •
         resolve_report: ì‹ ê³  ì²˜ë¦¬
+        sensitive_account: ë‹¹ì‹ ì˜ ê³„ì •ì˜ ë¯¸ë””ì–´ë¥¼ ë¯¼ê°í•¨ìœ¼ë¡œ í‘œì‹œ
         silence_account: ê³„ì • ì¹¨ë¬µ
         suspend_account: ê³„ì • ì •ì§€
         unassigned_report: ì‹ ê³  ë§¡ê¸° ì·¨ì†Œ
+        unsensitive_account: ë‹¹ì‹ ì˜ ê³„ì •ì˜ ë¯¸ë””ì–´ë¥¼ ë¯¼ê°í•¨ìœ¼ë¡œ í‘œì‹œí•˜ì§€ ì•ŠìŒ
         unsilence_account: ê³„ì • ì¹¨ë¬µ ì·¨ì†Œ
         unsuspend_account: ê³„ì • ì •ì§€ ì·¨ì†Œ
         update_announcement: ê³µì§€ì‚¬í• ì—…ë°ì´íŠ¸
         update_custom_emoji: ì»¤ìŠ¤í…€ ì—ëª¨ì§€ ì—…ë°ì´íŠ¸
+        update_domain_block: ë„ë©”ì¸ ì°¨ë‹¨ ê°±ì‹ 
         update_status: ê²Œì‹œë¬¼ ê²Œì‹œ
       actions:
         assigned_to_self_report: "%{name}ì´ ë¦¬í¬íŠ¸ %{target}ì„ ìžì‹ ì—ê²Œ í• ë‹¹í–ˆìŠµë‹ˆë‹¤"
@@ -237,15 +262,17 @@ ko:
         create_account_warning: "%{name}ê°€ %{target}ì—ê²Œ ê²½ê³  ë³´ëƒ„"
         create_announcement: "%{name} ë‹˜ì´ ìƒˆ ê³µì§€ %{target}ì„ ë§Œë“¤ì—ˆìŠµë‹ˆë‹¤"
         create_custom_emoji: "%{name}ì´ ìƒˆë¡œìš´ ì—ëª¨ì§€ %{target}ë¥¼ ì¶”ê°€í–ˆìŠµë‹ˆë‹¤"
-        create_domain_allow: "%{name} ë‹˜ì´ %{target} ë„ë©”ì¸ì„ í™”ì´íŠ¸ë¦¬ìŠ¤íŠ¸ì— ë„£ì—ˆìŠµë‹ˆë‹¤"
+        create_domain_allow: "%{name} ë‹˜ì´ %{target} ë„ë©”ì¸ì„ í—ˆìš©ë¦¬ìŠ¤íŠ¸ì— ë„£ì—ˆìŠµë‹ˆë‹¤"
         create_domain_block: "%{name}ì´ ë„ë©”ì¸ %{target}ë¥¼ ì°¨ë‹¨í–ˆìŠµë‹ˆë‹¤"
         create_email_domain_block: "%{name}ì´ ì´ë©”ì¼ ë„ë©”ì¸ %{target}ë¥¼ ì°¨ë‹¨í–ˆìŠµë‹ˆë‹¤"
+        create_ip_block: "%{name} ë‹˜ì´ IP ê·œì¹™ %{target}ì„ ë§Œë“¤ì—ˆìŠµë‹ˆë‹¤"
         demote_user: "%{name}ì´ %{target}ì„ ê°•ë“±í–ˆìŠµë‹ˆë‹¤"
         destroy_announcement: "%{name} ë‹˜ì´ ê³µì§€ %{target}ì„ ì‚ì œí–ˆìŠµë‹ˆë‹¤"
         destroy_custom_emoji: "%{name}ì´ %{target} ì—ëª¨ì§€ë¥¼ ì‚ì œí•¨"
-        destroy_domain_allow: "%{name} ë‹˜ì´ %{target} ë„ë©”ì¸ì„ í™”ì´íŠ¸ë¦¬ìŠ¤íŠ¸ì—ì„œ ì œê±°í•˜ì˜€ìŠµë‹ˆë‹¤"
+        destroy_domain_allow: "%{name} ë‹˜ì´ %{target} ë„ë©”ì¸ì„ í—ˆìš©ë¦¬ìŠ¤íŠ¸ì—ì„œ ì œê±°í•˜ì˜€ìŠµë‹ˆë‹¤"
         destroy_domain_block: "%{name}ì´ ë„ë©”ì¸ %{target}ì˜ ì°¨ë‹¨ì„ í•´ì œí–ˆìŠµë‹ˆë‹¤"
-        destroy_email_domain_block: "%{name}ì´ ì´ë©”ì¼ ë„ë©”ì¸ %{target}ì„ í™”ì´íŠ¸ë¦¬ìŠ¤íŠ¸ì— ë„£ì—ˆìŠµë‹ˆë‹¤"
+        destroy_email_domain_block: "%{name}ì´ ì´ë©”ì¼ ë„ë©”ì¸ %{target}ì„ í—ˆìš©ë¦¬ìŠ¤íŠ¸ì— ë„£ì—ˆìŠµë‹ˆë‹¤"
+        destroy_ip_block: "%{name} ë‹˜ì´ IP ê·œì¹™ %{target}ì„ ì‚ì œí•˜ì˜€ìŠµë‹ˆë‹¤"
         destroy_status: "%{name}ì´ %{target}ì˜ íˆ¿ì„ ì‚ì œí–ˆìŠµë‹ˆë‹¤"
         disable_2fa_user: "%{name}ì´ %{target}ì˜ 2FAë¥¼ ë¹„í™œì„±í™” í–ˆìŠµë‹ˆë‹¤"
         disable_custom_emoji: "%{name}ì´ ì—ëª¨ì§€ %{target}ë¥¼ ë¹„í™œì„±í™” í–ˆìŠµë‹ˆë‹¤"
@@ -258,13 +285,16 @@ ko:
         reopen_report: "%{name}ì´ ë¦¬í¬íŠ¸ %{target}ì„ ë‹¤ì‹œ ì—´ì—ˆìŠµë‹ˆë‹¤"
         reset_password_user: "%{name}ì´ %{target}ì˜ ì•”í˜¸ë¥¼ ì´ˆê¸°í™”í–ˆìŠµë‹ˆë‹¤"
         resolve_report: "%{name}ì´ %{target} ì‹ ê³ ë¥¼ ì²˜ë¦¬ë¨ìœ¼ë¡œ ë³€ê²½í•˜ì˜€ìŠµë‹ˆë‹¤"
+        sensitive_account: "%{name} ë‹˜ì´ %{target}ì˜ ë¯¸ë””ì–´ë¥¼ ë¯¼ê°í•¨ìœ¼ë¡œ í‘œì‹œí–ˆìŠµë‹ˆë‹¤"
         silence_account: "%{name}ì´ %{target}ì˜ ê³„ì •ì„ ì¹¨ë¬µì‹œì¼°ìŠµë‹ˆë‹¤"
         suspend_account: "%{name}ì´ %{target}ì˜ ê³„ì •ì„ ì •ì§€ì‹œì¼°ìŠµë‹ˆë‹¤"
         unassigned_report: "%{name}ì´ ë¦¬í¬íŠ¸ %{target}ì„ í• ë‹¹ í•´ì œí–ˆìŠµë‹ˆë‹¤"
+        unsensitive_account: "%{name} ë‹˜ì´ %{target}ì˜ ë¯¸ë””ì–´ë¥¼ ë¯¼ê°í•˜ì§€ ì•ŠìŒìœ¼ë¡œ í‘œì‹œí–ˆìŠµë‹ˆë‹¤"
         unsilence_account: "%{name}ì´ %{target}ì— ëŒ€í•œ ì¹¨ë¬µì„ í•´ì œí–ˆìŠµë‹ˆë‹¤"
         unsuspend_account: "%{name}ì´ %{target}ì— ëŒ€í•œ ì •ì§€ë¥¼ í•´ì œí–ˆìŠµë‹ˆë‹¤"
         update_announcement: "%{name} ë‹˜ì´ ê³µì§€ %{target}ì„ ê°±ì‹ í–ˆìŠµë‹ˆë‹¤"
         update_custom_emoji: "%{name}ì´ ì—ëª¨ì§€ %{target}ë¥¼ ì—…ë°ì´íŠ¸ í–ˆìŠµë‹ˆë‹¤"
+        update_domain_block: "%{name} ë‹˜ì´ %{target}ì— ëŒ€í•œ ë„ë©”ì¸ ì°¨ë‹¨ì„ ê°±ì‹ í–ˆìŠµë‹ˆë‹¤"
         update_status: "%{name}ì´ %{target}ì˜ ìƒíƒœë¥¼ ì—…ë°ì´íŠ¸ í–ˆìŠµë‹ˆë‹¤"
       deleted_status: "(ì‚ì œë¨)"
       empty: ë¡œê·¸ë¥¼ ì°¾ì„ ìˆ˜ ì—†ìŠµë‹ˆë‹¤
@@ -346,9 +376,9 @@ ko:
       week_interactions: ì´ë²ˆ ì£¼ì˜ ìƒí˜¸ìž‘ìš©
       week_users_active: ì´ë²ˆ ì£¼ì˜ í™œì„± ì‚¬ìš©ìž
       week_users_new: ì´ë²ˆ ì£¼ì˜ ì‹ ê·œ ìœ ì €
-      whitelist_mode: í™”ì´íŠ¸ë¦¬ìŠ¤íŠ¸ ëª¨ë“œ
+      whitelist_mode: ì œí•œëœ íŽ˜ë”ë ˆì´ì…˜ ëª¨ë“œ
     domain_allows:
-      add_new: í—ˆìš© ëœ ë„ë©”ì¸
+      add_new: ë„ë©”ì¸ í—ˆìš©
       created_msg: ë„ë©”ì¸ì´ ì„±ê³µì ìœ¼ë¡œ í—ˆìš© ëª©ë¡ì— ì¶”ê°€ë˜ì—ˆìŠµë‹ˆë‹¤
       destroyed_msg: ë„ë©”ì¸ì´ í—ˆìš© ëª©ë¡ì—ì„œ ì œê±°ë˜ì—ˆìŠµë‹ˆë‹¤
       undo: í—ˆìš© ëª©ë¡ì—ì„œ ì œì™¸
@@ -370,6 +400,8 @@ ko:
           silence: ì¹¨ë¬µ
           suspend: ì •ì§€
         title: ìƒˆë¡œìš´ ë„ë©”ì¸ ì°¨ë‹¨
+      obfuscate: ë„ë©”ì¸ ì´ë¦„ ë‚œë…í™”
+      obfuscate_hint: ë„ë©”ì¸ ì œí•œ ëª©ë¡ì„ ê³µê°œí•˜ëŠ” ê²½ìš° ë„ë©”ì¸ ì´ë¦„ì˜ ì¼ë¶€ë¥¼ ë‚œë…í™” í•©ë‹ˆë‹¤
       private_comment: ë¹„ê³µê°œ ì£¼ì„
       private_comment_hint: ì´ ë„ë©”ì¸ ì œí•œì— ëŒ€í•œ ì£¼ì„ì€ ì¤‘ìž¬ìžë¥¼ ìœ„í•´ ë‚´ë¶€ì ìœ¼ë¡œ ì‚¬ìš© ë©ë‹ˆë‹¤.
       public_comment: ê³µê°œ ì£¼ì„
@@ -408,6 +440,7 @@ ko:
     instances:
       by_domain: ë„ë©”ì¸
       delivery_available: ì „ì†¡ ê°€ëŠ¥
+      empty: ë„ë©”ì¸ì´ í•˜ë‚˜ë„ ì—†ìŠµë‹ˆë‹¤.
       known_accounts:
         other: ì•Œë ¤ì§„ ê³„ì • %{count}ê°œ
       moderation:
@@ -430,6 +463,21 @@ ko:
         expired: ë§Œë£Œë¨
         title: í•„í„°
       title: ì´ˆëŒ€
+    ip_blocks:
+      add_new: ê·œì¹™ ë§Œë“¤ê¸°
+      created_msg: ì„±ê³µì ìœ¼ë¡œ ìƒˆ IP ê·œì¹™ì„ ë§Œë“¤ì—ˆìŠµë‹ˆë‹¤
+      delete: ì‚ì œ
+      expires_in:
+        '1209600': 2 ì£¼
+        '15778476': 6 ë‹¬
+        '2629746': 1 ë‹¬
+        '31556952': 1 ë…„
+        '86400': 1 ì¼
+        '94670856': 3 ë…„
+      new:
+        title: ìƒˆ IP ê·œì¹™ ë§Œë“¤ê¸°
+      no_ip_block_selected: ì•„ë¬´ ê²ƒë„ ì„ íƒ ë˜ì§€ ì•Šì•„ ì–´ë–¤ IP ê·œì¹™ë„ ë³€ê²½ ë˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤
+      title: IP ê·œì¹™ë“¤
     pending_accounts:
       title: ëŒ€ê¸°ì¤‘ì¸ ê³„ì • (%{count})
     relationships:
@@ -447,7 +495,7 @@ ko:
       pending: ë¦´ë ˆì´ì˜ ìŠ¹ì¸ ëŒ€ê¸°ì¤‘
       save_and_enable: ì €ìž¥í•˜ê³  í™œì„±í™”
       setup: ë¦´ë ˆì´ ì—°ê²° ì„¤ì •
-      signatures_not_enabled: ì‹œíì–´ëª¨ë“œë‚˜ í™”ì´íŠ¸ë¦¬ìŠ¤íŠ¸ëª¨ë“œë¥¼ ì‚¬ìš©í•˜ê³  ìžˆë‹¤ë©´ ë¦´ë ˆì´ëŠ” ì œëŒ€ë¡œ ë™ìž‘í•˜ì§€ ì•Šì„ ê²ƒìž…ë‹ˆë‹¤
+      signatures_not_enabled: ì‹œíì–´ëª¨ë“œë‚˜ ì œí•œëœ íŽ˜ë”ë ˆì´ì…˜ ëª¨ë“œë¥¼ ì‚¬ìš©í•˜ê³  ìžˆë‹¤ë©´ ë¦´ë ˆì´ëŠ” ì œëŒ€ë¡œ ë™ìž‘í•˜ì§€ ì•Šì„ ê²ƒìž…ë‹ˆë‹¤
       status: ìƒíƒœ
       title: ë¦´ë ˆì´
     report_notes:
@@ -467,6 +515,8 @@ ko:
       comment:
         none: ì—†ìŒ
       created_at: ë¦¬í¬íŠ¸ ì‹œê°
+      forwarded: ì „ë‹¬ë¨
+      forwarded_to: "%{domain}ì—ê²Œ ì „ë‹¬ë¨"
       mark_as_resolved: í•´ê²° ì™„ë£Œ ì²˜ë¦¬
       mark_as_unresolved: ë¯¸í•´ê²°ë¡œ í‘œì‹œ
       notes:
@@ -510,6 +560,7 @@ ko:
       domain_blocks_rationale:
         title: ì‚¬ìœ  ë³´ì—¬ì£¼ê¸°
       enable_bootstrap_timeline_accounts:
+        desc_html: ìƒˆ ì‚¬ìš©ìžë“¤ì´ ìžë™ìœ¼ë¡œ ì„¤ì • ëœ ê³„ì •ë“¤ì„ íŒ”ë¡œìš° í•˜ë„ë¡ í•´ì„œ ê·¸ë“¤ì˜ í™ˆ í”¼ë“œê°€ ë¹ˆ ìƒíƒœë¡œ ì‹œìž‘í•˜ì§€ ì•Šë„ë¡ í•©ë‹ˆë‹¤
         title: ìƒˆ ìœ ì €ê°€ íŒ”ë¡œìš°í•  ê³„ì •ì„ ë³´ì—¬ì£¼ê¸°
       hero:
         desc_html: í”„ë¡ íŠ¸íŽ˜ì´ì§€ì— í‘œì‹œ ë©ë‹ˆë‹¤. ìµœì†Œ 600x100í”½ì…€ì„ ê¶Œìž¥í•©ë‹ˆë‹¤. ë§Œì•½ ì„¤ì •ë˜ì§€ ì•Šì•˜ë‹¤ë©´, ì„œë²„ì˜ ì¸ë„¤ì¼ì´ ì‚¬ìš© ë©ë‹ˆë‹¤
@@ -536,6 +587,9 @@ ko:
         min_invite_role:
           disabled: ì•„ë¬´ë„ ëª» í•˜ê²Œ
           title: ì´ˆëŒ€ë§í¬ë¥¼ ë§Œë“¤ ìˆ˜ ìžˆëŠ” ê¶Œí•œ
+        require_invite_text:
+          desc_html: ê°€ìž…ì´ ìˆ˜ë™ ìŠ¹ì¸ì„ í•„ìš”ë¡œ í•  ë•Œ, "ì™œ ê°€ìž…í•˜ë ¤ê³  í•˜ë‚˜ìš”?" í•ëª©ì„ ì„ íƒì‚¬í•ìœ¼ë¡œ ë‘ëŠ” ê²ƒë³´ë‹¤ëŠ” í•„ìˆ˜ë¡œ ë‘ëŠ” ê²ƒì´ ë‚«ìŠµë‹ˆë‹¤
+          title: ìƒˆ ì‚¬ìš©ìžê°€ ì´ˆëŒ€ ìš”ì² ê¸€ì„ ìž‘ì„±í•´ì•¼ í•˜ë„ë¡
       registrations_mode:
         modes:
           approved: ê°€ìž…í•˜ë ¤ë©´ ìŠ¹ì¸ì´ í•„ìš”í•¨
@@ -675,8 +729,11 @@ ko:
       prefix_sign_up: ë§ˆìŠ¤í† ëˆì— ê°€ìž…í•˜ì„¸ìš”!
       suffix: ê³„ì • í•˜ë‚˜ë¡œ ì‚¬ëžŒë“¤ì„ íŒ”ë¡œìš° í•˜ê³ , ê²Œì‹œë¬¼ì„ ìž‘ì„±í•˜ë©° ë§ˆìŠ¤í† ëˆì„ í¬í•¨í•œ ë‹¤ë¥¸ ì–´ë–¤ ì„œë²„ì˜ ìœ ì €ì™€ë„ ë©”ì‹œì§€ë¥¼ ì£¼ê³  ë°›ì„ ìˆ˜ ìžˆìŠµë‹ˆë‹¤!
     didnt_get_confirmation: í™•ì¸ ë©”ì¼ì„ ë°›ì§€ ëª»í•˜ì…¨ìŠµë‹ˆê¹Œ?
+    dont_have_your_security_key: ë³´ì•ˆ í‚¤ê°€ ì—†ìŠµë‹ˆê¹Œ?
     forgot_password: ë¹„ë°€ë²ˆí˜¸ë¥¼ ìžŠì–´ë²„ë¦¬ì…¨ìŠµë‹ˆê¹Œ?
     invalid_reset_password_token: ì•”í˜¸ ë¦¬ì…‹ í† í°ì´ ì˜¬ë°”ë¥´ì§€ ëª»í•˜ê±°ë‚˜ ê¸°ê°„ì´ ë§Œë£Œë˜ì—ˆìŠµë‹ˆë‹¤. ë‹¤ì‹œ ìš”ì²í•´ì£¼ì„¸ìš”.
+    link_to_otp: íœ´ëŒ€í°ì˜ 2ì°¨ ì½”ë“œ í˜¹ì€ ë³µêµ¬ í‚¤ë¥¼ ìž…ë ¥í•´ ì£¼ì„¸ìš”
+    link_to_webauth: ë³´ì•ˆ í‚¤ ìž¥ì¹˜ ì‚¬ìš©
     login: ë¡œê·¸ì¸
     logout: ë¡œê·¸ì•„ì›ƒ
     migrate_account: ê³„ì • ì˜®ê¸°ê¸°
@@ -701,7 +758,9 @@ ko:
       functional: ê³„ì •ì´ ì™„ë²½ížˆ ìž‘ë™í•©ë‹ˆë‹¤.
       pending: ë‹¹ì‹ ì˜ ê°€ìž… ì‹ ì²ì€ ìŠ¤íƒœí”„ì˜ ê²€ì‚¬ë¥¼ ìœ„í•´ ëŒ€ê¸°ì¤‘ìž…ë‹ˆë‹¤. ì´ê²ƒì€ ì‹œê°„ì´ ë‹¤ì†Œ ì†Œìš”ë©ë‹ˆë‹¤. ê°€ìž… ì‹ ì²ì´ ìŠ¹ì¸ ë  ê²½ìš° ì´ë©”ì¼ì„ ë°›ê²Œ ë©ë‹ˆë‹¤.
       redirecting_to: ê³„ì •ì´ %{acct}ë¡œ ë¦¬ë‹¤ì´ë ‰íŠ¸ ì¤‘ì´ê¸° ë•Œë¬¸ì— ë¹„í™œì„± ìƒíƒœìž…ë‹ˆë‹¤.
+    too_fast: ë„ˆë¬´ ë¹ ë¥´ê²Œ ì–‘ì‹ì´ ì œì¶œë˜ì—ˆìŠµë‹ˆë‹¤, ë‹¤ì‹œ ì‹œë„í•˜ì„¸ìš”.
     trouble_logging_in: ë¡œê·¸ì¸ í•˜ëŠ”ë° ë¬¸ì œê°€ ìžˆë‚˜ìš”?
+    use_security_key: ë³´ì•ˆ í‚¤ ì‚¬ìš©
   authorize_follow:
     already_following: ì´ë¯¸ ì´ ê³„ì •ì„ íŒ”ë¡œìš° í•˜ê³  ìžˆìŠµë‹ˆë‹¤
     already_requested: ì´ë¯¸ ì´ ê³„ì •ì—ê²Œ íŒ”ë¡œìš° ìš”ì²ì„ ë³´ëƒˆìŠµë‹ˆë‹¤
@@ -726,6 +785,7 @@ ko:
   date:
     formats:
       default: "%Y-%b-%d"
+      with_month_name: "%Y-%B-%d"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}ì‹œê°„"
@@ -790,6 +850,7 @@ ko:
       request: ì•„ì¹´ì´ë¸Œ ìš”ì²í•˜ê¸°
       size: í¬ê¸°
     blocks: ì°¨ë‹¨
+    bookmarks: ë³´ê´€í•¨
     csv: CSV
     domain_blocks: ë„ë©”ì¸ ì°¨ë‹¨
     lists: ë¦¬ìŠ¤íŠ¸
@@ -856,6 +917,8 @@ ko:
     status: ì¸ì¦ ìƒíƒœ
     view_proof: ì¦ëª… ë³´ê¸°
   imports:
+    errors:
+      over_rows_processing_limit: "%{count}ê°œ ì´ìƒì˜ ì—´ì„ í¬í•¨í•©ë‹ˆë‹¤"
     modes:
       merge: ë³‘í•©
       merge_long: ê¸°ì¡´ ê²ƒì„ ê·¸ëŒ€ë¡œ ë‘” ì±„ ìƒˆë¡œ ì¶”ê°€
@@ -865,6 +928,7 @@ ko:
     success: íŒŒì¼ì´ ì •ìƒì ìœ¼ë¡œ ì—…ë¡œë“œ ë˜ì—ˆìœ¼ë©°, í˜„ìž¬ ì²˜ë¦¬ ì¤‘ìž…ë‹ˆë‹¤
     types:
       blocking: ì°¨ë‹¨í•œ ê³„ì • ëª©ë¡
+      bookmarks: ë³´ê´€í•¨
       domain_blocking: ë„ë©”ì¸ ì°¨ë‹¨ ëª©ë¡
       following: íŒ”ë¡œìš° ì¤‘ì¸ ê³„ì • ëª©ë¡
       muting: ë®¤íŠ¸ ì¤‘ì¸ ê³„ì • ëª©ë¡
@@ -982,6 +1046,14 @@ ko:
           quadrillion: Q
           thousand: K
           trillion: T
+  otp_authentication:
+    code_hint: í™•ì¸ì„ ìœ„í•´ ì¸ì¦ ì• í”Œë¦¬ì¼€ì´ì…˜ì— ìƒì„±ëœ ì½”ë“œë¥¼ ìž…ë ¥í•´ ì£¼ì‹ì‹œì˜¤
+    description_html: ì¸ì¦ê¸° ì•±ìœ¼ë¡œ <strong>2ë‹¨ê³„ ì¸ì¦</strong>ì„ í™œì„±í™” í•˜ë©´ ë¡œê·¸ì¸ ì‹œ ìž…ë ¥ í•  í† í°ì„ ìƒì„±í•´ ì£¼ëŠ” ì „í™”ê¸°ê°€ í•„ìš”í•©ë‹ˆë‹¤.
+    enable: í™œì„±í™”
+    instructions_html: "<strong>Google Authenticator, ë˜ëŠ” íƒ€ TOTP ì• í”Œë¦¬ì¼€ì´ì…˜ì—ì„œ ì´ QR ì½”ë“œë¥¼ ìŠ¤ìº”í•´ ì£¼ì‹ì‹œì˜¤.</strong> ì´í›„ ë¡œê·¸ì¸ ì‹œì—ëŠ” ì´ ì• í”Œë¦¬ì¼€ì´ì…˜ì—ì„œ ìƒì„±ë˜ëŠ” ì½”ë“œê°€ í•„ìš”í•©ë‹ˆë‹¤."
+    manual_instructions: 'QR ì½”ë“œë¥¼ ìŠ¤ìº”í•  ìˆ˜ ì—†ì–´ ìˆ˜ë™ìœ¼ë¡œ ë“±ë¡ì„ ì›í•˜ì‹œëŠ” ê²½ìš° ì´ ë¹„ë°€ ì½”ë“œë¥¼ ì‚¬ìš©í•´ ì£¼ì‹ì‹œì˜¤:'
+    setup: ì„¤ì •
+    wrong_code: ì½”ë“œê°€ ì˜¬ë°”ë¥´ì§€ ì•ŠìŠµë‹ˆë‹¤! ì„œë²„ì™€ íœ´ëŒ€ì „í™” ê°„ì˜ ì‹œê°ì´ ì¼ì¹˜í•˜ë‚˜ìš”?
   pagination:
     newer: ìƒˆë¡œìš´ íˆ¿
     next: ë‹¤ìŒ
@@ -1010,6 +1082,7 @@ ko:
   relationships:
     activity: ê³„ì • í™œë™
     dormant: íœ´ë©´
+    follow_selected_followers: ì„ íƒí•œ íŒ”ë¡œì›Œë“¤ì„ íŒ”ë¡œìš°
     followers: íŒ”ë¡œì›Œ
     following: íŒ”ë¡œìž‰
     invited: ì´ˆëŒ€ë¨
@@ -1048,40 +1121,40 @@ ko:
     activity: ë§ˆì§€ë§‰ í™œë™
     browser: ë¸Œë¼ìš°ì €
     browsers:
-      alipay: ì•Œë¦¬íŽ˜ì´
-      blackberry: ë¸”ëž™ë² ë¦¬
-      chrome: í¬ë¡¬
-      edge: ì—£ì§€
-      electron: ì¼ë ‰íŠ¸ë¡ 
-      firefox: íŒŒì´ì–´íìŠ¤
+      alipay: Alipay
+      blackberry: Blackberry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
       generic: ì•Œ ìˆ˜ ì—†ëŠ” ë¸Œë¼ìš°ì €
-      ie: IE
-      micro_messenger: ë§ˆì´í¬ë¡œë©”ì‹ ì €
-      nokia: ë…¸í‚¤ì•„ S40 Ovi ë¸Œë¼ìš°ì €
-      opera: ì˜¤íŽ˜ë¼
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi ë¸Œë¼ìš°ì €
+      opera: Opera
       otter: Otter
       phantom_js: PhantomJS
       qq: QQ ë¸Œë¼ìš°ì €
-      safari: ì‚¬íŒŒë¦¬
+      safari: Safari
       uc_browser: UCë¸Œë¼ìš°ì €
-      weibo: ì›¨ì´ë³´
+      weibo: Weibo
     current_session: í˜„ìž¬ ì„¸ì…˜
     description: "%{platform}ì˜ %{browser}"
     explanation: ë‚´ ë§ˆìŠ¤í† ëˆ ê³„ì •ì— í˜„ìž¬ ë¡œê·¸ì¸ ì¤‘ì¸ ì›¹ ë¸Œë¼ìš°ì € ëª©ë¡ìž…ë‹ˆë‹¤.
     ip: IP
     platforms:
-      adobe_air: ì–´ë„ë¹„ ì—ì–´
-      android: ì•ˆë“œë¡œì´ë“œ
-      blackberry: ë¸”ëž™ë² ë¦¬
-      chrome_os: í¬ë¡¬OS
-      firefox_os: íŒŒì´ì–´íìŠ¤OS
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: Blackberry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
       ios: iOS
-      linux: ë¦¬ëˆ…ìŠ¤
-      mac: ë§¥
+      linux: Linux
+      mac: macOS
       other: ì•Œ ìˆ˜ ì—†ëŠ” í”Œëž«í¼
-      windows: ìœˆë„ìš°ì¦ˆ
-      windows_mobile: ìœˆë„ìš°ì¦ˆ ëª¨ë°”ì¼
-      windows_phone: ìœˆë„ìš°ì¦ˆ í°
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
     revoke: ì‚ì œ
     revoke_success: ì„¸ì…˜ì´ ì„±ê³µì ìœ¼ë¡œ ì‚ì œë˜ì—ˆìŠµë‹ˆë‹¤
     title: ì„¸ì…˜
@@ -1106,6 +1179,7 @@ ko:
     profile: í”„ë¡œí•„
     relationships: íŒ”ë¡œìž‰ê³¼ íŒ”ë¡œì›Œ
     two_factor_authentication: 2ë‹¨ê³„ ì¸ì¦
+    webauthn_authentication: ë³´ì•ˆ í‚¤
   spam_check:
     spam_detected: ì´ê²ƒì€ ìžë™í™” ëœ ì‹ ê³ ìž…ë‹ˆë‹¤. ìŠ¤íŒ¸ì´ ê°ì§€ë˜ì—ˆìŠµë‹ˆë‹¤.
   statuses:
@@ -1138,6 +1212,8 @@ ko:
         other: "%{count}ëª… íˆ¬í‘œí•¨"
       vote: íˆ¬í‘œ
     show_more: ë” ë³´ê¸°
+    show_newer: ìƒˆë¡œìš´ ê²ƒ í‘œì‹œ
+    show_older: ì˜¤ëž˜ëœ ê²ƒ í‘œì‹œ
     show_thread: ê¸€íƒ€ëž˜ ë³´ê¸°
     sign_in_to_participate: ë¡œê·¸ì¸ í•˜ì—¬ ì´ ëŒ€í™”ì— ì°¸ì—¬í•˜ê¸°
     title: '%{name}: "%{quote}"'
@@ -1246,21 +1322,20 @@ ko:
       default: "%Yë…„ %mì›” %dì¼ %H:%M"
       month: "%Yë…„ %b"
   two_factor_authentication:
-    code_hint: í™•ì¸í•˜ê¸° ìœ„í•´ì„œ ì¸ì¦ ì• í”Œë¦¬ì¼€ì´ì…˜ì—ì„œ í‘œì‹œëœ ì½”ë“œë¥¼ ìž…ë ¥í•´ ì£¼ì‹ì‹œì˜¤
-    description_html: "<strong>2ë‹¨ê³„ ì¸ì¦</strong>ì„ í™œì„±í™” í•˜ë©´ ë¡œê·¸ì¸ ì‹œ ì „í™”ë¡œ ì¸ì¦ ì½”ë“œë¥¼ ë°›ì„ í•„ìš”ê°€ ìžˆìŠµë‹ˆë‹¤."
+    add: ì¶”ê°€
     disable: ë¹„í™œì„±í™”
-    enable: í™œì„±í™”
+    disabled_success: 2ë‹¨ê³„ ì¸ì¦ì´ ë¹„í™œì„±í™” ë˜ì—ˆìŠµë‹ˆë‹¤.
+    edit: íŽ¸ì§‘
     enabled: 2ë‹¨ê³„ ì¸ì¦ì´ í™œì„±í™” ë˜ì–´ ìžˆìŠµë‹ˆë‹¤
     enabled_success: 2ë‹¨ê³„ ì¸ì¦ì´ í™œì„±í™” ë˜ì—ˆìŠµë‹ˆë‹¤
     generate_recovery_codes: ë³µêµ¬ ì½”ë“œ ìƒì„±
-    instructions_html: "<strong>Google Authenticator, ë˜ëŠ” íƒ€ TOTP ì• í”Œë¦¬ì¼€ì´ì…˜ì—ì„œ ì´ QR ì½”ë“œë¥¼ ìŠ¤ìº”í•´ ì£¼ì‹ì‹œì˜¤.</strong> ì´í›„ ë¡œê·¸ì¸ ì‹œì—ëŠ” ì´ ì• í”Œë¦¬ì¼€ì´ì…˜ì—ì„œ ìƒì„±ë˜ëŠ” ì½”ë“œê°€ í•„ìš”í•©ë‹ˆë‹¤."
     lost_recovery_codes: ë³µêµ¬ ì½”ë“œë¥¼ ì‚¬ìš©í•˜ë©´ íœ´ëŒ€ì „í™”ë¥¼ ë¶„ì‹¤í•œ ê²½ìš°ì—ë„ ê³„ì •ì— ì ‘ê·¼í•  ìˆ˜ ìžˆê²Œ ë©ë‹ˆë‹¤. ë³µêµ¬ ì½”ë“œë¥¼ ë¶„ì‹¤í•œ ê²½ìš°ì—ë„ ì—¬ê¸°ì„œ ë‹¤ì‹œ ìƒì„±í•  ìˆ˜ ìžˆì§€ë§Œ, ì˜ˆì „ ë³µêµ¬ ì½”ë“œëŠ” ë¹„í™œì„±í™” ë©ë‹ˆë‹¤.
-    manual_instructions: 'QR ì½”ë“œë¥¼ ìŠ¤ìº”í•  ìˆ˜ ì—†ì–´ ìˆ˜ë™ìœ¼ë¡œ ë“±ë¡ì„ ì›í•˜ì‹œëŠ” ê²½ìš° ì´ ë¹„ë°€ ì½”ë“œë¥¼ ì‚¬ìš©í•´ ì£¼ì‹ì‹œì˜¤:'
+    methods: 2ë‹¨ê³„ ì¸ì¦
+    otp: ì¸ì¦ ì•±
     recovery_codes: ë³µêµ¬ ì½”ë“œ
     recovery_codes_regenerated: ë³µêµ¬ ì½”ë“œê°€ ë‹¤ì‹œ ìƒì„±ë˜ì—ˆìŠµë‹ˆë‹¤
     recovery_instructions_html: íœ´ëŒ€ì „í™”ë¥¼ ë¶„ì‹¤í•œ ê²½ìš°, ì•„ëž˜ ë³µêµ¬ ì½”ë“œ ì¤‘ í•˜ë‚˜ë¥¼ ì‚¬ìš©í•´ ê³„ì •ì— ì ‘ê·¼í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤. <strong>ë³µêµ¬ ì½”ë“œëŠ” ì•ˆì „í•˜ê²Œ ë³´ê´€í•´ ì£¼ì‹ì‹œì˜¤.</strong> ì´ ì½”ë“œë¥¼ ì¸ì‡„í•´ ì¤‘ìš”í•œ ì„œë¥˜ì™€ í•¨ê»˜ ë³´ê´€í•˜ëŠ” ê²ƒë„ ì¢‹ìŠµë‹ˆë‹¤.
-    setup: ì´ˆê¸° ì„¤ì •
-    wrong_code: ì½”ë“œê°€ ì˜¬ë°”ë¥´ì§€ ì•ŠìŠµë‹ˆë‹¤. ì„œë²„ì™€ íœ´ëŒ€ì „í™” ê°„ì˜ ì‹œê°ì´ ì¼ì¹˜í•˜ë‚˜ìš”?
+    webauthn: ë³´ì•ˆ í‚¤
   user_mailer:
     backup_ready:
       explanation: ë‹¹ì‹ ì´ ìš”ì²í•œ ê³„ì •ì˜ í’€ ë°±ì—…ì´ ì´ì œ ë‹¤ìš´ë¡œë“œ ê°€ëŠ¥í•©ë‹ˆë‹¤!
@@ -1275,6 +1350,7 @@ ko:
     warning:
       explanation:
         disable: ë‹¹ì‹ ì˜ ê³„ì •ì´ ë™ê²° ëœ ë™ì•ˆ ë‹¹ì‹ ì˜ ê³„ì •ì€ ìœ ì§€ ë©ë‹ˆë‹¤. í•˜ì§€ë§Œ ìž ê¸ˆì´ í’€ë¦´ ë•Œê¹Œì§€ ë‹¹ì‹ ì€ ì•„ë¬´ ê²ƒë„ í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤.
+        sensitive: ë‹¹ì‹ ì˜ ì—…ë¡œë“œ í•œ ë¯¸ë””ì–´ íŒŒì¼ë“¤ê³¼ ë§í¬ëœ ë¯¸ë””ì–´ë“¤ì€ ë¯¼ê°í•¨ìœ¼ë¡œ ì·¨ê¸‰ë©ë‹ˆë‹¤.
         silence: ë‹¹ì‹ ì˜ ê³„ì •ì´ ì œí•œ ëœ ë™ì•ˆì—” ë‹¹ì‹ ì˜ íŒ”ë¡œì›Œ ì´ì™¸ì—” íˆ¿ì„ ë°›ì•„ ë³¼ ìˆ˜ ì—†ê³  ê³µê°œ ë¦¬ìŠ¤íŒ…ì—ì„œ ì œì™¸ ë©ë‹ˆë‹¤. í•˜ì§€ë§Œ ë‹¤ë¥¸ ì‚¬ëžŒë“¤ì€ ì—¬ì „ížˆ ë‹¹ì‹ ì„ íŒ”ë¡œìš° ê°€ëŠ¥í•©ë‹ˆë‹¤.
         suspend: ë‹¹ì‹ ì˜ ê³„ì •ì€ ì •ì§€ ë˜ì—ˆìœ¼ë©°, ëª¨ë“  íˆ¿ê³¼ ì—…ë¡œë“œ í•œ ë¯¸ë””ì–´ê°€ ì„œë²„ì—ì„œ ì‚ì œ ë˜ì–´ ë˜ëŒë¦´ ìˆ˜ ì—†ìŠµë‹ˆë‹¤.
       get_in_touch: ì´ ë©”ì¼ì— ëŒ€í•´ ë‹µìž¥í•´ì„œ %{instance}ì˜ ìŠ¤íƒœí”„ì™€ ì—°ë½ í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤.
@@ -1283,11 +1359,13 @@ ko:
       subject:
         disable: ë‹¹ì‹ ì˜ ê³„ì • %{acct}ê°€ ë™ê²° ë˜ì—ˆìŠµë‹ˆë‹¤
         none: "%{acct}ì—ê²Œì˜ ê²½ê³ "
+        sensitive: ë‹¹ì‹ ì˜ ê³„ì • %{acct}ì—ì„œ í¬ìŠ¤íŒ… í•˜ëŠ” ë¯¸ë””ì–´ëŠ” ë¯¼ê°í•¨ìœ¼ë¡œ ì„¤ì •ë˜ì—ˆìŠµë‹ˆë‹¤
         silence: ë‹¹ì‹ ì˜ ê³„ì • %{acct}ê°€ ì œí•œ ë˜ì—ˆìŠµë‹ˆë‹¤
         suspend: ë‹¹ì‹ ì˜ ê³„ì • %{acct}ê°€ ì •ì§€ ë˜ì—ˆìŠµë‹ˆë‹¤
       title:
         disable: ê³„ì • ë™ê²° ë¨
         none: ê²½ê³ 
+        sensitive: ë‹¹ì‹ ì˜ ë¯¸ë””ì–´ëŠ” ë¯¼ê°í•¨ìœ¼ë¡œ í‘œì‹œë˜ì—ˆìŠµë‹ˆë‹¤
         silence: ê³„ì • ì œí•œ ë¨
         suspend: ê³„ì • ì •ì§€ ë¨
     welcome:
@@ -1308,9 +1386,11 @@ ko:
       tips: íŒ
       title: í™˜ì˜í•©ë‹ˆë‹¤ %{name} ë‹˜!
   users:
+    blocked_email_provider: í—ˆìš©ëœ ì´ë©”ì¼ ì œê³µìžê°€ ì•„ë‹™ë‹ˆë‹¤
     follow_limit_reached: ë‹¹ì‹ ì€ %{limit}ëª…ì˜ ì‚¬ëžŒì„ ë„˜ì–´ì„œ íŒ”ë¡œìš° í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤
     generic_access_help_html: ê³„ì • ë¡œê·¸ì¸ì— ë¬¸ì œê°€ ìžˆë‚˜ìš”? %{email} ë¡œ ë„ì›€ì„ ìš”ì²í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤
     invalid_email: ë©”ì¼ ì£¼ì†Œê°€ ì˜¬ë°”ë¥´ì§€ ì•ŠìŠµë‹ˆë‹¤
+    invalid_email_mx: ì´ë©”ì¼ ì£¼ì†Œê°€ ì¡´ìž¬í•˜ì§€ ì•ŠëŠ” ê²ƒ ê°™ìŠµë‹ˆë‹¤
     invalid_otp_token: 2ë‹¨ê³„ ì¸ì¦ ì½”ë“œê°€ ì˜¬ë°”ë¥´ì§€ ì•ŠìŠµë‹ˆë‹¤
     invalid_sign_in_token: ìž˜ëª»ëœ ë³´ì•ˆ ì½”ë“œ
     otp_lost_help_html: ë§Œì•½ ì–‘ìª½ ëª¨ë‘ë¥¼ ìžƒì–´ë²„ë ¸ë‹¤ë©´ %{email}ì„ í†µí•´ ë³µêµ¬í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤
@@ -1320,3 +1400,20 @@ ko:
   verification:
     explanation_html: 'ë‹¹ì‹ ì€ <strong>í”„ë¡œí•„ ë©”íƒ€ë°ì´í„°ì˜ ë§í¬ ì†Œìœ ìžìž„ì„ ê²€ì¦í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤</strong>. ì´ê²ƒì„ í•˜ê¸° ìœ„í•´ì„œëŠ”, ë§í¬ ëœ ì›¹ì‚¬ì´íŠ¸ì—ì„œ ë‹¹ì‹ ì˜ ë§ˆìŠ¤í† ëˆ í”„ë¡œí•„ì„ ì—ìœ¼ë¡œ ë§í¬í•´ì•¼ í•©ë‹ˆë‹¤. ì—ë§í¬ëŠ” <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: ë³´ì•ˆ í‚¤ë¥¼ ì‚¬ìš©í•˜ê¸° ìœ„í•´ì„œëŠ” 2ë‹¨ê³„ ì¸ì¦ì„ ë¨¼ì € í™œì„±í™” í•´ ì£¼ì„¸ìš”
+    registered_on: "%{date} ì— ë“±ë¡ë¨"
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index 2fbf0ffd710189ce2905acb59a57eba453b1b9f9..0d76e1b97d923ca6d9975b321989c6470ececbd0 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -1 +1,1415 @@
---- {}
+---
+ku:
+  about:
+    about_hashtag_html: Ø¦Û•Ù…Ø§Ù†Û• ØªÙˆØªÛŒ Ú¯Ø´ØªÛŒÙ† Ø¨Û• Ù‡Û•Ø´ØªÛ•Ú¯ÛŒ Ú¯Ø´ØªÛŒ <strong>#%{hashtag}}</strong>. Ú¯Û•Ø± Ø¦ÛŽÙˆÛ• Ù„Û• Ù‡Û•Ø± Ú•Ø§Ú˜Û•ÛŒÛ•Ú© Ù‡Û•Ú˜Ù…Ø§Ø±Û•ØªØ§Ù† Ø¨ÛŽØª Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ù„ÛŽØ±Û• Ø¨Û•Ù… Ù†ÙˆÙˆØ³Ø±Ø§ÙˆØ§Ù†Û• Ù‡Ø§ÙˆØ¦Ø§Ù‡Û•Ù†Ú¯ Ø¨Ù†.
+    about_mastodon_html: 'ØªÛ†Ú•ÛŒ Ú©Û†Ù…Û•ÚµØ§ÛŒÛ•ØªÛŒ Ø¯Ø§Ù‡Ø§ØªÙˆÙˆ: Ù‡ÛŒÚ† Ú•ÛŒÚ©Ù„Ø§Ù…ÛŽÚ© ØŒ Ù‡ÛŒÚ† Ú†Ø§ÙˆØ¯ÛŽØ±ÛŒÛŒÛ•Ú©ÛŒ Ú©Û†Ù…Ù¾Ø§Ù†ÛŒØ§ ØŒ Ø¯ÛŒØ²Ø§ÛŒÙ†ÛŒ Ø¦Û•Ø®Ù„Ø§Ù‚ÛŒ Ùˆ Ù„Ø§Ù…Û•Ø±Ú©Û•Ø²ÛŒ! Ø®Ø§ÙˆÛ•Ù†ÛŒ Ø¯Ø§ØªØ§Ú©Ø§Ù†Øª Ù†Ø§Ø¨ÛŽ Ù„Û• Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†!'
+    about_this: Ø¯Û•Ø±Ø¨Ø§Ø±Û•
+    active_count_after: Ú†Ø§Ù„Ø§Ú©
+    active_footnote: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†ÛŒ Ú†Ø§Ù„Ø§Ú©ÛŒ Ù…Ø§Ù†Ú¯Ø§Ù†Û• (MAU)
+    administered_by: 'Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Ø±Ø§Ùˆ Ù„Û•Ù„Ø§ÛŒÛ•Ù†:'
+    api: API
+    apps: Ø¦Û•Ù¾Û•Ú©Ø§Ù†ÛŒ Ù…Û†Ø¨Ø§ÛŒÙ„
+    apps_platforms: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø§Ù†ÛŒ Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† Ù„Û• iOSØŒ Ø¦Û•Ù†Ø¯Ø±Û†ÛŒØ¯ Ùˆ Ø³Û•Ú©Û†Ú©Ø§Ù†ÛŒ ØªØ±
+    browse_directory: Ú¯Û•Ú•Ø§Ù† Ù„Û• Ú•ÛŽØ¨Û•Ø±ÛŽÚ©ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„ Ùˆ Ù¾Ø§ÚµØ§ÙˆØªÙ† Ø¨Û•Ù¾ÛŽÛŒ Ø¨Û•Ø±Ú˜Û•ÙˆÛ•Ù†Ø¯ÛŒÛ•Ú©Ø§Ù†
+    browse_local_posts: Ú¯Û•Ú•Ø§Ù†ÛŒ Ú•Ø§Ø³ØªÛ•ÙˆØ®Û† Ù„Û• Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ• Ú¯Ø´ØªÛŒÛ•Ú©Ø§Ù† Ù„Û•Ù… Ú•Ø§Ú˜Û•ÙˆÛ•
+    browse_public_posts: Ú¯Û•Ú•Ø§Ù† Ù„Û• Ø¬Û†Ú¯Û•ÛŒÛ•Ú©ÛŒ Ø²ÛŒÙ†Ø¯ÙˆÙˆÛŒ Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ• Ú¯Ø´ØªÛŒÛ•Ú©Ø§Ù† Ù„Û•Ø³Û•Ø± Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†
+    contact: Ø¨Û•Ø±Ø¯Û•Ù†Ú¯
+    contact_missing: Ø³Ø§Ø²Ù†Û•Ú©Ø±Ø§ÙˆÛ•
+    contact_unavailable: Ø¨ÙˆÙˆÙ†ÛŒ Ù†ÛŒÛŒÛ•
+    discover_users: Ù¾Û•ÛŒØ¯Ø§Ú©Ø±Ø¯Ù†ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†
+    documentation: Ø¨Û•ÚµÚ¯Û•Ú©Ø§Ù†
+    federation_hint_html: Ø¨Û• Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒÛ•Ú© Ù„Û•Ø³Û•Ø± %{instance} Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø´ÙˆÛŽÙ† Ø®Û•ÚµÚ© Ø¨Ú©Û•ÙˆÛŒØª Ù„Û•Ø³Û•Ø± Ù‡Û•Ø±Ú•Ø§Ú˜Û•ÛŒÛ•Ú©ÛŒ Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†.
+    get_apps: Ø¦Û•Ù¾ÛŽÚ©ÛŒ ØªÛ•Ù„Û•ÙÛ†Ù† ØªØ§Ù‚ÛŒ Ø¨Ú©Û•Ø±Û•ÙˆÛ•
+    hosted_on: Ù…Û•Ø³ØªÙˆØ¯Û†Ù† Ù…ÛŒÙˆØ§Ù†Ø¯Ø§Ø±ÛŒ Ú©Ø±Ø§ÙˆÛ• Ù„Û• %{domain}
+    instance_actor_flash: |
+      Ø¦Û•Ù… Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒÛ• Ø¦Û•Ú©ØªÛ•Ø±ÛŽÚ©ÛŒ Ø®Û•ÛŒØ§ÚµÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡Ø§ØªÙˆÙˆÛ• Ø¨Û† Ù†ÙˆÛŽÙ†Û•Ø±Ø§ÛŒÛ•ØªÛŒ Ú©Ø±Ø¯Ù†ÛŒ Ø®ÙˆØ¯ÛŒ Ú•Ø§Ú˜Û•Ú©Û• Ùˆ Ù†Û•Ú© Ù‡ÛŒÚ† Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŽÚ©ÛŒ ØªØ§Ú©.
+      Ø¨Û† Ù…Û•Ø¨Û•Ø³ØªÛŒ ÙÛŒØ¯Ø±Ø§Ø³ÛŒÛ†Ù† Ø¨Û•Ú©Ø§Ø±Ø¯ÛŽØª Ùˆ Ù†Ø§Ø¨ÛŽØª Ø¨Ù„Û†Ú© Ø¨Ú©Ø±ÛŽØª Ù…Û•Ú¯Û•Ø± Ø¯Û•ØªÛ•ÙˆÛŽØª Ù‡Û•Ù…ÙˆÙˆ Ù†Ù…ÙˆÙ†Û•Ú©Û• Ø¨Ù„Û†Ú© Ø¨Ú©Û•ÛŒØªØŒ Ú©Û• Ù„Û• ØØ§ÚµÛ•ØªÛ•Ø´ Ø¯Ø§ Ù¾ÛŽÙˆÛŒØ³ØªÛ• Ø¨Ù„Û†Ú©ÛŒ Ø¯Û†Ù…Û•ÛŒÙ† Ø¨Û•Ú©Ø§Ø±Ø¨Ù‡ÛŽÙ†ÛŒØª.
+    learn_more: Ø²ÛŒØ§ØªØ± ÙÛŽØ±Ø¨Ù‡
+    privacy_policy: Ú•Ø§Ù…ÛŒØ§Ø±ÛŒ ØªØ§ÛŒØ¨Û•ØªÛŽØªÛŒ
+    see_whats_happening: Ø¨Ø²Ø§Ù†Û• Ú†ÛŒ Ú•ÙˆÙˆØ¯Û•Ø¯Ø§Øª
+    server_stats: 'Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ Ú•Ø§Ú˜Û•Ú©Ø§Ø±:'
+    source_code: Ú©Û†Ø¯ÛŒ Ø³Û•Ø±Ú†Ø§ÙˆÛ•
+    status_count_after:
+      one: Ø¯Û†Ø®
+      other: Ø¯Û†Ø®Û•Ú©Ø§Ù†
+    status_count_before: Ù„Û• Ù„Ø§ÛŒÛ•Ù† ÛŒÛ•Ú©Û•ÙˆÛ•
+    tagline: Ø¯ÙˆØ§ÛŒ Ù‡Ø§ÙˆÚ•ÛŽÚ©Ø§Ù† Ø¨Ú©Û•ÙˆÛ• Ùˆ Ø¦Û•ÙˆØ§Ù†Û•ÛŒ Ù†ÙˆÛŽ Ø¨Ø¯Û†Ø²ÛŒÛ•ÙˆÛ•
+    terms: Ù…Û•Ø±Ø¬Û•Ú©Ø§Ù†ÛŒ Ø®Ø²Ù…Û•ØªÚ¯ÙˆØ²Ø§Ø±ÛŒ
+    unavailable_content: Ú•Ø§Ú˜Û•ÛŒ Ú†Ø§ÙˆØ¯ÛŽØ±ÛŒÚ©Ø±Ø§Ùˆ
+    unavailable_content_description:
+      domain: Ú•Ø§Ú˜Û•Ú©Ø§Ø±
+      reason: Ù‡Û†Ú©Ø§Ø±
+      rejecting_media: 'Ù¾Û•Ú•Ú¯Û•Ú©Ø§Ù†ÛŒ Ù…ÛŒØ¯ÛŒØ§ Ù„Û•Ù… Ú•Ø§Ú˜Ø§Ù†Û•ÙˆÛ• Ù¾Ø±Û†Ø³Û• Ù†Ø§Ú©Ø±ÛŽØª ÛŒØ§Ù† Ù‡Û•ÚµÙ†Ø§Ú¯ÛŒØ±ÛŽÙ†ØŒ Ùˆ Ù‡ÛŒÚ† ÙˆÛŽÙ†Û†Ú†Ú©Û•ÛŒÛ•Ú© Ù¾ÛŒØ´Ø§Ù† Ù†Ø§Ø¯Ø±ÛŽØªØŒ Ù¾ÛŽÙˆÛŒØ³ØªÛŒ Ø¨Û• Ú©Ø±ØªÛ• Ú©Ø±Ø¯Ù†ÛŒ Ø¯Û•Ø³ØªÛŒ Ù‡Û•ÛŒÛ• Ø¨Û† ÙØ§ÛŒÙ„Û• Ø³Û•Ø±Û•Ú©ÛŒÛ•Ú©Û•:'
+      rejecting_media_title: Ù¾Ø§ÚµÛŽÙˆÛ•Ø±ÛŒ Ù…ÛŒØ¯ÛŒØ§
+      silenced: 'Ø¨Ø§Ø¨Û•ØªÛ•Ú©Ø§Ù†ÛŒ Ø¦Û•Ù… Ú•Ø§Ú˜Ø§Ù†Û• Ù„Û• Ù‡ÛŽÚµÛŒ Ú©Ø§ØªÛŒ Ú¯Ø´ØªÛŒ Ùˆ Ú¯ÙØªÙˆÚ¯Û†Ú©Ø§Ù†Ø¯Ø§ Ø¯Û•Ø´Ø§Ø±Ø¯Ø±ÛŽÙ†Û•ÙˆÛ•ØŒ Ùˆ Ù‡ÛŒÚ† Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…ÛŽÚ© Ø¯Ø±ÙˆØ³Øª Ù†Ø§Ú©Ø±ÛŽØª Ù„Û• Ú†Ø§Ù„Ø§Ú©ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†ÛŒØ§Ù†ØŒ Ù…Û•Ú¯Û•Ø± ØªÛ† Ø¨Û•Ø¯ÙˆØ§ÛŒØ§Ù† Ø¯Û•Ú†ÛŒØª:'
+      silenced_title: Ú•Ø§Ú˜Û• Ù†Ø§Ú†Ø§Ù„Ø§Ú©Û•Ú©Ø§Ù†
+      suspended: 'Ù‡ÛŒÚ† Ø¯Ø§ØªØ§ÛŒÛ•Ú© Ù„Û•Ù… Ú•Ø§Ú˜Ø§Ù†Û•ÙˆÛ• Ù¾Ø±Û†Ø³Û• Ù†Ø§Ú©Ø±ÛŽØªØŒ Ø®Û•Ø²Ù† Ø¯Û•Ú©Ø±ÛŽØª ÛŒØ§Ù† Ø¯Û•Ú¯Û†Ú•Ø¯Ø±ÛŽØªÛ•ÙˆÛ•ØŒ ÙˆØ§ Ø¯Û•Ú©Ø§Øª Ù‡ÛŒÚ† Ú©Ø§Ø±Ù„ÛŽÚ© ÛŒØ§Ù† Ù¾Û•ÛŒÙˆÛ•Ù†Ø¯ÛŒÛŒÛ•Ú© Ù„Û•Ú¯Û•Úµ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù† Ù„Û•Ù… Ú•Ø§Ú˜Ø§Ù†Û• Ù…Û•ØØ§Úµ Ø¨ÛŽØª:'
+      suspended_title: Ú•Ø§Ú˜Û• Ú•Ø§Ú¯ÛŒØ±Ø§ÙˆÛ•Ú©Ø§Ù†
+    unavailable_content_html: Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† Ø¨Û• Ú¯Ø´ØªÛŒ Ú•ÛŽÚ¯Û•Øª Ù¾ÛŽØ¯Û•Ø¯Ø§Øª Ø¨Û† Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ù†Ø§ÙˆÛ•Ú•Û†Ú© Ù„Û• Ùˆ Ú©Ø§Ø±Ù„ÛŽ Ú©Ø±Ø¯Ù† Ù„Û•Ú¯Û•Úµ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù† Ù„Û• Ù‡Û•Ø± Ú•Ø§Ú˜Û•ÛŒÛ•Ú©ÛŒ ØªØ± Ø¨Û• Ú¯Ø´ØªÛŒ. Ø¦Û•Ù…Ø§Ù†Û• Ø¦Û•Ùˆ Ø¨Û•Ø¯Û•Ø±Ú©Ø±Ø¯Ù†Ø§Ù†Û•Ù† Ú©Û• Ú©Ø±Ø§ÙˆÙ† Ù„Û•Ø³Û•Ø± Ø¦Û•Ù… Ú•Ø§Ú˜Û• ØªØ§ÛŒØ¨Û•ØªÛ•.
+    user_count_after:
+      one: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±
+      other: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†
+    user_count_before: "`Ø®Ø§ÙˆÛ•Ù†"
+    what_is_mastodon: Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† Ú†ÛŒÛŒÛ•?
+  accounts:
+    choices_html: 'Ù‡Û•ÚµØ¨Ú˜Ø§Ø±Ø¯Ù†Û•Ú©Ø§Ù†ÛŒ %{name}:'
+    endorsements_hint: Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø¦Û•Ùˆ Ú©Û•Ø³Ø§Ù†Û• Ù¾Û•Ø³Û•Ù†Ø¯ Ø¨Ú©Û•ÛŒØª Ú©Û• Ù¾Û•ÛŒÚ•Û•ÙˆÛŒØ§Ù† Ø¯Û•Ú©Û•ÛŒØª Ù„Û• Ú•ÙˆÙˆÚ©Ø§Ø±ÛŒ ÙˆÛŽØ¨ØŒ Ùˆ Ø¦Û•ÙˆØ§Ù† Ù„ÛŽØ±Û• Ø¯Û•Ø±Ø¯Û•Ú©Û•ÙˆÙ†.
+    featured_tags_hint: Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ù‡Ø§Ø´ØªØ§Ú¯ÛŒ ØªØ§ÛŒØ¨Û•Øª Ù¾ÛŽØ´Ú©Û•Ø´ Ø¨Ú©Û•ÛŒØª Ú©Û• Ù„ÛŽØ±Û• Ù¾ÛŒØ´Ø§Ù† Ø¯Û•Ø¯Ø±ÛŽØª.
+    follow: Ø´ÙˆÛŽÙ† Ú©Û•ÙˆÛ•
+    followers:
+      one: Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆÙˆ
+      other: Ø´ÙˆÛŽÙ†â€ŒÚ©Û•ÙˆØªÙˆÙˆØ§Ù†
+    following: Ø´ÙˆÛŽÙ†â€ŒÚ©Û•ÙˆØªÙˆÙˆÛŒ
+    joined: Ø¨Û•Ø´Ø¯Ø§Ø±ÛŒ %{date}
+    last_active: Ø¯ÙˆØ§ Ú†Ø§Ù„Ø§Ú©ÛŒ
+    link_verified_on: Ø®Ø§ÙˆÛ•Ù†Ø¯Ø§Ø±ÛŒÛ•ØªÛŒ Ø¦Û•Ù… Ù„ÛŒÙ†Ú©Û• Ù„Û• %{date} Ú†ÛŽÚ© Ú©Ø±Ø§ÙˆÛ•
+    media: Ù…ÛŒØ¯ÛŒØ§
+    moved_html: "%{name} Ú¯ÙˆØ§Ø³ØªØ±Ø§ÙˆÛ•ØªÛ•ÙˆÛ• Ø¨Û† %{new_profile_link}:"
+    network_hidden: Ø¦Û•Ù… Ø²Ø§Ù†ÛŒØ§Ø±ÛŒÛ• Ø¨Û•Ø±Ø¯Û•Ø³Øª Ù†ÛŒÛ•
+    never_active: Ù‡Û•Ø±Ú¯ÛŒØ²
+    nothing_here: Ù„ÛŽØ±Û• Ù‡ÛŒÚ† Ù†ÛŒÛŒÛ•!
+    people_followed_by: Ø¦Û•Ùˆ Ú©Û•Ø³Ø§Ù†Û•ÛŒ Ú©Û• %{name} Ø¨Û•Ø¯ÙˆØ§ÛŒØ¯Ø§ Ø¯Û•Ú©Û•ÙˆÙ†
+    people_who_follow: Ø¦Û•Ùˆ Ú©Û•Ø³Ø§Ù†Û•ÛŒ Ú©Û• Ø¨Û•Ø¯ÙˆØ§ÛŒ %{name} Ø¯Ø§ Ø¯Û•Ú©Û•ÙˆÙ†
+    pin_errors:
+      following: ØªÛ† Ø¯Û•Ø¨ÛŽØª Ù‡Û•Ø± Ø¦ÛŽØ³ØªØ§ Ø¨Û• Ø¯ÙˆØ§ÛŒ Ø¦Û•Ùˆ Ú©Û•Ø³Û•Ø¯Ø§ Ø¨ÛŒØª Ú©Û• Ø¯Û•ØªÛ•ÙˆÛŽØª Ù¾Û•Ø³Û•Ù†Ø¯ÛŒ Ø¨Ú©Û•ÛŒØª
+    posts:
+      one: ØªÙˆØª
+      other: ØªÙˆÙˆØªÛ•Ú©Ø§Ù†
+    posts_tab_heading: ØªÙˆÙˆØªÛ•Ú©Ø§Ù†
+    posts_with_replies: ØªÙˆÙˆØªÛ•Ú©Ø§Ù† Ùˆ ÙˆÚµØ§Ù…Û•Ú©Ø§Ù†
+    reserved_username: Ù†Ø§ÙˆÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø± Ù¾Ø§Ø±ÛŽØ²Ø±Ø§ÙˆÛ•
+    roles:
+      admin: Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Û•Ø±
+      bot: Ø¨Û†Øª
+      group: Ú¯Ø±ÙˆÙˆÙ¾
+      moderator: Ù…Û†Ø¯
+    unavailable: Ù¾Ø±Û†ÙØ§ÛŒÙ„ Ø¨Û•Ø±Ø¯Û•Ø³Øª Ù†ÛŒÛ•
+    unfollow: Ø¨Û•Ø¯ÙˆØ§Ø¯Ø§Ù†Û•Ú†Ùˆ
+  admin:
+    account_actions:
+      action: Ø¦Û•Ù†Ø¬Ø§Ù…Ø¯Ø§Ù†ÛŒ Ú©Ø±Ø¯Ø§Ø±
+      title: Ø¦Û•Ù†Ø¬Ø§Ù…Ø¯Ø§Ù†ÛŒ Ú©Ø§Ø±ÛŒ Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Ø±Ø¯Ù† Ù„Û• %{acct}
+    account_moderation_notes:
+      create: Ø¬ÛŽÙ‡ÛŽØ´ØªÙ†ÛŒ ØªÛŽØ¨ÛŒÙ†ÛŒ
+      created_msg: ØªÛŽØ¨ÛŒÙ†ÛŒ Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Û•Ø± Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¯Ø±ÙˆØ³Øª Ú©Ø±Ø§!
+      delete: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•
+      destroyed_msg: ØªÛŽØ¨ÛŒÙ†ÛŒ Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Û•Ø± Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ù„Û•Ù†Ø§ÙˆÚ†ÙˆÙˆ!
+    accounts:
+      add_email_domain_block: Ø¨Ù„Û†Ú©Ú©Ø±Ø¯Ù†ÛŒ Ù‡Û•Ù…ÙˆÙˆ Ø¯Û†Ù…Û•ÛŒÙ†Û•Ú©Û•
+      approve: Ù¾Û•Ø³Û•Ù†Ø¯ Ú©Ø±Ø¯Ù†
+      approve_all: Ù¾Û•Ø³Û•Ù†Ø¯Ú©Ø±Ø¯Ù†ÛŒ Ù‡Û•Ù…ÙˆÙˆ
+      approved_msg: Ø¨Û•Ø±Ù†Ø§Ù…Û•ÛŒ ØªÛ†Ù…Ø§Ø±Ú©Ø±Ø¯Ù†ÛŒ %{username} Ø¨Û† Ú†ÙˆÙˆÙ†Û•Ù†Ø§ÙˆÛŒ Ù¾Û•Ø³Û•Ù†Ø¯ Ú©Ø±Ø§
+      are_you_sure: Ø¯ÚµÙ†ÛŒØ§ÛŒ?
+      avatar: ÙˆÛŽÙ†Û†Ú†Ú©Û•
+      by_domain: Ø¯Û†Ù…Û•ÛŒÙ†
+      change_email:
+        changed_msg: Ø¦ÛŒÙ…Û•ÛŒÚµÛŒ Ø¦Û•Ú˜Ù…ÛŽØ± Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ú¯Û†Ú•Ø§!
+        current_email: Ø¦ÛŒÙ…Û•ÛŒÙ„ÛŒ Ø¦ÛŽØ³ØªØ§
+        label: Ú¯Û†Ú•ÛŒÙ†ÛŒ Ø¦ÛŒÙ…ÛŽÚµ
+        new_email: Ø¦ÛŒÙ…Û•ÛŒÚµÛŒ Ù†ÙˆÛŽ
+        submit: Ú¯Û†Ú•ÛŒÙ†ÛŒ Ø¦ÛŒÙ…ÛŽÚµ
+        title: Ú¯Û†Ú•ÛŒÙ†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ Ø¨Û† %{username}
+      confirm: Ù¾Ø´ØªÚ•Ø§Ø³ØªÛŒ Ø¨Ú©Û•ÙˆÛ•
+      confirmed: Ù¾Ø´ØªÚ•Ø§Ø³Øª Ú©Ø±Ø§
+      confirming: Ù¾Ø´ØªÚ•Ø§Ø³ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ•
+      delete: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•ÛŒ Ø¯Ø§ØªØ§
+      deleted: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•
+      demote: Ù¾Ù„Û• Ù†Ø²Ù…Ú©Ø±Ø§ÛŒÛ•ÙˆÛ•
+      destroyed_msg: Ø¯Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ %{username} Ù„Û• Ú•ÛŒØ²ÛŒ Ø³Ú•ÛŒÙ†Û•ÙˆÛ•Ù†
+      disable: Ø¨Û•Ø³ØªÙ†
+      disable_two_factor_authentication: Ù„Û•Ú©Ø§Ø±Ø®Ø³ØªÙ†ÛŒ 2FA
+      disabled: Ø¨Û•Ø³ØªÙˆÙˆ
+      display_name: Ù†Ø§ÙˆÛŒ Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†
+      domain: Ø¯Û†Ù…Û•ÛŒÙ†
+      edit: Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒ
+      email: Ù¾Û†Ø³ØªÛŒ Ø¦Û•Ù„Ú©ØªØ±Û†Ù†ÛŒ
+      email_status: Ø¯Û†Ø®ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ
+      enable: Ú†Ø§Ù„Ø§Ú© Ú©Ø±Ø¯Ù†
+      enabled: Ú†Ø§Ù„Ø§Ú©Ú©Ø±Ø§ÙˆÛ•
+      enabled_msg: Ù‡Û•Ú˜Ù…Ø§Ø±Û• %{username} Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø³Ù†ÙˆÙˆØ±Ø¯Ø§Ø± Ú©Ø±Ø§
+      followers: Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†
+      follows: Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†
+      header: Ø³Û•Ø±Ù¾Û•Ú•Û•
+      inbox_url: Ù†ÛŒØ´Ø§Ù†ÛŒ Ù‡Ø§ØªÙ†Û•Ú˜ÙˆÙˆØ±
+      invited_by: Ù‡Ø§ØªÛ†ØªÛ• Ú˜ÙˆØ±Û•ÙˆÛ• Ù„Û• Ù„Ø§ÛŒÛ•Ù†
+      ip: Ø¦Ø§ÛŒâ€ŒÙ¾ÛŒ
+      joined: Ø¦Û•Ù†Ø¯Ø§Ù… Ø¨ÙˆÙˆ Ù„Û•
+      location:
+        all: Ù‡Û•Ù…ÙˆÙˆ
+        local: Ù†Ø§ÙˆØ®Û†ÛŒÛŒ
+        remote: Ø¯ÙˆÙˆØ±
+        title: Ø´ÙˆÛŽÙ†
+      login_status: Ø¯Û†Ø®ÛŒ Ú†ÙˆÙˆÙ†Û•Ú˜ÙˆÙˆØ±Û•ÙˆÛ•
+      media_attachments: Ù‡Ø§ÙˆÙ¾ÛŽÚ†ÛŒ Ù…ÛŒØ¯ÛŒØ§
+      memorialize: Ú¯Û†Ú•Ø§Ù† Ø¨Û• ÛŒØ§Ø¯Û•ÙˆÛ•Ø±ÛŒ
+      memorialized: Ø¨ÛŒØ±Ú©Û•ÙˆØªÙ†Û•ÙˆÛ•
+      memorialized_msg: Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ %{username} Ø¨Û† Ù‡Û•Ú˜Ù…Ø§Ø±ÛŽÚ©ÛŒ Ø¨ÛŒØ±Û•ÙˆÛ•Ø±ÛŒ Ú¯Û†Ú•Ø§
+      moderation:
+        active: Ú†Ø§Ù„Ø§Ú©
+        all: Ù‡Û•Ù…ÙˆÙˆ
+        pending: Ú†Ø§ÙˆÛ•Ú•ÙˆØ§Ù†
+        silenced: Ø¨ÛŽØ¯Û•Ù†Ú¯
+        suspended: Ú•Ø§Ú¯Ø±ØªÙ†
+        title: Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Ø±Ø¯Ù†
+      moderation_notes: Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Ø±Ø¯Ù†ÛŒ ØªÛŽØ¨ÛŒÙ†ÛŒÛ•Ú©Ø§Ù†
+      most_recent_activity: Ù†ÙˆÛŽØªØ±ÛŒÙ† Ú†Ø§Ù„Ø§Ú©ÛŒ
+      most_recent_ip: Ù†ÙˆÛŽØªØ±ÛŒÙ† Ø¦Ø§ÛŒ Ù¾ÛŒ
+      no_account_selected: Ù‡ÛŒÚ† Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒÛ•Ú© Ù†Û•Ú¯Û†Ú•Ø§ÙˆÛ• ÙˆÛ•Ú© Ø¦Û•ÙˆÛ•ÛŒ Ù‡ÛŒÚ† ÛŒÛ•Ú©ÛŽÚ© Ø¯ÛŒØ§Ø±ÛŒ Ù†Û•Ú©Ø±Ø§ÙˆÛ•
+      no_limits_imposed: Ù‡ÛŒÚ† Ø³Ù†ÙˆÙˆØ±ÛŽÚ© Ù†Û•Ø³Û•Ù¾ÛŽÙ†Ø±Ø§
+      not_subscribed: Ø¨Û•Ø´Ø¯Ø§Ø± Ù†Û•Ø¨ÙˆÙˆ
+      pending: Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ•ÛŒ Ú†Ø§ÙˆÛ•Ú•ÙˆØ§Ù†
+      perform_full_suspension: Ú•Ø§Ú¯Ø±ØªÙ†
+      promote: Ø¨Û•Ø±Ø²Ú©Ø±Ø¯Ù†Û•ÙˆÛ•
+      protocol: Ù¾Ø±Û†ØªÛ†Ú©Û†Ù„
+      public: Ú¯Ø´ØªÛŒ
+      push_subscription_expires: Ø¨Û•Ø´Ø¯Ø§Ø±ÛŒ PuSH Ø¨Û•Ø³Û•Ø± Ø¯Û•Ú†ÛŽØª
+      redownload: Ù†ÙˆÛŽÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„
+      redownloaded_msg: Ù¾Ø±Û†ÙØ§ÛŒÙ„ÛŒ %{username} Ù„Û• Ø¨Ù†Û•Ú•Û•ØªÛ•ÙˆÛ• Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ù†ÙˆÛŽÚ©Ø±Ø§ÛŒÛ•ÙˆÛ•
+      reject: Ú•Û•ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ•
+      reject_all: Ù‡Û•Ù…ÙˆÙˆ Ú•Û•Øª Ø¨Ú©Û•ÙˆÛ•
+      rejected_msg: Ø¨Û•Ø±Ù†Ø§Ù…Û•ÛŒ ØªÛ†Ù…Ø§Ø±Ú©Ø±Ø¯Ù†ÛŒ %{username} Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ú•Û•ØªÚ©Ø±Ø§ÛŒÛ•ÙˆÛ•
+      remove_avatar: Ù„Ø§Ø¨Ø±Ø¯Ù†ÛŒ ÙˆÛŽÙ†Û†Ø¬Ú©Û•
+      remove_header: Ø³Û•Ø±Ù¾Û•Ú• Ù„Ø§Ø¨Ø¯Û•
+      removed_avatar_msg: ÙˆÛŽÙ†Û•ÛŒ Ø¦Û•Ú¤Ø§ØªØ§Ø± %{username} Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ù„Ø§Ø¨Ø±Ø§
+      removed_header_msg: Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ ÙˆÛŽÙ†Û•ÛŒ Ø³Û•Ø±Ù¾Û•Ú•Û•ÛŒ %{username} Ù„Ø§Ø¨Ø±Ø§
+      resend_confirmation:
+        already_confirmed: Ø¦Û•Ù… Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Û• Ù¾ÛŽØ´ØªØ± Ù¾Ø´ØªÚ•Ø§Ø³ØªÚ©Ø±Ø§ÙˆÛ•ØªÛ•ÙˆÛ•
+        send: Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ù†Ø§Ø±Ø¯Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛŒ Ø¯ÙˆÙˆÙ¾Ø§ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ•
+        success: Ø¦ÛŒÙ…Û•ÛŒÚµÛŒ Ù¾Ø´ØªÚ•Ø§Ø³ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ• Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ù†ÛŽØ±Ø¯Ø±Ø§!
+      reset: Ú•ÛŽÚ©Ø®Ø³ØªÙ†Û•ÙˆÛ•
+      reset_password: Ú¯Û•Ú•Ø§Ù†Û•ÙˆÛ•ÛŒ ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•
+      resubscribe: Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ø¦Ø§Ø¨ÙˆÙ†Û•Ø¨ÙˆÙˆÙ†
+      role: Ù…Û†ÚµÛ•ØªÛ•Ú©Ø§Ù†
+      roles:
+        admin: Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Û•Ø±
+        moderator: Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Û•Ø±
+        staff: Ø³ØªØ§Ù
+        user: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±
+      search: Ú¯Û•Ú•Ø§Ù†
+      search_same_email_domain: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†ÛŒ Ø¯ÛŒÚ©Û• Ø¨Û• Ø¦ÛŒÙ…Û•ÛŒÙ„ÛŒ ÛŒÛ•Ú©Ø³Ø§Ù†
+      search_same_ip: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†ÛŒ ØªØ± Ø¨Û•Ù‡Û•Ù…Ø§Ù† Ø¦Ø§ÛŒ Ù¾ÛŒ
+      sensitive: Ù‡Û•Ø³ØªÛŒØ§Ø±
+      sensitized: ÙˆÛ•Ú© Ù‡Û•Ø³ØªÛŒØ§Ø± Ù†ÛŒØ´Ø§Ù† Ú©Ø±Ø§ÙˆÛ•
+      shared_inbox_url: Ø¨Û•Ø³ØªÛ•Ø±ÛŒ Ø³Ù†Ø¯ÙˆÙ‚ÛŒ Ù‡Ø§ÙˆØ¨Û•Ø´Ú©Ø±Ø§Ùˆ
+      show:
+        created_reports: Ú¯ÙˆØ²Ø§Ø±Ø´ØªÛŒ ØªÛ†Ù…Ø§Ø±Ú©Ø±Ø§ÙˆÛ•
+        targeted_reports: Ú¯ÙˆØ²Ø§Ø±Ø´ØªÚ©Ø±Ø§ÙˆÛ• Ù„Û•Ù„Ø§ÛŒÛ•Ù† Ú©Û•Ø³Ø§Ù†ÛŒ ØªØ±Û•ÙˆÛ•
+      silence: Ø³Ù†ÙˆÙˆØ±
+      silenced: Ø³Ù†ÙˆÙˆØ±Ú©Ø±Ø§
+      statuses: Ø¯Û†Ø®Û•Ú©Ø§Ù†
+      subscribe: Ø¦Ø§Ø¨ÙˆÙˆÙ†Û•
+      suspended: Ú•Ø§Ú¯Ø±ØªÙ†
+      suspension_irreversible: Ø¯Ø§ØªØ§ÛŒ Ø¦Û•Ù… Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒÛ• Ø¨Û• Ø´ÛŽÙˆÛ•ÛŒÛ•Ú©ÛŒ Ù†Ø§Ø¦Ø§Ø³Ø§ÛŒÛŒ Ø³Ú•Ø§ÙˆÛ•ØªÛ•ÙˆÛ•. Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ú•Ø§Ø¨Ø®Û•ÛŒØª Ø¨Û† Ø¦Û•ÙˆÛ•ÛŒ Ø¨Û•Ú©Ø§Ø±Ø¨ÛŽØª Ø¨Û•ÚµØ§Ù… Ù‡ÛŒÚ† Ø¯Ø§ØªØ§ÛŒÛ•Ú© Ù†Ø§Ú¯Û•Ú•Ú¯Û•Ú•ÛŽØªÛ•ÙˆÛ• Ú©Û• Ù¾ÛŽØ´ØªØ± Ø¨ÙˆÙˆÙ†ÛŒ Ø¨ÙˆÙˆ.
+      suspension_reversible_hint_html: Ù‡Û•Ú˜Ù…Ø§Ø±Û• Ú•Ø§Ú¯ÛŒØ±Ø§ ØŒ Ùˆ Ø¯Ø§ØªØ§Ú©Û• Ø¨Û•ØªÛ•ÙˆØ§ÙˆÛŒ Ù„Û• %{date} Ù„Ø§Ø¯Û•Ø¨Ø±ÛŽØª. ØªØ§ Ø¦Û•Ùˆ Ú©Ø§ØªÛ• Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û• Ø¯Û•ØªÙˆØ§Ù†Ø±ÛŽØª Ø¨Û• Ø¨ÛŽ Ù‡ÛŒÚ† Ú©Ø§Ø±ÛŒÚ¯Û•Ø±ÛŒÛ•Ú©ÛŒ Ø®Ø±Ø§Ù¾ Ø¨Ú˜Ù…ÛŽØ±Ø¯Ø±ÛŽØªÛ•ÙˆÛ•. Ø¦Û•Ú¯Û•Ø± Ø¯Û•ØªÛ•ÙˆÛŽØª Ù‡Û•Ù…ÙˆÙˆ Ø¯Ø§ØªØ§Ú©Ø§Ù†ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û• Ø¨Ø³Ú•Û•ÙˆÛ•ØŒ Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ù„Û• Ø®ÙˆØ§Ø±Û•ÙˆÛ• Ø¦Û•Ù…Û• Ø¨Ú©Û•ÛŒØª.
+      time_in_queue: Ú†Ø§ÙˆÛ•Ú•ÙˆØ§Ù†ÛŒ Ù„Û• Ú•ÛŒØ²Ø¯Ø§ %{time}
+      title: Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Ø§Ù†
+      unconfirmed_email: Ø¦ÛŒÙ…Û•ÛŒÚµÛŒ Ù¾Ø´ØªÚ•Ø§Ø³ØªÙ†Û•Ú©Ø±Ø§Ùˆ
+      undo_sensitized: " Ù‡Û•Ø³ØªÛŒØ§Ø± Ù†Û•Ú©Ø±Ø¯Ù†"
+      undo_silenced: Ø¨ÛŽØ¯Û•Ù†Ú¯ Ø¨Ø¨Û•
+      undo_suspension: Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ú•Ø§Ú¯Ø±ØªÙ†
+      unsilenced_msg: Ù‡Û•Ú˜Ù…Ø§Ø±ÛŒ %{username} Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¨ÛŽØ³Ù†ÙˆÙˆØ± Ú©Ø±Ø§
+      unsubscribe: Ø¨Û•ØªØ§ÚµÚ©Ø±Ø¯Ù†ÛŒ Ø¦Ø§Ø¨ÙˆÙˆÙ†Û•
+      unsuspended_msg: Ù‡Û•Ú˜Ù…Ø§Ø±Û• %{username} Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¦Ø§Ø¨ÙˆÙˆÙ†Û•ÛŒ Ø¨Û•ØªØ§ÚµÚ©Ø±Ø§
+      username: Ù†Ø§ÙˆÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±
+      view_domain: Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ú©ÙˆØ±ØªÛ•Ø¨Û† Ø¯Û†Ù…Û•ÛŒÙ†
+      warn: ÙˆØ±ÛŒØ§Ú©Ø±Ø¯Ù†Û•ÙˆÛ•
+      web: Ù…Ø§ÚµÙ¾Û•Ú•
+      whitelisted: Ù¾ÛŽØ±Ø³ØªÛŒ Ú•ÛŽÙ¾ÛŽØ¯Ø±Ø§Ùˆ
+    action_logs:
+      action_types:
+        assigned_to_self_report: ØªÛ•Ø±Ø®Ø§Ù†Ú©Ø±Ø¯Ù†ÛŒ Ú¯ÙˆØ²Ø§Ø±Ø´Øª
+        change_email_user: Ú¯Û†Ú•ÛŒÙ†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ Ø¨Û† Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±
+        confirm_user: Ø¯ÚµÙ†ÛŒØ§Ø¨ÙˆÙˆÙ† Ù„Û• Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±
+        create_account_warning: Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯Ù†ÛŒ Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒ
+        create_announcement: Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯Ù†ÛŒ Ø±Ø§Ú¯Û•ÛŒÛ•Ù†Ø¯Ø±Ø§Ùˆ
+        create_custom_emoji: Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯Ù†ÛŒ Ø¦ÛŽÙ…Û†Ù…Û†Ø¬ÛŒ Ø¯ÚµØ®ÙˆØ§Ø²
+        create_domain_allow: Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯Ù†ÛŒ Ú•ÛŽÙ¾ÛŽØ¯Ø§Ù† Ø¨Û• Ø¯Û†Ù…Û•ÛŒÙ†
+        create_domain_block: Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯Ù†ÛŒ Ø¨Ù„Û†Ú©ÛŒ Ø¯Û†Ù…Û•ÛŒÙ†
+        create_email_domain_block: Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯Ù†ÛŒ Ø¨Ù„Û†Ú©ÛŒ Ø¯Û†Ù…Û•ÛŒÙ†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ
+        create_ip_block: Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯Ù†ÛŒ ÛŒØ§Ø³Ø§ÛŒ IP
+        demote_user: Ø¯Ø§Ø¨Û•Ø²Ø§Ù†Ø¯Ù†ÛŒ Ø¦Ø§Ø³ØªÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±
+        destroy_announcement: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•ÛŒ Ø±Ø§Ú¯Û•ÛŒÛ•Ù†Ø¯Ø±Ø§Ùˆ
+        destroy_custom_emoji: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•ÛŒ Ø¦ÛŽÙ…Û†Ù…Û†Ø¬ÛŒ ØªØ§ÛŒØ¨Û•ØªÙ…Û•Ù†Ø¯
+        destroy_domain_allow: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•ÛŒ Ú•ÛŽÙ¾ÛŽØ¯Ø§Ù† Ø¨Û• Ø¯Û†Ù…Û•ÛŒÙ†
+        destroy_domain_block: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•ÛŒ Ø¨Ù„Û†Ú©ÛŒ Ø¯Û†Ù…Û•ÛŒÙ†
+        destroy_email_domain_block: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•ÛŒ Ø¨Ù„Û†Ú©ÛŒ Ø¯Û†Ù…Û•ÛŒÙ†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ
+        destroy_ip_block: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•ÛŒ ÛŒØ§Ø³Ø§ÛŒ IP
+        destroy_status: Ø¯Û†Ø® Ø¨Ø³Ú•Û•ÙˆÛ•
+        disable_2fa_user: Ù„Û•Ú©Ø§Ø±Ø®Ø³ØªÙ†ÛŒ 2FA
+        disable_custom_emoji: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•ÛŒ Ø¦ÛŽÙ…Û†Ù…Û†Ø¬ÛŒ ØªØ§ÛŒØ¨Û•ØªÙ…Û•Ù†Ø¯
+        disable_user: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø± Ù„Û• Ú©Ø§Ø±Ø¨Ø®Û•
+        enable_custom_emoji: Ø¦ÛŒÙ…Û†Ù…Û†Ø¬ÛŒ ØªØ§ÛŒØ¨Û•ØªÙ…Û•Ù†Ø¯ Ú†Ø§Ù„Ø§Ú© Ø¨Ú©Û•
+        enable_user: Ú†Ø§Ù„Ø§Ú©Ú©Ø±Ø¯Ù†ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±
+        memorialize_account: Ù‡Û•Ú˜Ù…Ø§Ø±ÛŒ Ø¨ÛŒØ±Ú©Û•ÙˆØªÙ†Û•ÙˆÛ•
+        promote_user: Ø¨Û•Ø±Ø²Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±
+        remove_avatar_user: Ù„Ø§Ø¨Ø±Ø¯Ù†ÛŒ ÙˆÛŽÙ†Û†Ø¬Ú©Û•
+        reopen_report: Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ú¯ÙˆØ²Ø§Ø±Ø´Øª
+        reset_password_user: Ú¯Û•Ú•Ø§Ù†Û•ÙˆÛ•ÛŒ ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•
+        resolve_report: Ú¯ÙˆØ²Ø§Ø±Ø´Øª Ú†Ø§Ø±Û•Ø³Û•Ø±Ø¨Ú©Û•
+        sensitive_account: Ù…ÛŒØ¯ÛŒØ§Ú©Û• Ù„Û• Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª ÙˆÛ•Ú© Ù‡Û•Ø³ØªÛŒØ§Ø± Ù†ÛŒØ´Ø§Ù†Û• Ø¨Ú©Û•
+        silence_account: Ù‡Û•Ú˜Ù…Ø§Ø±ÛŒ Ø¨ÛŽØ¯Û•Ù†Ú¯ÛŒ
+        suspend_account: Ú•Ø§Ú¯Ø±ØªÙ†ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•
+        unassigned_report: Ú¯ÙˆØ²Ø§Ø±Ø´ØªÛŒ Ø¯ÛŒØ§Ø±ÛŒÙ†Û•Ú©Ø±Ø§Ùˆ
+        unsensitive_account: Ù…ÛŒØ¯ÛŒØ§Ú©Û• Ù„Û• Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª ÙˆÛ•Ú© Ù‡Û•Ø³ØªÛŒØ§Ø± Ù†ÛŒØ´Ø§Ù†Û• Ù…Û•Ú©Û•
+        unsilence_account: Ù‡Û•Ú˜Ù…Ø§Ø±ÛŒ Ø¨ÛŽ Ø¯Û•Ù†Ú¯
+        unsuspend_account: Ù‡Û•Ú˜Ù…Ø§Ø±ÛŒ Ù‡Û•ÚµÙ†Û•ÙˆÛ•Ø³ØªÛŽÙ†Ø±Ø§Ùˆ
+        update_announcement: Ø¨Û•Ú•Û†Ú˜Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø±Ø§Ú¯Û•ÛŒÛ•Ù†Ø¯Ø±Ø§Ùˆ
+        update_custom_emoji: Ø¨Û•Ú•Û†Ú˜Ú©Ø±Ø¯Ù†ÛŒ Ø¦ÛŽÙ…Û†Ù…Û†Ø¬ÛŒ Ø¯ÚµØ®ÙˆØ§Ø²
+        update_status: Ø¨Û•Ú•Û†Ú˜Ú©Ø±Ø¯Ù†ÛŒ Ø¯Û†Ø®
+      actions:
+        assigned_to_self_report: "%{name} Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ• Ø¨Û• Ú¯ÙˆØ²Ø§Ø±Ø´ØªÛŒ %{target} Ù„Û• Ø¦Û•Ø³ØªÛ† Ú¯Ø±ØªÙˆÙˆÛ•"
+        change_email_user: "%{name} Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÙ„ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŒÙ†Û•Ø±ÛŒ %{target} Ú¯Û†Ú•Ø§"
+        confirm_user: "%{name} Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÙ„ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŒÙ†Û•Ø±ÛŒ %{target} Ù¾Û•Ø³Û•Ù†Ø¯ Ú©Ø±Ø¯"
+        create_account_warning: "%{name} Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒÛŽÚ© Ø¨Û† %{target} Ù†Ø§Ø±Ø¯"
+        create_announcement: "%{name} Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒ Ù†ÙˆÛŽÛŒ Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯ %{target}"
+        create_custom_emoji: "%{name} Ø¦ÛŒÙ…Û†Ø¬ÛŒ Ù†ÙˆÛŽÛŒ %{target} Ø¨Ø§Ø±Ú©Ø±Ø¯"
+        create_domain_allow: "%{name} Ø¯Û†Ù…Û•ÛŒÙ†ÛŒ %{target} Ú•ÛŽÙ¾ÛŽØ¯Ø§"
+        create_domain_block: "%{name} Ø¯Û†Ù…Û•Ù†ÛŒ %{target} Ø¨Ù„Û†Ú©Ú©Ø±Ø¯"
+        create_email_domain_block: "%{name} Ø¯Û†Ù…Û•ÛŒÙ†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÙ„ÛŒ %{target} Ø¨Ù„Û†Ú©Ú©Ø±Ø¯"
+        create_ip_block: "%{name} ÛŒØ§Ø³Ø§ÛŒ Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø§Ùˆ Ø¨Û† Ø¦Ø§ÛŒâ€ŒÙ¾ÛŒ %{target}"
+        demote_user: "%{name} Ø¦Ø§Ø³ØªÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŒ %{target} Ø¯Ø§Ø¨Û•Ø²Ø§Ù†Ø¯"
+        destroy_announcement: "%{name} Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒ %{target} Ø³Ú•ÛŒÛ•ÙˆÛ•"
+        destroy_custom_emoji: "%{name} Ø¦ÛŒÙ…Û†Ø¬ÛŒ %{target} Ù„Û• Ù†Ø§ÙˆØ¨Ø±Ø¯"
+        destroy_domain_allow: "%{name} Ø¯Û†Ù…Û•Ù†ÛŒ%{target} Ù„Û• Ù¾ÛŽØ±Ø³ØªÛŒ Ú•ÛŽÙ¾ÛŽØ¯Ø±Ø§Ùˆ Ù„Ø§Ø¨Ø±Ø¯"
+        destroy_domain_block: "%{name} Ø¨Û•Ø±Ú¯ÛŒØ±ÛŒ Ù„Û• Ø¯Û†Ù…Û•ÛŒÙ†ÛŒ %{target} Ù„Ø§Ø¨Ø±Ø¯"
+        destroy_email_domain_block: "%{name} Ø¯Û†Ù…Û•ÛŒÙ†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÙ„ÛŒ %{target} Ø®Ø³ØªÛ• Ù¾ÛŽØ±Ø³ØªÛŒ Ú•ÛŽÙ¾ÛŽØ¯Ø±Ø§Ùˆ"
+        destroy_ip_block: "%{name} ÛŒØ§Ø³Ø§ÛŒ Ø³Ú•ÛŒÙ†Û•ÙˆÛ• Ø¨Û† Ø¦Ø§ÛŒâ€ŒÙ¾ÛŒ %{target}"
+        destroy_status: "%{name} Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•ÛŒ %{target} Ø³Ú•ÛŒÛ•ÙˆÛ•"
+        disable_2fa_user: "%{name} Ø¯ÙˆÙˆ Ù…Û•Ø±Ø¬ÛŒ ÙØ§Ú©ØªÛ•Ø± Ø¨Û† Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø± %{target} Ù„Û• Ú©Ø§Ø±Ø®Ø³Øª"
+        disable_custom_emoji: "%{name} Ø¦ÛŒÙ…Û†Ø¬ÛŒ %{target} Ù†Ø§Ú†Ø§Ù„Ø§Ú© Ú©Ø±Ø¯"
+        disable_user: "%{name} Ú†ÙˆÙˆÙ†Û•Ú˜ÙˆÙˆØ±Û•ÙˆÛ•ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŒ %{target} Ù„Û•Ú©Ø§Ø±Ø®Ø³Øª"
+        enable_custom_emoji: "%{name} Ø¦ÛŒÙ…Û†Ø¬ÛŒ %{target} Ú†Ø§Ù„Ø§Ú© Ú©Ø±Ø¯"
+        enable_user: "%{name} Ú†ÙˆÙˆÙ†Û•Ú˜ÙˆÙˆØ±Û•ÙˆÛ•ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŒ %{target} Ú†Ø§Ù„Ú©Ú©Ø±Ø¯"
+        memorialize_account: "%{name} Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŒ %{target} Ú¯Û†Ú•Ø§ Ø¨Û• Ù¾Û•Ú•Û•ÛŒ ÛŒØ§Ø¯Û•ÙˆÛ•Ø±ÛŒ"
+        promote_user: "%{name} Ø¦Ø§Ø³ØªÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŒ %{target} Ø¨Û•Ø±Ø²Ú©Ø±Ø¯Û•ÙˆÛ•"
+        remove_avatar_user: "%{name} ÙˆÛŽÙ†Û†Ú†Ú©Û•ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŒ %{target} Ø³Ú•ÛŒÛ•ÙˆÛ•"
+        reopen_report: "%{name} Ú¯ÙˆØ²Ø§Ø±Ø´ØªÛŒ %{target} Ø¯ÙˆÙˆØ¨Ø§Ø±Û• ÙˆÛ•Ú¯Ú•Ø®Ø³ØªÛ•ÙˆÛ•"
+        reset_password_user: "%{name} ØªÛŽÙ¾Û•Ø±ÙˆØ´Û•ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŒ %{target} Ú¯Û•Ú•Ø§Ù†Û•ÙˆÛ•"
+        resolve_report: "%{name} Ú¯ÙˆØ²Ø§Ø±Ø´ØªÛŒ %{target} Ø¯ÙˆÙˆØ¨Ø§Ø±Û• ÙˆÛ•Ú¯Ú•Ø®Ø³ØªÛ•ÙˆÛ•"
+        sensitive_account: "%{name} Ø¨Û• %{target}'s Ù…ÛŒØ¯ÛŒØ§ ÙˆÛ•Ú© Ù‡Û•Ø³ØªÛŒØ§Ø± Ø¯ÛŒØ§Ø±ÛŒ Ú©Ø±Ø§ÙˆÛ•"
+        silence_account: "%{name} Ù‡Û•Ú˜Ù…Ø§Ø±ÛŒ %{target}'s Ø¨ÛŽØ¯Û•Ù†Ú¯ Ú©Ø±Ø§"
+        suspend_account: "%{name} Ù‡Û•Ú˜Ù…Ø§Ø±ÛŒ %{target}'ÛŒ Ú•Ø§Ú¯ÛŒØ±Ø§"
+        unassigned_report: "%{name} Ú•Ø§Ù¾Û†Ø±ØªÛŒ Ø¯ÛŒØ§Ø±ÛŒ Ù†Û•Ú©Ø±Ø§ÙˆÛŒ %{target}"
+        unsensitive_account: "%{name} Ø¨Û• %{target}'s Ù…ÛŒØ¯ÛŒØ§ ÙˆÛ•Ú© Ù‡Û•Ø³ØªÛŒØ§Ø± Ø¯ÛŒØ§Ø±ÛŒ Ù†Û•Ú©Ø±Ø§ÙˆÛ•"
+        unsilence_account: "%{name} Ù‡Û•Ú˜Ù…Ø§Ø±ÛŒ %{target}'s Ø¨ÛŽ Ø¯Û•Ù†Ú¯"
+        unsuspend_account: "%{name} Ù‡Û•Ú˜Ù…Ø§Ø±ÛŒ %{target}'s Ù‡Û•ÚµÙ†Û•Ù¾Û•Ø³ÛŽØ±Ø¯Ø±Ø§Ùˆ"
+        update_announcement: "%{name} Ø¨Û•Ú•Û†Ú˜Ú©Ø±Ø§ÙˆÛ•ÛŒ Ø±Ø§Ú¯Û•ÛŒØ§Ù†Ø¯Ù†ÛŒ %{target}"
+        update_custom_emoji: "%{name} Ø¦ÛŒÙ…Û†Ø¬ÛŒ %{target} Ù†ÙˆÛŽÚ©Ø±Ø§ÛŒÛ•ÙˆÛ•"
+        update_status: "%{name} Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•ÛŒ %{target} Ø¨Û•Ú•Û†Ú˜Ú©Ø±Ø¯"
+      deleted_status: "(Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ• Ø³Ú•Ø§ÙˆÛ•)"
+      empty: Ù‡ÛŒÚ† Ù„Ø§Ú¯ÛŒ Ú©Ø§Ø±Ù†Û•Ø¯Û†Ø²Ø±Ø§ÛŒÛ•ÙˆÛ•.
+      filter_by_action: ÙÙ„ØªÛ•Ø± Ú©Ø±Ø¯Ù† Ø¨Û• Ú©Ø±Ø¯Ø§Ø±
+      filter_by_user: ÙÙ„ØªÛ•Ø± Ú©Ø±Ø¯Ù† Ø¨Û• Ú©Ø±Ø¯Ø§Ø±
+      title: ØªÛ†Ù…Ø§Ø±ÛŒ ÙˆØ±Ø¯Ø¨ÛŒÙ†ÛŒ
+    announcements:
+      destroyed_msg: Ø¨Ø§Ù†Ú¯Û•ÙˆØ§Ø²Û•Ú©Û• Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø³Ú•Ø§ÙˆÛ•ØªÛ•ÙˆÛ•!
+      edit:
+        title: Ø¨ÚµØ§ÙˆÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø±Ø§Ú¯Û•ÛŒÛ•Ù†Ø¯Ø±Ø§Ùˆ
+      empty: Ù‡ÛŒÚ† Ø±Ø§Ú¯Û•ÛŒÛ•Ù†Ø¯Ø±Ø§ÙˆÛŽÚ© Ù†Û•Ø¯Û†Ø²Ø±Ø§ÛŒÛ•ÙˆÛ•.
+      live: Ø²ÛŒÙ†Ø¯ÙˆÙˆ
+      new:
+        create: Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯Ù†ÛŒ Ø±Ø§Ú¯Û•ÛŒÛ•Ù†Ø¯Ø±Ø§Ùˆ
+        title: Ú•Ø§Ú¯Û•ÛŒØ§Ù†Ø¯Ù†ÛŒ Ù†ÙˆÛŽ
+      published_msg: Ø¨Ø§Ù†Ú¯Û•ÙˆØ§Ø²Û•Ú©Û• Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¨ÚµØ§Ùˆ Ú©Ø±Ø§ÛŒÛ•ÙˆÛ•!
+      scheduled_for: Ø®Ø´ØªÛ•Ú©Ø±Ø§ÙˆÛ• Ø¨Û† %{time}
+      scheduled_msg: Ú•Ø§Ú¯Û•ÛŒØ§Ù†Ø¯Ù†ÛŒ Ø®Ø´ØªÛ•ÛŒ Ø¨Û† Ø¨ÚµØ§ÙˆÚ©Ø±Ø¯Ù†Û•ÙˆÛ•!
+      title: Ú•Ø§Ú¯Ù‡ ÛŒÙ‡ Ù†Ø±Ø§ÙˆÛ•Ú©Ø§Ù†
+      unpublished_msg: Ø¨Ø§Ù†Ú¯Û•ÙˆØ§Ø² Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¨ÚµØ§ÙˆÙ†Û•Ú©Ø±Ø§ÛŒÛ•ÙˆÛ•!
+      updated_msg: Ø¨Ø§Ù†Ú¯Û•ÙˆØ§Ø²Û•Ú©Û• Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ù†ÙˆÛŽÚ©Ø±Ø§ÛŒÛ•ÙˆÛ•!
+    custom_emojis:
+      assign_category: Ø¯Ø§Ù†Ø§Ù†ÛŒ Ù¾Û†Ù„ÛŽÙ†
+      by_domain: Ø¯Û†Ù…Û•ÛŒÙ†
+      copied_msg: Ú©Û†Ù¾ÛŒÛ•Ú©ÛŒ Ù†Ø§ÙˆØ®Û†ÛŒÛŒ Ø¦ÛŒÙ…Û†Ø¬ÛŒØ¨Û•Ú©Û• Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¯Ø±ÙˆØ³Øª Ú©Ø±Ø¯
+      copy: Ú©Û†Ù¾ÛŒ
+      copy_failed_msg: Ù†Ù‡ÛŒØªÙˆØ§Ù†ÛŒ Ú©Û†Ù¾ÛŒÙ‡Ú©ÛŒ Ù†Ø§ÙˆØ®Û†ÛŒÛŒ Ø¦Ù‡Ùˆ Ø¦ÛŒÙ…Û†Ø¬ÛŒÛŒÛ• Ø¯Ø±ÙˆØ³Øª Ø¨Ú©Ø§Øª
+      create_new_category: Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯Ù†ÛŒ Ù‡Ø§ÙˆÙ¾Û†Ù„ÛŒ Ù†ÙˆÛŽ
+      created_msg: Ø¦ÛŒÙ…Û†Ø¬ÛŒ Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø§!
+      delete: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•
+      destroyed_msg: Ø¦ÛŒÙ…Û†Ø¬ÛŒ Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¨Û•ØªØ§ÚµÚ©Ø±Ø§!
+      disable: Ù„Û•Ú©Ø§Ø±Ø®Ø³ØªÙ†
+      disabled: Ù†Ø§Ú†Ø§Ù„Ø§Ú©Ú©Ø±Ø§ÙˆÛ•
+      disabled_msg: Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¦Û•Ùˆ Ø¦ÛŒÙ…Û†Ø¬ÛŒÛŒÛ• Ù„Û• Ú©Ø§Ø±Ø®Ø±Ø§ÙˆÛ•
+      emoji: Ø¦ÛŒÙ…Û†Ø¬ÛŒ
+      enable: Ú†Ø§Ù„Ø§Ú©Ú©Ø±Ø¯Ù†
+      enabled: Ú†Ø§Ù„Ø§Ú©Ú©Ø±Ø§ÙˆÛ•
+      enabled_msg: Ø¦Û•Ùˆ Ø¦ÛŒÙ…Û†Ø¬ÛŒÛŒÛ• Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆØ§Ù†Û• Ú†Ø§Ù„Ø§Ú© Ú©Ø±Ø§
+      image_hint: PNG ØªØ§ Ù¥Ù Ú©ÛŒÙ„Û†Ø¨Ø§ÛŒØª
+      list: Ù¾ÛŽØ±Ø³Øª
+      listed: Ù¾ÛŽØ±Ø³ØªÚ©Ø±Ø§ÙˆÛ•
+      new:
+        title: Ø¦ÛŒÙ…Û†Ø¬ÛŒ Ù†ÙˆÛŽÛŒ Ø¯ÚµØ®ÙˆØ§Ø² Ø²ÛŒØ§Ø¯ Ø¨Ú©Û•
+      not_permitted: ØªÛ† Ú•ÛŽÚ¯Û•Ù¾ÛŽØ¯Ø±Ø§Ùˆ Ù†ÛŒÙ† Ø¨Û† Ø¦Û•Ù†Ø¬Ø§Ù…Ø¯Ø§Ù†ÛŒ Ø¦Û•Ù… Ú©Ø§Ø±Û•
+      overwrite: Ù†ÙˆÙˆØ³ÛŒÙ†Û•ÙˆÛ•
+      shortcode: Ú©ÙˆØ±ØªÛ•Ú©Ù„ÛŒÙ„
+      shortcode_hint: Ø¨Û•Ù„Ø§ÛŒÛ•Ù†ÛŒ Ú©Û•Ù…Û•ÙˆÛ• Ù¢Ù†ÙˆÙˆØ³Û•ØŒ ØªÛ•Ù†Ù‡Ø§ Ù†ÙˆÙˆØ³Û•Ú©Ø§Ù†ÛŒ Ø¦Û•Ù„Ù Ùˆ Ø¨ÛŽ Ùˆ Ú˜ÛŽØ±Ù‡ÛŽÚµÛ•Ú©Ø§Ù†
+      title: Ø¦ÛŒÙ…Û†Ø¬ÛŒ Ø¯ÚµØ®ÙˆØ§Ø²
+      uncategorized: Ù‡Ø§ÙˆÙ¾Û†Ù„ Ù†Û•Ú©Ø±Ø§ÙˆÛ•
+      unlist: Ø¨ÛŽ Ù¾ÛŽØ±Ø³Øª
+      unlisted: Ù¾ÛŽØ±Ø³Øª Ù†Û•Ø¨ÙˆÙˆÛ•
+      update_failed_msg: Ù†Ù‡ ÛŒØªÙˆØ§Ù†ÛŒ Ø¦Ù‡ Ùˆ Ø¦ÛŒÙ…Û†Ø¬ÛŒÛŒÙ‡ Ù†ÙˆÛŽ Ø¨Ú©Ø§ØªÛ•ÙˆÛ•
+      updated_msg: Ø¦ÛŒÙ…Û†Ø¬ÛŒ Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ù†ÙˆÛŽÚ©Ø±Ø§ÛŒÛ•ÙˆÛ•!
+      upload: Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†
+    dashboard:
+      authorized_fetch_mode: Ø¯Û†Ø®ÛŒ Ù¾Ø§Ø±ÛŽØ²Ø±Ø§Ùˆ
+      backlog: Ú©Ø§Ø±ÛŒ Ù¾Ø´ØªÛ•ÙˆØ§Ø²
+      config: Ø´ÛŽÙˆÛ•Ù¾ÛŽØ¯Ø§Ù†
+      feature_deletions: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•
+      feature_invites: Ø¨Ø§Ù†Ú¯ÛŽØ´ØªÚ©Ø±Ø¯Ù†ÛŒ Ø¨Û•Ø³ØªÛ•Ø±Û•Ú©Ø§Ù†
+      feature_profile_directory: Ú•ÛŽÙ†ÛŒØ´Ø§Ù†Ø¯Û•Ø±ÛŽÚ©ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„
+      feature_registrations: ØªÛ†Ù…Ø§Ø±Ú©Ø±Ø§ÙˆÛ•Ú©Ø§Ù†
+      feature_relay: Ú¯ÙˆØ§Ø³ØªÙ†Û•ÙˆÛ•ÛŒ Ú¯Ø´ØªÛŒ
+      feature_spam_check: Ø¯Ú˜Û• Ø³Ù¾Ø§Ù…
+      feature_timeline_preview: Ù¾ÛŽØ´ Ù†ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•Ú©Ø§Ù†
+      features: ØªØ§ÛŒØ¨Û•ØªÙ…Û•Ù†Ø¯ÛŒÛ•Ú©Ø§Ù†
+      hidden_service: Ù¾Û•ÛŒÙˆÛ•Ù†Ø¯ÛŒ Ù†ÛŽÙˆØ§Ù† Ú•Ø§Ú˜Û• ÛŒØ§Ù† Ø®Ø²Ù…Û•ØªÚ¯ÙˆØ²Ø§Ø±ÛŒ Ù†ÛŽÙ†Ù†ÛŒ
+      open_reports: Ú•Ø§Ù¾Û†Ø±ØªÛ•Ú©Ø§Ù† Ø¨Ú©Û•ÙˆÛ•
+      pending_tags: Ù‡Ø§Ø´ØªØ§Ú¯ÛŒ Ú†Ø§ÙˆÛ•Ú•ÙˆØ§Ù†ÛŒ Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ• Ø¯Û•Ú©Ø§Øª
+      pending_users: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù† Ú†Ø§ÙˆÛ•Ú•ÛŽÛŒ Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ•Ù†
+      recent_users: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†ÛŒ Ø¦Û•Ù… Ø¯ÙˆØ§ÛŒÛŒÛ•
+      search: Ú¯Û•Ú•Ø§Ù†ÛŒ ØªÛ•ÙˆØ§ÙˆÛŒ-Ø¯Û•Ù‚
+      single_user_mode: Ø¯Û†Ø®ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŒ ØªØ§Ú©
+      software: Ù†Û•Ø±Ù…Û•Ú©Ø§Ù„Ø§
+      space: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø§Ù†ÛŒ Ø¨Û†Ø´Ø§ÛŒÛŒ
+      title: Ø¯Ø§Ø´Ø¨Û†Ø±Ø¯
+      total_users: Ú˜Ù…Ø§Ø±Û•ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†
+      trends: ØªØ§Ú¯Û• Ø¨Û•Ø±Ú†Ø§ÙˆÚ©Ø±Ø§ÙˆÛ•Ú©Ø§Ù†
+      week_interactions: Ú†Ø§Ù„Ø§Ú©ÛŒÛ•Ú©Ø§Ù†ÛŒ Ø¦Û•Ù… Ù‡Û•ÙØªÛ•ÛŒÛ•
+      week_users_active: Ú†Ø§Ù„Ø§Ú©ÛŒ Ø¦Û•Ù… Ù‡Û•ÙØªÛ•ÛŒÛ•
+      week_users_new: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†ÛŒ Ø¦Û•Ù… Ù‡Û•ÙØªÛ•ÛŒÛ•
+      whitelist_mode: Ø´ÛŽÙˆÛ•ÛŒ Ù¾ÛŽØ±Ø³ØªÛŒ Ú•ÛŽÙ¾ÛŽØ¯Ø±Ø§Ùˆ
+    domain_allows:
+      add_new: Ú•ÛŽÙ¾ÛŽØ¯Ø§Ù† Ø¨Û• Ø¯Û†Ù…Û•ÛŒÙ†
+      created_msg: Ø¯Û†Ù…Û•ÛŒÙ† Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø±ÛŽÚ¯Û•ÛŒ Ù¾ÛŽØ¯Ø±Ø§
+      destroyed_msg: Ø¯Û†Ù…Û•ÛŒÙ† Ù„Û• Ù¾ÛŽØ±Ø³ØªÛŒ Ø±ÛŽÚ¯Û•ÛŒ Ù¾ÛŽØ¯Ø±Ø§ Ù„Ø§Ø¨Ø±Ø§
+      undo: Ù„Ø§Ø¨Ø±Ø¯Ù† Ù„Û• Ù¾ÛŽØ±Ø³ØªÛŒ Ú•ÛŽÙ¾ÛŽØ¯Ø±Ø§Ùˆ
+    domain_blocks:
+      add_new: Ø²ÛŒØ§Ø¯Ú©Ø±Ø¯Ù†ÛŒ Ø¨Ù„Û†Ú©ÛŒ Ø¯Û†Ù…Û•ÛŒÙ†ÛŒ Ù†ÙˆÛŽ
+      created_msg: Ø¨Ù„Û†Ú©Ú©Ø±Ø¯Ù†ÛŒ Ø¯Û†Ù…Û•ÛŒÙ† Ù„Û• ØØ§ÚµÛŽ Ø¬ÛŽØ¨Û•Ø¬ÛŽÚ©Ø±Ø¯Ù†Û•
+      destroyed_msg: Ø¨Ù„Û†Ú©ÛŒ Ø¯Û†Ù…Û•ÛŒÙ† Ù‡Û•ÚµÙˆÛ•Ø´Ø§ÙˆÛ•ØªÛ•ÙˆÛ•
+      domain: Ø¯Û†Ù…Û•ÛŒÙ†
+      edit: Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒ Ø¨Ù„Û†Ú©ÛŒ Ø¯Û†Ù…Û•ÛŒÙ†ÛŒ Ù†ÙˆÛŽ
+      existing_domain_block_html: Ø¦ÛŽÙˆÛ• Ù¾ÛŽØ´ØªØ± Ø³Ù†ÙˆÙˆØ±ÛŒ Ø¯Ú˜ÙˆØ§Ø±ØªÙ†Ø§ Ù„Û• Ø³Û•Ø±%{name} Ø¬ÛŽØ¨Û•Ø¬ÛŽÚ©Ø±Ø¯ÙˆÙˆÛ•ØŒ Ø³Û•Ø±Û•ØªØ§ Ø¯Û•Ø¨ÛŽ <a href="%{unblock_url}">Ø¨Ù„Û†Ú© Ù‡Û•ÚµÙˆÛ•Ø´ÛŽÙ†Û•ÙˆÛ•</a>.
+      new:
+        create: Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯Ù†ÛŒ Ø¨Ù„Û†Ú©
+        hint: Ø¨Ù„Û†Ú©ÛŒ Ø¯Û†Ù…Û•ÛŒÙ† Ø±ÛŽÚ¯Ø±ÛŒ Ù„Û• Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯Ù†ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒ Ú†ÙˆÙˆÙ†Û•Ú˜ÙˆÙˆØ±Û•ÙˆÛ• Ù„Û• Ø¨Ù†Ú©Û•ÛŒ Ø²Ø§Ù†ÛŒØ§Ø±ÛŽÚ©Ø§Ù† Ù†Ø§Ú©Ø§Øª ØŒ Ø¨Û•ÚµÚ©Ùˆ Ø¨Û• Ø´ÛŽÙˆÛ•ÛŒÛ•Ú©ÛŒ Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ùˆ Ø®Û†Ú©Ø§Ø±Ø§Ù†Û• Ø±ÛŽÙˆØ´ÛŽÙˆØ§Ø²ÛŒ Ù¾ÛŽØ´Ú©Û•ÙˆØªÙˆÙˆ ØªØ§ÛŒØ¨Û•Øª Ù„Û•Ø³Û•Ø± Ø¦Û•Ùˆ Ù‡Û•Ú˜Ù…Ø§Ø±Ø§Ù†Û• Ø¬ÛŽØ¨Û•Ø¬ÛŽ Ø¯Û•Ú©Ø§Øª.
+        severity:
+          desc_html: "<strong> Ø¨ÛŽØ¯Û•Ù†Ú¯ÛŒ</strong> ÙˆØ§ Ø¯Û•Ú©Ø§Øª Ú©Û• Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Ø§Ù† Ù†Û•Ø¨ÛŒÙ†Ø±Ø§ÙˆÛ• Ø¨ÛŽØª Ø¨Û† Ù‡Û•Ø± Ú©Û•Ø³ÛŽÚ© Ú©Û• Ø´ÙˆÛŽÙ†ÛŒØ§Ù† Ù†Û•Ú©Û•ÙˆÛŽ. <strong>Ú•Ø§Ú¯Ø±ØªÙ†ÛŒ</strong> Ù‡Û•Ù…ÙˆÙˆ Ù†Ø§ÙˆÛ•Ú•Û†Ú©ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•ØŒ Ù…ÛŒØ¯ÛŒØ§ØŒ Ùˆ Ø¯Ø§ØªØ§ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„Û•Ú©Û•ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø§Ù†. <strong>Ù‡ÛŒÚ† </strong> Ø¦Û•Ú¯Û•Ø± Ø¯Û•ØªÛ•ÙˆÛŽØª ÙØ§ÛŒÙ„Û•Ú©Ø§Ù†ÛŒ Ù…ÛŒØ¯ÛŒØ§ Ú•Û•Øª Ø¨Ú©Û•ÛŒØªÛ•ÙˆÛ•."
+          noop: Ù‡ÛŒÚ†
+          silence: Ø¨ÛŽØ¯Û•Ù†Ú¯
+          suspend: Ú•Ø§Ú¯Ø±ØªÙ†
+        title: Ø¨Ù„Û†Ú©ÛŒ Ø¯Û†Ù…Û•ÛŒÙ†ÛŒ Ù†ÙˆÛŽ
+      private_comment: Ù„ÛŽØ¯ÙˆØ§Ù†ÛŒ ØªØ§ÛŒØ¨Û•Øª
+      private_comment_hint: Ù„ÛŽØ¯ÙˆØ§Ù† Ø¯Û•Ø±Ø¨Ø§Ø±Û•ÛŒ Ø³Ù†ÙˆÙˆØ±Ø¯Ø§Ø±ÛŒ Ø¦Û•Ù… Ø¯Û†Ù…Û•ÛŒÙ†Û• Ø¨Û† Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø§Ù†ÛŒ Ù†Ø§ÙˆØ®Û†ÛŒÛŒ Ù„Û•Ù„Ø§ÛŒÛ•Ù† Ù…Û†Ø¯Û•Ø±Û•Ú©Ø§Ù†.
+      public_comment: Ø³Û•Ø±Ù†Ø¬ÛŒ Ú¯Ø´ØªÛŒ
+      public_comment_hint: Ù„ÛŽØ¯ÙˆØ§Ù† Ø¯Û•Ø±Ø¨Ø§Ø±Û•ÛŒ Ø³Ù†ÙˆÙˆØ±Ø¯Ø§Ø±ÛŒ Ø¦Û•Ù… Ø¯Û†Ù…Û•ÛŒÙ†Û• Ø¨Û† Ú¯Ø´ØªÛŒØŒ Ø¦Û•Ú¯Û•Ø± Ø¨ÚµØ§ÙˆÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù„ÛŒØ³ØªÛŒ Ø³Ù†ÙˆÙˆØ±Ø¯Ø§Ø±ÛŒ Ø¯Û†Ù…Û•ÛŒÙ†Û•Ú©Û• Ú†Ø§Ù„Ø§Ú© Ø¨Ú©Ø±ÛŽØª.
+      reject_media: Ú•Û•ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ ÙØ§ÛŒÙ„Û•Ú©Ø§Ù†ÛŒ Ù…ÛŒØ¯ÛŒØ§
+      reject_media_hint: Ù¾Û•Ú•Ú¯Û• Ù…ÛŒØ¯ÛŒØ§ÛŒ Ù¾Ø§Ø´Ú©Û•ÙˆØªÚ©Ø±Ø§Ùˆ Ø¨Û• Ø´ÛŽÙˆÛ•ÛŽÚ©ÛŒ Ù†Ø§ÙˆØ®Û†ÛŒÛŒ Ù„Ø§Ø¨Ø¯Û• Ùˆ Ø¯Ø§Ø¨Û•Ø²ÛŒÙ† Ù„Û• Ø¯Ø§Ù‡Ø§ØªÙˆÙˆ Ú•Û•ØªØ¯Û•Ú©Ø§ØªÛ•ÙˆÛ•. Ù†Ø§Ù¾Û•ÛŒÙˆÛ•Ù†Ø¯ÛŒØ¯Ø§Ø± Û• Ø¨Û† Ú•Ø§Ú¯Ø±ØªÙ†
+      reject_reports: Ú¯ÙˆØ²Ø§Ø±Ø´ØªÛ•Ú©Ø§Ù† Ú•Û•Øª Ø¨Ú©Û•ÙˆÛ•
+      reject_reports_hint: Ù¾Ø´ØªÚ¯ÙˆÛŽ Ø®Ø³ØªÙ†ÛŒ Ù‡Û•Ù…ÙˆÙˆ Ú¯ÙˆØ²Ø§Ø±Ø´ØªÛ•Ú©Ø§Ù† Ú©Û• Ø¯ÛŽÙ† Ù„Û•Ù… Ø¯Û†Ù…Û•ÛŒÙ†Û•. Ù†Ø§Ù¾Û•ÛŒÙˆÛ•Ù†Ø¯ÛŒØ¯Ø§Ø±Û• Ø¨Û† Ú•Ø§Ú¯Ø±ØªÙ†
+      rejecting_media: Ú•Û•ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ ÙØ§ÛŒÙ„Û•Ú©Ø§Ù†ÛŒ Ù…ÛŒØ¯ÛŒØ§
+      rejecting_reports: Ú•Û•ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ú¯ÙˆØ²Ø§Ø±Ø´ØªÛ•Ú©Ø§Ù†
+      severity:
+        silence: Ø¨ÛŽØ¯Û•Ù†Ú¯
+        suspend: Ú•Ø§Ú¯Ø±ØªÙ†
+      show:
+        affected_accounts:
+          one: Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒÛ•Ú© Ú©Û• Ù„Û• Ø¨Ù†Ú©Û•ÛŒ Ø²Ø§Ù†ÛŒØ§Ø±ÛŽÚ©Ø§Ù† Ú©Ø§Ø±ÛŒÚ¯Û•Ø±ÛŒ Ù„Û•Ø³Û•Ø±Û•
+          other: "%{count} Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒÛ•Ú© Ú©Û• Ù„Û• Ø¨Ù†Ú©Û•ÛŒ Ø²Ø§Ù†ÛŒØ§Ø±ÛŽÚ©Ø§Ù† Ú©Ø§Ø±ÛŒÚ¯Û•Ø±ÛŒ Ù„Û•Ø³Û•Ø±Û•"
+        retroactive:
+          silence: Ù†Ø§Ø¨ÛŽØ¯Û•Ù†Ú¯ÛŒ Ø¦Û•Ùˆ Ø¦Û•Ú˜Ù…ÛŽØ±Ø§Ù†Û•ÛŒ Ú©Û• Ù‡Û•ÛŒÛ• Ù„Û•Ù… Ø¯Û†Ù…Û•ÛŒÙ†Û•ÙˆÛ•
+          suspend: Ù‡Û•ÚµÙ†Û•Ù¾Û•Ø³ÛŽØ¯Ø±Ø§ÙˆÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û• Ú©Ø§Ø±ÛŒÚ¯Û•Ø±Û•Ú©Ø§Ù†ÛŒ Ø¦Û•Ù… Ø¯Û†Ù…Û•ÛŒÙ†
+        title: Ú¯Û•Ú•Ø§Ù†Û•ÙˆÛ•ÛŒ Ø¨Ù„Û†Ú©Ú©Ø±Ø¯Ù†ÛŒ Ø¯Û†Ù…Û•ÛŒÙ† %{domain}
+        undo: Ú¯Û•Ú•Ø§Ù†Û•ÙˆÛ•
+      undo: Ú¯Û•Ú•Ø§Ù†Û•ÙˆÛ•ÛŒ Ø¨Ù„Û†Ú©ÛŒ Ø¯Û†Ù…Û•ÛŒÙ†ÛŒ
+      view: Ø¯ÛŒØªÙ†ÛŒ Ø¨Ù„Û†Ú©ÛŒ Ø¯Û†Ù…Û•ÛŒÙ†ÛŒ
+    email_domain_blocks:
+      add_new: Ø²ÛŒØ§Ø¯Ú©Ø±Ø¯Ù†ÛŒ Ù†ÙˆÛŽ
+      created_msg: Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¯Û†Ù…Û•ÛŒÙ†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ Ø¨Ù„Û†Ú© Ú©Ø±Ø§
+      delete: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•
+      destroyed_msg: Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¯Û†Ù…Û•ÛŒÙ†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ Ù„Û• Ø¨Ù„Û†Ú© Ù„Ø§Ú†ÙˆÙˆ
+      domain: Ø¯Û†Ù…Û•ÛŒÙ†
+      empty: Ù‡ÛŒÚ† Ø¯Û†Ù…Û•ÛŒÙ†ÛŽÚ© Ù„Û• Ø¦ÛŽØ³ØªØ§Ø¯Ø§ Ø¨Ù„Û†Ú© Ù†Û•Ú©Ø±Ø§ÙˆÛ•.
+      from_html: Ù„Û• %{domain}
+      new:
+        create: Ø²ÛŒØ§Ø¯Ú©Ø±Ø¯Ù†ÛŒ Ø¯Û†Ù…Û•ÛŒÙ†
+        title: Ø¨Ù„Û†Ú©Ú©Ø±Ø¯Ù†ÛŒ Ø¯Û†Ù…Û•ÛŒÙ†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛŒ Ù†ÙˆÛŽ
+      title: Ø¯Û†Ù…Û•ÛŒÙ†Û• Ø¨Ù„Û†Ú©Ú©Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ
+    instances:
+      by_domain: Ø¯Û†Ù…Û•ÛŒÙ†
+      delivery_available: Ú¯Û•ÛŒØ§Ù†Ø¯Ù† Ø¨Û•Ø±Ø¯Û•Ø³ØªÛ•
+      known_accounts:
+        one: "%{count} Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒ Ù†Ø§Ø³Ø±Ø§Ùˆ"
+        other: "%{count} Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Ø§Ù†ÛŒ Ù†Ø§Ø³Ø±Ø§Ùˆ"
+      moderation:
+        all: Ù‡Û•Ù…ÙˆÙˆ
+        limited: Ø³Ù†ÙˆÙˆØ±Ø¯Ø§Ø±
+        title: Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Ø±Ø¯Ù†
+      private_comment: Ù„ÛŽØ¯ÙˆØ§Ù†ÛŒ ØªØ§ÛŒØ¨Û•Øª
+      public_comment: Ø³Û•Ø±Ù†Ø¬ÛŒ Ú¯Ø´ØªÛŒ
+      title: Ù¾Û•ÛŒÙˆÛ•Ù†Ø¯ÛŒ Ù†ÛŽÙˆØ§Ù† Ú•Ø§Ú˜Û•
+      total_blocked_by_us: Ù„Û•Ù„Ø§ÛŒÛ•Ù† Ø¦ÛŽÙ…Û• Ø¨Û•Ø±Ø¨Û•Ø³Øª Ú©Ø±Ø§ÙˆÛ•
+      total_followed_by_them: Ø´ÙˆÛŽÙ†Ù…Ø§Ù† Ø¯Û•Ú©Û•ÙˆÙ†
+      total_followed_by_us: Ø´ÙˆÛŽÙ†ÛŒØ§Ù† Ú©Û•ÙˆØªÛŒÙ†
+      total_reported: Ú¯ÙˆØ²Ø§Ø±Ø´Øª Ù„Ù‡ Ø¨Ø§Ø±Ù‡ ÛŒØ§Ù†
+      total_storage: Ù‡Ø§ÙˆÙ¾ÛŽÚ†ÛŒ Ù…ÛŒØ¯ÛŒØ§
+    invites:
+      deactivate_all: Ù‡Û•Ù…ÙˆÙˆ Ù„Û•Ú©Ø§Ø±Ø®Ø³ØªÙ†ÛŒ
+      filter:
+        all: Ù‡Û•Ù…ÙˆÙˆ
+        available: Ø¨Û•Ø±Ø¯Û•Ø³ØªÛ•
+        expired: Ø¨Û•Ø³Û•Ø±Ú†ÙˆÙˆÛ•
+        title: Ù¾Ø§ÚµØ§ÙˆØªÙ†
+      title: Ø¨Ø§Ù†Ú¯Ù‡ÛŽØ´ØªÛ•Ú©Ø§Ù†
+    ip_blocks:
+      add_new: Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯Ù†ÛŒ ÛŒØ§Ø³Ø§
+      created_msg: Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆØ§Ù†Û• ÛŒØ§Ø³Ø§ÛŒ Ù†ÙˆÛŽÛŒ IP Ø²ÛŒØ§Ø¯Ú©Ø±Ø§
+      delete: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•
+      expires_in:
+        '1209600': Ù¢ Ù‡Û•ÙØªÛ•
+        '15778476': Ù¦ Ù…Ø§Ù†Ú¯
+        '2629746': Ù¡ Ù…Ø§Ù†Ú¯
+        '31556952': Ù¡ Ø³Ø§Úµ
+        '86400': Ù¡ Ú•Û†Ú˜
+        '94670856': Ù£ Ø³Ø§Úµ
+      new:
+        title: Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯Ù†ÛŒ ÛŒØ§Ø³Ø§ÛŒ Ù†ÙˆÛŽÛŒ IP
+      no_ip_block_selected: Ù‡ÛŒÚ† Ú•ÛŽØ³Ø§ÛŒÛ•Ú©ÛŒ IP Ù†Û•Ú¯Û†Ú•Ø¯Ø±Ø§ ÙˆÛ•Ú© Ø¦Û•ÙˆÛ•ÛŒ Ù‡ÛŒÚ† Ú©Ø§Ù…ÛŒØ§Ù† Ø¯Û•Ø³ØªÙ†ÛŒØ´Ø§Ù† Ù†Û•Ú©Ø±Ø§Ù†
+      title: ÛŒØ§Ø³Ø§Ú©Ø§Ù†ÛŒ IP
+    pending_accounts:
+      title: Ù‡Û•Ú˜Ù…Ø§Ø±Û• Ù‡Û•ÚµÙˆØ§Ø³Ø±Ø§ÙˆÛ•Ú©Ø§Ù† (%{count})
+    relationships:
+      title: Ù¾Û•ÛŒÙˆÛ•Ù†ÛŒÛ•Ú©Ø§Ù† %{acct}
+    relays:
+      add_new: Ø²ÛŒØ§Ø¯Ú©Ø±Ø¯Ù†ÛŒ Ú¯ÙˆØ§Ø³ØªÙ†Û•ÙˆÛ•ÛŒ Ù†ÙˆÛŽ
+      delete: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•
+      description_html: Ø¯Ø§Ù†Û•ÛŒÛ•Ú©ÛŒ <strong>Ú•ÛŽÚµÛ•ÛŒ Ù†ÛŽÙˆ Ú•Ø§Ú˜Û•ÛŒÛŒÛ•(federation relay) Ú©Û• Ù‚Û•Ø¨Ø§Ø±Û•ÛŒÛ•Ú©ÛŒ ÙØ±Û•ÛŒ Ù„Û• ØªÙˆÙˆØªÛ• Ú¯Ø´ØªÛŒÛŒÛ•Ú©Ø§Ù† Ù„Û• Ù†ÛŽÙˆ Ú•Ø§Ú˜Û• Ù‡Ø§ÙˆØ¨Û•Ø´Û•Ú©Ø§Ù† Ùˆ Ø¦Ø§Ø¨ÙˆÙˆÙ†Û•Ú©Ø§Ù† Ø¯Û•Ú¯ÙˆØ§Ø²ÛŽØªÛ•ÙˆÛ• <strong>Ø±ÛŽÚµÛ• ÛŒØ§Ø±Ù…Û•ØªÛŒ Ø¨Û• Ú•Ø§Ú˜Û• Ø¨Ú†Ú©Û†Ù„Û•Ùˆ Ù…Ø§Ù…Ù†Ø§ÙˆÛ• Ù†Ø¯ÛŒÛŒÛ•Ú©Ø§Ù† Ø¯Û•Ø¯Ø§ Ú©Û• Ø¨Ø§Ø¨Û•ØªÛŒ ÙØ±Û•ØªØ± Ù¾Û•ÛŒØ¯Ø§ Ø¨Ú©Û•Ù†</strong> Ú¯Û•Ø± Ú•ÛŽÚµÛ• Ù†Û•Ø¨ÛŽØªØŒ Ø¦Û•Ù… Ø¨Ø§Ø¨Û•ØªÛ• Ú¯Ø´ØªÛŒÛŒØ§Ù†Û• ØªÛ•Ù†Ù‡Ø§ Ú©Ø§ØªÛŽÚ© Ù¾Û•ÛŒØ¯Ø§ Ø¯Û•Ø¨Ù† Ú©Û• Ø¨Û• Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†ÛŒ Ù†Ø§ÙˆØ®Û†ÛŒÛŒ Ø®Û†ÛŒØ§Ù† Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆÙˆÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù† Ù„Û• Ø³Û•Ø± Ú•Ø§Ú˜Û•Ú©Ø§Ù†ÛŒ Ø¯ÛŒÚ©Û• Ø¨Ù†.
+      disable: Ù„Û•Ú©Ø§Ø±Ø®Ø³ØªÙ†
+      disabled: Ù†Ø§Ú†Ø§Ù„Ø§Ú©Ú©Ø±Ø§ÙˆÛ•
+      enable: Ú†Ø§Ù„Ø§Ú©Ú©Ø±Ø§ÙˆÛ•
+      enable_hint: Ú©Ø§ØªÛŽÚ© Ú†Ø§Ù„Ø§Ú© Ú©Ø±Ø§ØŒ Ú•Ø§Ú˜Û•Ú©Ø§Ø±Û•Ú©Û•Øª Ø¨Û•Ø´Ø¯Ø§Ø±ÛŒ Ø¯Û•Ú©Ø§Øª Ù„Û• Ù‡Û•Ù…ÙˆÙˆ ØªÙˆØªÛ•Ú©Ø§Ù†ÛŒ Ú¯Ø´ØªÛŒ Ù„Û•Ù… Ú¯ÙˆØ§Ø³ØªÙ†Û•ÙˆÛ•ÛŒÛ•ØŒ Ùˆ Ø¯Û•Ø³Øª Ø¯Û•Ú©Ø§Øª Ø¨Û• Ù†Ø§Ø±Ø¯Ù†ÛŒ ØªÙˆØªÛŒ Ú¯Ø´ØªÛŒ Ø¦Û•Ù… Ú•Ø§Ú˜Û•ÛŒÛ•.
+      enabled: Ú†Ø§Ù„Ø§Ú©Ú©Ø±Ø§ÙˆÛ•
+      inbox_url: Ù†ÛŒØ´Ø§Ù†Û•ÛŒ URL
+      pending: Ú†Ø§ÙˆÛ•Ú•ÛŽÛŒ Ù¾Û•Ø³Û•Ù†Ø¯Ú©Ø±Ø¯Ù†ÛŒ Ú•ÛŽÙ„Û•ÛŒ
+      save_and_enable: Ù¾Ø§Ø´Ú©Û•ÙˆØªÚ©Ø±Ø¯Ù† Ùˆ Ú†Ø§Ù„Ø§Ú©Ú©Ø±Ø¯Ù†
+      setup: Ø¯Ø§Ù…Û•Ø²Ø±Ø§Ù†Ø¯Ù†ÛŒ Ú•ÛŽÚµÛ•ÛŒ Ù¾Û•ÛŒÙˆÛ•Ù†Ø¯ÛŒ
+      signatures_not_enabled: Ú•ÛŒÙ„Û•Ú©Ø§Ù† Ø¨Û• Ø¯Ø±ÙˆØ³ØªÛŒ Ú©Ø§Ø±Ù†Ø§Ú©Ø§Øª Ù„Û• Ú©Ø§ØªÛŽÚ©Ø¯Ø§ Ø¯Û†Ø®ÛŒ Ù¾Ø§Ø±ÛŽØ²Ø±Ø§Ùˆ ÛŒØ§Ù† Ø¯Û†Ø®ÛŒ Ø³Ù†ÙˆÙˆØ±Ø¯Ø§Ø±ÛŒ Ú¯Ø´ØªÛŒ Ú†Ø§Ù„Ø§Ú© Ú©Ø±Ø§ÙˆÛ•
+      status: Ø¯Û†Ø®
+      title: Ú•ÛŽÚµÛ•Ú©Ø§Ù†
+    report_notes:
+      created_msg: ØªÛŽØ¨ÛŒÙ†ÛŒ Ú•Ø§Ù¾Û†Ø±Øª Ú©Ø±Ø¯Ù† Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¯Ø±ÙˆØ³Øª Ú©Ø±Ø§!
+      destroyed_msg: ØªÛŽØ¨ÛŒÙ†ÛŒ Ú¯ÙˆØ²Ø§Ø±Ø´Øª Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø³Ú•Ø§ÙˆÛ•ØªÛ•ÙˆÛ•!
+    reports:
+      account:
+        notes:
+          one: "%{count} ÛŒØ§Ø¯Ø§Ø´Øª"
+          other: "%{count} ÛŒØ§Ø¯Ø§Ø´Øª"
+        reports:
+          one: "%{count} Ú¯ÙˆØ²Ø§Ø±Ø´Øª"
+          other: "%{count} Ú¯ÙˆØ²Ø§Ø±Ø´ØªÛ•Ú©Ø§Ù†"
+      action_taken_by: Ú©Ø±Ø¯Û•ÙˆÛ• Ù„Û• Ù„Ø§ÛŒÛ•Ù†
+      are_you_sure: Ø¯ÚµÙ†ÛŒØ§ÛŒ?
+      assign_to_self: Ø¯ÛŒØ§Ø±ÛŒÚ©Ø±Ø¯Ù† Ø¨Û† Ù…Ù†
+      assigned: Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Û•Ø±ÛŒ Ø¨Û•Ø±Ù¾Ø±Ø³
+      by_target_domain: Ø¯Û†Ù…Û•ÛŒÙ†ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒ Ú¯ÙˆØ²Ø§Ø±Ø´ØªØ¯Ø±Ø§Ùˆ
+      comment:
+        none: Ù‡ÛŒÚ†
+      created_at: Ú¯ÙˆØ²Ø§Ø±Ø´ØªÚ©Ø±Ø§
+      mark_as_resolved: Ù†ÛŒØ´Ø§Ù†Û•ÛŒ Ø¨Ú©Û• ÙˆÛ•Ú© Ú†Ø§Ø±Û•Ø³Û•Ø±Ú©Ø±Ø§Ùˆ
+      mark_as_unresolved: Ù†ÛŒØ´Ø§Ù†Û•Ú©Ø±Ø¯Ù† ÙˆÛ•Ú© Ú†Ø§Ø±Û•Ø³Û•Ø±Ù†Û•Ú©Ø±Ø§ÙˆÛ•
+      notes:
+        create: Ø²ÛŒØ§Ø¯Ú©Ø±Ø¯Ù†ÛŒ ØªÛŽØ¨ÛŒÙ†ÛŒ
+        create_and_resolve: Ú†Ø§Ø±Û•Ø³Û•Ø± Ú©Ø±Ø¯Ù† Ù„Û•Ú¯Û•Úµ ØªÛŽØ¨ÛŒÙ†ÛŒ
+        create_and_unresolve: Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø¨Û• ØªÛŽØ¨ÛŒÙ†ÛŒ
+        delete: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•
+        placeholder: Ø¨Ø§Ø³ÛŒ Ø¦Û•Ùˆ Ú©Ø±Ø¯Ø§Ø±Ø§Ù†Û• Ø¨Ú©Û• Ú©Û• Ø¦Û•Ù†Ø¬Ø§Ù… Ø¯Ø±Ø§ÙˆÙ†ØŒ ÛŒØ§Ù† Ù‡Û•Ø± Ù†ÙˆÛŽÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒÛ•Ú©ÛŒ Ù¾Û•ÛŒÙˆÛ•Ù†Ø¯ÛŒØ¯Ø§Ø±ÛŒ Øª...
+      reopen: Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ú¯ÙˆØ²Ø§Ø±Ø´Øª
+      report: 'Ú¯ÙˆØ²Ø§Ø±Ø´Øª #%{id}'
+      reported_account: Ú¯ÙˆØ²Ø§Ø±Ø´ØªÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•
+      reported_by: Ú¯ÙˆØ²Ø§Ø±Ø´Øª Ù„Û• Ù„Ø§ÛŒÛ•Ù†
+      resolved: Ú†Ø§Ø±Û•Ø³Û•Ø±Ú©Ø±Ø§
+      resolved_msg: Ú¯ÙˆØ²Ø§Ø±Ø´ØªÚ©Ø±Ø¯Ù† Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ú†Ø§Ø±Û•Ø³Û•Ø± Ú©Ø±Ø§!
+      status: Ø¯Û†Ø®
+      title: Ú¯ÙˆØ²Ø§Ø±Ø´ØªÚ©Ø±Ø§
+      unassign: Ø¯ÛŒØ§Ø±ÛŒÙ†Û•Ú©Ø±Ø§ÙˆÛ•
+      unresolved: Ú†Ø§Ø±Û•Ø³Û•Ø± Ù†Û•Ú©Ø±Ø§ÙˆÛ•
+      updated_at: Ù†ÙˆÛŽÚ©Ø±Ø§ÛŒÛ•ÙˆÛ•
+    settings:
+      activity_api_enabled:
+        desc_html: Ú˜Ù…Ø§Ø±Ø¯Ù†ÛŒ Ø¯Û†Ø®ÛŒ Ø¨ÚµØ§ÙˆÚ©Ø±Ø§ÙˆÛ• ÛŒ Ù†Ø§ÙˆØ®Û†ÛŒÛŒ Ùˆ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Û• Ú†Ø§Ù„Ø§Ú©Û•Ú©Ø§Ù† Ùˆ ØªÛ†Ù…Ø§Ø±ÛŒ Ù†ÙˆÛŽ Ù„Û• Ø³Û•ØªÚµÛŒ Ù‡Û•ÙØªØ§Ù†Û•
+        title: Ø¨ÚµØ§ÙˆÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø¦Ø§Ù…Ø§Ø±ÛŒ Ú©Û† Ø¯Û•Ø±Ø¨Ø§Ø±Û•ÛŒ Ú†Ø§Ù„Ø§Ú©ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±
+      bootstrap_timeline_accounts:
+        desc_html: Ú†Û•Ù†Ø¯ Ù†Ø§ÙˆÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŽÚ© Ø¬ÛŒØ§Ø¨Ú©Û• Ø¨Û• Ø¨Û†Ø±ØŒ ØªÛ•Ù†Ù‡Ø§ Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒ Ø¨Ù„Û†Ú©Ú©Ø±Ø§ÙˆÛ•Ú©Ø§Ù† Ùˆ Ù†Ø§ÙˆØ®Û†ÛŒÛŒ Ú©Ø§Ø±Ø¯Û•Ú©Û•Ù†. Ø¨Ù†Û•Ú•Û•Øª Ú©Ø§ØªÛŽÚ© Ø¨Û•ØªØ§Úµ Ø¨ÙˆÙˆ Ù‡Û•Ù…ÙˆÙˆ Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Û•Ø±Û• Ø®Û†Ø¬ÛŽÛŒÛ•Ú©Ø§Ù†Ù†.
+        title: Ø¨Û•Ø¯ÙˆØ§Ø¯Ø§Ú†ÙˆÛ•Ú©Ø§Ù†ÛŒ Ú¯Ø±ÛŒÙ…Ø§Ù†Û•ÛŒÛŒ Ø¨Û† Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Û• Ù†ÙˆÛŽÚ©Ø§Ù†
+      contact_information:
+        email: Ø¦ÛŒÙ…Û•ÛŒÙ„ÛŒ Ø¨Ø§Ø²Ø±Ú¯Ø§Ù†ÛŒ
+        username: Ù†Ø§ÙˆÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±
+      custom_css:
+        desc_html: Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒ Ú©Ø±Ø¯Ù†ÛŒ Ø´ÛŽÙˆÛ•ÛŒ CSS Ø¨Ø§Ø±Ú©Ø±Ø§Ùˆ Ù„Û•Ø³Û•Ø± Ù‡Û•Ù…ÙˆÙˆ Ù„Ø§Ù¾Û•Ú•Û•Ú©Ø§Ù†
+        title: CSSÛŒ ØªØ§ÛŒØ¨Û•ØªÙ…Û•Ù†Ø¯
+      default_noindex:
+        desc_html: Ú©Ø§Ø±Ø¯Û•Ú©Ø§ØªÛ• Ø³Û•Ø± Ù‡Û•Ù…ÙˆÙˆ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Û•Ú©Ø§Ù† Ú©Û• Ø¦Û•Ù… Ú•ÛŽÚ©Ø®Ø³ØªÙ†Û• Ø®Û†ÛŒØ§Ù† Ù†Û•Ú¯Û†Ú•Ø§ÙˆÙ†
+        title: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù† Ù„Û• Ù¾ÛŽÚ•Ø³ØªÚ©Ø±Ø¯Ù†ÛŒ Ø¨Ø²ÙˆÛŽÙ†Û•Ø±ÛŒ Ú¯Û•Ú•Ø§Ù† Ø¨Û• Ú¯Ø±ÛŒÙ…Ø§Ù†Û•ÛŒÛŒ Ù‡Û•ÚµØ¨Ú˜ÛŽÙ†
+      domain_blocks:
+        all: Ø¨Û† Ù‡Û•Ù…ÙˆÙˆ Ú©Û•Ø³ÛŽÚ©
+        disabled: Ø¨Û† Ù‡ÛŒÚ† Ú©Û•Ø³ÛŽÚ©
+        title: Ø¨Ù„Û†Ú©Û•Ú©Ø§Ù†ÛŒ Ø¯Û†Ù…Û•ÛŒÙ† Ù¾ÛŒØ´Ø§Ù† Ø¨Ø¯Û•
+        users: Ø¨Û† Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆÙˆØ±Û•ÙˆÛ•ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†ÛŒ Ù†Ø§ÙˆØ®Û†
+      domain_blocks_rationale:
+        title: Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ú•ÛŽÚ˜Û•ÛŒÛŒ
+      enable_bootstrap_timeline_accounts:
+        title: Ú†Ø§Ù„Ø§Ú©Ú©Ø±Ø¯Ù†ÛŒ Ø¨Û•Ø¯ÙˆØ§Ú©Û•Ú©Ø§Ù†ÛŒ Ú¯Ø±ÛŒÙ…Ø§Ù†Û•ÛŒÛŒ Ø¨Û† Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Û• Ù†ÙˆÛŽÚ©Ø§Ù†
+      hero:
+        desc_html: Ù†ÛŒØ´Ø§Ù† Ø¯Ø±Ø§ Ù„Û• Ù¾Û•Ú•Û•ÛŒ Ø³Û•Ø±Û•ØªØ§. Ø¨Û•Ù„Ø§ÛŒÛ•Ù†ÛŒ Ú©Û•Ù…Û•ÙˆÛ• 600x100px Ù¾ÛŽØ´Ù†ÛŒØ§Ø±Ú©Ø±Ø§ÙˆÛ•. Ú©Ø§ØªÛŽÚ© Ú•ÛŽÚ© Ù†Û•Ú©Û•ÙˆÛŒØªØŒ Ø¯Û•Ú¯Û•Ú•ÛŽØªÛ•ÙˆÛ• Ø¨Û† ÙˆÛŽÙ†Û†Ø¬Ú©Û•ÛŒ Ú•Ø§Ú˜Û•
+        title: ÙˆÛŽÙ†Û•ÛŒ Ù¾Ø§ÚµÛ•ÙˆØ§Ù†
+      mascot:
+        desc_html: Ù†ÛŒØ´Ø§Ù† Ø¯Ø±Ø§ÙˆÛ• Ù„Û• Ú†Û•Ù†Ø¯ Ù„Ø§Ù¾Û•Ú•Û•ÛŒÛ•Ú©. Ø¨Û•Ù„Ø§ÛŒÛ•Ù†ÛŒ Ú©Û•Ù…Û•ÙˆÛ• 293Ã— 205px Ù¾ÛŽØ´Ù†ÛŒØ§Ø±Ú©Ø±Ø§ÙˆÛ•. Ú©Ø§ØªÛŽÚ© Ø¯ÛŒØ§Ø±ÛŒ Ù†Ø§Ú©Ø±ÛŽØªØŒ Ø¯Û•Ú¯Û•Ú•ÛŽØªÛ•ÙˆÛ• Ø¨Û† Ø¨Û•Ø®ØªØ¨Û•Ø®ØªÛŽÚ©ÛŒ Ø¦Ø§Ø³Ø§ÛŒÛŒ
+        title: ÙˆÛŽÙ†Û•ÛŒ Ù…Ø§Ø³Ú©Û†Øª
+      peers_api_enabled:
+        desc_html: Ù†Ø§ÙˆÛŒ Ø¯Û†Ù…Û•ÛŒÙ†Û•Ú©Ø§Ù†ÛŽÚ© Ú©Û• Ø¦Û•Ù… Ú•Ø§Ú˜Û• Ù¾Û•ÛŒÙˆÛ•Ù†Ø¯ÛŒ Ù¾ÛŽÙˆÛ•Ú¯Ø±ØªÙˆÙˆÛ•
+        title: Ø¨ÚµØ§ÙˆÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù„ÛŒØ³ØªÛŒ Ø±Ø§Ú˜Û•Ú©Ø§Ù†ÛŒ Ø¯Û†Ø²Ø±Ø§ÙˆÛ•
+      preview_sensitive_media:
+        desc_html: Ø¨ÛŒÙ†ÛŒÙ†ÛŒ Ù„ÛŒÙ†Ú© Ù„Û• ÙˆÛŽØ¨ Ø³Ø§ÛŒØªÛ•Ú©Ø§Ù†ÛŒ ØªØ± ÙˆÛŽÙ†Û†Ú†Ú©Û•ÛŒÛ•Ú© Ù¾ÛŒØ´Ø§Ù† Ø¯Û•Ø¯Ø§Øª ØªÛ•Ù†Ø§Ù†Û•Øª Ø¦Û•Ú¯Û•Ø± Ù…ÛŒØ¯ÛŒØ§Ú©Û• Ø¨Û• Ù‡Û•Ø³ØªÛŒØ§Ø±ÛŒ Ù†ÛŒØ´Ø§Ù† Ú©Ø±Ø§Ø¨ÛŽØª
+        title: Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ù…ÛŒØ¯ÛŒØ§ÛŒ Ù‡Û•Ø³ØªÛŒØ§Ø± Ù„Û• Ù¾ÛŽØ´Ø¨ÛŒÙ†ÛŒÛ•Ú©Ø§Ù†ÛŒ OpenGraph
+      profile_directory:
+        desc_html: Ú•ÛŽÚ¯Û•Ø¯Ø§Ù† Ø¨Û• Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù† Ø¨Û† Ø¯Û†Ø²ÛŒÙ†Û•ÙˆÛ•ÛŒØ§Ù†
+        title: Ú†Ø§Ù„Ø§Ú©Ú©Ø±Ø¯Ù†ÛŒ Ú•ÛŽÙ†ÛŒØ´Ø§Ù†Ø¯Û•Ø±ÛŽÚ©ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„
+      registrations:
+        closed_message:
+          desc_html: Ù„Û• Ù¾Û•Ú•Û•ÛŒ Ù¾ÛŽØ´Û•ÙˆÛ• Ù¾ÛŒØ´Ø§Ù† Ø¯Û•Ø¯Ø±ÛŽØª Ú©Ø§ØªÛŽÚ© ØªÛ†Ù…Ø§Ø±Û•Ú©Ø§Ù† Ø¯Ø§Ø®Ø±Ø§ÙˆÙ†. Ø¯Û•ØªÙˆØ§Ù†ÛŒØª ØªØ§Ú¯Û•Ú©Ø§Ù†ÛŒ HTML Ø¨Û•Ú©Ø§Ø±Ø¨ÛŽÙ†ÛŒØª
+          title: Ù†Ø§Ù…Û•ÛŒ ØªÛ†Ù…Ø§Ø±Ú©Ø±Ø¯Ù† Ø¯Ø§Ø®Ø±Ø§Ùˆ
+        deletion:
+          desc_html: Ú•ÛŽ Ø¨Ø¯Û• Ø¨Û• Ù‡Û•Ø± Ú©Û•Ø³ÛŽÚ© Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•ÛŒ Ø¨Ø³Ú•ÛŒØªÛ•ÙˆÛ•
+          title: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û• Ø¨Ú©Û•ÙˆÛ•
+        min_invite_role:
+          disabled: Ù‡ÛŒÚ†Ú©Û•Ø³
+          title: Ú•ÛŽÙ¾ÛŽØ¯Ø§Ù†ÛŒ Ø¨Ø§Ù†Ú¯Ù‡ÛŽØ´ØªÛ•Ú©Ø§Ù† Ù„Û•Ù„Ø§ÛŒÛ•Ù†
+      registrations_mode:
+        modes:
+          approved: Ù¾Û•Ø³Û•Ù†Ø¯Ú©Ø±Ø¯Ù†ÛŒ Ø¯Ø§ÙˆØ§Ú©Ø±Ø§Ùˆ Ø¨Û† Ù†Ø§ÙˆØªÛ†Ù…Ø§Ø±Ú©Ø±Ø¯Ù†
+          none: Ú©Û•Ø³ Ù†Ø§ØªÙˆØ§Ù†ÛŽØª Ø®Û†ÛŒ ØªÛ†Ù…Ø§Ø± Ø¨Ú©Ø§Øª
+          open: Ù‡Û•Ø± Ú©Û•Ø³ÛŽÚ© Ø¯Û•ØªÙˆØ§Ù†ÛŽØª Ø®Û†ÛŒ ØªÛ†Ù…Ø§Ø± Ø¨Ú©Ø§Øª
+        title: Ù…Û•Ø±Ø¬ÛŒ ØªÛ†Ù…Ø§Ø±Ú©Ø±Ø¯Ù†
+      show_known_fediverse_at_about_page:
+        desc_html: Ú©Ø§ØªÛŽÚ© Ù†Ø§Ú†Ø§Ù„Ø§Ú© Ú©Ø±Ø§ØŒ Ù‡ÛŽÚµÛŒ Ú©Ø§ØªÛŒ Ú¯Ø´ØªÛŒ Ú©Û• Ø¨Û•Ø³ØªØ±Ø§ÙˆÛ•ØªÛ•ÙˆÛ• Ø¨Û• Ù„Ø§Ù¾Û•Ú•Û•ÛŒ Ø¦ÛŽØ³ØªØ§ Ø³Ù†ÙˆÙˆØ±Ø¯Ø§Ø± Ø¯Û•Ø¨Ù†ØŒ ØªÛ•Ù†Ù‡Ø§ Ù†Ø§ÙˆÛ•Ú•Û†Ú©ÛŒ Ù†Ø§ÙˆØ®Û†ÛŒÛŒ Ù¾ÛŒØ´Ø§Ù†Ø¯Û•Ø¯Ø±ÛŽÙ†
+        title: Ù†ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ú•Ø§Ú˜Û•Ú©Ø§Ù†ÛŒ Ø¯ÛŒÚ©Û• Ù„Û• Ù¾ÛŽØ´Ù†Û•Ù…Ø§ÛŒÛ•Ø´ÛŒ Ø¦Û•Ù… Ú•Ø§Ú˜Û•
+      show_staff_badge:
+        desc_html: Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ù‡ÛŽÙ…Ø§ÛŒÛ•Ú© Ù‡Ø§ÙˆÚ©Ø§Ø± Ù„Û• Ø³Û•Ø± Ù¾Û•Ú•Û•ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±
+        title: Ù†ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ù‡ÛŽÙ…Ø§ÛŒ Ù‡Ø§ÙˆÚ©Ø§Ø±
+      site_description:
+        desc_html: Ú©ÙˆØ±ØªÛ• Ø¨Ø§Ø³ÛŒÚ© Ø¯Û•Ø±Ø¨Ø§Ø±Û•ÛŒ APIØŒ Ø¯Û•Ø±Ø¨Ø§Ø±Û•ÛŒ Ø¦Û•ÙˆÛ• Ú† Ø´ØªÛŽÚ© Ø¯Û•Ø±Ø¨Ø§Ø±Û•ÛŒ Ø¦Û•Ù… Ú•Ø§Ú˜Û•ÛŒ Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† ØªØ§ÛŒØ¨Û•ØªÛ• ÛŒØ§Ù† Ù‡Û•Ø± Ø´ØªÛŽÚ©ÛŒ Ú¯Ø±ÛŒÙ†Ú¯ÛŒ Ø¯ÛŒÚ©Û•. Ø¯Û•ØªÙˆØ§Ù†Ù† HTML Ø¨Ù†ÙˆÙˆØ³Ù†ØŒ Ø¨Û•ØªØ§ÛŒØ¨Û•Øª <code>&lt;a&gt;</code> ÙˆÛ• <code>&lt;em&gt;</code>.
+        title: Ø¯Û•Ø±Ø¨Ø§Ø±Û•ÛŒ Ø¦Û•Ù… Ú•Ø§Ú˜Û•
+      site_description_extended:
+        desc_html: Ø´ÙˆÛŽÙ†ÛŒÚ©ÛŒ Ø¨Ø§Ø´Û• Ø¨Û† Ù†ÙˆÙˆØ³ÛŒÙ†ÛŒ Ø³ÛŒØ§Ø³Û•ØªÛŒ Ø¦ÛŒØ³ØŒ ÛŒØ§Ø³Ø§ Ùˆ Ú•ÛŽØ³Ø§ ØŒ Ú•ÛŽÙ†Ù…Ø§ÛŒÛŒ Ùˆ Ù‡Û•Ø± Ø´ØªÛŒÚ© Ú©Û• ØªØ§ÛŒØ¨Û•Øª Ø¨Û•Ù… Ú•Ø§Ú˜ÛŒÛ•ØŒ ØªØ§Ú¯Û•Ú©Ø§Ù†ÛŒ HTMLÙ€Ù€Ù„ÛŒØ´ Ú•ÛŽÚ¯Û•ÛŒ Ù¾ÛŽØ¯Ø±Ø§ÙˆÛ•
+        title: Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ ØªÛ•ÙˆØ§ÙˆÚ©Û•Ø±ÛŒ ØªØ§ÛŒØ¨Û•ØªÙ…Û•Ù†Ø¯ÛŒ
+      site_short_description:
+        desc_html: Ù†ÛŒØ´Ø§Ù† Ù„Û• Ø´Ø±ÛŒØªÛŒ Ù„Ø§ØªÛ•Ù†ÛŒØ´Øª Ùˆ Ù…ÛŽØªØ§ ØªØ§Ú¯Û•Ú©Ø§Ù†. Ù„Û• Ù¾Û•Ø±Û•Ú¯Ø±Ø§ÙÛŽÚ© Ø¯Ø§ ÙˆÛ•Ø³ÙÛŒ Ø¨Ú©Û• Ú©Û• Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† Ú†ÛŒÛ• Ùˆ Ú†ÛŒ ÙˆØ§ Ù„Û• Ú•Ø§Ú˜Û• Ú©Û• Ø¯Û•Ú©Ø§Øª ØªØ§ÛŒØ¨Û•Øª Ø¨ÛŽØª.
+        title: Ø¯Û•Ø±Ø¨Ø§Ø±Û•ÛŒ Ø¦Û•Ù… Ú•Ø§Ú˜Û•
+      site_terms:
+        desc_html: Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø³ÛŒØ§Ø³Û•ØªÛŒ ØªØ§ÛŒØ¨Û•ØªÛŒÛŽØªÛŒ Ø®Û†Øª Ø¨Ù†ÙˆÙˆØ³ÛŒØªØŒ Ù…Û•Ø±Ø¬Û•Ú©Ø§Ù†ÛŒ Ø®Ø²Ù…Û•ØªÚ¯ÙˆØ²Ø§Ø±ÛŒ ÛŒØ§Ù† ÛŒØ§Ø³Ø§ÛŒÛŒ ØªØ±. Ø¯Û•ØªÙˆØ§Ù†ÛŒØª ØªØ§Ú¯Û•Ú©Ø§Ù†ÛŒ HTML Ø¨Û•Ú©Ø§Ø±Ø¨ÛŽÙ†ÛŒØª
+        title: Ù…Û•Ø±Ø¬Û•Ú©Ø§Ù†ÛŒ Ø®Ø²Ù…Û•ØªÚ¯ÙˆØ²Ø§Ø±ÛŒ Ø¦Ø§Ø³Ø§ÛŒÛŒ
+      site_title: Ù†Ø§ÙˆÛŒ Ú•Ø§Ú˜Û•
+      spam_check_enabled:
+        desc_html: Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† Ø¯Û•ØªÙˆØ§Ù†ÛŽØª Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Ø§Ù† Ø®Û†Ú©Ø§Ø±Ø§Ù†Û• Ø¨ÛŽØ¯Û•Ù†Ú¯ ÛŒØ§Ù† Ú¯ÙˆØ²Ø§Ø±Ø´ØªÛŒØ§Ù† Ø¨Ú©Ø§. Ø²Û†Ø± Ø¬Ø§Ø± Ø¨Û† Ù†Ø§Ø³ÛŒÙ†ÛŒ Ù‡Û•Ø±Ø²Û•Ù¾Û•ÛŒØ§Ù… Ùˆ Ù¾Û•ÛŒØ§Ù…ÛŒ Ù†Û•Ø®ÙˆØ§Ø²ÛŒØ§Ø±ÛŒ Ø¯ÙˆÙˆÙ¾Ø§ØªØ¯Û•Ø¨ÛŽØªÛ•ÙˆÛ•ØŒØ¬Ø§Ø± Ùˆ Ø¨Ø§Ø± Ø¨Û• Ù‡Û•ÚµÛ• Ø¯Û•Ø±Ø¯Û•Ú†ÛŽØª.
+        title: Ø¯Ú˜Û• Ù‡Û•Ø±Ø²Û•Ù†Ø§Ù…Û•
+      thumbnail:
+        desc_html: Ø¨Û† Ù¾ÛŽØ´Ø¨ÛŒÙ†ÛŒÙ† Ø¨Û•Ú©Ø§Ø±Ù‡Ø§ØªÙˆÙˆÛ• Ù„Û• Ú•ÛŽÚ¯Û•ÛŒ OpenGraph ÙˆÛ• API. Ú•ÙˆÙˆÙ†Ø§Ú©ÛŒ Ø¨ÛŒÙ†ÛŒÙ† Ù¡Ù¢Ù Ù xÙ¦Ù£Ù Ù¾ÛŒÚ©Ø³ÛŽÚµ Ù¾ÛŽØ´Ù†ÛŒØ§Ø±Ú©Ø±Ø§ÙˆÛ•
+        title: ÙˆÛŽÙ†Û•ÛŒ Ø¨Ú†Ú©Û†Ù„Û•ÛŒ Ú•Ø§Ú˜Û•
+      timeline_preview:
+        desc_html: Ù„ÛŒÙ†Ú©Û•Ú©Û• Ù†ÛŒØ´Ø§Ù† Ø¨Ø¯Û• Ø¨Û† Ù‡ÛŽÚµÛŒ Ú©Ø§ØªÛŒ Ú¯Ø´ØªÛŒ Ù„Û•Ø³Û•Ø± Ù¾Û•Ú•Û•ÛŒ Ù†ÛŒØ´ØªÙ†Û•ÙˆÛ• Ùˆ Ú•ÛŽÚ¯Û• Ø¨Û• API Ø¨Ø¯Û• Ø¯Û•Ø³ØªÚ¯Û•ÛŒØ´ØªÙ†ÛŒ Ù‡Û•Ø¨ÛŽØª Ø¨Û† Ù‡ÛŽÚµÛŒ Ú©Ø§ØªÛŒ Ú¯Ø´ØªÛŒ Ø¨Û•Ø¨ÛŽ Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†ÛŒ Ú•Û•Ø³Û•Ù†Ø§ÛŒÛ•ØªÛŒ
+        title: Ú•ÛŽÚ¯Û•Ø¨Ø¯Û• Ø¨Û• Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆØ±Û•ÙˆÛ•ÛŒ Ù†Û•Ø³Û•Ù„Ù…ÛŽÙ†Ø±Ø§Ùˆ Ø¨Û† Ù‡ÛŽÚµÛŒ Ú©Ø§ØªÛŒ Ú¯Ø´ØªÛŒ
+      title: Ú•ÛŽÚ©Ø®Ø³ØªÙ†Û•Ú©Ø§Ù†ÛŒ Ù…Ø§ÚµÙ¾Û•Ú•
+      trendable_by_default:
+        desc_html: Ú©Ø§Ø±ÛŒÚ¯Û•Ø±ÛŒ Ù„Û•Ø³Û•Ø± Ù‡Ø§Ø´ØªØ§Ú¯ÛŒ Ù¾ÛŽØ´ÙˆÙˆ Ú©Û• Ù¾ÛŽØ´ØªØ± Ú•ÛŽÚ¯Û• Ù¾ÛŽÙ†Û•Ø¯Ø±Ø§ÙˆÛ•
+        title: Ú•ÛŽÚ¯Û• Ø¨Ø¯Û• Ø¨Û• Ù‡Ø§Ø´ØªØ§Ú¯ÛŒ Ø¨Û•Ø±Ú†Ø§ÙˆÚ©Ø±Ø§ÙˆÛ• Ø¨Û•Ø¨ÛŽ Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ•ÛŒ Ù¾ÛŽØ´ÙˆÙˆ
+      trends:
+        desc_html: Ø¨Û• Ø¦Ø§Ø´Ú©Ø±Ø§ Ù‡Ø§Ø´ØªØ§Ú¯ÛŒ Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ•ÛŒ Ù¾ÛŽØ´ÙˆÙˆ Ù¾ÛŒØ´Ø§Ù† Ø¨Ø¯Û• Ú©Û• Ø¦ÛŽØ³ØªØ§ Ø¨Û•Ø±Ú†Ø§ÙˆÚ©Ø±Ø§ÙˆÛ•Ù†
+        title: Ù‡Ø§Ø´ØªØ§Ú¯ÛŒ Ø¨Û•Ø±Ú†Ø§ÙˆÚ©Ø±Ø§ÙˆÛ•
+    site_uploads:
+      delete: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•ÛŒ ÙØ§ÛŒÙ„ÛŒ Ø¨Ø§Ø±Ú©Ø±Ø§Ùˆ
+      destroyed_msg: Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†ÛŒ Ù…Ø§ÚµÙ¾Û•Ú• Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø³Ú•Ø¯Ø±Ø§ÙˆÛ•ØªÛ•ÙˆÛ•!
+    statuses:
+      back_to_account: Ú¯Û•Ú•Ø§Ù†Û•ÙˆÛ• Ø¨Û† Ù„Ø§Ù¾Û•Ú•Û•ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•
+      batch:
+        delete: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•
+        nsfw_off: Ù†ÛŒØ´Ø§Ù†Û•Ú©Ø±Ø¯Ù† ÙˆÛ•Ú© Ù‡Û•Ø³ØªÛŒØ§Ø± Ù†ÛŒÛ•
+        nsfw_on: Ù†ÛŒØ´Ø§Ù†Û•Ú©Ø±Ø¯Ù† ÙˆÛ•Ú© Ù‡Û•Ø³ØªÛŒØ§Ø±
+      deleted: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•
+      failed_to_execute: Ø¬ÛŽØ¨Û•Ø¬ÛŽ Ú©Ø±Ø¯Ù† Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆ Ù†Û•Ø¨ÙˆÙˆ
+      media:
+        title: Ù…ÛŒØ¯ÛŒØ§
+      no_media: Ù‡ÛŒÚ† Ù…ÛŒØ¯ÛŒØ§ÛŒÛ•Ú©
+      no_status_selected: Ù‡ÛŒÚ† Ø¯Û†Ø®ÛŒÚ© Ù†Û•Ú¯Û†Ú•Ø§ÙˆÛ• ÙˆÛ•Ú© Ø¦Û•ÙˆÛ•ÛŒ Ù‡ÛŒÚ† Ø¨Ø§Ø±ÛŽÚ© Ø¯Û•Ø³ØªÙ†ÛŒØ´Ø§Ù† Ù†Û•Ú©Ø±Ø§ÙˆÛ•
+      title: Ø¯Û†Ø®ÛŒ Ø¦Û•Ú˜Ù…ÛŽØ±
+      with_media: Ø¨Û• Ù…ÛŒØ¯ÛŒØ§
+    tags:
+      accounts_today: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø§Ù†ÛŒ Ø¨ÛŽ Ù‡Ø§ÙˆØªØ§ÛŒ Ø¦Û•Ù…Ú•Û†
+      accounts_week: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŒ ÛŒÛ•Ú©ØªØ§ Ù„Û•Ù… Ù‡Û•ÙØªÛ•ÛŒÛ•
+      breakdown: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø§Ù†ÛŒ Ø¦Û•Ù…Ú•Û† Ø¨Û• Ø¬ÙˆØ¯Ø§Ú©Ø±Ø¯Ù†ÛŒ Ø³Û•Ø±Ú†Ø§ÙˆÛ•
+      context: Ø¯Û•Ù‚
+      directory: Ù„Û• Ù¾ÛŽØ±Ø³Øª
+      in_directory: "%{count} Ù„Û• Ù¾ÛŽØ±Ø³Øª"
+      last_active: Ø¯ÙˆØ§ Ú†Ø§Ù„Ø§Ú©ÛŒ
+      most_popular: Ø¨Û•Ù†Ø§ÙˆØ¨Ø§Ù†Ú¯ØªØ±ÛŒÙ†
+      most_recent: ØªØ§Ø²Û•ØªØ±ÛŒÙ†
+      name: Ù‡Û•Ø´ØªØ§Ú¯
+      review: Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ•ÛŒ Ø¯Û†Ø®
+      reviewed: Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ•
+      title: Ù‡Û•Ø´ØªØ§Ú¯
+      trending_right_now: Ø¨Û•Ø±Ú†Ø§ÙˆÚ©Ø±Ø¯Ù† Ù„Û• Ø¦ÛŽØ³ØªØ§Ø¯Ø§
+      unique_uses_today: T%{count} Ø¦Û•Ù…Ú•Û† Ø¨ÚµØ§ÙˆÚ©Ø±Ø§ÙˆÛ•
+      unreviewed: Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ• Ù†Û•Ú©Ø±Ø§ÙˆÛ•
+      updated_msg: Ú•ÛŽÚ©Ø®Ø³ØªÙ†ÛŒ Ù‡Ø§Ø´ØªØ§Ú¯ Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ù†ÙˆÛŽÚ©Ø±Ø§ÛŒÛ•ÙˆÛ•
+    title: Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Û•Ø±
+    warning_presets:
+      add_new: Ø²ÛŒØ§Ø¯Ú©Ø±Ø¯Ù†ÛŒ Ù†ÙˆÛŽ
+      delete: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•
+      edit_preset: Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒÚ©Ø±Ø¯Ù†ÛŒ Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒ Ù¾ÛŽØ´Ú¯Ø±ÛŒÙ…Ø§Ù†
+      title: Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Ø±Ø¯Ù†ÛŒ Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±Ú©Ø±Ø¯Ù†Û•ÙˆÛ• Ù¾ÛŽØ´â€ŒØ³Ø§Ø²Ø¯Ø§Ù†
+  admin_mailer:
+    new_pending_account:
+      body: ÙˆØ±Ø¯Û•Ú©Ø§Ø±ÛŒÙ‡Û•Ú˜Ù…Ø§Ø±Û• Ù†ÙˆÛŽÛŒÛ•Ú©Û• Ù„Û• Ø®ÙˆØ§Ø±Û•ÙˆÛ•ÛŒÛ•. Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø¦Û•Ù… Ù†Û•Ø±Ù…Û•Ú©Ø§Ù„Ø§ Ù¾Û•Ø³Û•Ù†Ø¯ Ø¨Ú©Û•ÛŒØª ÛŒØ§Ù† Ú•Û•Øª Ø¨Ú©Û•ÛŒØªÛ•ÙˆÛ•.
+      subject: Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒÛ•Ú© Ù†ÙˆÛŽ Ø¨Û† Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ• Ù„Û•Ø³Û•Ø± %{instance} (%{username})
+    new_report:
+      body: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŒ %{reporter} Ú¯ÙˆØ²Ø§Ø±Ø´ÛŒ Ù„Û• Ø¨Û•Ú©Ø§Ø±Ù‡ÛŒÙ†Û•Ø±ÛŒ%{target} Ø¯Ø§
+      body_remote: Ú©Û•Ø³ÛŽÚ© Ù„Û• %{domain} Ú¯ÙˆØ²Ø§Ø±Ø´ØªÛŒ %{target} Ù†Ø§Ø±Ø¯ÙˆÙˆÛ•
+      subject: Ú¯ÙˆØ²Ø§Ø±Ø´ØªÛŽÚ©ÛŒ Ù†ÙˆÛŒ Ù„Û• %{instance} (#%{id})
+    new_trending_tag:
+      body: 'Ù‡Ø§Ø´ØªØ§Ú¯ÛŒ #%{name} Ø¦Û•Ù…Ú•Û† Ø¦Ø§Ø±Ø§Ø³ØªÛ• Ø¯Û•Ú©Ø±ÛŽØªØŒ Ø¨Û•ÚµØ§Ù… Ù¾ÛŽØ´ØªØ± Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ•ÛŒ Ø¨Û† Ù†Û•Ú©Ø±Ø§ÙˆÛ•. Ø¨Û• Ø¦Ø§Ø´Ú©Ø±Ø§ Ù¾ÛŒØ´Ø§Ù† Ù†Ø§Ø¯Ø±ÛŽØª Ù…Û•Ú¯Û•Ø± ØªÛ† Ú•ÛŽÚ¯Û•ÛŒ Ù¾ÛŽ Ø¨Ø¯Û•ÛŒØªØŒ ÛŒØ§Ù† ØªÛ•Ù†Ù‡Ø§ ÙÛ†Ø±Ù…Û•Ú©Û•Øª ÙˆÛ•Ú© Ø®Û†ÛŒ Ù¾Ø§Ø´Û•Ú©Û•ÙˆØª Ø¨Ú©Û•ÛŒØª Ú©Û• Ù‡Û•Ø±Ú¯ÛŒØ² Ù„ÛŽÛŒ Ù†Û•Ø¨ÛŒØ³ØªÛŒØª.'
+      subject: ØªØ§Ú¯ÛŽÚ©ÛŒ Ù†ÙˆÛŽ Ù„Û• %{instance} Ù†ÛŒØ§Ø²Ù…Û•Ù†Ø¯ÛŒ Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ•ÛŒÛ• (#%{name})
+  aliases:
+    add_new: Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯Ù†ÛŒ Ù†Ø§ÙˆÛŒ Ø³Ø§Ø®ØªÛ•
+    created_msg: Ù†Ø§Ø²Ù†Ø§ÙˆÛŽÚ©ÛŒ Ù†ÙˆÛŽÛŒØ§Ù† Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆØ§Ù†Û• Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯. Ø¦ÛŽØ³ØªØ§ Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø¯Û•Ø³Øª Ø¨Û• Ú¯ÙˆØ§Ø³ØªÙ†Û•ÙˆÛ• Ú©Û•ÛŒØª Ù„Û• Ù‡Û•Ú˜Ù…ÛŽØ±Û• Ú©Û†Ù†Û•Ú©Û•Øª.
+    deleted_msg: Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆØ§Ù†Û• Ù†Ø§Ø²Ù†Ø§ÙˆÛ•Ú©Ø§Ù† Ù„Ø§Ø¨Ø¯Û•. Ú¯ÙˆØ§Ø³ØªÙ†Û•ÙˆÛ• Ù„Û•Ùˆ Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÙˆÛ• Ø¨Û† Ø¦Û•Ù… Ú©Û•Ø³Û• Ú†ÛŒØªØ± Ù†Ø§Ø¨ÛŽØª.
+    empty: Ù‡ÛŒÚ† Ù†Ø§Ø²Ù†Ø§ÙˆÛŽÚ©Øª Ù†ÛŒÛ•.
+    hint_html: Ø¦Û•Ú¯Û•Ø± Ø¯Û•ØªÛ•ÙˆÛŽØª Ù„Û• Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒÛ•Ú©ÛŒ ØªØ±Û•ÙˆÛ• Ø¨Ú¯ÙˆÛŽØ²Ø±ÛŒØªÛ•ÙˆÛ• Ø¨Û† Ø¦Û•Ù… Ù‡Û•Ú˜Ù…Ø§Ø±Û•ØŒ Ù„ÛŽØ±Û•Ø¯Ø§ Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ù†Ø§Ø²Ù†Ø§ÙˆÛŽÚ© Ø¯Ø±ÙˆØ³Øª Ø¨Ú©Û•ÛŒØªØŒ Ù¾ÛŽØ´ Ø¦Û•ÙˆÛ•ÛŒ Ø¦Û•ÙˆÛ• Ø¨Û•Ø±Ø¯Û•ÙˆØ§Ù… Ø¨ÛŒØª Ù„Û• Ú¯ÙˆØ§Ø³ØªÙ†Û•ÙˆÛ•ÛŒ Ù„Û• Ù‡Û•Ú˜Ù…Ø§Ø±Û• Ú©Û†Ù†Û•Ú©Û• Ø¨Û† Ø¦Û•Ù… Ù‡Û•Ú˜Ù…Ø§Ø±Û• Ù¾ÛŽÙˆÛŒØ³ØªÛ•. Ø¦Û•Ù… Ú©Ø±Ø¯Û•ÙˆÛ•ÛŒÛ• Ø®Û†ÛŒ Ù„Û• Ø®Û†ÛŒØ¯Ø§ <strong>Ø¨ÛŽ Ø²Û•Ø±Û• Ùˆ Ù†Ø§Ú¯Û•Ú•ÛŽØªÛ•ÙˆÛ•</strong><strong>Ú¯ÙˆØ§Ø³ØªÙ†Û•ÙˆÛ•ÛŒ Ù„Û• Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒ Ú©Û†Ù†Û• Ø¨Û† Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒ Ù†ÙˆÛŽ Ø¯Û•Ø³ØªÛŒ Ù¾ÛŽÚ©Ø±Ø¯ÙˆÙˆÛ•</strong>.
+    remove: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•ÛŒ Ù¾Û•ÛŒÙˆÛ•Ù†Ø¯ÛŒ Ù†Ø§Ø² Ù†Ø§Ùˆ
+  appearance:
+    advanced_web_interface: Ø±ÙˆØ®Ø³Ø§Ø±ÛŒ Ù¾ÛŽØ´Ú©Û•ÙˆØªÙˆÙˆ
+    advanced_web_interface_hint: 'Ø¦Û•Ú¯Û•Ø± Ø¯Û•ØªÛ•ÙˆÛŽØª Ù¾Ø§Ù†ÛŒ Ø´Ø§Ø´Û•Ú©Û• Ø¨Û•Ú©Ø§Ø±Ø¨ÛŽÙ†ÛŒØªØŒ Ø¯Û•ØªÙˆØ§Ù†ÛŒ Ø¨Û• ÛŒØ§Ø±Ù…Û•ØªÛŒ Ú•ÙˆÙˆÚ©Ø§Ø±ÛŒ Ù¾ÛŽØ´Ú©Û•ÙˆØªÙˆÙˆ Ú†Û•Ù†Ø¯ÛŒÙ† Ø³ØªÙˆÙˆÙ†ÛŒ Ø¬ÛŒØ§ÙˆØ§Ø² Ú•ÛŽÚ©Ø¨Ø®Û•ÛŒØª Ø¨Û† Ø¨ÛŒÙ†ÛŒÙ†ÛŒ Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ Ø²ÛŒØ§ØªØ± Ù„Û• Ù‡Û•Ù…Ø§Ù† Ú©Ø§Øª Ú©Û• Ø¯Û•ØªÛ•ÙˆÛŽØª Ø¨ÛŒØ¨ÛŒÙ†ÛŒØª: Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ Ù†ÙˆÙˆØ³Û•Ø±Ø§Ù†ÛŒ Ø¯ÛŒÚ©Û•ØŒ Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù†ØŒ Ù¾ÛŽØ±Ø³ØªÛŒ Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ Ù‡Û•Ù…ÙˆÙˆ Ø´ÙˆÛŽÙ†ÛŽÚ©ØŒ ÙˆÛ• Ù‡Û•Ø± Ú˜Ù…Ø§Ø±Û•ÛŒÛ•Ú© Ù„Û• Ù„ÛŒØ³ØªÛ•Ú©Ø§Ù† Ùˆ Ù‡Ø§Ø´ØªØ§Ú¯Û•Ú©Ø§Ù†.'
+    animations_and_accessibility: Ø¦Û•Ù†ÛŒÙ…Û•ÛŒØ´Ù† Ùˆ ØªÙˆØ§Ù†Ø§ÛŒÛŒ Ø¯Û•Ø³ØªÙ¾ÛŽÚ¯Û•ÛŒØ´ØªÙ†
+    confirmation_dialogs: Ù¾Û•ÛŒØ§Ù…Û•Ú©Ø§Ù†ÛŒ Ù¾Û•Ø³Û•Ù†Ø¯Ú©Ø±Ø§Ùˆ
+    discovery: Ø¯Û†Ø²ÛŒÙ†Û•ÙˆÛ•
+    localization:
+      body: Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† Ù„Û•Ù„Ø§ÛŒÛ•Ù† Ø®Û†Ø¨Û•Ø®Ø´Û•ÙˆÛ• ÙˆÛ•Ø±Ø¯Û•Ú¯ÛŽÚ•ÛŽØª.
+      guide_link: https://crowdin.com/project/mastodon
+      guide_link_text: Ù‡Û•Ù…ÙˆÙˆ Ú©Û•Ø³ÛŽÚ© Ø¯Û•ØªÙˆØ§Ù†ÛŽØª Ø¨Û•Ø´Ø¯Ø§Ø±ÛŒ Ø¨Ú©Ø§Øª.
+    sensitive_content: Ù†Ø§ÙˆÛ•Ú•Û†Ú©ÛŒ Ù‡Û•Ø³ØªÛŒØ§Ø±
+    toot_layout: Ù„Û†ÛŒ ØªÙˆØª
+  application_mailer:
+    notification_preferences: Ú¯Û†Ú•ÛŒÙ†ÛŒ Ù¾Û•Ø³Û•Ù†Ø¯Ú©Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ
+    salutation: "%{name},"
+    settings: 'Ú¯Û†Ú•ÛŒÙ†ÛŒ Ù¾Û•Ø³Û•Ù†Ø¯Ú©Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ: %{link}'
+    view: 'Ù†ÛŒØ´Ø§Ù†Ø¯Ø§Ù†:'
+    view_profile: Ù¾Ø±Û†ÙØ§ÛŒÙ„ Ù†ÛŒØ´Ø§Ù† Ø¨Ø¯Û•
+    view_status: Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ø¯Û†Ø®
+  applications:
+    created: Ø¨Û•Ø±Ù†Ø§Ù…Û• Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¯Ø±ÙˆØ³Øª Ú©Ø±Ø§
+    destroyed: Ø¨Û•Ø±Ù†Ø§Ù…Û• Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø³Ú•Ø¯Ø±Ø§ÙˆÛ•ØªÛ•ÙˆÛ•
+    invalid_url: Ø¨Û•Ø³ØªÛ•Ø±ÛŒ Ø¯Ø§Ø¨ÛŒÙ†Ú©Ø±Ø§Ùˆ Ù†Ø§Ø¯Ø±ÙˆØ³ØªÛ•
+    regenerate_token: Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù†ÛŒØ´Ø§Ù†Û•ÛŒ Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆÙˆØ±Û•ÙˆÛ•
+    token_regenerated: Ú©Û†Ø¯ÛŒ Ø¯Û•Ø³ØªÙ¾ÛŽÚ¯Û•ÛŒØ´ØªÙ† Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø§
+    warning: Ø²Û†Ø± Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±Ø¨Û• Ù„Û•Ù… Ø¯Ø§ØªØ§ÛŒÛ•. Ù‡Û•Ø±Ú¯ÛŒØ² Ù„Û•Ú¯Û•Úµ Ú©Û•Ø³ Ø¯Ø§ Ù‡Ø§ÙˆØ¨Û•Ø´ÛŒ Ù…Û•Ú©Û•!
+    your_token: Ú©Û†Ø¯ÛŒ Ø¯Û•Ø³ØªÙ¾ÛŽÚ¯Û•ÛŒØ´ØªÙ†ÛŒ Ø¦ÛŽÙˆÛ•
+  auth:
+    apply_for_account: Ø¯Ø§ÙˆØ§Ú©Ø±Ø¯Ù†ÛŒ Ø¨Ø§Ù†Ú¯Ù‡ÛŽØ´ØªÛŽÚ©
+    change_password: ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•
+    checkbox_agreement_html: Ù…Ù† Ú•Ø§Ø²ÛŒÙ… Ø¨Û• <a href ="%{rules_path}" target="_blank">ÛŒØ§Ø³Ø§Ú©Ø§Ù†ÛŒ Ú•Ø§Ú˜Û•</a> ÙˆÛ• <a href="%{terms_path}" target="_blank">Ù…Û•Ø±Ø¬Û•Ú©Ø§Ù†ÛŒ Ø®Ø²Ù…Û•ØªÚ¯ÙˆØ²Ø§Ø±ÛŒ</a>
+    checkbox_agreement_without_rules_html: Ù…Ù† Ú•Ø§Ø²ÛŒÙ… Ø¨Û• <a href="%{terms_path}" target="_blank">Ù…Û•Ø±Ø¬Û•Ú©Ø§Ù†ÛŒ Ø®Ø²Ù…Û•ØªÚ¯ÙˆØ²Ø§Ø±ÛŒ</a>
+    delete_account: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•
+    delete_account_html: Ú¯Û•Ø± Ù‡Û•Ø±Û•Ú©ØªÛ• Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ø¨Ø³Ú•ÛŒØªÛ•ÙˆÛ•ØŒ Ù„Û• <a href="%{path}">Ù„Û•Ù… Ù‚ÙˆÙ†Ø§ØºØ§Ù†Û•</a> Ø¨Ú•Û†ÛŒØªÛ• Ù¾ÛŽØ´Û•ÙˆÛ•. Ø¯Ø§ÙˆØ§ÛŒ Ù¾Û•Ø³Û•Ù†Ø¯ Ú©Ø±Ø¯Ù†ØªØ§Ù† Ù„ÛŽØ¯Û•Ú¯ÛŒØ±ÛŽØª.
+    description:
+      prefix_invited_by_user: "@%{name} Ø¨Ø§Ù†Ú¯Øª Ø¯Û•Ú©Ø§Øª Ø¨Û† Ù¾Û•ÛŒÙˆÛ•Ù†Ø¯ÛŒÚ©Ø±Ø¯Ù† Ø¨Û•Ù… Ú•Ø§Ú˜Û•ÛŒ Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†!"
+      prefix_sign_up: Ø¦Û•Ù…Ú•Û† Ø®Û†Øª ØªÛ†Ù…Ø§Ø± Ø¨Ú©Û• Ù„Û• Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†!
+      suffix: Ø¨Û• Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒÛ•Ú©ØŒ Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø´ÙˆÛŽÙ† Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Ø§Ù†ÛŒ Ø¯ÛŒÚ©Û• Ø¨Ú©Û•ÙˆÛŒØªØŒ Ù†ÙˆÛŽÚ©Ø±Ø¯Ù†Û•ÙˆÛ•Ú©Ø§Ù† Ø¨ÚµØ§ÙˆØ¨Ú©Û•ÙˆÛ• Ùˆ Ù†Ø§Ù…Û• Ù„Û•Ú¯Û•Úµ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù† Ù„Û• Ù‡Û•Ø± Ú•Ø§Ú˜Û•ÛŒÛ•Ú©ÛŒ Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† Ùˆ Ø²ÛŒØ§ØªØ± Ø¨Ú¯Û†Ú•ÛŒØªÛ•ÙˆÛ•!
+    didnt_get_confirmation: Ú•ÛŽÙ†Ù…Ø§ÛŒÛŒÛ•Ú©Ø§Ù†ÛŒ Ø¯ÚµÙ†ÛŒØ§Ú©Ø±Ø¯Ù†Û•ÙˆÛ•Øª Ù¾ÛŽÙ†Û•Ø¯Ø±Ø§?
+    dont_have_your_security_key: Ú©Ù„ÛŒÙ„ÛŒ Ø¦Ø§Ø³Ø§ÛŒØ´Øª Ù†ÛŒÛ•?
+    forgot_password: ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•Ú©Û•Øª Ù„Û•Ø¨ÛŒØ± Ú†ÙˆÙˆÛ•?
+    invalid_reset_password_token: ÙˆØ´Û•ÛŒ Ù†Ù‡ÛŽÙ†ÛŒ Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ú•ÛŽÚ©Ø¨Ø®Û•ÙˆÛ• Ø¯Ø±ÙˆØ³Øª Ù†ÛŒÛ• ÛŒØ§Ù† Ø¨Û•Ø³Û•Ø±Ú†ÙˆÙˆÛ•. ØªÚ©Ø§ÛŒÛ• Ø¯Ø§ÙˆØ§ÛŒÛ•Ú©ÛŒ Ù†ÙˆÛŽ Ø¨Ú©Û•.
+    link_to_otp: Ú©Û†Ø¯ÛŒ Ø¯ÙˆÙˆ ÙØ§Ú©ØªÛ•Ø± Ù„Û• ØªÛ•Ù„Û•ÙÛ†Ù†Û•Ú©Û•Øª ÛŒØ§Ù† Ú©Û†Ø¯ÛŒ Ú†Ø§Ú©Ú©Ø±Ø¯Ù†Û•ÙˆÛ• ØªÛŽØ¨Ù†ÙˆÙˆØ³Û•
+    link_to_webauth: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø§Ù†ÛŒ Ø¦Ø§Ù…ÛŽØ±ÛŒ Ú©Ù„ÛŒÙ„ÛŒ Ù¾Ø§Ø±Ø§Ø³ØªÙ†
+    login: Ú†ÙˆÙˆÙ†Û•Ú˜ÙˆÙˆØ±Û•ÙˆÛ•
+    logout: Ú†ÙˆÙˆÙ†Û•Ø¯Û•Ø±Û•ÙˆÛ•
+    migrate_account: Ú¯ÙˆØ§Ø³ØªÙ†Û•ÙˆÛ• Ø¨Û† Ø¦Û•Ú˜Ù…ÛŽØ±ÛŽÚ©ÛŒ ØªØ±
+    migrate_account_html: Ø¦Û•Ú¯Û•Ø± Ø¯Û•ØªÛ•ÙˆÛŽØª Ø¦Û•Ù… Ù‡Û•Ú˜Ù…Ø§Ø±Û• Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ø¦Ø§Ú•Ø§Ø³ØªÛ• Ø¨Ú©Û•ÛŒØª Ø¨Û† Ø¦Û•Ú˜Ù…ÛŽØ±ÛŽÚ©ÛŒ ØªØ±ØŒ Ø¯Û•ØªÙˆØ§Ù†ÛŒØª <href="%{path}"> Ú©Ø±ØªÛ•ÛŒÛ•Ú© Ù„ÛŽØ±Û• Ø¨Ú©Û•ÛŒ </a>.
+    or_log_in_with: ÛŒØ§Ù† Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆÙˆØ±Û•ÙˆÛ• Ø¨Û•
+    providers:
+      cas: CAS
+      saml: SAML
+    register: Ø®Û† ØªÛ†Ù…Ø§Ø±Ú©Ø±Ø¯Ù†
+    registration_closed: "%{instance} Ø¦Û•Ù†Ø¯Ø§Ù…Ø§Ù†ÛŒ Ù†ÙˆÛŽ Ù‚Ø¨ÙˆÙˆÚµ Ù†Ø§Ú©Ø§Øª"
+    resend_confirmation: Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ù†Ø§Ø±Ø¯Ù†ÛŒ Ú•ÛŽÙ†Ù…Ø§ÛŒÛŒÛ•Ú©Ø§Ù†ÛŒ Ø¯ÙˆÙˆÙ¾Ø§ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ•
+    reset_password: Ú¯Û•Ú•Ø§Ù†Û•ÙˆÛ•ÛŒ ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•
+    security: Ø¦Ø§Ø³Ø§ÛŒØ´
+    set_new_password: Ø³Ø§Ø²Ø¯Ø§Ù†ÛŒ ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•ÛŒ Ù†ÙˆÛŽ
+    setup:
+      email_below_hint_html: Ø¦Û•Ú¯Û•Ø± Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛŒ Ø®ÙˆØ§Ø±Û•ÙˆÛ• Ù†Ø§Ø¯Ø±ÙˆØ³ØªÛ•ØŒ Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ù„ÛŽØ±Û• Ø¨ÛŒÚ¯Û†Ú•ÛŒØª Ùˆ Ø¦ÛŒÙ…Û•ÛŒÚµÛŽÚ©ÛŒ Ù¾Ø´ØªÚ•Ø§Ø³ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù†ÙˆÛŽ ÙˆÛ•Ø±Ø¨Ú¯Û†Ú•ÛŒØª.
+      email_settings_hint_html: Ø¦ÛŒÙ…Û•ÛŒÚµÛŒ Ù¾Ø´ØªÚ•Ø§Ø³ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ• Ú©Û• Ù†ÛŽØ±Ø¯Ø±Ø§ Ø¨Û† %{email}. Ø¦Û•Ú¯Û•Ø± Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ Ú•Ø§Ø³Øª Ù†Û•Ø¨ÙˆÙˆØŒ Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ù„Û• Ú•ÛŽÚ©Ø¨Û•Ù†Ø¯Û•Ú©Ø§Ù†ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ø¨ÛŒÚ¯Û†Ú•ÛŒØª.
+      title: Ø¯Ø§Ù…Û•Ø²Ø±Ø§Ù†Ø¯Ù†
+    status:
+      account_status: Ø¯Û†Ø®ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•
+      confirming: Ú†Ø§ÙˆÛ•Ú•ÙˆØ§Ù†ÛŒ Ø¯ÚµÙ†ÛŒØ§Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ Ø¨Û† ØªÛ•ÙˆØ§ÙˆÚ©Ø±Ø¯Ù†.
+      functional: Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ø¨Û•ØªÛ•ÙˆØ§ÙˆÛŒ Ú©Ø§Ø±Ø§ Ø¨ÙˆÙˆÛ•ØªÛ•ÙˆÛ•.
+      pending: Ø¦Û•Ù¾Ù„ÛŒÚ©Û•ÛŒØ´Û•Ù†Û•Ú©Û•Øª Ú†Ø§ÙˆÛ•Ú•ÙˆØ§Ù†ÛŒ Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ•ÛŒÛ• Ù„Û•Ù„Ø§ÛŒÛ•Ù† Ø³ØªØ§ÙÛ•Ú©Û•Ù…Ø§Ù†Û•ÙˆÛ•. Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ø¦Û•Ù…Û• Ù‡Û•Ù†Ø¯ÛŽÚ© Ú©Ø§ØªÛŒ Ø¨Ø®Ø§ÛŒÛ•Ù†ÛŽØª Ø¦Û•Ú¯Û•Ø± Ø¦Û•Û†Ù¾Û•Ú©Û•Øª Ù¾Û•Ø³Û•Ù†Ø¯ Ú©Ø±Ø§ØŒ Ø¦ÛŒÙ…Û•ÛŒÚµØª Ù¾ÛŽØ¯Û•Ú¯Ø§Øª.
+      redirecting_to: Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ù†Ø§Ú†Ø§Ù„Ø§Ú©Û• Ù„Û•Ø¨Û•Ø±Ø¦Û•ÙˆÛ•ÛŒ Ø¦ÛŽØ³ØªØ§ Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ø¦Ø§Ú•Ø§Ø³ØªÛ•Ø¯Û•Ú©Ø±ÛŽØªÛ•ÙˆÛ• Ø¨Û† %{acct}.
+    trouble_logging_in: Ú©ÛŽØ´Û• Øª Ù‡Û•ÛŒÛ• Ø¨Û† Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆÙˆØ±Û•ÙˆÛ•?
+    use_security_key: Ú©Ù„ÛŒÙ„ÛŒ Ø¦Ø§Ø³Ø§ÛŒØ´ Ø¨Û•Ú©Ø§Ø±Ø¨Ù‡ÛŽÙ†Û•
+  authorize_follow:
+    already_following: Ø¦ÛŽÙˆÛ• Ø¦ÛŽØ³ØªØ§ Ø´ÙˆÛŽÙ† Ú©Û•ÙˆØªÙˆÙˆÛŒ Ø¦Û•Ù… Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒÛ•ÛŒ
+    already_requested: ØªÛ† Ù¾ÛŽØ´ØªØ± Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒ Ø¨Û•Ø¯ÙˆØ§Ø¯Ø§Ú†ÙˆØª Ù†Ø§Ø±Ø¯ÙˆÛ• Ø¨Û† Ø¦Û•Ùˆ Ù‡Û•Ú˜Ù…Ø§Ø±Û•
+    error: Ø¨Û•Ø¯Ø§Ø®Û•ÙˆÛ• Ù‡Û•ÚµÛ•ÛŒÛ•Ú© Ù‡Û•Ø¨ÙˆÙˆ Ù„Û• Ú©Ø§ØªÛŒ Ú¯Û•Ú•Ø§Ù† Ø¨Û•Ø¯ÙˆØ§ÛŒ Ø¦Û•Ùˆ Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒÛ•
+    follow: Ø´ÙˆÛŽÙ† Ú©Û•ÙˆÛ•
+    follow_request: 'ØªÛ† Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒ Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙ†Øª Ù†Ø§Ø±Ø¯ÙˆÙˆÛ• Ø¨Û†:'
+    following: 'Ø¦Û•Ù†Ø¬Ø§Ù… Ø¨ÙˆÙˆ! ØªÛ† Ø¦ÛŽØ³ØªØ§ Ø¨Û•Ø¯ÙˆØ§ÛŒ Ø¦Û•Ù… Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Û• Ø¯Û•Ú©Û•ÙˆÛŒØª:'
+    post_follow:
+      close: ÛŒØ§Ù†ØŒ Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø¦Û•Ù… Ù¾Û•Ù†Ø¬Û•Ø±Û•ÛŒÛ• Ø¯Ø§Ø¨Ø®Û•ÛŒØª.
+      return: Ù¾Ø±Û†ÙØ§ÛŒÙ„ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø± Ù†ÛŒØ´Ø§Ù† Ø¨Ø¯Û•
+      web: Ø¨Ú•Û† Ø¨Û† ÙˆÛŽØ¨
+    title: Ø¯ÙˆØ§ÛŒ %{acct} Ø¨Ú©Û•ÙˆÛ•
+  challenge:
+    confirm: Ø¨Û•Ø±Ø¯Û•ÙˆØ§Ù… Ø¨Û•
+    hint_html: "<strong>Ø®Ø§Úµ:</strong> Ø¦ÛŒÙ…Û• Ù„Û• Ú©Ø§ØªÚ˜Ù…ÛŽØ±ÛŒ Ø¯Ø§Ù‡Ø§ØªÙˆÙˆ ØªÛŽÙ¾Û•Ø±ÙˆØ´Û•Øª Ù„ÛŽØ¯Ø§ÙˆØ§ Ù†Ø§Ú©Û•ÛŒÙ†."
+    invalid_password: ØªÛŽÙ¾Û•Ø±ÙˆØ´Û• Ø¯Ø±ÙˆØ³Øª Ù†ÛŒÛ•
+    prompt: Ø¯ÚµÙ†ÛŒØ§Ø¨ÙˆÙˆÙ† Ù„Û• Ù†Ù‡ÛŽÙ†ÙˆØ´Û• Ø¨Û† Ø¨Û•Ø±Ø¯Û•ÙˆØ§Ù…Ø¨ÙˆÙˆÙ†
+  crypto:
+    errors:
+      invalid_key: Ú©Ù„ÛŒÙ„ÛŒ Ø¨Ø§ÙˆÚ•Ù¾ÛŽÚ©Ø±Ø§Ùˆ Ed25519 ÛŒØ§Ù† Curve25519 Ø¯Ø±ÙˆØ³Øª Ù†ÛŒÛŒÛ•
+      invalid_signature: ÙˆØ§Ú˜ÙˆÙˆÛŒ Ed25519 Ø¨Ú•ÙˆØ§Ø¯Ø§Ø± Ù†ÛŒÛŒÛ•
+  date:
+    formats:
+      default: "%b %d, %Y"
+      with_month_name: "%B %d, %Y"
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count}Ú©Ø§Øª"
+      about_x_months: "%{count}mo"
+      about_x_years: "%{count}Ø³Ø§Úµ"
+      almost_x_years: "%{count}Ø³Ø§Úµ"
+      half_a_minute: Ø¦ÛŽØ³ØªØ§
+      less_than_x_minutes: "%{count}m"
+      less_than_x_seconds: Ø¦ÛŽØ³ØªØ§
+      over_x_years: "%{count}Ø³Ø§Úµ"
+      x_days: "%{count}Ú•Û†Ú˜"
+      x_minutes: "%{count}m"
+      x_months: "%{count}mo"
+      x_seconds: "%{count}s"
+  deletes:
+    challenge_not_passed: Ø¦Û•Ùˆ Ø²Ø§Ù†ÛŒØ§Ø±ÛŒØ§Ù†Û•ÛŒ ØªÛŽÙ†ÙˆÙˆØ³Øª Ú©Ø±Ø¯ÙˆÙˆÛ• Ú•Ø§Ø³Øª Ù†Û•Ø¨ÙˆÙˆ
+    confirm_password: ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•ÛŒ Ø¦ÛŽØ³ØªØ§Øª ØªÛŽØ¨Ù†ÙˆÙˆØ³Û• Ø¨Û† Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†ÛŒ Ù†Ø§Ø³Ù†Ø§Ù…Û•Ú©Û•Øª
+    confirm_username: Ù†Ø§ÙˆÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Øª ØªÛŽØ¨Ù†ÙˆÙˆØ³Û• Ø¨Û† Ø¯ÚµÙ†ÛŒØ§Ø¨ÙˆÙˆÙ† Ù„Û• Ú©Ø±Ø¯Ø§Ø±Û•Ú©Û•
+    proceed: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•
+    success_msg: Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø³Ú•Ø±Ø§ÛŒÛ•ÙˆÛ•
+    warning:
+      before: 'Ù¾ÛŽØ´ Ø¨Û•Ø±Ø¯Û•ÙˆØ§Ù… Ø¨ÙˆÙˆÙ†ØŒ ØªÚ©Ø§ÛŒÛ• Ø¦Û•Ù… ØªÛŽØ¨ÛŒÙ†ÛŒØ§Ù†Û• Ø¨Û• ÙˆØ±Ø¯ÛŒ Ø¨Ø®ÙˆÛŽÙ†Ù†Û•ÙˆÛ•:'
+      caches: ÙˆØ§Ø¯ÛŒØ§Ø±Û• Ø¦Û•Ùˆ Ù†Ø§ÙˆÛ•Ø±Û†Ú©Û• Ú©Û• Ú•Ø§Ú˜Û•Ú©Ø§Ù†ÛŒ Ø¯ÛŒÚ©Û• Ù¾Ø§Ø´Ú©Û•ÙˆØªÛŒØ§Ù† Ú©Ø±Ø¯ÙˆÙˆÛ• Ø¨Ù…ÛŒÙ†ÛŽØªÛ•ÙˆÛ•
+      data_removal: Ø¨Ø§Ø¨Û•ØªÛ•Ú©Ø§Ù†Øª Ùˆ Ø¯Ø§ØªØ§Ú©Ø§Ù†ÛŒ ØªØ± Ø¨Û• Ù‡Û•Ù…ÛŒØ´Û•ÛŒÛŒ Ù„Ø§Ø¯Û•Ø¨Ø±ÛŽÙ†
+      email_change_html: Ø¯Û•ØªÙˆØ§Ù†ÛŒ <a href="%{path}"> Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Ú©Û•Øª Ø¨Ú¯Û†Ú•ÛŒØª</a> Ø¨Û•Ø¨ÛŽ Ø³Ú•ÛŒÙ†Û•ÙˆÛ•ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª
+      email_contact_html: Ú¯Û•Ø± Ø¦ÛŒÙ…Û•ÛŒÙ„ Ù†Û•Ú¯Û•ÛŒØ´ØªÙˆÙˆÛ• Ø¨Û† Ø¯Ø§ÙˆØ§ÛŒ ÛŒØ§Ø±Ù…Û•ØªÛŒ Ù¾Û•ÛŒØ§Ù…ÛŽÚ© Ø¨Ù†ÛŽØ±Û• Ø¨Û† <a href="mailto:%{email}">%{email}</a> Ù¾ÛŒØºØ§Ù… Ø¯Ù‡ÛŒØ¯
+      email_reconfirmation_html: Ø¦Û•Ú¯Û•Ø± Ø¦ÛŒÙ…Û•ÛŒÚµÛŒ Ù¾Ø´ØªÚ•Ø§Ø³ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ•Øª Ù¾ÛŽÙ†Û•Ú¯Û•Ø´ØªÙˆÙˆÛ•ØŒ Ø¯Û•ØªÙˆØ§Ù†ÛŒØª <a href="%{path}"> Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ø¯Ø§ÙˆØ§ÛŒ Ù„ÛŽØ¨Ú©Û•</a>
+      irreversible: Ù†Ø§ØªÙˆØ§Ù†ÛŒØª Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ø¨Ú¯Û•Ú•ÛŽÙ†ÛŒØªÛ•ÙˆÛ• ÛŒØ§Ù† Ú©Ø§Ø±Ø§ Ø¨Ú©Û•ÛŒØªÛ•ÙˆÛ•
+      more_details_html: Ø¨Û† Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ Ø²ÛŒØ§ØªØ±ØŒ <a href="%{terms_path}"> Ù¾Ø§Ø±Ø§Ø³ØªÙ†ÛŒ Ù†Ù‡ÛŽÙ†ÛŒÛ•Ú©Ø§Ù†</a> Ø¨Ø¨ÛŒÙ†Û•.
+      username_available: Ù†Ø§ÙˆÛŒ ØªÛŽÙ¾Û•Ú•Ø¨ÙˆÙˆÙ†Øª Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ø¨Û•Ø±Ø¯Û•Ø³Øª Ø¯Û•Ø¨ÛŽØª
+      username_unavailable: Ù†Ø§ÙˆÛŒ ØªÛŽÙ¾Û•Ú•Ø¨ÙˆÙˆÙ†Øª Ø¨Û•Ø±Ø¯Û•Ø³Øª Ù†ÛŒÛŒÛ•
+  directories:
+    directory: Ú•ÛŽÙ†ÛŒØ´Ø§Ù†Ø¯Û•Ø±ÛŽÚ©ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„
+    explanation: Ø¯Û†Ø²ÛŒÙ†Û•ÙˆÛ•ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù† Ù„Û•Ø³Û•Ø± Ø¨Ù†Û•Ù…Ø§ÛŒ Ø¨Û•Ø±Ú˜Û•ÙˆÛ•Ù†Ø¯ÛŒÛŒÛ•Ú©Ø§Ù†ÛŒØ§Ù†
+    explore_mastodon: Ú¯Û•Ú•Ø§Ù† Ù„Û• %{title}
+  domain_validator:
+    invalid_domain: Ù†Ø§ÙˆÛŒ Ø¯Û†Ù…Û•ÛŒÙ† Ø¨Ú•ÙˆØ§Ø¯Ø§Ø± Ù†ÛŒÛŒÛ•
+  errors:
+    '400': Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒÛ•Ú©Û•ÛŒ Ú©Û• Ù¾ÛŽØ´Ú©Û•Ø´Øª Ú©Ø±Ø¯ÙˆÙˆÛ• Ù†Ø§Ø¯Ø±ÙˆØ³ØªÛ• ÛŒØ§Ù† Ù†Û•ÛŒÙ¾ÛŽÚ©Ø§.
+    '403': ØªÛ† Ù…Û†ÚµÛ•ØªØª Ù†ÛŒÛ• Ø¨Û† Ø¨ÛŒÙ†ÛŒÙ†ÛŒ Ø¦Û•Ù… Ù„Ø§Ù¾Û•Ú•Û•ÛŒÛ•.
+    '404': Ø¦Û•Ùˆ Ù„Ø§Ù¾Û•Ú•Û•ÛŒÛ•ÛŒ Ø¨Û•Ø¯ÙˆØ§ÛŒ Ø¯Û•Ú¯Û•Ú•ÛŽÛŒ Ù„ÛŽØ±Û• Ù†ÛŒÛ•.
+    '406': Ø¦Û•Ù… Ù¾Û•Ú•Û•ÛŒÛ• Ù„Û• ÙÛ†Ø±Ù…Ø§ØªÛŒ Ø¯Ø§ÙˆØ§Ú©Ø±Ø§ÙˆØ¯Ø§ Ø¨Û•Ø±Ø¯Û•Ø³Øª Ù†ÛŒÛŒÛ•.
+    '410': Ø¦Û•Ùˆ Ù„Ø§Ù¾Û•Ú•Û•ÛŒÛ•ÛŒ Ø¨Û•Ø¯ÙˆØ§ÛŒ Ø¯Ø§ Ø¯Û•Ú¯Û•Ú•Ø§ÛŒØª Ú†ÛŒØªØ± Ù„ÛŽØ±Û• Ø¨ÙˆÙˆÙ†ÛŒ Ù†ÛŒÛ•.
+    '422':
+      content: Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†Û•Ú©Û•ÛŒ Ø¦Ø§Ø³Ø§ÛŒØ´ Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆ Ù†Û•Ø¨ÙˆÙˆ. ØªÛ† Ø¨Ù„Û†Ú©ÛŒ Ú©Û†Ú©ÛŒØ² Ø¯Û•Ú©Û•ÛŒØª?
+      title: Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†Û•Ú©Û•ÛŒ Ø¦Ø§Ø³Ø§ÛŒØ´ Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆ Ù†Û•Ø¨ÙˆÙˆ
+    '429': Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒ Ø²Û†Ø±
+    '500':
+      content: Ø¯Ø§ÙˆØ§ÛŒ Ù„ÛŽØ¨ÙˆØ±Ø¯Ù† Ø¯Û•Ú©Û•ÛŒÙ†ØŒ Ø¨Û•ÚµØ§Ù… Ù„Û• Ú©Û†ØªØ§ÛŒÛŒÛ•Ú©Û•Ù…Ø§Ù†Ø¯Ø§. Ø´ØªÛŽÚ© Ù‡Û•ÚµÛ• Ú•ÙˆÛŒØ¯Ø§ÙˆÛ•.
+      title: Ø¦Û•Ù… Ù„Ø§Ù¾Û•Ú•Û•ÛŒÛ• Ú•Ø§Ø³Øª Ù†ÛŒÛŒÛ•
+    '503': Ù†Ø§ØªÙˆØ§Ù†Ø±ÛŽØª Ù¾Û•Ú•Û•Ú©Û• Ø®Ø²Ù…Û•Øª Ø¨Ú©Ø±ÛŽØª Ø¨Û•Ù‡Û†ÛŒ Ø´Ú©Ø³ØªÛŒ Ú•Ø§Ú˜Û•ÛŒÛ•Ú©ÛŒ Ú©Ø§ØªÛŒ.
+    noscript_html: Ø¨Û† Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø§Ù†ÛŒ Ø¨Û•Ø±Ù†Ø§Ù…Û•ÛŒ ÙˆÛŽØ¨ÛŒ Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†ØŒ ØªÚ©Ø§ÛŒÛ• Ø¬Ø§Ú¤Ø§Ø³Ú©Ø±ÛŒÙ¾Øª Ø¨Û•ØªÙˆØ§Ù†Ø§ Ø¨Ú©Û•. Ù„Û• Ø¬ÛŒØ§ØªÛŒ Ø¦Û•ÙˆÛ•ØŒ ÛŒÛ•Ú©ÛŽÚ© Ù„Û• < href="%{apps_path}">Ø¦Û•Ù¾ÛŽÚ©ÛŒ Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†</a>Ø¨Û•Ú©Ø§Ø±Ø¨Ø¨Û•.
+  existing_username_validator:
+    not_found: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŽÚ© Ø¨Û•Ù… Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Û• Ù„Û•Ù… Ú•Ø§Ú˜Û• Ù¾Û•ÛŒØ¯Ø§ Ù†Û•Ø¨ÙˆÙˆ
+    not_found_multiple: Ù†Û•ÛŒØªÙˆØ§Ù†ÛŒ %{usernames} Ø¨Ø¯Û†Ø²ÛŽØªÛ•ÙˆÛ•
+  exports:
+    archive_takeout:
+      date: Ø¨Û•Ø±ÙˆØ§Ø±
+      download: Ø¯Ø§Ú¯Ø±ØªÙ†ÛŒ Ø¦Û•Ø±Ø´ÛŒÙÛ•Ú©Û•Øª
+      hint_html: Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø¯Ø§ÙˆØ§ÛŒ Ø¦Û•Ø±Ø´ÛŒÙÛŒ <strong> Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ• Ùˆ Ù…ÛŒØ¯ÛŒØ§ÛŒ Ø¨Ø§Ø±Ú©Ø±Ø§ÙˆÛ•ÛŒ Ø®Û†Øª </strong> Ø¨Ú©Û•ÛŒ. Ø¯Ø§ØªØ§ÛŒ Ù‡Û•Ù†Ø§Ø±Ø¯Û•Ú©Ø±Ø§Ùˆ Ù„Û• ÙÛ†Ø±Ù…Ø§ØªÛŒ ActivityPub Ø¯Û•Ø¨ÛŽØªØŒ Ø¯Û•Ø®ÙˆÛŽÙ†Ø±ÛŽØªÛ•ÙˆÛ• Ù„Û•Ù„Ø§ÛŒÛ•Ù† Ù‡Û•Ø± Ù†Û•Ø±Ù…Û•Ú©Ø§Ù„Ø§ÛŒÛ•Ú©ÛŒ Ú¯ÙˆÙ†Ø¬Ø§Ùˆ. Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ù‡Û•Ù…ÙˆÙˆ Ù§ Ú•Û†Ú˜ Ø¬Ø§Ø±ÛŽÚ© Ø¯Ø§ÙˆØ§ÛŒ Ø¦Û•Ø±Ø´ÛŒÙÛŽÚ©Û•Øª Ø¨Ú©Û•ÛŒØª.
+      in_progress: Ø®Û•Ø±ÛŒÚ©ÛŒ Ú©Û† Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø¦Û•Ø±Ø´ÛŒÚ¤Û•Ú©Û•Øª...
+      request: Ø¯Ø§ÙˆØ§ÛŒ Ø¦Û•Ø±Ø´ÛŒÙÛ•Ú©Û•Øª Ø¨Ú©Û•
+      size: Ù‚Û•Ø¨Ø§Ø±Û•
+    blocks: ØªÛ† Ø¨Ù„Û†Ú© Ø¯Û•Ú©Û•ÛŒØª
+    bookmarks: Ù†ÛŒØ´Ø§Ù†Ú©Ø±Ø§ÙˆÛ•Ú©Ø§Ù†
+    csv: CSV
+    domain_blocks: Ø¯Û†Ù…Û•ÛŒÙ† Ù‚Û•Ù¾Ø§ØªÚ©Ø±Ø§
+    lists: Ù„ÛŒØ³ØªÛ•Ú©Ø§Ù†
+    mutes: Ù‡Û•Ú˜Ù…Ø§Ø±Û• Ø¨ÛŽØ¯Û•Ù†Ú¯ Ú©Ø±Ø§ÙˆÛ•
+    storage: Ù‡Û•Ù…Ø§Ø±Ú¯Û•ÛŒ Ù…ÛŒØ¯ÛŒØ§
+  featured_tags:
+    add_new: Ø²ÛŒØ§Ø¯Ú©Ø±Ø¯Ù†ÛŒ Ù†ÙˆÛŽ
+    errors:
+      limit: Ø¦ÛŽÙˆÛ• Ú˜Ù…Ø§Ø±Û•ÛŒ Ø¨Ú•ÛŒ Ú•ÛŽÚ¯Û•Ù¾ÛŽØ¯Ø±Ø§ÙˆÛ•ÛŒ Ù‡Ø§Ø´ØªØ§Ú¯Øª Ù‡Û•ÛŒÛ•
+    hint_html: "<strong> Ù‡Ø§Ø´ØªØ§Ú¯ÛŒ ØªØ§ÛŒØ¨Û•Øª Ú†ÛŒÛŒÛ•ØŸ</strong> Ø¨Û• Ø´ÛŽÙˆÛ•ÛŒÛ•Ú©ÛŒ Ø¯ÛŒØ§Ø± Ù†ÛŒØ´Ø§Ù† Ø¯Û•Ø¯Ø±ÛŽØª Ù„Û•Ø³Û•Ø± Ù¾Ø±Û†ÙØ§ÛŒÙ„ÛŒ Ú¯Ø´ØªÛŒ Ùˆ Ú•ÛŽÚ¯Û• Ø¨Û• Ø®Û•ÚµÚ© Ø¯Û•Ø¯Ø§Øª Ø¨Û† Ú¯Û•Ú•Ø§Ù† Ù„Û• Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ• Ú¯Ø´ØªÛŒÛ•Ú©Ø§Ù†Øª Ø¨Û• ØªØ§ÛŒØ¨Û•ØªÛŒ Ù„Û•Ú˜ÛŽØ± Ø¦Û•Ùˆ Ù‡Ø§Ø´ØªØ§Ú¯Û•. Ø¦Ø§Ù…Ø±Ø§Ø²ÛŽÚ©ÛŒ Ø²Û†Ø± Ø¨Ø§Ø´Ù† Ø¨Û† Ù¾Ø§Ø±Ø§Ø³ØªÙ†ÛŒ Ú©Ø§Ø±ÛŒ Ø¯Ø§Ù‡ÛŽÙ†Û•Ø±Ø§Ù†Û• ÛŒØ§Ù† Ù¾Ú•Û†Ú˜Û•ÛŒ Ø¯Ø±ÛŽÚ˜Ø®Ø§ÛŒÛ•Ù†ÛŒ Ø¦ÛŽÙˆÛ•."
+  filters:
+    contexts:
+      account: Ù¾Ø±Û†ÙØ§ÛŒÙ„Û•Ú©Ø§Ù†
+      home: Ù…Ø§ÚµÛ•ÙˆÛ•
+      notifications: Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒÛŒÛ•Ú©Ø§Ù†
+      public: Ù¾ÛŽØ±Ø³ØªÛŒ Ú¯Ø´ØªÛŒ Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•Ú©Ø§Ù†
+      thread: Ú¯ÙØªÙˆÚ¯Û†Ú©Ø§Ù†
+    edit:
+      title: Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒ ÙÙ„ØªÛ•Ø±
+    errors:
+      invalid_context: Ù‡ÛŒÚ† Ø¯Û•Ù‚ÛŽÚ©ÛŒ Ù†Ø§Ø¯Ø±ÙˆØ³Øª Ù†ÛŒÛŒÛ• ÛŒØ§Ù† Ø¨ÛŽ Ø¨Ú•ÙˆØ§ÛŒÛ•
+      invalid_irreversible: ÙÙ„ØªÛ•Ø±Ú©Ø±Ø¯Ù†ÛŒ Ø¨ÛŽ Ú¯Û•Ú•Ø§Ù†Û•ÙˆÛ• ØªÛ•Ù†Ù‡Ø§ Ú©Ø§Ø± Ø¯Û•Ú©Ø§Øª Ù„Û•Ú¯Û•Úµ Ú†ÙˆØ§Ø±Ú†ÛŽÙˆÛ•ÛŒ Ù…Ø§Úµ ÛŒØ§Ù† Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù†
+    index:
+      delete: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•
+      empty: Ù‡ÛŒÚ† Ù¾Ø§Ù„ÛŽÙˆÛ•Ø±ÛŽÚ©Øª Ù†ÛŒÛ•.
+      title: ÙÙ„ØªÛ•Ø±Û•Ú©Ø§Ù†
+    new:
+      title: Ø²ÛŒØ§Ø¯Ú©Ø±Ø¯Ù†ÛŒ ÙÙ„ØªÛ•Ø±ÛŒ Ù†ÙˆÛŽ
+  footer:
+    developers: Ù¾Û•Ø±Û•Ù¾ÛŽØ¯Û•Ø±Ø§Ù†
+    more: Ø²ÛŒØ§ØªØ±â€¦
+    resources: Ø³Û•Ø±Ú†Ø§ÙˆÛ•Ú©Ø§Ù†
+    trending_now: Ù‡Û•ÙˆØ§Ø¯Ø§Ø±Ø§Ù†ÛŒ Ø¦ÛŽØ³ØªØ§
+  generic:
+    all: Ù‡Û•Ù…ÙˆÙˆ
+    changes_saved_msg: Ú¯Û†Ú•Ø§Ù†Ú©Ø§Ø±ÛŒÛ•Ú©Ø§Ù† Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ù‡Û•ÚµÚ¯ÛŒØ±Ø§!
+    copy: Ú•ÙˆÙˆÙ†ÙˆÙˆØ³
+    delete: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•
+    no_batch_actions_available: Ù‡ÛŒÚ† Ú¯Ø±ÙˆÙˆÙ¾ÛŽÚ©ÛŒ Ú©Ø§Ø±ÛŒ Ø¨Û•Ø±Ø¯Û•Ø³Øª Ù†ÛŒÛ• Ù„Û•Ø³Û•Ø± Ø¦Û•Ù… Ù„Ø§Ù¾Û•Ú•Û•ÛŒÛ•
+    order_by: Ú•ÛŽÚ©Ø®Ø³ØªÙ† Ø¨Û•Ù¾ÛŽÛŒ
+    save_changes: Ú¯Û†Ú•Ø§Ù†Ú©Ø§Ø±ÛŒÛ•Ú©Ø§Ù† Ø¨Ù¾Ø§Ø±ÛŽØ²Û•
+    validation_errors:
+      one: Ø´ØªÛŽÚ© Ù‡ÛŽØ´ØªØ§ ØªÛ•ÙˆØ§Ùˆ Ú•Ø§Ø³Øª Ù†ÛŒÛ• ØªÚ©Ø§ÛŒÛ• Ú†Ø§Ùˆ Ø¨Û• Ù‡Û•ÚµÛ•Ú©Û•ÛŒ Ø®ÙˆØ§Ø±Û•ÙˆÛ• Ø¨Ø®Ø´ÛŽÙ†Û•ÙˆÛ•
+      other: Ù‡ÛŽØ´ØªØ§ ØªÛ•ÙˆØ§Ùˆ Ú•Ø§Ø³Øª Ù†ÛŒÛ• ØªÚ©Ø§ÛŒÛ• Ú†Ø§Ùˆ Ø¨Û• Ù‡Û•ÚµÛ•ÛŒ %{count} Ø®ÙˆØ§Ø±Û•ÙˆÛ• Ø¨Ø®Ø´ÛŽÙ†Û•ÙˆÛ•
+  html_validator:
+    invalid_markup: 'Ù†ÛŒØ´Ø§Ù†Û•ÛŒ HTML Ù†Ø§Ø¯Ø±ÙˆØ³ØªÛŒ ØªÛŽØ¯Ø§ÛŒÛ•: %{error}'
+  identity_proofs:
+    active: Ú†Ø§Ù„Ø§Ú©
+    authorize: Ø¨Û•ÚµÛŽØŒ Ú•ÛŽÚ¯Û• Ø¨Ø¯Û•
+    authorize_connection_prompt: Ø¦Ø§ÛŒØ§ Ø¦Û•Ù… Ú¯Ø±ÛŽØ¯Ø§Ù†Û• Ù†Ù‡ÛŽÙ†ÛŒÛŒÛ• Ú•ÛŒÚ¯Û• Ø¯Û•Ø¯Û•ÛŒ?
+    errors:
+      failed: Ù¾Û•ÛŒÙˆÛ•Ù†Ø¯ÛŒ Ú©Ø±Ø¯Ù†ÛŒ Ù†Ù‡ÛŽÙ†ÛŒÚ©Ø±Ø¯Ù† Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆ Ù†Û•Ø¨ÙˆÙˆ. ØªÚ©Ø§ÛŒÛ• Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ù„Û• %{provider} Ù‡Û•ÙˆÚµ Ø¨Ø¯Û•ÙˆÛ•.
+      keybase:
+        invalid_token: Ù†ÛŒØ´Ø§Ù†Û• Ú©Ø§Ù†ÛŒ Ø¨Ù†Û•Ú©Ù„ÛŒÙ„ÛŒ Ø³Û•Ø±Û•Ú©ÛŒ (Ù‡Û•Ø´) ÙˆØ§Ú˜ÙˆÙˆÛŒ Ø¯ÛŒØ¬ÛŒØªØ§ÚµÙ† Ùˆ Ù„Ø§Ù†ÛŒ Ú©Û•Ù… Ù¦Ù¦ Ù†ÙˆÙˆØ³Û• Ù„Û• ØªÙˆØ§Ù†ÛŒ Ù¡Ù¦ Ù‡Û•ÛŒÛ•
+        verification_failed: Ø¦Û•Ù… Ø¨Ù†Û• Ú©Ù„ÛŒÙ„ÛŒÛ•(Keybase) Ø¨Û• Ø¡ÛŒÙ†ÙˆØ§Ù†ÛŒ ÙˆØ§Ú˜ÙˆÙˆÛŒ Ø¯ÛŒØ¬ÛŒØªØ§ÚµÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŒ %{kb_username} Ù¾Û•Ø³Û•Ù†Ø¯ Ù†Ø§Ú©Ø§ØŒ ØªÚ©Ø§ÛŒØ§ Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ù„Û• Ø¨Ù†Û• Ú©Ù„ÛŒÙ„ÛŽÚ©ÛŒ Ø¯ÛŒÚ©Û• Ù‡Û•ÙˆÚµ Ø¨Ø¯Û•ÙˆÛ•.
+      wrong_user: Ù†Ø§ØªÙˆØ§Ù†Ø±ÛŽØª Ù¾Ø´Øª Ú•Ø§Ø³ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒÛ•Ú© Ø¨Û† %{proving} Ù„Û• Ú©Ø§ØªÛŽÚ© Ø¨Û• Ø¹ÛŒÙ†ÙˆØ§Ù†ÛŒ %{current} Ù‡Ø§ØªÙ†Û•ØªÛ• Ù†Ø§ÙˆÛ•. Ø¨Û• Ø¹ÛŒÙ†ÙˆØ§Ù†ÛŒ %{proving} Ø¨Ú†Ù†Û• Ù†Ø§ÙˆÛ•Ùˆ Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ù‡Û•ÙˆÚµ Ø¨Ø¯Û•Ù†Û•ÙˆÛ•.
+    explanation_html: Ù„ÛŽØ±Û• Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø¨Û• Ù†Ù‡ÛŽÙ†ÛŒ Ù†Ø§Ø³Ù†Ø§Ù…Û•Ú©Ø§Ù†ÛŒ ØªØ± Øª Ú¯Ø±ÛŽ Ø¨Ø¯Û•ÛŒ Ù„Û• Ø³Û•Ú©Û†Ú©Ø§Ù†ÛŒ ØªØ±Û•ÙˆÛ•ØŒ ÙˆÛ•Ú© Ú©Ù„ÛŒÙ„ÛŒ Ø¨Ù†Ú©Û•. Ø¦Û•Ù…Û• Ú•ÛŽÚ¯Û• Ø¯Û•Ø¯Ø§Øª Ø¨Û• Ú©Û•Ø³Ø§Ù†ÛŒ ØªØ± Ù†Ø§Ù…Û•ÛŒ Ø±Û•Ù…Ø²ÛŽÙ†Ø±Ø§ÙˆÛ•Ú©Ø§Ù†Øª Ø¨Û† Ø¨Ù†ÛŽØ±Ù† Ù„Û•Ø³Û•Ø± Ø¦Û•Ùˆ Ù¾Ù„Ø§ØªÙÛ†Ø±Ù…Û• ØŒ Ø±ÛŽÚ¯Û•ÛŒØ§Ù† Ù¾ÛŽØ¯Û•Ø¯Ø§Øª Ù…ØªÙ…Ø§Ù†Û• Ø¨Ú©Û•Ù† Ú©Û• Ø¦Û•Ùˆ Ù†Ø§ÙˆÛ•Ú•Û†Ú©Û•ÛŒ ØªÛ† Ø¯Û•ÛŒØ§Ù†Ù†ÛŽØ±ÛŒØª Ù„Û• ØªÛ†ÙˆÛ• Ø¯ÛŽØª.
+    i_am_html: Ù…Ù† %{username} Ù€Ù€Ù… Ù„Û•Ø³Û•Ø± %{service} Ù€Ù€Ù†Ù….
+    identity: Ù†Ø§Ø³Ù†Ø§Ù…Û•
+    inactive: Ù†Ø§Ú†Ø§Ù„Ø§Ú©Û•
+    publicize_checkbox: 'Ø¦Û•Ù…Û• ØªÙˆØª Ø¨Ú©Û•:'
+    publicize_toot: 'Ù¾Û•Ø³Û•Ù†Ø¯ Ú©Ø±Ø§! Ù…Ù† %{username} Ù„Û•Ø³Û•Ø± %{service} Ù‡Û•Ù…: %{url}'
+    remove: Ù„Ø§Ø¨Ø±Ø¯Ù†ÛŒ Ø¨Û•ÚµÚ¯Û• Ù„Û• Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒ
+    removed: Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¨Û•ÚµÚ¯Û•Ù†Ø§Ù…Û•ÛŒ Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù† Ù„Ø§Ø¨Ø±Ø§ Ù„Û• Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŒÙ†Û•Ø±
+    status: Ø¯Û†Ø®ÛŒ Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†
+    view_proof: Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†
+  imports:
+    modes:
+      merge: ÛŒÛ•Ú©Ø®Ø³ØªÙ†
+      merge_long: Ù‡ÛŽØ´ØªÙ†Û•ÙˆÛ•ÛŒ ØªÛ†Ù…Ø§Ø±Û•Ú©Ø§Ù†ÛŒ Ø¨Û•Ø±Ø¯Û•Ø³Øª Ùˆ Ø²ÛŒØ§Ø¯Ú©Ø±Ø¯Ù†ÛŒ Ø¯Ø§Ù†Û•Ù†ÙˆÛŽÚ©Ø§Ù†
+      overwrite: Ù†ÙˆÙˆØ³ÛŒÙ†Û•ÙˆÛ•
+      overwrite_long: Ø¯Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ Ø¦ÛŽØ³ØªØ§ Ø¨Ø³Ú•Û•ÙˆÛ• Ùˆ Ø¯Ø±Ø§ÙˆÛŒ Ù†ÙˆÛŽ Ø²ÛŒØ§Ø¯ Ø¨Ú©Û•
+    preface: Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ Ù‡Ø§ÙˆØ±Ø¯Û• Ø¨Ú©Û•ÛŒØª Ú©Û• Ù†Ø§Ø±Ø¯ÙˆØªÛ• ØªÛ• Ù„Û• Ú•Ø§Ú˜Û•ÛŒÛ•Ú©ÛŒ ØªØ±Û•ÙˆÛ•ØŒ ÙˆÛ•Ú© Ù„ÛŒØ³ØªÛŒ Ø¦Û•Ùˆ Ú©Û•Ø³Ø§Ù†Û•ÛŒ Ú©Û• ØªÛ† Ø¨Û•Ø¯ÙˆØ§ÛŒ Ø¯Ø§Ø¯Û•Ú©Û•ÙˆÛŒØª ÛŒØ§Ù† Ø¨Û•Ø±Ø¨Û•Ø³ØªØª Ø¯Û•Ú©Û•Ù†.
+    success: Ø¯Ø§ØªØ§Ú©Û•Øª Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¨Ø§Ø±Ú©Ø±Ø§ Ùˆ Ø¦ÛŽØ³ØªØ§ Ù„Û• Ú©Ø§ØªÛŒ Ø®Û†ÛŒØ¯Ø§ Ù¾Ø±Û†Ø³ÛŽØ³ Ø¯Û•Ú©Ø±ÛŽØª
+    types:
+      blocking: Ù„ÛŒØ³ØªÛŒ Ø¨Ù„Û†Ú©Ú©Ø±Ø¯Ù†
+      bookmarks: Ù†ÛŒØ´Ø§Ù†Û•Ú©Ø§Ù†
+      domain_blocking: Ù„ÛŒØ³ØªÛŒ Ø¨Ù„Û†Ú©Ú©Ø±Ø¯Ù†ÛŒ Ø¯Û†Ù…Û•ÛŒÙ†
+      following: Ù„ÛŒØ³ØªÛŒ Ø®ÙˆØ§Ø±Û•ÙˆÛ•
+      muting: Ù„ÛŒØ³ØªÛŒ Ú©Ù¾Ú©Ø±Ø¯Ù†Û•ÙˆÛ•
+    upload: Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†
+  in_memoriam_html: Ù„Û•ÛŒØ§Ø¯Ø¨ÙˆÙˆÙ†.
+  invites:
+    delete: Ù„Û•Ú©Ø§Ø±Ø®Ø³ØªÙ†
+    expired: Ø¨Û•Ø³Û•Ø±Ú†ÙˆÙˆÛ•
+    expires_in:
+      '1800': Ù£Ù  Ø®ÙˆÙ„Û•Ú©
+      '21600': Ù¦ Ú©Ø§ØªÚ˜Ù…ÛŽØ±
+      '3600': Ù¡ Ú©Ø§ØªÚ˜Ù…ÛŽØ±
+      '43200': Ù¡Ù¢ Ú©Ø§ØªÚ˜Ù…ÛŽØ±
+      '604800': Ù¡ Ù‡Û•ÙØªÛ•
+      '86400': Ù¡ Ú•Û†Ú˜
+    expires_in_prompt: Ù‡Û•Ø±Ú¯ÛŒØ²
+    generate: Ø¯Ø±ÙˆØ³ØªÚ©Ø±Ø¯Ù†ÛŒ Ù„ÛŒÙ†Ú©ÛŒ Ø¨Ø§Ù†Ú¯Ù‡ÛŽØ´Øª
+    invited_by: 'Ø¨Ø§Ù†Ú¯Ù‡ÛŽØ´ØªÚ©Ø±Ø§ÛŒØª Ù„Û•Ù„Ø§ÛŒÛ•Ù†:'
+    max_uses:
+      one: Ù¡ Ø¨Ø§Ø±
+      other: "%{count} Ø¨Ø§Ø±"
+    max_uses_prompt: Ø¨ÛŽ Ø³Ù†ÙˆÙˆØ±
+    prompt: Ø¯Ø±ÙˆØ³Øª Ú©Ø±Ø¯Ù† Ùˆ Ù‡Ø§ÙˆØ¨Û•Ø´ Ú©Ø±Ø¯Ù†ÛŒ Ù„ÛŒÙ†Ú©Û•Ú©Ø§Ù† Ù„Û•Ú¯Û•Úµ Ø¦Û•ÙˆØ§Ù†ÛŒ ØªØ± Ø¨Û† Ù¾ÛŽØ¯Ø§Ù†ÛŒ Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆÙˆØ±Û•ÙˆÛ• Ø¨Û† Ø¦Û•Ù… Ú•Ø§Ú˜Û•
+    table:
+      expires_at: Ø¨Û•Ø³Û•Ø±Ú†ÙˆÙˆÛ•
+      uses: Ø¨Û•Ú©Ø§Ø±Ù‡Ø§ÙˆØ±Ø¯Ù†Û•Ú©Ø§Ù†
+    title: Ø¨Ø§Ù†Ú¯Ù‡ÛŽØ´ØªÚ©Ø±Ø¯Ù†ÛŒ Ø®Û•ÚµÚ©
+  lists:
+    errors:
+      limit: ØªÛ† Ú¯Û•ÛŒØ´ØªÙˆÙˆÛŒØªÛ• Ø²Û†Ø±ØªØ±ÛŒÙ† Ú•ÛŽÚ˜Û•ÛŒ Ù„ÛŒØ³ØªÛ•Ú©Ø§Ù†
+  media_attachments:
+    validations:
+      images_and_video: Ù†Ø§ØªÙˆØ§Ù†Ø±ÛŽØª Ù„Û•Ú¯Û•Úµ Ø¦Û•Ùˆ Ù†ÙˆÙˆØ³Ø±Ø§ÙˆØ§Ù†Û• Ú©Û• ÙˆÛŽÙ†Û•ÛŒ Ù„Û•Ú¯Û•ÚµÛ• ØŒÚ¤ÛŒØ¯ÛŒÛ† Ø¨Ø§Ø± Ø¨Ú©Û•ÛŒ
+      not_ready: Ù†Ø§ØªÙˆØ§Ù†ÛŽØª ÙØ§ÛŒÙ„Û•Ú©Ø§Ù† Ù‡Ø§ÙˆÙ¾ÛŽÚ† Ø¨Ú©Ø§Øª Ú©Û• Ù¾Ø±Û†Ø³Û•Ú©Û•ÛŒØ§Ù† ØªÛ•ÙˆØ§Ùˆ Ù†Û•Ú©Ø±Ø¯ÙˆÙˆÛ•. Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ù‡Û•ÙˆÚµ Ø¨Ø¯Û•!
+      too_many: Ù†Ø§ØªÙˆØ§Ù†ÛŽØª Ø²ÛŒØ§ØªØ± Ù„Û• Ù¤ ÙØ§ÛŒÙ„ Ù‡Ø§ÙˆÙ¾ÛŽÚ† Ø¨Ú©Ø§Øª
+  migrations:
+    acct: Ú¯ÙˆÛŽØ²Ø±Ø§ÛŒÛ•ÙˆÛ• Ø¨Û†
+    cancel: Ù¾Ø§Ø´Ú¯Û•Ø²Ø¨ÙˆÙˆÙ†Û•ÙˆÛ• Ù„Û• Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ø¦Ø§Ú•Ø§Ø³ØªÛ•Ú©Ø±Ø¯Ù†Û•ÙˆÛ•
+    cancel_explanation: Ù‡Û•ÚµÙˆÛ•Ø´Ø§Ù†Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ø¦Ø§Ú•Ø§Ø³ØªÛ•Ú©Ø±Ø¯Ù†Û•ÙˆÛ• Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒ Ø¦ÛŽØ³ØªØ§Øª Ú†Ø§Ù„Ø§Ú© Ø¯Û•Ú©Ø§ØªØŒ Ø¨Û•ÚµØ§Ù… Ø¦Û•Ùˆ Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ Ù†Ø§Ù‡ÛŽÙ†Û• ÙˆÙ‡ Ú©Û• Ú¯ÙˆØ§Ø³ØªØ±Ø§ÙˆÛ•ØªÛ•ÙˆÛ• Ø¨Û† Ø¦Û•Ùˆ Ù‡Û•Ú˜Ù…Ø§Ø±Û•.
+    cancelled_msg: Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆØ§Ù†Û• Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ø¦Ø§Ú•Ø§Ø³ØªÛ•Ú©Ø±Ø¯Ù†Û•ÙˆÛ•Ú©Û•ÛŒ Ø¨Û•ØªØ§Úµ Ú©Ø±Ø¯Û•ÙˆÛ•.
+    errors:
+      already_moved: Ù‡Û•Ù…Ø§Ù† Ø¦Û•Ú˜Ù…ÛŽØ±Û• Ú©Û• ØªÛ† Ù¾ÛŽØ´ØªØ± Ú¯ÙˆØ§Ø³ØªÙˆÙˆØªÛ• Ø¨Û†
+      missing_also_known_as: Ù†Ø§Ø²Ù†Ø§ÙˆÛŽÚ©ÛŒ Ø¦Û•Ù… Ù‡Û•Ú˜Ù…Ø§Ø±Û• Ù†ÛŒÛŒÛ•
+      move_to_self: Ù†Ø§ØªÙˆØ§Ù†ÛŽØª Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒ Ø¦ÛŽØ³ØªØ§ Ø¨ÛŽØª
+      not_found: Ù†Ø§Ø¯Û†Ø²Ø±ÛŽØªÛ•ÙˆÛ•
+      on_cooldown: ØªÛ† Ø¯Û•Ø¨ÛŽØª Ú†Ø§ÙˆÛ•Ú•ÙˆØ§Ù† Ø¨ÛŒØª
+    followers_count: Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ Ú©Ø§ØªÛŒ Ù„Û• ØØ§ÚµÛŒ Ú¯ÙˆØ§Ø³ØªÙ†Û•ÙˆÛ•
+    incoming_migrations: Ú¯ÙˆØ§Ø³ØªÙ†Û•ÙˆÛ• Ù„Û• Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒ Ø¬ÛŒØ§ÙˆØ§Ø²
+    incoming_migrations_html: Ø¨Û† Ú¯ÙˆØ§Ø³ØªÙ†Û•ÙˆÛ• Ù„Û• Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒÛ•Ú©ÛŒ ØªØ±Û•ÙˆÛ• Ø¨Û† Ø¦Û•Ù… Ù‡Û•Ú˜Ù…Ø§Ø±Û•ØŒ Ø³Û•Ø±Û•ØªØ§ Ù¾ÛŽÙˆÛŒØ³ØªÛ• <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} Û•ÙˆÛ• Ú¯ÙˆØ§Ø³ØªÛŒÛ•ÙˆÛ•ØŒ ØªÛŽØ¨ÛŒÙ†ÛŒÛ•Ú©Ø§Ù†ÛŒ Ù¾ÛŽØ´ÙˆÙˆØª Ø¯Û•Ø±Ø¨Ø§Ø±Û•ÛŒØ§Ù† Ø¨ÙˆÙˆÙ†:'
+  notification_mailer:
+    digest:
+      action: Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ù‡Û•Ù…ÙˆÙˆ Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù†
+      body: Ø¦Û•Ù…Û• Ú©ÙˆØ±ØªÛ•ÛŒ Ø¦Û•Ùˆ Ù†Ø§Ù…Ø§Ù†Û•ÛŒ Ù„Û• Ø¯Û•Ø³ØªØª Ø¯Ø§ Ù„Û• Ø¯ÙˆØ§ Ø³Û•Ø±Ø¯Ø§Ù†ÛŒØª Ù„Û• %{since}
+      mention: "%{name} Ø¦Ø§Ù…Ø§Ú˜Û•ÛŒ Ø¨Û• ØªÛ† Ú©Ø±Ø¯ Ù„Û•:"
+      new_followers_summary:
+        one: Ù„Û•Ú©Ø§ØªÛŽÚ© Ú©Û• Ù†Û•Ø¨ÙˆÙˆ ØŒØ´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆÙˆÛŒÛŽÚ©ÛŒ Ù†ÙˆÛŽØª Ù¾Û•ÛŒØ¯Ø§Ú©Ø±Ø¯ØŒØ¦Ø§ÙÛ•Ø±Ù…!
+        other: Ú©Ø§ØªÛŒÚ© Ú©Û• Ù†Û•Ø¨ÙˆÙˆÛŒ %{count} Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆÙˆÛŒÛŽÚ©ÛŒ Ù†ÙˆÛŽØª Ù¾Û•ÛŒØ¯Ø§ Ú©Ø±Ø¯! Ú† Ø¨Ø§Ø´Û•!
+      subject:
+        one: "Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒÛŽÚ©ÛŒ Ù†ÙˆÙˆÛŒ Ù„Û• Ø¯ÙˆØ§ÛŒÛŒÙ† Ø³Û•Ø±Ø¯Ø§Ù†ÛŒ Ø¦ÛŽÙˆÛ•\U0001F418"
+        other: "%{count} Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒÛŽÚ©ÛŒ Ù†ÙˆÛŽ Ù„Û• Ø¯ÙˆØ§ÛŒÛŒÙ† Ø³Û•Ø±Ø¯Ø§Ù†ÛŒ Ø¦ÛŽÙˆÛ•\U0001F418"
+      title: Ù„Û• ØºÛŒØ§Ø¨ÛŒ ØªÛ†Ø¯Ø§...
+    favourite:
+      body: 'Ø¯Û†Ø®Øª Ù¾Û•Ø³Û•Ù†Ø¯Ú©Ø±Ø§ÙˆÛ• Ù„Û•Ù„Ø§ÛŒÛ•Ù† %{name}:'
+      subject: "%{name} Ø¯Û†Ø®ÛŒ ØªÛ†ÛŒ Ù¾Û•Ø³Û•Ù†Ø¯ Ú©Ø±Ø¯"
+      title: Ø¯ÚµØ®ÙˆØ§Ø²Ú©Ø±Ø¯Ù†ÛŒ Ù†ÙˆÛŽ
+    follow:
+      body: "%{name} Ø¦ÛŽØ³ØªØ§ Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆÙˆ Ø¦ÛŽÙˆÛ•ÛŒÛ•!"
+      subject: "%{name} Ø¦ÛŽØ³ØªØ§ Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆÙˆ Ø¦ÛŽÙˆÛ•ÛŒÛ•"
+      title: Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ Ù†ÙˆÛŽ
+    follow_request:
+      action: Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Ø±Ø¯Ù†ÛŒ Ø¯Ø§ÙˆØ§ÛŒ Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙ†
+      body: "%{name} Ø¯Ø§ÙˆØ§ÛŒ Ú©Ø±Ø¯ÙˆÙˆÛ• Ú©Û• Ø´ÙˆÛŽÙ†Øª Ø¨Ú©Û•ÙˆÛŽØª"
+      subject: 'Ú†Ø§ÙˆÛ•Ú•ÙˆØ§Ù†ÛŒ Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆÙˆÛ•: %{name}'
+      title: Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒ Ø´ÙˆÛŒÙ†Ú©Û•ÙˆØªÙ†ÛŒ Ù†ÙˆÛŽ
+    mention:
+      action: ÙˆÛ•ÚµØ§Ù…
+      body: "%{name} Ù„ÛŽØ±Û• Ù†Ø§ÙˆÛŒ Ø¦ÛŽÙˆÙˆÛ•ÛŒ Ø¨Ø±Ø¯ÙˆÙˆÛ•:"
+      subject: "%{name} Ù„ÛŽØ±Û• Ù†Ø§ÙˆÛŒ Ø¦ÛŽÙˆÙˆÛ•ÛŒ Ø¨Ø±Ø¯ÙˆÙˆÛ•"
+      title: Ù†Ø§ÙˆØ¨Ø±Ø§ÙˆÛ•ÛŒ Ù†ÙˆÛŽ
+    reblog:
+      body: "%{name} Ù†ÙˆÙˆØ³ÛŒØ³Ø±Ø§ÙˆÛ•Ú©Û•ÛŒ Ø¦ÛŽÙˆÛ•ÛŒ ØªÙˆØªØ§Ù†Ø¯Û•ÙˆÛ•:"
+      subject: "%{name} Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•Ú©Û•ØªÛŒ Ø¯ÙˆÙˆØ¨Ø§Ø±Û• ØªÙˆØªØ§Ù†Ø¯"
+      title: ØªÙˆØªØ§Ù†Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù†ÙˆÛŽ
+  notifications:
+    email_events: Ø±ÙˆÙˆØ¯Ø§ÙˆÛ•Ú©Ø§Ù† Ø¨Û† Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒ Ø¦ÛŒÙ…Û•ÛŒÙ„ÛŒ
+    email_events_hint: 'Ø¦Û•Ùˆ Ú•ÙˆÙˆØ¯Ø§ÙˆØ§Ù†Û• Ø¯ÛŒØ§Ø±ÛŒØ¨Ú©Û• Ú©Û• Ø¯Û•ØªÛ•ÙˆÛŽØª Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù† ÙˆÛ•Ø±Ø¨Ú¯Ø±ÛŒ Ø¨Û†:'
+    other_settings: Ú•ÛŽÚ©Ø¨Û•Ù†Ø¯Û•Ú©Ø§Ù†ÛŒ Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù†ÛŒ ØªØ±
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: B
+          million: M
+          quadrillion: Q
+          thousand: K
+          trillion: T
+  otp_authentication:
+    code_hint: Ú©Û†Ø¯ÛŽÚ© Ø¯Ø§Ø®Úµ Ø¨Ú©Û• Ú©Û• Ø¯Ø±ÙˆØ³Øª Ú©Ø±Ø§ÙˆÛ• Ù„Û•Ù„Ø§ÛŒÛ•Ù† Ø¦Û•Ù¾ÛŒ Ú•Û•Ø³Û•Ù†Ø§ÛŒÛ•ØªÛŒÛ•ÙˆÛ• Ø¨Û† Ø¯ÚµÙ†ÛŒØ§Ø¨ÙˆÙˆÙ†
+    description_html: Ø¦Û•Ú¯Û•Ø± ØªÛ† <strong> Ù‡Ø§ØªÙ†Û•Ú˜ÙˆÙˆØ±Û•ÙˆÛ•ÛŒ Ø¯ÙˆÙˆ Ù‚Û†Ù†Ø§ØºÛŒ</strong> Ø¨Û• ÛŒØ§Ø±Ù…Û•ØªÛŒ Ø¦Û•Ù¾ÛŽÚ©ÛŒ Ù¾Û•Ø³Û•Ù†Ø¯Ú©Ø±Ø¯Ù† Ú†Ø§Ù„Ø§Ú© Ø¨Ú©Û•Ù†ØŒ Ù¾ÛŽÙˆÛŒØ³ØªÛ• Ø¨Û† Ú†ÙˆÙˆÙ†Û•Ú˜ÙˆÙˆØ±Û•ÙˆÛ• ØŒ Ø¨Û• ØªÛ•Ù„Û•ÙÛ†Ù†Û•Ú©Û•ØªØ§Ù† Ú©Û• Ú©Û†Ø¯ÛŒÚ©ØªØ§Ù† Ø¨Û† Ø¯Ø±ÙˆØ³ØªØ¯Û•Ú©Ø§Øª Ø¯Û•Ø³ØªÙ¾ÛŽÚ¯Û•ÛŒØ´ØªÙ†ØªØ§Ù† Ù‡Û•Ø¨ÛŽØª.
+    enable: Ú†Ø§Ù„Ø§Ú©Ú©Ø±Ø¯Ù†
+    instructions_html: "<strong> QR Ø¨Ø¯Û†Ø²Û•ÙˆÛ• Ø¨Û† Ù†Ø§Ùˆ Ú•Û•Ø³Û•Ù†Ø§ÛŒÛ•ØªÛŒ Ú¯ÙˆÙˆÚ¯Úµ ÛŒØ§Ù† Ú©Ø§Ø±Ø¨Û•Ø±Ù†Ø§Ù…Û•ÛŒ 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: Ù‡ÛŽÚµÛŒ Ú©Ø§ØªÛŒ Ú¯Ø´ØªÛŒ
+  reactions:
+    errors:
+      limit_reached: Ø³Ù†ÙˆÙˆØ±ÛŒ Ú©Ø§Ø±Ø¯Ø§Ù†Ù‡ ÙˆÙ‡ ÛŒ Ø¬ÛŒØ§ÙˆØ§Ø² Ú¯Ù‡ ÛŒØ´Øª
+      unrecognized_emoji: Ø¦ÛŒÙ…Û†Ø¬ÛŒÛŒÛ•Ú©ÛŒ Ù†Ø§Ø³Ø±Ø§Ùˆ Ù†ÛŒÛŒÛ•
+  relationships:
+    activity: Ú†Ø§Ù„Ø§Ú©ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•
+    dormant: Ù†Ø§Ú†Ø§Ù„Ø§Ú©
+    follow_selected_followers: Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù† Ø¯ÛŒØ§Ø±ÛŒÚ©Ø±Ø§Ùˆ Ø¨Ú©Û•
+    followers: Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†
+    following: Ø´ÙˆÛŽÙ†â€ŒÚ©Û•ÙˆØªÙˆÙˆÛŒ
+    invited: Ø¨Ø§Ù†Ú¯Ù‡ÛŽØ´ØªÛ•Ú©Ø§Ù†
+    last_active: Ø¯ÙˆØ§ÛŒÛŒÙ† Ú†Ø§Ù„Ø§Ú©ÛŒ
+    most_recent: ØªØ§Ø²Û•ØªØ±ÛŒÙ†
+    moved: Ú¯ÙˆÛŽØ²Ø±Ø§ÛŒÛ•ÙˆÛ•
+    mutual: Ø¯ÙˆÙˆÙ„Ø§ÛŒÛ•Ù†Û•
+    primary: Ø³Û•Ø±Û•ØªØ§ÛŒÛŒ
+    relationship: Ù¾Û•ÛŒÙˆÛ•Ù†Ø¯ÛŒ
+    remove_selected_domains: Ù„Ø§Ø¨Ø±Ø¯Ù†ÛŒ Ù‡Û•Ù…ÙˆÙˆ Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ Ø¯Û†Ù…Û•ÛŒÙ†Û• Ø¯ÛŒØ§Ø±ÛŒÚ©Ø±Ø§ÙˆÛ•Ú©Ø§Ù†
+    remove_selected_followers: Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ Ø¯ÛŒØ§Ø±ÛŒÚ©Ø±Ø§Ùˆ Ù„Ø§Ø¨Ø¯Û•
+    remove_selected_follows: Ú©Û†ØªØ§ÛŒÛŒ Ø¨Û• Ø¨Û•Ø¯ÙˆØ§Ø¯Ø§Ù†Û•Ú†ÙˆÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Û• Ø¯ÛŒØ§Ø±ÛŒÚ©Ø±Ø§ÙˆÛ•Ú©Ø§Ù† Ø¨Ø¯Û•
+    status: Ø¯Û†Ø®ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•
+  remote_follow:
+    acct: Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒ username@domainØ®Û†Øª Ù„ÛŽØ±Û• Ø¨Ù†ÙˆÙˆØ³Û•
+    missing_resource: Ù†Û•ÛŒØªÙˆØ§Ù†ÛŒ URLÛŒ Ø¦Ø§Ø±Ø§Ø³ØªÛ•Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù¾ÛŽÙˆÛŒØ³Øª Ø¨Ø¯Û†Ø²ÛŽØªÛ•ÙˆÛ• Ø¨Û† Ø¦Û•Ú˜Ù…ÛŽØ±Û•Ú©Û•Øª
+    no_account_html: Ù‡ÛŽØ´ØªØ§ Ù†Û•Ø¨ÙˆÙˆÛŒ Ø¨Û• Ø¦Û•Ù†Ø¯Ø§Ù…ØŸ <a href='%{sign_up_path}' target='_blank'>Ù„ÛŽØ±Û• Ø¯Û•ØªÙˆØ§Ù†ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒÛ•Ú© Ø¯Ø±ÙˆØ³Øª Ø¨Ú©Û•ÛŒ</a>
+    proceed: Ø¨Û•Ø±Ø¯Û•ÙˆØ§Ù… Ø¨Û• Ø¨Û† Ø¨Û•Ø¯ÙˆØ§Ø¯Ø§Ú†ÙˆÙˆÙ†
+    prompt: 'ØªÛ† Ø¨Û•Ø¯ÙˆØ§ÛŒ Ø¯Ø§ Ø¯Û•Ú†ÛŒØª:'
+    reason_html: "<strong> Ø¨Û†Ú†ÛŒ Ø¦Û•Ù… Ù‡Û•Ù†Ú¯Ø§ÙˆÛ• Ù¾ÛŽÙˆÛŒØ³ØªÛ•ØŸ </strong> <code>%{instance}</code> Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ø¦Û•Ùˆ Ú•Ø§Ú˜Û•ÛŒÛ• Ù†Û•Ø¨ÛŽØª Ú©Û• ØªÛ† ØªÛ†Ù…Ø§Ø±Øª Ú©Ø±Ø¯ÙˆÙˆÛ•ØŒ Ø¨Û†ÛŒÛ• Ù¾ÛŽÙˆÛŒØ³ØªÛ• Ø³Û•Ø±Û•ØªØ§ Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ø¦Ø§Ú•Ø§Ø³ØªÛ•Øª Ø¨Ú©Û•ÛŒÙ† Ø¨Û† Ú•Ø§Ú˜Û•Ú©Ø§Ø±ÛŒ Ù…Ø§ÚµÛ•ÙˆÛ•Øª."
+  remote_interaction:
+    favourite:
+      proceed: Ø¨Û† Ø¯ÚµØ®ÙˆØ§Ø²Ú©Ø±Ø¯Ù†ÛŒ Ø¦Û•Ù… ØªÙˆØªÛ•
+      prompt: 'Ø¯Û•ØªÛ•ÙˆÛŽØª Ø¦Û•Ù… ØªÙˆÙˆØªÛ• ØªÙ¾Û•Ø³Û•Ù†Ø¯ Ø¨Ú©Û•ÛŒØªØ›:'
+    reblog:
+      proceed: Ø¨Û•Ø±Ø¯Û•ÙˆØ§Ù… Ø¨Û• Ø¨Û† Ø¯ÙˆÙˆØ¨Ø§Ø±Û• ØªÙˆØªØ§Ù†Ø¯Ù†
+      prompt: 'Ø¯Û•ØªÛ•ÙˆÛŽØª Ø¦Û•Ù… ØªÙˆÙˆØªÛ• Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ø¨Ú©Û•ÛŒØªÛ•ÙˆÛ•:'
+    reply:
+      proceed: Ø¨Û† ÙˆÛ•ÚµØ§Ù…Ø¯Ø§Ù†Û•ÙˆÛ•
+      prompt: 'Ø¯Û•ØªÛ•ÙˆÛŽØª Ø¦Û•Ù… ØªÙˆÙˆØªÛ• ÙˆÚµØ§Ù… Ø¨Ø¯Û•ÛŒØªÛ•ÙˆÛ•:'
+  scheduled_statuses:
+    over_daily_limit: Ø¦ÛŽÙˆÛ• Ù„Û• Ø³Ù†ÙˆÙˆØ±ÛŒ Ú•ÛŒÙ¾ÛŽØ¯Ø±Ø§ÙˆÛŒ %{limit} ØªÙˆØªÛŒ Ø¦Û•Ùˆ Ø±Û†Ú˜Û•ØŒØ®Û†Ø±ØªØ± Ú•Û†ÛŒØ´ØªÙˆÙˆÛŒØª
+    over_total_limit: ØªÛ† Ø³Ù†ÙˆÙˆØ±ÛŒ Ø®Ø´ØªÛ•Ú©Ø±Ø§ÙˆÛŒ %{limit} Øª Ø¨Û•Ø²Ø§Ù†Ø¯ÙˆÙˆÛ•
+    too_soon: Ù¾ÛŽÙˆÛŒØ³ØªÛ• Ø¨Û•Ø±ÙˆØ§Ø±ÛŒ Ø®Ø´ØªÛ•Ú©Ø±Ø§Ùˆ Ù„Û• Ø¯Ø§Ù‡Ø§ØªÙˆÙˆØ¯Ø§ Ø¨ÛŽØª
+  sessions:
+    activity: Ø¯ÙˆØ§ÛŒÛŒÙ† Ú†Ø§Ù„Ø§Ú©ÛŒ
+    browser: ÙˆÛŽØ¨Ú¯Û•Ú•
+    browsers:
+      alipay: Alipay
+      blackberry: Ø¨Ù„Ø§Ú©Ø¨ÛŽØ±ÛŒ
+      chrome: Ú©Ø±Û†Ù…
+      edge: Ù…Ø§ÛŒÚ©Ø±Û†Ø³Û†ÙØª Ø¦ÛŒÚ†
+      electron: Ø¦Û•Ù„Ú©ØªØ±Û†Ù†
+      firefox: ÙØ§ÛŒÛ•Ø±ÙÛ†Ú©Ø³
+      generic: ÙˆÛŽØ¨Ú¯Û•Ú•ÛŒ Ù†Û•Ù†Ø§Ø³Ø±Ø§Ùˆ
+      ie: Ø¦ÛŒÙ†ØªÛŽØ±Ù†ÛŽØª Ø¦ÛŽÚ©Ø³Ù¾Ù„Û†Ø±Û•Ø±
+      micro_messenger: Ù…Ø§ÛŒÚ©Ø±Û†Ù…ÛŽØ³Ù†Ø¬Û•Ø±
+      nokia: ÙˆÛŽØ¨Ú¯Û•Ú•ÛŒ Ù†Û†Ú©ÛŒØ§ Ø¦ÛŽØ³ Ù¤Ù  Ø¦Û†Ú¤ÛŒ
+      opera: Ø¦Û†Ù¾ÛŽØ±Ø§
+      otter: Ø¦Û†ØªÛ•Ø±
+      phantom_js: ÙØ§Ù†ØªÛ†Ù… Ø¬Û•ÛŒ Ø¦ÛŽØ³
+      qq: ÙˆÛŽØ¨Ú¯Û•Ú•ÛŒ QQ
+      safari: Ø³Ø§ÙØ±ÛŒ
+      uc_browser: ÙˆÛŽØ¨Ú¯Û•Ú•ÛŒ UC
+      weibo: Weibo
+    current_session: Ø¯Ø§Ù†ÛŒØ´ØªÙ†ÛŒ Ø¦ÛŽØ³ØªØ§
+    description: "%{browser} Ù„Û•Ø³Û•Ø± %{platform}"
+    explanation: Ø¦Û•Ù…Ø§Ù†Û• ÙˆÛŽØ¨Ú¯Û•Ú•Û•Ú©Û•Ù† Ú©Û• Ø¦ÛŽØ³ØªØ§ Ú†ÙˆÙˆÛ•ØªÛ• Ú˜ÙˆÙˆØ±Û•ÙˆÛ• Ø¨Û† Ø¦Û•Ú˜Ù…ÛŽØ±ÛŒ Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†ÛŒ Ø®Û†Øª.
+    ip: Ø¦Ø§ÛŒâ€ŒÙ¾ÛŒ
+    platforms:
+      adobe_air: Adobe Air
+      android: Ø¦Û•Ù†Ø¯Ø±Û†ÛŒØ¯
+      blackberry: Ø¨Ù„Ø§Ú©Ø¨ÛŽØ±ÛŒ
+      chrome_os: Ø³ÛŒØ³ØªÛ•Ù…ÛŒ Ú©Ø§Ø±Ú¯ÛŽÚ•ÛŒ Ú©Ø±Û†Ù…
+      firefox_os: Ø³ÛŒØ³ØªÛ•Ù…ÛŒ Ú©Ø§Ø±Ú¯ÛŽÚ•ÛŒ ÙØ§ÛŒÛ•Ø±ÙÛ†Ú©Ø³
+      ios: iOS
+      linux: Ù„ÛŒÙ†Û†Ú©Ø³
+      mac: Ù…Ø§Ú©
+      other: Ø³ÛŒØ³ØªÛ•Ù…ÛŒÚ©Ø§Ø±Ú¯ÛŽÚ•ÛŒ Ù†Û•Ù†Ø§Ø³Ø±Ø§Ùˆ
+      windows: ÙˆÛŒÙ†Ø¯Û†Ø²
+      windows_mobile: ÙˆÛŒÙ†Ø¯Û†Ø²Ù…ÙˆØ¨Ø§ÛŒÙ„
+      windows_phone: ÙˆÛŒÙ†Ø¯Û†Ø²ÙÛ†Ù†
+    revoke: Ø¨Û•ØªØ§ÚµÚ©Ø±Ø¯Ù†
+    revoke_success: Ø¯Ø§Ù†ÛŒØ´ØªÙ† Ø¨Û•Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¨Û•ØªØ§ÚµÚ©Ø±Ø§
+    title: Ú©Û†Ø¨ÙˆÙˆÙ†Û•ÙˆÛ•Ú©Ø§Ù†
+  settings:
+    account: Ù‡Û•Ú˜Ù…Ø§Ø±Û•
+    account_settings: Ú•ÛŽÚ©Ø®Ø³ØªÙ†Û•Ú©Ø§Ù†ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•
+    aliases: Ù†Ø§Ø²Ù†Ø§ÙˆÛ•ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•
+    appearance: Ú•ÙˆÙˆØ®Ø³Ø§Ø±
+    authorized_apps: Ø¦Û•Ù¾Û•Ú©Ø§Ù†ÛŒ Ú•ÛŽÚ¯Û•Ù¾ÛŽØ¯Ø±Ø§Ùˆ
+    back: Ú¯Û•Ú•Ø§Ù†Û•ÙˆÛ• Ø¨Û† Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†
+    delete: Ø³Ú•ÛŒÙ†Û•ÙˆÛ•ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•
+    development: Ú¯Û•Ø´Û•Ù¾ÛŽØ¯Ø§Ù†
+    edit_profile: Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„
+    export: Ù†Ø§Ø±Ø¯Ù† Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ
+    featured_tags: Ù‡Ø§Ø´ØªØ§Ú¯ÛŒ ØªØ§ÛŒØ¨Û•Øª
+    identity_proofs: Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†ÛŒ Ù†Ø§Ø³Ù†Ø§Ù…Û•
+    import: Ù‡Ø§ÙˆØ±Ø¯Ù†
+    import_and_export: Ù‡Ø§ÙˆØ±Ø¯Û•Ú©Ø±Ø¯Ù† Ùˆ Ù†Ø§Ø±Ø¯Ù†
+    migrate: Ú¯ÙˆØ§Ø³ØªÙ†Û•ÙˆÛ•ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•
+    notifications: Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒÛŒÛ•Ú©Ø§Ù†
+    preferences: Ù¾Û•Ø³Û•Ù†Ø¯Û•Ú©Ø§Ù†
+    profile: Ù¾Ø±Û†ÙØ§ÛŒÙ„
+    relationships: Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆÙˆ Ùˆ Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†
+    two_factor_authentication: Ú©Û†Ø¯ÛŒ Ø¯ÙˆÙˆÙ‚Û†Ù†Ø§ØºÛŒ Ù‡Ø§ØªÙ†Û•Ú˜ÙˆÙˆØ±
+    webauthn_authentication: Ú©Ù„ÛŒÙ„Û•Ú©Ø§Ù†ÛŒ Ù¾Ø§Ø±Ø§Ø³ØªÙ†
+  spam_check:
+    spam_detected: Ø¦Û•Ù…Û• Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒÛ•Ú©ÛŒ Ø®Û†Ú©Ø§Ø±Ø§Ù†Û•ÛŒÛ•Ø¨Û† Ù†Ø§Ø³Ø§Ù†Ø¯Ù†ÛŒ Ø³Ù¾Ø§Ù….
+  statuses:
+    attached:
+      audio:
+        one: "%{count} Ø¯Û•Ù†Ú¯"
+        other: "%{count} Ø¯Û•Ù†Ú¯"
+      description: 'Ù‡Ø§ÙˆÙ¾ÛŽÚ†: %{attached}'
+      image:
+        one: "%{count} ÙˆÛŽÙ†Û•"
+        other: "%{count} ÙˆÛŽÙ†Û•Ú©Ø§Ù†"
+      video:
+        one: "%{count} Ú¤ÛŒØ¯ÛŒÛ†"
+        other: "%{count} Ú¤ÛŒØ¯ÛŒÛ†Ú©Ø§Ù†"
+    boosted_from_html: ØªÙˆÚ©Ø±Ø§ÙˆÛ•ØªÛ•ÙˆÛ• Ù„Û•Ù„Ø§ÛŒÛ•Ù† %{acct_link}
+    content_warning: 'Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒ Ù†Ø§ÙˆÛ•Ú•Û†Ú©: %{warning}'
+    disallowed_hashtags:
+      one: 'Ù‡Ø§Ø´ØªØ§Ú¯ÛŒ Ú•ÛŽÚ¯Û•Ù¾ÛŽÙ†Û•Ø¯Ø±Ø§ÙˆÛ•ÛŒ ØªÛŽØ¯Ø§Ø¨ÙˆÙˆ: %{tags}'
+      other: 'Ù‡Ø§Ø´ØªØ§Ú¯Û•Ú©Ø§Ù†ÛŒ Ú•ÛŽÚ¯Û•Ù¾ÛŽÙ†Û•Ø¯Ø±Ø§ÙˆÛ•ÛŒ ØªÛŽØ¯Ø§Ø¨ÙˆÙˆ: %{tags}'
+    errors:
+      in_reply_not_found: Ø¦Û•Ùˆ Ø¯Û†Ø®Û•ÛŒ Ú©Û• ØªÛ† Ù‡Û•ÙˆÚµÛŒ ÙˆÛ•ÚµØ§Ù…Ø¯Ø§Ù†Û•ÙˆÛ•ÛŒ Ø¯Û•Ø¯Û•ÛŒØª ÙˆØ§Ø¯Û•Ø±Ù†Ø§Ú©Û•ÙˆÛŽØª Ú©Û• Ù‡Û•Ø¨ÛŽØª.
+    language_detection: Ø¨Û• Ø´ÛŽÙˆÛ•ÛŒÛ•Ú©ÛŒ Ø®Û†Ú©Ø§Ø±Ø§Ù†Û• Ø²Ù…Ø§Ù† Ø¨Ø¯Û†Ø²ÛŒÛ•ÙˆÛ•
+    open_in_web: Ú©Ø±Ø¯Ù†Û•ÙˆÛ• Ù„Û• ÙˆÛŽØ¨
+    over_character_limit: Ø³Ù†ÙˆÙˆØ±ÛŒ Ù†ÙˆÙˆØ³Û•ÛŒ %{max} ØªÛŽÙ¾Û•Ú•ÛŽÙ†Ø±Ø§
+    pin_errors:
+      limit: ØªÛ† Ù¾ÛŽØ´ØªØ± Ø²Û†Ø±ØªØ±ÛŒÙ† Ú˜Ù…Ø§Ø±Û•ÛŒ ØªÙˆØªØªÛŒ Ú†Û•Ø³Ù¾ÛŒÙˆÛ•Øª Ù‡Û•ÛŒÛ•
+      ownership: Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ ØªØ± Ù†Ø§ØªÙˆØ§Ù†Ø±ÛŽ Ø¨Ø³Û•Ù„Ù…ÛŽØª
+      private: ØªÙˆØªÛŒ Ù†Ø§Ú¯Ø´ØªÛŒ Ù†Ø§ØªÙˆØ§Ù†Ø±ÛŽØª Ø¨Ú†Û•Ø³Ù¾ÛŽ
+      reblog: Ø¨Û•Ù‡ÛŽØ²Ú©Ø±Ø¯Ù† Ù†Ø§ØªÙˆØ§Ù†Ø±ÛŽØª Ø¨Ú†Û•Ø³Ù¾ÛŽ
+    poll:
+      total_people:
+        one: "%{count} Ú©Û•Ø³"
+        other: "%{count} Ø®Û•ÚµÚ©"
+      total_votes:
+        one: "%{count} Ø¯Û•Ù†Ú¯"
+        other: "%{count} Ø¯Û•Ù†Ú¯Û•Ú©Ø§Ù†"
+      vote: Ø¯Û•Ù†Ú¯
+    show_more: Ø²ÛŒØ§ØªØ± Ù¾ÛŒØ´Ø§Ù† Ø¨Ø¯Û•
+    show_newer: Ù†ÙˆÛŽØªØ± Ù¾ÛŒØ´Ø§Ù† Ø¨Ø¯Û•
+    show_older: Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ú©Û†Ù†ØªØ±
+    show_thread: Ù†ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ú•Ø´ØªÛ•
+    sign_in_to_participate: Ø¨Ú†Û† Ú˜ÙˆÙˆØ±Û•ÙˆÛ• Ø¨Û† Ø¨Û•Ø´Ø¯Ø§Ø±ÛŒÚ©Ø±Ø¯Ù† Ù„Û• Ú¯ÙØªÙˆÚ¯Û†Ú©Û•Ø¯Ø§
+    title: '%{name}: "%{quote}"'
+    visibilities:
+      private: Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ ØªÛ•Ù†Ù‡Ø§
+      private_long: ØªÛ•Ù†Ù‡Ø§ Ø¨Û† Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ Ù¾ÛŒØ´Ø§Ù† Ø¨Ø¯Û•
+      public: Ú¯Ø´ØªÛŒ
+      public_long: Ù‡Û•Ù…ÙˆÙˆ Ú©Û•Ø³ Ø¯Û•ØªÙˆØ§Ù†ÛŽØª Ø¨Ø¨ÛŒÙ†ÛŽØª
+      unlisted: Ù¾ÛŽØ±Ø³Øª Ù†Û•Ø¨ÙˆÙˆÛ•
+      unlisted_long: Ù‡Û•Ù…ÙˆÙˆ Ú©Û•Ø³ Ø¯Û•ØªÙˆØ§Ù†ÛŽØª Ø¨ÛŒØ¨ÛŒÙ†ÛŽØªØŒ Ø¨Û•ÚµØ§Ù… Ù„Û• Ù‡ÛŽÚµÛŒ Ú©Ø§ØªÛŒ Ú¯Ø´ØªÛŒ Ø¯Ø§ Ù†Û•Ø±ÛŒØ²Ø±Ø§ÙˆÛ•
+  stream_entries:
+    pinned: ØªÙˆØªÛŒ Ú†Û•Ø³Ù¾Ú©Ø±Ø§Ùˆ
+    reblogged: Ø¨Û•Ù‡ÛŽØ²Ú©Ø±Ø¯Ù†
+    sensitive_content: Ù†Ø§ÙˆÛ•Ú•Û†Ú©ÛŒ Ù‡Û•Ø³ØªÛŒØ§Ø±
+  tags:
+    does_not_match_previous_name: Ù„Û•Ú¯Û•Úµ Ù†Ø§ÙˆÛŒ Ù¾ÛŽØ´ÙˆÙˆ ÛŒÛ•Ú© Ù†Ø§Ú¯Ø±ÛŽØªÛ•ÙˆÛ•
+  terms:
+    body_html: |
+      <h2>Ø³ÛŒØ§Ø³Û•ØªÛŒ ØªØ§ÛŒØ¨Û•Øª</h2>
+      <h3 id="collect">Ú† Ø²Ø§Ù†ÛŒØ§Ø±ÛŒÛŽÚ© Ú©Û† Ø¯Û•Ú©Û•ÛŒÙ†Û•ÙˆÛ•ØŸ</h3>
+      <ul>
+      <li><em>Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ Ø¦Û•Ú˜Ù…ÛŽØ±ÛŒ Ø¨Ù†Û•Ú•Û•ØªÛŒ</em>: Ø¦Û•Ú¯Û•Ø± ØªÛ† Ù„Û•Ø³Û•Ø± Ø¦Û•Ù… Ú•Ø§Ú˜Û•ÛŒ ØªÛ†Ù…Ø§Ø±Ø¨Ú©Û•ÛŒØªØŒ Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ø¯Ø§ÙˆØ§Øª Ù„ÛŽØ¨Ú©Ø±ÛŽØª Ù†Ø§ÙˆÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ØŒ Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ Ùˆ Ù†Ù‡ÛŽÙ†ÙˆØ´Û• ØªÛŽØ¨Ù†ÙˆÙˆØ³ÛŒØª. Ù‡Û•Ø±ÙˆÛ•Ù‡Ø§ Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„ÛŒ Ø²ÛŒØ§ØªØ± ØªÛŽØ¨Ù†ÙˆÙˆØ³ÛŒ Øª ÙˆÛ•Ú© Ù†Ø§ÙˆÛŒ Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù† Ùˆ Ú˜ÛŒØ§Ù†Ù†Ø§Ù…Û•ØŒ Ùˆ Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†ÛŒ ÙˆÛŽÙ†Û•ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„ Ùˆ ÙˆÛŽÙ†Û•ÛŒ Ø³Û•Ø±Ù¾Û•Ú•Û•. Ù†Ø§ÙˆÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ØŒ Ù†Ø§ÙˆÛŒ Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ØŒ Ú˜ÛŒØ§Ù†Ù†Ø§Ù…Û•ØŒ ÙˆÛŽÙ†Û•ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„ Ùˆ ÙˆÛŽÙ†Û•ÛŒ Ø³Û•Ø±Ù¾Û•Ú•Û• Ù‡Û•Ù…ÛŒØ´Û• Ø¨Û• Ø¦Ø§Ø´Ú©Ø±Ø§ Ù„ÛŒØ³Øª Ú©Ø±Ø§ÙˆÛ•.</li>
+      <li><em> Ù¾Û†Ø³ØªÛ•Ú©Ø§Ù†ØŒ Ø¨Û•Ø¯ÙˆØ§Ú©Û•ÙˆØªÙ† Ùˆ Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ Ú¯Ø´ØªÛŒ </em>: Ù„ÛŒØ³ØªÛŒ Ø¦Û•Ùˆ Ú©Û•Ø³Ø§Ù†Û•ÛŒ Ú©Û• Ù¾Û•ÛŒÚ•Û•ÙˆÛŒ Ø¯Û•Ú©Û•ÛŒØª Ø¨Û• Ø¦Ø§Ø´Ú©Ø±Ø§ Ù„ÛŒØ³Øª Ú©Ø±Ø§ÙˆÛ•ØŒ Ù‡Û•Ù…Ø§Ù† Ø´Øª Ø¨Û† Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÛ•Ú©Ø§Ù†Øª Ú•Ø§Ø³ØªÛ•. Ú©Ø§ØªÛŽÚ© Ø¦ÛŒÙ…Û•ÛŒÚµÛŽÚ©Øª Ù¾ÛŽØ´Ú©Û•Ø´ Ú©Ø±Ø¯ØŒ Ø¨Û•Ø±ÙˆØ§Ø± Ùˆ Ú©Ø§Øª Ø®Û•Ø²Ù† Ú©Ø±Ø§ÙˆÛ• Ùˆ Ù‡Û•Ø±ÙˆÛ•Ù‡Ø§ Ø¦Û•Ùˆ Ø¨Û•Ø±Ù†Ø§Ù…Û•ÛŒÛ•ÛŒ Ú©Û• Ù†Ø§Ù…Û•Ú©Û•Øª Ù„Û•ÙˆÛ• Ù¾ÛŽØ´Ú©Û•Ø´ Ú©Ø±Ø¯ÙˆÙˆÛ•. Ù†Ø§Ù…Û•Ú©Ø§Ù† Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ù‡Ø§ÙˆÙ¾ÛŽÚ†ÛŒ Ù…ÛŒØ¯ÛŒØ§ÛŒ ØªÛŽØ¯Ø§Ø¨ÛŽØªØŒ ÙˆÛ•Ú© ÙˆÛŽÙ†Û• Ùˆ Ú¤ÛŒØ¯ÛŒÛ†. Ú¯Ø´ØªÛŒ Ùˆ Ù„ÛŒØ³ØªÛ• Ù†Û•Ú©Ø±Ø§ÙˆÛ•Ú©Ø§Ù† Ø¨Ø§Ø¨Û•ØªÛ•Ú©Ø§Ù† Ø¨Û• Ø¦Ø§Ø´Ú©Ø±Ø§ Ø¨Û•Ø±Ø¯Û•Ø³ØªÙ†. Ú©Ø§ØªÛŽÚ© Ø¨Ø§Ø¨Û•ØªÛŽÚ© Ù¾ÛŽØ´Ú©Û•Ø´ Ø¯Û•Ú©Û•ÛŒØª Ù„Û•Ø³Û•Ø± Ù¾Ø±Û†ÙØ§ÛŒÙ„Û•Ú©Û•ØªØŒ Ú©Û• Ù‡Û•Ø±ÙˆÛ•Ù‡Ø§ Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ Ø¨Û•Ø±Ø¯Û•Ø³ØªÛŒ Ú¯Ø´ØªÛŒÛ•. Ø¨Ø§Ø¨Û•ØªÛ•Ú©Ø§Ù†Øª Ø¯Û•Ú¯Û•ÛŒÛ•Ù†ÛŒÙ†Û• Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÛ•Ú©Ø§Ù†ØªØŒ Ù„Û• Ù‡Û•Ù†Ø¯ÛŽÚ© ØØ§ÚµÛ•ØªØ¯Ø§ Ù…Ø§Ù†Ø§ÛŒ ÙˆØ§ÛŒÛ• Ø¯Û•Ú¯Û•ÛŒÛ•Ù†ÛŒÙ†Û• Ú•Ø§Ú˜Û•Ú©Ø§Ø±ÛŒ Ø¬ÛŒØ§ÙˆØ§Ø² Ùˆ Ú©Û†Ù¾ÛŒÛ•Ú©Ø§Ù† Ù„Û•ÙˆÛŽ Ù‡Û•ÚµÚ¯ÛŒØ±Ø§ÙˆÙ†. Ú©Ø§ØªÛŽÚ© Ø¨Ø§Ø¨Û•ØªÛ•Ú©Ø§Ù† Ø¯Û•Ø³Ú•ÛŒØªÛ•ÙˆÛ•ØŒ Ø¦Û•Ù…Û• Ø¨Û• Ù‡Û•Ù…Ø§Ù† Ø´ÛŽÙˆÛ•ÛŒÛ• Ø¯Û•Ú¯Û•ÛŒÛ•Ù†ÛŒØªÛ• Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ Ø®Û†Øª. Ú©Ø§Ø±ÛŒ Ø³Û•Ø±Ù„ÛŽØ¨Ú•ÛŒÙ† ÛŒØ§Ù† Ø¨Û• Ø¯ÚµÙ†ÛŒÛŒØ§Ú©Ø±Ø¯Ù†ÛŒ Ù¾Û†Ø³ØªÛŒ ØªØ± Ù‡Û•Ù…ÛŒØ´Û• Ú¯Ø´ØªÛŒÛ•.</li>
+      <li><em> Ú•Ø§Ø³ØªÛ•ÙˆØ®Û† Ùˆ ØªÛ•Ù†Ù‡Ø§ Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ Ø¨Ø§Ø¨Û•ØªÛ•Ú©Ø§Ù†</em>: Ù‡Û•Ù…ÙˆÙˆ Ø¨Ø§Ø¨Û•ØªÛ•Ú©Ø§Ù† Ø®Û•Ø²Ù† Ú©Ø±Ø§ÙˆÙ† Ùˆ Ù„Û• Ú•Ø§Ú˜Û•Ú©Ø§Ø±Û•Ú©Û• Ø¯Ø§ Ù¾Ø±Û†Ø³Û•Ú©Ø±Ø§ÙˆÙ†. Ù¾Û†Ø³Øª ØªÛ•Ù†Ù‡Ø§ Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ Ø®Û†Øª Ø¯Û•Ú¯Û•ÛŒÛ•Ù†ÛŒÙ†Û• Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ Ø®Û†Øª Ùˆ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù† Ú©Û• ØªÛŽÛŒØ¯Ø§ Ø¨Ø§Ø³ Ø¯Û•Ú©Ø±ÛŽØªØŒ Ùˆ Ù¾Û†Ø³ØªÛŒ Ú•Ø§Ø³ØªÛ•ÙˆØ®Û†Ø´ ØªÛ•Ù†Ù‡Ø§ Ø¯Û•Ú¯Û•ÛŒÛ•Ù†ÛŒÙ†Û• Ø¦Û•Ùˆ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†Û•ÛŒ Ú©Û• Ø¦Ø§Ù…Ø§Ú˜Û•ÛŒØ§Ù† Ù¾ÛŽÚ©Ø±Ø§ÙˆÛ• Ù„Û• Ù‡Û•Ù†Ø¯ÛŽÚ© ØØ§ÚµÛ•ØªØ¯Ø§ ÙˆØ§ØªÛ• Ø¯Û•Ú¯Û•ÛŒÛ•Ù†ÛŒÙ†Û• Ú•Ø§Ú˜Û•ÛŒ Ø¬ÛŒØ§ÙˆØ§Ø²Û•Ú©Ø§Ù† Ùˆ Ú©Û†Ù¾ÛŒÛ•Ú©Ø§Ù† Ù„Û•ÙˆÛŽ Ù‡Û•ÚµÚ¯ÛŒØ±Ø§ÙˆÙ† Ø¦ÛŽÙ…Û• Ù‡Û•ÙˆÚµÛŒ Ø¨Ø§ÙˆÛ•Ú•ÛŽÚ©ÛŒ Ø¨Ø§Ø´ Ø¯Û•Ú©Û•ÛŒÙ† Ø¨Û† Ø³Ù†ÙˆÙˆØ±Ø¯Ø§Ø±Ú©Ø±Ø¯Ù†ÛŒ Ú¯Û•ÛŒØ´ØªÙ† Ø¨Û•Ùˆ Ù¾Û†Ø³ØªØ§Ù†Û• ØªÛ•Ù†Ù‡Ø§ Ø¨Û† Ú©Û•Ø³Ø§Ù†ÛŒ Ú•ÛŽÚ¯Û•Ù¾ÛŽØ¯Ø±Ø§ÙˆØŒ Ø¨Û•ÚµØ§Ù… Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ú•Ø§Ú˜Û•Ú©Ø§Ø±Û•Ú©Ø§Ù†ÛŒ ØªØ± Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆ Ù†Û•Ø¨ÙˆÙˆÙ†. Ø¨Û†ÛŒÛ• Ú¯Ø±Ù†Ú¯Û• Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ• Ø¨Û• Ø³ÛŽØ±Ú¤Û•Ø±Û•Ú©Ø§Ù† Ø¨Ú©Û•ÛŒØª Ú©Û• Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ ØªÛ† Ù‡ÛŒ Ø¦Û•ÙˆÛ•Ù†. Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ø¨Ú˜Ø§Ø±Ø¯Û•ÛŒÛ•Ú© Ø¨Ú¯Û†Ú•ÛŒØª Ø¨Û† Ù¾Û•Ø³Û•Ù†Ø¯Ú©Ø±Ø¯Ù† Ùˆ Ú•Û•ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ Ù†ÙˆÛŽ Ø¨Û• Ø¯Û•Ø³ØªÛŒ Ù„Û• Ú•ÛŽÚ©Ø¨Û•Ù†Ø¯Û•Ú©Ø§Ù†. <em> ØªÚ©Ø§ÛŒÛ• Ù„Û• Ø¨ÛŒØ±Øª Ø¨ÛŽØª Ú©Û• Ú©Ø§Ø±Ù¾ÛŽÚ©Û•Ø±Û•Ú©Ø§Ù†ÛŒ Ø³ÛŽØ±Ú¤Û•Ø±Û•Ú©Û• Ùˆ Ù‡Û•Ø± Ø®Ø²Ù…Û•ØªÚ©Ø§Ø±ÛŒ ÙˆÛ•Ø±Ú¯Ø±ÛŽÚ© Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ø¦Û•Ù… Ø¬Û†Ø±Û• Ù†Ø§Ù…Ø§Ù†Û• </em>ØŒ Ùˆ ÙˆÛ•Ø±Ú¯Ø±Û•Ú©Ø§Ù† Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ú¯Ø±ØªÛ•ÛŒ Ø´Ø§Ø´Û• ÛŒØ§Ù† Ú©Û†Ù¾ÛŒ Ø¨Ú©Û•Ù† ÛŒØ§Ù† Ø¨Û• Ù¾ÛŽÚ†Û•ÙˆØ§Ù†Û•ÙˆÛ• Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ø¨Û•Ø´Ø¯Ø§Ø±ÛŒ Ù¾ÛŽØ¨Ú©Û•Ù†. <em> Ù‡ÛŒÚ† Ø²Ø§Ù†ÛŒØ§Ø±ÛŒÛ•Ú©ÛŒ Ù…Û•ØªØ±Ø³ÛŒØ¯Ø§Ø± Ù„Û•Ø³Û•Ø± Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† Ø¨ÚµØ§Ùˆ</em></li>
+      <li><em>Ø¦Ø§ÛŒ Ù¾ÛŒ Ùˆ Ù…ÛŽØªØ§Ø¯Ø§ØªØ§ÛŒ ØªØ±</em>: Ú©Ø§ØªÛŽÚ© Ø¯Û•Ú†ÛŒØªÛ• Ú˜ÙˆÙˆØ±Û•ÙˆÛ•ØŒ Ø¦ÛŽÙ…Û• Ø¦Û•Ùˆ Ø¦Ø§ÛŒ Ù¾ÛŒ Û• ØªÛ†Ù…Ø§Ø± Ø¯Û•Ú©Û•ÛŒÙ† Ú©Û• ØªÛ† Ù„Û• Ù†Ø§ÙˆÛŒ Û•ÙˆÛ• Ø¯Ø§Ø®Úµ ØªØ¯Û•Ú©Û•ÛŒØªØŒ Ù‡Û•Ø±ÙˆÛ•Ù‡Ø§ Ù†Ø§ÙˆÛŒ Ø¨Û•Ø±Ù†Ø§Ù…Û•ÛŒ ÙˆÛŽØ¨Ú¯Û•Ú•Û•Ú©Û•Øª. Ù‡Û•Ù…ÙˆÙˆ Ø¦Û•Ùˆ Ú©Û†Ú©Ø±Ø§ÙˆØ§Ù†Û•ÛŒ Ù„Û• Ú©Û†Ø¨ÙˆÙˆÙ†Û•ÙˆÛ•Ú©Ø§Ù†Ø¯Ø§ Ù‡Û•Ù† Ø¨Û† Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ• Ùˆ Ø¨Û•ØªØ§ÚµÚ©Ø±Ø¯Ù†Û•ÙˆÛ•Øª Ù„Û• Ú•ÛŽÚ©Ø¨Û•Ù†Ø¯Û•Ú©Ø§Ù†. Ù†ÙˆÛŽØªØ±ÛŒÙ† Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ IP Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø±Ø§ÙˆÛ• Ø®Û•Ø²Ù† Ú©Ø±Ø§ÙˆÛ• Ø¨Û† Ù¡Ù¢ Ù…Ø§Ù†Ú¯. Ù‡Û•Ø±ÙˆÛ•Ù‡Ø§ Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ø¦ÛŽÙ…Û• Ù…Ø§Ø¯Û• Ú•Ø§Ú˜Û•Ú©Ø§Ø±Û•Ú©Ø§Ù† Ø¨Ù‡ÛŽÚµÛŒÙ† Ú©Û• Ø¦Ø§ÛŒ Ù¾ÛŒ Ø¦Û•Ø¯Ø±ÛŽØ³ÛŒ Ù‡Û•Ù…ÙˆÙˆ Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒÛŒÛ•Ú© Ø¨Û† Ú•Ø§Ú˜Û•Ú©Ø§Ø±Û•Ú©Ø§Ù†Ù…Ø§Ù† </li>
+      </ul>
+      < hr="spacer" />
+
+      <h3 id="use">Ø¦ÛŽÙ…Û• Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ Ø¦ÛŽÙˆÛ•Ù…Ø§Ù† Ø¨Û† Ú†ÛŒÛŒÛ•ØŸ</h3>
+
+      <p> Ø¦Û•Ùˆ Ø²Ø§Ù†ÛŒØ§Ø±ÛŒØ§Ù†Û•ÛŒ Ù„Û• Ø¦ÛŽÙˆÛ• Ú©Û†ÛŒ Ø¯Û•Ú©Û•ÛŒÙ† Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ø¨Û•Ù… Ú•ÛŽÚ¯Ø§ÛŒØ§Ù†Û• Ø¨Û•Ú©Ø§Ø± Ø¨Ù‡ÛŽÙ†Ø±ÛŽØª:</p>
+
+      <ul>
+      <li> Ø¨Û† Ø¯Ø§Ø¨ÛŒÙ†Ú©Ø±Ø¯Ù†ÛŒ Ø¦Û•Ø±Ú©Û• Ø³Û•Ø±Û•Ú©ÛŒÛ•Ú©Ø§Ù†ÛŒ Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†. Ø¯Û•ØªÙˆØ§Ù†ÛŒØª ØªÛ•Ù†Ù‡Ø§ Ú©Ø§Ø±Ù„ÛŽÚ© Ø¨Ú©Û•ÛŒØª Ù„Û•Ú¯Û•Úµ Ù†Ø§ÙˆÛ•Ú•Û†Ú©ÛŒ Ú©Û•Ø³Ø§Ù†ÛŒ ØªØ± Ùˆ Ù†Ø§ÙˆÛ•Ú•Û†Ú©ÛŒ Ø®Û†Øª Ù¾Û†Ø³Øª Ø¨Ú©Û•ÛŒØª Ú©Ø§ØªÛŽÚ© Ø¯Û•Ú†ÛŒØªÛ• Ú˜ÙˆÙˆØ±Û•ÙˆÛ•. Ø¨Û† Ù†Ù…ÙˆÙˆÙ†Û•ØŒ Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ø´ÙˆÛŽÙ† Ú©Û•Ø³Ø§Ù†ÛŒ ØªØ± Ø¨Ú©Û•ÙˆÛŒØª Ø¨Û† Ø¨ÛŒÙ†ÛŒÙ†ÛŒ Ù¾Û†Ø³ØªÛ• ØªÛŽÚ©Û•ÚµÛ•Ú©Ø§Ù†ÛŒØ§Ù† Ù„Û• ØªØ§ÛŒÙ… Ù„Ø§ÛŒÙ†ÛŒ Ù…Ø§ÚµÛ•ÙˆÛ•ÛŒ ØªØ§ÛŒØ¨Û•ØªÛŒ Ø®Û†Øª.</li>
+      <li> Ø¨Û† Ú†Ø§ÙˆØ¯ÛŽØ±ÛŒ Ú©Ø±Ø¯Ù†ÛŒ Ú©Û†Ù…Û•ÚµÚ¯Ø§ØŒ Ø¨Û† Ù†Ù…ÙˆÙˆÙ†Û• Ø¨Û•Ø±Ø§ÙˆØ±Ø¯Ú©Ø±Ø¯Ù†ÛŒ Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ IPÛ•Ú©Û•Øª Ù„Û•Ú¯Û•Úµ Ú©Û•Ø³Ø§Ù†ÛŒ Ù†Ø§Ø³Ø±Ø§Ùˆ Ø¨Û† Ø¯ÛŒØ§Ø±ÛŒÚ©Ø±Ø¯Ù†ÛŒ Ø®Û†Ø¯Ø²ÛŒÙ†Û•ÙˆÛ• ÛŒØ§Ù† Ù¾ÛŽØ´ÛŽÙ„Ú©Ø§Ø±ÛŒØªØ±.</li>
+      <li> Ø¦Û•Ùˆ Ø¦ÛŒÙ…Û•ÛŒÚµÛ•ÛŒ Ú©Û• ØªÛ† Ø¯Û•Ø³ØªÛ•Ø¨Û•Ø±Øª Ú©Ø±Ø¯ÙˆÙˆÛ• Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ø¨Û•Ú©Ø§Ø±Ø¨ÛŽØª Ø¨Û† Ù†Ø§Ø±Ø¯Ù†ÛŒ Ø²Ø§Ù†ÛŒØ§Ø±ÛŒØŒ Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒ Ø¯Û•Ø±Ø¨Ø§Ø±Û•ÛŒ Ú©Û•Ø³Ø§Ù†ÛŒ ØªØ± Ú©Û• Ú©Ø§Ø±Ù„ÛŽÚ© Ø¯Û•Ú©Û•Ù† Ù„Û•Ú¯Û•Úµ Ù†Ø§ÙˆÛ•Ú•Û†Ú©Û•Ú©Û•Øª ÛŒØ§Ù† Ù†Ø§Ø±Ø¯Ù†ÛŒ Ù†Ø§Ù…Û•Ú©Ø§Ù†ØªØŒ Ùˆ ÙˆÛ•ÚµØ§Ù…Ø¯Ø§Ù†Û•ÙˆÛ•ÛŒ Ù¾Ø±Ø³ÛŒØ§Ø±Ú©Ø±Ø¯Ù†Û•Ú©Ø§Ù†ØŒ Ùˆ/ÛŒØ§Ù† Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒÛŒØ§Ù† ÛŒØ§Ù† Ù¾Ø±Ø³ÛŒØ§Ø±Û•Ú©Ø§Ù†ÛŒ ØªØ±.</li>
+      </ul>
+      < hr="spacer" />
+
+      <h3 id="Ø¨Ù¾Ø§Ø±ÛŽØ²Û•"> Ú†Û†Ù† Ø²Ø§Ù†ÛŒØ§Ø±ÛŒÛ•Ú©Û•Øª Ø¯Û•Ù¾Ø§Ø±ÛŽØ²ÛŒÙ†ØŸ</h3>
+
+      <p> Ø¦ÛŽÙ…Û• Ú†Û•Ù†Ø¯ÛŒÙ† Ù¾ÛŽÙˆØ§Ù†Û•ÛŒ Ø¦Û•Ù…Ù†ÛŒ Ø¬Û†Ø±Ø§ÙˆØ¬Û†Ø± Ø¬ÛŽØ¨Û•Ø¬ÛŽ Ø¯Û•Ú©Û•ÛŒÙ† Ø¨Û† Ù¾Ø§Ø±Ø§Ø³ØªÙ†ÛŒ Ø³Û•Ù„Ø§Ù…Û•ØªÛŒ Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ Û• ØªØ§ÛŒØ¨Û•ØªÛŒÛ•Ú©Ø§Ù†Øª Ú©Ø§ØªÛŽÚ© ØªÛ† Ø¯Ø§Ø®ÚµØª Ú©Ø±Ø¯ÙˆÙˆÛ• ÛŒØ§Ù† Ù¾ÛŽØ´Ú©Û•Ø´Ú©Ø±Ø¯Ù† ÛŒØ§Ù† Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆÙˆØ±Û•ÙˆÛ• Ø¨Û† Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ ØªØ§ÛŒØ¨Û•ØªÛŒ. Ù„Û• Ù†ÛŽÙˆØ§Ù† Ø´ØªÛ•Ú©Ø§Ù†ÛŒ ØªØ±Ø¯Ø§ØŒ Ø¯Ø§Ù†ÛŒØ´ØªÙ†ÛŒ ÙˆÛŽØ¨Ú¯Û•Ú•Û•Ú©Û•ØªØŒ Ù‡Û•Ø±ÙˆÛ•Ù‡Ø§ ØªØ±Ø§ÙÛŒÚ©ÛŒ Ù†ÛŽÙˆØ§Ù† Ú©Ø§Ø±Ø¨Û•Ø±Ù†Ø§Ù…Û•Ú©Ø§Ù†Øª Ùˆ APIØŒ Ø¨Û• SSL Ù¾Ø§Ø±ÛŽØ²Ø±Ø§ÙˆÛ•ØŒ Ùˆ Ù†Ù‡ÛŽÙ†ÙˆØ´Û•Ú©Û•Øª Ø¨Û• Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø§Ù†ÛŒ Ø¦Û•Ù„Ú¯Ø§Ø±ÛŒØªÙ…ÛŒ ÛŒÛ•Ú©-Ú•ÛŽÚ¯Û•ÛŒ Ø¨Û•Ù‡ÛŽØ² Ø¨Û• Ù‡Ø§ÙˆØ³ÛŽÚ©Ø±Ø§ÙˆÛ•. Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†ÛŒ Ø¯ÙˆÙˆ-ÙØ§Ú©ØªÛ•Ø± Ø¨Û•ØªÙˆØ§Ù†Ø§ Ø¨Ú©Û•ÛŒØª Ø¨Û† Ø²ÛŒØ§ØªØ± Ù¾Ø§Ø±Ø§Ø³ØªÙ†ÛŒ Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆÙˆØ±Û•ÙˆÛ• Ø¨Û† Ø¦Û•Ú˜Ù…ÛŽØ±Û•Ú©Û•Øª.</p>
+
+      < hr="spacer" />
+      < hr="spacer" />
+
+      <h3 id="Ø¯Ø§ØªØ§-Ù‡ÛŽØ´ØªÙ†Û•ÙˆÛ•"> Ø¨ÛŒÙ…Û•Ù†Ø§Ù…Û•ÛŒ Ù‡ÛŽØ´ØªÙ†Û•ÙˆÛ• Ø¯Ø§ØªØ§Ù…Ø§Ù† Ú†ÛŒÛŒÛ•ØŸ</h3>
+
+      <p> Ø¦ÛŽÙ…Û• Ø¨Û• Ø¨Ø§Ø´ÛŒ Ù‡Û•ÙˆÚµ Ø¨Û† Ø¨Ø§ÙˆÛ•Ú•Û•Ú©Ø§Ù† </p>
+
+      <ul>
+      <li> Ø³ÛŽØ±Ú¤Û•Ø±ÛŒ Ù¾Ø§Ø±Ø§Ø³ØªÙ†ÛŒ Ù†Ø§ÙˆÙ†ÙˆÙˆØ³Û•Ú©Ø§Ù† Ú©Û• Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦Ø§ÛŒ Ù¾ÛŒ ØªÛŽØ¯Ø§ÛŒÛ• Ø¨Û† Ù‡Û•Ù…ÙˆÙˆ Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒÛ•Ú©Ø§Ù† Ø¨Û† Ø¦Û•Ù… Ø³ÛŽØ±Ú¤Û•Ø±Û•ØŒ ØªØ§ Ø¦ÛŽØ³ØªØ§ ÙˆÛ•Ú© Ø¦Û•Ùˆ Ø¬Û†Ø±Û• Ù„Û†Ú¯Ø§Ù†Û• Ù¾Ø§Ø±ÛŽØ²Ø±Ø§ÙˆÙ†ØŒ Ø²ÛŒØ§ØªØ± Ù„Û• 90 Ú•Û†Ú˜.</li>
+      <li> Ø¦Ø§ÛŒ Ù¾ÛŒÛ•Ú©Û• Ø¨Ù¾Ø§Ø±ÛŽØ²Û• Ú©Û• Ù¾Û•ÛŒÙˆÛ•Ù†Ø¯ÛŒ Ø¨Û• Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Û• ØªÛ†Ù…Ø§Ø±Ú©Ø±Ø§ÙˆÛ•Ú©Ø§Ù† Ù‡Û•ÛŒÛ• Ø²ÛŒØ§ØªØ± Ù„Û• 12 Ù…Ø§Ù†Ú¯.</li>
+      </ul>
+      <p> Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒ Ùˆ Ø¯Ø§Ú¯Ø±ØªÙ†ÛŒ Ø¦Û•Ø±Ø´ÛŒÙÛŒ Ù†Ø§ÙˆÛ•Ú•Û†Ú©Û•Ú©Û•Øª Ø¨Ú©Û•ÛŒØªØŒ Ù„Û•ÙˆØ§Ù†Û• Ø¨Ø§Ø¨Û•ØªÛ•Ú©Ø§Ù†ØªØŒ Ù‡Ø§ÙˆÙ¾ÛŽÚ†Û•Ú©Ø§Ù†ÛŒ Ù…ÛŒØ¯ÛŒØ§ØŒ ÙˆÛŽÙ†Û•ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„ØŒ Ùˆ ÙˆÛŽÙ†Û•ÛŒ Ø³Û•Ø±Ù¾Û•Ú•Û•.</p>
+
+      <p> ØªÛ† Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø¨Û• Ø´ÛŽÙˆÛ•ÛŒÛ•Ú©ÛŒ Ù†Ø§Ø¦Ø§Ø³Ø§ÛŒÛŒ Ø¦Û•Ú˜Ù…ÛŽØ±Û•Ú©Û•Øª Ø¨Ø³Ú•ÛŒØªÛ•ÙˆÛ• Ù„Û• Ù‡Û•Ø± Ú©Ø§ØªÛŽÚ©Ø¯Ø§.</p>
+
+      < hr="spacer"/>
+
+      <h3 id="Ú©Û†Ú©ÛŒØ²"> Ø¦Ø§ÛŒØ§ Ø¦ÛŽÙ…Û• Ú©Û†Ú©ÛŒØ² Ø¨Û•Ú©Ø§Ø± Ø¨ÛŽÙ†Û•ØŸ</h3>
+
+      <p> Ø¨Û•ÚµÛŽ Ú©Û†Ú©ÛŒØ²Û•Ú©Ø§Ù† ÙØ§ÛŒÙ„ÛŒ Ø¨Ú†ÙˆÙˆÚ©Ù† Ú©Û• Ø³Ø§ÛŒØªÛŽÚ© ÛŒØ§Ù† Ø¯Ø§Ø¨ÛŒÙ†Ú©Û•Ø±ÛŒ Ø®Ø²Ù…Û•ØªÚ¯ÙˆØ²Ø§Ø±ÛŒÛ•Ú©Û•ÛŒ Ø¯Û•ÛŒÚ¯ÙˆÛŽØ²ÛŽØªÛ•ÙˆÛ• Ø¨Û† Ù‡Ø§Ø±Ø¯ Ø¯Ø±Ø§ÛŒÚ¤ÛŒ Ú©Û†Ù…Ù¾ÛŒÙˆØªÛ•Ø±Û•Ú©Û•Øª Ù„Û• Ú•ÛŽÚ¯Û•ÛŒ ÙˆÛŽØ¨Ú¯Û•Ú•Û•Ú©Û•Øª (Ø¦Û•Ú¯Û•Ø± Ú•ÛŽÚ¯Û•Øª Ù¾ÛŽ Ø¨Ø¯Û•ÛŒØª). Ø¦Û•Ù… Ú©Û†Ú©ÛŒØ²Ø§Ù†Û• ÙˆÛŽØ¨Ø³Ø§ÛŒØªÛ• Ø¨Û•ØªÙˆØ§Ù†Ø§ Ø¯Û•Ú©Û•Ù† Ø¨Û† Ù†Ø§Ø³ÛŒÙ†Û•ÙˆÛ•ÛŒ ÙˆÛŽØ¨Ú¯Û•Ú•Û•Ú©Û•Øª ÙˆØŒ Ø¦Û•Ú¯Û•Ø± Ø¦Û•Ú˜Ù…ÛŽØ±ÛŽÚ©ÛŒ ØªÛ†Ù…Ø§Ø±Ú©Ø±Ø§ÙˆØª Ù‡Û•ÛŒÛ•ØŒ Ø¨ÛŒØ¨Û•Ø³ØªÛ• Ø¨Û• Ø¦Û•Ú˜Ù…ÛŽØ±ÛŒ ØªÛ†Ù…Ø§Ø±Ú©Ø±Ø§Ùˆ.</p>
+
+      <p> Ú©Û†Ú©ÛŒØ² Ø¨Û•Ú©Ø§Ø±Ø¨ÛŽÙ†Û• Ø¨Û† ØªÛŽÚ¯Û•ÛŒØ´ØªÙ† Ùˆ Ù‡Û•ÚµÚ¯Ø±ØªÙ†ÛŒ Ù¾Û•Ø³Û•Ù†Ø¯ÛŒÛ•Ú©Ø§Ù†ÛŒ ØªÛ† Ø¨Û† Ø³Û•Ø±Ø¯Ø§Ù†Û•Ú©Ø§Ù†ÛŒ Ø¯Ø§Ù‡Ø§ØªÙˆÙˆ.</p>
+
+      < hr="spacer" />
+
+      <h3 ="Ø¦Ø§Ø´Ú©Ø±Ø§</h3> > Ø¦Ø§ÛŒØ§ Ù‡ÛŒÚ† Ø²Ø§Ù†ÛŒØ§Ø±ÛŒÛŒÛ•Ú© Ø¨Û† ØØ²Ø¨Û•Ú©Ø§Ù†ÛŒ Ø¯Û•Ø±Û•ÙˆÛ• Ø¦Ø§Ø´Ú©Ø±Ø§ Ø¯Û•Ú©Û•ÛŒÙ†ØŸ
+
+      <p> Ø¦ÛŽÙ…Û• Ø²Ø§Ù†ÛŒØ§Ø±ÛŒÛ• ØªØ§ÛŒØ¨Û•ØªÛ•Ú©Ø§Ù†Øª Ù†Ø§ÙØ±Û†Ø´ÛŒÙ†ØŒ Ø¨Ø§Ø²Ø±Ú¯Ø§Ù†ÛŒ Ø¯Û•Ú©Û•ÛŒÙ†ØŒ ÛŒØ§Ù† Ù†Ø§Ú¯ÙˆØ§Ø²Ø±ÛŽØªÛ•ÙˆÛ• Ø¨Û† ØØ²Ø¨Û•Ú©Ø§Ù†ÛŒ Ø¯Û•Ø±Û•ÙˆÛ•. Ø¦Û•Ù…Û• Ù„Ø§ÛŒÛ•Ù†ÛŒ Ø³ÛŽÛŒÛ•Ù…ÛŒ Ø¨Ø§ÙˆÛ•Ú•Ù¾ÛŽÚ©Ø±Ø§Ùˆ ÛŒ ØªÛŽØ¯Ø§ Ù†ÛŒÛŒÛ• Ú©Û• ÛŒØ§Ø±Ù…Û•ØªÛŒÙ…Ø§Ù† Ø¯Û•Ø¯Ø§Øª Ù„Û• Ú©Ø§Ø±Ù¾ÛŽÚ©Ø±Ø¯Ù†ÛŒ Ø³Ø§ÛŒØªÛ•Ú©Û•Ù…Ø§Ù†ØŒ Ø¦Û•Ù†Ø¬Ø§Ù…Ø¯Ø§Ù†ÛŒ Ú©Ø§Ø±Û•Ú©Ø§Ù†Ù…Ø§Ù†ØŒ ÛŒØ§Ù† Ø®Ø²Ù…Û•ØªÚ©Ø±Ø¯Ù†ÛŒ Ø¦ÛŽÙˆÛ•ØŒ Ù‡Û•ØªØ§ Ø¦Û•Ùˆ ØØ²Ø¨Ø§Ù†Û• Ú•Ø§Ø²ÛŒ Ø¨Ù† Ø¨Û• Ù†Ù‡ÛŽÙ†ÛŒ Ù‡ÛŽØ´ØªÙ†Û•ÙˆÛ•ÛŒ Ø¦Û•Ù… Ø²Ø§Ù†ÛŒØ§Ø±ÛŒØ§Ù†Û•. Ù‡Û•Ø±ÙˆÛ•Ù‡Ø§ Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ø²Ø§Ù†ÛŒØ§Ø±ÛŒÛ•Ú©Û•Øª Ø¨ÚµØ§ÙˆÚ©Û•ÛŒÙ†Û•ÙˆÙ‡ Ú©Ø§ØªÛŽÚ© Ù¾ÛŽÙ…Ø§Ù† ÙˆØ§ÛŒÛ• Ø¦Ø§Ø²Ø§Ø¯Ú©Ø±Ø¯Ù† Ú¯ÙˆÙ†Ø¬Ø§ÙˆÛ• Ø¨Û† Ù¾Ø§Ø¨Û•Ù†Ø¯Ø¨ÙˆÙˆÙ† Ø¨Û• ÛŒØ§Ø³Ø§ØŒ Ø³Û•Ù¾Ø§Ù†Ø¯Ù†ÛŒ Ø³ÛŒØ§Ø³Û•ØªÛŒ Ù…Ø§ÚµÙ¾Û•Ú•Û•Ú©Û•Ù…Ø§Ù†ØŒ ÛŒØ§Ù† Ù¾Ø§Ø±Ø§Ø³ØªÙ†ÛŒ Ù…Ø§ÙÛ•Ú©Ø§Ù†Ù…Ø§Ù† ÛŒØ§Ù† Ù…Ø§ÙÛŒ ØªØ±ØŒ Ù…ÙˆÚµÚ©ØŒ ÛŒØ§Ù† Ø³Û•Ù„Ø§Ù…Û•ØªÛŒ.</p>
+
+      <p> Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ù†Ø§ÙˆÛ•Ú•Û†Ú©ÛŒ Ú¯Ø´ØªÛŒØª Ø¯Ø§Ø¨Û•Ø²ÛŽÙ†Ø±Ø§Ø¨ÛŽØª Ù„Û•Ù„Ø§ÛŒÛ•Ù† Ø®Ø²Ù…Û•ØªÚ¯ÙˆØ²Ø§Ø±ÛŒÛ•Ú©Ø§Ù†ÛŒ ØªØ±Û•ÙˆÛ• Ù„Û• ØªÛ†Ú•Û•Ú©Û•Ø¯Ø§. Ù¾Û†Ø³ØªÛ• Ú¯Ø´ØªÛŒ Ùˆ ØªÛ•Ù†Ù‡Ø§ Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ ØªÛ† Ø¯Û•Ú¯Û•ÛŒÛ•Ù†ÛŒÙ†Û• Ø¦Û•Ùˆ Ø³ÛŽØ±Ú¤Û•Ø±Ø§Ù†Û•ÛŒ Ú©Û• Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ ØªÛŽÛŒØ¯Ø§ Ù†ÙˆØ§Ù†Ø¯ÙˆÙˆÛ•ØŒ Ùˆ Ù¾Û•ÛŒØ§Ù…ÛŒ Ú•Ø§Ø³ØªÛ•ÙˆØ®Û† Ø¯Û•Ú¯Û•ÛŒÛ•Ù†ÛŒÙ†Û• Ø®Ø²Ù…Û•ØªÚ©Ø§Ø±Û•Ú©Ø§Ù†ÛŒ ÙˆÛ•Ø±Ú¯Ø±Û•Ú©Ø§Ù†ØŒ Ù„Û• Ø¯ÙˆÙˆØ±ÛŒ Ø¦Û•ÙˆÛ•ÛŒ Ú©Û• Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ ÛŒØ§Ù† ÙˆÛ•Ø±Ú¯Ø±Û•Ú©Ø§Ù† Ù„Û• Ø³ÛŽØ±Ú¤Û•Ø±ÛŽÚ©ÛŒ Ø¬ÛŒØ§ÙˆØ§Ø² Ù„Û•Ù….</p>
+
+      <p> Ú©Ø§ØªÛŽÚ© ØªÛ† Ù…Û†ÚµÛ•Øª Ø¨Û• Ú©Ø§Ø±Ø¨Û•Ø±Ù†Ø§Ù…Û•ÛŒÛ•Ú© Ø¨Ø¯Û•ÛŒØª Ø¨Û† Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø§Ù†ÛŒ Ø¦Û•Ú˜Ù…ÛŽØ±Û•Ú©Û•ØªØŒ Ø¨Û•Ú¯ÙˆÛŽØ±Û•ÛŒ Ù…Û•ÙˆØ¯Ø§ÛŒ Ù…Û†ÚµÛ•ØªÛ•Ú©Ø§Ù†Øª Ú©Û• Ù¾Û•Ø³Û•Ù†Ø¯Øª Ú©Ø±Ø¯ÙˆÙˆÛ•ØŒ Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ø¨Ú†ÛŽØªÛ• Ù†Ø§Ùˆ Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„ÛŒ Ú¯Ø´ØªÛŒØŒ Ù„ÛŒØ³ØªÛŒ Ø®ÙˆØ§Ø±Û•ÙˆÛ•ØªØŒ Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ ØªÛ†ØŒ Ù„ÛŒØ³ØªÛ•Ú©Ø§Ù†ØªØŒ Ù‡Û•Ù…ÙˆÙˆ Ø¨Ø§Ø¨Û•ØªÛ•Ú©Ø§Ù†ØªØŒ Ùˆ Ø¯ÚµØ±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ ØªÛ†. Ú©Ø§Ø±Ø¨Û•Ø±Ù†Ø§Ù…Û•Ú©Ø§Ù† Ù‡Û•Ø±Ú¯ÛŒØ² Ù†Ø§ØªÙˆØ§Ù†Ù† Ø¯Û•Ø³ØªÚ¯Û•ÛŒØ´ØªÙ†ÛŒØ§Ù† Ù‡Û•Ø¨ÛŽØª Ø¨Û• Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ ÛŒØ§Ù† Ù†Ù‡ÛŽÙ†ÙˆØ´Û•.</p>
+      < hr="spacer" />
+
+      <h3 id="Ù…Ù†Ø¯Ø§ÚµØ§Ù†"> Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø§Ù†ÛŒ Ø³Ø§ÛŒØª Ù„Û•Ù„Ø§ÛŒÛ•Ù† Ù…Ù†Ø¯Ø§ÚµØ§Ù†Û•ÙˆÛ•</h3>
+
+      <p> Ø¦Û•Ú¯Û•Ø± Ø¦Û•Ù… Ø³ÛŽØ±Ú¤Û•Ø±Û• Ù„Û• ÛŒÛ•Ú©ÛŽØªÛŒ Ø¦Û•ÙˆØ±ÙˆÙˆÙ¾Ø§ ÛŒØ§Ù† Ø¦ÛŒ Ø¦ÛŒ Ø¦ÛŒ Ø¦Û•ÛŒ Ø¨ÛŽØª: Ù…Ø§ÚµÙ¾Û•Ú•ØŒ Ø¨Û•Ø±Ù‡Û•Ù… Ùˆ Ø®Ø²Ù…Û•ØªÚ¯ÙˆØ²Ø§Ø±ÛŒÛŒÛ•Ú©Ø§Ù†ÛŒ Ø¦ÛŽÙ…Û• Ù‡Û•Ù…ÙˆÙˆÛŒØ§Ù† Ø¦Ø§Ø±Ø§Ø³ØªÛ•ÛŒ Ø¦Û•Ùˆ Ú©Û•Ø³Ø§Ù†Û• Ø¯Û•Ú©Ø±ÛŽØª Ú©Û• Ø¨Û• Ù„Ø§ÛŒÛ•Ù†ÛŒ Ú©Û•Ù…Û•ÙˆÛ• 16 Ø³Ø§Úµ Ù†. Ø¦Û•Ú¯Û•Ø± ØªÛ•Ù…Û•Ù†Øª Ù„Û• Ø®ÙˆØ§Ø± 16 Ø³Ø§ÚµÛ•ÙˆÛ• Ø¨ÛŽØªØŒ Ù„Û• Ø³Û•Ø± Ù¾ÛŽØ¯Ø§ÙˆÛŒØ³ØªÛŒ GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) Ø¦Û•Ù… Ø³Ø§ÛŒØªÛ• Ø¨Û•Ú©Ø§Ø±Ù…Û•Ù‡ÛŽÙ†ÛŒØª.</p>
+
+      <p> Ø¦Û•Ú¯Û•Ø± Ø¦Û•Ù… Ø³ÛŽØ±Ú¤Û•Ø±Û• Ù„Û• Ø¦Û•Ù…Ø±ÛŒÚ©Ø§ Ø¨ÛŽØª: Ù…Ø§ÚµÙ¾Û•Ú• Ùˆ Ø¨Û•Ø±Ù‡Û•Ù… Ùˆ Ø®Ø²Ù…Û•ØªÚ¯ÙˆØ²Ø§Ø±ÛŒÛ•Ú©Ø§Ù†Ù…Ø§Ù† Ù‡Û•Ù…ÙˆÙˆÛŒ Ø¦Ø§Ø±Ø§Ø³ØªÛ•ÛŒ Ø¦Û•Ùˆ Ú©Û•Ø³Ø§Ù†Û• Ø¯Û•Ú©Ø±ÛŽØª Ú©Û• Ø¨Û• Ù„Ø§ÛŒÛ•Ù†ÛŒ Ú©Û•Ù…Û•ÙˆÛ• 13 Ø³Ø§Úµ Ù†. Ø¦Û•Ú¯Û•Ø± ØªÛ† Ù„Û• Ø®ÙˆØ§Ø± ØªÛ•Ù…Û•Ù†ÛŒ 13 Ø³Ø§ÚµÛŒÛ•ÙˆÛ•Ø¨ÛŒØªØŒ Ù„Û• Ø³Û•Ø± Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒÛ•Ú©Ø§Ù†ÛŒ COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection act</a>) Ø¦Û•Ù… Ø³Ø§ÛŒØªÛ• Ø¨Û•Ú©Ø§Ø±Ù…Û•Ù‡ÛŽÙ†ÛŒØª.</p>
+
+      <p> ÛŒØ§Ø³Ø§ Ø¯Û•ØªÙˆØ§Ù†ÛŽØª Ø¬ÛŒØ§ÙˆØ§Ø² Ø¨ÛŽØª Ø¦Û•Ú¯Û•Ø± Ø¦Û•Ù… Ø³ÛŽØ±Ú¤Û•Ø±Û• Ù„Û• Ø¯Û•Ø³Û•ÚµØ§ØªÛŒ Ø¯Ø§Ø¯ÙˆÛ•Ø±ÛŒ ØªØ± Ø¨ÛŽØª.</p>
+
+      < hr="spacer" />
+
+      <h3 id="Ú¯Û†Ú•Ø§Ù†Ú©Ø§Ø±ÛŒÛ•Ú©Ø§Ù†"> Ú¯Û†Ú•Ø§Ù†Ú©Ø§Ø±ÛŒÛ•Ú©Ø§Ù† Ù„Û• Ø³ÛŒØ§Ø³Û•ØªÛŒ ØªØ§ÛŒØ¨Û•ØªÙ…Û•Ù†Ø¯ÛŒÙ…Ø§Ù†</h3>
+
+      <p> Ø¦Û•Ú¯Û•Ø± Ø¨Ú•ÛŒØ§Ø±Ù…Ø§Ù† Ø¯Ø§ Ø³ÛŒØ§Ø³Û•ØªÛŒ ØªØ§ÛŒØ¨Û•ØªÙ…Û•Ù†Ø¯ÛŒÙ…Ø§Ù† Ø¨Ú¯Û†Ú•ÛŒÙ†ØŒ Ø¦Û•Ùˆ Ú¯Û†Ú•Ø§Ù†Ú©Ø§Ø±ÛŒØ§Ù†Û• Ù„Û•Ù… Ù¾Û•Ú•Û•ÛŒÛ• Ø¨ÚµØ§ÙˆØ¯Û•Ú©Û•ÛŒÙ†Û•ÙˆÛ•.</p>
+
+      <p> Ø¦Û•Ù… Ø¯Û†Ú©ÛŒÙˆÙ…ÛŽÙ†ØªÛ• CC-BY-SA Û•. Ø¯ÙˆØ§ÛŒÛŒÙ† Ø¬Ø§Ø± Ù†ÙˆÛŽÚ©Ø±Ø§ÛŒÛ•ÙˆÛ• Ù„Û• 7ÛŒ Ø¦Ø§Ø²Ø§Ø±ÛŒ 2018.</p>
+
+      <p> Ù„Û• Ø¨Ù†Û•Ú•Û•ØªØ¯Ø§ Ù„Û• < href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
+    title: "%{instance} Ù…Û•Ø±Ø¬Û•Ú©Ø§Ù†ÛŒ Ø®Ø²Ù…Û•ØªÚ¯ÙˆØ²Ø§Ø±ÛŒ Ùˆ Ø³ÛŒØ§Ø³Û•ØªÛŒ ØªØ§ÛŒØ¨Û•ØªÛŒÛŽØªÛŒ"
+  themes:
+    contrast: Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† (Ú©Û†Ù†ØªØ±Ø§Ø³ØªÛŒ Ø¨Û•Ø±Ø²)
+    default: Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† (Ú•Û•Ø´)
+    mastodon-light: Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† (Ú©Ø§Úµ)
+  time:
+    formats:
+      default: "%b %d, %Y, %H:%M"
+      month: "%b %Y"
+  two_factor_authentication:
+    add: Ø²ÛŒØ§Ø¯Ú©Ø±Ø¯Ù†
+    disable: Ù„Û•Ú©Ø§Ø±Ø®Ø³ØªÙ†ÛŒ 2FA
+    disabled_success: Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†ÛŒ Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†ÛŒ Ø¯ÙˆÙˆ-ÙØ§Ú©ØªÛ•Ø± Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ù„Û•Ú©Ø§Ø±Ø®Ø±Ø§ÙˆÛ•
+    edit: Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒ
+    enabled: Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†ÛŒ Ø¯ÙˆÙˆ-ÙØ§Ú©ØªÛ•Ø± Ú†Ø§Ù„Ø§Ú© Ú©Ø±Ø§ÙˆÛ•
+    enabled_success: Ø³Û•Ù„Ù…Ø§Ù†Ø¯Ù†ÛŒ Ø¯ÙˆÙˆ-ÙØ§Ú©ØªÛ•Ø± Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ú†Ø§Ù„Ø§Ú© Ú©Ø±Ø§
+    generate_recovery_codes: Ø¯Ø±ÙˆØ³Øª Ú©Ø±Ø¯Ù†ÛŒ Ú©Û†Ø¯ÛŒ Ú†Ø§Ú©Ú©Ø±Ø¯Ù†Û•ÙˆÛ•
+    lost_recovery_codes: Ú©Û†Ø¯ÛŒ Ú¯Û•Ú•Ø§Ù†Ø¯Ù†Û•ÙˆÛ• Ú•ÛŽÚ¯Û•Øª Ù¾ÛŽ Ø¯Û•Ø¯Ø§Øª Ú©Û• Ø¯Û•Ø³ØªÚ¯Û•ÛŒØ´ØªÙ†Øª Ø¨Û† Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ø¨Û•Ø¯Û•Ø³Øª Ø¨Ù‡ÛŽÙ†ÛŽ Ø¦Û•Ú¯Û•Ø± ØªÛ•Ù„Û•ÙÛ†Ù†Û•Ú©Û•Øª Ù„Û•Ø¯Û•Ø³Øª Ø¨Ø¯Û•ÛŒØª. Ø¦Û•Ú¯Û•Ø± Ú©Û†Ø¯Û•Ú©Ø§Ù†ÛŒ Ú†Ø§Ú©Ø¨ÙˆÙˆÙ†Û•ÙˆÛ•Øª Ù„Û•Ø¯Û•Ø³Øª Ø¯Ø§ÙˆÛ•ØŒ Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ù„ÛŽØ±Û• Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ø¯Ø±ÙˆØ³ØªÛŒØ§Ù† Ú©Û•ÛŒ. Ú©Û†Ø¯ÛŒ Ú†Ø§Ú©Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ú©Û†Ù†Øª Ù‡Û•ÚµØ¯Û•ÙˆÛ•Ø´ÛŽÙ†ÛŽØªÛ•ÙˆÛ•.
+    methods: Ø¯ÙˆÙˆ - Ù…ÛŒØªÛ†Ø¯ÛŒ ÙØ§Ú©ØªÛ•Ø±
+    otp: Ø¦Û•Ù¾ÛŒ Ú•Ø§Ø³ØªÛ•ÙˆÛ•
+    recovery_codes: Ù¾Ø§ÚµÙ¾Ø´ØªÚ©Ø±Ø¯Ù† Ù„Û• Ú©Û†Ø¯ÛŒ Ù‡ÛŽÙ†Ø§Ù†Û•ÙˆÛ•ÛŒ
+    recovery_codes_regenerated: Ú©Û†Ø¯ÛŒ Ú¯Û•Ú•Ø§Ù†Ø¯Ù†Û•ÙˆÛ• Ø¨Û• Ø³Û•Ø±Ú©Û•ÙˆØªÙˆÙˆÛŒÛŒ Ø¯ÙˆÙˆØ¨Ø§Ø±Û• Ø¯Ø±ÙˆØ³Øª Ø¨ÙˆÙˆÛŒÛ•ÙˆÛ•
+    recovery_instructions_html: Ú¯Û•Ø± ØªÛ•Ù„Û•ÙÛ†Ù†Û•Ú©Û•Øª Ø¨Ø²Ø± Ú©Ø±Ø¯ Ø¯Û•ØªÙˆØ§Ù†ÛŒ Ø¨Û• ÛŒÛ•Ú©ÛŽÚ© Ù„Û• Ú©Û†Ø¯Û•Ú©Ø§Ù†ÛŒ Ø®ÙˆØ§Ø±Û•ÙˆÛ• Ú†Ø§ÙˆØ¯ÛŽØ±ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª Ù„Û• Ø¯Û•Ø³Øª Ø¨Ú¯Ø±ÛŒØª.<strong>Ø§Ø¦Û•Ù… Ú©Û†Ø¯Ø§Ù†Û• Ù„Û• Ø´ÙˆÛŽÙ†ÛŽÚ©ÛŒ Ù¾Ø§Ø±Ø§Ùˆ Ù‡Û•ÚµØ¨Ú¯Ø±Û•</strong> Ø¨Û† Ù†Ù…ÙˆÙˆÙ†Û• Ú†Ø§Ù¾ÛŒ Ø¨Ú©Û•Ù† ÛŒØ§Ù† Ù„Û•Ú¯Û•Úµ Ø¨Û•ÚµÚ¯Û•Ù†Ø§Ù…Û• Ú¯Ø±ÛŒÙ†Ú¯Û•Ú©Ø§Ù†Øª Ø¯Ø§ÛŒØ¨Ù†ÛŽ.
+    webauthn: Ú©Ù„ÛŒÙ„Û•Ú©Ø§Ù†ÛŒ Ù¾Ø§Ø±Ø§Ø³ØªÙ†
+  user_mailer:
+    backup_ready:
+      explanation: Ø¦ÛŽÙˆÛ• ÙˆØ´Ø§Ù†ÛŽÚ©ÛŒ Ù¾Ø§ÚµÙ¾Ø´ØªÛŒ ØªÛ•ÙˆØ§ÙˆØª Ù„Û• Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•ÛŒ Ø®Û†Øª Ø¯Ø§ÙˆØ§ Ú©Ø±Ø¯ÙˆÙˆÛ•ØŒ Ø¦Û•Ù… Ù¾Ø§ÚµÙ¾Ø´ØªÛŒÛŒÛ• Ø¦ÛŽØ³ØªØ§ Ø¦Ø§Ù…Ø§Ø¯Û•ÛŒ Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†Û•!
+      subject: Ø¦Ø§Ø±Ø´ÛŒÚ¤ÛŒ Ø¦ÛŽÙˆÛ• Ø¦Ø§Ù…Ø§Ø¯Û•ÛŒ Ø¯Ø§Ú¯Ø±ØªÙ†Û•
+      title: ÙˆÛ•Ø±Ú¯Ø±ØªÙ†ÛŒ Ø¦Ø§Ø±Ø´ÛŒÚ¤
+    sign_in_token:
+      details: 'ÙˆØ±Ø¯Û•Ú©Ø§Ø±ÛŒÛŒ Ù‡Û•ÙˆÚµÛ•Ú©Ø§Ù†:'
+      explanation: 'Ù‡Û•ÙˆÚµÛŽÚ© Ø¨Û† Ù‡Ø§ØªÙ†Û• Ù†ÛŽÙˆ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•ØªØ§Ù† Ù„Û• Ù†Ø§ÙˆÙ†ÛŒØ³Ø§Ù†ÛŽÚ©ÛŒ Ø¦Ø§ÛŒâ€ŒÙ¾ÛŒ Ù¾Û•ÛŒØ¯Ø§Ú©Ø±Ø§. Ú¯Û•Ø± Ø®Û†ØªØ§Ù†Ù†. ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•ÛŒ Ù¾Ø§Ø±Ø§Ø³ØªÙ† Ø¨Û† Ù¾Û•Ú•Û•ÛŒ Ø¨Û•Ø±Ù†Ú¯Ø§Ø±ÛŒ Ø¯Ø§Ø¨ÛŒÙ† Ø¨Ú©Û•:'
+      further_actions: 'Ú¯Û•Ø± Ø¦ÛŽÙˆÛ• Ù†ÛŒÛŒÙ† ØªÚ©Ø§ÛŒÛ• ØªÛŽÙ¾Û•Ú•ÙˆØ´Û• Ø¨Ú¯Û†Ú•Û• ÙˆÛ• Ù„ÛŽØ±Û•ÙˆÛ• Ù¾Û•Ø³Û•Ù†Ø¯ Ø¨ÙˆÙˆÙ†ÛŒ Ø¯ÙˆÙˆ Ù‚Û†Ù†Ø§ØºÛŒ Ù„Û• Ø³Û•Ø± Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•ØªØ§Ù† Ú†Ø§Ù„Ø§Ú© Ø¨Ú©Û•Ù†:'
+      subject: ØªÚ©Ø§ÛŒÛ• Ø¯ÚµÙ†ÛŒØ§Ø¨Û• Ù„Û• Ù‡Û•ÙˆÚµØ¯Ø§Ù† Ø¨Û† Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆÙˆØ±Û•ÙˆÛ•
+      title: Ù‡Û•ÙˆÚµØ¯Ø§Ù† Ø¨Û† Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆÙˆØ±Û•ÙˆÛ•
+    warning:
+      explanation:
+        disable: ØªØ§ Ú©Ø§ØªÛŽÚ© Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒ Ø¦ÛŽÙˆÛ• Ù†Û•ÙˆÛŽØ³ØªØ§ÙˆÛ•ØŒ Ø¯Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ Ø¦ÛŽÙˆÛ• Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒ Ù†Ø§Ú©Ø±ÛŽØª.Ø¨Û•ÚµØ§Ù… ØªØ§ Ú©Ø§ØªÛŽÚ© Ú©Û• Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•ØªØ§Ù† Ù†Ø§Ú©Ø±ÛŽØªÛ•ÙˆÛ•. Ù†Ø§ØªÙˆØ§Ù†Ù† Ù‡ÛŒÚ† Ø¦ÛŒØ´ÛŽÚ©ÛŒ Ù„Û•Ø³Û•Ø± Ø¨Ú©Û•Ù†.
+        sensitive: Ù¾Û•Ú•Ú¯Û• Ù…ÛŒØ¯ÛŒØ§ÛŒÛ• Ø¨Ø§Ø±Ú©Ø±Ø§ÙˆÛ•Ú©Ø§Ù†Øª Ùˆ Ù…ÛŒØ¯ÛŒØ§ Ù„ÛŒÙ†Ú©Ú©Ø±Ø§ÙˆÛ•Ú©Ø§Ù†Øª ÙˆÛ•Ú© Ù‡Û•Ø³ØªÛŒØ§Ø± Ù…Ø§Ù…Û•ÚµÛ•ÛŒØ§Ù† Ù„Û•Ú¯Û•Úµ Ø¯Û•Ú©Ø±ÛŽØª.
+        silence: ØªØ§ Ú©Ø§ØªÛŒÚ© Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•ØªØ§Ù† Ø³Ù†ÙˆÙˆØ±Ø¯Ø§Ø± Ø¨ÛŽØªØŒ ØªÛ•Ù†Ù‡Ø§ Ø¦Û•Ùˆ Ú©Û•Ø³Ø§Ù†Û• Ú©Û• Ù¾ÛŽØ´ØªØ± Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆÙˆÛŒ Ø¦ÛŽÙˆÛ• Ø¨ÙˆÙˆÙ† Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ Ø¦ÛŽÙˆÛ• Ù„Û•Ù… Ú•Ø§Ú˜Û• Ø¯Û•Ø¨ÛŒÙ†Ù†. Ø´Ø§ÛŒÛ•Ø¯ Ø¦ÛŽÙˆÛ• Ù„Û• Ø²Û†Ø± Ù¾ÛŽØ±Ø³ØªÛŒ Ú¯Ø´ØªÛŒ Ø¯ÛŒØ§Ø± Ù†Û•Ú©Û•ÙˆÙ†Ø› Ø¨Û•ÚµØ§Ù… Ø®Û•ÚµÚ©Ø§Ù†ÛŒ Ø¯ÛŒÚ©Û• Ø¯Û•ØªÙˆØ§Ù†Ù† Ø¨Û• Ø¯ÚµÛŒ Ø®Û†ÛŒØ§Ù† Ù¾Û•ÛŒÚ¯ÛŒØ±ÛŒ Ø¦ÛŽÙˆÛ• Ø¨Ù†.
+        suspend: Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•ØªØ§Ù† Ù‡Û•ÚµÙˆØ§Ø³Ø±Ø§ÙˆÛ•ØŒ ÙˆÛ• ØªÛ•ÙˆØ§Ùˆ ØªÙˆØª Ùˆ Ù…ÛŒØ¯ÛŒØ§Ú©Ø§Ù† Ú©Û• Ù„Û•Ø³Û•Ø± Ø¦Û•Ù… Ú•Ø§Ú˜Û• Ø¨Ø§Ø±ØªØ§Ù† Ú©Ø±Ø¯ÙˆÙˆÛ• ÛŒØ§Ù† Ø¦Û•Ùˆ Ú•Ø§Ú˜Ø§Ù†Û• Ú©Û• Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆÙˆØªØ§Ù† Ù„Û• Ø³Û•Ø±ÛŒ Ø¨ÙˆÙˆÛ• Ø¦ÛŒØªØ± Ù†Ø§Ú¯Û•Ú•ÛŽÙ†Û•ÙˆÛ•.
+      get_in_touch: Ø¨Û• ÙˆÚµØ§Ù… Ø¯Ø§Ù†Û•ÙˆÛ•ÛŒ Ø¦Û•Ù… Ø¦ÛŒÙ…Û•ÛŒÙ„Û• Ø¯Û•ØªÙˆØ§Ù†Ù† Ù„Û• Ú¯Û•Úµ Ù„ÛŒÚ˜Ù†Û•ÛŒ %{instance} Ù„Û• Ù¾Û•ÛŒÙˆÛ•Ù†Ø¯ÛŒ Ø¨Ù†.
+      review_server_policies: Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ•ÛŒ Ø³ÛŒØ§Ø³Û•ØªÛ•Ú©Ø§Ù†ÛŒ Ú•Ø§Ú˜Û•
+      statuses: 'Ø¨Û• Ø¯ÛŒØ§Ø±ÛŒÚ©Ø±Ø§ÙˆÛŒØŒ Ø¨Û†:'
+      subject:
+        disable: Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª %{acct} Ø¨Û•Ø³ØªØ±Ø§ÙˆÛ•
+        none: Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒ Ø¨Û† %{acct}
+        sensitive: Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª %{acct} Ù…ÛŒØ¯ÛŒØ§ÛŒÛ•Ú©ÛŒ Ù¾Û†Ø³Øª Ú©Ø±Ø¯Ù† Ø¨Û• Ù‡Û•Ø³ØªÛŒØ§Ø± Ù†ÛŒØ´Ø§Ù† Ú©Ø±Ø§ÙˆÛ•
+        silence: Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•ÛŒ %{acct} Ø³Ù†ÙˆÙˆØ±Ø¯Ø§Ø± Ú©Ø±Ø§ÙˆÛ•
+        suspend: Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•ÛŒ %{acct} Ú•Ø§Ú¯ÛŒØ±Ø§
+      title:
+        disable: Ù‡Û•Ú˜Ù…Ø§Ø±Û• Ø¨Û•Ø³ØªØ±Ø§ÙˆÛ•
+        none: Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒ
+        sensitive: Ù…ÛŒØ¯ÛŒØ§Ú©Û•Øª Ø¨Û• Ù‡Û•Ø³ØªÛŒØ§Ø± Ù†ÛŒØ´Ø§Ù† Ú©Ø±Ø§ÙˆÛ•
+        silence: Ù‡Û•Ú˜Ù…Ø§Ø±ÛŒ Ø³Ù†ÙˆÙˆØ±Ø¯Ø§Ø±
+        suspend: Ù‡Û•Ú˜Ù…Ø§Ø± Ú•Ø§Ú¯ÛŒØ±Ø§
+    welcome:
+      edit_profile_action: Ù¾Ø±Û†ÙØ§ÛŒÙ„ÛŒ Ø¬ÛŽÚ¯ÛŒØ±Ú©Ø±Ø¯Ù†
+      edit_profile_step: 'Ø¦ÛŽÙˆÛ• Ø¯Û•ØªÙˆØ§Ù†Ù† Ù¾Ø±Û†ÙØ§ÛŒÙ„Û•Ú©Û•ØªØ§Ù† Ø¨Û• Ø¯ÚµØ®ÙˆØ§Ø²ÛŒ Ø®Û†ØªØ§Ù† Ø¨Ú¯Û†Ú•Ù†: Ø¯Û•ØªÙˆØ§Ù†Ù† ÙˆÛŽÙ†Û•ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„ØŒÙˆÛŽÙ†Û•ÛŒ Ù¾Ø§Ø´Ø¨Ù†Û•Ù…Ø§ØŒÙ†Ø§Ùˆ Ùˆ... Ù‡ØªØ¯ Ø¯Ø§Ø¨ÛŒÙ† Ø¨Ú©Û•Ù†. Ø¦Û•Ú¯Û•Ø± Ù‡Û•Ø±Û•Ú©Øª Ø¨ÛŽØª Ø¯Û•ØªÙˆØ§Ù†ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª ØªØ§ÛŒØ¨Û•Øª Ø¨Ú©Û•ÛŒØªÛ•ÙˆÛ• ØªØ§ ØªÛ•Ù†Ù‡Ø§ Ú©Û•Ø³Ø§Ù†ÛŽÚ© Ú©Û• Ø¦ÛŽÙˆÛ• Ú•ÛŽÚ¯Û•ØªØ§Ù† Ø¯Ø§ÙˆÛ• Ø¯Û•ØªÙˆØ§Ù†Ù† Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆÙˆ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•ØªØ§Ù† Ø¨Ù†.'
+      explanation: Ø¦Û•Ù…Û• Ú†Û•Ù†Ø¯ Ø¦Ø§Ù…Û†Ú˜Ú¯Ø§Ø±ÛŒÛŒÛ•Ú©Ù† Ø¨Û† Ø¯Û•Ø³Øª Ù¾ÛŽÚ©Ø±Ø¯Ù†Øª
+      final_action: Ø¯Û•Ø³Øª Ø¨Ú©Û• Ø¨Û• Ø¨ÚµØ§ÙˆÚ©Ø±Ø¯Ù†Û•ÙˆÛ•
+      final_step: 'Ú†ÛŒØ²ÛŒ Ø¨Ù†ÙˆÙˆØ³ÛŒØ¯! ØªÛ•Ù†Ø§Ù†Û•Øª Ú¯Û•Ø± Ø¦ÛŽØ³ØªØ§ Ú©Û•Ø³ÛŽÚ© Ø´ÙˆÛŽÙ† Ú©Û•ÙˆØªÙˆÙˆÛŒ Ø¦ÛŽÙˆÛ• Ù†Û•Ø¨ÙˆÙˆØŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Ø§Ù†ÛŒ Ø¯ÛŒÚ©Û• Ùˆ Ø³Û•Ø±Ø¯Ø§Ù†Ú©Û•Ø±Û•Ú©Ø§Ù†ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„Û•Ú©Û•ØªØ§Ù† Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ Ú¯Ø´ØªÛŒ Ø¦ÛŽÙˆÛ• Ø¯Û•Ø¨ÛŒÙ†Ù†. Ø¨Û† Ù†Ù…ÙˆÙˆÙ†Û• Ù„Û• Ù¾ÛŽØ±Ø³ØªÛŒ Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ• Ø®Û†Ù…Ø§ÚµÛŒÛŒÛ•Ú©Ø§Ù† Ùˆ Ù„Û• Ù„Ú©Ø§ÙˆÛ•ÛŒ(Ù‡Ø§Ø´ØªØ§Ú¯) Û•Ú©Ø§Ù†ØŒ Ø´Ø§ÛŒÛ•Ø¯ Ù‡Û•Ø±Û•Ú©ØªØ§Ù† Ø¨ÛŽØª Ø¨Û• Ú†Û•Ø³Ù¾Ú©Ø±Ø§ÙˆÛ•ÛŒ # Ø®Û†ØªØ§Ù† Ø¨Ù†Ø§Ø³ÛŽÙ†Ù†.'
+      full_handle: Ù†Ø§ÙˆÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŒ ØªÛ•ÙˆØ§ÙˆÛŒ Ø¦ÛŽÙˆÛ•
+      full_handle_hint: Ø¦Û•Ù…Û• Ø¦Û•Ùˆ Ø´ØªÛ•ÛŒÛ• Ú©Û• Ø¨Û• Ù‡Ø§ÙˆÚ•ÛŽÚ©Ø§Ù†Øª Ø¯Û•Ù„ÛŽÛŒ Ø¨Û† Ø¦Û•ÙˆÛ•ÛŒ Ù¾Û•ÛŒØ§Ù… ÛŒØ§Ù† Ù„Û• Ú•Ø§Ú˜Û•ÛŒÛ•Ú©ÛŒ Ø¯ÛŒÚ©Û•ÛŒ ØªØ±Û•ÙˆÛ• Ø¨Û•Ø¯ÙˆØ§Øª Ø¨Ú©Û•ÙˆÙ†.
+      review_preferences_action: Ú¯Û†Ú•ÛŒÙ†ÛŒ Ù¾Û•Ø³Û•Ù†Ø¯Û•Ú©Ø§Ù†
+      review_preferences_step: Ø¯ÚµÙ†ÛŒØ§Ø¨Û• Ù„Û• Ø¯Ø§Ù†Ø§Ù†ÛŒ Ù¾Û•Ø³Û•Ù†Ø¯Ú©Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ØªØŒ ÙˆÛ•Ú© Ú©Ø§Ù… Ø¦ÛŒÙ…Û•ÛŒÙ„ Ú©Û• Ø¯Û•ØªÛ•ÙˆÛŽØª ÙˆÛ•Ø±ÛŒØ¨Ú¯Ø±ÛŽØŒ ÛŒØ§Ù† Ø¯Û•ØªÛ•ÙˆÛŽØª Ú† Ø¦Ø§Ø³ØªÛŽÚ©ÛŒ ØªØ§ÛŒØ¨Û•ØªÛŒØª Ø¨Û† Ø¨Ø§Ø¨Û•ØªÛ•Ú©Ø§Ù†Øª Ù¾ÛŽØ´ Ú¯Ø±ÛŒÙ…Ø§Ù†Û• Ø¨ÛŽØª. Ø¦Û•Ú¯Û•Ø± Ù†Û•Ø®Û†Ø´ÛŒ Ø¬ÙˆÚµÛ•Øª(Ø¯Úµ ØªÛŽÚ©Û•ÚµØ¯Ø§Ù† Ù„Û• ÙˆÛŽÙ†Û• Ø¬ÙˆÙˆÚµÛ•ÛŒÛŒÛ•Ú©Ø§Ù†) Ù†ÛŒÛ•ØŒ Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ù‡Û•ÚµØ¨Ú˜ÛŽØ±ÛŒØª Ø¨Û† Ø¨Û•ØªÙˆØ§Ù†Ø§Ú©Ø±Ø¯Ù†ÛŒ Ù¾Û•Ø®Ø´Ú©Ø±Ø¯Ù†ÛŒ Ø®Û†Ú©Ø§Ø±ÛŒ GIF.
+      subject: Ø¨Û•Ø®ÛŽØ±Ø¨ÛŒØª Ø¨Û† Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†
+      tip_federated_timeline: Ù¾ÛŽØ±Ø³ØªÛŒ Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ Ù‡Û•Ù…ÙˆÙˆØ´ÙˆÛŽÙ†ÛŽÚ© ÙˆÛŽÙ†Û•ÛŒÛ•Ú©ÛŒ Ú¯Ø´ØªÛŒ Ù„Û• ØªÛ†Ú•ÛŒ Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†Û•ØŒ Ø¨Û•ÚµØ§Ù… ØªÛ•Ù†Ù‡Ø§ Ø¨Ø±ÛŒØªÛŒÛŒÛ• Ù„Û• Ù‡Ø§ÙˆØ³ÛŽÚ©Ø§Ù† Ú©Û• Ø´ÙˆÛŽÙ†ÛŒØ§Ù† Ú©Û•ÙˆØªÙ†Ø›Ø¨Ø³ ØªÛ•ÙˆØ§Ùˆ Ù†ÛŒÛŒÛ•.
+      tip_following: Ø¨Û• Ø´ÛŒÙˆÛ•ÛŒ Ø¨Ù†Û•Ú•Û•ØªÛŒ Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Û•Ø±Ø§Ù† Ú•Ø§Ú˜Û•Ú©Û•ØªØ§Ù† Ú†Ø§ÙˆØ¯ÛŽØ±ÛŒ Ø¯Û•Ú©Û•Ù†ØŒ Ø¨Û† Ù¾Û•Ø¯Ø§Ú©Ø±Ø¯Ù†ÛŒ Ú©Û•Ø³Ø§Ù†ÛŒ Ø³Û•Ø±Ù†Ø¬Ú•Ø§Ú©ÛŽØ´Û• Ú†Ø§ÙˆØ¯ÛŽØ±ÛŒ Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ• Ù†Ø§Ø®Û†ÛŒÛŒ Ùˆ Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•Ú©Ø§Ù†ÛŒ Ø´ÙˆÛŽÙ†Û•Ú©Ø§Ù†ÛŒ Ø¯ÛŒÚ©Û• Ø¨Ú©Û•Ù†.
+      tip_local_timeline: Ù¾ÛŽØ±Ø³ØªÛŒ Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ• Ù†Ø§ÙˆØ®Û†ÛŒÛŒÛ•Ú©Ø§Ù† Ø´ÛŽÙˆÛ•ÛŒÛ•Ú©ÛŒ ØªÛ•ÙˆØ§Ùˆ Ù„Û• Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù† Ù„Û• Ø³Û•Ø± %{instance} Ù¾ÛŒØ³Ø§Ù† Ø¯Û•Ø¯Û•Ù†ØŒ Ø¦Û•Ù…Ø§Ù†Û• Ø¬Û•ÛŒØ±Ø§Ù†ÛŒ Ø¦ÛŽÙˆÛ•Ù†!
+      tip_mobile_webapp: Ø¦Û•Ú¯Û•Ø± ÙˆÛŽØ¨Ú¯Û•Ú•ÛŒ Ù…Û†Ø¨Ø§ÛŒÙ„Û•Ú©Û•Øª Ù¾ÛŽØ´Ù†ÛŒØ§Ø±ÛŒ Ø²ÛŒØ§Ø¯Ú©Ø±Ø¯Ù†ÛŒ Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù† Ø¨Û† Ø´Ø§Ø´Û•ÛŒ Ú•ÙˆÙˆÙ…ÛŽØ²ÛŒÛ•Ú©Û•ØªÛŒ Ú©Ø±Ø¯ØŒ Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù†ÛŒ Ù‡Ø§Ù†Ø¯Ø§Ù† ÙˆÛ•Ø±Ø¨Ú¯Ø±ÛŒ. Ù„Û• Ø²Û†Ø± Ú•ÙˆÛ•ÙˆÛ• ÙˆÛ•Ú© Ø¨Û•Ø±Ù†Ø§Ù…Û•ÛŒÛ•ÛŒÛ•Ú©ÛŒ Ø¦Û•Ø³ÚµÛŒ Ø¦ÛŒØ³ Ø¯Û•Ú©Ø§!
+      tips: Ø¦Ø§Ù…Û†Ú˜Ú¯Ø§Ø±ÛŒÛ•Ú©Ø§Ù†
+      title: Ø¨Û•Ø®ÛŽØ±Ø¨ÛŽÛŒØªØŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø± %{name}!
+  users:
+    blocked_email_provider: Ø¦Û•Ù… Ø¯Ø§Ø¨ÛŒÙ†Ú©Û•Ø±ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛ• Ø±ÛŽÚ¯Û•Ù¾ÛŽØ¯Ø±Ø§Ùˆ Ù†ÛŒÛŒÛ•
+    follow_limit_reached: Ù†Ø§ØªÙˆØ§Ù†ÛŒØª Ø²ÛŒØ§ØªØ± Ù„Û• %{limit} Ø®Û•ÚµÚ© Ù¾Û•ÛŒÚ•Û•Ùˆ Ú©Û•ÛŒØª
+    generic_access_help_html: Ú©ÛŽØ´Û•Øª Ù‡Û•ÛŒÛ• Ù„Û• Ú¯Û•ÛŒØ´ØªÙ† Ø¨Û• Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•ØªØŸ Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ù„Û•Ú¯Û•Úµ %{email} Ø¨Û† ÛŒØ§Ø±Ù…Û•ØªÛŒØ¯Ø§Ù† Ù¾Û•ÛŒÙˆÛ•Ù†Ø¯ÛŒ Ø¨Ú¯Ø±Ù†
+    invalid_email: Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Ú©Û• Ù†Ø§Ø¯Ø±ÙˆØ³ØªÛ•
+    invalid_email_mx: Ù„Û•ÙˆÛ• Ù†Ø§Ú†ÛŽØª Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ Ø¨ÙˆÙˆÙ†ÛŒ Ù‡Û•Ø¨ÛŽØª
+    invalid_otp_token: Ú©Û†Ø¯ÛŒ Ø¯ÙˆÙˆ-ÙØ§Ú©ØªÛ•Ø± Ù†Ø§Ø¯Ø±ÙˆØ³ØªÛ•
+    invalid_sign_in_token: Ú©Û†Ø¯ÛŒ Ù¾Ø§Ø±Ø§Ø³ØªÙ† Ø¯Ø±ÙˆØ³Øª Ù†ÛŒÛ•
+    otp_lost_help_html: Ú¯Û•Ø± Ø¨Û•Ùˆ Ø¯ÙˆÙˆÚ•ÛŽÚ¯Ø§ Ù†Û•ØªÙˆØ§Ù†ÛŒ Ø¨Ú†ÛŒØªÛ• Ú˜ÙˆÙˆØ±Û•ÙˆÛ•ØŒ Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ù¾Û•ÛŒÙˆÛ•Ù†Ø¯ÛŒ Ø¨Ú¯Ø±ÛŒ Ø¨Û• %{email} Ø¨Û† ÛŒØ§Ø±Ù…Û•ØªÛŒ
+    seamless_external_login: ØªÛ† Ù„Û• Ú•ÛŽÚ¯Û•ÛŒ Ø®Ø²Ù…Û•ØªÚ¯ÙˆØ²Ø§Ø±ÛŒ Ø¯Û•Ø±Û•Ú©ÛŒÛ•ÙˆÛ• Ø¯Ø§Ø®Úµ Ø¨ÙˆÙˆÛŒØŒ Ø¨Û†ÛŒÛ• Ú•ÛŽÚ©Ø¨Û•Ù†Ø¯Û•Ú©Ø§Ù†ÛŒ Ù†Ù‡ÛŽÙ†ÙˆØ´Û• Ùˆ Ø¦ÛŒÙ…Û•ÛŒÙ„ Ø¨Û•Ø±Ø¯Û•Ø³Øª Ù†ÛŒÙ†.
+    signed_in_as: 'Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆÙˆØ±Û•ÙˆÛ• ÙˆÛ•Ú©:'
+    suspicious_sign_in_confirmation: ÙˆØ§Ø¯ÛŒØ§Ø±Û• ØªÛ† Ù¾ÛŽØ´ØªØ± Ù„Û•Ù… Ø¦Ø§Ù…ÛŽØ±Û• Ù†Û•Ú†ÙˆÛŒØªÛ• Ú˜ÙˆÙˆØ±Û•ÙˆÛ•ØŒ Ùˆ Ø¨Û† Ù…Ø§ÙˆÛ•ÛŒÛ•Ú© Ù†Û•Ú†ÙˆÛŒØªÛ• Ú˜ÙˆÙˆØ±Û•ÙˆÛ•ØŒ Ø¨Û†ÛŒÛ• Ú©Û†Ø¯ÛŒ Ù¾Ø§Ø±Ø§Ø³ØªÙ† Ø¯Û•Ù†ÛŽØ±Ø¯Ø±ÛŒÙ†Û• Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµÛ•Ú©Û•Øª Ø¨Û† Ø¯ÚµÙ†ÛŒØ§Ø¨ÙˆÙˆÙ† Ù„Û•ÙˆÛ•ÛŒ Ú©Û• Ø¦Û•ÙˆÛ• ØªÛ†ÛŒØª.
+  verification:
+    explanation_html: 'Ø¯Û•ØªÙˆØ§Ù†ÛŒØª <strong> Ø®Û†Øª Ø¨Ø³Û•Ù„Ù…ÛŽÙ†ÛŒØª ÙˆÛ•Ú© Ø®Ø§ÙˆÛ•Ù†ÛŒ Ù„ÛŒÙ†Ú©Û•Ú©Ø§Ù† Ù„Û• Ù…ÛŽØªØ§Ø¯Ø§ØªØ§ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„Û•Ú©Û•Øª</strong>. Ø¨Û† Ø¦Û•Ù…Û•ØŒ Ù…Ø§ÚµÙ¾Û•Ú•Û• Ù„ÛŒÙ†Ú©Ú©Ø±Ø§ÙˆÛ•Ú©Û• Ù¾ÛŽÙˆÛŒØ³ØªÛ• Ù„ÛŒÙ†Ú©ÛŽÚ©ÛŒ ØªÛŽØ¯Ø§ Ø¨ÛŽØª Ø¨Û† Ù¾Ø±Û†ÙØ§ÛŒÙ„ÛŒ Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†Û•Ú©Û•Øª. Ø¨Û•Ø³ØªÛ•Ø±ÛŒ <strong> Ø¯Û•Ø¨ÛŽØª </strong> Ù‡Û•Ø¨ÛŽØª <code>="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}
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 5a4542ea8c380e0e200cedcdc5c429fb2d9c3dae..0e4bb65bc803dd3e5e62ca4457d56e978b6772d0 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -776,21 +776,14 @@ lt:
     default: Mastodon (Tamsus)
     mastodon-light: Mastodon (Å viesus)
   two_factor_authentication:
-    code_hint: Ä®veskite autentikacijos aplikacijos sugeneruotÄ… kodÄ… kad galÄ—tumete tÄ™sti
-    description_html: Jeigu Ä¯jungiate <strong>dviejÅ³ veiksniÅ³ autentikacijÄ…</strong>, prisijungiant jums reikÄ—s turÄ—ti su savimi savo telefonÄ…, kuris jums generuos prisijungimo Å¾etonus.
     disable: IÅ¡jungti
-    enable: Ä®jungti
     enabled: DviejÅ³ veiksniÅ³ autentikacija Ä¯jungta
     enabled_success: DviejÅ³ veiksniÅ³ autentikacija sÄ—kmingai Ä¯jungta
     generate_recovery_codes: Sugeneruoti atkÅ«rimo kodus
-    instructions_html: "<strong>Nuskenuokite Å¡Ä¯ QR kodÄ… Ä¯ Google AutentikatoriÅ³ arba panaÅ¡iÄ… TOTP aplikacijÄ… jÅ«sÅ³ telefone</strong>. Nuo Å¡iol, Å¡i aplikacija jums generuos Å¾etonus, kuriÅ³ reikÄ—s norint prisijungti."
     lost_recovery_codes: AtkÅ«rimo kodai jums leidÅ¾ia atgauti prisijungimÄ… prie JÅ«sÅ³ paskyros, jeigu prarandate telefonÄ…. Jeigu praradote atkÅ«rimo kodus, juos galite sugeneruoti Äia. JÅ«sÅ³ senieji atkÅ«rimo kodai nebeveiks.
-    manual_instructions: 'Jeigu jÅ«s negalite nuskenuoti QR kodo ir turite jÄ¯ Ä¯vesti savarankiÅ¡kai, Å¡tai Äia yra tekstas Å¡iam kodui:'
     recovery_codes: Atsarginio atkÅ«rimo kodai
     recovery_codes_regenerated: AtkÅ«rimo kodai sÄ—kmingai sugeneruoti
     recovery_instructions_html: Jeigu prarandate prieiga prie telefono, jÅ«s galite naudoti atkÅ«rimo kodus esanÄius Å¾emiau, kad atgautumÄ—te priega prie savo paskyros.<strong>Laikykite atkÅ«rimo kodus saugiai</strong> PavyzdÅ¾iui, galite norÄ—ti juos iÅ¡spausdinti, ir laikyti kartu su kitais svarbiais dokumentais.
-    setup: Nustatyti
-    wrong_code: Koda netinkamas! Ar serverio laikas ir prietaiso laikas vienodi?
   user_mailer:
     backup_ready:
       explanation: JÅ«s praÅ¡Ä—te pilnos Mastodon paskyros atsarginÄ—s kopijos. Ji paruoÅ¡ta parsisiuntimui!
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 5c493be56a71b7eae5c7261157db4cee5d4bf5f6..510458c5e12398c44fb2132032c50ac1318dcf03 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -10,11 +10,3 @@ lv:
     '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
-  invites:
-    expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index c2cafa5a708d0d4c267b2a5386456ad1dd6847dd..b538272dee40067bee1eb62431540fb50bb67aeb 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -10,11 +10,3 @@ mk:
     '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
-  invites:
-    expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index f2731cf04befa95cad715218f93ef770ff479350..2f24ee3ececfef28ec54ee8bd6908c153f41af1c 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -1,32 +1,52 @@
 ---
 ml:
   about:
+    about_this: à´•àµà´±à´¿à´šàµà´šàµ
+    api: API
+    apps: à´®àµŠà´¬àµˆàµ½ à´†à´ªàµà´ªàµà´•àµ¾
+    contact: à´¬à´¨àµà´§à´ªàµà´ªàµ†à´Ÿàµà´•
     contact_missing: à´¸à´œàµà´œà´®à´¾à´•àµà´•à´¿à´¯à´¿à´Ÿàµà´Ÿà´¿à´²àµà´²
     contact_unavailable: à´²à´àµà´¯à´®à´²àµà´²
     discover_users: à´‰à´ªà´¯àµ‹à´—àµâ€Œà´¤à´¾à´•àµà´•à´³àµ† à´•à´£àµà´Ÿàµ†à´¤àµà´¤àµà´•
+    get_apps: à´®àµŠà´¬àµˆàµ½ à´†à´ªàµà´ªàµ à´ªà´°àµ€à´•àµà´·à´¿à´•àµà´•àµà´•
     learn_more: à´•àµ‚à´Ÿàµà´¤àµ½ à´ªà´ à´¿à´•àµà´•àµà´•
     privacy_policy: à´¸àµà´µà´•à´¾à´°àµà´¯à´¤à´¾ à´¨à´¯à´‚
     see_whats_happening: à´Žà´¨àµà´¤àµŠà´•àµà´•àµ† à´¸à´‚à´à´µà´¿à´•àµà´•àµà´¨àµà´¨àµ à´Žà´¨àµà´¨àµ à´•à´¾à´£àµà´•
+    source_code: à´¸àµ‡à´¾à´´àµà´¸àµ à´•àµ‡à´¾à´¡àµ
     status_count_before: à´†à´°à´¾àµ½ à´Žà´´àµà´¤à´ªàµà´ªàµ†à´Ÿàµà´Ÿàµ
     tagline: à´¸àµà´¹àµƒà´¤àµà´¤àµà´•àµà´•à´³àµ† à´ªà´¿à´¨àµà´¤àµà´Ÿà´°àµà´•à´¯àµà´‚ à´ªàµà´¤à´¿à´¯à´µà´°àµ† à´•à´£àµà´Ÿàµ†à´¤àµà´¤àµà´•à´¯àµà´‚ à´šàµ†à´¯àµà´¯àµà´•
     terms: à´¸àµ‡à´µà´¨ à´µàµà´¯à´µà´¸àµà´¥à´•àµ¾
     unavailable_content: à´²à´àµà´¯à´®à´²àµà´²à´¾à´¤àµà´¤ à´‰à´³àµà´³à´Ÿà´•àµà´•à´‚
     unavailable_content_description:
+      domain: à´¸àµ†àµ¼à´µàµ¼
       reason: à´•à´¾à´°à´£à´‚
     what_is_mastodon: à´Žà´¨àµà´¤à´¾à´£àµ à´®à´¾à´¸àµà´±àµà´±à´¡àµ‹àµº?
   accounts:
     follow: à´ªà´¿à´¨àµà´¤àµà´Ÿà´°àµà´•
-    following: à´¨à´¿à´™àµà´™àµ¾ à´ªà´¿à´¨àµà´¤àµà´Ÿà´°àµà´¨àµà´¨à´µàµ¼
+    following: à´ªà´¿à´¨àµà´¤àµà´Ÿà´°àµà´¨àµà´¨àµ
     joined: "%{date} àµ½ à´šàµ‡àµ¼à´¨àµà´¨àµ"
     last_active: à´…à´µà´¸à´¾à´¨à´‚ à´¸à´œàµ€à´µà´®à´¾à´¯à´¿à´°àµà´¨àµà´¨à´¤àµ
     link_verified_on: à´¸à´¨àµà´§à´¿à´¯àµà´Ÿàµ† à´‰à´Ÿà´®à´¸àµà´¥à´¾à´µà´¸àµâ€Œà´•à´¾à´¶à´‚ %{date} àµ½ à´ªà´°à´¿à´¶àµ‹à´§à´¿à´•àµà´•à´ªàµà´ªàµ†à´Ÿàµà´Ÿàµ
     media: à´®à´¾à´§àµà´¯à´®à´™àµà´™àµ¾
     moved_html: "%{name}, %{new_profile_link} à´²àµ‡à´•àµà´•àµ à´¨àµ€à´™àµà´™à´¿à´¯à´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨àµ:"
+    network_hidden: à´ˆ à´µà´¿à´µà´°à´‚ à´²à´àµà´¯à´®à´²àµà´²
+    nothing_here: à´‡à´µà´¿à´Ÿàµ† à´’à´¨àµà´¨àµà´®à´¿à´²àµà´²!
+    posts_tab_heading: à´Ÿàµ‚à´Ÿàµà´Ÿàµà´•àµ¾
+    posts_with_replies: à´Ÿàµ‚à´Ÿàµà´Ÿàµà´•à´³àµà´‚ à´®à´±àµà´ªà´Ÿà´¿à´•à´³àµà´‚
+    roles:
+      admin: à´…à´¡àµâ€Œà´®à´¿à´¨àµâ€
+      bot: à´¬àµ‹à´Ÿàµà´Ÿàµ
+      group: à´—àµà´°àµ‚à´ªàµà´ªàµ
+    unavailable: à´ªàµà´°àµŠà´«àµˆàµ½ à´²à´àµà´¯à´®à´²àµà´²
   admin:
     account_moderation_notes:
       delete: à´®à´¾à´¯àµà´•àµà´•àµà´•
     accounts:
+      add_email_domain_block: à´‡-à´®àµ†à´¯à´¿àµ½ à´¡àµŠà´®àµ†à´¯àµàµ» à´¤à´Ÿà´¯àµà´•
       approve: à´…à´‚à´—àµ€à´•à´°à´¿à´•àµà´•àµà´•
+      approve_all: à´Žà´²àµà´²à´¾à´‚ à´…à´‚à´—àµ€à´•à´°à´¿à´•àµà´•àµà´•
+      are_you_sure: à´¨à´¿à´™àµà´™àµ¾à´•àµà´•àµ à´‰à´±à´ªàµà´ªà´¾à´£àµ‹?
+      avatar: à´…à´µà´¤à´¾àµ¼
       by_domain: à´®àµ‡à´–à´²
       change_email:
         changed_msg: à´…à´‚à´—à´¤àµà´¤à´¿à´¨àµà´±àµ† à´‡à´²à´•àµà´Ÿàµà´°àµ‹à´£à´¿à´•àµ à´•à´¤àµà´¤à´¿à´¨àµà´±àµ† à´®àµ‡àµ½à´µà´¿à´²à´¾à´¸à´‚ à´µà´¿à´œà´¯à´•à´°à´®à´¾à´¯à´¿ à´®à´¾à´±àµà´±à´¿à´¯à´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨àµ!
@@ -37,6 +57,8 @@ ml:
         title: "%{username} à´¨àµà´±àµ† à´‡à´²à´•àµà´Ÿàµà´°àµ‹à´£à´¿à´•àµ à´•à´¤àµà´¤àµ à´®àµ‡àµ½à´µà´¿à´²à´¾à´¸à´‚ à´®à´¾à´±àµà´±àµà´•"
       confirm: à´¨à´¿à´œà´ªàµà´ªàµ†à´Ÿàµà´¤àµà´¤àµà´•
       confirmed: à´¨à´¿à´œà´ªàµà´ªàµ†à´Ÿàµà´¤àµà´¤à´¿
+      confirming: à´¸àµà´¥à´¿à´°àµ€à´•à´°à´¿à´•àµà´•àµà´¨àµà´¨àµ
+      delete: à´¡à´¾à´±àµà´± à´‡à´²àµà´²à´¾à´¤à´¾à´•àµà´•àµà´•
       deleted: à´®à´¾à´¯à´¿à´šàµà´šàµ
       demote: à´¤à´°à´‚ à´¤à´¾à´´àµà´¤àµà´¤àµà´•
       disable: à´ªàµà´°à´µà´°àµâ€à´¤àµà´¤à´¨ à´°à´¹à´¿à´¤à´®à´¾à´•àµà´•àµà´•
@@ -44,6 +66,56 @@ ml:
       disabled: à´ªàµà´°à´µàµ¼à´¤àµà´¤à´¨ à´°à´¹à´¿à´¤à´®à´¾à´•àµà´•à´ªàµà´ªàµ†à´Ÿàµà´Ÿà´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨àµ
       display_name: à´•à´¾à´£à´ªàµà´ªàµ†à´Ÿàµà´¨àµà´¨ à´¨à´¾à´®à´‚
       domain: à´®àµ‡à´–à´²
+      edit: à´¤à´¿à´°àµà´¤àµà´¤àµà´•
+      email: à´‡à´®àµ†à´¯à´¿àµ½
+      header: à´¤à´²à´•àµà´•àµ†à´Ÿàµà´Ÿàµ
+      location:
+        all: à´Žà´²àµà´²à´¾à´‚
+      moderation:
+        active: à´¸à´œàµ€à´µà´®à´¾à´£àµ
+        all: à´Žà´²àµà´²à´¾à´‚
+      resend_confirmation:
+        send: à´¸àµà´¥à´¿à´°àµ€à´•à´°à´£ à´‡à´®àµ†à´¯à´¿àµ½ à´µàµ€à´£àµà´Ÿàµà´‚ à´…à´¯à´¯àµà´•àµà´•àµà´•
+        success: à´¸àµà´¥à´¿à´°àµ€à´•à´°à´£ à´‡à´®àµ†à´¯à´¿àµ½ à´µà´¿à´œà´¯à´•à´°à´®à´¾à´¯à´¿ à´…à´¯à´šàµà´šàµ!
+      reset: à´ªàµà´¨à´ƒà´•àµà´°à´®àµ€à´•à´°à´¿à´•àµà´•àµà´•
+      reset_password: à´ªà´¾à´¸àµâ€Œà´µàµ‡à´¡àµ à´ªàµà´¨à´ƒà´•àµà´°à´®àµ€à´•à´°à´¿à´•àµà´•àµà´•
+      role: à´…à´¨àµà´®à´¤à´¿à´•àµ¾
+      roles:
+        user: à´‰à´ªà´¯àµ‹à´•àµà´¤à´¾à´µàµ
+      search: à´¤à´¿à´°à´¯àµà´•
+      title: à´…à´•àµà´•àµ—à´£àµà´Ÿàµà´•àµ¾
+      unconfirmed_email: à´¸àµà´¥à´¿à´°àµ€à´•à´°à´¿à´•àµà´•à´¾à´¤àµà´¤ à´‡à´®àµ†à´¯à´¿àµ½
+      username: à´‰à´ªà´¯àµ‹à´•àµà´¤àµƒà´¨à´¾à´®à´‚
+      web: à´µàµ†à´¬àµ
+    action_logs:
+      action_types:
+        confirm_user: à´‰à´ªà´¯àµ‹à´•àµà´¤à´¾à´µà´¿à´¨àµ† à´¸àµà´¥à´¿à´°àµ€à´•à´°à´¿à´•àµà´•àµà´•
+        remove_avatar_user: à´…à´µà´¤à´¾àµ¼ à´¨àµ€à´•àµà´•à´‚à´šàµ†à´¯àµà´¯àµà´•
+        reset_password_user: à´ªà´¾à´¸àµâ€Œà´µàµ‡à´¡àµ à´ªàµà´¨à´ƒà´•àµà´°à´®àµ€à´•à´°à´¿à´•àµà´•àµà´•
+    custom_emojis:
+      copy: à´ªà´•à´°àµâ€à´¤àµà´¤àµà´•
+      create_new_category: à´ªàµà´¤à´¿à´¯ à´µà´¿à´à´¾à´—à´‚ à´¸àµƒà´·àµà´Ÿà´¿à´•àµà´•àµà´•
+      delete: à´‡à´²àµà´²à´¾à´¤à´¾à´•àµà´•àµà´•
+      emoji: à´‡à´®àµ‹à´œà´¿
+    dashboard:
+      feature_profile_directory: à´ªàµà´°àµŠà´«àµˆàµ½ à´¡à´¯à´±à´•àµà´Ÿà´±à´¿
+      features: à´¸à´µà´¿à´¶àµ‡à´·à´¤à´•àµ¾
+      title: à´¡à´¾à´·àµà´¬àµ‡à´¾àµ¼à´¡àµ
+      total_users: à´®àµŠà´¤àµà´¤à´‚ à´‰à´ªà´¯àµ‹à´•àµà´¤à´¾à´•àµà´•àµ¾
+      trends: à´Ÿàµà´°àµ†àµ»à´¡àµà´•àµ¾
+    email_domain_blocks:
+      add_new: à´ªàµà´¤à´¿à´¯à´¤àµ à´šàµ‡à´°àµâ€à´•àµà´•àµà´•
+      delete: à´‡à´²àµà´²à´¾à´¤à´¾à´•àµà´•àµà´•
+      domain: à´¡àµŠà´®àµˆà´¨àµâ€
+      new:
+        create: à´¡àµŠà´®àµˆàµ» à´šàµ‡à´°àµâ€à´•àµà´•àµà´•
+    invites:
+      filter:
+        all: à´Žà´²àµà´²à´¾à´‚
+  authorize_follow:
+    following: 'à´µà´¿à´œà´¯à´•à´°à´‚! à´¨à´¿à´™àµà´™àµ¾ à´‡à´ªàµà´ªàµ‹àµ¾ à´ªà´¿à´¨àµà´¤àµà´Ÿà´°àµà´¨àµà´¨àµ:'
+  directories:
+    directory: à´ªàµà´°àµŠà´«àµˆàµ½ à´¡à´¯à´±à´•àµà´Ÿà´±à´¿
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': You don't have permission to view this page.
@@ -54,11 +126,18 @@ ml:
     '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
-  invites:
-    expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
+  filters:
+    contexts:
+      notifications: à´…à´±à´¿à´¯à´¿à´ªàµà´ªàµà´•àµ¾
+  generic:
+    all: à´Žà´²àµà´²à´¾à´‚
+  notification_mailer:
+    digest:
+      action: à´Žà´²àµà´²à´¾ à´…à´±à´¿à´¯à´¿à´ªàµà´ªàµà´•à´³àµà´‚ à´•à´¾à´£à´¿à´•àµà´•àµà´•
+    follow:
+      body: "%{name} à´‡à´ªàµà´ªàµ‹àµ¾ à´¨à´¿à´™àµà´™à´³àµ† à´ªà´¿à´¨àµà´¤àµà´Ÿà´°àµà´¨àµà´¨àµ!"
+      subject: "%{name} à´‡à´ªàµà´ªàµ‹àµ¾ à´¨à´¿à´™àµà´™à´³àµ† à´ªà´¿à´¨àµà´¤àµà´Ÿà´°àµà´¨àµà´¨àµ"
+  relationships:
+    following: à´ªà´¿à´¨àµà´¤àµà´Ÿà´°àµà´¨àµà´¨àµ
+  settings:
+    notifications: à´…à´±à´¿à´¯à´¿à´ªàµà´ªàµà´•àµ¾
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 72228df520f88b3667e7703b3943542255f90e0f..9d7609ea4ba181791d2d737b845568c841e1a3c5 100644
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -10,11 +10,3 @@ mr:
     '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
-  invites:
-    expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 3ab48184655f02629445cd8a91bad7fc7513ed5b..089707d03b35435ad45710d5ca00447692a775f3 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -297,14 +297,6 @@ ms:
   exports:
     archive_takeout:
       in_progress: Mengkompil arkib anda...
-  invites:
-    expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
   notification_mailer:
     digest:
       title: Ketika anda tiada di sini...
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index c92b6c1db527ebb674375dc21381beee9bf7af2a..a419e0b47d12ec48402613272bbb12a6b64c6b7b 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -21,7 +21,9 @@ nl:
     federation_hint_html: Met een account op %{instance} ben je in staat om mensen die zich op andere Mastodonservers (en op andere plekken) bevinden te volgen.
     get_apps: Mobiele apps
     hosted_on: Mastodon op %{domain}
-    instance_actor_flash: Dit account is een virtuel actor dat wordt gebruikt om de server zelf te vertegenwoordigen en is geen individuele gebruiker. Het wordt voor federatiedoeleinden gebruikt en moet niet worden geblokkeerd, tenzij je de hele server wilt blokkeren. In zo'n geval dien je echter een domeinblokkade te gebruiken.
+    instance_actor_flash: 'Dit account is een virtuel actor dat wordt gebruikt om de server zelf te vertegenwoordigen en is geen individuele gebruiker. Het wordt voor federatiedoeleinden gebruikt en moet niet worden geblokkeerd, tenzij je de hele server wilt blokkeren. In zo''n geval dien je echter een domeinblokkade te gebruiken.
+
+'
     learn_more: Meer leren
     privacy_policy: Privacybeleid
     see_whats_happening: Kijk wat er aan de hand is
@@ -58,6 +60,7 @@ nl:
       one: Volger
       other: Volgers
     following: Volgend
+    instance_actor_flash: Dit account is een 'virtual actor' waarmee de server zichzelf vertegenwoordigd en is dus geen individuele gebruiker. Het wordt voor federatiedoeleinden gebruikt en moet niet worden opgeschort.
     joined: Geregistreerd in %{date}
     last_active: laatst actief
     link_verified_on: Eigendom van deze link is gecontroleerd op %{date}
@@ -96,6 +99,7 @@ nl:
       add_email_domain_block: E-maildomein blokkeren
       approve: Goedkeuren
       approve_all: Alles goedkeuren
+      approved_msg: Het goedkeuren van het registratieverzoek van %{username} is geslaagd
       are_you_sure: Weet je het zeker?
       avatar: Avatar
       by_domain: Domein
@@ -109,22 +113,26 @@ nl:
       confirm: Bevestigen
       confirmed: Bevestigd
       confirming: Bevestiging
+      delete: Gegevens verwijderen
       deleted: Verwijderd
       demote: Degraderen
-      disable: Uitschakelen
+      destroyed_msg: De verwijdering van de gegevens van %{username} staat nu in de wachtrij
+      disable: Bevriezen
       disable_two_factor_authentication: 2FA uitschakelen
-      disabled: Uitgeschakeld
+      disabled: Bevroren
       display_name: Weergavenaam
       domain: Domein
       edit: Bewerken
       email: E-mail
       email_status: E-mailstatus
-      enable: Inschakelen
+      enable: Ontdooien
       enabled: Ingeschakeld
+      enabled_msg: Het ontdooien van het account van %{username} is geslaagd
       followers: Volgers
       follows: Volgt
       header: Omslagfoto
       inbox_url: Inbox-URL
+      invite_request_text: Redenen om te registreren
       invited_by: Uitgenodigd door
       ip: IP
       joined: Geregistreerd in
@@ -135,7 +143,9 @@ nl:
         title: Locatie
       login_status: Loginstatus
       media_attachments: Mediabijlagen
-      memorialize: In gedenkpagina veranderen
+      memorialize: Naar een In memoriam veranderen
+      memorialized: In memoriam
+      memorialized_msg: Het naar een In memoriam veranderen van het account van %{username} is geslaagd
       moderation:
         active: Actief
         all: Alles
@@ -156,10 +166,14 @@ nl:
       public: Openbaar
       push_subscription_expires: PuSH-abonnement verloopt op
       redownload: Profiel vernieuwen
+      redownloaded_msg: Het herstellen van het oorspronkelijke profiel van %{username} is geslaagd
       reject: Afkeuren
       reject_all: Alles afkeuren
+      rejected_msg: Het afwijzen van het registratieverzoek van %{username} is geslaagd
       remove_avatar: Avatar verwijderen
       remove_header: Omslagfoto verwijderen
+      removed_avatar_msg: Het verwijderen van de avatar van %{username} is geslaagd
+      removed_header_msg: Het verwijderen van de omslagfoto van %{username} is geslaagd
       resend_confirmation:
         already_confirmed: Deze gebruiker is al bevestigd
         send: Verzend bevestigingsmail opnieuw
@@ -176,22 +190,30 @@ nl:
       search: Zoeken
       search_same_email_domain: Andere gebruikers met hetzelfde e-maildomein
       search_same_ip: Andere gebruikers met hetzelfde IP-adres
+      sensitive: Gevoelig
+      sensitized: als gevoelig gemarkeerd
       shared_inbox_url: Gedeelde inbox-URL
       show:
         created_reports: Aangemaakte rapportages
         targeted_reports: Door anderen gerapporteerd
-      silence: Negeren
-      silenced: Genegeerd
+      silence: Beperken
+      silenced: Beperkt
       statuses: Toots
       subscribe: Abonneren
       suspended: Opgeschort
+      suspension_irreversible: De gegevens van dit account zijn onomkeerbaar verwijderd. Je kunt het opschorten van dit account ongedaan maken zodat het weer valt te gebruiken, maar de verwijderde gegevens worden hiermee niet hersteld.
+      suspension_reversible_hint_html: Dit account is opgeschort en de gegevens worden volledig verwijderd op %{date}. Tot die tijd kan dit account worden hersteld zonder nadelige gevolgen. Wanneer je alle gegevens van dit account onmiddellijk wilt verwijderen, kun je dit hieronder doen.
       time_in_queue: "%{time} in de wachtrij"
       title: Accounts
       unconfirmed_email: Onbevestigd e-mailadres
+      undo_sensitized: Niet meer als gevoelig markeren
       undo_silenced: Niet langer negeren
       undo_suspension: Niet langer opschorten
+      unsilenced_msg: Het opheffen van de beperkingen van %{username} zijn geslaagd
       unsubscribe: Opzeggen
+      unsuspended_msg: Het niet langer opschorten van %{username} is geslaagd
       username: Gebruikersnaam
+      view_domain: Samenvatting voor domein bekijken
       warn: Waarschuwen
       web: Webapp
       whitelisted: Goedgekeurd voor federatie
@@ -206,31 +228,36 @@ nl:
         create_domain_allow: Domeingoedkeuring aanmaken
         create_domain_block: Domeinblokkade aanmaken
         create_email_domain_block: E-maildomeinblokkade aanmaken
+        create_ip_block: IP-regel aanmaken
         demote_user: Gebruiker degraderen
         destroy_announcement: Mededeling verwijderen
         destroy_custom_emoji: Lokale emoji verwijderen
         destroy_domain_allow: Domeingoedkeuring verwijderen
         destroy_domain_block: Domeinblokkade verwijderen
         destroy_email_domain_block: E-maildomeinblokkade verwijderen
+        destroy_ip_block: IP-regel verwijderen
         destroy_status: Toot verwijderen
         disable_2fa_user: Tweestapsverificatie uitschakelen
         disable_custom_emoji: Lokale emojij uitschakelen
         disable_user: Gebruiker uitschakelen
         enable_custom_emoji: Lokale emoji inschakelen
         enable_user: Gebruiker inschakelen
-        memorialize_account: Account in gedenkpagina veranderen
+        memorialize_account: Het account in een In memoriam veranderen
         promote_user: Gebruiker promoveren
         remove_avatar_user: Avatar verwijderen
         reopen_report: Rapportage heropenen
         reset_password_user: Wachtwoord opnieuw instellen
         resolve_report: Rapportage oplossen
+        sensitive_account: De media in jouw account als gevoelig markeren
         silence_account: Account negeren
         suspend_account: Account opschorten
         unassigned_report: Rapportage niet langer toewijzen
+        unsensitive_account: De media in jouw account niet langer als gevoelig markeren
         unsilence_account: Account niet langer negeren
         unsuspend_account: Account niet langer opschorten
         update_announcement: Mededeling bijwerken
         update_custom_emoji: Lokale emoji bijwerken
+        update_domain_block: Domeinblokkade bijwerken
         update_status: Toot bijwerken
       actions:
         assigned_to_self_report: "%{name} heeft rapportage %{target} aan zichzelf toegewezen"
@@ -254,7 +281,7 @@ nl:
         disable_user: Inloggen voor %{target} is door %{name} uitgeschakeld
         enable_custom_emoji: Emoji %{target} is door %{name} ingeschakeld
         enable_user: Inloggen voor %{target} is door %{name} ingeschakeld
-        memorialize_account: Account %{target} is door %{name} in een gedenkpagina veranderd
+        memorialize_account: Het account %{target} is door %{name} in een In memoriam veranderd
         promote_user: Gebruiker %{target} is door %{name} gepromoveerd
         remove_avatar_user: "%{name} verwijderde de avatar van %{target}"
         reopen_report: "%{name} heeft rapportage %{target} heropend"
@@ -409,6 +436,7 @@ nl:
     instances:
       by_domain: Domein
       delivery_available: Bezorging is mogelijk
+      empty: Geen domeinen gevonden.
       known_accounts:
         one: "%{count} bekend account"
         other: "%{count} bekende accounts"
@@ -432,6 +460,21 @@ nl:
         expired: Verlopen
         title: Filter
       title: Uitnodigingen
+    ip_blocks:
+      add_new: Regel aanmaken
+      created_msg: Het toevoegen van een nieuwe IP-regel is geslaagd
+      delete: Verwijderen
+      expires_in:
+        '1209600': 2 weken
+        '15778476': 6 maanden
+        '2629746': 1 maand
+        '31556952': 1 jaar
+        '86400': 1 dag
+        '94670856': 3 jaar
+      new:
+        title: Nieuwe IP-regel aanmaken
+      no_ip_block_selected: Er zijn geen IP-regels veranderd, omdat er geen een was geselecteerd
+      title: IP-regels
     pending_accounts:
       title: Accounts in afwachting (%{count})
     relationships:
@@ -471,6 +514,8 @@ nl:
       comment:
         none: Geen
       created_at: Gerapporteerd op
+      forwarded: Doorgestuurd
+      forwarded_to: Doorgestuurd naar %{domain}
       mark_as_resolved: Markeer als opgelost
       mark_as_unresolved: Markeer als onopgelost
       notes:
@@ -679,8 +724,11 @@ nl:
       prefix_sign_up: Registreer je vandaag nog op Mastodon!
       suffix: Met een account ben je in staat om mensen te volgen, berichten te plaatsen en uit te wisselen met mensen die zich op andere Mastodonservers bevinden en meer!
     didnt_get_confirmation: Geen bevestigingsinstructies ontvangen?
+    dont_have_your_security_key: Heb je jouw beveiligingssleutel niet bij de hand?
     forgot_password: Wachtwoord vergeten?
     invalid_reset_password_token: De code om jouw wachtwoord opnieuw in te stellen is verlopen. Vraag een nieuwe aan.
+    link_to_otp: Voer een tweestapsverificatiecode van je telefoon of een herstelcode in
+    link_to_webauth: Jouw apparaat met de authenticatie-app gebruiken
     login: Inloggen
     logout: Uitloggen
     migrate_account: Naar een ander account verhuizen
@@ -705,7 +753,9 @@ nl:
       functional: Jouw account is volledig operationeel.
       pending: Jouw aanvraag moet nog worden beoordeeld door een van onze medewerkers. Dit kan misschien eventjes duren. Je ontvangt een e-mail wanneer jouw aanvraag is goedgekeurd.
       redirecting_to: Jouw account is inactief omdat het momenteel wordt doorverwezen naar %{acct}.
+    too_fast: Formulier is te snel ingediend. Probeer het nogmaals.
     trouble_logging_in: Problemen met inloggen?
+    use_security_key: Beveiligingssleutel gebruiken
   authorize_follow:
     already_following: Je volgt dit account al
     already_requested: Je hebt al een volgverzoek naar dat account verstuurd
@@ -730,6 +780,7 @@ nl:
   date:
     formats:
       default: "%d %b %Y"
+      with_month_name: "%d %B %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}u"
@@ -794,6 +845,7 @@ nl:
       request: Jouw archief opvragen
       size: Omvang
     blocks: Jij blokkeert
+    bookmarks: Bladwijzers
     csv: CSV
     domain_blocks: Domeinblokkades
     lists: Lijsten
@@ -807,7 +859,7 @@ nl:
   filters:
     contexts:
       account: Profielen
-      home: Starttijdlijn
+      home: Starttijdlijn en lijsten
       notifications: Meldingen
       public: Openbare tijdlijnen
       thread: Gesprekken
@@ -861,6 +913,8 @@ nl:
     status: Verificatiestatus
     view_proof: Bekijk bewijs
   imports:
+    errors:
+      over_rows_processing_limit: bevat meer dan %{count} rijen
     modes:
       merge: Samenvoegen
       merge_long: Bestaande gegevens behouden en nieuwe toevoegen
@@ -870,6 +924,7 @@ nl:
     success: Jouw gegevens zijn succesvol geÃ¼pload en worden binnenkort verwerkt
     types:
       blocking: Blokkeerlijst
+      bookmarks: Bladwijzers
       domain_blocking: Lijst met genegeerde servers
       following: Volglijst
       muting: Negeerlijst
@@ -990,6 +1045,14 @@ nl:
           quadrillion: qdn.
           thousand: K
           trillion: bln.
+  otp_authentication:
+    code_hint: Voer de code in die door de authenticatie-app werd gegenereerd
+    description_html: Na het instellen van <strong>tweestapsverificatie</strong> met een authenticatie-app, kun je alleen inloggen als je jouw mobiele telefoon bij je hebt. Hiermee genereer je namelijk de in te voeren aanmeldcode.
+    enable: Inschakelen
+    instructions_html: "<strong>Scan deze QR-code in Google Authenticator of een soortgelijke app op jouw mobiele telefoon</strong>. Van nu af aan genereert deze app aanmeldcodes die je bij het inloggen moet invoeren."
+    manual_instructions: 'Voor het geval je de QR-code niet kunt scannen en het handmatig moet invoeren, vind je hieronder de geheime code in platte tekst:'
+    setup: Instellen
+    wrong_code: De ingevoerde code is ongeldig! Klopt de systeemtijd van de server en die van jouw apparaat?
   pagination:
     newer: Nieuwer
     next: Volgende
@@ -1018,6 +1081,7 @@ nl:
   relationships:
     activity: Accountactiviteit
     dormant: Sluimerend
+    follow_selected_followers: Geselecteerde volgers volgen
     followers: Volgers
     following: Volgend
     invited: Uitgenodigd
@@ -1114,6 +1178,7 @@ nl:
     profile: Profiel
     relationships: Volgers en gevolgden
     two_factor_authentication: Tweestapsverificatie
+    webauthn_authentication: Beveiligingssleutels
   spam_check:
     spam_detected: Dit is een automatisch gegenereerde rapportage. Er is spam gedetecteerd.
   statuses:
@@ -1152,6 +1217,8 @@ nl:
         other: "%{count} stemmen"
       vote: Stemmen
     show_more: Meer tonen
+    show_newer: Nieuwere tonen
+    show_older: Oudere tonen
     show_thread: Gesprek tonen
     sign_in_to_participate: Meld je aan om aan dit gesprek mee te doen
     title: '%{name}: "%{quote}"'
@@ -1260,21 +1327,20 @@ nl:
       default: "%d %B %Y om %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Voer de code in die door de authenticatie-app gegenereerd is
-    description_html: Na het instellen van <strong>tweestapsverificatie</strong>, kun je alleen inloggen als je jouw mobiele telefoon bij je hebt. Hiermee genereer je namelijk de in te voeren aanmeldcode.
-    disable: Uitschakelen
-    enable: Inschakelen
+    add: Toevoegen
+    disable: Tweestapsverificatie uitschakelen
+    disabled_success: Uitschakelen tweestapsverificatie is geslaagd
+    edit: Bewerken
     enabled: Tweestapsverificatie is ingeschakeld
     enabled_success: Inschakelen tweestapsverificatie geslaagd
     generate_recovery_codes: Herstelcodes genereren
-    instructions_html: "<strong>Scan deze QR-code in Google Authenticator of een soortgelijke app op jouw mobiele telefoon</strong>. Van nu af aan genereert deze app aanmeldcodes die je bij het inloggen moet invoeren."
     lost_recovery_codes: Met herstelcodes kun je toegang tot jouw account krijgen wanneer je jouw telefoon bent kwijtgeraakt. Wanneer je jouw herstelcodes bent kwijtgeraakt, kan je ze hier opnieuw genereren. Jouw oude herstelcodes zijn daarna ongeldig.
-    manual_instructions: Voor het geval je de QR-code niet kunt scannen en het handmatig moet invoeren, vind je hieronder de geheime code in platte tekst.
+    methods: Methoden voor tweestapsverificatie
+    otp: Authenticatie-app
     recovery_codes: Herstelcodes back-uppen
     recovery_codes_regenerated: Opnieuw genereren herstelcodes geslaagd
     recovery_instructions_html: Wanneer je ooit de toegang verliest tot jouw telefoon, kan je met behulp van een van de herstelcodes hieronder opnieuw toegang krijgen tot jouw account. <strong>Zorg ervoor dat je de herstelcodes op een veilige plek bewaard</strong>. Je kunt ze bijvoorbeeld printen en ze samen met andere belangrijke documenten bewaren.
-    setup: Instellen
-    wrong_code: De ingevoerde code is ongeldig! Klopt de systeemtijd van de server en die van jouw apparaat?
+    webauthn: Beveiligingssleutels
   user_mailer:
     backup_ready:
       explanation: Je hebt een volledige back-up van jouw Mastodon-account opgevraagd. Het staat nu klaar om te worden gedownload!
@@ -1282,9 +1348,14 @@ nl:
       title: Archief ophalen
     sign_in_token:
       details: 'Hier zijn details van de poging:'
+      explanation: 'We hebben een inlogpoging op je account ontdekt vanaf een onbekend IP-adres. Als jij dit bent, vul dan de beveiligingscode hieronder in op de inlog-uitdagingspagina:'
+      further_actions: 'Als jij dit niet was, verander dan je wachtwoord en schakel tweestapsverificatie voor je account in. Dat kun je hier doen:'
+      subject: Bevestig de inlogpoging
+      title: Inlogpoging
     warning:
       explanation:
         disable: Zolang jouw account is bevroren blijven jouw accountgegevens intact, maar kun je geen handelingen uitvoeren totdat het account is vrijgegeven.
+        sensitive: De mediabestanden die je upload en gekoppelde media worden als gevoelig behandeld.
         silence: Zolang jouw account wordt beperkt, kunnen alleen mensen die jou al volgen jouw toots op deze server zien. Tevens ben je niet zichtbaar in meldingen, gesprekken en op openbare tijdlijnen. Anderen kunnen je echter wel handmatig volgen.
         suspend: Jouw account is opgeschort. Jouw toots en geÃ¼ploade media zijn onomkeerbaar van deze server verwijderd, en ook o.a. van de servers waar jij volgers had.
       get_in_touch: Je kunt deze e-mail beantwoorden om in contact te komen met de medewerkers van %{instance}.
@@ -1293,11 +1364,13 @@ nl:
       subject:
         disable: Jouw account %{acct} is bevroren
         none: Waarschuwing voor %{acct}
+        sensitive: De door jouw account %{acct} geplaatste media is als gevoelig gemarkeerd
         silence: Jouw account %{acct} is nu beperkt
         suspend: Jouw account %{acct} is opgeschort
       title:
         disable: Account bevroren
         none: Waarschuwing
+        sensitive: Jouw media is als gevoelig gemarkeerd
         silence: Account beperkt
         suspend: Account opgeschort
     welcome:
@@ -1318,12 +1391,34 @@ nl:
       tips: Tips
       title: Welkom aan boord %{name}!
   users:
+    blocked_email_provider: Deze e-mailprovider is niet toegestaan
     follow_limit_reached: Je kunt niet meer dan %{limit} accounts volgen
+    generic_access_help_html: Problemen met toegang tot je account? Neem dan contact op met %{email} voor assistentie
     invalid_email: E-mailadres is ongeldig
+    invalid_email_mx: Het e-mailadres lijkt niet te bestaan
     invalid_otp_token: Ongeldige tweestaps-aanmeldcode
+    invalid_sign_in_token: Ongeldige beveiligingscode
     otp_lost_help_html: Als je toegang tot beiden kwijt bent geraakt, neem dan contact op via %{email}
     seamless_external_login: Je bent ingelogd via een externe dienst, daarom zijn wachtwoorden en e-mailinstellingen niet beschikbaar.
     signed_in_as: 'Ingelogd als:'
+    suspicious_sign_in_confirmation: Het lijkt er op dat je nog niet eerder op dit apparaat bent ingelogd, en je bent een tijdje niet ingelogd, dus sturen we een beveiligingscode naar je e-mailadres om te bevestigen dat jij het bent.
   verification:
     explanation_html: 'Je kunt <strong>jezelf verifiÃ«ren als de eigenaar van de links in de metadata van jouw profiel</strong>. Hiervoor moet op de gelinkte website een link terug naar jouw Mastodonprofiel staan. Deze link <strong>moet</strong> het <code>rel="me"</code>-attribuut bevatten. De omschrijving van de link maakt niet uit. Hier is een voorbeeld:'
     verification: Verificatie
+  webauthn_credentials:
+    add: Nieuwe beveiligingssleutel toevoegen
+    create:
+      error: Er deed zich een probleem voor met het toevoegen van jouw beveiligingssleutel. Probeer het nogmaals.
+      success: Het toevoegen van je beveiligingssleutel is geslaagd.
+    delete: Verwijderen
+    delete_confirmation: Weet je zeker dat je deze beveiligingssleutel wilt verwijderen?
+    description_html: Wanneer je <strong>verificatie met beveiligingssleutels</strong> inschakelt, moet je tijdens het inloggen een van jouw beveiligingssleutels gebruiken.
+    destroy:
+      error: Er deed zich een probleem voor met het verwijderen van jouw beveiligingssleutel. Probeer het nogmaals.
+      success: Het verwijderen van jouw beveiligingssleutel is geslaagd.
+    invalid_credential: Ongeldige beveiligingssleutel
+    nickname_hint: Voer de bijnaam in van jouw nieuwe beveiligingssleutel
+    not_enabled: Je hebt WebAuthn nog niet ingeschakeld
+    not_supported: Deze browser ondersteunt geen beveiligingssleutels
+    otp_required: Om beveiligingssleutels te kunnen gebruiken, moet je eerst tweestapsverificatie inschakelen.
+    registered_on: Geregistreerd op %{date}
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 13a6d1911a5063792ed90174fd7e7286125612da..463364e3d523b170b222ebb1da5f256bd25c27d7 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -38,8 +38,11 @@ nn:
       domain: SÃ¸rvar
       reason: Grunn
       rejecting_media: 'Mediafiler fra disse tjenerne vil ikke bli behandlet eller lagret, og ingen miniatyrbilder vil bli vist, noe som vil kreve manuell klikking for Ã¥ besÃ¸ke den opprinnelige filen:'
+      rejecting_media_title: Filtrert media
       silenced: 'Innlegg frÃ¥ desse tenarane vert gÃ¸ymde frÃ¥ offentlege tidsliner og samtalar, og det kjem ingen varsel frÃ¥ samhandlingane til brukarane deira, med mindre du fylgjer dei:'
+      silenced_title: Stilnede tjenere
       suspended: 'Ingen data frÃ¥ desse tenarane vert handsama, lagra eller sende til andre, som gjer det umogeleg Ã¥ samhandla eller kommunisera med andre brukarar frÃ¥ desse tenarane:'
+      suspended_title: Suspenderte tjenere
     unavailable_content_html: Mastodon gjev deg som regel lov til Ã¥ sjÃ¥ innhald og samhandla med brukarar frÃ¥ alle andre tenarar i fÃ¸diverset. Dette er unnataka som er valde for akkurat denne tenaren.
     user_count_after:
       one: brukar
@@ -90,7 +93,7 @@ nn:
       delete: Slett
       destroyed_msg: Moderatormerknad er utsletta!
     accounts:
-      add_email_domain_block: Svartelist E-postdomenet
+      add_email_domain_block: GÃ¸ym e-postdomene
       approve: Godtak
       approve_all: Godtak alle
       are_you_sure: Er du sikker?
@@ -106,6 +109,7 @@ nn:
       confirm: Stadfest
       confirmed: Stadfesta
       confirming: Stadfestar
+      delete: Slett data
       deleted: Sletta
       demote: Degrader
       disable: SlÃ¥ av
@@ -171,7 +175,7 @@ nn:
         staff: Personell
         user: Brukar
       search: SÃ¸k
-      search_same_email_domain: Andre brukere med samme E-postdomene
+      search_same_email_domain: Andre brukarar med same e-postdomene
       search_same_ip: Andre brukarar med same IP
       shared_inbox_url: Delt Innboks URL
       show:
@@ -187,40 +191,50 @@ nn:
       unconfirmed_email: E-post utan stadfesting
       undo_silenced: Angr mÃ¥lbinding
       undo_suspension: Angr utvising
+      unsilenced_msg: Opphevde vellykket begrensningen av %{username} sin konto
       unsubscribe: Avmeld
+      unsuspended_msg: Opphevde vellykket suspenderingen av %{username} sin konto
       username: Brukarnamn
+      view_domain: Vis sammendrag for domenet
       warn: Ã…tvar
       web: Nett
       whitelisted: Kvitlista
     action_logs:
       action_types:
         assigned_to_self_report: Tilordne rapport
-        change_email_user: Endre brukerens E-postadresse
-        confirm_user: Bekreft brukeren
-        create_account_warning: Opprett en advarsel
-        create_announcement: Opprett en kunngjÃ¸ring
-        create_custom_emoji: Opprett en tilpasset emoji
+        change_email_user: Byt e-post for brukar
+        confirm_user: Stadfest brukar
+        create_account_warning: Opprett Ã¥tvaring
+        create_announcement: Opprett lysing
+        create_custom_emoji: Opprett tilpassa emoji
         create_domain_allow: Opprett domene tillatt
         create_domain_block: Opprett domene-blokk
         create_email_domain_block: Opprett e-post domeneblokk
-        demote_user: Degrader bruker
-        destroy_announcement: Slett kunngjÃ¸ringen
-        destroy_custom_emoji: Slett den tilpassede emojien
-        destroy_status: Slett statusen
-        disable_2fa_user: Skru av 2-trinnsinnlogging
-        disable_user: Deaktiver bruker
-        enable_user: Aktiver bruker
-        promote_user: Promoter bruker
-        remove_avatar_user: Fjern Avatar
-        reopen_report: GjenÃ¥pne rapporten
+        create_ip_block: Opprett IP-regel
+        demote_user: Degrader brukar
+        destroy_announcement: Slett lysinga
+        destroy_custom_emoji: Slett tilpassa emoji
+        destroy_domain_allow: Slett domenegodkjenning
+        destroy_domain_block: Slett domenesperring
+        destroy_email_domain_block: Slett e-postdomenesperring
+        destroy_ip_block: Slett IP-regel
+        destroy_status: Slett status
+        disable_2fa_user: Skruv av 2FA
+        disable_custom_emoji: Skruv av tilpassa emoji
+        disable_user: Skruv av brukar
+        enable_custom_emoji: Skruv pÃ¥ tilpassa emoji
+        enable_user: Skruv pÃ¥ brukar
+        promote_user: Forfrem brukar
+        remove_avatar_user: Fjern avatar
+        reopen_report: Opn rapport opp att
         reset_password_user: Tilbakestill passord
         resolve_report: LÃ¸s rapport
         silence_account: Demp konto
         suspend_account: Suspender kontoen
         unsuspend_account: Opphev suspensjonen av kontoen
         update_announcement: Oppdater kunngjÃ¸ringen
-        update_custom_emoji: Oppdater tilpasset Emoji
-        update_status: Oppdater statusen
+        update_custom_emoji: Oppdater tilpassa emoji
+        update_status: Oppdater tut
       actions:
         assigned_to_self_report: "%{name} tilegnet rapport %{target} til seg selv"
         change_email_user: "%{name} endra e-postadressa til brukaren %{target}"
@@ -231,12 +245,14 @@ nn:
         create_domain_allow: "%{name} kvitlista domenet %{target}"
         create_domain_block: "%{name} blokkerte domenet %{target}"
         create_email_domain_block: "%{name} svartelista e-postdomenet %{target}"
+        create_ip_block: "%{name} opprettet en regel for IP-en %{target}"
         demote_user: "%{name} degraderte brukaren %{target}"
         destroy_announcement: "%{name} slettet kunngjÃ¸ring %{target}"
         destroy_custom_emoji: "%{name} utsletta kjensleteiknet %{target}"
         destroy_domain_allow: "%{name} fjerna domenet %{target} frÃ¥ kvitliste"
         destroy_domain_block: "%{name} slutta Ã¥ blokkera domenet %{target}"
         destroy_email_domain_block: "%{name} kvitlista e-postdomenet %{target}"
+        destroy_ip_block: "%{name} slettet en regel for IP-en %{target}"
         destroy_status: "%{name} sletta status av %{target}"
         disable_2fa_user: "%{name} tok vekk krav om tofaktorautentisering for brukaren %{target}"
         disable_custom_emoji: "%{name} deaktiverte emojien %{target}"
@@ -258,9 +274,9 @@ nn:
         update_custom_emoji: "%{name} oppdaterte kjensleteiknet %{target}"
         update_status: "%{name} oppdaterte status for %{target}"
       deleted_status: "(sletta status)"
-      empty: Ingen loggfÃ¸ringer ble funnet.
+      empty: Ingen loggar funne.
       filter_by_action: Sorter etter handling
-      filter_by_user: Sorter etter bruker
+      filter_by_user: Sorter etter brukar
       title: Revisionslogg
     announcements:
       destroyed_msg: KunngjÃ¸ringen er slettet!
@@ -299,7 +315,7 @@ nn:
       listed: OppfÃ¸rt
       new:
         title: Legg til eige kjensleteikn
-      not_permitted: Du har ikke rettigheter til Ã¥ utfÃ¸re denne handlingen
+      not_permitted: Du har ikkje lÃ¸yve til Ã¥ utfÃ¸ra denne handlinga
       overwrite: Skriv over
       shortcode: Stuttkode
       shortcode_hint: Minst 2 teikn, berre tal, bokstavar og understrek
@@ -390,7 +406,7 @@ nn:
       destroyed_msg: E-postdomenet har blitt fjernet fra blokkeringslisten uten problemer
       domain: Domene
       empty: Ingen e-mail-domener er sortelistet pÃ¥ dette tidspunkt.
-      from_html: fra %{domain}
+      from_html: frÃ¥ %{domain}
       new:
         create: Legg til domene
         title: Ny blokkeringsoppfÃ¸ring av e-postdomene
@@ -421,6 +437,20 @@ nn:
         expired: UtgÃ¥tt
         title: Filter
       title: Innbydingar
+    ip_blocks:
+      add_new: Opprett regel
+      created_msg: La vellykket til en ny IP-regel
+      delete: Slett
+      expires_in:
+        '1209600': 2 uker
+        '15778476': 6 mÃ¥neder
+        '2629746': 1 mÃ¥ned
+        '31556952': 1 Ã¥r
+        '86400': 1 dag
+        '94670856': 3 Ã¥r
+      new:
+        title: Opprett ny IP-regel
+      title: IP-regler
     pending_accounts:
       title: Kontoar som ventar (%{count})
     relationships:
@@ -564,7 +594,8 @@ nn:
       trends:
         title: PopulÃ¦re emneknaggar
     site_uploads:
-      delete: Slett den opplastede filen
+      delete: Slett opplasta fil
+      destroyed_msg: Vellukka sletting av sideopplasting!
     statuses:
       back_to_account: Tilbake til kontosida
       batch:
@@ -618,7 +649,7 @@ nn:
     add_new: Lag psevdonym
     created_msg: Laga eit nytt kallenamn. No kan du setja i gang med flyttinga frÃ¥ den gamle kontoen.
     deleted_msg: Fjerna kallenamnet. No vert det ikkje lenger mogeleg Ã¥ flytta frÃ¥ den andre kontoen til denne.
-    empty: Du har ingen aliaser.
+    empty: Du har inkje alias.
     hint_html: Dersom du vil flytte fra en annen konto til den, kan du lage et alias her, som er pÃ¥krevd fÃ¸r du kan gÃ¥ videre med Ã¥ flytte fÃ¸lgere fra den gamle kontoen til den nye. Handlingen i seg selv er <strong>harmlÃ¸s og reversibel</strong>. <strong>Kontoflyttingen har blitt satt i gang fra den gamle kontoen</strong>.
     remove: Fjern aliaslenking
   appearance:
@@ -660,8 +691,11 @@ nn:
       prefix_sign_up: Meld deg pÃ¥ Mastodon i dag!
       suffix: Med ein konto kan du fylgja folk, skriva innlegg og veksla meldingar med brukarar frÃ¥ kva som helst annan Mastodon-tenar og meir!
     didnt_get_confirmation: Fekk du ikkje stadfestingsinstruksjonar?
+    dont_have_your_security_key: Har du ikke sikkerhetsnÃ¸kkelen din?
     forgot_password: Har du glÃ¸ymt passordet ditt?
     invalid_reset_password_token: Tilgangsnykelen er ugyldig eller utgÃ¥tt. Ver venleg Ã¥ beda om ein ny ein.
+    link_to_otp: Skriv inn en 2-trinnskode fra din 2-trinnspÃ¥loggingsenhet eller en gjenopprettingskode
+    link_to_webauth: Bruk sikkerhetsnÃ¸kkel-enheten din
     login: Innlogging
     logout: Logg ut
     migrate_account: Flytt til ein annan konto
@@ -687,8 +721,10 @@ nn:
       pending: SÃ¸knaden din ventar pÃ¥ gjennomgang frÃ¥ personalet vÃ¥rt. Dette kan taka litt tid. Du fÃ¥r ein e-post om sÃ¸knaden din vert godkjend.
       redirecting_to: Kontoen din er inaktiv fordi den for Ã¸yeblikket omdirigerer til %{acct}.
     trouble_logging_in: FÃ¥r du ikkje logga inn?
+    use_security_key: Bruk sikkerhetsnÃ¸kkel
   authorize_follow:
     already_following: Du fylgjer allereie denne kontoen
+    already_requested: Du har allereie sendt ein fylgjespurnad til den kontoen
     error: Uheldigvis skjedde det en feil da vi prÃ¸vde Ã¥ fÃ¥ tak i en bruker fra en annen instans
     follow: Fylg
     follow_request: 'Du har sendt ein fylgjefÃ¸respurnad til:'
@@ -703,6 +739,10 @@ nn:
     hint_html: "<strong>Tips:</strong> Vi skal ikkje spÃ¸rja deg om passordet ditt igjen i laupet av den neste timen."
     invalid_password: Ugyldig passord
     prompt: Stadfest passord for Ã¥ halda fram
+  crypto:
+    errors:
+      invalid_key: er ikkje ein gild Ed25519 eller Curve25519 nykel
+      invalid_signature: er ikkje ein gild Ed25519-signatur
   date:
     formats:
       default: "%b %d, %Y"
@@ -789,6 +829,8 @@ nn:
       thread: Samtalar
     edit:
       title: Endr filter
+    errors:
+      invalid_context: Ingen eller ugild kontekst gjeve
     index:
       delete: Slett
       empty: Du har ingen filtre.
@@ -805,16 +847,20 @@ nn:
     changes_saved_msg: Alle endringane vart lagra!
     copy: Kopier
     delete: Slett
+    no_batch_actions_available: Ingen batch-handlingar tilgjengelege pÃ¥ denne sida
     order_by: Sorter etter
     save_changes: Lagr endringar
     validation_errors:
       one: Noe er ikke helt riktig ennÃ¥. Vennligst se etter en gang til
       other: Noe er ikke helt riktig ennÃ¥. Det er ennÃ¥ %{count} feil Ã¥ rette pÃ¥
+  html_validator:
+    invalid_markup: 'rommar ugild HTML-kode: %{error}'
   identity_proofs:
     active: Aktiv
     authorize: Ja, stadfest
     authorize_connection_prompt: Vil du autorisere denne kryptografiske forbindelsen?
     errors:
+      failed: Den kryptografiske tilkoplinga gjekk gale. Venlegast prÃ¸v om att frÃ¥ %{provider}.
       keybase:
         verification_failed: Keybase kjenner ikke igjen denne sjetongen som en signatur for Keybase-brukeren %{kb_username}. Vennligst prÃ¸v igjen gjennom Keybase.
       wrong_user: Kan ikke lage et bevis for %{proving} mens du er logget pÃ¥ som %{current}. Logg pÃ¥ som %{proving} og prÃ¸v igjen.
@@ -824,12 +870,14 @@ nn:
     inactive: Uaktiv
     publicize_checkbox: 'Og tut dette:'
     publicize_toot: 'Det er prova! Eg er %{username} pÃ¥ %{service}: %{url}'
-    remove: Fjern bevis fra kontoen
+    remove: Fjern prov frÃ¥ konto
+    removed: Vellukka fjerning av prov frÃ¥ konto
     status: Stadfestingsstatus
     view_proof: SjÃ¥ prov
   imports:
     modes:
       merge: Set saman
+      merge_long: Hald pÃ¥ eksisterande data og legg til nye
       overwrite: Skriv over
     preface: Du kan henta inn data som du har eksportert frÃ¥ ein annan tenar, som t.d. ei liste over folka du fylgjer eller blokkerer.
     success: Dataa dine vart lasta opp og vert no handsama sÃ¥ fort som mogeleg
@@ -873,23 +921,39 @@ nn:
     acct: Flytta til
     cancel: Avbryt omdirigeringen
     cancel_explanation: Ã… avbryte omdirigeringen vil reaktivere din nÃ¥vÃ¦rende konto, men vil ikke bringe tilbake fÃ¸lgere som har blitt flyttet til den kontoen.
+    cancelled_msg: AvbrÃ¸t omdirigeringen med suksess.
     errors:
       already_moved: er den same kontoen som du allereie har flytta til
+      missing_also_known_as: er ikkje eit alias til denne kontoen
       move_to_self: kan ikkje vera denne kontoen
       not_found: fann ikkje
       on_cooldown: Du er i en nedkjÃ¸lingsperiode
     followers_count: Fylgjarar dÃ¥ kontoen vart flytta
     incoming_migrations: Flyttar frÃ¥ ein annan konto
     incoming_migrations_html: For Ã¥ flytta frÃ¥ ein annnan konto til denne mÃ¥ du fyrst <a href="%{path}">laga eit kallenamn til kontoen</a>.
+    moved_msg: Kontoen din omdirigeres nÃ¥ til %{acct}, og fÃ¸lgerne dine blir flyttet over.
+    not_redirecting: Kontoen din omdirigeres ikke til noen andre kontoer for Ã¸yeblikket.
+    on_cooldown: Du har nylig overfÃ¸rt kontoen din. Denne funksjonen blir tilgjengelig igjen om %{count} dager.
     past_migrations: Tidlegare vandringar
     proceed_with_move: Flytt fylgjarar
+    redirected_msg: Kontoen din omdirigerer no til %{acct}.
+    redirecting_to: Kontoen din omdirigerer til %{acct}.
     set_redirect: Bestem omdirigering
     warning:
+      backreference_required: Den nye kontoen mÃ¥ fyrst konfigurerast til Ã¥ visa til denne
       before: 'FÃ¸r du fortsetter, vennligst les disse notisene nÃ¸ye:'
+      cooldown: Etter flytting er det en nedkjÃ¸lingsperiode der du ikke vil kunne flytte igjen
       disabled_account: Din nÃ¥vÃ¦rende konto vil ikke vÃ¦re fullt brukbar etterpÃ¥. Men du vil ha tilgang til dataeksportering sÃ¥vel som reaktivering.
-      other_data: Ingen andre data vil bli flyttet automatisk
+      followers: Denne handlingen vil flytte alle fÃ¸lgere fra den nÃ¥vÃ¦rende kontoen til den nye kontoen
+      only_redirect_html: Alternativt kan du velge Ã¥ <a href="%{path}">bare legge ut en omdirigering pÃ¥ profilen din</a>.
+      other_data: Inkje anna data flyttast av seg sjÃ¸lve
+      redirect: Profilen til din nÃ¥vÃ¦rende konto vil bli oppdatert med en omdirigeringsnotis og bli fjernet fra sÃ¸k
   moderation:
     title: Moderasjon
+  move_handler:
+    carry_blocks_over_text: Denne brukaren flytta frÃ¥ %{acct}, som du gÃ¸ymde.
+    carry_mutes_over_text: Denne brukeren flyttet fra %{acct}, som du hadde dempet.
+    copy_account_note_text: 'Denne brukeren flyttet fra %{acct}, her var dine tidligere notater om dem:'
   notification_mailer:
     digest:
       action: SjÃ¥ alle varsel
@@ -938,6 +1002,14 @@ nn:
           quadrillion: Bil
           thousand: K
           trillion: Bil
+  otp_authentication:
+    code_hint: Skriv inn koden generert av autentiseringsappen din for Ã¥ bekrefte
+    description_html: Hvis du skrur pÃ¥ <strong>2-trinnsautentisering</strong> ved hjelp av en autentiseringsapp, vil pÃ¥logging kreve at du er i besittelse av autentiseringsenheten din, som genererer sjetonger som du skal skrive inn.
+    enable: Aktiver
+    instructions_html: "<strong>Skann denne QR-koden i Authy, Google Autentisering, eller en lignende TOTP-app pÃ¥ en av dine enheter</strong>. Fra nÃ¥ av, vil den appen generere sjetonger som du vil mÃ¥tte skrive inn nÃ¥r du logger pÃ¥."
+    manual_instructions: 'Hvis du ikke kan skanne QR-koden og mÃ¥ skrive den inn manuelt, her er tekstkoden i ren tekst:'
+    setup: Sett opp
+    wrong_code: Den innskrevne koden var ugyldig! Er tjenertiden og enhetstiden riktige?
   pagination:
     newer: Nyare
     next: Neste
@@ -996,6 +1068,10 @@ nn:
     reply:
       proceed: Svar
       prompt: 'Du vil svara pÃ¥ dette tutet:'
+  scheduled_statuses:
+    over_daily_limit: Du har overskredet grensen pÃ¥ %{limit} planlagte tuter for den dagen
+    over_total_limit: Du har overskredet grensen pÃ¥ %{limit} planlagte tuter
+    too_soon: Den planlagte datoen mÃ¥ vÃ¦re i fremtiden
   sessions:
     activity: Siste aktivitet
     browser: Nettlesar
@@ -1058,10 +1134,14 @@ nn:
     profile: Profil
     relationships: Fylgjar og fylgjarar
     two_factor_authentication: Tostegsautorisering
+    webauthn_authentication: SikkerhetsnÃ¸kler
   spam_check:
     spam_detected: Dette er en automatisert rapport. Spam har blitt oppdaget.
   statuses:
     attached:
+      audio:
+        one: "%{count} ljod"
+        other: "%{count} ljodar"
       description: 'Vedlagt: %{attached}'
       image:
         one: "%{count} bilete"
@@ -1074,6 +1154,8 @@ nn:
     disallowed_hashtags:
       one: 'inneheldt ein emneknagg som ikkje var tillaten: %{tags}'
       other: 'inneheldt emneknaggen som ikkje var tillaten: %{tags}'
+    errors:
+      in_reply_not_found: Det ser ut til at tutet du freistar Ã¥ svara ikkje finst.
     language_detection: Kjenn att sprÃ¥k automatisk
     open_in_web: Opn pÃ¥ nett
     over_character_limit: Ã¸vregrensa for teikn, %{max}, er nÃ¥dd
@@ -1199,25 +1281,29 @@ nn:
       default: "%d.%b %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Skriv inn koden frÃ¥ autentiseringsappen for Ã¥ stadfesta
-    description_html: Hvis du skrur pÃ¥ <strong>tofaktorautentisering</strong> mÃ¥ du ha din telefon for Ã¥ logge inn. Denne vil generere koder som du mÃ¥ taste inn.
+    add: Legg til
     disable: SlÃ¥ av
-    enable: SlÃ¥ pÃ¥
+    disabled_success: 2-trinnsautentisering ble vellykket skrudd av
+    edit: Redigering
     enabled: Tostegsinnlogging er slege pÃ¥
     enabled_success: Aktivering av tofaktorautentisering vellykket
     generate_recovery_codes: GenerÃ©r gjenopprettingskoder
-    instructions_html: "<strong>Scan denne QR-koden med Google Authenticator eller en lignende app pÃ¥ telefonen din</strong>. Fra nÃ¥ av vil denne applikasjonen generere koder for deg som skal brukes under innlogging."
     lost_recovery_codes: Gjenopprettingskoder lar deg gjenoppnÃ¥ tilgang til din konto hvis du mister din telefon. Hvis du har mistet gjenopprettingskodene, kan du regenerere dem her. Dine gamle gjenopprettingskoder vil bli ugyldige.
-    manual_instructions: 'Hvis du ikke fÃ¥r scannet QR-koden mÃ¥ du skrive inn fÃ¸lgende kode manuelt:'
+    methods: 2-trinnsmetoder
+    otp: Autentiseringsapp
     recovery_codes: Reservekoder
     recovery_codes_regenerated: Generering av reservekoder fullfÃ¸rt
     recovery_instructions_html: Hvis du skulle miste tilgang til telefonen din, kan du bruke en av gjenopprettingskodene nedenfor til Ã¥ gjenopprette tilgang til din konto. <strong>Oppbevar gjenopprettingskodene sikkert</strong>, for eksempel ved Ã¥ skrive dem ut og gjemme dem pÃ¥ et lurt sted bare du vet om.
-    setup: Sett opp
-    wrong_code: Den angitte koden var ugyldig! Stemmer instansens tid overalt med enhetens tid?
+    webauthn: SikkerhetsnÃ¸kler
   user_mailer:
     backup_ready:
       explanation: Du ba om en fullstendig sikkerhetskopi av Mastodon-kontoen din. Den er nÃ¥ klar for nedlasting!
       subject: Arkivet ditt er klart til Ã¥ lastes ned
+    sign_in_token:
+      details: 'Her er forsÃ¸ksdetaljane:'
+      further_actions: 'Om dette ikkje var deg, so venlegast endra passordet ditt og skruv pÃ¥ tostegsgodkjenning pÃ¥ kontoen din. Du kan gjera det her:'
+      subject: Venlegast stadfest forsÃ¸ket pÃ¥ Ã¥ logga inn
+      title: ForsÃ¸k pÃ¥ Ã¥ logga inn
     warning:
       explanation:
         disable: Mens kontoen din er fryst, forblir dine kontodata intakt, men du kan ikke utfÃ¸re noen handlinger fÃ¸r den har blitt tint opp.
@@ -1254,11 +1340,27 @@ nn:
       tips: Tips
       title: Velkomen om bord, %{name}!
   users:
+    blocked_email_provider: Denne E-postleverandÃ¸ren er ikke tillatt
     follow_limit_reached: Du kan ikkje fylgja fleire enn %{limit} folk
+    generic_access_help_html: Har du vanskar med tilgjenge til kontoen din? Tak gjerne kontakt med %{email}
     invalid_email: E-mailadressa er ugyldig
     invalid_otp_token: Ugyldig tostegskode
+    invalid_sign_in_token: Ugild trygdenykel
     otp_lost_help_html: Hvis du mistet tilgangen til begge deler, kan du komme i kontakt med %{email}
+    seamless_external_login: Du er logga inn gjennom eit eksternt reiskap, so passord og e-postinstillingar er ikkje tilgjengelege.
     signed_in_as: 'Logga inn som:'
+    suspicious_sign_in_confirmation: Det verkar ikkje som du har logga inn frÃ¥ dette reiskapet fÃ¸r, og du har ikkje logga inn pÃ¥ ei stund, difor sender me deg ein trygdekode til e-post-addressa di for Ã¥ stadfesta at det er deg.
   verification:
     explanation_html: 'Du kan <strong>bekrefte at du selv er eieren av lenkene i din profilmetadata</strong>. For Ã¥ gjÃ¸re det, mÃ¥ det tillenkede nettstedet inneholde en lenke som fÃ¸rer tilbake til Mastodon-profilen din. Lenken tilbake <strong>mÃ¥</strong> ha en <code>rel="me"</code>-attributt. Tekstinnholdet til lenken er irrelevant. Her er et eksempel:'
     verification: Stadfesting
+  webauthn_credentials:
+    add: Legg til ny sikkerhetsnÃ¸kkel
+    create:
+      success: SikkerhetsnÃ¸kkelen din ble vellykket lagt til.
+    delete: Slett
+    delete_confirmation: Er du sikker pÃ¥ at du vil slette denne sikkerhetsnÃ¸kkelen?
+    destroy:
+      success: SikkerhetsnÃ¸kkelen din ble vellykket slettet.
+    invalid_credential: Ugyldig sikkerhetsnÃ¸kkel
+    not_supported: Denne nettleseren stÃ¸tter ikke sikkerhetsnÃ¸kler
+    registered_on: Registrert den %{date}
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 32368fc9a2bd2403f6d27423eace4262127e9138..b70eb167c442e6ca13a8186c37e7415b64be746e 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -21,7 +21,9 @@
     federation_hint_html: Med en konto pÃ¥ %{instance} vil du kunne fÃ¸lge folk pÃ¥ enhver Mastodon-tjener, og mer til.
     get_apps: PrÃ¸v en mobilapp
     hosted_on: Mastodon driftet pÃ¥ %{domain}
-    instance_actor_flash: Denne brukeren er en virtuell aktÃ¸r brukt til Ã¥ representere selve serveren og ingen individuell bruker. Det brukes til foreningsformÃ¥l og bÃ¸r ikke blokkeres med mindre du vil blokkere hele instansen, hvor domeneblokkering bÃ¸r brukes i stedet.
+    instance_actor_flash: 'Denne brukeren er en virtuell aktÃ¸r brukt til Ã¥ representere selve serveren og ingen individuell bruker. Det brukes til foreningsformÃ¥l og bÃ¸r ikke blokkeres med mindre du vil blokkere hele instansen, hvor domeneblokkering bÃ¸r brukes i stedet.
+
+'
     learn_more: LÃ¦r mer
     privacy_policy: Privatlivsretningslinjer
     see_whats_happening: Se hva som skjer
@@ -38,8 +40,11 @@
       domain: Tjener
       reason: Ã…rsak
       rejecting_media: 'Mediafiler fra disse tjenerne vil ikke bli behandlet eller lagret, og ingen miniatyrbilder vil bli vist, noe som vil kreve manuell klikking for Ã¥ besÃ¸ke den opprinnelige filen:'
+      rejecting_media_title: Filtrert media
       silenced: 'Innlegg fra disse tjenerne vil bli skjult fra offentlige tidslinjer og samtaler, og ingen varslinger vil bli generert fra disse brukernes samhandlinger, med mindre du fÃ¸lger dem:'
+      silenced_title: Stilnede tjenere
       suspended: 'Ingen data fra disse tjenerne vil bli behandlet, lagret, eller utvekslet, noe som vil gjÃ¸re enhver samhandling eller kommunikasjon med brukere fra disse tjenerne umulig:'
+      suspended_title: Suspenderte tjenere
     unavailable_content_html: Mastodon lar deg vanligvis se innhold fra og samhandle med brukere fra enhver annen tjener i strÃ¸miverset. Dette er unntakene som har blitt gjort pÃ¥ denne spesifikke tjeneren.
     user_count_after:
       one: bruker
@@ -106,6 +111,7 @@
       confirm: Bekreft
       confirmed: Bekreftet
       confirming: Bekrefte
+      delete: Slett data
       deleted: Slettet
       demote: Degrader
       disable: Deaktiver
@@ -187,8 +193,11 @@
       unconfirmed_email: Ubekreftet E-postadresse
       undo_silenced: Angre mÃ¥lbinding
       undo_suspension: Angre utvisning
+      unsilenced_msg: Opphevde vellykket begrensningen av %{username} sin konto
       unsubscribe: Avslutt abonnementet
+      unsuspended_msg: Opphevde vellykket suspenderingen av %{username} sin konto
       username: Brukernavn
+      view_domain: Vis sammendrag for domenet
       warn: Advar
       web: Nett
       whitelisted: Hvitelistet
@@ -203,12 +212,16 @@
         create_domain_allow: Opprett domene tillatt
         create_domain_block: Opprett domene-blokk
         create_email_domain_block: Opprett e-post domeneblokk
+        create_ip_block: Opprett IP-regel
         demote_user: Degrader bruker
         destroy_announcement: Slett kunngjÃ¸ringen
         destroy_custom_emoji: Slett den tilpassede emojien
+        destroy_ip_block: Slett IP-regel
         destroy_status: Slett statusen
         disable_2fa_user: Skru av 2-trinnsinnlogging
+        disable_custom_emoji: Skru av tilpassede emojier
         disable_user: Deaktiver bruker
+        enable_custom_emoji: Skru pÃ¥ tilpassede emojier
         enable_user: Aktiver bruker
         promote_user: Promoter bruker
         remove_avatar_user: Fjern Avatar
@@ -231,12 +244,14 @@
         create_domain_allow: "%{name} hvitelistet domenet %{target}"
         create_domain_block: "%{name} blokkerte domenet %{target}"
         create_email_domain_block: "%{name} svartelistet e-postdomenet %{target}"
+        create_ip_block: "%{name} opprettet en regel for IP-en %{target}"
         demote_user: "%{name} degraderte bruker %{target}"
         destroy_announcement: "%{name} slettet kunngjÃ¸ring %{target}"
         destroy_custom_emoji: "%{name} Ã¸dela emojien %{target}"
         destroy_domain_allow: "%{name} fjernet domenet %{target} fra hvitelisten"
         destroy_domain_block: "%{name} fjernet blokkeringen av domenet %{target}"
         destroy_email_domain_block: "%{name} hvitelistet e-postdomenet %{target}"
+        destroy_ip_block: "%{name} slettet en regel for IP-en %{target}"
         destroy_status: "%{name} fjernet status av %{target}"
         disable_2fa_user: "%{name} deaktiverte tofaktor-autentiseringskravet for bruker %{target}"
         disable_custom_emoji: "%{name} deaktiverte emoji %{target}"
@@ -421,6 +436,20 @@
         expired: UtlÃ¸pt
         title: Filtrer
       title: Invitasjoner
+    ip_blocks:
+      add_new: Opprett regel
+      created_msg: La vellykket til en ny IP-regel
+      delete: Slett
+      expires_in:
+        '1209600': 2 uker
+        '15778476': 6 mÃ¥neder
+        '2629746': 1 mÃ¥ned
+        '31556952': 1 Ã¥r
+        '86400': 1 dag
+        '94670856': 3 Ã¥r
+      new:
+        title: Opprett ny IP-regel
+      title: IP-regler
     pending_accounts:
       title: Avventende brukere (%{count})
     relationships:
@@ -650,8 +679,11 @@
       prefix_sign_up: Meld deg opp pÃ¥ Mastodon i dag!
       suffix: Med en konto, vil kunne fÃ¸lge folk, legge ut oppdateringer, og utveksle meldinger med brukere fra enhver Mastodon-tjener, og mer til!
     didnt_get_confirmation: Mottok du ikke instruksjoner om bekreftelse?
+    dont_have_your_security_key: Har du ikke sikkerhetsnÃ¸kkelen din?
     forgot_password: Har du glemt passordet ditt?
     invalid_reset_password_token: TilbakestillingsnÃ¸kkelen for passord er ugyldig eller utlÃ¸pt. Vennligst be om en ny.
+    link_to_otp: Skriv inn en 2-trinnskode fra din 2-trinnspÃ¥loggingsenhet eller en gjenopprettingskode
+    link_to_webauth: Bruk sikkerhetsnÃ¸kkel-enheten din
     login: Logg pÃ¥
     logout: Logg ut
     migrate_account: Flytt til en annen konto
@@ -677,6 +709,7 @@
       pending: SÃ¸knaden din avventer gjennomgang av styret vÃ¥rt. Dette kan ta litt tid. Du vil motta en E-post dersom sÃ¸knaden din blir godkjent.
       redirecting_to: Kontoen din er inaktiv fordi den for Ã¸yeblikket omdirigerer til %{acct}.
     trouble_logging_in: Har du problemer med Ã¥ logge pÃ¥?
+    use_security_key: Bruk sikkerhetsnÃ¸kkel
   authorize_follow:
     already_following: Du fÃ¸lger allerede denne kontoen
     error: Uheldigvis skjedde det en feil da vi prÃ¸vde Ã¥ fÃ¥ tak i en bruker fra en annen instans
@@ -693,6 +726,10 @@
     hint_html: "<strong>Tips:</strong> Vi ber deg ikke om passordet ditt igjen i lÃ¸pet av neste time."
     invalid_password: Ugyldig passord
     prompt: Bekreft passordet for Ã¥ fortsette
+  crypto:
+    errors:
+      invalid_key: er ikke en gyldig Ed25519- eller Curve25519-nÃ¸kkel
+      invalid_signature: er ikke en gyldig Ed25519-signatur
   date:
     formats:
       default: "%b %d, %Y"
@@ -861,23 +898,39 @@
     acct: brukernavn@domene til den nye kontoen
     cancel: Avbryt omdirigeringen
     cancel_explanation: Ã… avbryte omdirigeringen vil reaktivere din nÃ¥vÃ¦rende konto, men vil ikke bringe tilbake fÃ¸lgere som har blitt flyttet til den kontoen.
+    cancelled_msg: AvbrÃ¸t omdirigeringen med suksess.
     errors:
       already_moved: er den samme kontoen du allerede har flyttet til
+      missing_also_known_as: er ikke en av denne kontoens aliaser
       move_to_self: kan ikke vÃ¦re den nÃ¥vÃ¦rende kontoen
       not_found: ble ikke funnet
       on_cooldown: Du er i en nedkjÃ¸lingsperiode
     followers_count: FÃ¸lgere pÃ¥ flyttetidspunktet
     incoming_migrations: Flytte fra en annen konto
     incoming_migrations_html: For Ã¥ flytte fra en annen konto til denne, mÃ¥ du fÃ¸rst <a href="%{path}">sette opp et kontoalias</a>.
+    moved_msg: Kontoen din omdirigeres nÃ¥ til %{acct}, og fÃ¸lgerne dine blir flyttet over.
+    not_redirecting: Kontoen din omdirigeres ikke til noen andre kontoer for Ã¸yeblikket.
+    on_cooldown: Du har nylig overfÃ¸rt kontoen din. Denne funksjonen blir tilgjengelig igjen om %{count} dager.
     past_migrations: Tidligere migreringer
     proceed_with_move: Flytt fÃ¸lgere
+    redirected_msg: Kontoen din omdirigeres nÃ¥ til %{acct}.
+    redirecting_to: Kontoen din omdirigeres til %{acct}.
     set_redirect: Bestem omdirigering
     warning:
+      backreference_required: Den nye kontoen mÃ¥ fÃ¸rst settes opp til Ã¥ henvise tilbake til denne
       before: 'FÃ¸r du fortsetter, vennligst les disse notisene nÃ¸ye:'
+      cooldown: Etter flytting er det en nedkjÃ¸lingsperiode der du ikke vil kunne flytte igjen
       disabled_account: Din nÃ¥vÃ¦rende konto vil ikke vÃ¦re fullt brukbar etterpÃ¥. Men du vil ha tilgang til dataeksportering sÃ¥vel som reaktivering.
+      followers: Denne handlingen vil flytte alle fÃ¸lgere fra den nÃ¥vÃ¦rende kontoen til den nye kontoen
+      only_redirect_html: Alternativt kan du velge Ã¥ <a href="%{path}">bare legge ut en omdirigering pÃ¥ profilen din</a>.
       other_data: Ingen andre data vil bli flyttet automatisk
+      redirect: Profilen til din nÃ¥vÃ¦rende konto vil bli oppdatert med en omdirigeringsnotis og bli fjernet fra sÃ¸k
   moderation:
     title: Moderasjon
+  move_handler:
+    carry_blocks_over_text: Denne brukeren flyttet fra %{acct}, som du hadde blokkert.
+    carry_mutes_over_text: Denne brukeren flyttet fra %{acct}, som du hadde dempet.
+    copy_account_note_text: 'Denne brukeren flyttet fra %{acct}, her var dine tidligere notater om dem:'
   notification_mailer:
     digest:
       action: Vis alle varslinger
@@ -926,6 +979,14 @@
           quadrillion: Kvd
           thousand: T
           trillion: Trl
+  otp_authentication:
+    code_hint: Skriv inn koden generert av autentiseringsappen din for Ã¥ bekrefte
+    description_html: Hvis du skrur pÃ¥ <strong>2-trinnsautentisering</strong> ved hjelp av en autentiseringsapp, vil pÃ¥logging kreve at du er i besittelse av autentiseringsenheten din, som genererer sjetonger som du skal skrive inn.
+    enable: Aktiver
+    instructions_html: "<strong>Skann denne QR-koden i Authy, Google Autentisering, eller en lignende TOTP-app pÃ¥ en av dine enheter</strong>. Fra nÃ¥ av, vil den appen generere sjetonger som du vil mÃ¥tte skrive inn nÃ¥r du logger pÃ¥."
+    manual_instructions: 'Hvis du ikke kan skanne QR-koden og mÃ¥ skrive den inn manuelt, her er tekstkoden i ren tekst:'
+    setup: Sett opp
+    wrong_code: Den innskrevne koden var ugyldig! Er tjenertiden og enhetstiden riktige?
   pagination:
     newer: Nyere
     next: Neste
@@ -984,6 +1045,10 @@
     reply:
       proceed: Fortsett til svaret
       prompt: 'Du Ã¸nsker Ã¥ svare pÃ¥ denne tuten:'
+  scheduled_statuses:
+    over_daily_limit: Du har overskredet grensen pÃ¥ %{limit} planlagte tuter for den dagen
+    over_total_limit: Du har overskredet grensen pÃ¥ %{limit} planlagte tuter
+    too_soon: Den planlagte datoen mÃ¥ vÃ¦re i fremtiden
   sessions:
     activity: Siste aktivitet
     browser: Nettleser
@@ -1046,10 +1111,14 @@
     profile: Profil
     relationships: FÃ¸lginger og fÃ¸lgere
     two_factor_authentication: Tofaktorautentisering
+    webauthn_authentication: SikkerhetsnÃ¸kler
   spam_check:
     spam_detected: Dette er en automatisert rapport. Spam har blitt oppdaget.
   statuses:
     attached:
+      audio:
+        one: "%{count} lyd"
+        other: "%{count} lyd"
       description: 'Vedlagt: %{attached}'
       image:
         one: "%{count} bilde"
@@ -1183,25 +1252,27 @@
       default: "%-d. %b %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Tast koden som ble generert av din autentiseringsapp for Ã¥ bekrefte
-    description_html: Hvis du skrur pÃ¥ <strong>tofaktorautentisering</strong> mÃ¥ du ha din telefon for Ã¥ logge inn. Denne vil generere koder som du mÃ¥ taste inn.
+    add: Legg til
     disable: Skru av
-    enable: Skru pÃ¥
+    disabled_success: 2-trinnsautentisering ble vellykket skrudd av
+    edit: Redigering
     enabled: To-faktor autentisering er aktivert
     enabled_success: Aktivering av tofaktorautentisering vellykket
     generate_recovery_codes: GenerÃ©r gjenopprettingskoder
-    instructions_html: "<strong>Scan denne QR-koden med Google Authenticator eller en lignende app pÃ¥ telefonen din</strong>. Fra nÃ¥ av vil denne applikasjonen generere koder for deg som skal brukes under innlogging."
     lost_recovery_codes: Gjenopprettingskoder lar deg gjenoppnÃ¥ tilgang til din konto hvis du mister din telefon. Hvis du har mistet gjenopprettingskodene, kan du regenerere dem her. Dine gamle gjenopprettingskoder vil bli ugyldige.
-    manual_instructions: 'Hvis du ikke fÃ¥r scannet QR-koden mÃ¥ du skrive inn fÃ¸lgende kode manuelt:'
+    methods: 2-trinnsmetoder
+    otp: Autentiseringsapp
     recovery_codes: Reservekoder
     recovery_codes_regenerated: Generering av reservekoder fullfÃ¸rt
     recovery_instructions_html: Hvis du skulle miste tilgang til telefonen din, kan du bruke en av gjenopprettingskodene nedenfor til Ã¥ gjenopprette tilgang til din konto. <strong>Oppbevar gjenopprettingskodene sikkert</strong>, for eksempel ved Ã¥ skrive dem ut og gjemme dem pÃ¥ et lurt sted bare du vet om.
-    setup: Sett opp
-    wrong_code: Den angitte koden var ugyldig! Stemmer instansens tid overalt med enhetens tid?
+    webauthn: SikkerhetsnÃ¸kler
   user_mailer:
     backup_ready:
       explanation: Du ba om en fullstendig sikkerhetskopi av Mastodon-kontoen din. Den er nÃ¥ klar for nedlasting!
       subject: Arkivet ditt er klart til Ã¥ lastes ned
+    sign_in_token:
+      details: 'Her er detaljene om forsÃ¸ket:'
+      title: PÃ¥loggingsforsÃ¸k
     warning:
       explanation:
         disable: Mens kontoen din er fryst, forblir dine kontodata intakt, men du kan ikke utfÃ¸re noen handlinger fÃ¸r den har blitt tint opp.
@@ -1238,11 +1309,24 @@
       tips: Tips
       title: Velkommen ombord, %{name}!
   users:
+    blocked_email_provider: Denne E-postleverandÃ¸ren er ikke tillatt
     follow_limit_reached: Du kan ikke fÃ¸lge mer enn %{limit} personer
     invalid_email: E-postaddressen er ugyldig
     invalid_otp_token: Ugyldig to-faktorkode
+    invalid_sign_in_token: Ugyldig sikkerhetskode
     otp_lost_help_html: Hvis du mistet tilgangen til begge deler, kan du komme i kontakt med %{email}
     signed_in_as: 'Innlogget som:'
   verification:
     explanation_html: 'Du kan <strong>bekrefte at du selv er eieren av lenkene i din profilmetadata</strong>. For Ã¥ gjÃ¸re det, mÃ¥ det tillenkede nettstedet inneholde en lenke som fÃ¸rer tilbake til Mastodon-profilen din. Lenken tilbake <strong>mÃ¥</strong> ha en <code>rel="me"</code>-attributt. Tekstinnholdet til lenken er irrelevant. Her er et eksempel:'
     verification: Bekreftelse
+  webauthn_credentials:
+    add: Legg til ny sikkerhetsnÃ¸kkel
+    create:
+      success: SikkerhetsnÃ¸kkelen din ble vellykket lagt til.
+    delete: Slett
+    delete_confirmation: Er du sikker pÃ¥ at du vil slette denne sikkerhetsnÃ¸kkelen?
+    destroy:
+      success: SikkerhetsnÃ¸kkelen din ble vellykket slettet.
+    invalid_credential: Ugyldig sikkerhetsnÃ¸kkel
+    not_supported: Denne nettleseren stÃ¸tter ikke sikkerhetsnÃ¸kler
+    registered_on: Registrert den %{date}
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 95d15ef85edbfe6cbc24c35373c13e00bc053326..3837ce56a559ccefe69365cd77a68f5fe9e56b0b 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -47,6 +47,7 @@ oc:
     what_is_mastodon: Quâ€™es Mastodonâ€¯?
   accounts:
     choices_html: 'Recomandacions de %{name}Â :'
+    endorsements_hint: PodÃ¨tz recomandar personas que seguÃ¨tz a partir de lâ€™interfÃ cia web, apreissarÃ n aquÃ.
     featured_tags_hint: PodÃ¨tz indicar dâ€™etiquetas que mostrarem aquÃ.
     follow: SÃ¨gre
     followers:
@@ -104,6 +105,7 @@ oc:
       confirm: Confirmar
       confirmed: Confirmat
       confirming: Confirmacion
+      delete: Suprimir donadas
       deleted: Suprimits
       demote: Retrogradar
       disable: Desactivar
@@ -131,6 +133,7 @@ oc:
       login_status: Estat formulari de connexion
       media_attachments: MÃ¨dias enviats
       memorialize: Passar en memorial
+      memorialized: Memorizat
       moderation:
         active: Actius
         all: Totes
@@ -170,6 +173,8 @@ oc:
         user: Uitlizaire
       search: Cercar
       search_same_ip: Autres utilizaires amb la meteissa IP
+      sensitive: Sensible
+      sensitized: marcar coma sensible
       shared_inbox_url: URL de recepcion partejada
       show:
         created_reports: Senhalaments creats
@@ -182,6 +187,7 @@ oc:
       time_in_queue: En espÃ¨ra a la fila %{time}
       title: Comptes
       unconfirmed_email: AdreÃ§a pas confirmada
+      undo_sensitized: Desmarcar coma sensible
       undo_silenced: Levar lo silenci
       undo_suspension: Levar la suspension
       unsubscribe: Se desabonar
@@ -197,6 +203,7 @@ oc:
         create_account_warning: Crear un avertiment
         create_announcement: Crear una anÃ³ncia
         create_custom_emoji: Crear un emoji personalizat
+        create_ip_block: Crear una rÃ¨gla IP
         demote_user: Retrogradar lâ€™utilizaire
         destroy_announcement: Suprimir lâ€™anÃ³ncia
         destroy_custom_emoji: Suprimir lâ€™emoji personalizat
@@ -417,6 +424,19 @@ oc:
         expired: Expirats
         title: Filtre
       title: Convits
+    ip_blocks:
+      add_new: Crear una rÃ¨gla
+      delete: Suprimir
+      expires_in:
+        '1209600': 2 setmanas
+        '15778476': 6 meses
+        '2629746': 1 mes
+        '31556952': 1 an
+        '86400': 1 jorn
+        '94670856': 3 ans
+      new:
+        title: Crear una rÃ¨glas IP novÃ¨la
+      title: RÃ¨glas IP
     pending_accounts:
       title: Comptes en espÃ¨ra (%{count})
     relationships:
@@ -672,6 +692,7 @@ oc:
       account_status: Estat del compte
       functional: VÃ²stre compte es complÃ¨tament foncional.
     trouble_logging_in: ProblÃ¨mas de connexionâ€¯?
+    use_security_key: Utilizar clau de seguretat
   authorize_follow:
     already_following: SeguÃ¨tz ja aqueste compte
     error: O planhÃ¨m, i a agut una error al moment de cercar lo compte
@@ -690,7 +711,8 @@ oc:
     prompt: Confirmatz lo senhal per dire de contunhar
   date:
     formats:
-      default: "%d %B de %Y"
+      default: "%-d %B de %Y"
+      with_month_name: "%-d %B de %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count} h"
@@ -753,6 +775,7 @@ oc:
       request: Demandar vÃ²stre archiu
       size: Talha
     blocks: Personas que blocatz
+    bookmarks: Marcadors
     csv: CSV
     domain_blocks: Blocatge de domenis
     lists: Listas
@@ -827,6 +850,7 @@ oc:
     success: VÃ²stras donadas son ben estadas mandadas e serÃ n tractadas tre que possible
     types:
       blocking: Lista de blocatge
+      bookmarks: Marcadors
       domain_blocking: Lista dels domenis blocats
       following: Lista de monde que seguÃ¨tz
       muting: Lista de monde que volÃ¨tz pas legir
@@ -931,6 +955,9 @@ oc:
           quadrillion: Q
           thousand: K
           trillion: T
+  otp_authentication:
+    enable: Activar
+    setup: Parametrar
   pagination:
     newer: Mai recents
     next: Seguent
@@ -960,13 +987,13 @@ oc:
     activity: Activitat del compte
     dormant: Inactiu
     followers: Seguidors
-    following: Aboanements
+    following: Abonaments
     invited: Convidat
     last_active: DarriÃ¨ra activitat
     most_recent: Mai recenta
     moved: Mudat
     mutual: Mutuala
-    primary: PirmÃ ria
+    primary: PrimÃ ria
     relationship: Relacion
     remove_selected_domains: Levar totes los seguidors dels domenis seleccionats
     remove_selected_followers: Levar los seguidors seleccionats
@@ -1055,10 +1082,14 @@ oc:
     profile: Perfil
     relationships: Abonaments e seguidors
     two_factor_authentication: Autentificacion en dos temps
+    webauthn_authentication: Claus de seguretat
   spam_check:
     spam_detected: AquÃ² es un senhalament automatic. Dâ€™spam es estat detectat.
   statuses:
     attached:
+      audio:
+        one: "%{count} Ã udio"
+        other: "%{count} Ã udios"
       description: 'Ajustatâ€¯: %{attached}'
       image:
         one: "%{count} imatge"
@@ -1195,24 +1226,20 @@ oc:
     mastodon-light: Mastodon (Clar)
   time:
     formats:
-      default: Lo %d %b de %Y a %Ho%M
-      month: "%b de %Y"
+      default: Lo %-d %B de %Y a %Ho%M
+      month: "%B de %Y"
   two_factor_authentication:
-    code_hint: Picatz lo cÃ²di generat per vÃ²stra aplicacion dâ€™autentificacion per confirmar
-    description_html: Sâ€™activatz <strong> lâ€™autentificacion two-factor</strong>, vos caldrÃ  vÃ²stre mobil per vos connectar perque generarÃ  un geton per vos daissar dintrar.
+    add: Ajustar
     disable: Desactivar
-    enable: Activar
+    edit: Modificar
     enabled: Autentificacion en dos temps activada
     enabled_success: Lâ€™autentificacion en dos temps es ben activada
     generate_recovery_codes: Generar los cÃ²dis de recuperacion
-    instructions_html: "<strong>Escanatz aqueste cÃ²di QR amb Google Authenticator o una aplicacion similÃ ria sus vÃ²stre mobil</strong>. A partir dâ€™ara, aquesta aplicacion generarÃ  un geton que vos caldrÃ  picar per vos connectar."
     lost_recovery_codes: Los cÃ²di de recuperacion vos permeton dâ€™accedir a vÃ²stre compte se perdÃ¨tz vÃ²stre mobil. Sâ€™avÃ¨tz perdut vÃ²stres cÃ²dis de recuperacion los podÃ¨tz tornar generar aquÃ. Los ancians cÃ²dis serÃ n pas mai valides.
-    manual_instructions: 'Se podÃ¨tz pas numerizar lo cÃ²di QR e que vos cal picar lo cÃ²di a la man, vaquÃ lo cÃ²di en clarâ€¯:'
     recovery_codes: Salvar los cÃ²dis de recuperacion
     recovery_codes_regenerated: Los cÃ²dis de recuperacion son ben estats tornats generar
     recovery_instructions_html: Se vos arriba de perdre vÃ²stre mobil, podÃ¨tz utilizar un dels cÃ²dis de recuperacion cai-jos per poder tornar accedir a vÃ²stre compte. <strong>Gardatz los cÃ²dis en seguretat</strong>, per exemple, imprimissÃ¨tz los e gardatz los amb vÃ²stres documents importants.
-    setup: Parametrar
-    wrong_code: Lo cÃ²di picat es invalidâ€¯! Lâ€™ora es bona sul servidor e lo mobilâ€¯?
+    webauthn: Claus de seguretat
   user_mailer:
     backup_ready:
       explanation: AvÃ¨tz demandat una salvagarda complÃ¨ta de vÃ²stre compte Mastodon. Es prÃ¨sta per telecargamentâ€¯!
@@ -1264,3 +1291,8 @@ oc:
   verification:
     explanation_html: 'PodÃ¨tz <strong>verificar vosautres meteisses coma proprietari dels ligams per las metadonadas de vÃ²stre perfil</strong>. Per aquÃ² far, lo site Web ligat deu contÃ©ner un ligam cap a vÃ²stre perfil Mastodon. Lo ligam <strong>deu</strong> aver un atribut <code>rel="me"</code>. Lo contengut tÃ¨xte del ligam impÃ²rta pas. VaquÃ un exempleÂ :'
     verification: Verificacion
+  webauthn_credentials:
+    add: Apondre una clau de seguretat novÃ¨la
+    delete: Suprimir
+    invalid_credential: Cau de seguretat invalida
+    registered_on: Inscripcion del %{date}
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 7d0b3f214ba4ffba0d13e4d7fc444177c05774d4..23c67267e0eda9f2e2dd8bf6bb57cd9e98cad4b2 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -66,6 +66,7 @@ pl:
       one: Å›ledzÄ…cy
       other: ÅšledzÄ…cych
     following: Å›ledzonych
+    instance_actor_flash: To konto jest wirtualnym profilem uÅ¼ywanym do reprezentowania samego serwera, a nie Å¼adnego indywidualnego uÅ¼ytkownika. Jest ono stosowane do celÃ³w federacji i nie powinien byÄ‡ zawieszany.
     joined: DoÅ‚Ä…czyÅ‚(a) %{date}
     last_active: ostatnio aktywny(-a)
     link_verified_on: WÅ‚asnoÅ›Ä‡ tego odnoÅ›nika zostaÅ‚a sprawdzona %{date}
@@ -106,6 +107,7 @@ pl:
       add_email_domain_block: Dodaj domenÄ™ e-mail na czarnÄ… listÄ™
       approve: Przyjmij
       approve_all: ZatwierdÅº wszystkie
+      approved_msg: PomyÅ›lnie zaakceptowano wniosek o rejestracjÄ™ %{username}
       are_you_sure: JesteÅ› tego pewien?
       avatar: Awatar
       by_domain: Domena
@@ -119,8 +121,10 @@ pl:
       confirm: PotwierdÅº
       confirmed: Potwierdzono
       confirming: Potwierdzanie
+      delete: UsuÅ„ dane
       deleted: UsuniÄ™to
       demote: Degraduj
+      destroyed_msg: Dane %{username} sÄ… teraz w kolejce do natychmiastowego usuniÄ™cia
       disable: Dezaktywuj
       disable_two_factor_authentication: WyÅ‚Ä…cz uwierzytelnianie dwuetapowe
       disabled: Dezaktywowano
@@ -131,10 +135,12 @@ pl:
       email_status: Stan e-maila
       enable: Aktywuj
       enabled: Aktywowano
+      enabled_msg: PomyÅ›lnie odblokowano konto %{username}
       followers: ÅšledzÄ…cy
       follows: Åšledzeni
       header: NagÅ‚Ã³wek
       inbox_url: Adres skrzynki
+      invite_request_text: Powody rejestracji
       invited_by: Zaproszony(-a) przez
       ip: Adres IP
       joined: DoÅ‚Ä…czyÅ‚(-a)
@@ -146,6 +152,8 @@ pl:
       login_status: Stan logowania
       media_attachments: ZaÅ‚Ä…czniki multimedialne
       memorialize: PrzeÅ‚Ä…cz na â€žIn Memoriamâ€
+      memorialized: UpamiÄ™tniono
+      memorialized_msg: PomyÅ›lnie przeÅ‚Ä…czono %{username} w konto in memoriam
       moderation:
         active: Aktywne
         all: Wszystkie
@@ -166,10 +174,14 @@ pl:
       public: Publiczne
       push_subscription_expires: Subskrypcja PuSH wygasa
       redownload: OdÅ›wieÅ¼ profil
+      redownloaded_msg: PomyÅ›lnie odÅ›wieÅ¼ono profil %{username} z miejsca pochodzenia
       reject: OdrzuÄ‡
       reject_all: OdrzuÄ‡ wszystkie
+      rejected_msg: PomyÅ›lnie odrzucono wniosek o rejestracjÄ™ %{username}
       remove_avatar: Usun awatar
       remove_header: UsuÅ„ nagÅ‚Ã³wek
+      removed_avatar_msg: PomyÅ›lnie usuniÄ™to awatar %{username}
+      removed_header_msg: PomyÅ›lnie usuniÄ™to obraz nagÅ‚Ã³wka %{username}
       resend_confirmation:
         already_confirmed: To konto zostaÅ‚o juÅ¼ potwierdzone
         send: WyÅ›lij ponownie e-mail z potwierdzeniem
@@ -186,6 +198,8 @@ pl:
       search: Szukaj
       search_same_email_domain: Inni uÅ¼ytkownicy z e-mail w tej domenie
       search_same_ip: Inni uÅ¼ytkownicy z tym samym IP
+      sensitive: WraÅ¼liwe
+      sensitized: oznaczono jako wraÅ¼liwe
       shared_inbox_url: Adres udostÄ™pnianej skrzynki
       show:
         created_reports: ZgÅ‚oszenia tego uÅ¼ytkownika
@@ -195,13 +209,19 @@ pl:
       statuses: Wpisy
       subscribe: Subskrybuj
       suspended: Zawieszono
+      suspension_irreversible: Dane tego konta zostaÅ‚y bezpowrotnie usuniÄ™te. MoÅ¼esz cofnÄ…Ä‡ zawieszenie tego konta aby moÅ¼na byÅ‚o z niego ponownie korzystaÄ‡, lecz nie przywrÃ³ci to danych ktÃ³re poprzednio siÄ™ na nim znajdowaÅ‚y.
+      suspension_reversible_hint_html: Twoje konto zostaÅ‚o zawieszone, a dane zostanÄ… caÅ‚kowicie usuniÄ™te %{date}. Do tego czasu, konto moÅ¼e zostaÄ‡ przywrÃ³cone bez Å¼adnych negatywnych skutkÃ³w. JeÅ¼eli chcesz natychmiastowo usunÄ…Ä‡ wszystkie dane, moÅ¼esz zrobiÄ‡ to niÅ¼ej.
       time_in_queue: Czekanie w kolejce %{time}
       title: Konta
       unconfirmed_email: Niepotwierdzony adres e-mail
+      undo_sensitized: Cofnij oznaczenie
       undo_silenced: Cofnij wyciszenie
       undo_suspension: Cofnij zawieszenie
+      unsilenced_msg: PomyÅ›lnie zwolniono z ograniczeÅ„ konto %{username}
       unsubscribe: PrzestaÅ„ subskrybowaÄ‡
+      unsuspended_msg: PomyÅ›lnie cofniÄ™to zawieszenie konto %{username}
       username: Nazwa uÅ¼ytkownika
+      view_domain: Zobacz podsumowanie domeny
       warn: OstrzeÅ¼
       web: SieÄ‡
       whitelisted: Na biaÅ‚ej liÅ›cie
@@ -216,12 +236,14 @@ pl:
         create_domain_allow: UtwÃ³rz zezwolenie dla domeny
         create_domain_block: UtwÃ³rz blokadÄ™ domeny
         create_email_domain_block: UtwÃ³rz blokadÄ™ domeny e-mail
+        create_ip_block: UtwÃ³rz reguÅ‚Ä™ IP
         demote_user: Zdegraduj uÅ¼ytkownika
         destroy_announcement: UsuÅ„ ogÅ‚oszenie
         destroy_custom_emoji: UsuÅ„ niestandardowe emoji
         destroy_domain_allow: UsuÅ„ zezwolenie dla domeny
         destroy_domain_block: UsuÅ„ blokadÄ™ domeny
         destroy_email_domain_block: UsuÅ„ blokadÄ™ domeny e-mail
+        destroy_ip_block: UsuÅ„ reguÅ‚Ä™ IP
         destroy_status: UsuÅ„ wpis
         disable_2fa_user: WyÅ‚Ä…cz 2FA
         disable_custom_emoji: WyÅ‚Ä…cz niestandardowe emoji
@@ -234,13 +256,16 @@ pl:
         reopen_report: OtwÃ³rz zgÅ‚oszenie ponownie
         reset_password_user: Resetuj hasÅ‚o
         resolve_report: RozwiÄ…Å¼ zgÅ‚oszenie
+        sensitive_account: Oznacz zawartoÅ›Ä‡ multimedialnÄ… swojego konta jako wraÅ¼liwÄ…
         silence_account: Wycisz konto
         suspend_account: ZawieÅ› konto
         unassigned_report: Cofnij przypisanie zgÅ‚oszenia
+        unsensitive_account: Cofnij oznaczenie zawartoÅ›ci multimedialnej swojego konta jako wraÅ¼liwÄ…
         unsilence_account: Cofnij wyciszenie konta
         unsuspend_account: Cofnij zawieszenie konta
         update_announcement: Aktualizuj ogÅ‚oszenie
         update_custom_emoji: Aktualizuj niestandardowe emoji
+        update_domain_block: Zaktualizuj blokadÄ™ domeny
         update_status: Aktualizuj wpis
       actions:
         assigned_to_self_report: "%{name} przypisaÅ‚(a) sobie zgÅ‚oszenie %{target}"
@@ -252,12 +277,14 @@ pl:
         create_domain_allow: "%{name} dodaÅ‚(a) na biaÅ‚Ä… listÄ™ domenÄ™ %{target}"
         create_domain_block: "%{name} zablokowaÅ‚(a) domenÄ™ %{target}"
         create_email_domain_block: "%{name} dodaÅ‚(a) domenÄ™ e-mail %{target} na czarnÄ… listÄ™"
+        create_ip_block: "%{name} stworzyÅ‚ dla IP %{target}"
         demote_user: "%{name} zdegradowaÅ‚(a) uÅ¼ytkownika %{target}"
         destroy_announcement: "%{name} usunÄ…Å‚(-Ä™Å‚a) ogÅ‚oszenie %{target}"
         destroy_custom_emoji: "%{name} usunÄ…Å‚(-Ä™Å‚a) emoji %{target}"
         destroy_domain_allow: "%{name} usunÄ…Å‚(-Ä™Å‚a) domenÄ™ %{target} z biaÅ‚ej listy"
         destroy_domain_block: "%{name} odblokowaÅ‚(a) domenÄ™ %{target}"
         destroy_email_domain_block: "%{name} usunÄ…Å‚(-Ä™Å‚a) domenÄ™ e-mail %{target} z czarnej listy"
+        destroy_ip_block: "%{name} usunÄ…Å‚ reguÅ‚Ä™ dla IP %{target}"
         destroy_status: "%{name} usunÄ…Å‚(-Ä™Å‚a) wpis uÅ¼ytkownika %{target}"
         disable_2fa_user: "%{name} wyÅ‚Ä…czyÅ‚(a) uwierzytelnianie dwustopniowe uÅ¼ytkownikowi %{target}"
         disable_custom_emoji: "%{name} wyÅ‚Ä…czyÅ‚(a) emoji %{target}"
@@ -270,13 +297,16 @@ pl:
         reopen_report: "%{name} otworzyÅ‚(a) ponownie zgÅ‚oszenie %{target}"
         reset_password_user: "%{name} przywrÃ³ciÅ‚(a) hasÅ‚o uÅ¼ytkownikowi %{target}"
         resolve_report: "%{name} rozwiÄ…zaÅ‚(a) zgÅ‚oszenie %{target}"
+        sensitive_account: "%{name} oznaczyÅ‚(a) zawartoÅ›Ä‡ multimedialnÄ… %{target} jako wraÅ¼liwÄ…"
         silence_account: "%{name} wyciszyÅ‚(a) konto %{target}"
         suspend_account: "%{name} zawiesiÅ‚(a) konto %{target}"
         unassigned_report: "%{name} cofnÄ…Å‚(-Ä™Å‚a) przypisanie zgÅ‚oszenia %{target}"
+        unsensitive_account: "%{name} cofnÄ…Å‚(-Ä™Å‚a) oznaczenie zawartoÅ›ci multimedialnej %{target} jako wraÅ¼liwÄ…"
         unsilence_account: "%{name} cofnÄ…Å‚(-Ä™Å‚a) wyciszenie konta %{target}"
         unsuspend_account: "%{name} cofnÄ…Å‚(-Ä™Å‚a) zawieszenie konta %{target}"
         update_announcement: "%{name} zaktualizowaÅ‚(-a) ogÅ‚oszenie %{target}"
         update_custom_emoji: "%{name} zaktualizowaÅ‚(a) emoji %{target}"
+        update_domain_block: "%{name} zaktualizowaÅ‚(-a) blokadÄ™ domeny dla %{target}"
         update_status: "%{name} zaktualizowaÅ‚(a) wpis uÅ¼ytkownika %{target}"
       deleted_status: "(usuniÄ™ty wpis)"
       empty: Nie znaleziono aktywnoÅ›ci w dzienniku.
@@ -380,6 +410,8 @@ pl:
           silence: Wycisz
           suspend: ZawieÅ›
         title: Nowa blokada domen
+      obfuscate: Ukryj nazwÄ™ domeny
+      obfuscate_hint: CzÄ™Å›ciowo ukryj nazwÄ™ domeny na liÅ›cie, gdy reklamowanie listy limitÃ³w domen jest wÅ‚Ä…czone
       private_comment: Prywatny komentarz
       private_comment_hint: Komentarz na temat ograniczeÅ„ dla tej domeny do wewnÄ™trznej informacji dla moderatorÃ³w.
       public_comment: Publiczny komentarz
@@ -421,6 +453,7 @@ pl:
     instances:
       by_domain: Domena
       delivery_available: DorÄ™czanie jest dostÄ™pne
+      empty: Nie znaleziono domen.
       known_accounts:
         few: "%{count} znane konta"
         many: "%{count} znane konta"
@@ -446,6 +479,21 @@ pl:
         expired: WygasÅ‚e
         title: Filtruj
       title: Zaproszenia
+    ip_blocks:
+      add_new: StwÃ³rz reguÅ‚Ä™
+      created_msg: PomyÅ›lnie dodano nowÄ… reguÅ‚Ä™ IP
+      delete: UsuÅ„
+      expires_in:
+        '1209600': 2 tygodnie
+        '15778476': 6 miesiÄ™cy
+        '2629746': 1 miesiÄ…c
+        '31556952': 1 rok
+        '86400': 1 dzieÅ„
+        '94670856': 3 lata
+      new:
+        title: UtwÃ³rz nowÄ… reguÅ‚Ä™ IP
+      no_ip_block_selected: Å»adna reguÅ‚a nie zostaÅ‚a zmieniona, poniewaÅ¼ Å¼adna nie zostaÅ‚a wybrana
+      title: ReguÅ‚y adresÃ³w IP
     pending_accounts:
       title: OczekujÄ…ce konta (%{count})
     relationships:
@@ -489,6 +537,8 @@ pl:
       comment:
         none: Brak
       created_at: ZgÅ‚oszono
+      forwarded: Przekazano
+      forwarded_to: Przekazano do %{domain}
       mark_as_resolved: Oznacz jako rozwiÄ…zane
       mark_as_unresolved: Oznacz jako nierozwiÄ…zane
       notes:
@@ -532,6 +582,7 @@ pl:
       domain_blocks_rationale:
         title: PokaÅ¼ uzasadnienia
       enable_bootstrap_timeline_accounts:
+        desc_html: Niech nowi uÅ¼ytkownicy automatycznie Å›ledzÄ… ustawione konta, aby ich gÅ‚Ã³wna oÅ› czasu nie byÅ‚ poczÄ…tkowo pusta
         title: Dodawaj domyÅ›lne obserwacje nowym uÅ¼ytkownikom
       hero:
         desc_html: WyÅ›wietlany na stronie gÅ‚Ã³wnej. Zalecany jest rozmiar przynajmniej 600x100 pikseli. JeÅ¼eli nie ustawiony, zostanie uÅ¼yta miniatura serwera
@@ -558,6 +609,9 @@ pl:
         min_invite_role:
           disabled: Nikt
           title: Kto moÅ¼e zapraszaÄ‡ uÅ¼ytkownikÃ³w
+        require_invite_text:
+          desc_html: Kiedy rejestracje wymagajÄ… rÄ™cznego zatwierdzenia, ustaw pole "Dlaczego chcesz doÅ‚Ä…czyÄ‡?" jako obowiÄ…zkowe, a nie opcjonalne
+          title: Wymagaj od nowych uÅ¼ytkownikÃ³w wypeÅ‚nienia tekstu proÅ›by o zaproszenie
       registrations_mode:
         modes:
           approved: PrzyjÄ™cie jest wymagane do rejestracji
@@ -697,8 +751,11 @@ pl:
       prefix_sign_up: Zarejestruj siÄ™ na Mastodon juÅ¼ dziÅ›!
       suffix: MajÄ…c konto, moÅ¼esz Å›ledziÄ‡ ludzi, publikowaÄ‡ wpisy i wymieniaÄ‡ siÄ™ wiadomoÅ›ciami z uÅ¼ytkownikami innych serwerÃ³w Mastodona i nie tylko!
     didnt_get_confirmation: Nie otrzymaÅ‚eÅ›(-aÅ›) instrukcji weryfikacji?
+    dont_have_your_security_key: Nie masz klucza bezpieczeÅ„stwa?
     forgot_password: Nie pamiÄ™tasz hasÅ‚a?
     invalid_reset_password_token: Token do resetowania hasÅ‚a jest nieprawidÅ‚owy lub utraciÅ‚ waÅ¼noÅ›Ä‡. SprÃ³buj uzyskaÄ‡ nowy.
+    link_to_otp: WprowadÅº kod dwustopniowego uwierzytelniania z telefonu lub uÅ¼yj zapasowego kodu
+    link_to_webauth: UÅ¼yj swojego urzÄ…dzenia z kluczem bezpieczeÅ„stwa
     login: Zaloguj siÄ™
     logout: Wyloguj siÄ™
     migrate_account: PrzenieÅ› konto
@@ -723,7 +780,9 @@ pl:
       functional: Twoje konto caÅ‚kowicie funkcjonuje.
       pending: Twoje zgÅ‚oszenie czeka na zatwierdzenie przez nas. MoÅ¼e to trochÄ™ potrwaÄ‡. JeÅ¼eli zgÅ‚oszenie zostanie przyjÄ™te, otrzymasz wiadomoÅ›Ä‡ e-mail.
       redirecting_to: Twoje konto jest nieaktywne, poniewaÅ¼ obecnie przekierowuje je na %{acct}.
+    too_fast: Zbyt szybko przesÅ‚ano formularz, sprÃ³buj ponownie.
     trouble_logging_in: Masz problem z zalogowaniem siÄ™?
+    use_security_key: UÅ¼yj klucza bezpieczeÅ„stwa
   authorize_follow:
     already_following: JuÅ¼ Å›ledzisz to konto
     already_requested: JuÅ¼ wysÅ‚aÅ‚eÅ›(-aÅ›) proÅ›bÄ™ o moÅ¼liwoÅ›Ä‡ Å›ledzenia tego konta
@@ -748,6 +807,7 @@ pl:
   date:
     formats:
       default: "%d. %b %Y"
+      with_month_name: "%d. %B %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}g"
@@ -812,6 +872,7 @@ pl:
       request: Uzyskaj archiwum
       size: Rozmiar
     blocks: Zablokowani
+    bookmarks: ZakÅ‚adki
     csv: CSV
     domain_blocks: Blokady domen
     lists: Listy
@@ -881,6 +942,8 @@ pl:
     status: Stan weryfikacji
     view_proof: WyÅ›wietl dowÃ³d
   imports:
+    errors:
+      over_rows_processing_limit: zawiera wiÄ™cej niÅ¼ %{count} wierszy
     modes:
       merge: PoÅ‚Ä…cz
       merge_long: Zachowaj obecne wpisy i dodaj nowe
@@ -890,6 +953,7 @@ pl:
     success: Twoje dane zostaÅ‚y zaÅ‚adowane i zostanÄ… niebawem przetworzone
     types:
       blocking: Lista blokowanych
+      bookmarks: ZakÅ‚adki
       domain_blocking: Lista zablokowanych domen
       following: Lista Å›ledzonych
       muting: Lista wyciszonych
@@ -960,6 +1024,10 @@ pl:
       redirect: Twoje obecne konto zostanie uaktualnione o informacjÄ™ o przeniesieniu i wyÅ‚Ä…czone z wyszukiwania
   moderation:
     title: Moderacja
+  move_handler:
+    carry_blocks_over_text: Ten uÅ¼ytkownik przeniÃ³sÅ‚ siÄ™ z konta %{acct}, ktÃ³re zablokowaÅ‚eÅ›(-aÅ›).
+    carry_mutes_over_text: Ten uÅ¼ytkownik przeniÃ³sÅ‚ siÄ™ z konta %{acct}, ktÃ³re wyciszyÅ‚eÅ›(-aÅ›).
+    copy_account_note_text: 'Ten uÅ¼ytkownik przeniÃ³sÅ‚ siÄ™ z konta %{acct}, oto Twoje poprzednie notatki o nim:'
   notification_mailer:
     digest:
       action: WyÅ›wietl wszystkie powiadomienia
@@ -1012,6 +1080,14 @@ pl:
           quadrillion: bld
           thousand: tys
           trillion: bln
+  otp_authentication:
+    code_hint: Aby potwierdziÄ‡, wprowadÅº kod wygenerowany przez aplikacjÄ™ uwierzytelniajÄ…cÄ…
+    description_html: JeÅ›li wÅ‚Ä…czysz <strong>uwierzytelnianie dwuetapowe</strong> uÅ¼ywajÄ…c aplikacji uwierzytelniajÄ…cej, logowanie siÄ™ bÄ™dzie wymagaÅ‚o podania tokenu wyÅ›wietlonego na Twoim telefonie.
+    enable: Aktywuj
+    instructions_html: "<strong>Zeskanuj ten kod QR na swoim telefonie za pomocÄ… Google Authenticator lub podobnej aplikacji TOTP</strong>. Od teraz bÄ™dzie ona generowaÅ‚a kody wymagane przy logowaniu."
+    manual_instructions: 'JeÅ›li nie moÅ¼esz zeskanowaÄ‡ kodu QR i musisz wprowadziÄ‡ go rÄ™cznie, oto klucz w formie tekstu:'
+    setup: Skonfiguruj
+    wrong_code: Wprowadzony kod jest nieprawidÅ‚owy! Czy czas serwera i urzÄ…dzenia jest poprawny?
   pagination:
     newer: Nowsze
     next: NastÄ™pna
@@ -1040,6 +1116,7 @@ pl:
   relationships:
     activity: AktywnoÅ›Ä‡ konta
     dormant: UÅ›pione
+    follow_selected_followers: Zacznij Å›ledziÄ‡ wybranych Å›ledzÄ…cych
     followers: ÅšledzÄ…cy
     following: Åšledzeni
     invited: Zaproszeni
@@ -1136,10 +1213,16 @@ pl:
     profile: Profil
     relationships: Åšledzeni i Å›ledzÄ…cy
     two_factor_authentication: Uwierzytelnianie dwuetapowe
+    webauthn_authentication: Klucze bezpieczeÅ„stwa
   spam_check:
     spam_detected: To zgÅ‚oszenie jest automatyczne. ZostaÅ‚ wykryty spam.
   statuses:
     attached:
+      audio:
+        few: "%{count} pliki dÅºwiÄ™kowe"
+        many: "%{count} plikÃ³w dÅºwiÄ™kowych"
+        one: "%{count} plik dÅºwiÄ™kowy"
+        other: pliki dÅºwiÄ™kowe (%{count})
       description: 'ZaÅ‚Ä…czono: %{attached}'
       image:
         few: "%{count} obrazy"
@@ -1181,6 +1264,8 @@ pl:
         other: "%{count} gÅ‚osy"
       vote: GÅ‚osuj
     show_more: PokaÅ¼ wiÄ™cej
+    show_newer: PokaÅ¼ nowsze
+    show_older: PokaÅ¼ starsze
     show_thread: PokaÅ¼ wÄ…tek
     sign_in_to_participate: Zaloguj siÄ™, aby udzieliÄ‡ siÄ™ w tej konwersacji
     title: '%{name}: "%{quote}"'
@@ -1289,21 +1374,20 @@ pl:
       default: "%d. %b %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Aby kontynuowaÄ‡, wprowadÅº kod wyÅ›wietlany przez aplikacjÄ™ uwierzytelniajÄ…cÄ…
-    description_html: JeÅ›li wÅ‚Ä…czysz <strong>uwierzytelnianie dwuetapowe</strong>, logowanie siÄ™ bÄ™dzie wymagaÅ‚o podania tokenu wyÅ›wietlonego na Twoim telefonie.
+    add: Dodaj
     disable: WyÅ‚Ä…cz
-    enable: WÅ‚Ä…cz
+    disabled_success: PomyÅ›lnie wyÅ‚Ä…czono uwierzytelnianie dwuetapowe
+    edit: Edytuj
     enabled: Uwierzytelnianie dwuetapowe jest wÅ‚Ä…czone
     enabled_success: PomyÅ›lnie aktywowano uwierzytelnianie dwuetapowe
     generate_recovery_codes: Generuj kody zapasowe
-    instructions_html: "<strong>Zeskanuj ten kod QR na swoim urzÄ…dzeniu za pomocÄ… Google Authenticator, FreeOTP lub podobnej aplikacji</strong>. Od teraz bÄ™dzie ona generowaÅ‚a kody wymagane przy logowaniu."
     lost_recovery_codes: Kody zapasowe pozwolÄ… uzyskaÄ‡ dostÄ™p do portalu, jeÅ¼eli utracisz dostÄ™p do telefonu. JeÅ¼eli utracisz dostÄ™p do nich, moÅ¼esz wygenerowaÄ‡ je ponownie tutaj. Poprzednie zostanÄ… uniewaÅ¼nione.
-    manual_instructions: 'JeÅ¼eli nie moÅ¼esz zeskanowaÄ‡ kodu QR, musisz wprowadziÄ‡ ten kod rÄ™cznie:'
+    methods: Metody uwierzytelniania dwuetapowego
+    otp: Aplikacja uwierzytelniajÄ…ca
     recovery_codes: PrzywrÃ³Ä‡ kody zapasowe
     recovery_codes_regenerated: PomyÅ›lnie wygenerowano ponownie kody zapasowe
     recovery_instructions_html: JeÅ¼eli kiedykolwiek utracisz dostÄ™p do telefonu, moÅ¼esz wykorzystaÄ‡ jeden z kodÃ³w zapasowych, aby odzyskaÄ‡ dostÄ™p do konta. <strong>Trzymaj je w bezpiecznym miejscu</strong>. Na przykÅ‚ad, wydrukuj je i przechowuj z waÅ¼nymi dokumentami.
-    setup: Skonfiguruj
-    wrong_code: Wprowadzony kod jest niepoprawny! Czy czas serwera i urzÄ…dzenia jest poprawny?
+    webauthn: Klucze bezpieczeÅ„stwa
   user_mailer:
     backup_ready:
       explanation: ZaÅ¼Ä…daÅ‚eÅ› peÅ‚nej kopii zapasowej konta na Mastodonie. Jest ona dostÄ™pna do pobrania!
@@ -1318,6 +1402,7 @@ pl:
     warning:
       explanation:
         disable: Kiedy Twoje konto jest wyÅ‚Ä…czone, Twoje dane pozostajÄ… na serwerze, ale nie moÅ¼esz wykonywaÄ‡ Å¼adnych dziaÅ‚aÅ„, zanim zostanie odblokowane.
+        sensitive: WysyÅ‚ane przez Ciebie pliki multimedialne i media z odnoÅ›nikÃ³w bÄ™dÄ… traktowane jako wraÅ¼liwe.
         silence: Kiedy Twoje konto jest ograniczone, tylko osoby ktÃ³re je Å›ledzÄ… bÄ™dÄ… widzieÄ‡ Twoje wpisy. MoÅ¼e ono teÅ¼ przestaÄ‡ byÄ‡ widoczne na publicznych listach. Inni wciÄ…Å¼ mogÄ… zaczÄ…Ä‡ CiÄ™ Å›ledziÄ‡.
         suspend: Twoje konto zostaÅ‚o zawieszone i wszystkie Twoje wpisy wraz z zawartoÅ›ciÄ… multimedialnÄ… zostaÅ‚y nieodwracalnie usuniÄ™te z tego serwera i serwerÃ³w, ktÃ³rych uÅ¼ytkownicy Å›ledzili CiÄ™.
       get_in_touch: MoÅ¼esz odpowiedzieÄ‡ na ten e-mail aby pozostaÄ‡ w kontakcie z prowadzÄ…cymi %{instance}.
@@ -1326,11 +1411,13 @@ pl:
       subject:
         disable: Twoje konto %{acct} zostaÅ‚o wyÅ‚Ä…czone
         none: OstrzeÅ¼enie dla %{acct}
+        sensitive: ZawartoÅ›Ä‡ multimedialna publikowana przez Twoje konto %{acct} zostaÅ‚a oznaczona jako wraÅ¼liwa
         silence: Twoje konto %{acct} zostaÅ‚o ograniczone
         suspend: Twoje konto %{acct} zostaÅ‚o zawieszone
       title:
         disable: Konto wyÅ‚Ä…czone
         none: OstrzeÅ¼enie
+        sensitive: Twoja zawartoÅ›Ä‡ multimedialna zostaÅ‚a oznaczona jako wraÅ¼liwa
         silence: Konto ograniczone
         suspend: Konto zawieszone
     welcome:
@@ -1351,9 +1438,11 @@ pl:
       tips: WskazÃ³wki
       title: Witaj na pokÅ‚adzie, %{name}!
   users:
+    blocked_email_provider: Ten dostawca e-mail jest niedozwolony
     follow_limit_reached: Nie moÅ¼esz Å›ledziÄ‡ wiÄ™cej niÅ¼ %{limit} osÃ³b
     generic_access_help_html: Nie moÅ¼esz uzyskaÄ‡ dostÄ™pu do konta? Skontaktuj siÄ™ z %{email} aby uzyskaÄ‡ pomoc
     invalid_email: Adres e-mail jest niepoprawny
+    invalid_email_mx: Ten adres e-mail wydaje siÄ™ nie istnieÄ‡
     invalid_otp_token: Kod uwierzytelniajÄ…cy jest niepoprawny
     invalid_sign_in_token: NieprawidÅ‚owy kod zabezpieczajÄ…cy
     otp_lost_help_html: JeÅ¼eli utracisz dostÄ™p do obu, moÅ¼esz skontaktowaÄ‡ siÄ™ z %{email}
@@ -1363,3 +1452,20 @@ pl:
   verification:
     explanation_html: 'MoÅ¼esz <strong>zweryfikowaÄ‡ siebie jako wÅ‚aÅ›ciciela stron, do ktÃ³rych odnoÅ›niki znajdujÄ… siÄ™ w metadanych</strong>. Aby to zrobiÄ‡, strona musi zawieraÄ‡ odnoÅ›nik do Twojego profilu na Mastodonie. OdnoÅ›nik <strong>musi</strong> zawieraÄ‡ atrybut <code>rel="me"</code>. Jego zawartoÅ›Ä‡ nie ma znaczenia. PrzykÅ‚ad:'
     verification: Weryfikacja
+  webauthn_credentials:
+    add: Dodaj nowy klucz bezpieczeÅ„stwa
+    create:
+      error: WystÄ…piÅ‚ problem z dodawaniem klucza bezpieczeÅ„stwa. SprÃ³buj ponownie.
+      success: PomyÅ›lnie dodano klucz bezpieczeÅ„stwa.
+    delete: UsuÅ„
+    delete_confirmation: Czy jesteÅ› pewien, Å¼e chcesz usunÄ…Ä‡ ten klucz bezpieczeÅ„stwa?
+    description_html: JeÅ›li wÅ‚Ä…czysz <strong>uwierzytelnianie kluczem bezpieczeÅ„stwa</strong>, logowanie bÄ™dzie wymagaÅ‚o uÅ¼ycia jednego z kluczy bezpieczeÅ„stwa.
+    destroy:
+      error: WystÄ…piÅ‚ problem z usuwaniem klucza bezpieczeÅ„stwa. SprÃ³buj ponownie.
+      success: PomyÅ›lnie usuniÄ™to klucz bezpieczeÅ„stwa.
+    invalid_credential: NieprawidÅ‚owy klucz bezpieczeÅ„stwa
+    nickname_hint: WprowadÅº nazwÄ™ twojego nowego klucza bezpieczeÅ„stwa
+    not_enabled: Nie wÅ‚Ä…czyÅ‚eÅ› WebAuthn
+    not_supported: Twoja przeglÄ…darka nie obsÅ‚uguje kluczy bezpieczeÅ„stwa
+    otp_required: Aby uÅ¼yÄ‡ kluczy bezpieczeÅ„stwa, najpierw wÅ‚Ä…cz uwierzytelnianie dwuskÅ‚adnikowe.
+    registered_on: Zarejestrowano %{date}
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 2e2a8d4eb7d508ae9f3d9c09ad736eda917ab7e5..529548225a8c5484417064aebea3103d3bfa640e 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -60,6 +60,7 @@ pt-BR:
       one: Seguidor
       other: Seguidores
     following: Seguindo
+    instance_actor_flash: Esta conta Ã© um ator virtual usado para representar o prÃ³prio servidor e nÃ£o um usuÃ¡rio individual. Ã‰ utilizada para fins de federaÃ§Ã£o e nÃ£o deve ser suspensa.
     joined: Entrou em %{date}
     last_active: Ãºltima atividade
     link_verified_on: O link foi verificado em %{date}
@@ -98,6 +99,7 @@ pt-BR:
       add_email_domain_block: Adicionar o domÃnio de e-mail Ã  lista negra
       approve: Aprovar
       approve_all: Aprovar tudo
+      approved_msg: Aprovado com sucesso o pedido de registro de %{username}
       are_you_sure: VocÃª tem certeza?
       avatar: Imagem de perfil
       by_domain: DomÃnio
@@ -111,9 +113,11 @@ pt-BR:
       confirm: Confirmar
       confirmed: Confirmado
       confirming: Confirmando
+      delete: Excluir dados
       deleted: ExcluÃdo
       demote: Rebaixar
-      disable: Desativar
+      destroyed_msg: Os dados de %{username} estÃ£o na fila para serem excluÃdos em breve
+      disable: Congelar
       disable_two_factor_authentication: Desativar autenticaÃ§Ã£o de dois fatores
       disabled: Desativada
       display_name: Nome de exibiÃ§Ã£o
@@ -121,12 +125,14 @@ pt-BR:
       edit: Editar
       email: E-mail
       email_status: Status do e-mail
-      enable: Ativar
+      enable: Descongelar
       enabled: Ativada
+      enabled_msg: Descongelada com sucesso a conta de %{username}
       followers: Seguidores
       follows: Seguindo
       header: Capa
       inbox_url: URL da caixa de entrada
+      invite_request_text: Motivos para entrar
       invited_by: Convidado por
       ip: IP
       joined: Entrou
@@ -138,6 +144,8 @@ pt-BR:
       login_status: SituaÃ§Ã£o da conta
       media_attachments: MÃdias anexadas
       memorialize: Converter em memorial
+      memorialized: Convertidas em memorial
+      memorialized_msg: Transformou com sucesso %{username} em uma conta memorial
       moderation:
         active: Ativo
         all: Todos
@@ -158,10 +166,14 @@ pt-BR:
       public: PÃºblico
       push_subscription_expires: InscriÃ§Ã£o PuSH expira
       redownload: Atualizar perfil
+      redownloaded_msg: Atualizado com sucesso o perfil de %{username} a partir da origem
       reject: Vetar
       reject_all: Vetar tudo
+      rejected_msg: Rejeitado com sucesso o pedido de registro de %{username}
       remove_avatar: Remover imagem de perfil
       remove_header: Remover capa
+      removed_avatar_msg: Removida com sucesso a imagem de avatar de %{username}
+      removed_header_msg: Removida com sucesso a imagem de capa de %{username}
       resend_confirmation:
         already_confirmed: Este usuÃ¡rio jÃ¡ estÃ¡ confirmado
         send: Reenviar o e-mail de confirmaÃ§Ã£o
@@ -178,6 +190,8 @@ pt-BR:
       search: Pesquisar
       search_same_email_domain: Outros usuÃ¡rios com o mesmo domÃnio de e-mail
       search_same_ip: Outros usuÃ¡rios com o mesmo IP
+      sensitive: SensÃveis
+      sensitized: marcadas como sensÃveis
       shared_inbox_url: Link da caixa de entrada compartilhada
       show:
         created_reports: DenÃºncias desta conta
@@ -187,13 +201,19 @@ pt-BR:
       statuses: Toots
       subscribe: Inscrever-se
       suspended: Banido
+      suspension_irreversible: Os dados desta conta foram excluÃdos de forma irreversÃvel. VocÃª pode remover a suspensÃ£o da conta para tornÃ¡-la utilizÃ¡vel, mas ela nÃ£o irÃ¡ recuperar nenhum dado que ela possuÃa anteriormente.
+      suspension_reversible_hint_html: A conta foi suspensa e os dados serÃ£o totalmente removidos em %{date}. AtÃ© lÃ¡, a conta pode ser restaurada sem nenhum efeito negativo. Se vocÃª deseja remover todos os dados da conta imediatamente, vocÃª pode fazer isso abaixo.
       time_in_queue: Esperando na fila por %{time}
       title: Contas
       unconfirmed_email: E-mail nÃ£o confirmado
+      undo_sensitized: Desfazer sensÃvel
       undo_silenced: Desfazer silÃªncio
       undo_suspension: Desbanir
+      unsilenced_msg: Removidas com sucesso as limitaÃ§Ãµes da conta de %{username}
       unsubscribe: Cancelar inscriÃ§Ã£o
+      unsuspended_msg: Removida com sucesso a suspensÃ£o da conta de %{username}
       username: Nome de usuÃ¡rio
+      view_domain: Ver resumo para o domÃnio
       warn: Notificar
       web: Web
       whitelisted: Permitido
@@ -208,31 +228,36 @@ pt-BR:
         create_domain_allow: Adicionar domÃnio permitido
         create_domain_block: Criar Bloqueio de DomÃnio
         create_email_domain_block: Criar Bloqueio de DomÃnio de E-mail
+        create_ip_block: Criar regra de IP
         demote_user: Rebaixar usuÃ¡rio
         destroy_announcement: Excluir anÃºncio
         destroy_custom_emoji: Excluir emoji personalizado
         destroy_domain_allow: Excluir domÃnio permitido
         destroy_domain_block: Excluir Bloqueio de DomÃnio
         destroy_email_domain_block: Excluir bloqueio de domÃnio de e-mail
+        destroy_ip_block: Excluir regra de IP
         destroy_status: Excluir Status
         disable_2fa_user: Desativar autenticaÃ§Ã£o de dois fatores
         disable_custom_emoji: Desativar Emoji Personalizado
         disable_user: Desativar usuÃ¡rio
         enable_custom_emoji: Ativar Emoji Personalizado
         enable_user: Ativar usuÃ¡rio
-        memorialize_account: Memorizar Conta
+        memorialize_account: Converter conta em memorial
         promote_user: Promover usuÃ¡rio
         remove_avatar_user: Remover Avatar
         reopen_report: Reabrir RelatÃ³rio
         reset_password_user: Redefinir a senha
         resolve_report: Resolver RelatÃ³rio
+        sensitive_account: Marcar a mÃdia na sua conta como sensÃvel
         silence_account: Silenciar conta
         suspend_account: Suspender Conta
         unassigned_report: Remover relatÃ³rio
+        unsensitive_account: Desmarcar a mÃdia na sua conta como sensÃvel
         unsilence_account: Desfazer silenciar conta
         unsuspend_account: Remover suspensÃ£o de conta
         update_announcement: Editar anÃºncio
         update_custom_emoji: Editar Emoji Personalizado
+        update_domain_block: Atualizar bloqueio de domÃnio
         update_status: Editar Status
       actions:
         assigned_to_self_report: "%{name} pegou a denÃºncia %{target}"
@@ -244,31 +269,36 @@ pt-BR:
         create_domain_allow: "%{name} permitiu %{target}"
         create_domain_block: "%{name} bloqueou %{target}"
         create_email_domain_block: "%{name} adicionou o domÃnio de e-mail %{target} Ã  lista negra"
+        create_ip_block: "%{name} criou regra para o IP %{target}"
         demote_user: "%{name} rebaixou o usuÃ¡rio %{target}"
         destroy_announcement: "%{name} excluiu o anÃºncio %{target}"
         destroy_custom_emoji: "%{name} excluiu emoji %{target}"
         destroy_domain_allow: "%{name} bloqueou %{target}"
         destroy_domain_block: "%{name} desbloqueou %{target}"
         destroy_email_domain_block: "%{name} adicionou domÃnio de e-mail %{target} Ã  lista branca"
+        destroy_ip_block: "%{name} excluiu regra para o IP %{target}"
         destroy_status: "%{name} excluiu toot de %{target}"
         disable_2fa_user: "%{name} desativou a exigÃªncia de autenticaÃ§Ã£o de dois fatores para o usuÃ¡rio %{target}"
         disable_custom_emoji: "%{name} desativou o emoji %{target}"
         disable_user: "%{name} desativou o acesso para o usuÃ¡rio %{target}"
         enable_custom_emoji: "%{name} ativou o emoji %{target}"
         enable_user: "%{name} ativou o acesso para o usuÃ¡rio %{target}"
-        memorialize_account: "%{name} transformou a conta de %{target} em um memorial"
+        memorialize_account: "%{name} transformou a conta de %{target} em um pÃ¡gina de memorial"
         promote_user: "%{name} promoveu o usuÃ¡rio %{target}"
         remove_avatar_user: "%{name} removeu a imagem de perfil de %{target}"
         reopen_report: "%{name} reabriu a denÃºncia %{target}"
         reset_password_user: "%{name} redefiniu a senha do usuÃ¡rio %{target}"
         resolve_report: "%{name} resolveu a denÃºncia %{target}"
+        sensitive_account: "%{name} marcou a mÃdia de %{target} como sensÃvel"
         silence_account: "%{name} silenciou a conta de %{target}"
         suspend_account: "%{name} baniu a conta de %{target}"
         unassigned_report: "%{name} largou a denÃºncia %{target}"
+        unsensitive_account: "%{name} desmarcou a mÃdia de %{target} como sensÃvel"
         unsilence_account: "%{name} desativou o silÃªncio de %{target}"
         unsuspend_account: "%{name} removeu a suspensÃ£o da conta de %{target}"
         update_announcement: "%{name} atualizou o anÃºncio %{target}"
         update_custom_emoji: "%{name} atualizou o emoji %{target}"
+        update_domain_block: "%{name} atualizou o bloqueio de domÃnio para %{target}"
         update_status: "%{name} atualizou o status de %{target}"
       deleted_status: "(status excluÃdo)"
       empty: Nenhum registro encontrado.
@@ -391,7 +421,7 @@ pt-BR:
           other: "%{count} contas no banco de dados foram afetadas"
         retroactive:
           silence: Dessilenciar contas existentes afetadas deste domÃnio
-          suspend: Dessuspender contas existentes afetadas deste domÃnio
+          suspend: Remover a suspensÃ£o das contas afetadas deste domÃnio
         title: Desfazer bloqueio de domÃnio para %{domain}
         undo: Desfazer
       undo: Desfazer bloqueio de domÃnio
@@ -411,6 +441,7 @@ pt-BR:
     instances:
       by_domain: DomÃnio
       delivery_available: Envio disponÃvel
+      empty: Nenhum domÃnio encontrado.
       known_accounts:
         one: "%{count} conta conhecida"
         other: "%{count} contas conhecidas"
@@ -434,6 +465,21 @@ pt-BR:
         expired: Expirado
         title: Filtro
       title: Convites
+    ip_blocks:
+      add_new: Criar regra
+      created_msg: Nova regra de IP adicionada com sucesso
+      delete: Excluir
+      expires_in:
+        '1209600': 2 semanas
+        '15778476': 6 meses
+        '2629746': 1 mÃªs
+        '31556952': 1 ano
+        '86400': 1 dia
+        '94670856': 3 anos
+      new:
+        title: Criar nova regra de IP
+      no_ip_block_selected: Nenhuma regra de IP foi alterada pois nenhuma foi selecionada
+      title: Regras de IP
     pending_accounts:
       title: Contas pendentes (%{count})
     relationships:
@@ -473,6 +519,8 @@ pt-BR:
       comment:
         none: Nenhum
       created_at: Denunciado
+      forwarded: Encaminhados
+      forwarded_to: Encaminhado para %{domain}
       mark_as_resolved: Marcar como resolvido
       mark_as_unresolved: Marcar como nÃ£o resolvido
       notes:
@@ -542,6 +590,9 @@ pt-BR:
         min_invite_role:
           disabled: NinguÃ©m
           title: Permitir convites de
+        require_invite_text:
+          desc_html: Quando o cadastro de novas contas exigir aprovaÃ§Ã£o manual, tornar obrigatÃ³rio, ao invÃ©s de opcional, o texto de solicitaÃ§Ã£o de convite em "Por que vocÃª deseja criar uma conta aqui?"
+          title: Exigir que novos usuÃ¡rios preencham um texto de solicitaÃ§Ã£o de convite
       registrations_mode:
         modes:
           approved: AprovaÃ§Ã£o necessÃ¡ria para criar conta
@@ -681,8 +732,11 @@ pt-BR:
       prefix_sign_up: Crie uma conta no Mastodon hoje!
       suffix: Com uma conta, vocÃª poderÃ¡ seguir pessoas, postar atualizaÃ§Ãµes, trocar mensagens com usuÃ¡rios de qualquer instÃ¢ncia Mastodon e muito mais!
     didnt_get_confirmation: NÃ£o recebeu instruÃ§Ãµes de confirmaÃ§Ã£o?
+    dont_have_your_security_key: NÃ£o estÃ¡ com a sua chave de seguranÃ§a?
     forgot_password: Esqueceu a sua senha?
     invalid_reset_password_token: CÃ³digo de alteraÃ§Ã£o de senha Ã© invÃ¡lido ou expirou. Por favor, solicite um novo.
+    link_to_otp: Digite um cÃ³digo de duas etapas do seu telefone ou um cÃ³digo de recuperaÃ§Ã£o
+    link_to_webauth: Use seu dispositivo de chave de seguranÃ§a
     login: Entrar
     logout: Sair
     migrate_account: Mudar-se para outra conta
@@ -707,7 +761,9 @@ pt-BR:
       functional: Sua conta estÃ¡ totalmente operacional.
       pending: Sua solicitaÃ§Ã£o estÃ¡ com revisÃ£o pendente por parte de nossa equipe. VocÃª receberÃ¡ um e-mail se ela for aprovada.
       redirecting_to: Sua conta estÃ¡ inativa porque atualmente estÃ¡ redirecionando para %{acct}.
+    too_fast: O formulÃ¡rio foi enviado muito rapidamente, tente novamente.
     trouble_logging_in: Problemas para entrar?
+    use_security_key: Usar chave de seguranÃ§a
   authorize_follow:
     already_following: VocÃª jÃ¡ segue
     already_requested: VocÃª jÃ¡ enviou uma solicitaÃ§Ã£o para seguir esta conta
@@ -732,6 +788,7 @@ pt-BR:
   date:
     formats:
       default: "%d %b, %Y"
+      with_month_name: "%d de %b de %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}h"
@@ -796,6 +853,7 @@ pt-BR:
       request: Solicitar o seu arquivo
       size: Tamanho
     blocks: VocÃª bloqueou
+    bookmarks: Marcadores
     csv: CSV
     domain_blocks: Bloqueios de domÃnio
     lists: Listas
@@ -872,6 +930,7 @@ pt-BR:
     success: Os seus dados foram enviados com sucesso e serÃ£o processados em instantes
     types:
       blocking: Lista de bloqueio
+      bookmarks: Marcadores
       domain_blocking: Lista de domÃnios bloqueados
       following: Pessoas que vocÃª segue
       muting: Lista de silenciados
@@ -992,6 +1051,14 @@ pt-BR:
           quadrillion: QUA
           thousand: MIL
           trillion: TRI
+  otp_authentication:
+    code_hint: Digite o cÃ³digo gerado pelo seu aplicativo autenticador para confirmar
+    description_html: Se vocÃª habilitar a <strong>autenticaÃ§Ã£o de dois fatores</strong> usando um aplicativo autenticador, o login exigirÃ¡ que vocÃª esteja com o seu telefone, que gerarÃ¡ tokens para vocÃª entrar.
+    enable: Habilitar
+    instructions_html: "<strong>Escaneie este cÃ³digo QR no Google Authenticator ou em um aplicativo TOTP similar no seu telefone</strong>. A partir de agora, esse aplicativo irÃ¡ gerar tokens que vocÃª terÃ¡ que digitar ao fazer login."
+    manual_instructions: 'Se vocÃª nÃ£o pode escanear o cÃ³digo QR e precisa digitÃ¡-lo manualmente, aqui estÃ¡ o segredo em texto:'
+    setup: Configurar
+    wrong_code: O cÃ³digo digitado Ã© invÃ¡lido! O horÃ¡rio do servidor e o horÃ¡rio do dispositivo estÃ£o corretos?
   pagination:
     newer: Mais novo
     next: PrÃ³ximo
@@ -1020,6 +1087,7 @@ pt-BR:
   relationships:
     activity: Atividade da conta
     dormant: Inativo
+    follow_selected_followers: Seguir os seguidores selecionados
     followers: Seguidores
     following: Seguindo
     invited: Convidado
@@ -1116,6 +1184,7 @@ pt-BR:
     profile: Perfil
     relationships: Seguindo e seguidores
     two_factor_authentication: AutenticaÃ§Ã£o de dois fatores
+    webauthn_authentication: Chaves de seguranÃ§a
   spam_check:
     spam_detected: Esta Ã© uma denÃºncia automÃ¡tica. Spam foi detectado.
   statuses:
@@ -1154,6 +1223,8 @@ pt-BR:
         other: "%{count} votos"
       vote: Votar
     show_more: Mostrar mais
+    show_newer: Mostrar mais recentes
+    show_older: Mostrar mais antigos
     show_thread: Mostrar conversa
     sign_in_to_participate: Entre para participar dessa conversa
     title: '%{name}: "%{quote}"'
@@ -1262,21 +1333,20 @@ pt-BR:
       default: "%H:%M em %d de %b de %Y"
       month: "%b de %Y"
   two_factor_authentication:
-    code_hint: Digite o cÃ³digo de dois fatores gerado pelo aplicativo no seu celular
-    description_html: Se vocÃª ativar a <strong>autenticaÃ§Ã£o de dois fatores</strong>, o acesso Ã  sua conta exigirÃ¡ um celular, que gerarÃ¡ cÃ³digos para validaÃ§Ã£o.
+    add: Adicionar
     disable: Desativar
-    enable: Ativar
+    disabled_success: AutenticaÃ§Ã£o de dois fatores desabilitada com sucesso
+    edit: Editar
     enabled: AutenticaÃ§Ã£o de dois fatores ativada
     enabled_success: AutenticaÃ§Ã£o de dois fatores ativada com sucesso
     generate_recovery_codes: Gerar cÃ³digos de recuperaÃ§Ã£o
-    instructions_html: "<strong>Escaneie este QR Code no Google Authenticator ou aplicativo TOTP similar no seu celular</strong>. De agora em diante, este aplicativo gerarÃ¡ cÃ³digos que vocÃª terÃ¡ que inserir ao entrar na sua conta."
     lost_recovery_codes: CÃ³digos de recuperaÃ§Ã£o permitem que vocÃª recupere o acesso Ã  sua conta caso perca o seu celular. Se vocÃª perdeu seus cÃ³digos de recuperaÃ§Ã£o, vocÃª pode gerÃ¡-los novamente aqui. Seus cÃ³digos de recuperaÃ§Ã£o anteriores serÃ£o invalidados.
-    manual_instructions: 'Se vocÃª nÃ£o consegue escanear o QR code, aqui estÃ¡ o segredo em texto:'
+    methods: MÃ©todos de dois fatores
+    otp: Aplicativo autenticador
     recovery_codes: CÃ³digos de recuperaÃ§Ã£o de reserva
     recovery_codes_regenerated: CÃ³digos de recuperaÃ§Ã£o gerados com sucesso
     recovery_instructions_html: Se vocÃª perder acesso ao seu celular, vocÃª pode usar um dos cÃ³digos de recuperaÃ§Ã£o abaixo para acessar a sua conta. <strong>Mantenha os cÃ³digos de recuperaÃ§Ã£o em um local seguro</strong>. Por exemplo, vocÃª pode imprimi-los e guardÃ¡-los junto com outros documentos importantes.
-    setup: Configurar
-    wrong_code: CÃ³digo de dois fatores invÃ¡lido. O horÃ¡rio da instÃ¢ncia e o horÃ¡rio do seu celular estÃ£o corretos?
+    webauthn: Chaves de seguranÃ§a
   user_mailer:
     backup_ready:
       explanation: VocÃª pediu um backup completo da sua conta no Mastodon. E agora estÃ¡ pronto para ser baixado!
@@ -1291,6 +1361,7 @@ pt-BR:
     warning:
       explanation:
         disable: Enquanto sua conta estÃ¡ congelada, seus dados de conta permanecem intactos, mas vocÃª nÃ£o pode realizar nenhuma aÃ§Ã£o atÃ© que esteja destrancada.
+        sensitive: Seus arquivos de mÃdia carregados e mÃdias vinculadas serÃ£o tratados como sensÃveis.
         silence: Enquanto sua conta estÃ¡ silenciada, somente pessoas que jÃ¡ estÃ£o seguindo vocÃª poderÃ£o ver seus toots nessa instÃ¢ncia, e vocÃª pode ser excluÃdo de vÃ¡rias listas pÃºblicas. No entanto, outros ainda podem te seguir manualmente.
         suspend: Sua conta foi banida e todos os seus toots e mÃdias foram irreversivelmente excluÃdos desta instÃ¢ncia e das instÃ¢ncias dos seus seguidores.
       get_in_touch: VocÃª pode responder a este e-mail para entrar em contato com a equipe de %{instance}.
@@ -1299,16 +1370,18 @@ pt-BR:
       subject:
         disable: Sua conta %{acct} foi bloqueada
         none: Aviso para %{acct}
+        sensitive: Sua conta %{acct} de postagem de mÃdia foi marcada como sensÃvel
         silence: Sua conta %{acct} foi silenciada
         suspend: Sua conta %{acct} foi banida
       title:
         disable: Conta bloqueada
         none: Aviso
+        sensitive: Sua mÃdia foi marcada como sensÃvel
         silence: Conta silenciada
         suspend: Conta banida
     welcome:
       edit_profile_action: Configurar perfil
-      edit_profile_step: VocÃª pode customizar o seu perfil ao fazer upload de um avatar, header, alterar seu nome de exibiÃ§Ã£o e mais. Se vocÃª preferir revisar novos seguidores antes de poderem te seguir, vocÃª pode trancar a sua conta.
+      edit_profile_step: VocÃª pode personalizar o seu perfil enviando um avatar, uma capa, alterando seu nome de exibiÃ§Ã£o e etc. Se vocÃª preferir aprovar seus novos seguidores antes de eles te seguirem, vocÃª pode trancar a sua conta.
       explanation: Aqui estÃ£o algumas dicas para vocÃª comeÃ§ar
       final_action: Comece a tootar
       final_step: 'Comece a tootar! Mesmo sem seguidores, suas mensagens pÃºblicas podem ser vistas pelos outros, por exemplo, na linha local e nas hashtags. VocÃª pode querer fazer uma introduÃ§Ã£o usando a hashtag #introduÃ§Ã£o, ou em inglÃªs usando a hashtag #introductions.'
@@ -1324,9 +1397,11 @@ pt-BR:
       tips: Dicas
       title: Boas vindas, %{name}!
   users:
+    blocked_email_provider: Este provedor de e-mail nÃ£o Ã© permitido
     follow_limit_reached: VocÃª nÃ£o pode seguir mais de %{limit} pessoas
     generic_access_help_html: Problemas para acessar sua conta? VocÃª pode entrar em contato com %{email} para obter ajuda
     invalid_email: EndereÃ§o de e-mail invÃ¡lido
+    invalid_email_mx: O endereÃ§o de e-mail parece nÃ£o existir
     invalid_otp_token: CÃ³digo de dois fatores invÃ¡lido
     invalid_sign_in_token: CÃ³gido de seguranÃ§a invÃ¡lido
     otp_lost_help_html: Se vocÃª perder o acesso Ã  ambos, vocÃª pode entrar em contato com %{email}
@@ -1336,3 +1411,20 @@ pt-BR:
   verification:
     explanation_html: 'VocÃª pode <strong>verificar os links nos metadados do seu perfil</strong>. Para isso, o site citado deve conter um link de volta para o seu perfil do Mastodon. O link de volta <strong>deve</strong> conter um atributo <code>rel="me"</code>. O conteÃºdo ou texto do link nÃ£o importa. Aqui estÃ¡ um exemplo:'
     verification: VerificaÃ§Ã£o
+  webauthn_credentials:
+    add: Adicionar nova chave de seguranÃ§a
+    create:
+      error: Houve um problema ao adicionar sua chave de seguranÃ§a. Tente novamente.
+      success: A sua chave de seguranÃ§a foi adicionada com sucesso.
+    delete: Excluir
+    delete_confirmation: VocÃª tem certeza de que deseja excluir esta chave de seguranÃ§a?
+    description_html: Se vocÃª habilitar a <strong>autenticaÃ§Ã£o por chave de seguranÃ§a</strong>, o login exigirÃ¡ que vocÃª use uma das suas chaves de seguranÃ§a.
+    destroy:
+      error: Houve um problema ao excluir sua chave de seguranÃ§a. Tente novamente.
+      success: Sua chave de seguranÃ§a foi excluÃda com sucesso.
+    invalid_credential: Chave de seguranÃ§a invÃ¡lida
+    nickname_hint: Digite o apelido da sua nova chave de seguranÃ§a
+    not_enabled: VocÃª ainda nÃ£o habilitou o WebAuthn
+    not_supported: Este navegador nÃ£o tem suporte a chaves de seguranÃ§a
+    otp_required: Para usar chaves de seguranÃ§a, por favor habilite primeiro a autenticaÃ§Ã£o de dois fatores.
+    registered_on: Registrado em %{date}
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 0d04bc358ebdf2a0a87904fa421f1efdbb2be4e9..f7b47fb10e5aacc880ff704de887ce3cc8bfe576 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -60,6 +60,7 @@ pt-PT:
       one: Seguidor
       other: Seguidores
     following: A seguir
+    instance_actor_flash: Esta conta Ã© um actor virtual usado para representar a prÃ³pria instÃ¢ncia e nÃ£o um utilizador individual. Ã‰ usada para motivos de federaÃ§Ã£o e nÃ£o deve ser suspenso.
     joined: Aderiu %{date}
     last_active: Ãºltima vez activo
     link_verified_on: A posse deste link foi verificada em %{date}
@@ -79,7 +80,7 @@ pt-PT:
     posts_with_replies: Posts e Respostas
     reserved_username: Este nome de utilizadores Ã© reservado
     roles:
-      admin: Administrador
+      admin: Administrador(a)
       bot: RobÃ´
       group: Grupo
       moderator: Moderador
@@ -90,14 +91,15 @@ pt-PT:
       action: Executar acÃ§Ã£o
       title: Executar acÃ§Ã£o de moderaÃ§Ã£o em %{acct}
     account_moderation_notes:
-      create: Criar
+      create: Criar nota
       created_msg: Nota de moderaÃ§Ã£o criada com sucesso!
       delete: Eliminar
       destroyed_msg: Nota de moderaÃ§Ã£o excluÃda com sucesso!
     accounts:
-      add_email_domain_block: Adicione o domÃnio de email Ã  lista negra
+      add_email_domain_block: Adicionar o domÃnio de email Ã  lista negra
       approve: Aprovar
       approve_all: Aprovar todos
+      approved_msg: InscriÃ§Ã£o de %{username} aprovada com sucesso
       are_you_sure: Tens a certeza?
       avatar: Imagem de Perfil
       by_domain: DomÃnio
@@ -108,26 +110,30 @@ pt-PT:
         new_email: Novo e-mail
         submit: Alterar e-mail
         title: Alterar e-mail para %{username}
-      confirm: Confirme
+      confirm: Confirmar
       confirmed: Confirmado
-      confirming: Confirmer
+      confirming: A confirmar
+      delete: Eliminar dados
       deleted: Apagada
       demote: Rebaixar
+      destroyed_msg: Os dados de %{username} estÃ£o agora em fila de espera para serem eliminados de imediato
       disable: Desativar
       disable_two_factor_authentication: Desativar 2FA
-      disabled: Desativado
+      disabled: Congelada
       display_name: Nome a mostrar
       domain: DomÃnio
       edit: Editar
       email: E-mail
-      email_status: Estado do correio electrÃ³nico
+      email_status: Estado do e-mail
       enable: Ativar
       enabled: Ativado
+      enabled_msg: Descongelou com sucesso a conta %{username}
       followers: Seguidores
-      follows: Seguindo
+      follows: A seguir
       header: CabeÃ§alho
       inbox_url: URL da caixa de entrada
-      invited_by: Convidado por
+      invite_request_text: RazÃµes para se juntar a nÃ³s
+      invited_by: Convidado(a) por
       ip: IP
       joined: Aderiu
       location:
@@ -138,6 +144,8 @@ pt-PT:
       login_status: Estado de inÃcio de sessÃ£o
       media_attachments: Anexos de media
       memorialize: Converter em memorial
+      memorialized: Em memÃ³ria
+      memorialized_msg: Conta %{username} transformada com sucesso em memorial
       moderation:
         active: Activo
         all: Todos
@@ -158,10 +166,14 @@ pt-PT:
       public: PÃºblico
       push_subscription_expires: A InscriÃ§Ã£o PuSH expira
       redownload: Atualizar perfil
+      redownloaded_msg: Atualizado com sucesso o perfil de %{username} da origem
       reject: Rejeitar
       reject_all: Rejeitar todas
+      rejected_msg: InscriÃ§Ã£o de %{username} rejeitada com sucesso
       remove_avatar: Remover a imagem de perfil
       remove_header: Remover o cabeÃ§alho
+      removed_avatar_msg: Imagem de perfil de %{username} removida com sucesso
+      removed_header_msg: Imagem de cabeÃ§alho de %{username} removida com sucesso
       resend_confirmation:
         already_confirmed: Este utilizador jÃ¡ estÃ¡ confirmado
         send: Reenviar um email de confirmaÃ§Ã£o
@@ -171,13 +183,15 @@ pt-PT:
       resubscribe: Reinscrever
       role: PermissÃµes
       roles:
-        admin: Administrador
+        admin: Administrador(a)
         moderator: Moderador
         staff: Equipa
         user: Utilizador
       search: Pesquisar
       search_same_email_domain: Outros utilizadores com o mesmo domÃnio de email
       search_same_ip: Outros utilizadores com o mesmo IP
+      sensitive: Marcar como sensÃvel
+      sensitized: marcada como sensÃvel
       shared_inbox_url: URL da caixa de entrada compartilhada
       show:
         created_reports: RelatÃ³rios gerados por esta conta
@@ -187,13 +201,19 @@ pt-PT:
       statuses: Status
       subscribe: Inscrever-se
       suspended: Suspensa
+      suspension_irreversible: Os dados desta conta foram eliminados irreversivelmente. VocÃª pode cancelar a suspensÃ£o da conta para tornÃ¡-la utilizÃ¡vel, mas ela nÃ£o irÃ¡ recuperar os dados que possuÃa anteriormente.
+      suspension_reversible_hint_html: A conta foi suspensa e os dados serÃ£o totalmente eliminados em %{date}. AtÃ© lÃ¡, a conta poderÃ¡ ser recuperada sem quaisquer efeitos negativos. Se deseja eliminar todos os dados desta conta imediatamente, pode fazÃª-lo em baixo.
       time_in_queue: Aguardando na fila %{time}
       title: Contas
       unconfirmed_email: E-mail nÃ£o confirmado
+      undo_sensitized: Desmarcar como sensÃvel
       undo_silenced: Desfazer silenciar
       undo_suspension: Desfazer supensÃ£o
+      unsilenced_msg: Removeu com sucesso as limitaÃ§Ãµes da conta %{username}
       unsubscribe: Cancelar inscriÃ§Ã£o
+      unsuspended_msg: Removeu com sucesso a suspensÃ£o da conta %{username}
       username: Utilizador
+      view_domain: Ver resumo do domÃnio
       warn: Aviso
       web: Web
       whitelisted: EstÃ¡ na lista branca
@@ -208,12 +228,14 @@ pt-PT:
         create_domain_allow: Criar PermissÃ£o de DomÃnio
         create_domain_block: Criar Bloqueio de DomÃnio
         create_email_domain_block: Criar Bloqueio de DomÃnio de E-mail
+        create_ip_block: Criar regra de IP
         demote_user: Despromover Utilizador
         destroy_announcement: Remover AnÃºncio
         destroy_custom_emoji: Remover Emoji Personalizado
         destroy_domain_allow: Remover PermissÃ£o de DomÃnio
         destroy_domain_block: Remover Bloqueio de DomÃnio
         destroy_email_domain_block: Remover Bloqueio de DomÃnio de E-mail
+        destroy_ip_block: Eliminar regra de IP
         destroy_status: Remover Estado
         disable_2fa_user: Desativar 2FA
         disable_custom_emoji: Desativar Emoji Personalizado
@@ -226,13 +248,16 @@ pt-PT:
         reopen_report: Reabrir RelatÃ³rio
         reset_password_user: Repor Password
         resolve_report: Resolver RelatÃ³rio
+        sensitive_account: Marcar a media na sua conta como sensÃvel
         silence_account: Silenciar Conta
         suspend_account: Suspender Conta
         unassigned_report: Desatribuir RelatÃ³rio
+        unsensitive_account: Desmarcar a media na sua conta como sensÃvel
         unsilence_account: Deixar de Silenciar Conta
         unsuspend_account: Retirar SuspensÃ£o Ã  Conta
         update_announcement: Atualizar AnÃºncio
         update_custom_emoji: Atualizar Emoji Personalizado
+        update_domain_block: Atualizar Bloqueio de DomÃnio
         update_status: Atualizar Estado
       actions:
         assigned_to_self_report: "%{name} atribuiu o relatÃ³rio %{target} a si prÃ³prios"
@@ -244,12 +269,14 @@ pt-PT:
         create_domain_allow: "%{name} colocou o domÃnio %{target} na lista branca"
         create_domain_block: "%{name} bloqueou o domÃnio %{target}"
         create_email_domain_block: "%{name} adicionou na lista negra o domÃnio de correio electrÃ³nico %{target}"
+        create_ip_block: "%{name} criou regra para o IP %{target}"
         demote_user: "%{name} rebaixou o utilizador %{target}"
         destroy_announcement: "%{name} excluiu o anÃºncio %{target}"
         destroy_custom_emoji: "%{name} destruiu o emoji %{target}"
         destroy_domain_allow: "%{name} removeu o domÃnio %{target} da lista branca"
         destroy_domain_block: "%{name} desbloqueou o domÃnio %{target}"
         destroy_email_domain_block: "%{name} retirou o domÃnio de e-mail %{target} da lista negra"
+        destroy_ip_block: "%{name} eliminou regra para o IP %{target}"
         destroy_status: "%{name} removeu o publicaÃ§Ã£o feita por %{target}"
         disable_2fa_user: "%{name} desactivou o requerimento de autenticaÃ§Ã£o em dois passos para o utilizador %{target}"
         disable_custom_emoji: "%{name} desabilitou o emoji %{target}"
@@ -262,13 +289,16 @@ pt-PT:
         reopen_report: "%{name} reabriu o relatÃ³rio %{target}"
         reset_password_user: "%{name} restabeleceu a palavra-passe do utilizador %{target}"
         resolve_report: "%{name} recusou o relatÃ³rio %{target}"
+        sensitive_account: "%{name} marcou a media de %{target} como sensÃvel"
         silence_account: "%{name} silenciou a conta de %{target}"
         suspend_account: "%{name} suspendeu a conta de %{target}"
         unassigned_report: "%{name} nÃ£o atribuiu o relatÃ³rio %{target}"
+        unsensitive_account: "%{name} desmarcou a media de %{target} como sensÃvel"
         unsilence_account: "%{name} desativou o silÃªncio de %{target}"
         unsuspend_account: "%{name} desativou a suspensÃ£o de  %{target}"
         update_announcement: "%{name} atualizou o anÃºncio %{target}"
         update_custom_emoji: "%{name} atualizou o emoji %{target}"
+        update_domain_block: "%{name} atualizou o bloqueio de domÃnio para %{target}"
         update_status: "%{name} atualizou o estado de %{target}"
       deleted_status: "(apagou a publicaÃ§Ã£o)"
       empty: NÃ£o foram encontrados registos.
@@ -372,6 +402,8 @@ pt-PT:
           silence: Silenciar
           suspend: Suspender
         title: Novo bloqueio de domÃnio
+      obfuscate: Ofuscar nome de domÃnio
+      obfuscate_hint: Ofuscar parcialmente o nome de domÃnio na lista, se estiverem habilitadas as limitaÃ§Ãµes na publicaÃ§Ã£o da lista de domÃnios
       private_comment: ComentÃ¡rio privado
       private_comment_hint: ComentÃ¡rio sobre essa limitaÃ§Ã£o de domÃnio para uso interno pelos moderadores.
       public_comment: ComentÃ¡rio pÃºblico
@@ -411,6 +443,7 @@ pt-PT:
     instances:
       by_domain: DomÃnio
       delivery_available: Entrega disponÃvel
+      empty: NÃ£o foram encontrados domÃnios.
       known_accounts:
         one: "%{count} conta conhecida"
         other: "%{count} contas conhecidas"
@@ -434,6 +467,21 @@ pt-PT:
         expired: Expirados
         title: Filtro
       title: Convites
+    ip_blocks:
+      add_new: Criar regra
+      created_msg: Nova regra de IP adicionada com sucesso
+      delete: Eliminar
+      expires_in:
+        '1209600': 2 semanas
+        '15778476': 6 meses
+        '2629746': 1 mÃªs
+        '31556952': 1 ano
+        '86400': 1 dia
+        '94670856': 3 anos
+      new:
+        title: Criar nova regra de IP
+      no_ip_block_selected: Nenhuma regra de IP foi alterada pois nenhuma foi selecionada
+      title: Regras de IP
     pending_accounts:
       title: Contas pendentes (%{count})
     relationships:
@@ -473,6 +521,8 @@ pt-PT:
       comment:
         none: Nenhum
       created_at: Relatado
+      forwarded: Encaminhado
+      forwarded_to: Encaminhado para %{domain}
       mark_as_resolved: Marcar como resolvido
       mark_as_unresolved: Marcar como nÃ£o resolvido
       notes:
@@ -516,6 +566,7 @@ pt-PT:
       domain_blocks_rationale:
         title: Mostrar motivo
       enable_bootstrap_timeline_accounts:
+        desc_html: FaÃ§a com que novos utilizadores sigam automaticamente contas configuradas, para que a cronologia destes nÃ£o se apresente inicialmente vazia
         title: Habilitar seguidores predefinidos para novos utilizadores
       hero:
         desc_html: Apresentado na primeira pÃ¡gina. Pelo menos 600x100px recomendados. Quando nÃ£o Ã© definido, Ã© apresentada a miniatura da instÃ¢ncia
@@ -542,6 +593,9 @@ pt-PT:
         min_invite_role:
           disabled: NinguÃ©m
           title: Permitir convites de
+        require_invite_text:
+          desc_html: Quando os registos exigirem aprovaÃ§Ã£o manual, faÃ§a o texto "Porque se quer juntar a nÃ³s?" da solicitaÃ§Ã£o de convite obrigatÃ³rio, em vez de opcional
+          title: Exigir que novos utilizadores preencham um texto de solicitaÃ§Ã£o de convite
       registrations_mode:
         modes:
           approved: Registo sujeito a aprovaÃ§Ã£o
@@ -681,8 +735,11 @@ pt-PT:
       prefix_sign_up: Inscreva-se hoje no Mastodon!
       suffix: Com uma conta, poderÃ¡ seguir pessoas, publicar atualizaÃ§Ãµes e trocar mensagens com utilizadores de qualquer instÃ¢ncia Mastodon e muito mais!
     didnt_get_confirmation: NÃ£o recebeu o email de confirmaÃ§Ã£o?
+    dont_have_your_security_key: NÃ£o tem a sua chave de seguranÃ§a?
     forgot_password: Esqueceste a palavra-passe?
     invalid_reset_password_token: Token de modificaÃ§Ã£o da palavra-passe Ã© invÃ¡lido ou expirou. Por favor, solicita um novo.
+    link_to_otp: Insere um cÃ³digo de duas etapas do teu telemÃ³vel ou um cÃ³digo de recuperaÃ§Ã£o
+    link_to_webauth: Usa o teu dispositivo de chave de seguranÃ§a
     login: Entrar
     logout: Sair
     migrate_account: Mudar para uma conta diferente
@@ -707,7 +764,9 @@ pt-PT:
       functional: A sua conta estÃ¡ totalmente operacional.
       pending: A sua inscriÃ§Ã£o estÃ¡ pendente de revisÃ£o pela nossa equipa. Isso pode demorar algum tempo. ReceberÃ¡ um e-mail se a sua conta for aprovada.
       redirecting_to: A sua conta estÃ¡ inativa porque estÃ¡ atualmente a ser redirecionada para %{acct}.
+    too_fast: FormulÃ¡rio enviado muito rapidamente, tente novamente.
     trouble_logging_in: Problemas em iniciar sessÃ£o?
+    use_security_key: Usar chave de seguranÃ§a
   authorize_follow:
     already_following: Tu jÃ¡ estÃ¡s a seguir esta conta
     already_requested: JÃ¡ enviou anteriormente um pedido para seguir esta conta
@@ -732,6 +791,7 @@ pt-PT:
   date:
     formats:
       default: "%d %b %Y"
+      with_month_name: "%d %B %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}h"
@@ -796,6 +856,7 @@ pt-PT:
       request: Pede o teu arquivo
       size: Tamanho
     blocks: Bloqueaste
+    bookmarks: Itens Salvos
     csv: CSV
     domain_blocks: Bloqueios de domÃnio
     lists: Listas
@@ -863,6 +924,8 @@ pt-PT:
     status: Estado da verificaÃ§Ã£o
     view_proof: Ver prova
   imports:
+    errors:
+      over_rows_processing_limit: contÃ©m mais de %{count} linhas
     modes:
       merge: Juntar
       merge_long: Manter os registos existentes e adicionar novos registos
@@ -872,6 +935,7 @@ pt-PT:
     success: Os teus dados foram enviados com sucesso e serÃ£o processados em breve
     types:
       blocking: Lista de bloqueio
+      bookmarks: Itens salvos
       domain_blocking: Lista de domÃnios bloqueados
       following: Lista de pessoas que estÃ¡s a seguir
       muting: Lista de utilizadores silenciados
@@ -992,6 +1056,14 @@ pt-PT:
           quadrillion: Q
           thousand: mil
           trillion: T
+  otp_authentication:
+    code_hint: Introduz o cÃ³digo gerado pela tua aplicaÃ§Ã£o de autenticaÃ§Ã£o para confirmar
+    description_html: Se ativar a <strong>autenticaÃ§Ã£o em duas etapas</strong>, para entrar na sua conta terÃ¡ de ter consigo o seu telefone, que vai gerar os tokens necessÃ¡rios Ã  validaÃ§Ã£o do seu acesso.
+    enable: Ativar
+    instructions_html: "<strong>Digitalize este cÃ³digo QR no Google Authenticator ou num aplicativo TOTP similar no seu telefone</strong>. A partir de agora, esse aplicativo irÃ¡ gerar tokens que vocÃª terÃ¡ que introduzir para aceder Ã  sua conta."
+    manual_instructions: 'Se vocÃª nÃ£o consegue digitalizar o cÃ³digo QR e precisa introduzi-lo manualmente, aqui estÃ¡ o cÃ³digo em texto:'
+    setup: Configurar
+    wrong_code: O cÃ³digo introduzido Ã© invÃ¡lido! A hora do servidor e a hora do dispositivo estÃ£o corretos?
   pagination:
     newer: Mais nova
     next: Seguinte
@@ -1020,6 +1092,7 @@ pt-PT:
   relationships:
     activity: Atividade da conta
     dormant: Inativo
+    follow_selected_followers: Seguir seguidores selecionados
     followers: Seguidores
     following: A seguir
     invited: Convidado
@@ -1116,6 +1189,7 @@ pt-PT:
     profile: Perfil
     relationships: Seguindo e seguidores
     two_factor_authentication: AutenticaÃ§Ã£o em dois passos
+    webauthn_authentication: Chaves de seguranÃ§a
   spam_check:
     spam_detected: Este Ã© um relatÃ³rio automatizado. Foi detectado spam.
   statuses:
@@ -1154,6 +1228,8 @@ pt-PT:
         other: "%{count} votos"
       vote: Votar
     show_more: Mostrar mais
+    show_newer: Mostrar mais recentes
+    show_older: Mostrar mais antigos
     show_thread: Mostrar conversa
     sign_in_to_participate: Inicie a sessÃ£o para participar na conversa
     title: '%{name}: "%{quote}"'
@@ -1256,27 +1332,26 @@ pt-PT:
   themes:
     contrast: Mastodon (Elevado contraste)
     default: Mastodon
-    mastodon-light: Mastodon (Leve)
+    mastodon-light: Mastodon (Claro)
   time:
     formats:
       default: "%H:%M em %d de %b de %Y"
       month: "%b de %Y"
   two_factor_authentication:
-    code_hint: Entre o cÃ³digo gerado pelo seu aplicativo para confirmar
-    description_html: Se ativar a <strong>autenticaÃ§Ã£o em dois passos</strong>, quando logar serÃ¡ necessÃ¡rio o seu telefone que vai gerar os tokens para validaÃ§Ã£o.
+    add: Adicionar
     disable: Desativar
-    enable: Ativar
+    disabled_success: AutenticaÃ§Ã£o em duas etapas desativada com sucesso
+    edit: Editar
     enabled: A autenticaÃ§Ã£o em dois passos estÃ¡ ativada
     enabled_success: AutenticaÃ§Ã£o em dois passos ativada com sucesso
     generate_recovery_codes: Gerar cÃ³digos para recuperar conta
-    instructions_html: "<strong>Scaneie este cÃ³digo QR no seu Google Authenticator ou aplicativo similar no seu telefone</strong>. A partir de agora seu aplicativo irÃ¡ gerar tokens que deverÃ£o ser digitados para vocÃª logar."
     lost_recovery_codes: CÃ³digos de recuperaÃ§Ã£o permite que vocÃª recupere o acesso a sua conta se vocÃª perder seu telefone. Se vocÃª perder os cÃ³digos de recuperaÃ§Ã£o, vocÃª pode regera-los aqui. Seus cÃ³digos antigos serÃ£o invalidados.
-    manual_instructions: 'Se vocÃª nÃ£o puder scanear o cÃ³digo QR e precisa digita-los manualmente, aqui estÃ¡ o segredo em texto.:'
+    methods: MÃ©todos de duas etapas
+    otp: AplicaÃ§Ã£o de autenticaÃ§Ã£o
     recovery_codes: CÃ³pia de seguranÃ§a dos cÃ³digos de recuperaÃ§Ã£o
     recovery_codes_regenerated: CÃ³digos de recuperaÃ§Ã£o foram gerados com sucesso
     recovery_instructions_html: Se tu alguma vez perderes o teu smartphone, to poderÃ¡s usar um dos cÃ³digos de recuperaÃ§Ã£o para voltares a ter acesso Ã  tua conta. <strong>MantÃ©m os cÃ³digos de recuperaÃ§Ã£o seguros</strong>. Por exemplo, tu podes imprimi-los e guardÃ¡-los junto a outros documentos importantes.
-    setup: Configurar
-    wrong_code: O cÃ³digo inserido Ã© invalido! O horÃ¡rio do servidor e o horÃ¡rio do seu aparelho estÃ£o corretos?
+    webauthn: Chaves de seguranÃ§a
   user_mailer:
     backup_ready:
       explanation: Pediste uma cÃ³pia completa da tua conta Mastodon. Ela jÃ¡ estÃ¡ pronta para descarregares!
@@ -1291,6 +1366,7 @@ pt-PT:
     warning:
       explanation:
         disable: Enquanto a tua conta estÃ¡ congelada, os seus dados permanecem intactos, mas tu nÃ£o podes executar quaisquer acÃ§Ãµes atÃ© que ela seja desbloqueada.
+        sensitive: Os seus ficheiros de media carregados e os media ligados serÃ£o tratados como sensÃveis.
         silence: Enquanto a sua conta estiver limitada, sÃ³ pessoas que jÃ¡ estiver a seguir irÃ£o ver as suas publicaÃ§Ãµes nesta instÃ¢ncia e poderÃ¡ ser excluÃdo de vÃ¡rias listagens pÃºblicas. No entanto, outros ainda o poderÃ£o seguir de forma manual.
         suspend: A sua conta foi suspensa e todas as suas publicaÃ§Ãµes e os seus ficheiros de media foram irreversivelmente removidos desta instÃ¢ncia e das instÃ¢ncias onde tinhas seguidores.
       get_in_touch: Pode responder a este e-mail para entrar em contacto com a equipa de %{instance}.
@@ -1299,11 +1375,13 @@ pt-PT:
       subject:
         disable: A tua conta %{acct} foi congelada
         none: Aviso para %{acct}
+        sensitive: As publicaÃ§Ãµes de media da sua conta %{acct} foram marcadas como sensÃveis
         silence: A tua conta %{acct} foi limitada
         suspend: A tua conta %{acct} foi suspensa
       title:
         disable: Conta congelada
         none: Aviso
+        sensitive: A sua media foi marcada como sensÃvel
         silence: Conta limitada
         suspend: Conta suspensa
     welcome:
@@ -1318,15 +1396,17 @@ pt-PT:
       review_preferences_step: Certifica-te de configurar as tuas preferÃªncias, tais como os e-mails que gostarias de receber ou o nÃvel de privacidade que desejas que as tuas publicaÃ§Ãµes tenham por defeito. Se nÃ£o sofres de enjoo, podes ativar a opÃ§Ã£o de auto-iniciar GIFs.
       subject: Bem-vindo ao Mastodon
       tip_federated_timeline: A cronologia federativa Ã© uma visÃ£o global da rede Mastodon. Mas sÃ³ inclui pessoas que os teus vizinhos subscrevem, por isso nÃ£o Ã© uma visÃ£o completa.
-      tip_following: VocÃª segue o(s) administrador(es) da sua instÃ¢ncia por defeito. Para encontrar mais pessoas interessantes, procure nas cronologias local e federada.
+      tip_following: Segues o(s) administrador(es) do teu servidor por defeito. Para encontrar mais pessoas interessantes, procura nas cronologias local e federada.
       tip_local_timeline: A cronologia local Ã© uma visÃ£o global das pessoas em %{instance}. Estes sÃ£o os seus vizinhos mais prÃ³ximos!
       tip_mobile_webapp: Se o teu navegador mÃ³vel te oferecer a possibilidade de adicionar o Mastodon ao teu homescreen, tu podes receber notificaÃ§Ãµes push. Ele age como uma aplicaÃ§Ã£o nativa de vÃ¡rios modos!
       tips: Dicas
       title: Bem-vindo a bordo, %{name}!
   users:
+    blocked_email_provider: Este provedor de e-mail nÃ£o Ã© permitido
     follow_limit_reached: NÃ£o podes seguir mais do que %{limit} pessoas
     generic_access_help_html: Problemas para aceder Ã  sua conta? Pode entrar em contacto com %{email} para obter ajuda
     invalid_email: O endereÃ§o de e-mail Ã© invÃ¡lido
+    invalid_email_mx: O endereÃ§o de e-mail nÃ£o parece existir
     invalid_otp_token: CÃ³digo de autenticaÃ§Ã£o invÃ¡lido
     invalid_sign_in_token: CÃ³gido de seguranÃ§a invÃ¡lido
     otp_lost_help_html: Se tu perdeste acesso a ambos, tu podes entrar em contacto com %{email}
@@ -1336,3 +1416,20 @@ pt-PT:
   verification:
     explanation_html: 'Tu podes <strong>comprovar que Ã©s o dono dos links nos metadados do teu perfil</strong>. Para isso, o website para o qual o link aponta tem de conter um link para o teu perfil do Mastodon. Este link <strong>tem</strong> de ter um <code>rel="me"</code> atributo. O conteÃºdo do texto nÃ£o Ã© relevante. Aqui estÃ¡ um exemplo:'
     verification: VerificaÃ§Ã£o
+  webauthn_credentials:
+    add: Adicionar nova chave de seguranÃ§a
+    create:
+      error: Ocorreu um problema ao adicionar sua chave de seguranÃ§a. Tente novamente.
+      success: A sua chave de seguranÃ§a foi adicionada com sucesso.
+    delete: Remover
+    delete_confirmation: Tem a certeza de que pretende remover esta chave de seguranÃ§a?
+    description_html: Se vocÃª ativar a <strong>autenticaÃ§Ã£o com chave de seguranÃ§a</strong>, para aceder Ã  sua conta serÃ¡ necessÃ¡rio que utilize uma das suas chaves de seguranÃ§a.
+    destroy:
+      error: Ocorreu um problema ao remover a sua chave de seguranÃ§a. Tente novamente.
+      success: A sua chave de seguranÃ§a foi removida com sucesso.
+    invalid_credential: Chave de seguranÃ§a invÃ¡lida
+    nickname_hint: Introduza o apelido da sua nova chave de seguranÃ§a
+    not_enabled: Ainda nÃ£o ativou o WebAuthn
+    not_supported: Este navegador nÃ£o suporta chaves de seguranÃ§a
+    otp_required: Para usar chaves de seguranÃ§a, por favor ative primeiro a autenticaÃ§Ã£o de duas etapas.
+    registered_on: Registado em %{date}
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index c1aec2d151782fa3afa9050bc06b6e420a766501..630bd91d6443e4f397cf1348edc27705eb0f57e1 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -680,21 +680,14 @@ ro:
       default: "%d %m, %Y, %H:%M"
       month: "%m %Y"
   two_factor_authentication:
-    code_hint: IntroduceÈ›i codul generat de aplicaÈ›ia dvs de autentificare pentru a confirma
-    description_html: DacÄƒ activaÈ›i <strong>autentificarea Ã®n doi paÈ™i</strong>, autentificarea va necesita ca tu sÄƒ fii Ã®n posesia telefonului tÄƒu, ceea ce va genera token-uri pentru ca tu sÄƒ intri.
     disable: DezactiveazÄƒ
-    enable: ActiveazÄƒ
     enabled: Autentificare Ã®n doi paÈ™i este activatÄƒ
     enabled_success: Autentificarea Ã®n doi paÈ™i activatÄƒ cu succes
     generate_recovery_codes: GenereazÄƒ coduri de recuperare
-    instructions_html: "<strong>ScanaÈ›i acest cod QR Ã®n Google Authenticator sau o aplicaÈ›ie TOTP similiarÄƒ de pe telefonul dvs.</strong>. De acum Ã®nainte, acea aplicaÈ›ie va genera token-uri pe care va trebui sÄƒ Ã®i introduceÈ›i atunci cÃ¢nd vÄƒ conectaÈ›i."
     lost_recovery_codes: Codurile de recuperare vÄƒ permit sÄƒ redobÃ¢ndiÈ›i accesul la contul dvs. dacÄƒ vÄƒ pierdeÈ›i telefonul. DacÄƒ È›i-ai pierdut codurile de recuperare, le poÈ›i regenera aici. Codurile tale vechi de recuperare vor fi invalidate.
-    manual_instructions: 'DacÄƒ nu puteÈ›i scana codul QR È™i trebuie sÄƒ-l introduceÈ›i manual, aici este textul simplu pentru cheia secretÄƒ:'
     recovery_codes: Copie a codurilor de recuperare
     recovery_codes_regenerated: Coduri de recuperare regenerate cu succes
     recovery_instructions_html: DacÄƒ Ã®È›i pierzi vreodatÄƒ accesul la telefon, poÈ›i folosi unul dintre codurile de recuperare de mai jos pentru a recÃ¢È™tiga accesul la contul tÄƒu. <strong>PÄƒstraÈ›i codurile de recuperare Ã®n condiÈ›ii de siguranÈ›Äƒ</strong>. De exemplu, le puteÈ›i tipÄƒri È™i stoca cu alte documente importante.
-    setup: Configurare
-    wrong_code: Codul introdus nu a fost valid! Orele serverului È™i timpul dispozitivului sunt corecte?
   user_mailer:
     backup_ready:
       explanation: Ai solicitat o copie de rezervÄƒ completÄƒ a contului tÄƒu. Acum este gata pentru descÄƒrcare!
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index f316c5cdfca7f91800a600d32d4a870cc0f95300..9895f9a55d451d228326652ed8b746da847e3a5c 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -66,6 +66,7 @@ ru:
       one: Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‡Ð¸Ðº
       other: Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ¾Ð²
     following: Ð¿Ð¾Ð´Ð¿Ð¸ÑÐºÐ¸
+    instance_actor_flash: ÐÑ‚Ð° ÑƒÑ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ - Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ñ‹Ð¹ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ, Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÐ¼Ñ‹Ð¹ Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÑÐ°Ð¼Ð¾Ð³Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ð°, Ð° Ð½Ðµ Ð¾Ñ‚Ð´ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ. ÐžÐ½Ð° Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ð´Ð»Ñ Ð¾Ñ€Ð³Ð°Ð½Ð¸Ð·Ð°Ñ†Ð¸Ð¾Ð½Ð½Ñ‹Ñ… Ñ†ÐµÐ»ÐµÐ¹ Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð·Ð°Ð¼Ð¾Ñ€Ð¾Ð¶ÐµÐ½Ð°.
     joined: 'Ð”Ð°Ñ‚Ð° Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ð¸: %{date}'
     last_active: Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÑÑ Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾ÑÑ‚ÑŒ
     link_verified_on: Ð’Ð»Ð°Ð´ÐµÐ½Ð¸Ðµ ÑÑ‚Ð¾Ð¹ ÑÑÑ‹Ð»ÐºÐ¾Ð¹ Ð±Ñ‹Ð»Ð¾ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÐ½Ð¾ %{date}
@@ -106,6 +107,7 @@ ru:
       add_email_domain_block: Ð—Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ e-mail Ð´Ð¾Ð¼ÐµÐ½
       approve: ÐŸÐ¾Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¸Ñ‚ÑŒ
       approve_all: ÐŸÐ¾Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¸Ñ‚ÑŒ Ð²ÑÐµ
+      approved_msg: Ð£ÑÐ¿ÐµÑˆÐ½Ð¾ Ð¾Ð´Ð¾Ð±Ñ€ÐµÐ½Ð° Ð·Ð°ÑÐ²ÐºÐ° Ð½Ð° Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸ÑŽ %{username}
       are_you_sure: Ð’Ñ‹ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹?
       avatar: ÐÐ²Ð°Ñ‚Ð°Ñ€
       by_domain: Ð”Ð¾Ð¼ÐµÐ½
@@ -119,8 +121,10 @@ ru:
       confirm: ÐŸÐ¾Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¸Ñ‚ÑŒ
       confirmed: ÐŸÐ¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¾
       confirming: ÐŸÐ¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ðµ
+      delete: Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð´Ð°Ð½Ð½Ñ‹Ðµ
       deleted: Ð£Ð´Ð°Ð»Ñ‘Ð½
       demote: Ð Ð°Ð·Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ‚ÑŒ
+      destroyed_msg: Ð”Ð°Ð½Ð½Ñ‹Ðµ %{username} Ð¿Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ñ‹ Ð² Ð¾Ñ‡ÐµÑ€ÐµÐ´ÑŒ Ð½Ð° ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ
       disable: Ð—Ð°Ð¼Ð¾Ñ€Ð¾Ð·ÐºÐ°
       disable_two_factor_authentication: ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ 2FA
       disabled: ÐžÑ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾
@@ -131,10 +135,12 @@ ru:
       email_status: Ð¡Ñ‚Ð°Ñ‚ÑƒÑ e-mail
       enable: Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ
       enabled: Ð’ÐºÐ»ÑŽÑ‡ÐµÐ½
+      enabled_msg: Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ %{username} ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ñ€Ð°Ð·Ð¼Ð¾Ñ€Ð¾Ð¶ÐµÐ½Ð°
       followers: ÐŸÐ¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ¸
       follows: ÐŸÐ¾Ð´Ð¿Ð¸ÑÐºÐ¸
       header: Ð¨Ð°Ð¿ÐºÐ°
       inbox_url: URL Ð²Ñ…Ð¾Ð´ÑÑ‰Ð¸Ñ…
+      invite_request_text: ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ñ‹ Ð´Ð»Ñ Ð¿Ñ€Ð¸ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ
       invited_by: ÐŸÑ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ðµ Ð²Ñ‹Ð´Ð°Ð»(Ð°)
       ip: IP
       joined: Ð”Ð°Ñ‚Ð° Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ð¸
@@ -146,6 +152,8 @@ ru:
       login_status: Ð¡Ñ‚Ð°Ñ‚ÑƒÑ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸
       media_attachments: Ð¤Ð°Ð¹Ð»Ñ‹ Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ð¼ÐµÐ´Ð¸Ð°
       memorialize: Ð¡Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ð¼ÐµÐ¼Ð¾Ñ€Ð¸Ð°Ð»Ð¾Ð¼
+      memorialized: ÐŸÑ€ÐµÐ²Ñ€Ð°Ñ‰Ñ‘Ð½ Ð² Ð¿Ð°Ð¼ÑÑ‚Ð½Ð¸Ðº
+      memorialized_msg: "%{username} ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð¿Ñ€ÐµÐ²Ñ€Ð°Ñ‰Ñ‘Ð½ Ð² Ð¿Ð°Ð¼ÑÑ‚Ð½Ð¸Ðº"
       moderation:
         active: Ð”ÐµÐ¹ÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ðµ
         all: Ð’ÑÐµ
@@ -166,10 +174,14 @@ ru:
       public: ÐŸÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ð¹
       push_subscription_expires: ÐŸÐ¾Ð´Ð¿Ð¸ÑÐºÐ° PuSH Ð¸ÑÑ‚ÐµÐºÐ°ÐµÑ‚
       redownload: ÐžÐ±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð°Ð²Ð°Ñ‚Ð°Ñ€
+      redownloaded_msg: ÐŸÑ€Ð¾Ñ„Ð¸Ð»ÑŒ %{username} ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½ Ð¸Ð· Ð¾Ñ€Ð¸Ð³Ð¸Ð½Ð°Ð»Ð°
       reject: ÐžÑ‚ÐºÐ»Ð¾Ð½Ð¸Ñ‚ÑŒ
       reject_all: ÐžÑ‚ÐºÐ»Ð¾Ð½Ð¸Ñ‚ÑŒ Ð²ÑÐµ
+      rejected_msg: Ð£ÑÐ¿ÐµÑˆÐ½Ð¾ Ð¾Ñ‚ÐºÐ»Ð¾Ð½ÐµÐ½Ð¾ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ð¸ %{username}
       remove_avatar: Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð°Ð²Ð°Ñ‚Ð°Ñ€
       remove_header: Ð£Ð±Ñ€Ð°Ñ‚ÑŒ ÑˆÐ°Ð¿ÐºÑƒ
+      removed_avatar_msg: ÐÐ²Ð°Ñ‚Ð°Ñ€ %{username} ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ ÑƒÐ´Ð°Ð»ÐµÐ½
+      removed_header_msg: Ð£ÑÐ¿ÐµÑˆÐ½Ð¾ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¾ Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ðµ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ° %{username}
       resend_confirmation:
         already_confirmed: ÐÑ‚Ð¾Ñ‚ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ ÑƒÐ¶Ðµ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½
         send: ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ðµ Ð¿Ð¾ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ðµ
@@ -186,6 +198,8 @@ ru:
       search: ÐŸÐ¾Ð¸ÑÐº
       search_same_email_domain: Ð”Ñ€ÑƒÐ³Ð¸Ðµ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸ Ñ Ñ‚ÐµÐ¼ Ð¶Ðµ Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð¼ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹
       search_same_ip: Ð”Ñ€ÑƒÐ³Ð¸Ðµ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸ Ñ Ñ‚Ð°ÐºÐ¸Ð¼ Ð¶Ðµ IP
+      sensitive: Ð”ÐµÐ»Ð¸ÐºÐ°Ñ‚Ð½Ñ‹Ð¹
+      sensitized: Ð¾Ñ‚Ð¼ÐµÑ‡ÐµÐ½Ð¾ ÐºÐ°Ðº Ð´ÐµÐ»Ð¸ÐºÐ°Ñ‚Ð½Ñ‹Ð¹ ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚
       shared_inbox_url: URL Ð¾Ð±Ñ‰Ð¸Ñ… Ð²Ñ…Ð¾Ð´ÑÑ‰Ð¸Ñ…
       show:
         created_reports: Ð–Ð°Ð»Ð¾Ð±Ñ‹, Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ‹Ðµ Ñ ÑÑ‚Ð¾Ð¹ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸
@@ -195,13 +209,19 @@ ru:
       statuses: ÐŸÐ¾ÑÑ‚Ñ‹
       subscribe: ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒÑÑ
       suspended: Ð—Ð°Ð¼Ð¾Ñ€Ð¾Ð¶ÐµÐ½
+      suspension_irreversible: Ð”Ð°Ð½Ð½Ñ‹Ðµ ÑÑ‚Ð¾Ð¹ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð±Ñ‹Ð»Ð¸ Ð½ÐµÐ¾Ð±Ñ€Ð°Ñ‚Ð¸Ð¼Ð¾ ÑƒÐ´Ð°Ð»ÐµÐ½Ñ‹. Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ñ€Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÑƒÑ‡ÐµÑ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑÐ´ÐµÐ»Ð°Ñ‚ÑŒ ÐµÑ‘ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾Ð¹, Ð½Ð¾ ÑÑ‚Ð¾ Ð½Ðµ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ Ñ€Ð°Ð½ÐµÐµ Ð¸Ð¼ÐµÐ²ÑˆÐ¸ÐµÑÑ Ð² Ð½ÐµÐ¹ Ð´Ð°Ð½Ð½Ñ‹Ðµ.
+      suspension_reversible_hint_html: Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð±Ñ‹Ð»Ð° Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð°, Ð¸ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð±ÑƒÐ´ÑƒÑ‚ Ð¿Ð¾Ð»Ð½Ð¾ÑÑ‚ÑŒÑŽ ÑƒÐ´Ð°Ð»ÐµÐ½Ñ‹ %{date}. Ð”Ð¾ ÑÑ‚Ð¾Ð³Ð¾ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚Ð° ÐµÑ‘ Ð¼Ð¾Ð¶Ð½Ð¾ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð±ÐµÐ· ÐºÐ°ÐºÐ¸Ñ…-Ð»Ð¸Ð±Ð¾ Ð½ÐµÐ¿Ñ€Ð¸ÑÑ‚Ð½Ñ‹Ñ… Ð¿Ð¾ÑÐ»ÐµÐ´ÑÑ‚Ð²Ð¸Ð¹. Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð½ÐµÐ¼ÐµÐ´Ð»ÐµÐ½Ð½Ð¾ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð²ÑÐµ Ð´Ð°Ð½Ð½Ñ‹Ðµ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸, Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ ÑÐ´ÐµÐ»Ð°Ñ‚ÑŒ ÑÑ‚Ð¾ Ð½Ð¸Ð¶Ðµ.
       time_in_queue: ÐžÐ¶Ð¸Ð´Ð°Ð½Ð¸Ðµ Ð² Ð¾Ñ‡ÐµÑ€ÐµÐ´Ð¸ %{time}
       title: Ð£Ñ‡Ñ‘Ñ‚Ð½Ñ‹Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸
       unconfirmed_email: ÐÐµÐ¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´Ñ‘Ð½Ð½Ñ‹Ð¹ e-mail
+      undo_sensitized: Ð¡Ð½ÑÑ‚ÑŒ Ð¾Ñ‚Ð¼ÐµÑ‚ÐºÑƒ "Ð´ÐµÐ»Ð¸ÐºÐ°Ñ‚Ð½Ñ‹Ð¹"
       undo_silenced: ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ ÑÐºÑ€Ñ‹Ñ‚Ð¸Ðµ
       undo_suspension: Ð¡Ð½ÑÑ‚ÑŒ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÑƒ
+      unsilenced_msg: ÐžÐ³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ %{username} ÑÐ½ÑÑ‚Ñ‹ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾
       unsubscribe: ÐžÑ‚Ð¿Ð¸ÑÐ°Ñ‚ÑŒÑÑ
+      unsuspended_msg: Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ %{username} ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ñ€Ð°Ð·Ð¼Ð¾Ñ€Ð¾Ð¶ÐµÐ½Ð°
       username: Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ
+      view_domain: ÐŸÑ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€ ÑÐ²Ð¾Ð´ÐºÐ¸ Ð¿Ð¾ Ð´Ð¾Ð¼ÐµÐ½Ñƒ
       warn: ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ
       web: Ð’ÐµÐ±
       whitelisted: Ð’ Ð±ÐµÐ»Ð¾Ð¼ ÑÐ¿Ð¸ÑÐºÐµ
@@ -216,12 +236,14 @@ ru:
         create_domain_allow: Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ðµ Ð´Ð»Ñ Ð´Ð¾Ð¼ÐµÐ½Ð°
         create_domain_block: Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ° Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð²
         create_email_domain_block: Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ° e-mail Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð²
+        create_ip_block: Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ IP Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð¾
         demote_user: Ð Ð°Ð·Ð¶Ð°Ð»Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹
         destroy_announcement: Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¾Ð±ÑŠÑÐ²Ð»ÐµÐ½Ð¸Ð¹
         destroy_custom_emoji: Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ ÑÐ¼Ð¾Ð´Ð·Ð¸
         destroy_domain_allow: Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ðµ Ð´Ð»Ñ Ð´Ð¾Ð¼ÐµÐ½Ð°
         destroy_domain_block: Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ° Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð²
         destroy_email_domain_block: Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ° e-mail Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð²
+        destroy_ip_block: Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ IP Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð¾
         destroy_status: Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð¾ÑÑ‚Ð¾Ð²
         disable_2fa_user: ÐžÑ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ 2FA
         disable_custom_emoji: ÐžÑ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ ÑÐ¼Ð¾Ð´Ð·Ð¸
@@ -234,13 +256,16 @@ ru:
         reopen_report: Ð’Ð¾Ð·Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¶Ð°Ð»Ð¾Ð±
         reset_password_user: Ð¡Ð±Ñ€Ð¾Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹
         resolve_report: ÐžÑ‚Ð¼ÐµÑ‚ÐºÐ° Ð¶Ð°Ð»Ð¾Ð± Â«Ñ€ÐµÑˆÑ‘Ð½Ð½Ñ‹Ð¼Ð¸Â»
+        sensitive_account: ÐžÑ‚Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ Ð²ÑÐµ Ð¼ÐµÐ´Ð¸Ð°Ñ„Ð°Ð¹Ð»Ñ‹ Ð² Ð²Ð°ÑˆÐµÐ¹ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ ÐºÐ°Ðº Ð´ÐµÐ»Ð¸ÐºÐ°Ñ‚Ð½Ñ‹Ðµ
         silence_account: Ð¡ÐºÑ€Ñ‹Ñ‚Ð¸Ðµ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹
         suspend_account: Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹
         unassigned_report: Ð¡Ð½ÑÑ‚Ð¸Ðµ Ð¶Ð°Ð»Ð¾Ð±
+        unsensitive_account: Ð¡Ð½ÑÑ‚ÑŒ Ð¾Ñ‚Ð¼ÐµÑ‚ÐºÑƒ "Ð´ÐµÐ»Ð¸ÐºÐ°Ñ‚Ð½Ñ‹Ð¹" Ñ Ð¼ÐµÐ´Ð¸Ð°Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð²Ð°ÑˆÐµÐ¹ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸
         unsilence_account: ÐžÑ‚Ð¼ÐµÐ½Ð° ÑÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹
         unsuspend_account: Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹
         update_announcement: ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¾Ð±ÑŠÑÐ²Ð»ÐµÐ½Ð¸Ð¹
         update_custom_emoji: ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÐ¼Ð¾Ð´Ð·Ð¸
+        update_domain_block: Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÑƒ Ð´Ð¾Ð¼ÐµÐ½Ð°
         update_status: Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¿Ð¾ÑÑ‚Ð¾Ð²
       actions:
         assigned_to_self_report: "%{name} Ð½Ð°Ð·Ð½Ð°Ñ‡Ð¸Ð»(Ð°) ÑÐµÐ±Ñ Ð´Ð»Ñ Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð¶Ð°Ð»Ð¾Ð±Ñ‹ %{target}"
@@ -252,12 +277,14 @@ ru:
         create_domain_allow: "%{name} Ð²Ð½ÐµÑ(Ð»Ð°) Ð´Ð¾Ð¼ÐµÐ½ %{target} Ð² Ð±ÐµÐ»Ñ‹Ð¹ ÑÐ¿Ð¸ÑÐ¾Ðº"
         create_domain_block: "%{name} Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð»(Ð°) Ð´Ð¾Ð¼ÐµÐ½ %{target}"
         create_email_domain_block: "%{name} Ð´Ð¾Ð±Ð°Ð²Ð¸Ð»(Ð°) e-mail Ð´Ð¾Ð¼ÐµÐ½ %{target} Ð² Ñ‡Ñ‘Ñ€Ð½Ñ‹Ð¹ ÑÐ¿Ð¸ÑÐ¾Ðº"
+        create_ip_block: "%{name} ÑÐ¾Ð·Ð´Ð°Ð» Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð¾ Ð´Ð»Ñ IP %{target}"
         demote_user: "%{name} Ñ€Ð°Ð·Ð¶Ð°Ð»Ð¾Ð²Ð°Ð»(Ð°) Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %{target}"
         destroy_announcement: "%{name} ÑƒÐ´Ð°Ð»Ð¸Ð» Ð¾Ð±ÑŠÑÐ²Ð»ÐµÐ½Ð¸Ðµ %{target}"
         destroy_custom_emoji: "%{name} Ð¸Ð·Ð¼ÐµÐ»ÑŒÑ‡Ð¸Ð»(Ð°) ÑÐ¼Ð¾Ð´Ð·Ð¸ %{target} Ð² Ð¿Ñ‹Ð»ÑŒ"
         destroy_domain_allow: "%{name} ÑƒÐ±Ñ€Ð°Ð» Ð´Ð¾Ð¼ÐµÐ½ %{target} Ð¸Ð· Ð±ÐµÐ»Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ°"
         destroy_domain_block: "%{name} Ñ€Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð»(Ð°) Ð´Ð¾Ð¼ÐµÐ½ %{target}"
         destroy_email_domain_block: "%{name} Ð´Ð¾Ð±Ð°Ð²Ð¸Ð»(Ð°) e-mail Ð´Ð¾Ð¼ÐµÐ½ %{target} Ð² Ð±ÐµÐ»Ñ‹Ð¹ ÑÐ¿Ð¸ÑÐ¾Ðº"
+        destroy_ip_block: "%{name} ÑƒÐ´Ð°Ð»Ð¸Ð» Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð¾ Ð´Ð»Ñ IP %{target}"
         destroy_status: "%{name} ÑƒÐ´Ð°Ð»Ð¸Ð»(Ð°) Ð¿Ð¾ÑÑ‚ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %{target}"
         disable_2fa_user: "%{name} Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ð»(Ð°) Ñ‚Ñ€ÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð´Ð²ÑƒÑ…ÑÑ‚Ð°Ð¿Ð½Ð¾Ð¹ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ð¸ Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %{target}"
         disable_custom_emoji: "%{name} Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ð»(Ð°) ÑÐ¼Ð¾Ð´Ð·Ð¸ %{target}"
@@ -270,13 +297,16 @@ ru:
         reopen_report: "%{name} Ð¿ÐµÑ€ÐµÐ¾Ñ‚ÐºÑ€Ñ‹Ð»(Ð°) Ð¶Ð°Ð»Ð¾Ð±Ñƒ %{target}"
         reset_password_user: "%{name} ÑÐ±Ñ€Ð¾ÑÐ¸Ð»(Ð°) Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %{target}"
         resolve_report: "%{name} Ñ€ÐµÑˆÐ¸Ð»(Ð°) Ð¶Ð°Ð»Ð¾Ð±Ñƒ %{target}"
+        sensitive_account: "%{name} Ð¿Ð¾Ð¼ÐµÑ‚Ð¸Ð» Ð¼ÐµÐ´Ð¸Ð° %{target} ÐºÐ°Ðº Ð´ÐµÐ»Ð¸ÐºÐ°Ñ‚Ð½Ð¾Ðµ"
         silence_account: "%{name} Ð½Ð°Ð»Ð¾Ð¶Ð¸Ð»(Ð°) Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð½Ð° Ð²Ð¸Ð´Ð¸Ð¼Ð¾ÑÑ‚ÑŒ Ð¿Ð¾ÑÑ‚Ð¾Ð² ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ %{target}"
         suspend_account: "%{name} Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð»(Ð°) ÑƒÑ‡Ñ‘Ñ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ %{target}"
         unassigned_report: "%{name} ÑÐ½ÑÐ»Ð° Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð¶Ð°Ð»Ð¾Ð±Ñ‹ %{target}"
+        unsensitive_account: '%{name} ÑÐ½ÑÐ» Ð¾Ñ‚Ð¼ÐµÑ‚ÐºÑƒ "Ð´ÐµÐ»Ð¸ÐºÐ°Ñ‚Ð½Ð¾Ðµ" Ñ Ð¼ÐµÐ´Ð¸Ð° %{target}'
         unsilence_account: "%{name} ÑÐ½ÑÐ» Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð²Ð¸Ð´Ð¸Ð¼Ð¾ÑÑ‚Ð¸ Ð¿Ð¾ÑÑ‚Ð¾Ð² Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %{target}"
         unsuspend_account: "%{name} ÑÐ½ÑÐ»(Ð°) Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÑƒ Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %{target}"
         update_announcement: "%{name} Ð¾Ð±Ð½Ð¾Ð²Ð¸Ð» Ð¾Ð±ÑŠÑÐ²Ð»ÐµÐ½Ð¸Ðµ %{target}"
         update_custom_emoji: "%{name} Ð¾Ð±Ð½Ð¾Ð²Ð¸Ð»(Ð°) ÑÐ¼Ð¾Ð´Ð·Ð¸ %{target}"
+        update_domain_block: "%{name} Ð¾Ð±Ð½Ð¾Ð²Ð¸Ð» Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÑƒ Ð´Ð¾Ð¼ÐµÐ½Ð° Ð´Ð»Ñ %{target}"
         update_status: "%{name} Ð¸Ð·Ð¼ÐµÐ½Ð¸Ð»(Ð°) Ð¿Ð¾ÑÑ‚ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %{target}"
       deleted_status: "(ÑƒÐ´Ð°Ð»Ñ‘Ð½Ð½Ñ‹Ð¹ Ð¿Ð¾ÑÑ‚)"
       empty: Ð–ÑƒÑ€Ð½Ð°Ð» Ð¿ÑƒÑÑ‚.
@@ -426,6 +456,7 @@ ru:
     instances:
       by_domain: Ð”Ð¾Ð¼ÐµÐ½
       delivery_available: Ð”Ð¾ÑÑ‚Ð°Ð²ÐºÐ° Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð°
+      empty: Ð”Ð¾Ð¼ÐµÐ½Ñ‹ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ‹.
       known_accounts:
         few: "%{count} Ð¸Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ðµ ÑƒÑ‡Ñ‘Ñ‚Ð½Ñ‹Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸"
         many: "%{count} Ð¸Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ñ… ÑƒÑ‡Ñ‘Ñ‚Ð½Ñ‹Ñ… Ð·Ð°Ð¿Ð¸ÑÐµÐ¹"
@@ -451,6 +482,21 @@ ru:
         expired: Ð˜ÑÑ‚Ñ‘ÐºÑˆÐ¸Ðµ
         title: Ð¤Ð¸Ð»ÑŒÑ‚Ñ€
       title: ÐŸÑ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ
+    ip_blocks:
+      add_new: Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð¾
+      created_msg: Ð£ÑÐ¿ÐµÑˆÐ½Ð¾ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¾ Ð½Ð¾Ð²Ð¾Ðµ IP Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð¾
+      delete: Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ
+      expires_in:
+        '1209600': 2 Ð½ÐµÐ´ÐµÐ»Ð¸
+        '15778476': 6 Ð¼ÐµÑÑÑ†ÐµÐ²
+        '2629746': 1 Ð¼ÐµÑÑÑ†
+        '31556952': 1 Ð³Ð¾Ð´
+        '86400': 1 Ð´ÐµÐ½ÑŒ
+        '94670856': 3 Ð³Ð¾Ð´Ð°
+      new:
+        title: Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ð½Ð¾Ð²Ð¾Ðµ IP Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð¾
+      no_ip_block_selected: ÐÐµ Ð±Ñ‹Ð»Ð¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¾ Ð½Ð¸ Ð¾Ð´Ð½Ð¾Ð³Ð¾ IP Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð°, Ñ‚Ð°Ðº ÐºÐ°Ðº Ð½Ðµ Ð±Ñ‹Ð»Ð¾ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð¾ Ð½Ð¸ Ð¾Ð´Ð½Ð¾Ð³Ð¾
+      title: IP Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð°
     pending_accounts:
       title: ÐžÐ¶Ð¸Ð´Ð°ÑŽÑ‰Ð¸Ðµ ÑƒÑ‡ÐµÑ‚Ð½Ñ‹Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸ (%{count})
     relationships:
@@ -494,6 +540,8 @@ ru:
       comment:
         none: ÐÐµÑ‚
       created_at: Ð¡Ð¾Ð·Ð´Ð°Ð½Ð°
+      forwarded: ÐŸÐµÑ€ÐµÑÐ»Ð°Ð½Ð¾
+      forwarded_to: ÐŸÐµÑ€ÐµÑÐ»Ð°Ð½Ð¾ Ð½Ð° %{domain}
       mark_as_resolved: ÐžÑ‚Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ ÐºÐ°Ðº Ñ€ÐµÑˆÑ‘Ð½Ð½ÑƒÑŽ
       mark_as_unresolved: ÐžÑ‚Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ ÐºÐ°Ðº Ð½ÐµÑ€ÐµÑˆÑ‘Ð½Ð½ÑƒÑŽ
       notes:
@@ -563,6 +611,9 @@ ru:
         min_invite_role:
           disabled: ÐÐ¸ÐºÐ¾Ð³Ð¾
           title: Ð Ð°Ð·Ñ€ÐµÑˆÐ°Ñ‚ÑŒ Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ Ð¾Ñ‚
+        require_invite_text:
+          desc_html: ÐšÐ¾Ð³Ð´Ð° Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ Ñ€ÑƒÑ‡Ð½Ð¾Ð³Ð¾ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ, ÑÐ´ÐµÐ»Ð°Ñ‚ÑŒ Ð¾Ñ‚Ð²ÐµÑ‚ Ð½Ð° Ð²Ð¾Ð¿Ñ€Ð¾Ñ "ÐŸÐ¾Ñ‡ÐµÐ¼Ñƒ Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¸ÑÐ¾ÐµÐ´Ð¸Ð½Ð¸Ñ‚ÑŒÑÑ?" Ð¾Ð±ÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¼, Ð° Ð½Ðµ Ð¾Ð¿Ñ†Ð¸Ð¾Ð½Ð°Ð»ÑŒÐ½Ñ‹Ð¼
+          title: ÐžÐ±ÑÐ·Ð°Ñ‚ÑŒ Ð½Ð¾Ð²Ñ‹Ñ… Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð·Ð°Ð¿Ð¾Ð»Ð½ÑÑ‚ÑŒ Ñ‚ÐµÐºÑÑ‚ Ð·Ð°Ð¿Ñ€Ð¾ÑÐ° Ð½Ð° Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ðµ
       registrations_mode:
         modes:
           approved: Ð”Ð»Ñ Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ð¸ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ðµ
@@ -702,8 +753,11 @@ ru:
       prefix_sign_up: Ð—Ð°Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð¸Ñ€ÑƒÐ¹Ñ‚ÐµÑÑŒ Ð² Mastodon ÑƒÐ¶Ðµ ÑÐµÐ³Ð¾Ð´Ð½Ñ!
       suffix: Ð˜Ð¼ÐµÑ ÑƒÑ‡Ñ‘Ñ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ, Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‹Ð²Ð°Ñ‚ÑŒÑÑ Ð½Ð° Ð»ÑŽÐ´ÐµÐ¹, Ð¿Ð¾ÑÑ‚Ð¸Ñ‚ÑŒ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ, Ð¾Ð±Ð¼ÐµÐ½Ð¸Ð²Ð°Ñ‚ÑŒÑÑ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸ÑÐ¼Ð¸ Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑÐ¼Ð¸ Ð»ÑŽÐ±Ñ‹Ñ… ÑƒÐ·Ð»Ð¾Ð² Mastodon Ð¸ Ð½Ðµ Ñ‚Ð¾Ð»ÑŒÐºÐ¾!
     didnt_get_confirmation: ÐÐµ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ð»Ð¸ Ð¸Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ð¸ÑŽ Ð´Ð»Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ?
+    dont_have_your_security_key: Ð£ Ð²Ð°Ñ Ð½ÐµÑ‚ ÐºÐ»ÑŽÑ‡Ð° Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸?
     forgot_password: Ð—Ð°Ð±Ñ‹Ð»Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ?
     invalid_reset_password_token: Ð¢Ð¾ÐºÐµÐ½ ÑÐ±Ñ€Ð¾ÑÐ° Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½ÐµÐ²ÐµÑ€ÐµÐ½ Ð¸Ð»Ð¸ ÑƒÑÑ‚Ð°Ñ€ÐµÐ». ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð·Ð°Ð¿Ñ€Ð¾ÑÐ¸Ñ‚Ðµ Ð½Ð¾Ð²Ñ‹Ð¹.
+    link_to_otp: Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð´Ð²ÑƒÑ…Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ñ‹Ð¹ ÐºÐ¾Ð´ Ñ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð° Ð¸Ð»Ð¸ ÐºÐ¾Ð´ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ
+    link_to_webauth: Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾ Ñ ÐºÐ»ÑŽÑ‡Ð¾Ð¼ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸
     login: Ð’Ð¾Ð¹Ñ‚Ð¸
     logout: Ð’Ñ‹Ð¹Ñ‚Ð¸
     migrate_account: ÐŸÐµÑ€ÐµÐ½Ð¾Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸
@@ -728,7 +782,9 @@ ru:
       functional: Ð’Ð°ÑˆÐ° ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð² Ð¿Ð¾Ð»Ð½Ð¾Ð¼ Ð¿Ð¾Ñ€ÑÐ´ÐºÐµ.
       pending: Ð’Ð°ÑˆÐ° Ð·Ð°ÑÐ²ÐºÐ° Ð¾Ð¶Ð¸Ð´Ð°ÐµÑ‚ Ð¾Ð´Ð¾Ð±Ñ€ÐµÐ½Ð¸Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°Ð¼Ð¸, ÑÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð½ÑÑ‚ÑŒ Ð½ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸. Ð’Ñ‹ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚Ðµ Ð¿Ð¸ÑÑŒÐ¼Ð¾, ÐºÐ°Ðº Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð·Ð°ÑÐ²ÐºÑƒ Ð¾Ð´Ð¾Ð±Ñ€ÑÑ‚.
       redirecting_to: Ð’Ð°ÑˆÐ° ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð´ÐµÐ°ÐºÑ‚Ð¸Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°, Ð¿Ð¾Ñ‚Ð¾Ð¼Ñƒ Ñ‡Ñ‚Ð¾ Ð²Ñ‹ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ð»Ð¸ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð½Ð° %{acct}.
+    too_fast: Ð¤Ð¾Ñ€Ð¼Ð° Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð° ÑÐ»Ð¸ÑˆÐºÐ¾Ð¼ Ð±Ñ‹ÑÑ‚Ñ€Ð¾, Ð¿Ð¾Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ ÐµÑ‰Ðµ Ñ€Ð°Ð·.
     trouble_logging_in: ÐÐµ ÑƒÐ´Ð°Ñ‘Ñ‚ÑÑ Ð²Ð¾Ð¹Ñ‚Ð¸?
+    use_security_key: Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸
   authorize_follow:
     already_following: Ð’Ñ‹ ÑƒÐ¶Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ‹ Ð½Ð° ÑÑ‚Ñƒ ÑƒÑ‡Ñ‘Ñ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ
     already_requested: Ð’Ñ‹ ÑƒÐ¶Ðµ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð¸ Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° Ð¿Ð¾Ð´Ð¿Ð¸ÑÐºÑƒ Ð½Ð° ÑÑ‚Ñƒ ÑƒÑ‡Ñ‘Ñ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ
@@ -753,6 +809,7 @@ ru:
   date:
     formats:
       default: "%d %b %Y"
+      with_month_name: "%d %B %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}Ñ‡"
@@ -817,6 +874,7 @@ ru:
       request: Ð—Ð°Ð¿Ñ€Ð¾ÑÐ¸Ñ‚ÑŒ Ð²Ð°Ñˆ Ð°Ñ€Ñ…Ð¸Ð²
       size: Ð Ð°Ð·Ð¼ÐµÑ€
     blocks: Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ¸
+    bookmarks: Ð—Ð°ÐºÐ»Ð°Ð´ÐºÐ¸
     csv: CSV
     domain_blocks: Ð”Ð¾Ð¼ÐµÐ½Ð½Ñ‹Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ¸
     lists: Ð¡Ð¿Ð¸ÑÐºÐ¸
@@ -895,6 +953,7 @@ ru:
     success: Ð’Ð°ÑˆÐ¸ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð±Ñ‹Ð»Ð¸ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ñ‹ Ð¸ Ð±ÑƒÐ´ÑƒÑ‚ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ð½Ñ‹ Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾Ð¹ ÑÐºÐ¾Ñ€Ð¾ÑÑ‚ÑŒÑŽ
     types:
       blocking: Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ¸
+      bookmarks: Ð—Ð°ÐºÐ»Ð°Ð´ÐºÐ¸
       domain_blocking: Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð´Ð¾Ð¼ÐµÐ½Ð½Ñ‹Ñ… Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð¾Ðº
       following: ÐŸÐ¾Ð´Ð¿Ð¸ÑÐºÐ¸
       muting: Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð³Ð»ÑƒÑˆÐµÐ½Ð¸Ñ
@@ -1021,6 +1080,14 @@ ru:
           quadrillion: ÐºÐ²Ð°Ð´Ñ€Ð»Ð½
           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: Ð¡Ð»ÐµÐ´
@@ -1049,6 +1116,7 @@ ru:
   relationships:
     activity: ÐÐºÑ‚Ð¸Ð²Ð½Ð¾ÑÑ‚ÑŒ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸
     dormant: Ð—Ð°Ð±Ñ€Ð¾ÑˆÐµÐ½Ð½Ð°Ñ
+    follow_selected_followers: ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒÑÑ Ð½Ð° Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ¾Ð²
     followers: ÐŸÐ¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ¸
     following: ÐŸÐ¾Ð´Ð¿Ð¸ÑÐºÐ¸
     invited: ÐŸÑ€Ð¸Ð³Ð»Ð°ÑˆÑ‘Ð½Ð½Ñ‹Ðµ
@@ -1145,6 +1213,7 @@ ru:
     profile: ÐŸÑ€Ð¾Ñ„Ð¸Ð»ÑŒ
     relationships: ÐŸÐ¾Ð´Ð¿Ð¸ÑÐºÐ¸ Ð¸ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ¸
     two_factor_authentication: ÐŸÐ¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ðµ Ð²Ñ…Ð¾Ð´Ð°
+    webauthn_authentication: ÐšÐ»ÑŽÑ‡Ð¸ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸
   spam_check:
     spam_detected: ÐÑ‚Ð¾ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸Ð¹ Ð¾Ñ‚Ñ‡ÐµÑ‚. ÐžÐ±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½ ÑÐ¿Ð°Ð¼.
   statuses:
@@ -1195,6 +1264,8 @@ ru:
         other: "%{count} Ð³Ð¾Ð»Ð¾ÑÐ¾Ð²"
       vote: Ð“Ð¾Ð»Ð¾ÑÐ¾Ð²Ð°Ñ‚ÑŒ
     show_more: Ð Ð°Ð·Ð²ÐµÑ€Ð½ÑƒÑ‚ÑŒ
+    show_newer: ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð±Ð¾Ð»ÐµÐµ Ð½Ð¾Ð²Ð¾Ðµ
+    show_older: ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ ÑÑ‚Ð°Ñ€Ñ‹Ðµ
     show_thread: ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð¾Ð±ÑÑƒÐ¶Ð´ÐµÐ½Ð¸Ðµ
     sign_in_to_participate: Ð’Ð¾Ð¹Ð´Ð¸Ñ‚Ðµ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€Ð¸Ð½ÑÑ‚ÑŒ ÑƒÑ‡Ð°ÑÑ‚Ð¸Ðµ Ð² Ð´Ð¸ÑÐºÑƒÑÑÐ¸Ð¸
     title: '%{name}: "%{quote}"'
@@ -1299,21 +1370,20 @@ ru:
       default: "%d %b %Y, %H:%M"
       month: "%m.%Y"
   two_factor_authentication:
-    code_hint: Ð”Ð»Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð²Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÐºÐ¾Ð´, ÑÐ³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ð¹ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÐ¼-Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€Ð¾Ð¼.
-    description_html: 'ÐÐ° ÑÑ‚Ð¾Ð¹ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ðµ Ð¼Ð¾Ð¶Ð½Ð¾ Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ <strong>Ð´Ð²ÑƒÑ…Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½ÑƒÑŽ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸ÑŽ</strong>: Ñ Ð½ÐµÐ¹, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð²Ð¾Ð¹Ñ‚Ð¸ Ð² ÑÐ²Ð¾ÑŽ ÑƒÑ‡Ñ‘Ñ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ, Ð¿Ð¾Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ Ð²Ð²ÐµÑÑ‚Ð¸ Ð½ÐµÐ±Ð¾Ð»ÑŒÑˆÐ¾Ð¹ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ð¹ ÐºÐ¾Ð´, Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€ÑƒÐµÐ¼Ñ‹Ð¹ Ñ‡ÐµÑ€ÐµÐ· Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ð° ÑÐ²Ð¾Ñ‘Ð¼ ÑÐ¼Ð°Ñ€Ñ‚Ñ„Ð¾Ð½Ðµ.'
+    add: Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ
     disable: ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ
-    enable: Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ
+    disabled_success: Ð”Ð²ÑƒÑ…Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð°Ñ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð°
+    edit: Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ
     enabled: Ð”Ð²ÑƒÑ…Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð°Ñ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½Ð°
     enabled_success: Ð”Ð²ÑƒÑ…Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð°Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ñ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½Ð°
     generate_recovery_codes: Ð¡Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÐºÐ¾Ð´Ñ‹ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ
-    instructions_html: "<strong>ÐžÑ‚ÑÐºÐ°Ð½Ð¸Ñ€ÑƒÐ¹Ñ‚Ðµ ÑÑ‚Ð¾Ñ‚ QR-ÐºÐ¾Ð´ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Google Authenticator, Ð¯Ð½Ð´ÐµÐºÑ.ÐšÐ»ÑŽÑ‡Ð° Ð¸Ð»Ð¸ Ð»ÑŽÐ±Ð¾Ð³Ð¾ Ð´Ñ€ÑƒÐ³Ð¾Ð³Ð¾ Ð¿Ð¾Ð´Ð¾Ð±Ð½Ð¾Ð³Ð¾ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ</strong>. ÐŸÐ¾ÑÐ»Ðµ ÑÐºÐ°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ, Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ð°Ñ‡Ð½Ñ‘Ñ‚ Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÐºÐ¾Ð´Ñ‹, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ Ð²Ð²Ð¾Ð´Ð¸Ñ‚ÑŒ Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð²Ñ…Ð¾Ð´Ð° Ð² ÑƒÑ‡Ñ‘Ñ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ."
     lost_recovery_codes: ÐšÐ¾Ð´Ñ‹ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÑŽÑ‚ÑÑ Ð²Ð¾Ð¹Ñ‚Ð¸ Ð² ÑƒÑ‡Ñ‘Ñ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð² ÑÐ»ÑƒÑ‡Ð°Ðµ ÑƒÑ‚ÐµÑ€Ð¸ ÑÐ¼Ð°Ñ€Ñ‚Ñ„Ð¾Ð½Ð°. Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð¿Ð¾Ñ‚ÐµÑ€ÑÐ»Ð¸ ÑÐ²Ð¾Ð¸ ÐºÐ¾Ð´Ñ‹ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ, Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ð½Ð¾Ð²Ñ‹Ðµ Ð·Ð´ÐµÑÑŒ. ÐŸÑ€Ð¾ÑˆÐ»Ñ‹Ðµ ÐºÐ¾Ð´Ñ‹ Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ Ð¿ÐµÑ€ÐµÑÑ‚Ð°Ð½ÑƒÑ‚.
-    manual_instructions: 'Ð•ÑÐ»Ð¸ Ð¾Ñ‚ÑÐºÐ°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ QR-ÐºÐ¾Ð´ Ð½Ðµ Ð¿Ð¾Ð»ÑƒÑ‡Ð°ÐµÑ‚ÑÑ Ð¸Ð»Ð¸ Ð½Ðµ Ð¿Ñ€ÐµÐ´ÑÑ‚Ð°Ð²Ð»ÑÐµÑ‚ÑÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹Ð¼, Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²Ð²ÐµÑÑ‚Ð¸ ÐµÐ³Ð¾ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ:'
+    methods: ÐœÐµÑ‚Ð¾Ð´Ñ‹ Ð´Ð²ÑƒÑ…Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð¾Ð¹ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸
+    otp: ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ Ð¿Ð¾Ð´Ð»Ð¸Ð½Ð½Ð¾ÑÑ‚Ð¸
     recovery_codes: ÐšÐ¾Ð´Ñ‹ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ
     recovery_codes_regenerated: ÐšÐ¾Ð´Ñ‹ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ ÑÐ³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ñ‹
     recovery_instructions_html: 'ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, ÑÐ¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚Ðµ ÐºÐ¾Ð´Ñ‹ Ð½Ð¸Ð¶Ðµ Ð² Ð½Ð°Ð´Ñ‘Ð¶Ð½Ð¾Ð¼ Ð¼ÐµÑÑ‚Ðµ: Ð¾Ð½Ð¸ Ð¿Ð¾Ð½Ð°Ð´Ð¾Ð±ÑÑ‚ÑÑ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð²Ð¾Ð¹Ñ‚Ð¸ Ð² ÑƒÑ‡Ñ‘Ñ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ, ÐµÑÐ»Ð¸ Ð²Ñ‹ Ð¿Ð¾Ñ‚ÐµÑ€ÑÐµÑ‚Ðµ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº ÑÐ²Ð¾ÐµÐ¼Ñƒ ÑÐ¼Ð°Ñ€Ñ‚Ñ„Ð¾Ð½Ñƒ. Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ Ð¿ÐµÑ€ÐµÐ¿Ð¸ÑÐ°Ñ‚ÑŒ Ð¸Ñ…, Ñ€Ð°ÑÐ¿ÐµÑ‡Ð°Ñ‚Ð°Ñ‚ÑŒ Ð¸ ÑÐ¿Ñ€ÑÑ‚Ð°Ñ‚ÑŒ ÑÑ€ÐµÐ´Ð¸ Ð²Ð°Ð¶Ð½Ñ‹Ñ… Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð² Ð¸Ð»Ð¸, Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€, Ð² Ð»ÑŽÐ±Ð¸Ð¼Ð¾Ð¹ ÐºÐ½Ð¸Ð¶ÐºÐµ. <strong>ÐšÐ°Ð¶Ð´Ñ‹Ð¹ ÐºÐ¾Ð´ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÐµÐ½ Ð¾Ð´Ð¸Ð½ Ñ€Ð°Ð·</strong>.'
-    setup: ÐÐ°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ
-    wrong_code: Ð’Ð²ÐµÐ´ÐµÐ½Ð½Ñ‹Ð¹ ÐºÐ¾Ð´ Ð½ÐµÐ²ÐµÑ€ÐµÐ½! ÐŸÑ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ Ð»Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ‹ ÑÐµÑ€Ð²ÐµÑ€Ð½Ð¾Ðµ Ð²Ñ€ÐµÐ¼Ñ Ð¸ Ð²Ñ€ÐµÐ¼Ñ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°?
+    webauthn: ÐšÐ»ÑŽÑ‡Ð¸ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸
   user_mailer:
     backup_ready:
       explanation: Ð’Ñ‹ Ð·Ð°Ð¿Ñ€Ð¾ÑÐ¸Ð»Ð¸ Ð°Ñ€Ñ…Ð¸Ð² Ð²ÑÐµÑ… Ð´Ð°Ð½Ð½Ñ‹Ñ… Ð²Ð°ÑˆÐµÐ¹ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ Mastodon. Ð§Ñ‚Ð¾ Ð¶, Ð¾Ð½ Ð³Ð¾Ñ‚Ð¾Ð² Ðº ÑÐºÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸ÑŽ.
@@ -1328,6 +1398,7 @@ ru:
     warning:
       explanation:
         disable: ÐŸÐ¾ÐºÐ° Ð²Ð°ÑˆÐ° ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð·Ð°Ð¼Ð¾Ñ€Ð¾Ð¶ÐµÐ½Ð°, Ð²Ð°ÑˆÐ¸ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð¾ÑÑ‚Ð°ÑŽÑ‚ÑÑ Ð½ÐµÑ‚Ñ€Ð¾Ð½ÑƒÑ‚Ñ‹Ð¼Ð¸, Ð½Ð¾ Ð²Ñ‹ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÑŒ Ð½Ð¸ÐºÐ°ÐºÐ¸Ñ… Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ð¹ Ð´Ð¾ Ñ€Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ¸.
+        sensitive: Ð’Ð°ÑˆÐ¸ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð½Ñ‹Ðµ Ð¼ÐµÐ´Ð¸Ð°-Ñ„Ð°Ð¹Ð»Ñ‹ Ð¸ ÑÐ²ÑÐ·Ð°Ð½Ð½Ñ‹Ðµ Ñ Ð½Ð¸Ð¼Ð¸ Ð¼ÐµÐ´Ð¸Ð° Ð±ÑƒÐ´ÑƒÑ‚ Ñ€Ð°ÑÑÐ¼Ð°Ñ‚Ñ€Ð¸Ð²Ð°Ñ‚ÑŒÑÑ ÐºÐ°Ðº Ð´ÐµÐ»Ð¸ÐºÐ°Ñ‚Ð½Ñ‹Ðµ.
         silence: ÐŸÐ¾ÐºÐ° Ð´ÐµÐ¹ÑÑ‚Ð²ÑƒÑŽÑ‚ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ, Ð¿ÑƒÐ±Ð»Ð¸ÐºÑƒÐµÐ¼Ñ‹Ðµ Ð²Ð°Ð¼Ð¸ Ð¿Ð¾ÑÑ‚Ñ‹ Ð±ÑƒÐ´ÑƒÑ‚ Ð²Ð¸Ð´ÐµÑ‚ÑŒ Ð¸ÑÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ð»ÑŽÐ´Ð¸, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð½Ð° Ð²Ð°Ñ ÑƒÐ¶Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ‹ Ð½Ð° ÑÑ‚Ð¾Ð¼ ÑƒÐ·Ð»Ðµ, Ð²Ñ‹ Ñ‚Ð°ÐºÐ¶Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð±Ñ‹Ñ‚ÑŒ Ð¸ÑÐºÐ»ÑŽÑ‡ÐµÐ½Ñ‹ Ð¸Ð· Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð½Ñ‹Ñ… Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ñ… Ð»ÐµÐ½Ñ‚. ÐÐµÑÐ¼Ð¾Ñ‚Ñ€Ñ Ð½Ð° ÑÑ‚Ð¾, Ð¾ÑÑ‚Ð°Ð»ÑŒÐ½Ñ‹Ðµ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸ Ð¿Ð¾-Ð¿Ñ€ÐµÐ¶Ð½ÐµÐ¼Ñƒ Ð¼Ð¾Ð³ÑƒÑ‚ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒÑÑ Ð½Ð° Ð²Ð°Ñ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ð½Ð¾Ð²Ñ‹Ðµ Ð¿Ð¾ÑÑ‚Ñ‹.
         suspend: Ð’Ð°ÑˆÐ° ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð° Ð¸ Ð²ÑÐµ Ð²Ð°ÑˆÐ¸ Ð¿Ð¾ÑÑ‚Ñ‹ Ð¸ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð½Ñ‹Ðµ Ð¼ÐµÐ´Ð¸Ð°Ñ„Ð°Ð¹Ð»Ñ‹ Ð±ÐµÐ·Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð½Ð¾ ÑƒÐ´Ð°Ð»ÐµÐ½Ñ‹ Ñ ÑÑ‚Ð¾Ð³Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ð° Ð¸ Ð´Ñ€ÑƒÐ³Ð¸Ñ… ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð², Ð³Ð´Ðµ Ñƒ Ð²Ð°Ñ Ð±Ñ‹Ð»Ð¸ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ¸.
       get_in_touch: Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¾Ñ‚Ð²ÐµÑ‚Ð¸Ñ‚ÑŒ Ð½Ð° ÑÑ‚Ð¾ Ð¿Ð¸ÑÑŒÐ¼Ð¾, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑÐ²ÑÐ·Ð°Ñ‚ÑŒÑÑ Ñ ÑÐ¾Ñ‚Ñ€ÑƒÐ´Ð½Ð¸ÐºÐ°Ð¼Ð¸ %{instance}.
@@ -1336,11 +1407,13 @@ ru:
       subject:
         disable: Ð’Ð°ÑˆÐ° ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ %{acct} Ð·Ð°Ð¼Ð¾Ñ€Ð¾Ð¶ÐµÐ½Ð°
         none: "%{acct} Ð²Ñ‹Ð½ÐµÑÐµÐ½Ð¾ Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
+        sensitive: Ð’Ð°ÑˆÐ° ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ %{acct} Ð¿Ð¾Ð¼ÐµÑ‡ÐµÐ½Ð° ÐºÐ°Ðº Ð´ÐµÐ»Ð¸ÐºÐ°Ñ‚Ð½Ð°Ñ
         silence: ÐÐ° ÑƒÑ‡Ñ‘Ñ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ %{acct} Ð½Ð°Ð»Ð¾Ð¶ÐµÐ½Ñ‹ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ
         suspend: Ð’Ð°ÑˆÐ° ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ %{acct} Ð±Ñ‹Ð»Ð° Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð°
       title:
         disable: Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð·Ð°Ð¼Ð¾Ñ€Ð¾Ð¶ÐµÐ½Ð°
         none: ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ
+        sensitive: Ð’Ð°Ñˆ Ð¼ÐµÐ´Ð¸Ð°Ñ„Ð°Ð¹Ð» Ð±Ñ‹Ð» Ð¾Ñ‚Ð¼ÐµÑ‡ÐµÐ½ ÐºÐ°Ðº Ð´ÐµÐ»Ð¸ÐºÐ°Ñ‚Ð½Ñ‹Ð¹
         silence: ÐÐ° ÑƒÑ‡Ñ‘Ñ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð½Ð°Ð»Ð¾Ð¶ÐµÐ½Ñ‹ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ
         suspend: Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð°
     welcome:
@@ -1361,9 +1434,11 @@ ru:
       tips: Ð¡Ð¾Ð²ÐµÑ‚Ñ‹
       title: Ð”Ð¾Ð±Ñ€Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ‚ÑŒ Ð½Ð° Ð±Ð¾Ñ€Ñ‚, %{name}!
   users:
+    blocked_email_provider: ÐÑ‚Ð¾Ñ‚ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¹ Ð¿Ñ€Ð¾Ð²Ð°Ð¹Ð´ÐµÑ€ Ð½Ðµ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½
     follow_limit_reached: Ð’Ñ‹ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒÑÑ Ð±Ð¾Ð»ÑŒÑˆÐµ, Ñ‡ÐµÐ¼ Ð½Ð° %{limit} Ñ‡ÐµÐ»Ð¾Ð²ÐµÐº
     generic_access_help_html: ÐÐµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²Ð¾Ð¹Ñ‚Ð¸ Ð² ÑÐ²Ð¾ÑŽ ÑƒÑ‡Ñ‘Ñ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ? Ð¡Ð²ÑÐ¶Ð¸Ñ‚ÐµÑÑŒ Ñ %{email} Ð´Ð»Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð¸
     invalid_email: Ð’Ð²ÐµÐ´ÐµÐ½Ð½Ñ‹Ð¹ e-mail Ð½ÐµÐ²ÐµÑ€ÐµÐ½
+    invalid_email_mx: ÐÐ´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹ Ð½Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚
     invalid_otp_token: Ð’Ð²ÐµÐ´ÐµÐ½ Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ ÐºÐ¾Ð´ Ð´Ð²ÑƒÑ…Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð¾Ð¹ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸
     invalid_sign_in_token: ÐÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ ÐºÐ¾Ð´ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸
     otp_lost_help_html: Ð•ÑÐ»Ð¸ Ð’Ñ‹ Ð¿Ð¾Ñ‚ÐµÑ€ÑÐ»Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ð¾Ð±Ð¾Ð¸Ð¼, ÑÐ²ÑÐ¶Ð¸Ñ‚ÐµÑÑŒ Ñ %{email}
@@ -1373,3 +1448,20 @@ ru:
   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}
diff --git a/config/locales/sa.yml b/config/locales/sa.yml
new file mode 100644
index 0000000000000000000000000000000000000000..229e4568c5e2cdbaa023092cce71e8a104ffa001
--- /dev/null
+++ b/config/locales/sa.yml
@@ -0,0 +1,12 @@
+---
+sa:
+  errors:
+    '400': The request you submitted was invalid or malformed.
+    '403': You don't have permission to view this page.
+    '404': The page you are looking for isn't here.
+    '406': This page is not available in the requested format.
+    '410': The page you were looking for doesn't exist here anymore.
+    '422': 
+    '429': Too many requests
+    '500': 
+    '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index d1b8b43b4408763bfe2cdf41a80cb8bb62dc546f..626c7671c0ca7b85c2368c3ac25ae7a81e7e004a 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -1,20 +1,1420 @@
 ---
 sc:
+  about:
+    about_hashtag_html: Custos sunt tuts pÃ¹blicos etichetados cun <strong>#%{hashtag}</strong>. Bi podes intrare in cuntatu si tenes unu contu in cale si siat logu de su fediversu.
+    about_mastodon_html: 'Sa rete sotziale de su benidore: sena publitzidade, sena vigilÃ ntzia corporativa, disignu Ã¨ticu e detzentralizatzione! Sias mere de is datos tuos cun Mastodon!'
+    about_this: Informatziones
+    active_count_after: ativu
+    active_footnote: Utentes Ativos Mensiles (UAM)
+    administered_by: 'Amministradu dae:'
+    api: "*API"
+    apps: Aplicatziones mÃ²biles
+    apps_platforms: Imprea Mastodon dae iOS, Android e Ã teras prataformas
+    browse_directory: NÃ viga su diretÃ²riu de profilos e filtra segundu interessos
+    browse_local_posts: NÃ viga unu flussu in direta de messÃ gios pÃ¹blicos de custu serbidore
+    browse_public_posts: NÃ viga unu flussu in direta de messÃ gios pÃ¹blicos in Mastodon
+    contact: Cuntatu
+    contact_missing: No impostadu
+    contact_unavailable: No a disponimentu
+    discover_users: Iscoberi utentes
+    documentation: Documentatzione
+    federation_hint_html: Cun unu contu in %{instance} as a pÃ²dere sighire persones in cale si siat serbidore de Mastodon o de su fediversu.
+    get_apps: Proa un'aplicatzione mÃ²bile
+    hosted_on: Mastodon acasagiadu in %{domain}
+    instance_actor_flash: 'Custu contu est un''atore virtuale impreadu pro rapresentare su serbidore matessi, no est un''utente individuale. Benit impreadu pro punnas de federatzione e non lu dias dÃ¨pere blocare si non cheres blocare su domÃ¬niu intreu, e in cussu casu dias dÃ¨pere impreare unu blocu de domÃ¬niu.
+
+'
+    learn_more: Ã€teras informatziones
+    privacy_policy: PolÃ¬tica de riservadesa
+    see_whats_happening: CÃ stia su chi est acontessende
+    server_stats: 'IstatÃ¬sticas de su serbidore:'
+    source_code: CÃ²dighe mitza
+    status_count_after:
+      one: istadu
+      other: istados
+    status_count_before: Autores de
+    tagline: Sighi is amigos tuos e iscoberiÂ·nde de noos
+    terms: Cunditziones de su servÃ¬tziu
+    unavailable_content: Serbidores moderados
+    unavailable_content_description:
+      domain: Serbidore
+      reason: Resone
+      rejecting_media: 'Is documentos multimediales de custos serbidores no at a Ã¨ssere protzessadu o sarvadu e peruna miniadura at a Ã¨ssere ammustradas, ca tenent bisÃ²ngiu de un''incarcu manuale in su documentu originale:'
+      rejecting_media_title: MÃ¨dios filtrados
+      silenced: 'Is messÃ gios dae custos serbidores ant a Ã¨ssere cuados in is lÃ¬nias de tempus e is arresonadas pÃ¹blicas, e no at a Ã¨ssere generada peruna notÃ¬fica dae is interatziones de is utentes, francu chi nde sias sighende:'
+      silenced_title: Serbidores a sa muda
+      suspended: 'Perunu datu de custos serbidores at a Ã¨ssere protzessadu, immagasinadu o cuncambiadu; est impossÃ¬bile duncas cale si siat interatzione o comunicatzione cun is utentes de custos serbidores:'
+      suspended_title: Serbidores suspÃ¨ndidos
+    unavailable_content_html: Mastodon ti permitit de bÃ¬dere su cuntenutu de utentes de cale si siat Ã teru serbidore de su fediversu. Custas sunt etzetziones chi fatas in custu serbidore particulare.
+    user_count_after:
+      one: utente
+      other: utentes
+    user_count_before: Allogiadu dae
+    what_is_mastodon: Ite est Mastodon?
+  accounts:
+    choices_html: 'SÃ¨beros de %{name}:'
+    endorsements_hint: Podes cussigiare gente chi sighis dae s'interfache web, e at a aparÃ¨ssere inoghe.
+    featured_tags_hint: Podes evidentziare etichetas ispetzÃ¬ficas chi ant a Ã¨ssere ammustradas inoghe.
+    follow: Sighi
+    followers:
+      one: Sighidura
+      other: Sighiduras
+    following: Sighende
+    joined: At aderidu su %{date}
+    last_active: Ã¹rtima atividade
+    link_verified_on: Sa propiedade de custu ligÃ mene est istada controllada su %{date}
+    media: Elementos multimediales
+    moved_html: "%{name} est istadu trasferidu a %{new_profile_link}:"
+    network_hidden: Custa informatzione no a disponimentu
+    never_active: Mai
+    nothing_here: Nudda inoghe.
+    people_followed_by: Gente sighida dae %{name}
+    people_who_follow: Gente chi sighit a %{name}
+    pin_errors:
+      following: Depes sighire sa persone chi boles promÃ²vere
+    posts:
+      one: Tut
+      other: Tuts
+    posts_tab_heading: Tuts
+    posts_with_replies: Tuts e rispostas
+    reserved_username: Custu nÃ²mine de utente est giai impreadu
+    roles:
+      admin: Admin
+      bot: Bot
+      group: Grupu
+      moderator: Moderadore
+    unavailable: Su profilu no est a disponimentu
+    unfollow: Non sigas prus
+  admin:
+    account_actions:
+      action: Faghe un'atzione
+      title: Faghe un'atzione de moderatzione in %{acct}
+    account_moderation_notes:
+      create: Lassa una nota
+      created_msg: As creadu una nota de moderatzione.
+      delete: Cantzella
+      destroyed_msg: As cantzelladu una nota de moderatzione.
+    accounts:
+      add_email_domain_block: Bloca domÃ¬niu de posta eletrÃ²nica
+      approve: Aprova
+      approve_all: Aprova totus
+      approved_msg: Sa dimanda de registru de %{username} est istada aprovada
+      are_you_sure: Seguru?
+      avatar: ImmÃ gine de profilu
+      by_domain: DomÃ¬niu
+      change_email:
+        changed_msg: As cambiadu s'indiritzu eletrÃ²nicu.
+        current_email: Indiritzu eletrÃ²nicu atuale
+        label: Muda s'indiritzu eletrÃ²nicu
+        new_email: Indiritzu de eletrÃ²nicu nou
+        submit: Muda s'indiritzu eletrÃ²nicu
+        title: Muda s'indiritzu eletrÃ²nicu de %{username}
+      confirm: Cunfirma
+      confirmed: Cunfirmadu
+      confirming: Cunfirmende
+      delete: Cantzella datos
+      deleted: Cantzelladu
+      demote: Degrada
+      destroyed_msg: Is datos de %{username} sunt a sa coa pro Ã¨ssere cantzellados luego
+      disable: Disativa
+      disable_two_factor_authentication: Disativa 2FA
+      disabled: Disativadu
+      display_name: NÃ²mine visÃ¬bile
+      domain: DomÃ¬niu
+      edit: ModÃ¬fica
+      email: Posta eletrÃ²nica
+      email_status: Istadu de s'indiritzu eletrÃ²nicu
+      enable: Ativa
+      enabled: Ativadu
+      enabled_msg: Su contu de %{username} est istadu ativadu
+      followers: Sighiduras
+      follows: Sighende
+      header: Intestatzione
+      inbox_url: URL de intrada
+      invited_by: Invitu dae
+      ip: IP
+      joined: At aderidu
+      location:
+        all: Totus
+        local: Locale
+        remote: Remotu
+        title: Positzione
+      login_status: Istadu de atzessu
+      media_attachments: Allegados multimediales
+      memorialize: Cunverte in memoriam
+      memorialized: Memorializadu
+      memorialized_msg: As trasformadu %{username} in unu contu de ammentu
+      moderation:
+        active: Ativu
+        all: Totus
+        pending: De imbiare
+        silenced: A sa muda
+        suspended: SuspÃ¨ndidu
+        title: Moderatzione
+      moderation_notes: Notas de moderatzione
+      most_recent_activity: Atividade prus reghente
+      most_recent_ip: IP prus reghente
+      no_account_selected: Perunu contu est istadu mudadu, dae chi non nd'as seletzionadu
+      no_limits_imposed: Sena lÃ¬mites
+      not_subscribed: Sena sutiscritzione
+      pending: De revisionare
+      perform_full_suspension: SuspÃ¨ndidu
+      promote: Promove
+      protocol: Protocollu
+      public: PÃ¹blicu
+      push_subscription_expires: Sa sutiscritzione PuSH iscadit
+      redownload: Atualiza su profilu
+      redownloaded_msg: Su profilu de %{username} est istadu agiornadu dae s'orÃ¬gine
+      reject: Refuda
+      reject_all: Refuda totu
+      rejected_msg: Sa dimanda de registru de %{username} est istada refudada
+      remove_avatar: Boga immÃ gine de profilu
+      remove_header: Boga s'intestatzione
+      removed_avatar_msg: S'immÃ gine de d'Ã vatar de %{username} est istada bogada
+      removed_header_msg: S'immÃ gine de intestatzione de %{username} est istada bogada
+      resend_confirmation:
+        already_confirmed: Custa persone est giai cunfirmada
+        send: Torra a imbiare messÃ giu eletrÃ²nicu de cunfirmatzione
+        success: MessÃ giu eletrÃ²nicu de cunfirmatzione imbiadu.
+      reset: Reseta
+      reset_password: Reseta sa crae
+      resubscribe: Torra a sutascrÃ¬ere
+      role: Permissos
+      roles:
+        admin: Admin
+        moderator: Mod
+        staff: Personale
+        user: Utente
+      search: Chirca
+      search_same_email_domain: Ã€teras persones cun su prÃ²piu domÃ¬niu de posta
+      search_same_ip: Ã€teras persones cun sa prÃ²piu IP
+      sensitive: SensÃ¬bile
+      sensitized: marcadu comente a sensÃ¬bile
+      shared_inbox_url: URL de intrada cumpartzida
+      show:
+        created_reports: Informes creados
+        targeted_reports: Informes de Ã tere
+      silence: LÃ¬mita
+      silenced: Limitadas
+      statuses: Tuts
+      subscribe: SutascrieÂ·ti
+      suspended: SuspÃ¨ndidu
+      suspension_irreversible: Is datos de custu contu sunt istados cantzellados in manera irreversÃ¬bile. Podes bogare sa suspensione a su contu pro chi si potzat impreare, ma no at a recuperare datu perunu de is chi teniat in antis.
+      suspension_reversible_hint_html: Su contu est istadu suspÃ¨ndidu, e is datos ant a Ã¨ssere cantzelladu de su totu su %{date}. Finas a tando, su contu si podet ripristinare sena efetu malu perunu. Si boles cantzellare totu is datos de su contu immediatamente ddu podes fÃ ghere inoghe in bassu.
+      time_in_queue: Isetende in coa %{time}
+      title: Contos
+      unconfirmed_email: Posta eletrÃ²nica sena cunfirmare
+      undo_sensitized: Boga sa marcadura comente "sensÃ¬bile"
+      undo_silenced: Non pÃ²ngias a sa muda
+      undo_suspension: Iscontza sa suspensione
+      unsilenced_msg: As bogadu is lÃ¬mites a su contu de %{username}
+      unsubscribe: Annulla sa sutiscritzione
+      unsuspended_msg: As bogadu sa suspensione a su contu de %{username}
+      username: NÃ²mine utente
+      view_domain: CÃ stia unu resumu pro su domÃ¬niu
+      warn: Avisu
+      web: Web
+      whitelisted: Federatzione permÃ¬tida
+    action_logs:
+      action_types:
+        assigned_to_self_report: Assigna s'informe
+        change_email_user: Muda s'indiritzu eletrÃ²nicu pro s'utente
+        confirm_user: Cunfirma s'utente
+        create_account_warning: Crea un'avisu
+        create_announcement: Crea un'annÃ¹ntziu
+        create_custom_emoji: Crea un'emoji personalizadu
+        create_domain_allow: Crea unu domÃ¬niu permÃ¬tidu
+        create_domain_block: Crea unu blocu de domÃ¬niu
+        create_email_domain_block: Crea unu blocu de domÃ¬niu de indiritzu de posta
+        create_ip_block: Crea una rÃ¨gula IP
+        demote_user: Degrada s'utente
+        destroy_announcement: Cantzella s'annÃ¹ntziu
+        destroy_custom_emoji: Cantzella s'emoji personalizadu
+        destroy_domain_allow: Cantzella su domÃ¬niu permÃ¬tidu
+        destroy_domain_block: Cantzella su blocu de domÃ¬niu
+        destroy_email_domain_block: Cantzella su blocu de domÃ¬niu de s'indiritzu de posta
+        destroy_ip_block: Cantzella sa rÃ¨gula IP
+        destroy_status: Cantzella s'istadu
+        disable_2fa_user: Disativa 2FA
+        disable_custom_emoji: Disativa s'emoji personalizadu
+        disable_user: Disativa utente
+        enable_custom_emoji: Ativa s'emoji personalizadu
+        enable_user: Ativa utente
+        memorialize_account: Regorda su contu
+        promote_user: Promove utente
+        remove_avatar_user: Cantzella immÃ gine de profilu
+        reopen_report: Torra a abÃ¨rrere s'informe
+        reset_password_user: Reseta sa crae
+        resolve_report: Isorve s'informe
+        sensitive_account: Marca sos cuntenutos multimediales in su contu tuo comente sensÃ¬bile
+        silence_account: Pone custu contu a sa muda
+        suspend_account: Suspende custu contu
+        unassigned_report: Boga s'assignatzione de custu informe
+        unsensitive_account: Boga sa marcadura "sensÃ¬biles" a is elementos multimediales in su contu tuo
+        unsilence_account: Boga custu contu de is contos a sa muda
+        unsuspend_account: Boga custu contu de is contos suspÃ¨ndidos
+        update_announcement: Atualiza s'annÃ¹ntziu
+        update_custom_emoji: Atualiza s'emoji personalizadu
+        update_status: Atualiza s'istadu
+      actions:
+        assigned_to_self_report: "%{name} s'est auto-assignadu s'informe %{target}"
+        change_email_user: "%{name} at mudadu s'indiritzu de posta eletrÃ²nica de s'utente %{target}"
+        confirm_user: "%{name} at cunfirmadu s'indiritzu de posta eletrÃ²nica de s'utente %{target}"
+        create_account_warning: "%{name} at imbiadu un'avisu a %{target}"
+        create_announcement: "%{name} at creadu un'annÃ¹ntziu nou %{target}"
+        create_custom_emoji: "%{name} at carrigadu un'emoji nou%{target}"
+        create_domain_allow: "%{name} at permÃ¬tidu sa federatzione cun su domÃ¬niu %{target}"
+        create_domain_block: "%{name} at blocadu su domÃ¬niu %{target}"
+        create_email_domain_block: "%{name} at blocadu su domÃ¬niu de posta eletrÃ²nica %{target}"
+        create_ip_block: "%{name} at creadu una rÃ¨gula pro s'IP %{target}"
+        demote_user: "%{name} at degradadu s'utente %{target}"
+        destroy_announcement: "%{name} at cantzelladu s'annÃ¹ntziu %{target}"
+        destroy_custom_emoji: "%{name} at cantzelladu s'emoji %{target}"
+        destroy_domain_allow: "%{name} no at permÃ¬tidu sa federatzione cun su domÃ¬niu %{target}"
+        destroy_domain_block: "%{name} at isblocadu su domÃ¬niu %{target}"
+        destroy_email_domain_block: "%{name} at isblocadu su domÃ¬niu de posta eletrÃ²nica %{target}"
+        destroy_ip_block: "%{name} at cantzelladu sa rÃ¨gula pro s'IP %{target}"
+        destroy_status: "%{name} at eliminadu s'istadu de %{target}"
+        disable_2fa_user: "%{name} at disativadu su rechisitu de duos fatores pro s'utente %{target}"
+        disable_custom_emoji: "%{name} at disativadu s'emoji %{target}"
+        disable_user: "%{name} at disativadu s'atzessu pro s'utente %{target}"
+        enable_custom_emoji: "%{name} at ativadu s'emoji %{target}"
+        enable_user: "%{name} at ativadu s'atzessu pro s'utente %{target}"
+        memorialize_account: "%{name} at cunvertidu su contu %{target} in una pÃ gina in memoriam"
+        promote_user: "%{name} at promÃ²vidu s'utente %{target}"
+        remove_avatar_user: "%{name} at cantzelladu s'immÃ gine de profilu de %{target}"
+        reopen_report: "%{name} at torradu a abÃ¨rrere s'informe %{target}"
+        reset_password_user: "%{name} at restadu sa crae de s'utente %{target}"
+        resolve_report: "%{name} at isÃ²rvidu s'informe %{target}"
+        sensitive_account: "%{name} at marcadu s'elementu multimediale de %{target} comente sensÃ¬bile"
+        silence_account: "%{name} at postu su contu de %{target} a sa muda"
+        suspend_account: "%{name} at suspÃ¨ndidu su contu de %{target}"
+        unassigned_report: "%{name} at bogadu s'assignatzione de s'informe %{target}"
+        unsensitive_account: '%{name} at bogadu sa marcadura "sensÃ¬bile" a s''elementu multimediale de %{target}'
+        unsilence_account: "%{name} at postu su contu de %{target} a sa muda"
+        unsuspend_account: "%{name} at bogadu sa suspensione de su contu de %{target}"
+        update_announcement: "%{name} at atualizadu s'annÃ¹ntziu %{target}"
+        update_custom_emoji: "%{name} at atualizadu s'emoji %{target}"
+        update_status: "%{name} at atualizadu s'istadu de %{target}"
+      deleted_status: "(istadu cantzelladu)"
+      empty: Perunu registru agatadu.
+      filter_by_action: Filtra pro atzione
+      filter_by_user: Filtra pro utente
+      title: Registru de controllu
+    announcements:
+      destroyed_msg: As cantzelladu s'annÃ¹ntziu.
+      edit:
+        title: ModÃ¬fica s'annÃ¹ntziu
+      empty: Perunu annÃ¹ntziu agatadu.
+      live: In direta
+      new:
+        create: Crea un'annÃ¹ntziu
+        title: AnnÃ¹ntziu nou
+      published_msg: As publicadu s'annÃ¹ntziu.
+      scheduled_for: Programmadu pro %{time}
+      scheduled_msg: As programmadu s'annÃ¹ntziu pro Ã¨ssere publicadu!
+      title: AnnÃ¹ntzios
+      unpublished_msg: As ritiradu s'annÃ¹ntziu!
+      updated_msg: As atualizadu s'annÃ¹ntziu.
+    custom_emojis:
+      assign_category: Assigna a una categoria
+      by_domain: DomÃ¬niu
+      copied_msg: As creadu sa cÃ²pia locale de s'emoji
+      copy: CÃ²pia
+      copy_failed_msg: ImpossÃ¬bile fÃ ghere una cÃ²pia locale de custu emoji
+      create_new_category: Crea una categoria noa
+      created_msg: As creadu s'emoji.
+      delete: Cantzella
+      destroyed_msg: As cantzelladu s'emoji.
+      disable: Disativa
+      disabled: Disativu
+      disabled_msg: As disativadu s'emoji
+      emoji: Emoji
+      enable: Ativa
+      enabled: Ativadu
+      enabled_msg: As ativadu s'emoji
+      image_hint: PNG de finas a 50 KB
+      list: Lista
+      listed: Listadu
+      new:
+        title: Agiunghe emoji personalizadu nou
+      not_permitted: Non tenes su permissu de fÃ ghere custa atzione
+      overwrite: Subraiscrie
+      shortcode: Incurtzadura
+      shortcode_hint: MÃ¬nimu 2 carÃ teres, isceti carÃ teres alfanumÃ¨ricos e tratigheddos bÃ scios
+      title: Emojis personalizados
+      uncategorized: Sena categoria
+      unlist: Esclude de sa lista
+      unlisted: EsclÃ¹idu de sa lista
+      update_failed_msg: ImpossÃ¬bile atualizare custu emoji
+      updated_msg: Emoji atualizadu
+      upload: CÃ rriga
+    dashboard:
+      authorized_fetch_mode: Modalidade segura
+      backlog: tareas arretradas
+      config: Cunfiguratzione
+      feature_deletions: Eliminatzione de contos
+      feature_invites: LigÃ menes de invitu
+      feature_profile_directory: DiretÃ²riu de profilos
+      feature_registrations: Registradas
+      feature_relay: Ripetidore de federatzione
+      feature_spam_check: Anti-Ã liga
+      feature_timeline_preview: Pre-visualizatzione de sa lÃ¬nia de tempus
+      features: CaraterÃ¬sticas
+      hidden_service: Federatzione cun servÃ¬tzios cuados
+      open_reports: informes abertos
+      pending_tags: etichetas de revisionare
+      pending_users: persones de revisionare
+      recent_users: Persones reghentes
+      search: Chirca de testu cumpletu
+      single_user_mode: Modalidade de utente Ã¹nicu
+      software: Programmas
+      space: Impreu de ispÃ tziu
+      title: Pannellu
+      total_users: persones in totale
+      trends: TendÃ¨ntzias
+      week_interactions: interatziones de custa chida
+      week_users_active: persones ativas custa chida
+      week_users_new: persones noas de custa chida
+      whitelist_mode: Modalidade de federatzione limitada
+    domain_allows:
+      add_new: Permite sa federatzione cun domÃ¬niu
+      created_msg: Sa federatzione cun su domÃ¬niu est istada permÃ¬tida
+      destroyed_msg: Sa federatzione cun su domÃ¬niu no est istada permÃ¬tida
+      undo: Non permitas sa federatzione cun su domÃ¬niu
+    domain_blocks:
+      add_new: Agiunghe blocu de domÃ¬niu nou
+      created_msg: Protzessende su blocu de domÃ¬niu
+      destroyed_msg: Su blocu de domÃ¬niu est istadu iscontzadu
+      domain: DomÃ¬niu
+      edit: ModÃ¬fica su blocu de su domÃ¬niu
+      existing_domain_block_html: As giai impostu lÃ¬mites prus astrintos a %{name}, ddu dias dÃ¨pere <a href="%{unblock_url}">isblocare</a> prima.
+      new:
+        create: Crea unu blocu
+        hint: Su blocu de domÃ¬niu no at a impedire sa creatzione de contos noos in sa base de datos, ma ant a Ã¨ssere aplicados in manera retroativa mÃ¨todos de moderatzione ispetzÃ¬ficos subra custos contos.
+        severity:
+          desc_html: "<strong>A sa muda</strong> at a pÃ²nnere is messÃ gios de custos contos comente invisÃ¬biles a sa gente chi no ddi siat sighende. <strong>Sa suspensione</strong> at a cantzellare totu su cuntenutu de su contu, elementos multimediales e datos de profilu. Imprea <strong>Perunu</strong> si boles isceti refudare is archÃ¬vios multimediales."
+          noop: Perunu
+          silence: A sa muda
+          suspend: SuspÃ¨ndidu
+        title: Blocu de domÃ¬niu nou
+      private_comment: Cummentu privadu
+      private_comment_hint: Lassa unu cummentu a subra de custa limitatzione de domÃ¬niu pro impreu internu de s'iscuadra de moderatzione.
+      public_comment: Cummentu pÃ¹blicu
+      public_comment_hint: Lassa unu cummentu pro su pÃ¹blicu generale a subra de custa limitatzione de su domÃ¬niu, si sa publicatzione de sa lista de limitatziones de domÃ¬niu est abilitada.
+      reject_media: Refuda documentos multimediales
+      reject_media_hint: Cantzellat documentos multimediales sarvados in locale e refudat iscarrigamentos in su benidore. Non rilevante pro is suspensiones
+      reject_reports: Refuda informes
+      reject_reports_hint: Iscarta informes chi benint de custu domÃ¬niu. Non rilevante pro is suspensiones
+      rejecting_media: refudende documentos multimediales
+      rejecting_reports: refudende informes
+      severity:
+        silence: a sa muda
+        suspend: suspÃ¨ndidu
+      show:
+        affected_accounts:
+          one: Unu contu de sa base de datos implicadu
+          other: "%{count} contos de sa base de datos implicados"
+        retroactive:
+          silence: Boga de is contos a sa muda is contos de custu domÃ¬niu implicados
+          suspend: Boga sa suspensione de is contos de custu domÃ¬niu implicados
+        title: Iscontza su blocu de domÃ¬niu de %{domain}
+        undo: Iscontza
+      undo: Iscontza su blocu de domÃ¬niu
+      view: Bide su blocu de domÃ¬niu
+    email_domain_blocks:
+      add_new: Agiunghe noa
+      created_msg: DomÃ¬niu de posta eletrÃ²nica blocadu
+      delete: Cantzella
+      destroyed_msg: DomÃ¬niu de posta eletrÃ²nica isblocadu
+      domain: DomÃ¬niu
+      empty: Perunu domÃ¬niu de posta eletrÃ²nica blocadu.
+      from_html: dae %{domain}
+      new:
+        create: Agiunghe unu domÃ¬niu
+        title: Bloca su domÃ¬niu de posta eletrÃ²nica nou
+      title: DomÃ¬nios de posta eletrÃ²nica blocados
+    instances:
+      by_domain: DomÃ¬niu
+      delivery_available: Sa cunsigna est a disponimentu
+      known_accounts:
+        one: "%{count} contu connÃ²schidu"
+        other: "%{count} contos connÃ²schidos"
+      moderation:
+        all: Totus
+        limited: Limitadas
+        title: Moderatzione
+      private_comment: Cummentu privadu
+      public_comment: Cummentu pÃ¹blicu
+      title: Federatzione
+      total_blocked_by_us: Blocados dae nois
+      total_followed_by_them: Sighidos dae Ã tere
+      total_followed_by_us: Sighidos dae nois
+      total_reported: Informes a subra de Ã tere
+      total_storage: Allegados multimediales
+    invites:
+      deactivate_all: Disativa totu
+      filter:
+        all: Totus
+        available: A disponimentu
+        expired: Iscadidu
+        title: Filtru
+      title: Invitos
+    ip_blocks:
+      add_new: Crea una rÃ¨gula
+      created_msg: As agiuntu una rÃ¨gula IP noa
+      delete: Cantzella
+      expires_in:
+        '1209600': 2 chidas
+        '15778476': 6 meses
+        '2629746': 1 mese
+        '31556952': 1 annu
+        '86400': 1 die
+        '94670856': 3 annos
+      new:
+        title: Crea una rÃ¨gula IP noa
+      no_ip_block_selected: Peruna rÃ¨gula IP est istada mudada dae chi non nd'as seletzionadu
+      title: RÃ¨gulas IP
+    pending_accounts:
+      title: Contos in ispera (%{count})
+    relationships:
+      title: relatziones de %{acct}
+    relays:
+      add_new: Agiunghe unu ripetidore nou
+      delete: Cantzella
+      description_html: Unu <strong>ripetidore de federatzione</strong> est unu serbidore intermediÃ riu chi cuncÃ mbiat volÃ¹menes mannos de tuts pÃ¹blicos intre serbidores chi si connetent e bi pÃ¹blicant. <strong>Podet agiudare a serbidores minores e medianos a iscobÃ¨rrere cuntenutu de su fediversu</strong>, in manera chi is utentes locales non tÃ¨ngiant bisÃ²ngiu de sighire a manu Ã tera gente de serbidores remotos.
+      disable: Disativa
+      disabled: Disativu
+      enable: Ativa
+      enable_hint: Si abilitadu, su serbidore tuo at a Ã¨ssere sutascritu a totu is tuts pÃ¹blicos de custu ripetidore e bi at a cumintzare a imbiare totu is tuts pÃ¹blicos de custu serbidore.
+      enabled: Ativadu
+      inbox_url: URL de su ripetidore
+      pending: Isetende s'aprovatzione de su ripetidore
+      save_and_enable: Sarva e ativa
+      setup: Cunfigura una connessione cun unu ripetidore
+      signatures_not_enabled: Is ripetidores no ant a funtzionare comente si tocat si sa modalidade segura o sa modalidade a federatzione limitada sunt abilitadas
+      status: Istadu
+      title: Ripetidores
+    report_notes:
+      created_msg: As creadu sa nota de s'informe
+      destroyed_msg: As cantzelladu sa nota de s'informe
+    reports:
+      account:
+        notes:
+          one: "%{count} nota"
+          other: "%{count} notas"
+        reports:
+          one: "%{count} informe"
+          other: "%{count} informes"
+      action_taken_by: Mesuras adotadas dae
+      are_you_sure: Seguru?
+      assign_to_self: Assigna a mie
+      assigned: Moderatzione assignada
+      by_target_domain: DomÃ¬niu de su contu signaladu
+      comment:
+        none: Perunu
+      created_at: Signaladu
+      mark_as_resolved: Marca comente a isÃ²rvidu
+      mark_as_unresolved: Marcare comente a non isÃ²rvidu
+      notes:
+        create: Agiunghe una nota
+        create_and_resolve: Isorve cun una nota
+        create_and_unresolve: Torra a abÃ¨rrere cun una nota
+        delete: Cantzella
+        placeholder: Descrie is atziones chi as pigadu o cale si siat Ã tera atualizatzione de importu...
+      reopen: Torra a abÃ¨rrere s'informe
+      report: 'Informe #%{id}'
+      reported_account: Contu signaladu
+      reported_by: Signaladu dae
+      resolved: IsÃ²rvidu
+      resolved_msg: Informe isÃ²rvidu.
+      status: Istadu
+      title: Informes
+      unassign: Boga s'assignatzione
+      unresolved: No isÃ²rvidu
+      updated_at: Atualizadu
+    settings:
+      activity_api_enabled:
+        desc_html: NÃ¹meru de tuts publicados in locale, utentes ativos e registros noos in perÃ¬odos chidajolos
+        title: PÃ¹blica istatÃ¬sticas agregadas subra s'atividade de s'utente
+      bootstrap_timeline_accounts:
+        desc_html: Imprea vÃ¬rgulas intre is nÃ²mines de utente. Isceti is contos locales e isblocados ant a funtzionare. Su valore predefinidu cando est bÃ²idu est totu is admins locales.
+        title: Sighidura predefinida pro persones noas
+      contact_information:
+        email: Indiritzu eletrÃ²nicu de impresa
+        username: NÃ²mine de utente de su cuntatu
+      custom_css:
+        desc_html: ModÃ¬fica s'aspetu cun CSS carrigadu in cada pÃ gina
+        title: CSS personalizadu
+      default_noindex:
+        desc_html: ÃŒmplicat a totu is utentes chi no apant modificadu custa cunfiguratzione
+        title: Esclude in manera predefinida is utentes dae s'inditzamentu de is motores de chirca
+      domain_blocks:
+        all: Pro totus
+        disabled: Pro nemos
+        title: Ammustra blocos de domÃ¬niu
+        users: Pro utentes locales in lÃ¬nia
+      domain_blocks_rationale:
+        title: Ammustra sa resone
+      enable_bootstrap_timeline_accounts:
+        title: Ativa s sighiduras predefinidas pro is persones noas
+      hero:
+        desc_html: Ammustradu in sa pÃ gina printzipale. Cussigiadu a su mancu 600x100px. Si no est cunfiguradu, at a Ã¨ssere ammustradu cussu de su serbidore
+        title: ImmÃ gine de eroe
+      mascot:
+        desc_html: Ammustrada in vÃ rias pÃ ginas. Cussigiadu a su mancu 293x205px. Si no est cunfiguradu, torra a su personÃ giu predefinidu
+        title: ImmÃ gine de su personÃ giu
+      peers_api_enabled:
+        desc_html: Is nÃ²mines de domÃ¬niu chi custu serbidore at agatadu in su fediversu
+        title: PÃ¹blica sa lista de serbidores iscobertos
+      preview_sensitive_media:
+        desc_html: Is antiprimas de ligÃ²ngios de Ã teros sitos web ant a ammustrare una miniadura mancari is mÃ¨dios de comunicatzione siant marcados comente a sensÃ¬biles
+        title: Ammustra mÃ¨dios sensÃ¬biles in sas previsualizatziones de OpenGraph
+      profile_directory:
+        desc_html: Permite a is persone de Ã¨ssere iscobertas
+        title: Ativa diretÃ²riu de profilos
+      registrations:
+        closed_message:
+          desc_html: Ammustradu in sa prima pÃ gina cando is registratziones sunt serradas. Podes impreare etichetas HTML
+          title: MessÃ giu de registru serradu
+        deletion:
+          desc_html: Permite a chie si siat de cantzellare su contu suo
+          title: Aberi s'eliminatzione de su contu
+        min_invite_role:
+          disabled: Perunu
+          title: Permite invitos de
+      registrations_mode:
+        modes:
+          approved: Aprovatzione rechesta pro si registrare
+          none: Nemos si podet registrare
+          open: Chie si siat si podet registrare
+        title: Modu de registratzione
+      show_known_fediverse_at_about_page:
+        desc_html: Cando ativu, ammustrat in sa previsualizatzione is tuts de totu is istÃ ntzias connÃ²schidas. Si nono, ammustrat isceti is cuntenutos locales
+        title: Include su cuntenutu federadu in sa pÃ gina no autenticada de sa lÃ¬nia de tempus pÃ¹blica
+      show_staff_badge:
+        desc_html: Ammustra un'insigna de personale in sa pÃ gina de utente
+        title: Ammustra insigna de personale
+      site_description:
+        desc_html: ParÃ grafu de introdutzione a s'API. Descrie ite rendet ispatziale custu serbidore de Mastodon e cale si siat Ã tera cosa de importu. Podes impreare etichetas HTML, mescamente <code>&lt;a&gt;</code> e <code>&lt;em&gt;</code>.
+        title: Descritzione de su serbidore
+      site_description_extended:
+        desc_html: Unu logu adatu pro publicare su cÃ²dighe de cumportamentu, rÃ¨gulas, diretivas e Ã teras caraterÃ¬sticas ispetzÃ¬ficas de su serbidore tuo. Podes impreare etichetas HTML
+        title: Descritzione estÃ¨ndida de su logu
+      site_short_description:
+        desc_html: Ammustradu in sa barra laterale e in is meta-etichetas. Descrie ite est Mastodon e pro ite custu serbidore est ispetziale in unu parÃ grafu.
+        title: Descritzione curtza de su serbidore
+      site_terms:
+        desc_html: Podes iscriere sa tua normativa de riservadesa prÃ²pia, cunditziones de servÃ¬tziu e Ã teras normas legales. Podes impreare etichetas HTML
+        title: Termes de su servÃ¬tziu personalizados
+      site_title: NÃ²mine de su serbidore
+      spam_check_enabled:
+        desc_html: Mastodon podet signalare in automÃ ticu contos chi imbiant messÃ gios non rechestos in manera repetitiva. Bi podent Ã¨ssere falsos positivos.
+        title: Automatzione anti-spam
+      thumbnail:
+        desc_html: Impreadu pro otÃ¨nnere pre-visualizatziones pro mÃ¨diu de OpenGraph e API. Cussigiadu 1200x630px
+        title: Miniadura de su serbidore
+      timeline_preview:
+        desc_html: Ammustra su ligÃ mene a sa lÃ¬nia de tempus pÃ¹blica in sa pÃ gina initziale e permite s'atzessu pro mÃ¨diu de s'API a sa lÃ¬nia de tempus pÃ¹blica sena autenticatzione
+        title: Permite s'atzessu no autenticadu a sa lÃ¬nia de tempus pÃ¹blica
+      title: Cunfiguratzione de su logu
+      trendable_by_default:
+        desc_html: Tocat a is etichetas chi non siant istadas refudadas prima
+        title: Permite chi is etichetas divenant tendÃ¨ntzia sena revisione pretzedente
+      trends:
+        desc_html: Ammustra in pÃ¹blicu is etichetas chi siant istadas revisionadas in passadu e chi oe siant in tendÃ¨ntzia
+        title: Etichetas de tendÃ¨ntzia
+    site_uploads:
+      delete: Cantzella s'archÃ¬viu carrigadu
+      destroyed_msg: CÃ rriga de su situ cantzellada.
+    statuses:
+      back_to_account: Torra a sa pÃ gina de su contu
+      batch:
+        delete: Cantzella
+        nsfw_off: Signala comente a non sensÃ¬bile
+        nsfw_on: Signala comente a sensÃ¬bile
+      deleted: Cantzelladu
+      failed_to_execute: Faddina in s'esecutzione
+      media:
+        title: Elementos multimediales
+      no_media: Perunu elementu multimediale
+      no_status_selected: Perunu istadu est istadu mudadu dae chi non nd'as seletzionadu
+      title: Istados de su contu
+      with_media: Cun elementos multimediales
+    tags:
+      accounts_today: Impreos Ã¹nicos atuales
+      accounts_week: Impreos Ã¹nicos de custa chida
+      breakdown: DetÃ llios de s'impreu atuale pro orÃ¬gine
+      context: Cuntestu
+      directory: In su diretÃ²riu
+      in_directory: "%{count} in su diretÃ²riu"
+      last_active: Ã™rtima atividade
+      most_popular: Prus populares
+      most_recent: Prus reghentes
+      name: Eticheta
+      review: Revisiona s'istadu
+      reviewed: Revisionadas
+      title: Etichetas
+      trending_right_now: In tendÃ¨ntzia immoe
+      unique_uses_today: "%{count} publicatziones de oe"
+      unreviewed: Sena revisionare
+      updated_msg: Cunfiguratzione de etichetas atualizada
+    title: Amministratzione
+    warning_presets:
+      add_new: Agiunghe noa
+      delete: Cantzella
+      edit_preset: ModÃ¬fica s'avisu predefinidu
+      title: Gesti is cunfiguratziones predefinidas de is avisos
+  admin_mailer:
+    new_pending_account:
+      body: Is detÃ llios de su contu nou sunt a suta. Podes aprovare o refudare custa rechesta.
+      subject: Contu nou de revisionare in %{instance} (%{username})
+    new_report:
+      body: "%{reporter} at signaladu %{target}"
+      body_remote: Calicunu de su domÃ¬niu %{domain} at signaladu %{target}
+      subject: Informe nou pro %{instance} (#%{id})
+    new_trending_tag:
+      body: 'S''eticheta #%{name} est in tendÃ¨ntzia oe, ma non est istada revisionada in passadu. No at a Ã¨ssere ammustrada in pÃ¹blicu francu chi ddu permitas; si sarvas formulÃ riu sena ddu modificare no ddu as a bÃ¬dere mai prus.'
+      subject: Eticheta noa de revisionare in %{instance} (#%{name})
+  aliases:
+    add_new: Crea unu nomÃ¬ngiu
+    created_msg: NomÃ¬ngiu creadu. Immoe podes cumintzare a tramudare dae su contu betzu.
+    deleted_msg: NomÃ¬ngiu bogadu. Sa trÃ muda dae cussu contu a custu no at a Ã¨ssere prus possÃ¬bile.
+    empty: No tenes perunu nomÃ¬ngiu.
+    hint_html: Si boles mudare dae un'Ã teru contu a custu, inoghe as a pÃ²dere creare unu nomÃ¬ngiu, chi est rechestu in antis de sighire cun sa trÃ muda de is persones chi ti sighint dae su contu betzu a custu. Custa atzione est <strong>innÃ²cua e reversÃ¬bile</strong>. <strong>TrÃ muda de su contu betzu cumintzada</strong>.
+    remove: Disconnete su nomÃ¬ngiu
+  appearance:
+    advanced_web_interface: Interfache web avantzada
+    advanced_web_interface_hint: 'Si impreare totu sa largÃ ria de s''ischermu, s''interfache web avantzada ti permitit de cunfigurare diversas colunnas pro bÃ¬dere meda prus informatzione in contemporÃ nea: printzipale, notÃ¬ficas, lÃ¬nia de tempus federada e cale si siat nÃ¹meru de listas e etichetas.'
+    animations_and_accessibility: Animatziones e atzessibilidade
+    confirmation_dialogs: DiÃ logos de cunfirmatzione
+    discovery: Iscoberta
+    localization:
+      body: Mastodon est bortadu in manera voluntÃ ria.
+      guide_link: https://crowdin.com/project/mastodon
+      guide_link_text: Chie si siat podet contribuire.
+    sensitive_content: Cuntenutu sensÃ¬bile
+    toot_layout: Dispositzione de is tuts
+  application_mailer:
+    notification_preferences: Muda is preferÃ¨ntzias de posta
+    salutation: "%{name},"
+    settings: 'Muda is preferÃ¨ntzias de posta: %{link}'
+    view: 'Visualizatzione:'
+    view_profile: Visualiza profilu
+    view_status: Ammustra s'istadu
+  applications:
+    created: Aplicatzione creada
+    destroyed: Aplicatzione cantzellada
+    invalid_url: S'URL frunidu no est curretu
+    regenerate_token: Torra a generare s'identificadore de atzessu
+    token_regenerated: Identificadore de atzessu generadu
+    warning: Dae cara a custos datos. Non ddos cumpartzas mai cun nemos!
+    your_token: S'identificadore tuo de atzessu
+  auth:
+    apply_for_account: Pedi un'invitu
+    change_password: Crae
+    checkbox_agreement_html: So de acÃ²rdiu cun is <a href="%{rules_path}" target="_blank">rÃ¨gulas de su serbidore</a> e is <a href="%{terms_path}" target="_blank">cunditziones de su servÃ¬tziu</a>
+    checkbox_agreement_without_rules_html: So de acÃ²rdiu cun is <a href="%{terms_path}" target="_blank">cunditziones de su servÃ¬tziu</a>
+    delete_account: Cantzella su contu
+    delete_account_html: Si boles cantzellare su contu, ddu podes <a href="%{path}">fÃ ghere inoghe</a>. T'amus a dimandare una cunfirmatzione.
+    description:
+      prefix_invited_by_user: "@%{name} t'at invitadu a custu serbidore de Mastodon!"
+      prefix_sign_up: RegistraÂ·ti oe a Mastodon!
+      suffix: Cun unu contu as a pÃ²dere sighire gente, publicare e cuncambiare messÃ gios cun persones de cale si siat serbidore de Mastodon e Ã teru!
+    didnt_get_confirmation: No as retzidu su messÃ giu de cunfirmatzione?
+    dont_have_your_security_key: Non tenes sa crae de seguresa tua?
+    forgot_password: Ti ses iscarÃ¨ssidu de sa crae?
+    invalid_reset_password_token: Su cÃ²dighe de autorizatzione pro resetare sa crae no est vÃ lidu o est iscadidu. DimandaÂ·nde un'Ã teru.
+    link_to_otp: Inserta unu cÃ²dighe a duas fases dae su telÃ¨fono tuo o unu cÃ²dighe de recÃ¹peru
+    link_to_webauth: Imprea su dispositivu tuo de crae de seguresa
+    login: Intra
+    logout: Essi
+    migrate_account: Moe a unu contu diferente
+    migrate_account_html: Si boles torrare a indiritzare custu contu a un'Ã teru, ddu as a pÃ²dere <a href="%{path}">fÃ ghere inoghe</a>.
+    or_log_in_with: O intra cun
+    providers:
+      cas: CAS
+      saml: SAML
+    register: Registru
+    registration_closed: "%{instance} no atzetat Ã teras persones"
+    resend_confirmation: Torra a imbiare is istrutziones de cunfirmatzione
+    reset_password: Reseta sa crae
+    security: Seguresa
+    set_new_password: Cunfigura una crae noa
+    setup:
+      email_below_hint_html: Si s'indiritzu de posta eletrÃ²nica imbeniente no est curreta, dda podes mudare inoghe e as a retzire unu messÃ giu de cunfirmatzione nou.
+      email_settings_hint_html: MessÃ giu de cunfirmatzione imbiadu a %{email}. Si custu indiritzu de posta eletrÃ²nica no est curretu, ddu podes mudare dae is cunfiguratziones de su contu.
+      title: Cunfiguratzione
+    status:
+      account_status: Istadu de su contu
+      confirming: Isetende chi sa posta eletrÃ²nica siat cumpletada.
+      functional: Su contu tuo est operativu.
+      pending: Sa dimanda tua est in protzessu de revisione dae su personale nostru. Podet serbire unu pagu de tempus. As a retzire unu messÃ giu eletrÃ²nicu si sa dimanda est aprovada.
+      redirecting_to: Su contu tuo est inativu ca in die de oe est torrende a indiritzare a %{acct}.
+    too_fast: MÃ²dulu imbiadu tropu a lestru, torra a proare.
+    trouble_logging_in: Tenes problemas de atzessu?
+    use_security_key: Imprea una crae de seguresa
+  authorize_follow:
+    already_following: Ses giai sighende custu contu
+    already_requested: As giai imbiadu una dimanda de sighidura a custa persone
+    error: Faddina in sa chirca de su contu remotu
+    follow: Sighi
+    follow_request: 'As imbiadu una dimanda de sighidura a:'
+    following: 'Fatu! Immoe ses sighende:'
+    post_follow:
+      close: O, podes serrare custa ventana.
+      return: Ammustra su profilu de custa persone
+      web: Bae a su situ web
+    title: Sighi %{acct}
+  challenge:
+    confirm: Sighi
+    hint_html: "<strong>CussÃ¬giu:</strong> No t'amus a torrare a dimandare sa crae in s'ora imbeniente."
+    invalid_password: Sa crae no est vÃ lida
+    prompt: Cunfirma sa crae pro sighire
+  crypto:
+    errors:
+      invalid_key: no est una crae Ed25519 o Curve25519 vÃ lida
+      invalid_signature: no est una firma Ed25519 vÃ lida
+  date:
+    formats:
+      default: "%d %b %Y"
+      with_month_name: "%d %B %Y"
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count} o"
+      about_x_months: "%{count} me"
+      about_x_years: "%{count} an"
+      almost_x_years: "%{count} an"
+      half_a_minute: Immoe etotu
+      less_than_x_minutes: "%{count} m"
+      less_than_x_seconds: Immoe etotu
+      over_x_years: "%{count} an"
+      x_days: "%{count} d"
+      x_minutes: "%{count} m"
+      x_months: "%{count} me"
+      x_seconds: "%{count} s"
+  deletes:
+    challenge_not_passed: S'informatzione insertada no est curreta
+    confirm_password: InsertaÂ·nche sa crae atuale pro verificare s'identidade
+    confirm_username: Iscrie su nÃ²mine de utente tuo cunfirmare su protzedimentu
+    proceed: Cantzella su contu
+    success_msg: Contu cantzelladu
+    warning:
+      before: 'In antis de sighire, leghe custu cun atentzione:'
+      caches: Su cuntenutu chi siat istadu sarvadu in sa memÃ²ria temporÃ nea de Ã teros serbidores podet sighire a esÃ¬stere
+      data_removal: Is publicatziones tuas e Ã teros datos ant a Ã¨ssere cantzellados in manera permanente
+      email_change_html: Podes <a href="%{path}">mudare s'indiritzu tuo de posta eletrÃ²nica</a> sena cantzellare su contu
+      email_contact_html: Si no est ancora arribada, podes imbiare unu messÃ giu a <a href="mailto:%{email}">%{email}</a> e dimandare agiudu
+      email_reconfirmation_html: Si no ses retzende su messÃ giu de cunfirmatzione, ddu podes <a href="%{path}">torrare a dimandare</a>
+      irreversible: No as a pÃ²dere ripristinare o torrare a ativare su contu tuo
+      more_details_html: Pro Ã teros detÃ llios, bide sa <a href="%{terms_path}">normativa de riservadesa</a>.
+      username_available: Su nÃ²mine de utente tuo at a torrare a Ã¨ssere a disponimentu
+      username_unavailable: Su nÃ²mine de utente tuo no at a abarrare a disponimentu
+  directories:
+    directory: DiretÃ²riu de profilos
+    explanation: Iscoberi gente segundu is interessos suos
+    explore_mastodon: Esplora %{title}
+  domain_validator:
+    invalid_domain: no est unu nÃ²mine de domÃ¬niu vÃ lidu
   errors:
-    '400': The request you submitted was invalid or malformed.
-    '403': You don't have permission to view this page.
-    '404': The page you are looking for isn't here.
-    '406': This page is not available in the requested format.
-    '410': The page you were looking for doesn't exist here anymore.
-    '422': 
-    '429': Too many requests
-    '500': 
-    '503': The page could not be served due to a temporary server failure.
+    '400': Sa dimanda chi as imbiadu non fiat vÃ lida o non fiat curreta.
+    '403': Non tenes permissu pro bÃ¬dere custa pÃ gina.
+    '404': Sa pÃ gina chi ses chirchende no est inoghe.
+    '406': Custa pÃ gina no est a disponimentu in su formadu chi as pregontadu.
+    '410': Sa pÃ gina chi ses chirchende no esistet prus.
+    '422':
+      content: Faddina in sa verÃ¬fica de seguresa. Ses blochende is boboettos?
+      title: Faddina in sa verÃ¬fica de seguresa
+    '429': Tropu rechestas
+    '500':
+      content: Faddina dae s'ala nostra.
+      title: Custa pÃ gina no est curreta
+    '503': Faddina in sa trasmissione de sa pÃ gina pro more de una faddina temporÃ nea de su serbidore.
+    noscript_html: Pro impreare s'aplicatzione web de Mastodon, ativa JavaScript. In alternativa, proa una de is <a href="%{apps_path}">aplicatziones nativas</a> pro Mastodon in sa prataforma tua.
+  existing_username_validator:
+    not_found: impossÃ¬bile agatare utentes locales cun cussu nÃ²mine
+    not_found_multiple: impossÃ¬bile agatare %{usernames}
+  exports:
+    archive_takeout:
+      date: Data
+      download: IscÃ rriga s'archÃ¬viu
+      hint_html: Podes dimandare un'archÃ¬viu cun is <strong>tuts tuos e is mÃ¨dias chi as carrigadu</strong>. Is datos sunt in formadu ActivityPub, leghÃ¬bile dae is programmas cumpatÃ¬biles. Podes pregontare un'archÃ¬viu cada 7 dies.
+      in_progress: Compilende s'archÃ¬viu tuo...
+      request: Pregonta s'archÃ¬viu tuo
+      size: MannÃ ria
+    blocks: Ses blochende
+    bookmarks: Sinnalibros
+    csv: CSV
+    domain_blocks: Blocos de domÃ¬nios
+    lists: Listas
+    mutes: Ses ponende a sa muda
+    storage: Immagasinamentu
+  featured_tags:
+    add_new: Agiunghe noa
+    errors:
+      limit: As giai evidentziadu sa cantidade mÃ ssima de etichetas
+    hint_html: "<strong>Ite sunt is etichetas in evidÃ¨ntzia?</strong> Sunt ammustradas in evidÃ¨ntzia in su profilu pÃ¹blicu tuo e permitint a sa gente de navigare is messÃ gios pÃ¹blicos tuos in cussas etichetas ispetzÃ¬ficas. Sunt un'aina perfeta pro tÃ¨nnere unu registru de Ã²peras creativas o progetos longos."
+  filters:
+    contexts:
+      account: Profilos
+      home: PÃ gina printzipale e listas
+      notifications: NotÃ¬ficas
+      public: LÃ¬nias de tempos pÃ¹blicas
+      thread: Arresonadas
+    edit:
+      title: ModÃ¬fica filtru
+    errors:
+      invalid_context: Cuntestu mancante o non vÃ lidu
+      invalid_irreversible: Su filtrÃ giu non reversÃ¬bile funtzionat isceti in is cuntestos printzipale o de notÃ¬ficas
+    index:
+      delete: Cantzella
+      empty: Non tenes perunu filtru.
+      title: Filtros
+    new:
+      title: Agiunghe unu filtru nou
+  footer:
+    developers: Iscuadra de isvilupu
+    more: Ã€teruâ€¦
+    resources: Resursas
+    trending_now: Est tendÃ¨ntzia immoe
+  generic:
+    all: Totus
+    changes_saved_msg: ModÃ¬ficas sarvadas.
+    copy: CÃ²pia
+    delete: Cantzella
+    no_batch_actions_available: Peruna atzione in blocu a disponimentu dae custa pÃ gina
+    order_by: Ã’rdina pro
+    save_changes: Sarva is modÃ¬ficas
+    validation_errors:
+      one: Calicuna cosa ancora no est andende. Bide sa faddina in bÃ sciu
+      other: Calicuna cosa ancora no est andende. Bide is %{count} faddinas in bÃ sciu
+  html_validator:
+    invalid_markup: 'cuntenet etichetas HTML non vÃ lidas: %{error}'
+  identity_proofs:
+    active: Ativu
+    authorize: Eja, autoriza
+    authorize_connection_prompt: Boles autorizare custa connessione critografada?
+    errors:
+      failed: Faddina in sa connessione critografada. TorraÂ·bi a proare dae %{provider}.
+      keybase:
+        invalid_token: Is cÃ²dighes de autorizatzione de Keybase sunt hash de firmas e depent tÃ¨nnere 66 carÃ teres esadetzimales
+        verification_failed: Keybase non reconnoschet custu cÃ²dighe de autorizatzione che a firma de s'utente de Keybase %{kb_username}. TorraÂ·bi a proare dae Keybase.
+      wrong_user: ImpossÃ¬bile creare una proa pro %{proving} cando as fatu s'atzessu che a %{current}. Intra che a %{proving} e torraÂ·bi a proare.
+    explanation_html: Inoghe podes collegare critograficamente is Ã teras identidades tuas dae Ã teras prataformas, che a Keybase. Custu permitit a Ã teras persones de t'imbiare messÃ gios tzifrados in cussas prataformas e de tÃ¨nnere sa seguresa chi sos cuntenutos chi lis mandas benit dae tene.
+    i_am_html: So %{username} in %{service}.
+    identity: Identidade
+    inactive: Inativu
+    publicize_checkbox: 'E imbiat custu tut:'
+    publicize_toot: 'Verificadu! So %{username} in %{service}: %{url}'
+    remove: Boga sa proa dae su contu
+    removed: Proa bogada dae su contu
+    status: Istadu de verÃ¬fica
+    view_proof: BÃ¬dere sa proa
+  imports:
+    modes:
+      merge: Uni
+      merge_long: Mantene is registros chi esistint e agiungheÂ·nde Ã teros
+      overwrite: Subraiscrie
+      overwrite_long: Sostitui is registros atuales cun cussos noos
+    preface: Podes importare datos chi as esportadu dae unu Ã teru serbidore, che a sa lista de sa gente chi ses sighende o blochende.
+    success: Datos carrigados; ant a Ã¨ssere protzessados luego
+    types:
+      blocking: Lista de blocados
+      bookmarks: Sinnalibros
+      domain_blocking: Lista domÃ¬nios blocados
+      following: Lista de sighiduras
+      muting: Lista gente a sa muda
+    upload: CÃ rriga
+  in_memoriam_html: In memoriam.
   invites:
+    delete: Disativa
+    expired: Iscadidu
     expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
+      '1800': 30 minutos
+      '21600': 6 oras
+      '3600': 1 ora
+      '43200': 12 oras
+      '604800': 1 chida
+      '86400': 1 die
+    expires_in_prompt: Mai
+    generate: GÃ¨nera ligÃ mene de invitu
+    invited_by: 'As retzidu unu messÃ giu de invitu dae:'
+    max_uses:
+      one: 1 impreu
+      other: "%{count} impreos"
+    max_uses_prompt: Sena lÃ¬mite
+    prompt: GÃ¨nera e cumpartzi ligÃ menes cun Ã teras persones pro dare atzessu a custu serbidore
+    table:
+      expires_at: Iscadit
+      uses: Impreos
+    title: Invita gente
+  lists:
+    errors:
+      limit: Cantidade mÃ ssima de listas crÃ²mpida
+  media_attachments:
+    validations:
+      images_and_video: Non si podet allegare unu vÃ¬deu in una publicatzione chi cuntenet giai immÃ gines
+      not_ready: ImpossÃ¬bile allegare archÃ¬vios chi no siant istados protzessados in manera totale. TorraÂ·bi a proare a pustis
+      too_many: ImpossÃ¬bile allegare prus de 4 archÃ¬vios
+  migrations:
+    acct: MÃ²idu a
+    cancel: Annulla s'indiritzamentu
+    cancel_explanation: Si annullas s'indiritzamentu, su contu tuo at a Ã¨ssere torradu a ativare, perÃ² is sighiduras chi apas tramudadu a cussu contu no ant a pÃ²dere Ã¨ssere recuperadas.
+    cancelled_msg: Indiritzamentu annulladu.
+    errors:
+      already_moved: est su prÃ²piu contu a su chi as giai tramudadu
+      missing_also_known_as: no est unu nomÃ¬ngiu de custu countu
+      move_to_self: non podet Ã¨ssere su contu atuale
+      not_found: no agatadu
+      on_cooldown: Ses in perÃ¬odu de pÃ usa intre una trÃ muda e s'Ã tera
+    followers_count: Gente chi ti sighiat in su momentu de sa trÃ muda
+    incoming_migrations: Tramudada dae unu contu diferente
+    incoming_migrations_html: Pro tramudare cuntenutos dae un'Ã teru contu a custu, prima depes <a href="%{path}">creare unu nomÃ¬ngiu</a>.
+    moved_msg: Su contu tuo immoe est torrende a indiritzare a %{acct} e sa gente chi ti sighit at a Ã¨ssere tramudada.
+    not_redirecting: Su contu tuo no est torrende a indiritzare a perunu Ã teru contu immoe.
+    on_cooldown: As tramudadu su contu tuo de reghente. Custa funtzionalidade at a torrare a Ã¨ssere a disponimentu de immoe a %{count} dies.
+    past_migrations: TrÃ mudas pretzedentes
+    proceed_with_move: TrÃ muda sa gente chi ti sighit
+    redirected_msg: Su contu tuo immoe est torrende a indiritzare a %{acct}.
+    redirecting_to: Su contu tuo est torrende a indiritzare a %{acct}.
+    set_redirect: Cunfigura s'indiritzamentu
+    warning:
+      backreference_required: Su contu nou depet Ã¨ssere prima cunfiguradu pro pÃ²dere fÃ ghere riferimentu a custu
+      before: 'In antis de sighire, leghe custu cun atentzione:'
+      cooldown: A pustis de tramudare, ddoe at a Ã¨ssere unu perÃ¬odu de pÃ usa in su chi no as a pÃ²dere torrare a tramudare
+      disabled_account: A pustis, su contu atuale tuo no at a Ã¨ssere prus operativu in manera cumpleta. Sende gasi, as a tÃ¨nnere atzessu a s'esportatzione de datos e a sa re-ativatzione.
+      followers: Custa atzione at a tramudare totu sa gente chi ti sighit dae su contu atuale a su contu nou
+      only_redirect_html: In alternativa, podes isceti <a href="%{path}">cunfigurare un'indiritzamentu in su profilu tuo</a>.
+      other_data: Perunu Ã teru datu at a Ã¨ssere tramudadu in automÃ ticu
+      redirect: Su profilu de su contu atuale tuo at a Ã¨ssere atualizadu cun un'avisu de indiritzamentu e at a Ã¨ssere esclÃ¹idu dae is chircas
+  moderation:
+    title: Moderatzione
+  move_handler:
+    carry_blocks_over_text: Custu utente s'est tramudadu dae %{acct}, chi as blocadu.
+    carry_mutes_over_text: Custu utente s'est tramudadu dae %{acct}, chi as impostadu a sa muda.
+    copy_account_note_text: 'Custu utente s''est tramudadu dae %{acct}, custas sunt sas notas antepostas tuas chi li pertocant:'
+  notification_mailer:
+    digest:
+      action: Ammustra totu is notÃ¬ficas
+      body: Custu est unu resumu de su chi ti est sutzÃ¨didu dae sa visita Ã¹rtima tua su %{since}
+      mention: "%{name} t'at mentovadu in:"
+      new_followers_summary:
+        one: In prus, %{count} persone noa ti sighit dae cando fias assente. IncredÃ¬bile!
+        other: In prus, %{count} persones noas ti sighint dae cando fias assente. IncredÃ¬bile!
+      subject:
+        one: "1 notÃ¬fica noa dae s'Ã¹rtima visita tua \U0001F418"
+        other: "%{count} notÃ¬ficas noas dae s'Ã¹rtima visita tua \U0001F418"
+      title: Durante s'ausÃ¨ntzia tua...
+    favourite:
+      body: "%{name} at marcadu comente a preferidu s'istadu tuo:"
+      subject: "%{name} at marcadu comente a preferidu s'istadu tuo"
+      title: Preferidu nou
+    follow:
+      body: "%{name} t'est sighende!"
+      subject: "%{name} t'est sighende"
+      title: Una sighidura noa
+    follow_request:
+      action: Gesti is rechestas de sighidura
+      body: "%{name} at rechestu de ti sighire"
+      subject: 'Sighidura in ispera: %{name}'
+      title: Rechesta de sighidura noa
+    mention:
+      action: Risponde
+      body: "%{name} t'at mentovadu in:"
+      subject: "%{name} t'at mentovadu"
+      title: Mentovu nou
+    reblog:
+      body: "%{name} at cumpartzidu s'istadu tuo:"
+      subject: "%{name} at cumpartzidu s'istadu tuo"
+      title: Cumpartzidura noa
+  notifications:
+    email_events: Eventos pro notÃ¬ficas cun posta eletrÃ²nica
+    email_events_hint: 'Seletziona eventos pro is chi boles retzire notÃ¬ficas:'
+    other_settings: Ã€teras configuratziones de notÃ¬ficas
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: Mrd
+          million: M
+          quadrillion: Blr
+          thousand: m
+          trillion: Bln
+  otp_authentication:
+    code_hint: InsertaÂ·nche su cÃ²dighe generadu dae s'aplicatzione di autenticatzione pro cunfirmare
+    description_html: Si as a abilitare <strong>s'autenticatzione in duas fases</strong> impreende un'aplicatzione de autenticatzione, pro s'intrada as a dÃ¨pere tÃ¨nnere in fatu su telÃ¨fonu tuo, chi at a ingendrare getones pro ti fÃ ghere intrare.
+    enable: Ativa
+    instructions_html: "<strong>Iscansi custu cÃ²dighe QR in s'autenticadore de Google o in un'aplicatzione TOTP simigiante in su telÃ¨fonu tuo</strong>. Dae como a in antis, cuss'aplicatzione at a ingendrare getones chi as a dÃ¨pere insertare pro pÃ²dere fÃ ghere s'atzessu."
+    manual_instructions: 'Si non podet iscansire su cÃ²dighe QR e tenes bisÃ²ngiu de dd''insertare manualmente, inoghe ddoe est su cÃ²dighe segretu in testu craru:'
+    setup: Cunfigura
+    wrong_code: Su cÃ²dighe insertadu no est vÃ lidu! S'ora de su serbidore e de su dispositivu sunt curretas?
+  pagination:
+    newer: Prus reghente
+    next: Sighi
+    older: Prus betzu
+    prev: A coa
+    truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: As giai votadu in custu sondÃ giu
+      duplicate_options: cuntenet elementos duplicados
+      duration_too_long: est tropu a tesu in su benidore
+      duration_too_short: est tropu chitzi
+      expired: Su sondÃ giu est giai concruidu
+      invalid_choice: Su sÃ¨beru de votu chi as seberadu no esistet
+      over_character_limit: non podet Ã¨ssere superiore a %{max} carÃ teres cadaunu
+      too_few_options: depet tÃ¨nnere prus de un'elementu
+      too_many_options: non podet cuntÃ¨nnere prus de %{max} elementos
+  preferences:
+    other: Ã€teru
+    posting_defaults: Valores predefinidos de publicatzione
+    public_timelines: LÃ¬nias de tempos pÃ¹blicas
+  reactions:
+    errors:
+      limit_reached: LÃ¬mite de reatziones diferentes crÃ²mpidu
+      unrecognized_emoji: no est un'emoji reconnotu
+  relationships:
+    activity: Atividade de su contu
+    dormant: Firmu
+    follow_selected_followers: Sighi is persones seletzionadas
+    followers: Sighiduras
+    following: Sighende
+    invited: Invitos
+    last_active: Ã™rtima atividade
+    most_recent: Prus reghentes
+    moved: Tramudadu
+    mutual: Pari-pari
+    primary: PrimÃ riu
+    relationship: Relatzione
+    remove_selected_domains: Boga totu is sighiduras de is domÃ¬nios seletzionados
+    remove_selected_followers: Boga is sighiduras seletzionadas
+    remove_selected_follows: Non sigas prus is persones seletzionadas
+    status: Istadu de su contu
+  remote_follow:
+    acct: InsertaÂ·nche s'utente@domÃ¬niu tuo dae su chi boles sighire custa persone
+    missing_resource: ImpossÃ¬bile agatare sa rechesta de indiritzamentu URL pro su contu tuo
+    no_account_html: Non tenes ancora unu contu? Ti podes <a href='%{sign_up_path}' target='_blank'>registrare inoghe</a>
+    proceed: Cumintza a sighire
+    prompt: 'As a sighire a:'
+    reason_html: "<strong>Pro ite serbit custu?</strong> Podet Ã¨ssere chi <code>%{instance}</code> non siat su serbidore aunde ses registradu, pro custu tenimus bisÃ²ngiu de ti torrare a indiritzare prima a su serbidore tuo."
+  remote_interaction:
+    favourite:
+      proceed: Sighi pro marcare che a preferidu
+      prompt: 'Boles marcare comente a preferidu custu tut:'
+    reblog:
+      proceed: Sighi pro cumpartzire
+      prompt: 'Boles cumpartzire custu tut:'
+    reply:
+      proceed: Sighi pro rispÃ²ndere
+      prompt: 'Boles rispÃ²ndere a custu tut:'
+  scheduled_statuses:
+    over_daily_limit: As superadu su lÃ¬mite de %{limit} tuts programmados pro cudda die
+    over_total_limit: As superadu su lÃ¬mite de %{limit} tuts programmados
+    too_soon: Sa data programmada depet Ã¨ssere benidora
+  sessions:
+    activity: Ã™rtima atividade
+    browser: Navigadore
+    browsers:
+      alipay: Alipay
+      blackberry: Blackberry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
+      generic: Navigadore disconnotu
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Navigadore Nokia S40 Ovi
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UCBrowser
+      weibo: Weibo
+    current_session: Sessione atuale
+    description: "%{browser} de %{platform}"
+    explanation: Custos sunt is navigadores web de is chi ses intradu in su contu tuo de Mastodon.
+    ip: IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: Blackberry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: macOS
+      other: prataforma disconnota
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    revoke: RÃ¨voca
+    revoke_success: Sessione revocada
+    title: Sessiones
+  settings:
+    account: Contu
+    account_settings: Cunfiguratziones de su contu
+    aliases: NomÃ¬ngios de su contu
+    appearance: Aspetu
+    authorized_apps: Aplicatziones autorizadas
+    back: Torra a Mastodon
+    delete: Eliminatzione de su contu
+    development: Isvilupu
+    edit_profile: ModÃ¬fica profilu
+    export: Esportatzione de datos
+    featured_tags: Etichetas in evidÃ¨ntzia
+    identity_proofs: Proas de identidade
+    import: Importatzione
+    import_and_export: Importatzione e esportatzione
+    migrate: TrÃ muda de contu
+    notifications: NotÃ¬ficas
+    preferences: PreferÃ¨ntzias
+    profile: Profilu
+    relationships: Persones chi sighis e chi ti sighint
+    two_factor_authentication: Autenticatzione de duos fatores
+    webauthn_authentication: Craes de seguresa
+  spam_check:
+    spam_detected: Custu est un'informe automÃ ticu. Ã€liga rilevada.
+  statuses:
+    attached:
+      audio:
+        one: "%{count} Ã udio"
+        other: "%{count} Ã udios"
+      description: 'Allegadu: %{attached}'
+      image:
+        one: "%{count} immÃ gine"
+        other: "%{count} immÃ gines"
+      video:
+        one: "%{count} vÃ¬deu"
+        other: "%{count} vÃ¬deos"
+    boosted_from_html: Cumpartzidu dae %{acct_link}
+    content_warning: 'Avisu de cuntenutu: %{warning}'
+    disallowed_hashtags:
+      one: 'cuntenet un''eticheta non permÃ¬tida: %{tags}'
+      other: 'cuntenet is etichetas non permÃ¬tidas: %{tags}'
+    errors:
+      in_reply_not_found: Ses chirchende de rispÃ²ndere a unu tut chi no esistit prus.
+    language_detection: Rileva sa limba in automÃ ticu
+    open_in_web: Aberi in sa web
+    over_character_limit: lÃ¬mite de carÃ teres de %{max} superadu
+    pin_errors:
+      limit: As giai apicadu su nÃ¹meru mÃ ssimu de tuts
+      ownership: Is tuts de Ã tere non podent Ã¨ssere apicados
+      private: Is tuts non pÃ¹blicos non podent Ã¨ssere apicados
+      reblog: Is cumpartziduras non podent Ã¨ssere apicadas
+    poll:
+      total_people:
+        one: "%{count} persone"
+        other: "%{count} persones"
+      total_votes:
+        one: "%{count} votu"
+        other: "%{count} votos"
+      vote: Vota
+    show_more: AmmustraÂ·nde prus
+    show_newer: Ammustra is prus noos
+    show_older: Ammustra is prus betzos
+    show_thread: Ammustra su tema
+    sign_in_to_participate: Cumintzat sa sessione pro partetzipare in s'arresonada
+    title: '%{name}: "%{quote}"'
+    visibilities:
+      private: Isceti pro chie ti sighit
+      private_long: Ammustra isceti a chie ti sighit
+      public: PÃ¹blicu
+      public_long: Podet Ã¨ssere bidu dae chie si siat
+      unlisted: EsclÃ¹idu de sa lista
+      unlisted_long: Podet Ã¨ssere bidu dae chie si siat, perÃ² non podet Ã¨ssere ammustradu in lÃ¬nias de tempus pÃ¹blicas
+  stream_entries:
+    pinned: Tut apicadu
+    reblogged: cumpartzidu
+    sensitive_content: Cuntenutu sensÃ¬bile
+  tags:
+    does_not_match_previous_name: non cointzidet cun su nÃ²mine anteriore
+  terms:
+    body_html: |
+      <h2>PolÃ¬tica de riservadesa</h2>
+      <h3 id="collect">Ite informatziones collimus?</h3>
+
+      <ul>
+      <li><em>Informatziones de base de su contu</em>: Si t'as a registrare in custu serbidore, ti diant pÃ²dere pedire de insertare unu nÃ²mine utente, un'indiritzu de posta eletrÃ²nica e una crae de intrada. Dias pÃ²dere insertare fintzas Ã teras informatziones de profilu, che a unu nÃ²mine de ammustrare e una biografia, e carrigare un'immÃ gine de profilu e una de cobertedda. Su nÃ²mine utente, cussu ammustradu, sa biografia, s'immÃ gine de profilu e de cobertedda sunt semper allistados in pÃ¹blicu.</li>
+      <li><em>Publicatziones, sighidores e Ã teras informatziones pÃ¹blicas</em>: Sa lista de is persones chi sighis est allistada in pÃ¹blicu, e sa matessi cosa balet pro is chi ti sighint. Cando imbias unu messÃ giu sa data e s'ora benint sarbadas, gasi comente s'aplicatzione dae sa cale as imbiadu su messÃ giu. Is messÃ gios diant pÃ²dere cuntÃ¨nnere cuntenutos multimediales allongiados, che a immÃ gines e vÃ¬deos. Is publicatziones pÃ¹blicas e no allistadas sunt a disponimentu in abertu. Cando ammustras una publicatzione in su profilu tuo, fintzas cussa est un'informatzione a disponimentu pÃ¹blicu. Is publicatziones tuas benint imbiadas a is sighidores tuos, cosa chi a bortas bolet nÃ rrere chi benint intregadas a serbidores diferentes chi nde sarbant cÃ²pias in cue. Cando cantzellas publicatziones, custu acontessimentu benit imbiadu fintzas issu a is sighidores tuos. S'atzione de torrare a cumpartzire o de pÃ²nnere in is preferidos un'Ã tera publicatzione est semper pÃ¹blica.</li>
+      <li><em>Publicatziones diretas e pro is sighidores ebbia</em>: Totu is publicatziones benint archiviadas e protzessadas in su serbidore. Is publicatziones pro is sighidores ebbia benint intregadas a is sighidores tuos e a is utentes chi ddoe sunt mentovados in intro, e is publicatziones diretas benint intregadas isceti a is sighidores chi ddoe sunt mentovados in intro. In unos cantos casos bolet nÃ rrere chi benint intregados a serbidores diferentes e chi cÃ²pias issoro benint sarvadas in cue. Nois chircamus de limitare s'atzessu a custas publicatziones a is persones autorizadas ebbia, ma Ã teros serbidores bi diant pÃ²dere non resessere. Pro custa resone est de importu mannu su de revisionare is serbidores a is cales faghent parte is sighidores tuos. Podes impreare un'optzione pro aprovare o refudare in manera automÃ tica sighidores noos in is cunfiguratziones. <em>AmmentaÂ·ti chi is operadores de su serbidore e cale si siat serbidore chi ddos retzit podent castiare custos messÃ gios</em>, e chi is retzidores ddos diant pÃ²dere sarvare faghende caturas, copiendeÂ·los o torrendeÂ·los a cumpartzire in Ã teras maneras. <em>Non cumpartzas peruna informatzione perigulosa impreende Mastodon.</em></li>
+      <li><em>IP e Ã teros metadatos</em>: Cando intras in su contu tuo sarvamus s'indiritzu IP dae su cale lu ses faghende, e fintzas su nÃ²mine de s'aplicatzione chi impreas comente navigadore. Totu is sessiones de atzessu abertas sunt a disponimentu pro sa revisione e sa rÃ¨voca in is cunfiguratziones tuas. S'Ã¹rtimu indiritzu IP impreadu benit sarvadu finas a 12 meses. Diamus pÃ²dere archiviare fintzas raportos chi includent is indiritzos IP de totu is rechestas a su serbidore nostru.</li>
+      </ul>
+
+      <hr class="spacer" />
+
+      <h3 id="use">Pro ite cosas impreamus is informatziones tuas?</h3>
+
+      <p>Totu is informatziones chi collimus dae tene diat pÃ²dere Ã¨ssere impreadas in is maneras chi sighint:</p>
+
+      <ul>
+      <li>Pro frunire sa funtzionalidade de base de Mastodon. Podes interagire cun is cuntenutos de is Ã teras persones, e cumpartzire is tuos, isceti cando ses intradu in su contu tuo. A esÃ¨mpiu, podes sighire Ã teras persones pro castiare is publicatziones cumbinadas issoro in sa lÃ¬nia de tempus personalizada printzipale tua.</li>
+      <li>Pro agiudare sa moderatzione de sa comunidade, a esÃ¨mpiu cunfrontende s'indiritzu IP tuo cun Ã teros giai connotos pro verificare evasiones de blocos o Ã teras violatziones.</li>
+      <li>S'indiritzu de posta eletrÃ²nica chi as a frunire diat pÃ²dere Ã¨ssere impreadu pro t'imbiare informatziones, notÃ¬ficas a pitzu de Ã teras persones chi ant a interagire cun is cuntenutos tuos o chi t'ant a imbiare messÃ gios, e pro rispÃ²ndere a interrogativos e/o Ã teras rechestas o preguntas.</li>
+      </ul>
+
+      <hr class="spacer" />
+
+      <h3 id="protect">Comente amparamus is informatziones tuas?</h3>
+
+      <p>Impreamus medidas de seguresa vÃ rias pro amparare sa seguresa de is informatziones personales tuas cando insertas o imbias is informatziones personales tuas, o cando b'atzedes. In paris a Ã teras cosas, sa sessione de su navigadore tuo, e fintzas su trÃ ficu intre s'aplicatzione tua e s'API, benint amparados cun SSL, e sa crae tua benit tzifrada impreende un'algoritmu forte a una diretzione. Pro afortiare sa seguresa de s'atzessu a su contu tuo galu de prus podes abilitare s'autenticatzione in duos fatores.</p>
+
+      <hr class="spacer" />
+
+      <h3 id="data-retention">Cale est sa polÃ¬tica nostra de archiviatzione de is datos?</h3>
+
+      <p>Amus a fÃ ghere un'isfortzu in fide bona pro chircare de:</p>
+
+      <ul>
+      <li>MantÃ¨nnere in archÃ¬viu is raportos chi cuntenent is indiritzos IP de totu is rechestas a custu serbidore, cando cussas rechestas benint registradas, pro non prus de 90 dies.</li>
+      <li>MantÃ¨nnere in archÃ¬viu is indiritzos IP assotziados a is utentes registrados pro non prus de 12 meses.</li>
+      </ul>
+
+      <p>Podes pedire e iscarrigare un'archÃ¬viu de is cuntenutos tuos chi includet is publicatziones tuas, is elementos multimediales allongiados, s'immÃ gine de profilu e cussa de cobertedda.</p>
+
+      <p>Podes cantzellare su contu tuo in manera irreversÃ¬bile in cale si siat momentu.</p>
+
+      <hr class="spacer"/>
+
+      <h3 id="cookies">Impreamus is testimÃ²ngios?</h3>
+
+      <p>Eja. Is testimÃ²ngios ("cookies") sunt documentos minores chi unu situ o su frunidore de servÃ¬tzios suos tramudant a su discu tÃ¨teru de s'elaboradore tuo pro mÃ¨diu de su navigadore web tuo (si bi lu permitis). Custos testimÃ²ngios permitint a su situ de reconnÃ²schere su navigadore tuo e, si tenes unu contu registradu, de dd'assotziare cun su contu tuo.</p>
+
+      <p>Impreamus is testimÃ²ngios pro cumprÃ¨ndere e sarvare is preferÃ¨ntzias tuas pro is bÃ¬sitas imbenientes.</p>
+
+      <hr class="spacer" />
+
+      <h3 id="disclose">Rivelamus carchi informatzione a tertzas partes?</h3>
+
+      <p>Non bendimus, cuncambiamus, o tramudamus in Ã teras maneras is informatziones tuas chi ti diant pÃ²dere individuare in manera personale. Custu no incluit sugetos de tertzas partes fidados chi nos agiudant a amministrare su situ, fÃ ghere is fainas nostras, o a t'agiudare, finas a cando cussos sugetos atzetant de mantÃ¨nnere cunfidentziales cussas informatziones. Diamus fintzas pÃ²dere frunire is informatziones tuas si amus a Ã¨ssere cumbintos chi siat apropriadu pro sighire is leges, aplicare is polÃ¬ticas de su situ nostru, e amparare is deretos, propiedades o seguresas nostros o de Ã teros.</p>
+
+      <p>Is cuntenutos pÃ¹blicos tuos diant pÃ²dere Ã¨ssere iscarrigados dae Ã teros serbidores in sa retza. Is publicatziones pÃ¹blicas e pro is sighidores ebbia benint intregadas a is serbidores in ue istant is retzidores, si istant in unu serbidore chi no est custu.</p>
+
+      <p>Cando autorizas un'aplicatzione a impreare su contu tuo, a segunda de sa mannÃ ria de is permissos chi frunis, cussa diat pÃ²dere atzÃ¨dere a is informatziones pÃ¹blicas de profilu tuas, a sa lista de is persones chi sighis e chi ti sighint, a is listas tuas, a totu is publicatziones tuas e a is referidos tuos. Is aplicatziones non podent mai tÃ¨nnere atzessu a s'indiritzu de posta eletrÃ²nica tuo e a sa crae de intrada tua.</p>
+
+      <hr class="spacer" />
+
+      <h3 id="children">Impreu de custu situ dae arte de pitzinnos</h3>
+
+      <p>Si custu serbidore est in s'UE o in s'Ã€EE: Su situ nostru, is produtos nostros e is servÃ¬tzios nostros sunt totu cantos pensados pro persones chi tenent a su mancu 16 annos de edade. Si tenes de mancu de 16 annos, in aplicatzione de is rechisitos de su GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) no imprees custu situ.</p>
+
+      <p>Si custu serbidore est in sos IUA: Su situ nostru, is produtos e is servÃ¬tzios suos sunt totu cantos pensados pro persones chi tenent a su mancu 13 annos de edade. Si tenes de mancu de 13 annos, in aplicatzione de su COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) no imprees custu situ.</p>
+
+      <p>Is rechisidos de sa lege diant pÃ²dere Ã¨ssere diferentes si custu serbidore est in suta de un'Ã tera giurisditzione.</p>
+
+      <hr class="spacer" />
+
+      <h3 id="changes">ModÃ¬ficas a sa polÃ¬tica de riservadesa nostra</h3>
+
+      <p>Si amus a isseberare de cambiare sa polÃ¬tica de riservadesa nostra amus a publicare is modÃ¬ficas in custa pÃ gina.</p>
+
+      <p>Custu documentu tenet una litzÃ¨ntzia CC-BY-SA. Est istadu agiornadu s'Ã¹rtima borta su 7 de martzu de su 2018.</p>
+
+      <p>Adatadu, in orÃ¬gine, dae sa <a href="https://github.com/discourse/discourse">PolÃ¬tica de riservadesa de Discourse</a>.</p>
+    title: "%{instance} Cunditziones de su servÃ¬tziu e polÃ¬tica de riservadesa"
+  themes:
+    contrast: Mastodon (cuntrastu artu)
+    default: Mastodon (iscuru)
+    mastodon-light: Mastodon (craru)
+  time:
+    formats:
+      default: "%d %b %Y, %H:%M"
+      month: "%b %Y"
+  two_factor_authentication:
+    add: Agiunghe
+    disable: Disativa 2FA
+    disabled_success: Autenticatzione de duos fatores disativada
+    edit: ModÃ¬fica
+    enabled: Autenticatzione de duos fatores ativada
+    enabled_success: Autenticatzione de duos fatores ativada
+    generate_recovery_codes: GÃ¨nera cÃ²dighes de recÃ¹peru
+    lost_recovery_codes: Is cÃ²dighes de recÃ¹peru ti permitint de recuperare s'atzessu a su contu tuo si as a pÃ¨rdere su telÃ¨fonu tuo. Si perdes is cÃ²dighes de recÃ¹peru tuos, ddos podes torrare a ingendrare inoghe. Is cÃ²dighes betzos tuos s'ant a invalidare.
+    methods: MÃ¨todos in duos fatores
+    otp: Aplicatzione de autenticatzione
+    recovery_codes: CÃ²dighes de recÃ¹peru de cÃ²pia de seguridade
+    recovery_codes_regenerated: CÃ²dighes de recÃ¹peru torrados a generare
+    recovery_instructions_html: Si una die as a pÃ¨rdere s'atzessu a su telÃ¨fonu tuo, as a pÃ²dere impreare unu de is cÃ²dighes de recÃ¹peru inoghe in suta pro recuperare s'atzessu a su contu tuo. <strong>Cunserva is cÃ²dighes in manera segura</strong>. A esÃ¨mpiu, ddos dias pÃ²dere imprentare e archiviare in paris a Ã teros documentos de importu.
+    webauthn: Craes de seguresa
+  user_mailer:
+    backup_ready:
+      explanation: As pedidu una cÃ²pia de seguresa totale de su contu de Mastodon tuo. Como est pronta pro s'iscarrigamentu!
+      subject: S'archÃ¬viu tuo est prontu pro Ã¨ssere iscarrigadu
+      title: Collida dae s'archÃ¬viu
+    sign_in_token:
+      details: 'Custos sunt is detÃ llios de su tentativu:'
+      explanation: 'Amus rilevadu unu tentativu de identificatzione in su contu tuo dae un''indiritzu IP non reconnotu. Si fias tue, inserta su cÃ²dighe de seguresa in bÃ sciu in sa pÃ gina disafiu de identificatzione:'
+      further_actions: 'Si no fias tue, cÃ mbia sa crae tua e ativa s''autenticatzione in duos passos in su contu tuo. Ddu podes fÃ ghere inoghe:'
+      subject: Cunfirma su tentativu de identificatzione
+      title: Tentativu de identificatzione
+    warning:
+      explanation:
+        disable: Non podes prus intrare in su contu tuo o dd'impreare in cale si siat Ã tera manera, ma su profilu e is Ã teros datos tuos abarrant intatos.
+        sensitive: Is elementos e documentos multimediales carrigados e ligados tuos ant a Ã¨ssere tratados che a sensÃ¬biles.
+        silence: Podes ancora impreare so contu tuo, ma isceti is persones chi ti sunt giai sighende ant a bÃ¬dere is tuts tuos in custu serbidore, e dias pÃ²dere Ã¨ssere esclÃ¹didu dae unas cantas listas pÃ¹blicas. Nointames custu, is Ã teros ti diant pÃ²dere galu sighire in manera manuale.
+        suspend: Non podes prus impreare su contu tuo, e su profilu e Ã teros datos non sunt prus atzessÃ¬biles. Bi podes galu intrare pro pedire una cÃ²pia de seguresa de is datos tuos finas a cando no ant a Ã¨ssere cantzellados de su totu, ma nd'amus a mantÃ¨nnere unos cantos pro non ti permÃ¬tere de evÃ dere sa suspensione.
+      get_in_touch: Podes rispÃ²ndere a custu indiritzu de posta eletrÃ²nica pro cuntatare cun su personale de %{instance}.
+      review_server_policies: Revisionat sas polÃ¬ticas de su serbidore
+      statuses: 'In manera cuncreta, pro:'
+      subject:
+        disable: Su contu tuo %{acct} est istadu cungeladu
+        none: Avisu pro %{acct}
+        sensitive: Is elementos multimediales de publicatzione de su contu tuo %{acct} sunt istados marcados comente sensÃ¬biles
+        silence: Su contu tuo %{acct} est istadu limitadu
+        suspend: Su contu tuo %{acct} est istadu suspÃ¨ndidu
+      title:
+        disable: Contu congeladu
+        none: Atentzione
+        sensitive: S'elementu multimediale tuo est istadu marcadu comente sensÃ¬bile
+        silence: Contu limitadu
+        suspend: Contu suspÃ¨ndidu
+    welcome:
+      edit_profile_action: Cunfigura su profilu
+      edit_profile_step: Podes personalizare su profilu tuo carrighende un'Ã vatar o un'intestatzione, cambiende su nÃ²mine visÃ¬bile tuo e faghende fintzas Ã teru. Si boles revisionare is sighidores noos in antis chi tÃ¨ngiant su permissu de ti sighire podes blocare su contu tuo.
+      explanation: Inoghe b'ant una paja de impÃ²sitos pro cumintzare
+      final_action: Cumintza a publicare
+      final_step: 'Cumintza a publicare! Fintzas si no ti sighit nemos is Ã teros podent bÃ¬dere is messÃ gios pÃ¹blicos tuos, pro esÃ¨mpiu in sa lÃ¬nia de tempus locale e in is etichetas ("hashtags"). Ti dias pÃ²dere bÃ²lere introduire a sa comunidade cun s''eticheta #introductions.'
+      full_handle: Su nÃ²mine utente intreu tuo
+      full_handle_hint: Custu est su chi dias nÃ rrere a is amigos tuos pro chi ti potzant imbiare messÃ gios o sighire dae un'Ã teru serbidore.
+      review_preferences_action: Muda is preferÃ¨ntzias
+      review_preferences_step: AmmentaÂ·ti de impostare is preferÃ¨ntzias tuas, che a is lÃ¬teras de posta eletrÃ²nicas chi boles retzire, o ite livellu de riservadesa dias bÃ²lere chi siat predefinidu pro is messÃ gios tuos. Si is immÃ gines in movimentu non ti infadant podes isseberare de abilitare sa riprodutzione automÃ tica de is GIF.
+      subject: Ti donamus su benebÃ¨nnidu a Mastodon
+      tip_federated_timeline: Sa lÃ¬nia de tempus federada est una vista globale de sa retza de Mastodon. Ma incluit isceti is persones sighidas dae is bighinos tuos, duncas no est totale.
+      tip_following: Pro more de is cunfiguratziones predefinidas sighis s'amministratzione de su serbidore tuo. Pro agatare Ã teras persones de interessu, cÃ stia is lÃ¬nias de su tempus locale e federada.
+      tip_local_timeline: Sa lÃ¬nia de tempus locale est una vista globale de is persones in %{instance}. Custos sunt is bighinos tuos!
+      tip_mobile_webapp: Si su navigadore mÃ²bile tuo t'oferit de agiÃ¹nghere Mastodon a s'ischermada printzipale tua podes retzire notÃ¬ficas push. Funtzionat che a un'aplicatzione nativa in maneras medas!
+      tips: ImpÃ²sitos
+      title: Bene bÃ¨nnidu a bordu, %{name}!
+  users:
+    blocked_email_provider: Custu frunidore de posta eletrÃ²nica no est permÃ¬tidu
+    follow_limit_reached: Non podes sighire prus de %{limit} persones
+    generic_access_help_html: Tenes problemas a intrare in su contu tuo? Podes cuntatare a %{email} pro retzire agiudu
+    invalid_email: Custu indiritzu de posta eletrÃ²nica no est vÃ lidu
+    invalid_email_mx: Custu indiritzu de posta eletrÃ²nica paret chi no esistat
+    invalid_otp_token: CÃ²dighe a duas fases non vÃ lidu
+    invalid_sign_in_token: CÃ²dighe de seguresa non vÃ lidu
+    otp_lost_help_html: Si as pÃ¨rdidu s'atzessu a ambos, podes cuntatare a %{email}
+    seamless_external_login: Ses intradu pro mÃ¨diu de unu servÃ¬tziu esternu, e pro custa resone is impostatziones de sa crae de intrada e de posta eletrÃ²nica non sunt a disponimentu.
+    signed_in_as: 'Sessione aberta comente:'
+    suspicious_sign_in_confirmation: Paret chi tue non sias giai intradu dae custu dispositivu e non ses intradu dae unu pagu de tempus, duncas ti semus mandende unu cÃ²dighe de seguresa a s'indiritzu de posta eletrÃ²nica tuo pro cunfirmare chi ses tue.
+  verification:
+    explanation_html: 'Ti podes <strong>verificare a sa sola comente mere de is ligÃ²ngios in is metadatos de su profilu tuo</strong>. Pro ddu fÃ ghere su situ ligadu depet cuntÃ¨nnere unu ligÃ²ngiu chi torret a su profilu de Mastodon tuo. Su ligÃ²ngiu in su situ <strong>depet</strong> tÃ¨nnere un''atributu <code>rel="me"</code>. Su testu cuntenutu in su ligÃ²ngiu no est de importu. Custu est un''esÃ¨mpiu:'
+    verification: VerÃ¬fica
+  webauthn_credentials:
+    add: Agiunghe una crae de seguresa noa
+    create:
+      error: Ddoe est istadu unu problema cun s'agiunta de sa crae de seguresa tua. Torra a proare.
+      success: Sa crae de seguresa tua est istada agiunta.
+    delete: Cantzella
+    delete_confirmation: Seguru chi boles cantzellare custa crae de seguresa?
+    description_html: Si permites s'<strong>autenticatzione cun crae de seguresa</strong>, as a tÃ¨nnere bisÃ²ngiu de impreare una de is craes de seguresa tuas pro ti identificare.
+    destroy:
+      error: Ddoe est istadu unu problema cun sa cantzelladura de sa crae de seguresa tua. Torra a proare.
+      success: Sa crae de seguresa tua est istada cantzellada.
+    invalid_credential: Crae de seguresa non vÃ lida
+    nickname_hint: Inserta su nomÃ¬ngiu de sa crae de seguresa tua noa
+    not_enabled: No as ativadu ancora WebAuthn
+    not_supported: Custu navigadore no est cumpatÃ¬bile cun is craes de seguresa
+    otp_required: Pro impreare is craes de seguresa depes ativare prima s'autenticatzione in duos passos.
+    registered_on: 'Registratzione: %{date}'
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 8d149d11fa22d52c47c051bbe67f1e5dd67ca8bf..63f122b78f8e763eac2232f04848e5498356b4fb 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -88,7 +88,7 @@ ar:
           disable: ØªØ¹Ø·ÙŠÙ„
           none: Ù„Ø§ ØªÙØ¹Ù„ Ø´ÙŠØ¦Ø§
           silence: ÙƒØªÙ…
-          suspend: ØªØ¹Ù„ÙŠÙ‚ Ùˆ ØØ°Ù ÙƒØ§ÙØ© Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„ØØ³Ø§Ø¨
+          suspend: Ø¹Ù„ÙÙ‚
         warning_preset_id: Ø§Ø³ØªØ®Ø¯Ù… Ù†Ù…ÙˆØ°Ø¬ ØªÙ†Ø¨ÙŠÙ‡
       announcement:
         all_day: ØØ¯Ø« Ø§Ù„ÙŠÙˆÙ… ÙƒÙ„Ù‡
@@ -162,6 +162,8 @@ ar:
         comment: Ø§Ù„ØªØ¹Ù„ÙŠÙ‚
       invite_request:
         text: Ù„Ù…Ø§Ø°Ø§ ØªØ±ØºØ¨ ÙÙŠ Ø§Ù„Ø§Ù†Ø¶Ù…Ø§Ù…ØŸ
+      ip_block:
+        ip: Ø¹Ù†ÙˆØ§Ù† IP
       notification_emails:
         digest: Ø¥Ø±Ø³Ø§Ù„ Ù…Ù„Ø®ØµØ§Øª Ø¹Ø¨Ø± Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ
         favourite: Ø§Ø¨Ø¹Ø« Ø¨Ø±ÙŠØ¯Ø§Ù‹ Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠÙ‹Ø§ Ø¹Ù†Ø¯Ù…Ø§ ÙŠÙØ¹Ø¬ÙŽØ¨ Ø£ØØ¯Ù‡Ù… Ø¨Ù…Ù†Ø´ÙˆØ±Ùƒ
diff --git a/config/locales/simple_form.br.yml b/config/locales/simple_form.br.yml
index b67db471f8bad5026480e5b6840770dc518d6772..4cbc173bd310be508e9d4955c1bd65dd576edc47 100644
--- a/config/locales/simple_form.br.yml
+++ b/config/locales/simple_form.br.yml
@@ -4,10 +4,16 @@ br:
     labels:
       account_warning_preset:
         title: Titl
+      admin_account_action:
+        types:
+          suspend: AstalaÃ±
       announcement:
         text: Kemenn
       defaults:
+        current_password: Ger-tremen a vremaÃ±
+        data: RoadennoÃ¹
         display_name: Anv diskouezet
+        email: Chomlec'h postel
         header: Talbenn
         locale: Yezh ar c'hetal
         new_password: Ger-tremen nevez
@@ -15,6 +21,11 @@ br:
         setting_display_media_default: Dre ziouer
         setting_display_media_hide_all: Kuzhat pep tra
         setting_display_media_show_all: Diskouez pep tra
+        username: Anv
+      featured_tag:
+        name: Ger-klik
+      invite:
+        comment: Evezhiadenn
       tag:
         name: Ger-klik
     'no': Ket
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 00ca1ed5d666e11735a4ec13ba7d99db1f2bac08..b3692f5bae59bcdd42d3aba3d5bfce5242482ae8 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -65,8 +65,17 @@ ca:
         data: Fitxer CSV exportat des d'un altre servidor de Mastodon
       invite_request:
         text: AixÃ² ens ajudarÃ  a revisar la teva peticiÃ³
+      ip_block:
+        comment: Opcional. Recordatori de perquÃ¨ lâ€™has afegit.
+        expires_in: Les adreces IP son un recurs finit, de vegades son compartides i sovint canvien de mans. Per aquest motiu no es recomanen els bloquejos dâ€™IP indefinits.
+        ip: Introdueix una adreÃ§a IPv4 o IPv6. Pots bloquejar rangs complets amb la sintaxi CIDR. Ves a compte no et bloquegis a tu mateix!
+        severities:
+          no_access: Bloqueja lâ€™accÃ©s a tots els recursos
+          sign_up_requires_approval: Els nous registres requeriran la teva aprovaciÃ³
+        severity: Tria quÃ¨ passarÃ  amb les solÂ·licituds des dâ€™aquesta IP
       sessions:
         otp: 'Introdueix el codi de dos factors generat per el teu telÃ¨fon o utilitza un dels teus codis de recuperaciÃ³:'
+        webauthn: Si Ã©s una clau USB assegurat de que estÃ  inserida i, si Ã©s necessari, toca-ho.
       tag:
         name: NomÃ©s pots canviar la caixa de les lletres, per exemple, per fer-la mÃ©s llegible
       user:
@@ -91,6 +100,7 @@ ca:
         types:
           disable: Inhabilita
           none: No fer res
+          sensitive: Sensible
           silence: Silenci
           suspend: SuspÃ¨n i elimina irreversiblement les dades del compte
         warning_preset_id: Utilitza una configuraciÃ³ predefinida d'avÃs
@@ -116,6 +126,7 @@ ca:
         expires_in: Expira desprÃ©s
         fields: Metadades del perfil
         header: CapÃ§alera
+        honeypot: "%{label} (no omplir)"
         inbox_url: URL de la safata d'entrada del relay
         irreversible: Cau en lloc d'ocultar
         locale: Llengua de la interfÃcie
@@ -135,6 +146,7 @@ ca:
         setting_default_privacy: Privacitat de les publicacions
         setting_default_sensitive: Marca sempre els elements multimÃ¨dia com a sensibles
         setting_delete_modal: Mostra la finestra de confirmaciÃ³ abans d'esborrar un tut
+        setting_disable_swiping: Desactivar les animacions
         setting_display_media: VisualitzaciÃ³ multimÃ¨dia
         setting_display_media_default: Per defecte
         setting_display_media_hide_all: Amaga-ho tot
@@ -168,6 +180,13 @@ ca:
         comment: Comenta
       invite_request:
         text: Per quÃ¨ vols unir-te?
+      ip_block:
+        comment: Comentari
+        ip: IP
+        severities:
+          no_access: Bloquejar lâ€™accÃ©s
+          sign_up_requires_approval: Limitar els registres
+        severity: Regla
       notification_emails:
         digest: Envia un resum per correu electrÃ²nic
         favourite: Envia un correu electrÃ²nic si algÃº marca com a preferit el teu estat
@@ -188,4 +207,7 @@ ca:
     required:
       mark: "*"
       text: necessari
+    title:
+      sessions:
+        webauthn: Usa una de les teves claus de seguretat per a iniciar sessiÃ³
     'yes': SÃ
diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml
index f3edefdf315f3350abfeb651aa7274c67cc0d330..1d41066d1b3c8c6cacf31737a2b2572e96ea600c 100644
--- a/config/locales/simple_form.co.yml
+++ b/config/locales/simple_form.co.yml
@@ -65,8 +65,17 @@ co:
         data: Un fugliale CSV da unâ€™altru servore di Mastodon
       invite_request:
         text: Quessu ci aiutarÃ  Ã  valutÃ  a vostra dumanda
+      ip_block:
+        comment: In uzzione. Rammintatevi di perchÃ¨ avete aghjuntu sta regula.
+        expires_in: L'indirizzi IP sÃ² una risorsa finita, ponu esse spartute Ã¨ spessu cambianu di mani. GhjÃ¨ perchÃ¨ i blucchimi d'IP permanenti Ã¹n sÃ² micca ricumandati.
+        ip: Entrate un'indirizzu IPv4 o IPv6. Pudete bluccÃ  tutt'un'intervallu cÃ¹ a sintassa CIDR. Fate attenzione, Ã¹n vi bluccate micca!
+        severities:
+          no_access: BluccÃ  l'accessu Ã  tutte e risorse
+          sign_up_requires_approval: E nove dumande d'arregistramente necessitaranu a vostr'appruvazione
+        severity: Sceglie ciÃ² chÃ¬ si passerÃ  cÃ¹ e richieste di quest'IP
       sessions:
         otp: 'Entrate u codice dâ€™identificazione Ã  dui fattori nantâ€™Ã  u vostru telefuninu, o unu di i vostri codici di ricuperazione:'
+        webauthn: S'ella hÃ¨ una chjave USB assicuratevi di brancalla Ã¨, s'ellu c'hÃ¨ unu, appughjÃ  nant'Ã  u buttone.
       tag:
         name: Pudete solu cambiÃ  a cassa di i caratteri, per esempiu per u rende piÃ¹ lighjevule
       user:
@@ -91,6 +100,7 @@ co:
         types:
           disable: DisattivÃ 
           none: Ã™n fÃ  nunda
+          sensitive: Sensibile
           silence: SilenzÃ 
           suspend: Suspende Ã¨ sguassÃ  i dati di u contu di manera irreversibile
         warning_preset_id: UtilizÃ  un'avertimentu preselezziunatu
@@ -116,6 +126,7 @@ co:
         expires_in: Spira dopu Ã 
         fields: Metadata di u prufile
         header: Ritrattu di cuprendula
+        honeypot: "%{label} (Ã¹n empie micca)"
         inbox_url: URL di l'inbox di u ripetitore
         irreversible: SguassÃ  invece di piattÃ 
         locale: Lingua di l'interfaccia
@@ -135,6 +146,7 @@ co:
         setting_default_privacy: CunfidenzialitÃ  di i statuti
         setting_default_sensitive: Sempre cunsiderÃ  media cumâ€™Ã¨ sensibili
         setting_delete_modal: MustrÃ  une cunfirmazione per toglie un statutu
+        setting_disable_swiping: DisattivÃ  e sculiscere
         setting_display_media: Affissera di i media
         setting_display_media_default: Predefinitu
         setting_display_media_hide_all: PiattÃ  tuttu
@@ -168,6 +180,13 @@ co:
         comment: Cummentariu
       invite_request:
         text: PerchÃ¨ vulete ghjunghje?
+      ip_block:
+        comment: Cummentariu
+        ip: IP
+        severities:
+          no_access: BluccÃ  l'accessu
+          sign_up_requires_approval: LimitÃ  l'arregistramenti
+        severity: Regula
       notification_emails:
         digest: MandÃ  e-mail di ricapitulazione
         favourite: MandÃ  unâ€™e-mail quandu qualchâ€™unu aghjunghje i mo statuti Ã  i so favuriti
@@ -188,4 +207,7 @@ co:
     required:
       mark: "*"
       text: riquisiti
+    title:
+      sessions:
+        webauthn: UtilizÃ  una chjave di sicuritÃ  per cunnettassi
     'yes': IÃ©
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index d6681e664be01347e6961209e0184e6811b94328..cb3f75c1aa6a0234c7a83c7d1b84693d7a7cbcaa 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -151,6 +151,7 @@ cy:
         setting_use_blurhash: Dangoswch raddiannau lliwgar ar gyfer cyfryngau cudd
         setting_use_pending_items: Modd araf
         severity: Difrifoldeb
+        sign_in_token_attempt: Cod dioelwch
         type: Modd mewnforio
         username: Enw defnyddiwr
         username_or_email: Enw defnyddiwr neu e-bost
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index d7a10a4a9501aee8a90a0027b8b33587c3283032..1c16c8e372f29a4d07a7a0ff091f32f74d0a0a97 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -2,6 +2,8 @@
 da:
   simple_form:
     hints:
+      account_warning_preset:
+        title: Valgfri. Ikke synlig for modtageren
       admin_account_action:
         type_html: VÃ¦lg hvad du vil gÃ¸re med <strong>%{acct}</strong>
       defaults:
@@ -9,6 +11,7 @@ da:
         avatar: PNG, GIF eller JPG. HÃ¸jest %{size}. Vil blive skaleret ned til %{dimensions}px
         bot: Denne konto udfÃ¸rer hovedsageligt automatiserede handlinger og bliver muligvis ikke overvÃ¥get
         context: En eller flere sammenhÃ¦nge hvor filteret skal vÃ¦re gÃ¦ldende
+        current_username: For at bekrÃ¦fte, angiv venligst brugernavnet pÃ¥ den aktuelle konto
         digest: Sendes kun efter en lang periode med inaktivitet og kun hvis du har modtaget nogle personlige beskeder i dit fravÃ¦r
         email: Du vil fÃ¥ tilsendt en bekrÃ¦ftelses e-mail
         fields: Du kan have op til 4 ting vist som en tabel pÃ¥ din profil
@@ -22,14 +25,24 @@ da:
         scopes: Hvilke APIs applikationen vil fÃ¥ adgang til. Hvis du vÃ¦lger et hÃ¸jtlevel omfang, behÃ¸ver du ikke vÃ¦lge enkeltstÃ¥ende.
         setting_display_media_default: Skjul medier markeret som fÃ¸lsomt
         setting_display_media_hide_all: Skjul altid alle medier
+        setting_display_media_show_all: Vis altid medier
         setting_hide_network: Hvem du fÃ¸lger og hvem der fÃ¸lger dig vil ikke blive vist pÃ¥ din profil
         setting_noindex: PÃ¥virker din offentlige profil og status sider
         username: Dit brugernavn vil vÃ¦re unikt pÃ¥ %{domain}
         whole_word: NÃ¥r nÃ¸gle ordet eller udtrykket kun er alfanumerisk, vil det kun blive brugt hvis det passer hele ordet
       featured_tag:
         name: 'Du kunne mÃ¥ske tÃ¦nke dig at bruge en af fÃ¸lgende:'
+      form_challenge:
+        current_password: Du indtrÃ¦der et sikkert omrÃ¥de
       imports:
         data: CSV fil eksporteret fra en anden Mastodon server
+      invite_request:
+        text: Dette vil hjÃ¦lpe os med at gennemgÃ¥ din ansÃ¸gning
+      ip_block:
+        comment: Valgfri. Husk hvorfor du har tilfÃ¸jet denne regel.
+        severities:
+          no_access: Bloker for adgangen til alle ressourcer
+          sign_up_requires_approval: Nye tilmeldinger krÃ¦ver din godkendelse
       sessions:
         otp: 'Indtast to-faktor koden der generes af appen af appen pÃ¥ din telefon eller brug en af din genoprettelses koder:'
       user:
@@ -52,6 +65,10 @@ da:
           silence: Silence
           suspend: SuspendÃ©r og slet kontodata uopretteligt
         warning_preset_id: Brug en forudindstillet advarsel
+      announcement:
+        all_day: Heldags begivenhed
+        scheduled_at: PlanlÃ¦g offentliggÃ¸relse
+        text: BekendtgÃ¸relse
       defaults:
         autofollow: Inviter til at fÃ¸lge din konto
         avatar: Profilbillede
@@ -99,10 +116,13 @@ da:
         setting_unfollow_modal: Vis bekrÃ¦ftelses dialog fÃ¸r du stopper med at fÃ¸lge nogen
         setting_use_pending_items: Langsom tilstand
         severity: Omfang
+        sign_in_token_attempt: Sikkerhedskode
         type: Importtype
         username: Brugernavn
         username_or_email: Brugernavn eller Email
         whole_word: Helt ord
+      email_domain_block:
+        with_dns_records: Inkluder MX-optegnelser og IP'er for domÃ¦net
       featured_tag:
         name: Hashtag
       interactions:
@@ -113,6 +133,13 @@ da:
         comment: Kommentar
       invite_request:
         text: Hvorfor Ã¸nsker du at tilmelde dig?
+      ip_block:
+        comment: Kommentar
+        ip: IP
+        severities:
+          no_access: Bloker adgang
+          sign_up_requires_approval: BegrÃ¦ns tilmeldinger
+        severity: Regel
       notification_emails:
         digest: Send sammendrag via emails
         favourite: Send email nÃ¥r nogen favoriserer din status
@@ -133,4 +160,7 @@ da:
     required:
       mark: "*"
       text: pÃ¥krÃ¦vet
+    title:
+      sessions:
+        webauthn: Log pÃ¥ ved brug af en af dine sikkerhedskoder
     'yes': Ja
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 999c4432de0791ee7cfee1dc6d1241b374641f80..711dbf5c68c73cae897249866bcd668fbf3d379f 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -41,8 +41,8 @@ de:
         phrase: Wird schreibungsunabhÃ¤ngig mit dem Text und Inhaltswarnung eines Beitrags verglichen
         scopes: Welche Schnittstellen der Applikation erlaubt sind. Wenn du einen Top-Level-Scope auswÃ¤hlst, dann musst du nicht jeden einzelnen darunter auswÃ¤hlen.
         setting_aggregate_reblogs: Zeige denselben Beitrag nicht nochmal an, wenn er erneut geteilt wurde (dies betrifft nur neulich erhaltene erneut geteilte BeitrÃ¤ge)
-        setting_default_sensitive: Heikle Medien werden erst nach einem Klick sichtbar
-        setting_display_media_default: Verstecke Medien, die als sensibel markiert sind
+        setting_default_sensitive: NSFW-Medien werden erst nach einem Klick sichtbar
+        setting_display_media_default: Verstecke Medien, die als NSFW markiert sind
         setting_display_media_hide_all: Alle Medien immer verstecken
         setting_display_media_show_all: Alle Medien immer anzeigen
         setting_hide_network: Wem du folgst und wer dir folgt, wird in deinem Profil nicht angezeigt
@@ -56,7 +56,7 @@ de:
         domain: Diese Domain kann Daten von diesem Server abrufen und eingehende Daten werden verarbeitet und gespeichert
       email_domain_block:
         domain: Dies kann der Domainname sein, der in der E-Mail-Adresse angezeigt wird, den MX-Datensatz, der aufgelÃ¶st wird oder die IP des Servers, auf dem der MX-Eintrag aufgelÃ¶st wird. Diese werden bei der Registrierung Ã¼berprÃ¼ft und die Registrierung wird abgelehnt.
-        with_dns_records: Ein Versuch die DNS-EintrÃ¤ge der Domain aufzulÃ¶sen wurde unternommen und diese Ergebnisse werden unter anderem auch geblacklistet
+        with_dns_records: Ein Versuch die DNS-EintrÃ¤ge der Domain aufzulÃ¶sen wurde unternommen und diese Ergebnisse werden unter anderem auch geblockt
       featured_tag:
         name: 'Du mÃ¶chtest vielleicht einen von diesen benutzen:'
       form_challenge:
@@ -65,8 +65,17 @@ de:
         data: CSV-Datei, die aus einem anderen Mastodon-Server exportiert wurde
       invite_request:
         text: Dies wird uns helfen deine Anmeldungsanfrage besser zu verarbeiten
+      ip_block:
+        comment: Optional. Denke daran, warum du diese Regel hinzugefÃ¼gt hast.
+        expires_in: IP-Adressen sind eine endliche Ressource, sie werden manchmal geteilt und werden ab und zu ausgetauscht. Aus diesem Grund werden unbestimmte IP-BlÃ¶cke nicht empfohlen.
+        ip: Gebe eine IPv4- oder IPv6-Adresse an. Du kannst ganze Bereiche mit der CIDR-Syntax blockieren. Achte darauf, dass du dich nicht aussperrst!
+        severities:
+          no_access: Zugriff auf alle Ressourcen blockieren
+          sign_up_requires_approval: Neue Anmeldungen erfordern deine Zustimmung
+        severity: WÃ¤hle aus, was mit Anfragen aus dieser IP passiert
       sessions:
         otp: 'Gib die Zwei-Faktor-Authentifizierung von deinem Telefon ein oder benutze einen deiner Wiederherstellungscodes:'
+        webauthn: Wenn es sich um einen USB-SchlÃ¼ssel handelt, stelle sicher, dass du ihn einsteckst und ihn antippst.
       tag:
         name: Du kannst zum Beispiel nur die GroÃŸ- und Kleinschreibung der Buchstaben Ã¤ndern, um es lesbarer zu machen
       user:
@@ -91,6 +100,7 @@ de:
         types:
           disable: Deaktivieren
           none: Nichts tun
+          sensitive: NSFW
           silence: Stummschalten
           suspend: Deaktivieren und Benutzerdaten unwiderruflich lÃ¶schen
         warning_preset_id: Benutze eine Warnungsvorlage
@@ -116,6 +126,7 @@ de:
         expires_in: LÃ¤uft ab
         fields: Tabellenfelder
         header: Titelbild
+        honeypot: "%{label} (nicht ausfÃ¼llen)"
         inbox_url: Inbox-URL des Relais
         irreversible: Verwerfen statt verstecken
         locale: Sprache der BenutzeroberflÃ¤che
@@ -133,10 +144,11 @@ de:
         setting_crop_images: Bilder in nicht ausgeklappten BeitrÃ¤gen auf 16:9 zuschneiden
         setting_default_language: Beitragssprache
         setting_default_privacy: Beitragssichtbarkeit
-        setting_default_sensitive: Medien immer als heikel markieren
+        setting_default_sensitive: Medien immer als NSFW markieren
         setting_delete_modal: BestÃ¤tigungsdialog anzeigen, bevor ein Beitrag gelÃ¶scht wird
+        setting_disable_swiping: Deaktiviere Wischgesten
         setting_display_media: Medien-Anzeige
-        setting_display_media_default: Heikle Inhalte verstecken
+        setting_display_media_default: NSFW-Inhalte verstecken
         setting_display_media_hide_all: Alle Medien verstecken
         setting_display_media_show_all: Alle Medien anzeigen
         setting_expand_spoilers: BeitrÃ¤ge mit Inhaltswarnungen immer ausklappen
@@ -168,6 +180,13 @@ de:
         comment: Kommentar
       invite_request:
         text: Warum mÃ¶chtest du beitreten?
+      ip_block:
+        comment: Kommentar
+        ip: IP-Adresse
+        severities:
+          no_access: Zugriff sperren
+          sign_up_requires_approval: Anmeldungen begrenzen
+        severity: Regel
       notification_emails:
         digest: Kurzfassungen Ã¼ber E-Mail senden
         favourite: E-Mail senden, wenn jemand meinen Beitrag favorisiert
@@ -188,4 +207,7 @@ de:
     required:
       mark: "*"
       text: Pflichtfeld
+    title:
+      sessions:
+        webauthn: Verwende einer deiner SicherheitsschlÃ¼ssel zum Anmelden
     'yes': Ja
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index 86ba0d3033e3b561a36102ce64bc6d350c94bc16..d4c8a2da6852e90cc52ac3bb901005837cd4c7a4 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -65,8 +65,15 @@ el:
         data: Î‘ÏÏ‡ÎµÎ¯Î¿ CSV Ï€Î¿Ï… ÎÏ‡ÎµÎ¹ ÎµÎ¾Î±Ï‡Î¸ÎµÎ¯ Î±Ï€ÏŒ Î´Î¹Î±Ï†Î¿ÏÎµÏ„Î¹ÎºÏŒ ÎºÏŒÎ¼Î²Î¿ Mastodon
       invite_request:
         text: Î‘Ï…Ï„ÏŒ Î¸Î± Î¼Î±Ï‚ Î²Î¿Î·Î¸Î®ÏƒÎµÎ¹ Î½Î± ÎµÏ€Î¹Î¸ÎµÏ‰ÏÎ®ÏƒÎ¿Ï…Î¼Îµ Ï„Î·Î½ Î±Î¯Ï„Î·ÏƒÎ® ÏƒÎ¿Ï…
+      ip_block:
+        comment: Î ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÏŒ. Î˜Ï…Î¼Î·Î¸ÎµÎ¯Ï„Îµ Î³Î¹Î±Ï„Î¯ Ï€ÏÎ¿ÏƒÎ¸ÎÏƒÎ±Ï„Îµ Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ ÎºÎ±Î½ÏŒÎ½Î±.
+        severities:
+          no_access: Î‘Ï€Î¿ÎºÎ»ÎµÎ¹ÏƒÎ¼ÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ ÏƒÎµ ÏŒÎ»Î¿Ï…Ï‚ Ï„Î¿Ï…Ï‚ Ï€ÏŒÏÎ¿Ï…Ï‚
+          sign_up_requires_approval: ÎÎÎµÏ‚ ÎµÎ³Î³ÏÎ±Ï†ÎÏ‚ Î¸Î± Î±Ï€Î±Î¹Ï„Î¿ÏÎ½ Ï„Î·Î½ ÎÎ³ÎºÏÎ¹ÏƒÎ· ÏƒÎ±Ï‚
+        severity: Î•Ï€Î¹Î»ÎÎ¾Ï„Îµ Ï„Î¹ Î¸Î± Î³Î¯Î½ÎµÏ„Î±Î¹ Î¼Îµ Î±Î¹Ï„Î®ÏƒÎµÎ¹Ï‚ Î±Ï€ÏŒ Î±Ï…Ï„Î®Î½ Ï„Î·Î½ Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP
       sessions:
         otp: 'Î’Î¬Î»Îµ Ï„Î¿Î½ ÎºÏ‰Î´Î¹ÎºÏŒ Î´Ï…Î¿ Ï€Î±ÏÎ±Î³ÏŒÎ½Ï„Ï‰Î½ (2FA) Î±Ï€ÏŒ Ï„Î·Î½ ÎµÏ†Î±ÏÎ¼Î¿Î³Î® Ï„Î¿Ï… Ï„Î·Î»ÎµÏ†ÏŽÎ½Î¿Ï… ÏƒÎ¿Ï… Î® Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¯Î·ÏƒÎµ ÎºÎ¬Ï€Î¿Î¹Î¿Î½ Î±Ï€ÏŒ Ï„Î¿Ï…Ï‚ ÎºÏ‰Î´Î¹ÎºÎ¿ÏÏ‚ Î±Î½Î¬ÎºÏ„Î·ÏƒÎ·Ï‚ ÏƒÎ¿Ï…:'
+        webauthn: Î‘Î½ Ï€ÏÏŒÎºÎµÎ¹Ï„Î±Î¹ Î³Î¹Î± ÎÎ½Î± ÎºÎ»ÎµÎ¹Î´Î¯ USB Î²ÎµÎ²Î±Î¹Ï‰Î¸ÎµÎ¯Ï„Îµ ÏŒÏ„Î¹ ÎµÎ¯Î½Î±Î¹ ÏƒÏ…Î½Î´ÎµÎ´ÎµÎ¼ÎÎ½Î¿ ÎºÎ±Î¹ Î±Î½ Î±Ï€Î±Î¹Ï„ÎµÎ¯Ï„Î±Î¹ Ï€Î±Ï„Î®ÏƒÏ„Îµ Ï„Î¿ ÎµÎ»Î±Ï†ÏÎ¬.
       tag:
         name: ÎœÏ€Î¿ÏÎµÎ¯Ï‚ Î½Î± Î±Î»Î»Î¬Î¾ÎµÎ¹Ï‚ Î¼ÏŒÎ½Î¿ Ï„Î¿ Ï€Î»Î±Î¯ÏƒÎ¹Î¿ Ï„Ï‰Î½ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÏ‰Î½, Î³Î¹Î± Ï€Î±ÏÎ¬Î´ÎµÎ¹Î³Î¼Î± Î³Î¹Î± Î½Î± Î³Î¯Î½ÎµÎ¹ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ¿ ÎµÏ…Î±Î½Î¬Î³Î½Ï‰ÏƒÏ„Î¿
       user:
@@ -91,6 +98,7 @@ el:
         types:
           disable: Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·
           none: ÎšÎ±Î¼Î¯Î± ÎµÎ½ÎÏÎ³ÎµÎ¹Î±
+          sensitive: Î•Ï…Î±Î¯ÏƒÎ¸Î·Ï„Î¿
           silence: Î‘Ï€Î¿ÏƒÎ¹ÏŽÏ€Î·ÏƒÎ·
           suspend: Î‘Î½Î±ÏƒÏ„Î¿Î»Î® ÎºÎ±Î¹ Î±Î¼ÎµÏ„Î¬ÎºÎ»Î·Ï„Î· Î´Î¹Î±Î³ÏÎ±Ï†Î® ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Ï‰Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï
         warning_preset_id: Î§ÏÎ®ÏƒÎ· Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î·Ï‚ Ï€ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚
@@ -116,9 +124,10 @@ el:
         expires_in: Î›Î®Î¾Î· Î¼ÎµÏ„Î¬ Î±Ï€ÏŒ
         fields: ÎœÎµÏ„Î±Î´ÎµÎ´Î¿Î¼ÎÎ½Î± Ï€ÏÎ¿Ï†Î¯Î»
         header: Î•Ï€Î¹ÎºÎµÏ†Î±Î»Î¯Î´Î±
+        honeypot: "%{label} (Î¼Î· ÏƒÏ…Î¼Ï€Î»Î·ÏÏŽÎ½ÎµÏ„Îµ)"
         inbox_url: Î¤Î¿ URL Ï„Î¿Ï… inbox Ï„Î¿Ï… Î±Î½Ï„Î±Ï€Î¿ÎºÏÎ¹Ï„Î® (relay)
         irreversible: Î‘Ï€ÏŒÏÏÎ¹ÏˆÎ· Î±Î½Ï„Î¯ Î³Î¹Î± ÎºÏÏÏˆÎ¹Î¼Î¿
-        locale: Î“Î»ÏŽÏƒÏƒÎ± Ï€ÎµÏÎ¹Î²Î¬Î»Î»Î¿Î½Ï„Î¿Ï‚
+        locale: Î“Î»ÏŽÏƒÏƒÎ± Ï‡ÏÎ®ÏƒÎ·Ï‚
         locked: ÎšÎ»ÎµÎ¯Î´Ï‰Î¼Î± Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï
         max_uses: ÎœÎÎ³Î¹ÏƒÏ„Î¿Ï‚ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚ Ï‡ÏÎ®ÏƒÎµÏ‰Î½
         new_password: ÎÎÎ¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ
@@ -135,6 +144,7 @@ el:
         setting_default_privacy: Î™Î´Î¹Ï‰Ï„Î¹ÎºÏŒÏ„Î·Ï„Î± Î´Î·Î¼Î¿ÏƒÎ¹ÎµÏÏƒÎµÏ‰Î½
         setting_default_sensitive: Î£Î·Î¼ÎµÎ¯Ï‰ÏƒÎ· ÏŒÎ»Ï‰Î½ Ï„Ï‰Î½ Ï€Î¿Î»Ï…Î¼ÎÏƒÏ‰Î½ Ï‰Ï‚ ÎµÏ…Î±Î¯ÏƒÎ¸Î·Ï„Î¿Ï… Ï€ÎµÏÎ¹ÎµÏ‡Î¿Î¼ÎÎ½Î¿Ï…
         setting_delete_modal: Î•Ï€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ· Ï€ÏÎ¹Î½ Ï„Î· Î´Î¹Î±Î³ÏÎ±Ï†Î® ÎµÎ½ÏŒÏ‚ Ï„Î¿Ï…Ï„
+        setting_disable_swiping: Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÎºÎ¹Î½Î®ÏƒÎµÏ‰Î½ ÏƒÏ…ÏÏƒÎ¯Î¼Î±Ï„Î¿Ï‚
         setting_display_media: Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï€Î¿Î»Ï…Î¼ÎÏƒÏ‰Î½
         setting_display_media_default: Î ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿
         setting_display_media_hide_all: Î‘Ï€ÏŒÎºÏÏ…ÏˆÎ· ÏŒÎ»Ï‰Î½
@@ -168,6 +178,13 @@ el:
         comment: Î£Ï‡ÏŒÎ»Î¹Î±
       invite_request:
         text: Î“Î¹Î±Ï„Î¯ Î¸ÎÎ»ÎµÎ¹Ï‚ Î½Î± ÏƒÏ…Î¼Î¼ÎµÏ„Î¬ÏƒÏ‡ÎµÎ¹Ï‚;
+      ip_block:
+        comment: Î£Ï‡ÏŒÎ»Î¹Î¿
+        ip: IP
+        severities:
+          no_access: Î‘Ï€Î¿ÎºÎ»ÎµÎ¹ÏƒÎ¼ÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚
+          sign_up_requires_approval: Î ÎµÏÎ¹Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚ ÎµÎ³Î³ÏÎ±Ï†ÏŽÎ½
+        severity: ÎšÎ±Î½ÏŒÎ½Î±Ï‚
       notification_emails:
         digest: Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î® ÏƒÏ…Î½Î¿Ï€Ï„Î¹ÎºÏŽÎ½ email
         favourite: Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î® email ÏŒÏ„Î±Î½ ÎºÎ¬Ï€Î¿Î¹Î¿Ï‚ ÏƒÎ·Î¼ÎµÎ¹ÏŽÎ½ÎµÎ¹ Ï‰Ï‚ Î±Î³Î±Ï€Î·Î¼ÎÎ½Î· Ï„Î· Î´Î·Î¼Î¿ÏƒÎ¯ÎµÏ…ÏƒÎ® ÏƒÎ¿Ï…
@@ -188,4 +205,7 @@ el:
     required:
       mark: "*"
       text: Î±Ï€Î±Î¹Ï„ÎµÎ¯Ï„Î±Î¹
+    title:
+      sessions:
+        webauthn: Î§ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯ÏƒÏ„Îµ ÎÎ½Î± Î±Ï€ÏŒ Ï„Î± ÎºÎ»ÎµÎ¹Î´Î¹Î¬ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚ ÏƒÎ±Ï‚ Î³Î¹Î± Î½Î± ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯Ï„Îµ
     'yes': ÎÎ±Î¹
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 0a8a6fd62885bdb72a0504cc5ea8e39d45249e1f..20c91656028cd28af717e3db2020f68f42a4651d 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -65,8 +65,17 @@ en:
         data: CSV file exported from another Mastodon server
       invite_request:
         text: This will help us review your application
+      ip_block:
+        comment: Optional. Remember why you added this rule.
+        expires_in: IP addresses are a finite resource, they are sometimes shared and often change hands. For this reason, indefinite IP blocks are not recommended.
+        ip: Enter an IPv4 or IPv6 address. You can block entire ranges using the CIDR syntax. Be careful not to lock yourself out!
+        severities:
+          no_access: Block access to all resources
+          sign_up_requires_approval: New sign-ups will require your approval
+        severity: Choose what will happen with requests from this IP
       sessions:
         otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:'
+        webauthn: If it's an USB key be sure to insert it and, if necessary, tap it.
       tag:
         name: You can only change the casing of the letters, for example, to make it more readable
       user:
@@ -89,10 +98,11 @@ en:
         text: Custom warning
         type: Action
         types:
-          disable: Disable login
-          none: Do nothing
-          silence: Silence
-          suspend: Suspend and irreversibly delete account data
+          disable: Freeze
+          none: Send a warning
+          sensitive: Sensitive
+          silence: Limit
+          suspend: Suspend
         warning_preset_id: Use a warning preset
       announcement:
         all_day: All-day event
@@ -116,6 +126,7 @@ en:
         expires_in: Expire after
         fields: Profile metadata
         header: Header
+        honeypot: "%{label} (do not fill in)"
         inbox_url: URL of the relay inbox
         irreversible: Drop instead of hide
         locale: Interface language
@@ -135,6 +146,7 @@ en:
         setting_default_privacy: Posting privacy
         setting_default_sensitive: Always mark media as sensitive
         setting_delete_modal: Show confirmation dialog before deleting a toot
+        setting_disable_swiping: Disable swiping motions
         setting_display_media: Media display
         setting_display_media_default: Default
         setting_display_media_hide_all: Hide all
@@ -168,6 +180,13 @@ en:
         comment: Comment
       invite_request:
         text: Why do you want to join?
+      ip_block:
+        comment: Comment
+        ip: IP
+        severities:
+          no_access: Block access
+          sign_up_requires_approval: Limit sign-ups
+        severity: Rule
       notification_emails:
         digest: Send digest e-mails
         favourite: Someone favourited your status
@@ -188,4 +207,7 @@ en:
     required:
       mark: "*"
       text: required
+    title:
+      sessions:
+        webauthn: Use one of your security keys to sign in
     'yes': 'Yes'
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index 308738c889ed770a009c244ccb085cf88ad15e46..3f399deaed1dc59eb751c81ab60b65bfd1791878 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -29,7 +29,7 @@ eo:
         phrase: Estos provita senzorge pri la uskleco de teksto aÅ averto pri enhavo de mesaÄo
         scopes: Kiujn API-ojn la aplikaÄµo permesiÄos atingi. Se vi elektas supran amplekson, vi ne bezonas elekti la individuajn.
         setting_aggregate_reblogs: Ne montri novajn diskonigojn de mesaÄoj laste diskonigitaj (nur efikas al novaj diskonigoj)
-        setting_default_sensitive: Sentema komunikilo estas kaÅita defaÅlte kaj povas esti rivelita per alklako
+        setting_default_sensitive: Tiklaj aÅdovidaÄµoj estas defaÅlte kaÅita kaj povas esti malkiÅita per klako
         setting_display_media_default: KaÅi aÅdovidaÄµojn markitajn kiel tiklaj
         setting_display_media_hide_all: Äˆiam kaÅi Ä‰iujn aÅdovidaÄµojn
         setting_display_media_show_all: Äˆiam montri aÅdovidaÄµojn markitajn kiel tiklaj
@@ -47,6 +47,9 @@ eo:
         data: CSV-dosiero el alia Mastodon-servilo
       invite_request:
         text: Äˆi tio helpos nin revizii vian kandidatiÄon
+      ip_block:
+        severities:
+          sign_up_requires_approval: Novaj registriÄoj devigos vian aprobon
       sessions:
         otp: 'Enmetu la kodon de dufaktora aÅtentigo el via telefono aÅ uzu unu el viaj realiraj kodoj:'
       user:
@@ -64,12 +67,13 @@ eo:
         text: AntaÅagordita teksto
         title: Titolo
       admin_account_action:
-        send_email_notification: Atentigi la uzanton retpoÅte
+        send_email_notification: Sciigi la uzanton retpoÅte
         text: Propra averto
         type: Ago
         types:
           disable: Malebligi
           none: Fari nenion
+          sensitive: Tikla
           silence: Silentigi
           suspend: Haltigi kaj nemalfereble forigi kontajn datumojn
         warning_preset_id: Uzi antaÅagorditan averton
@@ -95,6 +99,7 @@ eo:
         expires_in: EksvalidiÄas post
         fields: Profilaj metadatumoj
         header: Fonbildo
+        honeypot: "%{label} (ne plenigi)"
         inbox_url: URL de la ripetila enirkesto
         irreversible: ForÄµeti anstataÅ kaÅi
         locale: Interfaca lingvo
@@ -108,12 +113,12 @@ eo:
         setting_advanced_layout: Ebligi altnivelan retpaÄan interfacon
         setting_aggregate_reblogs: Grupigi diskonigojn en tempolinioj
         setting_auto_play_gif: AÅtomate ekigi GIF-ojn
-        setting_boost_modal: Montri fenestron por konfirmi antaÅ ol diskonigi mesaÄon
+        setting_boost_modal: Montri konfirman fenestron antaÅ ol diskonigi mesaÄon
         setting_crop_images: Stuci bildojn en negrandigitaj mesaÄoj al 16x9
         setting_default_language: Publikada lingvo
         setting_default_privacy: MesaÄa videbleco
         setting_default_sensitive: Äˆiam marki aÅdovidaÄµojn tiklaj
-        setting_delete_modal: Montri fenestron por konfirmi antaÅ ol forigi mesaÄon
+        setting_delete_modal: Montri konfirman fenestron antaÅ ol forigi mesaÄon
         setting_display_media: AÅdovidaÄµa montrado
         setting_display_media_default: Dekomenca
         setting_display_media_hide_all: KaÅi Ä‰iujn
@@ -126,10 +131,11 @@ eo:
         setting_system_font_ui: Uzi la dekomencan tiparon de la sistemo
         setting_theme: Reteja etoso
         setting_trends: Montri hodiaÅajn furoraÄµojn
-        setting_unfollow_modal: Montri fenestron por konfirmi antaÅ ol Ä‰esi sekvi iun
+        setting_unfollow_modal: Montri konfirman fenestron antaÅ ol Ä‰esi sekvi iun
         setting_use_blurhash: Montri buntajn transirojn por kaÅitaj aÅdovidaÄµoj
         setting_use_pending_items: Malrapida reÄimo
         severity: Graveco
+        sign_in_token_attempt: Sekureca kodo
         type: Importa tipo
         username: Uzantnomo
         username_or_email: Uzantnomo aÅ Retadreso
@@ -144,6 +150,13 @@ eo:
         comment: Komento
       invite_request:
         text: Kial vi volas aliÄi?
+      ip_block:
+        comment: Komento
+        ip: IP
+        severities:
+          no_access: Bloki atingon
+          sign_up_requires_approval: Limigi registriÄojn
+        severity: Regulo
       notification_emails:
         digest: Sendi resumajn retmesaÄojn
         favourite: Sendi retmesaÄon kiam iu stelumas vian mesaÄon
@@ -153,11 +166,11 @@ eo:
         pending_account: Sendi retmesaÄon kiam nova konto bezonas kontrolon
         reblog: Sendi retmesaÄon kiam iu diskonigas vian mesaÄon
         report: Nova signalo estas sendita
-        trending_tag: Sendi retpoÅtmesaÄon kiam nekontrolita kradvorto furoras
+        trending_tag: Nekontrolita kradvorto furoras
       tag:
         name: Kradvorto
         trendable: Permesi al Ä‰i tiu kradvorto aperi en furoraÄµoj
-        usable: Permesi tootojn uzi Ä‰iun tiun haketon
+        usable: Permesi mesaÄojn uzi Ä‰i tiun kradvorton
     'no': Ne
     recommended: Rekomendita
     required:
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index a3195f6b8d0f61d4839cf98e0148097e0c17bf4c..153c1101d1b868f6dd5bdbcf9e6b322ae3296f43 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -12,7 +12,7 @@ es-AR:
       admin_account_action:
         include_statuses: El usuario verÃ¡ quÃ© toots causaron la acciÃ³n de moderaciÃ³n o advertencia
         send_email_notification: El usuario recibirÃ¡ una explicaciÃ³n de lo que sucediÃ³ con su cuenta
-        text_html: Opcional. PodÃ©s usar sintaxis de toots. PodÃ©s <a href="%{path}">agregar preajustes de advertencia</a> para ahorrar tiempo.
+        text_html: Opcional. PodÃ©s usar sintaxis de toots. PodÃ©s <a href="%{path}">agregar preajustes de advertencia</a> para ahorrar tiempo
         type_html: ElegÃ quÃ© hacer con <strong>%{acct}</strong>
         warning_preset_id: Opcional. TodavÃa podÃ©s agregar texto personalizado al final del preajuste
       announcement:
@@ -20,31 +20,31 @@ es-AR:
         ends_at: Opcional. El anuncio desaparecerÃ¡ automÃ¡ticamente en este momento
         scheduled_at: Dejar en blanco para publicar el anuncio inmediatamente
         starts_at: Opcional. En caso de que tu anuncio estÃ© vinculado a un rango de tiempo especÃfico
-        text: PodÃ©s usar la sintaxis de toot. Por favor, tenÃ© en cuenta el espacio que ocuparÃ¡ el anuncio en la pantalla del usuario
+        text: PodÃ©s usar sintaxis de toots. Por favor, tenÃ© en cuenta el espacio que ocuparÃ¡ el anuncio en la pantalla del usuario
       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
         current_username: Para confirmar, por favor, ingresÃ¡ el nombre de usuario de la cuenta actual
-        digest: SÃ³lo enviado tras un largo periodo de inactividad, y sÃ³lo si has recibiste mensajes personales en tu ausencia
+        digest: SÃ³lo enviado tras un largo periodo de inactividad, y sÃ³lo si recibiste mensajes personales en tu ausencia
         discoverable: El directorio del perfil es otra forma en la que tu cuenta puede llegar a un pÃºblico mÃ¡s amplio
         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 toots 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
+        locale: El idioma de la interface de usuario, correos electrÃ³nicos y notificaciones push
         locked: Requiere que manualmente aprobÃ©s seguidores
         password: UsÃ¡ al menos 8 caracteres
         phrase: Se aplicarÃ¡ sin importar las mayÃºsculas o las advertencias de contenido de un toot
         scopes: QuÃ© APIs de la aplicaciÃ³n tendrÃ¡n acceso. Si seleccionÃ¡s el alcance de nivel mÃ¡s alto, no necesitÃ¡s seleccionar las individuales.
         setting_aggregate_reblogs: No mostrar nuevos retoots de los toots que fueron recientemente retooteados (sÃ³lo afecta a los retoots recibidos recientemente)
         setting_default_sensitive: El contenido de medios sensibles estÃ¡ oculto predeterminadamente y puede ser mostrado con un clic
-        setting_display_media_default: Ocultar medios que estÃ¡n marcados como sensibles
+        setting_display_media_default: Ocultar medios marcados como sensibles
         setting_display_media_hide_all: Siempre ocultar todos los medios
-        setting_display_media_show_all: Siempre mostrar todos los medios que estÃ¡n marcados como sensibles
+        setting_display_media_show_all: Siempre mostrar todos los medios
         setting_hide_network: A quiÃ©nes seguÃs y tus seguidores no serÃ¡n mostrados en tu perfil
         setting_noindex: Afecta a tu perfil pÃºblico y pÃ¡ginas de estado
         setting_show_application: La aplicaciÃ³n que usÃ¡s para tootear se mostrarÃ¡ en la vista detallada de tus toots
@@ -56,7 +56,7 @@ es-AR:
         domain: Este dominio podrÃ¡ recolectar datos de este servidor, y los datos entrantes serÃ¡n procesados y archivados
       email_domain_block:
         domain: Puede ser el nombre de dominio que aparece en la direcciÃ³n de correo electrÃ³nico, el registro MX hacia el cual resuelve el dominio, o la direcciÃ³n IP del servidor hacia el cual resuelve ese registro MX. Esto se comprobarÃ¡ en el momento del registro del usuario, y el registro serÃ¡ rechazado.
-        with_dns_records: Se harÃ¡ un intento de resolver los registros DNS del dominio dado y los resultados serÃ¡n tambiÃ©n puestos en la lista de desaprobados
+        with_dns_records: Se harÃ¡ un intento de resolver los registros DNS del dominio dado y los resultados serÃ¡n tambiÃ©n bloqueados
       featured_tag:
         name: 'Puede que quieras usar una de estas:'
       form_challenge:
@@ -64,9 +64,18 @@ es-AR:
       imports:
         data: Archivo CSV exportado desde otro servidor de Mastodon
       invite_request:
-        text: Esto nos ayudarÃ¡ a revisar tu aplicaciÃ³n
+        text: Esto nos ayudarÃ¡ a revisar tu solicitud
+      ip_block:
+        comment: Opcional. Acordate por quÃ© agregaste esta regla.
+        expires_in: Las direcciones IP son un recurso finito, a veces se comparten y cambian de personas frecuentemente. Por esta razÃ³n, no se recomiendan bloqueos indefinidos de direcciones IP.
+        ip: IngresÃ¡ una direcciÃ³n IPv4 Ã³ IPv6. PodÃ©s bloquear rangos completos usando la sintaxis CIDR. Â¡TenÃ© cuidado de no bloquearte vos mismo!
+        severities:
+          no_access: Bloquear acceso a todos los recursos
+          sign_up_requires_approval: Los nuevos registros requerirÃ¡n tu aprobaciÃ³n
+        severity: ElegÃ lo que pasarÃ¡ con las solicitudes desde esta direcciÃ³n IP
       sessions:
-        otp: 'IngresÃ¡ el cÃ³digo de autenticaciÃ³n de dos factores generado por la aplicaciÃ³n de tu dispositivo mÃ³vil, o usÃ¡ uno de tus cÃ³digos de recuperaciÃ³n:'
+        otp: 'IngresÃ¡ el cÃ³digo de autenticaciÃ³n de dos factores generado por la aplicaciÃ³n en tu dispositivo, o usÃ¡ uno de tus cÃ³digos de recuperaciÃ³n:'
+        webauthn: Si es una llave USB, asegurate de insertarla y, de ser necesario, tocarla.
       tag:
         name: SÃ³lo podÃ©s cambiar la capitalizaciÃ³n de las letras, por ejemplo, para que sea mÃ¡s legible
       user:
@@ -89,16 +98,17 @@ es-AR:
         text: Advertencia personalizada
         type: AcciÃ³n
         types:
-          disable: Deshabilitar inicio de sesiÃ³n
-          none: No hacer nada
-          silence: Silenciar
-          suspend: Suspender y eliminar de forma irreversible los datos de la cuenta
-        warning_preset_id: Usar un texto predeterminado
+          disable: Congelar
+          none: Enviar una advertencia
+          sensitive: Sensible
+          silence: Limitar
+          suspend: Suspender
+        warning_preset_id: Usar una advertencia preestablecida
       announcement:
         all_day: Evento de todo el dÃa
         ends_at: Fin del evento
         scheduled_at: Programar publicaciÃ³n
-        starts_at: Comienzo del evento
+        starts_at: Inicio del evento
         text: Anuncio
       defaults:
         autofollow: Invitar para seguir tu cuenta
@@ -116,6 +126,7 @@ es-AR:
         expires_in: Vence despuÃ©s de
         fields: Metadatos de perfil
         header: Cabecera
+        honeypot: "%{label} (no rellenar)"
         inbox_url: DirecciÃ³n web de la bandeja de entrada del relÃ©
         irreversible: Dejar en lugar de ocultar
         locale: Idioma de la interface
@@ -135,6 +146,7 @@ es-AR:
         setting_default_privacy: Privacidad de toots
         setting_default_sensitive: Siempre marcar medios como sensibles
         setting_delete_modal: Mostrar diÃ¡logo de confirmaciÃ³n antes de eliminar un toot
+        setting_disable_swiping: Deshabilitar movimientos de deslizamiento
         setting_display_media: VisualizaciÃ³n de medios
         setting_display_media_default: Predeterminada
         setting_display_media_hide_all: Ocultar todo
@@ -147,7 +159,7 @@ es-AR:
         setting_system_font_ui: Utilizar la tipografÃa predeterminada del sistema
         setting_theme: Tema del sitio
         setting_trends: Mostrar las tendencias de hoy
-        setting_unfollow_modal: Mostrar diÃ¡logo de confirmaciÃ³n antes de dejar de seguir a alguien
+        setting_unfollow_modal: Mostrar diÃ¡logo de confirmaciÃ³n antes de dejar de seguir a una cuenta
         setting_use_blurhash: Mostrar gradientes coloridos para medios ocultos
         setting_use_pending_items: Modo lento
         severity: Severidad
@@ -168,16 +180,23 @@ es-AR:
         comment: Comentar
       invite_request:
         text: "Â¿Por quÃ© querÃ©s unirte?"
+      ip_block:
+        comment: Comentario
+        ip: DirecciÃ³n IP
+        severities:
+          no_access: Bloquear acceso
+          sign_up_requires_approval: Limitar registros
+        severity: Regla
       notification_emails:
         digest: Enviar correos electrÃ³nicos compilatorios
-        favourite: Enviar correo electrÃ³nico cuando una cuenta marca como favorito tu estado
-        follow: Enviar correo electrÃ³nico cuando una cuenta te siga
-        follow_request: Enviar correo electrÃ³nico cuando una cuenta solicita seguirte
-        mention: Enviar correo electrÃ³nico cuando una cuenta te mencione
-        pending_account: Enviar correo electrÃ³nico cuando una nueva cuenta necesita revisiÃ³n
-        reblog: Enviar correo electrÃ³nico cuando una cuenta retootee tu estado
-        report: Enviar correo electrÃ³nico cuando se envÃe un nuevo informe
-        trending_tag: Enviar correo electrÃ³nico cuando una etiqueta no revisada estÃ© en tendencia
+        favourite: Una cuenta marca tu toot como favorito
+        follow: Una cuenta te sigue
+        follow_request: Una cuenta solicita seguirte
+        mention: Una cuenta te menciona
+        pending_account: Una nueva cuenta necesita revisiÃ³n
+        reblog: Una cuenta retootea tu toot
+        report: Se envÃa una nueva denuncia
+        trending_tag: Una etiqueta no revisada estÃ¡ en tendencia
       tag:
         listable: Permitir que esta etiqueta aparezca en las bÃºsquedas y en el directorio de perfiles
         name: Etiqueta
@@ -188,4 +207,7 @@ es-AR:
     required:
       mark: "*"
       text: obligatorio
+    title:
+      sessions:
+        webauthn: UsÃ¡ una de tus llaves de seguridad para iniciar sesiÃ³n
     'yes': SÃ
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index bc29918f1ede66ff7256209362dbd584196be8f7..5da47d54a8817bff861c4f12efc988cff980e04a 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -65,8 +65,17 @@ es:
         data: Archivo CSV exportado desde otra instancia de Mastodon
       invite_request:
         text: Esto nos ayudarÃ¡ a revisar su aplicaciÃ³n
+      ip_block:
+        comment: Opcional. Recuerda por quÃ© has aÃ±adido esta regla.
+        expires_in: Las direcciones IP son un recurso finito, a veces se comparten y a menudo cambian de manos. Por esta razÃ³n, no se recomiendan bloqueos de IP indefinida.
+        ip: Introduzca una direcciÃ³n IPv4 o IPv6. Puede bloquear rangos completos usando la sintaxis CIDR. Â¡Tenga cuidado de no quedarse fuera!
+        severities:
+          no_access: Bloquear acceso a todos los recursos
+          sign_up_requires_approval: Nuevos registros requerirÃ¡n su aprobaciÃ³n
+        severity: Elegir lo que pasarÃ¡ con las peticiones desde esta IP
       sessions:
         otp: 'Introduce el cÃ³digo de autenticaciÃ³n de dos factores generado por tu aplicaciÃ³n de telÃ©fono o usa uno de tus cÃ³digos de recuperaciÃ³n:'
+        webauthn: Si es una tecla USB, asegÃºrese de insertarla y, si es necesario, pÃºlsela.
       tag:
         name: SÃ³lo se puede cambiar el cajÃ³n de las letras, por ejemplo, para que sea mÃ¡s legible
       user:
@@ -91,6 +100,7 @@ es:
         types:
           disable: Deshabilitar
           none: No hacer nada
+          sensitive: Sensible
           silence: Silenciar
           suspend: Suspender y eliminar de forma irreversible la informaciÃ³n de la cuenta
         warning_preset_id: Usar un aviso predeterminado
@@ -116,6 +126,7 @@ es:
         expires_in: Expirar tras
         fields: Metadatos de perfil
         header: Img. cabecera
+        honeypot: "%{label} (no rellenar)"
         inbox_url: URL de la entrada de relÃ©s
         irreversible: Dejar en lugar de ocultar
         locale: Idioma
@@ -135,6 +146,7 @@ es:
         setting_default_privacy: Privacidad de publicaciones
         setting_default_sensitive: Marcar siempre imÃ¡genes como sensibles
         setting_delete_modal: Mostrar diÃ¡logo de confirmaciÃ³n antes de borrar un toot
+        setting_disable_swiping: Deshabilitar movimientos de deslizamiento
         setting_display_media: VisualizaciÃ³n multimedia
         setting_display_media_default: Por defecto
         setting_display_media_hide_all: Ocultar todo
@@ -168,6 +180,13 @@ es:
         comment: Comentar
       invite_request:
         text: "Â¿Por quÃ© quiere unirse usted?"
+      ip_block:
+        comment: Comentario
+        ip: IP
+        severities:
+          no_access: Bloquear acceso
+          sign_up_requires_approval: Limitar registros
+        severity: Regla
       notification_emails:
         digest: Enviar resumen de correos electrÃ³nicos
         favourite: Enviar correo electrÃ³nico cuando alguien de a favorito en su publicaciÃ³n
@@ -188,4 +207,7 @@ es:
     required:
       mark: "*"
       text: necesario
+    title:
+      sessions:
+        webauthn: Utilice una de sus claves de seguridad para iniciar sesiÃ³n
     'yes': SÃ
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index 83f2d206f68e69a96267bfb20641f9f2ed8ba48c..5960c261051c85499297f3b557449a38553c661f 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -65,8 +65,17 @@ fa:
         data: Ù¾Ø±ÙˆÙ†Ø¯Ù‡Ù” CSV Ø¨Ø±ÙˆÙ†â€ŒØ±ÛŒØ®ØªÙ‡ Ø§Ø² Ø¯ÛŒÚ¯Ø± Ú©Ø§Ø±Ø³Ø§Ø² Ù…Ø§Ø³ØªÙˆØ¯ÙˆÙ†
       invite_request:
         text: Ø§ÛŒÙ† Ø¨Ø±Ø§ÛŒ Ø¨Ø±Ø±Ø³ÛŒ Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø´Ù…Ø§ Ø¨Ù‡ Ù…Ø§ Ú©Ù…Ú© Ø®ÙˆØ§Ù‡Ø¯ Ú©Ø±Ø¯
+      ip_block:
+        comment: Ø§Ø®ØªÛŒØ§Ø±ÛŒ. ÛŒØ§Ø¯ØªØ§Ù† Ø¨Ù…Ø§Ù†Ø¯ Ú†Ø±Ø§ Ø§ÛŒÙ† Ù‚Ø§Ø¹Ø¯Ù‡ Ø±Ø§ Ø§ÙØ²ÙˆØ¯ÛŒØ¯.
+        expires_in: Ù†Ø´Ø§Ù†ÛŒâ€ŒÙ‡Ø§ÛŒ Ø¢ÛŒâ€ŒÙ¾ÛŒØŒ Ù…Ù†Ø¨Ø¹ÛŒ Ù…ØØ¯ÙˆØ¯Ù†Ø¯. Ú¯Ø§Ù‡ÛŒ Ù‡Ù…â€ŒØ±Ø³Ø§Ù†ÛŒ Ø´Ø¯Ù‡ Ùˆ Ø§ØºÙ„Ø¨ Ø¯Ø³Øªâ€ŒØ¨Ù‡â€ŒØ¯Ø³Øª Ù…ÛŒâ€ŒØ´ÙˆÙ†Ø¯. Ø¨Ù‡ Ø§ÛŒÙ† Ø¯Ù„ÛŒÙ„ØŒ Ù…Ø³Ø¯ÙˆØ¯ÛŒØªâ€ŒÙ‡Ø§ÛŒ Ù…Ø¨ØªÙ†ÛŒ Ø¨Ø± Ø¢ÛŒâ€ŒÙ¾ÛŒ Ù¾ÛŒØ´Ù†Ù‡Ø§Ø¯ Ù†Ù…ÛŒâ€ŒØ´ÙˆÙ†Ø¯.
+        ip: ÛŒÚ© Ø¢ÛŒâ€ŒÙ¾ÛŒ Ù†Ú©Ø§Ø±Ø´ Û´ ÛŒØ§ Û¶ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯. Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ ØªÙ…Ø§Ù…ÛŒ Ø¯Ø§Ù…Ù†Ù‡â€ŒØ§ÛŒ Ø±Ø§ Ø¨Ø§ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ø³Ø§Ø®ØªØ§Ø± CIDR Ù…Ø³Ø¯ÙˆØ¯ Ú©Ù†ÛŒØ¯. Ù…Ø±Ø§Ù‚Ø¨ Ø¨Ø§Ø´ÛŒØ¯ Ø®ÙˆØ¯ØªØ§Ù† Ø±Ø§ Ø¨ÛŒØ±ÙˆÙ† Ù†ÛŒÙ†Ø¯Ø§Ø²ÛŒØ¯!
+        severities:
+          no_access: Ø§Ù†Ø³Ø¯Ø§Ø¯ Ø¯Ø³ØªØ±Ø³ÛŒ Ø¨Ù‡ ØªÙ…Ø§Ù…ÛŒ Ù…Ù†Ø§Ø¨Ø¹
+          sign_up_requires_approval: Ø«Ø¨Øªâ€ŒÙ†Ø§Ù…â€ŒÙ‡Ø§ÛŒ Ø¬Ø¯ÛŒØ¯ØŒ Ù†ÛŒØ§Ø²Ù…Ù†Ø¯ ØªØ£ÛŒÛŒØ¯ØªØ§Ù† Ø®ÙˆØ§Ù‡Ù†Ø¯ Ø¨ÙˆØ¯
+        severity: Ø¨Ú¯Ø²Ù†ÛŒØ¯ Ø¨Ø§ Ø¯Ø±Ø®ÙˆØ§Ø³Øªâ€ŒÙ‡Ø§ Ø§Ø² Ø§ÛŒÙ† Ø¢ÛŒâ€ŒÙ¾ÛŒ Ú†Ù‡ Ø´ÙˆØ¯
       sessions:
         otp: 'Ú©Ø¯ ØªØ£ÛŒÛŒØ¯ Ø¯ÙˆÙ…Ø±ØÙ„Ù‡â€ŒØ§ÛŒ Ú©Ù‡ Ø§Ù¾ Ø±ÙˆÛŒ ØªÙ„ÙÙ† Ø´Ù…Ø§ Ø³Ø§Ø®ØªÙ‡ Ø±Ø§ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯ ÛŒØ§ ÛŒÚ©ÛŒ Ø§Ø² Ú©Ø¯Ù‡Ø§ÛŒ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ø±Ø§ Ø¨Ù‡ Ú©Ø§Ø± Ø¨Ø¨Ø±ÛŒØ¯:'
+        webauthn: Ø§Ú¯Ø± Ú©Ù„ÛŒØ¯ USB Ø¨Ø§Ø´Ø¯ ØŒ Ø§Ø² Ø§ØªØµØ§Úµ Ø¢Ù† Ù…Ø·Ù…Ø¦Ù† Ø´ÙˆÛŒØ¯ ÙˆØŒ Ø§Ú¯Ø± Ù„Ø§Ø²Ù… Ø¨Ø§Ø´Ø¯ØŒ Ø¨Ù‡ Ø¢Ù† Ø¶Ø±Ø¨Ù‡â€ŒØ§ÛŒÛŒ Ø¨Ø²Ù†ÛŒØ¯.
       tag:
         name: Ø´Ù…Ø§ ØªÙ†Ù‡Ø§ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ø¨Ø²Ø±Ú¯ÛŒ Ùˆ Ú©ÙˆÚ†Ú©ÛŒ ØØ±ÙˆÙ Ø±Ø§ ØªØºÛŒÛŒØ± Ø¯Ù‡ÛŒØ¯ ØªØ§ Ù…Ø«Ù„Ø§Ù‹ Ø¢Ù† Ø±Ø§ Ø®ÙˆØ§Ù†Ø§ØªØ± Ú©Ù†ÛŒØ¯
       user:
@@ -91,6 +100,7 @@ fa:
         types:
           disable: ØºÛŒØ±ÙØ¹Ø§Ù„â€ŒÚ©Ø±Ø¯Ù†
           none: Ú©Ø§Ø±ÛŒ Ù†Ú©Ù†
+          sensitive: ØØ³Ø§Ø³
           silence: Ø¨ÛŒâ€ŒØµØ¯Ø§ Ú©Ø±Ø¯Ù†
           suspend: ØªØ¹Ù„ÛŒÙ‚ Ùˆ Ù¾Ø§Ú©â€ŒÚ©Ø±Ø¯Ù† Ú©Ø§Ù…Ù„ Ù‡Ù…Ù‡Ù” Ø§Ø·Ù„Ø§Ø¹Ø§Øª ØØ³Ø§Ø¨
         warning_preset_id: ÛŒÚ© Ù‡Ø´Ø¯Ø§Ø± Ø§Ø² Ù¾ÛŒØ´â€ŒØ¢Ù…Ø§Ø¯Ù‡ Ø±Ø§ Ø¨Ù‡ Ú©Ø§Ø± Ø¨Ø¨Ø±ÛŒØ¯
@@ -116,6 +126,7 @@ fa:
         expires_in: ØªØ§Ø±ÛŒØ® Ø§Ù†Ù‚Ø¶Ø§
         fields: Ø§Ø·Ù„Ø§Ø¹Ø§Øª ØªÚ©Ù…ÛŒÙ„ÛŒ Ù†Ù…Ø§ÛŒÙ‡
         header: ØªØµÙˆÛŒØ± Ø²Ù…ÛŒÙ†Ù‡
+        honeypot: "%{label} (Ù¾Ø± Ù†Ú©Ù†ÛŒØ¯)"
         inbox_url: Ù†Ø´Ø§Ù†ÛŒ ØµÙ†Ø¯ÙˆÙ‚ ÙˆØ±ÙˆØ¯ÛŒ Ø±Ù„Ù‡
         irreversible: Ø¨Ù‡ Ø¬Ø§ÛŒ Ù¾Ù†Ù‡Ø§Ù†â€ŒØ³Ø§Ø²ÛŒØŒ ØØ°Ù Ú©Ù†
         locale: Ø²Ø¨Ø§Ù† Ù…ØÛŒØ· Ú©Ø§Ø±Ø¨Ø±ÛŒ
@@ -135,6 +146,7 @@ fa:
         setting_default_privacy: ØØ±ÛŒÙ… Ø®ØµÙˆØµÛŒ Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§
         setting_default_sensitive: Ù‡Ù…ÛŒØ´Ù‡ ØªØµØ§ÙˆÛŒØ± Ø±Ø§ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ØØ³Ø§Ø³ Ø¹Ù„Ø§Ù…Øª Ø¨Ø²Ù†
         setting_delete_modal: Ù†Ù…Ø§ÛŒØ´ Ù¾ÛŒØºØ§Ù… ØªØ£ÛŒÛŒØ¯ Ù¾ÛŒØ´ Ø§Ø² Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† ÛŒÚ© Ù†ÙˆØ´ØªÙ‡
+        setting_disable_swiping: Ø§Ø² Ú©Ø§Ø± Ø§Ù†Ø¯Ø§Ø®ØªÙ† ØØ±Ú©Øªâ€ŒÙ‡Ø§ÛŒ Ú©Ø´ÛŒØ¯Ù†ÛŒ
         setting_display_media: Ù†Ù…Ø§ÛŒØ´ Ø¹Ú©Ø³ Ùˆ ÙˆÛŒØ¯ÛŒÙˆ
         setting_display_media_default: Ù¾ÛŒØ´â€ŒÙØ±Ø¶
         setting_display_media_hide_all: Ù†Ù‡ÙØªÙ† Ù‡Ù…Ù‡
@@ -168,6 +180,13 @@ fa:
         comment: ØªÙˆØ¶ÛŒØ
       invite_request:
         text: Ú†Ø±Ø§ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø¹Ø¶Ùˆ Ø´ÙˆÛŒØ¯ØŸ
+      ip_block:
+        comment: ØªÙˆØ¶ÛŒØ
+        ip: IP
+        severities:
+          no_access: Ø¨Ù† Ú©Ø±Ø¯Ù† Ø¯Ø³ØªØ±Ø³ÛŒ
+          sign_up_requires_approval: Ù…ØØ¯ÙˆØ¯ Ú©Ø±Ø¯Ù† Ø«Ø¨Øª Ù†Ø§Ù…â€ŒÙ‡Ø§
+        severity: Ù‚Ø§Ù†ÙˆÙ†
       notification_emails:
         digest: Ø®Ù„Ø§ØµÙ‡â€ŒÚ©Ø±Ø¯Ù† Ú†Ù†Ø¯ Ø§Ø¹Ù„Ø§Ù† Ø¯Ø± ÛŒÚ© Ø§ÛŒÙ…ÛŒÙ„
         favourite: ÙˆÙ‚ØªÛŒ Ú©Ø³ÛŒ Ù†ÙˆØ´ØªÙ‡Ù” Ø´Ù…Ø§ Ø±Ø§ Ù¾Ø³Ù†Ø¯ÛŒØ¯ Ø§ÛŒÙ…ÛŒÙ„ Ø¨ÙØ±Ø³Øª
@@ -188,4 +207,7 @@ fa:
     required:
       mark: "*"
       text: Ø¶Ø±ÙˆØ±ÛŒ
+    title:
+      sessions:
+        webauthn: Ø¨Ø±Ø§ÛŒ ÙˆØ±ÙˆØ¯ Ø§Ø² ÛŒÚ©ÛŒ Ø§Ø² Ú©Ù„ÛŒØ¯Ù‡Ø§ÛŒ Ø§Ù…Ù†ÛŒØªÛŒØªØ§Ù† Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ù†ÛŒØ¯
     'yes': Ø¨Ù„Ù‡
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 5bfcae5922473529fd9b69532fe3a032e17ad0df..1b4acc9b9b083e933a033f7a57b1b85db6e3d2e7 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -2,8 +2,18 @@
 fi:
   simple_form:
     hints:
+      account_alias:
+        acct: MÃ¤Ã¤rittele kÃ¤yttÃ¤jÃ¤n kÃ¤yttÃ¤jÃ¤nimi@verkkotunnus mistÃ¤ haluat siirtyÃ¤
+      account_migration:
+        acct: MÃ¤Ã¤rittele kÃ¤yttÃ¤jÃ¤n kÃ¤yttÃ¤jÃ¤nimi@verkkotunnus mihin haluat siirtyÃ¤
+      account_warning_preset:
+        title: Vapaaehtoinen. Ei nÃ¤ytetÃ¤ vastaanottajalle
       admin_account_action:
+        include_statuses: KÃ¤yttÃ¤jÃ¤ nÃ¤kee mitkÃ¤ tuuttaukset johtivat toimenpiteeseen tai varoitukseen
         send_email_notification: KÃ¤yttÃ¤jÃ¤ saa selityksen mitÃ¤ tapahtui hÃ¤nen tililleen
+        type_html: Valitse mitÃ¤ teet kÃ¤yttÃ¤jÃ¤lle <strong>%{acct}</strong>
+      announcement:
+        scheduled_at: JÃ¤tÃ¤ tyhjÃ¤ksi julkaistaksesi ilmoituksen vÃ¤littÃ¶mÃ¤sti
       defaults:
         avatar: PNG, GIF tai JPG. EnintÃ¤Ã¤n %{size}. Skaalataan kokoon %{dimensions} px
         bot: TÃ¤mÃ¤ tili suorittaa enimmÃ¤kseen automaattisia toimintoja eikÃ¤ sitÃ¤ ehkÃ¤ valvota
@@ -26,12 +36,29 @@ fi:
     labels:
       account:
         fields:
+          name: Nimike
           value: SisÃ¤ltÃ¶
+      account_warning_preset:
+        title: Otsikko
+      admin_account_action:
+        text: Mukautettu varoitus
+        type: Toimenpide
+        types:
+          disable: Poista kirjautuminen kÃ¤ytÃ¶stÃ¤
+          none: Ã„lÃ¤ tee mitÃ¤Ã¤n
+          silence: HiljennÃ¤
+          suspend: Poista kÃ¤ytÃ¶stÃ¤ ja tuhoa kÃ¤yttÃ¤jÃ¤tunnuksen tiedot peruuttamattomasti
+      announcement:
+        all_day: Koko pÃ¤ivÃ¤n kestÃ¤vÃ¤ tapahtuma
+        text: Ilmoitus
       defaults:
+        autofollow: Kutsu seuraamaan tiliÃ¤si
         avatar: Profiilikuva
         bot: TÃ¤mÃ¤ on botti
+        chosen_languages: Suodata kieliÃ¤
         confirm_new_password: Vahvista uusi salasana
         confirm_password: Vahvista salasana
+        context: Suodata konteksteista
         current_password: Nykyinen salasana
         data: Tiedot
         discoverable: Listaa tÃ¤mÃ¤ tili hakemistoon
@@ -47,32 +74,62 @@ fi:
         note: Kuvaus
         otp_attempt: Kaksivaiheisen tunnistuksen koodi
         password: Salasana
+        phrase: Avainsana tai lause
+        setting_advanced_layout: Ota kÃ¤yttÃ¶Ã¶n edistynyt web kÃ¤yttÃ¶liittymÃ¤
+        setting_aggregate_reblogs: RyhmitÃ¤ boostaukset aikajanalla
         setting_auto_play_gif: Toista GIF-animaatiot automaattisesti
         setting_boost_modal: Kysy vahvistusta ennen buustausta
+        setting_crop_images: Rajaa kuvat avaamattomissa tuuttauksissa 16:9 kuvasuhteeseen
+        setting_default_language: Julkaisujen kieli
         setting_default_privacy: Julkaisun nÃ¤kyvyys
         setting_default_sensitive: Merkitse media aina arkaluontoiseksi
         setting_delete_modal: Kysy vahvistusta ennen tuuttauksen poistamista
+        setting_display_media: Median nÃ¤yttÃ¤minen
+        setting_display_media_default: Oletus
+        setting_display_media_hide_all: Piilota kaikki
+        setting_display_media_show_all: NÃ¤ytÃ¤ kaikki
+        setting_hide_network: Piilota verkkosi
         setting_noindex: JÃ¤ttÃ¤ydy pois hakukoneindeksoinnista
         setting_reduce_motion: VÃ¤hennÃ¤ animaatioiden liikettÃ¤
+        setting_show_application: NÃ¤ytÃ¤ sovellus mistÃ¤ lÃ¤hetÃ¤t tuuttauksia
         setting_system_font_ui: KÃ¤ytÃ¤ jÃ¤rjestelmÃ¤n oletusfonttia
         setting_theme: Sivuston teema
+        setting_trends: NÃ¤ytÃ¤ pÃ¤ivÃ¤n trendit
         setting_unfollow_modal: Kysy vahvistusta, ennen kuin lopetat seuraamisen
+        setting_use_pending_items: Hidastila
         severity: Vakavuus
+        sign_in_token_attempt: Turvakoodi
         type: Tietojen laji
         username: KÃ¤yttÃ¤jÃ¤nimi
         username_or_email: KÃ¤yttÃ¤jÃ¤nimi tai sÃ¤hkÃ¶posti
+        whole_word: Koko sana
+      email_domain_block:
+        with_dns_records: SisÃ¤llytÃ¤ toimialueen MX tietueet ja IP-osoite
+      featured_tag:
+        name: Aihetunniste
       interactions:
         must_be_follower: EstÃ¤ ilmoitukset kÃ¤yttÃ¤jiltÃ¤, jotka eivÃ¤t seuraa sinua
         must_be_following: EstÃ¤ ilmoitukset kÃ¤yttÃ¤jiltÃ¤, joita et seuraa
         must_be_following_dm: EstÃ¤ suorat viestit kÃ¤yttÃ¤jiltÃ¤, joita et seuraa
+      invite:
+        comment: Kommentoi
+      invite_request:
+        text: Miksi haluat liittyÃ¤?
       notification_emails:
         digest: LÃ¤hetÃ¤ koosteviestejÃ¤ sÃ¤hkÃ¶postitse
         favourite: LÃ¤hetÃ¤ sÃ¤hkÃ¶posti, kun joku tykkÃ¤Ã¤ tilastasi
         follow: LÃ¤hetÃ¤ sÃ¤hkÃ¶posti, kun joku seuraa sinua
         follow_request: LÃ¤hetÃ¤ sÃ¤hkÃ¶posti, kun joku pyytÃ¤Ã¤ seurata sinua
         mention: LÃ¤hetÃ¤ sÃ¤hkÃ¶posti, kun sinut mainitaan
+        pending_account: Uusi tili tarvitsee tarkastusta
         reblog: LÃ¤hetÃ¤ sÃ¤hkÃ¶posti, kun joku buustaa julkaisusi
+      tag:
+        name: Aihetunniste
+        trendable: Salli tÃ¤mÃ¤n aihetunnisteen nÃ¤kyÃ¤ trendeissÃ¤
+        usable: Salli tuuttauksien kÃ¤yttÃ¤Ã¤ tÃ¤tÃ¤ aihetunnistetta
     'no': Ei
+    recommended: Suositeltu
     required:
+      mark: "*"
       text: pakollinen tieto
     'yes': KyllÃ¤
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 01e3f8cceba3a051fee07aeb29b3937b23f1446f..e173dc0dc2f7c7657535c0ed1c7bd255b8229eda 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -29,14 +29,14 @@ fr:
         current_password: Pour des raisons de sÃ©curitÃ©, veuillez saisir le mot de passe du compte courant
         current_username: Pour confirmer, veuillez saisir le nom d'utilisateur du compte courant
         digest: Uniquement envoyÃ© aprÃ¨s une longue pÃ©riode dâ€™inactivitÃ© et uniquement si vous avez reÃ§u des messages personnels pendant votre absence
-        discoverable: Lâ€™annuaire des profils est une autre faÃ§on pour votre compte dâ€™atteindre une plus grand audience
+        discoverable: Lâ€™annuaire des profils est une autre faÃ§on pour votre compte dâ€™atteindre une plus grande audience
         email: Vous recevrez un courriel de confirmation
         fields: Vous pouvez avoir jusquâ€™Ã  4 Ã©lÃ©ments affichÃ©s en tant que tableau sur votre profil
         header: Au format PNG, GIF ou JPG. %{size} maximum. Sera rÃ©duit Ã  %{dimensions}px
         inbox_url: Copiez lâ€™URL depuis la page dâ€™accueil du relais que vous souhaitez utiliser
         irreversible: Les pouets filtrÃ©s disparaÃ®tront irrÃ©mÃ©diablement, mÃªme si le filtre est supprimÃ© plus tard
         locale: La langue de lâ€™interface, des courriels et des notifications
-        locked: Vous devrez approuver chaque abonnÃ©Â·e et vos statuts ne sâ€™afficheront quâ€™Ã  vos abonnÃ©Â·eÂ·s
+        locked: NÃ©cessite que vous approuviez manuellement chaque abonnÃ©Â·e
         password: Utilisez au moins 8 caractÃ¨res
         phrase: Sera filtrÃ© sans que la casse ou lâ€™avertissement sur le contenu du pouet soit pris en compte
         scopes: Ã€ quelles APIs lâ€™application sera autorisÃ©e Ã  accÃ©der. Si vous sÃ©lectionnez une permission gÃ©nÃ©rale, vous nâ€™avez pas besoin de sÃ©lectionner les permissions plus prÃ©cises.
@@ -65,8 +65,17 @@ fr:
         data: Un fichier CSV gÃ©nÃ©rÃ© par un autre serveur de Mastodon
       invite_request:
         text: Cela nous aidera Ã  considÃ©rer votre demande
+      ip_block:
+        comment: Optionnel. Pour ne pas oublier pourquoi vous avez ajoutÃ© cette rÃ¨gle.
+        expires_in: Les adresses IP sont une ressource finie, elles sont parfois partagÃ©es et changent souvent de mains. Pour cette raison, les blocages dâ€™IP indÃ©finiment ne sont pas recommandÃ©s.
+        ip: Entrez une adresse IPv4 ou IPv6. Vous pouvez bloquer des plages entiÃ¨res en utilisant la syntaxe CIDR. Faites attention Ã  ne pas vous bloquer vous-mÃªme !
+        severities:
+          no_access: Bloquer lâ€™accÃ¨s Ã  toutes les ressources
+          sign_up_requires_approval: Les nouvelles inscriptions nÃ©cessiteront votre approbation
+        severity: Choisir ce qui se passera avec les requÃªtes de cette adresse IP
       sessions:
         otp: 'Entrez le code dâ€™authentification Ã  deux facteurs gÃ©nÃ©rÃ© par lâ€™application de votre tÃ©lÃ©phone ou utilisez un de vos codes de rÃ©cupÃ©rationâ€¯:'
+        webauthn: Si c'est une clÃ© USB, assurez-vous de l'insÃ©rer et, si nÃ©cessaire, de la tapoter.
       tag:
         name: Vous ne pouvez modifier que la casse des lettres, par exemple, pour le rendre plus lisible
       user:
@@ -91,6 +100,7 @@ fr:
         types:
           disable: DÃ©sactiver
           none: Ne rien faire
+          sensitive: Sensible
           silence: Masquer
           suspend: Suspendre et supprimer les donnÃ©es du compte de maniÃ¨re irrÃ©versible
         warning_preset_id: Utiliser un modÃ¨le dâ€™avertissement
@@ -116,6 +126,7 @@ fr:
         expires_in: Expire aprÃ¨s
         fields: MÃ©tadonnÃ©es du profil
         header: Image dâ€™en-tÃªte
+        honeypot: "%{label} (ne pas remplir)"
         inbox_url: URL de la boÃ®te de relais
         irreversible: Supprimer plutÃ´t que masquer
         locale: Langue de lâ€™interface
@@ -135,6 +146,7 @@ fr:
         setting_default_privacy: ConfidentialitÃ© des statuts
         setting_default_sensitive: Toujours marquer les mÃ©dias comme sensibles
         setting_delete_modal: Afficher une fenÃªtre de confirmation avant de supprimer un pouet
+        setting_disable_swiping: DÃ©sactiver les actions par glissement
         setting_display_media: Affichage des mÃ©dias
         setting_display_media_default: DÃ©faut
         setting_display_media_hide_all: Masquer tout
@@ -161,22 +173,29 @@ fr:
       featured_tag:
         name: Hashtag
       interactions:
-        must_be_follower: Masquer les notifications des personnes qui ne vous suivent pas
-        must_be_following: Masquer les notifications des personnes que vous ne suivez pas
+        must_be_follower: Bloquer les notifications des personnes qui ne vous suivent pas
+        must_be_following: Bloquer les notifications des personnes que vous ne suivez pas
         must_be_following_dm: Bloquer les messages directs des personnes que vous ne suivez pas
       invite:
         comment: Commentaire
       invite_request:
         text: Pourquoi voulez-vous vous inscrire ?
+      ip_block:
+        comment: Commentaire
+        ip: IP
+        severities:
+          no_access: Bloquer lâ€™accÃ¨s
+          sign_up_requires_approval: Limite des inscriptions
+        severity: RÃ¨gle
       notification_emails:
         digest: Envoyer des courriels rÃ©capitulatifs
-        favourite: Envoyer un courriel lorsque quelquâ€™un ajoute mes statuts Ã  ses favoris
-        follow: Envoyer un courriel lorsque quelquâ€™un me suit
-        follow_request: Envoyer un courriel lorsque quelquâ€™un demande Ã  me suivre
-        mention: Envoyer un courriel lorsque quelquâ€™un me mentionne
+        favourite: Quelquâ€™un ajoute mon pouet Ã  ses favoris
+        follow: Quelquâ€™un vient de me suivre
+        follow_request: Quelquâ€™un demande Ã  me suivre
+        mention: Quelquâ€™un me mentionne
         pending_account: Nouveau compte en attente dâ€™approbation
-        reblog: Quelquâ€™un a partagÃ© votre pouet
-        report: Envoyer un courriel lorsquâ€™un nouveau rapport est soumis
+        reblog: Quelquâ€™un partage mon pouet
+        report: Un nouveau rapport est envoyÃ©
         trending_tag: Un hashtag non approuvÃ© est dans les tendances
       tag:
         listable: Autoriser ce hashtag Ã  apparaÃ®tre dans les recherches et dans lâ€™annuaire des profils
@@ -187,5 +206,8 @@ fr:
     recommended: RecommandÃ©
     required:
       mark: "*"
-      text: Champs requis
+      text: champs requis
+    title:
+      sessions:
+        webauthn: Utilisez l'une de vos clÃ©s de sÃ©curitÃ© pour vous connecter
     'yes': Oui
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index f2e859acba32fff33514317bb34f50801f646739..799312e33837855094b62e42fac76a00df93cebf 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -56,7 +56,7 @@ gl:
         domain: Este dominio estarÃ¡ en disposiciÃ³n de obter datos desde este servidor e datos de entrada a el poderÃ¡n ser procesados e gardados
       email_domain_block:
         domain: Esto pode ser o nome de dominio que aparece no enderezo do correo, o rexistro MX que resolve o dominio, ou o IP do servidor que resolve o rexistro MX. Estos confrontaranse contra o rexistro da usuaria e o rexistro serÃ¡ rexeitado.
-        with_dns_records: Vaise facer un intento de resolver os rexistros DNS propocionados e os resultados tamÃ©n irÃ¡n a lista negra
+        with_dns_records: Vaise facer un intento de resolver os rexistros DNS proporcionados e os resultados tamÃ©n irÃ¡n a lista de bloqueo
       featured_tag:
         name: 'PoderÃas usar algunha destas:'
       form_challenge:
@@ -65,8 +65,17 @@ gl:
         data: Ficheiro CSV exportado desde outro servidor Mastodon
       invite_request:
         text: Esto axudaranos a revisar a tua aplicaciÃ³n
+      ip_block:
+        comment: Opcional. Lembrar a razÃ³n para engadir esta regra.
+        expires_in: Os enderezos IP son un recurso finito, a veces son compartidos e cambian de mans con frecuencia. Por esta razÃ³n, non se recomendan os bloqueos indefinidos de IPs.
+        ip: Escribe un enderezo IPv4 ou IPv6. Podes bloquear rangos completos usando a sintaxe CIDR. Ten coidado e non te bloquees a ti mesma!
+        severities:
+          no_access: Bloquear acceso a tÃ³dolos recursos
+          sign_up_requires_approval: Os novos rexistros requerirÃ¡n a tÃºa aprobaciÃ³n
+        severity: Escolle que acontecerÃ¡ coas peticiÃ³ns desde este IP
       sessions:
         otp: 'Introduce o cÃ³digo do segundo factor creado pola aplicaciÃ³n do teu mÃ³bil ou usa un dos cÃ³digos de recuperaciÃ³n:'
+        webauthn: Se Ã© unha chave USB asegÃºrate de que estÃ¡ conectada e preme o botÃ³n.
       tag:
         name: SÃ³ podes cambiar maiÃºs/minÃºsculas, por exemplo, mellorar a lexibilidade
       user:
@@ -89,10 +98,11 @@ gl:
         text: Aviso personalizado
         type: AcciÃ³n
         types:
-          disable: Desactivar conexiÃ³n
-          none: Non facer nada
-          silence: Acalar
-          suspend: Suspender e eliminar irreversiblemente datos da conta
+          disable: Desactivar
+          none: Enviar un aviso
+          sensitive: Sensible
+          silence: Limitar
+          suspend: Suspender
         warning_preset_id: Utilizar un aviso preestablecido
       announcement:
         all_day: Evento para todo o dÃa
@@ -116,6 +126,7 @@ gl:
         expires_in: Caduca tras
         fields: Metadatos do perfil
         header: Cabeceira
+        honeypot: "%{label} (non completar)"
         inbox_url: URL da caixa de entrada do repetidor
         irreversible: Soltar en lugar de agochar
         locale: Idioma da interface
@@ -135,6 +146,7 @@ gl:
         setting_default_privacy: Privacidade da publicaciÃ³n
         setting_default_sensitive: Marcar sempre multimedia como sensible
         setting_delete_modal: Solicitar confirmaciÃ³n antes de eliminar unha mensaxe
+        setting_disable_swiping: Desactivar opciÃ³ns de desprazamento
         setting_display_media: Mostrar multimedia
         setting_display_media_default: Por omisiÃ³n
         setting_display_media_hide_all: Ocultar todo
@@ -168,6 +180,13 @@ gl:
         comment: Comentar
       invite_request:
         text: Por que queres unirte?
+      ip_block:
+        comment: Comentario
+        ip: IP
+        severities:
+          no_access: Bloquear acceso
+          sign_up_requires_approval: Limitar o rexistro
+        severity: Regra
       notification_emails:
         digest: Enviar correos con resumos
         favourite: Enviar un correo cando alguÃ©n marca como favorita unha das tuas publicaciÃ³ns
@@ -188,4 +207,7 @@ gl:
     required:
       mark: "*"
       text: requerido
+    title:
+      sessions:
+        webauthn: Usa unha das tÃºas chaves de seguridade para conectar
     'yes': Si
diff --git a/config/locales/simple_form.hr.yml b/config/locales/simple_form.hr.yml
index 083343307f6a5f1d504a3cc4fc6fce0a10fc84dc..e8ef7bfbbad58edd025528aafb1c19ce04e0ccd9 100644
--- a/config/locales/simple_form.hr.yml
+++ b/config/locales/simple_form.hr.yml
@@ -3,39 +3,55 @@ hr:
   simple_form:
     hints:
       defaults:
-        avatar: PNG, GIF ili JPG. NajviÅ¡e %{size}. Bit Ä‡e smanjen na %{dimensions}px
-        header: PNG, GIF ili JPG. NajviÅ¡e %{size}. Bit Ä‡e smanjen na %{dimensions}px
-        locked: traÅ¾i te da ruÄno odobriÅ¡ sljedbenike i postavlja privatnost postova na dostupnu samo sljedbenicima
+        avatar: PNG, GIF ili JPG. NajviÅ¡e %{size}. Bit Ä‡e smanjeno na %{dimensions}px
+        header: PNG, GIF ili JPG. NajviÅ¡e %{size}. Bit Ä‡e smanjeno na %{dimensions}px
+        locked: Zahtijeva ruÄno odobravanje pratitelja
+        setting_display_media_default: Sakrij medijski sadrÅ¾aj oznaÄen kao osjetljiv
+        setting_display_media_hide_all: Uvijek sakrij medijski sadrÅ¾aj
+        setting_display_media_show_all: Uvijek prikaÅ¾i medijski sadrÅ¾aj
       imports:
-        data: CSV fajl izvezen iz druge Mastodon instance
+        data: CSV datoteka izvezena iz drugog Mastodonovog posluÅ¾itelja
     labels:
+      account_warning_preset:
+        title: Naslov
+      admin_account_action:
+        type: Radnja
       defaults:
         confirm_new_password: Potvrdi novu lozinku
         confirm_password: Potvrdi lozinku
         current_password: Trenutna lozinka
-        data: Podaci
-        display_name: Ime koje Ä‡u prikazati
-        email: E-mail adresa
-        locale: Jezik
-        locked: UÄini raÄun privatnim
+        data: Podatci
+        display_name: Prikazano ime
+        email: Adresa e-poÅ¡te
+        locale: Jezik suÄelja
+        locked: ZakljuÄaj raÄun
         new_password: Nova lozinka
-        otp_attempt: Dvo-faktorski kod
+        note: Biografija
+        otp_attempt: Dvofaktorski kÃ´d
         password: Lozinka
-        setting_auto_play_gif: Automatski pokreni animirane GIFove
-        setting_default_privacy: Privatnost posta
-        type: Tip uvoÅ¾enja
+        setting_auto_play_gif: Automatski pokreni animirane GIF-ove
+        setting_default_privacy: Privatnost objavljivanja
+        setting_display_media_default: Zadano
+        setting_display_media_hide_all: Sakrij sve
+        setting_display_media_show_all: PrikaÅ¾i sve
+        setting_system_font_ui: Koristi zadani font sustava
+        setting_theme: Tema stranice
+        type: Tip uvoza
         username: KorisniÄko ime
       interactions:
-        must_be_follower: Blokiraj notifikacije onih koji me ne slijede
-        must_be_following: Blokiraj notifikacije ljudi koje ne slijedim
+        must_be_follower: Blokiraj obavijesti korisnika koji me ne prate
+        must_be_following: Blokiraj obavijesti korisnika koje ne pratim
       notification_emails:
-        digest: Å alji mi e-mailove s notifikacijama
-        favourite: PoÅ¡alji mi e-mail kad netko lajka moj status
-        follow: PoÅ¡alji mi e-mail kad me netko poÄne slijediti
-        follow_request: PoÅ¡alji mi e-mail kad mi netko poÅ¡alje zahtjev da me Å¾eli slijediti
-        mention: PoÅ¡alji mi e-mail kad me netko spomene
-        reblog: PoÅ¡alji mi e-mail kad netko rebloga moj status
+        digest: Å alji e-poÅ¡tu sa saÅ¾etkom obavijesti
+        favourite: Netko oznaÄi VaÅ¡ status favoritom
+        follow: Netko Vas poÄinje pratiti
+        follow_request: Netko zatraÅ¾i da Vas prati
+        mention: Netko Vas spomene
+        reblog: Netko boosta VaÅ¡ status
+      tag:
+        name: Hashtag
     'no': Ne
     required:
-      text: traÅ¾eno
+      mark: "*"
+      text: obavezno
     'yes': Da
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 0b164c5b652ba0c0b0d8e660d3a303d4f807fa0d..d5e82ecb26dfdb38b817426b537e41fa39ecd7fe 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -65,8 +65,17 @@ hu:
         data: Egy mÃ¡sik Mastodon szerverrÅ‘l exportÃ¡lt CSV fÃ¡jl
       invite_request:
         text: Ez segÃt nekÃ¼nk Ã¡tnÃ©zni a jelentkezÃ©sedet
+      ip_block:
+        comment: OpcionÃ¡lis. EmlÃ©keztetÅ‘, hogy miÃ©rt is vetted fel ezt a szabÃ¡lyt.
+        expires_in: Az IP cÃmek korlÃ¡tos erÅ‘forrÃ¡sok, ezÃ©rt nÃ©ha meg vannak osztva Ã©s gyakran gazdÃ¡t is cserÃ©lnek. EzÃ©rt a korlÃ¡tlan IP tiltÃ¡sok hasznÃ¡latÃ¡t nem javasoljuk.
+        ip: Ãrj be egy IPv4 vagy IPv6 cÃmet. A CIDR formÃ¡tum hasznÃ¡latÃ¡val teljes tartomÃ¡nyokat tilthatsz ki. LÃ©gy Ã³vatos, hogy magadat vÃ©letlenÃ¼l se zÃ¡rd ki!
+        severities:
+          no_access: ElÃ©rÃ©s tiltÃ¡sa minden erÅ‘forrÃ¡shoz
+          sign_up_requires_approval: Ãšj regisztrÃ¡ciÃ³k csak a jÃ³vÃ¡hagyÃ¡soddal tÃ¶rtÃ©nhetnek majd meg
+        severity: VÃ¡laszd ki, mi tÃ¶rtÃ©njen a kÃ©rÃ©sekkel errÅ‘l az IP-rÅ‘l
       sessions:
         otp: 'Add meg a telefonodon generÃ¡lt kÃ©tlÃ©pcsÅ‘s azonosÃtÃ³ kÃ³dodat vagy hasznÃ¡ld az egyik tartalÃ©k bejelentkezÅ‘ kÃ³dot:'
+        webauthn: Ha ez egy USB kulcs, ellenÅ‘rizd, hogy csatlakoztattad Ã©s ha szÃ¼ksÃ©ges, aktivÃ¡ltad is.
       tag:
         name: Csak a kis/nagybetÅ±sÃ©get vÃ¡ltoztathatod meg, pl. hogy olvashatÃ³bb legyen
       user:
@@ -91,6 +100,7 @@ hu:
         types:
           disable: LetiltÃ¡s
           none: Ne csinÃ¡lj semmit
+          sensitive: SzenzitÃv
           silence: ElnÃ©mÃtÃ¡s
           suspend: FiÃ³k felfÃ¼ggesztÃ©se, adatok tÃ¶rlÃ©se visszaÃ¡llÃthatatlanul
         warning_preset_id: FigyelmeztetÃ©s hasznÃ¡lata
@@ -116,6 +126,7 @@ hu:
         expires_in: ElÃ©vÃ¼l
         fields: Profil metaadatok
         header: FejlÃ©c
+        honeypot: "%{label} (ne tÃ¶ltsd ki)"
         inbox_url: RelÃ© inbox-hoz tartozÃ³ URL
         irreversible: EldobÃ¡s elrejtÃ©s helyett
         locale: FelhasznÃ¡lÃ³i felÃ¼let nyelve
@@ -135,6 +146,7 @@ hu:
         setting_default_privacy: TÃ¼lkÃ¶k alapÃ©rtelmezett lÃ¡thatÃ³sÃ¡ga
         setting_default_sensitive: Minden mÃ©diafÃ¡jl megjelÃ¶lÃ©se szenzitÃvkÃ©nt
         setting_delete_modal: MegerÅ‘sÃtÃ©s kÃ©rÃ©se tÃ¼lk tÃ¶rlÃ©se elÅ‘tt
+        setting_disable_swiping: ElhÃºzÃ¡s mÅ±velet kikapcsolÃ¡sa
         setting_display_media: MÃ©dia megjelenÃtÃ©se
         setting_display_media_default: AlapÃ©rtelmezÃ©s
         setting_display_media_hide_all: Mindent elrejt
@@ -168,6 +180,13 @@ hu:
         comment: HozzÃ¡szÃ³lÃ¡s
       invite_request:
         text: MiÃ©rt akarsz csatlakozni?
+      ip_block:
+        comment: MegjegyzÃ©s
+        ip: IP
+        severities:
+          no_access: ElÃ©rÃ©s letiltÃ¡sa
+          sign_up_requires_approval: RegisztrÃ¡ciÃ³k korlÃ¡tozÃ¡sa
+        severity: SzabÃ¡ly
       notification_emails:
         digest: Ã–sszevont e-mailek kÃ¼ldÃ©se
         favourite: E-mail kÃ¼ldÃ©se, amikor valaki kedvencnek jelÃ¶li a tÃ¼lkÃ¶det
@@ -188,4 +207,7 @@ hu:
     required:
       mark: "*"
       text: kÃ¶telezÅ‘
+    title:
+      sessions:
+        webauthn: HasznÃ¡ld valamelyik biztonsÃ¡gi kulcsodat a bejelentkezÃ©shez
     'yes': Igen
diff --git a/config/locales/simple_form.hy.yml b/config/locales/simple_form.hy.yml
index cd73ee679261f594c2d644c786b61aa1789d295f..ff4bfcaab7385bc812526659315a7291f4be36cf 100644
--- a/config/locales/simple_form.hy.yml
+++ b/config/locales/simple_form.hy.yml
@@ -12,31 +12,202 @@ hy:
       admin_account_action:
         include_statuses: Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¨ Õ¿Õ¥Õ½Õ¶Õ¥Õ¬Õ¸Ö‚ Õ¡ Õ¸Ö€ Õ©Õ©Õ¥Ö€Õ¶ Õ¥Õ¶ Õ¡Õ¼Õ¡Õ»Õ¡ÖÖ€Õ¥Õ¬ Õ´Õ¸Õ¤Õ¥Ö€Õ¡ÖÕ«Õ¡ÕµÕ« Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¯Õ¡Õ´ Õ¦Õ£Õ¸Ö‚Õ·Õ¡ÖÕ¸Ö‚Õ´Ö‰
         send_email_notification: Ö…Õ£Õ¿Õ¡Õ¿Õ§Ö€Õ¨ Õ¯Õ¨ Õ½Õ¿Õ¡Õ¶Õ¡Õµ Õ¢Õ¡ÖÕ¡Õ¿Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¡ÕµÕ¶ Õ´Õ¡Õ½Õ«Õ¶ Õ©Õ§ Õ«Õ¶Õ¹ Õ§ ÕºÕ¡Õ¿Õ¡Õ°Õ¥Õ¬ Õ«Ö€Õ¥Õ¶Ö Õ°Õ¡Õ·Õ¸Ö‚Õ« Õ°Õ¥Õ¿Ö‰
+        text_html: ÕŠÕ¡ÕµÕ´Õ¡Õ¶Õ¡Õ¯Õ¡Õ¶â€¤ Ô´Õ¸Ö‚ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ Ô¹Õ¸Ö‚Õ©Õ« Õ·Õ¡Ö€Õ¡Õ¤Õ¡Õ½Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨Ö‰ Ô¿Õ¡Ö€Õ¸Õ² Õ¥Õ½ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ <a href="%{path}">Õ¡Ö‚Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ Õ¦Õ£Õ¸Ö‚Õ·Õ¡ÖÕ¶Õ¸Õ² Õ¶Õ¡ÕÕ¡Õ¤Õ«Ö€Õ¶Õ¥Ö€</a> ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯ ÕÕ¶Õ¡ÕµÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€
+        type_html: Ô¸Õ¶Õ¿Ö€Õ«Ö€ Õ«Õ¶Õ¹ Õ¡Õ¶Õ¥Õ¬ <strong>%{acct}</strong>Õ« Õ°Õ¥Õ¿Ö‰
+        warning_preset_id: ÕŠÕ¡ÕµÕ´Õ¡Õ¶Õ¡Õ¯Õ¡Õ¶â€¤ Ô¿Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ¡Ö‚Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ Õ¿Õ¥Ö„Õ½Õ¿ Õ¶Õ¡ÕÕ¤Õ«Ö€Õ« Õ¾Õ¥Ö€Õ»Õ¸Ö‚Õ´
+      announcement:
+        all_day: ÕŽÕ¥Ö€Õ¡Õ¶Õ¡ÕµÕ¸Ö‚Õ¥Õ¬Õ¸Ö‚Ö ÕµÕ¥Õ¿Õ¸Õµ, ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ¡ÖÕ¸ÕµÖÕ«Ö Õ´Õ«Õ¡ÕµÕ¶ Õ¡Õ´Õ½Õ¡Õ©Õ«Ö‚Õ¨ ÖÕ¸ÕµÖ Õ¯Õ¨ Õ¿Ö€Õ¸Ö‚Õ«
+        ends_at: ÕŠÕ¡ÕµÕ´Õ¡Õ¶Õ¡Õ¯Õ¡Õ¶â€¤ Õ…Õ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶ Õ¡Ö‚Õ¿Ö…Õ´Õ¡Õ¿ Õ¯Õ¨ Õ°Õ¡Õ¶Õ¸Ö‚Õ« Õ¡ÕµÕ½ ÕªÕ¡Õ´Õ«Õ¶
+        scheduled_at: ÔµÕ©Õ§ Õ¤Õ¡Õ¿Õ¡Ö€Õ¯ Õ©Õ¸Õ²Õ¶Õ¥Õ½ ÕµÕ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ´Õ«Õ¡Õ¶Õ£Õ¡Õ´Õ«Ö Õ¯Õ¨ Õ°Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¸Ö‚Õ«
+        starts_at: ÕŠÕ¡ÕµÕ´Õ¡Õ¶Õ¡Õ¯Õ¡Õ¶â€¤ Õ¡ÕµÕ¶ Õ¤Õ§ÕºÖ„Õ¸Ö‚Õ´, Õ¥Ö€Õ¢ ÕµÕ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¤ Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ¡Õ® Õ§ ÕµÕ½Õ¿Õ¡Õ¯ ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ¡ÖÕ¸ÕµÖÕ¸Õ¾
+        text: Ô¿Õ¡Ö€Õ¸Õ² Õ¥Õ½ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ©Õ©Õ« Õ·Õ¡Ö€Õ¡Õ¤Õ¡Õ½Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„, Õ¥Õ²Õ«Ö€ ÕÕ¥Õ¬Õ¡Õ´Õ«Õ¿ ÕµÕ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¿Õ¡Ö€Õ¡Õ®Ö„Õ¶ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬Õ«Õ½, Õ¡ÕµÕ¶ ÕµÕ¡ÕµÕ¿Õ¶Õ¸Ö‚Õ¥Õ¬Õ¸Ö‚ Õ§ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ» Õ§Õ¯Ö€Õ¡Õ¶Õ«Õ¶
+      defaults:
+        autofollow: Õ€Ö€Õ¡Ö‚Õ§Ö€Õ« Õ´Õ«Õ»Õ¸ÖÕ¸Õ¾ Õ£Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ¸Õ² Õ´Õ¡Ö€Õ¤Õ«Õ¯ Õ¯Õ¨ Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¶ Ö„Õ¥Õ¦
+        avatar: PNG, GIF Õ¯Õ¡Õ´ JPGÖ‰ Ô±Õ¼Õ¡Ö‚Õ¥Õ¬Õ¡Õ£Õ¸ÕµÕ¶Õ¨Õ %{size}Ö‰ Ô¿Õ¨ ÖƒÕ¸Ö„Ö€Õ¡ÖÕ¸Ö‚Õ« Õ´Õ«Õ¶Õ¹Õ¥Ö‚ %{dimensions}
+        bot: Ô±ÕµÕ½ Õ°Õ¡Õ·Õ«Ö‚Õ¨ Õ°Õ«Õ´Õ¶Õ¡Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ¯Õ¡Õ¿Õ¡Ö€Õ¸Ö‚Õ´ Õ§ Õ¡Ö‚Õ¿Ö…Õ´Õ¡Õ¿Õ¡ÖÕ¸Ö‚Õ¡Õ® Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¥Ö‚ Õ£Õ¸Ö‚ÖÕ§ Õ¹Õ« Õ¾Õ¥Ö€Õ¡ÕµÕ½Õ¯Õ¸Ö‚Õ¸Ö‚Õ´
+        context: Õ„Õ§Õ¯ Õ¯Õ¡Õ´ Õ´Õ« Ö„Õ¡Õ¶Õ« Õ¯Õ¸Õ¶Õ¿Õ¥Ö„Õ½Õ¿Õ¶Õ¥Ö€, Õ¸Ö€Õ¿Õ¥Õ² ÕºÕ§Õ¿Ö„ Õ§ Õ¯Õ«Ö€Õ¡Õ¼Õ¸Ö‚Õ« Õ¦Õ¿Õ«Õ¹
+        current_password: Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¶Õ¯Õ¡Õ¿Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ«Ö Õ¥Õ¬Õ¶Õ¥Õ¬Õ¸Õ¾, ÕÕ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ´Õ¸Ö‚Õ¿Ö„Õ¡Õ£Ö€Õ¥Õ¬ Õ¿Õ¸Ö‚Õ¥Õ¬ Õ°Õ¡Õ·Õ¸Ö‚Õ« Õ®Õ¡Õ®Õ¯Õ¡Õ£Õ«Ö€Õ¨
+        current_username: Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ ÕÕ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ´Õ¸Ö‚Õ¿Ö„Õ¡Õ£Ö€Õ¥Õ¬ Õ¿Õ¸Ö‚Õ¥Õ¬ Õ°Õ¡Õ·Õ¸Ö‚Õ« Ö…Õ£Õ¿Õ¡Õ¶Õ¸Ö‚Õ¶Õ¨
+        digest: ÕˆÖ‚Õ²Õ¡Ö€Õ¯Õ¸Ö‚Õ¸Ö‚Õ´ Õ§ ÕºÕ¡Õ½Õ«Ö‚Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¥Ö€Õ¯Õ¡Ö€ Õ·Ö€Õ»Õ¡Õ¶Õ«Ö ÕµÕ¥Õ¿Õ¸Õµ Õ¥Ö‚ Õ´Õ«Õ¡ÕµÕ¶ Õ¡ÕµÕ¶ Õ¤Õ§ÕºÖ„Õ¸Ö‚Õ´, Õ¥Ö€Õ¢ Õ¢Õ¡ÖÕ¡Õ¯Õ¡ÕµÕ¸Ö‚Õ©Õ¥Õ¡Õ¶Õ¤ ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯ Õ¸Ö€Õ¥Ö‚Õ§ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶ Õ¥Õ½ Õ½Õ¿Õ¡ÖÕ¥Õ¬
+        discoverable: Ô·Õ»Õ« Õ´Õ¡Õ¿Õ¥Õ¡Õ¶Õ¶ Õ¡ÕµÕ¬ Õ¥Õ²Õ¡Õ¶Õ¡Õ¯ Õ§ Õ°Õ¡Õ·Õ«Ö‚Õ¤ Õ¬Õ¡ÕµÕ¶ Õ·Ö€Õ»Õ¡Õ¶Õ¡Õ¯Õ¶Õ¥Ö€Õ«Õ¶ Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ¤Õ¡Ö€Õ±Õ¶Õ¥Õ¬Õ¸Ö‚
+        email: Õ”Õ¥Õ¦ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¸Ö‚Õ¥Õ¬ Õ§ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ´Õ¡Õ¶ Õ«Õ´Õ¡Õ¯
+        fields: Ô¿Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ¸Ö‚Õ¶Õ¥Õ¶Õ¡Õ¬ Õ´Õ«Õ¶Õ¹Õ¥Ö‚ 4 Õ¯Õ§Õ¿ Õ°Õ¡Õ·Õ¸Ö‚Õ«Õ¤ Õ¡Õ²Õ«Ö‚Õ½Õ¡Õ¯Õ¸Ö‚Õ´ ÖÕ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬Õ¸Ö‚
+        header: PNG, GIF Õ¯Õ¡Õ´ JPGÖ‰ Ô±Õ¼Õ¡Ö‚Õ¥Õ¬Õ¡Õ£Õ¸ÕµÕ¶Õ¨Õ %{size}Ö‰ Ô¿Õ¨ ÖƒÕ¸Ö„Ö€Õ¡ÖÕ¸Ö‚Õ« Õ´Õ«Õ¶Õ¹Õ¥Ö‚ %{dimensions}
+        inbox_url: ÕŠÕ¡Õ¿Õ³Õ§Õ¶Õ«Ö€ URL Õ¡ÕµÕ¶ Õ·Õ¥Ö€Õ¿Õ« Õ¤Õ«Õ´Õ¥Ö€Õ¥Õ½Õ«Ö, Õ¸Ö€Õ¨ ÖÕ¡Õ¶Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ¥Õ½ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬
+        irreversible: Ô¶Õ¿Õ¸Ö‚Õ¡Õ® Õ©Õ©Õ¥Ö€Õ¨ Õ¯Õ¸Ö€Õ¹Õ¥Õ¬Õ¸Ö‚ Õ¥Õ¶ Õ¡Õ¶Õ¤Õ¡Õ¼Õ¶Õ¡Õ¬Õ«Ö…Ö€Õ§Õ¶, Õ¶Õ¸ÕµÕ¶Õ«Õ½Õ¯ Õ¥Õ©Õ§ Õ¦Õ¿Õ«Õ¹Õ¨ ÕµÕ¥Õ¿Õ¸Õµ Õ°Õ¥Õ¼Õ¡ÖÕ¶Õ¥Õ½
+        locale: Ô»Õ¶Õ¿Õ¥Ö€Ö†Õ¥ÕµÕ½Õ« Õ¬Õ¥Õ¦Õ¸Ö‚Õ¶, Õ§Õ¬. Õ¶Õ¡Õ´Õ¡Õ¯Õ¶Õ¥Ö€Õ¨ Õ¥Ö‚ push Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨
+        locked: Ô±Õ¶Õ°Ö€Õ¡ÕªÕ¥Õ·Õ¿ Õ¯Õ¨ Õ¬Õ«Õ¶Õ« Õ±Õ¥Õ¼Ö„Õ¸Õ¾ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ«Õ¶
+        password: Õ•Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ«Ö€ Õ¡Õ¼Õ¶Õ¸Ö‚Õ¡Õ¦Õ¶ 8 Õ¶Õ«Õ·
+        phrase: Ô¿Õ¨ Õ°Õ¡Õ´Õ¨Õ¶Õ¯Õ¶Õ« Õ¡Õ¶Õ¯Õ¡Õ Õ¿Õ¥Ö„Õ½Õ¿Õ« Õ±Õ¥Ö‚Õ«Ö Õ¯Õ¡Õ´ Õ©Õ©Õ« Õ¦Õ£Õ¸Ö‚Õ·Õ¡ÖÕ¶Õ¸Õ² Õ¢Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ«Ö
+        scopes: ÕˆÖ€ APIÖŠÕ«Õ¶ ÕµÕ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Õ¶ Õ¸Ö‚Õ¶Õ« Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ«Õ¸Ö‚Õ©Õ«Ö‚Õ¶Ö‰ ÔµÕ©Õ§ Õ¨Õ¶Õ¿Ö€Õ¥Õ¬ Õ¥Õ½ Õ¢Õ¡Ö€Õ±Ö€ Õ´Õ¡Õ¯Õ¡Ö€Õ¤Õ¡Õ¯Õ« Õ¤Õ¡Õ·Õ¿, Õ¡ÕºÕ¡ Õ¡Õ¶Õ°Õ¡Õ¿Õ¡Õ¯Õ¡Õ¶ Õ¨Õ¶Õ¿Ö€Õ¥Õ¬Õ¸Ö‚ Õ¯Õ¡Ö€Õ«Ö„ Õ¹Õ¯Õ¡ÕµÖ‰
+        setting_aggregate_reblogs: Õ‰ÖÕ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ Õ¿Õ¡Ö€Õ¡Õ®Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¶ Õ¡ÕµÕ¶ Õ©Õ©Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€, Õ¸Ö€Õ¸Õ¶Ö„ Ö„Õ«Õ¹ Õ¡Õ¼Õ¡Õ» Õ¡Ö€Õ¤Õ§Õ¶ Õ¿Õ¡Ö€Õ¡Õ®Õ¸Ö‚Õ¥Õ¬ Õ¥Õ¶(Õ¾Õ¥Ö€Õ¡Õ¢Õ¥Ö€Õ¸Ö‚Õ´ Õ§ Õ´Õ«Õ¡ÕµÕ¶ Õ¾Õ¥Ö€Õ»Õ«Õ¶ Õ¿Õ¡Ö€Õ¡Õ®Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ«Õ¶)
+        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: Ô¿Õ¿Õ¸Ö€Õ¶Õ¥Ö€Õ¨ Õ°Õ«Õ´Õ¶Õ¸Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶ Õ©Õ¡Ö„ÖÕ¸Ö‚Õ¡Õ® Õ¾Õ«Õ¦Õ¸Ö‚Õ¡Õ¬Õ« Õ¾Ö€Õ¡ÕµÕ ÕÕ¡Õ´Ö€Õ¥ÖÕ¶Õ¥Õ¬Õ¸Õ¾ Õ¤Õ¥Õ¿Õ¡Õ¬Õ¶Õ¥Ö€Õ¨
+        setting_use_pending_items: Ô¹Õ¡Ö„ÖÕ¶Õ¥Õ¬ Õ°Õ¸Õ½Ö„Õ« Õ©Õ¡Ö€Õ´Õ¡ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¯Õ¿Õ¿Õ¸Õ« Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´Õ Õ¡Ö‚Õ¿Ö…Õ´Õ¡Õ¿ Õ©Õ¡Ö€Õ´Õ¡ÖÕ¸Ö‚Õ¸Õ² Õ°Õ¸Õ½Ö„Õ« ÖƒÕ¸ÕÕ¡Ö€Õ§Õ¶
+        username: Õ”Õ¸ Ö…Õ£Õ¿Õ¡Õ¶Õ¸Ö‚Õ¶Õ¨ ÕºÕ§Õ¿Ö„ Õ§ Õ¥Õ¦Õ¡Õ¯Õ« Õ¬Õ«Õ¶Õ« %{domain}-Õ¸Ö‚Õ´Ö‰
+        whole_word: ÔµÕ©Õ§ Õ¢Õ¡Õ¶Õ¡Õ¬Õ« Õ¢Õ¡Õ¼Õ¨ Õ¯Õ¡Õ´ Õ¡Ö€Õ¿Õ¡ÕµÕ¡ÕµÕ¿Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ ÕºÕ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¸Ö‚Õ´ Õ§ Õ´Õ«Õ¡ÕµÕ¶ Õ¡ÕµÕ¢Õ¢Õ¥Õ¶Õ¡Õ¯Õ¡Õ¶ Õ¶Õ«Õ·Õ¥Ö€ Õ¥Ö‚ Õ©Õ¸Ö‚Õ¥Ö€, Õ¡ÕºÕ¡ Õ¡ÕµÕ¶ Õ¯Õ«Ö€Õ¡Õ¼Õ¸Ö‚Õ¥Õ¬Õ¸Ö‚ Õ§ Õ¡Õ´Õ¢Õ¸Õ²Õ» Õ¢Õ¡Õ¼Õ« Õ°Õ¥Õ¿ Õ°Õ¡Õ´Õ¨Õ¶Õ¯Õ¶Õ¥Õ¬Õ¸Ö‚ Õ¤Õ§ÕºÖ„Õ¸Ö‚Õ´ Õ´Õ«Õ¡ÕµÕ¶
+      domain_allow:
+        domain: Ô±ÕµÕ½ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ§ Õ½Õ¿Õ¡Õ¶Õ¡Õ¬ Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬Õ¶Õ¥Ö€ Õ¡ÕµÕ½ Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ¹Õ«Ö Õ¥Ö‚ Õ½Õ¿Õ¡ÖÕ¸Ö‚Õ¸Õ² Õ¿Õ¸Ö‚Õ¥Õ¡Õ¬Õ¶Õ¥Ö€Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ¥Õ¬ Õ¥Ö‚ ÕºÕ¡Õ°Õ¸Ö‚Õ¥Õ¬
+      email_domain_block:
+        domain: ÕÕ¡ Õ¯Õ¡Ö€Õ¸Õ² Õ§ Õ¬Õ«Õ¶Õ¥Õ¬ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« Õ¡Õ¶Õ¸Ö‚Õ¶, Õ¸Ö€Õ¨ ÖÕ¸Ö‚ÖÕ¡Õ¤Ö€Õ¸Ö‚Õ´ Õ§ Õ§Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§Õ¶, MX Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´, Õ¸Ö€Õ«Õ¶ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ¨ ÕºÕ¡Õ¿Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ§, Õ¯Õ¡Õ´ MX Õ£Ö€Õ¡Õ¼Õ´Õ¡Õ¶ Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ¹Õ«  IPÖ‰ Ô´Ö€Õ¡Õ¶Ö„ Õ½Õ¿Õ¸Ö‚Õ£Õ¸Ö‚Õ¥Õ¬Õ¸Ö‚ Õ¥Õ¶ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ» Õ£Ö€Õ¡Õ¶ÖÕ´Õ¡Õ¶ ÕºÕ¡Õ°Õ«Õ¶ Õ¥Ö‚ Õ£Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ´Õ¨ Õ´Õ¥Ö€ÕªÕ¸Ö‚Õ¥Õ¬Õ¸Ö‚ Õ§Ö‰
+        with_dns_records: Ô±ÕµÕ½ Õ¿Õ«Ö€Õ¸ÕµÕ©Õ« DNS Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¯Õ¨ Õ¿Õ¡Ö€Ö€Õ¡Õ¬Õ¸Ö‚Õ®Õ¸Ö‚Õ¥Õ¶ Õ¥Ö‚ Õ¡Ö€Õ¤Õ«Ö‚Õ¶Ö„Õ¶Õ¥Ö€Õ¨ Õ¶Õ¸ÕµÕ¶ÕºÕ§Õ½ Õ¯Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¸Ö‚Õ¥Õ¶ Õ½Õ¥Ö‚ ÖÕ¸Ö‚ÖÕ¡Õ¯
+      featured_tag:
+        name: Ô³Õ¸Ö‚ÖÕ§ ÖÕ¡Õ¶Õ¯Õ¡Õ¶Õ¡Õ½ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ½Ö€Õ¡Õ¶ÖÕ«Ö Õ´Õ§Õ¯Õ¨â€¤
+      form_challenge:
+        current_password: Õ„Õ¸Ö‚Õ¿Ö„ Õ¥Õ½ Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ¡ÕºÕ¡Õ°Õ¸Õ¾ Õ¿Õ¡Ö€Õ¡Õ®Ö„
+      imports:
+        data: CSV Ö†Õ¡ÕµÕ¬Õ¨ Õ¶Õ¥Ö€Õ´Õ¸Ö‚Õ®Õ¸Ö‚Õ¥Õ¬ Õ§ Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶Õ« Õ¡ÕµÕ¬ Õ½Õ¥Ö€Õ¸Ö‚Õ¥Ö€Õ«Ö
+      invite_request:
+        text: ÕÕ¡ Õ¯Ö…Õ£Õ¶Õ« Õ´Õ¥Õ¦ Õ½Õ¿Õ¸Ö‚Õ£Õ¥Õ¬ Ö„Õ¸ ÕµÕ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Õ¨
+      ip_block:
+        comment: ÕŠÕ¡ÕµÕ´Õ¡Õ¶Õ¡Õ¯Õ¡Õ¶â€¤ Õ…Õ«Õ·Õ«Ö€ Õ«Õ¶Õ¹Õ¸Ö‚ Õ¥Õ½ Õ¡Ö‚Õ¥Õ¬Õ¡ÖÖ€Õ¥Õ¬ Õ¡ÕµÕ½ Õ¯Õ¡Õ¶Õ¸Õ¶Õ¨Ö‰
+        expires_in: IP Õ°Õ¡Õ½ÖÕ§Õ¶Õ¥Ö€Õ¨ Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¡ÖƒÕ¡Õ¯ Õ¥Õ¶, Õ¤Ö€Õ¡Õ¶Ö„ Õ¥Ö€Õ¢Õ¥Õ´Õ¶ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶ Õ¨Õ¶Õ¤Õ°Õ¡Õ¶Õ¸Ö‚Ö€ Õ¯Õ¡Õ´ Õ¡Õ¶ÖÕ¶Õ¸Ö‚Õ´ Õ±Õ¥Õ¼Ö„Õ«Ö Õ±Õ¥Õ¼Ö„Ö‰ Ô±ÕµÕ¤ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¸Õ¾ ÕÕ¸Ö€Õ°Õ¸Ö‚Ö€Õ¤ Õ¹Õ« Õ¿Ö€Ö‚Õ¸Ö‚Õ´ IP-Õ¶Õ¥Ö€Õ« Õ¡Õ¶ÕªÕ¡Õ´Õ¯Õ¥Õ¿ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´Õ¨Ö‰
+        ip: Õ†Õ¥Ö€Õ´Õ¸Ö‚Õ®Õ§Ö„ IPv4 Õ¯Õ¡Õ´ IPv6 Õ°Õ¡Õ½ÖÕ§Õ¶Ö‰ Õ†Õ¡Ö‡ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬ Õ°Õ¡Õ½ÖÕ§Õ¶Õ¥Ö€Õ« Õ´Õ«Õ»Õ¡Õ¯Õ¡ÕµÖ„Õ¥Ö€ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬Õ¸Õ¾ CIDR Õ½Õ«Õ¶Õ¿Õ¡Ö„Õ½Õ¨Ö‰ Ô¶Õ£Õ¸ÕµÕ· Õ¥Õ²Õ«Ö€Õ Õ«Õ¶Ö„Õ¤ Ö„Õ¥Õ¦ Õ¹Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Õ½Ö‰
+        severities:
+          no_access: Ô±Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ«Ö€ Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ«Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¨ Õ¢Õ¸Õ¬Õ¸Ö€ ÕºÕ¡Õ·Õ¡Ö€Õ¶Õ¥Ö€Õ«Õ¶Ö‰
+          sign_up_requires_approval: Õ†Õ¸Ö€ Õ£Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¯Õ¨ ÕºÕ¡Õ°Õ¡Õ¶Õ»Õ¥Õ¶ Ö„Õ¸ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¸Ö‚Õ´Õ¨
+        severity: Ô¸Õ¶Õ¿Ö€Õ«Ö€, Õ©Õ§ Õ«Õ¶Õ¹ Õ¯Õ¡Ö€Õ¸Õ² Õ§ ÕºÕ¡Õ¿Õ¡Õ°Õ¥Õ¬ Õ¡ÕµÕ½ IPÖŠÕ«Ö Õ¥Õ¯Õ¸Õ² ÕµÕ¡ÕµÕ¿Õ¥Ö€Õ« Õ°Õ¥Õ¿
+      sessions:
+        otp: Õ„Õ¸Ö‚Õ¿Ö„Õ¡Õ£Ö€Õ«Ö€ Õ¥Ö€Õ¯Ö„Õ¡ÕµÕ¬ Õ¶Õ¸ÕµÕ¶Õ¡Õ¯Õ¡Õ¶Õ¡ÖÕ´Õ¡Õ¶ Õ¯Õ¸Õ¤Õ¨, Õ¸Ö€Õ¨ Õ£Õ¥Õ¶Õ¥Ö€Õ¡ÖÕ¸Ö‚Õ¥Õ½ Õ¥Õ½ Ö„Õ¸ Õ¢Õ»Õ»Õ¡ÕµÕ«Õ¶ ÕµÕ¡Ö‚Õ¥Õ¬Õ¸Ö‚Õ¡Õ®Õ« Ö…Õ£Õ¶Õ¸Ö‚Õ©Õ¥Õ¡Õ´Õ¢ Õ¯Õ¡Õ´ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ«Ö€ Õ¡ÕµÕ½ Õ¯Õ¸Õ¤Õ¥Ö€Õ«Ö Õ¯Õ§Õ¯Õ¨Õ
+        webauthn: ÔµÕ©Õ§ Õ½Õ¡ USB Õ§Õ Õ¾Õ½Õ¿Õ¡Õ° Õ¥Õ²Õ«Ö€ Õ¿Õ¥Õ²Õ¡Õ¤Ö€Õ¥Õ¬ Õ¡ÕµÕ¶ Õ¥Ö‚ Õ¥Õ©Õ§ Õ¡Õ¶Õ°Ö€Õ¡ÕªÕ¥Õ·Õ¿ Õ§Õ Õ©Õ¡ÖƒÕ¡Õ°Õ¡Ö€Õ¥Õ¬Ö‰
+      tag:
+        name: Ô¿Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ´Õ«Õ¡ÕµÕ¶ ÖƒÕ¸ÕÕ¥Õ¬ Õ¿Õ¡Õ¼Õ¥Ö€Õ« Õ±Õ¥Ö‚Õ¨, Ö…Ö€Õ«Õ¶Õ¡Õ¯, Õ¡ÕµÕ¶ Õ¡Ö‚Õ¥Õ¬Õ« Õ¨Õ¶Õ©Õ¥Õ¼Õ¶Õ¥Õ¬Õ« Õ¤Õ¡Ö€Õ±Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€
+      user:
+        chosen_languages: Õ†Õ·Õ¸Ö‚Õ¡Õ® ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯ Õ°Õ¸Õ½Ö„Õ¸Ö‚Õ´ Õ¯Õ¥Ö€Õ¥Ö‚Õ¡Õµ Õ´Õ«Õ¡ÕµÕ¶ Õ¨Õ¶Õ¿Ö€Õ¸Ö‚Õ¡Õ® Õ¬Õ¥Õ¦Õ¸Ö‚Õ¸Õ¾ Õ©Õ¸Ö‚Õ©Õ¥Ö€Õ¨
     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: Õ…Õ¡ÕµÕ¿Õ¡Ö€Õ¡Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶
       defaults:
+        autofollow: Õ€Ö€Õ¡Ö‚Õ«Ö€Õ¥Õ¬ Õ§Õ»Õ«Õ¤ Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬Õ¸Ö‚
+        avatar: Ô±Ö‚Õ¡Õ¿Õ¡Ö€
+        bot: ÕÕ¡ Õ¢Ö…Õ¿Õ« Õ°Õ¡Õ·Õ«Ö‚ Õ§
+        chosen_languages: Ô¶Õ¿Õ¥Õ¬ Õ¬Õ¥Õ¦Õ¸Ö‚Õ¶Õ¥Ö€Õ¨
+        confirm_new_password: Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬ Õ¶Õ¸Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨
+        confirm_password: Ô³Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ« Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¸Ö‚Õ´
+        context: Ô¶Õ¿Õ¥Õ¬ Õ¯Õ¸Õ¶Õ¿Õ¥Ö„Õ½Õ¿Õ¶Õ¥Ö€Õ¨
+        current_password: Õ†Õ¥Ö€Õ¯Õ¡ÕµÕ«Õ½ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨
+        data: ÕÕ¸Ö‚Õ¥Õ¡Õ¬Õ¶Õ¥Ö€
+        discoverable: Ô±Ö‚Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ Õ°Õ¡Õ·Õ«Ö‚Õ¨ Õ°Õ¡Õ½ÖÕ§Õ¡Õ£Ö€Ö„Õ¸Ö‚Õ´
+        display_name: Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¸Ö‚Õ¸Õ² Õ¡Õ¶Õ¸Ö‚Õ¶
+        email: Ô·Õ¬â€¤ Õ°Õ¡Õ½ÖÕ§
+        expires_in: ÕÕºÕ¡Õ¼Õ¸Ö‚Õ¸Ö‚Õ´ Õ§
+        fields: Õ€Õ¡Õ·Õ¸Ö‚Õ« Õ´Õ¥Õ¿Õ¡Õ¤Õ¡Õ¿Õ¡
         header: ÕŽÕ¥Ö€Õ¶Õ¡Õ£Õ«Ö€
+        honeypot: "%{label} (Õ¹Õ¬Ö€Õ¡ÖÕ¶Õ¥Õ¬)"
+        inbox_url: Õ†Õ¥Ö€Õ´Õ¸Ö‚Õ®Õ´Õ¡Õ¶ Õ·Õ¥Ö€Õ¿Õ« URL
+        irreversible: Ô¹Õ¡Ö„ÖÕ¶Õ¥Õ¬Õ¸Ö‚ ÖƒÕ¸ÕÕ¡Ö€Õ§Õ¶ Õ»Õ¶Õ»Õ¥Õ¬
+        locale: Ô»Õ¶Õ¿Õ¥Ö€Ö†Õ¥ÕµÕ½Õ« Õ¬Õ¥Õ¦Õ¸Ö‚
+        locked: Õ“Õ¡Õ¯Õ¥Õ¬ Õ°Õ¡Õ·Õ«Ö‚Õ¨
+        max_uses: Õ•Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ´Õ¡Õ¶ Õ¡Õ¼Õ¡Ö‚Õ¥Õ¬Õ¡Õ£Õ¸ÕµÕ¶ Ö„Õ¡Õ¶Õ¡Õ¯
+        new_password: Õ†Õ¸Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼
         note: Ô²Õ«Õ¸
+        otp_attempt: 2F Õ¯Õ¸Õ¤
         password: Ô³Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼
+        phrase: Õ€Õ«Õ´Õ¶Õ¡Õ¢Õ¡Õ¼ Õ¯Õ¡Õ´ Õ¡Ö€Õ¿Õ¡ÕµÕ¡ÕµÕ¿Õ¸Ö‚Õ©Õ«Ö‚Õ¶
+        setting_advanced_layout: Õ„Õ«Õ¡ÖÕ¶Õ¥Õ¬ Õ¨Õ¶Õ¤Õ¬Õ¡ÕµÕ¶Õ¸Ö‚Õ¡Õ® Õ¾Õ¥Õ¢ Õ«Õ¶Õ¿Õ¥Ö€Ö†Õ¥ÕµÕ½
+        setting_aggregate_reblogs: ÕÕ¡Ö€Õ®Õ¡Õ®Õ¶Õ¥Ö€Õ¨ ÕÕ´Õ¢Õ¡Ö‚Õ¸Ö€Õ¥Õ¬ Õ°Õ¸Õ½Ö„Õ¸Ö‚Õ´
+        setting_auto_play_gif: Ô±Ö‚Õ¿Õ¸Õ´Õ¡Õ¿ Õ´Õ¥Õ¯Õ¶Õ¡Ö€Õ¯Õ¥Õ¬ GIFs Õ¡Õ¶Õ«Õ´Õ¡ÖÕ«Õ¡Õ¶Õ¥Ö€Õ¨
+        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: Ô¹Õ¡Ö„ÖÕ¶Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€Õ¨
+        setting_display_media_show_all: Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€Õ¨
+        setting_expand_spoilers: Õ„Õ«Õ·Õ¿ Õ¢Õ¡ÖÕ¥Õ¬ Õ¢Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¦Õ£Õ¸Ö‚Õ·Õ¡ÖÕ´Õ¡Õ´Õ¢ Õ©Õ©Õ¥Ö€Õ¨
+        setting_hide_network: Ô¹Õ¡Ö„ÖÕ¶Õ¥Õ¬ ÖÕ¡Õ¶ÖÕ¤
+        setting_noindex: Ô½Õ¸Ö‚Õ½Õ¡ÖƒÕ¥Õ¬ Õ¸Ö€Õ¸Õ¶Õ¸Õ²Õ¡Õ¯Õ¡Õ¶ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ¥Ö€Õ« Õ«Õ¶Õ¤Õ§Ö„Õ½Õ¡Ö‚Õ¸Ö€Õ¸Ö‚Õ´Õ«Ö
+        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: Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¯Õ¸Õ¤
+        type: Õ†Õ¥Ö€Õ´Õ¸Ö‚Õ®Õ´Õ¡Õ¶ Õ¿Õ¥Õ½Õ¡Õ¯
         username: Õ„Õ¸Ö‚Õ¿Ö„Õ¡Õ¶Õ¸Ö‚Õ¶
+        username_or_email: Ô¾Õ¡Õ®Õ¯Õ¡Õ¶Õ¸Ö‚Õ¶ Õ¯Õ¡Õ´ Õ§Õ¬â€¤ ÖƒÕ¸Õ½Õ¿
+        whole_word: Ô±Õ´Õ¢Õ¸Õ²Õ» Õ¢Õ¡Õ¼Õ¨
+      email_domain_block:
+        with_dns_records: Õ†Õ¥Ö€Õ¡Õ¼Õ¥Õ¬ MX Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´ Õ¯Õ¡Õ´ Õ¤Õ¸Õ´Õ§ÕµÕ¶Õ« IP
+      featured_tag:
+        name: ÕŠÕ«Õ¿Õ¡Õ¯
+      interactions:
+        must_be_follower: Ô±Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬ Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¸Õ¹ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö€Õ¤Õ¶Õ¥Ö€Õ«Ö
+        must_be_following: Ô±Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬ Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶ÖÕ«Ö, Õ¸Ö€Õ¸Õ¶Ö Õ¹Õ¥Õ½ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´
+        must_be_following_dm: Ô±Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬ Õ°Õ¡Õ½ÖÕ§Õ¡Õ£Ö€Õ¸Ö‚Õ¡Õ® Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©Õ«Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶ÖÕ«Ö, Õ¸Ö€Õ¸Õ¶Ö Õ¹Õ¥Õ½ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´
       invite:
         comment: Õ„Õ¥Õ¯Õ¶Õ¡Õ¢Õ¡Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶
+      invite_request:
+        text: Ô»Õ¶Õ¹Õ¸ÕžÖ‚ Õ¥Õ½ ÖÕ¡Õ¶Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ´Õ«Õ¡Õ¶Õ¡Õ¬
+      ip_block:
+        comment: Õ„Õ¥Õ¯Õ¶Õ¡Õ¢Õ¡Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶
+        ip: IP
+        severities:
+          no_access: Õ„Õ¸Ö‚Õ¿Ö„Õ¨ Õ¡Ö€Õ£Õ¥Õ¬Õ¥Õ¬
+          sign_up_requires_approval: ÕÕ¡Õ°Õ´Õ¡Õ¶Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬ Õ£Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨
+        severity: Ô¿Õ¡Õ¶Õ¸Õ¶
+      notification_emails:
+        digest: ÕˆÖ‚Õ²Õ¡Ö€Õ¯Õ¥Õ¬ Õ¤Õ¡Õ½Õ¡Õ¯Õ¡Ö€Õ£Õ¸Ö‚Õ¡Õ® Õ«Õ´Õ¡Õ¯Õ¶Õ¥Ö€
+        favourite: ÕˆÖ€Õ¥Ö‚Õ§ Õ´Õ¥Õ¯Õ¨ Õ°Õ¡Ö‚Õ¡Õ¶Õ¥Ö Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¤
+        follow: ÕˆÖ€Õ¥Ö‚Õ§ Õ´Õ§Õ¯Õ¨ Õ½Õ¯Õ½Õ¥Ö Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬ Ö„Õ¥Õ¦
+        follow_request: ÕˆÖ€Õ¥Ö‚Õ§ Õ´Õ§Õ¯Õ¨ Ö„Õ¥Õ¦ Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡ÕµÖ Õ§ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¥Õ¬
+        mention: ÕˆÖ€Õ¥Ö‚Õ§ Õ´Õ¥Õ¯Õ¨ Õ¶Õ·Õ¥Ö Ö„Õ¥Õ¦
+        pending_account: ÕŽÕ¥Ö€Õ¡Õ¶Õ¡ÕµÕ´Õ¡Õ¶ Õ¯Õ¡Ö€Õ«Ö„ Õ¸Ö‚Õ¶Õ¥ÖÕ¸Õ² Õ¶Õ¸Ö€ Õ°Õ¡Õ·Õ«Ö‚
+        reblog: Ô»Õ¶Õ¹ÖŠÕ¸Ö€ Õ´Õ§Õ¯Õ¨ Õ©Õ¸Ö‚Õ©Õ¤ Õ¿Õ¡Ö€Õ¡Õ®Õ¥Ö
+        report: Õ†Õ¸Ö€ Õ¢Õ¸Õ²Õ¸Ö„ Õ§ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¸Ö‚Õ¥Õ¬
+        trending_tag: Õ‰Õ¾Õ¥Ö€Õ¡Õ¶Õ¡ÕµÕ¸Ö‚Õ¡Õ® ÕºÕ«Õ¿Õ¡Õ¯Õ¨ Õ©Ö€Õ¥Õ¶Õ¤Õ« Õ´Õ§Õ» Õ§
+      tag:
+        listable: Ô¹Õ¸ÕµÕ¬Õ¡Õ¿Ö€Õ¥Õ¬, Õ¸Ö€ Õ¡ÕµÕ½ ÕºÕ«Õ¿Õ¡Õ¯Õ¨ ÕµÕ¡ÕµÕ¿Õ¶Õ¸Ö‚Õ« Õ¸Ö€Õ¸Õ¶Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ¥Ö‚ Õ°Õ¡Õ·Õ¸Ö‚Õ« Õ´Õ¡Õ¿Õ¥Õ¡Õ¶Õ¸Ö‚Õ´
+        name: ÕŠÕ«Õ¿Õ¡Õ¯
+        trendable: Ô¹Õ¸ÕµÕ¬Õ¡Õ¿Ö€Õ¥Õ¬, Õ¸Ö€ Õ¡ÕµÕ½ ÕºÕ«Õ¿Õ¡Õ¯Õ¨ ÕµÕ¡ÕµÕ¿Õ¶Õ¸Ö‚Õ« Õ©Ö€Õ¥Õ¶Õ¤Õ¶Õ¥Ö€Õ¸Ö‚Õ´
+        usable: Ô¹Õ¸ÕµÕ¬Õ¡Õ¿Ö€Õ¥Õ¬ Õ©Õ©Õ¥Ö€Õ«Õ¶ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ¡ÕµÕ½ ÕºÕ«Õ¿Õ¡Õ¯Õ¨
     'no': ÕˆÕ¹
     recommended: Ô½Õ¸Ö€Õ°Õ¸Ö‚Ö€Õ¤ Õ§ Õ¿Ö€Õ¾Õ¸Ö‚Õ´
     required:
       mark: "*"
       text: ÕºÕ¡Ö€Õ¿Õ¡Õ¤Õ«Ö€
+    title:
+      sessions:
+        webauthn: Õ•Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ«Ö€ Õ¡Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©Õ¥Õ¡Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶Õ¥Ö€Õ¨ Õ£Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€
     'yes': Ô±ÕµÕ¸
diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml
index 1717d0722cd8871ce169b6d179033fcd7f885343..4b469cd9363e0ef3a1a3c6675b119356282b79c4 100644
--- a/config/locales/simple_form.id.yml
+++ b/config/locales/simple_form.id.yml
@@ -65,8 +65,17 @@ id:
         data: File CSV yang diexpor dari server Mastodon lain
       invite_request:
         text: Ini akan membantu kami meninjau aplikasi Anda
+      ip_block:
+        comment: Opsional. Harap ingat alasan Anda menambahkan peraturan ini.
+        expires_in: Alamat IP terbatas, kadang-kadang dibagikan dan dipindah tangan. Oleh karena itu, blok IP tidak terbatas tidak disarankan.
+        ip: Masukkan alamat IPv4 atau IPv6. Anda dapat memblokir seluruh rentang dengan sintaks CIDR. Hati-hati, jangan mengunci Anda sendiri!
+        severities:
+          no_access: Blokir akses ke seluruh sumber daya
+          sign_up_requires_approval: Pendaftaran baru memerlukan persetujuan Anda
+        severity: Pilih apa yang akan dilakukan dengan permintaan dari IP ini
       sessions:
         otp: Masukkan kode dua-faktor dari handphone atau gunakan kode pemulihan anda.
+        webauthn: Jika ini kunci USB pastikan dalam keadaan tercolok dan, jika perlu, ketuk.
       tag:
         name: Anda hanya dapat mengubahnya ke huruf kecil/besar, misalnya, agar lebih mudah dibaca
       user:
@@ -91,6 +100,7 @@ id:
         types:
           disable: Matikan
           none: Biarkan
+          sensitive: Sensitif
           silence: Diamkan
           suspend: Tangguhkan dan hapus data akun scr permanen
         warning_preset_id: Gunakan preset peringatan
@@ -116,6 +126,7 @@ id:
         expires_in: Kedaluwarsa setelah
         fields: Metadata profil
         header: Tajuk
+        honeypot: "%{label} (jangan diisi)"
         inbox_url: URL kotak relai
         irreversible: Hapus alih-alih sembunyikan
         locale: Bahasa
@@ -135,6 +146,7 @@ id:
         setting_default_privacy: Privasi postingan
         setting_default_sensitive: Selalu tandai media sebagai sensitif
         setting_delete_modal: Tampilkan dialog konfirmasi sebelum hapus toot
+        setting_disable_swiping: Nonaktifkan gerak usap
         setting_display_media: Tampilan media
         setting_display_media_default: Bawaan
         setting_display_media_hide_all: Sembunyikan semua
@@ -151,6 +163,7 @@ id:
         setting_use_blurhash: Tampilkan gradien penuh warna utk media tersembunyi
         setting_use_pending_items: Mode pelan
         severity: Keparahan
+        sign_in_token_attempt: Kode keamanan
         type: Tipe impor
         username: Nama pengguna
         username_or_email: Nama pengguna atau Surel
@@ -167,6 +180,13 @@ id:
         comment: Komentar
       invite_request:
         text: Mengapa Anda ingin gabung?
+      ip_block:
+        comment: Komentar
+        ip: IP
+        severities:
+          no_access: Blok akses
+          sign_up_requires_approval: Batasi pendaftaran
+        severity: Aturan
       notification_emails:
         digest: Kirim email berisi rangkuman
         favourite: Kirim email saat seseorang menyukai status anda
@@ -187,4 +207,7 @@ id:
     required:
       mark: "*"
       text: wajib
+    title:
+      sessions:
+        webauthn: Gunakan salah satu kunci keamanan untuk masuk
     'yes': Ya
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 5a1c51883e0ebcd780e5c8b472ffc98010e26ad1..53e34f00cb0eaba127f468f262e106c7184ba177 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -65,8 +65,17 @@ is:
         data: CSV-skrÃ¡ sem flutt hefur veriÃ° Ãºt af Ã¶Ã°rum Mastodon-Ã¾jÃ³ni
       invite_request:
         text: Ãžetta mun hjÃ¡lpa okkur viÃ° aÃ° yfirfara umsÃ³knina Ã¾Ãna
+      ip_block:
+        comment: ValfrjÃ¡lst. Mundu hvers vegna Ã¾Ãº bÃ¦ttir Ã¾essari reglu viÃ°.
+        expires_in: IP-vistfÃ¶ng eru ekki Ã³endanleg, Ã¾eim er stundum deilt og skipta oftu um eigendur. Af Ã¾essum Ã¡stÃ¦Ã°um er ekki mÃ¦lt meÃ° Ã³takmÃ¶rkuÃ°um lokunum Ã¡ blokkir IP-vistfanga.
+        ip: Settu inn IPv4 eÃ°a IPv6 vistfang. ÃžÃº getur lokaÃ° Ã¡ sviÃ° vistfanga meÃ° Ã¾vÃ aÃ° nota CIDR-framsetningu. GÃ¦ttu Ã¾ess aÃ° loka ekki sjÃ¡lfa/n Ã¾ig Ãºti!
+        severities:
+          no_access: Loka Ã¡ aÃ°gang aÃ° Ã¶llum tilfÃ¶ngum
+          sign_up_requires_approval: NÃ½skrÃ¡ningar munu Ã¾urfa samÃ¾ykki Ã¾itt
+        severity: Veldu hvaÃ° munir gerast viÃ° beiÃ°nir frÃ¡ Ã¾essu IP-vistfangi
       sessions:
         otp: 'Settu inn tveggja-Ã¾Ã¡tta kÃ³Ã°ann sem farsÃmaforritiÃ° ÃºtbjÃ³ eÃ°a notaÃ°u einn af endurheimtukÃ³Ã°unum Ã¾Ãnum:'
+        webauthn: Ef Ã¾etta er USB-lykill, gakktu Ãºr skugga um aÃ° honum sÃ© stungiÃ° Ã samband og ef Ã¾Ã¶rf Ã¾ykir aÃ° Ã½ta Ã¡ hann.
       tag:
         name: ÃžÃº getur aÃ°eins breytt stafstÃ¶Ã°i mill hÃ¡-/lÃ¡gstafa, til gÃ¦mis til aÃ° gera Ã¾etta lÃ¦silegra
       user:
@@ -91,6 +100,7 @@ is:
         types:
           disable: Gera innskrÃ¡ningu Ã³virka
           none: Gera ekkert
+          sensitive: ViÃ°kvÃ¦mt
           silence: Hylja
           suspend: Setja Ã biÃ° og eyÃ°a endanlega gÃ¶gnum notandaaÃ°gangsins
         warning_preset_id: Nota forstillta aÃ°vÃ¶run
@@ -116,6 +126,7 @@ is:
         expires_in: Rennur Ãºt eftir
         fields: LÃ½sigÃ¶gn notandasniÃ°s
         header: SÃÃ°uhaus
+        honeypot: "%{label} (ekki fylla Ãºt)"
         inbox_url: URL-slÃ³Ã° Ã¡ innhÃ³lf endurvarpa
         irreversible: Fella niÃ°ur Ã staÃ°inn fyrir aÃ° fela
         locale: TungumÃ¡l viÃ°mÃ³ts
@@ -135,6 +146,7 @@ is:
         setting_default_privacy: Gagnaleynd fÃ¦rslna
         setting_default_sensitive: Alltaf merkja myndefni sem viÃ°kvÃ¦mt
         setting_delete_modal: Birta staÃ°festingarglugga Ã¡Ã°ur en tÃsti er eytt
+        setting_disable_swiping: Gera strokuhreyfingar Ã³virkar
         setting_display_media: Birting myndefnis
         setting_display_media_default: SjÃ¡lfgefiÃ°
         setting_display_media_hide_all: Fela allt
@@ -168,6 +180,13 @@ is:
         comment: Athugasemd
       invite_request:
         text: Hvers vegna viltu taka Ã¾Ã¡tt?
+      ip_block:
+        comment: Athugasemd
+        ip: IP-vistfang
+        severities:
+          no_access: Loka Ã¡ aÃ°gang
+          sign_up_requires_approval: Takmarka nÃ½skrÃ¡ningar
+        severity: Regla
       notification_emails:
         digest: Senda uppsafnaÃ°an tÃ¶lvupÃ³st
         favourite: Einhver setti stÃ¶Ã°ufÃ¦rslu Ã¾Ãna Ã eftirlÃ¦ti
@@ -188,4 +207,7 @@ is:
     required:
       mark: "*"
       text: nauÃ°synlegt
+    title:
+      sessions:
+        webauthn: Nota einn af Ã¶ryggislyklunum Ã¾Ãnum til aÃ° skrÃ¡ inn
     'yes': JÃ¡
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index f76ca05b674153aea6054660c75efeda57268efb..82f12861f48bf84ec164fba5e44e77c380544ea9 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -44,7 +44,7 @@ it:
         setting_default_sensitive: Media con contenuti sensibili sono nascosti in modo predefinito e possono essere rivelati con un click
         setting_display_media_default: Nascondi media segnati come sensibili
         setting_display_media_hide_all: Nascondi sempre tutti i media
-        setting_display_media_show_all: Nascondi sempre i media segnati come sensibili
+        setting_display_media_show_all: Mostra sempre i media segnati come sensibili
         setting_hide_network: Chi segui e chi segue te non saranno mostrati sul tuo profilo
         setting_noindex: Ha effetto sul tuo profilo pubblico e sulle pagine degli status
         setting_show_application: L'applicazione che usi per pubblicare i toot sarÃ  mostrata nella vista di dettaglio dei tuoi toot
@@ -65,8 +65,17 @@ it:
         data: File CSV esportato da un altro server Mastodon
       invite_request:
         text: Questo ci aiuterÃ  ad esaminare la tua richiesta
+      ip_block:
+        comment: Opzionale. Ricorda perchÃ© hai aggiunto questa regola.
+        expires_in: Gli indirizzi IP sono una risorsa finita, a volte sono condivisi e spesso cambiano possessore. Per questo motivo, i blocchi IP indefiniti non sono consigliati.
+        ip: Inserisci un indirizzo IPv4 o IPv6. Puoi bloccare interi intervalli usando la sintassi CIDR. Fai attenzione a non bloccare te stesso!
+        severities:
+          no_access: Blocca l'accesso a tutte le risorse
+          sign_up_requires_approval: Le nuove iscrizioni richiederanno la tua approvazione
+        severity: Scegli cosa accadrÃ  con le richieste da questo IP
       sessions:
         otp: 'Inserisci il codice a due fattori generato dall''app del tuo telefono o usa uno dei codici di recupero:'
+        webauthn: Se si tratta di una chiavetta USB assicurati di inserirla e, se necessario, toccarla.
       tag:
         name: Puoi cambiare solo il minuscolo/maiuscolo delle lettere, ad esempio, per renderlo piÃ¹ leggibile
       user:
@@ -91,6 +100,7 @@ it:
         types:
           disable: Disabilita
           none: Non fare nulla
+          sensitive: Sensibile
           silence: Silenzia
           suspend: Sospendi e cancella i dati dell'account in modo irreversibile
         warning_preset_id: Usa un avviso preimpostato
@@ -116,6 +126,7 @@ it:
         expires_in: Scade dopo
         fields: Metadati del profilo
         header: Intestazione
+        honeypot: "%{label} (non compilare)"
         inbox_url: URL della inbox del ripetitore
         irreversible: Elimina invece di nascondere
         locale: Lingua dell'interfaccia
@@ -135,6 +146,7 @@ it:
         setting_default_privacy: Privacy dei post
         setting_default_sensitive: Segna sempre i media come sensibili
         setting_delete_modal: Mostra dialogo di conferma prima di eliminare un toot
+        setting_disable_swiping: Disabilita i movimenti di scorrimento
         setting_display_media: Visualizzazione dei media
         setting_display_media_default: Predefinita
         setting_display_media_hide_all: Nascondi tutti
@@ -168,6 +180,13 @@ it:
         comment: Commento
       invite_request:
         text: PerchÃ© vuoi iscriverti?
+      ip_block:
+        comment: Commento
+        ip: IP
+        severities:
+          no_access: Blocca accesso
+          sign_up_requires_approval: Limita iscrizioni
+        severity: Regola
       notification_emails:
         digest: Invia email riassuntive
         favourite: Invia email quando segna come preferito al tuo stato
@@ -188,4 +207,7 @@ it:
     required:
       mark: "*"
       text: richiesto
+    title:
+      sessions:
+        webauthn: Usa una delle tue chiavi di sicurezza per accedere
     'yes': Si
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index bbc0b5fd77ead61493683745ff5d3c35bd24f964..abe986acd4a6c2c49e95c86679109428bb64a0e5 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -65,8 +65,17 @@ ja:
         data: ä»–ã® Mastodon ã‚µãƒ¼ãƒãƒ¼ã‹ã‚‰ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã—ãŸCSVãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžã—ã¦ä¸‹ã•ã„
       invite_request:
         text: ã“ã®ã‚µãƒ¼ãƒãƒ¼ã¯ç¾åœ¨æ‰¿èªåˆ¶ã§ã™ã€‚ç”³è«‹ã‚’æ‰¿èªã™ã‚‹éš›ã«å½¹ç«‹ã¤ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’æ·»ãˆã¦ãã ã•ã„
+      ip_block:
+        comment: ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§ã™ã€‚ã“ã®ãƒ«ãƒ¼ãƒ«ã‚’è¿½åŠ ã—ãŸç†ç”±ã®è¦šãˆæ›¸ãã«ã”åˆ©ç”¨ãã ã•ã„ã€‚
+        expires_in: IPã‚¢ãƒ‰ãƒ¬ã‚¹ã¯æœ‰é™ã®ãƒªã‚½ãƒ¼ã‚¹ã§ã™ã€‚è¤‡æ•°äººã§å…±æœ‰ã•ã‚ŒãŸã‚Šå¤‰æ›´ã•ã‚Œã‚‹ã“ã¨ã‚‚ã‚ã‚Šã¾ã™ã€‚ãã®ãŸã‚ç„¡æœŸé™ã«IPã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’ãƒ–ãƒãƒƒã‚¯ã™ã‚‹ã®ã¯æŽ¨å¥¨ã•ã‚Œã¾ã›ã‚“ã€‚
+        ip: IPv4ã¾ãŸã¯IPv6ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’å…¥åŠ›ã—ã¦ãã ã•ã„ã€‚CIDRæ§‹æ–‡ã‚’ç”¨ã„ã¦ç¯„å›²æŒ‡å®šã§ãƒ–ãƒãƒƒã‚¯ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚è‡ªåˆ†è‡ªèº«ã‚’ç· ã‚å‡ºã•ãªã„ã‚ˆã†æ³¨æ„ã—ã¦ãã ã•ã„ï¼
+        severities:
+          no_access: ã™ã¹ã¦ã®ãƒªã‚½ãƒ¼ã‚¹ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’ãƒ–ãƒãƒƒã‚¯ã—ã¾ã™
+          sign_up_requires_approval: æ‰¿èªã™ã‚‹ã¾ã§æ–°è¦ç™»éŒ²ãŒå®Œäº†ã—ãªããªã‚Šã¾ã™
+        severity: ã“ã®IPã«å¯¾ã™ã‚‹æŽªç½®ã‚’é¸æŠžã—ã¦ãã ã•ã„
       sessions:
         otp: 'æºå¸¯é›»è©±ã®ã‚¢ãƒ—ãƒªã§ç”Ÿæˆã•ã‚ŒãŸäºŒæ®µéšŽèªè¨¼ã‚³ãƒ¼ãƒ‰ã‚’å…¥åŠ›ã™ã‚‹ã‹ã€ãƒªã‚«ãƒãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã‚’ä½¿ç”¨ã—ã¦ãã ã•ã„:'
+        webauthn: USBã‚ãƒ¼ã®å ´åˆã¯ã€å¿…ãšæŒ¿å…¥ã—ã€å¿…è¦ã«å¿œã˜ã¦ã‚¿ãƒƒãƒ—ã—ã¦ãã ã•ã„ã€‚
       tag:
         name: è¦–èªæ€§å‘ä¸Šãªã©ã®ãŸã‚ã«ã‚¢ãƒ«ãƒ•ã‚¡ãƒ™ãƒƒãƒˆå¤§æ–‡å—å°æ–‡å—ã®å¤‰æ›´ã®ã¿è¡Œã†ã“ã¨ãŒã§ãã¾ã™
       user:
@@ -90,9 +99,10 @@ ja:
         type: ã‚¢ã‚¯ã‚·ãƒ§ãƒ³
         types:
           disable: ãƒã‚°ã‚¤ãƒ³ã‚’ç„¡åŠ¹åŒ–
-          none: ä½•ã‚‚ã—ãªã„
+          none: è¦å‘Šã‚’é€ä¿¡
+          sensitive: é–²è¦§æ³¨æ„
           silence: ã‚µã‚¤ãƒ¬ãƒ³ã‚¹
-          suspend: åœæ¢ã—ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ãƒ‡ãƒ¼ã‚¿ã‚’æ’ä¹…çš„ã«å‰Šé™¤ã™ã‚‹
+          suspend: åœæ¢
         warning_preset_id: ãƒ—ãƒªã‚»ãƒƒãƒˆè¦å‘Šæ–‡ã‚’ä½¿ç”¨
       announcement:
         all_day: çµ‚æ—¥
@@ -116,6 +126,7 @@ ja:
         expires_in: æœ‰åŠ¹æœŸé™
         fields: ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«è£œè¶³æƒ…å ±
         header: ãƒ˜ãƒƒãƒ€ãƒ¼
+        honeypot: "%{label} (å…¥åŠ›ã—ãªã„)"
         inbox_url: ãƒªãƒ¬ãƒ¼ã‚µãƒ¼ãƒãƒ¼ã® inbox URL
         irreversible: éš ã™ã®ã§ã¯ãªãé™¤å¤–ã™ã‚‹
         locale: è¨€èªž
@@ -135,6 +146,7 @@ ja:
         setting_default_privacy: æŠ•ç¨¿ã®å…¬é–‹ç¯„å›²
         setting_default_sensitive: ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’å¸¸ã«é–²è¦§æ³¨æ„ã¨ã—ã¦ãƒžãƒ¼ã‚¯ã™ã‚‹
         setting_delete_modal: ãƒˆã‚¥ãƒ¼ãƒˆã‚’å‰Šé™¤ã™ã‚‹å‰ã«ç¢ºèªãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’è¡¨ç¤ºã™ã‚‹
+        setting_disable_swiping: ã‚¹ãƒ¯ã‚¤ãƒ—ã§ã®åˆ‡ã‚Šæ›¿ãˆã‚’ç„¡åŠ¹ã«ã™ã‚‹
         setting_display_media: ãƒ¡ãƒ‡ã‚£ã‚¢ã®è¡¨ç¤º
         setting_display_media_default: æ¨™æº–
         setting_display_media_hide_all: éžè¡¨ç¤º
@@ -168,6 +180,13 @@ ja:
         comment: ã‚³ãƒ¡ãƒ³ãƒˆ
       invite_request:
         text: æ„æ°—è¾¼ã¿ã‚’ãŠèžã‹ã›ãã ã•ã„
+      ip_block:
+        comment: ã‚³ãƒ¡ãƒ³ãƒˆ
+        ip: IP
+        severities:
+          no_access: ãƒ–ãƒãƒƒã‚¯
+          sign_up_requires_approval: ç™»éŒ²ã‚’åˆ¶é™
+        severity: ãƒ«ãƒ¼ãƒ«
       notification_emails:
         digest: ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã‹ã‚‰ãƒ”ãƒƒã‚¯ã‚¢ãƒƒãƒ—ã—ã¦ãƒ¡ãƒ¼ãƒ«ã§é€šçŸ¥ã™ã‚‹
         favourite: ãŠæ°—ã«å…¥ã‚Šç™»éŒ²ã•ã‚ŒãŸæ™‚
@@ -188,4 +207,7 @@ ja:
     required:
       mark: "*"
       text: å¿…é ˆ
+    title:
+      sessions:
+        webauthn: ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ã‚ãƒ¼ã‚’ä½¿ç”¨ã—ã¦ã‚µã‚¤ãƒ³ã‚¤ãƒ³ã™ã‚‹
     'yes': ã¯ã„
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index d76af2c5737988cefce3d55fe2fc9a122fda8fb9..bbc23ed5127f7eb90ca212790becba0edecf5812 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -26,6 +26,10 @@ kab:
         name: 'Ahat ad tebÎ³uá¸ ad tesqedceá¸ yiwen gar-asen:'
       imports:
         data: Afaylu CSV id yusan seg uqeddac-nniá¸en n Maá¹£á¹udun
+      ip_block:
+        comment: D afrayan. Cfu É£ef wayÉ£er i terniá¸ alugen-a.
+        severities:
+          no_access: Sewá¸¥el anekcu É£er akk tiÉ£bula
     labels:
       account:
         fields:
@@ -42,6 +46,7 @@ kab:
           disable: Sens anekcum
           none: Ur teg kra
           silence: Sgugem
+          suspend: á¸¤bes di leÎµá¸il
       announcement:
         ends_at: Tagara n tedyant
         text: AlÉ£u
@@ -72,6 +77,7 @@ kab:
         setting_hide_network: Ffer azetta-kÂ·m
         setting_theme: Asental n wesmel
         setting_use_pending_items: Askar aleÎ³wayan
+        sign_in_token_attempt: Tangalt n tÉ£ellist
         username: Isem n useqdac
         username_or_email: Isem n useqdac neÎ³ imal
         whole_word: Awal akk
@@ -81,6 +87,15 @@ kab:
         comment: Awennit
       invite_request:
         text: Acimi tebÎ³iá¸ ad ternuá¸ iman-ik?
+      ip_block:
+        comment: Awennit
+        ip: IP
+        severities:
+          no_access: Sewá¸¥el anekcum
+        severity: Alugen
+      notification_emails:
+        mention: Yuder-ikÂ·em-id walbÉ›aá¸
+        reblog: Yella win yesselhan adda-dikÂ·im
       tag:
         name: Ahacá¹ag
     'no': Ala
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 7c05521fe452054052d69746b75aef1ed64b0046..5c47a99c446d2cdc7112c0406c32a10215d64469 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -65,8 +65,17 @@ ko:
         data: ë‹¤ë¥¸ ë§ˆìŠ¤í† ëˆ ì„œë²„ì—ì„œ ì¶”ì¶œëœ CSV íŒŒì¼
       invite_request:
         text: ì´ ì •ë³´ëŠ” ìš°ë¦¬ê°€ ì‹¬ì‚¬ë¥¼ í•˜ëŠ” ë°ì— ì°¸ê³ í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤
+      ip_block:
+        comment: í•„ìˆ˜ ì•„ë‹˜. ì™œ ì´ ê·œì¹™ì„ ì¶”ê°€í–ˆëŠ”ì§€ ê¸°ì–µí•˜ì„¸ìš”.
+        expires_in: IP ì£¼ì†ŒëŠ” í•œì •ëœ ìžì›ìž…ë‹ˆë‹¤, ì´ê²ƒë“¤ì€ ê°€ë” ê³µìœ  ë˜ê±°ë‚˜ ìžì£¼ ì†Œìœ ìžê°€ ë°”ë€Œê¸°ë„ í•©ë‹ˆë‹¤. ì´ëŸ° ì´ìœ ë¡œ ì¸í•´, IP ì°¨ë‹¨ì„ ì˜êµ¬ížˆ ìœ ì§€í•˜ëŠ” ê²ƒì€ ì¶”ì²œí•˜ì§€ ì•ŠìŠµë‹ˆë‹¤.
+        ip: IPv4 ë˜ëŠ” IPv6 ì£¼ì†Œë¥¼ ìž…ë ¥í•˜ì„¸ìš”. CIDR ë¬¸ë²•ì„ ì‚¬ìš©í•´ì„œ ëª¨ë“  ë²”ìœ„ë¥¼ ì°¨ë‹¨í•  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. ìžê¸° ìžì‹ ì„ ìž ê°€ë²„ë¦¬ì§€ ì•Šë„ë¡ ì£¼ì˜í•˜ì„¸ìš”!
+        severities:
+          no_access: ëª¨ë“  ìžì›ì— ëŒ€í•œ ì ‘ê·¼ ì°¨ë‹¨
+          sign_up_requires_approval: ìƒˆ ê°€ìž…ì´ ìŠ¹ì¸ì„ í•„ìš”ë¡œ í•˜ë„ë¡ í•©ë‹ˆë‹¤
+        severity: í•´ë‹¹ IPë¡œë¶€í„°ì˜ ìš”ì²ì— ëŒ€í•´ ë¬´ì—‡ì´ ì¼ì–´ë‚˜ê²Œ í•  ì§€ ê³ ë¥´ì„¸ìš”
       sessions:
         otp: 'íœ´ëŒ€ì „í™”ì—ì„œ ìƒì„± ëœ 2ë‹¨ê³„ ì¸ì¦ ì½”ë“œë¥¼ ìž…ë ¥í•˜ê±°ë‚˜, ë³µêµ¬ ì½”ë“œ ì¤‘ í•˜ë‚˜ë¥¼ ì‚¬ìš©í•˜ì„¸ìš”:'
+        webauthn: USB í‚¤ë¼ë©´ ì‚½ìž…í–ˆëŠ”ì§€ í™•ì¸í•˜ê³ , í•„ìš”í•˜ë‹¤ë©´ ëˆ„ë¥´ì„¸ìš”.
       tag:
         name: ì½ê¸° ì‰½ê²Œí•˜ê¸° ìœ„í•œ ê¸€ìžì˜ ëŒ€ì†Œë¬¸ìžë§Œ ë³€ê²½í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤.
       user:
@@ -91,6 +100,7 @@ ko:
         types:
           disable: ë¹„í™œì„±í™”
           none: ì•„ë¬´ ê²ƒë„ í•˜ì§€ ì•Šê¸°
+          sensitive: ë¯¼ê°í•¨
           silence: ì¹¨ë¬µ
           suspend: ì •ì§€í•˜ê³  ë˜ëŒë¦´ ìˆ˜ ì—†ëŠ” ë°ì´í„° ì‚ì œ
         warning_preset_id: ê²½ê³  í‹€ ì‚¬ìš©í•˜ê¸°
@@ -116,6 +126,7 @@ ko:
         expires_in: ë§Œë£Œì‹œê°
         fields: í”„ë¡œí•„ ë©”íƒ€ë°ì´í„°
         header: í—¤ë”
+        honeypot: "%{label} (ì±„ìš°ì§€ ë§ˆì‹œì˜¤)"
         inbox_url: ë¦´ë ˆì´ ì„œë²„ì˜ inbox URL
         irreversible: ìˆ¨ê¸°ëŠ” ëŒ€ì‹  ì‚ì œ
         locale: ì¸í„°íŽ˜ì´ìŠ¤ ì–¸ì–´
@@ -135,6 +146,7 @@ ko:
         setting_default_privacy: íˆ¿ í”„ë¼ì´ë²„ì‹œ
         setting_default_sensitive: ë¯¸ë””ì–´ë¥¼ ì–¸ì œë‚˜ ë¯¼ê°í•œ ì»¨í…ì¸ ë¡œ ì„¤ì •
         setting_delete_modal: íˆ¿ ì‚ì œ ì „ í™•ì¸ ì°½ì„ í‘œì‹œ
+        setting_disable_swiping: ìŠ¤ì™€ì´í”„ ëª¨ì…˜ ë¹„í™œì„±í™”
         setting_display_media: ë¯¸ë””ì–´ í‘œì‹œ
         setting_display_media_default: ê¸°ë³¸
         setting_display_media_hide_all: ëª¨ë‘ ê°€ë¦¬ê¸°
@@ -168,6 +180,13 @@ ko:
         comment: ì£¼ì„
       invite_request:
         text: ê°€ìž…í•˜ë ¤ëŠ” ì´ìœ ê°€ ë¬´ì—‡ì¸ê°€ìš”?
+      ip_block:
+        comment: ì£¼ì„
+        ip: IP
+        severities:
+          no_access: ì ‘ê·¼ ì°¨ë‹¨
+          sign_up_requires_approval: ê°€ìž… ì œí•œ
+        severity: ê·œì¹™
       notification_emails:
         digest: ìš”ì•½ ì´ë©”ì¼ ë³´ë‚´ê¸°
         favourite: ëˆ„êµ°ê°€ ë‚´ ìƒíƒœë¥¼ ì¦ê²¨ì°¾ê¸°ë¡œ ë“±ë¡í–ˆì„ ë•Œ ì´ë©”ì¼ ë³´ë‚´ê¸°
@@ -188,4 +207,7 @@ ko:
     required:
       mark: "*"
       text: í•„ìˆ˜ í•ëª©
+    title:
+      sessions:
+        webauthn: ë¡œê·¸ì¸í•˜ê¸° ìœ„í•´ì„œ ë³´ì•ˆ í‚¤ë¥¼ ì‚¬ìš©í•´ ì£¼ì„¸ìš”
     'yes': ë„¤
diff --git a/config/locales/simple_form.ku.yml b/config/locales/simple_form.ku.yml
index cc251e86ae3fc9c96ba4a32a86e9e41868ac09d9..8ff8a5a46c6523339cc581072272d2923d34ee75 100644
--- a/config/locales/simple_form.ku.yml
+++ b/config/locales/simple_form.ku.yml
@@ -1 +1,212 @@
-ckb-IR:
+---
+ku:
+  simple_form:
+    hints:
+      account_alias:
+        acct: Ø¯ÛŒØ§Ø±ÛŒÚ©Ø±Ø¯Ù†ÛŒ username@domain Ø¦Û•Ùˆ Ù‡Û•Ú˜Ù…Ø§Ø±Û• Ú©Û• Ø¯Û•ØªÛ•ÙˆÛŽØª Ø¨ÛŒÚ¯ÙˆØ§Ø²ÛŒÛ•ÙˆÛ• Ù„Û•
+      account_migration:
+        acct: Ø¯ÛŒØ§Ø±ÛŒÚ©Ø±Ø¯Ù†ÛŒ username@domain Ø¦Û•Ùˆ Ù‡Û•Ú˜Ù…Ø§Ø±Û• Ú©Û• Ø¯Û•ØªÛ•ÙˆÛŽØª Ø¨ÛŒÚ¯ÙˆØ§Ø²ÛŒÛ•ÙˆÛ• Ù„Û•
+      account_warning_preset:
+        text: Ø¯Û•ØªÙˆØ§Ù†ÛŒ Ú•Ø³ØªÛ•Ø³Ø§Ø²ÛŒ ÛŒ ØªÙˆØª Ø¨Û•Ú©Ø§Ø±Ø¨ÛŽÙ†ÛŒØªØŒ ÙˆÛ•Ú© Ù„ÛŒÙ†Ú©ØŒ Ù‡Ø§Ø´ØªØ§Ú¯ Ùˆ Ø¨Ø§Ø³Û•Ú©Ø§Ù†
+        title: Ø¦Ø§Ø±Û•Ø²ÙˆÙˆÙ…Û•Ù†Ø¯Ø§Ù†Û•. Ø¯ÛŒØ§Ø± Ù†ÛŒÛ• Ø¨Û† ÙˆÛ•Ø±Ú¯Ø±
+      admin_account_action:
+        include_statuses: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Û•Ú©Û• Ø¯Û•Ø¨ÛŒÙ†ÛŽØª Ú©Ø§Ù… ØªÙˆØªÛŒ Ù‡Û†Ú©Ø§Ø±ÛŒ Ú©Ø±Ø¯Ø§Ø±ÛŒ Ø¨Û•Ú•ÛŽÙˆÛ•Ø¨Û•Ø± ÛŒØ§Ù† Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±Ú©Ø±Ø¯Ù†Û•ÙˆÛ•
+        send_email_notification: Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø± Ú•ÙˆÙ†Ù†Ú©Ø±Ø¯Û•ÙˆÛ•ÛŒÛ•Ú© Ø¯Û•Ø¨ÛŒÙ†ÛŽØª Ú©Û• ØªÛŽØ¯Ø§ Ø¯Û•Ø²Ø§Ù†ÛŽØª Ú†ÛŒ Ø¨Û• Ø³Û•Ø± Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•ÛŒ Ù‡Ø§ØªÙˆÙˆÛ•
+        text_html: Ø¦Ø§Ø±Ø²ÙˆÙˆÙ…Û•Ù†Ø¯Ø§Ù†Û•. Ø¯Û•ØªÙˆØ§Ù†Ù† ÙˆÛ•Ú© ØªÙˆØªÛŒ Ø¦Ø§Ø³Ø§ÛŒÛŒ Ø¨ÛŒÙ†ÙˆÙˆØ³Ù†. Ø¯Û•ØªÙˆØ§Ù†Ù† Ø¨Û† Ú©Û•Ù…Ú©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ú©Ø§Øª <a href="%{path}">Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒÛŒÛ•Ú©Ø§Ù† Ù„Û• Ù¾ÛŽØ´Û•ÙˆÛ• Ø²ÛŒØ§Ø¯Ø¨Ú©Û•Ù†</a>
+        type_html: Ú¯Û•Ø±Ú©ØªÛ• Ù„Û•Ú¯Û•Úµ Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒ <strong>%{acct}</strong> Ú†ÛŒ Ø¨Ú©Û•ÛŒØª
+        warning_preset_id: Ø¦Ø§Ø±Û•Ø²ÙˆÙˆÙ…Û•Ù†Ø¯Ø§Ù†Û•ÛŒÛ•. Ù‡ÛŽØ´ØªØ§ Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ù„Û• Ú©Û†ØªØ§ÛŒÛŒ Ø¯Û•Ù‚ Ø´ØªÛŽÚ© Ø²ÛŒØ§Ø¯ Ø¨Ú©Û•ÛŒ
+      announcement:
+        all_day: Ú©Ø§ØªÛŽÚ© Ú†Ø§ÙˆØ¯ÛŽØ±ÛŒÚ©Ø±Ø§ØŒ ØªÛ•Ù†Ù‡Ø§ Ø¨Û•Ø±ÙˆØ§Ø±Û•Ú©Ø§Ù†ÛŒ Ù…Û•ÙˆØ¯Ø§ÛŒ Ú©Ø§Øª Ù¾ÛŒØ´Ø§Ù† Ø¯Û•Ø¯Ø±ÛŽØª
+        ends_at: Ø¦Ø§Ø±Û•Ø²ÙˆÙˆÙ…Û•Ù†Ø¯Ø§Ù†Û•ÛŒÛ•. Ø¦Û•Ù… Ú©Ø§ØªÛ• Ø±Ø§Ú¯Û•ÛŒÛ•Ù†Ø±Ø§ÙˆÛ•Ú©Û• Ø¨Û• Ø´ÛŽÙˆÛ•ÛŒÛ•Ú©ÛŒ Ø®Û†Ú©Ø§Ø±Ø§Ù†Û• Ø¨ÚµØ§ÙˆÙ†Ø§Ú©Ø±ÛŽØªÛ•ÙˆÛ•
+        scheduled_at: Ú†Û†Úµ ÛŒØ¨Ù‡ÛŽÚµÛ•ÙˆÛ• Ø¨Û† Ø¨ÚµØ§ÙˆÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ø¯Û•Ø³ØªØ¨Û•Ø¬ÛŽÛŒ Ø¨Ø§Ù†Ú¯Û•ÙˆØ§Ø²Û•Ú©Û•
+        starts_at: Ø¦Ø§Ø±Û•Ø²ÙˆÙˆÙ…Û•Ù†Ø¯Ø§Ù†Û•ÛŒÛ•. Ù„Û• ØØ§ÚµÛ•ØªÛŒ Ú•Ø§Ú¯Û•ÛŒØ§Ù†Ø¯Ù†ÛŒ ØªÛ† Ø¨Û•Ø³ØªØ±Ø§Ùˆ Ø¨Û• Ù…Û•ÙˆØ¯Ø§ÛŒÛ•Ú©ÛŒ Ú©Ø§ØªÛŒ Ø¯ÛŒØ§Ø±ÛŒÚ©Ø±Ø§Ùˆ
+        text: Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ú•Ø³ØªÛ•Ø³Ø§Ø²ÛŒ ØªÙˆØª Ø¨Û•Ú©Ø§Ø± Ø¨ÛŽÙ†ÛŒØª. ØªÚ©Ø§ÛŒÛ• Ø¨ÛŒØ± Ù„Û•Ùˆ Ø¨Û†Ø´Ø§ÛŒÛŒÛ• Ø¨Ú©Û•ÙˆÛ• Ú©Û• Ø¨Ø§Ù†Ú¯Û•ÙˆØ§Ø²Û•Ú©Û• Ù„Û•Ø³Û•Ø± Ø´Ø§Ø´Û•ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Û•Ú©Û• Ø¯Û•Ø³Øª Ù†ÛŒØ´Ø§Ù† Ø¯Û•Ú©Ø§Øª
+      defaults:
+        autofollow: Ø¦Û•Ùˆ Ú©Û•Ø³Ø§Ù†Û•ÛŒ Ú©Û• Ù„Û• Ú•ÛŽÚ¯Û•ÛŒ Ø¨Ø§Ù†Ú¯Ù‡ÛŽØ´ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ• ØªÛ†Ù…Ø§Ø± Ø¯Û•Ú©Ø±ÛŽÙ† Ø¨Û• Ø®Û†Ú©Ø§Ø±Ø§Ù†Û• Ø´ÙˆÛŽÙ†Øª Ø¯Û•Ú©Û•ÙˆÙ†
+        avatar: PNG, GIF ÛŒØ§Ù† JPG. Ù„Û• Ø²Û†Ø±Ø¨Û•ÛŒ %{size}. Ø¯Û•Ø¨ÛŽØªÛ• Ø¦Û•Ù†Ø¯Ø§Ø²Û•ÛŒÛ•Ú©ÛŒ Ú©Û•Ù…Ú©Ø±Ø§ÙˆÛ• Ø¨Û† %{dimensions}px
+        bot: Ø¦Û•Ù… Ù‡Û•Ú˜Ù…Ø§Ø±Û• Ø¨Û•Ø´ÛŽÙˆÛ•ÛŒÛ•Ú©ÛŒ Ø³Û•Ø±Û•Ú©ÛŒ Ú©Ø±Ø¯Ø§Ø±Û• Ø®Û†Ú©Ø§Ø±Ø§Ù†Û• Ø¦Û•Ù†Ø¬Ø§Ù… Ø¯Û•Ø¯Ø§Øª Ùˆ Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ú†Ø§ÙˆØ¯ÛŽØ±ÛŒ Ù†Û•Ú©Ø±ÛŽØª
+        context: ÛŒÛ•Ú© ÛŒØ§Ù† Ú†Û•Ù†Ø¯ Ø¯Û•Ù‚ÛŽÚ© Ú©Û• Ù¾Ø§Ù„Ø§ÙØªÙ†Û•Ú©Û• Ø¬ÛŽØ¨Û•Ø¬ÛŽ Ø¨Ú©Ø§Øª
+        current_password: Ø¨Û† Ù…Û•Ø¨Û•Ø³ØªÛŒ Ù¾Ø§Ø±Ø§Ø³ØªÙ† ØªÚ©Ø§ÛŒÛ• ØªÛŽÙ¾Û•Ø±ÙˆØ´Û•ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒ Ø¦ÛŽØ³ØªØ§Ú©Û•Øª Ø¨Ù†ÙˆÙˆØ³Û•
+        current_username: Ø¨Û† Ø¯ÚµÙ†ÛŒØ§Ø¨ÙˆÙˆÙ†ØŒ ØªÚ©Ø§ÛŒÛ• Ù†Ø§ÙˆÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŒ Ø¦Û•Ù… Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒÛ• Ø¨Ù†ÙˆÙˆØ³Û•
+        digest: ØªÛ•Ù†ÛŒØ§ Ø¯ÙˆØ§ÛŒ Ù…Ø§ÙˆÛ•ÛŒÛ•Ú©ÛŒ Ø²Û†Ø± Ù„Û• Ø¨ÛŽ Ú†Ø§Ù„Ø§Ú©ÛŒØ¯Û•Ù†ÛŽØ±Ø¯Ø±ÛŽØª Ùˆ ØªÛ•Ù†ÛŒØ§ Ø¦Û•Ú¯Û•Ø± Ù†Ø§Ù…Û•ÛŒÛ•Ú©ÛŒ Ú©Û•Ø³ÛŒØª Ø¨Û† Ù†ÙˆÙˆØ³Ø±Ø§Ø¨ÛŽØª
+        discoverable: Ù¾ÛŽØ±Ø³ØªÛŒ Ù‡Û•ÚµØ¨Ú˜Ø§Ø±Ø¯Û•ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù†ØŒØªÛ•Ù†Ù‡Ø§ Ú•ÛŒÚ¯Ø§ÛŒÛ•Ú©ÛŒ Ø¯ÛŒÚ©Û•ÛŒÛ• Ø¨Û† Ú¯Û•ÛŒØ´ØªÙ†ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŒ ÙØ±Û•ØªØ± Ø¨Û† Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª
+        email: Ø¦ÛŒÙ…Û•ÛŒÚµÛŽÚ©ÛŒ Ù¾Ø´ØªÚ•Ø§Ø³ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ•Øª Ø¨Û† Ø¯Û•Ù†ÛŽØ±Ø¯Ø±ÛŽØª
+        fields: Ø¯Û•ØªÙˆØ§Ù†ÛŒØª ØªØ§ Ù¤Ø¨Ú•Ú¯Û•Øª Ù‡Û•Ø¨ÛŽØª Ú©Û• ÙˆÛ•Ú© Ø®Ø´ØªÛ•ÛŒÛ•Ú© Ù„Û•Ø³Û•Ø± Ù¾Ø±Û†ÙØ§ÛŒÙ„Û•Ú©Û•Øª Ù¾ÛŒØ´Ø§Ù† Ø¨Ø¯Ø±ÛŽØª
+        header: PNG, GIF ÛŒØ§Ù† JPG. Ù„Û• Ø²Û†Ø±Ø¨Û•ÛŒ %{size}. Ø¯Û•Ø¨ÛŽØªÛ• Ø¦Û•Ù†Ø¯Ø§Ø²Û•ÛŒÛ•Ú©ÛŒ Ú©Û•Ù…Ú©Ø±Ø§ÙˆÛ• Ø¨Û† %{dimensions}Ù¾ÛŒÚ©Ø³ÛŽÚµ
+        inbox_url: Ù†ÛŒØ´Ø§Ù†Û•ÛŒ Ù¾Û•Ú•Û•ÛŒ Ø³Û•Ø±Û•Ú©ÛŒ Ø¦Û•Ùˆ Ø±ÛŽÚµÛ• Ú©Û• Ù‡Û•Ø±Û•Ú©ØªÛ• Ø¨Û•Ú©Ø§Ø±ÛŒØ¨Ø¨Û•ÛŒØª Ú•ÙˆÙˆÙ†ÙˆÙˆØ³ Ø¯Û•Ú©Ø§Øª
+        irreversible: ØªÙˆØªÛ• ÙÙ„ØªÛ•Ø±Ú©Ø±Ø§ÙˆÛ•Ú©Û• Ø¨Û• Ø´ÛŽÙˆÛ•ÛŒÛ•Ú©ÛŒ Ù†Û•Ú¯Û•Ú•Ø§Ùˆ ÙØ±Û•Ø¯Û•Ø¯Ø±ÛŽÙ†ØŒ ØªÛ•Ù†Ø§Ù†Û•Øª Ø¦Û•Ú¯Û•Ø± ÙÙ„ØªÛ•Ø±Ø¯ÙˆØ§ØªØ± Ù„Ø§Ø¨Ø¨Ø±ÛŽØª
+        locale: Ø²Ù…Ø§Ù†ÛŒ Ú•ÙˆÙˆÚ©Ø§Ø±ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ØŒ Ø¦ÛŒÙ…Û•ÛŒÙ„Û•Ú©Ø§Ù† Ùˆ Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù†
+        locked: Ø¨Û• Ø¯Û•Ø³ØªÛŒ Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆØ§Ù†ÛŒ Ø®Û†Øª Ù¾Û•Ø³Û•Ù†Ø¯ Ø¨Ú©Û•
+        password: Ø¨Û•Ù„Ø§ÛŒÛ•Ù†ÛŒ Ú©Û•Ù…Û•ÙˆÛ• Ù¨ Ù†ÙˆÙˆØ³Û• Ø¨Û•Ú©Ø§Ø±Ø¨Ù‡ÛŽÙ†Û•
+        phrase: Ø³Û•Ø±Ø¨Û•Ø®Û† Ù„Û• Ø¨Ú†Ú©Û†Ù„ÛŒ Ùˆ Ú¯Û•ÙˆØ±Û•ÛŒÛŒ Ù¾ÛŒØªÛ•Ú©Ø§Ù†ØŒ Ù„Û•Ú¯Û•Úµ Ø¯Û•Ù‚ÛŒ Ø¦Û•Ø³ÚµÛŒ ÛŒØ§Ù† Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù†ÛŒ Ù†Ø§ÙˆÛ•Ø±Û†Ú©ÛŒ ØªÙˆØªÛ•Ú©Ø§Ù† Ù‡Ø§ÙˆØ¦Ø§Ù‡Û•Ù†Ú¯ Ø¯Û•Ú©Ø±ÛŽØª
+        scopes: APIÙ€ÛŒÛ•Ú©Ø§Ù†ÛŒ Ø¨Û•Ø±Ù†Ø§Ù…Û•Ù†ÙˆÙˆØ³ÛŒ Ú©Û• Ø¦Û•Ù… Ù…Ø§ÚµÙ¾Û•Ú•Û• Ø¯Û•Ø³ØªÙ¾ÛŽÚ¯Û•ÛŒØ´ØªÙ†ÛŒ Ù„Û•Ú¯Û•ÚµÛŒØ§Ù† Ù‡ÛŒÛ•. Ø¦Û•Ú¯Û•Ø± Ø¨Û•Ø±Ø²ØªØ±ÛŒÙ† Ø¦Ø§Ø³Øª Ù‡Û•ÚµØ¨Ú˜ÛŽØ±Ù† Ø¦ÛŒØªØ± Ù†ÛŒØ§Ø² Ø¨Û• Ø¨Ú˜Ø§Ø±Ø¯Û•ÛŒ Ø¦Ø§Ø³ØªÛŒ Ù†Ø²Ù… Ù†ÛŒÛŒÛ•.
+        setting_aggregate_reblogs: Ø¨Û† Ø¦Û•Ùˆ Ø¯ÙˆÙˆØ¨Ø§Ø±Û• ØªÙˆØªØ§Ù†Û• Ú©Û• Ø¨Û• Ù†ÙˆÛŽÛŒÛŒ Ù¾ÛŽØªØ§Ù† Ù†ÛŒØ´Ø§Ù† Ø¯Ø±Ø§ÙˆÛ•ØŒØ¯ÙˆÙˆØ¨Ø§Ø±Û• ØªÙˆØªÛ•Ú©Ø§Ù†ÛŒ Ù¾ÛŽØ´ØªØ± Ø²ÛŒØ§Ø¯ Ù…Û•Ú©Û•(ØªÛ•Ù†Ù‡Ø§ Ú©Ø§Ø±ÛŒÚ¯Û•Ø±ÛŒ Ù„Û•Ø³Û•Ø± ØªÙˆØªÛ•Ú©Ø§Ù†ÛŒ Ø¦Û•Ù… Ø¯ÙˆØ§ÛŒÛŒÛ• Ù‡Û•ÛŒÛ•)
+        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: Ø³ÛŽØ¨Û•Ø±Û•Ú©Ø§Ù† Ù„Û• Ø³Û•Ø± Ø¨Ù†Û•Ù…Ø§ÛŒ Ú•Û•Ù†Ú¯Û•Ú©Ø§Ù†ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡Ø§ØªÙˆÙˆ Ù„Û• ÙˆÛŽÙ†Û• Ø¯Ø§Ø´Ø§Ø±Ø§ÙˆÛ•Ú©Ø§Ù† Ø¯Ø±ÙˆØ³Øª Ø¯Û•Ø¨Ù† Ø¨Û•ÚµØ§Ù… ÙˆØ±Ø¯Û•Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ ÙˆÛŽÙ†Û• ØªÛŽÛŒØ¯Ø§ Ú•ÙˆÙˆÙ† Ù†ÛŒÛŒÛ•
+        setting_use_pending_items: Ù„Û•Ø¬ÛŒØ§ØªÛŒ Ø¦Û•ÙˆÛ•ÛŒ Ø¨Û• Ø®Û†Ú©Ø§Ø±Ø§Ù†Û• Ú©ÛŽØ´Ø§Ù† Ù‡Û•Ø¨ÛŽØª Ù„Û• Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•Ú©Ø§Ù† Ø¨Û• Ú©Ø±ØªÛ•ÛŒÛ•Ú© Ø¨Û•Ú•Û†Ú˜Ø¨ÙˆÙˆÙ†ÛŒ Ù¾ÛŽØ±Ø³ØªÛŒ Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•Ú©Ø§Ù† Ø¨Ø´Ø§Ø±Û•ÙˆÛ•
+        username: Ù†Ø§ÙˆÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±ÛŒ Ø¦ÛŽÙˆÛ• Ù„Û•Ø³Û•Ø± %{domain} ÛŒÛ•Ú©ØªØ§ Ø¯Û•Ø¨ÛŽØª
+        whole_word: Ú©Ø§ØªÛŽÚ© Ú©Ù„ÛŒÙ„â€ŒÙˆØ´Û• Ø¨Ø±ÛŒØªÛŒÛŒÛ• Ù„Û• Ú˜Ù…Ø§Ø±Û• Ùˆ Ù¾ÛŒØªØŒ ØªÙ†Û•Ù‡Ø§ Ú©Ø§ØªÛŽÚ© Ù¾Û•ÛŒØ¯Ø§ Ø¯Û•Ø¨ÛŽØª Ú©Û• Ù„Û•Ú¯Û•Úµ Ú¯Ø´ØªÛŒ ÙˆØ´Û• Ù„Û• Ù†ÛŽÙˆ Ø¯Û•Ù‚Û•Ú©Û• Ù‡Ø§ÙˆØ¦Ø§Ù‡Û•Ù†Ú¯ Ø¨ÛŽØªØŒ Ù†Û• ØªÛ•Ù†Ù‡Ø§ Ù„Û•Ú¯Û•Úµ Ø¨Û•Ø´ÛŽÚ© Ù„Û• ÙˆØ´Û•
+      domain_allow:
+        domain: Ø¦Û•Ù… Ø¯Û†Ù…Û•ÛŒÙ†Û• Ø¯Û•ØªÙˆØ§Ù†ÛŽØª Ø¯Ø±Ø§ÙˆÛ• Ù„Û• Ø¦Û•Ù… Ú•Ø§Ú˜Û• ÙˆÛ•Ø±Ø¨Ú¯Ø±ÛŽØª Ùˆ Ø¯Ø±Ø§ÙˆÛ•ÛŒ Ø¦Û•Ù… Ø¯Û†Ù…Û•ÛŒÙ†Û• Ù„ÛŽØ±Û• Ú•ÛŽÚ©Ø¯Û•Ø®Ø±ÛŒÙ† Ùˆ Ù¾Ø§Ø´Ú©Û•ÙˆØª Ø¯Û•Ú©Ø±ÛŽÙ†
+      email_domain_block:
+        domain: Ø¦Û•Ù…Û• Ø¯Û•Ú©Ø±ÛŽØª Ù†Ø§ÙˆÛŒ Ø¯Û†Ù…Û•ÛŒÙ†Û•Ú©Û• Ø¨ÛŽØª Ú©Û• Ù„Û• Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÙ„Ø¯Ø§ Ø¯Û•Ø±Ú©Û•ÙˆÛŽØŒ ØªÛ†Ù…Ø§Ø±ÛŒ MX Ú©Û• Ø¯Û†Ù…Û•ÛŒÙ† Ú†Ø§Ø±Û•Ø³Û•Ø±ÛŒ Ø¯Û•Ú©Ø§Øª ÛŒØ§Ù† IPÛŒ Ú•Ø§Ú˜Û•Ú©Û• Ú©Û• ØªÛ†Ù…Ø§Ø±ÛŒ MX Ú†Ø§Ø±Û•Ø³Û•Ø±ÛŒ Ø¯Û•Ú©Ø§Øª. Ø¦Û•ÙˆØ§Ù†Û• Ø¯Û•Ù¾Ø´Ú©Ù†Ù† Ù„Û•Ø³Û•Ø± ØªÛ†Ù…Ø§Ø±Ú©Ø±Ø¯Ù†ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø± Ùˆ ØªÛ†Ù…Ø§Ø±Ú©Ø±Ø¯Ù† Ú•Û•Øª Ø¯Û•Ú©Ø±ÛŽØª.
+        with_dns_records: Ù‡Û•ÙˆÚµÛŽÚ© Ø¨Û† Ú†Ø§Ø±Û•Ø³Û•Ø±Ú©Ø±Ø¯Ù†ÛŒ ØªÛ†Ù…Ø§Ø±Û•Ú©Ø§Ù†ÛŒ DNSÛŒ Ø¯Û†Ù…Û•ÛŒÙ† Ø¯Ø±Ø§ÙˆÛ• Ú©Û• Ø¦Û•Ù†Ø¬Ø§Ù…Û•Ú©Ø§Ù† Ø¨Ù„Û†Ú© Ø¯Û•Ú©Ø±ÛŽØª
+      featured_tag:
+        name: 'Ù„Û•ÙˆØ§Ù†Û•ÛŒÛ• Ø¨ØªÛ•ÙˆÛŽØª ÛŒÛ•Ú©ÛŽÚ© Ù„Û•Ù…Ø§Ù†Û• Ø¨Û•Ú©Ø§Ø±Ø¨Ù‡ÛŽÙ†ÛŒØª:'
+      form_challenge:
+        current_password: ØªÛ† Ø¯Û•Ú†ÛŒØªÛ• Ù†Ø§Ùˆ Ù†Ø§ÙˆÚ†Û•ÛŒ Ù¾Ø§Ø±ÛŽØ²Ø±Ø§Ùˆ
+      imports:
+        data: ÙØ§ÛŒÙ„ÛŒ CSV Ù‡Û•Ù†Ø§Ø±Ø¯Û•Ú©Ø±Ø§ÙˆÛ• Ù„Û• Ú•Ø§Ú˜Û•ÛŒÛ•Ú©ÛŒ ØªØ±ÛŒ Ù…Ø§Ø³ØªÛ†Ø¯Û†Ù†
+      invite_request:
+        text: Ø¦Û•Ù…Û• ÛŒØ§Ø±Ù…Û•ØªÛŒÙ…Ø§Ù† Ø¯Û•Ø¯Ø§Øª Ø¨Û† Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ•ÛŒ Ø¨Û•Ø±Ù†Ø§Ù…Û•Ú©Û•Øª
+      ip_block:
+        comment: Ø¯ÚµØ®ÙˆØ§Ø²Û•. Ù„Û•Ø¨ÛŒØ±ØªÛ• Ø¨Û†Ú†ÛŒ Ø¦Û•Ù… ÛŒØ§Ø³Ø§ÛŒÛ•Øª Ø²ÛŒØ§Ø¯ Ú©Ø±Ø¯.
+        expires_in: Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ IP Ø³Û•Ø±Ú†Ø§ÙˆÛ•ÛŒ Ø³Ù†ÙˆØ±Ø¯Ø§Ø±Ù†ØŒ Ù‡Û•Ù†Ø¯ÛŽÚ© Ø¬Ø§Ø± Ù‡Ø§ÙˆØ¨Û•Ø´Ú©Ø±Ø§ÙˆÙ† Ùˆ Ø²Û†Ø± Ø¬Ø§Ø± Ø¯Û•Ø³ØªÛ•Ú©Ø§Ù† Ø¯Û•Ú¯Û†Ú•Ù†. Ù„Û•Ø¨Û•Ø± Ø¦Û•Ù… Ù‡Û†ÛŒÛ•ØŒ Ø¨Ù„Û†Ú©ÛŒ IP Ø¨ÛŽ Ù†Û•Ù†Ø§Ø³Ø±Ø§Ùˆ Ù¾ÛŽØ´Ù†ÛŒØ§Ø± Ù†Û•Ú©Ø±Ø§ÙˆÛ•.
+        ip: Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ IPv4 ÛŒØ§Ù† IPv6 ØªÛŽØ¨Ù†ÙˆÙˆØ³Û•. Ø¯Û•ØªÙˆØ§Ù†ÛŒØª Ù‡Û•Ù…ÙˆÙˆ Ù…Û•ÙˆØ¯Ø§Ú©Ø§Ù† Ø¨Ù„Û†Ú© Ø¨Ú©Û•ÛŒØª Ø¨Û• Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø§Ù†ÛŒ Ø¯Ø§Ú•Ø³ØªØ§Ù†ÛŒ CIDR. ÙˆØ±ÛŒØ§Ø¨Û• Ø®Û†Øª Ù‚ÙÚµ Ù…Û•Ú©Û•!
+        severities:
+          no_access: Ø¨Ù„Û†Ú©Ú©Ø±Ø¯Ù†ÛŒ Ú¯Û•ÛŒØ´ØªÙ† Ø¨Û• Ù‡Û•Ù…ÙˆÙˆ Ø³Û•Ø±Ú†Ø§ÙˆÛ•Ú©Ø§Ù†
+          sign_up_requires_approval: Ù†ÙˆÛŽ Ù†Ø§ÙˆØªÛ†Ù…Ø§Ø±Ú©Ø±Ø¯Ù† Ù¾ÛŽÙˆÛŒØ³ØªÛŒ Ø¨Û• Ú•Û•Ø²Ø§Ù…Û•Ù†Ø¯ÛŒ ØªÛ†ÛŒÛ•
+        severity: Ù‡Û•ÚµØ¨Ú˜ÛŽØ±Û• Ú†ÛŒ Ú•ÙˆÙˆØ¯Û•Ø¯Ø§Øª Ù„Û•Ú¯Û•Úµ Ø¯Ø§ÙˆØ§Ú©Ø§Ø±ÛŒÛ•Ú©Ø§Ù†ÛŒ Ø¦Û•Ù… IP
+      sessions:
+        otp: 'Ú©Û†Ø¯ÛŒ Ø¯ÙˆÙˆ-ÙØ§Ú©ØªÛ†Ø± Ø¨Ù†ÙˆÙˆØ³Û• Ú©Û• Ù„Û•Ù„Ø§ÛŒÛ•Ù† Ø¦Û•Ù¾ÛŒ ØªÛ•Ù„Û•ÙÛ†Ù†Û•Ú©Û•ØªÛ•ÙˆÛ• Ø¯Ø±ÙˆØ³Øª Ú©Ø±Ø§ÙˆÛ• ÛŒØ§Ù† ÛŒÛ•Ú©ÛŽÚ© Ù„Û• Ú©Û†Ø¯Û•Ú©Ø§Ù†ÛŒ Ù‡ÛŽÙ†Ø§Ù†Û•ÙˆÛ•ÛŒ Ø®Û†Øª Ø¨Û•Ú©Ø§Ø±Ø¨Ù‡ÛŽÙ†Û•:'
+        webauthn: Ø¦Û•Ú¯Û•Ø± Ú©Ù„ÛŒÙ„ÛŒ USB Ø¨ÛŽØª Ø¯ÚµÙ†ÛŒØ§Ø¨Û• Ù„Û• ØªÛŽÚ©Ø±Ø¯Ù†ÛŒ Ùˆ Ø¦Û•Ú¯Û•Ø± Ù¾ÛŽÙˆÛŒØ³Øª Ø¨ÙˆÙˆØŒ Ù„ÛŽÛŒØ¨Ø¯Û•.
+      tag:
+        name: Ø¦ÛŽÙˆÛ• Ø¯Û•ØªÙˆØ§Ù†Ù† Ú¯Û•ÙˆØ±Û•ÛŒÛŒ Ùˆ Ø¨Ø¬Ú©Û†Ù„ÛŒÛŒ Ù¾ÛŒØªÛ•Ú©Ø§Ù† Ø¯Û•Ø³ØªÚ©Ø§Ø±ÛŒ Ø¨Ú©Û•Ù† ØªØ§Ú©ÙˆÙˆ Ø®ÙˆÛŽÙ†Û•ÙˆØ§Ø±ØªØ± Ø¯ÛŒØ§Ø±Ø¨Ù†
+      user:
+        chosen_languages: Ú©Ø§ØªÛŽÚ© Ú†Ø§ÙˆØ¯ÛŽØ±ÛŒ Ú©Ø±Ø§ØŒ ØªÛ•Ù†Ù‡Ø§ ØªÙˆØªÛ•Ú©Ø§Ù† Ø¨Û• Ø²Ù…Ø§Ù†Û• Ø¯ÛŒØ§Ø±ÛŒÚ©Ø±Ø§ÙˆÛ•Ú©Ø§Ù† Ù„Û• Ù‡ÛŽÚµÛŒâ€ŒÚ©Ø§ØªÛŒ Ú¯Ø´ØªÛŒ Ù¾ÛŒØ´Ø§Ù† Ø¯Û•Ø¯Ø±ÛŽØª
+    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: Ø¨Ø§Ù†Ú¯Û•ÙˆØ§Ø²
+      defaults:
+        autofollow: Ø¨Ø§Ù†Ú¯Ù‡ÛŽØ´Øª Ú©Ø±Ø¯Ù† Ø¨Û† Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙ†ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•Ú©Û•Øª
+        avatar: ÙˆÛŽÙ†Û†Ú†Ú©Û•
+        bot: Ø¦Û•Ù…Û• Ù‡Û•Ú˜Ù…Ø§Ø±ÛŽÚ©ÛŒ Ø³Ø§Ø®ØªÛ•ÛŒÛ•
+        chosen_languages: Ù¾Ø§ÚµØ§ÙˆØªÙ†ÛŒ Ø²Ù…Ø§Ù†Û•Ú©Ø§Ù†
+        confirm_new_password: Ù¾Ø´ØªÚ•Ø§Ø³ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•ÛŒ Ù†ÙˆÛŽ
+        confirm_password: Ù¾Ø´ØªÚ•Ø§Ø³ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•
+        context: Ú†ÙˆØ§Ø±Ú†ÛŽÙˆÛ•ÛŒ Ù¾Ø§ÚµØ§ÙØªÙ†
+        current_password: ØªÛŽÙ¾Û•Ø±ÙˆØ´Û•ÛŒ Ø¦ÛŽØ³ØªØ§
+        data: Ø¯Ø±Ø§ÙˆÙ‡
+        discoverable: Ø¦Û•Ù… Ù‡Û•Ú˜Ù…ÛŽØ±Û• Ù„Û• Ù¾ÛŽØ±Ø³ØªÛŒ Ø¨Ú˜Ø§Ø±Ø¯Û•ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù† Ù†ÛŒØ´Ø§Ù† Ø¨Ø¯Û•
+        display_name: Ù†Ø§ÙˆÛŒ Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†
+        email: Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¦ÛŒÙ…Û•ÛŒÚµ
+        expires_in: Ø¨Û•Ø³Û•Ø±Ø¯Û•Ú†ÛŽØª Ù¾Ø§Ø´
+        fields: Ù…ÛŽØªØ§Ø¯Ø§ØªØ§ÛŒ Ù¾Ø±Û†ÙØ§ÛŒÙ„
+        header: Ø³Û•Ø±Ù¾Û•Ú•Û•
+        inbox_url: Ø¨Û•Ø³ØªÛ•Ø±ÛŒ Ø³Ù†Ø¯ÙˆÙ‚ÛŒ Ú¯ÙˆØ§Ø³ØªÙ†Û•ÙˆÛ•ÛŒ
+        irreversible: ÙØ±ÛŽØ¯Ø§Ù† Ù„Û•Ø¬ÛŒØ§ØªÛŒ Ø´Ø§Ø±Ø¯Ù†Û•ÙˆÛ•
+        locale: Ø²Ù…Ø§Ù†ÛŒ Ù¾Û•Ú•Û•ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±
+        locked: Ø¯Ø§Ø®Ø³ØªÙ†ÛŒ Ù‡Û•Ú˜Ù…Ø§Ø±Û•
+        max_uses: Ø²Û†Ø±ØªØ±ÛŒÙ† Ú˜Ù…Ø§Ø±Û•ÛŒ Ø¨Û•Ú©Ø§Ø±Ø¨Û•Ø±Û•Ú©Ø§Ù†
+        new_password: ØªÛŽÙ¾Û•Ø±ÙˆØ´Û•ÛŒ Ù†ÙˆÛŽ
+        note: Ø¯Û•Ø±Ø¨Ø§Ø±Û•ÛŒ Ø¦ÛŒÙˆÛ•
+        otp_attempt: Ú©Û†Ø¯ÛŒ Ø¯ÙˆÙˆÙ‚Û†Ù†Ø§ØºÛŒ Ù‡Ø§ØªÙ†Û•Ú˜ÙˆÙˆØ±
+        password: ØªÛŽÙ¾Û•Ú•ÙˆØ´Û•
+        phrase: ÙˆØ´Û•Ú©Ù„ÛŒÙ„ ÛŒØ§Ù† Ø¯Û•Ø³ØªÛ•ÙˆØ§Ú˜Û•
+        setting_advanced_layout: Ú†Ø§Ù„Ø§Ú©Ú©Ø±Ø¯Ù†ÛŒ Ú•ÙˆÙˆÚ©Ø§Ø±ÛŒ ÙˆÛŽØ¨ÛŒ Ù¾ÛŽØ´Ú©Û•ÙˆØªÙˆÙˆ
+        setting_aggregate_reblogs: Ú¯Ø±ÙˆÙˆÙ¾ÛŒ ØªÙˆØªÛ•Ú©Ø§Ù† ÛŒÛ•Ú©Ø¨Ø®Û•
+        setting_auto_play_gif: Ø®Û†Ú©Ø§Ø±Ø¨Û•Ø®Ø´Ú©Ø±Ø¯Ù†ÛŒ GIFÙ€Ù€Û•Ú©Ø§Ù†
+        setting_boost_modal: Ù¾ÛŒØ´Ø§Ù†Ø¯Ø§Ù†ÛŒ Ø¯ÛŒØ§Ù„Û†Ú¯ÛŒ Ø¯ÙˆÙˆÙ¾Ø§ØªÚ©Ø±Ø¯Ù†Û•ÙˆÛ• Ù¾ÛŽØ´ Ø¯ÙˆØ¨Ø§Ø±Û• ØªÙˆØªØ§Ù†Ø¯Ù†
+        setting_crop_images: Ù„Û• ØªÙˆÙˆØªÛŒ Ù†Û•Ú©Ø±Ø§ÙˆÛ•ØŒÙˆÛŒÙ†Û•Ú©Ø§Ù† Ù„Û• Ø¦Û•Ù†Ø¯Ø§Ø²ÛŒ Û±Ù¦Ã—Û¹ Ø¨Ø¨Ú•Û•
+        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: Ø´Ø§Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ Ù‡Û•Ù…ÙˆÙˆ
+        setting_display_media_show_all: Ù‡Û•Ù…ÙˆÙˆ Ù†ÛŒØ´Ø§Ù† Ø¨Ø¯Û•
+        setting_expand_spoilers: Ù‡Û•Ù…ÛŒØ´Û• Ø¦Û•Ùˆ ØªÙˆØªØ§Ù†Û•ÛŒ Ú©Û• Ø¨Û• Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±Ú©Ø±Ø¯Ù†Û•ÙˆÛ•Ú©Ø§Ù†ÛŒ Ù†Ø§ÙˆÛ•Ú•Û†Ú©Û•ÙˆÛ• Ù†ÛŒØ´Ø§Ù†Û•Ú©Ø±Ø§ÙˆÙ†ØŒ Ù¾ÛŒØ³Ø§Ù† Ø¨Ø¯Û•
+        setting_hide_network: Ø´Ø§Ø±Ø¯Ù†Û•ÙˆÛ•ÛŒ ØªÛ†Ú•Û•Ú©Û•Øª
+        setting_noindex: Ø¯Ø§ÙˆØ§ Ù„Û• Ù…Û•Ú©ÛŒÙ†Û•ÛŒ Ú¯Û•Ú•Ø§Ù† Ø¨Û† Ù¾ÛŒØ´Ø§Ù†Ù†Û•Ø¯Ø§Ù† Ù„Û• Ø¯Û•Ø¦Û•Ù†Ø¬Ø§Ù…ÛŒ Ú¯Û•Ú•Ø§Ù†Û•Ú©Ø§Ù†
+        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: Ú©Û†Ø¯ÛŒ Ù¾Ø§Ø±Ø§Ø³ØªÙ†
+        type: Ø¬Û†Ø±ÛŒ Ù‡Ø§ÙˆØ±Ø¯Û•Ú©Ø±Ø¯Ù†
+        username: Ù†Ø§ÙˆÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±
+        username_or_email: Ù†Ø§ÙˆÛŒ Ø¨Û•Ú©Ø§Ù‡ÛŽÙ†Û•Ø± ÛŒØ§Ù† Ø¦ÛŒÙ…Û•ÛŒÚµ
+        whole_word: Ù‡Û•Ù…ÙˆÙˆ ÙˆØ´Û•Ú©Û•
+      email_domain_block:
+        with_dns_records: Ù„Û•Ø®Û†Ú¯Ø±ØªÙ†ÛŒ ØªÛ†Ù…Ø§Ø±Û•Ú©Ø§Ù†ÛŒ MX Ùˆ Ø¦Ø§ÛŒ Ù¾ÛŒÛŒÛ•Ú©Ø§Ù†ÛŒ Ø¯Û†Ù…Û•ÛŒÙ†
+      featured_tag:
+        name: Ù‡Û•Ø´ØªØ§Ú¯
+      interactions:
+        must_be_follower: Ù‚Û•Ù¾Ø§ØªÚ©Ø±Ø¯Ù†ÛŒ Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù† Ø¨ÛŽØ¬Ú¯Û• Ù„Û• Ø´ÙˆÛŽÙ†Ú©Û•ÙˆØªÙˆÙˆØ§Ù†
+        must_be_following: Ø¨Û•Ø¦Ø§Ú¯Ø§Ù†Ø§Ù…Û•Ú©Ø§Ù† Ø¨Ù„Û†Ú© Ø¨Ú©Û• Ù„Û• Ø®Û•ÚµÚ©ÛŽÚ© Ú©Û• Ù¾Û•ÛŒÚ•Û•ÙˆÛŒØ§Ù† Ù†Ø§Ú©Û•ÛŒØª
+        must_be_following_dm: Ù¾Û•ÛŒØ§Ù…Û•Ú©Ø§Ù†ÛŒ Ú•Ø§Ø³ØªÛ•ÙˆØ®Û† Ø¨Ù„Û†Ú© Ø¨Ú©Û• Ù„Û•Ùˆ Ú©Û•Ø³Ø§Ù†Û•ÛŒ Ú©Û•ØŒ Ù¾Û•ÛŒÚ•Û•ÙˆÛŒ Ù†Ø§Ú©Û•Ù†
+      invite:
+        comment: Ø¨Û†Ú†ÙˆÙˆÙ†
+      invite_request:
+        text: Ø¨Û†Ú†ÛŒ Ø¯Û•ØªÛ•ÙˆÛŽØª Ø¨Û•Ø´Ø¯Ø§Ø± Ø¨ÛŒØª?
+      ip_block:
+        comment: Ø¨Û†Ú†ÙˆÙˆÙ†
+        ip: IP
+        severities:
+          no_access: Ø¨Ù„Û†Ú©Ú©Ø±Ø¯Ù†ÛŒ Ø¯Ù‡â€ŒØ³ØªÙ¾ÛŽÚ¯Ù‡â€ŒÛŒØ´ØªÙ†
+          sign_up_requires_approval: Ø³Ù†ÙˆÙˆØ±Ø¯Ø§Ø±Ú©Ø±Ø¯Ù†ÛŒ Ú†ÙˆÙˆÙ†Û•Ù†Ø§Ùˆ
+        severity: ÛŒØ§Ø³Ø§
+      notification_emails:
+        digest: Ú©ÙˆØ±ØªÚ©Ø±Ø¯Ù†ÛŒ Ø¦Ø§Ú¯Ø§Ø¯Ø§Ø±ÛŒÛŒÚ©Û•Ù† Ù„Û•ÛŒÛ•Ú© Ø¦ÛŒÙ…Û•ÛŒÙ„
+        favourite: Ú©Û•Ø³ÛŽÚ© Ø¯Û†Ø®ÛŒ ØªÛ†ÛŒ Ø¨Û•Ø¯Úµ Ø¨ÙˆÙˆ
+        follow: Ú©Û•Ø³ÛŽÚ© Ø¯ÙˆØ§ÛŒ ØªÛ† Ú©Û•ÙˆØª
+        follow_request: Ú©Û•Ø³ÛŽÚ© Ø¯Ø§ÙˆØ§ÛŒ Ú©Ø±Ø¯ÙˆÙˆÛ• Ú©Û• Ø¨Û•Ø¯ÙˆØ§Øª Ø¨Ú©Û•ÙˆÛŽØª
+        mention: Ú©Û•Ø³ÛŽÚ© Ø¨Ø§Ø³ÛŒ Ú©Ø±Ø¯ÙˆÙˆÛŒ
+        pending_account: Ù‡Û•Ú˜Ù…Ø§Ø±Û•ÛŒ Ù†ÙˆÛŽ Ù¾ÛŽÙˆÛŒØ³ØªÛŒ Ø¨Û• Ù¾ÛŽØ¯Ø§Ú†ÙˆÙˆÙ†Û•ÙˆÛ•Ù‡Û•ÛŒÛ•
+        reblog: Ú©Ø§ØªÛŽÚ© Ú©Û•Ø³ÛŽÚ© Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•ÛŒ Ø¦ÛŽÙˆÛ• Ø¯ÙˆÙˆØ¨Ø§Ø±Û• ØªÙˆØª Ø¯Û•Ú©Ø§ØªÛ•ÙˆÛ•
+        report: Ú¯ÙˆØ²Ø§Ø±Ø´ØªÛŒ Ù†ÙˆÛŽ Ù¾ÛŽØ´Ú©Û•Ø´ Ú©Ø±Ø§ÙˆÛ•
+        trending_tag: Ú©Ø§ØªÛŽÚ© Ù‡Ø§Ø´ØªØ§Ú¯ÛŽÚ©ÛŒ Ù¾ÛŽØ¯Ø§Ù†Û•Ú†ÙˆÙˆ Ù‡Û†Ú¯Ø±ÛŒ ÙØ±Û• Ø¨ÙˆÙˆØŒ Ø¦ÛŒÙ…Û•ÛŒÙ„ÛŽÚ© Ø¨Ù†ÛŽØ±Û•
+      tag:
+        listable: Ú•ÛŒÚ¯Û•Ø¨Ø¯Û• Ø¦Û•Ù… Ù‡Ø§Ø´ØªØ§Ú¯Û• Ù„Û• Ù¾ÛŽØ±Ø³ØªÛŒ Ù‡Û•ÚµØ¨Ú˜Ø§Ø±Ø¯Û•ÛŒ Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Û•Ø±Ø§Ù† Ùˆ Ù¾Û•Ú•Û•ÛŒ Ú¯Û•Ú•Ø§Ù† Ù†ÛŒØ´Ø§Ù† Ø¨Ø¯Ø±ÛŽØª
+        name: Ù‡Û•Ø´ØªØ§Ú¯
+        trendable: Ú•ÛŽÚ¯Û•Ø¨Ø¯Û• Ø¦Û•Ù… Ù‡Û•Ø´ØªØ§Ú¯Û• Ù„Û• Ù†ÙˆÙˆØ³Ø±Ø§ÙˆÛ•ÛŒ Ø¨Û•Ø±Ú†Ø§ÙˆÚ©Ø±Ø§Ùˆ Ù†ÛŒØ³Ø§Ù† Ø¨Ø¯Ø±ÛŽØª
+        usable: Ú•ÛŽÚ¯Û•Ø¨Ø¯Û• Ø¨Û• ØªÙˆØªÛ•Ú©Ø§Ù† Ø¨Û† Ø¨Û•Ú©Ø§Ø±Ù‡ÛŽÙ†Ø§Ù†ÛŒ Ø¦Û•Ù… Ù‡Û•Ø´ØªØ§Ú¯Û•
+    'no': Ù†Û•
+    recommended: Ù¾ÛŽØ´Ù†ÛŒØ§Ø±Ú©Ø±Ø§ÙˆÛ•
+    required:
+      mark: "*"
+      text: Ù¾ÛŽÙˆÛŒØ³ØªÛ•
+    title:
+      sessions:
+        webauthn: ÛŒÛ•Ú©ÛŽÚ© Ù„Û• Ú©Ù„ÛŒÙ„Û•Ú©Ø§Ù†ÛŒ Ù¾Ø§Ø±Ø§Ø³ØªÙ† Ø¨Û•Ú©Ø§Ø±Ø¨Ù‡ÛŽÙ†Û• Ø¨Û† Ú†ÙˆÙˆÙ†Û• Ú˜ÙˆÙˆØ±Û•ÙˆÛ•
+    'yes': Ø¨Û•ÚµÛŽ
diff --git a/config/locales/simple_form.ml.yml b/config/locales/simple_form.ml.yml
index df04a15e85ae23f2b6589ed992bc5e71baf889df..c60cd96998866e9d07a3a9857e7910ece13cdc1b 100644
--- a/config/locales/simple_form.ml.yml
+++ b/config/locales/simple_form.ml.yml
@@ -14,3 +14,7 @@ ml:
         acct: à´ªà´´à´¯ à´…à´‚à´—à´¤àµà´µà´¤àµà´¤à´¿à´²àµ‡à´•àµà´•àµà´³àµà´³ à´ªà´¿à´Ÿà´¿
       account_migration:
         acct: à´ªàµà´¤à´¿à´¯ à´…à´‚à´—à´¤àµà´µà´¤àµà´¤à´¿à´²àµ‡à´•àµà´•àµà´³àµà´³ à´ªà´¿à´Ÿà´¿
+      defaults:
+        email: à´‡-à´®àµ†à´¯à´¿àµ½ à´µà´¿à´²à´¾à´¸à´‚
+      notification_emails:
+        follow: à´†à´°àµ‹ à´¨à´¿à´™àµà´™à´³àµ† à´ªà´¿à´¨àµà´¤àµà´Ÿàµ¼à´¨àµà´¨àµ
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 3f4bd9b9e68e112d9544e0c143ee5feebcd564cf..8abc9448cdd3f912708d18c12631f468c6c90e38 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -65,6 +65,10 @@ nl:
         data: CSV-bestand dat op een andere Mastodonserver werd geÃ«xporteerd
       invite_request:
         text: Dit helpt ons om jouw aanvraag te beoordelen
+      ip_block:
+        comment: Optioneel. Vergeet niet te onthouden waarom je deze regel hebt toegevoegd.
+        severities:
+          sign_up_requires_approval: Nieuwe registraties vereisen jouw goedkeuring
       sessions:
         otp: 'Voer de tweestaps-aanmeldcode vanaf jouw mobiele telefoon in of gebruik een van jouw herstelcodes:'
       tag:
@@ -89,9 +93,10 @@ nl:
         text: Aangepaste waarschuwing
         type: Actie
         types:
-          disable: Inloggen uitschakelen
-          none: Niets doen
-          silence: Negeren
+          disable: Bevriezen
+          none: Waarschuwing sturen
+          sensitive: Gevoelig
+          silence: Beperken
           suspend: Opschorten en onomkeerbaar accountgegevens verwijderen
         warning_preset_id: Gebruik een voorinstelling van een waarschuwing
       announcement:
@@ -116,6 +121,7 @@ nl:
         expires_in: Vervalt na
         fields: Metadata profiel
         header: Omslagfoto
+        honeypot: "%{label} (niet invullen)"
         inbox_url: Inbox-URL van de relayserver
         irreversible: Verwijderen in plaats van verbergen
         locale: Taal van de gebruikersomgeving
@@ -135,6 +141,7 @@ nl:
         setting_default_privacy: Standaardzichtbaarheid van jouw toots
         setting_default_sensitive: Media altijd als gevoelig markeren
         setting_delete_modal: Vraag voor het verwijderen van een toot een bevestiging
+        setting_disable_swiping: Swipebewegingen uitschakelen
         setting_display_media: Mediaweergave
         setting_display_media_default: Standaard
         setting_display_media_hide_all: Alles verbergen
@@ -167,7 +174,14 @@ nl:
       invite:
         comment: Opmerking
       invite_request:
-        text: Waarom wil jij je aanmelden?
+        text: Waarom wil je je hier registreren?
+      ip_block:
+        comment: Opmerking
+        ip: IP
+        severities:
+          no_access: Toegang blokkeren
+          sign_up_requires_approval: Registraties beperken
+        severity: Regel
       notification_emails:
         digest: Periodiek e-mails met een samenvatting versturen
         favourite: Wanneer iemand jouw toot aan hun favorieten heeft toegevoegd
@@ -188,4 +202,7 @@ nl:
     required:
       mark: "*"
       text: vereist
+    title:
+      sessions:
+        webauthn: Gebruik een van uw beveiligingssleutels om in te loggen
     'yes': Ja
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index 54a5ecf01061ad0d733ef07410abf77143816adb..f4a62ac078d0c640f4d15398b8fffab29f18c613 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -3,27 +3,27 @@ nn:
   simple_form:
     hints:
       account_alias:
-        acct: Spesifiser brukernavn@domene til brukeren du vil flytte fra
+        acct: Spesifiser brukarnamn@domenet til brukaren du vil flytja frÃ¥
       account_migration:
-        acct: Spesifiser brukernavn@domene til brukeren du vil flytte til
+        acct: Spesifiser brukarnamn@domenet til brukaren du vil flytja til
       account_warning_preset:
-        text: Du kan bruke tut syntaks, f.eks. URLer, emneknagger og nevnelser
-        title: Valgfritt. Ikke synlig for mottaker
+        text: Du kan bruka tut-syntaks, som t. d. URL-ar, emneknaggar og nemningar
+        title: Valfritt. Ikkje synleg for mottakar
       admin_account_action:
-        include_statuses: Brukeren vil se hvilke tuter som forÃ¥rsaket moderator-handlingen eller -advarselen
-        send_email_notification: Brukeren vil motta en forklaring pÃ¥ hva som har skjedd med deres bruker
-        text_html: Valgfritt. Du kan bruke tut syntaks. Du kan <a href="%{path}">legge til advarsels-forhÃ¥ndsinnstillinger</a> for Ã¥ spare tid
-        type_html: Velg hva du vil gjÃ¸re med <strong>%{acct}</strong>
+        include_statuses: Brukaren fÃ¥r sjÃ¥ kva tut som gjorde moderatorhandllinga eller -Ã¥tvaringa
+        send_email_notification: Brukaren fÃ¥r ei forklÃ¥ring av kva som har hendt med kontoen sin
+        text_html: Valfritt. Du kan bruka tut-syntaks. Du kan <a href="%{path}">leggja til Ã¥tvaringsfÃ¸rehandsinnstillingar</a> for Ã¥ spara tid
+        type_html: Vel det du vil gjera med <strong>%{acct}</strong>
         warning_preset_id: Valfritt. Du kan leggja inn eigen tekst pÃ¥ enden av fÃ¸reoppsettet
       announcement:
-        all_day: Hvis noen av dem er valgt, vil kun datoene av tidsrammen bli vist
-        ends_at: Valgfritt. KunngjÃ¸ring vil bli automatisk avpublisert pÃ¥ dette tidspunktet
-        scheduled_at: La stÃ¥ tomt for Ã¥ publisere kunngjÃ¸ringen umiddelbart
-        starts_at: Valgfritt. I tilfellet din kunngjÃ¸ring er bundet til en spesifikk tidsramme
-        text: Du kan bruke tut syntaks. Vennligst vÃ¦r oppmerksom pÃ¥ plassen som kunngjÃ¸ringen vil ta opp pÃ¥ brukeren sin skjerm
+        all_day: NÃ¥r merka, vil berre datoane til tidsramma synast
+        ends_at: Valfritt. Lysinga vert teken ned av seg sjÃ¸lv pÃ¥ dette tidspunktet
+        scheduled_at: Lat stÃ¥ blankt for Ã¥ gjeva ut lysinga med ein gong
+        starts_at: Valfritt. Om lysinga di er bunden til eit tidspunkt
+        text: Du kan bruka tut-syntaks. Ver merksam pÃ¥ plassen lysinga tek pÃ¥ brukaren sin skjerm
       defaults:
-        autofollow: Folk som lager en konto gjennom invitasjonen, vil automatisk fÃ¸lge deg
-        avatar: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px
+        autofollow: Folk som lagar ein konto gjennom innbydinga fylgjer deg automatisk
+        avatar: PNG, GIF eller JPG. Maksimalt %{size}. Minkast til %{dimensions}px
         bot: Denne kontoen utfÃ¸rer i hovedsak automatiserte handlinger og blir kanskje ikke holdt Ã¸ye med
         context: En eller flere sammenhenger der filteret skal gjelde
         current_password: For sikkerhetsgrunner, vennligst oppgi passordet til den nÃ¥vÃ¦rende bruker
@@ -32,59 +32,62 @@ nn:
         discoverable: Profilmappen er en annen mÃ¥te for kontoen din Ã¥ nÃ¥ et bredere publikum pÃ¥
         email: Du fÃ¥r snart ein stadfestings-e-post
         fields: Du kan ha opptil 4 gjenstander vist som en tabell pÃ¥ profilsiden din
-        header: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px
+        header: PNG, GIF eller JPG. Maksimalt %{size}. Minkast til %{dimensions}px
         inbox_url: Kopier URLen fra forsiden til overgangen du vil bruke
-        irreversible: Filtrerte tuter vil ugjenkallelig forsvinne, selv om filteret senere blir fjernet
-        locale: SprÃ¥ket til brukergrensesnittet, e-mailer og push-varsler
-        locked: Krever at du manuelt godkjenner fÃ¸lgere
+        irreversible: Filtrerte tut vil verta borte for evig, sjÃ¸lv om filteret vert fjerna seinare
+        locale: SprÃ¥ket til brukargrensesnittet, e-postar og push-varsel
+        locked: Krev at du manuelt godkjenner fylgjarar
         password: Nytt minst 8 teikn
         phrase: Vil bli samsvart med, uansett bruk av store/smÃ¥ bokstaver eller innholdsadvarselen til en tut
-        scopes: Hvilke API-er programmet vil bli gitt tilgang til. Dersom du velger et toppnivÃ¥omfang, trenger du ikke Ã¥ velge individuelle API-er.
-        setting_aggregate_reblogs: Ikke vis nye fremhevinger for tuter som nylig har blitt fremhever (PÃ¥virker kun nylige fremhevinger)
-        setting_default_sensitive: Sensitivt media blir skjult som standard og kan bli vist med et klikk
-        setting_display_media_default: Skjul media som er merket som sensitivt
+        scopes: API-ane som programmet vil fÃ¥ tilgjenge til. Ettersom du vel eit toppnivÃ¥omfang tarv du ikkje velja einskilde API-ar.
+        setting_aggregate_reblogs: Ikkje vis nye framhevingar for tut som nyleg har vorte heva fram (PÃ¥verkar berre nylege framhevingar)
+        setting_default_sensitive: NÃ¦rtakande media vert gÃ¸ymd som standard og kan synast med eit klikk
+        setting_display_media_default: GÃ¸ym media som er merka som nÃ¦rtakande
         setting_display_media_hide_all: Alltid skjul alt media
-        setting_display_media_show_all: Alltid vis media som er merket som sensitivt
+        setting_display_media_show_all: Vis alltid media
         setting_hide_network: Kven du fylgjer og kven som fylgjer deg vert ikkje vist pÃ¥ profilen din
-        setting_noindex: PÃ¥virker din offentlige profil og statussider
-        setting_show_application: Appen du brukte til Ã¥ tute vil bli vist i den detaljerte visningen til tutene dine
-        setting_use_blurhash: Gradientene er basert pÃ¥ fargene til de skjulte visualitetene, men gjÃ¸r alle detaljer uklare
-        setting_use_pending_items: Skjul tidslinjeoppdateringer bak et klikk, i stedet for Ã¥ automatisk la strÃ¸mmen skrolle
+        setting_noindex: PÃ¥verkar den offentlege profilen og statussidene dine
+        setting_show_application: Programmet du brukar for Ã¥ tuta synast i den detaljerte visninga av tuta dine
+        setting_use_blurhash: Overgangar er bygt pÃ¥ dei lÃ¸ynde sine leter, men gjer detaljar utydelege
+        setting_use_pending_items: GÃ¸ym tidslineoppdateringar ved eit klikk, i staden for Ã¥ bla ned hendestraumen automatisk
         username: Brukarnamnet ditt vert unikt pÃ¥ %{domain}
-        whole_word: NÃ¥r sÃ¸keordet eller setningen bare er alfanumerisk, aktiveres det bare hvis det samsvarer med hele ordet
+        whole_word: NÃ¥r sÃ¸kjeordet eller setninga berre er alfanumerisk, nyttast det berre om det samsvarar med heile ordet
       domain_allow:
-        domain: Dette domenet vil vÃ¦re i stand til Ã¥ hente data fra denne serveren og dets innkommende data vil bli prosessert og lagret
+        domain: Dette domenet er i stand til Ã¥ henta data frÃ¥ denne tenaren og innkomande data vert handsama og lagra
       email_domain_block:
-        domain: Det kan vÃ¦re domenenavnet som vises i e-postadressen, MX-posten, som domenet bestemmer til, eller IP-en til serveren som MX-posten lÃ¸ser etter. De vil bli sjekket ved brukerregistrering og registrering vil bli avvist.
-        with_dns_records: Et forsÃ¸k pÃ¥ Ã¥ lÃ¸se det gitte domenets DNS-poster vil bli gjort, og resultatene vil ogsÃ¥ bli svartelistet
+        domain: Dette kan vera domenenamnet som synest i e-postaddressa, MX-recorden som domenet lÃ¸yser til eller IP-adressa til tenaren som MX-record lÃ¸yser til. Dei sjekkast ved brukarregistrering og registretinga vert avvist.
+        with_dns_records: Eit forsÃ¸k pÃ¥ Ã¥ lÃ¸ysa gjeve domene som DNS-data vil vera gjord og resultata vert svartelista
       featured_tag:
         name: 'Kanskje du vil nytta ein av desse:'
       form_challenge:
-        current_password: Du gÃ¥r inn i et sikkert omrÃ¥de
+        current_password: Du gÃ¥r inn i eit trygt omrÃ¥de
       imports:
         data: CSV-fil eksportert frÃ¥ ein annan Mastodon-tenar
       invite_request:
         text: Dette kjem til Ã¥ hjelpa oss med Ã¥ gÃ¥ gjennom sÃ¸knaden din
+      ip_block:
+        severities:
+          no_access: Blokker tilgang til alle ressurser
       sessions:
         otp: Angi tofaktorkoden fra din telefon eller bruk en av dine gjenopprettingskoder.
       tag:
-        name: Du kan bare forandre bruken av store/smÃ¥ bokstaver, f.eks. for Ã¥ gjÃ¸re det mer lesbart
+        name: Du kan berre endra bruken av store/smÃ¥ bokstavar, t. d. for Ã¥ gjera det meir leseleg
       user:
-        chosen_languages: Hvis noen av dem er valgt, vil kun tuter i de valgte sprÃ¥kene bli vist i de offentlige tidslinjene
+        chosen_languages: NÃ¥r merka vil berre tuta pÃ¥ dei valde sprÃ¥ka synast pÃ¥ offentlege tidsliner
     labels:
       account:
         fields:
           name: Merkelapp
           value: Innhald
       account_alias:
-        acct: Brukernavnet til den gamle brukeren
+        acct: Brukarnamnet pÃ¥ den gamle kontoen
       account_migration:
-        acct: Brukernavnet til den nye brukeren
+        acct: Brukarnamnet pÃ¥ den nye kontoen
       account_warning_preset:
         text: FÃ¸reÃ¥tstekst
         title: Tittel
       admin_account_action:
-        include_statuses: Inkluder rapporterte tuter i e-mailen
+        include_statuses: Ha med rapporterte tut i e-posten
         send_email_notification: Varsl brukaren med e-post
         text: Eigen Ã¥tvaring
         type: Handling
@@ -95,11 +98,11 @@ nn:
           suspend: Utvis og slett kontodata for godt
         warning_preset_id: Bruk Ã¥tvaringsoppsett
       announcement:
-        all_day: Heldagshendelse
-        ends_at: Slutten av hendelsen
+        all_day: Heildagshending
+        ends_at: Hendinga er ferdig
         scheduled_at: Planlegg publisering
-        starts_at: Begynnelse av hendelsen
-        text: KunngjÃ¸ring
+        starts_at: Byrjing av hendinga
+        text: Lysing
       defaults:
         autofollow: Bed om Ã¥ fylgja kontoen din
         avatar: Bilete
@@ -110,14 +113,14 @@ nn:
         context: Filtrer kontekstar
         current_password: Noverande passord
         data: Data
-        discoverable: FÃ¸r opp denne kontoen i mappen
+        discoverable: FÃ¸r denne kontoen opp i mappa
         display_name: Synleg namn
         email: E-post-adresse
         expires_in: Vert ugyldig etter
         fields: Profilmetadata
         header: Overskrift
-        inbox_url: URL til overgangsinnboksen
-        irreversible: Forkast i stedet for Ã¥ skjule
+        inbox_url: URL-addressen til overgangsinnboksen
+        irreversible: Forkast i staden for Ã¥ gÃ¸yma
         locale: SprÃ¥k
         locked: LÃ¥s konto
         max_uses: Grense pÃ¥ brukartal
@@ -126,47 +129,56 @@ nn:
         otp_attempt: Tostegskode
         password: Passord
         phrase: Nykelord eller frase
-        setting_advanced_layout: Skru pÃ¥ det avanserte nettgrensesnittet
-        setting_aggregate_reblogs: Gruppefremhevinger i tidslinjer
+        setting_advanced_layout: Skruv pÃ¥ det avanserte nettgrensesnittet
+        setting_aggregate_reblogs: Gruppeframhevingar pÃ¥ tidsliner
         setting_auto_play_gif: Spel av animerte GIF-ar automatisk
-        setting_boost_modal: Vis bekreftelse fÃ¸r fremheving
-        setting_crop_images: Klipp bilder i ikke-utvidede tuter til 16:9
+        setting_boost_modal: Vis stadfesting fÃ¸r framheving
+        setting_crop_images: Skjer bilete i ikkje-utvida tut til 16x9
         setting_default_language: SprÃ¥k pÃ¥ innlegg
         setting_default_privacy: Privatliv
-        setting_default_sensitive: Marker alltid media som sensitivt
-        setting_delete_modal: Vis bekreftelse fÃ¸r du sletter en tut
+        setting_default_sensitive: Merk alltid media som nÃ¦rtakande
+        setting_delete_modal: Vis stadfesting fÃ¸r du slettar eit tut
+        setting_disable_swiping: Skru av sveipebevegelser
         setting_display_media: Medievisning
         setting_display_media_default: Standard
         setting_display_media_hide_all: GÃ¸ym alle
         setting_display_media_show_all: Vis alle
-        setting_expand_spoilers: Utvid alltid tuter som er merket med innholdsadvarsler
-        setting_hide_network: Skjul nettverket ditt
-        setting_noindex: Avmeld fra sÃ¸kemotorindeksering
-        setting_reduce_motion: Reduser bevegelser i animasjoner
-        setting_show_application: Skryt av appen som ble brukt til Ã¥ sende tuter
+        setting_expand_spoilers: Vid alltid ut tut som er merka med innhaldsÃ¥tvaringar
+        setting_hide_network: GÃ¸ym nettverket ditt
+        setting_noindex: Vel bort sÃ¸kjemotorregistrering
+        setting_reduce_motion: Minsk rÃ¸rsle i animasjonar
+        setting_show_application: Avdekk programmet bruka for Ã¥ senda tut
         setting_system_font_ui: Bruk standardskrifttypen pÃ¥ systemet
         setting_theme: Sidetema
         setting_trends: Vis kva som er populÃ¦rt i dag
-        setting_unfollow_modal: Vis bekreftelse fÃ¸r du slutter Ã¥ fÃ¸lge noen
-        setting_use_blurhash: Vis fargerike gradienter for skjulte media
+        setting_unfollow_modal: Vis stadfesting fÃ¸r du sluttar Ã¥ fylgja nokon
+        setting_use_blurhash: Vis fargerike overgangar for gÃ¸ymt media
         setting_use_pending_items: Saktemodus
         severity: Alvorsgrad
+        sign_in_token_attempt: Trygdenykel
         type: Importtype
         username: Brukarnamn
-        username_or_email: Brukarnman eller E-post
+        username_or_email: Brukarnamn eller E-post
         whole_word: Heilt ord
       email_domain_block:
-        with_dns_records: Inkluder MX-poster og IP-adresser for domenet
+        with_dns_records: Ha med MX-recordar og IP-ar til domenet
       featured_tag:
         name: Emneknagg
       interactions:
-        must_be_follower: Blokker varslinger fra ikke-fÃ¸lgere
-        must_be_following: Blokker varslinger fra personer du ikke fÃ¸lger
-        must_be_following_dm: Blokker direkte meldinger fra personer du ikke fÃ¸lger
+        must_be_follower: GÃ¸ym varslingar frÃ¥ folk som ikkje fylgjer deg
+        must_be_following: GÃ¸ym varslingar frÃ¥ folk du ikkje fylgjer
+        must_be_following_dm: GÃ¸ym direktemeldinger frÃ¥ folk du ikkje fylgjer
       invite:
         comment: Kommentar
       invite_request:
         text: Kvifor vil du verta med?
+      ip_block:
+        comment: Kommentere
+        ip: IP
+        severities:
+          no_access: Blokker tilgang
+          sign_up_requires_approval: Begrens pÃ¥meldinger
+        severity: OppfÃ¸ring
       notification_emails:
         digest: Send samandrag pÃ¥ e-post
         favourite: Send e-post nÃ¥r nokon merkjer statusen din som favoritt
@@ -176,15 +188,18 @@ nn:
         pending_account: Send e-post nÃ¥r ein ny konto treng gjennomgang
         reblog: Send e-post nÃ¥r nokon framhevar statusen din
         report: Send e-post nÃ¥r nokon rapporterer noko
-        trending_tag: En ugjennomgÃ¥tt emneknagg trender
+        trending_tag: Ein emneknagg som ikkje er sett igjennom er pÃ¥ veg opp
       tag:
-        listable: Tillat denne emneknaggen Ã¥ vises i sÃ¸k og pÃ¥ profilmappen
+        listable: Tillat denne emneknaggen Ã¥ synast i sÃ¸k og i profilmappa
         name: Emneknagg
-        trendable: Tillat denne emneknaggen til Ã¥ vises under trender
+        trendable: Tillat denne emneknaggen til Ã¥ synast under trendar
         usable: Gje tut lov til Ã¥ nytta denne emneknaggen
     'no': Nei
     recommended: TilrÃ¥dt
     required:
       mark: "*"
       text: obligatorisk
+    title:
+      sessions:
+        webauthn: Bruk en av sikkerhetsnÃ¸klene dine til Ã¥ logge pÃ¥
     'yes': Ja
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml
index 0210e5a6e8d184f072eb2869405c3526c7c64799..cdf3d61e8433ec7023acc21c7fb62ae8f869a949 100644
--- a/config/locales/simple_form.no.yml
+++ b/config/locales/simple_form.no.yml
@@ -65,6 +65,9 @@
         data: CSV-fil eksportert fra en annen Mastodon-instans
       invite_request:
         text: Dette vil hjelpe oss med Ã¥ gjennomgÃ¥ din sÃ¸knad
+      ip_block:
+        severities:
+          no_access: Blokker tilgang til alle ressurser
       sessions:
         otp: Angi tofaktorkoden fra din telefon eller bruk en av dine gjenopprettingskoder.
       tag:
@@ -135,6 +138,7 @@
         setting_default_privacy: Postintegritet
         setting_default_sensitive: Marker alltid media som sensitivt
         setting_delete_modal: Vis bekreftelse fÃ¸r du sletter en tut
+        setting_disable_swiping: Skru av sveipebevegelser
         setting_display_media: Mediavisning
         setting_display_media_default: Standard
         setting_display_media_hide_all: Skjul alle
@@ -151,6 +155,7 @@
         setting_use_blurhash: Vis fargerike gradienter for skjulte media
         setting_use_pending_items: Saktemodus
         severity: Alvorlighetsgrad
+        sign_in_token_attempt: Sikkerhetskode
         type: Importeringstype
         username: Brukernavn
         username_or_email: Brukernavn eller E-post
@@ -167,6 +172,13 @@
         comment: Kommentar
       invite_request:
         text: Hvorfor vil du bli med?
+      ip_block:
+        comment: Kommentere
+        ip: IP
+        severities:
+          no_access: Blokker tilgang
+          sign_up_requires_approval: Begrens pÃ¥meldinger
+        severity: OppfÃ¸ring
       notification_emails:
         digest: Send sammendrag pÃ¥ e-post
         favourite: Send e-post nÃ¥r noen setter din status som favoritt
@@ -187,4 +199,7 @@
     required:
       mark: "*"
       text: obligatorisk
+    title:
+      sessions:
+        webauthn: Bruk en av sikkerhetsnÃ¸klene dine til Ã¥ logge pÃ¥
     'yes': Ja
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index 16bde88ce03c63cb41fecd16aebc49436ad27448..79c621ee2429ffd10125477ae60d8d6c9e5ed5a8 100644
--- a/config/locales/simple_form.oc.yml
+++ b/config/locales/simple_form.oc.yml
@@ -22,9 +22,9 @@ oc:
         starts_at: Opcional. Se per cas vÃ²stra anÃ³ncia es ligada a un interval de temps especific
         text: PodÃ¨tz utilizar la sintaxi dels tuts. Gardatz al cap quâ€™aquesta anÃ³ncia ocuparÃ  la fenÃ¨stra de lâ€™utilizaire
       defaults:
-        autofollow: Lo monde que se marcan grÃ cia a lâ€™invitacion vos segrÃ n automaticament
+        autofollow: Lo mond que se marcan grÃ cia a lâ€™invitacion vos segrÃ n automaticament
         avatar: PNG, GIF o JPG. Maximum %{size}. SerÃ  retalhat en %{dimensions}px
-        bot: Avisar lo monde quâ€™aqueste compte es pas dâ€™una persona
+        bot: Avisar lo mond quâ€™aqueste compte es pas dâ€™una persona
         context: Un o mai de contÃ¨xtes ont lo filtre deuriÃ¡ sâ€™aplicar
         current_password: Per de rasons de seguretat volgatz picar lo senhal del compte actual
         current_username: Per confirmar, volgatz picar lo nom dâ€™utilizaire del compte actual
@@ -45,7 +45,7 @@ oc:
         setting_display_media_default: Rescondre los mÃ¨dias marcats coma sensibles
         setting_display_media_hide_all: Totjorn rescondre los mÃ¨dias
         setting_display_media_show_all: Totjorn mostrar los mÃ¨dias marcats coma sensibles
-        setting_hide_network: VÃ²stre perfil mostrarÃ  pas los que vos sÃ¨gon e lo monde que seguÃ¨tz
+        setting_hide_network: VÃ²stre perfil mostrarÃ  pas los que vos sÃ¨gon e lo mond que seguÃ¨tz
         setting_noindex: AquÃ² es destinat a vÃ²stre perfil public e vÃ²stra pagina dâ€™estatuts
         setting_show_application: Lo nom de lâ€™aplicacion quâ€™utilizatz per publicar serÃ  mostrat dins la vista detalhada de vÃ²stres tuts
         setting_use_blurhash: Los degradats venon de las colors de lâ€™imatge rescondut en enfoscar los detalhs
@@ -65,8 +65,17 @@ oc:
         data: FichiÃ¨r CSV exportat dâ€™un autre servidor Mastodon
       invite_request:
         text: AquÃ² nos ajudarÃ  per validar vÃ²stra demanda
+      ip_block:
+        comment: Opcional. Remembratz-vos perque ajustÃ¨retz aquesta rÃ¨gla.
+        expires_in: Las adreÃ§as IP son una ressorsa finida, son de cÃ²ps partejadas e cÃ mbian sovent de mans. Per aquesta rason, los blocatges dâ€™IP sens fin son pas recomandats.
+        ip: Dintratz una adreÃ§a IPv4 o IPv6. PodÃ¨tz blocar de plajas entiÃ¨ras en utilizant la sintaxi CIDR. Agachatz de pas vos blocar defÃ²raâ€¯!
+        severities:
+          no_access: Blocar lâ€™accÃ¨s a totas las ressorsas
+          sign_up_requires_approval: Las inscripcions novÃ¨las requerirÃ n vÃ²stra validacion
+        severity: CausissÃ¨tz que far amb las requÃ¨stas dâ€™aquesta IP
       sessions:
         otp: 'Picatz lo cÃ²di dâ€™autentificacion en dos temps (Two factor code) de vÃ²stra aplicacion mobil o utilizatz un de vÃ²stres cÃ²dis de recuperacionâ€¯:'
+        webauthn: Sâ€™es una clau USB asseguratz-vos de lâ€™inserir, e se cal de la picanhejar.
       tag:
         name: PodÃ¨tz pas que cambiar la talha de las letras, per exemple, per que siÃ¡n de melhor legir
       user:
@@ -91,6 +100,7 @@ oc:
         types:
           disable: Desactivar
           none: Far pas res
+          sensitive: Sensible
           silence: Metre en silence
           suspend: Suspendre e escafar per de bon las donadas del compte
         warning_preset_id: Utilizar un avertiment predefinit
@@ -116,6 +126,7 @@ oc:
         expires_in: Expira aprÃ¨p
         fields: Metadonada del perfil
         header: BandiÃ¨ra
+        honeypot: "%{label} (emplenar pas)"
         inbox_url: URL de la bÃ³stia de recepcion del relai
         irreversible: Suprimir allÃ²c de rescondre
         locale: Lenga de lâ€™interfÃ cia
@@ -135,6 +146,7 @@ oc:
         setting_default_privacy: Confidencialitat dels tuts
         setting_default_sensitive: Totjorn marcar los mÃ¨dias coma sensibles
         setting_delete_modal: Mostrar una fenÃ¨stra de confirmacion abans de suprimir un estatut
+        setting_disable_swiping: Desactivar las accions en lisant
         setting_display_media: Afichatge dels mÃ¨dias
         setting_display_media_default: Defaut
         setting_display_media_hide_all: O rescondre tot
@@ -163,11 +175,18 @@ oc:
       interactions:
         must_be_follower: Blocar las notificacions del mond que vos sÃ¨gon pas
         must_be_following: Blocar las notificacions del mond que seguÃ¨tz pas
-        must_be_following_dm: Blocar los messatges del monde que seguÃ¨tz pas
+        must_be_following_dm: Blocar los messatges del mond que seguÃ¨tz pas
       invite:
         comment: Comentari
       invite_request:
         text: PerquÃ© volÃ¨tz vos marcarâ€¯?
+      ip_block:
+        comment: Comentari
+        ip: IP
+        severities:
+          no_access: Blocar lâ€™accÃ¨s
+          sign_up_requires_approval: Limitar las inscripcions
+        severity: RÃ¨gla
       notification_emails:
         digest: Enviar un corriÃ¨l recapitulatiu
         favourite: Enviar un corriÃ¨l quand qualquâ€™un plaÃ§a vÃ²stre estatut en favorit
@@ -188,4 +207,7 @@ oc:
     required:
       mark: "*"
       text: requesit
+    title:
+      sessions:
+        webauthn: Utilizatz una de vÃ²stras clau de seguretat per vos identificar
     'yes': Ã’c
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index d2a1e9386ef47e8a30453f7cc4ddc86fcc8abf24..6fc33ab08ae2a3b29d5bdc90a9cd5752422e8919 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -65,8 +65,17 @@ pl:
         data: Plik CSV wyeksportowany z innego serwera Mastodona
       invite_request:
         text: To pomoÅ¼e nam w recenzji Twojej aplikacji
+      ip_block:
+        comment: Niewymagane. PamiÄ™taj, dlaczego dodaÅ‚eÅ› tÄ™ reguÅ‚Ä™.
+        expires_in: Adresy IP to ograniczony zasÃ³b, czasami sÄ… wspÃ³Å‚dzielone i czÄ™sto zmieniajÄ… wÅ‚aÅ›ciciela. Z tego powodu blokady adresÃ³w IP nie sÄ… zalecane.
+        ip: WprowadÅº adres IPv4 lub IPv6. MoÅ¼esz zablokowaÄ‡ caÅ‚e zakresy za pomocÄ… skÅ‚adni CIDR. UwaÅ¼aj, aby siÄ™ nie zablokowaÄ‡!
+        severities:
+          no_access: Zablokuj dostÄ™p do wszystkich zasobÃ³w
+          sign_up_requires_approval: Nowe rejestracje bÄ™dÄ… wymagaÄ‡ twojej zgody
+        severity: Wybierz co ma siÄ™ staÄ‡ z Å¼adaniami z tego adresu IP
       sessions:
         otp: 'WprowadÅº kod weryfikacji dwuetapowej z telefonu lub wykorzystaj jeden z kodÃ³w zapasowych:'
+        webauthn: JeÅ¼eli jest to klucz USB, upewnij siÄ™, Å¼e go wÅ‚oÅ¼yÅ‚eÅ› i, jeÅ›li to konieczne, naciÅ›nij go.
       tag:
         name: MoÅ¼esz zmieniaÄ‡ tylko wielkoÅ›Ä‡ liter, np. aby byÅ‚y bardziej widoczne
       user:
@@ -91,6 +100,7 @@ pl:
         types:
           disable: WyÅ‚Ä…cz
           none: Nie rÃ³b niczego
+          sensitive: WraÅ¼liwe
           silence: Wycisz
           suspend: ZawieÅ› i nieodwracalnie usuÅ„ dane konta
         warning_preset_id: UÅ¼yj szablonu ostrzeÅ¼enia
@@ -116,6 +126,7 @@ pl:
         expires_in: WygaÅ›nie po
         fields: Metadane profilu
         header: NagÅ‚Ã³wek
+        honeypot: "%{label} (nie wypeÅ‚niaj)"
         inbox_url: Adres skrzynki przekaÅºnika
         irreversible: Usuwaj zamiast ukrywaÄ‡
         locale: JÄ™zyk interfejsu
@@ -135,6 +146,7 @@ pl:
         setting_default_privacy: WidocznoÅ›Ä‡ wpisÃ³w
         setting_default_sensitive: Zawsze oznaczaj zawartoÅ›Ä‡ multimedialnÄ… jako wraÅ¼liwÄ…
         setting_delete_modal: Pytaj o potwierdzenie przed usuniÄ™ciem wpisu
+        setting_disable_swiping: WyÅ‚Ä…cz ruchy przesuwania
         setting_display_media: WyÅ›wietlanie zawartoÅ›ci multimedialnej
         setting_display_media_default: DomyÅ›lne
         setting_display_media_hide_all: Ukryj wszystko
@@ -168,6 +180,13 @@ pl:
         comment: Komentarz
       invite_request:
         text: Czemu chcesz doÅ‚Ä…czyÄ‡?
+      ip_block:
+        comment: Skomentuj
+        ip: Adres IP
+        severities:
+          no_access: Zablokuj dostÄ™p
+          sign_up_requires_approval: Ogranicz rejestracje
+        severity: ReguÅ‚a
       notification_emails:
         digest: WysyÅ‚aj podsumowania e-mailem
         favourite: Powiadamiaj mnie e-mailem, gdy ktoÅ› polubi mÃ³j wpis
@@ -188,4 +207,7 @@ pl:
     required:
       mark: "*"
       text: pole wymagane
+    title:
+      sessions:
+        webauthn: UÅ¼yj jednego ze swoich kluczy bezpieczeÅ„stwa, aby siÄ™ zalogowaÄ‡
     'yes': Tak
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index c112ad4bc65445f75552bf7419c0852cb4bfe27c..574a3e3dc9cc4e5561bc55edae37cf0a6186c7ad 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -55,7 +55,7 @@ pt-BR:
       domain_allow:
         domain: Este domÃnio poderÃ¡ obter dados deste servidor e os dados recebidos dele serÃ£o processados e armazenados
       email_domain_block:
-        domain: Este pode ser o nome de domÃnio que aparece no endereÃ§o de e-mail, o registro MX para o qual o domÃnio resolve, ou o IP do servidor para o qual o registro MX resolve. Esses vÃ£o ser verificados no momento da cadastro do usuÃ¡rio e o cadastro serÃ¡ rejeitado.
+        domain: Este pode ser o nome de domÃnio que aparece no endereÃ§o de e-mail, o registro MX para o qual o domÃnio resolve, ou o IP do servidor para o qual o registro MX resolve. Esses vÃ£o ser verificados no momento de registro do usuÃ¡rio e o registro serÃ¡ rejeitado.
         with_dns_records: SerÃ¡ feita uma tentativa de resolver os registros DNS do domÃnio em questÃ£o e os resultados tambÃ©m serÃ£o colocados na lista negra
       featured_tag:
         name: 'VocÃª pode querer usar um destes:'
@@ -64,9 +64,18 @@ pt-BR:
       imports:
         data: Arquivo CSV exportado de outra instÃ¢ncia Mastodon
       invite_request:
-        text: Isso nos ajudarÃ¡ a revisar seu aplicativo
+        text: Isso vai nos ajudar a revisar sua aplicaÃ§Ã£o
+      ip_block:
+        comment: Opcional. Lembrar de por que vocÃª adicionou esta regra.
+        expires_in: EndereÃ§os IP sÃ£o um recurso limitado, algumas vezes sÃ£o compartilhados e muitas vezes mudam de mÃ£os. Por esse motivo, blocos de IP indefinidos nÃ£o sÃ£o recomendados.
+        ip: Digite um endereÃ§o IPv4 ou IPv6. VocÃª pode bloquear intervalos inteiros usando a sintaxe CIDR. Tenha cuidado para nÃ£o bloquear a si mesmo!
+        severities:
+          no_access: Bloquear o acesso a todos os recursos
+          sign_up_requires_approval: Novos registros exigirÃ£o sua aprovaÃ§Ã£o
+        severity: Escolha o que acontecerÃ¡ com as solicitaÃ§Ãµes deste IP
       sessions:
         otp: 'Digite o cÃ³digo de dois fatores gerado pelo aplicativo no seu celular ou use um dos cÃ³digos de recuperaÃ§Ã£o:'
+        webauthn: Se for uma chave USB tenha certeza de inseri-la e, se necessÃ¡rio, tocar nela.
       tag:
         name: VocÃª pode mudar a capitalizaÃ§Ã£o das letras, por exemplo, para tornÃ¡-la mais legÃvel
       user:
@@ -89,8 +98,9 @@ pt-BR:
         text: Aviso personalizado
         type: AÃ§Ã£o
         types:
-          disable: Bloquear conta
+          disable: Congelar
           none: NÃ£o fazer nada
+          sensitive: SensÃvel
           silence: Silenciar
           suspend: Banir e excluir irreversivelmente dados da conta
         warning_preset_id: Usar um aviso prÃ©-definido
@@ -116,6 +126,7 @@ pt-BR:
         expires_in: Expira em
         fields: Metadados do perfil
         header: CabeÃ§alho
+        honeypot: "%{label} (nÃ£o preencher)"
         inbox_url: Link da caixa de entrada do repetidor
         irreversible: Ignorar ao invÃ©s de ocultar
         locale: Idioma da interface
@@ -135,6 +146,7 @@ pt-BR:
         setting_default_privacy: Privacidade dos toots
         setting_default_sensitive: Sempre marcar mÃdia como sensÃvel
         setting_delete_modal: Solicitar confirmaÃ§Ã£o antes de excluir toot
+        setting_disable_swiping: Desabilitar movimentos deslizantes
         setting_display_media: ExibiÃ§Ã£o das mÃdias
         setting_display_media_default: PadrÃ£o
         setting_display_media_hide_all: Ocultar tudo
@@ -168,6 +180,13 @@ pt-BR:
         comment: ComentÃ¡rio
       invite_request:
         text: Por que vocÃª deseja criar uma conta aqui?
+      ip_block:
+        comment: ComentÃ¡rio
+        ip: IP
+        severities:
+          no_access: Bloquear acesso
+          sign_up_requires_approval: Limitar registros
+        severity: Regra
       notification_emails:
         digest: Enviar e-mails de resumo
         favourite: Enviar e-mail quando alguÃ©m favoritar seus toots
@@ -188,4 +207,7 @@ pt-BR:
     required:
       mark: "*"
       text: obrigatÃ³rio
+    title:
+      sessions:
+        webauthn: Utilize uma das suas chaves de seguranÃ§a para entrar
     'yes': Sim
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index d3cf5911afae9592684111482d73a18d983df7ad..869ecaddcc118fef8c7fd9d5c3c64cfeb454927e 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -65,8 +65,17 @@ pt-PT:
         data: Arquivo CSV exportado de outra instÃ¢ncia do Mastodon
       invite_request:
         text: Isto vai ajudar-nos a rever o seu pedido
+      ip_block:
+        comment: Opcional. Relembre-se por que adicionou esta regra.
+        expires_in: EndereÃ§os IP sÃ£o um recurso limitado, algumas vezes sÃ£o compartilhados e muitas vezes mudam de mÃ£os. Por essa razÃ£o, bloqueios de IP indefinidos nÃ£o sÃ£o recomendados.
+        ip: Introduza um endereÃ§o IPv4 ou IPv6. Pode bloquear intervalos inteiros usando a sintaxe CIDR. Tenha cuidado para nÃ£o se bloquear a sÃ mesmo!
+        severities:
+          no_access: Bloquear o acesso a todos os recursos
+          sign_up_requires_approval: Novas inscriÃ§Ãµes requererÃ£o a sua aprovaÃ§Ã£o
+        severity: Escolha o que acontecerÃ¡ com as solicitaÃ§Ãµes deste IP
       sessions:
         otp: 'Insere o cÃ³digo de autenticaÃ§Ã£o em dois passos gerado pelo teu telemÃ³vel ou usa um dos teus cÃ³digos de recuperaÃ§Ã£o:'
+        webauthn: Se for uma chave USB tenha certeza de inseri-la e, se necessÃ¡rio, toque nela.
       tag:
         name: SÃ³ pode alterar a capitalizaÃ§Ã£o das letras, por exemplo, para tornÃ¡-las mais legÃveis
       user:
@@ -91,6 +100,7 @@ pt-PT:
         types:
           disable: Desactivar
           none: NÃ£o fazer algo
+          sensitive: SensÃvel
           silence: Silenciar
           suspend: Suspender e apagar irreversivelmente os dados da conta
         warning_preset_id: Usar um aviso prÃ©-definido
@@ -116,6 +126,7 @@ pt-PT:
         expires_in: Expira em
         fields: Meta-dados de perfil
         header: CabeÃ§alho
+        honeypot: "%{label} (nÃ£o preencher)"
         inbox_url: URL da caixa de entrada do repetidor
         irreversible: Expandir em vez de esconder
         locale: Idioma
@@ -135,6 +146,7 @@ pt-PT:
         setting_default_privacy: Privacidade da publicaÃ§Ã£o
         setting_default_sensitive: Sempre marcar media como sensÃvel
         setting_delete_modal: Solicitar confirmaÃ§Ã£o antes de eliminar uma publicaÃ§Ã£o
+        setting_disable_swiping: Desactivar os movimentos de deslize
         setting_display_media: VisualizaÃ§Ã£o de media
         setting_display_media_default: PrÃ©-definiÃ§Ã£o
         setting_display_media_hide_all: Esconder todos
@@ -168,6 +180,13 @@ pt-PT:
         comment: ComentÃ¡rio
       invite_request:
         text: Porque se quer juntar a nÃ³s?
+      ip_block:
+        comment: ComentÃ¡rio
+        ip: IP
+        severities:
+          no_access: Bloquear acesso
+          sign_up_requires_approval: Limitar inscriÃ§Ãµes
+        severity: Regra
       notification_emails:
         digest: Enviar e-mails de resumo
         favourite: Enviar e-mail quando alguÃ©m adiciona uma publicaÃ§Ã£o tua aos favoritos
@@ -188,4 +207,7 @@ pt-PT:
     required:
       mark: "*"
       text: obrigatÃ³rio
+    title:
+      sessions:
+        webauthn: Utilize uma das suas chaves de seguranÃ§a para entrar
     'yes': Sim
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index 6cc565228fcd1e4d07118551d2ae76863c207482..5baa9d46e8a17c862084e85b148585b921f78d60 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -65,8 +65,17 @@ ru:
         data: Ð¤Ð°Ð¹Ð» CSV, ÑÐºÑÐ¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ð¹ Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð³Ð¾ ÑƒÐ·Ð»Ð° Mastodon.
       invite_request:
         text: ÐÑ‚Ð¾ Ð¿Ð¾Ð¼Ð¾Ð¶ÐµÑ‚ Ð½Ð°Ð¼ Ñ€Ð°ÑÑÐ¼Ð¾Ñ‚Ñ€ÐµÑ‚ÑŒ Ð²Ð°ÑˆÑƒ Ð·Ð°ÑÐ²ÐºÑƒ
+      ip_block:
+        comment: ÐÐµÐ¾Ð±ÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾. Ð—Ð°Ð¼ÐµÑ‚ÐºÐ° Ð½Ð° Ð±ÑƒÐ´ÑƒÑ‰ÐµÐµ, Ð¿Ð¾Ñ‡ÐµÐ¼Ñƒ Ð²Ñ‹ Ð´Ð¾Ð±Ð°Ð²Ð¸Ð»Ð¸ ÑÑ‚Ð¾ Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð¾.
+        expires_in: IP Ð°Ð´Ñ€ÐµÑÐ° â€” Ð²ÐµÑÑŒÐ¼Ð° Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð½Ñ‹Ð¹ Ñ€ÐµÑÑƒÑ€Ñ, Ð¸Ð½Ð¾Ð³Ð´Ð° Ð¾Ð½Ð¸ Ñ€Ð°Ð·Ð´ÐµÐ»ÑÑŽÑ‚ÑÑ Ð¼ÐµÐ¶Ð´Ñƒ Ð°Ð±Ð¾Ð½ÐµÐ½Ñ‚Ð°Ð¼Ð¸ Ð¸ Ñ‡Ð°ÑÑ‚Ð¾ Ð¼ÐµÐ½ÑÑŽÑ‚ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ð°. ÐŸÐ¾ ÑÑ‚Ð¾Ð¹ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ¸ Ð½Ð° Ð½ÐµÐ¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ‘Ð½Ð½Ñ‹Ðµ ÑÑ€Ð¾ÐºÐ¸ Ð½Ðµ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÑŽÑ‚ÑÑ.
+        ip: Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ IPv4 Ð¸Ð»Ð¸ IPv6 Ð°Ð´Ñ€ÐµÑ. Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ†ÐµÐ»Ñ‹Ðµ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½Ñ‹, Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ ÑÐ¸Ð½Ñ‚Ð°ÐºÑÐ¸Ñ CIDR. Ð‘ÑƒÐ´ÑŒÑ‚Ðµ Ð¾ÑÑ‚Ð¾Ñ€Ð¾Ð¶Ð½Ñ‹, Ð½Ðµ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€ÑƒÐ¹Ñ‚Ðµ ÑÐ°Ð¼Ð¾Ð³Ð¾ ÑÐµÐ±Ñ!
+        severities:
+          no_access: Ð—Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿ ÐºÐ¾ Ð²ÑÐµÐ¼ Ñ€ÐµÑÑƒÑ€ÑÐ°Ð¼
+          sign_up_requires_approval: ÐÐ¾Ð²Ñ‹Ðµ Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ð¸ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±ÑƒÑŽÑ‚ Ð²Ð°ÑˆÐµÐ³Ð¾ Ð¾Ð´Ð¾Ð±Ñ€ÐµÐ½Ð¸Ñ
+        severity: Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ, Ñ‡Ñ‚Ð¾ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ñ€Ð¾Ð¸ÑÑ…Ð¾Ð´Ð¸Ñ‚ÑŒ Ñ Ð·Ð°Ð¿Ñ€Ð¾ÑÐ°Ð¼Ð¸ Ñ ÑÑ‚Ð¾Ð³Ð¾ IP
       sessions:
         otp: 'Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÐºÐ¾Ð´ Ð´Ð²ÑƒÑ…Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð¾Ð¹ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸, ÑÐ³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ð¹ Ð² Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ð¾Ð¼ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¸, Ð¸Ð»Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ Ð¾Ð´Ð¸Ð½ Ð¸Ð· Ð²Ð°ÑˆÐ¸Ñ… ÐºÐ¾Ð´Ð¾Ð² Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ:'
+        webauthn: Ð•ÑÐ»Ð¸ ÑÑ‚Ð¾ ÐºÐ»ÑŽÑ‡ USB, Ð½Ðµ Ð·Ð°Ð±ÑƒÐ´ÑŒÑ‚Ðµ ÐµÐ³Ð¾ Ð²ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¸, Ð¿Ñ€Ð¸ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ÑÑ‚Ð¸, Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ Ð½Ð° Ð½ÐµÐ³Ð¾.
       tag:
         name: Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€ Ð±ÑƒÐºÐ² Ñ‡Ñ‚Ð¾Ð±Ñ‹, Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€, ÑÐ´ÐµÐ»Ð°Ñ‚ÑŒ Ñ‚ÐµÐ³ Ð±Ð¾Ð»ÐµÐµ Ñ‡Ð¸Ñ‚Ð°ÐµÐ¼Ñ‹Ð¼
       user:
@@ -91,6 +100,7 @@ ru:
         types:
           disable: Ð—Ð°Ð¼Ð¾Ñ€Ð¾Ð·Ð¸Ñ‚ÑŒ
           none: ÐÐ¸Ñ‡ÐµÐ³Ð¾ Ð½Ðµ Ð´ÐµÐ»Ð°Ñ‚ÑŒ
+          sensitive: Ð”ÐµÐ»Ð¸ÐºÐ°Ñ‚Ð½Ñ‹Ð¹
           silence: Ð¡ÐºÑ€Ñ‹Ñ‚ÑŒ
           suspend: Ð—Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð¸ Ð±ÐµÐ·Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð½Ð¾ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð²ÑÐµ Ð´Ð°Ð½Ð½Ñ‹Ðµ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸
         warning_preset_id: Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑˆÐ°Ð±Ð»Ð¾Ð½
@@ -116,6 +126,7 @@ ru:
         expires_in: Ð˜ÑÑ‚ÐµÐºÐ°ÐµÑ‚ Ñ‡ÐµÑ€ÐµÐ·
         fields: ÐœÐµÑ‚Ð°Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ
         header: Ð¨Ð°Ð¿ÐºÐ°
+        honeypot: "%{label} (Ð½Ðµ Ð·Ð°Ð¿Ð¾Ð»Ð½ÑÑ‚ÑŒ)"
         inbox_url: URL Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´ÑÑ‰Ð¸Ñ… Ð¾Ñ‚ Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ð¾Ð²
         irreversible: Ð£Ð´Ð°Ð»ÑÑ‚ÑŒ, Ð° Ð½Ðµ ÑÐºÑ€Ñ‹Ð²Ð°Ñ‚ÑŒ
         locale: Ð¯Ð·Ñ‹Ðº Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹ÑÐ°
@@ -135,6 +146,7 @@ ru:
         setting_default_privacy: Ð’Ð¸Ð´Ð¸Ð¼Ð¾ÑÑ‚ÑŒ Ð¿Ð¾ÑÑ‚Ð¾Ð²
         setting_default_sensitive: Ð’ÑÐµÐ³Ð´Ð° Ð¾Ñ‚Ð¼ÐµÑ‡Ð°Ñ‚ÑŒ Ð¼ÐµÐ´Ð¸Ð°Ñ„Ð°Ð¹Ð»Ñ‹ ÐºÐ°Ðº Ð´ÐµÐ»Ð¸ÐºÐ°Ñ‚Ð½Ñ‹Ðµ
         setting_delete_modal: Ð’ÑÐµÐ³Ð´Ð° ÑÐ¿Ñ€Ð°ÑˆÐ¸Ð²Ð°Ñ‚ÑŒ Ð¿ÐµÑ€ÐµÐ´ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ð¸ Ð¿Ð¾ÑÑ‚Ð°
+        setting_disable_swiping: ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð°Ð½Ð¸Ð¼Ð°Ñ†Ð¸ÑŽ ÑÐ¼Ð°Ñ…Ð¸Ð²Ð°Ð½Ð¸Ñ
         setting_display_media: ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ðµ Ð¼ÐµÐ´Ð¸Ð°Ñ„Ð°Ð¹Ð»Ð¾Ð²
         setting_display_media_default: ÐŸÐ¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ
         setting_display_media_hide_all: Ð¡ÐºÑ€Ñ‹Ð²Ð°Ñ‚ÑŒ Ð²ÑÐµ
@@ -168,6 +180,13 @@ ru:
         comment: ÐšÐ¾Ð¼Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ð¸Ð¹
       invite_request:
         text: ÐŸÐ¾Ñ‡ÐµÐ¼Ñƒ Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¸ÑÐ¾ÐµÐ´Ð¸Ð½Ð¸Ñ‚ÑŒÑÑ Ðº Ð½Ð°Ð¼?
+      ip_block:
+        comment: ÐšÐ¾Ð¼Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ð¸Ð¹
+        ip: IP
+        severities:
+          no_access: Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿
+          sign_up_requires_approval: ÐžÐ³Ñ€Ð°Ð½Ð¸Ñ‡Ð¸Ñ‚ÑŒ Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ð¸
+        severity: ÐŸÑ€Ð°Ð²Ð¸Ð»Ð¾
       notification_emails:
         digest: ÐŸÑ€Ð¸ÑÑ‹Ð»Ð°Ñ‚ÑŒ Ð´Ð°Ð¹Ð´Ð¶ÐµÑÑ‚ Ð¿Ð¾ e-mail
         favourite: Ð’Ð°Ñˆ Ð¿Ð¾ÑÑ‚ Ð´Ð¾Ð±Ð°Ð²Ð¸Ð»Ð¸ Ð² Ð¸Ð·Ð±Ñ€Ð°Ð½Ð½Ð¾Ðµ
@@ -188,4 +207,7 @@ ru:
     required:
       mark: "*"
       text: Ð¾Ð±ÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾
+    title:
+      sessions:
+        webauthn: Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ Ð¾Ð´Ð¸Ð½ Ð¸Ð· Ð²Ð°ÑˆÐ¸Ñ… ÐºÐ»ÑŽÑ‡ÐµÐ¹ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸ Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð° Ð² ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ
     'yes': Ð”Ð°
diff --git a/config/locales/simple_form.sa.yml b/config/locales/simple_form.sa.yml
new file mode 100644
index 0000000000000000000000000000000000000000..07ea4372a3a109674214ba80f2070c9f99fb872d
--- /dev/null
+++ b/config/locales/simple_form.sa.yml
@@ -0,0 +1 @@
+sa:
diff --git a/config/locales/simple_form.sc.yml b/config/locales/simple_form.sc.yml
index 91bd6d92f04580bfea64f85ac0291ed4a4c1fb7c..99d5ab4294bd66743fc22d91369c339790ac0efa 100644
--- a/config/locales/simple_form.sc.yml
+++ b/config/locales/simple_form.sc.yml
@@ -1 +1,213 @@
+---
 sc:
+  simple_form:
+    hints:
+      account_alias:
+        acct: Dislinda su nÃ²mineutente@domÃ¬niu de su contu dae su cale ti boles mÃ²ere
+      account_migration:
+        acct: Dislinda su nÃ²mineutente@domÃ¬niu de su contu cara a su cale ti boles mÃ²ere
+      account_warning_preset:
+        text: Podes impreare sa sintassi de is tuts, che a is URL, is etichetas e is mentovos
+        title: Optzionale. InvisÃ¬bile a s'Ã tera persone
+      admin_account_action:
+        include_statuses: S'utente at a bÃ¬dere is tuts chi ant causadu s'atzione o s'avisu de moderatzione
+        send_email_notification: S'utente at a retzire un'ispiegatzione de su chi siat sutzÃ¨didu in su contu suo
+        text_html: Optzionale. Podes impreare sa sintassi de is tuts. Podes <a href="%{path}">agiÃ¹nghere avisos pre-impostados</a> pro risparmiare tempus
+        type_html: SÃ¨bera ite fÃ ghere cun <strong>%{acct}</strong>
+        warning_preset_id: Optzionale. Podes ancora agiÃ¹nghere testu personalizadu a s'acabu de cussu predefinidu
+      announcement:
+        all_day: Si est marcadu, ant a Ã¨ssere ammustradas isceti is datas de s'intervallu de tempus
+        ends_at: Optzionale. S'annÃ¹ntziu at a acabbare de abarrare publicadu in custu momentu
+        scheduled_at: Lassa bÃ²idu pro publicare s'annÃ¹ntziu immediatamente
+        starts_at: Optzionale. S'in casu chi s'annÃ¹ntziu tuo siat ligadu a un'intervallu de tempus ispetzÃ¬ficu
+        text: Podes impreare sa sintassi de is tuts. Dae cara a su tretu chi s'annÃ¹ntziu at a pigare in s'ischermu de s'utente
+      defaults:
+        autofollow: Is persones chi s'ant a registrare pro mÃ¨diu de s'invitu t'ant a sighire in manera automÃ tica
+        avatar: PNG, GIF o JPG. MÃ ssimu %{size}. Ant a Ã¨ssere iscaladas a %{dimensions}px
+        bot: Custu contu faghet pro su prus atziones automatizadas e diat pÃ²dere no Ã¨ssere monitoradu
+        context: Unu o prus cuntestos in ue su filtru si diat dÃ¨pere aplicare
+        current_password: Pro chistiones de seguresa inserta sa crae de intrada de su contu atuale
+        current_username: Pro cunfirmare inserta su nÃ²mine utente de su contu atuale
+        digest: Imbiadu isceti a pustis de unu perÃ¬odu longu de inatividade, e isceti si as retzidu carchi messÃ giu personale cando non bi fias
+        discoverable: Sa cartella de is profilos est un'Ã tera manera pro fÃ ghere otÃ¨nnere unu pÃ¹blicu prus mannu a su contu tuo
+        email: T'amus a mandare unu messÃ giu eletrÃ²nicu de cunfirma
+        fields: Podes tÃ¨nnere finas a 4 elementos ammustrados in una tabella in su profilu tuo
+        header: PNG, GIF o JPG. MÃ ssimu %{size}. Ant a Ã¨ssere iscaladas a %{dimensions}px
+        inbox_url: CÃ²pia s'URL dae sa pÃ gina printzipale de su ripetidore chi boles impreare
+        irreversible: Is tuts filtrados ant a isparÃ¨ssere in manera irreversÃ¬bile, fintzas si prus a tardu s'at a bogare su filtru
+        locale: Sa limba de s'interfache de s'utente, de is lÃ¬teras de posta eletrÃ²nica e de is notÃ¬ficas push
+        locked: Tenet bisÃ²ngiu chi aproves a manu is sighiduras
+        password: Imprea a su mancu 8 carÃ teres
+        phrase: Su cunfrontu s'at a fÃ ghere chena pigare in cunsideru si su testu de sa publicatzione est minÃ¹sculu o majÃ¹sculu o si tenet un'avisu de cuntenutu
+        scopes: A ite API s'aplicatzione at a pÃ²dere atzÃ¨dere. Si seletziones un'Ã mbitu de livellu artu no tenes bisÃ²ngiu de nde seletzionare de sÃ¬ngulos.
+        setting_aggregate_reblogs: No ammustres cumpartziduras noas pro tuts chi sunt istados cumpartzidos dae pagu (tenet efetu isceti pro is cumpartziduras retzidas noas)
+        setting_default_sensitive: Is elementos multimediales sensÃ¬biles benint cuados dae is cunfiguratziones predefinidas e si podent rivelare cun un'incarcu
+        setting_display_media_default: Cua elementos multimediales marcados comente sensÃ¬biles
+        setting_display_media_hide_all: Cua semper is elementos multimediales
+        setting_display_media_show_all: Ammustra semper is elementos multimediales
+        setting_hide_network: Sa gente chi sighis o chi ti sighit no at a Ã¨ssere ammustrada in su profilu tuo
+        setting_noindex: Tenet efetu in su profilu pÃ¹blicu tuo e in is pÃ ginas de is istados
+        setting_show_application: S'aplicatzione chi impreas pro publicare tuts at a Ã¨ssere ammustrada in sa visualizatzione de detÃ lliu de is tuts
+        setting_use_blurhash: Is gradientes sunt basados in subra de is colores de is immÃ gines cuadas ma imbelant totu is minujas
+        setting_use_pending_items: Cua is atualizatziones in segus de un'incarcu imbetzes de iscÃ¹rrere in automÃ ticu su flussu de publicatziones
+        username: Su nÃ²mine de utente tuo at a Ã¨ssere Ã¹nicu in %{domain}
+        whole_word: Cando sa parÃ ula o sa frÃ sia crae est alfanumÃ¨rica ebbia s'at a aplicare isceti si currispondet a sa parÃ ula intrea
+      domain_allow:
+        domain: Custu domÃ¬niu at a pÃ²dere recuperare datos dae custu serbidore e is datos in intrada dae cue ant a Ã¨ssere protzessados e archiviados
+      email_domain_block:
+        domain: Custu podet Ã¨ssere su nÃ²mine de domÃ¬niu chi benit ammustradu in s'indiritzu de posta eletrÃ²nica, in su registru MX in ue si risolvet su domÃ¬niu o s'IP de su serbidore in ue si risolvet su registru MX. Custos ant a Ã¨ssere verificados a pustis de sa registratzione e sa registratzione at a Ã¨ssere refudada.
+        with_dns_records: S'at a fÃ ghere unu tentativu de risÃ²lvere is registros DNS de su domÃ¬niu e fintzas is risultados ant a Ã¨ssere blocados
+      featured_tag:
+        name: 'Forsis boles impreare unu de custos:'
+      form_challenge:
+        current_password: Ses intrende in un'Ã rea segura
+      imports:
+        data: ArchÃ¬viu CSV esportadu dae un'Ã teru serbidore de Mastodon
+      invite_request:
+        text: Custu si at a agiudare a revisionare sa dimanda tua
+      ip_block:
+        comment: Optzionale. Regorda pro ite as agiuntu custa rÃ¨gula.
+        expires_in: Is indiritzos IP sunt una risursa limitada, fatu-fatu benint cumpartzidos e podent mudare de mere. Pro custa resone is blocos indefinidos de indiritzos IP non sunt racumandados.
+        ip: Inserta un'indiritzu IPv4 o IPv6. Podes blocare intervallos intreos impreende sa sintassi CIDR. Dae cara e non ti bloches a sa sola!
+        severities:
+          no_access: Bloca s'atzessu a totu is resursas
+          sign_up_requires_approval: As a dÃ¨pere aprovare is iscritziones noas
+        severity: SÃ¨bera ite at a sutzÃ¨dere cun is rechestas de custa IP
+      sessions:
+        otp: 'Inserta su cÃ²dighe de atzessu in duos passos generadu dae s''aplicatzione mÃ²bile tua o imprea unu de custos cÃ²dighes de recÃ¹peru:'
+        webauthn: Si est una crae USB asseguraÂ·ti de l'insertare e, si serbit, de la tocare.
+      tag:
+        name: Podes isceti cambiare su minÃ¹sculu/maiÃ¹sculu de is lÃ¬teras, a esÃ¨mpiu, pro fÃ ghere in manera chi siant prus fÃ tziles de lÃ¨ghere
+      user:
+        chosen_languages: Cando est incarcadu, isceti is tuts in is limbas ischertadas ant a Ã¨ssere ammustrados in is lÃ¬nias de tempus pÃ¹blicas
+    labels:
+      account:
+        fields:
+          name: Eticheta
+          value: Cuntenutu
+      account_alias:
+        acct: NÃ²mine utente de su contu betzu
+      account_migration:
+        acct: NÃ²mine utente de su contu nou
+      account_warning_preset:
+        text: Testu predefinidu
+        title: TÃ¬tulu
+      admin_account_action:
+        include_statuses: Include is tuts sinnalados in sa lÃ¬tera eletrÃ²nica
+        send_email_notification: NotÃ¬fica s'utente pro mÃ¨diu de posta eletrÃ²nica
+        text: Avisu personalizadu
+        type: Atzione
+        types:
+          disable: Disativa
+          none: Imbia un'avisu
+          sensitive: SensÃ¬bile
+          silence: A sa muda
+          suspend: Suspende
+        warning_preset_id: Imprea un'avisu predefinidu
+      announcement:
+        all_day: Eventu de totu sa die
+        ends_at: Fine de s'eventu
+        scheduled_at: Programma sa publicatzione
+        starts_at: Cumintzu de s'eventu
+        text: AnnÃ¹ntziu
+      defaults:
+        autofollow: Invita a sighire su contu tuo
+        avatar: ImmÃ gine de profilu
+        bot: Custu contu est unu bot
+        chosen_languages: Filtra limbas
+        confirm_new_password: Cunfirma sa crae noa
+        confirm_password: Cunfirma sa crae
+        context: Filtra cuntestos
+        current_password: Crae atuale
+        data: Data
+        discoverable: Ammustra custu contu in su diretÃ²riu
+        display_name: NÃ²mine visÃ¬bile
+        email: Indiritzu de posta eletrÃ²nica
+        expires_in: Iscadit a pustis de
+        fields: Metadatos de su profilu
+        header: Intestatzione
+        honeypot: "%{label} (non compiles)"
+        inbox_url: URL de sa cartella de intrada de su ripetidore
+        irreversible: Cantzella imbetzes de cuare
+        locale: Limba de s'interfache
+        locked: Bloca su contu
+        max_uses: NÃ¹meru mÃ ssimu de impreos
+        new_password: Crae noa
+        note: Biografia
+        otp_attempt: CÃ²dighe in duos fatores
+        password: Crae
+        phrase: ParÃ ula o frÃ sia crae
+        setting_advanced_layout: AbÃ¬lita s'interfache web avantzada
+        setting_aggregate_reblogs: Agrupa is cumpartziduras in is lÃ¬nias de tempus
+        setting_auto_play_gif: Riprodui is GIFs animadas in manera automÃ tica
+        setting_boost_modal: Ammustra una ventanedda de diÃ logu de cunfirma in antis de cumpartzire
+        setting_crop_images: RetÃ llia is immÃ gines in is tuts no ismanniados a 16x9
+        setting_default_language: Limba de publicatzione
+        setting_default_privacy: Riservadesa de publicatzione
+        setting_default_sensitive: Marca semper is elementos multimediales comente sensÃ¬biles
+        setting_delete_modal: Ammustra una ventanedda de diÃ logu de cunfirma in antis de cantzellare unu tut
+        setting_disable_swiping: DisabÃ¬lita is movimentos de trisinadura
+        setting_display_media: Visualizatzione de is elementos multimediales
+        setting_display_media_default: Predefinida
+        setting_display_media_hide_all: Cua totu
+        setting_display_media_show_all: Ammustra totu
+        setting_expand_spoilers: IsmÃ nnia semper is tuts marcados cun avisos de cuntenutu
+        setting_hide_network: Cua sa retza tua
+        setting_noindex: Pedi de non ti fÃ ghere inditzizare dae is motores de chirca
+        setting_reduce_motion: MÃ¬nima su movimentu in is animatziones
+        setting_show_application: Rivela s'aplicatzione impreada pro imbiare tuts
+        setting_system_font_ui: Imprea su carÃ tere predefinidu de su sistema
+        setting_theme: Tema de su situ
+        setting_trends: Ammustra is tendÃ¨ntzias de oe
+        setting_unfollow_modal: Ammustra una ventanedda de diÃ logu de cunfirma in antis de acabbare de sighire a calicunu
+        setting_use_blurhash: Ammustra gradientes colorados pro is elementos multimediales cuados
+        setting_use_pending_items: Modalidade lenta
+        severity: Severidade
+        sign_in_token_attempt: CÃ²dighe de seguresa
+        type: Casta de importatzione
+        username: NÃ²mine utente
+        username_or_email: NÃ²mine utente o indiritzu de posta eletrÃ²nica
+        whole_word: ParÃ ula intrea
+      email_domain_block:
+        with_dns_records: Include registros MX e indiritzos IP de su domÃ¬niu
+      featured_tag:
+        name: Eticheta
+      interactions:
+        must_be_follower: Bloca is notÃ¬ficas dae chie non ti sighit
+        must_be_following: Bloca is notÃ¬ficas dae persones chi non sighis
+        must_be_following_dm: Bloca is messÃ gios diretos dae persones chi non sighis
+      invite:
+        comment: Cummenta
+      invite_request:
+        text: Proite ti cheres iscrÃ¬ere?
+      ip_block:
+        comment: Cummentu
+        ip: IP
+        severities:
+          no_access: Bloca s'atzessu
+          sign_up_requires_approval: LÃ¬mita is registratziones
+        severity: RÃ¨gula
+      notification_emails:
+        digest: Imbia lÃ¬teras eletrÃ²nicas de resumu
+        favourite: Calicunu at postu s'istadu tuo in is preferidos suos
+        follow: Calicunu at incumentzadu a ti sighire
+        follow_request: Calicunu at pedidu de ti sighire
+        mention: Calicunu t'at mentovadu
+        pending_account: Unu contu nou bisÃ²ngiat de una revisione
+        reblog: Calicunu at cumpartzidu s'istadu tuo
+        report: Est istadu imbiadu unu raportu nou
+        trending_tag: Un'eticheta non revisionada est in tendÃ¨ntzia
+      tag:
+        listable: Permite a cust'eticheta de apÃ rrere in is chircas e in sa cartella de is profilos
+        name: Eticheta
+        trendable: Permite a cust'eticheta de apÃ rrere in is tendÃ¨ntzias
+        usable: Permite a is tuts de impreare cust'eticheta
+    'no': Nono
+    recommended: Racumandadu
+    required:
+      mark: "*"
+      text: netzessÃ riu
+    title:
+      sessions:
+        webauthn: Imprea una de is craes de seguresa tuas pro intrare
+    'yes': Eja
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index 0093edde28c36b4c70b9cc6386f779800fd8062e..18211e69ea0d6713aa9c69b000dd5e6a44c9a7f6 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -65,8 +65,17 @@ sq:
         data: KartelÃ« CSV tÃ« eksportuar nga njÃ« tjetÃ«r shÃ«rbyes Mastodon
       invite_request:
         text: Kjo do tÃ« na ndihmojÃ« tÃ« shqyrtojmÃ« aplikimin tuaj
+      ip_block:
+        comment: Opsionale. Mbani mend pse e shtuat kÃ«tÃ« rregull.
+        expires_in: Adresat IP janÃ« njÃ« burim i kufizuar, shpesh janÃ« tÃ« pÃ«rbashkÃ«ta dh ndryshojnÃ« zot shpesh. PÃ«r kÃ«tÃ« arsye, nuk rekomandohem blloqe IP tÃ« pafund.
+        ip: Jepni njÃ« adresÃ« IPv4 ose IPv6. Duke pÃ«rdorur sintaksÃ«n CIDR, mund tÃ« bllokoni intervale tÃ« tÃ«ra. Hapni sytÃ« mos lini veten jashtÃ«!
+        severities:
+          no_access: Blloko hyrje nÃ« krejt burimet
+          sign_up_requires_approval: Regjistrime tÃ« reja do tÃ« duan miratimin tuaj
+        severity: Zgjidhni Ã§â€™do tÃ« ndodhÃ« me kÃ«rkesa nga kjo IP
       sessions:
         otp: 'Jepni kodin dyfaktorÃ«sh tÃ« prodhuar nga aplikacioni i telefonit tuaj ose pÃ«rdorni njÃ« nga kodet tuaj tÃ« rikthimeve:'
+        webauthn: NÃ«se Ã«shtÃ« njÃ« diskth USB, sigurohuni se e keni futur dhe, nÃ« qoftÃ« e nevojshme, prekeni.
       tag:
         name: Mund tÃ« ndryshoni shkronjat vetÃ«m nga tÃ« mÃ«dha nÃ« tÃ« vogla ose anasjelltas, pÃ«r shembull, pÃ«r tâ€™i bÃ«rÃ« mÃ« tÃ« lexueshme
       user:
@@ -91,6 +100,7 @@ sq:
         types:
           disable: Ã‡aktivizo hyrjen
           none: Mos bÃ«j gjÃ«
+          sensitive: Rezervat
           silence: Heshtje
           suspend: Pezulloje dhe fshi nÃ« mÃ«nyrÃ« tÃ« pakthyeshme tÃ« dhÃ«nat e llogarisÃ«
         warning_preset_id: PÃ«rdor njÃ« sinjalizim tÃ« paracaktuar
@@ -116,6 +126,7 @@ sq:
         expires_in: Skadon pas
         fields: TejtÃ«dhÃ«na profili
         header: Krye
+        honeypot: "%{label} (mos plotÃ«soni gjÃ« kÃ«tu)"
         inbox_url: URL e TÃ« marrÃ«ve tÃ« relesÃ«
         irreversible: Heqje, nÃ« vend se fshehje
         locale: GjuhÃ« ndÃ«rfaqeje
@@ -135,6 +146,7 @@ sq:
         setting_default_privacy: PrivatÃ«si postimi
         setting_default_sensitive: Mediave vÃ«ru pÃ«rherÃ« shenjÃ« si rezervat
         setting_delete_modal: Shfaq dialog ripohimi pÃ«rpara fshirjes sÃ« njÃ« mesazhi
+        setting_disable_swiping: Ã‡aktivizo lÃ«vizje me fÃ«rkim
         setting_display_media: Shfaqje mediash
         setting_display_media_default: Parazgjedhje
         setting_display_media_hide_all: Fshihi krejt
@@ -168,6 +180,13 @@ sq:
         comment: Komentoni
       invite_request:
         text: Pse doni tÃ« bÃ«heni pjesÃ«?
+      ip_block:
+        comment: Koment
+        ip: IP
+        severities:
+          no_access: Bllokoji hyrjen
+          sign_up_requires_approval: Kufizo regjistrime
+        severity: Rregull
       notification_emails:
         digest: DÃ«rgo email-e pÃ«rmbledhÃ«s
         favourite: Dikush parapÃ«lqeu gjendjen tuaj
@@ -188,4 +207,7 @@ sq:
     required:
       mark: "*"
       text: e domosdoshme
+    title:
+      sessions:
+        webauthn: QÃ« tÃ« bÃ«het hyrja, pÃ«rdorni njÃ« nga kyÃ§et tuaj tÃ« sigurisÃ«
     'yes': Po
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index 80b699c28581fe0f250d99d3ad402743108b834d..8500f109eccf712f26e6a1e6b1b6d5f0bbd5284a 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -15,6 +15,10 @@ sv:
         text_html: Extra. Du kan anvÃ¤nda toot syntax. Du kan <a href="%{path}">lÃ¤gga till fÃ¶rvalda varningar</a> fÃ¶r att spara tid
         type_html: VÃ¤lj vad du vill gÃ¶ra med <strong>%{acct}</strong>
         warning_preset_id: Extra. Du kan lÃ¤gga till valfri text i slutet av fÃ¶rinstÃ¤llningen
+      announcement:
+        all_day: NÃ¤r det Ã¤r markerat visas endast datum fÃ¶r tidsintervallet
+        ends_at: Frivillig. Meddelandet kommer automatiskt att publiceras just nu
+        scheduled_at: LÃ¤mna tomt fÃ¶r att publicera meddelandet omedelbart
       defaults:
         autofollow: AnvÃ¤ndarkonton som skapas genom din inbjudan kommer automatiskt fÃ¶lja dig
         avatar: PNG, GIF eller JPG. HÃ¶gst %{size}. Kommer att skalas ner till %{dimensions}px
@@ -49,20 +53,27 @@ sv:
       account_warning_preset:
         title: Rubrik
       admin_account_action:
+        text: Anpassad varning
         types:
+          disable: Inaktivera inloggning
           none: GÃ¶r ingenting
+          silence: Tysta
       defaults:
         autofollow: Bjud in till att fÃ¶lja ditt konto
         bot: Detta Ã¤r ett botkonto
         chosen_languages: Filtrera sprÃ¥k
         confirm_new_password: BekrÃ¤fta nytt lÃ¶senord
         confirm_password: BekrÃ¤fta lÃ¶senord
+        context: Filter sammanhang
         current_password: Nuvarande lÃ¶senord
+        data: Data
+        discoverable: Lista detta konto i katalogen
         display_name: Visningsnamn
         email: E-postadress
         expires_in: FÃ¶rfaller efter
         fields: Profil-metadata
         header: Bakgrundsbild
+        honeypot: "%{label} (fyll inte i)"
         locale: SprÃ¥k
         locked: LÃ¥s konto
         max_uses: HÃ¶gst antal  anvÃ¤ndningar
@@ -78,7 +89,9 @@ sv:
         setting_default_privacy: Postintegritet
         setting_default_sensitive: Markera alltid media som kÃ¤nsligt
         setting_delete_modal: Visa bekrÃ¤ftelsedialog innan du raderar en toot
+        setting_disable_swiping: Inaktivera svepande rÃ¶relser
         setting_display_media: Mediavisning
+        setting_display_media_default: Standard
         setting_display_media_hide_all: DÃ¶lj alla
         setting_display_media_show_all: Visa alla
         setting_hide_network: GÃ¶m ditt nÃ¤tverk
diff --git a/config/locales/simple_form.ta.yml b/config/locales/simple_form.ta.yml
index 74c64190127a13728fad4d9e4e73cc991151c31c..e306ce64d32ec6e4678d1d3a97d452bd7d80d47a 100644
--- a/config/locales/simple_form.ta.yml
+++ b/config/locales/simple_form.ta.yml
@@ -64,6 +64,7 @@ ta:
         note: à®šà¯à®¯à®šà®°à®¿à®¤à¯ˆ
         password: à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯
         setting_use_pending_items: à®®à¯†à®¤à¯à®µà®¾à®© à®ªà®¯à®©à¯à®®à¯à®±à¯ˆ
+        sign_in_token_attempt: à®ªà®¾à®¤à¯à®•à®¾à®ªà¯à®ªà¯à®•à¯ à®•à¯à®±à®¿à®¯à¯€à®Ÿà¯
         username: à®ªà®¯à®©à®°à¯à®ªà¯†à®¯à®°à¯
         username_or_email: à®ªà®¯à®©à®°à¯ à®ªà¯†à®¯à®°à¯ à®…à®²à¯à®²à®¤à¯ à®®à®¿à®©à¯à®©à®žà¯à®šà®²à¯
       email_domain_block:
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index ee1476b9eb5a1df9e3c6fe6e9225bd2ff8937903..23add1d45599d2a14dc59d381eafc7edfbdc2512 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -53,9 +53,9 @@ th:
         username: à¸Šà¸·à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‚à¸à¸‡à¸„à¸¸à¸“à¸ˆà¸°à¹„à¸¡à¹ˆà¸‹à¹‰à¸³à¸à¸±à¸™à¹ƒà¸™ %{domain}
         whole_word: à¹€à¸¡à¸·à¹ˆà¸à¸„à¸³à¸ªà¸³à¸„à¸±à¸à¸«à¸£à¸·à¸à¸§à¸¥à¸µà¹€à¸›à¹‡à¸™à¸•à¸±à¸§à¸à¸±à¸à¸©à¸£à¹à¸¥à¸°à¸•à¸±à¸§à¹€à¸¥à¸‚à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™ à¸ˆà¸°à¸™à¸³à¹„à¸›à¹ƒà¸Šà¹‰à¸à¸±à¸šà¸„à¸³à¸ªà¸³à¸„à¸±à¸à¸«à¸£à¸·à¸à¸§à¸¥à¸µà¸«à¸²à¸à¸•à¸£à¸‡à¸à¸±à¸™à¸—à¸±à¹‰à¸‡à¸„à¸³à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™
       domain_allow:
-        domain: à¹‚à¸”à¹€à¸¡à¸™à¸™à¸µà¹‰à¸ˆà¸°à¸ªà¸²à¸¡à¸²à¸£à¸–à¸”à¸¶à¸‡à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸ˆà¸²à¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸™à¸µà¹‰à¹à¸¥à¸°à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸‚à¸²à¹€à¸‚à¹‰à¸²à¸ˆà¸²à¸à¹‚à¸”à¹€à¸¡à¸™à¸ˆà¸°à¹„à¸”à¹‰à¸£à¸±à¸šà¸à¸²à¸£à¸›à¸£à¸°à¸¡à¸§à¸¥à¸œà¸¥à¹à¸¥à¸°à¸ˆà¸±à¸”à¹€à¸à¹‡à¸š
+        domain: à¹‚à¸”à¹€à¸¡à¸™à¸™à¸µà¹‰à¸ˆà¸°à¸ªà¸²à¸¡à¸²à¸£à¸–à¸”à¸¶à¸‡à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸ˆà¸²à¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸™à¸µà¹‰à¹à¸¥à¸°à¸ˆà¸°à¸›à¸£à¸°à¸¡à¸§à¸¥à¸œà¸¥à¹à¸¥à¸°à¸ˆà¸±à¸”à¹€à¸à¹‡à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸‚à¸²à¹€à¸‚à¹‰à¸²à¸ˆà¸²à¸à¹‚à¸”à¹€à¸¡à¸™
       email_domain_block:
-        with_dns_records: à¸ˆà¸°à¸—à¸³à¸à¸²à¸£à¸žà¸¢à¸²à¸¢à¸²à¸¡à¹à¸›à¸¥à¸‡à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆà¸£à¸°à¹€à¸šà¸µà¸¢à¸™ DNS à¸‚à¸à¸‡à¹‚à¸”à¹€à¸¡à¸™à¸—à¸µà¹ˆà¸à¸³à¸«à¸™à¸”à¹à¸¥à¸°à¸ˆà¸°à¸‚à¸¶à¹‰à¸™à¸šà¸±à¸à¸Šà¸µà¸”à¸³à¸œà¸¥à¸¥à¸±à¸žà¸˜à¹Œà¹€à¸Šà¹ˆà¸™à¸à¸±à¸™
+        with_dns_records: à¸ˆà¸°à¸—à¸³à¸à¸²à¸£à¸žà¸¢à¸²à¸¢à¸²à¸¡à¹à¸›à¸¥à¸‡à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆà¸£à¸°à¹€à¸šà¸µà¸¢à¸™ DNS à¸‚à¸à¸‡à¹‚à¸”à¹€à¸¡à¸™à¸—à¸µà¹ˆà¸à¸³à¸«à¸™à¸”à¹à¸¥à¸°à¸ˆà¸°à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¸œà¸¥à¸¥à¸±à¸žà¸˜à¹Œà¹€à¸Šà¹ˆà¸™à¸à¸±à¸™
       featured_tag:
         name: 'à¸„à¸¸à¸“à¸à¸²à¸ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸«à¸™à¸¶à¹ˆà¸‡à¹ƒà¸™à¸™à¸µà¹‰:'
       form_challenge:
@@ -64,6 +64,9 @@ th:
         data: à¹„à¸Ÿà¸¥à¹Œ CSV à¸—à¸µà¹ˆà¸ªà¹ˆà¸‡à¸à¸à¸à¸ˆà¸²à¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ Mastodon à¸à¸·à¹ˆà¸™
       invite_request:
         text: à¸™à¸µà¹ˆà¸ˆà¸°à¸Šà¹ˆà¸§à¸¢à¹ƒà¸«à¹‰à¹€à¸£à¸²à¸•à¸£à¸§à¸ˆà¸—à¸²à¸™à¹ƒà¸šà¸ªà¸¡à¸±à¸„à¸£à¸‚à¸à¸‡à¸„à¸¸à¸“
+      ip_block:
+        severities:
+          no_access: à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¸—à¸£à¸±à¸žà¸¢à¸²à¸à¸£à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”
       sessions:
         otp: 'à¸›à¹‰à¸à¸™à¸£à¸«à¸±à¸ªà¸ªà¸à¸‡à¸›à¸±à¸ˆà¸ˆà¸±à¸¢à¸—à¸µà¹ˆà¸ªà¸£à¹‰à¸²à¸‡à¹‚à¸”à¸¢à¹à¸à¸›à¹ƒà¸™à¹‚à¸—à¸£à¸¨à¸±à¸žà¸—à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“à¸«à¸£à¸·à¸à¹ƒà¸Šà¹‰à¸«à¸™à¸¶à¹ˆà¸‡à¹ƒà¸™à¸£à¸«à¸±à¸ªà¸à¸¹à¹‰à¸„à¸·à¸™à¸‚à¸à¸‡à¸„à¸¸à¸“:'
       tag:
@@ -88,10 +91,11 @@ th:
         text: à¸„à¸³à¹€à¸•à¸·à¸à¸™à¸—à¸µà¹ˆà¸à¸³à¸«à¸™à¸”à¹€à¸à¸‡
         type: à¸à¸²à¸£à¸à¸£à¸°à¸—à¸³
         types:
-          disable: à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸ªà¸¹à¹ˆà¸£à¸°à¸šà¸š
-          none: à¹„à¸¡à¹ˆà¸—à¸³à¸ªà¸´à¹ˆà¸‡à¹ƒà¸”
-          silence: à¸—à¸³à¹ƒà¸«à¹‰à¹€à¸‡à¸µà¸¢à¸š
-          suspend: à¸£à¸°à¸‡à¸±à¸šà¹à¸¥à¸°à¸¥à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸šà¸±à¸à¸Šà¸µà¸à¸¢à¹ˆà¸²à¸‡à¸–à¸²à¸§à¸£
+          disable: à¸à¸²à¸¢à¸±à¸”
+          none: à¸ªà¹ˆà¸‡à¸„à¸³à¹€à¸•à¸·à¸à¸™
+          sensitive: à¸¥à¸°à¹€à¸à¸µà¸¢à¸”à¸à¹ˆà¸à¸™
+          silence: à¸ˆà¸³à¸à¸±à¸”
+          suspend: à¸£à¸°à¸‡à¸±à¸š
         warning_preset_id: à¹ƒà¸Šà¹‰à¸„à¸³à¹€à¸•à¸·à¸à¸™à¸—à¸µà¹ˆà¸•à¸±à¹‰à¸‡à¹„à¸§à¹‰à¸¥à¹ˆà¸§à¸‡à¸«à¸™à¹‰à¸²
       announcement:
         all_day: à¹€à¸«à¸•à¸¸à¸à¸²à¸£à¸“à¹Œà¸•à¸¥à¸à¸”à¸—à¸±à¹‰à¸‡à¸§à¸±à¸™
@@ -134,6 +138,7 @@ th:
         setting_default_privacy: à¸„à¸§à¸²à¸¡à¹€à¸›à¹‡à¸™à¸ªà¹ˆà¸§à¸™à¸•à¸±à¸§à¸‚à¸à¸‡à¸à¸²à¸£à¹‚à¸žà¸ªà¸•à¹Œ
         setting_default_sensitive: à¸—à¸³à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸«à¸¡à¸²à¸¢à¸ªà¸·à¹ˆà¸à¸§à¹ˆà¸²à¸¥à¸°à¹€à¸à¸µà¸¢à¸”à¸à¹ˆà¸à¸™à¹€à¸ªà¸¡à¸
         setting_delete_modal: à¹à¸ªà¸”à¸‡à¸à¸¥à¹ˆà¸à¸‡à¹‚à¸•à¹‰à¸•à¸à¸šà¸à¸²à¸£à¸¢à¸·à¸™à¸¢à¸±à¸™à¸à¹ˆà¸à¸™à¸¥à¸šà¹‚à¸žà¸ªà¸•à¹Œ
+        setting_disable_swiping: à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸²à¸£à¹€à¸„à¸¥à¸·à¹ˆà¸à¸™à¹„à¸«à¸§à¹ƒà¸™à¸à¸²à¸£à¸›à¸±à¸”
         setting_display_media: à¸à¸²à¸£à¹à¸ªà¸”à¸‡à¸ªà¸·à¹ˆà¸
         setting_display_media_default: à¸„à¹ˆà¸²à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™
         setting_display_media_hide_all: à¸‹à¹ˆà¸à¸™à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”
@@ -167,6 +172,13 @@ th:
         comment: à¸„à¸§à¸²à¸¡à¸„à¸´à¸”à¹€à¸«à¹‡à¸™
       invite_request:
         text: à¸—à¸³à¹„à¸¡à¸„à¸¸à¸“à¸ˆà¸¶à¸‡à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¹ˆà¸§à¸¡?
+      ip_block:
+        comment: à¸„à¸§à¸²à¸¡à¸„à¸´à¸”à¹€à¸«à¹‡à¸™
+        ip: IP
+        severities:
+          no_access: à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡
+          sign_up_requires_approval: à¸ˆà¸³à¸à¸±à¸”à¸à¸²à¸£à¸¥à¸‡à¸—à¸°à¹€à¸šà¸µà¸¢à¸™
+        severity: à¸à¸Ž
       notification_emails:
         digest: à¸ªà¹ˆà¸‡à¸à¸µà¹€à¸¡à¸¥à¸ªà¸£à¸¸à¸›
         favourite: à¹ƒà¸„à¸£à¸ªà¸±à¸à¸„à¸™à¹„à¸”à¹‰à¸Šà¸·à¹ˆà¸™à¸Šà¸à¸šà¸ªà¸–à¸²à¸™à¸°à¸‚à¸à¸‡à¸„à¸¸à¸“
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index ea913048d8b30ecacd60f7183414bc848d97be72..39ae58dc2e04024f30e4d3481ae398f82b5caffb 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -3,15 +3,15 @@ tr:
   simple_form:
     hints:
       account_alias:
-        acct: TaÅŸÄ±mak istediÄŸiniz hesabÄ±n kullanÄ±cÄ±-adÄ±@alan-adÄ±nÄ± belirtin
+        acct: TaÅŸÄ±mak istediÄŸiniz hesabÄ±n kullanÄ±cÄ±adÄ±@alanadÄ±nÄ± belirtin
       account_migration:
-        acct: TaÅŸÄ±nmak istediÄŸiniz hesabÄ±n kullanÄ±cÄ±-adÄ±@alan-adÄ±nÄ± belirtin
+        acct: TaÅŸÄ±mak istediÄŸiniz hesabÄ±n kullanÄ±cÄ±adÄ±@alanadÄ±nÄ± belirtin
       account_warning_preset:
-        text: URL'ler, etiketler ve bahsetmeler gibi toot sÃ¶zdizimleri kullanabilirsiniz
-        title: Ä°steÄŸe baÄŸlÄ±. AlÄ±cÄ± tarafÄ±ndan gÃ¶rÃ¼lemez
+        text: URL'ler, etiketler ve bahsedenler gibi toot sÃ¶zdizimini kullanabilirsiniz
+        title: Ä°steÄŸe baÄŸlÄ±. AlÄ±cÄ±ya gÃ¶rÃ¼nmez
       admin_account_action:
         include_statuses: KullanÄ±cÄ± hangi tootlarÄ±n denetleme eylemi ya da uyarÄ±sÄ±na neden olduÄŸunu gÃ¶recektir
-        send_email_notification: KullanÄ±cÄ±, hesabÄ±na ne olduÄŸu hakkÄ±nda bir bildirim alacak
+        send_email_notification: KullanÄ±cÄ±, hesabÄ±na ne olduÄŸuna dair bir aÃ§Ä±klama alacak
         text_html: Ä°steÄŸe baÄŸlÄ±. Toot sÃ¶zdizimleri kullanabilirsiniz. Zamandan kazanmak iÃ§in <a href="%{path}">uyarÄ± Ã¶n-ayarlarÄ± ekleyebilirsiniz</a>
         type_html: "<strong>%{acct}</strong> ile ne yapÄ±lacaÄŸÄ±nÄ± seÃ§in"
         warning_preset_id: Ä°steÄŸe baÄŸlÄ±. HazÄ±r ayarÄ±n sonuna hala Ã¶zel metin ekleyebilirsiniz
@@ -28,11 +28,11 @@ tr:
         context: Filtrenin geÃ§erli olmasÄ± gereken bir veya daha fazla iÃ§erik
         current_password: GÃ¼venlik nedeniyle lÃ¼tfen ÅŸu anki hesabÄ±n parolasÄ±nÄ± girin
         current_username: Onaylamak iÃ§in lÃ¼tfen ÅŸu anki hesabÄ±n kullanÄ±cÄ± adÄ±nÄ± girin
-        digest: YalnÄ±zca uzun sÃ¼re kullanÄ±lmadÄ±ÄŸÄ±nda ve yalnÄ±zca yokluÄŸunda kiÅŸisel mesajlar aldÄ±ysanÄ±z gÃ¶nderilir
+        digest: Sadece uzun bir sÃ¼re hareketsiz kaldÄ±ktan sonra ve yalnÄ±zca yokluÄŸunuzda herhangi bir kiÅŸisel mesaj aldÄ±ysanÄ±z gÃ¶nderilir
         discoverable: Profil dizini, hesabÄ±nÄ±zÄ±n daha geniÅŸ bir kitleye ulaÅŸmasÄ±nÄ±n baÅŸka bir yoludur
         email: Onay e-postasÄ± gÃ¶nderilecek
         fields: Profilinizde tablo olarak gÃ¶rÃ¼ntÃ¼lenen en fazla 4 Ã¶geye sahip olabilirsiniz
-        header: En fazla %{size} olacak ÅŸekilde PNG, GIF veya JPG formatÄ±nda yÃ¼kleyiniz. %{dimensions}px bÃ¼yÃ¼klÃ¼ÄŸÃ¼ne indirgenecektir.
+        header: PNG, GIF ya da JPG. En fazla %{size}. %{dimensions}px boyutuna kÃ¼Ã§Ã¼ltÃ¼lecek
         inbox_url: Kullanmak istediÄŸiniz aktarÄ±cÄ±nÄ±n Ã¶n sayfasÄ±ndan URL'yi kopyalayÄ±n
         irreversible: Filtre uygulanmÄ±ÅŸ tootlar, filtre daha sonra Ã§Ä±kartÄ±lsa bile geri dÃ¶nÃ¼ÅŸÃ¼msÃ¼z biÃ§imde kaybolur
         locale: KullanÄ±cÄ± arayÃ¼zÃ¼nÃ¼n dili, e-postalar ve push bildirimleri
@@ -40,20 +40,23 @@ tr:
         password: En az 8 karakter kullanÄ±n
         phrase: Metnin bÃ¼yÃ¼k/kÃ¼Ã§Ã¼k harf durumundan veya tootun iÃ§erik uyarÄ±sÄ±ndan baÄŸÄ±msÄ±z olarak eÅŸleÅŸtirilecek
         scopes: UygulamanÄ±n eriÅŸmesine izin verilen API'ler. Ãœst seviye bir kapsam seÃ§tiyseniz, bireysel kapsam seÃ§menize gerek yoktur.
-        setting_aggregate_reblogs: YakÄ±n zamanda yinelenmiÅŸ tootlar iÃ§in yeni yinelemeler gÃ¶sterme (yalnÄ±zca yeni alÄ±nan yinelemeleri etkiler)
-        setting_default_sensitive: Hassas medya varsayÄ±lan olarak gizlenir ve bir tÄ±klama ile gÃ¶rÃ¼ntÃ¼lenebilir
+        setting_aggregate_reblogs: YakÄ±n zamanda boostlanmÄ±ÅŸ tootlar iÃ§in yeni boostlarÄ± gÃ¶stermeyin (yalnÄ±zca yeni alÄ±nan boostlarÄ± etkiler)
+        setting_default_sensitive: Hassas medya varsayÄ±lan olarak gizlidir ve bir tÄ±klama ile gÃ¶sterilebilir
         setting_display_media_default: Hassas olarak iÅŸaretlenmiÅŸ medyayÄ± gizle
-        setting_display_media_hide_all: TÃ¼m medyayÄ± gizle
-        setting_display_media_show_all: Hassas olarak iÅŸaretlenmiÅŸ medyayÄ± gÃ¶ster
-        setting_hide_network: Takip edilenler ve takipÃ§iler profilinizde gÃ¶sterilmeyecek
+        setting_display_media_hide_all: MedyayÄ± her zaman gizle
+        setting_display_media_show_all: MedyayÄ± her zaman gÃ¶ster
+        setting_hide_network: Takip ettiÄŸiniz ve sizi takip eden kiÅŸiler profilinizde gÃ¶sterilmeyecek
         setting_noindex: Herkese aÃ§Ä±k profilinizi ve durum sayfalarÄ±nÄ±zÄ± etkiler
         setting_show_application: Tootlamak iÃ§in kullandÄ±ÄŸÄ±nÄ±z uygulama, tootlarÄ±nÄ±zÄ±n detaylÄ± gÃ¶rÃ¼nÃ¼mÃ¼nde gÃ¶sterilecektir
         setting_use_blurhash: Gradyenler gizli gÃ¶rsellerin renklerine dayanÄ±r, ancak detaylarÄ± gizler
-        setting_use_pending_items: Zaman Ã§izelgesi gÃ¼ncellemelerini, akÄ±ÅŸÄ± otomatik olarak kaydÄ±rmak yerine bir tÄ±klamanÄ±n arkasÄ±na gizleyin
+        setting_use_pending_items: AkÄ±ÅŸÄ± otomatik olarak kaydÄ±rmak yerine, zaman Ã§izelgesi gÃ¼ncellemelerini tek bir tÄ±klamayla gizleyin
         username: KullanÄ±cÄ± adÄ±nÄ±z %{domain} alanÄ±nda benzersiz olacak
         whole_word: Anahtar kelime veya kelime Ã¶beÄŸi yalnÄ±zca alfasayÄ±sal olduÄŸunda, yalnÄ±zca tÃ¼m sÃ¶zcÃ¼kle eÅŸleÅŸirse uygulanÄ±r
       domain_allow:
         domain: Bu alan adÄ±, bu sunucudan veri alabilecek ve ondan gelen veri iÅŸlenecek ve saklanacaktÄ±r
+      email_domain_block:
+        domain: Bu, e-posta adresinde gÃ¶rÃ¼nen etki alanÄ± adÄ±, etki alanÄ±nÄ±n Ã§Ã¶zÃ¼mlediÄŸi MX kaydÄ± veya MX kaydÄ±nÄ±n Ã§Ã¶zÃ¼mlediÄŸi sunucunun IP'si olabilir. Bunlar kullanÄ±cÄ± kaydÄ± ile kontrol edilecek ve kayÄ±t reddedilecektir.
+        with_dns_records: Belirli bir alanÄ±n DNS kayÄ±tlarÄ±nÄ± Ã§Ã¶zmeyi deneyecek ve sonuÃ§lar kara listeye eklenecek
       featured_tag:
         name: 'Bunlardan birini kullanmak isteyebilirsiniz:'
       form_challenge:
@@ -62,8 +65,17 @@ tr:
         data: DiÄŸer Mastodon sunucusundan dÄ±ÅŸarÄ± aktardÄ±ÄŸÄ±nÄ±z CSV dosyasÄ±
       invite_request:
         text: Bu, baÅŸvurunuzu gÃ¶zden geÃ§irmemize yardÄ±mcÄ± olacaktÄ±r
+      ip_block:
+        comment: Ä°steÄŸe baÄŸlÄ±. Bu kuralÄ± neden eklediÄŸinizi hatÄ±rlayÄ±n.
+        expires_in: IP adresleri sÄ±nÄ±rlÄ± bir kaynaktÄ±r, bazen paylaÅŸÄ±lÄ±rlar ve sÄ±klÄ±kla el deÄŸiÅŸtirirler. Bu nedenle, belirsiz IP bloklarÄ± Ã¶nerilmez.
+        ip: Bir IPv4 veya IPv6 adresi girin. CIDR sÃ¶zdizimini kullanarak tÃ¼m aralÄ±klarÄ± engelleyebilirsiniz. Kendinizi dÄ±ÅŸarÄ±da bÄ±rakmamaya dikkat edin!
+        severities:
+          no_access: TÃ¼m kaynaklara eriÅŸimi engelle
+          sign_up_requires_approval: Yeni kayÄ±t onayÄ±nÄ±zÄ± gerektirir
+        severity: Bu IP'den gelen isteklere ne olacaÄŸÄ±nÄ± seÃ§in
       sessions:
         otp: Telefonunuzdaki two-factor kodunuzu giriniz veya kurtarma kodlarÄ±nÄ±zdan birini giriniz.
+        webauthn: Bir USB anahtarÄ±ysa, taktÄ±ÄŸÄ±nÄ±zdan ve gerekirse Ã¼zerine tÄ±kladÄ±ÄŸÄ±nÄ±zdan emin olun.
       tag:
         name: Harflerin, Ã¶rneÄŸin daha okunabilir yapmak iÃ§in, sadece bÃ¼yÃ¼k/kÃ¼Ã§Ã¼k harf durumlarÄ±nÄ± deÄŸiÅŸtirebilirsiniz
       user:
@@ -78,111 +90,124 @@ tr:
       account_migration:
         acct: Yeni hesabÄ±n tanÄ±tÄ±cÄ±sÄ±
       account_warning_preset:
-        text: Ã–n-ayar metni
+        text: Ã–n ayarlÄ± metin
         title: BaÅŸlÄ±k
       admin_account_action:
-        include_statuses: Birdirilen tootlarÄ± e-postaya dahil et
-        send_email_notification: E-postayla kullanÄ±cÄ±yÄ± bilgilendir
+        include_statuses: Bildirilen tootlarÄ± e-postaya dahil et
+        send_email_notification: KullanÄ±cÄ±yÄ± e-posta ile bilgilendir
         text: Ã–zel uyarÄ±
         type: Eylem
         types:
-          disable: Devre dÄ±ÅŸÄ±
+          disable: Dondur
           none: HiÃ§ birÅŸey
-          silence: Sessiz
+          sensitive: Hassas
+          silence: Limit
           suspend: Hesap verilerini askÄ±ya alÄ±n ve geri alÄ±namaz ÅŸekilde silin
-        warning_preset_id: Bir uyarÄ± Ã¶n-ayarÄ± kullan
+        warning_preset_id: Bir uyarÄ± Ã¶n ayarÄ± kullan
       announcement:
         all_day: TÃ¼m gÃ¼n etkinliÄŸi
-        ends_at: Etkinlik sonu
+        ends_at: EtkinliÄŸin sonu
         scheduled_at: YayÄ±nlamayÄ± zamanla
-        starts_at: Etkinlik baÅŸlangÄ±cÄ±
+        starts_at: EtkinliÄŸin baÅŸlangÄ±cÄ±
         text: Duyuru
       defaults:
         autofollow: HesabÄ±nÄ±zÄ± takip etmeye davet edin
         avatar: Profil resmi
         bot: Bu bir bot hesabÄ±
         chosen_languages: Dilleri filtrele
-        confirm_new_password: Yeni parolanÄ±z (tekrar)
-        confirm_password: ParolanÄ±z (tekrar)
+        confirm_new_password: Yeni ÅŸifreyi onayla
+        confirm_password: Åžifreyi onayla
         context: Ä°Ã§eriÄŸi filtrele
-        current_password: Mevcut parolanÄ±z
-        data: Dosya
+        current_password: GeÃ§erli ÅŸifre
+        data: Veri
         discoverable: Bu hesabÄ± dizinde listele
-        display_name: GÃ¶rÃ¼nen adÄ±nÄ±z
-        email: E-posta adresiniz
+        display_name: GÃ¶rÃ¼nen isim
+        email: E-posta adresi
         expires_in: BitiÅŸ tarihi
-        fields: Profil Metaverisi
+        fields: Profil meta verisi
         header: Kapak resmi
+        honeypot: "%{label} (doldurmayÄ±n)"
         inbox_url: AktarÄ±cÄ± gelen kutusunun URL'si
         irreversible: Gizlemek yerine bÄ±rak
-        locale: Dil
-        locked: HesabÄ±mÄ± kilitle
+        locale: ArayÃ¼z dili
+        locked: HesabÄ± kilitle
         max_uses: Maksimum kullanÄ±m sayÄ±sÄ±
-        new_password: Yeni parolanÄ±z
+        new_password: Yeni ÅŸifre
         note: KiÅŸisel bilgiler
-        otp_attempt: Ä°ki-faktÃ¶rlÃ¼ kod
-        password: ParolanÄ±z
+        otp_attempt: Ä°ki adÄ±mlÄ± doÄŸrulama kodu
+        password: Åžifre
         phrase: Anahtar kelime veya kelime Ã¶beÄŸi
         setting_advanced_layout: GeliÅŸmiÅŸ web arayÃ¼zÃ¼nÃ¼ etkinleÅŸtir
-        setting_aggregate_reblogs: Zaman Ã§izelgesindeki grup yinelemeleri
-        setting_auto_play_gif: GIF'leri otomatik oynatt
-        setting_boost_modal: Boost etmeden Ã¶nce onay diyaloÄŸu gÃ¶ster
+        setting_aggregate_reblogs: Zaman Ã§izelgesinde grup boostlarÄ±
+        setting_auto_play_gif: Hareketli GIF'leri otomatik oynat
+        setting_boost_modal: Boostlamadan Ã¶nce onay iletiÅŸim kutusu gÃ¶ster
         setting_crop_images: GeniÅŸletilmemiÅŸ tootlardaki resimleri 16x9 olarak kÄ±rp
         setting_default_language: GÃ¶nderi dili
         setting_default_privacy: GÃ¶nderi gizliliÄŸi
-        setting_default_sensitive: Her zaman hassas medya olarak iÅŸaretle
-        setting_delete_modal: Bir tootu silmeden Ã¶nce onay iletiÅŸim kutusunu gÃ¶ster
-        setting_display_media: Medya gÃ¶rÃ¼nÃ¼mÃ¼
+        setting_default_sensitive: MedyayÄ± her zaman hassas olarak iÅŸaretle
+        setting_delete_modal: Bir tootu silmeden Ã¶nce onay iletiÅŸim kutusu gÃ¶ster
+        setting_disable_swiping: KaydÄ±rma hareketlerini devre dÄ±ÅŸÄ± bÄ±rak
+        setting_display_media: Medya gÃ¶rÃ¼ntÃ¼leme
         setting_display_media_default: VarsayÄ±lan
         setting_display_media_hide_all: TÃ¼mÃ¼nÃ¼ gizle
         setting_display_media_show_all: TÃ¼mÃ¼nÃ¼ gÃ¶ster
         setting_expand_spoilers: Ä°Ã§erik uyarÄ±larÄ±yla iÅŸaretli tootlarÄ± her zaman geniÅŸlet
-        setting_hide_network: AÄŸÄ±nÄ± gizle
-        setting_noindex: Arama motoru endekslemesini iptal et
+        setting_hide_network: AÄŸÄ±nÄ±zÄ± gizleyin
+        setting_noindex: Arama motoru dizinine eklemeyi iptal et
         setting_reduce_motion: Animasyonlarda hareketi azalt
-        setting_show_application: Toot gÃ¶ndermek iÃ§in kullanÄ±lan uygulamayÄ± belirt
+        setting_show_application: TootlarÄ± gÃ¶ndermek iÃ§in kullanÄ±lan uygulamayÄ± belirt
         setting_system_font_ui: Sistemin varsayÄ±lan yazÄ± tipini kullan
         setting_theme: Site temasÄ±
-        setting_trends: BugÃ¼nÃ¼n trendlerini gÃ¶ster
-        setting_unfollow_modal: Birini takip etmeden Ã¶nce onay iletiÅŸim kutusunu gÃ¶ster
-        setting_use_blurhash: Gizli ortamlar iÃ§in renkli gradyen gÃ¶ster
+        setting_trends: BugÃ¼nÃ¼n gÃ¼ndemini gÃ¶ster
+        setting_unfollow_modal: Birini takip etmeden Ã¶nce onay iletiÅŸim kutusu gÃ¶ster
+        setting_use_blurhash: Gizli medya iÃ§in renkli gradyanlar gÃ¶ster
         setting_use_pending_items: YavaÅŸ mod
-        severity: Zorluk
+        severity: Ã–nem derecesi
         sign_in_token_attempt: GÃ¼venlik kodu
-        type: Dosya tÃ¼rÃ¼
-        username: KullanÄ±cÄ± adÄ±nÄ±z
-        username_or_email: KullanÄ±cÄ± adÄ± ya da email
-        whole_word: TÃ¼m dÃ¼nya
+        type: Ä°Ã§eri aktarma tÃ¼rÃ¼
+        username: KullanÄ±cÄ± adÄ±
+        username_or_email: KullanÄ±cÄ± adÄ± ya da e-posta
+        whole_word: Tam sÃ¶zcÃ¼k
       email_domain_block:
         with_dns_records: Alan adÄ±nÄ±n MX kayÄ±tlarÄ±nÄ± ve IP'lerini ekleyin
       featured_tag:
-        name: Hashtag
+        name: Etiket
       interactions:
         must_be_follower: TakipÃ§im olmayan kiÅŸilerden gelen bildirimleri engelle
         must_be_following: Takip etmediÄŸim kiÅŸilerden gelen bildirimleri engelle
-        must_be_following_dm: Takip etmediÄŸiniz kiÅŸilerin doÄŸrudan ileti gÃ¶ndermesini engelle
+        must_be_following_dm: Takip etmediÄŸiniz kiÅŸilerden gelen direkt mesajlarÄ± engelle
       invite:
         comment: Yorum
       invite_request:
         text: Neden katÄ±lmak istiyorsun?
+      ip_block:
+        comment: Yorum
+        ip: IP
+        severities:
+          no_access: EriÅŸimi engelle
+          sign_up_requires_approval: KayÄ±tlarÄ± sÄ±nÄ±rla
+        severity: Kural
       notification_emails:
         digest: Ã–zet e-postalarÄ± gÃ¶nder
-        favourite: Biri durumumu favorilerine eklediginde bana e-posta gÃ¶nder
-        follow: Biri beni takip ettiÄŸinde bana e-posta gÃ¶nder
-        follow_request: Biri bana takip isteÄŸi gÃ¶nderdiÄŸinde, bana e-posta gÃ¶nder
-        mention: Biri benden bahsettiÄŸinde, bana e-posta gÃ¶nder
-        pending_account: Yeni bir hesap incelemesi gerektiÄŸinde e-posta gÃ¶nder
-        reblog: Biri durumumu paylaÅŸtÄ±ÄŸÄ±nda, bana e-posta gÃ¶nder
-        report: Yeni bir rapor gÃ¶nderildiÄŸinde e-posta gÃ¶nder
-        trending_tag: Ä°ncelenmemiÅŸ bir hashtag trend olduÄŸunda e-posta gÃ¶nder
+        favourite: Birisi durumunuzu beÄŸendi
+        follow: Biri seni takip etti
+        follow_request: Biri seni takip etmek istedi
+        mention: Biri senden bahsetti
+        pending_account: Yeni hesabÄ±n incelenmesi gerekiyor
+        reblog: Biri durumunuzu boostladÄ±
+        report: Yeni rapor gÃ¶nderildi
+        trending_tag: Ä°ncelenmemiÅŸ bir etiket gÃ¼ndem oluyor
       tag:
         listable: Bu etiketin aramalarda ve profil dizininde gÃ¶rÃ¼nmesine izin ver
-        name: Hashtag
-        trendable: Bu etiketin trendlerin altÄ±nda gÃ¶rÃ¼nmesine izin ver
+        name: Etiket
+        trendable: Bu etiketin gÃ¼ndem altÄ±nda gÃ¶rÃ¼nmesine izin ver
         usable: TootlarÄ±n bu etiketi kullanmasÄ±na izin ver
     'no': HayÄ±r
     recommended: Ã–nerilen
     required:
       mark: "*"
       text: gerekli
+    title:
+      sessions:
+        webauthn: Oturum aÃ§mak iÃ§in gÃ¼venlik anahtarlarÄ±nÄ±zdan birini kullanÄ±n
     'yes': Evet
diff --git a/config/locales/simple_form.tt.yml b/config/locales/simple_form.tt.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5eab4abff95e2119202e91e8d75bd785c9ccbdc9
--- /dev/null
+++ b/config/locales/simple_form.tt.yml
@@ -0,0 +1 @@
+tt:
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index a490efed555048ee1c2cb899bf0b067a9dabe129..adfc07a0958d872a7057aa1828a2b59907f6298c 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -55,6 +55,7 @@ uk:
       domain_allow:
         domain: Ð¦ÐµÐ¹ Ð´Ð¾Ð¼ÐµÐ½ Ð·Ð¼Ð¾Ð¶Ðµ Ð¾Ñ‚Ñ€Ð¸Ð¼ÑƒÐ²Ð°Ñ‚Ð¸ Ð´Ð°Ð½Ñ– Ð· Ñ†ÑŒÐ¾Ð³Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ñƒ. Ð’Ñ…Ñ–Ð´Ð½Ñ– Ð´Ð°Ð½Ñ– Ð±ÑƒÐ´ÑƒÑ‚ÑŒ Ð¾Ð±Ñ€Ð¾Ð±Ð»ÐµÐ½Ñ– Ñ‚Ð° Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ñ–
       email_domain_block:
+        domain: Ð¦Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑƒÑ‚Ð¸ Ð´Ð¾Ð¼ÐµÐ½, Ñ‰Ð¾ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ”Ñ‚ÑŒÑÑ Ñƒ Ð¿Ð¾ÑˆÑ‚Ð¾Ð²Ñ–Ð¹ Ð°Ð´Ñ€ÐµÑÑ–, Ð·Ð°Ð¿Ð¸Ñ MX Ð´Ð»Ñ Ð´Ð¾Ð¼ÐµÐ½Ñƒ Ñ‡Ð¸ IP Ð°Ð´Ñ€ÐµÑÐ¸ ÑÐµÑ€Ð²ÐµÑ€Ð°. Ð’Ð¾Ð½Ð¸ Ð±ÑƒÐ´ÑƒÑ‚ÑŒ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐµÐ½Ñ– Ð¿Ñ€Ð¸ Ñ€ÐµÑ”ÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ— ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°, Ñ– Ñ€ÐµÑ”ÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ Ð±ÑƒÐ´Ðµ Ð²Ñ–Ð´Ñ…Ð¸Ð»ÐµÐ½Ð°.
         with_dns_records: Ð¡Ð¿Ñ€Ð¾Ð±Ð° Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ DNS-Ð·Ð°Ð¿Ð¸ÑÑ–Ð² Ð·Ð°Ð´Ð°Ð½Ð¾Ð³Ð¾ Ð´Ð¾Ð¼ÐµÐ½Ñƒ Ð±ÑƒÐ´Ðµ Ð·Ð´Ñ–Ð¹ÑÐ½ÐµÐ½Ð°, Ð° Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð¸ Ñ‚Ð°ÐºÐ¾Ð¶ Ð±ÑƒÐ´ÑƒÑ‚ÑŒ Ð·Ð°Ð½ÐµÑÐµÐ½Ñ– Ð´Ð¾ Ñ‡Ð¾Ñ€Ð½Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÑƒ
       featured_tag:
         name: 'ÐœÐ¾Ð¶Ð»Ð¸Ð²Ð¾, Ð²Ð¸ Ð·Ð°Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð¾Ð´Ð¸Ð½ Ð· Ñ†Ð¸Ñ…:'
@@ -66,6 +67,7 @@ uk:
         text: Ð¦Ðµ Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð¶Ðµ Ð½Ð°Ð¼ Ñ€Ð¾Ð·Ð³Ð»ÑÐ½ÑƒÑ‚Ð¸ Ð²Ð°ÑˆÑƒ Ð·Ð°ÑÐ²Ñƒ
       sessions:
         otp: Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÐºÐ¾Ð´ Ð´Ð²ÑƒÑ…Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð¾Ð¹ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸ Ð¸Ð»Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ Ð¾Ð´Ð¸Ð½ Ð¸Ð· Ð’Ð°ÑˆÐ¸Ñ… ÐºÐ¾Ð´Ð¾Ð² Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ.
+        webauthn: Ð¯ÐºÑ‰Ð¾ Ñ†Ðµ USB ÐºÐ»ÑŽÑ‡, Ð²ÑÑ‚Ð°Ð²Ñ‚Ðµ Ð¹Ð¾Ð³Ð¾ Ñ–, ÑÐºÑ‰Ð¾ Ð½ÐµÐ¾Ð±Ñ…Ñ–Ð´Ð½Ð¾, Ð½Ð°Ñ‚Ð¸ÑÐ½Ñ–Ñ‚ÑŒ Ð½Ð° Ð½ÑŒÐ¾Ð³Ð¾.
       tag:
         name: Ð¢ÑƒÑ‚ Ð²Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð»Ð¸ÑˆÐµ Ð·Ð¼Ñ–Ð½ÑŽÐ²Ð°Ñ‚Ð¸ Ñ€ÐµÐ³Ñ–ÑÑ‚Ñ€ Ð»Ñ–Ñ‚ÐµÑ€, Ñ‰Ð¾Ð± Ð¿Ñ–Ð´Ð²Ð¸Ñ‰Ð¸Ñ‚Ð¸ Ñ‡Ð¸Ñ‚Ð°Ð±ÐµÐ»ÑŒÐ½Ñ–ÑÑ‚ÑŒ
       user:
@@ -187,4 +189,7 @@ uk:
     required:
       mark: "*"
       text: Ð¾Ð±Ð¾Ð²'ÑÐ·ÐºÐ¾Ð²Ðµ
+    title:
+      sessions:
+        webauthn: Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð¹Ñ‚Ðµ Ð¾Ð´Ð¸Ð½ Ñ–Ð· Ð²Ð°ÑˆÐ¸Ñ… ÐºÐ»ÑŽÑ‡Ñ–Ð² Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ
     'yes': Ð¢Ð°Ðº
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index 5251ab114fbbc123361572da997aa6dcdf2f7285..dfe1ae36e513864894e74a9f63b4b96ec7fc3896 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -3,97 +3,107 @@ vi:
   simple_form:
     hints:
       account_alias:
-        acct: Chá»n tÃªn_ngÆ°á»i_dÃ¹ng@mÃ¡y chá»§ cá»§a tÃ i khoáº£n lÃºc trÆ°á»›c
+        acct: Nháºp tÃªn_ngÆ°á»i_dÃ¹ng@mÃ¡y chá»§ cá»§a tÃ i khoáº£n cÅ©
       account_migration:
-        acct: Chá»n tÃªnngÆ°á»idÃ¹ng@mÃ¡y chá»§ cá»§a tÃ i khoáº£n báº¡n muá»‘n dá»i sang
+        acct: Nháºp tÃªn_ngÆ°á»i_dÃ¹ng@mÃ¡y chá»§ cá»§a tÃ i khoáº£n báº¡n muá»‘n dá»i sang
       account_warning_preset:
-        text: Báº¡n cÃ³ thá»ƒ sá» dá»¥ng URL, hashtag vÃ  nháº¯c Ä‘áº¿n
+        text: Báº¡n cÃ³ thá»ƒ dÃ¹ng URL, hashtag vÃ  nháº¯c Ä‘áº¿n
         title: TÃ¹y chá»n. KhÃ´ng cho ngÆ°á»i nháºn xem
       admin_account_action:
-        include_statuses: NgÆ°á»i dÃ¹ng sáº½ tháº¥y cÃ¡c tÃºt bá»‹ kiá»ƒm duyá»‡t hoáº·c cáº£nh cÃ¡o
+        include_statuses: NgÆ°á»i dÃ¹ng sáº½ tháº¥y cÃ¡c tÃºt nÃ o cá»§a há» bá»‹ kiá»ƒm duyá»‡t
         send_email_notification: NgÆ°á»i dÃ¹ng sáº½ nháºn Ä‘Æ°á»£c lá»i giáº£i thÃch vá» nhá»¯ng gÃ¬ xáº£y ra vá»›i tÃ i khoáº£n cá»§a há»
-        text_html: TÃ¹y chá»n. Báº¡n cÃ³ thá»ƒ sá» dá»¥ng <a href="%{path}">cáº£nh cÃ¡o cÃ i sáºµn</a> Ä‘á»ƒ tiáº¿t kiá»‡m thá»i gian
+        text_html: TÃ¹y chá»n. Báº¡n nÃªn dÃ¹ng <a href="%{path}">cáº£nh cÃ¡o cÃ i sáºµn</a> Ä‘á»ƒ tiáº¿t kiá»‡m thá»i gian
         type_html: Chá»n lÃ m gÃ¬ vá»›i <strong>%{acct}</strong>
-        warning_preset_id: TÃ¹y chá»n. Báº¡n váº«n cÃ³ thá»ƒ thÃªm vÄƒn báº£n tÃ¹y chá»‰nh vÃ o cuá»‘i cáº£nh cÃ¡o cÃ i sáºµn
+        warning_preset_id: TÃ¹y chá»n. Báº¡n váº«n cÃ³ thá»ƒ thÃªm ghi chÃº riÃªng
       announcement:
         all_day: Chá»‰ cÃ³ khoáº£ng thá»i gian Ä‘Æ°á»£c Ä‘Ã¡nh dáº¥u má»›i hiá»ƒn thá»‹
         ends_at: TÃ¹y chá»n. ThÃ´ng bÃ¡o sáº½ tá»± Ä‘á»™ng há»§y vÃ o lÃºc nÃ y
         scheduled_at: Äá»ƒ trá»‘ng náº¿u muá»‘n Ä‘Äƒng thÃ´ng bÃ¡o ngay láºp tá»©c
         starts_at: TÃ¹y chá»n. Trong trÆ°á»ng há»£p thÃ´ng bÃ¡o cá»§a báº¡n Ä‘Äƒng vÃ o má»™t khoáº£ng thá»i gian cá»¥ thá»ƒ
-        text: Báº¡n cÃ³ thá»ƒ sá» dá»¥ng tÃºt dáº¡ng cÃº phÃ¡p. Cá»‘ gáº¯ng ngáº¯n gá»n bá»Ÿi vÃ¬ thÃ´ng bÃ¡o sáº½ xuáº¥t hiá»‡n trÃªn mÃ n hÃ¬nh Ä‘iá»‡n thoáº¡i cá»§a ngÆ°á»i dÃ¹ng
+        text: Báº¡n cÃ³ thá»ƒ dÃ¹ng URL, hashtag vÃ  nháº¯c Ä‘áº¿n. Cá»‘ gáº¯ng ngáº¯n gá»n bá»Ÿi vÃ¬ thÃ´ng bÃ¡o sáº½ xuáº¥t hiá»‡n trÃªn mÃ n hÃ¬nh Ä‘iá»‡n thoáº¡i cá»§a ngÆ°á»i dÃ¹ng
       defaults:
-        autofollow: Nhá»¯ng ngÆ°á»i Ä‘Äƒng kÃ½ thÃ´ng qua lá»i má»i sáº½ tá»± Ä‘á»™ng theo dÃµi báº¡n
+        autofollow: Nhá»¯ng ngÆ°á»i Ä‘Äƒng kÃ½ sáº½ tá»± Ä‘á»™ng theo dÃµi báº¡n
         avatar: PNG, GIF hoáº·c JPG. KÃch cá»¡ tá»‘i Ä‘a %{size}. Sáº½ bá»‹ nÃ©n xuá»‘ng %{dimensions}px
         bot: TÃ i khoáº£n nÃ y tá»± Ä‘á»™ng thá»±c hiá»‡n cÃ¡c hÃ nh Ä‘á»™ng vÃ  khÃ´ng cáº§n thiáº¿t theo dÃµi
-        context: Má»™t hoáº·c nhiá»u bá»‘i cáº£nh nÆ¡i bá»™ lá»c nÃªn Ã¡p dá»¥ng
+        context: Chá»n má»™t hoáº·c nhiá»u nÆ¡i mÃ  bá»™ lá»c sáº½ Ã¡p dá»¥ng
         current_password: VÃ¬ má»¥c Ä‘Ãch báº£o máºt, vui lÃ²ng nháºp máºt kháº©u cá»§a tÃ i khoáº£n hiá»‡n táº¡i
         current_username: Äá»ƒ xÃ¡c nháºn, vui lÃ²ng nháºp tÃªn ngÆ°á»i dÃ¹ng cá»§a tÃ i khoáº£n hiá»‡n táº¡i
-        digest: Chá»‰ Ä‘Æ°á»£c gá»i sau má»™t thá»i gian dÃ i khÃ´ng hoáº¡t Ä‘á»™ng vÃ  chá»‰ khi báº¡n Ä‘Ã£ nháºn Ä‘Æ°á»£c báº¥t ká»³ tin nháº¯n cÃ¡ nhÃ¢n nÃ o khi báº¡n váº¯ng máº·t
-        discoverable: Danh sÃ¡ch thÃ nh viÃªn lÃ  má»™t cÃ¡ch hay Ä‘á»ƒ báº¡n tÃ¬m kiáº¿m ngÆ°á»i báº¡n muá»‘n theo dÃµi
+        digest: Chá»‰ gá»i sau má»™t thá»i gian dÃ i khÃ´ng hoáº¡t Ä‘á»™ng hoáº·c khi báº¡n nháºn Ä‘Æ°á»£c tin nháº¯n (trong thá»i gian váº¯ng máº·t)
+        discoverable: Má»i ngÆ°á»i sáº½ cÃ³ thá»ƒ tÃ¬m tháº¥y báº¡n dá»… dÃ ng hÆ¡n
         email: Báº¡n sáº½ Ä‘Æ°á»£c gá»i má»™t email xÃ¡c nháºn
-        fields: Báº¡n cÃ³ thá»ƒ táº¡o tá»‘i Ä‘a 4 má»¥c Ä‘Æ°á»£c hiá»ƒn thá»‹ dÆ°á»›i dáº¡ng báº£ng trÃªn há»“ sÆ¡ cá»§a báº¡n
+        fields: ÄÆ°á»£c phÃ©p táº¡o tá»‘i Ä‘a 4 má»¥c trÃªn trang cÃ¡ nhÃ¢n cá»§a báº¡n
         header: PNG, GIF hoáº·c JPG. KÃch cá»¡ tá»‘i Ä‘a %{size}. Sáº½ bá»‹ nÃ©n xuá»‘ng %{dimensions}px
-        inbox_url: Sao chÃ©p URL cá»§a relay mÃ  báº¡n muá»‘n sá» dá»¥ng
-        irreversible: CÃ¡c tÃºt Ä‘Ã£ lá»c sáº½ khÃ´ng thá»ƒ phá»¥c há»“i, ká»ƒ cáº£ khi bá»™ lá»c cÃ³ bá»‹ xÃ³a
+        inbox_url: Sao chÃ©p URL cá»§a mÃ¡y chá»§ mÃ  báº¡n muá»‘n dÃ¹ng
+        irreversible: CÃ¡c tÃºt Ä‘Ã£ lá»c sáº½ khÃ´ng thá»ƒ phá»¥c há»“i, ká»ƒ cáº£ sau khi xÃ³a bá»™ lá»c
         locale: NgÃ´n ngá»¯ cá»§a giao diá»‡n, email vÃ  thÃ´ng bÃ¡o Ä‘áº©y
-        locked: YÃªu cáº§u báº¡n cháº¥p thuáºn thá»§ cÃ´ng ngÆ°á»i theo dÃµi
-        password: Sá» dá»¥ng Ãt nháº¥t 8 kÃ½ tá»±
+        locked: Tá»± báº¡n sáº½ phÃª duyá»‡t ngÆ°á»i theo dÃµi
+        password: DÃ¹ng Ãt nháº¥t 8 kÃ½ tá»±
         phrase: Sáº½ Ä‘Æ°á»£c hiá»‡n thá»‹ trong vÄƒn báº£n hoáº·c cáº£nh bÃ¡o ná»™i dung cá»§a má»™t tÃºt
-        scopes: API nÃ o á»©ng dá»¥ng sáº½ Ä‘Æ°á»£c phÃ©p truy cáºp. Náº¿u báº¡n chá»n pháº¡m vi cáº¥p cao nháº¥t, báº¡n khÃ´ng cáº§n chá»n tá»«ng pháº¡m vi.
-        setting_aggregate_reblogs: Äá»«ng hiá»‡n nhá»¯ng chia sáº» má»›i cho nhá»¯ng tÃºt Ä‘Ã£ chia sáº» gáº§n Ä‘Ã¢y (chá»‰ áº£nh hÆ°á»Ÿng Ä‘áº¿n cÃ¡c chia sáº» má»›i)
-        setting_default_sensitive: áº¢nh/video/Ã¢m thanh nháº¡y cáº£m Ä‘Æ°á»£c áº©n theo máº·c Ä‘á»‹nh vÃ  chá»‰ hiá»ƒn thá»‹ náº¿u nháº¥p chuá»™t
-        setting_display_media_default: áº¨n áº£nh hoáº·c video Ä‘Æ°á»£c Ä‘Ã¡nh dáº¥u lÃ  nháº¡y cáº£m
-        setting_display_media_hide_all: LuÃ´n áº©n áº£nh vÃ  video
-        setting_display_media_show_all: LuÃ´n hiá»‡n áº£nh vÃ  video
-        setting_hide_network: Báº¡n theo dÃµi ai vÃ  ai theo dÃµi báº¡n sáº½ khÃ´ng Ä‘Æ°á»£c hiá»ƒn thá»‹ trÃªn há»“ sÆ¡ cá»§a báº¡n
+        scopes: API nÃ o á»©ng dá»¥ng sáº½ Ä‘Æ°á»£c phÃ©p truy cáºp. Náº¿u báº¡n chá»n quyá»n háº¡n cáº¥p cao nháº¥t, báº¡n khÃ´ng cáº§n chá»n tá»«ng pháº¡m vi.
+        setting_aggregate_reblogs: Náº¿u má»™t tÃºt Ä‘Ã£ Ä‘Æ°á»£c chia sáº» thÃ¬ nhá»¯ng lÆ°á»£t chia sáº» sau sáº½ khÃ´ng hiá»ƒn thá»‹ trÃªn báº£ng tin ná»¯a
+        setting_default_sensitive: Ná»™i dung nháº¡y cáº£m máº·c Ä‘á»‹nh lÃ  áº©n vÃ  chá»‰ hiá»ƒn thá»‹ náº¿u nháº¥n vÃ o
+        setting_display_media_default: LÃ m má» nhá»¯ng thá»© Ä‘Æ°á»£c Ä‘Ã¡nh dáº¥u lÃ  nháº¡y cáº£m
+        setting_display_media_hide_all: KhÃ´ng hiá»ƒn thá»‹
+        setting_display_media_show_all: LuÃ´n luÃ´n hiá»ƒn thá»‹
+        setting_hide_network: áº¨n nhá»¯ng ngÆ°á»i báº¡n theo dÃµi vÃ  nhá»¯ng ngÆ°á»i theo dÃµi báº¡n trÃªn trang cÃ¡ nhÃ¢n
         setting_noindex: áº¢nh hÆ°á»Ÿng Ä‘áº¿n trang cÃ¡ nhÃ¢n vÃ  tÃºt cá»§a báº¡n
-        setting_show_application: TÃªn á»©ng dá»¥ng báº¡n sá» dá»¥ng Ä‘á»ƒ Ä‘Äƒng tÃºt sáº½ Ä‘Æ°á»£c hiá»ƒn thá»‹ trong chi tiáº¿t bÃ i Ä‘Äƒng
-        setting_use_blurhash: HÃ¬nh áº£nh má» dá»±a trÃªn mÃ u sáº¯c cá»§a hÃ¬nh áº£nh nháº¡y cáº£m nhÆ°ng sáº½ che háº¿t chi tiáº¿t
-        setting_use_pending_items: áº¨n cáºp nháºt báº£ng tin báº±ng má»™t cÃ¡i nháº¥p chuá»™t thay vÃ¬ pháº£i cuá»™n toÃ n bá»™
+        setting_show_application: TÃªn á»©ng dá»¥ng báº¡n dÃ¹ng Ä‘á»ƒ Ä‘Äƒng tÃºt sáº½ hiá»‡n trong chi tiáº¿t bÃ i Ä‘Äƒng
+        setting_use_blurhash: Lá»›p phá»§ má» dá»±a trÃªn mÃ u sáº¯c cá»§a hÃ¬nh áº£nh nháº¡y cáº£m
+        setting_use_pending_items: Dá»“n láº¡i toÃ n bá»™ tÃºt má»›i vÃ  chá»‰ hiá»ƒn thá»‹ khi nÃ o nháº¥p chuá»™t vÃ o
         username: TÃªn ngÆ°á»i dÃ¹ng cá»§a báº¡n sáº½ lÃ  duy nháº¥t trÃªn %{domain}
-        whole_word: Khi tá»« khÃ³a hoáº·c cá»¥m tá»« chá»‰ lÃ  chá»¯ vÃ  sá»‘, nÃ³ sáº½ chá»‰ hiá»‡n ra nhá»¯ng tá»« chÃnh xÃ¡c nhÆ° váºy
+        whole_word: Khi tá»« khÃ³a hoáº·c cá»¥m tá»« lÃ  chá»¯ vÃ  sá»‘, nÃ³ sáº½ chá»‰ hiá»‡n ra nhá»¯ng tá»« chÃnh xÃ¡c nhÆ° váºy
       domain_allow:
         domain: MÃ¡y chá»§ nÃ y sáº½ tiáº¿p nháºn dá»¯ liá»‡u, rá»“i sau Ä‘Ã³ xá» lÃ½ vÃ  lÆ°u trá»¯
       email_domain_block:
-        domain: ÄÃ¢y cÃ³ thá»ƒ lÃ  tÃªn mÃ¡y chá»§ cá»§a Ä‘á»‹a chá»‰ email. Náº¿u mÃ¡y chá»§ Ä‘Ã³ cÃ³ váº¥n Ä‘á», Ä‘Äƒng kÃ½ sáº½ bá»‹ tá»« chá»‘i.
+        domain: ÄÃ¢y cÃ³ thá»ƒ lÃ  tÃªn miá»n hoáº·c IP cá»§a dá»‹ch vá»¥ email. NgÆ°á»i dÃ¹ng cá»§a nhá»¯ng dá»‹ch vá»¥ email nÃ y sáº½ bá»‹ tá»« chá»‘i khi Ä‘Äƒng kÃ½.
         with_dns_records: Náº¿u DNS cÃ³ váº¥n Ä‘á», nÃ³ sáº½ bá»‹ Ä‘Æ°a vÃ o danh sÃ¡ch cáº¥m
       featured_tag:
-        name: 'Nhá»¯ng hashtag khuyáº¿n nghá»‹ báº¡n sá» dá»¥ng:'
+        name: 'Nhá»¯ng hashtag gá»£i Ã½ cho báº¡n:'
       form_challenge:
         current_password: Biá»ƒu máº«u nÃ y an toÃ n
       imports:
         data: Tá»‡p CSV Ä‘Æ°á»£c xuáº¥t tá»« mÃ¡y chá»§ Mastodon khÃ¡c
       invite_request:
-        text: Äiá»u nÃ y sáº½ giÃºp chÃºng tÃ´i xem xÃ©t lá»i má»i cá»§a báº¡n
+        text: Äiá»u nÃ y sáº½ giÃºp chÃºng tÃ´i phÃª duyá»‡t Ä‘Äƒng kÃ½ cá»§a báº¡n
+      ip_block:
+        comment: TÃ¹y chá»n. HÃ£y cho biáº¿t lÃ½ do báº¡n cháº·n IP nÃ y.
+        expires_in: CÃ³ thá»ƒ sáº½ cÃ³ nhiá»u ngÆ°á»i khÃ¡c nhau dÃ¹ng chung má»™t Ä‘á»‹a chá»‰ IP. VÃ¬ váºy, báº¡n nÃªn cÃ¢n nháº¯c khÃ´ng nÃªn cháº·n IP nÃ o Ä‘Ã³ vÄ©nh viá»…n.
+        ip: Nháºp má»™t Ä‘á»‹a chá»‰ IPv4 hoáº·c IPv6. Báº¡n cÅ©ng cÃ³ thá»ƒ cháº·n toÃ n bá»™ dÃ£y IP báº±ng cÃº phÃ¡p CIDR. HÃ£y cáº©n tháºn Ä‘á»«ng cháº·n nháº§m toÃ n bá»™!
+        severities:
+          no_access: Cháº·n truy cáºp tá»« táº¥t cáº£ IP nÃ y
+          sign_up_requires_approval: Báº¡n sáº½ phÃª duyá»‡t nhá»¯ng Ä‘Äƒng kÃ½ má»›i tá»« IP nÃ y
+        severity: Chá»n hÃ nh Ä‘á»™ng náº¿u nháºn Ä‘Æ°á»£c yÃªu cáº§u tá»« IP nÃ y
       sessions:
-        otp: 'Nháºp mÃ£ xÃ¡c thá»±c hai yáº¿u tá»‘ Ä‘Æ°á»£c táº¡o bá»Ÿi á»©ng dá»¥ng Ä‘iá»‡n thoáº¡i cá»§a báº¡n hoáº·c sá» dá»¥ng má»™t trong cÃ¡c mÃ£ khÃ´i phá»¥c cá»§a báº¡n:'
+        otp: 'Nháºp mÃ£ xÃ¡c thá»±c hai bÆ°á»›c Ä‘Æ°á»£c táº¡o bá»Ÿi á»©ng dá»¥ng Ä‘iá»‡n thoáº¡i cá»§a báº¡n hoáº·c dÃ¹ng má»™t trong cÃ¡c mÃ£ khÃ´i phá»¥c cá»§a báº¡n:'
+        webauthn: Náº¿u Ä‘Ã¢y lÃ  USB key, hÃ£y cáº¯m vÃ o vÃ  thá» xoay chiá»u.
       tag:
         name: Báº¡n cÃ³ thá»ƒ thay Ä‘á»•i cÃ¡ch viáº¿t hoa cÃ¡c chá»¯ cÃ¡i Ä‘á»ƒ giÃºp nÃ³ dá»… Ä‘á»c hÆ¡n
       user:
-        chosen_languages: Chá»‰ nhá»¯ng tÃºt viáº¿t báº±ng cÃ¡c ngÃ´n ngá»¯ Ä‘Æ°á»£c chá»n sáº½ Ä‘Æ°á»£c hiá»ƒn thá»‹ trÃªn báº£ng tin
+        chosen_languages: Chá»‰ nhá»¯ng tÃºt viáº¿t báº±ng cÃ¡c ngÃ´n ngá»¯ Ä‘Æ°á»£c chá»n sáº½ hiá»ƒn thá»‹ trÃªn báº£ng tin
     labels:
       account:
         fields:
           name: NhÃ£n
           value: Ná»™i dung
       account_alias:
-        acct: Xá» lÃ½ tÃ i khoáº£n cÅ©
+        acct: TÃ i khoáº£n cÅ©
       account_migration:
-        acct: Xá» lÃ½ tÃ i khoáº£n má»›i
+        acct: TÃ i khoáº£n má»›i
       account_warning_preset:
         text: VÄƒn báº£n cÃ i sáºµn
         title: Tá»±a Ä‘á»
       admin_account_action:
-        include_statuses: ÄÃnh kÃ¨m nhá»¯ng tÃºt bá»‹ bÃ¡o xáº¥u trong e-mail
-        send_email_notification: ThÃ´ng bÃ¡o cho ngÆ°á»i dÃ¹ng má»—i email
-        text: TÃ¹y chá»‰nh cáº£nh bÃ¡o
-        type: Hoáº¡t Ä‘á»™ng
+        include_statuses: ÄÃnh kÃ¨m nhá»¯ng tÃºt bá»‹ bÃ¡o cÃ¡o trong e-mail
+        send_email_notification: ThÃ´ng bÃ¡o cho ngÆ°á»i nÃ y qua email
+        text: Ghi chÃº riÃªng
+        type: HÃ nh Ä‘á»™ng
         types:
-          disable: VÃ´ hiá»‡u hÃ³a Ä‘Äƒng nháºp
-          none: KhÃ´ng lÃ m gÃ¬ cáº£
-          silence: Im láº·ng
-          suspend: ÄÃ¬nh chá»‰ vÃ  xÃ³a dá»¯ liá»‡u tÃ i khoáº£n
-        warning_preset_id: Sá» dá»¥ng cáº£nh bÃ¡o cÃ i Ä‘áº·t trÆ°á»›c
+          disable: Táº¡m khÃ³a
+          none: Cáº¥m upload
+          sensitive: Nháº¡y cáº£m
+          silence: Táº¡m áº©n
+          suspend: VÃ´ hiá»‡u hÃ³a
+        warning_preset_id: DÃ¹ng cáº£nh cÃ¡o cÃ i sáºµn
       announcement:
         all_day: Sá»± kiá»‡n diá»…n ra háº±ng ngÃ y
         ends_at: Káº¿t thÃºc sá»± kiá»‡n
@@ -103,56 +113,58 @@ vi:
       defaults:
         autofollow: Má»i theo dÃµi tÃ i khoáº£n cá»§a báº¡n
         avatar: áº¢nh Ä‘áº¡i diá»‡n
-        bot: ÄÃ¢y lÃ  tÃ i khoáº£n bot
+        bot: ÄÃ¢y lÃ  tÃ i khoáº£n Bot
         chosen_languages: Chá»n ngÃ´n ngá»¯
         confirm_new_password: XÃ¡c nháºn máºt kháº©u má»›i
         confirm_password: XÃ¡c nháºn máºt kháº©u
-        context: Bá»™ lá»c bá»‘i cáº£nh
+        context: Ãp dá»¥ng
         current_password: Máºt kháº©u hiá»‡n táº¡i
         data: Dá»¯ liá»‡u
-        discoverable: Liá»‡t kÃª tÃ i khoáº£n nÃ y trÃªn danh sÃ¡ch thÃ nh viÃªn
+        discoverable: Liá»‡t kÃª tÃ i khoáº£n trÃªn danh sÃ¡ch thÃ nh viÃªn
         display_name: TÃªn hiá»ƒn thá»‹
         email: ÄiÌ£a chiÌ‰ email
         expires_in: Háº¿t háº¡n sau
-        fields: Há»“ sÆ¡ metadata
+        fields: Metadata
         header: áº¢nh bÃ¬a
-        inbox_url: URL cá»§a há»™p thÆ° relay
-        irreversible: KÃ©o xuá»‘ng thay vÃ¬ áº©n
+        honeypot: "%{label} (Ä‘á»«ng Ä‘iá»n vÃ o)"
+        inbox_url: Há»™p thÆ° relay
+        irreversible: XÃ³a bá» vÄ©nh viá»…n
         locale: NgÃ´n ngá»¯
-        locked: KhÃ³a tÃ i khoáº£n
-        max_uses: Sá»‘ láº§n sá» dá»¥ng tá»‘i Ä‘a
+        locked: ÄÃ¢y lÃ  tÃ i khoáº£n riÃªng tÆ°
+        max_uses: Sá»‘ láº§n dÃ¹ng tá»‘i Ä‘a
         new_password: Máºt kháº©u má»›i
         note: Tiá»ƒu sá»
         otp_attempt: XÃ¡c thá»±c hai bÆ°á»›c
         password: Máºt kháº©u
         phrase: Tá»« khÃ³a hoáº·c cá»¥m tá»«
-        setting_advanced_layout: KÃch hoáº¡t giao diá»‡n web nÃ¢ng cao
-        setting_aggregate_reblogs: Hiá»‡n tÃºt nhÃ³m trong báº£ng tin
-        setting_auto_play_gif: Tá»± Ä‘á»™ng phÃ¡t GIF
+        setting_advanced_layout: KÃch hoáº¡t giao diá»‡n nhiá»u cá»™t
+        setting_aggregate_reblogs: KhÃ´ng hiá»‡n lÆ°á»£t chia sáº» trÃ¹ng
+        setting_auto_play_gif: Tá»± Ä‘á»™ng phÃ¡t áº£nh GIF
         setting_boost_modal: YÃªu cáº§u xÃ¡c nháºn trÆ°á»›c khi chia sáº» tÃºt
         setting_crop_images: Hiá»ƒn thá»‹ áº£nh theo tá»‰ lá»‡ 16x9
         setting_default_language: NgÃ´n ngá»¯ Ä‘Äƒng
         setting_default_privacy: Kiá»ƒu Ä‘Äƒng
-        setting_default_sensitive: LuÃ´n Ä‘Ã¡nh dáº¥u áº£nh/video lÃ  nháº¡y cáº£m
+        setting_default_sensitive: LuÃ´n Ä‘Ã¡nh dáº¥u áº£nh/video lÃ  ná»™i dung nháº¡y cáº£m
         setting_delete_modal: YÃªu cáº§u xÃ¡c nháºn trÆ°á»›c khi xÃ³a tÃºt
-        setting_display_media: Hiá»‡n áº£nh/video
+        setting_disable_swiping: VÃ´ hiá»‡u hÃ³a vuá»‘t mÃ n hÃ¬nh
+        setting_display_media: Ná»™i dung nháº¡y cáº£m
         setting_display_media_default: Máº·c Ä‘á»‹nh
         setting_display_media_hide_all: áº¨n toÃ n bá»™
         setting_display_media_show_all: Hiá»‡n toÃ n bá»™
-        setting_expand_spoilers: LuÃ´n hiá»‡n trÆ°á»›c cÃ¡c tÃºt Ä‘Ã¡nh dáº¥u lÃ  spoil
-        setting_hide_network: áº¨n mÃ¡y chá»§ cá»§a báº¡n
+        setting_expand_spoilers: LuÃ´n hiá»ƒn thá»‹ Ä‘áº§y Ä‘á»§ ná»™i dung tÃºt
+        setting_hide_network: áº¨n káº¿t ná»‘i cá»§a báº¡n
         setting_noindex: KhÃ´ng xuáº¥t hiá»‡n trong cÃ´ng cá»¥ tÃ¬m kiáº¿m
         setting_reduce_motion: Giáº£m chuyá»ƒn Ä‘á»™ng áº£nh GIF
-        setting_show_application: Hiá»‡n á»©ng dá»¥ng Ä‘Æ°á»£c sá» dá»¥ng Ä‘á»ƒ Ä‘Äƒng tÃºt
-        setting_system_font_ui: Sá» dá»¥ng phÃ´ng chá»¯ máº·c Ä‘á»‹nh cá»§a há»‡ thá»‘ng
-        setting_theme: Giao diá»‡n trang web
+        setting_show_application: Hiá»‡n á»©ng dá»¥ng Ä‘Ã£ dÃ¹ng Ä‘á»ƒ Ä‘Äƒng tÃºt
+        setting_system_font_ui: DÃ¹ng phÃ´ng chá»¯ máº·c Ä‘á»‹nh cá»§a há»‡ thá»‘ng
+        setting_theme: Giao diá»‡n
         setting_trends: Hiá»ƒn thá»‹ xu hÆ°á»›ng hÃ´m nay
         setting_unfollow_modal: YÃªu cáº§u xÃ¡c nháºn trÆ°á»›c khi há»§y theo dÃµi ai Ä‘Ã³
         setting_use_blurhash: LÃ m má» trÆ°á»›c áº£nh/video nháº¡y cáº£m
         setting_use_pending_items: KhÃ´ng tá»± Ä‘á»™ng cáºp nháºt báº£ng tin
         severity: Má»©c Ä‘á»™ nghiÃªm trá»ng
         sign_in_token_attempt: MÃ£ an toÃ n
-        type: Nháºp loáº¡i
+        type: Kiá»ƒu nháºp
         username: TÃªn ngÆ°á»i dÃ¹ng
         username_or_email: TÃªn ngÆ°á»i dÃ¹ng hoáº·c email
         whole_word: Cáº£ tá»«
@@ -168,24 +180,34 @@ vi:
         comment: BÃ¬nh luáºn
       invite_request:
         text: Táº¡i sao báº¡n muá»‘n tham gia?
+      ip_block:
+        comment: MÃ´ táº£
+        ip: IP
+        severities:
+          no_access: Cháº·n truy cáºp
+          sign_up_requires_approval: Giá»›i háº¡n Ä‘Äƒng kÃ½
+        severity: Má»©c Ä‘á»™
       notification_emails:
         digest: Gá»i email Ä‘á»‹nh ká»³
-        favourite: Ai Ä‘Ã³ tÃ¢m Ä‘áº¯c tÃºt cá»§a báº¡n
+        favourite: Ai Ä‘Ã³ thÃch tÃºt cá»§a báº¡n
         follow: Ai Ä‘Ã³ theo dÃµi báº¡n
         follow_request: Ai Ä‘Ã³ yÃªu cáº§u theo dÃµi báº¡n
         mention: Ai Ä‘Ã³ nháº¯c Ä‘áº¿n báº¡n
-        pending_account: CÃ³ tÃ i khoáº£n má»›i cáº§n phÃª duyá»‡t
+        pending_account: TÃ i khoáº£n má»›i cáº§n phÃª duyá»‡t
         reblog: Ai Ä‘Ã³ chia sáº» tÃºt cá»§a báº¡n
-        report: Ai Ä‘Ã³ gá»i bÃ¡o cÃ¡o xáº¥u
+        report: Ai Ä‘Ã³ gá»i bÃ¡o cÃ¡o kiá»ƒm duyá»‡t
         trending_tag: Má»™t hashtag chÆ°a Ä‘Æ°á»£c phÃª duyá»‡t Ä‘ang lÃ  xu hÆ°á»›ng
       tag:
-        listable: Cho phÃ©p hashtag nÃ y xuáº¥t hiá»‡n trong tÃ¬m kiáº¿m vÃ  trÃªn danh sÃ¡ch thÃ nh viÃªn
+        listable: Cho phÃ©p hashtag nÃ y xuáº¥t hiá»‡n trong tÃ¬m kiáº¿m vÃ  trÃªn tiá»ƒu sá» cÃ¡ nhÃ¢n
         name: Hashtag
         trendable: Cho phÃ©p hashtag nÃ y xuáº¥t hiá»‡n trong xu hÆ°á»›ng
-        usable: Cho phÃ©p cÃ¡c tÃºt sá» dá»¥ng hashtag nÃ y
-    'no': KhÃ´ng
+        usable: Cho phÃ©p dÃ¹ng hashtag nÃ y trong tÃºt
+    'no': Táº¯t
     recommended: Khuyáº¿n nghá»‹
     required:
       mark: "*"
       text: yÃªu cáº§u
-    'yes': ÄÃºng
+    title:
+      sessions:
+        webauthn: DÃ¹ng má»™t trong nhá»¯ng khÃ³a báº£o máºt cá»§a báº¡n Ä‘á»ƒ Ä‘Äƒng nháºp
+    'yes': Báºt
diff --git a/config/locales/simple_form.zgh.yml b/config/locales/simple_form.zgh.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ed9ea90f8212a2d6fc08d44c9287a1508d3a579a
--- /dev/null
+++ b/config/locales/simple_form.zgh.yml
@@ -0,0 +1,41 @@
+---
+zgh:
+  simple_form:
+    hints:
+      defaults:
+        setting_display_media_hide_all: âµ™âµâµœâµ âµ‰âµ™âµâµ–âµŽâµ‰âµ™âµ â´°â´±â´·â´°
+        setting_display_media_show_all: âµ™âµŽâ´°âµ âµ‰âµ™âµâµ–âµŽâµ‰âµ™âµ â´°â´±â´·â´°
+    labels:
+      account_warning_preset:
+        title: â´°âµ£âµ¡âµ
+      admin_account_action:
+        type: âµœâµ‰â´³â´°âµ¡âµœ
+      defaults:
+        bot: âµ¡â´°â´· â´°âµŽâµ‰â´¹â´°âµ âµ âµ“â´±âµ“âµœ
+        chosen_languages: âµ™âµœâµ¢ âµœâµ“âµœâµâ´°âµ¢âµ‰âµ
+        confirm_new_password: âµ™âµâµœâµŽ âµœâ´°â´³âµ“âµ”âµ‰ âµ âµ“âµ£âµ”â´°âµ¢ âµœâ´°âµŽâ´°âµ¢âµâµ“âµœ
+        confirm_password: âµ™âµâµœâµŽ âµœâ´°â´³âµ“âµ”âµ‰ âµ âµ“âµ£âµ”â´°âµ¢
+        data: âµ‰â´¼âµ™â´½â´°
+        email: âµœâ´°âµâµ™â´° âµ‰âµŽâ´°âµ¢âµ
+        locale: âµœâµ“âµœâµâ´°âµ¢âµœ âµ âµ“âµâ´³âµ”âµ“â´·âµŽ
+        locked: âµ”â´³âµ â´°âµŽâµ‰â´¹â´°âµ
+        new_password: âµœâ´°â´³âµ“âµ”âµ‰ âµ âµ“âµ£âµ”â´°âµ¢ âµœâ´°âµŽâ´°âµ¢âµâµ“âµœ
+        note: âµœâ´°âµ”âµ‰â´·âµ‰âµ”âµœ
+        password: âµœâ´°â´³âµ“âµ”âµ‰ âµ âµ“âµ£âµ”â´°âµ¢
+        setting_hide_network: â´¼â´¼âµ” â´°âµ¥âµŸâµŸâ´° âµâµâ´½
+        setting_theme: â´°âµ™â´³âµ“âµŽ âµ âµ¡â´°âµ™âµ‰âµœ
+        username: âµ‰âµ™âµŽ âµ âµ“âµâµ™âµ™âµŽâµ”âµ™
+        username_or_email: âµ‰âµ™âµŽ âµ âµ“âµâµ™âµ™âµŽâµ”âµ™ âµâµ– âµ‰âµŽâ´°âµ¢âµ
+      featured_tag:
+        name: âµ€â´°âµ›âµŸâ´°â´³
+      invite:
+        comment: â´°âµ–â´¼â´°âµ¡â´°âµ
+      ip_block:
+        comment: âµ–â´¼â´°âµ¡âµ
+        ip: âµœâ´°âµâµ™â´° IP
+      tag:
+        name: âµ€â´°âµ›âµŸâ´°â´³
+    'no': âµ“âµ€âµ“
+    required:
+      mark: "*"
+    'yes': âµ¢â´°âµ€
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 6bb1053a8e11647bf93d9cf0cc27403f4ddd4250..35222c076d2cdee75e085bf4e34f3d3a5b4d888e 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -65,8 +65,17 @@ zh-CN:
         data: ä»Žå…¶ä»– Mastodon æœåŠ¡å™¨å¯¼å‡ºçš„ CSV æ–‡ä»¶
       invite_request:
         text: è¿™ä¼šæœ‰åŠ©äºŽæˆ‘ä»¬å¤„ç†ä½ çš„ç”³è¯·
+      ip_block:
+        comment: å¯é€‰ã€‚è¯·è®°ä½ä¸ºä»€ä¹ˆæ‚¨æ·»åŠ äº†æ¤è§„åˆ™ã€‚
+        expires_in: IP åœ°å€æ˜¯ä¸€ç§æœ‰é™çš„èµ„æºï¼Œå®ƒä»¬æœ‰æ—¶æ˜¯å…±äº«çš„ï¼Œå¹¶ä¸”å¸¸å¸¸å˜åŒ–ã€‚å› æ¤ï¼Œä¸æŽ¨èæ— é™æœŸçš„ IP å°ç¦ã€‚
+        ip: è¾“å…¥ IPv4 æˆ– IPv6 åœ°å€ã€‚æ‚¨å¯ä»¥ä½¿ç”¨ CIDR è¯æ³•å±è”½æ•´ä¸ªèŒƒå›´ã€‚å°å¿ƒä¸è¦å±è”½è‡ªå·±ï¼
+        severities:
+          no_access: é˜»æ¢è®¿é—®æ‰€æœ‰èµ„æº
+          sign_up_requires_approval: æ–°çš„æ³¨å†Œéœ€è¦æ‚¨çš„æ‰¹å‡†
+        severity: é€‰æ‹©å¦‚ä½•å¤„ç†æ¥è‡ªæ¤ IP çš„è¯·æ±‚ã€‚
       sessions:
         otp: è¾“å…¥ä½ æ‰‹æœºåº”ç”¨ä¸Šç”Ÿæˆçš„åŒé‡è®¤è¯ç ï¼Œæˆ–è€…ä»»æ„ä¸€ä¸ªæ¢å¤ä»£ç ï¼š
+        webauthn: å¦‚æžœæ˜¯ USB å¯†é’¥ï¼Œè¯·ç¡®ä¿å°†å…¶æ’å…¥ï¼Œå¦‚æœ‰å¿…è¦ï¼Œè¯·ç‚¹å‡»å®ƒã€‚
       tag:
         name: æ‚¨åªèƒ½æ”¹å˜å—æ¯çš„å¤§å°å†™ï¼Œè®©å®ƒæ›´æ˜“è¯»
       user:
@@ -91,6 +100,7 @@ zh-CN:
         types:
           disable: ç¦ç”¨
           none: å¿½ç•¥
+          sensitive: æ•æ„Ÿå†…å®¹
           silence: é™éŸ³
           suspend: åœç”¨å¹¶æ°¸ä¹…åˆ é™¤è´¦å·æ•°æ®
         warning_preset_id: ä½¿ç”¨é¢„ç½®è¦å‘Š
@@ -116,6 +126,7 @@ zh-CN:
         expires_in: å¤±æ•ˆæ—¶é—´
         fields: ä¸ªäººèµ„æ–™é™„åŠ ä¿¡æ¯
         header: ä¸ªäººèµ„æ–™é¡µæ¨ªå¹…å›¾ç‰‡
+        honeypot: "%{label} (è¯·å‹¿å¡«å†™)"
         inbox_url: ä¸ç»§ç«™æ”¶ä»¶ç®±çš„ URL
         irreversible: ä¸¢å¼ƒè€Œéžéšè—
         locale: ç•Œé¢è¯è¨€
@@ -135,6 +146,7 @@ zh-CN:
         setting_default_privacy: å˜Ÿæ–‡é»˜è®¤å¯è§èŒƒå›´
         setting_default_sensitive: æ€»æ˜¯å°†æˆ‘å‘é€çš„åª’ä½“æ–‡ä»¶æ ‡è®°ä¸ºæ•æ„Ÿå†…å®¹
         setting_delete_modal: åœ¨åˆ é™¤å˜Ÿæ–‡å‰è¯¢é—®æˆ‘
+        setting_disable_swiping: ç¦ç”¨æ»‘åŠ¨åŠ¨ä½œ
         setting_display_media: åª’ä½“å±•ç¤º
         setting_display_media_default: é»˜è®¤
         setting_display_media_hide_all: éšè—å…¨éƒ¨
@@ -168,6 +180,13 @@ zh-CN:
         comment: è¯„è®º
       invite_request:
         text: ä½ ä¸ºä»€ä¹ˆæƒ³è¦åŠ å…¥ï¼Ÿ
+      ip_block:
+        comment: å¤‡æ³¨
+        ip: IP åœ°å€
+        severities:
+          no_access: é˜»æ¢è®¿é—®
+          sign_up_requires_approval: é™åˆ¶æ³¨å†Œ
+        severity: è§„åˆ™
       notification_emails:
         digest: å‘é€æ‘˜è¦é‚®ä»¶
         favourite: å½“æœ‰ç”¨æˆ·å–œæ¬¢äº†æˆ‘çš„å˜Ÿæ–‡æ—¶ï¼Œå‘é€ç”µåé‚®ä»¶æé†’æˆ‘
@@ -188,4 +207,7 @@ zh-CN:
     required:
       mark: "*"
       text: å¿…å¡«
+    title:
+      sessions:
+        webauthn: ä½¿ç”¨æ‚¨çš„å®‰å…¨å¯†é’¥ç™»å½•
     'yes': æ˜¯
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml
index fd192fbbcb47eefb0bf38cf74e17af2c2ad5aa43..eaed6e32b99ff665ee16eee72adff1a44db58028 100644
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@@ -3,59 +3,81 @@ zh-HK:
   simple_form:
     hints:
       account_alias:
-        acct: æŒ‡å®šæ¬²ç§»å‹•ä¹‹å¸³æˆ¶çš„ ä½¿ç”¨è€…åç¨±@ç«™å°
+        acct: æŒ‡å®šæ¬²ç§»å‹•ä¹‹å¸³æˆ¶çš„ã€Œä½¿ç”¨è€…åç¨±@åŸŸåã€
       account_migration:
-        acct: æŒ‡å®šæ¬²ç§»å‹•è‡³ä¹‹å¸³æˆ¶çš„ ä½¿ç”¨è€…åç¨±@ç«™å°
+        acct: æŒ‡å®šæ¬²ç§»å‹•è‡³ä¹‹å¸³æˆ¶çš„ã€Œä½¿ç”¨è€…åç¨±@åŸŸåã€
       account_warning_preset:
-        text: æ‚¨å¯ä½¿ç”¨å˜Ÿæ–‡èªžæ³•ï¼Œä¾‹å¦‚ç¶²å€ã€ã€Œ#ã€æ¨™ç±¤å’ŒæåŠåŠŸèƒ½
+        text: ä½ å¯ä½¿ç”¨ toot æ ¼å¼ï¼Œä¾‹å¦‚ç¶²å€ã€ã€Œ#ã€æ¨™ç±¤å’ŒæåŠåŠŸèƒ½
+        title: å¯é¸ï¼ŒæŽ¥æ”¶è€…ä¸æœƒè¦‹åˆ°
       admin_account_action:
+        include_statuses: ä½¿ç”¨è€…å°‡æœƒçœ‹åˆ°å“ªäº›æ–‡ç« å°Žè‡´æª¢èˆ‰æˆ–è¦å‘Š
         send_email_notification: ä½¿ç”¨è€…å°‡æ”¶åˆ°å¸³æˆ¶ç™¼ç”Ÿä¹‹äº‹æƒ…çš„è§£é‡‹
-        text_html: é¸ç”¨ã€‚æ‚¨èƒ½ä½¿ç”¨å˜Ÿæ–‡èªžæ³•ã€‚æ‚¨å¯ <a href="%{path}">æ–°å¢žè¦å‘Šé è¨</a> ä¾†ç¯€çœæ™‚é–“
+        text_html: é¸ç”¨ã€‚ä½ èƒ½ä½¿ç”¨ toot èªžæ³•ã€‚ä½ å¯ <a href="%{path}">æ–°å¢žè¦å‘Šé è¨</a> ä¾†ç¯€çœæ™‚é–“
         type_html: è¨å®šè¦ä½¿ç”¨ <strong>%{acct}</strong> åšçš„äº‹
-        warning_preset_id: é¸ç”¨ã€‚æ‚¨ä»å¯åœ¨é è¨çš„çµå°¾æ–°å¢žè‡ªè¨‚æ–‡å—
+        warning_preset_id: é¸ç”¨ã€‚ä½ ä»å¯åœ¨é è¨è¨Šæ¯çš„çµå°¾åŠ å…¥è‡ªè¨‚æ–‡å—
       announcement:
-        all_day: æ ¸å–å¾Œï¼Œåªæœƒé¡¯ç¤ºå‡ºæ™‚é–“ç¯„åœä¸çš„æ—¥æœŸéƒ¨åˆ†
-        scheduled_at: ç©ºç™½å‰‡ç«‹å³ç™¼å¸ƒå…¬å‘Š
+        all_day: å‹¾é¸å¾Œï¼Œåªæœƒé¡¯ç¤ºå‡ºæ™‚é–“ç¯„åœä¸çš„æ—¥æœŸéƒ¨åˆ†
+        ends_at: å¯é¸ï¼Œå…¬å‘Šæœƒåœ¨è©²æ™‚é–“é»žè‡ªå‹•å–æ¶ˆç™¼å¸ƒ
+        scheduled_at: ç•™ç©ºæ¤é …ä»¥ç«‹å³ç™¼å¸ƒå…¬å‘Š
+        starts_at: å¯é¸ï¼Œä½ å¯ä»¥è®“å…¬å‘Šåœ¨æŒ‡å®šæ™‚é–“ç¯„åœå…§é¡¯ç¤º
+        text: ä½ å¯ä»¥ä½¿ç”¨æ–‡ç« æ ¼å¼ï¼Œä½†è«‹å°å¿ƒåˆ¥è®“å…¬å‘Šä½”æ“šå¤ªå¤§çš„ä½¿ç”¨è€…ç•«é¢ç©ºé–“ã€‚
       defaults:
         autofollow: é€šéŽé‚€è«‹ç¶²å€è¨»å†Šçš„ç”¨æˆ¶å°‡æœƒè‡ªå‹•é—œæ³¨ä½ 
         avatar: æ”¯æ´ PNG, GIF æˆ– JPG åœ–ç‰‡ï¼Œæª”æ¡ˆæœ€å¤§ç‚º %{size}ï¼Œæœƒç¸®è£æˆ %{dimensions}px
-        bot: æé†’ç”¨æˆ¶æœ¬å¸³è™Ÿæ˜¯æ©Ÿæ¢°äºº
-        context: æ‡‰è©²å¥—ç”¨éŽæ¿¾å™¨çš„ä¸€é …æˆ–å¤šé …å…§å®¹
-        current_password: å› å®‰å…¨å› ç´ ï¼Œè«‹è¼¸å…¥ç›®å‰å¸³æˆ¶çš„å¯†ç¢¼
+        bot: é€™å€‹å¸³è™Ÿæ˜¯æ©Ÿæ¢°äººï¼Œæ‰€åšçš„äº‹æƒ…å¯èƒ½æ²’æœ‰ç¶“äººç‚ºç›£å¯Ÿ
+        context: éŽæ¿¾å™¨æ‡‰è©²å¥—ç”¨çš„ä¸€é …æˆ–å¤šé …æ¢ä»¶
+        current_password: åŸºæ–¼ä¿å®‰ç·£æ•…ï¼Œè«‹è¼¸å…¥ç›®å‰å¸³è™Ÿçš„å¯†ç¢¼
         current_username: è«‹è¼¸å…¥ç›®å‰å¸³æˆ¶çš„ä½¿ç”¨è€…åç¨±ä»¥ç¢ºèª
         digest: åƒ…åœ¨ä½ é•·æ™‚é–“æœªç™»éŒ„ï¼Œä¸”æ”¶åˆ°äº†ç§ä¿¡æ™‚ç™¼é€
-        email: æ‚¨å°‡æ”¶åˆ°ä¸€å°ç¢ºèªé›»åéƒµä»¶
+        discoverable: å€‹äººè³‡æ–™ç›®éŒ„å¯ä»¥è®“ä½ çš„å¸³è™Ÿæ›´å»£ç‚ºäººçŸ¥
+        email: ä½ å°‡æ”¶åˆ°ä¸€å°ç¢ºèªé›»éƒµ
         fields: å€‹äººè³‡æ–™é å¯é¡¯ç¤ºå¤šè‡³ 4 å€‹é …ç›®
         header: æ”¯æ´ PNG, GIF æˆ– JPG åœ–ç‰‡ï¼Œæª”æ¡ˆæœ€å¤§ç‚º %{size}ï¼Œæœƒç¸®è£æˆ %{dimensions}px
-        inbox_url: å¾žæ‚¨æƒ³è¦ä½¿ç”¨çš„ä¸ç¹¼é¦–é è¤‡è£½ç¶²å€
-        irreversible: å·²éŽæ¿¾çš„å˜Ÿæ–‡å°‡æœƒä¸å¯é€†çš„æ¶ˆå¤±ï¼Œå³ä¾¿éŽæ¿¾å™¨ç§»é™¤ä¹‹å¾Œä¹Ÿä¸€æ¨£
+        inbox_url: åœ¨ä½ æƒ³è¦ä½¿ç”¨çš„ä¸ç¹¼ç«™é¦–é ï¼Œè¤‡è£½å®ƒçš„ç¶²å€
+        irreversible: æ–‡ç« éŽæ¿¾æ˜¯ä¸å¯é‚„åŽŸçš„ï¼Œå³ä½¿æ—¥å¾ŒéŽæ¿¾å™¨è¢«ç§»é™¤ï¼Œä¹Ÿç„¡æ³•é‡æ–°çœ‹åˆ°è¢«å®ƒæ¿¾èµ°çš„æ–‡ç« 
         locale: ä½¿ç”¨è€…ä»‹é¢ã€é›»éƒµå’Œé€šçŸ¥çš„èªžè¨€
-        locked: ä½ å¿…é ˆäººæ‰‹æ ¸å‡†æ¯å€‹ç”¨æˆ¶å°ä½ çš„é—œæ³¨è«‹æ±‚ï¼Œè€Œä½ çš„æ–‡ç« ç§éš±æœƒè¢«é è¨ç‚ºã€Œåªæœ‰é—œæ³¨ä½ çš„äººèƒ½çœ‹ã€
+        locked: ä½ å¿…é ˆæ‰‹å‹•å¯©æ ¸æ¯å€‹äººå°ä½ çš„é—œæ³¨è«‹æ±‚
         password: ä½¿ç”¨è‡³å°‘ 8 å€‹å—å…ƒ
-        phrase: ç„¡è«–æ˜¯å˜Ÿæ–‡çš„æœ¬æ–‡æˆ–æ˜¯å…§å®¹è¦å‘Šéƒ½æœƒè¢«éŽæ¿¾
-        scopes: å…è¨±è®“æ‡‰ç”¨ç¨‹å¼å˜å–çš„ APIã€‚ è‹¥æ‚¨é¸æ“‡æœ€é«˜éšŽç¯„åœï¼Œå‰‡ç„¡é ˆé¸æ“‡å€‹åˆ¥é …ç›®ã€‚
-        setting_aggregate_reblogs: è«‹å‹¿é¡¯ç¤ºæœ€è¿‘å·²è¢«è½‰å˜Ÿä¹‹å˜Ÿæ–‡çš„æœ€æ–°è½‰å˜Ÿï¼ˆåªå½±éŸ¿æœ€æ–°æ”¶åˆ°çš„å˜Ÿæ–‡ï¼‰
+        phrase: éŽæ¿¾å™¨æœƒé–±è®€æ–‡ç« å’Œå…§å®¹è¦å‘Šæ¨™èªžçš„å—çœ¼ï¼Œç„¶å¾Œæ±ºå®šéŽæ¿¾èˆ‡å¦
+        scopes: é¸æ“‡æ‡‰ç”¨ç¨‹å¼å¯ä»¥å˜å–çš„ APIã€‚ è‹¥ä½ é¸æ“‡æœ€é«˜éšŽçš„æ¬Šé™ç¯„åœï¼Œå‰‡ç„¡é ˆé¸æ“‡å€‹åˆ¥é …ç›®ã€‚
+        setting_aggregate_reblogs: è«‹å‹¿é¡¯ç¤ºæ–°è¿‘è¢«è½‰æŽ¨çš„æ–‡ç« ï¼ˆåªå½±éŸ¿æœ€æ–°è¢«æŽ¨çš„æ–‡ç« ï¼‰
         setting_default_sensitive: æ•æ„Ÿåª’é«”é è¨éš±è—ï¼Œä¸”æŒ‰ä¸€ä¸‹å³å¯é‡æ–°é¡¯ç¤º
         setting_display_media_default: éš±è—æ¨™ç‚ºæ•æ„Ÿçš„åª’é«”
         setting_display_media_hide_all: ç¸½æ˜¯éš±è—æ‰€æœ‰åª’é«”
         setting_display_media_show_all: ç¸½æ˜¯é¡¯ç¤ºæ¨™ç‚ºæ•æ„Ÿçš„åª’é«”
-        setting_hide_network: ä½ é—œæ³¨çš„äººå’Œé—œæ³¨ä½ çš„äººå°‡ä¸æœƒåœ¨ä½ çš„å€‹äººè³‡æ–™é ä¸Šé¡¯ç¤º
+        setting_hide_network: ä½ æ‰€é—œæ³¨çš„äººï¼Œå’Œé—œæ³¨ä½ çš„äººï¼Œå°‡ä¸æœƒåœ¨ä½ çš„å€‹äººè³‡æ–™é ä¸Šé¡¯ç¤º
         setting_noindex: æ¤è¨å®šæœƒå½±éŸ¿åˆ°ä½ çš„å…¬é–‹å€‹äººè³‡æ–™ä»¥åŠæ–‡ç« é é¢
-        setting_show_application: æ‚¨ç”¨ä¾†ç™¼å˜Ÿæ–‡çš„æ‡‰ç”¨ç¨‹å¼å°‡æœƒåœ¨æ‚¨å˜Ÿæ–‡çš„è©³ç´°æª¢è¦–é¡¯ç¤º
-        username: æ‚¨çš„ä½¿ç”¨è€…åç¨±å°‡åœ¨ %{domain} æ˜¯ç¨ä¸€ç„¡äºŒçš„
+        setting_show_application: ä½ ç”¨ä¾†ç™¼è¡¨æ–‡ç« çš„æ‡‰ç”¨ç¨‹å¼ï¼Œå°‡æœƒé¡¯ç¤ºåœ¨ä½ æ–‡ç« çš„è©³ç´°æª¢è¦–ä¸
+        setting_use_blurhash: æ¼¸è®Šåœ–æ¨£æœƒåŸºæ–¼éš±è—åª’é«”å…§å®¹ç”¢ç”Ÿï¼Œä½†æ‰€æœ‰ç´°ç¯€æœƒè®Šå¾—æ¨¡ç³Š
+        setting_use_pending_items: é—œé–‰è‡ªå‹•æ»¾å‹•æ›´æ–°ï¼Œæ™‚é–“è»¸æœƒåœ¨é»žæ“Šå¾Œæ›´æ–°
+        username: ä½ çš„ä½¿ç”¨è€…åç¨±åœ¨ %{domain} å°‡æ˜¯ç¨ä¸€ç„¡äºŒçš„
         whole_word: å¦‚æžœé—œéµå—æˆ–è©žçµ„åƒ…æœ‰å—æ¯èˆ‡æ•¸å—ï¼Œå‰‡å…¶å°‡åªåœ¨ç¬¦åˆæ•´å€‹å–®å—çš„æ™‚å€™æ‰æœƒå¥—ç”¨
+      domain_allow:
+        domain: æ¤ç¶²åŸŸå°‡èƒ½å¾žæ¤ç«™ç²å–è³‡æ–™ï¼Œè€Œæ¤ç«™ç™¼å‡ºçš„æ•¸æ“šä¹Ÿæœƒè¢«è™•ç†å’Œå˜å„²ã€‚
+      email_domain_block:
+        domain: é€™è£¡å¯ä»¥æ˜¯é›»éƒµåœ°å€ä¸çš„åŸŸåã€åŸŸåè§£æžåˆ°çš„MXè¨˜éŒ„ã€æˆ–MXç´€éŒ„è§£æžåˆ°çš„æœå‹™å™¨IPã€‚å¦‚æžœä¸Šè¿°è³‡æ–™è¢«å°ç¦ï¼Œé‚£éº¼è¨»å†Šå°‡è¢«æ‹’çµ•ã€‚
+        with_dns_records: Mastodon æœƒå˜—è©¦è§£æžæ‰€çµ¦åŸŸåçš„ DNS è¨˜éŒ„ï¼Œç„¶å¾Œèˆ‡è§£æžçµæžœä¸€ä½µå°ç¦
       featured_tag:
-        name: æ‚¨å¯èƒ½æƒ³ä½¿ç”¨å…¶ä¸ä¸€å€‹ï¼š
+        name: ä½ å¯èƒ½æƒ³ä½¿ç”¨å…¶ä¸ä¸€å€‹ï¼š
       form_challenge:
-        current_password: æ‚¨æ£è¦é€²å…¥å®‰å…¨å€åŸŸ
+        current_password: ä½ æ£è¦é€²å…¥å®‰å…¨å€åŸŸ
       imports:
         data: è‡ªå…¶ä»–æœå‹™ç«™åŒ¯å‡ºçš„ CSV æª”æ¡ˆ
       invite_request:
-        text: é€™æœƒå”åŠ©æˆ‘å€‘å¯©æ ¸æ‚¨çš„æ‡‰ç”¨ç¨‹å¼
+        text: é€™å°‡æœ‰åŠ©æˆ‘å€‘å¯©æ ¸ä½ çš„æ‡‰ç”¨ç¨‹å¼
+      ip_block:
+        comment: å¯é¸ï¼Œä½†è«‹è¨˜å¾—è‡ªå·±ç‚ºç”šéº¼æ·»åŠ äº†é€™å€‹è¦å‰‡ã€‚
+        expires_in: å› ç‚º IP ä½å€æ˜¯ç¶“å¸¸è¢«åˆ†äº«æˆ–è½‰æ‰‹çš„æœ‰é™è³‡æºï¼Œæ‰€ä»¥æˆ‘å€‘ä¸å»ºè°ä½ ç„¡é™æœŸåœ°å°éŽ– IP ä½å€ã€‚
+        ip: è«‹è¼¸å…¥ IPv4 æˆ– IPv6 ä½å€ï¼Œä½ äº¦å¯ä»¥ç”¨ CIDR èªžæ³•ä¾†å°éŽ–æ•´å€‹ IP å€æ®µã€‚è«‹å°å¿ƒä½¿ç”¨ï¼Œä¸è¦æŠŠè‡ªå·±çµ¦ä¸€ä½µå°éŽ–ï¼
+        severities:
+          no_access: å°éŽ–æ‰€æœ‰è³‡æºå˜å–
+          sign_up_requires_approval: æ–°ç™»è¨˜ç”³è«‹æ£ç‰å€™ä½ å¯©æ‰¹
+        severity: è«‹è¨å®šä¼ºæœå™¨å°‡å¦‚ä½•è™•ç†ä¾†è‡ªé€™å€‹ IP ä½å€çš„è«‹æ±‚
       sessions:
         otp: è¼¸å…¥ä½ æ‰‹æ©Ÿä¸Šç”Ÿæˆçš„é›™é‡èªè‰ç¢¼ï¼Œæˆ–è€…ä»»æ„ä¸€å€‹æ¢å¾©ä»£ç¢¼ï¼š
+        webauthn: å¦‚æžœå®ƒæ˜¯ USB å®‰å…¨é‘°åŒ™çš„è©±ï¼Œè«‹å…ˆæ’å…¥é›»è…¦ã€‚å¦‚é‘°åŒ™è¨è¨ˆæœ‰éœ€è¦ï¼Œè«‹æŒ‰éµå•Ÿç”¨ã€‚
       tag:
-        name: æ‚¨åªèƒ½è®Šæ›´å¤§å°å¯«ï¼Œä¾‹å¦‚ï¼Œä»¥ä½¿å…¶æ›´æ˜“è®€ã€‚
+        name: ä½ åªèƒ½è®Šæ›´å¤§å°å¯«ï¼ˆä»¥ä½¿å…¶æ›´æ˜“è®€ï¼‰ã€‚
       user:
         chosen_languages: åªæœ‰è¢«é¸æ“‡çš„èªžè¨€æœƒåœ¨å…¬é–‹æ™‚é–“è»¸å…§é¡¯ç¤º
     labels:
@@ -63,20 +85,25 @@ zh-HK:
         fields:
           name: æ¨™ç±¤
           value: å…§å®¹
+      account_alias:
+        acct: èˆŠå¸³è™Ÿåç¨±
+      account_migration:
+        acct: æ–°å¸³è™Ÿåç¨±
       account_warning_preset:
         text: é è¨æ–‡å—
         title: æ¨™é¡Œ
       admin_account_action:
-        include_statuses: åœ¨é›»åéƒµä»¶ä¸åŠ å…¥æª¢èˆ‰çš„å˜Ÿæ–‡
+        include_statuses: åœ¨é›»éƒµä¸åŠ å…¥è¢«æª¢èˆ‰çš„æ–‡ç« 
         send_email_notification: é€éŽé›»åä¿¡ä»¶é€šçŸ¥ä½¿ç”¨è€…
         text: è‡ªè¨‚è¦å‘Š
-        type: å‹•ä½œ
+        type: æ“ä½œ
         types:
           disable: åœç”¨
-          none: ä»€éº¼ä¹Ÿä¸åš
-          silence: å®‰éœ
-          suspend: åœæ¬Šä¸¦ä¸å¯é€†çš„åˆªé™¤å¸³æˆ¶è³‡æ–™
-        warning_preset_id: ä½¿ç”¨è¦å‘Šé è¨
+          none: ç™¼é€è¦å‘Š
+          sensitive: æ•æ„Ÿå†…å®¹
+          silence: é™åˆ¶
+          suspend: åœæ¬Š
+        warning_preset_id: ä½¿ç”¨é è¨è¦å‘Š
       announcement:
         all_day: å…¨å¤©æ´»å‹•
         ends_at: æ´»å‹•çµæŸæ™‚é–“
@@ -84,25 +111,26 @@ zh-HK:
         starts_at: æ´»å‹•é–‹å§‹æ™‚é–“
         text: å…¬å‘Š
       defaults:
-        autofollow: é‚€è«‹åˆ¥äººé—œæ³¨ä½ çš„è³¬è™Ÿ
+        autofollow: é‚€è«‹åˆ¥äººé—œæ³¨ä½ çš„å¸³è™Ÿ
         avatar: å€‹äººé åƒ
         bot: é€™å¸³è™Ÿæ˜¯æ©Ÿæ¢°äºº
-        chosen_languages: èªžè¨€éŽæ¿¾
+        chosen_languages: æ‰€éŽæ¿¾èªžè¨€
         confirm_new_password: ç¢ºèªæ–°å¯†ç¢¼
         confirm_password: ç¢ºèªå¯†ç¢¼
-        context: éŽæ¿¾æƒ…å¢ƒ
+        context: æ‰€éŽæ¿¾æƒ…å¢ƒ
         current_password: ç›®å‰å¯†ç¢¼
         data: è³‡æ–™
-        discoverable: åœ¨ç›®éŒ„åˆ—å‡ºæ¤å¸³æˆ¶
+        discoverable: åœ¨ç›®éŒ„åˆ—å‡ºæ¤å¸³è™Ÿ
         display_name: é¡¯ç¤ºåç¨±
         email: é›»éƒµåœ°å€
         expires_in: å¤±æ•ˆæ™‚é–“
         fields: è³‡æ–™
         header: å€‹äººé é¢é ‚éƒ¨
+        honeypot: "%{label} (è«‹ä¸è¦å¡«å¯«)"
         inbox_url: ä¸ç¹¼æ”¶ä»¶åŒ£çš„ URL
-        irreversible: æ”¾æ£„è€Œéžéš±è—
+        irreversible: ä¸Ÿæ£„è€Œéžéš±è—
         locale: ä»‹é¢èªžè¨€
-        locked: å°‡ç”¨æˆ¶è½‰ç‚ºã€Œç§äººã€
+        locked: å°‡å¸³è™Ÿè½‰ç‚ºã€Œç§äººã€
         max_uses: æœ€å¤§ä½¿ç”¨æ¬¡æ•¸
         new_password: æ–°å¯†ç¢¼
         note: ç°¡ä»‹
@@ -110,59 +138,76 @@ zh-HK:
         password: å¯†ç¢¼
         phrase: é—œéµå—æˆ–ç‰‡èªž
         setting_advanced_layout: å•Ÿç”¨é€²éšŽç¶²é ä»‹é¢
-        setting_aggregate_reblogs: æ™‚é–“è»¸ä¸çš„ç¾¤çµ„è½‰å˜Ÿ
+        setting_aggregate_reblogs: æ™‚é–“è»¸ä¸çš„ç¾¤çµ„è½‰æŽ¨
         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_delete_modal: åˆªé™¤æ–‡ç« å‰ï¼Œè«‹è¦æ±‚æˆ‘ç¢ºèª
+        setting_disable_swiping: åœç”¨æ»‘å‹•æ‰‹å‹¢
         setting_display_media: åª’é«”é¡¯ç¤º
         setting_display_media_default: é è¨
         setting_display_media_hide_all: å…¨éƒ¨éš±è—
         setting_display_media_show_all: å…¨éƒ¨é¡¯ç¤º
-        setting_expand_spoilers: æ°¸é å±•é–‹æ¨™æœ‰å…§å®¹è¦å‘Šçš„å˜Ÿæ–‡
+        setting_expand_spoilers: æ°¸é å±•é–‹æ¨™æœ‰å…§å®¹è¦å‘Šçš„æ–‡ç« 
         setting_hide_network: éš±è—ä½ çš„ç¤¾äº¤ç¶²çµ¡
-        setting_noindex: é˜»æ¢æœå°‹å¼•æ“Žæª¢ç´¢
-        setting_reduce_motion: æ¸›ä½Žå‹•ç•«æ•ˆæžœ
-        setting_show_application: é¡¯ç¤ºç”¨ä¾†å‚³é€å˜Ÿæ–‡çš„æ‡‰ç”¨ç¨‹å¼
+        setting_noindex: è²æ˜Žæœ¬ç«™ä¸å¸Œæœ›æœå°‹å™¨è®“å¤–ç•Œæœå°‹
+        setting_reduce_motion: æ¸›å°‘å‹•ç•«æ•ˆæžœ
+        setting_show_application: é¡¯ç¤ºç”¨ä¾†ç™¼è¡¨æ–‡ç« çš„æ‡‰ç”¨ç¨‹å¼
         setting_system_font_ui: ä½¿ç”¨ç³»çµ±é è¨å—åž‹
         setting_theme: ç¶²ç«™ä¸»é¡Œ
-        setting_trends: é¡¯ç¤ºæœ¬æ—¥è¶¨å‹¢
-        setting_unfollow_modal: å–æ¶ˆé—œæ³¨å‰è·³å‡ºè©¢å•æˆ‘
+        setting_trends: é¡¯ç¤ºä»Šå¤©ç†±é–€ä¸»é¡Œ
+        setting_unfollow_modal: å–æ¶ˆé—œæ³¨å‰è«‹è®“æˆ‘ç¢ºå®š
+        setting_use_blurhash: å°‡éš±è—åª’é«”ä»¥å½©è‰²æ¼¸è®Šåœ–æ¨£è¡¨ç¤º
         setting_use_pending_items: é™é€Ÿæ¨¡å¼
         severity: ç‰ç´š
+        sign_in_token_attempt: å®‰å…¨ç¢¼
         type: åŒ¯å…¥è³‡æ–™é¡žåž‹
-        username: ç”¨æˆ¶åç¨±
-        username_or_email: ç”¨æˆ¶åç¨±æˆ–é›»éƒµ
+        username: ä½¿ç”¨è€…åç¨±
+        username_or_email: ä½¿ç”¨è€…åç¨±æˆ–é›»éƒµ
         whole_word: æ•´å€‹è©žå½™
+      email_domain_block:
+        with_dns_records: åŒ…æ‹¬åŸŸåçš„ MX è¨˜éŒ„å’Œ IP ä½å€
       featured_tag:
-        name: "ã€Œ#ã€æ¨™ç±¤"
+        name: ä¸»é¡Œæ¨™ç±¤ (Hashtag)
       interactions:
-        must_be_follower: éš±è—æ²’æœ‰é—œæ³¨ä½ çš„ç”¨æˆ¶çš„é€šçŸ¥
-        must_be_following: éš±è—ä½ ä¸é—œæ³¨çš„ç”¨æˆ¶çš„é€šçŸ¥
-        must_be_following_dm: éš±è—ä½ ä¸é—œæ³¨çš„ç”¨æˆ¶çš„ç§ä¿¡
+        must_be_follower: éš±è—ä½ é—œæ³¨è€…ä»¥å¤–çš„äººçš„é€šçŸ¥
+        must_be_following: éš±è—ä½ ä¸é—œæ³¨çš„äººçš„é€šçŸ¥
+        must_be_following_dm: éš±è—ä½ ä¸é—œæ³¨çš„äººçš„ç§ä¿¡
       invite:
         comment: å‚™è¨»
       invite_request:
         text: åŠ å…¥çš„åŽŸå› 
+      ip_block:
+        comment: å‚™è¨»
+        ip: IP ä½å€
+        severities:
+          no_access: å°éŽ–
+          sign_up_requires_approval: é™åˆ¶è¨»å†Š
+        severity: è¦å‰‡
       notification_emails:
         digest: å®šæœŸé›»éƒµæ‘˜è¦
-        favourite: ç•¶æœ‰ç”¨æˆ¶å–œæ¡ä½ çš„æ–‡ç« æ™‚ï¼Œç™¼é›»éƒµé€šçŸ¥
-        follow: ç•¶æœ‰ç”¨æˆ¶é—œæ³¨ä½ æ™‚ï¼Œç™¼é›»éƒµé€šçŸ¥
-        follow_request: ç•¶æœ‰ç”¨æˆ¶è¦æ±‚é—œæ³¨ä½ æ™‚ï¼Œç™¼é›»éƒµé€šçŸ¥
-        mention: ç•¶æœ‰ç”¨æˆ¶åœ¨æ–‡ç« æåŠä½ æ™‚ï¼Œç™¼é›»éƒµé€šçŸ¥
-        pending_account: éœ€è¦å¯©æ ¸çš„æ–°å¸³æˆ¶
-        reblog: ç•¶æœ‰ç”¨æˆ¶è½‰æŽ¨ä½ çš„æ–‡ç« æ™‚ï¼Œç™¼é›»éƒµé€šçŸ¥
-        report: ç•¶æäº¤æ–°æª¢èˆ‰æ™‚å‚³é€é›»åéƒµä»¶
+        favourite: æœ‰äººå–œæ¡ä½ çš„æ–‡ç« 
+        follow: ç•¶æœ‰äººé—œæ³¨ä½ æ™‚
+        follow_request: ç•¶æœ‰äººè¦æ±‚é—œæ³¨ä½ æ™‚
+        mention: ç•¶æœ‰äººåœ¨æ–‡ç« æåŠä½ æ™‚
+        pending_account: æœ‰æ–°å¸³è™Ÿéœ€è¦å¯©æ ¸æ™‚
+        reblog: ç•¶æœ‰äººè½‰æŽ¨ä½ çš„æ–‡ç« æ™‚
+        report: æ”¶åˆ°æ–°æª¢èˆ‰æ™‚
+        trending_tag: ç•¶æœªå¯©æ ¸çš„æ¨™ç±¤æˆç‚ºç•¶å‰ç†±é–€æ™‚
       tag:
         listable: å…è¨±æ¤ä¸»é¡Œæ¨™ç±¤åœ¨æœå°‹åŠå€‹äººæª”æ¡ˆç›®éŒ„ä¸é¡¯ç¤º
         name: ä¸»é¡Œæ¨™ç±¤
         trendable: å…è¨±æ¤ä¸»é¡Œæ¨™ç±¤åœ¨è¶¨å‹¢ä¸‹é¡¯ç¤º
-        usable: å…è¨±å˜Ÿæ–‡ä½¿ç”¨æ¤ä¸»é¡Œæ¨™ç±¤
+        usable: å…è¨±æ–‡ç« ä½¿ç”¨æ¤ä¸»é¡Œæ¨™ç±¤
     'no': å¦
     recommended: å»ºè°
     required:
       mark: "*"
       text: å¿…é ˆå¡«å¯«
+    title:
+      sessions:
+        webauthn: ä½¿ç”¨ä½ çš„å®‰å…¨å¯†é‘°è£ç½®ä¾†ç™»å…¥
     'yes': æ˜¯
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index a09c9945d7a1ee5a73ab6676be3ea6d951fbfa14..000ec529b003e910264b8fd65ba8ae487d4171b9 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -24,6 +24,7 @@ zh-TW:
         current_password: å› å®‰å…¨å› ç´ ï¼Œè«‹è¼¸å…¥ç›®å‰å¸³æˆ¶çš„å¯†ç¢¼
         current_username: è«‹è¼¸å…¥ç›®å‰å¸³æˆ¶çš„ä½¿ç”¨è€…åç¨±ä»¥ç¢ºèª
         digest: åƒ…åœ¨ä½ é•·æ™‚é–“æœªç™»å…¥ä¸”åœ¨æœªç™»å…¥æœŸé–“æ”¶åˆ°ç§è¨Šæ™‚å‚³é€
+        discoverable: åŠ å…¥å€‹äººè³‡æ–™ç›®éŒ„èƒ½æŽ¥è§¸æ›´å¤šé–±è½çœ¾
         email: æ‚¨å°‡æ”¶åˆ°ä¸€å°ç¢ºèªé›»åéƒµä»¶
         fields: æ‚¨å¯åœ¨å€‹äººè³‡æ–™ä¸Šæœ‰è‡³å¤š 4 å€‹ä»¥è¡¨æ ¼å½¢å¼é¡¯ç¤ºçš„é …ç›®
         header: æ”¯æ´ PNG, GIF æˆ– JPG åœ–ç‰‡ï¼Œæª”æ¡ˆæœ€å¤§ç‚º %{size}ï¼ŒæœƒæŒ‰æ¯”ä¾‹ç¸®å°æˆ %{dimensions} åƒç´ 
@@ -74,6 +75,7 @@ zh-TW:
         types:
           disable: åœç”¨
           none: ä»€éº¼ä¹Ÿä¸åš
+          sensitive: æœ‰é›·å°å¿ƒ
           silence: å®‰éœ
           suspend: åœæ¬Šä¸¦ä¸å¯é€†çš„åˆªé™¤å¸³æˆ¶è³‡æ–™
         warning_preset_id: ä½¿ç”¨è¦å‘Šé è¨
@@ -146,6 +148,13 @@ zh-TW:
         comment: å‚™è¨»
       invite_request:
         text: åŠ å…¥çš„åŽŸå› 
+      ip_block:
+        comment: å‚™è¨»
+        ip: IP ä½å€
+        severities:
+          no_access: å°éŽ–
+          sign_up_requires_approval: é™åˆ¶è¨»å†Š
+        severity: è¦å‰‡
       notification_emails:
         digest: å‚³é€æ‘˜è¦ä¿¡ä»¶
         favourite: ç•¶æœ‰ä½¿ç”¨è€…å–œæ¡ä½ çš„å˜Ÿæ–‡æ™‚ï¼Œå‚³é€é›»åä¿¡ä»¶é€šçŸ¥
@@ -165,4 +174,7 @@ zh-TW:
     required:
       mark: "*"
       text: å¿…é ˆå¡«å¯«
+    title:
+      sessions:
+        webauthn: ä½¿ç”¨æ‚¨çš„å®‰å…¨é‡‘é‘°ä¾†ç™»å…¥
     'yes': æ˜¯
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index e11fb3e691b812f4f8cf93410a95f40961d25bf7..bc214a4444fef2008754d331f7881ec4bf1a9deb 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -42,7 +42,9 @@ sk:
       domain: Server
       reason: 'DÃ´vod:'
       rejecting_media: 'MediÃ¡lne sÃºbory z tÃ½chto serverov nebudÃº spracovanÃ©, alebo ukladanÃ©, a nebudÃº z nich zobrazovanÃ© Å¾iadne nÃ¡hÄ¾ady, vyÅ¾adujÃºc ruÄnÃ© prekliknutie priamo aÅ¾ k pÃ´vodnÃ©mu sÃºboru:'
+      rejecting_media_title: TriedenÃ© mÃ©diÃ¡
       silenced: 'PrÃspevky z tÃ½chto serverov budÃº skrytÃ© z verejnÃ½ch osÃ a z konverzÃ¡ciÃ, a nebudÃº vytvorenÃ© Å¾iadnÃ© oboznÃ¡mena ohÄ¾adom aktivity ich uÅ¾ÃvateÄ¾ov, pokiaÄ¾ ich nenÃ¡sledujeÅ¡:'
+      silenced_title: UtÃÅ¡enÃ© servery
     unavailable_content_html: Vo vÅ¡eobecnosti, Mastodon ti dovoÄ¾uje vidieÅ¥ obsah, a komunikovaÅ¥ s uÅ¾ÃvateÄ¾mi akÃ©hokoÄ¾vek inÃ©ho serveru v rÃ¡mci fediversa. Toto sÃº vÃ½nimky, ktorÃ© boli vytvorenÃ© na tomto konkrÃ©tnom serveri.
     user_count_after:
       few: uÅ¾ÃvateÄ¾ov
@@ -1159,26 +1161,22 @@ sk:
     formats:
       default: "%b %d, %R, %H:%M"
   two_factor_authentication:
-    code_hint: Pre potvrdenie teraz zadaj kÃ³d vygenerovanÃ½ pomocou tvojej overovacej aplikÃ¡cie
-    description_html: Ak povolÃÅ¡ <strong> dvojfÃ¡zovÃ© overovanie</strong>, na prihlÃ¡senie potom budeÅ¡ potrebovaÅ¥ svoj telefÃ³n, ktorÃ½ vygeneruje prÃstupovÃ© kÃ³dy, Äo musÃÅ¡ zadaÅ¥.
     disable: ZakÃ¡Å¾
-    enable: PovoÄ¾
     enabled: DvojfÃ¡zovÃ© overovanie je povolenÃ©
     enabled_success: DvojfÃ¡zovÃ© overovanie ÃºspeÅ¡ne povolenÃ©
     generate_recovery_codes: Vygeneruj zÃ¡lohovÃ© kÃ³dy
-    instructions_html: "<strong>Naskenuj tento QR kÃ³d do Google AutentikÃ¡tora, alebo do podobnej TOTP aplikÃ¡cie pomocou svojho telefÃ³nu.</strong> Od tejto chvÃle bude tÃ¡to aplikÃ¡cia pre teba generovaÅ¥ kÃ³dy ktorÃ© musÃÅ¡ zadaÅ¥ aby si sa prihlÃ¡sil/a."
     lost_recovery_codes: ZÃ¡lohovÃ© kÃ³dy ti umoÅ¾nia dostaÅ¥ sa k svojmu ÃºÄtu ak stratÃÅ¡ telefÃ³n. PokiaÄ¾ si stratila svoje zÃ¡lohovÃ© kÃ³dy, mÃ´Å¾eÅ¡ si ich tu znovu vygenerovaÅ¥. Tvoje starÃ© zÃ¡lohovÃ© kÃ³dy budÃº zneplatnenÃ©.
-    manual_instructions: 'PokiaÄ¾ nemÃ´Å¾eÅ¡ oskenovaÅ¥ danÃ½ QR kÃ³d, a potrebujeÅ¡ ho zadaÅ¥ ruÄne, tu je tajomstvo v textovom formÃ¡te:'
     recovery_codes: ZÃ¡lohuj kÃ³dy pre obnovu
     recovery_codes_regenerated: ZÃ¡lohovÃ© kÃ³dy boli ÃºspeÅ¡ne zvova vygenerovanÃ©
     recovery_instructions_html: KeÄ hocikedy stratÃÅ¡ prÃstup k svojmu telefÃ³nu, mÃ´Å¾eÅ¡ pouÅ¾iÅ¥ jeden z prÃstupovÃ½ch kÃ³dov niÅ¾Å¡ie pre obnovenie prÃstupu k svojmu ÃºÄtu. <strong>Skladuj tieto prÃstupovÃ© kÃ³dy na bezpeÄnom mieste</strong>. NaprÃklad ich mÃ´Å¾eÅ¡ vytlaÄiÅ¥ a uloÅ¾iÅ¥ ich spolu s inÃ½mi dÃ´leÅ¾itÃ½mi dokumentami.
-    setup: Nastav
-    wrong_code: ZadanÃ½ kÃ³d bol neplatnÃ½! Je serverovÃ½ Äas a Äas na zariadenÃ sprÃ¡vny?
   user_mailer:
     backup_ready:
       explanation: VyÅ¾iadal/a si si ÃºplnÃº zÃ¡lohu svojho Mastodon ÃºÄtu. TÃ¡to zÃ¡loha je teraz pripravenÃ¡ na stiahnutie!
       subject: Tvoj archÃv je pripravenÃ½ na stiahnutie
       title: Odber archÃvu
+    sign_in_token:
+      subject: ProsÃm potvrÄ pokus o prihlÃ¡senie
+      title: Pokus o prihlÃ¡senie
     warning:
       explanation:
         disable: PokiaÄ¾ je tvoj ÃºÄet zamrazenÃ½, tvoje dÃ¡ta zostÃ¡vajÃº nedoknutÃ©, ale nemÃ´Å¾eÅ¡ v rÃ¡mci neho niÄ robiÅ¥, aÅ¾ kÃ½m nebude odomknutÃ½.
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index a7cf869a4060f7f41539e638ce097a52a0b5f1b7..91466c9c249d6287b0dafea722ded866fd4f7d7f 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1024,21 +1024,14 @@ sl:
       default: "%b %d, %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Za potrditev vnesite kodo, ki jo je ustvarila aplikacija za preverjanje pristnosti
-    description_html: ÄŒe omogoÄite <strong>dvofaktorsko preverjanje pristnosti</strong>, boste za prijavo morali imeti svoj telefon, s katerim boste ustvarili Å¾etone za vstop.
     disable: OnemogoÄi
-    enable: OmogoÄi
     enabled: Dvofaktorsko preverjanje pristnosti je omogoÄeno
     enabled_success: Dvofaktorsko preverjanje pristnosti je uspeÅ¡no omogoÄeno
     generate_recovery_codes: Ustvari kode za obnovitev
-    instructions_html: "<strong>Skenirajte QR kodo z Google Authenticator ali s podobno aplikacijo TOTP</strong>. Od zdaj naprej bo ta aplikacija ustvarjala Å¾etone, ki jih boste morali vnesti ob prijavi."
     lost_recovery_codes: Obnovitvene kode vam omogoÄajo, da ponovno pridobite dostop do svojega raÄuna, Äe izgubite telefon. ÄŒe ste izgubili obnovitvene kode, jih lahko obnovite tukaj. VaÅ¡e stare obnovitvene kode bodo neveljavne.
-    manual_instructions: 'ÄŒe ne morete skenirati QR kode in jo morate vnesti roÄno, je tu skrivnost v tekstovni obliki:'
     recovery_codes: Varnostna kopija obnovitvenih kod
     recovery_codes_regenerated: Obnovitvene kode so bile uspeÅ¡no regenerirane
     recovery_instructions_html: ÄŒe kdaj izgubite dostop do telefona, lahko uporabite eno od spodnjih obnovitvenih kod, da ponovno pridobite dostop do svojega raÄuna. <strong>Shranite obnovitvene kode</strong>. Lahko jih natisnete in shranite z drugimi pomembnimi dokumenti.
-    setup: Nastavi
-    wrong_code: Vnesena koda je bila neveljavna! Ali sta Äas streÅ¾nika in Äas naprave pravilna?
   user_mailer:
     backup_ready:
       explanation: Zahtevali ste popolno varnostno kopijo raÄuna Mastodon. Zdaj je pripravljen za prenos!
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 33718f1a8e1cec91a0727495bf8e45237d394546..e841ab690599ec148277c4aa202840ede0c94103 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -60,6 +60,7 @@ sq:
       one: NdjekÃ«s
       other: NdjekÃ«s
     following: Ndjekje
+    instance_actor_flash: Kjo llogari Ã«shtÃ« njÃ« aktor virtual, i pÃ«rdorur pÃ«r tÃ« pÃ«rfaqÃ«suar vetÃ« shÃ«rbyesin dhe jo ndonjÃ« pÃ«rdorues individual. PÃ«rdoret pÃ«r qÃ«llime federimi dhe sâ€™duhet pezulluar.
     joined: U bÃ« pjesÃ« mÃ« %{date}
     last_active: aktiv sÃ« fundi
     link_verified_on: PronÃ«sia e kÃ«saj lidhjeje qe kontrolluar mÃ« %{date}
@@ -98,6 +99,7 @@ sq:
       add_email_domain_block: VÃ«re pÃ«rkatÃ«sinÃ« email nÃ« listÃ« bllokimesh
       approve: Miratojeni
       approve_all: Miratojini krejt
+      approved_msg: U miratua me sukses aplikimi pÃ«r regjistrim tÃ« %{username}
       are_you_sure: Jeni i sigurt?
       avatar: Avatar
       by_domain: PÃ«rkatÃ«si
@@ -111,8 +113,10 @@ sq:
       confirm: Ripohojeni
       confirmed: U ripohua
       confirming: Po ripohohet
+      delete: Fshiji tÃ« dhÃ«nat
       deleted: U fshi
       demote: Zhgradoje
+      destroyed_msg: TÃ« dhÃ«nat e %{username} tani janÃ« vÃ«nÃ« nÃ« radhÃ« pÃ«r fshirje tÃ« menjÃ«hershme
       disable: Ã‡aktivizoje
       disable_two_factor_authentication: Ã‡aktivizoni 2FA-nÃ«
       disabled: E Ã§aktivizuar
@@ -123,10 +127,12 @@ sq:
       email_status: Gjendje email-i
       enable: Aktivizoje
       enabled: E aktivizuar
+      enabled_msg: U hoq me sukses ngrirja pÃ«r llogarinÃ« e %{username}
       followers: NdjekÃ«s
       follows: Ndjekje
       header: Krye
       inbox_url: URL Mesazhesh tÃ« MarrÃ«
+      invite_request_text: Arsye pÃ«r pjesÃ«marrje
       invited_by: Ftuar nga
       ip: IP
       joined: U bÃ« pjesÃ«
@@ -138,6 +144,8 @@ sq:
       login_status: Gjendje hyrjeje
       media_attachments: BashkÃ«ngjitje media
       memorialize: ShndÃ«rroje nÃ« pÃ«rkujtimore
+      memorialized: U shndÃ«rrua nÃ« pÃ«rkujtimore
+      memorialized_msg: "%{username} u kthye me sukses nÃ« njÃ« llogari pÃ«rkujtimore"
       moderation:
         active: Aktiv
         all: Krejt
@@ -158,10 +166,14 @@ sq:
       public: Publike
       push_subscription_expires: Pajtimi PuSH skadon mÃ«
       redownload: Rifresko profilin
+      redownloaded_msg: Profili i %{username} u rifreskua me sukses prej origjinÃ«s
       reject: Hidhe tej
       reject_all: Hidhi krejt tej
+      rejected_msg: Aplikimi pÃ«r regjistrim i %{username} u hodh poshtÃ« me sukses
       remove_avatar: Hiqe avatarin
       remove_header: Hiqe kryen
+      removed_avatar_msg: U hoq me sukses figura e avatarit tÃ« %{username}
+      removed_header_msg: U hoq me sukses figura e kreut pÃ«r %{username}
       resend_confirmation:
         already_confirmed: Ky pÃ«rdorues Ã«shtÃ« i ripohuar tashmÃ«
         send: RidÃ«rgo email ripohimi
@@ -178,6 +190,8 @@ sq:
       search: KÃ«rkoni
       search_same_email_domain: TÃ« tjerÃ« pÃ«rdorues me tÃ« njÃ«jtÃ«n pÃ«rkatÃ«si email-i
       search_same_ip: TÃ« tjerÃ« pÃ«rdorues me tÃ« njÃ«jtÃ«n IP
+      sensitive: Rezervat
+      sensitized: iu vu shenjÃ« si rezervat
       shared_inbox_url: URL kutie tÃ« pÃ«rbashkÃ«t mesazhesh
       show:
         created_reports: Ka bÃ«rÃ« raportime
@@ -187,13 +201,19 @@ sq:
       statuses: Gjendje
       subscribe: PajtomÃ«
       suspended: TÃ« pezulluara
+      suspension_irreversible: TÃ« dhÃ«nat e kÃ«saj llogarie janÃ« fshirÃ« nÃ« mÃ«nyrÃ« tÃ« pakthyeshme. Mund ta shpezulloni llogarinÃ«, pÃ«r ta bÃ«rÃ« tÃ« pÃ«rdorshme, por kjo sâ€™do tÃ« kthejÃ« ndonjÃ« tÃ« dhÃ«nÃ« qÃ« kihej mÃ« parÃ«.
+      suspension_reversible_hint_html: Llogaria Ã«shtÃ« pezulluar, dhe tÃ« dhÃ«nat do tÃ« hiqen plotÃ«sisht mÃ« %{date}. Deri atÃ«herÃ«, llogaria mund tÃ« rikthehet pa ndonjÃ« zarar. NÃ«se doni tÃ« hiqen menjÃ«herÃ« krejt tÃ« dhÃ«nat e llogarisÃ«, kÃ«tÃ« mund ta bÃ«ni mÃ« poshtÃ«.
       time_in_queue: Pritje nÃ« radhÃ« %{time}
       title: Llogari
       unconfirmed_email: Email i paripohuar
+      undo_sensitized: Hiqja shenjÃ«n si rezervat
       undo_silenced: ZhbÃ«je heshtjen
       undo_suspension: ZhbÃ«je pezullimin
+      unsilenced_msg: U hoqÃ«n me sukses kufizimet pÃ«r llogarinÃ« e %{username}
       unsubscribe: Shpajtohuni
+      unsuspended_msg: U hoq me sukses pezullimi pÃ«r llogarinÃ« e %{username}
       username: EmÃ«r pÃ«rdoruesi
+      view_domain: Shihni pÃ«rmbledhjen pÃ«r pÃ«rkatÃ«sinÃ«
       warn: Sinjalizoje
       web: Web
       whitelisted: Lejuar pÃ«r federim
@@ -208,12 +228,14 @@ sq:
         create_domain_allow: Krijo Lejim PÃ«rkatÃ«sie
         create_domain_block: Krijo Bllokim PÃ«rkatÃ«sie
         create_email_domain_block: Krijo Bllokim PÃ«rkatÃ«sie Email-esh
+        create_ip_block: Krijoni Rregull IP
         demote_user: Zhgradoje PÃ«rdoruesin
         destroy_announcement: Fshije LajmÃ«rimin
         destroy_custom_emoji: Fshi Emotikon Vetjak
         destroy_domain_allow: Fshi Lejim PÃ«rkatÃ«sie
         destroy_domain_block: Fshi Bllokim PÃ«rkatÃ«sie
         destroy_email_domain_block: Fshi bllokim pÃ«rkatÃ«sie email-esh
+        destroy_ip_block: Fshini Rregull IP
         destroy_status: Fshi Gjendje
         disable_2fa_user: Ã‡aktivizo 2FA-nÃ«
         disable_custom_emoji: Ã‡aktivizo Emotikon Vetjak
@@ -226,13 +248,16 @@ sq:
         reopen_report: Rihape Raportimin
         reset_password_user: Ricaktoni FjalÃ«kalimin
         resolve_report: Zgjidhe Raportimin
+        sensitive_account: I vini shenjÃ« si rezervat medias nÃ« llogarinÃ« tuaj
         silence_account: Heshtoje LlogarinÃ«
         suspend_account: Pezulloje LlogarinÃ«
         unassigned_report: Hiqe Caktimin e Raportimit
+        unsensitive_account: Hiqjani shenjÃ«n si rezervat medias nÃ« llogarinÃ« tuaj
         unsilence_account: Hiqe Heshtimin e LlogarisÃ«
         unsuspend_account: Hiqe Pezullimin e LlogarisÃ«
         update_announcement: PÃ«rditÃ«so LajmÃ«rimin
         update_custom_emoji: PÃ«rditÃ«so Emotikon Vetjak
+        update_domain_block: PÃ«rditÃ«so Bllok PÃ«rkatÃ«sish
         update_status: PÃ«rditÃ«so Gjendjen
       actions:
         assigned_to_self_report: "%{name} ia kaloi raportimin %{target} nÃ« ngarkim vetvetes"
@@ -244,12 +269,14 @@ sq:
         create_domain_allow: "%{name} kaloi nÃ« listÃ« lejimesh pÃ«rkatÃ«sinÃ« %{target}"
         create_domain_block: "%{name} bllokoi pÃ«rkatÃ«sinÃ« %{target}"
         create_email_domain_block: "%{name} shtoi nÃ« listÃ« bllokimesh pÃ«rkatÃ«sinÃ« %{target}"
+        create_ip_block: "%{name} krijoi rregull pÃ«r IP-nÃ« %{target}"
         demote_user: "%{name} zhgradoi pÃ«rdoruesin %{target}"
         destroy_announcement: "%{name} fshiu lajmÃ«rimin pÃ«r %{target}"
         destroy_custom_emoji: "%{name} asgjÃ«soi emotikonin %{target}"
         destroy_domain_allow: "%{name} hoqi pÃ«rkatÃ«sinÃ« %{target} nga listÃ« lejimesh"
         destroy_domain_block: "%{name} zhbllokoi pÃ«rkatÃ«sinÃ« %{target}"
         destroy_email_domain_block: "%{name} e shtoi nÃ« listÃ« lejimesh pÃ«rkatÃ«sinÃ« %{target}"
+        destroy_ip_block: "%{name} fshiu rregull pÃ«r IP-nÃ« %{target}"
         destroy_status: "%{name} hoqi gjendje nga %{target}"
         disable_2fa_user: "%{name} Ã§aktivizoi domosdoshmÃ«ritÃ« pÃ«r dyfaktorÃ«sh pÃ«r pÃ«rdoruesin %{target}"
         disable_custom_emoji: "%{name} Ã§aktivizoi emotikonin %{target}"
@@ -262,13 +289,16 @@ sq:
         reopen_report: "%{name} rihapi raportimin %{target}"
         reset_password_user: "%{name} ricaktoi fjalÃ«kalimi pÃ«r pÃ«rdoruesin %{target}"
         resolve_report: "%{name} zgjidhi raportimin %{target}"
+        sensitive_account: "%{name} i vuri shenjÃ« si rezervat medias nÃ« %{target}"
         silence_account: "%{name} heshtoi llogarinÃ« e %{target}"
         suspend_account: "%{name} pezulloi llogarinÃ« e %{target}"
         unassigned_report: "%{name} rihapi raportimin %{target}"
+        unsensitive_account: "%{name} ia hoqi shenjÃ«n si rezervat medias nÃ« %{target}"
         unsilence_account: "%{name} hoqi heshtimin pÃ«r llogarinÃ« %{target}"
         unsuspend_account: "%{name} hoqi pezullimin pÃ«r llogarinÃ« e %{target}"
         update_announcement: "%{name} pÃ«rditÃ«soi lajmÃ«rimin %{target}"
         update_custom_emoji: "%{name} pÃ«rditÃ«soi emotikonin %{target}"
+        update_domain_block: "%{name} pÃ«rditÃ«soi bllok pÃ«rkatÃ«sish pÃ«r %{target}"
         update_status: "%{name} pÃ«rditÃ«soi gjendjen me %{target}"
       deleted_status: "(fshiu gjendjen)"
       empty: Sâ€™u gjetÃ«n regjistra.
@@ -372,6 +402,8 @@ sq:
           silence: Heshtoji
           suspend: Pezulloje
         title: Bllokim i ri pÃ«rkatÃ«sie
+      obfuscate: ErrÃ«soje emrin e pÃ«rkatÃ«sisÃ«
+      obfuscate_hint: ErrÃ«soje pjesÃ«risht emrin e pÃ«rkatÃ«sisÃ« te lista, nÃ«se Ã«shtÃ« aktivizuar publikimi i listÃ«s sÃ« kufizimeve tÃ« pÃ«rkatÃ«sive
       private_comment: Koment privat
       private_comment_hint: Koment mbi kÃ«tÃ« kufizim pÃ«rkatÃ«sie pÃ«r pÃ«rdorim tÃ« brendshÃ«m nga moderatorÃ«t.
       public_comment: Koment publik
@@ -411,6 +443,7 @@ sq:
     instances:
       by_domain: PÃ«rkatÃ«si
       delivery_available: Ka shpÃ«rndarje tÃ« mundshme
+      empty: Sâ€™u gjetÃ«n pÃ«rkatÃ«si.
       known_accounts:
         one: "%{count} llogari e njohur"
         other: "%{count} llogari tÃ« njohura"
@@ -434,6 +467,21 @@ sq:
         expired: I skaduar
         title: Filtrim
       title: Ftesa
+    ip_blocks:
+      add_new: Krijoni rregull
+      created_msg: U shtua me sukses rregull i ri IP
+      delete: Fshije
+      expires_in:
+        '1209600': 2 javÃ«
+        '15778476': 6 muaj
+        '2629746': 1 muaj
+        '31556952': 1 vit
+        '86400': 1 ditÃ«
+        '94670856': 3 vjet
+      new:
+        title: Krijoni rregull IP tÃ« ri
+      no_ip_block_selected: Sâ€™u ndryshua ndonjÃ« rregull IP, ngaqÃ« sâ€™u pÃ«rzgjodh ndonjÃ« i tillÃ«
+      title: Rregulla IP
     pending_accounts:
       title: Llogari pezull (%{count})
     relationships:
@@ -473,6 +521,8 @@ sq:
       comment:
         none: AsnjÃ«
       created_at: Raportuar mÃ«
+      forwarded: U pÃ«rcoll
+      forwarded_to: U pÃ«rcoll te %{domain}
       mark_as_resolved: VÃ«ri shenjÃ« si i zgjidhur
       mark_as_unresolved: VÃ«ri shenjÃ« si tÃ« pazgjidhur
       notes:
@@ -516,6 +566,7 @@ sq:
       domain_blocks_rationale:
         title: Shfaq arsye
       enable_bootstrap_timeline_accounts:
+        desc_html: BÃ«j qÃ« pÃ«rdoruesit e rinj automatikisht tÃ« ndjekin llogaritÃ« e formÃ«suara, qÃ« prurja e tyre bazÃ« tÃ« mos nisÃ« e zbrazÃ«t
         title: Aktivizo ndjekje parazgjedhje pÃ«r pÃ«rdorues tÃ« rinj
       hero:
         desc_html: E shfaqur nÃ« faqen ballore. KÃ«shillohet tÃ« paktÃ«n 600x100px. Kur nuk caktohet gjÃ«, pÃ«rdoret miniaturÃ« e shÃ«rbyesit
@@ -542,6 +593,9 @@ sq:
         min_invite_role:
           disabled: AsnjÃ«
           title: Lejo ftesa nga
+        require_invite_text:
+          desc_html: Kur regjistrimet lypin miratim dorazi, tekstin e kÃ«rkesÃ«s pÃ«r ftesÃ« â€œPse doni tÃ« merrni pjesÃ«?â€ bÃ«je tÃ« detyrueshÃ«m, nÃ« vend se opsional
+          title: KÃ«rkoju pÃ«rdoruesve tÃ« rinj tÃ« plotÃ«sojnÃ« doemos njÃ« tekst kÃ«rkese pÃ«r ftesÃ«
       registrations_mode:
         modes:
           approved: PÃ«r regjistrim, lypset miratimi
@@ -681,8 +735,11 @@ sq:
       prefix_sign_up: Regjistrohuni nÃ« Mastodon qÃ« sot!
       suffix: Me njÃ« llogari, do tÃ« jeni nÃ« gjendje tÃ« ndiqni persona, pÃ«rditÃ«sime postimesh dhe tÃ« shkÃ«mbeni mesazhe me pÃ«rdorues nga cilido shÃ«rbyes Mastodon, etj!
     didnt_get_confirmation: Sâ€™morÃ«t udhÃ«zime ripohimi?
+    dont_have_your_security_key: Sâ€™i keni kyÃ§et tuaj tÃ« sigurisÃ«?
     forgot_password: Harruat fjalÃ«kalimin tuaj?
     invalid_reset_password_token: Token-i i ricaktimit tÃ« fjalÃ«kalimit Ã«shtÃ« i pavlefshÃ«m ose ka skaduar. Ju lutemi, kÃ«rkoni njÃ« tÃ« ri.
+    link_to_otp: Jepni njÃ« kod mirÃ«filltÃ«simi dyfaktorÃ«sh prej telefonit tuaj ose njÃ« kod rimarrjeje
+    link_to_webauth: PÃ«rdorni pajisjen tuaj tÃ« kyÃ§eve tÃ« sigurisÃ«
     login: Hyni
     logout: Dalje
     migrate_account: Kaloni nÃ« njÃ« tjetÃ«r llogari
@@ -707,7 +764,9 @@ sq:
       functional: Llogaria juaj Ã«shtÃ« tÃ«rÃ«sisht funksionale.
       pending: Aplikimi juaj Ã«shtÃ« nÃ« pritje tÃ« shqyrtimit nga stafi ynÃ«. Kjo mund tÃ« dojÃ« ca kohÃ«. NÃ«se aplikimi juaj miratohet, do tÃ« merrni njÃ« email.
       redirecting_to: Llogaria juaj Ã«shtÃ« joaktive, ngaqÃ« aktualisht ridrejton te %{acct}.
+    too_fast: Formulari u parashtrua shumÃ« shpejt, riprovoni.
     trouble_logging_in: Probleme me hyrjen?
+    use_security_key: PÃ«rdor kyÃ§ sigurie
   authorize_follow:
     already_following: E ndiqni tashmÃ« kÃ«tÃ« llogari
     already_requested: Keni dÃ«rguar tashmÃ« njÃ« kÃ«rkesÃ« ndjekjeje te ajo llogari
@@ -732,6 +791,7 @@ sq:
   date:
     formats:
       default: "%b %d, %Y"
+      with_month_name: "%d %B, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}o"
@@ -796,6 +856,7 @@ sq:
       request: KÃ«rkoni arkivin tuaj
       size: MadhÃ«si
     blocks: Bllokoni
+    bookmarks: FaqerojtÃ«s
     csv: CSV
     domain_blocks: Bllokime pÃ«rkatÃ«sish
     lists: Lista
@@ -863,6 +924,8 @@ sq:
     status: Gjendje verifikimi
     view_proof: Shihni provÃ«n
   imports:
+    errors:
+      over_rows_processing_limit: pÃ«rmban mÃ« shumÃ« se %{count} rreshta
     modes:
       merge: PÃ«rzieji
       merge_long: Mbaji zÃ«rat ekzistues dhe shto tÃ« rinjtÃ«
@@ -872,6 +935,7 @@ sq:
     success: TÃ« dhÃ«nat tuaja u ngarkuan me sukses dhe tani do tÃ« pÃ«rpunohet nÃ« kohÃ«
     types:
       blocking: ListÃ« bllokimesh
+      bookmarks: FaqerojtÃ«s
       domain_blocking: ListÃ« bllokimesh pÃ«rkatÃ«sish
       following: ListÃ« ndjekjesh
       muting: ListÃ« heshtimesh
@@ -992,6 +1056,14 @@ sq:
           quadrillion: K
           thousand: M
           trillion: T
+  otp_authentication:
+    code_hint: QÃ« tÃ« bÃ«het ripohimi, jepni kodin e prodhuar nga aplikacioni juaj i mirÃ«filltÃ«simeve
+    description_html: NÃ«se aktivizoni <strong>mirÃ«filltÃ«sim dyfaktorÃ«sh</strong> duke pÃ«rdorur njÃ« aplikacion mirÃ«filltÃ«simesh, hyrja do tÃ« dojÃ« qÃ« tÃ« keni telefonin tuaj, i cili do tÃ« prodhojÃ« pÃ«r ju token-Ã« hyrjesh.
+    enable: Aktivizoje
+    instructions_html: "<strong>Skanoje kÃ«tÃ« kod QR me Google Authenticator ose njÃ« aplikacion tÃ« ngjashÃ«m TOTP nÃ« telefonin tuaj</strong>. Tani e tutje, ai aplikacion do tÃ« prodhojÃ« token-Ã« tÃ« cilÃ«t do tâ€™ju duhet tâ€™i jepni kur bÃ«ni hyrje."
+    manual_instructions: 'NÃ«se nuk skanoni kodin QR dhe ju duhet ta jepni dorazi, ja e fshehta si tekst i thjeshtÃ«:'
+    setup: Ujdiseni
+    wrong_code: Kodi i dhÃ«nÃ« Ã«shtÃ« i pavlefshÃ«m! A janÃ« tÃ« sakta koha e shÃ«rbyesit dhe koha e pajisjes?
   pagination:
     newer: MÃ« tÃ« ri
     next: Pasuesi
@@ -1020,6 +1092,7 @@ sq:
   relationships:
     activity: Veprimtari llogarie
     dormant: NÃ« gjumÃ«
+    follow_selected_followers: Ndiq ndjekÃ«sit e pÃ«rzgjedhur
     followers: NdjekÃ«s
     following: Ndjek
     invited: TÃ« ftuar
@@ -1116,6 +1189,7 @@ sq:
     profile: Profil
     relationships: Ndjekje dhe ndjekÃ«s
     two_factor_authentication: MirÃ«filltÃ«sim DyfaktorÃ«sh
+    webauthn_authentication: KyÃ§e sigurie
   spam_check:
     spam_detected: Ky Ã«shtÃ« njÃ« raportim i automatizuar. Ã‹shtÃ« pikasur mesazh i padÃ«shiruar.
   statuses:
@@ -1154,6 +1228,8 @@ sq:
         other: "%{count} vota"
       vote: VotÃ«
     show_more: Shfaq mÃ« tepÃ«r
+    show_newer: Shfaq mÃ« tÃ« reja
+    show_older: Shfaq mÃ« tÃ« vjetra
     show_thread: Shfaq rrjedhÃ«n
     sign_in_to_participate: BÃ«ni hyrjen, qÃ« tÃ« merrni pjesÃ« te biseda
     title: '%{name}: "%{quote}"'
@@ -1262,21 +1338,20 @@ sq:
       default: "%d %b, %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: QÃ« tÃ« bÃ«het ripohimi, jepni kodin e prodhuar nga aplikacioni juaj i mirÃ«filltÃ«simeve
-    description_html: NÃ«se aktivizoni <strong>mirÃ«filltÃ«simin dyfaktorÃ«sh</strong>, hyrja do tÃ« kÃ«rkojÃ« tÃ« jeni nÃ« zotÃ«rim tÃ« telefonit tuaj, i cili do tÃ« prodhojÃ« kod qÃ« duhet ta jepni.
+    add: Shtoje
     disable: Ã‡aktivizoje
-    enable: Aktivizoje
+    disabled_success: MirÃ«filltÃ«simi dyfaktorÃ«sh u Ã§aktivizua me sukses
+    edit: PÃ«rpunojeni
     enabled: MirÃ«filltÃ«simi dyfaktorÃ«sh Ã«shtÃ« i aktivizuar
     enabled_success: MirÃ«filltÃ«simi dyfaktorÃ«sh u aktivizua me sukses
     generate_recovery_codes: Prodho kode rikthimesh
-    instructions_html: "<strong>Skanojeni kÃ«tÃ« kod QR me Google Authenticator ose njÃ« aplikacion TOTP tÃ« ngjashÃ«m nÃ« telefonin tuaj</strong>. Tani e tutje, ai aplikacion do tÃ« prodhojÃ« kode tÃ« cilÃ«t duhet tâ€™i jepni kur bÃ«ni hyrje."
     lost_recovery_codes: Kodet e rikthimit ju lejojnÃ« tÃ« rifitoni hyrje nÃ« llogarinÃ« tuaj, nÃ«se humbni telefonin tuaj. NÃ«se keni humbur kodet tuaj tÃ« rikthimit, mund tâ€™i prodhoni sÃ«rish kÃ«tu. Kodet tuaj tÃ« vjetÃ«r tÃ« rikthimit do tÃ« bÃ«hen tÃ« pavlefshÃ«m.
-    manual_instructions: 'NÃ«se nuk skanoni dot kodin QR dhe ju duhet ta jepni dorazi, ja e fshehta si tekst i thjeshtÃ«:'
+    methods: Metoda dyfaktorÃ«shi
+    otp: Aplikacion mirÃ«filltÃ«simesh
     recovery_codes: Kopjeruani kode rikthimesh
     recovery_codes_regenerated: Kodet e rikthimeve u riprodhuan me sukses
     recovery_instructions_html: NÃ« ndodhtÃ« qÃ« tÃ« humbni hyrje te telefoni juaj, mund tÃ« pÃ«rdorni njÃ« nga kodet e rikthimit mÃ« poshtÃ«, qÃ« tÃ« rifitoni hyrje te llogaria juaj. <strong>Mbajini tÃ« parrezikuar kodet e rikthimeve</strong>. PÃ«r shembull, mund tâ€™i shtypni dhe tâ€™i ruani tok me dokumente tÃ« tjerÃ« tÃ« rÃ«ndÃ«sishÃ«m.
-    setup: Ujdiseni
-    wrong_code: Kodi i dhÃ«nÃ« Ã«shtÃ« i pavlefshÃ«m! A janÃ« tÃ« sakta koha e shÃ«rbyesit dhe koha e pajisjes?
+    webauthn: KyÃ§e sigurie
   user_mailer:
     backup_ready:
       explanation: KÃ«rkuat njÃ« kopjeruajtje tÃ« plotÃ« tÃ« llogarisÃ« tuaj Mastodon. E keni gati pÃ«r shkarkim!
@@ -1291,6 +1366,7 @@ sq:
     warning:
       explanation:
         disable: Kur llogaria juaj Ã«shtÃ« e ngrirÃ«, tÃ« dhÃ«nat nÃ« llogarinÃ« tuaj mbeten tÃ« paprekura, por sâ€™mund tÃ« kryeni ndonjÃ« veprim, para se tÃ« shkyÃ§et.
+        sensitive: Kartelat tuaja media tÃ« ngarkuara dhe media e lidhur prej jush do tÃ« trajtohet si rezervat.
         silence: Kur llogaria juaj Ã«shtÃ« e kufizuar, mesazhet tuaj nÃ« kÃ«tÃ« shÃ«rbyes do tâ€™i shohin vetÃ«m personat qÃ« ju ndjekin tashmÃ«. dhe mund tÃ« liheni jashtÃ« nga lista tÃ« ndryshme publike. MegjithatÃ«, tÃ« tjerÃ«t prapÃ« mund tâ€™ju ndjekin dorazi.
         suspend: Llogaria juaj Ã«shtÃ« pezulluar, dhe krejt mesazhet tuaja dhe kartelat media tÃ« ngarkuara janÃ« hequr nÃ« mÃ«nyrÃ« tÃ« pakthyeshme nga ky shÃ«rbyes, dhe nga shÃ«rbyesit te tÃ« cilÃ«t kishit ndjekÃ«s.
       get_in_touch: QÃ« tÃ« lidheni me ekipin e %{instance}, mund tâ€™i pÃ«rgjigjeni kÃ«tij email-i.
@@ -1299,11 +1375,13 @@ sq:
       subject:
         disable: Llogaria juaj %{acct} Ã«shtÃ« ngrirÃ«
         none: Sinjalizim pÃ«r %{acct}
+        sensitive: Medias postuar nga llogaria juaj %{acct} i Ã«shtÃ« vÃ«nÃ« shenjÃ« si rezervat
         silence: Llogaria juaj %{acct} Ã«shtÃ« kufizuar
         suspend: Llogaria juaj %{acct} Ã«shtÃ« pezulluar
       title:
         disable: Llogari e ngrirÃ«
         none: Sinjalizim
+        sensitive: Medias tuaj i Ã«shtÃ« vÃ«nÃ« shenjÃ« si rezervat
         silence: Llogari e kufizuar
         suspend: Llogari e pezulluar
     welcome:
@@ -1324,9 +1402,11 @@ sq:
       tips: NdihmÃ«za
       title: MirÃ« se vini, %{name}!
   users:
+    blocked_email_provider: Ky furnizues shÃ«rbimi email nuk lejohet
     follow_limit_reached: Sâ€™mund tÃ« ndiqni mÃ« tepÃ«r se %{limit} persona
     generic_access_help_html: Problem me hyrjen nÃ« llogarinÃ« tuaj? PÃ«r asistencÃ« mund tÃ« lidheni me %{email}
     invalid_email: Adresa email Ã«shtÃ« e pavlefshme
+    invalid_email_mx: Adresa email sâ€™duket se ekziston
     invalid_otp_token: Kod dyfaktorÃ«sh i pavlefshÃ«m
     invalid_sign_in_token: Kod sigurie i pavlefshÃ«m
     otp_lost_help_html: NÃ«se humbi hyrjen te tÃ« dy, mund tÃ« lidheni me %{email}
@@ -1336,3 +1416,20 @@ sq:
   verification:
     explanation_html: 'Mundeni <strong>tÃ« verifikoni veten si i zoti i lidhjeve te tejtÃ«dhÃ«nat e profilit tuaj</strong>. PÃ«r kÃ«tÃ«, sajti i lidhur duhet tÃ« pÃ«rmbajÃ« njÃ« lidhje pÃ«r te profili juaj Mastodon. Lidhje pÃ«r te ajo <strong>duhet</strong> tÃ« ketÃ« njÃ« atribut <code>rel="me"</code>. LÃ«nda tekst e lidhjes nuk ngre peshÃ«. Ja njÃ« shembull:'
     verification: Verifikim
+  webauthn_credentials:
+    add: Shton kyÃ§ tÃ« ri sigurie
+    create:
+      error: Pati njÃ« problem me shtimin e kyÃ§eve tuaj tÃ« sigurisÃ«. Ju lutemi, riprovoni.
+      success: KyÃ§i juaj i sigurisÃ« u shtua me sukses.
+    delete: Fshije
+    delete_confirmation: Jeni i sigurt se doni tÃ« fshihet ky kyÃ§ sigurie?
+    description_html: NÃ«se aktivizoni <strong>mirÃ«filltÃ«sim me kyÃ§ sigurie</strong>, hyrja do tÃ« kÃ«rkojÃ« qÃ« tÃ« pÃ«rdorni njÃ« nga kyÃ§et tuaj tÃ« sigurisÃ«.
+    destroy:
+      error: Pati njÃ« problem me fshirjen e kyÃ§it tuaj tÃ« sigurisÃ«. Ju lutemi, riprovoni.
+      success: KyÃ§i juaj i sigurisÃ« u fshi me sukses.
+    invalid_credential: KyÃ§ i pavlefshÃ«m sigurie
+    nickname_hint: Jepni nofkÃ«n e kyÃ§it tuaj tÃ« ri tÃ« sigurisÃ«
+    not_enabled: Sâ€™e keni aktivizuar ende WebAuthn-in
+    not_supported: Ky shfletues nuk mbulon kyÃ§e sigurie
+    otp_required: QÃ« tÃ« pÃ«rdoren kyÃ§e sigurie, ju lutemi, sÃ« pari aktivizoni mirÃ«filltÃ«simin dyfaktorÃ«sh.
+    registered_on: Regjistruar mÃ« %{date}
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 61cea8c21408df18084dc92c49af83eb3305fc3c..da8eda86f48ec44af412edce44985ecbfbbe2477 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -472,21 +472,14 @@ sr-Latn:
   themes:
     default: Mastodont
   two_factor_authentication:
-    code_hint: Unesite kod sa VaÅ¡e aplikacije za proveru identiteta da potvrdite
-    description_html: Ako ukljuÄite <strong>dvofaktorsku identifikaciju</strong>, moraÄ‡ete da imate telefon sa sobom da biste mogli da se prijavite. Telefon Ä‡e onda generisati tokene za VaÅ¡u prijavu.
     disable: IskljuÄi
-    enable: UkljuÄi
     enabled: Dvofaktorska identifikacija je ukljuÄena
     enabled_success: Dvofaktorska identifikacija je uspeÅ¡no ukljuÄena
     generate_recovery_codes: GeneriÅ¡i kodove za oporavak
-    instructions_html: "<strong>Skenirajte ovaj QR kod u Google Authenticator ili nekoj sliÄnoj TOTP aplikaciji na VaÅ¡em telefonu</strong>. Od sada, ta aplikacija Ä‡e Vam generisati tokene koje morate uneti da biste se prijavili."
     lost_recovery_codes: Kodovi za oporavak Vam omoguÄ‡avaju da povratite pristup nalogu ako izgubite telefon. Ako izgubite kodove za oporavak, moÅ¾ete ih regenerisati ovde. Od tog trenutka, stari kodovi za oporavak viÅ¡e ne vaÅ¾e.
-    manual_instructions: 'Ukoliko ne moÅ¾ete da skenirate QR kod i morate ga unesete ruÄno, evo je ogoljena Å¡ifra:'
     recovery_codes: Napravite rezervu kodova za oporavak
     recovery_codes_regenerated: Kodovi za oporavak uspeÅ¡no regenerisani
     recovery_instructions_html: Ako ikada izgubite pristup telefonu, moÅ¾ete iskoristiti kodove za oporavak date ispod da povratite pristup nalogu. <strong>DrÅ¾ite kodove za oporavak na sigurnom</strong>. Na primer, odÅ¡tampajte ih i Äuvajte ih sa ostalim vaÅ¾nim dokumentima.
-    setup: NameÅ¡tanje
-    wrong_code: Uneseni kod nije ispravan! Da li su vremena na serveru i na ureÄ‘aju ispravna?
   users:
     invalid_email: Adresa e-poÅ¡te nije ispravna
     invalid_otp_token: Neispravni dvofaktorski kod
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index d7fb6f74d6aea13650e6700c6009dad4ac6f15e5..e26682891c25b7df7f3b6844df565bd2a9c965e8 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -757,21 +757,14 @@ sr:
     default: ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½
     mastodon-light: ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½ (ÑÐ²ÐµÑ‚Ð»Ð¾)
   two_factor_authentication:
-    code_hint: Ð”Ð° Ð±Ð¸ÑÑ‚Ðµ Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ð¸Ð»Ð¸, ÑƒÐ½ÐµÑÐ¸Ñ‚Ðµ ÐºÐ¾Ð´ Ð³ÐµÐ½ÐµÑ€Ð¸ÑÐ°Ð½ Ð¾Ð´ ÑÑ‚Ñ€Ð°Ð½Ðµ Ð²Ð°ÑˆÐµ Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ðµ Ð·Ð° Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ñƒ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ‚ÐµÑ‚Ð°
-    description_html: ÐÐºÐ¾ ÑƒÐºÑ™ÑƒÑ‡Ð¸Ñ‚Ðµ <strong>Ð´Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€ÑÐºÑƒ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ñƒ</strong>, Ð¼Ð¾Ñ€Ð°Ñ›ÐµÑ‚Ðµ Ð´Ð° Ð¸Ð¼Ð°Ñ‚Ðµ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½ ÑÐ° ÑÐ¾Ð±Ð¾Ð¼ Ð´Ð° Ð±Ð¸ÑÑ‚Ðµ Ð¼Ð¾Ð³Ð»Ð¸ Ð´Ð° ÑÐµ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ð¸Ñ‚Ðµ. Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½ Ñ›Ðµ Ð¾Ð½Ð´Ð° Ð³ÐµÐ½ÐµÑ€Ð¸ÑÐ°Ñ‚Ð¸ Ñ‚Ð¾ÐºÐµÐ½Ðµ Ð·Ð° Ð’Ð°ÑˆÑƒ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ñƒ.
     disable: Ð˜ÑÐºÑ™ÑƒÑ‡Ð¸
-    enable: ÐžÐ¼Ð¾Ð³ÑƒÑ›Ð¸
     enabled: Ð”Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€ÑÐºÐ° Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð° Ñ˜Ðµ ÑƒÐºÑ™ÑƒÑ‡ÐµÐ½Ð°
     enabled_success: Ð”Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€ÑÐºÐ° Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð° Ñ˜Ðµ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ ÑƒÐºÑ™ÑƒÑ‡ÐµÐ½Ð°
     generate_recovery_codes: Ð“ÐµÐ½ÐµÑ€Ð¸ÑˆÐ¸ ÐºÐ¾Ð´Ð¾Ð²Ðµ Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº
-    instructions_html: "<strong>Ð¡ÐºÐµÐ½Ð¸Ñ€Ð°Ñ˜Ñ‚Ðµ Ð¾Ð²Ð°Ñ˜ QR ÐºÐ¾Ð´ Ñƒ Google Authenticator Ð¸Ð»Ð¸ Ð½ÐµÐºÐ¾Ñ˜ ÑÐ»Ð¸Ñ‡Ð½Ð¾Ñ˜ TOTP Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð¸ Ð½Ð° Ð’Ð°ÑˆÐµÐ¼ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ñƒ</strong>. ÐžÐ´ ÑÐ°Ð´Ð°, Ñ‚Ð° Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð° Ñ›Ðµ Ð’Ð°Ð¼ Ð³ÐµÐ½ÐµÑ€Ð¸ÑÐ°Ñ‚Ð¸ Ñ‚Ð¾ÐºÐµÐ½Ðµ ÐºÐ¾Ñ˜Ðµ Ð¼Ð¾Ñ€Ð°Ñ‚Ðµ ÑƒÐ½ÐµÑ‚Ð¸ Ð´Ð° Ð±Ð¸ÑÑ‚Ðµ ÑÐµ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ð¸Ð»Ð¸."
     lost_recovery_codes: ÐšÐ¾Ð´Ð¾Ð²Ð¸ Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº Ð’Ð°Ð¼ Ð¾Ð¼Ð¾Ð³ÑƒÑ›Ð°Ð²Ð°Ñ˜Ñƒ Ð´Ð° Ð¿Ð¾Ð²Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿ Ð½Ð°Ð»Ð¾Ð³Ñƒ Ð°ÐºÐ¾ Ð¸Ð·Ð³ÑƒÐ±Ð¸Ñ‚Ðµ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½. ÐÐºÐ¾ Ð¸Ð·Ð³ÑƒÐ±Ð¸Ñ‚Ðµ ÐºÐ¾Ð´Ð¾Ð²Ðµ Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº, Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¸Ñ… Ñ€Ðµ-Ð³ÐµÐ½ÐµÑ€Ð¸ÑÐ°Ñ‚Ð¸ Ð¾Ð²Ð´Ðµ. ÐžÐ´ Ñ‚Ð¾Ð³ Ñ‚Ñ€ÐµÐ½ÑƒÑ‚ÐºÐ°, ÑÑ‚Ð°Ñ€Ð¸ ÐºÐ¾Ð´Ð¾Ð²Ð¸ Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº Ð²Ð¸ÑˆÐµ Ð½Ðµ Ð²Ð°Ð¶Ðµ.
-    manual_instructions: 'Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð´Ð° ÑÐºÐµÐ½Ð¸Ñ€Ð°Ñ‚Ðµ QR ÐºÐ¾Ð´ Ð¸ Ð¼Ð¾Ñ€Ð°Ñ‚Ðµ Ð³Ð° ÑƒÐ½ÐµÑÐµÑ‚Ðµ Ñ€ÑƒÑ‡Ð½Ð¾, ÐµÐ²Ð¾ Ñ˜Ðµ Ð¾Ð³Ð¾Ñ™ÐµÐ½Ð° ÑˆÐ¸Ñ„Ñ€Ð°:'
     recovery_codes: ÐÐ°Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ðµ Ñ€ÐµÐ·ÐµÑ€Ð²Ñƒ ÐºÐ¾Ð´Ð¾Ð²Ð° Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº
     recovery_codes_regenerated: ÐšÐ¾Ð´Ð¾Ð²Ð¸ Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ñ€Ðµ-Ð³ÐµÐ½ÐµÑ€Ð¸ÑÐ°Ð½Ð¸
     recovery_instructions_html: ÐÐºÐ¾ Ð¸ÐºÐ°Ð´Ð° Ð¸Ð·Ð³ÑƒÐ±Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ñƒ, Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¸ÑÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ ÐºÐ¾Ð´Ð¾Ð²Ðµ Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº Ð´Ð°Ñ‚Ðµ Ð¸ÑÐ¿Ð¾Ð´ Ð´Ð° Ð¿Ð¾Ð²Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿ Ð½Ð°Ð»Ð¾Ð³Ñƒ. <strong>Ð”Ñ€Ð¶Ð¸Ñ‚Ðµ ÐºÐ¾Ð´Ð¾Ð²Ðµ Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº Ð½Ð° ÑÐ¸Ð³ÑƒÑ€Ð½Ð¾Ð¼</strong>. ÐÐ° Ð¿Ñ€Ð¸Ð¼ÐµÑ€, Ð¾Ð´ÑˆÑ‚Ð°Ð¼Ð¿Ð°Ñ˜Ñ‚Ðµ Ð¸Ñ… Ð¸ Ñ‡ÑƒÐ²Ð°Ñ˜Ñ‚Ðµ Ð¸Ñ… ÑÐ° Ð¾ÑÑ‚Ð°Ð»Ð¸Ð¼ Ð²Ð°Ð¶Ð½Ð¸Ð¼ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð¸Ð¼Ð°.
-    setup: ÐÐ°Ð¼ÐµÑˆÑ‚Ð°ÑšÐµ
-    wrong_code: Ð£Ð½ÐµÑÐµÐ½Ð¸ ÐºÐ¾Ð´ Ð½Ð¸Ñ˜Ðµ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð°Ð½! Ð”Ð° Ð»Ð¸ ÑÑƒ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð° Ð½Ð° ÑÐµÑ€Ð²ÐµÑ€Ñƒ Ð¸ Ð½Ð° ÑƒÑ€ÐµÑ’Ð°Ñ˜Ñƒ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð°?
   user_mailer:
     backup_ready:
       explanation: Ð¢Ñ€Ð°Ð¶Ð¸Ð»Ð¸ ÑÑ‚Ðµ Ð¿Ð¾Ñ‚Ð¿ÑƒÐ½Ñƒ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ñƒ ÐºÐ¾Ð¿Ð¸Ñ˜Ñƒ Ð²Ð°ÑˆÐµÐ³ ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½ Ñ€Ð°Ñ‡ÑƒÐ½Ð°. Ð¡Ð¿Ñ€ÐµÐ¼Ð½Ð° Ð·Ð° Ð¿Ñ€ÐµÑƒÐ·Ð¸Ð¼Ð°ÑšÐµ!
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index ebedfb4f944ce47964f4a839bb40ad113a69bc2f..36154b49b4162f5d410d86a5e11318a4c2e53eb9 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -21,7 +21,9 @@ sv:
     federation_hint_html: Med ett konto pÃ¥ %{instance} kommer du att kunna fÃ¶lja personer pÃ¥ alla Mastodon-servers och mer Ã¤n sÃ¥.
     get_apps: Prova en mobilapp
     hosted_on: Mastodon-vÃ¤rd pÃ¥ %{domain}
-    instance_actor_flash: Detta konto Ã¤r en virtuell agent som anvÃ¤nds fÃ¶r att representera servern sjÃ¤lv och inte nÃ¥gon individuell anvÃ¤ndare. Det anvÃ¤nds av sammanslutningsskÃ¤l och ska inte blockeras sÃ¥vitt du inte vill blockera hela instansen, och fÃ¶r detta fall ska domÃ¤nblockering anvÃ¤ndas.
+    instance_actor_flash: 'Detta konto Ã¤r en virtuell agent som anvÃ¤nds fÃ¶r att representera servern sjÃ¤lv och inte nÃ¥gon individuell anvÃ¤ndare. Det anvÃ¤nds av sammanslutningsskÃ¤l och ska inte blockeras sÃ¥vitt du inte vill blockera hela instansen, och fÃ¶r detta fall ska domÃ¤nblockering anvÃ¤ndas.
+
+'
     learn_more: LÃ¤r dig mer
     privacy_policy: Integritetspolicy
     see_whats_happening: Se vad som hÃ¤nder
@@ -41,6 +43,9 @@ sv:
       suspended: 'Ingen data frÃ¥n dessa serverdatorer kommer bearbetas, lagras eller bytas ut vilket omÃ¶jliggÃ¶r kommunikation med anvÃ¤ndare frÃ¥n dessa serverdatorer:'
       suspended_title: AvstÃ¤ngda vÃ¤rddatorer
     unavailable_content_html: Mastodon lÃ¥ter dig se material frÃ¥n, och interagera med, andra anvÃ¤ndare i servernÃ¤tverket. Det Ã¤r undantag som gjorts pÃ¥ denna serverdator.
+    user_count_after:
+      one: anvÃ¤ndare
+      other: anvÃ¤ndare
     user_count_before: Hem till
     what_is_mastodon: Vad Ã¤r Mastodon?
   accounts:
@@ -84,6 +89,7 @@ sv:
       delete: Ta bort
       destroyed_msg: Modereringsnotering borttagen utan problem!
     accounts:
+      add_email_domain_block: Blockera e-postdomÃ¤n
       approve: GodkÃ¤nn
       approve_all: GodkÃ¤nn alla
       are_you_sure: Ã„r du sÃ¤ker?
@@ -164,6 +170,7 @@ sv:
         staff: Personal
         user: AnvÃ¤ndare
       search: SÃ¶k
+      search_same_email_domain: Andra anvÃ¤ndare med samma e-postdomÃ¤n
       search_same_ip: Annan anvÃ¤ndare med samma IP-adress
       shared_inbox_url: Delad inkorg URL
       show:
@@ -185,16 +192,49 @@ sv:
       web: Webb
       whitelisted: Vitlistad
     action_logs:
+      action_types:
+        assigned_to_self_report: Tilldela anmÃ¤lan
+        change_email_user: Ã„ndra e-post fÃ¶r anvÃ¤ndare
+        confirm_user: BekrÃ¤fta anvÃ¤ndare
+        create_account_warning: Skapa varning
+        create_announcement: Skapa ett anslag
+        create_custom_emoji: Skapa egen emoji
+        create_domain_allow: Skapa tillÃ¥ten domÃ¤n
+        create_domain_block: Skapa blockerad domÃ¤n
+        destroy_announcement: Ta bort anslag
+        destroy_custom_emoji: Ta bort egen emoji
+        destroy_domain_allow: Ta bort tillÃ¥ten domÃ¤n
+        destroy_domain_block: Ta bort blockerad domÃ¤n
+        destroy_status: Ta bort status
+        disable_2fa_user: Inaktivera 2FA
+        disable_custom_emoji: Inaktivera egna emojis
+        disable_user: Inaktivera anvÃ¤ndare
+        enable_custom_emoji: Aktivera egna emojis
+        enable_user: Aktivera anvÃ¤ndare
+        memorialize_account: MinnesmÃ¤rk konto
+        promote_user: Befordra anvÃ¤ndare
+        remove_avatar_user: Ta bort avatar
+        reset_password_user: Ã…terstÃ¤ll lÃ¶senord
+        resolve_report: LÃ¶s rapport
+        silence_account: Tysta konto
+        suspend_account: StÃ¤ng av konto
+        unsuspend_account: Ã…teraktivera konto
+        update_announcement: Uppdatera meddelande
+        update_custom_emoji: Uppdatera egna emojis
+        update_domain_block: Uppdatera blockerad domÃ¤n
+        update_status: Uppdatera status
       actions:
         assigned_to_self_report: "%{name} tilldelade anmÃ¤lan %{target} till sig sjÃ¤lv"
         change_email_user: "%{name} bytte e-postadress fÃ¶r anvÃ¤ndare %{target}"
         confirm_user: "%{name} bekrÃ¤ftade e-postadress fÃ¶r anvÃ¤ndare %{target}"
         create_account_warning: "%{name} sÃ¤nde en varning till %{target}"
+        create_announcement: "%{name} skapade nytt meddelande %{target}"
         create_custom_emoji: "%{name} laddade upp ny emoji %{target}"
         create_domain_allow: "%{name} vitlistade domÃ¤n %{target}"
         create_domain_block: "%{name} blockerade domÃ¤n %{target}"
         create_email_domain_block: "%{name} svartlistade e-postdomÃ¤n %{target}"
         demote_user: "%{name} degraderade anvÃ¤ndare %{target}"
+        destroy_announcement: "%{name} raderade meddelanden %{target}"
         destroy_custom_emoji: "%{name} fÃ¶rstÃ¶rde emoji %{target}"
         destroy_domain_allow: "%{name} raderade domÃ¤n %{target} frÃ¥n vitlistan"
         destroy_domain_block: "%{name} avblockerade domÃ¤n %{target}"
@@ -217,8 +257,10 @@ sv:
         unsilence_account: "%{name} Ã¥terljudade %{target}s konto"
         unsuspend_account: "%{name} aktiverade %{target}s konto"
         update_custom_emoji: "%{name} uppdaterade emoji %{target}"
+        update_domain_block: "%{name} uppdaterade blockerad domÃ¤n fÃ¶r %{target}"
         update_status: "%{name} uppdaterade status fÃ¶r %{target}"
       deleted_status: "(raderad status)"
+      empty: Inga loggar hittades.
       title: Revisionslogg
     announcements:
       scheduled_for: Schemalagd fÃ¶r %{time}
@@ -304,12 +346,15 @@ sv:
           silence: Tysta ner
           suspend: Suspendera
         title: Nytt domÃ¤nblock
+      obfuscate: DÃ¶lj domÃ¤nnamn
+      obfuscate_hint: DÃ¶lj domÃ¤nnamnet i listan till viss del, om underrÃ¤ttelser fÃ¶r listan Ã¶ver domÃ¤nbegrÃ¤nsningar aktiverats
       private_comment: Privat kommentar
       private_comment_hint: Kommentar fÃ¶r moderatorer om denna domÃ¤nbegrÃ¤nsning.
       public_comment: Offentlig kommentar
       reject_media: Avvisa mediafiler
       reject_media_hint: Raderar lokalt lagrade mediefiler och fÃ¶rhindrar mÃ¶jligheten att ladda ner nÃ¥got i framtiden. Irrelevant fÃ¶r suspensioner
       severity:
+        silence: tystad
         suspend: avstÃ¤ngd
       show:
         affected_accounts:
@@ -328,28 +373,40 @@ sv:
       destroyed_msg: E-postdomÃ¤n har tagits bort frÃ¥n domÃ¤nblockslistan utan problem
       domain: DomÃ¤n
       empty: FÃ¶r tillfÃ¤llet inga svartlistade mejl.
+      from_html: frÃ¥n %{domain}
       new:
         create: Skapa domÃ¤n
         title: Ny E-postdomÃ¤nblocklistningsinmatning
       title: E-postdomÃ¤nblock
     instances:
       by_domain: DomÃ¤n
+      empty: Inga domÃ¤ner hittades.
       moderation:
         all: Alla
         limited: BegrÃ¤nsad
+        title: Moderering
       private_comment: Privat kommentar
+      public_comment: Offentlig kommentar
       title: KÃ¤nda instanser
+      total_blocked_by_us: Blockerad av oss
+      total_followed_by_them: FÃ¶ljs av dem
+      total_followed_by_us: FÃ¶ljs av oss
     invites:
+      deactivate_all: Inaktivera alla
       filter:
         all: Alla
         available: TillgÃ¤ngliga
         expired: UtgÃ¥ngna
         title: Filtrera
       title: Inbjudningar
+    pending_accounts:
+      title: VÃ¤ntande konton (%{count})
     relays:
       delete: Radera
       disable: Inaktivera
+      disabled: Inaktiverad
       enable: Aktivera
+      enable_hint: NÃ¤r den Ã¤r aktiverad kommer din server att prenumerera pÃ¥ alla publika toots frÃ¥n detta relay, och kommer att bÃ¶rja skicka serverns publika toots till den.
       enabled: Aktivera
       save_and_enable: Spara och aktivera
       status: Status
@@ -361,9 +418,12 @@ sv:
       are_you_sure: Ã„r du sÃ¤ker?
       assign_to_self: Tilldela till mig
       assigned: Tilldelad moderator
+      by_target_domain: DomÃ¤n fÃ¶r rapporterat konto
       comment:
         none: Ingen
       created_at: AnmÃ¤ld
+      forwarded: Vidarebefordrad
+      forwarded_to: Vidarebefordrad till %{domain}
       mark_as_resolved: Markera som lÃ¶st
       mark_as_unresolved: Markera som olÃ¶st
       notes:
@@ -394,10 +454,25 @@ sv:
         email: FÃ¶retag E-post
         username: AnvÃ¤ndarnamn fÃ¶r kontakt
       custom_css:
+        desc_html: Ã„ndra utseendet genom CSS laddat pÃ¥ varje sida
         title: Anpassad CSS
+      default_noindex:
+        desc_html: PÃ¥verkar alla anvÃ¤ndare som inte har Ã¤ndrat denna instÃ¤llning sjÃ¤lva
+        title: Undantag anvÃ¤ndare frÃ¥n sÃ¶kmotorindexering som standard
+      domain_blocks:
+        all: Till alla
+        disabled: FÃ¶r ingen
+        title: Visa domÃ¤n-blockeringar
+        users: FÃ¶r inloggade lokala anvÃ¤ndare
+      domain_blocks_rationale:
+        title: Visa motiv
+      enable_bootstrap_timeline_accounts:
+        title: Aktivera standard fÃ¶ljer fÃ¶r nya anvÃ¤ndare
       hero:
         desc_html: Visas pÃ¥ framsidan. Minst 600x100px rekommenderas. Om inte angiven faller den tillbaka pÃ¥ instansens miniatyrbild
         title: HjÃ¤ltebild
+      mascot:
+        title: Maskot bild
       peers_api_enabled:
         desc_html: DomÃ¤nnamn denna instans har pÃ¥trÃ¤ffat i fediverse
         title: Publicera lista Ã¶ver upptÃ¤ckta instanser
@@ -411,6 +486,9 @@ sv:
         min_invite_role:
           disabled: Ingen
           title: TillÃ¥t inbjudningar av
+        require_invite_text:
+          desc_html: NÃ¤r nyregistrering krÃ¤ver manuellt godkÃ¤nnande, gÃ¶r det obligatoriskt att fylla i text i fÃ¤ltet "VarfÃ¶r vill du gÃ¥ med?"
+          title: KrÃ¤v att nya anvÃ¤ndare fyller i en inbjudningsfÃ¶rfrÃ¥gan
       show_known_fediverse_at_about_page:
         desc_html: NÃ¤r den vÃ¤xlas, kommer toots frÃ¥n hela fediverse visas pÃ¥ fÃ¶rhandsvisning. Annars visas bara lokala toots.
         title: Visa det kÃ¤nda fediverse pÃ¥ tidslinjens fÃ¶rhandsgranskning
@@ -508,6 +586,8 @@ sv:
       email_settings_hint_html: BekrÃ¤ftelsemeddelandet skickades till %{email}. Om den e-postadressen inte stÃ¤mmer sÃ¥ kan du Ã¤ndra den i kontoinstÃ¤llningarna.
     status:
       account_status: Kontostatus
+      redirecting_to: Ditt konto Ã¤r inaktivt eftersom det fÃ¶r nÃ¤rvarande dirigeras om till %{acct}.
+    too_fast: FormulÃ¤ret har skickats fÃ¶r snabbt, fÃ¶rsÃ¶k igen.
   authorize_follow:
     already_following: Du fÃ¶ljer redan detta konto
     already_requested: Du har redan skickat en vÃ¤nfÃ¶rfrÃ¥gan till det kontot
@@ -545,6 +625,8 @@ sv:
     confirm_password: Ange ditt lÃ¶senord fÃ¶r att verifiera din identitet
     proceed: Ta bort konto
     success_msg: Ditt konto har raderats
+    warning:
+      irreversible: Du kan inte Ã¥terstÃ¤lla eller Ã¥teraktivera ditt konto
   domain_validator:
     invalid_domain: Ã¤r inte ett giltigt domÃ¤nnamn
   errors:
@@ -571,6 +653,7 @@ sv:
       request: EfterfrÃ¥ga ditt arkiv
       size: Storlek
     blocks: Du blockerar
+    bookmarks: BokmÃ¤rken
     csv: CSV
     lists: Listor
     mutes: Du tystar
@@ -599,11 +682,17 @@ sv:
     validation_errors:
       one: NÃ¥got Ã¤r inte riktigt rÃ¤tt Ã¤nnu! Kontrollera felet nedan
       other: NÃ¥got Ã¤r inte riktigt rÃ¤tt Ã¤nnu! Kontrollera dom %{count} felen nedan
+  identity_proofs:
+    active: Aktiv
+    inactive: Inaktiv
   imports:
+    errors:
+      over_rows_processing_limit: innehÃ¥ller fler Ã¤n %{count} rader
     preface: Du kan importera data som du exporterat frÃ¥n en annan instans, till exempel en lista Ã¶ver personer du fÃ¶ljer eller blockerar.
     success: Dina uppgifter har laddats upp och kommer nu att behandlas snarast
     types:
       blocking: Lista av blockerade
+      bookmarks: BokmÃ¤rken
       following: Lista av fÃ¶ljare
       muting: Lista av nertystade
     upload: Ladda upp
@@ -639,6 +728,7 @@ sv:
       too_many: Det gÃ¥r inte att bifoga mer Ã¤n 4 filer
   migrations:
     acct: anvÃ¤ndarnamn@domÃ¤n av det nya kontot
+    cancel_explanation: AvstÃ¤ngning av omdirigeringen kommer att Ã¥teraktivera ditt nuvarande konto, men kommer inte att Ã¥terskapa fÃ¶ljare som har flyttats till det kontot.
     incoming_migrations: Flyttar frÃ¥n ett annat konto
     redirected_msg: Ditt konto dirigeras om till %{acct}.
   moderation:
@@ -691,14 +781,17 @@ sv:
     other: Annat
   relationships:
     activity: Kontoaktivitet
+    follow_selected_followers: FÃ¶lj valda personer
     followers: FÃ¶ljare
     following: FÃ¶ljer
+    last_active: Senast aktiv
     status: Kontostatus
   remote_follow:
     acct: Ange ditt anvÃ¤ndarnamn@domÃ¤n du vill fÃ¶lja frÃ¥n
     missing_resource: Det gick inte att hitta den begÃ¤rda omdirigeringsadressen fÃ¶r ditt konto
     proceed: FortsÃ¤tt fÃ¶r att fÃ¶lja
     prompt: 'Du kommer att fÃ¶lja:'
+    reason_html: "<strong>VarfÃ¶r Ã¤r det hÃ¤r steget nÃ¶dvÃ¤ndigt?</strong> <code>%{instance}</code> Ã¤r kanske inte den server du Ã¤r registrerad vid, sÃ¥ vi behÃ¶ver dirigera dig till din hemserver fÃ¶rst."
   sessions:
     activity: Senaste aktivitet
     browser: WebblÃ¤sare
@@ -873,21 +966,14 @@ sv:
     default: Mastodon
     mastodon-light: Mastodon (ljust)
   two_factor_authentication:
-    code_hint: Ange koden som genererats av din autentiseringsapp fÃ¶r att bekrÃ¤fta
-    description_html: Om du aktiverar <strong>tvÃ¥faktorsautentisering</strong> kommer inloggningen krÃ¤va att du har din telefon tillgÃ¤nglig, vilket kommer att generera tokens fÃ¶r dig att ange.
     disable: Inaktivera
-    enable: Aktivera
     enabled: TvÃ¥faktorsautentisering Ã¤r aktiverad
     enabled_success: TvÃ¥faktorsautentisering aktiverad
     generate_recovery_codes: Generera Ã¥terstÃ¤llningskoder
-    instructions_html: "<strong>Skanna den hÃ¤r QR-koden i Google Authenticator eller en liknande TOTP-app pÃ¥ din telefon </strong>. FrÃ¥n och med nu genererar den appen tokens som du mÃ¥ste ange nÃ¤r du loggar in."
     lost_recovery_codes: Ã…terstÃ¤llningskoder tillÃ¥ter dig att fÃ¥ tillgÃ¥ng till ditt konto om du fÃ¶rlorar din telefon. Om du har fÃ¶rlorat dina Ã¥terstÃ¤llningskoder kan du regenerera dem hÃ¤r. Dina gamla Ã¥terstÃ¤llningskoder kommer att ogiltigfÃ¶rklaras.
-    manual_instructions: 'Om du inte kan skanna QR-koden och behÃ¶ver skriva in den manuellt, hÃ¤r Ã¤r den hemliga nyckeln i ren text:'
     recovery_codes: Backup Ã¥terstÃ¤llningskod
     recovery_codes_regenerated: Ã…terstÃ¤llningskoder genererades pÃ¥ nytt
     recovery_instructions_html: Om du nÃ¥gonsin tappar Ã¥tkomst till din telefon kan du anvÃ¤nda nÃ¥gon av Ã¥terstÃ¤llningskoderna nedan fÃ¶r att Ã¥terstÃ¤lla Ã¥tkomst till ditt konto. <strong> HÃ¥ll Ã¥terstÃ¤llningskoderna sÃ¤kra </strong>. Du kan till exempel skriva ut dem och lagra dem med andra viktiga dokument.
-    setup: StÃ¤ll in
-    wrong_code: Den angivna koden var ogiltig! Ã„r servertid och enhetstid korrekt?
   user_mailer:
     backup_ready:
       explanation: Du begÃ¤rde en fullstÃ¤ndig sÃ¤kerhetskopiering av ditt Mastodon-konto. Det Ã¤r nu klart fÃ¶r nedladdning!
@@ -910,7 +996,9 @@ sv:
       tip_mobile_webapp: Om din mobila webblÃ¤sare erbjuder dig att lÃ¤gga till Mastodon pÃ¥ din hemskÃ¤rm kan du fÃ¥ push-aviseringar. Det fungerar som en inbyggd app pÃ¥ mÃ¥nga sÃ¤tt!
       title: VÃ¤lkommen ombord, %{name}!
   users:
+    blocked_email_provider: Denna e-postleverantÃ¶r Ã¤r inte tillÃ¥ten
     invalid_email: E-postadressen Ã¤r ogiltig
+    invalid_email_mx: E-postadressen verkar inte finnas
     invalid_otp_token: Ogiltig tvÃ¥faktorskod
     otp_lost_help_html: Om du fÃ¶rlorat Ã¥tkomst till bÃ¥da kan du komma i kontakt med %{email}
     seamless_external_login: Du Ã¤r inloggad via en extern tjÃ¤nst, sÃ¥ lÃ¶senord och e-postinstÃ¤llningar Ã¤r inte tillgÃ¤ngliga.
diff --git a/config/locales/szl.yml b/config/locales/szl.yml
index 54a411c08de256ba55e5ad2e7a1b139679000ae2..4359f4d610ecfdf2d06ad55c3c3ac15c726ff077 100644
--- a/config/locales/szl.yml
+++ b/config/locales/szl.yml
@@ -10,11 +10,3 @@ szl:
     '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
-  invites:
-    expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index fa4c1a87b6b99007d992890c0f251039ea1c5a40..18a2077150ce8d59762a0d0c1a906b16123b403f 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -34,6 +34,9 @@ ta:
     unavailable_content_description:
       domain: à®µà®´à®™à¯à®•à®¿
       reason: à®•à®¾à®°à®£à®®à¯
+      rejecting_media_title: à®µà®Ÿà®¿à®•à®Ÿà¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®Ÿ à®®à¯€à®Ÿà®¿à®¯à®¾
+      silenced_title: à®…à®£à¯ˆà®•à¯à®•à®ªà®Ÿà¯à®Ÿ à®šà®°à¯à®µà®°à¯à®•à®³à¯
+      suspended_title: à®‡à®Ÿà¯ˆà®¨à¯€à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿ à®šà®°à¯à®µà®°à¯à®•à®³à¯
     user_count_after:
       one: à®ªà®¯à®©à®°à¯
       other: à®ªà®¯à®©à®°à¯à®•à®³à¯
@@ -222,6 +225,7 @@ ta:
       unpublished_msg: à®…à®±à®¿à®µà®¿à®ªà¯à®ªà¯ à®µà¯†à®±à¯à®±à®¿à®•à®°à®®à®¾à®•à®¤à¯ à®¤à®¿à®°à¯à®®à¯à®ªà®ªà¯ à®ªà¯†à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯!
       updated_msg: à®…à®±à®¿à®µà®¿à®ªà¯à®ªà¯ à®µà¯†à®±à¯à®±à®¿à®•à®°à®®à®¾à®•à®¤à¯ à®¤à®¿à®°à¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯!
     custom_emojis:
+      not_permitted: à®‡à®šà¯à®šà¯†à®¯à®²à¯ˆà®šà¯ à®šà¯†à®¯à¯à®¯ à®‰à®™à¯à®•à®³à¯à®•à¯à®•à¯ à®…à®©à¯à®®à®¤à®¿ à®‡à®²à¯à®²à¯ˆ
       uncategorized: à®µà®•à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà®¾à®¤à®µà¯ˆ
       unlist: à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ à®‡à®°à¯à®¨à¯à®¤à¯ à®…à®•à®±à¯à®±à¯à®•
       unlisted: à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à®¿à®Ÿà®ªà¯à®ªà®Ÿà®¾à®¤
@@ -264,12 +268,18 @@ ta:
     site_uploads:
       delete: à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®ªà¯ à®ªà®Ÿà®®à¯ à®…à®´à®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯
       destroyed_msg: à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿ à®µà®²à¯ˆà®¤à®³à®®à¯ à®µà¯†à®±à¯à®±à®¿à®•à¯à®•à®°à®®à®¾à®• à®…à®´à®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯!
+  aliases:
+    empty: à®‰à®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à®¾à®±à¯à®±à¯à®ªà¯à®ªà¯†à®¯à®°à¯à®•à®³à¯ à®à®¤à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ.
   appearance:
     localization:
       body: à®®à®¾à®¸à¯à®Ÿà¯‹à®Ÿà®¾à®©à¯ à®¤à®©à¯à®©à®¾à®°à¯à®µà®²à®°à¯à®•à®³à®¾à®²à¯ à®®à¯Šà®´à®¿à®ªà¯†à®¯à®°à¯à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯.
       guide_link_text: à®…à®©à¯ˆà®µà®°à¯à®®à¯ à®ªà®™à¯à®•à®³à®¿à®•à¯à®•à®²à®¾à®®à¯.
   authorize_follow:
     already_requested: à®‡à®•à¯à®•à®£à®•à¯à®•à¯ˆà®ªà¯ à®ªà®¿à®©à¯à®¤à¯Šà®Ÿà®°à¯à®®à¯ à®•à¯‹à®°à®¿à®•à¯à®•à¯ˆà®¯à¯ˆ à®¨à¯€à®™à¯à®•à®³à¯ à®à®±à¯à®•à®©à®µà¯‡ à®…à®©à¯à®ªà¯à®ªà®¿à®µà®¿à®Ÿà¯à®Ÿà¯€à®°à¯à®•à®³à¯
+  crypto:
+    errors:
+      invalid_key: à®’à®°à¯ à®®à¯à®±à¯ˆà®¯à®¾à®© Ed25519 à®…à®²à¯à®²à®¤à¯ Curve25519 key à®…à®²à¯à®²
+      invalid_signature: à®’à®°à¯ à®®à¯à®±à¯ˆà®¯à®¾à®© Ed25519 à®…à®Ÿà¯ˆà®¯à®¾à®³à®®à¯ à®…à®²à¯à®²
   date:
     formats:
       default: "%b %d, %Y"
@@ -288,17 +298,18 @@ ta:
       empty: à®¤à®Ÿà¯à®ªà¯à®ªà¯à®•à®³à¯ à®à®¤à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ.
   generic:
     delete: à®¨à¯€à®•à¯à®•à¯
-  invites:
-    expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
+  identity_proofs:
+    remove: à®†à®¤à®¾à®°à®¤à¯à®¤à¯ˆà®•à¯ à®•à®£à®•à¯à®•à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®¨à¯€à®•à¯à®•à¯
+    removed: à®†à®¤à®¾à®°à®®à¯ à®•à®£à®•à¯à®•à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®µà¯†à®±à¯à®±à®¿à®•à®°à®®à®¾à®• à®¨à¯€à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯
   media_attachments:
     validations:
       not_ready: à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®®à¯ à®®à¯à®Ÿà®¿à®µà®Ÿà¯ˆà®¯à®¾à®¤ à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯ˆ à®‡à®£à¯ˆà®•à¯à®• à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯. à®šà®¿à®±à®¿à®¤à¯ à®¨à¯‡à®°à®®à¯ à®•à®´à®¿à®¤à¯à®¤à¯ à®®à¯€à®£à¯à®Ÿà¯à®®à¯ à®®à¯à®¯à®±à¯à®šà®¿ à®šà¯†à®¯à¯à®¯à®µà¯à®®à¯!
+  migrations:
+    redirected_msg: à®‰à®™à¯à®•à®³à¯ à®•à®£à®•à¯à®•à¯ à®‡à®ªà¯à®ªà¯Šà®´à¯à®¤à¯ %{acct}-à®‡à®±à¯à®•à¯à®¤à¯ à®¤à®¿à®°à¯à®ªà¯à®ªà®¿à®µà®¿à®Ÿà®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯.
+  move_handler:
+    carry_blocks_over_text: à®‡à®ªà¯à®ªà®¯à®©à®°à¯ %{acct}-à®‡à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®¨à®•à®°à¯à®¨à¯à®¤à¯à®µà®¿à®Ÿà¯à®Ÿà®¾à®°à¯, à®…à®•à¯à®•à®£à®•à¯à®•à¯ˆ à®¨à¯€à®™à¯à®•à®³à¯ à®¤à®Ÿà¯à®¤à¯à®¤à®¿à®°à¯à®¨à¯à®¤à¯€à®°à¯à®•à®³à¯.
+    carry_mutes_over_text: à®‡à®ªà¯à®ªà®¯à®©à®°à¯ %{acct}-à®‡à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®¨à®•à®°à¯à®¨à¯à®¤à¯à®µà®¿à®Ÿà¯à®Ÿà®¾à®°à¯, à®…à®•à¯à®•à®£à®•à¯à®•à¯ˆ à®¨à¯€à®™à¯à®•à®³à¯ à®®à¯à®Ÿà®•à¯à®•à®¿à®¯à®¿à®°à¯à®¨à¯à®¤à¯€à®°à¯à®•à®³à¯.
+    copy_account_note_text: 'à®‡à®ªà¯à®ªà®¯à®©à®°à¯ %{acct}-à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®¨à®•à®°à¯à®¨à¯à®¤à¯à®µà®¿à®Ÿà¯à®Ÿà®¾à®°à¯, à®‡à®µà®°à¯ˆà®ªà¯ à®ªà®±à¯à®±à®¿à®¯ à®‰à®™à¯à®•à®³à¯ à®®à¯à®¨à¯à®¤à¯ˆà®¯ à®•à¯à®±à®¿à®ªà¯à®ªà¯à®•à®³à¯ à®‡à®™à¯à®•à¯‡:'
   notifications:
     email_events: à®®à®¿à®©à¯à®©à®žà¯à®šà®²à¯ à®…à®±à®¿à®µà®¿à®ªà¯à®ªà¯à®•à®³à¯à®•à¯à®•à®¾à®© à®¨à®¿à®•à®´à¯à®µà¯à®•à®³à¯
     email_events_hint: 'à®Žà®¨à¯à®¤ à®¨à®¿à®•à®´à¯à®µà¯à®•à®³à¯à®•à¯à®•à¯ à®…à®±à®¿à®µà®¿à®ªà¯à®ªà¯à®•à®³à¯ˆà®ªà¯ à®ªà¯†à®± à®µà¯‡à®£à¯à®Ÿà¯à®®à¯ à®Žà®©à¯à®±à¯ à®¤à¯‡à®°à¯à®µà¯ à®šà¯†à®¯à¯à®•:'
@@ -311,6 +322,21 @@ ta:
       limit_reached: à®Žà®¤à®¿à®°à¯à®µà®¿à®©à¯ˆà®•à®³à¯à®•à¯à®•à®¾à®© à®‰à®šà¯à®šà®µà®°à®®à¯à®ªà¯ à®Žà®Ÿà¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯
       unrecognized_emoji: à®…à®™à¯à®•à¯€à®•à®°à®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿ à®ˆà®®à¯‹à®œà®¿ à®…à®²à¯à®²
   statuses:
+    attached:
+      audio:
+        one: "%{count} à®’à®²à®¿"
+        other: "%{count} à®’à®²à®¿à®•à®³à¯"
     errors:
       in_reply_not_found: à®¨à¯€à®™à¯à®•à®³à¯ à®®à®±à¯à®®à¯Šà®´à®¿ à®…à®³à®¿à®•à¯à®• à®®à¯à®¯à®²à¯à®®à¯ à®ªà®¤à®¿à®µà¯ à®‡à®°à¯à®ªà¯à®ªà®¤à¯à®ªà¯‹à®²à¯ à®¤à¯†à®°à®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ.
     show_thread: à®¤à¯Šà®Ÿà®°à¯ˆà®•à¯ à®•à®¾à®Ÿà¯à®Ÿà¯
+  user_mailer:
+    sign_in_token:
+      details: 'à®…à®®à¯à®®à¯à®¯à®±à¯à®šà®¿ à®ªà®±à¯à®±à®¿à®¯ à®µà®¿à®µà®°à®™à¯à®•à®³à¯ à®‡à®™à¯à®•à¯‡:'
+      explanation: 'à®…à®™à¯à®•à¯€à®•à®°à®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà®¾à®¤ à®“à®°à¯ IP à®®à¯à®•à®µà®°à®¿à®¯à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®‰à®™à¯à®•à®³à¯ à®•à®£à®•à¯à®•à®¿à®±à¯à®•à¯à®³à¯ à®¨à¯à®´à¯ˆà®¯à¯à®®à¯ à®®à¯à®¯à®±à¯à®šà®¿ à®¨à®Ÿà®¨à¯à®¤à¯à®³à¯à®³à®¤à¯. à®‡à®¤à¯ à®¨à¯€à®™à¯à®•à®³à¯à®¤à®¾à®©à¯ à®Žà®©à¯à®±à®¾à®²à¯, à®¤à®¯à®µà¯à®šà¯†à®¯à¯à®¤à¯ à®ªà®¾à®¤à¯à®•à®¾à®ªà¯à®ªà¯ à®•à¯à®±à®¿à®¯à¯€à®Ÿà¯à®Ÿà¯ˆà®•à¯ à®•à¯€à®´à¯‡ à®‰à®³à¯à®³à®¿à®Ÿà®µà¯à®®à¯:'
+      further_actions: 'à®‡à®¤à¯ à®¨à¯€à®™à¯à®•à®³à¯ à®‡à®²à¯à®²à¯ˆ à®Žà®©à¯à®±à®¾à®²à¯, à®¤à®¯à®µà¯à®šà¯†à®¯à¯à®¤à¯ à®‰à®™à¯à®•à®³à¯ à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ à®®à®¾à®±à¯à®±à®µà¯à®®à¯. à®®à¯‡à®²à¯à®®à¯, à®‰à®™à¯à®•à®³à¯ à®•à®£à®•à¯à®•à®¿à®±à¯à®•à¯ à®‡à®°à®£à¯à®Ÿà¯ à®•à®Ÿà¯à®Ÿ à®…à®™à¯à®•à¯€à®•à®¾à®°à®¤à¯à®¤à¯ˆ (two-factor authentication) à®šà¯†à®¯à®²à®¾à®•à¯à®•à®µà¯à®®à¯. à®…à®¤à¯ˆ à®‡à®™à¯à®•à¯ à®šà¯†à®¯à¯à®¯ à®‡à®¯à®²à¯à®®à¯:'
+      subject: à®‰à®³à¯à®¨à¯à®´à¯ˆà®¯ à®®à¯à®¯à®±à¯à®šà®¿à®¤à¯à®¤à®¤à¯ˆ à®¤à®¯à®µà¯à®šà¯†à®¯à¯à®¤à¯ à®‰à®±à¯à®¤à®¿à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯
+      title: à®‰à®³à¯à®¨à¯à®´à¯ˆà®¯ à®®à¯à®¯à®±à¯à®šà®¿
+  users:
+    generic_access_help_html: à®‰à®™à¯à®•à®³à¯ à®•à®£à®•à¯à®•à¯ˆ à®…à®£à¯à®•à¯à®µà®¤à®¿à®²à¯ à®šà®¿à®•à¯à®•à®²à®¾? à®‰à®¤à®µà®¿à®•à¯à®•à¯ %{email} -à®‰à®Ÿà®©à¯ à®¤à¯Šà®Ÿà®°à¯à®ªà¯ à®•à¯Šà®³à¯à®³à®µà¯à®®à¯
+    invalid_sign_in_token: à®¤à®µà®±à®¾à®© à®ªà®¾à®¤à¯à®•à®¾à®ªà¯à®ªà¯à®•à¯ à®•à¯à®±à®¿à®¯à¯€à®Ÿà¯
+    suspicious_sign_in_confirmation: à®‡à®¤à®±à¯à®•à¯ à®®à¯à®©à¯à®ªà¯ à®‡à®¨à¯à®¤ à®šà®¾à®¤à®©à®¤à¯à®¤à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®¨à¯€à®™à¯à®•à®³à¯ à®‰à®³à¯à®¨à¯à®´à¯ˆà®¨à¯à®¤à®¤à¯à®ªà¯‹à®²à¯ à®¤à¯†à®°à®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ. à®®à¯‡à®²à¯à®®à¯, à®¨à¯€à®™à¯à®•à®³à¯ à®‰à®³à¯à®¨à¯à®´à¯ˆà®¨à¯à®¤à¯‡ à®šà®¿à®² à®•à®¾à®²à®®à¯ à®†à®•à®¿à®±à®¤à¯. à®Žà®©à®µà¯‡, à®‡à®¤à¯ à®¨à¯€à®™à¯à®•à®³à¯à®¤à®¾à®©à®¾ à®Žà®©à¯à®ªà®¤à¯ˆ à®‰à®±à¯à®¤à®¿à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤ à®‰à®™à¯à®•à®³à¯ à®®à®¿à®©à¯à®©à®žà¯à®šà®²à¯ à®®à¯à®•à®µà®°à®¿à®•à¯à®•à¯ à®’à®°à¯ à®ªà®¾à®¤à¯à®•à®¾à®ªà¯à®ªà¯à®•à¯ à®•à¯à®±à®¿à®¯à¯€à®Ÿà¯à®Ÿà¯ˆ à®…à®©à¯à®ªà¯à®ªà¯à®•à®¿à®±à¯‹à®®à¯.
diff --git a/config/locales/tai.yml b/config/locales/tai.yml
index 27e4a8b7837e3101c31790f3460ce65971c0860d..3b22e9999b5641a9985826558ef3f9784a35b169 100644
--- a/config/locales/tai.yml
+++ b/config/locales/tai.yml
@@ -10,11 +10,3 @@ tai:
     '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
-  invites:
-    expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
diff --git a/config/locales/te.yml b/config/locales/te.yml
index 79415b1d16eb7c9776c0619eaebc678310ca87cf..0028ac3253c25ac88d6f580cc5d4bf0cc0ce9123 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -116,11 +116,3 @@ te:
     '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
-  invites:
-    expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
diff --git a/config/locales/th.yml b/config/locales/th.yml
index f5bab5d3040bdf8d059f46c34430768f3979a253..63ce98d4ba23428735550f25cb0f11b43e8c261c 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -35,9 +35,11 @@ th:
     unavailable_content_description:
       domain: à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ
       reason: à¹€à¸«à¸•à¸¸à¸œà¸¥
-      rejecting_media: 'à¹„à¸Ÿà¸¥à¹Œà¸ªà¸·à¹ˆà¸à¸ˆà¸²à¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¹€à¸«à¸¥à¹ˆà¸²à¸™à¸µà¹‰à¸ˆà¸°à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸£à¸±à¸šà¸à¸²à¸£à¸›à¸£à¸°à¸¡à¸§à¸¥à¸œà¸¥à¸«à¸£à¸·à¸à¸ˆà¸±à¸”à¹€à¸à¹‡à¸š à¹à¸¥à¸°à¸ˆà¸°à¹„à¸¡à¹ˆà¹à¸ªà¸”à¸‡à¸ à¸²à¸žà¸‚à¸™à¸²à¸”à¸¢à¹ˆà¸ à¸•à¹‰à¸à¸‡à¸¡à¸µà¸à¸²à¸£à¸„à¸¥à¸´à¸à¹„à¸›à¸¢à¸±à¸‡à¹„à¸Ÿà¸¥à¹Œà¸•à¹‰à¸™à¸‰à¸šà¸±à¸šà¸”à¹‰à¸§à¸¢à¸•à¸™à¹€à¸à¸‡:'
+      rejecting_media: 'à¸ˆà¸°à¹„à¸¡à¹ˆà¸›à¸£à¸°à¸¡à¸§à¸¥à¸œà¸¥à¸«à¸£à¸·à¸à¸ˆà¸±à¸”à¹€à¸à¹‡à¸šà¹„à¸Ÿà¸¥à¹Œà¸ªà¸·à¹ˆà¸à¸ˆà¸²à¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¹€à¸«à¸¥à¹ˆà¸²à¸™à¸µà¹‰ à¹à¸¥à¸°à¸ˆà¸°à¹„à¸¡à¹ˆà¹à¸ªà¸”à¸‡à¸ à¸²à¸žà¸‚à¸™à¸²à¸”à¸¢à¹ˆà¸ à¸•à¹‰à¸à¸‡à¸¡à¸µà¸à¸²à¸£à¸„à¸¥à¸´à¸à¹„à¸›à¸¢à¸±à¸‡à¹„à¸Ÿà¸¥à¹Œà¸•à¹‰à¸™à¸‰à¸šà¸±à¸šà¸”à¹‰à¸§à¸¢à¸•à¸™à¹€à¸à¸‡:'
       rejecting_media_title: à¸ªà¸·à¹ˆà¸à¸—à¸µà¹ˆà¸à¸£à¸à¸‡à¸à¸¢à¸¹à¹ˆ
+      silenced: 'à¸ˆà¸°à¸‹à¹ˆà¸à¸™à¹‚à¸žà¸ªà¸•à¹Œà¸ˆà¸²à¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¹€à¸«à¸¥à¹ˆà¸²à¸™à¸µà¹‰à¹ƒà¸™à¹€à¸ªà¹‰à¸™à¹€à¸§à¸¥à¸²à¸ªà¸²à¸˜à¸²à¸£à¸“à¸°à¹à¸¥à¸°à¸à¸²à¸£à¸ªà¸™à¸—à¸™à¸² à¹à¸¥à¸°à¸ˆà¸°à¹„à¸¡à¹ˆà¸ªà¸£à¹‰à¸²à¸‡à¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™à¸ˆà¸²à¸à¸à¸²à¸£à¹‚à¸•à¹‰à¸•à¸à¸šà¸‚à¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰ à¹€à¸§à¹‰à¸™à¹à¸•à¹ˆà¸„à¸¸à¸“à¸à¸³à¸¥à¸±à¸‡à¸•à¸´à¸”à¸•à¸²à¸¡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰:'
       silenced_title: à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸—à¸µà¹ˆà¹€à¸‡à¸µà¸¢à¸šà¸à¸¢à¸¹à¹ˆ
+      suspended: 'à¸ˆà¸°à¹„à¸¡à¹ˆà¸›à¸£à¸°à¸¡à¸§à¸¥à¸œà¸¥ à¸ˆà¸±à¸”à¹€à¸à¹‡à¸š à¸«à¸£à¸·à¸à¹à¸¥à¸à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸ˆà¸²à¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¹€à¸«à¸¥à¹ˆà¸²à¸™à¸µà¹‰ à¸—à¸³à¹ƒà¸«à¹‰à¸à¸²à¸£à¹‚à¸•à¹‰à¸•à¸à¸šà¸«à¸£à¸·à¸à¸à¸²à¸£à¸ªà¸·à¹ˆà¸à¸ªà¸²à¸£à¹ƒà¸” à¹† à¸à¸±à¸šà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸ˆà¸²à¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¹€à¸«à¸¥à¹ˆà¸²à¸™à¸µà¹‰à¹€à¸›à¹‡à¸™à¹„à¸›à¹„à¸¡à¹ˆà¹„à¸”à¹‰:'
       suspended_title: à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸—à¸µà¹ˆà¸£à¸°à¸‡à¸±à¸šà¸à¸¢à¸¹à¹ˆ
     user_count_after:
       other: à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰
@@ -74,13 +76,14 @@ th:
   admin:
     account_actions:
       action: à¸—à¸³à¸à¸²à¸£à¸à¸£à¸°à¸—à¸³
+      title: à¸—à¸³à¸à¸²à¸£à¸à¸£à¸°à¸—à¸³à¸à¸²à¸£à¸„à¸§à¸šà¸„à¸¸à¸¡ %{acct}
     account_moderation_notes:
       create: à¹€à¸‚à¸µà¸¢à¸™à¸«à¸¡à¸²à¸¢à¹€à¸«à¸•à¸¸
       created_msg: à¸ªà¸£à¹‰à¸²à¸‡à¸«à¸¡à¸²à¸¢à¹€à¸«à¸•à¸¸à¸à¸²à¸£à¸„à¸§à¸šà¸„à¸¸à¸¡à¸ªà¸³à¹€à¸£à¹‡à¸ˆ!
       delete: à¸¥à¸š
       destroyed_msg: à¸—à¸³à¸¥à¸²à¸¢à¸«à¸¡à¸²à¸¢à¹€à¸«à¸•à¸¸à¸à¸²à¸£à¸„à¸§à¸šà¸„à¸¸à¸¡à¸ªà¸³à¹€à¸£à¹‡à¸ˆ!
     accounts:
-      add_email_domain_block: à¸‚à¸¶à¹‰à¸™à¸šà¸±à¸à¸Šà¸µà¸”à¸³à¹‚à¸”à¹€à¸¡à¸™à¸à¸µà¹€à¸¡à¸¥
+      add_email_domain_block: à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™à¸à¸µà¹€à¸¡à¸¥
       approve: à¸à¸™à¸¸à¸¡à¸±à¸•à¸´
       approve_all: à¸à¸™à¸¸à¸¡à¸±à¸•à¸´à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”
       are_you_sure: à¸„à¸¸à¸“à¹à¸™à¹ˆà¹ƒà¸ˆà¸«à¸£à¸·à¸à¹„à¸¡à¹ˆ?
@@ -96,22 +99,24 @@ th:
       confirm: à¸¢à¸·à¸™à¸¢à¸±à¸™
       confirmed: à¸¢à¸·à¸™à¸¢à¸±à¸™à¹à¸¥à¹‰à¸§
       confirming: à¸à¸³à¸¥à¸±à¸‡à¸¢à¸·à¸™à¸¢à¸±à¸™
+      delete: à¸¥à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥
       deleted: à¸¥à¸šà¹à¸¥à¹‰à¸§
       demote: à¸¥à¸”à¸‚à¸±à¹‰à¸™
-      disable: à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™
+      disable: à¸à¸²à¸¢à¸±à¸”
       disable_two_factor_authentication: à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ 2FA
-      disabled: à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸¢à¸¹à¹ˆ
+      disabled: à¸à¸²à¸¢à¸±à¸”à¸à¸¢à¸¹à¹ˆ
       display_name: à¸Šà¸·à¹ˆà¸à¸—à¸µà¹ˆà¹à¸ªà¸”à¸‡
       domain: à¹‚à¸”à¹€à¸¡à¸™
       edit: à¹à¸à¹‰à¹„à¸‚
       email: à¸à¸µà¹€à¸¡à¸¥
       email_status: à¸ªà¸–à¸²à¸™à¸°à¸à¸µà¹€à¸¡à¸¥
-      enable: à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™
+      enable: à¹€à¸¥à¸´à¸à¸à¸²à¸¢à¸±à¸”
       enabled: à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸¢à¸¹à¹ˆ
       followers: à¸œà¸¹à¹‰à¸•à¸´à¸”à¸•à¸²à¸¡
       follows: à¸à¸²à¸£à¸•à¸´à¸”à¸•à¸²à¸¡
       header: à¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§
       inbox_url: URL à¸à¸¥à¹ˆà¸à¸‡à¸‚à¸²à¹€à¸‚à¹‰à¸²
+      invite_request_text: à¹€à¸«à¸•à¸¸à¸œà¸¥à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¹ˆà¸§à¸¡
       invited_by: à¹€à¸Šà¸´à¸à¹‚à¸”à¸¢
       ip: IP
       joined: à¹€à¸‚à¹‰à¸²à¸£à¹ˆà¸§à¸¡à¹€à¸¡à¸·à¹ˆà¸
@@ -123,6 +128,7 @@ th:
       login_status: à¸ªà¸–à¸²à¸™à¸°à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸ªà¸¹à¹ˆà¸£à¸°à¸šà¸š
       media_attachments: à¹„à¸Ÿà¸¥à¹Œà¹à¸™à¸šà¸ªà¸·à¹ˆà¸
       memorialize: à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹€à¸›à¹‡à¸™à¸à¸™à¸¸à¸ªà¸£à¸“à¹Œ
+      memorialized_msg: à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™ %{username} à¹€à¸›à¹‡à¸™à¸šà¸±à¸à¸Šà¸µà¸à¸™à¸¸à¸ªà¸£à¸“à¹Œà¸ªà¸³à¹€à¸£à¹‡à¸ˆ
       moderation:
         active: à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸¢à¸¹à¹ˆ
         all: à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”
@@ -133,6 +139,7 @@ th:
       moderation_notes: à¸«à¸¡à¸²à¸¢à¹€à¸«à¸•à¸¸à¸à¸²à¸£à¸„à¸§à¸šà¸„à¸¸à¸¡
       most_recent_activity: à¸à¸´à¸ˆà¸à¸£à¸£à¸¡à¸¥à¹ˆà¸²à¸ªà¸¸à¸”
       most_recent_ip: IP à¸¥à¹ˆà¸²à¸ªà¸¸à¸”
+      no_limits_imposed: à¹„à¸¡à¹ˆà¸¡à¸µà¸‚à¸µà¸”à¸ˆà¸³à¸à¸±à¸”à¸—à¸µà¹ˆà¸à¸³à¸«à¸™à¸”
       not_subscribed: à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸šà¸à¸à¸£à¸±à¸š
       pending: à¸à¸²à¸£à¸•à¸£à¸§à¸ˆà¸—à¸²à¸™à¸—à¸µà¹ˆà¸£à¸à¸”à¸³à¹€à¸™à¸´à¸™à¸à¸²à¸£
       perform_full_suspension: à¸£à¸°à¸‡à¸±à¸š
@@ -145,6 +152,8 @@ th:
       reject_all: à¸›à¸à¸´à¹€à¸ªà¸˜à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”
       remove_avatar: à¹€à¸à¸²à¸ à¸²à¸žà¸›à¸£à¸°à¸ˆà¸³à¸•à¸±à¸§à¸à¸à¸
       remove_header: à¹€à¸à¸²à¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§à¸à¸à¸
+      removed_avatar_msg: à¹€à¸à¸²à¸ à¸²à¸žà¸›à¸£à¸°à¸ˆà¸³à¸•à¸±à¸§à¸‚à¸à¸‡ %{username} à¸à¸à¸à¸ªà¸³à¹€à¸£à¹‡à¸ˆ
+      removed_header_msg: à¹€à¸à¸²à¸ à¸²à¸žà¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§à¸‚à¸à¸‡ %{username} à¸à¸à¸à¸ªà¸³à¹€à¸£à¹‡à¸ˆ
       resend_confirmation:
         already_confirmed: à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸™à¸µà¹‰à¹„à¸”à¹‰à¸£à¸±à¸šà¸à¸²à¸£à¸¢à¸·à¸™à¸¢à¸±à¸™à¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§
         send: à¸ªà¹ˆà¸‡à¸à¸µà¹€à¸¡à¸¥à¸¢à¸·à¸™à¸¢à¸±à¸™à¸à¸µà¸à¸„à¸£à¸±à¹‰à¸‡
@@ -164,8 +173,8 @@ th:
       show:
         created_reports: à¸£à¸²à¸¢à¸‡à¸²à¸™à¸—à¸µà¹ˆà¸ªà¸£à¹‰à¸²à¸‡
         targeted_reports: à¸£à¸²à¸¢à¸‡à¸²à¸™à¹‚à¸”à¸¢à¸œà¸¹à¹‰à¸à¸·à¹ˆà¸™
-      silence: à¸—à¸³à¹ƒà¸«à¹‰à¹€à¸‡à¸µà¸¢à¸š
-      silenced: à¹€à¸‡à¸µà¸¢à¸šà¸à¸¢à¸¹à¹ˆ
+      silence: à¸ˆà¸³à¸à¸±à¸”
+      silenced: à¸ˆà¸³à¸à¸±à¸”à¸à¸¢à¸¹à¹ˆ
       statuses: à¸ªà¸–à¸²à¸™à¸°
       subscribe: à¸šà¸à¸à¸£à¸±à¸š
       suspended: à¸£à¸°à¸‡à¸±à¸šà¸à¸¢à¸¹à¹ˆ
@@ -175,10 +184,11 @@ th:
       undo_silenced: à¹€à¸¥à¸´à¸à¸—à¸³à¸à¸²à¸£à¸—à¸³à¹ƒà¸«à¹‰à¹€à¸‡à¸µà¸¢à¸š
       undo_suspension: à¹€à¸¥à¸´à¸à¸—à¸³à¸à¸²à¸£à¸£à¸°à¸‡à¸±à¸š
       unsubscribe: à¹€à¸¥à¸´à¸à¸šà¸à¸à¸£à¸±à¸š
+      unsuspended_msg: à¹€à¸¥à¸´à¸à¸£à¸°à¸‡à¸±à¸šà¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡ %{username} à¸ªà¸³à¹€à¸£à¹‡à¸ˆ
       username: à¸Šà¸·à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰
       warn: à¹€à¸•à¸·à¸à¸™
       web: à¹€à¸§à¹‡à¸š
-      whitelisted: à¸‚à¸¶à¹‰à¸™à¸šà¸±à¸à¸Šà¸µà¸‚à¸²à¸§à¹à¸¥à¹‰à¸§
+      whitelisted: à¸à¸™à¸¸à¸à¸²à¸•à¸à¸²à¸£à¸•à¸´à¸”à¸•à¹ˆà¸à¸à¸±à¸šà¸ à¸²à¸¢à¸™à¸à¸à¹à¸¥à¹‰à¸§
     action_logs:
       action_types:
         assigned_to_self_report: à¸¡à¸à¸šà¸«à¸¡à¸²à¸¢à¸£à¸²à¸¢à¸‡à¸²à¸™
@@ -190,12 +200,14 @@ th:
         create_domain_allow: à¸ªà¸£à¹‰à¸²à¸‡à¸à¸²à¸£à¸à¸™à¸¸à¸à¸²à¸•à¹‚à¸”à¹€à¸¡à¸™
         create_domain_block: à¸ªà¸£à¹‰à¸²à¸‡à¸à¸²à¸£à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™
         create_email_domain_block: à¸ªà¸£à¹‰à¸²à¸‡à¸à¸²à¸£à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™à¸à¸µà¹€à¸¡à¸¥
+        create_ip_block: à¸ªà¸£à¹‰à¸²à¸‡à¸à¸Ž IP
         demote_user: à¸¥à¸”à¸‚à¸±à¹‰à¸™à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰
         destroy_announcement: à¸¥à¸šà¸›à¸£à¸°à¸à¸²à¸¨
         destroy_custom_emoji: à¸¥à¸šà¸à¸µà¹‚à¸¡à¸ˆà¸´à¸—à¸µà¹ˆà¸à¸³à¸«à¸™à¸”à¹€à¸à¸‡
         destroy_domain_allow: à¸¥à¸šà¸à¸²à¸£à¸à¸™à¸¸à¸à¸²à¸•à¹‚à¸”à¹€à¸¡à¸™
         destroy_domain_block: à¸¥à¸šà¸à¸²à¸£à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™
         destroy_email_domain_block: à¸¥à¸šà¸à¸²à¸£à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™à¸à¸µà¹€à¸¡à¸¥
+        destroy_ip_block: à¸¥à¸šà¸à¸Ž IP
         destroy_status: à¸¥à¸šà¸ªà¸–à¸²à¸™à¸°
         disable_2fa_user: à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ 2FA
         disable_custom_emoji: à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸µà¹‚à¸¡à¸ˆà¸´à¸—à¸µà¹ˆà¸à¸³à¸«à¸™à¸”à¹€à¸à¸‡
@@ -208,29 +220,35 @@ th:
         reopen_report: à¹€à¸›à¸´à¸”à¸£à¸²à¸¢à¸‡à¸²à¸™à¹ƒà¸«à¸¡à¹ˆ
         reset_password_user: à¸•à¸±à¹‰à¸‡à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹ƒà¸«à¸¡à¹ˆ
         resolve_report: à¹à¸à¹‰à¸›à¸±à¸à¸«à¸²à¸£à¸²à¸¢à¸‡à¸²à¸™
+        sensitive_account: à¸—à¸³à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸«à¸¡à¸²à¸¢à¸ªà¸·à¹ˆà¸à¹ƒà¸™à¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡à¸„à¸¸à¸“à¸§à¹ˆà¸²à¸¥à¸°à¹€à¸à¸µà¸¢à¸”à¸à¹ˆà¸à¸™
         silence_account: à¸—à¸³à¹ƒà¸«à¹‰à¸šà¸±à¸à¸Šà¸µà¹€à¸‡à¸µà¸¢à¸š
         suspend_account: à¸£à¸°à¸‡à¸±à¸šà¸šà¸±à¸à¸Šà¸µ
         unassigned_report: à¹€à¸¥à¸´à¸à¸¡à¸à¸šà¸«à¸¡à¸²à¸¢à¸£à¸²à¸¢à¸‡à¸²à¸™
+        unsensitive_account: à¹€à¸¥à¸´à¸à¸—à¸³à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸«à¸¡à¸²à¸¢à¸ªà¸·à¹ˆà¸à¹ƒà¸™à¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡à¸„à¸¸à¸“à¸§à¹ˆà¸²à¸¥à¸°à¹€à¸à¸µà¸¢à¸”à¸à¹ˆà¸à¸™
         unsilence_account: à¹€à¸¥à¸´à¸à¸—à¸³à¹ƒà¸«à¹‰à¸šà¸±à¸à¸Šà¸µà¹€à¸‡à¸µà¸¢à¸š
         unsuspend_account: à¹€à¸¥à¸´à¸à¸£à¸°à¸‡à¸±à¸šà¸šà¸±à¸à¸Šà¸µ
         update_announcement: à¸à¸±à¸›à¹€à¸”à¸•à¸›à¸£à¸°à¸à¸²à¸¨
         update_custom_emoji: à¸à¸±à¸›à¹€à¸”à¸•à¸à¸µà¹‚à¸¡à¸ˆà¸´à¸—à¸µà¹ˆà¸à¸³à¸«à¸™à¸”à¹€à¸à¸‡
+        update_domain_block: à¸à¸±à¸›à¹€à¸”à¸•à¸à¸²à¸£à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™
         update_status: à¸à¸±à¸›à¹€à¸”à¸•à¸ªà¸–à¸²à¸™à¸°
       actions:
+        assigned_to_self_report: "%{name} à¹„à¸”à¹‰à¸¡à¸à¸šà¸«à¸¡à¸²à¸¢à¸£à¸²à¸¢à¸‡à¸²à¸™ %{target} à¹ƒà¸«à¹‰à¸à¸±à¸šà¸•à¸™à¹€à¸à¸‡"
         change_email_user: "%{name} à¹„à¸”à¹‰à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¸‚à¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰ %{target}"
         confirm_user: "%{name} à¹„à¸”à¹‰à¸¢à¸·à¸™à¸¢à¸±à¸™à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¸‚à¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰ %{target}"
         create_account_warning: "%{name} à¹„à¸”à¹‰à¸ªà¹ˆà¸‡à¸„à¸³à¹€à¸•à¸·à¸à¸™à¹„à¸›à¸¢à¸±à¸‡ %{target}"
         create_announcement: "%{name} à¹„à¸”à¹‰à¸ªà¸£à¹‰à¸²à¸‡à¸›à¸£à¸°à¸à¸²à¸¨à¹ƒà¸«à¸¡à¹ˆ %{target}"
         create_custom_emoji: "%{name} à¹„à¸”à¹‰à¸à¸±à¸›à¹‚à¸«à¸¥à¸”à¸à¸µà¹‚à¸¡à¸ˆà¸´à¹ƒà¸«à¸¡à¹ˆ %{target}"
-        create_domain_allow: "%{name} à¹„à¸”à¹‰à¸‚à¸¶à¹‰à¸™à¸šà¸±à¸à¸Šà¸µà¸‚à¸²à¸§à¹‚à¸”à¹€à¸¡à¸™ %{target}"
+        create_domain_allow: "%{name} à¹„à¸”à¹‰à¸à¸™à¸¸à¸à¸²à¸•à¸à¸²à¸£à¸•à¸´à¸”à¸•à¹ˆà¸à¸à¸±à¸šà¸ à¸²à¸¢à¸™à¸à¸à¸à¸±à¸šà¹‚à¸”à¹€à¸¡à¸™ %{target}"
         create_domain_block: "%{name} à¹„à¸”à¹‰à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™ %{target}"
-        create_email_domain_block: "%{name} à¹„à¸”à¹‰à¸‚à¸¶à¹‰à¸™à¸šà¸±à¸à¸Šà¸µà¸”à¸³à¹‚à¸”à¹€à¸¡à¸™à¸à¸µà¹€à¸¡à¸¥ %{target}"
+        create_email_domain_block: "%{name} à¹„à¸”à¹‰à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™à¸à¸µà¹€à¸¡à¸¥ %{target}"
+        create_ip_block: "%{name} à¹„à¸”à¹‰à¸ªà¸£à¹‰à¸²à¸‡à¸à¸Žà¸ªà¸³à¸«à¸£à¸±à¸š IP %{target}"
         demote_user: "%{name} à¹„à¸”à¹‰à¸¥à¸”à¸‚à¸±à¹‰à¸™à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰ %{target}"
         destroy_announcement: "%{name} à¹„à¸”à¹‰à¸¥à¸šà¸›à¸£à¸°à¸à¸²à¸¨ %{target}"
         destroy_custom_emoji: "%{name} à¹„à¸”à¹‰à¸—à¸³à¸¥à¸²à¸¢à¸à¸µà¹‚à¸¡à¸ˆà¸´ %{target}"
-        destroy_domain_allow: "%{name} à¹„à¸”à¹‰à¹€à¸à¸²à¹‚à¸”à¹€à¸¡à¸™ %{target} à¸à¸à¸à¸ˆà¸²à¸à¸šà¸±à¸à¸Šà¸µà¸‚à¸²à¸§"
+        destroy_domain_allow: "%{name} à¹„à¸”à¹‰à¹„à¸¡à¹ˆà¸à¸™à¸¸à¸à¸²à¸•à¸à¸²à¸£à¸•à¸´à¸”à¸•à¹ˆà¸à¸à¸±à¸šà¸ à¸²à¸¢à¸™à¸à¸à¸à¸±à¸šà¹‚à¸”à¹€à¸¡à¸™ %{target}"
         destroy_domain_block: "%{name} à¹„à¸”à¹‰à¹€à¸¥à¸´à¸à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™ %{target}"
-        destroy_email_domain_block: "%{name} à¹„à¸”à¹‰à¸‚à¸¶à¹‰à¸™à¸šà¸±à¸à¸Šà¸µà¸‚à¸²à¸§à¹‚à¸”à¹€à¸¡à¸™à¸à¸µà¹€à¸¡à¸¥ %{target}"
+        destroy_email_domain_block: "%{name} à¹„à¸”à¹‰à¹€à¸¥à¸´à¸à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™à¸à¸µà¹€à¸¡à¸¥ %{target}"
+        destroy_ip_block: "%{name} à¹„à¸”à¹‰à¸¥à¸šà¸à¸Žà¸ªà¸³à¸«à¸£à¸±à¸š IP %{target}"
         destroy_status: "%{name} à¹„à¸”à¹‰à¹€à¸à¸²à¸ªà¸–à¸²à¸™à¸°à¹‚à¸”à¸¢ %{target} à¸à¸à¸"
         disable_2fa_user: "%{name} à¹„à¸”à¹‰à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸„à¸§à¸²à¸¡à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¸ªà¸à¸‡à¸›à¸±à¸ˆà¸ˆà¸±à¸¢à¸ªà¸³à¸«à¸£à¸±à¸šà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰ %{target}"
         disable_custom_emoji: "%{name} à¹„à¸”à¹‰à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸µà¹‚à¸¡à¸ˆà¸´ %{target}"
@@ -241,14 +259,18 @@ th:
         promote_user: "%{name} à¹„à¸”à¹‰à¹€à¸¥à¸·à¹ˆà¸à¸™à¸‚à¸±à¹‰à¸™à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰ %{target}"
         remove_avatar_user: "%{name} à¹„à¸”à¹‰à¹€à¸à¸²à¸ à¸²à¸žà¸›à¸£à¸°à¸ˆà¸³à¸•à¸±à¸§à¸‚à¸à¸‡ %{target} à¸à¸à¸"
         reopen_report: "%{name} à¹„à¸”à¹‰à¹€à¸›à¸´à¸”à¸£à¸²à¸¢à¸‡à¸²à¸™ %{target} à¹ƒà¸«à¸¡à¹ˆ"
+        reset_password_user: "%{name} à¹„à¸”à¹‰à¸•à¸±à¹‰à¸‡à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‚à¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰ %{target} à¹ƒà¸«à¸¡à¹ˆ"
         resolve_report: "%{name} à¹„à¸”à¹‰à¹à¸à¹‰à¸›à¸±à¸à¸«à¸²à¸£à¸²à¸¢à¸‡à¸²à¸™ %{target}"
+        sensitive_account: "%{name} à¹„à¸”à¹‰à¸—à¸³à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸«à¸¡à¸²à¸¢à¸ªà¸·à¹ˆà¸à¸‚à¸à¸‡ %{target} à¸§à¹ˆà¸²à¸¥à¸°à¹€à¸à¸µà¸¢à¸”à¸à¹ˆà¸à¸™"
         silence_account: "%{name} à¹„à¸”à¹‰à¸—à¸³à¹ƒà¸«à¹‰à¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡ %{target} à¹€à¸‡à¸µà¸¢à¸š"
         suspend_account: "%{name} à¹„à¸”à¹‰à¸£à¸°à¸‡à¸±à¸šà¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡ %{target}"
         unassigned_report: "%{name} à¹„à¸”à¹‰à¹€à¸¥à¸´à¸à¸¡à¸à¸šà¸«à¸¡à¸²à¸¢à¸£à¸²à¸¢à¸‡à¸²à¸™ %{target}"
+        unsensitive_account: "%{name} à¹„à¸”à¹‰à¹€à¸¥à¸´à¸à¸—à¸³à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸«à¸¡à¸²à¸¢à¸ªà¸·à¹ˆà¸à¸‚à¸à¸‡ %{target} à¸§à¹ˆà¸²à¸¥à¸°à¹€à¸à¸µà¸¢à¸”à¸à¹ˆà¸à¸™"
         unsilence_account: "%{name} à¹„à¸”à¹‰à¹€à¸¥à¸´à¸à¸—à¸³à¹ƒà¸«à¹‰à¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡ %{target} à¹€à¸‡à¸µà¸¢à¸š"
         unsuspend_account: "%{name} à¹„à¸”à¹‰à¹€à¸¥à¸´à¸à¸£à¸°à¸‡à¸±à¸šà¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡ %{target}"
         update_announcement: "%{name} à¹„à¸”à¹‰à¸à¸±à¸›à¹€à¸”à¸•à¸›à¸£à¸°à¸à¸²à¸¨ %{target}"
         update_custom_emoji: "%{name} à¹„à¸”à¹‰à¸à¸±à¸›à¹€à¸”à¸•à¸à¸µà¹‚à¸¡à¸ˆà¸´ %{target}"
+        update_domain_block: "%{name} à¹„à¸”à¹‰à¸à¸±à¸›à¹€à¸”à¸•à¸à¸²à¸£à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™à¸ªà¸³à¸«à¸£à¸±à¸š %{target}"
         update_status: "%{name} à¹„à¸”à¹‰à¸à¸±à¸›à¹€à¸”à¸•à¸ªà¸–à¸²à¸™à¸°à¹‚à¸”à¸¢ %{target}"
       deleted_status: "(à¸ªà¸–à¸²à¸™à¸°à¸—à¸µà¹ˆà¸¥à¸šà¹à¸¥à¹‰à¸§)"
       empty: à¹„à¸¡à¹ˆà¸žà¸šà¸£à¸²à¸¢à¸à¸²à¸£à¸šà¸±à¸™à¸—à¸¶à¸
@@ -273,7 +295,9 @@ th:
     custom_emojis:
       assign_category: à¸à¸³à¸«à¸™à¸”à¸«à¸¡à¸§à¸”à¸«à¸¡à¸¹à¹ˆ
       by_domain: à¹‚à¸”à¹€à¸¡à¸™
+      copied_msg: à¸ªà¸£à¹‰à¸²à¸‡à¸ªà¸³à¹€à¸™à¸²à¸‚à¸à¸‡à¸à¸µà¹‚à¸¡à¸ˆà¸´à¹ƒà¸™à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸ªà¸³à¹€à¸£à¹‡à¸ˆ
       copy: à¸„à¸±à¸”à¸¥à¸à¸
+      copy_failed_msg: à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸ªà¸£à¹‰à¸²à¸‡à¸ªà¸³à¹€à¸™à¸²à¸‚à¸à¸‡à¸à¸µà¹‚à¸¡à¸ˆà¸´à¸™à¸±à¹‰à¸™à¹ƒà¸™à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ
       create_new_category: à¸ªà¸£à¹‰à¸²à¸‡à¸«à¸¡à¸§à¸”à¸«à¸¡à¸¹à¹ˆà¹ƒà¸«à¸¡à¹ˆ
       created_msg: à¸ªà¸£à¹‰à¸²à¸‡à¸à¸µà¹‚à¸¡à¸ˆà¸´à¸ªà¸³à¹€à¸£à¹‡à¸ˆ!
       delete: à¸¥à¸š
@@ -327,12 +351,12 @@ th:
       week_interactions: à¸à¸²à¸£à¹‚à¸•à¹‰à¸•à¸à¸šà¹ƒà¸™à¸ªà¸±à¸›à¸”à¸²à¸«à¹Œà¸™à¸µà¹‰
       week_users_active: à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸ªà¸±à¸›à¸”à¸²à¸«à¹Œà¸™à¸µà¹‰
       week_users_new: à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¹ƒà¸™à¸ªà¸±à¸›à¸”à¸²à¸«à¹Œà¸™à¸µà¹‰
-      whitelist_mode: à¹‚à¸«à¸¡à¸”à¸šà¸±à¸à¸Šà¸µà¸‚à¸²à¸§
+      whitelist_mode: à¹‚à¸«à¸¡à¸”à¸à¸²à¸£à¸•à¸´à¸”à¸•à¹ˆà¸à¸à¸±à¸šà¸ à¸²à¸¢à¸™à¸à¸à¹à¸šà¸šà¸ˆà¸³à¸à¸±à¸”
     domain_allows:
-      add_new: à¸‚à¸¶à¹‰à¸™à¸šà¸±à¸à¸Šà¸µà¸‚à¸²à¸§à¹‚à¸”à¹€à¸¡à¸™
-      created_msg: à¸‚à¸¶à¹‰à¸™à¸šà¸±à¸à¸Šà¸µà¸‚à¸²à¸§à¹‚à¸”à¹€à¸¡à¸™à¸ªà¸³à¹€à¸£à¹‡à¸ˆ
-      destroyed_msg: à¹€à¸à¸²à¹‚à¸”à¹€à¸¡à¸™à¸à¸à¸à¸ˆà¸²à¸à¸šà¸±à¸à¸Šà¸µà¸‚à¸²à¸§à¹à¸¥à¹‰à¸§
-      undo: à¹€à¸à¸²à¸à¸à¸à¸ˆà¸²à¸à¸šà¸±à¸à¸Šà¸µà¸‚à¸²à¸§
+      add_new: à¸à¸™à¸¸à¸à¸²à¸•à¸à¸²à¸£à¸•à¸´à¸”à¸•à¹ˆà¸à¸à¸±à¸šà¸ à¸²à¸¢à¸™à¸à¸à¸à¸±à¸šà¹‚à¸”à¹€à¸¡à¸™
+      created_msg: à¸à¸™à¸¸à¸à¸²à¸•à¸à¸²à¸£à¸•à¸´à¸”à¸•à¹ˆà¸à¸à¸±à¸šà¸ à¸²à¸¢à¸™à¸à¸à¸à¸±à¸šà¹‚à¸”à¹€à¸¡à¸™à¸ªà¸³à¹€à¸£à¹‡à¸ˆ
+      destroyed_msg: à¹„à¸¡à¹ˆà¸à¸™à¸¸à¸à¸²à¸•à¸à¸²à¸£à¸•à¸´à¸”à¸•à¹ˆà¸à¸à¸±à¸šà¸ à¸²à¸¢à¸™à¸à¸à¸à¸±à¸šà¹‚à¸”à¹€à¸¡à¸™à¹à¸¥à¹‰à¸§
+      undo: à¹„à¸¡à¹ˆà¸à¸™à¸¸à¸à¸²à¸•à¸à¸²à¸£à¸•à¸´à¸”à¸•à¹ˆà¸à¸à¸±à¸šà¸ à¸²à¸¢à¸™à¸à¸à¸à¸±à¸šà¹‚à¸”à¹€à¸¡à¸™
     domain_blocks:
       add_new: à¹€à¸žà¸´à¹ˆà¸¡à¸à¸²à¸£à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™à¹ƒà¸«à¸¡à¹ˆ
       created_msg: à¸à¸³à¸¥à¸±à¸‡à¸›à¸£à¸°à¸¡à¸§à¸¥à¸œà¸¥à¸à¸²à¸£à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™
@@ -353,6 +377,8 @@ th:
       reject_media: à¸›à¸à¸´à¹€à¸ªà¸˜à¹„à¸Ÿà¸¥à¹Œà¸ªà¸·à¹ˆà¸
       reject_media_hint: à¹€à¸à¸²à¹„à¸Ÿà¸¥à¹Œà¸ªà¸·à¹ˆà¸à¸—à¸µà¹ˆà¸ˆà¸±à¸”à¹€à¸à¹‡à¸šà¹„à¸§à¹‰à¹ƒà¸™à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸à¸à¸à¹à¸¥à¸°à¸›à¸à¸´à¹€à¸ªà¸˜à¸—à¸µà¹ˆà¸ˆà¸°à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œà¹ƒà¸” à¹† à¹ƒà¸™à¸à¸™à¸²à¸„à¸• à¹„à¸¡à¹ˆà¹€à¸à¸µà¹ˆà¸¢à¸§à¸‚à¹‰à¸à¸‡à¸à¸±à¸šà¸à¸²à¸£à¸£à¸°à¸‡à¸±à¸š
       reject_reports: à¸›à¸à¸´à¹€à¸ªà¸˜à¸£à¸²à¸¢à¸‡à¸²à¸™
+      rejecting_media: à¸à¸³à¸¥à¸±à¸‡à¸›à¸à¸´à¹€à¸ªà¸˜à¹„à¸Ÿà¸¥à¹Œà¸ªà¸·à¹ˆà¸
+      rejecting_reports: à¸à¸³à¸¥à¸±à¸‡à¸›à¸à¸´à¹€à¸ªà¸˜à¸£à¸²à¸¢à¸‡à¸²à¸™
       severity:
         silence: à¹€à¸‡à¸µà¸¢à¸šà¸à¸¢à¸¹à¹ˆ
         suspend: à¸£à¸°à¸‡à¸±à¸šà¸à¸¢à¸¹à¹ˆ
@@ -368,18 +394,19 @@ th:
       view: à¸”à¸¹à¸à¸²à¸£à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™
     email_domain_blocks:
       add_new: à¹€à¸žà¸´à¹ˆà¸¡à¹ƒà¸«à¸¡à¹ˆ
-      created_msg: à¹€à¸žà¸´à¹ˆà¸¡à¹‚à¸”à¹€à¸¡à¸™à¸à¸µà¹€à¸¡à¸¥à¹€à¸›à¹‡à¸™à¸šà¸±à¸à¸Šà¸µà¸”à¸³à¸ªà¸³à¹€à¸£à¹‡à¸ˆ
+      created_msg: à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™à¸à¸µà¹€à¸¡à¸¥à¸ªà¸³à¹€à¸£à¹‡à¸ˆ
       delete: à¸¥à¸š
-      destroyed_msg: à¸¥à¸šà¹‚à¸”à¹€à¸¡à¸™à¸à¸µà¹€à¸¡à¸¥à¸à¸à¸à¸ˆà¸²à¸à¸šà¸±à¸à¸Šà¸µà¸”à¸³à¸ªà¸³à¹€à¸£à¹‡à¸ˆ
+      destroyed_msg: à¹€à¸¥à¸´à¸à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™à¸à¸µà¹€à¸¡à¸¥à¸ªà¸³à¹€à¸£à¹‡à¸ˆ
       domain: à¹‚à¸”à¹€à¸¡à¸™
-      empty: à¹„à¸¡à¹ˆà¸¡à¸µà¹‚à¸”à¹€à¸¡à¸™à¸à¸µà¹€à¸¡à¸¥à¸—à¸µà¹ˆà¸‚à¸¶à¹‰à¸™à¸šà¸±à¸à¸Šà¸µà¸”à¸³à¸à¸¢à¸¹à¹ˆ
+      empty: à¹„à¸¡à¹ˆà¸¡à¸µà¹‚à¸”à¹€à¸¡à¸™à¸à¸µà¹€à¸¡à¸¥à¸—à¸µà¹ˆà¸›à¸´à¸”à¸à¸±à¹‰à¸™à¸à¸¢à¸¹à¹ˆ
       from_html: à¸ˆà¸²à¸ %{domain}
       new:
         create: à¹€à¸žà¸´à¹ˆà¸¡à¹‚à¸”à¹€à¸¡à¸™
-        title: à¸£à¸²à¸¢à¸à¸²à¸£à¸šà¸±à¸à¸Šà¸µà¸”à¸³à¸à¸µà¹€à¸¡à¸¥à¹ƒà¸«à¸¡à¹ˆ
-      title: à¸šà¸±à¸à¸Šà¸µà¸”à¸³à¸à¸µà¹€à¸¡à¸¥
+        title: à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™à¸à¸µà¹€à¸¡à¸¥à¹ƒà¸«à¸¡à¹ˆ
+      title: à¹‚à¸”à¹€à¸¡à¸™à¸à¸µà¹€à¸¡à¸¥à¸—à¸µà¹ˆà¸›à¸´à¸”à¸à¸±à¹‰à¸™à¸à¸¢à¸¹à¹ˆ
     instances:
       by_domain: à¹‚à¸”à¹€à¸¡à¸™
+      empty: à¹„à¸¡à¹ˆà¸žà¸šà¹‚à¸”à¹€à¸¡à¸™
       known_accounts:
         other: "%{count} à¸šà¸±à¸à¸Šà¸µà¸—à¸µà¹ˆà¸£à¸¹à¹‰à¸ˆà¸±à¸"
       moderation:
@@ -389,6 +416,10 @@ th:
       private_comment: à¸„à¸§à¸²à¸¡à¸„à¸´à¸”à¹€à¸«à¹‡à¸™à¸ªà¹ˆà¸§à¸™à¸•à¸±à¸§
       public_comment: à¸„à¸§à¸²à¸¡à¸„à¸´à¸”à¹€à¸«à¹‡à¸™à¸ªà¸²à¸˜à¸²à¸£à¸“à¸°
       title: à¸à¸²à¸£à¸•à¸´à¸”à¸•à¹ˆà¸à¸à¸±à¸šà¸ à¸²à¸¢à¸™à¸à¸
+      total_blocked_by_us: à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¸¢à¹€à¸£à¸²
+      total_followed_by_them: à¸•à¸´à¸”à¸•à¸²à¸¡à¹‚à¸”à¸¢à¹€à¸‚à¸²
+      total_followed_by_us: à¸•à¸´à¸”à¸•à¸²à¸¡à¹‚à¸”à¸¢à¹€à¸£à¸²
+      total_reported: à¸£à¸²à¸¢à¸‡à¸²à¸™à¹€à¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸šà¹€à¸‚à¸²
       total_storage: à¹„à¸Ÿà¸¥à¹Œà¹à¸™à¸šà¸ªà¸·à¹ˆà¸
     invites:
       deactivate_all: à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”
@@ -398,6 +429,20 @@ th:
         expired: à¸«à¸¡à¸”à¸à¸²à¸¢à¸¸à¹à¸¥à¹‰à¸§
         title: à¸•à¸±à¸§à¸à¸£à¸à¸‡
       title: à¸„à¸³à¹€à¸Šà¸´à¸
+    ip_blocks:
+      add_new: à¸ªà¸£à¹‰à¸²à¸‡à¸à¸Ž
+      created_msg: à¹€à¸žà¸´à¹ˆà¸¡à¸à¸Ž IP à¹ƒà¸«à¸¡à¹ˆà¸ªà¸³à¹€à¸£à¹‡à¸ˆ
+      delete: à¸¥à¸š
+      expires_in:
+        '1209600': 2 à¸ªà¸±à¸›à¸”à¸²à¸«à¹Œ
+        '15778476': 6 à¹€à¸”à¸·à¸à¸™
+        '2629746': 1 à¹€à¸”à¸·à¸à¸™
+        '31556952': 1 à¸›à¸µ
+        '86400': 1 à¸§à¸±à¸™
+        '94670856': 3 à¸›à¸µ
+      new:
+        title: à¸ªà¸£à¹‰à¸²à¸‡à¸à¸Ž IP à¹ƒà¸«à¸¡à¹ˆ
+      title: à¸à¸Ž IP
     pending_accounts:
       title: à¸šà¸±à¸à¸Šà¸µà¸—à¸µà¹ˆà¸£à¸à¸”à¸³à¹€à¸™à¸´à¸™à¸à¸²à¸£ (%{count})
     relationships:
@@ -430,6 +475,8 @@ th:
       comment:
         none: à¹„à¸¡à¹ˆà¸¡à¸µ
       created_at: à¸£à¸²à¸¢à¸‡à¸²à¸™à¹€à¸¡à¸·à¹ˆà¸
+      forwarded: à¸ªà¹ˆà¸‡à¸•à¹ˆà¸à¹à¸¥à¹‰à¸§
+      forwarded_to: à¸ªà¹ˆà¸‡à¸•à¹ˆà¸à¹„à¸›à¸¢à¸±à¸‡ %{domain} à¹à¸¥à¹‰à¸§
       mark_as_resolved: à¸—à¸³à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸«à¸¡à¸²à¸¢à¸§à¹ˆà¸²à¹à¸à¹‰à¸›à¸±à¸à¸«à¸²à¹à¸¥à¹‰à¸§
       mark_as_unresolved: à¸—à¸³à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸«à¸¡à¸²à¸¢à¸§à¹ˆà¸²à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¹à¸à¹‰à¸›à¸±à¸à¸«à¸²
       notes:
@@ -455,7 +502,10 @@ th:
         email: à¸à¸µà¹€à¸¡à¸¥à¸˜à¸¸à¸£à¸à¸´à¸ˆ
         username: à¸Šà¸·à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¹ƒà¸™à¸à¸²à¸£à¸•à¸´à¸”à¸•à¹ˆà¸
       custom_css:
+        desc_html: à¸›à¸£à¸±à¸šà¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸¹à¸›à¸¥à¸±à¸à¸©à¸“à¹Œà¸”à¹‰à¸§à¸¢ CSS à¸—à¸µà¹ˆà¹‚à¸«à¸¥à¸”à¹ƒà¸™à¸—à¸¸à¸à¸«à¸™à¹‰à¸²
         title: CSS à¸—à¸µà¹ˆà¸à¸³à¸«à¸™à¸”à¹€à¸à¸‡
+      default_noindex:
+        desc_html: à¸¡à¸µà¸œà¸¥à¸•à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¹„à¸”à¹‰à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¸™à¸µà¹‰à¸”à¹‰à¸§à¸¢à¸•à¸™à¹€à¸à¸‡
       domain_blocks:
         all: à¹ƒà¸«à¹‰à¸à¸±à¸šà¸—à¸¸à¸à¸„à¸™
         disabled: à¹ƒà¸«à¹‰à¸à¸±à¸šà¹„à¸¡à¹ˆà¸¡à¸µà¹ƒà¸„à¸£
@@ -466,12 +516,16 @@ th:
       enable_bootstrap_timeline_accounts:
         title: à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸²à¸£à¸•à¸´à¸”à¸•à¸²à¸¡à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¹ƒà¸«à¸¡à¹ˆ
       hero:
+        desc_html: à¹à¸ªà¸”à¸‡à¹ƒà¸™à¸«à¸™à¹‰à¸²à¹à¸£à¸ à¸à¸¢à¹ˆà¸²à¸‡à¸™à¹‰à¸à¸¢ 600x100px à¸—à¸µà¹ˆà¹à¸™à¸°à¸™à¸³ à¹€à¸¡à¸·à¹ˆà¸à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸•à¸±à¹‰à¸‡ à¸à¸¥à¸±à¸šà¹„à¸›à¹ƒà¸Šà¹‰à¸ à¸²à¸žà¸‚à¸™à¸²à¸”à¸¢à¹ˆà¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ
         title: à¸ à¸²à¸žà¹à¸šà¸™à¹€à¸™à¸à¸£à¹Œà¸«à¸¥à¸±à¸
       mascot:
+        desc_html: à¹à¸ªà¸”à¸‡à¹ƒà¸™à¸«à¸¥à¸²à¸¢à¸«à¸™à¹‰à¸² à¸à¸¢à¹ˆà¸²à¸‡à¸™à¹‰à¸à¸¢ 293Ã—205px à¸—à¸µà¹ˆà¹à¸™à¸°à¸™à¸³ à¹€à¸¡à¸·à¹ˆà¸à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸•à¸±à¹‰à¸‡ à¸à¸¥à¸±à¸šà¹„à¸›à¹ƒà¸Šà¹‰à¸¡à¸²à¸ªà¸„à¸à¸•à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™
         title: à¸ à¸²à¸žà¸¡à¸²à¸ªà¸„à¸à¸•
       peers_api_enabled:
         desc_html: à¸Šà¸·à¹ˆà¸à¹‚à¸”à¹€à¸¡à¸™à¸—à¸µà¹ˆà¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸™à¸µà¹‰à¹„à¸”à¹‰à¸žà¸šà¹ƒà¸™à¹€à¸Ÿà¸”à¸´à¹€à¸§à¸´à¸£à¹Œà¸ª
         title: à¹€à¸œà¸¢à¹à¸žà¸£à¹ˆà¸£à¸²à¸¢à¸à¸²à¸£à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸—à¸µà¹ˆà¸„à¹‰à¸™à¸žà¸š
+      preview_sensitive_media:
+        title: à¹à¸ªà¸”à¸‡à¸ªà¸·à¹ˆà¸à¸—à¸µà¹ˆà¸¥à¸°à¹€à¸à¸µà¸¢à¸”à¸à¹ˆà¸à¸™à¹ƒà¸™à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡ OpenGraph
       profile_directory:
         desc_html: à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸ªà¸²à¸¡à¸²à¸£à¸–à¸„à¹‰à¸™à¸žà¸šà¹„à¸”à¹‰
         title: à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸”à¹€à¸£à¸à¸—à¸à¸£à¸µà¹‚à¸›à¸£à¹„à¸Ÿà¸¥à¹Œ
@@ -507,11 +561,14 @@ th:
         title: à¹€à¸‡à¸·à¹ˆà¸à¸™à¹„à¸‚à¸à¸²à¸£à¹ƒà¸«à¹‰à¸šà¸£à¸´à¸à¸²à¸£à¸—à¸µà¹ˆà¸à¸³à¸«à¸™à¸”à¹€à¸à¸‡
       site_title: à¸Šà¸·à¹ˆà¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ
       thumbnail:
+        desc_html: à¹ƒà¸Šà¹‰à¸ªà¸³à¸«à¸£à¸±à¸šà¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡à¸œà¹ˆà¸²à¸™ OpenGraph à¹à¸¥à¸° API 1200x630px à¸—à¸µà¹ˆà¹à¸™à¸°à¸™à¸³
         title: à¸ à¸²à¸žà¸‚à¸™à¸²à¸”à¸¢à¹ˆà¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ
       timeline_preview:
         desc_html: à¹à¸ªà¸”à¸‡à¸¥à¸´à¸‡à¸à¹Œà¹„à¸›à¸¢à¸±à¸‡à¹€à¸ªà¹‰à¸™à¹€à¸§à¸¥à¸²à¸ªà¸²à¸˜à¸²à¸£à¸“à¸°à¹ƒà¸™à¸«à¸™à¹‰à¸²à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™à¹à¸¥à¸°à¸à¸™à¸¸à¸à¸²à¸•à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡ API à¹„à¸›à¸¢à¸±à¸‡à¹€à¸ªà¹‰à¸™à¹€à¸§à¸¥à¸²à¸ªà¸²à¸˜à¸²à¸£à¸“à¸°à¹‚à¸”à¸¢à¹„à¸¡à¹ˆà¸¡à¸µà¸à¸²à¸£à¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡
         title: à¸à¸™à¸¸à¸à¸²à¸•à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¹€à¸ªà¹‰à¸™à¹€à¸§à¸¥à¸²à¸ªà¸²à¸˜à¸²à¸£à¸“à¸°à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡
       title: à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¹„à¸‹à¸•à¹Œ
+      trendable_by_default:
+        desc_html: à¸¡à¸µà¸œà¸¥à¸•à¹ˆà¸à¹à¸®à¸Šà¹à¸—à¹‡à¸à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¹„à¸”à¹‰à¹„à¸¡à¹ˆà¸à¸™à¸¸à¸à¸²à¸•à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰
       trends:
         title: à¹à¸®à¸Šà¹à¸—à¹‡à¸à¸—à¸µà¹ˆà¸à¸³à¸¥à¸±à¸‡à¸™à¸´à¸¢à¸¡
     site_uploads:
@@ -551,12 +608,15 @@ th:
       edit_preset: à¹à¸à¹‰à¹„à¸‚à¸„à¸³à¹€à¸•à¸·à¸à¸™à¸—à¸µà¹ˆà¸•à¸±à¹‰à¸‡à¹„à¸§à¹‰à¸¥à¹ˆà¸§à¸‡à¸«à¸™à¹‰à¸²
       title: à¸ˆà¸±à¸”à¸à¸²à¸£à¸„à¸³à¹€à¸•à¸·à¸à¸™à¸—à¸µà¹ˆà¸•à¸±à¹‰à¸‡à¹„à¸§à¹‰à¸¥à¹ˆà¸§à¸‡à¸«à¸™à¹‰à¸²
   admin_mailer:
+    new_pending_account:
+      body: à¸£à¸²à¸¢à¸¥à¸°à¹€à¸à¸µà¸¢à¸”à¸‚à¸à¸‡à¸šà¸±à¸à¸Šà¸µà¹ƒà¸«à¸¡à¹ˆà¸à¸¢à¸¹à¹ˆà¸”à¹‰à¸²à¸™à¸¥à¹ˆà¸²à¸‡ à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¸à¸™à¸¸à¸¡à¸±à¸•à¸´à¸«à¸£à¸·à¸à¸›à¸à¸´à¹€à¸ªà¸˜à¹ƒà¸šà¸ªà¸¡à¸±à¸„à¸£à¸™à¸µà¹‰
     new_report:
       body: "%{reporter} à¹„à¸”à¹‰à¸£à¸²à¸¢à¸‡à¸²à¸™ %{target}"
       body_remote: à¹ƒà¸„à¸£à¸ªà¸±à¸à¸„à¸™à¸ˆà¸²à¸ %{domain} à¹„à¸”à¹‰à¸£à¸²à¸¢à¸‡à¸²à¸™ %{target}
       subject: à¸£à¸²à¸¢à¸‡à¸²à¸™à¹ƒà¸«à¸¡à¹ˆà¸ªà¸³à¸«à¸£à¸±à¸š %{instance} (#%{id})
   aliases:
     add_new: à¸ªà¸£à¹‰à¸²à¸‡à¸™à¸²à¸¡à¹à¸à¸‡
+    deleted_msg: à¹€à¸à¸²à¸™à¸²à¸¡à¹à¸à¸‡à¸à¸à¸à¸ªà¸³à¹€à¸£à¹‡à¸ˆ à¸ˆà¸°à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸¢à¹‰à¸²à¸¢à¸ˆà¸²à¸à¸šà¸±à¸à¸Šà¸µà¸™à¸±à¹‰à¸™à¹„à¸›à¸¢à¸±à¸‡à¸šà¸±à¸à¸Šà¸µà¸™à¸µà¹‰à¹„à¸”à¹‰à¸à¸µà¸à¸•à¹ˆà¸à¹„à¸›
     empty: à¸„à¸¸à¸“à¹„à¸¡à¹ˆà¸¡à¸µà¸™à¸²à¸¡à¹à¸à¸‡
     remove: à¹€à¸¥à¸´à¸à¹€à¸Šà¸·à¹ˆà¸à¸¡à¹‚à¸¢à¸‡à¸™à¸²à¸¡à¹à¸à¸‡
   appearance:
@@ -580,6 +640,8 @@ th:
     created: à¸ªà¸£à¹‰à¸²à¸‡à¹à¸à¸›à¸žà¸¥à¸´à¹€à¸„à¸Šà¸±à¸™à¸ªà¸³à¹€à¸£à¹‡à¸ˆ
     destroyed: à¸¥à¸šà¹à¸à¸›à¸žà¸¥à¸´à¹€à¸„à¸Šà¸±à¸™à¸ªà¸³à¹€à¸£à¹‡à¸ˆ
     invalid_url: URL à¸—à¸µà¹ˆà¸£à¸°à¸šà¸¸à¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡
+    regenerate_token: à¸ªà¸£à¹‰à¸²à¸‡à¹‚à¸—à¹€à¸„à¸™à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¹ƒà¸«à¸¡à¹ˆ
+    token_regenerated: à¸ªà¸£à¹‰à¸²à¸‡à¹‚à¸—à¹€à¸„à¸™à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¹ƒà¸«à¸¡à¹ˆà¸ªà¸³à¹€à¸£à¹‡à¸ˆ
     your_token: à¹‚à¸—à¹€à¸„à¸™à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¸‚à¸à¸‡à¸„à¸¸à¸“
   auth:
     apply_for_account: à¸‚à¸à¸„à¸³à¹€à¸Šà¸´à¸
@@ -587,29 +649,42 @@ th:
     checkbox_agreement_html: à¸‰à¸±à¸™à¸¢à¸à¸¡à¸£à¸±à¸š <a href="%{rules_path}" target="_blank">à¸à¸Žà¸‚à¸à¸‡à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ</a> à¹à¸¥à¸° <a href="%{terms_path}" target="_blank">à¹€à¸‡à¸·à¹ˆà¸à¸™à¹„à¸‚à¸à¸²à¸£à¹ƒà¸«à¹‰à¸šà¸£à¸´à¸à¸²à¸£</a>
     checkbox_agreement_without_rules_html: à¸‰à¸±à¸™à¸¢à¸à¸¡à¸£à¸±à¸š <a href="%{terms_path}" target="_blank">à¹€à¸‡à¸·à¹ˆà¸à¸™à¹„à¸‚à¸à¸²à¸£à¹ƒà¸«à¹‰à¸šà¸£à¸´à¸à¸²à¸£</a>
     delete_account: à¸¥à¸šà¸šà¸±à¸à¸Šà¸µ
+    delete_account_html: à¸«à¸²à¸à¸„à¸¸à¸“à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¸¥à¸šà¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡à¸„à¸¸à¸“ à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸– <a href="%{path}">à¸”à¸³à¹€à¸™à¸´à¸™à¸à¸²à¸£à¸•à¹ˆà¸à¸—à¸µà¹ˆà¸™à¸µà¹ˆ</a> à¸„à¸¸à¸“à¸ˆà¸°à¹„à¸”à¹‰à¸£à¸±à¸šà¸à¸²à¸£à¸–à¸²à¸¡à¹€à¸žà¸·à¹ˆà¸à¸à¸²à¸£à¸¢à¸·à¸™à¸¢à¸±à¸™
     description:
+      prefix_invited_by_user: "@%{name} à¹€à¸Šà¸´à¸à¸„à¸¸à¸“à¹€à¸‚à¹‰à¸²à¸£à¹ˆà¸§à¸¡à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ Mastodon à¸™à¸µà¹‰!"
       prefix_sign_up: à¸¥à¸‡à¸—à¸°à¹€à¸šà¸µà¸¢à¸™à¹ƒà¸™ Mastodon à¸§à¸±à¸™à¸™à¸µà¹‰!
     didnt_get_confirmation: à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸£à¸±à¸šà¸„à¸³à¹à¸™à¸°à¸™à¸³à¸à¸²à¸£à¸¢à¸·à¸™à¸¢à¸±à¸™?
+    dont_have_your_security_key: à¹„à¸¡à¹ˆà¸¡à¸µà¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¸‚à¸à¸‡à¸„à¸¸à¸“?
     forgot_password: à¸¥à¸·à¸¡à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‚à¸à¸‡à¸„à¸¸à¸“?
+    invalid_reset_password_token: à¹‚à¸—à¹€à¸„à¸™à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹ƒà¸«à¸¡à¹ˆà¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¸«à¸£à¸·à¸à¸«à¸¡à¸”à¸à¸²à¸¢à¸¸à¹à¸¥à¹‰à¸§ à¹‚à¸›à¸£à¸”à¸‚à¸à¹‚à¸—à¹€à¸„à¸™à¹ƒà¸«à¸¡à¹ˆ
+    link_to_otp: à¸›à¹‰à¸à¸™à¸£à¸«à¸±à¸ªà¸ªà¸à¸‡à¸›à¸±à¸ˆà¸ˆà¸±à¸¢à¸ˆà¸²à¸à¹‚à¸—à¸£à¸¨à¸±à¸žà¸—à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“à¸«à¸£à¸·à¸à¸£à¸«à¸±à¸ªà¸à¸¹à¹‰à¸„à¸·à¸™
+    link_to_webauth: à¹ƒà¸Šà¹‰à¸à¸¸à¸›à¸à¸£à¸“à¹Œà¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¸‚à¸à¸‡à¸„à¸¸à¸“
     login: à¹€à¸‚à¹‰à¸²à¸ªà¸¹à¹ˆà¸£à¸°à¸šà¸š
     logout: à¸à¸à¸à¸ˆà¸²à¸à¸£à¸°à¸šà¸š
     migrate_account: à¸¢à¹‰à¸²à¸¢à¹„à¸›à¸¢à¸±à¸‡à¸šà¸±à¸à¸Šà¸µà¸à¸·à¹ˆà¸™
+    migrate_account_html: à¸«à¸²à¸à¸„à¸¸à¸“à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹€à¸ªà¹‰à¸™à¸—à¸²à¸‡à¸šà¸±à¸à¸Šà¸µà¸™à¸µà¹‰à¹„à¸›à¸¢à¸±à¸‡à¸šà¸±à¸à¸Šà¸µà¸à¸·à¹ˆà¸™ à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸– <a href="%{path}">à¸à¸³à¸«à¸™à¸”à¸„à¹ˆà¸²à¸šà¸±à¸à¸Šà¸µà¸—à¸µà¹ˆà¸™à¸µà¹ˆ</a>
     or_log_in_with: à¸«à¸£à¸·à¸à¹€à¸‚à¹‰à¸²à¸ªà¸¹à¹ˆà¸£à¸°à¸šà¸šà¸”à¹‰à¸§à¸¢
     providers:
       cas: CAS
       saml: SAML
     register: à¸¥à¸‡à¸—à¸°à¹€à¸šà¸µà¸¢à¸™
+    registration_closed: "%{instance} à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸à¸³à¸¥à¸±à¸‡à¹€à¸›à¸´à¸”à¸£à¸±à¸šà¸ªà¸¡à¸²à¸Šà¸´à¸à¹ƒà¸«à¸¡à¹ˆ"
     resend_confirmation: à¸ªà¹ˆà¸‡à¸„à¸³à¹à¸™à¸°à¸™à¸³à¸à¸²à¸£à¸¢à¸·à¸™à¸¢à¸±à¸™à¹ƒà¸«à¸¡à¹ˆ
     reset_password: à¸•à¸±à¹‰à¸‡à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹ƒà¸«à¸¡à¹ˆ
     security: à¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢
     set_new_password: à¸•à¸±à¹‰à¸‡à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹ƒà¸«à¸¡à¹ˆ
+    setup:
+      email_below_hint_html: à¸«à¸²à¸à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¸”à¹‰à¸²à¸™à¸¥à¹ˆà¸²à¸‡à¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡ à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¸—à¸µà¹ˆà¸™à¸µà¹ˆà¹à¸¥à¸°à¸£à¸±à¸šà¸à¸µà¹€à¸¡à¸¥à¸¢à¸·à¸™à¸¢à¸±à¸™à¹ƒà¸«à¸¡à¹ˆ
+      email_settings_hint_html: à¸ªà¹ˆà¸‡à¸à¸µà¹€à¸¡à¸¥à¸¢à¸·à¸™à¸¢à¸±à¸™à¹„à¸›à¸¢à¸±à¸‡ %{email} à¹à¸¥à¹‰à¸§ à¸«à¸²à¸à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¸™à¸±à¹‰à¸™à¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡ à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¹ƒà¸™à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¸šà¸±à¸à¸Šà¸µ
     status:
       account_status: à¸ªà¸–à¸²à¸™à¸°à¸šà¸±à¸à¸Šà¸µ
       confirming: à¸à¸³à¸¥à¸±à¸‡à¸£à¸à¸à¸²à¸£à¸¢à¸·à¸™à¸¢à¸±à¸™à¸à¸µà¹€à¸¡à¸¥à¹ƒà¸«à¹‰à¹€à¸ªà¸£à¹‡à¸ˆà¸ªà¸¡à¸šà¸¹à¸£à¸“à¹Œ
       functional: à¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡à¸„à¸¸à¸“à¸—à¸³à¸‡à¸²à¸™à¹„à¸”à¹‰à¸à¸¢à¹ˆà¸²à¸‡à¹€à¸•à¹‡à¸¡à¸—à¸µà¹ˆ
     trouble_logging_in: à¸¡à¸µà¸›à¸±à¸à¸«à¸²à¹ƒà¸™à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸ªà¸¹à¹ˆà¸£à¸°à¸šà¸š?
+    use_security_key: à¹ƒà¸Šà¹‰à¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢
   authorize_follow:
     already_following: à¸„à¸¸à¸“à¸à¸³à¸¥à¸±à¸‡à¸•à¸´à¸”à¸•à¸²à¸¡à¸šà¸±à¸à¸Šà¸µà¸™à¸µà¹‰à¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§
+    already_requested: à¸„à¸¸à¸“à¹„à¸”à¹‰à¸ªà¹ˆà¸‡à¸„à¸³à¸‚à¸à¸•à¸´à¸”à¸•à¸²à¸¡à¹„à¸›à¸¢à¸±à¸‡à¸šà¸±à¸à¸Šà¸µà¸™à¸±à¹‰à¸™à¹„à¸›à¹à¸¥à¹‰à¸§
     follow: à¸•à¸´à¸”à¸•à¸²à¸¡
     follow_request: 'à¸„à¸¸à¸“à¹„à¸”à¹‰à¸ªà¹ˆà¸‡à¸„à¸³à¸‚à¸à¸•à¸´à¸”à¸•à¸²à¸¡à¹„à¸›à¸¢à¸±à¸‡:'
     following: 'à¸ªà¸³à¹€à¸£à¹‡à¸ˆ! à¸„à¸¸à¸“à¸à¸³à¸¥à¸±à¸‡à¸•à¸´à¸”à¸•à¸²à¸¡:'
@@ -629,6 +704,7 @@ th:
   date:
     formats:
       default: "%d %b %Y"
+      with_month_name: "%d %B %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count} à¸Šà¸±à¹ˆà¸§à¹‚à¸¡à¸‡"
@@ -673,6 +749,7 @@ th:
       title: à¸à¸²à¸£à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¸¥à¹‰à¸¡à¹€à¸«à¸¥à¸§
     '429': à¸„à¸³à¸‚à¸à¸¡à¸²à¸à¹€à¸à¸´à¸™à¹„à¸›
     '500':
+      content: à¹€à¸£à¸²à¸‚à¸à¸à¸ à¸±à¸¢ à¹à¸•à¹ˆà¸¡à¸µà¸šà¸²à¸‡à¸à¸¢à¹ˆà¸²à¸‡à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸ªà¹ˆà¸§à¸™à¸‚à¸à¸‡à¹€à¸£à¸²
       title: à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰à¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡
     '503': The page could not be served due to a temporary server failure.
   existing_username_validator:
@@ -685,6 +762,7 @@ th:
       request: à¸‚à¸à¸à¸²à¸£à¹€à¸à¹‡à¸šà¸–à¸²à¸§à¸£à¸‚à¸à¸‡à¸„à¸¸à¸“
       size: à¸‚à¸™à¸²à¸”
     blocks: à¸„à¸¸à¸“à¸›à¸´à¸”à¸à¸±à¹‰à¸™
+    bookmarks: à¸—à¸µà¹ˆà¸„à¸±à¹ˆà¸™à¸«à¸™à¹‰à¸²
     csv: CSV
     domain_blocks: à¸à¸²à¸£à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™
     lists: à¸£à¸²à¸¢à¸à¸²à¸£
@@ -695,7 +773,7 @@ th:
   filters:
     contexts:
       account: à¹‚à¸›à¸£à¹„à¸Ÿà¸¥à¹Œ
-      home: à¹€à¸ªà¹‰à¸™à¹€à¸§à¸¥à¸²à¸«à¸™à¹‰à¸²à¹à¸£à¸
+      home: à¸«à¸™à¹‰à¸²à¹à¸£à¸à¹à¸¥à¸°à¸£à¸²à¸¢à¸à¸²à¸£
       notifications: à¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™
       public: à¹€à¸ªà¹‰à¸™à¹€à¸§à¸¥à¸²à¸ªà¸²à¸˜à¸²à¸£à¸“à¸°
       thread: à¸à¸²à¸£à¸ªà¸™à¸—à¸™à¸²
@@ -724,13 +802,18 @@ th:
   identity_proofs:
     active: à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸¢à¸¹à¹ˆ
     authorize: à¹ƒà¸Šà¹ˆ à¸à¸™à¸¸à¸à¸²à¸•
+    i_am_html: à¸‰à¸±à¸™à¸„à¸·à¸ %{username} à¹ƒà¸™ %{service}
     identity: à¸•à¸±à¸§à¸•à¸™
     inactive: à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™
     publicize_checkbox: 'à¹à¸¥à¸°à¹‚à¸žà¸ªà¸•à¹Œà¸ªà¸´à¹ˆà¸‡à¸™à¸µà¹‰:'
+    publicize_toot: 'à¸žà¸´à¸ªà¸¹à¸ˆà¸™à¹Œà¸•à¸±à¸§à¸•à¸™à¹à¸¥à¹‰à¸§! à¸‰à¸±à¸™à¸„à¸·à¸ %{username} à¹ƒà¸™ %{service}: %{url}'
     remove: à¹€à¸à¸²à¸à¸²à¸£à¸žà¸´à¸ªà¸¹à¸ˆà¸™à¹Œà¸à¸à¸à¸ˆà¸²à¸à¸šà¸±à¸à¸Šà¸µ
     removed: à¹€à¸à¸²à¸à¸²à¸£à¸žà¸´à¸ªà¸¹à¸ˆà¸™à¹Œà¸à¸à¸à¸ˆà¸²à¸à¸šà¸±à¸à¸Šà¸µà¸ªà¸³à¹€à¸£à¹‡à¸ˆ
     status: à¸ªà¸–à¸²à¸™à¸°à¸à¸²à¸£à¸•à¸£à¸§à¸ˆà¸ªà¸à¸š
+    view_proof: à¸”à¸¹à¸à¸²à¸£à¸žà¸´à¸ªà¸¹à¸ˆà¸™à¹Œ
   imports:
+    errors:
+      over_rows_processing_limit: à¸¡à¸µà¸¡à¸²à¸à¸à¸§à¹ˆà¸² %{count} à¹à¸–à¸§
     modes:
       merge: à¸œà¸ªà¸²à¸™
       merge_long: à¹€à¸à¹‡à¸šà¸£à¸°à¹€à¸šà¸µà¸¢à¸™à¸—à¸µà¹ˆà¸¡à¸µà¸à¸¢à¸¹à¹ˆà¹à¸¥à¸°à¹€à¸žà¸´à¹ˆà¸¡à¸£à¸°à¹€à¸šà¸µà¸¢à¸™à¹ƒà¸«à¸¡à¹ˆ
@@ -738,6 +821,7 @@ th:
       overwrite_long: à¹à¸—à¸™à¸—à¸µà¹ˆà¸£à¸°à¹€à¸šà¸µà¸¢à¸™à¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™à¸”à¹‰à¸§à¸¢à¸£à¸°à¹€à¸šà¸µà¸¢à¸™à¹ƒà¸«à¸¡à¹ˆ
     types:
       blocking: à¸£à¸²à¸¢à¸à¸²à¸£à¸›à¸´à¸”à¸à¸±à¹‰à¸™
+      bookmarks: à¸—à¸µà¹ˆà¸„à¸±à¹ˆà¸™à¸«à¸™à¹‰à¸²
       domain_blocking: à¸£à¸²à¸¢à¸à¸²à¸£à¸›à¸´à¸”à¸à¸±à¹‰à¸™à¹‚à¸”à¹€à¸¡à¸™
       following: à¸£à¸²à¸¢à¸à¸²à¸£à¸•à¸´à¸”à¸•à¸²à¸¡
       muting: à¸£à¸²à¸¢à¸à¸²à¸£à¸‹à¹ˆà¸à¸™
@@ -745,6 +829,7 @@ th:
   in_memoriam_html: à¹€à¸žà¸·à¹ˆà¸à¸£à¸°à¸¥à¸¶à¸à¸–à¸¶à¸‡
   invites:
     delete: à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™
+    expired: à¸«à¸¡à¸”à¸à¸²à¸¢à¸¸à¹à¸¥à¹‰à¸§
     expires_in:
       '1800': 30 à¸™à¸²à¸—à¸µ
       '21600': 6 à¸Šà¸±à¹ˆà¸§à¹‚à¸¡à¸‡
@@ -758,6 +843,7 @@ th:
     max_uses:
       other: "%{count} à¸à¸²à¸£à¹ƒà¸Šà¹‰"
     max_uses_prompt: à¹„à¸¡à¹ˆà¸¡à¸µà¸‚à¸µà¸”à¸ˆà¸³à¸à¸±à¸”
+    prompt: à¸ªà¸£à¹‰à¸²à¸‡à¹à¸¥à¸°à¹à¸šà¹ˆà¸‡à¸›à¸±à¸™à¸¥à¸´à¸‡à¸à¹Œà¸à¸±à¸šà¸œà¸¹à¹‰à¸à¸·à¹ˆà¸™à¹€à¸žà¸·à¹ˆà¸à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸™à¸µà¹‰
     table:
       expires_at: à¸«à¸¡à¸”à¸à¸²à¸¢à¸¸à¹€à¸¡à¸·à¹ˆà¸
       uses: à¸à¸²à¸£à¹ƒà¸Šà¹‰
@@ -780,6 +866,8 @@ th:
     redirected_msg: à¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡à¸„à¸¸à¸“à¸à¸³à¸¥à¸±à¸‡à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹€à¸ªà¹‰à¸™à¸—à¸²à¸‡à¹„à¸›à¸¢à¸±à¸‡ %{acct}
     redirecting_to: à¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡à¸„à¸¸à¸“à¸à¸³à¸¥à¸±à¸‡à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹€à¸ªà¹‰à¸™à¸—à¸²à¸‡à¹„à¸›à¸¢à¸±à¸‡ %{acct}
     set_redirect: à¸•à¸±à¹‰à¸‡à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹€à¸ªà¹‰à¸™à¸—à¸²à¸‡
+    warning:
+      followers: à¸à¸²à¸£à¸à¸£à¸°à¸—à¸³à¸™à¸µà¹‰à¸ˆà¸°à¸¢à¹‰à¸²à¸¢à¸œà¸¹à¹‰à¸•à¸´à¸”à¸•à¸²à¸¡à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”à¸ˆà¸²à¸à¸šà¸±à¸à¸Šà¸µà¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™à¹„à¸›à¸¢à¸±à¸‡à¸šà¸±à¸à¸Šà¸µà¹ƒà¸«à¸¡à¹ˆ
   moderation:
     title: à¸à¸²à¸£à¸„à¸§à¸šà¸„à¸¸à¸¡
   move_handler:
@@ -821,6 +909,10 @@ th:
     email_events: à¹€à¸«à¸•à¸¸à¸à¸²à¸£à¸“à¹Œà¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™à¸à¸µà¹€à¸¡à¸¥
     email_events_hint: 'à¹€à¸¥à¸·à¸à¸à¹€à¸«à¸•à¸¸à¸à¸²à¸£à¸“à¹Œà¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¸£à¸±à¸šà¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™:'
     other_settings: à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™à¸à¸·à¹ˆà¸™ à¹†
+  otp_authentication:
+    code_hint: à¸›à¹‰à¸à¸™à¸£à¸«à¸±à¸ªà¸—à¸µà¹ˆà¸ªà¸£à¹‰à¸²à¸‡à¹‚à¸”à¸¢à¹à¸à¸›à¸•à¸±à¸§à¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¸‚à¸à¸‡à¸„à¸¸à¸“à¹€à¸žà¸·à¹ˆà¸à¸¢à¸·à¸™à¸¢à¸±à¸™
+    enable: à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™
+    wrong_code: à¸£à¸«à¸±à¸ªà¸—à¸µà¹ˆà¸›à¹‰à¸à¸™à¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡! à¹€à¸§à¸¥à¸²à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¹à¸¥à¸°à¹€à¸§à¸¥à¸²à¸à¸¸à¸›à¸à¸£à¸“à¹Œà¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¸«à¸£à¸·à¸à¹„à¸¡à¹ˆ?
   pagination:
     newer: à¹ƒà¸«à¸¡à¹ˆà¸à¸§à¹ˆà¸²
     next: à¸–à¸±à¸”à¹„à¸›
@@ -829,8 +921,9 @@ th:
     truncate: "&hellip;"
   polls:
     errors:
-      already_voted: à¸„à¸¸à¸“à¹„à¸”à¹‰à¸¥à¸‡à¸„à¸°à¹à¸™à¸™à¹ƒà¸™à¸à¸²à¸£à¸ªà¸³à¸£à¸§à¸ˆà¸„à¸§à¸²à¸¡à¸„à¸´à¸”à¹€à¸«à¹‡à¸™à¸™à¸µà¹‰à¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§
+      already_voted: à¸„à¸¸à¸“à¹„à¸”à¹‰à¸¥à¸‡à¸„à¸°à¹à¸™à¸™à¹ƒà¸™à¸à¸²à¸£à¸ªà¸³à¸£à¸§à¸ˆà¸„à¸§à¸²à¸¡à¸„à¸´à¸”à¹€à¸«à¹‡à¸™à¸™à¸µà¹‰à¹„à¸›à¹à¸¥à¹‰à¸§
       duplicate_options: à¸¡à¸µà¸£à¸²à¸¢à¸à¸²à¸£à¸—à¸µà¹ˆà¸‹à¹‰à¸³à¸à¸±à¸™
+      expired: à¸à¸²à¸£à¸ªà¸³à¸£à¸§à¸ˆà¸„à¸§à¸²à¸¡à¸„à¸´à¸”à¹€à¸«à¹‡à¸™à¹„à¸”à¹‰à¸ªà¸´à¹‰à¸™à¸ªà¸¸à¸”à¹„à¸›à¹à¸¥à¹‰à¸§
       invalid_choice: à¹„à¸¡à¹ˆà¸¡à¸µà¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸à¸à¸²à¸£à¸¥à¸‡à¸„à¸°à¹à¸™à¸™à¸—à¸µà¹ˆà¹€à¸¥à¸·à¸à¸à¸à¸¢à¸¹à¹ˆ
       too_few_options: à¸•à¹‰à¸à¸‡à¸¡à¸µà¸¡à¸²à¸à¸à¸§à¹ˆà¸²à¸«à¸™à¸¶à¹ˆà¸‡à¸£à¸²à¸¢à¸à¸²à¸£
       too_many_options: à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸¡à¸µà¸¡à¸²à¸à¸à¸§à¹ˆà¸² %{max} à¸£à¸²à¸¢à¸à¸²à¸£
@@ -844,6 +937,7 @@ th:
   relationships:
     activity: à¸à¸´à¸ˆà¸à¸£à¸£à¸¡à¸šà¸±à¸à¸Šà¸µ
     dormant: à¹„à¸¡à¹ˆà¹€à¸„à¸¥à¸·à¹ˆà¸à¸™à¹„à¸«à¸§
+    follow_selected_followers: à¸•à¸´à¸”à¸•à¸²à¸¡à¸œà¸¹à¹‰à¸•à¸´à¸”à¸•à¸²à¸¡à¸—à¸µà¹ˆà¹€à¸¥à¸·à¸à¸
     followers: à¸œà¸¹à¹‰à¸•à¸´à¸”à¸•à¸²à¸¡
     following: à¸à¸³à¸¥à¸±à¸‡à¸•à¸´à¸”à¸•à¸²à¸¡
     invited: à¹€à¸Šà¸´à¸à¹à¸¥à¹‰à¸§
@@ -934,6 +1028,7 @@ th:
     profile: à¹‚à¸›à¸£à¹„à¸Ÿà¸¥à¹Œ
     relationships: à¸à¸²à¸£à¸•à¸´à¸”à¸•à¸²à¸¡à¹à¸¥à¸°à¸œà¸¹à¹‰à¸•à¸´à¸”à¸•à¸²à¸¡
     two_factor_authentication: à¸à¸²à¸£à¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¸”à¹‰à¸§à¸¢à¸ªà¸à¸‡à¸›à¸±à¸ˆà¸ˆà¸±à¸¢
+    webauthn_authentication: à¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢
   spam_check:
     spam_detected: à¸™à¸µà¹ˆà¸„à¸·à¸à¸£à¸²à¸¢à¸‡à¸²à¸™à¹à¸šà¸šà¸à¸±à¸•à¹‚à¸™à¸¡à¸±à¸•à¸´ à¸•à¸£à¸§à¸ˆà¸žà¸šà¸ªà¹à¸›à¸¡
   statuses:
@@ -962,12 +1057,14 @@ th:
         other: "%{count} à¸à¸²à¸£à¸¥à¸‡à¸„à¸°à¹à¸™à¸™"
       vote: à¸¥à¸‡à¸„à¸°à¹à¸™à¸™
     show_more: à¹à¸ªà¸”à¸‡à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡
+    show_newer: à¹à¸ªà¸”à¸‡à¸—à¸µà¹ˆà¹ƒà¸«à¸¡à¹ˆà¸à¸§à¹ˆà¸²
+    show_older: à¹à¸ªà¸”à¸‡à¸—à¸µà¹ˆà¹€à¸à¹ˆà¸²à¸à¸§à¹ˆà¸²
     show_thread: à¹à¸ªà¸”à¸‡à¸à¸£à¸°à¸—à¸¹à¹‰
     sign_in_to_participate: à¸¥à¸‡à¸Šà¸·à¹ˆà¸à¹€à¸‚à¹‰à¸²à¹€à¸žà¸·à¹ˆà¸à¹€à¸‚à¹‰à¸²à¸£à¹ˆà¸§à¸¡à¸à¸²à¸£à¸ªà¸™à¸—à¸™à¸²
     title: '%{name}: "%{quote}"'
     visibilities:
       private: à¸œà¸¹à¹‰à¸•à¸´à¸”à¸•à¸²à¸¡à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™
-      private_long: à¹à¸ªà¸”à¸‡à¸•à¹ˆà¸à¸œà¸¹à¹‰à¸•à¸´à¸”à¸•à¸²à¸¡à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™
+      private_long: à¹à¸ªà¸”à¸‡à¹à¸à¹ˆà¸œà¸¹à¹‰à¸•à¸´à¸”à¸•à¸²à¸¡à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™
       public: à¸ªà¸²à¸˜à¸²à¸£à¸“à¸°
       public_long: à¸—à¸¸à¸à¸„à¸™à¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸«à¹‡à¸™
       unlisted: à¹„à¸¡à¹ˆà¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸£à¸²à¸¢à¸à¸²à¸£
@@ -988,16 +1085,25 @@ th:
       default: "%d %b %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: à¸›à¹‰à¸à¸™à¸£à¸«à¸±à¸ªà¸—à¸µà¹ˆà¸ªà¸£à¹‰à¸²à¸‡à¹‚à¸”à¸¢à¹à¸à¸›à¸•à¸±à¸§à¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¸‚à¸à¸‡à¸„à¸¸à¸“à¹€à¸žà¸·à¹ˆà¸à¸¢à¸·à¸™à¸¢à¸±à¸™
-    disable: à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™
-    enable: à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™
+    add: à¹€à¸žà¸´à¹ˆà¸¡
+    disable: à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ 2FA
+    disabled_success: à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸²à¸£à¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¸”à¹‰à¸§à¸¢à¸ªà¸à¸‡à¸›à¸±à¸ˆà¸ˆà¸±à¸¢à¸ªà¸³à¹€à¸£à¹‡à¸ˆ
+    edit: à¹à¸à¹‰à¹„à¸‚
     enabled: à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸²à¸£à¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¸”à¹‰à¸§à¸¢à¸ªà¸à¸‡à¸›à¸±à¸ˆà¸ˆà¸±à¸¢à¹à¸¥à¹‰à¸§
     enabled_success: à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸²à¸£à¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¸”à¹‰à¸§à¸¢à¸ªà¸à¸‡à¸›à¸±à¸ˆà¸ˆà¸±à¸¢à¸ªà¸³à¹€à¸£à¹‡à¸ˆ
     generate_recovery_codes: à¸ªà¸£à¹‰à¸²à¸‡à¸£à¸«à¸±à¸ªà¸à¸¹à¹‰à¸„à¸·à¸™
+    methods: à¸§à¸´à¸˜à¸µà¸à¸²à¸£à¸ªà¸à¸‡à¸›à¸±à¸ˆà¸ˆà¸±à¸¢
+    otp: à¹à¸à¸›à¸•à¸±à¸§à¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡
     recovery_codes: à¸£à¸«à¸±à¸ªà¸à¸¹à¹‰à¸„à¸·à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸ªà¸³à¸£à¸à¸‡
-    setup: à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²
-    wrong_code: à¸£à¸«à¸±à¸ªà¸—à¸µà¹ˆà¸›à¹‰à¸à¸™à¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡! à¹€à¸§à¸¥à¸²à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¹à¸¥à¸°à¹€à¸§à¸¥à¸²à¸à¸¸à¸›à¸à¸£à¸“à¹Œà¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¸«à¸£à¸·à¸à¹„à¸¡à¹ˆ?
+    recovery_codes_regenerated: à¸ªà¸£à¹‰à¸²à¸‡à¸£à¸«à¸±à¸ªà¸à¸¹à¹‰à¸„à¸·à¸™à¹ƒà¸«à¸¡à¹ˆà¸ªà¸³à¹€à¸£à¹‡à¸ˆ
+    webauthn: à¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢
   user_mailer:
+    sign_in_token:
+      details: 'à¸™à¸µà¹ˆà¸„à¸·à¸à¸£à¸²à¸¢à¸¥à¸°à¹€à¸à¸µà¸¢à¸”à¸‚à¸à¸‡à¸„à¸§à¸²à¸¡à¸žà¸¢à¸²à¸¢à¸²à¸¡:'
+      explanation: 'à¹€à¸£à¸²à¸•à¸£à¸§à¸ˆà¸žà¸šà¸„à¸§à¸²à¸¡à¸žà¸¢à¸²à¸¢à¸²à¸¡à¸¥à¸‡à¸Šà¸·à¹ˆà¸à¹€à¸‚à¹‰à¸²à¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡à¸„à¸¸à¸“à¸ˆà¸²à¸à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆ IP à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¸£à¸¹à¹‰à¸ˆà¸±à¸ à¸«à¸²à¸à¸™à¸µà¹ˆà¸„à¸·à¸à¸„à¸¸à¸“ à¹‚à¸›à¸£à¸”à¸›à¹‰à¸à¸™à¸£à¸«à¸±à¸ªà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¸”à¹‰à¸²à¸™à¸¥à¹ˆà¸²à¸‡à¹ƒà¸™à¸«à¸™à¹‰à¸²à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸à¸²à¸£à¸¥à¸‡à¸Šà¸·à¹ˆà¸à¹€à¸‚à¹‰à¸²:'
+      further_actions: 'à¸«à¸²à¸à¸™à¸µà¹ˆà¹„à¸¡à¹ˆà¹ƒà¸Šà¹ˆà¸„à¸¸à¸“ à¹‚à¸›à¸£à¸”à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‚à¸à¸‡à¸„à¸¸à¸“à¹à¸¥à¸°à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸²à¸£à¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¸”à¹‰à¸§à¸¢à¸ªà¸à¸‡à¸›à¸±à¸ˆà¸ˆà¸±à¸¢à¹ƒà¸™à¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡à¸„à¸¸à¸“ à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¸—à¸³à¹„à¸”à¹‰à¸—à¸µà¹ˆà¸™à¸µà¹ˆ:'
+      subject: à¹‚à¸›à¸£à¸”à¸¢à¸·à¸™à¸¢à¸±à¸™à¸à¸²à¸£à¸¥à¸‡à¸Šà¸·à¹ˆà¸à¹€à¸‚à¹‰à¸²à¸—à¸µà¹ˆà¸žà¸¢à¸²à¸¢à¸²à¸¡
+      title: à¸„à¸§à¸²à¸¡à¸žà¸¢à¸²à¸¢à¸²à¸¡à¸¥à¸‡à¸Šà¸·à¹ˆà¸à¹€à¸‚à¹‰à¸²
     warning:
       review_server_policies: à¸•à¸£à¸§à¸ˆà¸—à¸²à¸™à¸™à¹‚à¸¢à¸šà¸²à¸¢à¸‚à¸à¸‡à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ
       subject:
@@ -1012,11 +1118,28 @@ th:
       tips: à¹€à¸„à¸¥à¹‡à¸”à¸¥à¸±à¸š
       title: à¸¢à¸´à¸™à¸”à¸µà¸•à¹‰à¸à¸™à¸£à¸±à¸š %{name}!
   users:
+    blocked_email_provider: à¹„à¸¡à¹ˆà¸à¸™à¸¸à¸à¸²à¸•à¸œà¸¹à¹‰à¹ƒà¸«à¹‰à¸šà¸£à¸´à¸à¸²à¸£à¸à¸µà¹€à¸¡à¸¥à¸™à¸µà¹‰
     follow_limit_reached: à¸„à¸¸à¸“à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸•à¸´à¸”à¸•à¸²à¸¡à¸¡à¸²à¸à¸à¸§à¹ˆà¸² %{limit} à¸„à¸™
     invalid_email: à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡
+    invalid_email_mx: à¸”à¸¹à¹€à¸«à¸¡à¸·à¸à¸™à¸§à¹ˆà¸²à¹„à¸¡à¹ˆà¸¡à¸µà¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¸à¸¢à¸¹à¹ˆ
     invalid_otp_token: à¸£à¸«à¸±à¸ªà¸ªà¸à¸‡à¸›à¸±à¸ˆà¸ˆà¸±à¸¢à¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡
     invalid_sign_in_token: à¸£à¸«à¸±à¸ªà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡
     seamless_external_login: à¸„à¸¸à¸“à¹„à¸”à¹‰à¹€à¸‚à¹‰à¸²à¸ªà¸¹à¹ˆà¸£à¸°à¸šà¸šà¸œà¹ˆà¸²à¸™à¸šà¸£à¸´à¸à¸²à¸£à¸ à¸²à¸¢à¸™à¸à¸ à¸”à¸±à¸‡à¸™à¸±à¹‰à¸™à¸ˆà¸¶à¸‡à¹„à¸¡à¹ˆà¸¡à¸µà¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹à¸¥à¸°à¸à¸µà¹€à¸¡à¸¥
     signed_in_as: 'à¸¥à¸‡à¸Šà¸·à¹ˆà¸à¹€à¸‚à¹‰à¸²à¹€à¸›à¹‡à¸™:'
   verification:
     verification: à¸à¸²à¸£à¸•à¸£à¸§à¸ˆà¸ªà¸à¸š
+  webauthn_credentials:
+    add: à¹€à¸žà¸´à¹ˆà¸¡à¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¹ƒà¸«à¸¡à¹ˆ
+    create:
+      error: à¸¡à¸µà¸›à¸±à¸à¸«à¸²à¹ƒà¸™à¸à¸²à¸£à¹€à¸žà¸´à¹ˆà¸¡à¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¸‚à¸à¸‡à¸„à¸¸à¸“ à¹‚à¸›à¸£à¸”à¸¥à¸à¸‡à¸à¸µà¸à¸„à¸£à¸±à¹‰à¸‡
+      success: à¹€à¸žà¸´à¹ˆà¸¡à¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¸‚à¸à¸‡à¸„à¸¸à¸“à¸ªà¸³à¹€à¸£à¹‡à¸ˆ
+    delete: à¸¥à¸š
+    delete_confirmation: à¸„à¸¸à¸“à¹à¸™à¹ˆà¹ƒà¸ˆà¸«à¸£à¸·à¸à¹„à¸¡à¹ˆà¸§à¹ˆà¸²à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¸¥à¸šà¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¸™à¸µà¹‰?
+    destroy:
+      error: à¸¡à¸µà¸›à¸±à¸à¸«à¸²à¹ƒà¸™à¸à¸²à¸£à¸¥à¸šà¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¸‚à¸à¸‡à¸„à¸¸à¸“ à¹‚à¸›à¸£à¸”à¸¥à¸à¸‡à¸à¸µà¸à¸„à¸£à¸±à¹‰à¸‡
+      success: à¸¥à¸šà¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¸‚à¸à¸‡à¸„à¸¸à¸“à¸ªà¸³à¹€à¸£à¹‡à¸ˆ
+    invalid_credential: à¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡
+    not_enabled: à¸„à¸¸à¸“à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ WebAuthn
+    not_supported: à¹€à¸šà¸£à¸²à¸§à¹Œà¹€à¸‹à¸à¸£à¹Œà¸™à¸µà¹‰à¹„à¸¡à¹ˆà¸£à¸à¸‡à¸£à¸±à¸šà¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢
+    otp_required: à¹€à¸žà¸·à¹ˆà¸à¹ƒà¸Šà¹‰à¸à¸¸à¸à¹à¸ˆà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢ à¹‚à¸›à¸£à¸”à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸²à¸£à¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¸”à¹‰à¸§à¸¢à¸ªà¸à¸‡à¸›à¸±à¸ˆà¸ˆà¸±à¸¢à¸à¹ˆà¸à¸™
+    registered_on: à¸¥à¸‡à¸—à¸°à¹€à¸šà¸µà¸¢à¸™à¹€à¸¡à¸·à¹ˆà¸ %{date}
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 650166781f4ec7d93ecd0c01c7545a02ba720c94..62247bf56a2fd11eb8605bba31c954a806278285 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -3,10 +3,10 @@ tr:
   about:
     about_hashtag_html: Bunlar <strong>#%{hashtag}</strong> ile etiketlenen genel tootlar. Fediverse iÃ§inde herhangi bir yerde bir hesabÄ±nÄ±z varsa, onlarla etkileÅŸime geÃ§ebilirsiniz.
     about_mastodon_html: Mastodon <em>Ã¼cretsiz ve aÃ§Ä±k kaynaklÄ±</em> bir sosyal aÄŸdÄ±r. <em>MerkezileÅŸtirilmemiÅŸ</em> yapÄ±sÄ± sayesinde diÄŸer ticari sosyal platformlarÄ±n aksine iletiÅŸimininizin tek bir firmada tutulmasÄ±nÄ±n/yÃ¶netilmesinin Ã¶nÃ¼ne geÃ§er. GÃ¼vendiÄŸiniz bir sunucuyu seÃ§erek oradaki kiÅŸilerle etkileÅŸimde bulunabilirsiniz. Herkes kendi Mastodon sunucusunu kurabilir ve sorunsuz bir ÅŸekilde Mastodon <em>sosyal aÄŸÄ±na</em> dahil edebilir.
-    about_this: Bu sunucu hakkÄ±nda
+    about_this: HakkÄ±nda
     active_count_after: etkin
     active_footnote: AylÄ±k Aktif KullanÄ±cÄ±lar (AAK)
-    administered_by: 'YÃ¶neten:'
+    administered_by: 'YÃ¶netici:'
     api: API
     apps: Mobil uygulamalar
     apps_platforms: Ä°os, Android ve diÄŸer platformlardaki Mastodon'u kullanÄ±n
@@ -30,19 +30,21 @@ tr:
     server_stats: 'Sunucu istatistikleri:'
     source_code: Kaynak kodu
     status_count_after:
-      one: durum
-      other: durum
+      one: durum yazÄ±ldÄ±
+      other: durum yazÄ±ldÄ±
     status_count_before: Åžu ana kadar
     tagline: ArkadaÅŸlarÄ±nÄ± takip et ve yenilerini keÅŸfet
     terms: KullanÄ±m ÅŸartlarÄ±
-    unavailable_content: Mevcut olmayan iÃ§erik
+    unavailable_content: Denetlenen sunucular
     unavailable_content_description:
       domain: Sunucu
       reason: Sebep
       rejecting_media: 'Bu sunuculardaki medya dosyalarÄ± iÅŸlenmeyecek ya da saklanmayacak, ve hiÃ§bir kÃ¼Ã§Ã¼k resim gÃ¶sterilmeyecektir, dolayÄ±sÄ±yla orjinal dosyaya manuel tÄ±klama gerekecektir:'
       rejecting_media_title: FiltrelenmiÅŸ medya
       silenced: 'Bu sunuculardan gelen gÃ¶nderiler genel zaman Ã§izelgelerinde ve konuÅŸmalarda gizlenecek ve siz onlarÄ± takip etmediÄŸiniz sÃ¼rece, kullanÄ±cÄ±larÄ±n etkileÅŸimlerinden hiÃ§bir bildirim alÄ±nmayacaktÄ±r:'
+      silenced_title: SusturulmuÅŸ sunucular
       suspended: 'Bu sunuculardaki hiÃ§bir veri iÅŸlenmeyecek, saklanmayacak veya deÄŸiÅŸ tokuÅŸ edilmeyecektir, dolayÄ±sÄ±yla bu sunuculardaki kullanÄ±cÄ±larla herhangi bir etkileÅŸim ya da iletiÅŸim imkansÄ±z olacaktÄ±r:'
+      suspended_title: AskÄ±ya alÄ±nan sunucular
     unavailable_content_html: Mastodon, genel olarak fediverse'teki herhangi bir sunucudan iÃ§erik gÃ¶rÃ¼ntÃ¼lemenize ve kullanÄ±cÄ±larÄ±yla etkileÅŸim kurmanÄ±za izin verir. Bunlar, bu sunucuda yapÄ±lmÄ±ÅŸ olan istisnalardÄ±r.
     user_count_after:
       one: kullanÄ±cÄ±
@@ -50,16 +52,16 @@ tr:
     user_count_before: KayÄ±tlÄ±
     what_is_mastodon: Mastodon nedir?
   accounts:
-    choices_html: "%{name} seÃ§imleri:"
+    choices_html: "%{name} kiÅŸisinin seÃ§imleri:"
     endorsements_hint: Takip ettiÄŸiniz kiÅŸileri web arayÃ¼zÃ¼nden onaylayabilirsiniz, burada gÃ¶rÃ¼necekler.
     featured_tags_hint: Burada gÃ¶rÃ¼ntÃ¼lenecek belirli etiketlere sahip olabilirsiniz.
     follow: Takip et
     followers:
       one: TakipÃ§i
       other: TakipÃ§i
-    following: Takip ettikleri
+    following: Takip edilenler
     joined: "%{date} tarihinde katÄ±ldÄ±"
-    last_active: son aktivite
+    last_active: son etkinlik
     link_verified_on: Bu baÄŸlantÄ±nÄ±n mÃ¼lkiyeti %{date} tarihinde kontrol edildi
     media: Medya
     moved_html: "%{name}, %{new_profile_link} adresine taÅŸÄ±ndÄ±:"
@@ -72,10 +74,10 @@ tr:
       following: Onaylamak istediÄŸiniz kiÅŸiyi zaten takip ediyor olmalÄ±sÄ±nÄ±z
     posts:
       one: Toot
-      other: Tootlar
+      other: Toot
     posts_tab_heading: Tootlar
     posts_with_replies: Tootlar ve yanÄ±tlar
-    reserved_username: KullanÄ±cÄ± adÄ± saklÄ±dÄ±r
+    reserved_username: KullanÄ±cÄ± adÄ± rezerve edildi
     roles:
       admin: YÃ¶netici
       bot: Bot
@@ -88,16 +90,18 @@ tr:
       action: Eylemi gerÃ§ekleÅŸtir
       title: "%{acct} Ã¼zerinde denetleme eylemi gerÃ§ekleÅŸtir"
     account_moderation_notes:
-      create: Not bÄ±rakÄ±n
+      create: Not bÄ±rak
       created_msg: Denetim notu baÅŸarÄ±yla oluÅŸturuldu!
       delete: Sil
       destroyed_msg: Denetim notu baÅŸarÄ±yla yok edildi!
     accounts:
+      add_email_domain_block: E-posta alan adÄ±nÄ± engelle
       approve: Onayla
       approve_all: TÃ¼mÃ¼nÃ¼ onayla
+      approved_msg: "%{username} adlÄ± kullanÄ±cÄ±nÄ±n kayÄ±t baÅŸvurusu baÅŸarÄ±yla onaylandÄ±"
       are_you_sure: Emin misiniz?
-      avatar: Avatar
-      by_domain: Sunucu
+      avatar: Profil resmi
+      by_domain: Alan adÄ±
       change_email:
         changed_msg: Hesap e-postasÄ± baÅŸarÄ±yla deÄŸiÅŸtirildi!
         current_email: Mevcut e-posta
@@ -107,19 +111,22 @@ tr:
         title: "%{username} iÃ§in e-postayÄ± deÄŸiÅŸtir"
       confirm: Onayla
       confirmed: OnaylandÄ±
-      confirming: Onaylama
-      deleted: Silinen
+      confirming: OnaylanÄ±yor
+      delete: Veriyi sil
+      deleted: Silindi
       demote: DÃ¼ÅŸÃ¼r
+      destroyed_msg: "%{username} verilerinin hemen silinmesi iÃ§in kuyruÄŸa alÄ±ndÄ±"
       disable: Devre dÄ±ÅŸÄ±
       disable_two_factor_authentication: 2AD kapat
       disabled: KapalÄ±
-      display_name: GÃ¶rÃ¼nen adÄ±nÄ±z
-      domain: Sunucu
+      display_name: GÃ¶rÃ¼nen isim
+      domain: Alan adÄ±
       edit: DÃ¼zenle
       email: E-posta
       email_status: E-posta durumu
       enable: EtkinleÅŸtir
       enabled: Etkin
+      enabled_msg: "%{username} hesabÄ± baÅŸarÄ±yla Ã§Ã¶zÃ¼ldÃ¼"
       followers: TakipÃ§iler
       follows: Takip edilen
       header: Ãœstbilgi
@@ -132,16 +139,18 @@ tr:
         local: Yerel
         remote: Uzaktan
         title: Konum
-      login_status: GiriÅŸ durumu
+      login_status: Oturum aÃ§ma durumu
       media_attachments: Medya ekleri
-      memorialize: Bir hatÄ±raya dÃ¶n
+      memorialize: AnÄ±ta dÃ¶nÃ¼ÅŸtÃ¼r
+      memorialized: AnÄ±tlaÅŸtÄ±rÄ±ldÄ±
+      memorialized_msg: "%{username} hesabÄ± baÅŸarÄ±yla anÄ±t hesabÄ±na dÃ¶nÃ¼ÅŸtÃ¼rÃ¼ldÃ¼"
       moderation:
         active: Etkin
         all: Hepsi
         pending: Bekliyor
         silenced: Susturulanlar
         suspended: UzaklaÅŸtÄ±rÄ±lanlar
-        title: YÃ¶netim
+        title: Denetim
       moderation_notes: Denetleme notlarÄ±
       most_recent_activity: Son aktivite
       most_recent_ip: Son IP
@@ -155,16 +164,20 @@ tr:
       public: Herkese aÃ§Ä±k
       push_subscription_expires: PuSH aboneliÄŸi dolumu
       redownload: Profili yenile
+      redownloaded_msg: "%{username} kullanÄ±cÄ±sÄ±nÄ±n profili kÃ¶kenden baÅŸarÄ±yla yenilendi"
       reject: Reddet
       reject_all: TÃ¼mÃ¼nÃ¼ reddet
-      remove_avatar: AvatarÄ± kaldÄ±r
+      rejected_msg: "%{username} adlÄ± kullanÄ±cÄ±nÄ±n kayÄ±t baÅŸvurusu baÅŸarÄ±yla reddedildi"
+      remove_avatar: Profil resmini kaldÄ±r
       remove_header: Ãœstbilgiyi kaldÄ±r
+      removed_avatar_msg: "%{username} hesabÄ±nÄ±n avatar resmi baÅŸarÄ±yla kaldÄ±rÄ±ldÄ±"
+      removed_header_msg: "%{username} hesabÄ±nÄ±n baÅŸlÄ±k resmi baÅŸarÄ±yla kaldÄ±rÄ±ldÄ±"
       resend_confirmation:
         already_confirmed: Bu kullanÄ±cÄ± zaten onaylandÄ±
         send: DoÄŸrulama epostasÄ±nÄ± yeniden gÃ¶nder
         success: Onay e-postasÄ± baÅŸarÄ±yla gÃ¶nderildi!
       reset: SÄ±fÄ±rla
-      reset_password: ParolayÄ± deÄŸiÅŸtir
+      reset_password: Åžifreyi sÄ±fÄ±rla
       resubscribe: Yeniden abone ol
       role: Ä°zinler
       roles:
@@ -173,7 +186,10 @@ tr:
         staff: Personel
         user: KullanÄ±cÄ±
       search: Ara
+      search_same_email_domain: AynÄ± e-posta alan adÄ±na sahip diÄŸer kullanÄ±cÄ±lar
       search_same_ip: AynÄ± IP adresine sahip diÄŸer kullanÄ±cÄ±lar
+      sensitive: Hassas
+      sensitized: hassas olarak iÅŸaretlendi
       shared_inbox_url: PaylaÅŸÄ±lan gelen kutusu baÄŸlantÄ±sÄ±
       show:
         created_reports: YapÄ±lan ÅŸikayetler
@@ -183,23 +199,64 @@ tr:
       statuses: Durumlar
       subscribe: Abone ol
       suspended: AskÄ±ya alÄ±ndÄ±
+      suspension_irreversible: Bu hesabÄ±n verileri geri dÃ¶nÃ¼ÅŸÃ¼msÃ¼z olarak silindi. HesabÄ± kullanÄ±labilir hale getirmek iÃ§in hesabÄ±n askÄ±ya alÄ±nmasÄ±nÄ± kaldÄ±rabilirsiniz, ancak daha Ã¶nce sahip olduÄŸu herhangi bir veri kurtarÄ±lamaz.
+      suspension_reversible_hint_html: Hesap askÄ±ya alÄ±ndÄ± ve veriler %{date} tarihinde tamamen kaldÄ±rÄ±lacak. O zamana kadar, hesap herhangi bir olumsuz etki olmaksÄ±zÄ±n geri yÃ¼klenebilir. HesabÄ±n tÃ¼m verilerini hemen kaldÄ±rmak isterseniz, bunu aÅŸaÄŸÄ±dan yapabilirsiniz.
       time_in_queue: "%{time} kuyruÄŸunda bekliyor"
       title: Hesaplar
       unconfirmed_email: OnaylanmamÄ±ÅŸ e-posta
+      undo_sensitized: HassaslÄ±ÄŸÄ± geri al
       undo_silenced: SusturmayÄ± geri al
       undo_suspension: UzaklaÅŸtÄ±rmayÄ± geri al
+      unsilenced_msg: "%{username} hesabÄ± baÅŸarÄ±yla sÄ±nÄ±rsÄ±z yapÄ±ldÄ±"
       unsubscribe: Abonelikten Ã§Ä±k
+      unsuspended_msg: "%{username} hesabÄ±nÄ±n askÄ±ya alÄ±nmasÄ± baÅŸarÄ±yla kaldÄ±rÄ±ldÄ±"
       username: KullanÄ±cÄ± adÄ±
+      view_domain: Alan adÄ± iÃ§in Ã¶zeti gÃ¶rÃ¼ntÃ¼leyin
       warn: Uyar
       web: Web
       whitelisted: Beyaz listede
     action_logs:
       action_types:
-        change_email_user: KullanÄ±cÄ± iÃ§in e-postayÄ± deÄŸiÅŸtir
+        assigned_to_self_report: Raporu Ata
+        change_email_user: KullanÄ±cÄ± E-postasÄ±nÄ± DeÄŸiÅŸtir
         confirm_user: KullanÄ±cÄ±yÄ± Onayla
+        create_account_warning: UyarÄ± OluÅŸtur
         create_announcement: Duyuru OluÅŸtur
         create_custom_emoji: Ã–zel Ä°fade OluÅŸtur
+        create_domain_allow: Ä°zin Verilen Alan AdÄ± OluÅŸtur
+        create_domain_block: Engellenen Alan AdÄ± OluÅŸtur
+        create_email_domain_block: E-Posta Alan AdÄ± Engeli OluÅŸtur
+        create_ip_block: IP kuralÄ± oluÅŸtur
+        demote_user: KullanÄ±cÄ±yÄ± DÃ¼ÅŸÃ¼r
+        destroy_announcement: Duyuru Sil
+        destroy_custom_emoji: Ã–zel Ä°fadeyi Sil
+        destroy_domain_allow: Ä°zin Verilen Alan AdÄ±nÄ± Sil
+        destroy_domain_block: Engellenen Alan AdÄ±nÄ± Sil
+        destroy_email_domain_block: E-posta alan adÄ± engelini sil
+        destroy_ip_block: IP kuralÄ±nÄ± sil
         destroy_status: Durumu Sil
+        disable_2fa_user: 2AD Kapat
+        disable_custom_emoji: Ã–zel Ä°fadeyi Devre DÄ±ÅŸÄ± BÄ±rak
+        disable_user: KullanÄ±cÄ±yÄ± Devre DÄ±ÅŸÄ± BÄ±rak
+        enable_custom_emoji: Ã–zel Ä°fadeyi EtkinleÅŸtir
+        enable_user: KullanÄ±cÄ±yÄ± EtkinleÅŸtir
+        memorialize_account: HesabÄ± AnÄ±tlaÅŸtÄ±r
+        promote_user: KullanÄ±cÄ±yÄ± YÃ¼kselt
+        remove_avatar_user: Profil Resmini KaldÄ±r
+        reopen_report: Åžikayeti Tekrar AÃ§
+        reset_password_user: ParolayÄ± SÄ±fÄ±rla
+        resolve_report: Åžikayeti Ã‡Ã¶z
+        sensitive_account: HesabÄ±nÄ±zdaki medyayÄ± hassas olarak iÅŸaretleyin
+        silence_account: HesabÄ± Sustur
+        suspend_account: HesabÄ± AskÄ±ya Al
+        unassigned_report: Rapor AtamasÄ±nÄ± KaldÄ±r
+        unsensitive_account: HesabÄ±nÄ±zdaki medyayÄ± hassas olarak iÅŸaretlemeyin
+        unsilence_account: HesabÄ±n Sesini AÃ§
+        unsuspend_account: HesabÄ± AskÄ±dan KaldÄ±r
+        update_announcement: Duyuruyu GÃ¼ncelle
+        update_custom_emoji: Ã–zel Ä°fadeyi GÃ¼ncelle
+        update_domain_block: Engellenen Alan AdÄ±nÄ± GÃ¼ncelle
+        update_status: Durumu GÃ¼ncelle
       actions:
         assigned_to_self_report: "%{name} kendilerine %{target} adlÄ± raporu verdi"
         change_email_user: "%{name}, %{target} kullanÄ±cÄ±sÄ±nÄ±n e-posta adresini deÄŸiÅŸtirdi"
@@ -210,31 +267,36 @@ tr:
         create_domain_allow: "%{target} alan adÄ±, %{name} tarafÄ±ndan beyaz listeye alÄ±ndÄ±"
         create_domain_block: "%{target} alanÄ±, %{name} tarafÄ±ndan engellendi"
         create_email_domain_block: "%{target} e-posta alanÄ±, %{name} tarafÄ±ndan kara listeye alÄ±nmÄ±ÅŸ"
+        create_ip_block: "%{name}, IP %{target} iÃ§in kural oluÅŸturdu"
         demote_user: "%{name} %{target} kullanÄ±cÄ±sÄ±nÄ± dÃ¼ÅŸÃ¼rdÃ¼"
         destroy_announcement: "%{name}, %{target} duyurusunu sildi"
         destroy_custom_emoji: "%{target} emoji, %{name} tarafÄ±ndan kaldÄ±rÄ±ldÄ±"
         destroy_domain_allow: "%{target} alan adÄ±, %{name} tarafÄ±ndan beyaz listeden Ã§Ä±kartÄ±ldÄ±"
         destroy_domain_block: "%{target} alan adÄ±nÄ±n engeli %{name} tarafÄ±ndan kaldÄ±rÄ±ldÄ±"
         destroy_email_domain_block: "%{target} e-posta sunucusu, %{name} tarafÄ±ndan beyaz listeye alÄ±ndÄ±"
+        destroy_ip_block: "%{name}, IP %{target} iÃ§in kuralÄ± sildi"
         destroy_status: "%{name}, %{target} kullanÄ±cÄ±sÄ±nÄ±n durumunu kaldÄ±rdÄ±"
         disable_2fa_user: "%{name}, %{target} kullanÄ±cÄ±sÄ± iÃ§in iki adÄ±m gereksinimini kapattÄ±"
         disable_custom_emoji: "%{target} emoji, %{name} tarafÄ±ndan devre dÄ±ÅŸÄ± bÄ±rakÄ±ldÄ±"
         disable_user: "%{name} %{target} kullanÄ±cÄ±sÄ± iÃ§in oturum aÃ§mayÄ± devre dÄ±ÅŸÄ± bÄ±raktÄ±"
         enable_custom_emoji: "%{name} %{target} iÃ§in emojiyi etkinleÅŸtirdi"
         enable_user: "%{name} %{target} iÃ§in oturum aÃ§mayÄ± etkinleÅŸtirdi"
-        memorialize_account: "%{name} %{target}'in hesabÄ±nÄ± bir hatÄ±ra sayfasÄ±na dÃ¶nÃ¼ÅŸtÃ¼rdÃ¼"
+        memorialize_account: "%{name}, %{target} kiÅŸisinin hesabÄ±nÄ± anÄ±t sayfasÄ±na dÃ¶nÃ¼ÅŸtÃ¼rdÃ¼"
         promote_user: "%{name} %{target} kullanÄ±cÄ±sÄ±nÄ± yÃ¼kseltti"
         remove_avatar_user: "%{name} %{target}'in avatarÄ±nÄ± kaldÄ±rdÄ±"
         reopen_report: "%{name} %{target} ÅŸikayetini yeniden aÃ§tÄ±"
         reset_password_user: "%{name} %{target} kullanÄ±cÄ±sÄ±nÄ±n parolasÄ±nÄ± resetledi"
         resolve_report: "%{name} %{target} ÅŸikayetini Ã§Ã¶zdÃ¼"
+        sensitive_account: "%{name}, %{target} kiÅŸisinin medyasÄ±nÄ± hassas olarak iÅŸaretledi"
         silence_account: "%{name} %{target}'in hesabÄ±nÄ± susturdu"
         suspend_account: "%{name} %{target}'in hesabÄ±nÄ± uzaklaÅŸtÄ±rdÄ±"
         unassigned_report: "%{name} %{target} ÅŸikayetinin atamasÄ±nÄ± geri aldÄ±"
+        unsensitive_account: "%{name}, %{target} kiÅŸisinin medyasÄ±nÄ± hassas olarak iÅŸaretlemedi"
         unsilence_account: "%{name} %{target}'in hesabÄ±nÄ±n susturmasÄ±nÄ± kaldÄ±rdÄ±"
         unsuspend_account: "%{name} %{target}'in hesabÄ±nÄ±n uzaklaÅŸtÄ±rmasÄ±nÄ± kaldÄ±rdÄ±"
         update_announcement: "%{name}, %{target} duyurusunu gÃ¼ncelledi"
         update_custom_emoji: "%{name} %{target} emojiyi gÃ¼ncelledi"
+        update_domain_block: "%{name}, %{target} iÃ§in alan adÄ± engelini gÃ¼ncelledi"
         update_status: "%{name}, %{target} kullanÄ±cÄ±sÄ±nÄ±n durumunu gÃ¼ncelledi"
       deleted_status: "(silinmiÅŸ durum)"
       empty: KayÄ±t bulunamadÄ±.
@@ -252,7 +314,7 @@ tr:
         title: Yeni duyuru
       published_msg: Duyuru baÅŸarÄ±yla yayÄ±nlandÄ±!
       scheduled_for: "%{time} iÃ§in zamanlandÄ±"
-      scheduled_msg: Duyuru yayÄ±nlanmak Ã¼zere planlandÄ±!
+      scheduled_msg: Duyuru yayÄ±nlanmak Ã¼zere zamanlandÄ±!
       title: Duyurular
       unpublished_msg: Duyuru baÅŸarÄ±yla yayÄ±ndan kaldÄ±rÄ±ldÄ±!
       updated_msg: Duyuru baÅŸarÄ±yla gÃ¼ncellendi!
@@ -262,8 +324,8 @@ tr:
       copied_msg: Emojinin yerel kopyasÄ± baÅŸarÄ±yla oluÅŸturuldu
       copy: Kopyala
       copy_failed_msg: Bu emojinin yerel bir kopyasÄ± oluÅŸturulamadÄ±
-      create_new_category: Yeni kategori ekle
-      created_msg: Emoji baÅŸarÄ±yla oluÅŸturuldu!
+      create_new_category: Yeni kategori oluÅŸtur
+      created_msg: Ä°fade baÅŸarÄ±yla oluÅŸturuldu!
       delete: Sil
       destroyed_msg: Emojo baÅŸarÄ±yla yok edildi!
       disable: Devre dÄ±ÅŸÄ± bÄ±rak
@@ -278,6 +340,7 @@ tr:
       listed: Listelenen
       new:
         title: Yeni Ã¶zel emoji ekle
+      not_permitted: Bu iÅŸlemi gerÃ§ekleÅŸtirme izniniz yok
       overwrite: Ãœzerine yaz
       shortcode: KÄ±sa kod
       shortcode_hint: En az 2 karakter, sadece alfanÃ¼merik karakterler ve alt Ã§izgiler
@@ -293,8 +356,8 @@ tr:
       backlog: bekleyen iÅŸler
       config: YapÄ±landÄ±rma
       feature_deletions: Hesap silme
-      feature_invites: Davet linkleri
-      feature_profile_directory: Profil dizini
+      feature_invites: Davet baÄŸlantÄ±larÄ±
+      feature_profile_directory: Profil Dizini
       feature_registrations: KayÄ±tlar
       feature_relay: Federasyon aktarÄ±cÄ±sÄ±
       feature_spam_check: Anti-spam
@@ -311,7 +374,7 @@ tr:
       space: Alan kullanÄ±mÄ±
       title: Kontrol Paneli
       total_users: toplam kullanÄ±cÄ±
-      trends: Trendler
+      trends: GÃ¼ndemler
       week_interactions: bu haftaki etkileÅŸimler
       week_users_active: bu hafta aktif
       week_users_new: bu hafta kullanÄ±cÄ±lar
@@ -376,6 +439,7 @@ tr:
     instances:
       by_domain: Alan adÄ±
       delivery_available: Teslimat mevcut
+      empty: Alan adÄ± bulunamadÄ±.
       known_accounts:
         one: "%{count} bilinen hesap"
         other: "%{count} bilinen hesap"
@@ -399,6 +463,21 @@ tr:
         expired: SÃ¼resi dolmuÅŸ
         title: Filtre
       title: Davetler
+    ip_blocks:
+      add_new: Kural oluÅŸtur
+      created_msg: Yeni IP kuralÄ± baÅŸarÄ±yla eklendi
+      delete: Sil
+      expires_in:
+        '1209600': 2 hafta
+        '15778476': 6 ay
+        '2629746': 1 ay
+        '31556952': 1 yÄ±l
+        '86400': 1 gÃ¼n
+        '94670856': 3 yÄ±l
+      new:
+        title: Yeni IP kuralÄ± oluÅŸtur
+      no_ip_block_selected: HiÃ§biri seÃ§ilmediÄŸinden hiÃ§bir IP kuralÄ± deÄŸiÅŸtirilmedi
+      title: IP kurallarÄ±
     pending_accounts:
       title: Bekleyen hesaplar (%{count})
     relationships:
@@ -476,7 +555,7 @@ tr:
       domain_blocks:
         all: Herkes iÃ§in
         disabled: HiÃ§ kimseye
-        title: Alan adÄ± bloklarÄ±nÄ± gÃ¶ster
+        title: Engellenen alan adlarÄ±nÄ± gÃ¶ster
         users: Oturum aÃ§an yerel kullanÄ±cÄ±lara
       domain_blocks_rationale:
         title: GerekÃ§eyi gÃ¶ster
@@ -547,7 +626,7 @@ tr:
         title: Ã–n inceleme yapmadan etiketlerin trend olmasÄ±na izin ver
       trends:
         desc_html: Åžu anda trend olan ve daha Ã¶nce incelenen etiketleri herkese aÃ§Ä±k olarak gÃ¶ster
-        title: Trend etiketler
+        title: GÃ¼ndem etiketleri
     site_uploads:
       delete: YÃ¼klenen dosyayÄ± sil
       destroyed_msg: Site yÃ¼klemesi baÅŸarÄ±yla silindi!
@@ -572,7 +651,7 @@ tr:
       context: Ä°Ã§erik
       directory: Dizinde
       in_directory: Dizinde %{count}
-      last_active: Son aktivite
+      last_active: Son etkinlik
       most_popular: En popÃ¼ler
       most_recent: En yeni
       name: Etiket
@@ -594,8 +673,8 @@ tr:
       body: Yeni hesabÄ±n detaylarÄ± aÅŸaÄŸÄ±dadÄ±r. Bu baÅŸvuruyu onaylayabilir ya da reddedebilirsiniz.
       subject: "%{instance} Ã¼zerinde gÃ¶zden geÃ§irmek iÃ§in yeni hesap (%{username})"
     new_report:
-      body: "%{reporter} %{target}'i ÅŸikayet etti"
-      body_remote: "%{domain}'den birisi %{target}'i ÅŸikayet etti"
+      body: "%{reporter}, %{target} kiÅŸisini bildirdi"
+      body_remote: "%{domain} alan adÄ±ndan birisi %{target} kiÅŸisini bildirdi"
       subject: "%{instance} iÃ§in yeni ÅŸikayet (#%{id})"
     new_trending_tag:
       body: "#%{name} etiketi bugÃ¼n trend, ancak daha Ã¶nce incelenmedi. Siz izin vermediÄŸiniz sÃ¼rece herkese aÃ§Ä±k olarak gÃ¶sterilmeyecek, ya da bir daha asla hakkÄ±nda bir ÅŸey duymamak iÃ§in olduÄŸu ÅŸekliyle formu kaydedin."
@@ -622,9 +701,9 @@ tr:
   application_mailer:
     notification_preferences: E-posta tercihlerini deÄŸiÅŸtir
     salutation: "%{name},"
-    settings: 'E-mail tercihlerini deÄŸiÅŸtir: %{link}'
+    settings: 'E-posta tercihlerini deÄŸiÅŸtir: %{link}'
     view: 'GÃ¶rÃ¼ntÃ¼le:'
-    view_profile: Profili GÃ¶rÃ¼ntÃ¼le
+    view_profile: Profili gÃ¶rÃ¼ntÃ¼le
     view_status: Durumu gÃ¶rÃ¼ntÃ¼le
   applications:
     created: Uygulama baÅŸarÄ±yla oluÅŸturuldu
@@ -636,32 +715,35 @@ tr:
     your_token: EriÅŸim belirteciniz
   auth:
     apply_for_account: Davet et
-    change_password: Parola
-    checkbox_agreement_html: <a href="%{rules_path}" target="_blank">sunucu kurallarÄ±</a> ve<a href="%{terms_path}" target="_blank">hizmet ÅŸartlarÄ±nÄ±</a> kabul ediyorum
+    change_password: Åžifre
+    checkbox_agreement_html: <a href="%{rules_path}" target="_blank">Sunucu kurallarÄ±nÄ±</a> ve <a href="%{terms_path}" target="_blank">hizmet ÅŸartlarÄ±nÄ±</a> kabul ediyorum
     checkbox_agreement_without_rules_html: <a href="%{terms_path}" target="_blank">Hizmet ÅŸartlarÄ±nÄ±</a> kabul ediyorum
     delete_account: HesabÄ± sil
-    delete_account_html: HesabÄ±nÄ±zÄ± silmek isterseniz, <a href="%{path}">buradan devam edebilirsiniz</a>. Sizden onay istenecektir.
+    delete_account_html: HesabÄ±nÄ±zÄ± silmek isterseniz, <a href="%{path}">buradan devam edebilirsiniz </a>. OnaylamanÄ±z istenecektir.
     description:
-      prefix_invited_by_user: "@%{name} sizi Mastodon'un bu sunucusuna katÄ±lmaya davet ediyor!"
+      prefix_invited_by_user: "@%{name} sizi bu Mastodon sunucusuna katÄ±lmaya davet ediyor!"
       prefix_sign_up: BugÃ¼n Mastodon'a kaydolun!
       suffix: Bir hesapla, kiÅŸileri takip edebilir, gÃ¼ncellemeler gÃ¶nderebilir, herhangi bir Mastodon sunucusundan kullanÄ±cÄ±larla mesaj alÄ±ÅŸveriÅŸinde bulunabilir ve daha birÃ§ok ÅŸey yapabilirsin!
-    didnt_get_confirmation: Hesap doÄŸrulama mailini almadÄ±nÄ±z mÄ±?
-    forgot_password: ParolanÄ±zÄ± unuttunuz mu?
+    didnt_get_confirmation: DoÄŸrulama talimatlarÄ±nÄ± almadÄ±nÄ±z mÄ±?
+    dont_have_your_security_key: GÃ¼venlik anahtarÄ±nÄ±z yok mu?
+    forgot_password: Åžifrenizi mi unuttunuz?
     invalid_reset_password_token: Parola sÄ±fÄ±rlama belirteci geÃ§ersiz veya sÃ¼resi dolmuÅŸ. LÃ¼tfen yeni bir tane talep edin.
-    login: GiriÅŸ yap
-    logout: Ã‡Ä±kÄ±ÅŸ
-    migrate_account: FarklÄ± bir hesaba taÅŸÄ±nÄ±n
+    link_to_otp: Telefonunuzdan iki adÄ±mlÄ± bir kod veya bir kurtarma kodu girin
+    link_to_webauth: GÃ¼venlik anahtarÄ± cihazÄ±nÄ±zÄ± kullanÄ±n
+    login: Oturum aÃ§
+    logout: Oturumu kapat
+    migrate_account: FarklÄ± bir hesaba taÅŸÄ±yÄ±n
     migrate_account_html: Bu hesabÄ± baÅŸka bir hesaba yÃ¶nlendirmek istiyorsanÄ±z, <a href="%{path}">buradan yapÄ±landÄ±rabilirsiniz</a>.
-    or_log_in_with: Veya giriÅŸ yapÄ±n
+    or_log_in_with: 'Veya ÅŸununla oturum aÃ§Ä±n:'
     providers:
       cas: CAS
       saml: SAML
-    register: Ãœye ol
+    register: Kaydol
     registration_closed: "%{instance} yeni Ã¼yeler kabul etmemektedir"
-    resend_confirmation: DoÄŸrulama mailini tekrar gÃ¶nder
-    reset_password: ParolayÄ± deÄŸiÅŸtir
-    security: Kimlik bilgileri
-    set_new_password: Yeni parola oluÅŸtur
+    resend_confirmation: Onaylama talimatlarÄ±nÄ± tekrar gÃ¶nder
+    reset_password: Åžifreyi sÄ±fÄ±rla
+    security: GÃ¼venlik
+    set_new_password: Yeni ÅŸifre belirle
     setup:
       email_below_hint_html: EÄŸer aÅŸaÄŸÄ±daki e-posta adresi yanlÄ±ÅŸsa, onu burada deÄŸiÅŸtirebilir ve yeni bir doÄŸrulama e-postasÄ± alabilirsiniz.
       email_settings_hint_html: Onaylama e-postasÄ± %{email} adresine gÃ¶nderildi. EÄŸer bu e-posta adresi doÄŸru deÄŸilse, hesap ayarlarÄ±ndan deÄŸiÅŸtirebilirsiniz.
@@ -672,9 +754,12 @@ tr:
       functional: HesabÄ±nÄ±z tamamen kullanÄ±ma hazÄ±r.
       pending: BaÅŸvurunuz personelimiz tarafÄ±ndan gÃ¶zden geÃ§irilmeyi beklemektedir. Bu biraz zaman alabilir. BaÅŸvurunuz onaylanÄ±rsa bir e-posta alacaksÄ±nÄ±z.
       redirecting_to: HesabÄ±nÄ±z aktif deÄŸil Ã§Ã¼nkÃ¼ ÅŸu anda %{acct} adresine yÃ¶nlendirilmektedir.
+    too_fast: Form Ã§ok hÄ±zlÄ± gÃ¶nderildi, tekrar deneyin.
     trouble_logging_in: Oturum aÃ§arken sorun mu yaÅŸÄ±yorsunuz?
+    use_security_key: GÃ¼venlik anahtarÄ±nÄ± kullan
   authorize_follow:
     already_following: Bu hesabÄ± zaten takip ediyorsunuz
+    already_requested: Bu hesaba zaten takip isteÄŸi gÃ¶nderdiniz
     error: Uzak hesap aranÄ±rken bir hata oluÅŸtu
     follow: Takip et
     follow_request: 'Åžuna takip isteÄŸi gÃ¶nderdiniz:'
@@ -683,15 +768,20 @@ tr:
       close: Ya da, sadece bu pencereyi kapatabilirsiniz.
       return: KullanÄ±cÄ±nÄ±n profilini gÃ¶ster
       web: Web'e git
-    title: "%{acct}'i takip et"
+    title: "%{acct} takip et"
   challenge:
     confirm: Devam et
     hint_html: "<strong>Ä°pucu:</strong> Ã–nÃ¼mÃ¼zdeki saat boyunca sana parolanÄ± sormayacaÄŸÄ±z."
-    invalid_password: GeÃ§ersiz parola
-    prompt: Devam etmek parolayÄ± doÄŸrulayÄ±n
+    invalid_password: GeÃ§ersiz ÅŸifre
+    prompt: Devam etmek iÃ§in ÅŸifreyi doÄŸrulayÄ±n
+  crypto:
+    errors:
+      invalid_key: geÃ§erli bir Ed25519 veya Curve25519 anahtarÄ± deÄŸil
+      invalid_signature: geÃ§erli bir Ed25519 imzasÄ± deÄŸil
   date:
     formats:
-      default: "%b %d, %Y"
+      default: "%d %b %Y"
+      with_month_name: "%d %B %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}sa"
@@ -724,7 +814,7 @@ tr:
       username_available: KullanÄ±cÄ± adÄ±nÄ±z tekrar kullanÄ±labilir olacaktÄ±r
       username_unavailable: KullanÄ±cÄ± adÄ±nÄ±z kullanÄ±lamaz kalacaktÄ±r
   directories:
-    directory: Profil dizini
+    directory: Profil Dizini
     explanation: KullanÄ±cÄ±larÄ± ilgi alanlarÄ±na gÃ¶re keÅŸfedin
     explore_mastodon: "%{title} sunucusunu keÅŸfet"
   domain_validator:
@@ -753,14 +843,15 @@ tr:
       download: ArÅŸivinizi indirin
       hint_html: "<strong>TootlarÄ±nÄ±zÄ±n ve yÃ¼klediÄŸiniz ortamlarÄ±n</strong> bir arÅŸivini talep edebilirsiniz. DÄ±ÅŸa aktarÄ±lan veriler, herhangi bir uyumlu yazÄ±lÄ±m tarafÄ±ndan okunabilen ActivityPub formatÄ±nda olacaktÄ±r. Her 7 gÃ¼nde bir arÅŸiv talep edebilirsiniz."
       in_progress: ArÅŸivinizi derliyoruz...
-      request: ArÅŸiv isteÄŸi
+      request: ArÅŸivinizi isteyin
       size: Boyut
-    blocks: Engelledikleriniz
+    blocks: Engellediklerin
+    bookmarks: Yer imleri
     csv: CSV
-    domain_blocks: Alan adÄ± bloklarÄ±
+    domain_blocks: Alan adÄ± engelleri
     lists: Listeler
-    mutes: SusturduklarÄ±nÄ±z
-    storage: Ortam deposu
+    mutes: Sessize aldÄ±klarÄ±n
+    storage: Medya depolamasÄ±
   featured_tags:
     add_new: Yeni ekle
     errors:
@@ -788,7 +879,7 @@ tr:
     developers: GeliÅŸtiriciler
     more: Daha Fazlaâ€¦
     resources: Kaynaklar
-    trending_now: Trendler
+    trending_now: Åžu an gÃ¼ndemde
   generic:
     all: TÃ¼mÃ¼
     changes_saved_msg: DeÄŸiÅŸiklikler baÅŸarÄ±yla kaydedildi!
@@ -803,8 +894,8 @@ tr:
   html_validator:
     invalid_markup: 'geÃ§ersiz HTML markup iÃ§ermektedir: %{error}'
   identity_proofs:
-    active: Aktif
-    authorize: Evet, yetkilendir
+    active: Etkin
+    authorize: Evet, izin ver
     authorize_connection_prompt: Bu kriptolu baÄŸlantÄ±yÄ± yetkilendir?
     errors:
       failed: Kriptolu baÄŸlantÄ± baÅŸarÄ±sÄ±z oldu. LÃ¼tfen %{provider} Ã¼zerinden tekrar deneyin.
@@ -818,8 +909,10 @@ tr:
     inactive: Pasif
     publicize_checkbox: 'Ve bunu tootla:'
     publicize_toot: 'Ä°spatlandÄ±! Ben %{service} Ã¼zerinde %{username}: %{url}'
+    remove: Hesaptan kanÄ±tÄ± kaldÄ±r
+    removed: KanÄ±t hesaptan baÅŸarÄ±yla kaldÄ±rÄ±ldÄ±
     status: DoÄŸrulama durumu
-    view_proof: KanÄ±t gÃ¶rÃ¼ntÃ¼le
+    view_proof: KanÄ±tÄ± gÃ¶rÃ¼ntÃ¼le
   imports:
     modes:
       merge: BirleÅŸtir
@@ -830,6 +923,7 @@ tr:
     success: Verileriniz baÅŸarÄ±yla yÃ¼klendi ve zaman iÃ§inde iÅŸlenecek
     types:
       blocking: Engellenenler listesi
+      bookmarks: Yer imleri
       domain_blocking: Alan adÄ± engelleme listesi
       following: Takip edilenler listesi
       muting: Susturulanlar listesi
@@ -846,8 +940,8 @@ tr:
       '604800': 1 hafta
       '86400': 1 gÃ¼n
     expires_in_prompt: Asla
-    generate: OluÅŸtur
-    invited_by: 'TarafÄ±ndan davet edildi:'
+    generate: Davet baÄŸlantÄ±sÄ± oluÅŸtur
+    invited_by: 'Davet edildiniz:'
     max_uses:
       one: 1 kullanÄ±m
       other: "%{count} kullanÄ±m"
@@ -859,11 +953,12 @@ tr:
     title: Ä°nsanlarÄ± davet et
   lists:
     errors:
-      limit: Maksimum liste miktarÄ±na ulaÅŸtÄ±nÄ±z
+      limit: En yÃ¼ksek liste sayÄ±sÄ±na ulaÅŸtÄ±nÄ±z
   media_attachments:
     validations:
-      images_and_video: HalihazÄ±rda gÃ¶rsel iÃ§eren bir gÃ¶nderiye video ekleyemezsiniz
-      too_many: 4'ten fazla dosya ekleyemezsiniz
+      images_and_video: Zaten resim iÃ§eren bir duruma video eklenemez
+      not_ready: Ä°ÅŸlemi tamamlanmamÄ±ÅŸ dosyalar eklenemez. Birazdan tekrar deneyin!
+      too_many: 4'ten fazla dosya eklenemiyor
   migrations:
     acct: TaÅŸÄ±ndÄ±
     cancel: YÃ¶nlendirmeyi iptal et
@@ -883,6 +978,7 @@ tr:
     on_cooldown: Son zamanlarda hesabÄ±nÄ±zÄ± taÅŸÄ±dÄ±nÄ±z. Bu iÅŸlev %{count} gÃ¼n iÃ§inde tekrar kullanÄ±labilir olacaktÄ±r.
     past_migrations: GeÃ§miÅŸ taÅŸÄ±nmalar
     proceed_with_move: TakipÃ§ileri taÅŸÄ±
+    redirected_msg: HesabÄ±nÄ±z artÄ±k %{acct} adresine yÃ¶nlendiriliyor.
     redirecting_to: HesabÄ±nÄ±z %{acct} hesabÄ±na yÃ¶nlendirilmektedir.
     set_redirect: YÃ¶nlendirme ayarla
     warning:
@@ -895,41 +991,45 @@ tr:
       other_data: BaÅŸka bir veri otomatik olarak taÅŸÄ±nmayacaktÄ±r
       redirect: Mevcut hesabÄ±nÄ±zÄ±n profili bir yÃ¶nlendirme bildirimi ile gÃ¼ncellenecek ve aramalarÄ±n dÄ±ÅŸÄ±nda tutulacaktÄ±r
   moderation:
-    title: YÃ¶netim
+    title: Denetim
+  move_handler:
+    carry_blocks_over_text: Bu kullanÄ±cÄ± engellediÄŸiniz %{acct} adresinden taÅŸÄ±ndÄ±.
+    carry_mutes_over_text: Bu kullanÄ±cÄ± sessize aldÄ±ÄŸÄ±nÄ±z %{acct} adresinden taÅŸÄ±ndÄ±.
+    copy_account_note_text: 'Bu kullanÄ±cÄ± %{acct} adresinden taÅŸÄ±ndÄ±, iÅŸte onlarla ilgili Ã¶nceki notlarÄ±nÄ±z:'
   notification_mailer:
     digest:
       action: TÃ¼m bildirimleri gÃ¶rÃ¼ntÃ¼le
       body: Son ziyaretiniz olan %{since}'den beri'da kaÃ§Ä±rdÄ±ÄŸÄ±nÄ±z ÅŸeylerin Ã¶zeti
       mention: "%{name} senden bahsetti:"
       new_followers_summary:
-        one: Yeni bir takipÃ§iniz var!
-        other: Yeni %{count} takipÃ§iniz var!
+        one: AyrÄ±ca, uzaktayken yeni bir takipÃ§i kazandÄ±nÄ±z! YaÅŸasÄ±n!
+        other: AyrÄ±ca, uzaktayken %{count} yeni takipÃ§i kazandÄ±nÄ±z! Ä°nanÄ±lmaz!
       subject:
-        one: "Son ziyaretinizden beri 1 yeni bildiriminiz var \U0001F418"
-        other: "Son ziyaretinizden beri %{count} yeni bildiriminiz var \U0001F418"
+        one: "Son ziyaretinizden bu yana 1 yeni bildirim \U0001F418"
+        other: "Son ziyaretinizden bu yana %{count} yeni bildirim \U0001F418"
       title: Senin yokluÄŸunda...
     favourite:
-      body: "%{name} durumunuzu favorilere ekledi:"
-      subject: "%{name} favorilere ekledi"
-      title: Yeni favori
+      body: "%{name} durumunu beÄŸendi:"
+      subject: "%{name} durumunu beÄŸendi"
+      title: Yeni beÄŸeni
     follow:
-      body: "%{name} sizi takip etmeye baÅŸladÄ±!"
-      subject: "%{name} sizi takip etmeye baÅŸladÄ±"
+      body: "%{name} artÄ±k seni takip ediyor!"
+      subject: "%{name} artÄ±k seni takip ediyor"
       title: Yeni takipÃ§i
     follow_request:
       action: Takip isteklerini yÃ¶net
-      body: "%{name} size takip isteÄŸi gÃ¶nderdi"
-      subject: 'Takip isteÄŸi: %{name}'
+      body: "%{name} sana takip isteÄŸi gÃ¶nderdi"
+      subject: 'Bekleyen takipÃ§i: %{name}'
       title: Yeni takip isteÄŸi
     mention:
-      action: YanÄ±t
-      body: "%{name} sizden bahsetti:"
-      subject: "%{name} sizden bahsetti"
+      action: YanÄ±tla
+      body: "%{name} senden bahsetti:"
+      subject: "%{name} senden bahsetti"
       title: Yeni bahsetme
     reblog:
-      body: "%{name} durumunuzu boost etti:"
-      subject: "%{name} durumunuzu boost etti"
-      title: Yeni gÃ¶nderi
+      body: "%{name} durumunuzu boostladÄ±:"
+      subject: "%{name} durumunuzu boostladÄ±"
+      title: Yeni boost
   notifications:
     email_events: E-posta bildirimi gÃ¶nderilecek etkinlikler
     email_events_hint: 'Bildirim almak istediÄŸiniz olaylarÄ± seÃ§in:'
@@ -939,15 +1039,23 @@ tr:
       decimal_units:
         format: "%n%u"
         units:
-          billion: B
-          million: M
-          quadrillion: Q
-          thousand: K
-          trillion: T
+          billion: Mr
+          million: Mn
+          quadrillion: Kn
+          thousand: Bn
+          trillion: Tn
+  otp_authentication:
+    code_hint: Onaylamak iÃ§in authenticator uygulamanÄ±z tarafÄ±ndan oluÅŸturulan kodu girin
+    description_html: Bir authenticator uygulamasÄ±nÄ± kullanarak <strong>iki adÄ±mlÄ± kimlik doÄŸrulamayÄ±</strong> etkinleÅŸtirirseniz, giriÅŸ yapmak iÃ§in telefonunuzun elinizde olmasÄ± gerekir ve telefonunuz giriÅŸ yapmanÄ±z iÃ§in kodlar oluÅŸturur.
+    enable: EtkinleÅŸtir
+    instructions_html: "<strong>Bu QR kodunu Google Authenticator'a veya telefonunuzdaki benzer bir TOTP uygulamasÄ±na taratÄ±n.</strong> Bundan sonra, bu uygulama giriÅŸ yaparken girmeniz gereken kodu Ã¼retecektir."
+    manual_instructions: 'QR kodunu taratamÄ±yorsanÄ±z ve elle girmeniz gerekiyorsa, buradaki gizli dÃ¼z metni girebilirsiniz:'
+    setup: YapÄ±landÄ±r
+    wrong_code: Girilen kod geÃ§ersiz! Sunucu zamanÄ± ve cihaz zamanÄ± doÄŸru mu?
   pagination:
     newer: Daha yeni
     next: Sonraki
-    older: Daha Eski
+    older: Daha eski
     prev: Ã–nceki
     truncate: "&hellip;"
   polls:
@@ -971,47 +1079,48 @@ tr:
       unrecognized_emoji: tanÄ±nan bir emoji deÄŸil
   relationships:
     activity: Hesap etkinliÄŸi
-    dormant: AtÄ±l
+    dormant: Uykuda
+    follow_selected_followers: SeÃ§ili takipÃ§ileri takip et
     followers: TakipÃ§iler
     following: Takip edilenler
     invited: Davet edildi
-    last_active: Son aktivite
-    most_recent: En son
+    last_active: Son etkinlik
+    most_recent: En yeni
     moved: TaÅŸÄ±ndÄ±
-    mutual: Ortak
-    primary: Birincil
+    mutual: KarÅŸÄ±lÄ±klÄ±
+    primary: Ana
     relationship: Ä°liÅŸki
-    remove_selected_domains: SeÃ§ili alan adlarÄ±ndan tÃ¼m takipÃ§ileri kaldÄ±r
+    remove_selected_domains: SeÃ§ilen alan adlarÄ±n tÃ¼m takipÃ§ileri kaldÄ±r
     remove_selected_followers: SeÃ§ili takipÃ§ileri kaldÄ±r
     remove_selected_follows: SeÃ§ili kullanÄ±cÄ±larÄ± takip etmeyi bÄ±rak
     status: Hesap durumu
   remote_follow:
-    acct: Takip edeceÄŸiniz kiÅŸiyi kullaniciadi@sunuculinki ÅŸeklinde giriniz
-    missing_resource: HesabÄ±nÄ±z iÃ§in yÃ¶nlendirme linki bulunamadÄ±
+    acct: Ä°ÅŸlem yapmak istediÄŸiniz kullaniciadi@alanadini girin
+    missing_resource: HesabÄ±nÄ±z iÃ§in gerekli yÃ¶nlendirme URL'si bulunamadÄ±
     no_account_html: HesabÄ±nÄ±z yok mu? <a href='%{sign_up_path}' target='_blank'>Buradan kaydolabilirsiniz</a>
-    proceed: Takip onayÄ±
+    proceed: Takip etmek iÃ§in devam edin
     prompt: Bu kullanÄ±cÄ±yÄ± takip etmek istediÄŸinize emin misiniz?
     reason_html: "<strong>Bu adÄ±m neden gerekli?</strong><code>%{instance}</code> kayÄ±tlÄ± olduÄŸunuz sunucu olmayabilir, bu yÃ¼zden Ã¶nce sizi kendi sunucunuza yÃ¶nlendirmemiz gerekmektedir."
   remote_interaction:
     favourite:
-      proceed: Favorilere eklemek iÃ§in ilerle
-      prompt: 'Bu tootu favorilerinize eklemek istiyorsunuz:'
+      proceed: BeÄŸenmek iÃ§in devam edin
+      prompt: 'Bu tootu beÄŸenmek istiyorsunuz:'
     reblog:
-      proceed: Yinelemek iÃ§in ilerle
-      prompt: 'Bu tootu yinelemek istiyorsunuz:'
+      proceed: Boostlamak iÃ§in devam edin
+      prompt: 'Bu tootu boostlamak istiyorsunuz:'
     reply:
-      proceed: Cevap vermek iÃ§in ilerle
-      prompt: 'Bu toota cevap vermek istiyorsunuz:'
+      proceed: YanÄ±tlamak iÃ§in devam edin
+      prompt: 'Bu tootu yanÄ±tlamak istiyorsunuz:'
   scheduled_statuses:
     over_daily_limit: O gÃ¼n iÃ§in %{limit} zamanlanmÄ±ÅŸ toot sÄ±nÄ±rÄ±nÄ± aÅŸtÄ±nÄ±z
     over_total_limit: "%{limit} zamanlanmÄ±ÅŸ toot sÄ±nÄ±rÄ±nÄ± aÅŸtÄ±nÄ±z"
     too_soon: Programlanan tarih bugÃ¼nden ileri bir tarihte olmalÄ±dÄ±r
   sessions:
-    activity: Son aktivite
+    activity: Son etkinlik
     browser: TarayÄ±cÄ±
     browsers:
       alipay: Alipay
-      blackberry: BlackBerry
+      blackberry: Blackberry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1027,9 +1136,9 @@ tr:
       safari: Safari
       uc_browser: UC Browser
       weibo: Weibo
-    current_session: Åžu anki oturum
-    description: "%{platform} Ã¼zerinde %{browser}"
-    explanation: Bunlar ÅŸu anda Mastodon hesabÄ±nÄ±zda oturum aÃ§an web tarayÄ±cÄ±larÄ±dÄ±r.
+    current_session: GeÃ§erli oturum
+    description: "%{platform} - %{browser}"
+    explanation: Bunlar, Mastodon hesabÄ±nÄ±zda ÅŸu anda oturum aÃ§mÄ±ÅŸ web tarayÄ±cÄ±larÄ±dÄ±r.
     ip: IP
     platforms:
       adobe_air: Adobe Air
@@ -1038,13 +1147,13 @@ tr:
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
-      linux: GNU/Linux
-      mac: Mac
+      linux: Linux
+      mac: macOS
       other: bilinmeyen platform
       windows: Windows
-      windows_mobile: Windows Mobil
+      windows_mobile: Windows Mobile
       windows_phone: Windows Phone
-    revoke: Ä°ptal
+    revoke: Ä°ptal Et
     revoke_success: Oturum baÅŸarÄ±yla iptal edildi
     title: Oturumlar
   settings:
@@ -1052,22 +1161,23 @@ tr:
     account_settings: Hesap ayarlarÄ±
     aliases: Hesap takma adlarÄ±
     appearance: GÃ¶rÃ¼nÃ¼m
-    authorized_apps: Yetkilendirilen uygulamalar
+    authorized_apps: Yetkili uygulamalar
     back: Mastodon'a geri dÃ¶n
     delete: Hesap silme
     development: GeliÅŸtirme
     edit_profile: Profili dÃ¼zenle
-    export: DÄ±ÅŸa aktar
-    featured_tags: Ã–ne Ã§Ä±kan hashtag'ler
-    identity_proofs: Kimlik belgesi
+    export: Veriyi dÄ±ÅŸa aktar
+    featured_tags: Ã–ne Ã§Ä±kan etiketler
+    identity_proofs: Kimlik kanÄ±tlarÄ±
     import: Ä°Ã§e aktar
-    import_and_export: Ä°Ã§e al ve dÄ±ÅŸarÄ± aktar
+    import_and_export: Ä°Ã§e ve dÄ±ÅŸa aktar
     migrate: Hesap taÅŸÄ±ma
-    notifications: Bildirim
+    notifications: Bildirimler
     preferences: Tercihler
     profile: Profil
     relationships: Takip edilenler ve takipÃ§iler
-    two_factor_authentication: Ä°ki-faktÃ¶rlÃ¼ doÄŸrulama
+    two_factor_authentication: Ä°ki adÄ±mlÄ± doÄŸrulama
+    webauthn_authentication: GÃ¼venlik anahtarlarÄ±
   spam_check:
     spam_detected: Bu otomatik bir ÅŸikayettir. Spam tespit edildi.
   statuses:
@@ -1077,16 +1187,18 @@ tr:
         other: "%{count} ses"
       description: 'Ekli: %{attached}'
       image:
-        one: "%{count} gÃ¶rsel"
-        other: "%{count} gÃ¶rsel"
+        one: "%{count} resim"
+        other: "%{count} resim"
       video:
         one: "%{count} video"
         other: "%{count} video"
-    boosted_from_html: "%{acct_link} den yinelendi"
+    boosted_from_html: "%{acct_link} kiÅŸisinden boostladÄ±"
     content_warning: 'Ä°Ã§erik uyarÄ±sÄ±: %{warning}'
     disallowed_hashtags:
       one: 'izin verilmeyen bir etiket iÃ§eriyordu: %{tags}'
       other: 'izin verilmeyen hashtag''leri iÃ§eriyordu: %{tags}'
+    errors:
+      in_reply_not_found: YanÄ±tlamaya Ã§alÄ±ÅŸtÄ±ÄŸÄ±nÄ±z durum yok gibi gÃ¶rÃ¼nÃ¼yor.
     language_detection: Dili otomatik olarak algÄ±la
     open_in_web: Web sayfasÄ±nda aÃ§
     over_character_limit: "%{max} karakter limiti aÅŸÄ±ldÄ±"
@@ -1094,7 +1206,7 @@ tr:
       limit: Hali hazÄ±rda maksimum sayÄ±da tootu sabitlediniz
       ownership: BaÅŸkasÄ±nÄ±n tootu sabitlenemez
       private: Halka aÃ§Ä±k olmayan toot sabitlenemez
-      reblog: Bir yineleme sabitlenemez
+      reblog: Bir boost sabitlenemez
     poll:
       total_people:
         one: "%{count} kiÅŸi"
@@ -1102,9 +1214,11 @@ tr:
       total_votes:
         one: "%{count} oy"
         other: "%{count} oy"
-      vote: Oy
-    show_more: Daha fazla
-    show_thread: Mesaj dizisini gÃ¶ster
+      vote: Oy Ver
+    show_more: Daha fazlasÄ±nÄ± gÃ¶ster
+    show_newer: Yenileri gÃ¶ster
+    show_older: Eskileri gÃ¶ster
+    show_thread: Konuyu gÃ¶ster
     sign_in_to_participate: Sohbete katÄ±lmak iÃ§in oturum aÃ§Ä±n
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1116,7 +1230,7 @@ tr:
       unlisted_long: Herkes gÃ¶rebilir fakat herkese aÃ§Ä±k zaman tÃ¼nellerinde listelenmez
   stream_entries:
     pinned: SabitlenmiÅŸ toot
-    reblogged: boost edildi
+    reblogged: boostladÄ±
     sensitive_content: Hassas iÃ§erik
   tags:
     does_not_match_previous_name: Ã¶nceki adla eÅŸleÅŸmiyor
@@ -1209,32 +1323,38 @@ tr:
     mastodon-light: Mastodon (AÃ§Ä±k)
   time:
     formats:
-      default: "%b %d, %Y, %H:%M"
+      default: "%d %b %Y %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Onaylamak iÃ§in kimlik doÄŸrulama uygulamanÄ±zÄ±n oluÅŸturduÄŸu kodu giriniz
-    description_html: EÄŸer <strong>iki-faktÃ¶rlÃ¼ kimlik doÄŸrulamayÄ±</strong> aktif ederseniz, giriÅŸ yaparken sizin iÃ§in giriÅŸ kodu Ã¼reten telefonunuza ihtiyaÃ§ duyacaksÄ±nÄ±z.
-    disable: Devre dÄ±ÅŸÄ± bÄ±rak
-    enable: AktifleÅŸtir
+    add: Ekle
+    disable: 2FA'yÄ± devre dÄ±ÅŸÄ± bÄ±rak
+    disabled_success: Ä°ki adÄ±mlÄ± kimlik doÄŸrulama baÅŸarÄ±yla devre dÄ±ÅŸÄ± bÄ±rakÄ±ldÄ±
+    edit: DÃ¼zenle
     enabled: Ä°ki adÄ±mlÄ± kimlik doÄŸrulama etkin
-    enabled_success: Ä°ki-faktÃ¶rlÃ¼ kimlik doÄŸrulama baÅŸarÄ±yla aktif edildi
-    generate_recovery_codes: Kurtarma KodlarÄ±nÄ± OluÅŸtur
-    instructions_html: <strong>Bu QR kodunu, telefonunuzdaki <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2">Google Authenticator</a> veya benzer bir TOTP uygulamasÄ±yla taratÄ±nÄ±z</strong>. Bundan sonra giriÅŸ yaparken uygulamanÄ±n Ã¼rettiÄŸi kodu kullanarak giriÅŸ yapacaksÄ±nÄ±z.
+    enabled_success: Ä°ki adÄ±mlÄ± kimlik doÄŸrulama baÅŸarÄ±yla etkinleÅŸtirildi
+    generate_recovery_codes: Kurtarma kodlarÄ± oluÅŸtur
     lost_recovery_codes: Kurtarma kodlarÄ± telefonunuzu kaybettiÄŸiniz durumlarda hesabÄ±nÄ±za eriÅŸim yapabilmenize olanak tanÄ±r. EÄŸer kurtarma kodlarÄ±nÄ±zÄ± kaybettiyseniz burada tekrar oluÅŸturabilirsiniz. Eski kurtarma kodlarÄ±nÄ±z geÃ§ersiz hale gelecektir.
-    manual_instructions: 'EÄŸer QR kodunu taratamÄ±yorsanÄ±z ve elle giriÅŸ yapmanÄ±z gerekiyorsa buradaki gizli dÃ¼z metni girebilirsiniz:'
+    methods: Ä°ki adÄ±mlÄ± doÄŸrulama yÃ¶ntemleri
+    otp: Authenticator uygulamasÄ±
     recovery_codes: Kurtarma kodlarÄ±nÄ± yedekle
-    recovery_codes_regenerated: Kurtarma kodlarÄ± baÅŸarÄ±yla oluÅŸturuldu
+    recovery_codes_regenerated: Kurtarma kodlarÄ± baÅŸarÄ±yla yeniden oluÅŸturuldu
     recovery_instructions_html: 'EÄŸer telefonunuza eriÅŸiminizi kaybederseniz, aÅŸaÄŸÄ±daki kurtarma kodlarÄ±ndan birini kullanarak hesabÄ±nÄ±za giriÅŸ yapabilirsiniz. Kurtarma kodlarÄ±nÄ±zÄ± gÃ¼venli halde tutunuz. Ã–rneÄŸin: kodlarÄ±n Ã§Ä±ktÄ±sÄ±nÄ± alÄ±p diÄŸer Ã¶nemli belgeleriniz ile birlikte saklayabilirsiniz.'
-    setup: Kuruluma baÅŸla
-    wrong_code: GirdiÄŸiniz kod geÃ§ersiz! Telefonunuzun saati geri/ileri kalmÄ±ÅŸ olabilir.
+    webauthn: GÃ¼venlik anahtarlarÄ±
   user_mailer:
     backup_ready:
-      explanation: Mastodon hesabÄ±nÄ±zÄ±n tam bir yedeÄŸini istediniz. Åžimdi indirmeye hazÄ±r!
+      explanation: Mastodon hesabÄ±nÄ±zÄ±n tam yedeÄŸini istemiÅŸtiniz. Åžimdi indirilebilir durumda!
       subject: ArÅŸiviniz indirilmeye hazÄ±r
       title: ArÅŸiv paketlemesi
+    sign_in_token:
+      details: 'Ä°ÅŸte bu giriÅŸimin ayrÄ±ntÄ±larÄ±:'
+      explanation: 'TanÄ±nmayan bir IP adresinden hesabÄ±nÄ±zda oturum aÃ§ma denemesi tespit ettik. Bu sizseniz, lÃ¼tfen oturum aÃ§ma sorgulama sayfasÄ±na aÅŸaÄŸÄ±daki gÃ¼venlik kodunu girin:'
+      further_actions: 'Bu siz deÄŸildiyseniz, lÃ¼tfen ÅŸifrenizi deÄŸiÅŸtirin ve hesabÄ±nÄ±zda iki faktÃ¶rlÃ¼ kimlik doÄŸrulamayÄ± etkinleÅŸtirin. Bunu buradan yapabilirsiniz:'
+      subject: LÃ¼tfen oturum aÃ§ma giriÅŸimini onaylayÄ±n
+      title: Oturum aÃ§ma giriÅŸimi
     warning:
       explanation:
         disable: HesabÄ±nÄ±z donmuÅŸken, hesap verileriniz bozulmadan kalÄ±r, ancak kilidi aÃ§Ä±lÄ±ncaya kadar herhangi bir iÅŸlem gerÃ§ekleÅŸtiremezsiniz.
+        sensitive: YÃ¼klediÄŸiniz medya dosyalarÄ±nÄ±z ve baÄŸlantÄ±lÄ± medyanÄ±z hassas olarak deÄŸerlendirilecektir.
         silence: HesabÄ±nÄ±z sÄ±nÄ±rlÄ± iken, yalnÄ±zca sizi takip eden kiÅŸiler bu sunucuda tootlarÄ±nÄ±zÄ± gÃ¶recek ve Ã§eÅŸitli halka aÃ§Ä±k listelerin dÄ±ÅŸÄ±nda tutulabilirsiniz. Ancak, diÄŸerleri hala sizi manuel olarak takip edebilir.
         suspend: HesabÄ±nÄ±z askÄ±ya alÄ±ndÄ± ve tÃ¼m tootlarÄ±nÄ±z ve yÃ¼klediÄŸiniz medya dosyalarÄ±nÄ±z bu sunucudan ve takipÃ§ilerinizin bulunduÄŸu sunuculardan geri alÄ±namaz ÅŸekilde kaldÄ±rÄ±ldÄ±.
       get_in_touch: "%{instance} Ã§alÄ±ÅŸanlarÄ±yla iletiÅŸim kurmak iÃ§in bu e-postayÄ± yanÄ±tlayabilirsiniz."
@@ -1243,15 +1363,17 @@ tr:
       subject:
         disable: "%{acct} hesabÄ±nÄ±z donduruldu"
         none: "%{acct} iÃ§in uyarÄ±"
+        sensitive: HesabÄ±nÄ±zdan yayÄ±nlanan %{acct} medyanÄ±z hassas olarak iÅŸaretlendi
         silence: "%{acct} hesabÄ±nÄ±z sÄ±nÄ±rlandÄ±rÄ±ldÄ±"
         suspend: "%{acct} hesabÄ±nÄ±z askÄ±ya alÄ±ndÄ±"
       title:
         disable: Hesap donduruldu
         none: UyarÄ±
+        sensitive: MedyanÄ±z hassas olarak iÅŸaretlendi
         silence: Hesap sÄ±nÄ±rlandÄ±rÄ±ldÄ±
         suspend: Hesap askÄ±ya alÄ±ndÄ±
     welcome:
-      edit_profile_action: Profil ayarla
+      edit_profile_action: Profil kurulumu
       edit_profile_step: Bir avatar veya baÅŸlÄ±k yÃ¼kleyerek, ekran adÄ±nÄ±zÄ± deÄŸiÅŸtirerek ve daha fazlasÄ±nÄ± yaparak profilinizi kiÅŸiselleÅŸtirebilirsiniz. Yeni takipÃ§ileri sizi takip etmelerine izin verilmeden Ã¶nce incelemek isterseniz, hesabÄ±nÄ±zÄ± kilitleyebilirsiniz.
       explanation: Ä°ÅŸte sana baÅŸlangÄ±Ã§ iÃ§in birkaÃ§ ipucu
       final_action: GÃ¶nderi yazmaya baÅŸlayÄ±n
@@ -1268,13 +1390,34 @@ tr:
       tips: Ä°puÃ§larÄ±
       title: Gemiye hoÅŸgeldin, %{name}!
   users:
+    blocked_email_provider: Bu e-posta saÄŸlayÄ±cÄ±sÄ±na izin verilmiyor
     follow_limit_reached: "%{limit} kiÅŸiden daha fazlasÄ±nÄ± takip edemezsiniz"
-    invalid_email: E-posta adresiniz geÃ§ersiz
-    invalid_otp_token: Ä°ki-faktÃ¶rlÃ¼ kodunuz geÃ§ersiz
+    generic_access_help_html: HesabÄ±nÄ±za eriÅŸirken sorun mu yaÅŸÄ±yorsunuz? YardÄ±m iÃ§in %{email} ile iletiÅŸime geÃ§ebilirsiniz
+    invalid_email: E-posta adresi geÃ§ersiz
+    invalid_email_mx: E-posta adresi mevcut gÃ¶rÃ¼nmÃ¼yor
+    invalid_otp_token: GeÃ§ersiz iki adÄ±mlÄ± doÄŸrulama kodu
     invalid_sign_in_token: GeÃ§ersiz gÃ¼venlik kodu
     otp_lost_help_html: Her ikisine de eriÅŸiminizi kaybettiyseniz, %{email} ile irtibata geÃ§ebilirsiniz
     seamless_external_login: Harici bir servis aracÄ±lÄ±ÄŸÄ±yla oturum aÃ§tÄ±nÄ±z, bu nedenle parola ve e-posta ayarlarÄ± mevcut deÄŸildir.
-    signed_in_as: 'GiriÅŸ yapan:'
+    signed_in_as: 'Oturum aÃ§tÄ±:'
+    suspicious_sign_in_confirmation: Bu cihazdan daha Ã¶nce oturum aÃ§mamÄ±ÅŸ gibi gÃ¶rÃ¼nÃ¼yorsunuz ve bir sÃ¼redir oturum aÃ§mamÄ±ÅŸsÄ±nÄ±z, bu yÃ¼zden kimliÄŸinizi doÄŸrulamak iÃ§in e-posta adresinize bir gÃ¼venlik kodu gÃ¶nderiyoruz.
   verification:
     explanation_html: '<strong>Profil meta verisindeki baÄŸlantÄ±larÄ±n sahibi olarak kendinizi doÄŸrulayabilirsiniz</strong>. Bunun iÃ§in, link verilen web sitesi Mastodon profilinize geri bir link iÃ§ermelidir. Geri link bir <code>rel="me"</code> Ã¶zelliÄŸine sahip <strong>olmalÄ±dÄ±r</strong>. BaÄŸlantÄ±nÄ±n metin iÃ§eriÄŸi Ã¶nemli deÄŸildir. Ä°ÅŸte bir Ã¶rnek:'
     verification: DoÄŸrulama
+  webauthn_credentials:
+    add: Yeni gÃ¼venlik anahtarÄ± ekle
+    create:
+      error: GÃ¼venlik anahtarÄ±nÄ±zÄ± eklerken bir sorun oluÅŸtu. LÃ¼tfen tekrar deneyin.
+      success: GÃ¼venlik anahtarÄ±nÄ±z baÅŸarÄ±yla eklendi.
+    delete: Sil
+    delete_confirmation: Bu gÃ¼venlik anahtarÄ±nÄ± silmek istediÄŸinizden emin misiniz?
+    description_html: "<strong>GÃ¼venlik anahtarÄ± kimlik doÄŸrulamasÄ±nÄ±</strong> etkinleÅŸtirirseniz, giriÅŸ yapmak iÃ§in gÃ¼venlik anahtarlarÄ±nÄ±zdan birini kullanmanÄ±z gerekir."
+    destroy:
+      error: GÃ¼venlik anahtarÄ±nÄ± silerken bir sorun oluÅŸtu. LÃ¼tfen tekrar deneyin.
+      success: GÃ¼venlik anahtarÄ±nÄ±z baÅŸarÄ±yla silindi.
+    invalid_credential: GeÃ§ersiz gÃ¼venlik anahtarÄ±
+    nickname_hint: Yeni gÃ¼venlik anahtarÄ±nÄ±zÄ±n takma adÄ±nÄ± girin
+    not_enabled: HenÃ¼z WebAuthn'u etkinleÅŸtirmediniz
+    not_supported: Bu tarayÄ±cÄ± gÃ¼venlik anahtarlarÄ±nÄ± desteklemiyor
+    otp_required: GÃ¼venlik anahtarlarÄ±nÄ± kullanmak iÃ§in lÃ¼tfen Ã¶nce iki adÄ±mlÄ± kimlik doÄŸrulamayÄ± etkinleÅŸtirin.
+    registered_on: "%{date} tarihinde kaydoldu"
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
new file mode 100644
index 0000000000000000000000000000000000000000..e35b5da21c98ee1818e6b3c2c21c04c5152f8770
--- /dev/null
+++ b/config/locales/tt.yml
@@ -0,0 +1,12 @@
+---
+tt:
+  errors:
+    '400': The request you submitted was invalid or malformed.
+    '403': You don't have permission to view this page.
+    '404': The page you are looking for isn't here.
+    '406': This page is not available in the requested format.
+    '410': The page you were looking for doesn't exist here anymore.
+    '422': 
+    '429': Too many requests
+    '500': 
+    '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/ug.yml b/config/locales/ug.yml
index 7b709a35e9b2c59e307df1e51c5a885401f8ae50..779d4d226fc6557c606f93587371c9421b0f042a 100644
--- a/config/locales/ug.yml
+++ b/config/locales/ug.yml
@@ -10,11 +10,3 @@ ug:
     '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
-  invites:
-    expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 7b13c40c0ef6e9e35acf1c1b347ff1290655f60b..dee947dc68476ced8f10f4a56d64d5984c864da5 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -21,7 +21,9 @@ uk:
     federation_hint_html: Ð— Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¼ Ð·Ð°Ð¿Ð¸ÑÐ¾Ð¼ Ð½Ð° %{instance} Ð²Ð¸ Ð·Ð¼Ð¾Ð¶ÐµÑ‚Ðµ ÑÐ»Ñ–Ð´ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð·Ð° Ð»ÑŽÐ´ÑŒÐ¼Ð¸ Ð½Ð° Ð±ÑƒÐ´ÑŒ-ÑÐºÐ¾Ð¼Ñƒ ÑÐµÑ€Ð²ÐµÑ€Ñ– Mastodon Ñ‚Ð° Ð¿Ð¾Ð·Ð° Ð½Ð¸Ð¼.
     get_apps: Ð¡Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ Ð¼Ð¾Ð±Ñ–Ð»ÑŒÐ½Ð¸Ð¹ Ð´Ð¾Ð´Ð°Ñ‚Ð¾Ðº
     hosted_on: Mastodon Ñ€Ð¾Ð·Ð¼Ñ–Ñ‰ÐµÐ½Ð¾ Ð½Ð° %{domain}
-    instance_actor_flash: Ð¦ÐµÐ¹ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ Ñ” Ð²Ñ–Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾ÑŽ Ð¾ÑÐ¾Ð±Ð¾ÑŽ, ÑÐºÐ° Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð½Ñ ÑÐ°Ð¼Ð¾Ð³Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ð°, Ð° Ð½Ðµ Ð¿ÐµÐ²Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°. Ð’Ñ–Ð½ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ñ€ÐµÐ± Ñ„ÐµÐ´ÐµÑ€Ð°Ñ†Ñ–Ñ— Ñ– Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ Ð±ÑƒÑ‚Ð¸ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ð¸Ð¹, ÑÐºÑ‰Ð¾ Ñ‚Ñ–Ð»ÑŒÐºÐ¸ Ð²Ð¸ Ð½Ðµ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð·Ð°Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð²ÐµÑÑŒ ÑÐµÑ€Ð²ÐµÑ€, Ñƒ Ñ†ÑŒÐ¾Ð¼Ñƒ Ð²Ð¸Ð¿Ð°Ð´ÐºÑƒ Ð²Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– ÑÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ñ‚Ð¸ÑÑ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½ÑÐ¼ Ð´Ð¾Ð¼ÐµÐ½Ñƒ.
+    instance_actor_flash: 'Ð¦ÐµÐ¹ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ Ñ” Ð²Ñ–Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾ÑŽ Ð¾ÑÐ¾Ð±Ð¾ÑŽ, ÑÐºÐ° Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð½Ñ ÑÐ°Ð¼Ð¾Ð³Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ð°, Ð° Ð½Ðµ Ð¿ÐµÐ²Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°. Ð’Ñ–Ð½ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ñ€ÐµÐ± Ñ„ÐµÐ´ÐµÑ€Ð°Ñ†Ñ–Ñ— Ñ– Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ Ð±ÑƒÑ‚Ð¸ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ð¸Ð¹, ÑÐºÑ‰Ð¾ Ñ‚Ñ–Ð»ÑŒÐºÐ¸ Ð²Ð¸ Ð½Ðµ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð·Ð°Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð²ÐµÑÑŒ ÑÐµÑ€Ð²ÐµÑ€, Ñƒ Ñ†ÑŒÐ¾Ð¼Ñƒ Ð²Ð¸Ð¿Ð°Ð´ÐºÑƒ Ð²Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– ÑÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ñ‚Ð¸ÑÑ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½ÑÐ¼ Ð´Ð¾Ð¼ÐµÐ½Ñƒ.
+
+'
     learn_more: Ð”Ñ–Ð·Ð½Ð°Ñ‚Ð¸ÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ
     privacy_policy: ÐŸÐ¾Ð»Ñ–Ñ‚Ð¸ÐºÐ° Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ñ–
     see_whats_happening: ÐŸÐ¾Ð³Ð»ÑÐ½ÑŒÑ‚Ðµ, Ñ‰Ð¾ Ð²Ñ–Ð´Ð±ÑƒÐ²Ð°Ñ”Ñ‚ÑŒÑÑ
@@ -205,6 +207,7 @@ uk:
       whitelisted: Ð£ Ð±Ñ–Ð»Ð¾Ð¼Ñƒ ÑÐ¿Ð¸ÑÐºÑƒ
     action_logs:
       action_types:
+        assigned_to_self_report: ÐŸÑ€Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ Ð·Ð²Ñ–Ñ‚
         change_email_user: Ð—Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ñƒ Ð¿Ð¾ÑˆÑ‚Ñƒ Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°
         confirm_user: ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¸Ñ‚Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°
         create_account_warning: Ð¡Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ
@@ -220,10 +223,12 @@ uk:
         destroy_domain_block: Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾Ð¼ÐµÐ½Ñƒ
         destroy_email_domain_block: Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾ÑˆÑ‚Ð¾Ð²Ð¾Ð³Ð¾ Ð´Ð¾Ð¼ÐµÐ½Ñƒ
         destroy_status: Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð¿Ð¾ÑÑ‚
+        disable_2fa_user: Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸ 2FA
         disable_custom_emoji: Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ†ÑŒÐºÑ– ÐµÐ¼Ð¾Ð´Ð·Ñ–
         disable_user: Ð’Ñ–Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°
         enable_custom_emoji: Ð£Ð²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ†ÑŒÐºÑ– ÐµÐ¼Ð¾Ð´Ð·Ñ–
         enable_user: ÐÐºÑ‚Ð¸Ð²ÑƒÐ²Ð°Ñ‚Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°
+        memorialize_account: Ð—Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ Ð¼ÐµÐ¼Ð¾Ñ€Ñ–Ð°Ð»Ð¾Ð¼
         promote_user: ÐŸÑ–Ð´Ð²Ð¸Ñ‰Ð¸Ñ‚Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°
         remove_avatar_user: Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð°Ð²Ð°Ñ‚Ð°Ñ€
         reopen_report: ÐŸÐµÑ€ÐµÐ²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ ÑÐºÐ°Ñ€Ð³Ñƒ
@@ -231,6 +236,7 @@ uk:
         resolve_report: Ð Ð¾Ð·Ð²'ÑÐ·Ð°Ñ‚Ð¸ ÑÐºÐ°Ñ€Ð³Ñƒ
         silence_account: Ð—Ð°Ð³Ð»ÑƒÑˆÐ¸Ñ‚Ð¸ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ
         suspend_account: ÐŸÑ€Ð¸Ð·ÑƒÐ¿Ð¸Ð½Ð¸Ñ‚Ð¸ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ
+        unassigned_report: Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ ÑÐºÐ°Ñ€Ð³Ñƒ
         unsilence_account: Ð Ð¾Ð·Ð³Ð»ÑƒÑˆÐ¸Ñ‚Ð¸ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ
         unsuspend_account: Ð Ð¾Ð·Ð¼Ð¾Ñ€Ð¾Ð·Ð¸Ñ‚Ð¸ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ
         update_announcement: ÐžÐ½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð¾Ð³Ð¾Ð»Ð¾ÑˆÐµÐ½Ð½Ñ
@@ -693,8 +699,11 @@ uk:
       prefix_sign_up: Ð—Ð°Ñ€ÐµÑ”ÑÑ‚Ñ€ÑƒÐ¹Ñ‚ÐµÑÑ Ð½Ð° Mastodon ÑÑŒÐ¾Ð³Ð¾Ð´Ð½Ñ–!
       suffix: ÐœÐ°ÑŽÑ‡Ð¸ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ, Ð²Ð¸ Ð·Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ñ–Ð´Ð¿Ð¸ÑÑƒÐ²Ð°Ñ‚Ð¸ÑÑ Ð½Ð° Ð»ÑŽÐ´ÐµÐ¹, Ð¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ð¾ÑÑ‚Ð¸ Ñ‚Ð° Ð»Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ÑÑ Ð· ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°Ð¼Ð¸ Ð±ÑƒÐ´ÑŒ-ÑÐºÐ¾Ð³Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ð° Mastodon!
     didnt_get_confirmation: Ð’Ð¸ Ð½Ðµ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð»Ð¸ Ñ–Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ñ–Ñ— Ð· Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ?
+    dont_have_your_security_key: ÐÐµ Ð¼Ð°Ñ”Ñ‚Ðµ ÐºÐ»ÑŽÑ‡Ð° Ð±ÐµÐ·Ð¿ÐµÐºÐ¸?
     forgot_password: Ð—Ð°Ð±ÑƒÐ»Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ?
     invalid_reset_password_token: Ð¢Ð¾ÐºÐµÐ½ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»ÑŽ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¹ Ð°Ð±Ð¾ Ð¿Ñ€Ð¾ÑÑ€Ð¾Ñ‡ÐµÐ½Ð¸Ð¹. Ð¡Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ Ð¿Ð¾Ð¿Ñ€Ð¾ÑÐ¸Ñ‚Ð¸ Ð½Ð¾Ð²Ð¸Ð¹.
+    link_to_otp: Ð’Ð²ÐµÐ´Ñ–Ñ‚ÑŒ Ð´Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð¸Ð¹ ÐºÐ¾Ð´ Ð· Ð²Ð°ÑˆÐ¾Ð³Ð¾ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ñƒ Ð°Ð±Ð¾ ÐºÐ¾Ð´ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ
+    link_to_webauth: Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¸ÑÑ‚Ñ€Ñ–Ð¹ ÐºÐ»ÑŽÑ‡Ð° Ð±ÐµÐ·Ð¿ÐµÐºÐ¸
     login: Ð£Ð²Ñ–Ð¹Ñ‚Ð¸
     logout: Ð’Ð¸Ð¹Ñ‚Ð¸
     migrate_account: ÐŸÐµÑ€ÐµÑ—Ñ…Ð°Ñ‚Ð¸ Ð½Ð° Ñ–Ð½ÑˆÐ¸Ð¹ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ
@@ -720,6 +729,7 @@ uk:
       pending: Ð’Ð°ÑˆÐ° Ð·Ð°ÑÐ²Ð° Ð¾Ñ‡Ñ–ÐºÑƒÑ” Ð½Ð° Ñ€Ð¾Ð·Ð³Ð»ÑÐ´ Ð½Ð°ÑˆÐ¸Ð¼ Ð¿ÐµÑ€ÑÐ¾Ð½Ð°Ð»Ð¾Ð¼. Ð¦Ðµ Ð¼Ð¾Ð¶Ðµ Ð·Ð°Ð¹Ð½ÑÑ‚Ð¸ Ð´ÐµÑÐºÐ¸Ð¹ Ñ‡Ð°Ñ. Ð’Ð¸ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ”Ñ‚Ðµ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¸Ð¹ Ð»Ð¸ÑÑ‚, ÑÐºÑ‰Ð¾ Ð²Ð°ÑˆÐ° Ð·Ð°ÑÐ²Ð° Ð±ÑƒÐ´Ðµ ÑÑ…Ð²Ð°Ð»ÐµÐ½Ð°.
       redirecting_to: Ð’Ð°Ñˆ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ Ð½Ð°Ñ€Ð°Ð·Ñ– Ð½ÐµÐ°ÐºÑ‚Ð¸Ð²Ð½Ð¸Ð¹, Ñ‚Ð¾Ð¼Ñƒ Ñ‰Ð¾ Ð²Ñ–Ð½ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ð¹ Ð´Ð¾ %{acct}.
     trouble_logging_in: ÐŸÑ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ð²Ñ…Ð¾Ð´Ñƒ?
+    use_security_key: Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ ÐºÐ»ÑŽÑ‡ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸
   authorize_follow:
     already_following: Ð’Ð¸ Ð²Ð¶Ðµ ÑÐ»Ñ–Ð´ÐºÑƒÑ”Ñ‚Ðµ Ð·Ð° Ñ†Ð¸Ð¼ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¼ Ð·Ð°Ð¿Ð¸ÑÐ¾Ð¼
     already_requested: Ð’Ð¸ Ð²Ð¶Ðµ Ð½Ð°Ð´Ñ–ÑÐ»Ð°Ð»Ð¸ Ð·Ð°Ð¿Ð¸Ñ‚ Ð½Ð° Ð¿Ñ–Ð´Ð¿Ð¸ÑÐºÑƒ Ð´Ð¾ Ñ†ÑŒÐ¾Ð³Ð¾ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑƒ
@@ -744,6 +754,7 @@ uk:
   date:
     formats:
       default: "%b %d, %Y"
+      with_month_name: "%B %d, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}Ð³"
@@ -1012,6 +1023,14 @@ uk:
           quadrillion: ÐºÐ²Ð´Ñ€Ð»
           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: Ð”Ð°Ð»Ñ–
@@ -1136,10 +1155,16 @@ uk:
     profile: ÐŸÑ€Ð¾Ñ„Ñ–Ð»ÑŒ
     relationships: ÐŸÑ–Ð´Ð¿Ð¸ÑÐºÐ¸ Ñ‚Ð° Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÐ¸
     two_factor_authentication: Ð”Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð° Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–Ñ
+    webauthn_authentication: ÐšÐ»ÑŽÑ‡Ñ– Ð±ÐµÐ·Ð¿ÐµÐºÐ¸
   spam_check:
     spam_detected: Ð¦Ðµ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð° ÑÐºÐ°Ñ€Ð³Ð°. Ð‘ÑƒÐ»Ð¾ Ð²Ð¸ÑÐ²Ð»ÐµÐ½Ð¾ ÑÐ¿Ð°Ð¼.
   statuses:
     attached:
+      audio:
+        few: "%{count} Ð°ÑƒÐ´Ñ–Ð¾Ð·Ð°Ð¿Ð¸ÑÐ¸"
+        many: "%{count} Ð°ÑƒÐ´Ñ–Ð¾Ð·Ð°Ð¿Ð¸ÑÑ–Ð²"
+        one: "%{count} Ð°ÑƒÐ´Ñ–Ð¾Ð·Ð°Ð¿Ð¸Ñ"
+        other: "%{count} Ð°ÑƒÐ´Ñ–Ð¾Ð·Ð°Ð¿Ð¸ÑÑ–Ð²"
       description: 'ÐŸÑ€Ð¸ÐºÑ€Ñ–Ð¿Ð»ÐµÐ½Ð¾: %{attached}'
       image:
         few: "%{count} Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½ÑŒ"
@@ -1209,21 +1234,20 @@ uk:
       default: "%b %d, %Y, %H:%M"
       month: "%b %Y"
   two_factor_authentication:
-    code_hint: Ð”Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð½Ñ Ð²Ð²ÐµÐ´Ñ–Ñ‚ÑŒ ÐºÐ¾Ð´, Ð·Ð³ÐµÐ½ÐµÑ€Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð·Ð°ÑÑ‚Ð¾ÑÑƒÐ½ÐºÐ¾Ð¼ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð¾Ñ€Ð°
-    description_html: ÐŸÑ€Ð¸ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð½Ñ– <strong>Ð´Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð¾Ñ— Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ—</strong>, Ð²Ñ…Ñ–Ð´ Ð±ÑƒÐ´Ðµ Ð²Ð¸Ð¼Ð°Ð³Ð°Ñ‚Ð¸ Ð²Ñ–Ð´ Ð’Ð°Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ð½Ð½Ñ Ð’Ð°ÑˆÐ¾Ð³Ð¾ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°, ÑÐºÐ¸Ð¹ Ð·Ð³ÐµÐ½ÐµÑ€ÑƒÑ” Ð²Ñ…Ñ–Ð´Ð½Ð¸Ð¹ ÐºÐ¾Ð´.
+    add: Ð”Ð¾Ð´Ð°Ñ‚Ð¸
     disable: Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸
-    enable: Ð£Ð²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¸
+    disabled_success: Ð”Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð° Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð°
+    edit: Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸
     enabled: Ð”Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð° Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð°
     enabled_success: Ð”Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð° Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð°
     generate_recovery_codes: Ð—Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ ÐºÐ¾Ð´Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ
-    instructions_html: "<strong>Ð’Ñ–Ð´ÑÐºÐ°Ð½ÑƒÐ¹Ñ‚Ðµ Ñ†ÐµÐ¹ QR-ÐºÐ¾Ð´ Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾ÑŽ Google Authenticator Ñ‡Ð¸ Ñ–Ð½ÑˆÐ¾Ð³Ð¾ TOTP-Ð·Ð°ÑÑ‚Ð¾ÑÑƒÐ½ÐºÑƒ Ð½Ð° Ð’Ð°ÑˆÐ¾Ð¼Ñƒ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ñ–</strong>. Ð— Ñ†ÑŒÐ¾Ð³Ð¾ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚Ñƒ Ð²Ñ–Ð½ Ð±ÑƒÐ´Ðµ Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ ÐºÐ¾Ð´Ð¸, ÑÐºÑ– Ð±ÑƒÐ´Ðµ Ð½ÐµÐ¾Ð±Ñ…Ñ–Ð´Ð½Ð¾ Ð²Ð²ÐµÑÑ‚Ð¸ Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ."
     lost_recovery_codes: ÐšÐ¾Ð´Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑŽÑ‚ÑŒ Ð¿Ð¾Ð²ÐµÑ€Ð½ÑƒÑ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾ Ð²Ð°ÑˆÐ¾Ð³Ð¾ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑƒ Ñƒ Ð²Ð¸Ð¿Ð°Ð´ÐºÑƒ Ð²Ñ‚Ñ€Ð°Ñ‚Ð¸ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ñƒ. Ð¯ÐºÑ‰Ð¾ Ð²Ð¸ Ð²Ñ‚Ñ€Ð°Ñ‚Ð¸Ð»Ð¸ Ð²Ð°ÑˆÑ– ÐºÐ¾Ð´Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ, Ð²Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð½Ð¾Ð²Ñƒ Ð·Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ Ñ—Ñ… Ñ‚ÑƒÑ‚. Ð’Ð°ÑˆÑ– ÑÑ‚Ð°Ñ€Ñ– ÐºÐ¾Ð´Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ´ÑƒÑ‚ÑŒ Ð°Ð½ÑƒÐ»ÑŒÐ¾Ð²Ð°Ð½Ñ–.
-    manual_instructions: 'Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²Ñ–Ð´ÑÐºÐ°Ð½ÑƒÐ²Ð°Ñ‚Ð¸ QR-ÐºÐ¾Ð´ Ñ‚Ð° Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð²Ð²ÐµÑÑ‚Ð¸ Ð¹Ð¾Ð³Ð¾ Ð²Ñ€ÑƒÑ‡Ð½Ñƒ, ÑÐµÐºÑ€ÐµÑ‚ Ð¿Ñ€ÐµÐ´ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ð¹ Ñ‚ÑƒÑ‚ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸Ð¼ Ñ‚ÐµÐºÑÑ‚Ð¾Ð¼:'
+    methods: ÐœÐµÑ‚Ð¾Ð´Ð¸ Ð´Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð¾Ñ— Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–Ñ—
+    otp: ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð° Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–Ñ—
     recovery_codes: Ð—Ð°Ð¿Ð°ÑÐ½Ñ– ÐºÐ¾Ð´Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ
     recovery_codes_regenerated: ÐšÐ¾Ð´Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ Ð·Ð³ÐµÐ½ÐµÑ€Ð¾Ð²Ð°Ð½Ñ–
     recovery_instructions_html: Ð£ Ð²Ð¸Ð¿Ð°Ð´ÐºÑƒ Ð²Ñ‚Ñ€Ð°Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ Ð´Ð¾ Ð²Ð°ÑˆÐ¾Ð³Ð¾ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ñƒ Ð²Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ñ‚Ð¸ Ð¾Ð´Ð¸Ð½ Ð· Ð½Ð¸Ð¶Ñ‡ÐµÐ²ÐºÐ°Ð·Ð°Ð½Ð¸Ñ… ÐºÐ¾Ð´Ñ–Ð² Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ, Ñ‰Ð¾Ð± Ð¿Ð¾Ð²ÐµÑ€Ð½ÑƒÑ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾ Ð²Ð°ÑˆÐ¾Ð³Ð¾ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑƒ. <strong>Ð¢Ñ€Ð¸Ð¼Ð°Ð¹Ñ‚Ðµ ÐºÐ¾Ð´Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñƒ Ð±ÐµÐ·Ð¿ÐµÑ†Ñ–</strong>, Ð½Ð°Ð¿Ñ€Ð¸ÐºÐ»Ð°Ð´, Ñ€Ð¾Ð·Ð´Ñ€ÑƒÐºÑƒÐ¹Ñ‚Ðµ Ñ—Ñ… Ñ‚Ð° Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð¹Ñ‚Ðµ Ñ€Ð°Ð·Ð¾Ð¼ Ð· Ñ–Ð½ÑˆÐ¸Ð¼Ð¸ Ð²Ð°Ð¶Ð»Ð¸Ð²Ð¸Ð¼Ð¸ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ð¼Ð¸.
-    setup: ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸
-    wrong_code: Ð’Ð²ÐµÐ´ÐµÐ½Ð¸Ð¹ ÐºÐ¾Ð´ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¹! Ð§Ð¸ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹ Ñ‡Ð°Ñ Ð½Ð° ÑÐµÑ€Ð²ÐµÑ€Ñ– Ñ‚Ð° Ð¿Ñ€Ð¸ÑÑ‚Ñ€Ð¾Ñ—?
+    webauthn: ÐšÐ»ÑŽÑ‡Ñ– Ð±ÐµÐ·Ð¿ÐµÐºÐ¸
   user_mailer:
     backup_ready:
       explanation: Ð’Ð¸ Ñ€Ð¾Ð±Ð¸Ð»Ð¸ Ð·Ð°Ð¿Ð¸Ñ‚ Ð¿Ð¾Ð²Ð½Ð¾Ñ— Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¾Ñ— ÐºÐ¾Ð¿Ñ–Ñ— Ð²Ð°ÑˆÐ¾Ð³Ð¾ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑƒ Mastodon. Ð’Ð¾Ð½Ð° Ð²Ð¶Ðµ Ð³Ð¾Ñ‚Ð¾Ð²Ð° Ð´Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ!
@@ -1271,9 +1295,11 @@ uk:
       tips: ÐŸÐ¾Ñ€Ð°Ð´Ð¸
       title: Ð›Ð°ÑÐºÐ°Ð²Ð¾ Ð¿Ñ€Ð¾ÑÐ¸Ð¼Ð¾, %{name}!
   users:
+    blocked_email_provider: Ð¦ÐµÐ¹ Ð¿Ð¾ÑˆÑ‚Ð¾Ð²Ð¸Ð¹ Ð¿Ñ€Ð¾Ð²Ð°Ð¹Ð´ÐµÑ€ Ð½Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¸Ð¹
     follow_limit_reached: ÐÐµ Ð¼Ð¾Ð¶Ð½Ð° ÑÐ»Ñ–Ð´ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð±Ñ–Ð»ÑŒÑˆ Ð½Ñ–Ð¶ Ð·Ð° %{limit} Ð»ÑŽÐ´ÐµÐ¹
     generic_access_help_html: ÐÐµ Ð²Ð´Ð°Ñ”Ñ‚ÑŒÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑƒ? Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð²'ÑÐ·Ð°Ñ‚Ð¸ÑÑ Ð· %{email} Ð´Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¸
     invalid_email: Ð’Ð²ÐµÐ´ÐµÐ½Ð° Ð°Ð´Ñ€ÐµÑÐ° e-mail Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°
+    invalid_email_mx: Ð’ÐºÐ°Ð·Ð°Ð½Ð° ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð° Ð°Ð´Ñ€ÐµÑÐ° Ð½Ðµ Ñ–ÑÐ½ÑƒÑ”
     invalid_otp_token: Ð’Ð²ÐµÐ´ÐµÐ½Ð¾ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¹ ÐºÐ¾Ð´
     invalid_sign_in_token: Ð¥Ð¸Ð±Ð½Ð¸Ð¹ ÐºÐ¾Ð´ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸
     otp_lost_help_html: Ð¯ÐºÑ‰Ð¾ Ð²Ð¸ Ð²Ñ‚Ñ€Ð°Ñ‚Ð¸Ð»Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾ Ð¾Ð±Ð¾Ñ…, Ð²Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð· %{email}
@@ -1283,3 +1309,20 @@ uk:
   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}
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
index 2aa72a8f8d1cf051370a44e757138ce5decd9d86..31c2292bbd60de44652c4fa71bfa4bfa91b11ad6 100644
--- a/config/locales/ur.yml
+++ b/config/locales/ur.yml
@@ -10,11 +10,3 @@ ur:
     '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
-  invites:
-    expires_in:
-      '1800': 30 minutes
-      '21600': 6 hours
-      '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 1b5cfe1d1e56a5f7255cc4769dff085e6d56146d..e11c9f308553ca801af47da89ed53124415403e7 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1,68 +1,71 @@
 ---
 vi:
   about:
-    about_hashtag_html: ÄÃ¢y lÃ  cÃ¡c tÃºt cÃ´ng khai Ä‘Æ°á»£c gáº¯n tháº» <strong>#%{hashtag}</strong>. Chá»‰ cáº§n báº¡n cÃ³ tÃ i khoáº£n á»Ÿ báº¥t cá»© Ä‘Ã¢u trong máº¡ng liÃªn káº¿t lÃ  báº¡n cÃ³ thá»ƒ tÆ°Æ¡ng tÃ¡c vá»›i chÃºng.
+    about_hashtag_html: ÄÃ¢y lÃ  cÃ¡c tÃºt <strong>#%{hashtag}</strong> trÃªn máº¡ng liÃªn há»£p. Báº¡n cÃ³ thá»ƒ tÆ°Æ¡ng tÃ¡c vá»›i chÃºng sau khi Ä‘Äƒng nháºp.
     about_mastodon_html: 'Máº¡ng xÃ£ há»™i cá»§a tÆ°Æ¡ng lai: KhÃ´ng quáº£ng cÃ¡o, khÃ´ng theo dÃµi ngÆ°á»i dÃ¹ng vÃ  phi táºp quyá»n! LÃ m chá»§ quyá»n riÃªng tÆ° cá»§a báº¡n vá»›i Mastodon!'
-    about_this: Trong khoáº£ng
+    about_this: Giá»›i thiá»‡u
     active_count_after: hoáº¡t Ä‘á»™ng
-    active_footnote: NgÆ°á»i dÃ¹ng hoáº¡t Ä‘á»™ng hÃ ng thÃ¡ng
+    active_footnote: NgÆ°á»i dÃ¹ng hoáº¡t Ä‘á»™ng hÃ ng thÃ¡ng (MAU)
     administered_by: 'Quáº£n trá»‹ viÃªn:'
     api: API
     apps: á»¨ng dá»¥ng di Ä‘á»™ng
     apps_platforms: LÆ°á»›t Mastodon trÃªn iOS, Android vÃ  cÃ¡c ná»n táº£ng khÃ¡c
-    browse_directory: Nhá»¯ng ai Ä‘Ã£ tham gia mÃ¡y chá»§ nÃ y?
-    browse_local_posts: Xem thá» nhá»¯ng tÃºt cÃ´ng khai gáº§n Ä‘Ã¢y
+    browse_directory: TÃ¬m nhá»¯ng ngÆ°á»i cÃ¹ng chung sá»Ÿ thÃch
+    browse_local_posts: Xem nhá»¯ng gÃ¬ Ä‘ang xáº£y ra
     browse_public_posts: Xem thá» nhá»¯ng tÃºt cÃ´ng khai trÃªn máº¡ng Mastodon
     contact: LiÃªn láº¡c
     contact_missing: ChÆ°a thiáº¿t láºp
     contact_unavailable: N/A
-    discover_users: KhÃ¡m phÃ¡ ngÆ°á»i dÃ¹ng
+    discover_users: ThÃ nh viÃªn
     documentation: TÃ i liá»‡u
-    federation_hint_html: ÄÄƒng kÃ½ tÃ i khoáº£n %{instance}, báº¡n cÃ³ thá»ƒ giao tiáº¿p vá»›i má»i ngÆ°á»i trÃªn báº¥t ká»³ mÃ¡y chá»§ Mastodon nÃ o vÃ  hÆ¡n tháº¿ ná»¯a.
-    get_apps: DÃ¹ng thá» á»©ng dá»¥ng di Ä‘á»™ng
+    federation_hint_html: ÄÄƒng kÃ½ tÃ i khoáº£n %{instance} lÃ  báº¡n cÃ³ thá»ƒ giao tiáº¿p vá»›i má»i ngÆ°á»i trÃªn báº¥t ká»³ mÃ¡y chá»§ Mastodon nÃ o vÃ  cÃ²n hÆ¡n tháº¿ ná»¯a.
+    get_apps: á»¨ng dá»¥ng di Ä‘á»™ng
     hosted_on: "%{domain} váºn hÃ nh nhá» Mastodon"
-    instance_actor_flash: TÃ i khoáº£n nÃ y lÃ  má»™t tÃ¡c nhÃ¢n áº£o Ä‘Æ°á»£c sá» dá»¥ng Ä‘á»ƒ Ä‘áº¡i diá»‡n cho chÃnh mÃ¡y chá»§ chá»© khÃ´ng pháº£i báº¥t ká»³ ngÆ°á»i dÃ¹ng cÃ¡ nhÃ¢n nÃ o. NÃ³ Ä‘Æ°á»£c sá» dá»¥ng cho má»¥c Ä‘Ãch liÃªn káº¿t vÃ  khÃ´ng nÃªn bá»‹ cháº·n trá»« khi báº¡n muá»‘n cháº·n toÃ n bá»™ mÃ¡y chá»§.
-    learn_more: TÃ¬m hiá»ƒu thÃªm
+    instance_actor_flash: 'ÄÃ¢y lÃ  má»™t tÃ i khoáº£n áº£o Ä‘Æ°á»£c sá» dá»¥ng Ä‘á»ƒ Ä‘áº¡i diá»‡n cho mÃ¡y chá»§ chá»© khÃ´ng pháº£i báº¥t ká»³ ngÆ°á»i dÃ¹ng cÃ¡ nhÃ¢n nÃ o. NÃ³ Ä‘Æ°á»£c sá» dá»¥ng cho má»¥c Ä‘Ãch liÃªn káº¿t vÃ  khÃ´ng nÃªn cháº·n trá»« khi báº¡n muá»‘n cháº·n toÃ n bá»™ mÃ¡y chá»§.
+
+'
+    learn_more: TÃ¬m hiá»ƒu
     privacy_policy: ChÃnh sÃ¡ch báº£o máºt
-    see_whats_happening: Xem nhá»¯ng gÃ¬ Ä‘ang xáº£y ra
-    server_stats: 'Thá»‘ng kÃª mÃ¡y chá»§:'
+    see_whats_happening: DÃ²ng thá»i gian
+    server_stats: 'Cá»™ng Ä‘á»“ng:'
     source_code: MÃ£ nguá»“n
     status_count_after:
       other: tÃºt
     status_count_before: NÆ¡i lÆ°u giá»¯
-    tagline: Máº¡ng xÃ£ há»™i liÃªn há»£p lá»›n nháº¥t tháº¿ giá»›i
+    tagline: Theo dÃµi báº¡n bÃ¨ vÃ  khÃ¡m phÃ¡ tháº¿ giá»›i
     terms: Äiá»u khoáº£n dá»‹ch vá»¥
-    unavailable_content: MÃ¡y chá»§ bá»‹ giá»›i háº¡n
+    unavailable_content: Giá»›i háº¡n chung
     unavailable_content_description:
       domain: MÃ¡y chá»§
       reason: LÃ½ do
-      rejecting_media: 'áº¢nh vÃ  video tá»« nhá»¯ng mÃ¡y chá»§ sau sáº½ khÃ´ng Ä‘Æ°á»£c xá» lÃ½, lÆ°u trá»¯ vÃ  hiá»ƒn thá»‹ hÃ¬nh thu nhá», báº¯t buá»™c nháº¥p thá»§ cÃ´ng vÃ o tá»‡p gá»‘c Ä‘á»ƒ xem:'
-      rejecting_media_title: áº¢nh vÃ  cÃ¡c thá»© Ä‘Ã£ lá»c
+      rejecting_media: 'áº¢nh vÃ  video tá»« nhá»¯ng mÃ¡y chá»§ sau sáº½ khÃ´ng Ä‘Æ°á»£c xá» lÃ½, lÆ°u trá»¯ vÃ  hiá»ƒn thá»‹ hÃ¬nh thu nhá». Báº¯t buá»™c nháº¥p thá»§ cÃ´ng vÃ o tá»‡p gá»‘c Ä‘á»ƒ xem:'
+      rejecting_media_title: áº¢nh vÃ  video
       silenced: 'TÃºt tá»« nhá»¯ng mÃ¡y chá»§ sau sáº½ bá»‹ áº©n trÃªn báº£ng tin, trong tin nháº¯n vÃ  khÃ´ng cÃ³ thÃ´ng bÃ¡o nÃ o Ä‘Æ°á»£c táº¡o tá»« cÃ¡c tÆ°Æ¡ng tÃ¡c cá»§a ngÆ°á»i dÃ¹ng cá»§a há», trá»« khi báº¡n cÃ³ theo dÃµi ngÆ°á»i dÃ¹ng cá»§a há»:'
-      silenced_title: Nhá»¯ng mÃ¡y chá»§ Ä‘Ã£ bá»‹ táº¡m áº©n
-      suspended: 'Nhá»¯ng mÃ¡y chá»§ sau sáº½ khÃ´ng Ä‘Æ°á»£c xá» lÃ½, lÆ°u trá»¯ hoáº·c trao Ä‘á»•i ná»™i dung. Má»i tÆ°Æ¡ng tÃ¡c hoáº·c giao tiáº¿p vá»›i ngÆ°á»i dÃ¹ng tá»« cÃ¡c mÃ¡y chá»§ nÃ y cÅ©ng bá»‹ cáº¥m:'
+      silenced_title: Nhá»¯ng mÃ¡y chá»§ bá»‹ áº©n
+      suspended: 'Nhá»¯ng mÃ¡y chá»§ sau sáº½ khÃ´ng Ä‘Æ°á»£c xá» lÃ½, lÆ°u trá»¯ hoáº·c trao Ä‘á»•i ná»™i dung. Má»i tÆ°Æ¡ng tÃ¡c hoáº·c giao tiáº¿p vá»›i ngÆ°á»i dÃ¹ng tá»« cÃ¡c mÃ¡y chá»§ nÃ y Ä‘á»u bá»‹ cáº¥m:'
       suspended_title: Nhá»¯ng mÃ¡y chá»§ bá»‹ vÃ´ hiá»‡u hÃ³a
-    unavailable_content_html: Mastodon cho phÃ©p báº¡n xem ná»™i dung vÃ  tÆ°Æ¡ng tÃ¡c vá»›i ngÆ°á»i dÃ¹ng tá»« báº¥t ká»³ mÃ¡y chá»§ nÃ o khÃ¡c trong máº¡ng liÃªn káº¿t. CÃ²n mÃ¡y chá»§ nÃ y cÃ³ nhá»¯ng ngoáº¡i lá»‡ riÃªng.
+    unavailable_content_html: Mastodon cho phÃ©p báº¡n xem ná»™i dung vÃ  tÆ°Æ¡ng tÃ¡c vá»›i ngÆ°á»i dÃ¹ng tá»« báº¥t ká»³ mÃ¡y chá»§ nÃ o khÃ¡c trong máº¡ng liÃªn há»£p. CÃ²n mÃ¡y chá»§ nÃ y cÃ³ nhá»¯ng ngoáº¡i lá»‡ riÃªng.
     user_count_after:
       other: ngÆ°á»i dÃ¹ng
     user_count_before: NhÃ  cá»§a
     what_is_mastodon: Mastodon lÃ  gÃ¬?
   accounts:
-    choices_html: 'Nhá»¯ng ngÆ°á»i %{name} theo dÃµi:'
+    choices_html: "%{name} vinh danh:"
     endorsements_hint: Báº¡n cÃ³ thá»ƒ vinh danh nhá»¯ng ngÆ°á»i báº¡n theo dÃµi vÃ  há» sáº½ hiá»ƒn thá»‹ á»Ÿ giao diá»‡n web.
     featured_tags_hint: Báº¡n cÃ³ thá»ƒ cho biáº¿t nhá»¯ng hashtag thÆ°á»ng dÃ¹ng á»Ÿ Ä‘Ã¢y.
     follow: Theo dÃµi
     followers:
       other: NgÆ°á»i theo dÃµi
-    following: Äang theo dÃµi
+    following: Theo dÃµi
+    instance_actor_flash: TÃ i khoáº£n nÃ y Ä‘Æ°á»£c dÃ¹ng Ä‘á»ƒ Ä‘áº¡i diá»‡n cho mÃ¡y chá»§ vÃ  khÃ´ng pháº£i lÃ  ngÆ°á»i tháºt. Äá»«ng bao giá» vÃ´ hiá»‡u hÃ³a tÃ i khoáº£n nÃ y.
     joined: ÄÃ£ tham gia %{date}
-    last_active: hoáº¡t Ä‘á»™ng gáº§n Ä‘Ã¢y
+    last_active: online
     link_verified_on: LiÃªn káº¿t nÃ y Ä‘Ã£ Ä‘Æ°á»£c xÃ¡c thá»±c quyá»n sá»Ÿ há»¯u vÃ o %{date}
     media: Bá»™ sÆ°u táºp
     moved_html: "%{name} Ä‘Ã£ dá»i sang %{new_profile_link}:"
-    network_hidden: ThÃ´ng tin nÃ y khÃ´ng cÃ²n tá»“n táº¡i
+    network_hidden: Dá»¯ liá»‡u Ä‘Ã£ bá»‹ áº©n
     never_active: ChÆ°a cÃ³
-    nothing_here: ChÆ°a Ä‘Äƒng tÃºt nÃ o cáº£!
+    nothing_here: Trá»‘ng trÆ¡n!
     people_followed_by: Nhá»¯ng ngÆ°á»i %{name} theo dÃµi
     people_who_follow: Nhá»¯ng ngÆ°á»i theo dÃµi %{name}
     pin_errors:
@@ -70,28 +73,29 @@ vi:
     posts:
       other: TÃºt
     posts_tab_heading: TÃºt
-    posts_with_replies: Tráº£ lá»i
-    reserved_username: TÃªn ngÆ°á»i dÃ¹ng Ä‘Ã£ cÃ³ rá»“i
+    posts_with_replies: TÆ°Æ¡ng tÃ¡c
+    reserved_username: TÃªn nÃ y Ä‘Ã£ sá» dá»¥ng rá»“i
     roles:
       admin: Quáº£n trá»‹ viÃªn
-      bot: NgÆ°á»i mÃ¡y
+      bot: TÃ i khoáº£n Bot
       group: NhÃ³m
       moderator: Kiá»ƒm duyá»‡t viÃªn
-    unavailable: TÃ i khoáº£n khÃ´ng cÃ²n ná»¯a
+    unavailable: TÃ i khoáº£n bá»‹ Ä‘Ã¬nh chá»‰
     unfollow: NgÆ°ng theo dÃµi
   admin:
     account_actions:
-      action: Thá»±c hiá»‡n cÃ¡c hÃ nh Ä‘á»™ng
-      title: Thá»±c hiá»‡n kiá»ƒm duyá»‡t vá»›i %{acct}
+      action: Thá»±c hiá»‡n hÃ nh Ä‘á»™ng
+      title: Ãp Ä‘áº·t kiá»ƒm duyá»‡t vá»›i %{acct}
     account_moderation_notes:
-      create: Äá»ƒ láº¡i lá»i nháº¯n
-      created_msg: Äá»ƒ láº¡i lá»i nháº¯n kiá»ƒm duyá»‡t thÃ nh cÃ´ng!
+      create: Gá»i tin nháº¯n kiá»ƒm duyá»‡t
+      created_msg: Gá»i tin nháº¯n kiá»ƒm duyá»‡t thÃ nh cÃ´ng!
       delete: XÃ³a bá»
       destroyed_msg: ÄÃ£ ghi chÃº kiá»ƒm duyá»‡t xong!
     accounts:
-      add_email_domain_block: ThÃªm mÃ¡y chá»§ vÃ o danh sÃ¡ch cháº·n
+      add_email_domain_block: Cháº·n tÃªn miá»n email
       approve: PhÃª duyá»‡t
       approve_all: PhÃª duyá»‡t táº¥t cáº£
+      approved_msg: ÄÃ£ phÃª duyá»‡t %{username} Ä‘Äƒng kÃ½ thÃ nh cÃ´ng
       are_you_sure: Báº¡n cÃ³ cháº¯c khÃ´ng?
       avatar: áº¢nh Ä‘áº¡i diá»‡n
       by_domain: MÃ¡y chá»§
@@ -102,12 +106,14 @@ vi:
         new_email: Email má»›i
         submit: Thay Ä‘á»•i email
         title: Thay Ä‘á»•i email cho %{username}
-      confirm: XÃ¡c nháºn
+      confirm: PhÃª duyá»‡t
       confirmed: ÄÃ£ xÃ¡c thá»±c
       confirming: Chá» xÃ¡c nháºn
+      delete: XÃ³a dá»¯ liá»‡u
       deleted: ÄÃ£ xÃ³a
-      demote: Gá»¡ bá» chá»©c vá»¥
-      disable: VÃ´ hiá»‡u hÃ³a
+      demote: XÃ³a chá»©c vá»¥
+      destroyed_msg: Dá»¯ liá»‡u %{username} sáº½ Ä‘Æ°á»£c lÃªn lá»‹ch xÃ³a ngay bÃ¢y giá»
+      disable: Táº¡m khÃ³a
       disable_two_factor_authentication: VÃ´ hiá»‡u hÃ³a xÃ¡c thá»±c hai bÆ°á»›c
       disabled: ÄÃ£ vÃ´ hiá»‡u hÃ³a
       display_name: TÃªn hiá»ƒn thá»‹
@@ -115,52 +121,60 @@ vi:
       edit: Chá»‰nh sá»a
       email: Email
       email_status: Tráº¡ng thÃ¡i email
-      enable: PhÃª duyá»‡t
+      enable: Má»Ÿ láº¡i
       enabled: ÄÃ£ duyá»‡t
+      enabled_msg: ÄÃ£ kÃch hoáº¡t láº¡i tÃ i khoáº£n %{username} thÃ nh cÃ´ng
       followers: NgÆ°á»i theo dÃµi
       follows: Äang theo dÃµi
       header: áº¢nh bÃ¬a
-      inbox_url: URL há»™p thÆ° Ä‘áº¿n
+      inbox_url: Há»™p thÆ° cá»§a ngÆ°á»i nÃ y
+      invite_request_text: LÃ½ do Ä‘Äƒng kÃ½
       invited_by: ÄÆ°á»£c má»i bá»Ÿi
       ip: IP
       joined: ÄÃ£ tham gia
       location:
-        all: Táº¥t cáº£
+        all: ToÃ n bá»™
         local: MÃ¡y chá»§ cá»§a báº¡n
-        remote: Tá»« mÃ¡y chá»§ khÃ¡c
+        remote: MÃ¡y chá»§ khÃ¡c
         title: Vá»‹ trÃ
-      login_status: Tráº¡ng thÃ¡i Ä‘Äƒng nháºp
+      login_status: Tráº¡ng thÃ¡i tÃ i khoáº£n
       media_attachments: Tá»‡p Ä‘Ãnh kÃ¨m
       memorialize: Chuyá»ƒn sang tÃ i khoáº£n tÆ°á»Ÿng niá»‡m
+      memorialized: TÆ°á»Ÿng nhá»›
+      memorialized_msg: ÄÃ£ chuyá»ƒn %{username} thÃ nh tÃ i khoáº£n tÆ°á»Ÿng nhá»›
       moderation:
         active: Hoáº¡t Ä‘á»™ng
-        all: Táº¥t cáº£
-        pending: Äang chá» xá» lÃ½
+        all: ToÃ n bá»™
+        pending: Chá» xá» lÃ½
         silenced: Táº¡m áº©n
         suspended: VÃ´ hiá»‡u hÃ³a
-        title: Kiá»ƒm duyá»‡t
+        title: Tráº¡ng thÃ¡i
       moderation_notes: Nháºt kÃ½ kiá»ƒm duyá»‡t
-      most_recent_activity: Hoáº¡t Ä‘á»™ng gáº§n Ä‘Ã¢y nháº¥t
+      most_recent_activity: Hoáº¡t Ä‘á»™ng láº§n cuá»‘i
       most_recent_ip: IP gáº§n Ä‘Ã¢y nháº¥t
       no_account_selected: KhÃ´ng cÃ³ tÃ i khoáº£n nÃ o thay Ä‘á»•i vÃ¬ khÃ´ng cÃ³ tÃ i khoáº£n nÃ o Ä‘Æ°á»£c chá»n
-      no_limits_imposed: KhÃ´ng Ã¡p Ä‘áº·t giá»›i háº¡n
+      no_limits_imposed: BÃ¬nh thÆ°á»ng
       not_subscribed: ChÆ°a Ä‘Äƒng kÃ½
-      pending: Äang chá» xem xÃ©t
+      pending: Chá» duyá»‡t
       perform_full_suspension: VÃ´ hiá»‡u hÃ³a
       promote: Chá»‰ Ä‘á»‹nh chá»©c vá»¥
       protocol: Giao thá»©c
       public: CÃ´ng khai
       push_subscription_expires: ÄÄƒng kÃ½ PuSH háº¿t háº¡n
       redownload: LÃ m má»›i trang cÃ¡ nhÃ¢n
+      redownloaded_msg: ÄÃ£ tiáº¿p nháºn tÃ i khoáº£n %{username} thÃ nh cÃ´ng
       reject: Tá»« chá»‘i
       reject_all: Tá»« chá»‘i táº¥t cáº£
+      rejected_msg: ÄÃ£ tá»« chá»‘i Ä‘Äƒng kÃ½ tÃ i khoáº£n %{username}
       remove_avatar: XÃ³a áº£nh Ä‘áº¡i diá»‡n
       remove_header: XÃ³a áº£nh bÃ¬a
+      removed_avatar_msg: ÄÃ£ xÃ³a bá» áº£nh Ä‘áº¡i diá»‡n cá»§a %{username}
+      removed_header_msg: ÄÃ£ xÃ³a bá» áº£nh bÃ¬a cá»§a %{username}
       resend_confirmation:
         already_confirmed: NgÆ°á»i dÃ¹ng nÃ y Ä‘Ã£ Ä‘Æ°á»£c xÃ¡c thá»±c
         send: Gá»i láº¡i email xÃ¡c nháºn
         success: Email xÃ¡c nháºn Ä‘Ã£ gá»i thÃ nh cÃ´ng!
-      reset: Äáº·t láº¡i
+      reset: LÃ m tÆ°Æ¡i
       reset_password: Äáº·t láº¡i máºt kháº©u
       resubscribe: ÄÄƒng kÃ½ láº¡i
       role: Chá»©c vá»¥
@@ -170,105 +184,123 @@ vi:
         staff: Äá»™i ngÅ© quáº£n lÃ½
         user: NgÆ°á»i dÃ¹ng
       search: TÃ¬m kiáº¿m
-      search_same_email_domain: TÃ¬m ngÆ°á»i dÃ¹ng cÃ³ cÃ¹ng Ä‘á»‹a chá»‰ email
-      search_same_ip: TÃ¬m ngÆ°á»i dÃ¹ng cÃ³ cÃ¹ng IP
-      shared_inbox_url: Chia sáº» URL há»™p thÆ° Ä‘áº¿n
+      search_same_email_domain: Tra cá»©u email
+      search_same_ip: Tra cá»©u IP
+      sensitive: Nháº¡y cáº£m
+      sensitized: Ä‘Ã¡nh dáº¥u nháº¡y cáº£m
+      shared_inbox_url: Há»™p thÆ° cá»§a mÃ¡y chá»§ ngÆ°á»i nÃ y
       show:
-        created_reports: Xuáº¥t bÃ¡o cÃ¡o
+        created_reports: LÆ°á»£t bÃ¡o cÃ¡o
         targeted_reports: BÃ¡o cÃ¡o bá»Ÿi ngÆ°á»i khÃ¡c
-      silence: Táº¡m áº©n
-      silenced: Táº¡m áº©n
+      silence: áº¨n
+      silenced: ÄÃ£ áº©n
       statuses: TÃºt
       subscribe: ÄÄƒng kÃ½
       suspended: ÄÃ£ vÃ´ hiá»‡u hÃ³a
+      suspension_irreversible: ToÃ n bá»™ dá»¯ liá»‡u cá»§a ngÆ°á»i dÃ¹ng nÃ y sáº½ bá»‹ xÃ³a háº¿t. Báº¡n váº«n cÃ³ thá»ƒ ngá»«ng vÃ´ hiá»‡u hÃ³a nhÆ°ng dá»¯ liá»‡u sáº½ khÃ´ng thá»ƒ phá»¥c há»“i.
+      suspension_reversible_hint_html: Má»i dá»¯ liá»‡u cá»§a ngÆ°á»i nÃ y sáº½ bá»‹ xÃ³a sáº¡ch vÃ o %{date}. TrÆ°á»›c thá»i háº¡n nÃ y, dá»¯ liá»‡u váº«n cÃ³ thá»ƒ phá»¥c há»“i. Náº¿u báº¡n muá»‘n xÃ³a dá»¯ liá»‡u cá»§a ngÆ°á»i nÃ y ngay láºp tá»©c, hÃ£y tiáº¿p tá»¥c.
       time_in_queue: Äang chá» cÃ¡ch Ä‘Ã¢y %{time}
       title: TÃ i khoáº£n
       unconfirmed_email: Email chÆ°a Ä‘Æ°á»£c xÃ¡c thá»±c
-      undo_silenced: Bá» táº¡m áº©n
-      undo_suspension: Ngá»«ng vÃ´ hiá»‡u hÃ³a
+      undo_sensitized: ÄÃ¡nh dáº¥u bÃ¬nh thÆ°á»ng
+      undo_silenced: Bá» áº©n
+      undo_suspension: Bá» vÃ´ hiá»‡u hÃ³a
+      unsilenced_msg: Bá» áº©n %{username} thÃ nh cÃ´ng
       unsubscribe: Há»§y Ä‘Äƒng kÃ½
-      username: TÃªn tÃ i khoáº£n
-      warn: Cáº£nh cÃ¡o
+      unsuspended_msg: ÄÃ£ kÃch hoáº¡t láº¡i %{username} thÃ nh cÃ´ng
+      username: TÃ i khoáº£n
+      view_domain: Xem mÃ´ táº£ tÃ i khoáº£n nÃ y
+      warn: Cáº¥m upload
       web: Web
       whitelisted: Danh sÃ¡ch tráº¯ng
     action_logs:
       action_types:
-        assigned_to_self_report: BÃ¡o cÃ¡o tá»« Ä‘á»™i ngÅ©
-        change_email_user: Äá»•i email cho ngÆ°á»i dÃ¹ng
+        assigned_to_self_report: Tá»± xá» lÃ½ bÃ¡o cÃ¡o
+        change_email_user: Äá»•i email
         confirm_user: XÃ¡c nháºn ngÆ°á»i dÃ¹ng
-        create_account_warning: Táº¡o cáº£nh cÃ¡o
+        create_account_warning: Gá»i cáº£nh cÃ¡o
         create_announcement: Táº¡o thÃ´ng bÃ¡o
         create_custom_emoji: Táº¡o Emoji má»›i
-        create_domain_allow: Táº¡o danh sÃ¡ch mÃ¡y chá»§ cho phÃ©p
-        create_domain_block: Táº¡o danh sÃ¡ch mÃ¡y chá»§ cháº·n
-        create_email_domain_block: Táº¡o danh sÃ¡ch Ä‘á»‹a chá»‰ email cháº·n
-        demote_user: Gá»¡ bá» chá»©c vá»¥
-        destroy_announcement: Gá»¡ thÃ´ng bÃ¡o
-        destroy_custom_emoji: Gá»¡ Emoji
-        destroy_domain_allow: Gá»¡ mÃ¡y chá»§ cho phÃ©p
-        destroy_domain_block: Gá»¡ mÃ¡y chá»§ cháº·n
-        destroy_email_domain_block: Gá»¡ email Ä‘Ã£ cháº·n
+        create_domain_allow: Cho phÃ©p mÃ¡y chá»§
+        create_domain_block: Cháº·n mÃ¡y chá»§
+        create_email_domain_block: Cháº·n tÃªn miá»n email
+        create_ip_block: Cháº·n IP
+        demote_user: XÃ³a chá»©c vá»¥
+        destroy_announcement: XÃ³a thÃ´ng bÃ¡o
+        destroy_custom_emoji: XÃ³a Emoji
+        destroy_domain_allow: Bá» mÃ¡y chá»§ cho phÃ©p
+        destroy_domain_block: Bá» cháº·n mÃ¡y chá»§
+        destroy_email_domain_block: Bá» cháº·n email
+        destroy_ip_block: Bá» cháº·n IP
         destroy_status: XÃ³a tÃºt
-        disable_2fa_user: VÃ´ hiá»‡u hÃ³a xÃ¡c thá»±c hai bÆ°á»›c
+        disable_2fa_user: XÃ³a xÃ¡c thá»±c hai bÆ°á»›c
         disable_custom_emoji: VÃ´ hiá»‡u hÃ³a Emoji
-        disable_user: VÃ´ hiá»‡u hÃ³a ngÆ°á»i dÃ¹ng
-        enable_custom_emoji: Báºt Emoji
-        enable_user: Má»Ÿ láº¡i ngÆ°á»i dÃ¹ng
+        disable_user: Táº¡m khÃ³a ngÆ°á»i dÃ¹ng
+        enable_custom_emoji: Cho phÃ©p Emoji
+        enable_user: Má»Ÿ khÃ³a
         memorialize_account: TÃ i khoáº£n tÆ°á»Ÿng niá»‡m
         promote_user: Chá»‰ Ä‘á»‹nh chá»©c vá»¥
-        remove_avatar_user: Gá»¡ bá» áº£nh Ä‘áº¡i diá»‡n
+        remove_avatar_user: XÃ³a áº£nh Ä‘áº¡i diá»‡n
         reopen_report: Má»Ÿ láº¡i bÃ¡o cÃ¡o
         reset_password_user: Äáº·t láº¡i máºt kháº©u
-        resolve_report: Xem xÃ©t láº¡i bÃ¡o cÃ¡o
-        silence_account: TÃ i khoáº£n táº¡m áº©n
-        suspend_account: TÃ i khoáº£n bá»‹ vÃ´ hiá»‡u hÃ³a
-        unassigned_report: BÃ¡o cÃ¡o chÆ°a xem
-        unsilence_account: TÃ i khoáº£n bá» táº¡m áº©n
-        unsuspend_account: TÃ i khoáº£n Ä‘Ã£ ngá»«ng vÃ´ hiá»‡u hÃ³a
+        resolve_report: Xá» lÃ½ bÃ¡o cÃ¡o
+        sensitive_account: ÄÃ¡nh dáº¥u nháº¡y cáº£m cho tÃ i khoáº£n
+        silence_account: áº¨n
+        suspend_account: VÃ´ hiá»‡u hÃ³a
+        unassigned_report: BÃ¡o cÃ¡o chÆ°a xá» lÃ½
+        unsensitive_account: ÄÃ¡nh dáº¥u bÃ¬nh thÆ°á»ng
+        unsilence_account: Bá» áº©n
+        unsuspend_account: Bá» vÃ´ hiá»‡u hÃ³a
         update_announcement: Cáºp nháºt thÃ´ng bÃ¡o
         update_custom_emoji: Cáºp nháºt Emoji má»›i
-        update_status: Cáºp nháºt tráº¡ng thÃ¡i mÃ¡y chá»§
+        update_domain_block: Cáºp nháºt mÃ¡y chá»§ cháº·n
+        update_status: Cáºp nháºt tÃºt
       actions:
-        assigned_to_self_report: "%{name} Ä‘Ã£ xuáº¥t bÃ¡o cÃ¡o %{target} cho chÃnh há»"
+        assigned_to_self_report: "%{name} tá»± xá» lÃ½ bÃ¡o cÃ¡o %{target}"
         change_email_user: "%{name} Ä‘Ã£ thay Ä‘á»•i Ä‘á»‹a chá»‰ email cho %{target}"
         confirm_user: "%{name} xÃ¡c nháºn Ä‘á»‹a chá»‰ email cá»§a ngÆ°á»i dÃ¹ng %{target}"
         create_account_warning: "%{name} Ä‘Ã£ gá»i cáº£nh cÃ¡o %{target}"
-        create_announcement: "%{name} táº¡o thÃ´ng bÃ¡o tá»›i %{target}"
+        create_announcement: "%{name} táº¡o thÃ´ng bÃ¡o má»›i %{target}"
         create_custom_emoji: "%{name} Ä‘Ã£ táº£i lÃªn biá»ƒu tÆ°á»£ng cáº£m xÃºc má»›i %{target}"
-        create_domain_allow: "%{name} Ä‘Æ°a mÃ¡y chá»§ %{target} vÃ o danh sÃ¡ch tráº¯ng"
+        create_domain_allow: "%{name} kÃch hoáº¡t liÃªn há»£p vá»›i %{target}"
         create_domain_block: "%{name} cháº·n mÃ¡y chá»§ %{target}"
-        create_email_domain_block: "%{name} Ä‘Æ°a email %{target} vÃ o danh sÃ¡ch Ä‘en"
-        demote_user: "%{name} Ä‘Ã£ gá»¡ bá» chá»©c vá»¥ %{target}"
-        destroy_announcement: "%{name} gá»¡ thÃ´ng bÃ¡o tá»›i %{target}"
-        destroy_custom_emoji: "%{name} biá»ƒu tÆ°á»£ng cáº£m xÃºc bá»‹ phÃ¡ há»§y %{target}"
+        create_email_domain_block: "%{name} cháº·n tÃªn miá»n email %{target}"
+        create_ip_block: "%{name} Ä‘Ã£ cháº·n IP %{target}"
+        demote_user: "%{name} Ä‘Ã£ xÃ³a chá»©c vá»¥ %{target}"
+        destroy_announcement: "%{name} xÃ³a thÃ´ng bÃ¡o %{target}"
+        destroy_custom_emoji: "%{name} Ä‘Ã£ xÃ³a emoji %{target}"
         destroy_domain_allow: "%{name} Ä‘Ã£ xÃ³a tÃªn miá»n %{target} khá»i danh sÃ¡ch tráº¯ng"
         destroy_domain_block: "%{name} bá» cháº·n mÃ¡y chá»§ %{target}"
-        destroy_email_domain_block: "%{name} cho email %{target} vÃ o danh sÃ¡ch tráº¯ng"
-        destroy_status: "%{name} Ä‘Ã£ gá»¡ bá» tÃºt cá»§a %{target}"
-        disable_2fa_user: "%{name} Ä‘Ã£ vÃ´ hiá»‡u hÃ³a xÃ¡c thá»±c hai yáº¿u tá»‘ cá»§a %{target}"
-        disable_custom_emoji: "%{name} Ä‘Ã£ gá»¡ bá» Emoji %{target}"
-        disable_user: "%{name} vÃ´ hiá»‡u hÃ³a Ä‘Äƒng nháºp cá»§a ngÆ°á»i dÃ¹ng %{target}"
-        enable_custom_emoji: "%{name} kÃch hoáº¡t Emoji %{target}"
-        enable_user: "%{name} kÃch hoáº¡t Ä‘Äƒng nháºp cho ngÆ°á»i dÃ¹ng %{target}"
+        destroy_email_domain_block: "%{name} bá» cháº·n tÃªn miá»n email %{target}"
+        destroy_ip_block: "%{name} bá» cháº·n IP %{target}"
+        destroy_status: "%{name} Ä‘Ã£ xÃ³a tÃºt cá»§a %{target}"
+        disable_2fa_user: "%{name} Ä‘Ã£ vÃ´ hiá»‡u hÃ³a xÃ¡c thá»±c hai bÆ°á»›c cá»§a %{target}"
+        disable_custom_emoji: "%{name} Ä‘Ã£ áº©n emoji %{target}"
+        disable_user: "%{name} vÃ´ hiá»‡u hÃ³a Ä‘Äƒng nháºp %{target}"
+        enable_custom_emoji: "%{name} cho phÃ©p Emoji %{target}"
+        enable_user: "%{name} má»Ÿ khÃ³a cho ngÆ°á»i dÃ¹ng %{target}"
         memorialize_account: "%{name} Ä‘Ã£ biáº¿n tÃ i khoáº£n %{target} thÃ nh má»™t trang tÆ°á»Ÿng niá»‡m"
         promote_user: "%{name} Ä‘Ã£ chá»‰ Ä‘á»‹nh chá»©c vá»¥ cho %{target}"
         remove_avatar_user: "%{name} Ä‘Ã£ xÃ³a áº£nh Ä‘áº¡i diá»‡n cá»§a %{target}"
         reopen_report: "%{name} má»Ÿ láº¡i bÃ¡o cÃ¡o %{target}"
         reset_password_user: "%{name} Ä‘áº·t láº¡i máºt kháº©u cá»§a ngÆ°á»i dÃ¹ng %{target}"
         resolve_report: "%{name} Ä‘Ã£ giáº£i quyáº¿t bÃ¡o cÃ¡o %{target}"
-        silence_account: "%{name} Ä‘Ã£ táº¡m áº©n %{target}"
+        sensitive_account: "%{name} Ä‘Ã¡nh dáº¥u ná»™i dung cá»§a %{target} lÃ  nháº¡y cáº£m"
+        silence_account: "%{name} Ä‘Ã£ áº©n %{target}"
         suspend_account: "%{name} Ä‘Ã£ vÃ´ hiá»‡u hÃ³a %{target}"
         unassigned_report: "%{name} bÃ¡o cÃ¡o chÆ°a Ä‘Æ°á»£c chá»‰ Ä‘á»‹nh %{target}"
-        unsilence_account: "%{name} Ä‘Ã£ bá» táº¡m áº©n %{target}"
+        unsensitive_account: "%{name} Ä‘Ã¡nh dáº¥u ná»™i dung cá»§a %{target} lÃ  bÃ¬nh thÆ°á»ng"
+        unsilence_account: "%{name} Ä‘Ã£ bá» áº©n %{target}"
         unsuspend_account: "%{name} Ä‘Ã£ ngá»«ng vÃ´ hiá»‡u hÃ³a %{target}"
         update_announcement: "%{name} cáºp nháºt thÃ´ng bÃ¡o cho %{target}"
         update_custom_emoji: "%{name} Ä‘Ã£ cáºp nháºt biá»ƒu tÆ°á»£ng cáº£m xÃºc %{target}"
+        update_domain_block: "%{name} cáºp nháºt cháº·n mÃ¡y chá»§ %{target}"
         update_status: "%{name} cáºp nháºt tÃºt cá»§a %{target}"
       deleted_status: "(tÃºt Ä‘Ã£ xÃ³a)"
       empty: KhÃ´ng tÃ¬m tháº¥y báº£n ghi.
       filter_by_action: Lá»c theo hÃ nh Ä‘á»™ng
-      filter_by_user: Lá»c theo ngÆ°á»i dÃ¹ng
-      title: Nháºt kÃ½ Ä‘Ã¡nh giÃ¡
+      filter_by_user: Lá»c theo ngÆ°á»i
+      title: Nháºt kÃ½ kiá»ƒm duyá»‡t
     announcements:
       destroyed_msg: XÃ³a thÃ´ng bÃ¡o thÃ nh cÃ´ng!
       edit:
@@ -277,15 +309,15 @@ vi:
       live: Trá»±c tiáº¿p
       new:
         create: Táº¡o thÃ´ng bÃ¡o
-        title: ThÃ´ng bÃ¡o má»›i
+        title: Táº¡o thÃ´ng bÃ¡o má»›i
       published_msg: Truyá»n Ä‘i thÃ´ng bÃ¡o thÃ nh cÃ´ng!
       scheduled_for: ÄÃ£ lÃªn lá»‹ch %{time}
       scheduled_msg: ThÃ´ng bÃ¡o Ä‘Ã£ lÃªn lá»‹ch!
       title: ThÃ´ng bÃ¡o
-      unpublished_msg: Gá»¡ bá» thÃ´ng bÃ¡o thÃ nh xong!
+      unpublished_msg: XÃ³a bá» thÃ´ng bÃ¡o thÃ nh xong!
       updated_msg: Cáºp nháºt thÃ´ng bÃ¡o thÃ nh cÃ´ng!
     custom_emojis:
-      assign_category: Chá»‰ Ä‘á»‹nh danh má»¥c
+      assign_category: Xáº¿p vÃ o danh má»¥c
       by_domain: MÃ¡y chá»§
       copied_msg: Táº¡o thÃ nh cÃ´ng Emoji
       copy: Sao chÃ©p
@@ -293,14 +325,14 @@ vi:
       create_new_category: Táº¡o danh má»¥c má»›i
       created_msg: Emoji Ä‘Æ°á»£c táº¡o thÃ nh cÃ´ng!
       delete: XÃ³a bá»
-      destroyed_msg: ÄÃ£ gá»¡ Emoji thÃ nh cÃ´ng!
+      destroyed_msg: ÄÃ£ xÃ³a Emoji thÃ nh cÃ´ng!
       disable: VÃ´ hiá»‡u hÃ³a
       disabled: ÄÃ£ vÃ´ hiá»‡u hÃ³a
       disabled_msg: VÃ´ hiá»‡u hÃ³a thÃ nh cÃ´ng Emoji nÃ y
       emoji: Emoji
-      enable: KÃch hoáº¡t
-      enabled: ÄÃ£ kÃch hoáº¡t
-      enabled_msg: KÃch hoáº¡t thÃ nh cÃ´ng Emoji nÃ y
+      enable: Cho phÃ©p
+      enabled: ÄÃ£ cho phÃ©p
+      enabled_msg: ÄÃ£ cho phÃ©p thÃ nh cÃ´ng Emoji nÃ y
       image_hint: PNG tá»‘i Ä‘a 50KB
       list: Danh sÃ¡ch
       listed: Liá»‡t kÃª
@@ -310,49 +342,49 @@ vi:
       overwrite: Ghi Ä‘Ã¨
       shortcode: Viáº¿t táº¯t
       shortcode_hint: Ãt nháº¥t 2 kÃ½ tá»±, chá»‰ cÃ¡c kÃ½ tá»± chá»¯ vÃ  sá»‘ vÃ  dáº¥u gáº¡ch dÆ°á»›i
-      title: TÃ¹y chá»‰nh Emoji
+      title: Emoji
       uncategorized: ChÆ°a phÃ¢n loáº¡i
       unlist: Bá» danh sÃ¡ch
-      unlisted: ChÆ°a niÃªm yáº¿t
+      unlisted: ChÆ°a cho phÃ©p
       update_failed_msg: KhÃ´ng thá»ƒ cáºp nháºt Emoji nÃ y
       updated_msg: Cáºp nháºt thÃ nh cÃ´ng Emoji!
       upload: Táº£i lÃªn
     dashboard:
-      authorized_fetch_mode: Cháº¿ Ä‘á»™ báº£o máºt
+      authorized_fetch_mode: XÃ¡c thá»±c cao cáº¥p
       backlog: cÃ´ng viá»‡c tá»“n Ä‘á»ng
       config: Thiáº¿t láºp
       feature_deletions: XÃ³a tÃ i khoáº£n
-      feature_invites: Nhá»¯ng lá»i má»i
+      feature_invites: Má»i Ä‘Äƒng kÃ½
       feature_profile_directory: Danh sÃ¡ch thÃ nh viÃªn
       feature_registrations: ÄÄƒng kÃ½
       feature_relay: Máº¡ng liÃªn há»£p
       feature_spam_check: Chá»‘ng thÆ° rÃ¡c
       feature_timeline_preview: Xem trÆ°á»›c báº£ng tin
       features: TÃnh nÄƒng
-      hidden_service: Máº¡ng liÃªn káº¿t vá»›i cÃ¡c dá»‹ch vá»¥ áº©n
-      open_reports: má»Ÿ bÃ¡o cÃ¡o
-      pending_tags: hashtag Ä‘ang chá» xem xÃ©t
-      pending_users: ngÆ°á»i dÃ¹ng Ä‘ang chá» xem xÃ©t
-      recent_users: NgÆ°á»i dÃ¹ng gáº§n Ä‘Ã¢y
-      search: TÃ¬m kiáº¿m toÃ n vÄƒn
-      single_user_mode: Cháº¿ Ä‘á»™ ngÆ°á»i dÃ¹ng bÃ¬nh thÆ°á»ng
+      hidden_service: LiÃªn káº¿t vá»›i cÃ¡c dá»‹ch vá»¥ áº©n
+      open_reports: bÃ¡o cÃ¡o
+      pending_tags: hashtag chá» duyá»‡t
+      pending_users: ngÆ°á»i dÃ¹ng chá» duyá»‡t
+      recent_users: NgÆ°á»i dÃ¹ng má»›i nháº¥t
+      search: TÃ¬m kiáº¿m ná»™i dung
+      single_user_mode: MÃ¡y chá»§ chá»‰ cÃ³ 1 ngÆ°á»i
       software: Pháº§n má»m
       space: Dung lÆ°á»£ng lÆ°u trá»¯
-      title: Báº£ng cÃ¡ nhÃ¢n
+      title: Thá»‘ng kÃª
       total_users: tá»•ng sá»‘ ngÆ°á»i dÃ¹ng
       trends: Xu hÆ°á»›ng
       week_interactions: tÆ°Æ¡ng tÃ¡c trong tuáº§n nÃ y
       week_users_active: hoáº¡t Ä‘á»™ng trong tuáº§n nÃ y
-      week_users_new: ngÆ°á»i dÃ¹ng trong tuáº§n nÃ y
-      whitelist_mode: Cháº¿ Ä‘á»™ danh sÃ¡ch tráº¯ng
+      week_users_new: Ä‘Äƒng kÃ½ má»›i trong tuáº§n
+      whitelist_mode: Giá»›i háº¡n máº¡ng liÃªn há»£p
     domain_allows:
-      add_new: MÃ¡y chá»§ thuá»™c danh sÃ¡ch tráº¯ng
-      created_msg: MÃ¡y chá»§ Ä‘Ã£ Ä‘Æ°á»£c Ä‘Æ°a vÃ o danh sÃ¡ch tráº¯ng thÃ nh cÃ´ng
-      destroyed_msg: MÃ¡y chá»§ Ä‘Ã£ bá»‹ xÃ³a khá»i danh sÃ¡ch tráº¯ng
+      add_new: Cho phÃ©p liÃªn há»£p vá»›i mÃ¡y chá»§
+      created_msg: MÃ¡y chá»§ Ä‘Ã£ Ä‘Æ°á»£c kÃch hoáº¡t liÃªn há»£p thÃ nh cÃ´ng
+      destroyed_msg: MÃ¡y chá»§ Ä‘Ã£ bá»‹ ngÆ°ng liÃªn há»£p
       undo: XÃ³a khá»i danh sÃ¡ch tráº¯ng
     domain_blocks:
-      add_new: Cháº·n mÃ¡y chá»§ má»›i
-      created_msg: Äang xá» lÃ½ cháº·n mÃ¡y chá»§
+      add_new: Cháº·n mÃ¡y chá»§
+      created_msg: Äang tiáº¿n hÃ nh cháº·n mÃ¡y chá»§
       destroyed_msg: ÄÃ£ thÃ´i cháº·n mÃ¡y chá»§
       domain: MÃ¡y chá»§
       edit: Chá»‰nh sá»a mÃ¡y chá»§ bá»‹ cháº·n
@@ -361,11 +393,13 @@ vi:
         create: Táº¡o cháº·n
         hint: Cháº·n mÃ¡y chá»§ sáº½ khÃ´ng ngÄƒn viá»‡c hiá»ƒn thá»‹ tÃºt cá»§a mÃ¡y chá»§ Ä‘Ã³ trong cÆ¡ sá»Ÿ dá»¯ liá»‡u, nhÆ°ng sáº½ khiáº¿n tá»± Ä‘á»™ng Ã¡p dá»¥ng cÃ¡c phÆ°Æ¡ng phÃ¡p kiá»ƒm duyá»‡t cá»¥ thá»ƒ trÃªn cÃ¡c tÃ i khoáº£n Ä‘Ã³.
         severity:
-          desc_html: "<strong>Táº¡m áº©n</strong> sáº½ lÃ m cho bÃ i Ä‘Äƒng cá»§a tÃ i khoáº£n trá»Ÿ nÃªn vÃ´ hÃ¬nh Ä‘á»‘i vá»›i báº¥t ká»³ ai khÃ´ng theo dÃµi há». <strong>VÃ´ hiá»‡u hÃ³a</strong> sáº½ xÃ³a táº¥t cáº£ ná»™i dung, phÆ°Æ¡ng tiá»‡n vÃ  dá»¯ liá»‡u khÃ¡c cá»§a tÃ i khoáº£n. Sá» dá»¥ng <strong>Cáº¥m upload</strong> náº¿u báº¡n chá»‰ muá»‘n cáº¥m táº£i lÃªn áº£nh vÃ  video."
+          desc_html: "<strong>áº¨n</strong> sáº½ lÃ m cho bÃ i Ä‘Äƒng cá»§a tÃ i khoáº£n trá»Ÿ nÃªn vÃ´ hÃ¬nh Ä‘á»‘i vá»›i báº¥t ká»³ ai khÃ´ng theo dÃµi há». <strong>VÃ´ hiá»‡u hÃ³a</strong> sáº½ xÃ³a táº¥t cáº£ ná»™i dung, phÆ°Æ¡ng tiá»‡n vÃ  dá»¯ liá»‡u khÃ¡c cá»§a tÃ i khoáº£n. DÃ¹ng <strong>Cáº¥m upload</strong> náº¿u báº¡n chá»‰ muá»‘n cáº¥m táº£i lÃªn áº£nh vÃ  video."
           noop: KhÃ´ng hoáº¡t Ä‘á»™ng
-          silence: Táº¡m áº©n
+          silence: áº¨n
           suspend: VÃ´ hiá»‡u hÃ³a
         title: MÃ¡y chá»§ bá»‹ cháº·n má»›i
+      obfuscate: LÃ m má» tÃªn mÃ¡y chá»§
+      obfuscate_hint: LÃ m má» tÃªn mÃ¡y chá»§ trong danh sÃ¡ch náº¿u giá»›i háº¡n mÃ¡y chá»§ Ä‘Ã£ báºt
       private_comment: BÃ¬nh luáºn riÃªng
       private_comment_hint: Cho biáº¿t vÃ¬ sao cháº·n mÃ¡y chá»§ nÃ y Ä‘á»ƒ tiá»‡n kiá»ƒm duyá»‡t viÃªn tham kháº£o.
       public_comment: BÃ¬nh luáºn cÃ´ng khai
@@ -377,13 +411,13 @@ vi:
       rejecting_media: tá»« chá»‘i cÃ¡c táºp tin phÆ°Æ¡ng tiá»‡n truyá»n thÃ´ng
       rejecting_reports: tá»« chá»‘i bÃ¡o cÃ¡o
       severity:
-        silence: Ä‘Ã£ táº¡m áº©n
+        silence: bá»‹ áº©n
         suspend: bá»‹ vÃ´ hiá»‡u hÃ³a
       show:
         affected_accounts:
           other: "%{count} tÃ i khoáº£n trong cÆ¡ sá»Ÿ dá»¯ liá»‡u bá»‹ áº£nh hÆ°á»Ÿng"
         retroactive:
-          silence: Nhá»¯ng tÃ i khoáº£n táº¡m áº©n á»Ÿ mÃ¡y chá»§ nÃ y
+          silence: Nhá»¯ng tÃ i khoáº£n bá»‹ áº©n á»Ÿ mÃ¡y chá»§ nÃ y
           suspend: NgÆ°ng vÃ´ hiá»‡u hÃ³a cÃ¡c tÃ i khoáº£n á»Ÿ mÃ¡y chá»§ nÃ y
         title: Há»§y cháº·n mÃ¡y chá»§ %{domain}
         undo: Há»§y bá»
@@ -391,32 +425,33 @@ vi:
       view: Xem mÃ¡y chá»§ cháº·n
     email_domain_blocks:
       add_new: ThÃªm má»›i
-      created_msg: ÄÃ£ thÃªm thÃ nh cÃ´ng e-mail vÃ o danh sÃ¡ch Ä‘en
+      created_msg: ÄÃ£ cháº·n tÃªn miá»n email nÃ y
       delete: XÃ³a bá»
-      destroyed_msg: ÄÃ£ xÃ³a thÃ nh cÃ´ng e-mail khá»i danh sÃ¡ch Ä‘en
-      domain: MÃ¡y chá»§
-      empty: ChÆ°a cÃ³ mÃ¡y chá»§ nÃ o trong danh sÃ¡ch Ä‘en.
+      destroyed_msg: ÄÃ£ bá» cháº·n tÃªn miá»n email nÃ y
+      domain: Äá»‹a chá»‰ email
+      empty: ChÆ°a cháº·n tÃªn miá»n email nÃ o.
       from_html: tá»« %{domain}
       new:
-        create: ThÃªm mÃ¡y chá»§
-        title: Má»¥c má»›i trong danh sÃ¡ch Ä‘en email
-      title: Danh sÃ¡ch Ä‘en email
+        create: ThÃªm Ä‘á»‹a chá»‰
+        title: Cháº·n tÃªn miá»n email má»›i
+      title: TÃªn miá»n email Ä‘Ã£ cháº·n
     instances:
       by_domain: MÃ¡y chá»§
       delivery_available: Cho phÃ©p liÃªn káº¿t
+      empty: KhÃ´ng cÃ³ mÃ¡y chá»§ nÃ o.
       known_accounts:
-        other: "%{count} tÃ i khoáº£n Ä‘Ã£ xÃ¡c thá»±c"
+        other: "%{count} tÃ i khoáº£n Ä‘Ã£ biáº¿t"
       moderation:
         all: Táº¥t cáº£
         limited: Háº¡n cháº¿
         title: Kiá»ƒm duyá»‡t
       private_comment: BÃ¬nh luáºn riÃªng
       public_comment: BÃ¬nh luáºn cÃ´ng khai
-      title: Máº¡ng liÃªn káº¿t
+      title: Máº¡ng liÃªn há»£p
       total_blocked_by_us: Bá»‹ cháº·n bá»Ÿi chÃºng ta
       total_followed_by_them: ÄÆ°á»£c há» theo dÃµi
       total_followed_by_us: ÄÆ°á»£c quáº£n trá»‹ viÃªn theo dÃµi
-      total_reported: BÃ¡o cÃ¡o tá»•ng há»£p
+      total_reported: ToÃ n bá»™ bÃ¡o cÃ¡o
       total_storage: áº¢nh vÃ  video
     invites:
       deactivate_all: VÃ´ hiá»‡u hÃ³a táº¥t cáº£
@@ -426,10 +461,25 @@ vi:
         expired: ÄÃ£ háº¿t háº¡n
         title: Bá»™ lá»c
       title: Lá»i má»i
+    ip_blocks:
+      add_new: Cháº·n IP má»›i
+      created_msg: ÄÃ£ cháº·n IP thÃ nh cÃ´ng
+      delete: Bá» cháº·n
+      expires_in:
+        '1209600': 2 tuáº§n
+        '15778476': 6 thÃ¡ng
+        '2629746': 1 thÃ¡ng
+        '31556952': 1 nÄƒm
+        '86400': 1 ngÃ y
+        '94670856': 3 nÄƒm
+      new:
+        title: Cháº·n má»™t IP má»›i
+      no_ip_block_selected: Báº¡n chÆ°a chá»n báº¥t ká»³ IP nÃ o
+      title: Nhá»¯ng IP bá»‹ cháº·n
     pending_accounts:
-      title: TÃ i khoáº£n Ä‘ang chá» xá» lÃ½ (%{count})
+      title: TÃ i khoáº£n Ä‘ang chá» xem xÃ©t (%{count})
     relationships:
-      title: Nhá»¯ng má»‘i liÃªn há»‡ cá»§a %{acct}
+      title: Má»‘i quan há»‡ cá»§a %{acct}
     relays:
       add_new: ThÃªm liÃªn há»£p má»›i
       delete: Loáº¡i bá»
@@ -447,44 +497,46 @@ vi:
       status: Tráº¡ng thÃ¡i hiá»‡n táº¡i
       title: Máº¡ng liÃªn há»£p
     report_notes:
-      created_msg: BÃ¡o cÃ¡o ghi chÃº Ä‘Æ°á»£c táº¡o thÃ nh cÃ´ng!
-      destroyed_msg: BÃ¡o cÃ¡o Ä‘Ã£ xÃ³a thÃ nh cÃ´ng!
+      created_msg: Ghi chÃº kiá»ƒm duyá»‡t Ä‘Ã£ táº¡o xong!
+      destroyed_msg: ÄÃ£ xÃ³a bÃ¡o cÃ¡o kiá»ƒm duyá»‡t!
     reports:
       account:
         notes:
-          other: "%{count} ghi chÃº"
+          other: "%{count} kiá»ƒm duyá»‡t"
         reports:
           other: "%{count} bÃ¡o cÃ¡o"
       action_taken_by: HÃ nh Ä‘á»™ng Ä‘Æ°á»£c thá»±c hiá»‡n bá»Ÿi
       are_you_sure: Báº¡n cÃ³ cháº¯c khÃ´ng?
       assign_to_self: Giao cho tÃ´i
-      assigned: NgÆ°á»i Ä‘iá»u hÃ nh Ä‘Æ°á»£c phÃ¢n cÃ´ng
-      by_target_domain: MÃ¡y chá»§ cá»§a tÃ i khoáº£n bá»‹ bÃ¡o xáº¥u
+      assigned: NgÆ°á»i xá» lÃ½
+      by_target_domain: TÃªn tÃ i khoáº£n bá»‹ bÃ¡o cÃ¡o
       comment:
-        none: KhÃ´ng ai
-      created_at: BÃ¡o cÃ¡o
+        none: KhÃ´ng cÃ³ mÃ´ táº£
+      created_at: BÃ¡o cÃ¡o lÃºc
+      forwarded: Chuyá»ƒn tiáº¿p
+      forwarded_to: Chuyá»ƒn tiáº¿p tá»›i %{domain}
       mark_as_resolved: ÄÃ¡nh dáº¥u lÃ  Ä‘Ã£ giáº£i quyáº¿t
       mark_as_unresolved: ÄÃ¡nh dáº¥u lÃ  chÆ°a giáº£i quyáº¿t
       notes:
-        create: ThÃªm ghi chÃº
-        create_and_resolve: Giáº£i quyáº¿t vá»›i ghi chÃº
-        create_and_unresolve: Má»Ÿ láº¡i vá»›i ghi chÃº
+        create: Bá»• sung ghi chÃº
+        create_and_resolve: Xá» lÃ½ kiá»ƒm duyá»‡t
+        create_and_unresolve: Má»Ÿ láº¡i kÃ¨m ghi chÃº má»›i
         delete: XÃ³a bá»
-        placeholder: MÃ´ táº£ nhá»¯ng hÃ nh Ä‘á»™ng Ä‘Ã£ Ä‘Æ°á»£c thá»±c hiá»‡n, hoáº·c báº¥t ká»³ cáºp nháºt liÃªn quan khÃ¡c...
+        placeholder: MÃ´ táº£ vi pháº¡m cá»§a ngÆ°á»i nÃ y, má»©c Ä‘á»™ xá» lÃ½ vÃ  nhá»¯ng cáºp nháºt liÃªn quan khÃ¡c...
       reopen: Má»Ÿ láº¡i bÃ¡o cÃ¡o
       report: 'BÃ¡o cÃ¡o #%{id}'
-      reported_account: TÃ i khoáº£n bá»‹ bÃ¡o xáº¥u
-      reported_by: BÃ¡o xáº¥u bá»Ÿi
-      resolved: ÄÃ£ giáº£i quyáº¿t
-      resolved_msg: Giáº£i quyáº¿t bÃ¡o xáº¥u thÃ nh cÃ´ng!
+      reported_account: TÃ i khoáº£n bá»‹ bÃ¡o cÃ¡o
+      reported_by: BÃ¡o cÃ¡o bá»Ÿi
+      resolved: ÄÃ£ xá» lÃ½ xong
+      resolved_msg: ÄÃ£ giáº£i quyáº¿t bÃ¡o cÃ¡o xong!
       status: Tráº¡ng thÃ¡i
-      title: BÃ¡o xáº¥u
+      title: BÃ¡o cÃ¡o
       unassign: Bá» qua
-      unresolved: ChÆ°a giáº£i quyáº¿t
-      updated_at: ÄÃ£ cáºp nháºt
+      unresolved: Chá» xá» lÃ½
+      updated_at: Cáºp nháºt lÃºc
     settings:
       activity_api_enabled:
-        desc_html: Sá»‘ lÆ°á»£ng tráº¡ng thÃ¡i Ä‘Æ°á»£c Ä‘Äƒng táº¡i Ä‘á»‹a phÆ°Æ¡ng, ngÆ°á»i dÃ¹ng hoáº¡t Ä‘á»™ng vÃ  Ä‘Äƒng kÃ½ má»›i trong nhÃ³m hÃ ng tuáº§n
+        desc_html: Thu tháºp sá»‘ lÆ°á»£ng tÃºt Ä‘Æ°á»£c Ä‘Äƒng, ngÆ°á»i dÃ¹ng hoáº¡t Ä‘á»™ng vÃ  ngÆ°á»i dÃ¹ng Ä‘Äƒng kÃ½ má»›i hÃ ng tuáº§n
         title: CÃ´ng khai sá»‘ liá»‡u thá»‘ng kÃª vá» hoáº¡t Ä‘á»™ng ngÆ°á»i dÃ¹ng
       bootstrap_timeline_accounts:
         desc_html: TÃ¡ch tÃªn ngÆ°á»i dÃ¹ng báº±ng dáº¥u pháº©y. Chá»‰ cÃ³ hiá»‡u lá»±c vá»›i cÃ¡c tÃ i khoáº£n cÃ´ng khai thuá»™c mÃ¡y chá»§. Máº·c Ä‘á»‹nh khi trá»‘ng lÃ  táº¥t cáº£ quáº£n trá»‹ viÃªn.
@@ -506,15 +558,16 @@ vi:
       domain_blocks_rationale:
         title: Hiá»ƒn thá»‹ lÃ½ do
       enable_bootstrap_timeline_accounts:
+        desc_html: Thiáº¿t láºp ngÆ°á»i má»›i Ä‘Äƒng kÃ½ sáº½ tá»± Ä‘á»™ng theo dÃµi nhá»¯ng tÃ i khoáº£n cho trÆ°á»›c nháº±m trÃ¡nh viá»‡c báº£ng tin trá»‘ng
         title: Gá»£i Ã½ theo dÃµi cho ngÆ°á»i dÃ¹ng má»›i
       hero:
-        desc_html: Hiá»ƒn thá»‹ trÃªn trang chá»§. KÃch cá»¡ tá»‘i thiá»ƒu 600x100px. Khi khÃ´ng Ä‘Æ°á»£c Ä‘áº·t, sá» dá»¥ng hÃ¬nh thu nhá» cá»§a mÃ¡y chá»§
+        desc_html: Hiá»ƒn thá»‹ trÃªn trang chá»§. KÃch cá»¡ tá»‘i thiá»ƒu 600x100px. Máº·c Ä‘á»‹nh dÃ¹ng hÃ¬nh thu nhá» cá»§a mÃ¡y chá»§
         title: HÃ¬nh áº£nh giá»›i thiá»‡u
       mascot:
-        desc_html: Hiá»ƒn thá»‹ trÃªn nhiá»u trang. KÃch cá»¡ tá»‘i thiá»ƒu 293 Ã— 205px. Khi khÃ´ng Ä‘Æ°á»£c Ä‘áº·t, sá» dá»¥ng linh váºt máº·c Ä‘á»‹nh Mastodon
+        desc_html: Hiá»ƒn thá»‹ trÃªn nhiá»u trang. KÃch cá»¡ tá»‘i thiá»ƒu 293 Ã— 205px. Máº·c Ä‘á»‹nh dÃ¹ng linh váºt Mastodon
         title: Logo mÃ¡y chá»§
       peers_api_enabled:
-        desc_html: TÃªn miá»n mÃ  mÃ¡y chá»§ nÃ y Ä‘Ã£ káº¿t giao trong máº¡ng liÃªn káº¿t
+        desc_html: TÃªn miá»n mÃ  mÃ¡y chá»§ nÃ y Ä‘Ã£ káº¿t giao trong máº¡ng liÃªn há»£p
         title: Danh sÃ¡ch cÃ´ng khai cÃ¡c mÃ¡y chá»§ Ä‘Æ°á»£c phÃ¡t hiá»‡n
       preview_sensitive_media:
         desc_html: LiÃªn káº¿t xem trÆ°á»›c trÃªn cÃ¡c trang web khÃ¡c sáº½ hiá»ƒn thá»‹ hÃ¬nh thu nhá» ngay cáº£ khi phÆ°Æ¡ng tiá»‡n Ä‘Æ°á»£c Ä‘Ã¡nh dáº¥u lÃ  nháº¡y cáº£m
@@ -524,7 +577,7 @@ vi:
         title: Cho phÃ©p hiá»‡n danh sÃ¡ch thÃ nh viÃªn
       registrations:
         closed_message:
-          desc_html: Hiá»ƒn thá»‹ trÃªn trang chá»§ khi Ä‘Äƒng kÃ½ Ä‘Æ°á»£c Ä‘Ã³ng láº¡i. Báº¡n cÃ³ thá»ƒ sá» dá»¥ng tháº» HTML
+          desc_html: Hiá»ƒn thá»‹ trÃªn trang chá»§ khi Ä‘Äƒng kÃ½ Ä‘Æ°á»£c Ä‘Ã³ng láº¡i. Báº¡n cÃ³ thá»ƒ viáº¿t báº±ng tháº» HTML
           title: ThÃ´ng Ä‘iá»‡p bÃ¡o mÃ¡y chá»§ Ä‘Ã£ ngá»«ng Ä‘Äƒng kÃ½
         deletion:
           desc_html: Cho phÃ©p má»i ngÆ°á»i xÃ³a tÃ i khoáº£n cá»§a há»
@@ -532,6 +585,9 @@ vi:
         min_invite_role:
           disabled: KhÃ´ng má»™t ai
           title: Cho phÃ©p lá»i má»i báº±ng cÃ¡ch
+        require_invite_text:
+          desc_html: Khi chá»n phÃª duyá»‡t ngÆ°á»i dÃ¹ng thá»§ cÃ´ng, hiá»‡n â€œTáº¡i sao báº¡n muá»‘n Ä‘Äƒng kÃ½?â€ thay cho tÃ¹y chá»n nháºp
+          title: NgÆ°á»i Ä‘Äƒng kÃ½ má»›i pháº£i nháºp mÃ£ má»i tham gia
       registrations_mode:
         modes:
           approved: YÃªu cáº§u phÃª duyá»‡t Ä‘á»ƒ Ä‘Äƒng kÃ½
@@ -540,31 +596,31 @@ vi:
         title: Cháº¿ Ä‘á»™ Ä‘Äƒng kÃ½
       show_known_fediverse_at_about_page:
         desc_html: Náº¿u táº¯t, báº£ng tin sáº½ chá»‰ hiá»ƒn thá»‹ ná»™i dung do ngÆ°á»i dÃ¹ng cá»§a mÃ¡y chá»§ nÃ y táº¡o ra
-        title: Bao gá»“m ná»™i dung tá»« máº¡ng liÃªn káº¿t trÃªn báº£ng tin khÃ´ng Ä‘Æ°á»£c xÃ¡c thá»±c
+        title: Bao gá»“m ná»™i dung tá»« máº¡ng liÃªn há»£p trÃªn báº£ng tin khÃ´ng Ä‘Æ°á»£c xÃ¡c thá»±c
       show_staff_badge:
         desc_html: Hiá»ƒn thá»‹ huy hiá»‡u nhÃ¢n viÃªn trÃªn trang ngÆ°á»i dÃ¹ng
         title: Hiá»ƒn thá»‹ huy hiá»‡u nhÃ¢n viÃªn
       site_description:
-        desc_html: Äoáº¡n giá»›i thiá»‡u vá» API. MÃ´ táº£ nhá»¯ng gÃ¬ lÃ m cho mÃ¡y chá»§ Mastodon nÃ y Ä‘áº·c biá»‡t vÃ  báº¥t cá»© Ä‘iá»u gÃ¬ quan trá»ng khÃ¡c. Báº¡n cÃ³ thá»ƒ sá» dá»¥ng cÃ¡c tháº» HTML, Ä‘áº·c biá»‡t lÃ  <code>&lt;a&gt;</code> vÃ  <code>&lt;em&gt;</code> .
+        desc_html: Ná»™i dung giá»›i thiá»‡u vá» mÃ¡y chá»§. MÃ´ táº£ nhá»¯ng gÃ¬ lÃ m cho mÃ¡y chá»§ Mastodon nÃ y Ä‘áº·c biá»‡t vÃ  báº¥t cá»© Ä‘iá»u gÃ¬ quan trá»ng khÃ¡c. Báº¡n cÃ³ thá»ƒ dÃ¹ng cÃ¡c tháº» HTML, Ä‘áº·c biá»‡t lÃ  <code>&lt;a&gt;</code> vÃ  <code>&lt;em&gt;</code>.
         title: MÃ´ táº£ mÃ¡y chá»§
       site_description_extended:
-        desc_html: Báº¡n cÃ³ thá»ƒ táº¡o thÃªm cÃ¡c má»¥c nhÆ° quy Ä‘á»‹nh chung, hÆ°á»›ng dáº«n vÃ  nhá»¯ng thá»© khÃ¡c liÃªn quan tá»›i mÃ¡y chá»§ cá»§a báº¡n. Sá» dá»¥ng tháº» HTML
-        title: ThÃ´ng tin má»Ÿ rá»™ng tÃ¹y chá»‰nh
+        desc_html: Báº¡n cÃ³ thá»ƒ táº¡o thÃªm cÃ¡c má»¥c nhÆ° quy Ä‘á»‹nh chung, hÆ°á»›ng dáº«n vÃ  nhá»¯ng thá»© khÃ¡c liÃªn quan tá»›i mÃ¡y chá»§ cá»§a báº¡n. DÃ¹ng tháº» HTML
+        title: ThÃ´ng tin bá»• sung
       site_short_description:
         desc_html: Hiá»ƒn thá»‹ trong thanh bÃªn vÃ  tháº» meta. MÃ´ táº£ Mastodon lÃ  gÃ¬ vÃ  Ä‘iá»u gÃ¬ lÃ m cho mÃ¡y chá»§ nÃ y trá»Ÿ nÃªn Ä‘áº·c biá»‡t trong má»™t Ä‘oáº¡n vÄƒn duy nháº¥t.
         title: MÃ´ táº£ mÃ¡y chá»§ ngáº¯n
       site_terms:
-        desc_html: Báº¡n cÃ³ thá»ƒ viáº¿t chÃnh sÃ¡ch báº£o máºt cá»§a riÃªng báº¡n, Ä‘iá»u khoáº£n dá»‹ch vá»¥ hoáº·c phÃ¡p lÃ½ khÃ¡c. Báº¡n cÃ³ thá»ƒ sá» dá»¥ng tháº» HTML
+        desc_html: Báº¡n cÃ³ thá»ƒ viáº¿t Ä‘iá»u khoáº£n dá»‹ch vá»¥, quyá»n riÃªng tÆ° hoáº·c cÃ¡c váº¥n Ä‘á» phÃ¡p lÃ½ khÃ¡c. DÃ¹ng tháº» HTML
         title: Äiá»u khoáº£n dá»‹ch vá»¥ tÃ¹y chá»‰nh
       site_title: TÃªn mÃ¡y chá»§
       spam_check_enabled:
         desc_html: Mastodon cÃ³ thá»ƒ tá»± Ä‘á»™ng bÃ¡o cÃ¡o cÃ¡c tÃ i khoáº£n gá»i tin nháº¯n khÃ´ng mong muá»‘n láº·p Ä‘i láº·p láº¡i. CÃ³ thá»ƒ cÃ³ dÆ°Æ¡ng tÃnh giáº£.
         title: Tá»± Ä‘á»™ng chá»‘ng thÆ° rÃ¡c
       thumbnail:
-        desc_html: ÄÆ°á»£c sá» dá»¥ng Ä‘á»ƒ xem trÆ°á»›c thÃ´ng qua OpenGraph vÃ  API. Khuyáº¿n nghá»‹ 1200x630px
+        desc_html: Báº£n xem trÆ°á»›c thÃ´ng qua OpenGraph vÃ  API. Khuyáº¿n nghá»‹ 1200x630px
         title: HÃ¬nh thu nhá» cá»§a mÃ¡y chá»§
       timeline_preview:
-        desc_html: Hiá»ƒn thá»‹ liÃªn káº¿t Ä‘áº¿n dÃ²ng thá»i gian cÃ´ng khai trÃªn trang Ä‘Ãch vÃ  cho phÃ©p API truy cáºp vÃ o dÃ²ng thá»i gian cÃ´ng khai mÃ  khÃ´ng cáº§n xÃ¡c thá»±c
+        desc_html: Hiá»ƒn thá»‹ dÃ²ng thá»i gian cÃ´ng khai trÃªn trang Ä‘Ãch vÃ  cho phÃ©p API truy cáºp vÃ o dÃ²ng thá»i gian cÃ´ng khai mÃ  khÃ´ng cáº§n xÃ¡c thá»±c
         title: Cho phÃ©p truy cáºp khÃ´ng xÃ¡c thá»±c vÃ o dÃ²ng thá»i gian cÃ´ng cá»™ng
       title: CÃ i Ä‘áº·t trang web
       trendable_by_default:
@@ -586,28 +642,28 @@ vi:
       failed_to_execute: KhÃ´ng thá»ƒ thá»±c thi
       media:
         title: Bá»™ sÆ°u táºp
-      no_media: KhÃ´ng cÃ³ áº£nh hoáº·c video
-      no_status_selected: KhÃ´ng cÃ³ tÃºt nÃ o thay Ä‘á»•i vÃ¬ khÃ´ng cÃ³ tÃºt nÃ o Ä‘Æ°á»£c chá»n
-      title: Tráº¡ng thÃ¡i tÃ i khoáº£n
-      with_media: Vá»›i áº£nh hoáº·c video
+      no_media: ToÃ n bá»™
+      no_status_selected: Báº¡n chÆ°a chá»n báº¥t ká»³ tÃºt nÃ o
+      title: ToÃ n bá»™ tÃºt
+      with_media: CÃ³ áº£nh hoáº·c video
     tags:
       accounts_today: Sá» dá»¥ng hÃ´m nay
-      accounts_week: Sá» dá»¥ng trong tuáº§n nÃ y
-      breakdown: PhÃ¢n tÃch dung lÆ°á»£ng sá» dá»¥ng hÃ´m nay
+      accounts_week: Sá» dá»¥ng trong tuáº§n
+      breakdown: Thá»‘ng kÃª sá»‘ lÆ°á»£t dÃ¹ng hÃ´m nay
       context: Bá»‘i cáº£nh
-      directory: Trong phÃ¢n loáº¡i
-      in_directory: "%{count} trong phÃ¢n loáº¡i"
-      last_active: Sá» dá»¥ng gáº§n Ä‘Ã¢y
+      directory: CÃ³ trÃªn tiá»ƒu sá»
+      in_directory: "%{count} cÃ³ trÃªn tiá»ƒu sá»"
+      last_active: HÃ´m nay
       most_popular: Phá»• biáº¿n nháº¥t
-      most_recent: Vá»«a má»›i sá» dá»¥ng
+      most_recent: Gáº§n Ä‘Ã¢y
       name: Hashtag
       review: PhÃª duyá»‡t
       reviewed: ÄÃ£ phÃª duyá»‡t
       title: Hashtag
       trending_right_now: Xu hÆ°á»›ng
-      unique_uses_today: "%{count} Ä‘Äƒng ngÃ y hÃ´m nay"
-      unreviewed: ChÆ°a Ä‘Æ°á»£c xem xÃ©t
-      updated_msg: CÃ i Ä‘áº·t hashtag Ä‘Æ°á»£c cáºp nháºt thÃ nh cÃ´ng
+      unique_uses_today: "%{count} tÃºt dÃ¹ng hÃ´m nay"
+      unreviewed: ChÆ°a phÃª duyá»‡t
+      updated_msg: Hashtag Ä‘Ã£ Ä‘Æ°á»£c cáºp nháºt thÃ nh cÃ´ng
     title: Quáº£n trá»‹
     warning_presets:
       add_new: ThÃªm má»›i
@@ -616,39 +672,39 @@ vi:
       title: Quáº£n lÃ½ cáº£nh bÃ¡o cÃ i sáºµn
   admin_mailer:
     new_pending_account:
-      body: CÃ¡c chi tiáº¿t cá»§a tÃ i khoáº£n má»›i dÆ°á»›i Ä‘Ã¢y. Báº¡n cÃ³ thá»ƒ phÃª duyá»‡t hoáº·c tá»« chá»‘i á»©ng dá»¥ng nÃ y.
-      subject: TÃ i khoáº£n má»›i Ä‘Æ°á»£c xem xÃ©t trÃªn %{instance} (%{username})
+      body: ThÃ´ng tin chi tiáº¿t cá»§a tÃ i khoáº£n má»›i á»Ÿ phÃa dÆ°á»›i. Báº¡n cÃ³ thá»ƒ phÃª duyá»‡t hoáº·c tá»« chá»‘i ngÆ°á»i nÃ y.
+      subject: TÃ i khoáº£n chá» xÃ©t duyá»‡t trÃªn %{instance} (%{username})
     new_report:
-      body: "%{reporter} Ä‘Ã£ bÃ¡o cÃ¡o %{target}"
+      body: "%{reporter} vá»«a bÃ¡o cÃ¡o %{target}"
       body_remote: Ai Ä‘Ã³ tá»« %{domain} Ä‘Ã£ bÃ¡o cÃ¡o %{target}
-      subject: BÃ¡o cÃ¡o má»›i cho %{instance} (# %{id})
+      subject: "(%{instance}) BÃ¡o cÃ¡o #%{id}"
     new_trending_tag:
       body: 'Hashtag # %{name} Ä‘ang lÃ  xu hÆ°á»›ng nhÆ°ng chÆ°a Ä‘Æ°á»£c kiá»ƒm duyá»‡t. NÃ³ sáº½ khÃ´ng Ä‘Æ°á»£c hiá»ƒn thá»‹ cÃ´ng khai trá»« khi báº¡n cho phÃ©p. Bá» qua náº¿u báº¡n khÃ´ng bao giá» muá»‘n tháº¥y nÃ³ xuáº¥t hiá»‡n.'
       subject: Hashtag má»›i Ä‘Æ°á»£c xem xÃ©t trÃªn %{instance} (# %{name})
   aliases:
-    add_new: Táº¡o tÃªn hiá»ƒn thá»‹
+    add_new: Káº¿t ná»‘i tÃ i khoáº£n
     created_msg: Táº¡o thÃ nh cÃ´ng má»™t tÃªn hiá»ƒn thá»‹ má»›i. BÃ¢y giá» báº¡n cÃ³ thá»ƒ báº¯t Ä‘áº§u di chuyá»ƒn tá»« tÃ i khoáº£n cÅ©.
     deleted_msg: XÃ³a thÃ nh cÃ´ng tÃªn hiá»ƒn thá»‹. Chuyá»ƒn tá»« tÃ i khoáº£n nÃ y sang tÃ i khoáº£n nÃ y sáº½ khÃ´ng cÃ²n cÃ³ thá»ƒ.
-    empty: Báº¡n khÃ´ng tÃªn hiá»ƒn thá»‹ nÃ o.
-    hint_html: Náº¿u báº¡n muá»‘n chuyá»ƒn tá»« mÃ¡y chá»§ khÃ¡c sang mÃ¡y chá»§ nÃ y, táº¡i Ä‘Ã¢y báº¡n cÃ³ thá»ƒ táº¡o bÃ danh, Ä‘iá»u nÃ y lÃ  báº¯t buá»™c trÆ°á»›c khi báº¡n cÃ³ thá»ƒ tiáº¿n hÃ nh chuyá»ƒn ngÆ°á»i theo dÃµi tá»« tÃ i khoáº£n cÅ© sang tÃ i khoáº£n nÃ y. HÃ nh Ä‘á»™ng nÃ y cá»§a chÃnh nÃ³ lÃ  <strong>vÃ´ háº¡i vÃ  cÃ³ thá»ƒ Ä‘áº£o ngÆ°á»£c</strong>. <strong>Viá»‡c di chuyá»ƒn tÃ i khoáº£n Ä‘Æ°á»£c báº¯t Ä‘áº§u tá»« tÃ i khoáº£n cÅ©</strong>.
+    empty: Báº¡n khÃ´ng cÃ³ tÃ i khoáº£n cÅ© nÃ o.
+    hint_html: Náº¿u báº¡n muá»‘n chuyá»ƒn tá»« mÃ¡y chá»§ khÃ¡c sang mÃ¡y chá»§ nÃ y, báº¯t buá»™c báº¡n pháº£i táº¡o tÃªn ngÆ°á»i dÃ¹ng má»›i thÃ¬ má»›i cÃ³ thá»ƒ tiáº¿n hÃ nh chuyá»ƒn Ä‘Æ°á»£c ngÆ°á»i theo dÃµi. HÃ nh Ä‘á»™ng nÃ y <strong>khÃ´ng áº£nh hÆ°á»Ÿng gÃ¬ vÃ  cÃ³ thá»ƒ Ä‘áº£o ngÆ°á»£c</strong>. <strong>Viá»‡c di chuyá»ƒn tÃ i khoáº£n Ä‘Æ°á»£c báº¯t Ä‘áº§u tá»« tÃ i khoáº£n cÅ©</strong>.
     remove: Bá» liÃªn káº¿t bÃ danh
   appearance:
-    advanced_web_interface: Giao diá»‡n web nÃ¢ng cao
-    advanced_web_interface_hint: 'Náº¿u báº¡n muá»‘n sá» dá»¥ng toÃ n bá»™ chiá»u rá»™ng mÃ n hÃ¬nh cá»§a mÃ¬nh, giao diá»‡n web nÃ¢ng cao cho phÃ©p báº¡n Ä‘á»‹nh cáº¥u hÃ¬nh nhiá»u cá»™t khÃ¡c nhau Ä‘á»ƒ xem nhiá»u thÃ´ng tin cÃ¹ng lÃºc nhÆ° báº¡n muá»‘n: Trang chá»§, thÃ´ng bÃ¡o, dÃ²ng thá»i gian Ä‘Æ°á»£c liÃªn káº¿t, báº¥t ká»³ sá»‘ lÆ°á»£ng danh sÃ¡ch vÃ  hashtag nÃ o.'
-    animations_and_accessibility: NÃ¢ng cao
+    advanced_web_interface: Bá»‘ cá»¥c
+    advanced_web_interface_hint: 'Giao diá»‡n nhiá»u cá»™t cho phÃ©p báº¡n chuyá»ƒn bá»‘ cá»¥c hiá»ƒn thá»‹ thÃ nh nhiá»u cá»™t khÃ¡c nhau. Bao gá»“m: Báº£ng tin, thÃ´ng bÃ¡o, tháº¿ giá»›i, cÅ©ng nhÆ° danh sÃ¡ch vÃ  hashtag. Ráº¥t thÃch há»£p náº¿u báº¡n Ä‘ang dÃ¹ng mÃ n hÃ¬nh rá»™ng.'
+    animations_and_accessibility: Báº£ng tin
     confirmation_dialogs: Há»™p thoáº¡i xÃ¡c nháºn
     discovery: KhÃ¡m phÃ¡
     localization:
-      body: Mastodon Ä‘Æ°á»£c dá»‹ch bá»Ÿi Há»“ Nháº¥t Duy.
-      guide_link: https://crowdin.com/project/mastodon
-      guide_link_text: Tuy nhiÃªn, báº¡n cÅ©ng váº«n cÃ³ thá»ƒ Ä‘Ã³ng gÃ³p.
+      body: Mastodon Tiáº¿ng Viá»‡t Ä‘Æ°á»£c dá»‹ch bá»Ÿi Há»“ Nháº¥t Duy.
+      guide_link: https://mas.to/@duy
+      guide_link_text: ÄÃ¢y lÃ  trang cÃ¡ nhÃ¢n cá»§a anh áº¥y.
     sensitive_content: Ná»™i dung nháº¡y cáº£m
-    toot_layout: Bá»‘ cá»¥c TÃºt
+    toot_layout: TÃºt
   application_mailer:
     notification_preferences: Thay Ä‘á»•i tÃ¹y chá»n email
     salutation: "%{name},"
     settings: 'Thay Ä‘á»•i tÃ¹y chá»n email: %{link}'
-    view: 'Xem:'
+    view: 'Chi tiáº¿t:'
     view_profile: Xem trang cÃ¡ nhÃ¢n
     view_status: Xem tÃºt
   applications:
@@ -662,8 +718,8 @@ vi:
   auth:
     apply_for_account: ÄÄƒng kÃ½
     change_password: Máºt kháº©u
-    checkbox_agreement_html: TÃ´i Ä‘á»“ng Ã½ vá»›i cÃ¡c <a href="%{rules_path}" target="_blank">quy táº¯c</a> vÃ  <a href="%{terms_path}" target="_blank">Ä‘iá»u khoáº£n dá»‹ch vá»¥</a>
-    checkbox_agreement_without_rules_html: TÃ´i Ä‘á»“ng Ã½ vá»›i <a href="%{terms_path}" target="_blank">Ä‘iá»u khoáº£n dá»‹ch vá»¥</a>
+    checkbox_agreement_html: TÃ´i Ä‘á»“ng Ã½ <a href="%{rules_path}" target="_blank">quy táº¯c</a> vÃ  <a href="%{terms_path}" target="_blank">chÃnh sÃ¡ch báº£o máºt</a>
+    checkbox_agreement_without_rules_html: TÃ´i Ä‘á»“ng Ã½ <a href="%{terms_path}" target="_blank">chÃnh sÃ¡ch báº£o máºt</a>
     delete_account: XÃ³a tÃ i khoáº£n
     delete_account_html: Náº¿u báº¡n muá»‘n xÃ³a tÃ i khoáº£n cá»§a mÃ¬nh, hÃ£y <a href="%{path}">yÃªu cáº§u táº¡i Ä‘Ã¢y</a>. Báº¡n sáº½ Ä‘Æ°á»£c yÃªu cáº§u xÃ¡c nháºn.
     description:
@@ -671,12 +727,15 @@ vi:
       prefix_sign_up: Tham gia Mastodon ngay hÃ´m nay!
       suffix: Vá»›i tÃ i khoáº£n, báº¡n sáº½ cÃ³ thá»ƒ theo dÃµi má»i ngÆ°á»i, Ä‘Äƒng tÃºt vÃ  nháº¯n tin vá»›i ngÆ°á»i dÃ¹ng tá»« báº¥t ká»³ mÃ¡y chá»§ Mastodon khÃ¡c!
     didnt_get_confirmation: Gá»i láº¡i email xÃ¡c thá»±c?
+    dont_have_your_security_key: Báº¡n cÃ³ khÃ³a báº£o máºt chÆ°a?
     forgot_password: QuÃªn máºt kháº©u
     invalid_reset_password_token: MÃ£ Ä‘áº·t láº¡i máºt kháº©u khÃ´ng há»£p lá»‡ hoáº·c háº¿t háº¡n. Vui lÃ²ng yÃªu cáº§u má»™t cÃ¡i má»›i.
+    link_to_otp: Nháºp mÃ£ xÃ¡c thá»±c tá»« Ä‘iá»‡n thoáº¡i hoáº·c mÃ£ phá»¥c há»“i
+    link_to_webauth: Nháºp khÃ³a báº£o máºt tá»« thiáº¿t bá»‹
     login: ÄÄƒng nháºp
     logout: ÄÄƒng xuáº¥t
-    migrate_account: Sá» dá»¥ng má»™t tÃ i khoáº£n khÃ¡c
-    migrate_account_html: Náº¿u báº¡n muá»‘n bá» tÃ i khoáº£n nÃ y Ä‘á»ƒ sá» dá»¥ng má»™t tÃ i khoáº£n khÃ¡c, báº¡n cÃ³ thá»ƒ <a href="%{path}">thiáº¿t láºp nÃ³ á»Ÿ Ä‘Ã¢y</a>.
+    migrate_account: Chuyá»ƒn sang tÃ i khoáº£n khÃ¡c
+    migrate_account_html: Náº¿u báº¡n muá»‘n bá» tÃ i khoáº£n nÃ y Ä‘á»ƒ dÃ¹ng má»™t tÃ i khoáº£n khÃ¡c, báº¡n cÃ³ thá»ƒ <a href="%{path}">thiáº¿t láºp nÃ³ á»Ÿ Ä‘Ã¢y</a>.
     or_log_in_with: Hoáº·c Ä‘Äƒng nháºp báº±ng
     providers:
       cas: CAS
@@ -694,13 +753,15 @@ vi:
     status:
       account_status: Tráº¡ng thÃ¡i tÃ i khoáº£n
       confirming: Äang chá» xÃ¡c thá»±c email.
-      functional: TÃ i khoáº£n cá»§a báº¡n Ä‘Ã£ xÃ¡c thá»±c vÃ  cÃ³ thá»ƒ sá» dá»¥ng.
+      functional: TÃ i khoáº£n cá»§a báº¡n Ä‘Ã£ Ä‘Æ°á»£c xÃ¡c thá»±c.
       pending: ÄÆ¡n Ä‘Äƒng kÃ½ cá»§a báº¡n Ä‘ang chá» phÃª duyá»‡t. Äiá»u nÃ y cÃ³ thá»ƒ máº¥t má»™t thá»i gian. Báº¡n sáº½ nháºn Ä‘Æ°á»£c email náº¿u Ä‘Æ¡n Ä‘Äƒng kÃ½ cá»§a báº¡n Ä‘Æ°á»£c cháº¥p thuáºn.
       redirecting_to: TÃ i khoáº£n cá»§a báº¡n khÃ´ng hoáº¡t Ä‘á»™ng vÃ¬ hiá»‡n Ä‘ang chuyá»ƒn hÆ°á»›ng Ä‘áº¿n %{acct}.
-    trouble_logging_in: Gáº·p sá»± cá»‘ khi Ä‘Äƒng nháºp?
+    too_fast: Nghi váº¥n Ä‘Äƒng kÃ½ spam, xin thá» láº¡i.
+    trouble_logging_in: QuÃªn máºt kháº©u?
+    use_security_key: DÃ¹ng khÃ³a báº£o máºt
   authorize_follow:
-    already_following: Báº¡n Ä‘ang theo dÃµi ngÆ°á»i dÃ¹ng nÃ y
-    already_requested: Báº¡n vá»«a gá»i má»™t yÃªu cáº§u theo dÃµi tá»›i ngÆ°á»i dÃ¹ng nÃ y
+    already_following: Báº¡n Ä‘ang theo dÃµi ngÆ°á»i nÃ y
+    already_requested: Báº¡n vá»«a gá»i má»™t yÃªu cáº§u theo dÃµi tá»›i ngÆ°á»i nÃ y
     error: Ráº¥t tiáº¿c, Ä‘Ã£ xáº£y ra lá»—i khi tÃ¬m kiáº¿m tÃ i khoáº£n tá»« nÆ¡i khÃ¡c
     follow: Theo dÃµi
     follow_request: Báº¡n Ä‘Ã£ gá»i yÃªu cáº§u theo dÃµi tá»›i
@@ -714,14 +775,15 @@ vi:
     confirm: Tiáº¿p tá»¥c
     hint_html: "<strong>Máº¹o:</strong> ChÃºng tÃ´i sáº½ khÃ´ng há»i láº¡i máºt kháº©u cá»§a báº¡n sau nÃ y."
     invalid_password: Máºt kháº©u khÃ´ng há»£p lá»‡
-    prompt: XÃ¡c nháºn máºt kháº©u Ä‘á»ƒ tiáº¿p tá»¥c
+    prompt: Nháºp máºt kháº©u Ä‘á»ƒ tiáº¿p tá»¥c
   crypto:
     errors:
       invalid_key: khÃ´ng pháº£i lÃ  mÃ£ khÃ³a Ed25519 hoáº·c Curve25519 Ä‘Ãºng
       invalid_signature: khÃ´ng pháº£i lÃ  chá»¯ kÃ½ sá»‘ Ed25519 Ä‘Ãºng
   date:
     formats:
-      default: "%b.%-m.%Y"
+      default: "%-d %B, %Y"
+      with_month_name: "%B %d, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}h"
@@ -743,8 +805,8 @@ vi:
     proceed: XÃ³a tÃ i khoáº£n
     success_msg: TÃ i khoáº£n cá»§a báº¡n Ä‘Ã£ Ä‘Æ°á»£c xÃ³a thÃ nh cÃ´ng
     warning:
-      before: 'TrÆ°á»›c khi tiáº¿p tá»¥c, xin vui lÃ²ng Ä‘á»c cÃ¡c lÆ°u Ã½:'
-      caches: Ná»™i dung Ä‘Ã£ Ä‘Æ°á»£c lÆ°u trá»¯ bá»Ÿi cÃ¡c mÃ¡y chá»§ khÃ¡c cÃ³ thá»ƒ tá»“n táº¡i
+      before: 'TrÆ°á»›c khi tiáº¿p tá»¥c, xin vui lÃ²ng xem xÃ©t cáº©n tháºn:'
+      caches: Ná»™i dung Ä‘Ã£ lÆ°u trá»¯ trÃªn cÃ¡c mÃ¡y chá»§ khÃ¡c cÃ³ thá»ƒ váº«n tá»“n táº¡i
       data_removal: BÃ i viáº¿t cá»§a báº¡n vÃ  dá»¯ liá»‡u khÃ¡c sáº½ bá»‹ xÃ³a vÄ©nh viá»…n
       email_change_html: Báº¡n cÃ³ thá»ƒ <a href="%{path}">thay Ä‘á»•i Ä‘á»‹a chá»‰ email</a> mÃ  khÃ´ng cáº§n pháº£i xÃ³a tÃ i khoáº£n
       email_contact_html: Náº¿u váº«n khÃ´ng nháºn Ä‘Æ°á»£c, báº¡n cÃ³ thá»ƒ liÃªn há»‡ <a href="mailto:%{email}">%{email}</a> Ä‘á»ƒ Ä‘Æ°á»£c giÃºp Ä‘á»¡
@@ -754,9 +816,9 @@ vi:
       username_available: TÃªn ngÆ°á»i dÃ¹ng cá»§a báº¡n sáº½ cÃ³ thá»ƒ Ä‘Äƒng kÃ½ láº¡i
       username_unavailable: TÃªn ngÆ°á»i dÃ¹ng cá»§a báº¡n sáº½ khÃ´ng thá»ƒ Ä‘Äƒng kÃ½ má»›i
   directories:
-    directory: Danh sÃ¡ch thÃ nh viÃªn
-    explanation: KhÃ¡m phÃ¡ ngÆ°á»i dÃ¹ng dá»±a trÃªn sá»Ÿ thÃch cá»§a há»
-    explore_mastodon: KhÃ¡m phÃ¡ %{title}
+    directory: KhÃ¡m phÃ¡
+    explanation: TÃ¬m vÃ  theo dÃµi nhá»¯ng ngÆ°á»i cÃ¹ng sá»Ÿ thÃch
+    explore_mastodon: ThÃ nh viÃªn %{title}
   domain_validator:
     invalid_domain: khÃ´ng pháº£i lÃ  má»™t tÃªn miá»n há»£p lá»‡
   errors:
@@ -764,7 +826,7 @@ vi:
     '403': Báº¡n khÃ´ng cÃ³ quyá»n xem trang nÃ y.
     '404': Trang nÃ y chÆ°a Ä‘Æ°á»£c táº¡o.
     '406': Trang nÃ y khÃ´ng thá»ƒ hiá»ƒn thá»‹ do lá»—i Ä‘á»‹nh dáº¡ng.
-    '410': Trang nÃ y Ä‘Ã£ bá»‹ xÃ³a trÆ°á»›c Ä‘Ã³.
+    '410': Trang nÃ y Ä‘Ã£ bá»‹ xÃ³a
     '422':
       content: XÃ¡c minh báº£o máºt tháº¥t báº¡i. Báº¡n Ä‘ang cháº·n cookie?
       title: XÃ¡c minh báº£o máºt tháº¥t báº¡i
@@ -773,7 +835,7 @@ vi:
       content: ChÃºng tÃ´i xin lá»—i, nhÆ°ng Ä‘Ã£ xáº£y ra sá»± cá»‘.
       title: MÃºi giá» trÃªn thiáº¿t bá»‹ khÃ´ng Ä‘Ãºng
     '503': Trang khÃ´ng thá»ƒ hiá»ƒn thá»‹ do lá»—i mÃ¡y chá»§ táº¡m thá»i.
-    noscript_html: Äá»ƒ sá» dá»¥ng á»©ng dá»¥ng web Mastodon, vui lÃ²ng báºt JavaScript. NgoÃ i ra, hÃ£y thá» má»™t trong nhá»¯ng <a href="%{apps_path}">á»©ng dá»¥ng gá»‘c</a> cá»§a Mastodon cho há»‡ Ä‘iá»u hÃ nh cá»§a báº¡n.
+    noscript_html: Äá»ƒ vÃ o Mastodon báº£n web, vui lÃ²ng báºt JavaScript. NgoÃ i ra, hÃ£y thá» dÃ¹ng má»™t <a href="%{apps_path}">á»©ng dá»¥ng lÆ°á»›t Mastodon</a> cho thiáº¿t bá»‹ cá»§a báº¡n.
   existing_username_validator:
     not_found: khÃ´ng cÃ³ tÃªn ngÆ°á»i dÃ¹ng nÃ y trÃªn mÃ¡y chá»§
     not_found_multiple: khÃ´ng tÃ¬m tháº¥y %{usernames}
@@ -786,6 +848,7 @@ vi:
       request: Táº£i vá» dá»¯ liá»‡u cá»§a báº¡n
       size: Dung lÆ°á»£ng
     blocks: NgÆ°á»i báº¡n cháº·n
+    bookmarks: ÄÃ£ lÆ°u
     csv: CSV
     domain_blocks: MÃ¡y chá»§ báº¡n cháº·n
     lists: Danh sÃ¡ch
@@ -795,14 +858,14 @@ vi:
     add_new: ThÃªm má»›i
     errors:
       limit: Báº¡n Ä‘Ã£ Ä‘áº¡t tá»›i sá»‘ lÆ°á»£ng hashtag tá»‘i Ä‘a
-    hint_html: "<strong>Hashtags thÆ°á»ng dÃ¹ng lÃ  gÃ¬?</strong> ChÃºng Ä‘Æ°á»£c hiá»ƒn thá»‹ ná»•i báºt trÃªn trang cÃ¡ nhÃ¢n cá»§a báº¡n vÃ  cho phÃ©p má»i ngÆ°á»i tÃ¬m kiáº¿m cÃ¡c bÃ i Ä‘Äƒng cÃ´ng khai cá»§a báº¡n cÃ³ chá»©a cÃ¡c hashtag Ä‘Ã³. ChÃºng lÃ  má»™t cÃ´ng cá»¥ tuyá»‡t vá»i Ä‘á»ƒ theo dÃµi cÃ¡c tÃ¡c pháº©m sÃ¡ng táº¡o hoáº·c cÃ¡c dá»± Ã¡n dÃ i háº¡n."
+    hint_html: "<strong>Hashtags thÆ°á»ng dÃ¹ng</strong> lÃ  gÃ¬? ChÃºng lÃ  nhá»¯ng hashtag sáº½ Ä‘Æ°á»£c hiá»ƒn thá»‹ ná»•i báºt trÃªn trang cÃ¡ nhÃ¢n cá»§a báº¡n, cho phÃ©p má»i ngÆ°á»i tÃ¬m kiáº¿m cÃ¡c bÃ i Ä‘Äƒng cÃ´ng khai cá»§a báº¡n cÃ³ chá»©a cÃ¡c hashtag Ä‘Ã³. TÃnh nÄƒng nÃ y cÃ³ thá»ƒ dÃ¹ng Ä‘á»ƒ Ä‘Ã¡nh dáº¥u chuá»—i tÃ¡c pháº©m sÃ¡ng táº¡o hoáº·c dá»± Ã¡n dÃ i háº¡n."
   filters:
     contexts:
       account: Trang cÃ¡ nhÃ¢n
       home: Báº£ng tin
       notifications: ThÃ´ng bÃ¡o
       public: Tin cÃ´ng khai
-      thread: Cuá»™c trÃ² chuyá»‡n
+      thread: Tháº£o luáºn
     edit:
       title: Chá»‰nh sá»a bá»™ lá»c
     errors:
@@ -817,11 +880,11 @@ vi:
   footer:
     developers: NhÃ  phÃ¡t triá»ƒn
     more: Nhiá»u hÆ¡n
-    resources: Äá»c
+    resources: Quy táº¯c
     trending_now: Xu hÆ°á»›ng
   generic:
     all: Táº¥t cáº£
-    changes_saved_msg: Thay Ä‘á»•i Ä‘Æ°á»£c lÆ°u thÃ nh cÃ´ng!
+    changes_saved_msg: ÄÃ£ cáºp nháºt thay Ä‘á»•i xong!
     copy: Sao chÃ©p
     delete: XÃ³a
     no_batch_actions_available: KhÃ´ng cÃ³ sáºµn hÃ nh Ä‘á»™ng hÃ ng loáº¡t trÃªn trang nÃ y
@@ -841,7 +904,7 @@ vi:
         invalid_token: MÃ£ Ä‘Äƒng nháºp Keybase giá»‘ng nhÆ° chá»¯ kÃ½ sá»‘ vÃ  pháº£i Ä‘áº£m báº£o 66 kÃ½ tá»± hex
         verification_failed: Keybase khÃ´ng nháºn ra mÃ£ Ä‘Äƒng nháºp nÃ y lÃ  chá»¯ kÃ½ cá»§a ngÆ°á»i dÃ¹ng Keybase %{kb_username}. Vui lÃ²ng thá» láº¡i tá»« Keybase.
       wrong_user: KhÃ´ng thá»ƒ táº¡o báº±ng chá»©ng cho %{proving} trong khi Ä‘Äƒng nháºp lÃ  %{current}. ÄÄƒng nháºp báº±ng %{proving} vÃ  thá» láº¡i.
-    explanation_html: Táº¡i Ä‘Ã¢y, báº¡n cÃ³ thá»ƒ káº¿t ná»‘i máºt mÃ£ cÃ¡c danh tÃnh khÃ¡c cá»§a mÃ¬nh, cháº³ng háº¡n nhÆ° há»“ sÆ¡ Keybase. Äiá»u nÃ y cho phÃ©p ngÆ°á»i khÃ¡c gá»i cho báº¡n tin nháº¯n Ä‘Æ°á»£c mÃ£ hÃ³a vÃ  tin tÆ°á»Ÿng ná»™i dung báº¡n gá»i cho há».
+    explanation_html: Táº¡i Ä‘Ã¢y, báº¡n cÃ³ thá»ƒ káº¿t ná»‘i mÃ£ hÃ³a tÃ i khoáº£n cá»§a báº¡n trÃªn cÃ¡c ná»n táº£ng khÃ¡c, cháº³ng háº¡n nhÆ° Keybase. Äiá»u nÃ y cho phÃ©p ngÆ°á»i khÃ¡c gá»i cho báº¡n tin nháº¯n Ä‘Æ°á»£c mÃ£ hÃ³a vÃ  tin tÆ°á»Ÿng ná»™i dung báº¡n gá»i cho há».
     i_am_html: TÃ´i lÃ  %{username} trÃªn %{service}.
     identity: Danh tÃnh
     inactive: KhÃ´ng hoáº¡t Ä‘á»™ng
@@ -852,6 +915,8 @@ vi:
     status: TÃ¬nh tráº¡ng xÃ¡c minh
     view_proof: Xem báº±ng chá»©ng
   imports:
+    errors:
+      over_rows_processing_limit: chá»©a nhiá»u hÆ¡n %{count} hÃ ng
     modes:
       merge: Há»£p nháº¥t
       merge_long: Giá»¯ há»“ sÆ¡ hiá»‡n cÃ³ vÃ  thÃªm há»“ sÆ¡ má»›i
@@ -861,9 +926,10 @@ vi:
     success: Dá»¯ liá»‡u cá»§a báº¡n Ä‘Ã£ Ä‘Æ°á»£c táº£i lÃªn thÃ nh cÃ´ng vÃ  hiá»‡n Ä‘ang xá» lÃ½
     types:
       blocking: Danh sÃ¡ch cháº·n
+      bookmarks: ÄÃ£ lÆ°u
       domain_blocking: Danh sÃ¡ch mÃ¡y chá»§ Ä‘Ã£ cháº·n
       following: Danh sÃ¡ch ngÆ°á»i theo dÃµi
-      muting: Danh sÃ¡ch ngÆ°á»i dÃ¹ng áº©n
+      muting: Danh sÃ¡ch ngÆ°á»i Ä‘Ã£ áº©n
     upload: Táº£i lÃªn
   in_memoriam_html: TÆ°á»Ÿng Niá»‡m
   invites:
@@ -876,11 +942,11 @@ vi:
       '43200': 12 giá»
       '604800': 1 tuáº§n
       '86400': 1 ngÃ y
-    expires_in_prompt: KhÃ´ng bao giá»
+    expires_in_prompt: KhÃ´ng giá»›i háº¡n
     generate: Táº¡o lá»i má»i
     invited_by: 'Báº¡n Ä‘Ã£ Ä‘Æ°á»£c má»i bá»Ÿi:'
     max_uses:
-      other: "%{count} sá» dá»¥ng"
+      other: "%{count} láº§n dÃ¹ng"
     max_uses_prompt: KhÃ´ng giá»›i háº¡n
     prompt: Táº¡o vÃ  chia sáº» liÃªn káº¿t vá»›i nhá»¯ng ngÆ°á»i khÃ¡c Ä‘á»ƒ cáº¥p quyá»n truy cáºp vÃ o mÃ¡y chá»§ nÃ y
     table:
@@ -911,44 +977,44 @@ vi:
     incoming_migrations_html: Äá»ƒ chuyá»ƒn tá»« tÃ i khoáº£n khÃ¡c sang tÃ i khoáº£n nÃ y, trÆ°á»›c tiÃªn báº¡n cáº§n <a href="%{path}">táº¡o tham chiáº¿u tÃ i khoáº£n</a>.
     moved_msg: TÃ i khoáº£n cá»§a báº¡n hiá»‡n Ä‘ang chuyá»ƒn hÆ°á»›ng Ä‘áº¿n %{acct} vÃ  nhá»¯ng ngÆ°á»i theo dÃµi báº¡n cÅ©ng sáº½ Ä‘Æ°á»£c chuyá»ƒn Ä‘i.
     not_redirecting: TÃ i khoáº£n cá»§a báº¡n hiá»‡n khÃ´ng chuyá»ƒn hÆ°á»›ng Ä‘áº¿n báº¥t ká»³ tÃ i khoáº£n nÃ o khÃ¡c.
-    on_cooldown: Gáº§n Ä‘Ã¢y báº¡n Ä‘Ã£ di chuyá»ƒn tÃ i khoáº£n cá»§a báº¡n. Chá»©c nÄƒng nÃ y sáº½ trá»Ÿ nÃªn kháº£ dá»¥ng má»™t láº§n ná»¯a sau %{count} ngÃ y.
+    on_cooldown: Báº¡n vá»«a má»›i chuyá»ƒn tÃ i khoáº£n cá»§a báº¡n Ä‘i nÆ¡i khÃ¡c. Chá»‰ cÃ³ thá»ƒ sá» dá»¥ng tiáº¿p tÃnh nÄƒng nÃ y sau %{count} ngÃ y.
     past_migrations: Nhá»¯ng láº§n dá»i nhÃ  cÅ©
     proceed_with_move: Chuyá»ƒn hÆ°á»›ng ngÆ°á»i theo dÃµi
     redirected_msg: TÃ i khoáº£n cá»§a báº¡n Ä‘Ã£ chuyá»ƒn hÆ°á»›ng Ä‘áº¿n %{acct}.
     redirecting_to: TÃ i khoáº£n cá»§a báº¡n Ä‘ang chuyá»ƒn hÆ°á»›ng Ä‘áº¿n %{acct}.
     set_redirect: Thiáº¿t láºp chuyá»ƒn hÆ°á»›ng
     warning:
-      backreference_required: TÃ i khoáº£n má»›i trÆ°á»›c tiÃªn pháº£i Ä‘Æ°á»£c cáº¥u hÃ¬nh Ä‘á»ƒ tham chiáº¿u láº¡i tÃ i khoáº£n nÃ y
+      backreference_required: Báº¡n cáº§n pháº£i Ä‘Äƒng kÃ½ tÃ i khoáº£n má»›i á»Ÿ mÃ¡y chá»§ khÃ¡c trÆ°á»›c
       before: 'TrÆ°á»›c khi tiáº¿p tá»¥c, xin vui lÃ²ng Ä‘á»c cÃ¡c lÆ°u Ã½:'
-      cooldown: Sau khi di chuyá»ƒn, cÃ³ thá»i gian chiÃªu há»“i, trong Ä‘Ã³ báº¡n sáº½ khÃ´ng thá»ƒ di chuyá»ƒn ná»¯a
-      disabled_account: TÃ i khoáº£n hiá»‡n táº¡i cá»§a báº¡n sáº½ khÃ´ng thá»ƒ sá» dá»¥ng Ä‘áº§y Ä‘á»§ sau Ä‘Ã³. Tuy nhiÃªn, báº¡n sáº½ cÃ³ quyá»n truy cáºp Ä‘á»ƒ xuáº¥t dá»¯ liá»‡u cÅ©ng nhÆ° kÃch hoáº¡t láº¡i.
+      cooldown: Báº¡n sáº½ bá»‹ háº¡n cháº¿ chuyá»ƒn sang tÃ i khoáº£n má»›i trong thá»i gian sáº¯p tá»›i
+      disabled_account: TÃ i khoáº£n nÃ y sáº½ khÃ´ng thá»ƒ tiáº¿p tá»¥c dÃ¹ng ná»¯a. Tuy nhiÃªn, báº¡n cÃ³ quyá»n truy cáºp Ä‘á»ƒ xuáº¥t dá»¯ liá»‡u cÅ©ng nhÆ° kÃch hoáº¡t láº¡i.
       followers: HÃ nh Ä‘á»™ng nÃ y sáº½ chuyá»ƒn táº¥t cáº£ ngÆ°á»i theo dÃµi tá»« tÃ i khoáº£n hiá»‡n táº¡i sang tÃ i khoáº£n má»›i
       only_redirect_html: NgoÃ i ra, báº¡n cÃ³ thá»ƒ <a href="%{path}">Ä‘áº·t chuyá»ƒn hÆ°á»›ng trÃªn trang cÃ¡ nhÃ¢n cá»§a báº¡n</a>.
       other_data: Dá»¯ liá»‡u khÃ¡c sáº½ khÃ´ng Ä‘Æ°á»£c di chuyá»ƒn tá»± Ä‘á»™ng
-      redirect: Trang cÃ¡ nhÃ¢n hiá»‡n táº¡i cá»§a báº¡n sáº½ Ä‘Æ°á»£c cáºp nháºt vá»›i thÃ´ng bÃ¡o chuyá»ƒn hÆ°á»›ng vÃ  bá»‹ loáº¡i khá»i cÃ¡c tÃ¬m kiáº¿m
+      redirect: Trang cÃ¡ nhÃ¢n hiá»‡n táº¡i cá»§a báº¡n sáº½ hiá»ƒn thá»‹ thÃ´ng bÃ¡o chuyá»ƒn hÆ°á»›ng vÃ  bá»‹ loáº¡i khá»i káº¿t quáº£ tÃ¬m kiáº¿m
   moderation:
     title: Kiá»ƒm duyá»‡t
   move_handler:
     carry_blocks_over_text: TÃ i khoáº£n nÃ y chuyá»ƒn tá»« %{acct}, mÃ¡y chá»§ mÃ  báº¡n Ä‘Ã£ cháº·n trÆ°á»›c Ä‘Ã³.
     carry_mutes_over_text: TÃ i khoáº£n nÃ y chuyá»ƒn tá»« %{acct}, mÃ¡y chá»§ mÃ  báº¡n Ä‘Ã£ áº©n trÆ°á»›c Ä‘Ã³.
-    copy_account_note_text: 'TÃ i khoáº£n nÃ y chuyá»ƒn tá»« %{acct}, Ä‘Ã¢y lÃ  ghi chÃº vá» há» trÆ°á»›c Ä‘Ã³:'
+    copy_account_note_text: 'TÃ i khoáº£n nÃ y chuyá»ƒn tá»« %{acct}, Ä‘Ã¢y lÃ  lá»‹ch sá» kiá»ƒm duyá»‡t cá»§a há»:'
   notification_mailer:
     digest:
       action: Xem toÃ n bá»™ thÃ´ng bÃ¡o
       body: DÆ°á»›i Ä‘Ã¢y lÃ  nhá»¯ng tin nháº¯n báº¡n Ä‘Ã£ bá» lá»¡ ká»ƒ tá»« láº§n truy cáºp trÆ°á»›c vÃ o %{since}
-      mention: "%{name} vá»«a nháº¯c Ä‘áº¿n báº¡n trong:"
+      mention: "%{name} nháº¯c Ä‘áº¿n báº¡n trong:"
       new_followers_summary:
         other: NgoÃ i ra, báº¡n Ä‘Ã£ cÃ³ %{count} ngÆ°á»i theo dÃµi má»›i trong khi Ä‘i chÆ¡i! Ngáº¡c nhiÃªn chÆ°a!
       subject:
         other: "%{count} thÃ´ng bÃ¡o má»›i ká»ƒ tá»« láº§n truy cáºp trÆ°á»›c \U0001F418"
       title: Khi báº¡n offline...
     favourite:
-      body: TÃºt cá»§a báº¡n vá»«a Ä‘Æ°á»£c %{name} tÃ¢m Ä‘áº¯c
-      subject: "%{name} vá»«a tÃ¢m Ä‘áº¯c tÃºt cá»§a báº¡n"
-      title: LÆ°á»£t tÃ¢m Ä‘áº¯c má»›i
+      body: TÃºt cá»§a báº¡n vá»«a Ä‘Æ°á»£c thÃch bá»Ÿi %{name}
+      subject: "%{name} vá»«a thÃch tÃºt cá»§a báº¡n"
+      title: LÆ°á»£t thÃch má»›i
     follow:
-      body: Báº¡n vá»«a má»›i Ä‘Æ°á»£c %{name} theo dÃµi
-      subject: "%{name} vá»«a má»›i theo dÃµi báº¡n"
+      body: Báº¡n vá»«a Ä‘Æ°á»£c %{name} theo dÃµi!
+      subject: "%{name} vá»«a theo dÃµi báº¡n"
       title: NgÆ°á»i theo dÃµi má»›i
     follow_request:
       action: Quáº£n lÃ½ yÃªu cáº§u theo dÃµi
@@ -967,7 +1033,7 @@ vi:
   notifications:
     email_events: Email
     email_events_hint: 'Chá»n nhá»¯ng hoáº¡t Ä‘á»™ng sáº½ gá»i thÃ´ng bÃ¡o qua email:'
-    other_settings: CÃ i Ä‘áº·t thÃ´ng bÃ¡o khÃ¡c
+    other_settings: ThÃ´ng bÃ¡o khÃ¡c
   number:
     human:
       decimal_units:
@@ -978,6 +1044,14 @@ vi:
           quadrillion: Q
           thousand: K
           trillion: T
+  otp_authentication:
+    code_hint: Nháºp mÃ£ Ä‘Æ°á»£c táº¡o bá»Ÿi á»©ng dá»¥ng xÃ¡c thá»±c cá»§a báº¡n Ä‘á»ƒ xÃ¡c nháºn
+    description_html: Náº¿u kÃch hoáº¡t <strong>xÃ¡c thá»±c hai bÆ°á»›c</strong> thÃ´ng qua á»©ng dá»¥ng, báº¡n sáº½ Ä‘Äƒng nháºp báº±ng mÃ£ token Ä‘Æ°á»£c táº¡o bá»Ÿi chÃnh Ä‘iá»‡n thoáº¡i cá»§a báº¡n.
+    enable: KÃch hoáº¡t
+    instructions_html: "<strong>QuÃ©t mÃ£ QR báº±ng Google Authenticator hoáº·c má»™t á»©ng dá»¥ng TOTP tÆ°Æ¡ng tá»± trÃªn Ä‘iá»‡n thoáº¡i cá»§a báº¡n</strong>. Ká»ƒ tá»« bÃ¢y giá», á»©ng dá»¥ng Ä‘Ã³ sáº½ táº¡o nhá»¯ng token Ä‘á»ƒ báº¡n Ä‘Äƒng nháºp."
+    manual_instructions: 'Náº¿u báº¡n khÃ´ng thá»ƒ quÃ©t mÃ£ QR, Ä‘Ã¢y sáº½ lÃ  dÃ²ng chá»¯ gá»£i Ã½:'
+    setup: Thiáº¿t láºp
+    wrong_code: MÃ£ vá»«a nháºp khÃ´ng chÃnh xÃ¡c! Thá»i gian mÃ¡y chá»§ vÃ  thá»i gian thiáº¿t bá»‹ chÃnh xÃ¡c chÆ°a?
   pagination:
     newer: Má»›i hÆ¡n
     next: Káº¿ tiáº¿p
@@ -986,11 +1060,11 @@ vi:
     truncate: "&hellip;"
   polls:
     errors:
-      already_voted: Báº¡n Ä‘Ã£ bÃ¬nh chá»n trong cuá»™c thÄƒm dÃ² nÃ y
+      already_voted: Báº¡n Ä‘Ã£ bÃ¬nh chá»n xong rá»“i
       duplicate_options: chá»©a cÃ¡c lá»±a chá»n trÃ¹ng láº·p
       duration_too_long: quÃ¡ xa so vá»›i thá»i Ä‘iá»ƒm hiá»‡n táº¡i
       duration_too_short: quÃ¡ sá»›m
-      expired: Cuá»™c thÄƒm dÃ² Ä‘Ã£ káº¿t thÃºc
+      expired: Cuá»™c bÃ¬nh chá»n Ä‘Ã£ káº¿t thÃºc
       invalid_choice: Lá»±a chá»n khÃ´ng tá»“n táº¡i
       over_character_limit: Ä‘á»™ dÃ i tá»‘i Ä‘a %{max} kÃ½ tá»±
       too_few_options: pháº£i cÃ³ nhiá»u hÆ¡n má»™t má»¥c
@@ -1005,31 +1079,32 @@ vi:
       unrecognized_emoji: khÃ´ng pháº£i lÃ  emoji
   relationships:
     activity: Hoáº¡t Ä‘á»™ng tÃ i khoáº£n
-    dormant: KhÃ´ng cÃ³ tÆ°Æ¡ng tÃ¡c
-    followers: NgÆ°á»i nÃ y Ä‘ang theo dÃµi báº¡n
-    following: Báº¡n Ä‘ang theo dÃµi ngÆ°á»i nÃ y
-    invited: NgÆ°á»i báº¡n má»i Ä‘Äƒng kÃ½
+    dormant: ChÆ°a tÆ°Æ¡ng tÃ¡c
+    follow_selected_followers: Theo dÃµi nhá»¯ng ngÆ°á»i Ä‘Ã£ chá»n
+    followers: NgÆ°á»i theo dÃµi
+    following: Äang theo dÃµi
+    invited: ÄÃ£ má»i
     last_active: Hoáº¡t Ä‘á»™ng láº§n cuá»‘i
-    most_recent: Gáº§n Ä‘Ã¢y nháº¥t
-    moved: Dá»i sang
-    mutual: Báº±ng Há»¯u
-    primary: SÆ¡ cáº¥p
+    most_recent: Má»›i nháº¥t
+    moved: ÄÃ£ xÃ³a
+    mutual: Äá»“ng thá»i
+    primary: BÃ¬nh thÆ°á»ng
     relationship: Má»‘i quan há»‡
     remove_selected_domains: XÃ³a háº¿t ngÆ°á»i theo dÃµi tá»« cÃ¡c mÃ¡y chá»§ Ä‘Ã£ chá»n
     remove_selected_followers: XÃ³a nhá»¯ng ngÆ°á»i theo dÃµi Ä‘Ã£ chá»n
-    remove_selected_follows: Há»§y theo dÃµi ngÆ°á»i dÃ¹ng Ä‘Ã£ chá»n
-    status: TÃ¬nh tráº¡ng tÃ i khoáº£n
+    remove_selected_follows: NgÆ°ng theo dÃµi nhá»¯ng ngÆ°á»i Ä‘Ã£ chá»n
+    status: Tráº¡ng thÃ¡i tÃ i khoáº£n
   remote_follow:
     acct: Nháºp Ä‘á»‹a chá»‰ Mastodon cá»§a báº¡n (tÃªn@mÃ¡y chá»§)
-    missing_resource: KhÃ´ng thá»ƒ tÃ¬m tháº¥y URL chuyá»ƒn hÆ°á»›ng cáº§n thiáº¿t cho tÃ i khoáº£n cá»§a báº¡n
-    no_account_html: Náº¿u chÆ°a cÃ³ tÃ i khoáº£n, báº¡n cÃ³ thá»ƒ <a href='%{sign_up_path}' target='_blank'>Ä‘Äƒng kÃ½ táº¡i Ä‘Ã¢y</a>
-    proceed: Tiáº¿n hÃ nh theo
-    prompt: 'Báº¡n sáº¯p theo dÃµi:'
+    missing_resource: KhÃ´ng tÃ¬m tháº¥y URL chuyá»ƒn hÆ°á»›ng cho tÃ i khoáº£n cá»§a báº¡n
+    no_account_html: Náº¿u chÆ°a cÃ³ tÃ i khoáº£n, hÃ£y <a href='%{sign_up_path}' target='_blank'>Ä‘Äƒng kÃ½</a>
+    proceed: Theo dÃµi
+    prompt: 'Báº¡n vá»«a yÃªu cáº§u theo dÃµi:'
     reason_html: "<strong>Táº¡i sao bÆ°á»›c nÃ y lÃ  cáº§n thiáº¿t?</strong> <code>%{instance}</code> cÃ³ thá»ƒ khÃ´ng pháº£i lÃ  mÃ¡y chá»§ nÆ¡i báº¡n Ä‘Ã£ Ä‘Äƒng kÃ½, vÃ¬ váºy chÃºng tÃ´i cáº§n chuyá»ƒn hÆ°á»›ng báº¡n Ä‘áº¿n mÃ¡y chá»§ cá»§a báº¡n trÆ°á»›c."
   remote_interaction:
     favourite:
-      proceed: YÃªu thÃch tÃºt nÃ y
-      prompt: Báº¡n cÃ³ muá»‘n tÃ¢m Ä‘áº¯c tÃºt nÃ y?
+      proceed: ThÃch tÃºt
+      prompt: 'Báº¡n muá»‘n thÃch tÃºt nÃ y:'
     reblog:
       proceed: Tiáº¿p tá»¥c chia sáº»
       prompt: Báº¡n cÃ³ muá»‘n chia sáº» tÃºt nÃ y?
@@ -1041,7 +1116,7 @@ vi:
     over_total_limit: Báº¡n Ä‘Ã£ vÆ°á»£t quÃ¡ giá»›i háº¡n %{limit} cá»§a cÃ¡c tÃºt Ä‘Æ°á»£c lÃªn lá»‹ch
     too_soon: NgÃ y lÃªn lá»‹ch pháº£i trong tÆ°Æ¡ng lai
   sessions:
-    activity: Hoáº¡t Ä‘á»™ng cuá»‘i
+    activity: Gáº§n Ä‘Ã¢y nháº¥t
     browser: TrÃ¬nh duyá»‡t
     browsers:
       alipay: Alipay
@@ -1063,7 +1138,7 @@ vi:
       weibo: Weibo
     current_session: PhiÃªn hiá»‡n táº¡i
     description: "%{browser} trÃªn %{platform}"
-    explanation: ÄÃ¢y lÃ  cÃ¡c trÃ¬nh duyá»‡t web sá» dá»¥ng Ä‘á»ƒ Ä‘Äƒng nháºp vÃ o tÃ i khoáº£n Mastodon cá»§a báº¡n.
+    explanation: ÄÃ¢y lÃ  cÃ¡c trÃ¬nh duyá»‡t web Ä‘Ã£ tá»«ng Ä‘Äƒng nháºp vÃ o tÃ i khoáº£n Mastodon cá»§a báº¡n.
     ip: IP
     platforms:
       adobe_air: Adobe Air
@@ -1078,36 +1153,37 @@ vi:
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Äiá»‡n thoáº¡i Windows
-    revoke: Thu há»“i
-    revoke_success: Thu há»“i phiÃªn thÃ nh cÃ´ng
+    revoke: Gá»¡
+    revoke_success: Gá»¡ phiÃªn thÃ nh cÃ´ng
     title: PhiÃªn
   settings:
-    account: TÃ i khoáº£n
+    account: Báº£o máºt
     account_settings: CÃ i Ä‘áº·t tÃ i khoáº£n
-    aliases: Äá»‹nh danh tÃ i khoáº£n
+    aliases: Káº¿t ná»‘i tÃ i khoáº£n
     appearance: Giao diá»‡n
-    authorized_apps: App Ä‘Ã£ sá» dá»¥ng
+    authorized_apps: App Ä‘Ã£ dÃ¹ng
     back: Quay láº¡i Mastodon
     delete: XÃ³a tÃ i khoáº£n
-    development: PhÃ¡t triá»ƒn
-    edit_profile: Chá»‰nh sá»a trang cÃ¡ nhÃ¢n
+    development: Láºp trÃ¬nh
+    edit_profile: CÃ¡ nhÃ¢n hÃ³a
     export: Xuáº¥t dá»¯ liá»‡u
     featured_tags: Hashtags thÆ°á»ng dÃ¹ng
     identity_proofs: Báº±ng chá»©ng nháºn dáº¡ng
     import: Nháºp dá»¯ liá»‡u
-    import_and_export: Nháºp vÃ  xuáº¥t dá»¯ liá»‡u
+    import_and_export: Dá»¯ liá»‡u
     migrate: Chuyá»ƒn tÃ i khoáº£n sang mÃ¡y chá»§ khÃ¡c
     notifications: ThÃ´ng bÃ¡o
     preferences: Chung
     profile: Trang cÃ¡ nhÃ¢n
     relationships: LÆ°á»£t theo dÃµi
     two_factor_authentication: XÃ¡c thá»±c hai bÆ°á»›c
+    webauthn_authentication: KhÃ³a báº£o máºt
   spam_check:
     spam_detected: ÄÃ¢y lÃ  má»™t bÃ¡o cÃ¡o tá»± Ä‘á»™ng. ÄÃ£ phÃ¡t hiá»‡n thÆ° rÃ¡c.
   statuses:
     attached:
       audio:
-        other: "%{count} bÃ i hÃ¡t"
+        other: "%{count} Ã¢m thanh"
       description: 'ÄÃnh kÃ¨m: %{attached}'
       image:
         other: "%{count} hÃ¬nh áº£nh"
@@ -1120,7 +1196,7 @@ vi:
     errors:
       in_reply_not_found: Báº¡n Ä‘ang tráº£ lá»i má»™t tÃºt khÃ´ng cÃ²n tá»“n táº¡i.
     language_detection: Tá»± Ä‘á»™ng phÃ¡t hiá»‡n ngÃ´n ngá»¯
-    open_in_web: Má»Ÿ trÃªn web
+    open_in_web: Xem trong Mastodon
     over_character_limit: vÆ°á»£t quÃ¡ giá»›i háº¡n %{max} kÃ½ tá»±
     pin_errors:
       limit: Báº¡n Ä‘Ã£ ghim quÃ¡ sá»‘ lÆ°á»£ng tÃºt cho phÃ©p
@@ -1131,19 +1207,21 @@ vi:
       total_people:
         other: "%{count} ngÆ°á»i"
       total_votes:
-        other: "%{count} bÃ¬nh chá»n"
-      vote: Cuá»™c thÄƒm dÃ²
-    show_more: Xem thÃªm
-    show_thread: NguyÃªn vÄƒn
-    sign_in_to_participate: ÄÄƒng nháºp Ä‘á»ƒ tham gia vÃ o cuá»™c trÃ² chuyá»‡n
+        other: "%{count} ngÆ°á»i"
+      vote: BÃ¬nh chá»n
+    show_more: Äá»c thÃªm
+    show_newer: Má»›i hÆ¡n
+    show_older: CÅ© hÆ¡n
+    show_thread: ToÃ n bá»™ chá»§ Ä‘á»
+    sign_in_to_participate: ÄÄƒng nháºp Ä‘á»ƒ tráº£ lá»i chá»§ Ä‘á» nÃ y
     title: '%{name}: "%{quote}"'
     visibilities:
-      private: ÄÃ³ng
+      private: NgÆ°á»i theo dÃµi
       private_long: Chá»‰ ngÆ°á»i theo dÃµi má»›i xem Ä‘Æ°á»£c tÃºt
       public: CÃ´ng khai
       public_long: Ai cÅ©ng cÃ³ thá»ƒ tháº¥y
-      unlisted: Má»Ÿ
-      unlisted_long: Ai cÅ©ng cÃ³ thá»ƒ xem nhÆ°ng khÃ´ng hiá»‡n trÃªn báº£ng tin mÃ¡y chá»§
+      unlisted: RiÃªng tÆ°
+      unlisted_long: KhÃ´ng hiá»‡n trÃªn báº£ng tin mÃ¡y chá»§
   stream_entries:
     pinned: TÃºt Ä‘Æ°á»£c ghim
     reblogged: chia sáº»
@@ -1151,7 +1229,54 @@ vi:
   tags:
     does_not_match_previous_name: khÃ´ng khá»›p vá»›i tÃªn trÆ°á»›c
   terms:
-    body_html: "<h2> ChÃnh sÃ¡ch báº£o máºt </h2><h3 id=\"collect\"> ChÃºng ta Ä‘Ã£ thu tháºp Ä‘Æ°á»£c thÃ´ng tin gÃ¬ rá»“i? </h3><ul><li> <em>ThÃ´ng tin tÃ i khoáº£n cÆ¡ báº£n</em> : Náº¿u báº¡n Ä‘Äƒng kÃ½ trÃªn mÃ¡y chá»§ nÃ y, báº¡n cÃ³ thá»ƒ Ä‘Æ°á»£c yÃªu cáº§u nháºp tÃªn ngÆ°á»i dÃ¹ng, Ä‘á»‹a chá»‰ email vÃ  máºt kháº©u. Báº¡n cÅ©ng cÃ³ thá»ƒ nháºp thÃ´ng tin há»“ sÆ¡ bá»• sung nhÆ° tÃªn hiá»ƒn thá»‹ vÃ  tiá»ƒu sá» vÃ  táº£i lÃªn hÃ¬nh áº£nh há»“ sÆ¡ vÃ  hÃ¬nh áº£nh tiÃªu Ä‘á». TÃªn ngÆ°á»i dÃ¹ng, tÃªn hiá»ƒn thá»‹, tiá»ƒu sá», áº£nh há»“ sÆ¡ vÃ  hÃ¬nh áº£nh tiÃªu Ä‘á» luÃ´n Ä‘Æ°á»£c liá»‡t kÃª cÃ´ng khai. </li><li> <em>BÃ i Ä‘Äƒng, theo dÃµi vÃ  thÃ´ng tin cÃ´ng khai khÃ¡c</em> : Danh sÃ¡ch nhá»¯ng ngÆ°á»i báº¡n theo dÃµi Ä‘Æ°á»£c liá»‡t kÃª cÃ´ng khai, Ä‘iá»u nÃ y cÅ©ng Ä‘Ãºng vá»›i nhá»¯ng ngÆ°á»i theo dÃµi báº¡n. Khi báº¡n gá»i tin nháº¯n, ngÃ y vÃ  giá» Ä‘Æ°á»£c lÆ°u trá»¯ cÅ©ng nhÆ° á»©ng dá»¥ng báº¡n Ä‘Ã£ gá»i tin nháº¯n tá»« Ä‘Ã³. Tin nháº¯n cÃ³ thá»ƒ chá»©a tá»‡p Ä‘Ãnh kÃ¨m phÆ°Æ¡ng tiá»‡n, cháº³ng háº¡n nhÆ° hÃ¬nh áº£nh vÃ  video. BÃ i viáº¿t cÃ´ng khai vÃ  chÆ°a niÃªm yáº¿t cÃ³ sáºµn cÃ´ng khai. Khi báº¡n cÃ³ má»™t bÃ i Ä‘Äƒng trÃªn há»“ sÆ¡ cá»§a báº¡n, Ä‘Ã³ cÅ©ng lÃ  thÃ´ng tin cÃ³ sáºµn cÃ´ng khai. BÃ i Ä‘Äƒng cá»§a báº¡n Ä‘Æ°á»£c gá»i Ä‘áº¿n nhá»¯ng ngÆ°á»i theo dÃµi cá»§a báº¡n, trong má»™t sá»‘ trÆ°á»ng há»£p, Ä‘iá»u Ä‘Ã³ cÃ³ nghÄ©a lÃ  chÃºng Ä‘Æ°á»£c gá»i Ä‘áº¿n cÃ¡c mÃ¡y chá»§ khÃ¡c nhau vÃ  cÃ¡c báº£n sao Ä‘Æ°á»£c lÆ°u trá»¯ á»Ÿ Ä‘Ã³. Khi báº¡n xÃ³a bÃ i viáº¿t, Ä‘iá»u nÃ y cÅ©ng Ä‘Æ°á»£c gá»i Ä‘áº¿n nhá»¯ng ngÆ°á»i theo dÃµi cá»§a báº¡n. HÃ nh Ä‘á»™ng Ä‘Äƒng kÃ½ láº¡i hoáº·c yÃªu thÃch má»™t bÃ i Ä‘Äƒng khÃ¡c luÃ´n Ä‘Æ°á»£c cÃ´ng khai. </li><li> <em>BÃ i Ä‘Äƒng trá»±c tiáº¿p vÃ  chá»‰ dÃ nh cho ngÆ°á»i theo dÃµi</em> : Táº¥t cáº£ cÃ¡c bÃ i Ä‘Äƒng Ä‘Æ°á»£c lÆ°u trá»¯ vÃ  xá» lÃ½ trÃªn mÃ¡y chá»§. CÃ¡c bÃ i Ä‘Äƒng chá»‰ dÃ nh cho ngÆ°á»i theo dÃµi Ä‘Æ°á»£c gá»i Ä‘áº¿n nhá»¯ng ngÆ°á»i theo dÃµi vÃ  ngÆ°á»i dÃ¹ng cá»§a báº¡n Ä‘Æ°á»£c Ä‘á» cáºp trong Ä‘Ã³ vÃ  cÃ¡c bÃ i Ä‘Äƒng trá»±c tiáº¿p chá»‰ Ä‘Æ°á»£c gá»i cho ngÆ°á»i dÃ¹ng Ä‘Æ°á»£c Ä‘á» cáºp trong Ä‘Ã³. Trong má»™t sá»‘ trÆ°á»ng há»£p, Ä‘iá»u Ä‘Ã³ cÃ³ nghÄ©a lÃ  chÃºng Ä‘Æ°á»£c gá»i Ä‘áº¿n cÃ¡c mÃ¡y chá»§ khÃ¡c nhau vÃ  cÃ¡c báº£n sao Ä‘Æ°á»£c lÆ°u trá»¯ á»Ÿ Ä‘Ã³. ChÃºng tÃ´i thá»±c hiá»‡n má»™t ná»— lá»±c thiá»‡n chÃ Ä‘á»ƒ giá»›i háº¡n quyá»n truy cáºp vÃ o cÃ¡c bÃ i Ä‘Äƒng Ä‘Ã³ chá»‰ cho nhá»¯ng ngÆ°á»i Ä‘Æ°á»£c á»§y quyá»n, nhÆ°ng cÃ¡c mÃ¡y chá»§ khÃ¡c cÃ³ thá»ƒ khÃ´ng lÃ m nhÆ° váºy. Do Ä‘Ã³, Ä‘iá»u quan trá»ng lÃ  pháº£i xem xÃ©t cÃ¡c mÃ¡y chá»§ mÃ  ngÆ°á»i theo dÃµi cá»§a báº¡n thuá»™c vá». Báº¡n cÃ³ thá»ƒ chuyá»ƒn Ä‘á»•i tÃ¹y chá»n Ä‘á»ƒ phÃª duyá»‡t vÃ  tá»« chá»‘i ngÆ°á»i theo dÃµi má»›i theo cÃ¡ch thá»§ cÃ´ng trong cÃ i Ä‘áº·t. <em>Xin lÆ°u Ã½ ráº±ng cÃ¡c nhÃ  khai thÃ¡c cá»§a mÃ¡y chá»§ vÃ  báº¥t ká»³ mÃ¡y chá»§ nháºn nÃ o cÅ©ng cÃ³ thá»ƒ xem cÃ¡c tin nháº¯n</em> Ä‘Ã³ vÃ  ngÆ°á»i nháºn cÃ³ thá»ƒ chá»¥p mÃ n hÃ¬nh, sao chÃ©p hoáº·c chia sáº» láº¡i chÃºng. <em>KhÃ´ng chia sáº» báº¥t ká»³ thÃ´ng tin nguy hiá»ƒm nÃ o trÃªn Mastodon.</em> </li><li> <em>IP vÃ  siÃªu dá»¯ liá»‡u khÃ¡c</em> : Khi báº¡n Ä‘Äƒng nháºp, chÃºng tÃ´i ghi láº¡i Ä‘á»‹a chá»‰ IP báº¡n Ä‘Äƒng nháºp, cÅ©ng nhÆ° tÃªn cá»§a á»©ng dá»¥ng trÃ¬nh duyá»‡t cá»§a báº¡n. Táº¥t cáº£ cÃ¡c phiÃªn Ä‘Äƒng nháºp cÃ³ sáºµn Ä‘á»ƒ báº¡n xem xÃ©t vÃ  há»§y bá» trong cÃ i Ä‘áº·t. Äá»‹a chá»‰ IP má»›i nháº¥t Ä‘Æ°á»£c sá» dá»¥ng Ä‘Æ°á»£c lÆ°u trá»¯ tá»‘i Ä‘a 12 thÃ¡ng. ChÃºng tÃ´i cÅ©ng cÃ³ thá»ƒ giá»¯ láº¡i nháºt kÃ½ mÃ¡y chá»§ bao gá»“m Ä‘á»‹a chá»‰ IP cá»§a má»i yÃªu cáº§u Ä‘áº¿n mÃ¡y chá»§ cá»§a chÃºng tÃ´i. </li></ul><hr class=\"spacer\" /><h3 id=\"use\"> ChÃºng tÃ´i sá» dá»¥ng thÃ´ng tin cá»§a báº¡n Ä‘á»ƒ lÃ m gÃ¬? </h3><p> Báº¥t ká»³ thÃ´ng tin nÃ o chÃºng tÃ´i thu tháºp tá»« báº¡n cÃ³ thá»ƒ Ä‘Æ°á»£c sá» dá»¥ng theo cÃ¡c cÃ¡ch sau: </p><ul><li> Äá»ƒ cung cáº¥p cÃ¡c chá»©c nÄƒng cá»‘t lÃµi cá»§a Mastodon. Báº¡n chá»‰ cÃ³ thá»ƒ tÆ°Æ¡ng tÃ¡c vá»›i ná»™i dung cá»§a ngÆ°á»i khÃ¡c vÃ  Ä‘Äƒng ná»™i dung cá»§a riÃªng báº¡n khi báº¡n Ä‘Äƒng nháºp. VÃ dá»¥: báº¡n cÃ³ thá»ƒ theo dÃµi ngÆ°á»i khÃ¡c Ä‘á»ƒ xem cÃ¡c bÃ i Ä‘Äƒng káº¿t há»£p cá»§a há» trong dÃ²ng thá»i gian táº¡i nhÃ  Ä‘Æ°á»£c cÃ¡ nhÃ¢n hÃ³a cá»§a báº¡n. </li><li> Äá»ƒ há»— trá»£ kiá»ƒm duyá»‡t cá»™ng Ä‘á»“ng, vÃ dá»¥ so sÃ¡nh Ä‘á»‹a chá»‰ IP cá»§a báº¡n vá»›i cÃ¡c Ä‘á»‹a chá»‰ Ä‘Ã£ biáº¿t khÃ¡c Ä‘á»ƒ xÃ¡c Ä‘á»‹nh trá»‘n trÃ¡nh hoáº·c vi pháº¡m khÃ¡c. </li><li> Äá»‹a chá»‰ email báº¡n cung cáº¥p cÃ³ thá»ƒ Ä‘Æ°á»£c sá» dá»¥ng Ä‘á»ƒ gá»i cho báº¡n thÃ´ng tin, thÃ´ng bÃ¡o vá» nhá»¯ng ngÆ°á»i khÃ¡c tÆ°Æ¡ng tÃ¡c vá»›i ná»™i dung cá»§a báº¡n hoáº·c gá»i tin nháº¯n cho báº¡n vÃ  Ä‘á»ƒ tráº£ lá»i cÃ¡c cÃ¢u há»i cÅ©ng nhÆ° / hoáº·c cÃ¡c yÃªu cáº§u hoáº·c cÃ¢u há»i khÃ¡c. </li></ul><hr class=\"spacer\" /><h3 id=\"protect\"> LÃ m tháº¿ nÃ o Ä‘á»ƒ chÃºng tÃ´i báº£o vá»‡ thÃ´ng tin cá»§a báº¡n? </h3><p> ChÃºng tÃ´i thá»±c hiá»‡n nhiá»u biá»‡n phÃ¡p báº£o máºt Ä‘á»ƒ duy trÃ¬ sá»± an toÃ n cá»§a thÃ´ng tin cÃ¡ nhÃ¢n cá»§a báº¡n khi báº¡n nháºp, gá»i hoáº·c truy cáºp thÃ´ng tin cÃ¡ nhÃ¢n cá»§a báº¡n. Trong sá»‘ nhá»¯ng thá»© khÃ¡c, phiÃªn trÃ¬nh duyá»‡t cá»§a báº¡n, cÅ©ng nhÆ° lÆ°u lÆ°á»£ng giá»¯a cÃ¡c á»©ng dá»¥ng vÃ  API cá»§a báº¡n, Ä‘Æ°á»£c báº£o máºt báº±ng SSL vÃ  máºt kháº©u cá»§a báº¡n Ä‘Æ°á»£c bÄƒm báº±ng thuáºt toÃ¡n má»™t chiá»u máº¡nh máº½. Báº¡n cÃ³ thá»ƒ kÃch hoáº¡t xÃ¡c thá»±c hai yáº¿u tá»‘ Ä‘á»ƒ tiáº¿p tá»¥c truy cáºp an toÃ n vÃ o tÃ i khoáº£n cá»§a mÃ¬nh. </p><hr class=\"spacer\" /><h3 id=\"data-retention\"> ChÃnh sÃ¡ch lÆ°u giá»¯ dá»¯ liá»‡u cá»§a chÃºng tÃ´i lÃ  gÃ¬? </h3><p> ChÃºng tÃ´i sáº½ thá»±c hiá»‡n má»™t ná»— lá»±c Ä‘á»©c tin tá»‘t Ä‘á»ƒ: </p><ul><li> Giá»¯ láº¡i nháºt kÃ½ mÃ¡y chá»§ chá»©a Ä‘á»‹a chá»‰ IP cá»§a táº¥t cáº£ cÃ¡c yÃªu cáº§u Ä‘áº¿n mÃ¡y chá»§ nÃ y, cho Ä‘áº¿n khi cÃ¡c nháºt kÃ½ Ä‘Ã³ Ä‘Æ°á»£c lÆ°u giá»¯, khÃ´ng quÃ¡ 90 ngÃ y. </li><li> Giá»¯ láº¡i cÃ¡c Ä‘á»‹a chá»‰ IP Ä‘Æ°á»£c liÃªn káº¿t vá»›i ngÆ°á»i dÃ¹ng Ä‘Ã£ Ä‘Äƒng kÃ½ khÃ´ng quÃ¡ 12 thÃ¡ng. </li></ul><p> Báº¡n cÃ³ thá»ƒ yÃªu cáº§u vÃ  táº£i xuá»‘ng má»™t kho lÆ°u trá»¯ ná»™i dung cá»§a báº¡n, bao gá»“m cÃ¡c bÃ i Ä‘Äƒng, tá»‡p Ä‘Ãnh kÃ¨m phÆ°Æ¡ng tiá»‡n, áº£nh há»“ sÆ¡ vÃ  hÃ¬nh áº£nh tiÃªu Ä‘á». </p><p> Báº¡n cÃ³ thá»ƒ xÃ³a tÃ i khoáº£n cá»§a mÃ¬nh báº¥t cá»© lÃºc nÃ o. </p><hr class=\"spacer\"/><h3 id=\"cookies\"> ChÃºng ta cÃ³ sá» dá»¥ng cookie khÃ´ng? </h3><p> ÄÃºng. Cookies lÃ  cÃ¡c tá»‡p nhá» mÃ  má»™t trang web hoáº·c nhÃ  cung cáº¥p dá»‹ch vá»¥ cá»§a nÃ³ chuyá»ƒn vÃ o á»• cá»©ng mÃ¡y tÃnh cá»§a báº¡n thÃ´ng qua trÃ¬nh duyá»‡t Web (náº¿u báº¡n cho phÃ©p). Nhá»¯ng cookie nÃ y cho phÃ©p trang web nháºn ra trÃ¬nh duyá»‡t cá»§a báº¡n vÃ , náº¿u báº¡n cÃ³ tÃ i khoáº£n Ä‘Ã£ Ä‘Äƒng kÃ½, hÃ£y liÃªn káº¿t nÃ³ vá»›i tÃ i khoáº£n Ä‘Ã£ Ä‘Äƒng kÃ½ cá»§a báº¡n. </p><p> ChÃºng tÃ´i sá» dá»¥ng cookie Ä‘á»ƒ hiá»ƒu vÃ  lÆ°u cÃ¡c tÃ¹y chá»n cá»§a báº¡n cho cÃ¡c láº§n truy cáºp trong tÆ°Æ¡ng lai. </p><hr class=\"spacer\" /><h3 id=\"disclose\"> ChÃºng tÃ´i cÃ³ Ä‘Æ°á»£c cÃ´ng bá»‘ báº¥t cá»© thÃ´ng tin nÃ o ra bÃªn ngoÃ i khÃ´ng? </h3><p> ChÃºng tÃ´i khÃ´ng bÃ¡n, trao Ä‘á»•i hoáº·c chuyá»ƒn nhÆ°á»£ng cho cÃ¡c bÃªn ngoÃ i thÃ´ng tin nháºn dáº¡ng cÃ¡ nhÃ¢n cá»§a báº¡n. Äiá»u nÃ y khÃ´ng bao gá»“m cÃ¡c bÃªn thá»© ba Ä‘Ã¡ng tin cáºy há»— trá»£ chÃºng tÃ´i Ä‘iá»u hÃ nh trang web cá»§a chÃºng tÃ´i, tiáº¿n hÃ nh kinh doanh hoáº·c phá»¥c vá»¥ báº¡n, miá»…n lÃ  cÃ¡c bÃªn Ä‘Ã³ Ä‘á»“ng Ã½ giá»¯ bÃ máºt thÃ´ng tin nÃ y. ChÃºng tÃ´i cÅ©ng cÃ³ thá»ƒ tiáº¿t lá»™ thÃ´ng tin cá»§a báº¡n khi chÃºng tÃ´i tin ráº±ng viá»‡c phÃ¡t hÃ nh lÃ  phÃ¹ há»£p Ä‘á»ƒ tuÃ¢n thá»§ luáºt phÃ¡p, thá»±c thi chÃnh sÃ¡ch trang web cá»§a chÃºng tÃ´i hoáº·c báº£o vá»‡ quyá»n, tÃ i sáº£n hoáº·c an toÃ n cá»§a chÃºng tÃ´i hoáº·c cá»§a ngÆ°á»i khÃ¡c. </p><p> Ná»™i dung cÃ´ng khai cá»§a báº¡n cÃ³ thá»ƒ Ä‘Æ°á»£c táº£i xuá»‘ng bá»Ÿi cÃ¡c mÃ¡y chá»§ khÃ¡c trong máº¡ng. CÃ¡c bÃ i Ä‘Äƒng cÃ´ng khai vÃ  chá»‰ dÃ nh cho ngÆ°á»i theo dÃµi cá»§a báº¡n Ä‘Æ°á»£c gá»i Ä‘áº¿n cÃ¡c mÃ¡y chá»§ nÆ¡i ngÆ°á»i theo dÃµi cá»§a báº¡n cÆ° trÃº vÃ  tin nháº¯n trá»±c tiáº¿p Ä‘Æ°á»£c gá»i Ä‘áº¿n mÃ¡y chá»§ cá»§a ngÆ°á»i nháºn, cho Ä‘áº¿n khi nhá»¯ng ngÆ°á»i theo dÃµi hoáº·c ngÆ°á»i nháºn Ä‘Ã³ cÆ° trÃº trÃªn má»™t mÃ¡y chá»§ khÃ¡c vá»›i mÃ¡y chá»§ nÃ y. </p><p> Khi báº¡n cho phÃ©p á»©ng dá»¥ng sá» dá»¥ng tÃ i khoáº£n cá»§a mÃ¬nh, tÃ¹y thuá»™c vÃ o pháº¡m vi quyá»n báº¡n phÃª duyá»‡t, á»©ng dá»¥ng cÃ³ thá»ƒ truy cáºp thÃ´ng tin há»“ sÆ¡ cÃ´ng khai, danh sÃ¡ch sau Ä‘Ã¢y, ngÆ°á»i theo dÃµi, danh sÃ¡ch cá»§a báº¡n, táº¥t cáº£ bÃ i Ä‘Äƒng vÃ  má»¥c yÃªu thÃch cá»§a báº¡n. CÃ¡c á»©ng dá»¥ng khÃ´ng bao giá» cÃ³ thá»ƒ truy cáºp Ä‘á»‹a chá»‰ e-mail hoáº·c máºt kháº©u cá»§a báº¡n. </p><hr class=\"spacer\" /><h3 id=\"children\"> Sá» dá»¥ng trang web cá»§a tráº» em </h3><p> Náº¿u mÃ¡y chá»§ nÃ y á»Ÿ EU hoáº·c EEA: Trang web cá»§a chÃºng tÃ´i, cÃ¡c sáº£n pháº©m vÃ  dá»‹ch vá»¥ Ä‘á»u hÆ°á»›ng Ä‘áº¿n nhá»¯ng ngÆ°á»i Ãt nháº¥t 16 tuá»•i. Náº¿u báº¡n dÆ°á»›i 16 tuá»•i, theo cÃ¡c yÃªu cáº§u cá»§a GDPR ( <a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">Quy Ä‘á»‹nh báº£o vá»‡ dá»¯ liá»‡u chung</a> ) khÃ´ng sá» dá»¥ng trang web nÃ y. </p><p> Náº¿u mÃ¡y chá»§ nÃ y á»Ÿ Hoa Ká»³: Trang web cá»§a chÃºng tÃ´i, cÃ¡c sáº£n pháº©m vÃ  dá»‹ch vá»¥ Ä‘á»u hÆ°á»›ng Ä‘áº¿n nhá»¯ng ngÆ°á»i Ãt nháº¥t 13 tuá»•i. Náº¿u báº¡n dÆ°á»›i 13 tuá»•i, theo cÃ¡c yÃªu cáº§u cá»§a COPPA ( <a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Äáº¡o luáºt báº£o vá»‡ quyá»n riÃªng tÆ° trá»±c tuyáº¿n cá»§a tráº» em</a> ) khÃ´ng sá» dá»¥ng trang web nÃ y. </p><p> YÃªu cáº§u phÃ¡p luáºt cÃ³ thá»ƒ khÃ¡c nhau náº¿u mÃ¡y chá»§ nÃ y á»Ÿ khu vá»±c tÃ i phÃ¡n khÃ¡c. </p><hr class=\"spacer\" /><h3 id=\"changes\"> Thay Ä‘á»•i chÃnh sÃ¡ch báº£o máºt cá»§a chÃºng tÃ´i </h3><p> Náº¿u chÃºng tÃ´i quyáº¿t Ä‘á»‹nh thay Ä‘á»•i chÃnh sÃ¡ch báº£o máºt cá»§a mÃ¬nh, chÃºng tÃ´i sáº½ Ä‘Äƒng nhá»¯ng thay Ä‘á»•i Ä‘Ã³ trÃªn trang nÃ y. </p><p> TÃ i liá»‡u nÃ y lÃ  CC-BY-SA. NÃ³ Ä‘Æ°á»£c cáºp nháºt láº§n cuá»‘i vÃ o ngÃ y 7 thÃ¡ng 3 nÄƒm 2018. </p><p> Ban Ä‘áº§u Ä‘Æ°á»£c Ä‘iá»u chá»‰nh tá»« <a href=\"https://github.com/discourse/discourse\">chÃnh sÃ¡ch quyá»n riÃªng tÆ° cá»§a Nghá»‹ luáºn</a> . </p> \n"
+    body_html: |
+      <h2>ChÃnh sÃ¡ch báº£o máºt</h2>
+      <h3 id="collect">ChÃºng tÃ´i thu tháºp nhá»¯ng thÃ´ng tin gÃ¬?</h3>
+
+      <ul>
+      <li><em>ThÃ´ng tin tÃ i khoáº£n cÆ¡ báº£n</em>: Náº¿u báº¡n Ä‘Äƒng kÃ½ trÃªn mÃ¡y chá»§ nÃ y, báº¡n pháº£i cung cáº¥p tÃªn ngÆ°á»i dÃ¹ng, Ä‘á»‹a chá»‰ email vÃ  máºt kháº©u. Báº¡n cÅ©ng cÃ³ thá»ƒ tÃ¹y chá»n bá»• sung tÃªn hiá»ƒn thá»‹, mÃ´ táº£, áº£nh Ä‘áº¡i diá»‡n, áº£nh bÃ¬a. TÃªn ngÆ°á»i dÃ¹ng, tÃªn hiá»ƒn thá»‹, mÃ´ táº£, áº£nh há»“ sÆ¡ vÃ  áº£nh bÃ¬a luÃ´n Ä‘Æ°á»£c hiá»ƒn thá»‹ cÃ´ng khai.</li>
+      <li><em>TÃºt, lÆ°á»£t theo dÃµi vÃ  ná»™i dung cÃ´ng khai khÃ¡c</em>: Danh sÃ¡ch nhá»¯ng ngÆ°á»i báº¡n theo dÃµi Ä‘Æ°á»£c liá»‡t kÃª cÃ´ng khai, cÅ©ng tÆ°Æ¡ng tá»± nhÆ° danh sÃ¡ch nhá»¯ng ngÆ°á»i theo dÃµi báº¡n. Khi báº¡n Ä‘Äƒng tÃºt, ngÃ y giá» vÃ  á»©ng dá»¥ng sá» dá»¥ng Ä‘Æ°á»£c lÆ°u trá»¯. TÃºt cÃ³ thá»ƒ chá»©a tá»‡p Ä‘Ãnh kÃ¨m hÃ¬nh áº£nh vÃ  video. TÃºt cÃ´ng khai vÃ  tÃºt má»Ÿ sáº½ hiá»ƒn thá»‹ cÃ´ng khai. Khi báº¡n Ä‘Äƒng má»™t tÃºt trÃªn trang cÃ¡ nhÃ¢n cá»§a báº¡n, Ä‘Ã³ lÃ  ná»™i dung cÃ´ng khai. TÃºt cá»§a báº¡n sáº½ gá»i Ä‘áº¿n nhá»¯ng ngÆ°á»i theo dÃµi cá»§a báº¡n, Ä‘á»“ng nghÄ©a vá»›i viá»‡c sáº½ cÃ³ cÃ¡c báº£n sao Ä‘Æ°á»£c lÆ°u trá»¯ á»Ÿ mÃ¡y chá»§ cá»§a há». Khi báº¡n xÃ³a bÃ i viáº¿t, báº£n sao tá»« nhá»¯ng ngÆ°á»i theo dÃµi cá»§a báº¡n cÅ©ng bá»‹ xÃ³a theo. HÃ nh Ä‘á»™ng chia sáº» hoáº·c thÃch má»™t tÃºt luÃ´n luÃ´n lÃ  cÃ´ng khai.</li>
+      <li><em>Tin nháº¯n vÃ  tÃºt dÃ nh cho ngÆ°á»i theo dÃµi</em>: Táº¥t cáº£ tÃºt Ä‘Æ°á»£c lÆ°u trá»¯ vÃ  xá» lÃ½ trÃªn mÃ¡y chá»§. CÃ¡c tÃºt dÃ nh cho ngÆ°á»i theo dÃµi Ä‘Æ°á»£c gá»i Ä‘áº¿n nhá»¯ng ngÆ°á»i theo dÃµi vÃ  nhá»¯ng ngÆ°á»i Ä‘Æ°á»£c gáº¯n tháº» trong tÃºt. CÃ²n cÃ¡c tin nháº¯n chá»‰ Ä‘Æ°á»£c gá»i Ä‘áº¿n cho ngÆ°á»i nháºn. Äiá»u Ä‘Ã³ cÃ³ nghÄ©a lÃ  chÃºng Ä‘Æ°á»£c gá»i Ä‘áº¿n cÃ¡c mÃ¡y chá»§ khÃ¡c nhau vÃ  cÃ³ cÃ¡c báº£n sao Ä‘Æ°á»£c lÆ°u trá»¯ á»Ÿ Ä‘Ã³. ChÃºng tÃ´i Ä‘á» nghá»‹ chá»‰ cho nhá»¯ng ngÆ°á»i Ä‘Æ°á»£c á»§y quyá»n truy cáºp vÃ o Ä‘Ã³, nhÆ°ng khÃ´ng pháº£i mÃ¡y chá»§ nÃ o cÅ©ng lÃ m nhÆ° váºy. Do Ä‘Ã³, Ä‘iá»u quan trá»ng lÃ  pháº£i xem xÃ©t ká»¹ mÃ¡y chá»§ cá»§a ngÆ°á»i theo dÃµi cá»§a báº¡n. Báº¡n cÃ³ thá»ƒ thiáº¿t láºp tá»± mÃ¬nh phÃª duyá»‡t vÃ  tá»« chá»‘i ngÆ°á»i theo dÃµi má»›i trong cÃ i Ä‘áº·t. <em>Xin lÆ°u Ã½ ráº±ng quáº£n trá»‹ viÃªn mÃ¡y chá»§ cá»§a báº¡n vÃ  báº¥t ká»³ mÃ¡y chá»§ cá»§a ngÆ°á»i nháºn nÃ o cÅ©ng cÃ³ thá»ƒ xem cÃ¡c tin nháº¯n</em>. NgÆ°á»i nháºn tin nháº¯n cÃ³ thá»ƒ chá»¥p mÃ n hÃ¬nh, sao chÃ©p hoáº·c chia sáº» láº¡i chÃºng. <em>KhÃ´ng nÃªn chia sáº» báº¥t ká»³ thÃ´ng tin rá»§i ro nÃ o trÃªn Mastodon.</em></li>
+      <li> <em>Äá»‹a chá»‰ IP vÃ  siÃªu dá»¯ liá»‡u khÃ¡c</em>: Khi báº¡n Ä‘Äƒng nháºp, chÃºng tÃ´i ghi nhá»› Ä‘á»‹a chá»‰ IP Ä‘Äƒng nháºp cÅ©ng nhÆ° tÃªn trÃ¬nh duyá»‡t cá»§a báº¡n. Táº¥t cáº£ cÃ¡c phiÃªn Ä‘Äƒng nháºp sáº½ Ä‘á»ƒ báº¡n xem xÃ©t vÃ  há»§y bá» trong pháº§n cÃ i Ä‘áº·t. Äá»‹a chá»‰ IP sá» dá»¥ng Ä‘Æ°á»£c lÆ°u trá»¯ tá»‘i Ä‘a 12 thÃ¡ng. ChÃºng tÃ´i cÅ©ng cÃ³ thá»ƒ giá»¯ láº¡i nháºt kÃ½ mÃ¡y chá»§ bao gá»“m Ä‘á»‹a chá»‰ IP cá»§a nhá»¯ng lÆ°á»£t Ä‘Äƒng kÃ½ tÃ i khoáº£n trÃªn mÃ¡y chá»§ cá»§a chÃºng tÃ´i. </li>
+      </ul><hr class="spacer" />
+      <h3 id="use"> ChÃºng tÃ´i sá» dá»¥ng thÃ´ng tin cá»§a báº¡n Ä‘á»ƒ lÃ m gÃ¬? </h3>
+      <p> Báº¥t ká»³ thÃ´ng tin nÃ o chÃºng tÃ´i thu tháºp tá»« báº¡n lÃ : </p>
+      <ul>
+      <li>Äá»ƒ cung cáº¥p cÃ¡c chá»©c nÄƒng cá»‘t lÃµi cá»§a Mastodon. Sau khi Ä‘Äƒng nháºp, báº¡n má»›i cÃ³ thá»ƒ tÆ°Æ¡ng tÃ¡c vá»›i ná»™i dung cá»§a ngÆ°á»i khÃ¡c vÃ  Ä‘Äƒng ná»™i dung cá»§a riÃªng báº¡n. VÃ dá»¥: báº¡n cÃ³ thá»ƒ theo dÃµi ngÆ°á»i khÃ¡c Ä‘á»ƒ xem cÃ¡c tÃºt cá»§a há» trong báº£ng tin cá»§a báº¡n.</li>
+      <li>Äá»ƒ há»— trá»£ kiá»ƒm duyá»‡t. VÃ dá»¥ so sÃ¡nh Ä‘á»‹a chá»‰ IP cá»§a báº¡n vá»›i cÃ¡c Ä‘á»‹a chá»‰ Ä‘Ã£ biáº¿t khÃ¡c Ä‘á»ƒ xÃ¡c Ä‘á»‹nh hacker hoáº·c spammer.</li>
+      <li>Äá»‹a chá»‰ email báº¡n cung cáº¥p chá»‰ Ä‘Æ°á»£c sá» dá»¥ng Ä‘á»ƒ gá»i cÃ¡c thÃ´ng bÃ¡o quan trá»ng, tráº£ lá»i cÃ¡c cÃ¢u há»i cÅ©ng nhÆ° yÃªu cáº§u khÃ¡c tá»« chÃnh báº¡n.</li>
+      </ul>
+      <hr class="spacer" />
+      <h3 id="protect">ChÃºng tÃ´i báº£o vá»‡ thÃ´ng tin cá»§a báº¡n nhÆ° tháº¿ nÃ o? </h3>
+      <p>ChÃºng tÃ´i thá»±c hiá»‡n nhiá»u biá»‡n phÃ¡p Ä‘á»ƒ duy trÃ¬ sá»± an toÃ n khi báº¡n nháºp, gá»i hoáº·c truy cáºp thÃ´ng tin cÃ¡ nhÃ¢n cá»§a báº¡n. Má»™t vÃ i trong sá»‘ Ä‘Ã³ nhÆ° lÃ  kiá»ƒm soÃ¡t phiÃªn Ä‘Äƒng nháºp cá»§a báº¡n, lÆ°u lÆ°á»£ng giá»¯a cÃ¡c á»©ng dá»¥ng vÃ  API, báº£o máºt báº±ng SSL vÃ  bÄƒm nhá» máºt kháº©u nhá» thuáºt toÃ¡n má»™t chiá»u máº¡nh máº½. Báº¡n cÃ³ thá»ƒ kÃch hoáº¡t xÃ¡c thá»±c hai yáº¿u tá»‘ Ä‘á»ƒ tiáº¿p tá»¥c truy cáºp an toÃ n vÃ o tÃ i khoáº£n cá»§a mÃ¬nh.</p>
+      <hr class="spacer" />
+      <h3 id="data-retention">ChÃºng tÃ´i lÆ°u trá»¯ dá»¯ liá»‡u nhÆ° tháº¿ nÃ o?</h3>
+      <p>ChÃºng tÃ´i tiáº¿n hÃ nh:</p>
+      <ul>
+      <li>Giá»¯ láº¡i nháºt kÃ½ mÃ¡y chá»§ chá»©a Ä‘á»‹a chá»‰ IP cá»§a táº¥t cáº£ cÃ¡c yÃªu cáº§u Ä‘áº¿n mÃ¡y chá»§ nÃ y, cho Ä‘áº¿n khi cÃ¡c nháºt kÃ½ Ä‘Ã³ bá»‹ xÃ³a Ä‘i trong vÃ²ng 90 ngÃ y.</li>
+      <li>Giá»¯ láº¡i cÃ¡c Ä‘á»‹a chá»‰ IP Ä‘Æ°á»£c liÃªn káº¿t vá»›i ngÆ°á»i dÃ¹ng Ä‘Ã£ Ä‘Äƒng kÃ½ trong vÃ²ng 12 thÃ¡ng.</li>
+      </ul>
+      <p>Báº¡n cÃ³ thá»ƒ táº£i xuá»‘ng má»™t báº£n sao lÆ°u trá»¯ ná»™i dung cá»§a báº¡n, bao gá»“m cÃ¡c tÃºt, tá»‡p Ä‘Ãnh kÃ¨m phÆ°Æ¡ng tiá»‡n, áº£nh Ä‘áº¡i diá»‡n vÃ  áº£nh bÃ¬a.</p>
+      <p> Báº¡n cÃ³ thá»ƒ xÃ³a tÃ i khoáº£n cá»§a mÃ¬nh báº¥t cá»© lÃºc nÃ o.</p>
+      <hr class="spacer"/>
+      <h3 id="cookies">ChÃºng tÃ´i cÃ³ sá» dá»¥ng cookie khÃ´ng?</h3>
+      <p>CÃ³. Cookie lÃ  cÃ¡c tá»‡p nhá» mÃ  má»™t trang web hoáº·c nhÃ  cung cáº¥p dá»‹ch vá»¥ internet chuyá»ƒn vÃ o á»• cá»©ng mÃ¡y tÃnh cá»§a báº¡n thÃ´ng qua trÃ¬nh duyá»‡t Web (náº¿u báº¡n cho phÃ©p). Nhá»¯ng cookie nÃ y cho phÃ©p trang web nháºn ra trÃ¬nh duyá»‡t cá»§a báº¡n vÃ  náº¿u báº¡n cÃ³ tÃ i khoáº£n Ä‘Ã£ Ä‘Äƒng kÃ½, nÃ³ sáº½ liÃªn káº¿t vá»›i tÃ i khoáº£n Ä‘Ã£ Ä‘Äƒng kÃ½ cá»§a báº¡n.</p>
+      <p> ChÃºng tÃ´i sá» dá»¥ng cookie Ä‘á»ƒ hiá»ƒu vÃ  lÆ°u cÃ¡c tÃ¹y chá»n cá»§a báº¡n cho cÃ¡c láº§n truy cáºp trong tÆ°Æ¡ng lai.</p>
+      <hr class="spacer" />
+      <h3 id="disclose">ChÃºng tÃ´i cÃ³ tiáº¿t lá»™ báº¥t cá»© thÃ´ng tin nÃ o ra ngoÃ i khÃ´ng?</h3>
+      <p>ChÃºng tÃ´i khÃ´ng bÃ¡n, trao Ä‘á»•i hoáº·c chuyá»ƒn nhÆ°á»£ng thÃ´ng tin nháºn dáº¡ng cÃ¡ nhÃ¢n cá»§a báº¡n cho bÃªn thá»© ba. Trá»« khi bÃªn thá»© ba Ä‘Ã³ Ä‘ang há»— trá»£ chÃºng tÃ´i Ä‘iá»u hÃ nh Mastodon, tiáº¿n hÃ nh kinh doanh hoáº·c phá»¥c vá»¥ báº¡n, miá»…n lÃ  cÃ¡c bÃªn Ä‘Ã³ Ä‘á»“ng Ã½ giá»¯ bÃ máºt thÃ´ng tin nÃ y. ChÃºng tÃ´i cÅ©ng cÃ³ thá»ƒ tiáº¿t lá»™ thÃ´ng tin cá»§a báº¡n náº¿u viá»‡c cÃ´ng bá»‘ lÃ  Ä‘á»ƒ tuÃ¢n thá»§ luáºt phÃ¡p, thá»±c thi quy táº¯c mÃ¡y chá»§ cá»§a chÃºng tÃ´i hoáº·c báº£o vá»‡ quyá»n, tÃ i sáº£n há»£p phÃ¡p hoáº·c sá»± an toÃ n cá»§a chÃºng tÃ´i hoáº·c báº¥t ká»³ ai.</p>
+      <p>Ná»™i dung cÃ´ng khai cá»§a báº¡n cÃ³ thá»ƒ Ä‘Æ°á»£c táº£i xuá»‘ng bá»Ÿi cÃ¡c mÃ¡y chá»§ khÃ¡c trong máº¡ng liÃªn há»£p. CÃ¡c tÃºt cÃ´ng khai hay dÃ nh cho ngÆ°á»i theo dÃµi Ä‘Æ°á»£c gá»i Ä‘áº¿n cÃ¡c mÃ¡y chá»§ nÆ¡i ngÆ°á»i theo dÃµi cá»§a báº¡n lÃ  thÃ nh viÃªn vÃ  tin nháº¯n Ä‘Æ°á»£c gá»i Ä‘áº¿n mÃ¡y chá»§ cá»§a ngÆ°á»i nháºn, cho Ä‘áº¿n khi nhá»¯ng ngÆ°á»i theo dÃµi hoáº·c ngÆ°á»i nháºn Ä‘Ã³ chuyá»ƒn sang má»™t mÃ¡y chá»§ khÃ¡c.</p>
+      <p>Náº¿u báº¡n cho phÃ©p má»™t á»©ng dá»¥ng sá» dá»¥ng tÃ i khoáº£n cá»§a mÃ¬nh, tÃ¹y thuá»™c vÃ o pháº¡m vi quyá»n báº¡n phÃª duyá»‡t, á»©ng dá»¥ng cÃ³ thá»ƒ truy cáºp thÃ´ng tin trang cÃ¡ nhÃ¢n, danh sÃ¡ch ngÆ°á»i theo dÃµi, danh sÃ¡ch cá»§a báº¡n, táº¥t cáº£ tÃºt vÃ  lÆ°á»£t thÃch cá»§a báº¡n. CÃ¡c á»©ng dá»¥ng khÃ´ng bao giá» cÃ³ thá»ƒ truy cáºp Ä‘á»‹a chá»‰ e-mail hoáº·c máºt kháº©u cá»§a báº¡n.</p>
+      <hr class="spacer" />
+      <h3 id="children">Cáº¥m tráº» em sá» dá»¥ng</h3>
+      <p>Náº¿u mÃ¡y chá»§ nÃ y á»Ÿ EU hoáº·c EEA: Trang web cá»§a chÃºng tÃ´i, cÃ¡c sáº£n pháº©m vÃ  dá»‹ch vá»¥ Ä‘á»u hÆ°á»›ng Ä‘áº¿n nhá»¯ng ngÆ°á»i trÃªn 16 tuá»•i. Náº¿u báº¡n dÆ°á»›i 16 tuá»•i, theo yÃªu cáº§u cá»§a GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">Quy Ä‘á»‹nh báº£o vá»‡ dá»¯ liá»‡u chung</a>) thÃ¬ khÃ´ng Ä‘Æ°á»£c sá» dá»¥ng trang web nÃ y. </p>
+      <p>Náº¿u mÃ¡y chá»§ nÃ y á»Ÿ Hoa Ká»³: Trang web cá»§a chÃºng tÃ´i, cÃ¡c sáº£n pháº©m vÃ  dá»‹ch vá»¥ Ä‘á»u hÆ°á»›ng Ä‘áº¿n nhá»¯ng ngÆ°á»i trÃªn 13 tuá»•i. Náº¿u báº¡n dÆ°á»›i 13 tuá»•i, theo yÃªu cáº§u cá»§a COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Äáº¡o luáºt báº£o vá»‡ quyá»n riÃªng tÆ° trá»±c tuyáº¿n cá»§a tráº» em</a>) thÃ¬ khÃ´ng Ä‘Æ°á»£c sá» dá»¥ng trang web nÃ y.</p>
+      <p>Quy Ä‘á»‹nh phÃ¡p luáºt cÃ³ thá»ƒ khÃ¡c biá»‡t náº¿u mÃ¡y chá»§ nÃ y á»Ÿ khu vá»±c Ä‘á»‹a lÃ½ khÃ¡c.</p>
+      <hr class="spacer" />
+      <h3 id="changes">Cáºp nháºt thay Ä‘á»•i</h3>
+      <p>Náº¿u cÃ³ thay Ä‘á»•i chÃnh sÃ¡ch báº£o máºt, chÃºng tÃ´i sáº½ Ä‘Äƒng nhá»¯ng thay Ä‘á»•i Ä‘Ã³ á»Ÿ má»¥c nÃ y.</p>
+      <p>TÃ i liá»‡u nÃ y phÃ¡t hÃ nh dÆ°á»›i hÃ¬nh thá»©c CC-BY-SA vÃ  Ä‘Æ°á»£c cáºp nháºt láº§n cuá»‘i vÃ o ngÃ y 7 thÃ¡ng 3 nÄƒm 2018.</p>
+      <p>Chá»‰nh sá»a vÃ  hoÃ n thiá»‡n tá»« <a href="https://github.com/discourse/discourse">Discourse</a>.</p>
     title: "%{instance} Äiá»u khoáº£n dá»‹ch vá»¥ vÃ  chÃnh sÃ¡ch báº£o máºt"
   themes:
     contrast: Mastodon (Äá»™ tÆ°Æ¡ng pháº£n cao)
@@ -1159,24 +1284,23 @@ vi:
     mastodon-light: Mastodon (SÃ¡ng)
   time:
     formats:
-      default: lÃºc %H:%M %b %d nÄƒm%_Y
+      default: "%d.%m.%Y %H:%M"
       month: "%B %Y"
   two_factor_authentication:
-    code_hint: Nháºp mÃ£ Ä‘Æ°á»£c táº¡o bá»Ÿi á»©ng dá»¥ng xÃ¡c thá»±c cá»§a báº¡n Ä‘á»ƒ xÃ¡c nháºn
-    description_html: Náº¿u báº¡n kÃch hoáº¡t <strong>xÃ¡c thá»±c hai bÆ°á»›c</strong>, mÃ£ xÃ¡c thá»±c Ä‘Äƒng nháºp sáº½ Ä‘Æ°á»£c táº¡o ra tá»« Ä‘iá»‡n thoáº¡i cá»§a báº¡n.
+    add: ThÃªm
     disable: VÃ´ hiá»‡u hÃ³a
-    enable: KÃch hoáº¡t
+    disabled_success: ÄÃ£ vÃ´ hiá»‡u hÃ³a xÃ¡c thá»±c hai bÆ°á»›c
+    edit: Sá»a
     enabled: ÄÃ£ kÃch hoáº¡t xÃ¡c thá»±c hai bÆ°á»›c
     enabled_success: XÃ¡c thá»±c hai bÆ°á»›c Ä‘Æ°á»£c kÃch hoáº¡t thÃ nh cÃ´ng
     generate_recovery_codes: Táº¡o mÃ£ khÃ´i phá»¥c
-    instructions_html: "<strong>QuÃ©t mÃ£ QR nÃ y vÃ o Google Authenticator hoáº·c á»©ng dá»¥ng TOTP tÆ°Æ¡ng tá»± trÃªn Ä‘iá»‡n thoáº¡i cá»§a báº¡n</strong>. Tá»« giá» trá»Ÿ Ä‘i, á»©ng dá»¥ng Ä‘Ã³ sáº½ táº¡o mÃ£ thÃ´ng bÃ¡o mÃ  báº¡n sáº½ pháº£i nháºp khi Ä‘Äƒng nháºp."
     lost_recovery_codes: MÃ£ khÃ´i phá»¥c cho phÃ©p báº¡n láº¥y láº¡i quyá»n truy cáºp vÃ o tÃ i khoáº£n cá»§a mÃ¬nh náº¿u báº¡n máº¥t Ä‘iá»‡n thoáº¡i. Náº¿u báº¡n bá»‹ máº¥t mÃ£ khÃ´i phá»¥c, báº¡n cÃ³ thá»ƒ táº¡o láº¡i chÃºng á»Ÿ Ä‘Ã¢y. MÃ£ khÃ´i phá»¥c cÅ© cá»§a báº¡n sáº½ bá»‹ vÃ´ hiá»‡u.
-    manual_instructions: 'Náº¿u báº¡n khÃ´ng thá»ƒ quÃ©t mÃ£ QR vÃ  cáº§n nháºp thá»§ cÃ´ng, Ä‘Ã¢y lÃ  mÃ£ bÃ máºt:'
+    methods: PhÆ°Æ¡ng phÃ¡p xÃ¡c thá»±c
+    otp: á»¨ng dá»¥ng xÃ¡c thá»±c
     recovery_codes: MÃ£ phá»¥c há»“i dá»± phÃ²ng
     recovery_codes_regenerated: MÃ£ khÃ´i phá»¥c Ä‘Æ°á»£c phá»¥c há»“i thÃ nh cÃ´ng
-    recovery_instructions_html: Náº¿u báº¡n bá»‹ máº¥t Ä‘iá»‡n thoáº¡i, hÃ£y sá» dá»¥ng má»™t trong cÃ¡c mÃ£ khÃ´i phá»¥c bÃªn dÆ°á»›i Ä‘á»ƒ láº¥y láº¡i quyá»n truy cáºp vÃ o tÃ i khoáº£n cá»§a mÃ¬nh. <strong>Giá»¯ mÃ£ khÃ´i phá»¥c an toÃ n</strong>. VÃ dá»¥, báº¡n cÃ³ thá»ƒ in chÃºng ra giáº¥y.
-    setup: Thiáº¿t láºp
-    wrong_code: MÃ£ vá»«a nháºp khÃ´ng há»£p lá»‡! Thá»i gian mÃ¡y chá»§ vÃ  thá»i gian thiáº¿t bá»‹ cÃ³ Ä‘Ãºng khÃ´ng?
+    recovery_instructions_html: Náº¿u báº¡n bá»‹ máº¥t Ä‘iá»‡n thoáº¡i, hÃ£y dÃ¹ng má»™t trong cÃ¡c mÃ£ khÃ´i phá»¥c bÃªn dÆ°á»›i Ä‘á»ƒ láº¥y láº¡i quyá»n truy cáºp vÃ o tÃ i khoáº£n cá»§a mÃ¬nh. <strong>Giá»¯ mÃ£ khÃ´i phá»¥c an toÃ n</strong>. VÃ dá»¥, báº¡n cÃ³ thá»ƒ in chÃºng ra giáº¥y.
+    webauthn: KhÃ³a báº£o máºt
   user_mailer:
     backup_ready:
       explanation: Báº¡n Ä‘Ã£ yÃªu cáº§u sao lÆ°u toÃ n bá»™ tÃ i khoáº£n Mastodon cá»§a mÃ¬nh. BÃ¢y giá» cÃ³ thá»ƒ táº£i vá»!
@@ -1190,20 +1314,23 @@ vi:
       title: ÄÄƒng nháºp
     warning:
       explanation:
-        disable: Náº¿u tÃ i khoáº£n cá»§a báº¡n bá»‹ Ä‘Ã¬nh chá»‰, dá»¯ liá»‡u tÃ i khoáº£n cá»§a báº¡n váº«n cÃ²n nguyÃªn, nhÆ°ng báº¡n khÃ´ng thá»ƒ thá»±c hiá»‡n báº¥t ká»³ hÃ nh Ä‘á»™ng nÃ o cho Ä‘áº¿n khi Ä‘Æ°á»£c má»Ÿ khÃ³a.
-        silence: Náº¿u tÃ i khoáº£n cá»§a báº¡n bá»‹ táº¡m áº©n, báº¡n cÃ³ thá»ƒ bá»‹ loáº¡i khá»i cÃ¡c báº£ng tin cÃ´ng khai, chá»‰ nhá»¯ng ngÆ°á»i Ä‘Ã£ theo dÃµi báº¡n má»›i tháº¥y tÃºt cá»§a báº¡n. Tuy nhiÃªn, nhá»¯ng ngÆ°á»i khÃ¡c váº«n cÃ³ thá»ƒ tiáº¿p tá»¥c theo dÃµi báº¡n.
-        suspend: TÃ i khoáº£n cá»§a báº¡n Ä‘Ã£ bá»‹ vÃ´ hiá»‡u hÃ³a. Táº¥t cáº£ tÃºt vÃ  táºp tin Ä‘Ã£ táº£i lÃªn cá»§a báº¡n sáº½ bá»‹ xÃ³a khá»i mÃ¡y chá»§ nÃ y láº«n cÃ¡c mÃ¡y chá»§ nÆ¡i báº¡n cÃ³ ngÆ°á»i theo dÃµi.
+        disable: Báº¡n bá»‹ cáº¥m Ä‘Äƒng nháºp tÃ i khoáº£n. Tuy nhiÃªn, trang cÃ¡ nhÃ¢n vÃ  dá»¯ liá»‡u cá»§a báº¡n váº«n sáº½ Ä‘Æ°á»£c giá»¯ nguyÃªn.
+        sensitive: áº¢nh vÃ  video táº£i lÃªn cá»§a báº¡n sáº½ bá»‹ Ä‘Ã¡nh dáº¥u lÃ  nháº¡y cáº£m.
+        silence: Báº¡n váº«n cÃ³ thá»ƒ dÃ¹ng tÃ i khoáº£n cá»§a báº¡n. Tuy nhiÃªn, chá»‰ cÃ³ nhá»¯ng ngÆ°á»i Ä‘ang theo dÃµi báº¡n má»›i cÃ³ thá»ƒ tháº¥y tÃºt cá»§a báº¡n. Báº¡n sáº½ bá»‹ loáº¡i khá»i danh sÃ¡ch cá»§a má»™t sá»‘ ngÆ°á»i. Nhá»¯ng ngÆ°á»i má»›i khÃ¡c váº«n cÃ³ thá»ƒ theo dÃµi báº¡n bÃ¬nh thÆ°á»ng.
+        suspend: TÃ i khoáº£n cá»§a báº¡n Ä‘Ã£ bá»‹ vÃ´ hiá»‡u hÃ³a. Táº¥t cáº£ tÃºt vÃ  táºp tin mÃ  báº¡n Ä‘Ã£ táº£i lÃªn sáº½ khÃ´ng thá»ƒ truy cáºp Ä‘Æ°á»£c ná»¯a. Báº¡n váº«n cÃ³ thá»ƒ Ä‘Äƒng nháºp Ä‘á»ƒ yÃªu cáº§u táº£i vá» báº£n sao dá»¯ liá»‡u cá»§a báº¡n. Tuy nhiÃªn, chÃºng tÃ´i sáº½ giá»¯ láº¡i má»™t vÃ i dá»¯ liá»‡u Ä‘á»ƒ ngÄƒn ngá»«a báº¡n trá»‘n trÃ¡nh trÃ¡ch nhiá»‡m.
       get_in_touch: Báº¡n cÃ³ thá»ƒ tráº£ lá»i e-mail nÃ y Ä‘á»ƒ liÃªn há»‡ vá»›i Ä‘á»™i ngÅ© cá»§a %{instance}.
-      review_server_policies: Xem láº¡i chÃnh sÃ¡ch mÃ¡y chá»§
+      review_server_policies: Xem láº¡i quy táº¯c cá»§a mÃ¡y chá»§
       statuses: 'Cá»¥ thá»ƒ, cho:'
       subject:
         disable: TÃ i khoáº£n %{acct} cá»§a báº¡n Ä‘Ã£ bá»‹ vÃ´ hiá»‡u hÃ³a
         none: Cáº£nh bÃ¡o cho %{acct}
+        sensitive: áº¢nh vÃ  video táº£i lÃªn cá»§a %{acct} sáº½ bá»‹ Ä‘Ã¡nh dáº¥u lÃ  nháº¡y cáº£m
         silence: TÃ i khoáº£n %{acct} cá»§a báº¡n Ä‘Ã£ bá»‹ táº¡m áº©n
         suspend: TÃ i khoáº£n %{acct} cá»§a báº¡n Ä‘Ã£ bá»‹ vÃ´ hiá»‡u hÃ³a
       title:
         disable: TÃ i khoáº£n bá»‹ Ä‘Ã³ng bÄƒng
         none: Cáº£nh bÃ¡o
+        sensitive: áº¢nh vÃ  video cá»§a báº¡n sáº½ bá»‹ Ä‘Ã¡nh dáº¥u nháº¡y cáº£m
         silence: TÃ i khoáº£n bá»‹ táº¡m áº©n
         suspend: ToÃ i khoáº£n bá»‹ vÃ´ hiá»‡u hÃ³a
     welcome:
@@ -1215,18 +1342,20 @@ vi:
       full_handle: TÃªn Ä‘áº§y Ä‘á»§ cá»§a báº¡n
       full_handle_hint: ÄÃ¢y cÅ©ng lÃ  Ä‘á»‹a chá»‰ Ä‘Æ°á»£c dÃ¹ng Ä‘á»ƒ tÆ°Æ¡ng tÃ¡c vá»›i táº¥t cáº£ má»i ngÆ°á»i.
       review_preferences_action: TÃ¹y chá»‰nh giao diá»‡n
-      review_preferences_step: TÃ¹y chá»‰nh má»i thá»©! Cháº³ng háº¡n nhÆ° chá»n loáº¡i email nÃ o báº¡n muá»‘n nháºn hoáº·c tráº¡ng thÃ¡i tÃºt mÃ  báº¡n muá»‘n sá» dá»¥ng máº·c Ä‘á»‹nh. HÃ£y táº¯t tá»± Ä‘á»™ng phÃ¡t GIF náº¿u báº¡n hay bá»‹ chÃ³ng máº·t.
+      review_preferences_step: TÃ¹y chá»‰nh má»i thá»©! Cháº³ng háº¡n nhÆ° chá»n loáº¡i email nÃ o báº¡n muá»‘n nháºn hoáº·c tráº¡ng thÃ¡i Ä‘Äƒng tÃºt máº·c Ä‘á»‹nh mÃ  báº¡n muá»‘n dÃ¹ng. HÃ£y táº¯t tá»± Ä‘á»™ng phÃ¡t GIF náº¿u báº¡n dá»… bá»‹ chÃ³ng máº·t.
       subject: ChÃ o má»«ng Ä‘áº¿n vá»›i Mastodon
-      tip_federated_timeline: Máº¡ng liÃªn káº¿t lÃ  má»™t dáº¡ng "liÃªn há»£p quá»‘c" cá»§a Mastodon. Hiá»ƒu má»™t cÃ¡ch Ä‘Æ¡n giáº£n, nÃ³ lÃ  nhá»¯ng ngÆ°á»i báº¡n Ä‘Ã£ theo dÃµi tá»« cÃ¡c mÃ¡y chá»§ khÃ¡c.
-      tip_following: Theo máº·c Ä‘á»‹nh, báº¡n sáº½ theo dÃµi (cÃ¡c) quáº£n trá»‹ viÃªn mÃ¡y chá»§ cá»§a báº¡n. Äá»ƒ tÃ¬m nhá»¯ng ngÆ°á»i thÃº vá»‹ hÆ¡n, hÃ£y xem qua báº£ng tin vÃ  máº¡ng liÃªn káº¿t.
+      tip_federated_timeline: Máº¡ng liÃªn há»£p lÃ  má»™t dáº¡ng "liÃªn há»£p quá»‘c" cá»§a Mastodon. Hiá»ƒu má»™t cÃ¡ch Ä‘Æ¡n giáº£n, nÃ³ lÃ  nhá»¯ng ngÆ°á»i báº¡n Ä‘Ã£ theo dÃµi tá»« cÃ¡c mÃ¡y chá»§ khÃ¡c.
+      tip_following: Theo máº·c Ä‘á»‹nh, báº¡n sáº½ theo dÃµi (cÃ¡c) quáº£n trá»‹ viÃªn mÃ¡y chá»§ cá»§a báº¡n. Äá»ƒ tÃ¬m nhá»¯ng ngÆ°á»i thÃº vá»‹ hÆ¡n, hÃ£y xem qua cá»™ng Ä‘á»“ng vÃ  tháº¿ giá»›i.
       tip_local_timeline: Báº£ng tin lÃ  nÆ¡i hiá»‡n lÃªn nhá»¯ng tÃºt cÃ´ng khai cá»§a thÃ nh viÃªn %{instance}. Há» lÃ  nhá»¯ng ngÆ°á»i hÃ ng xÃ³m trá»±c tiáº¿p cá»§a báº¡n!
       tip_mobile_webapp: Náº¿u trÃ¬nh duyá»‡t trÃªn Ä‘iá»‡n thoáº¡i di Ä‘á»™ng cá»§a báº¡n thÃªm Mastodon vÃ o mÃ n hÃ¬nh chÃnh, báº¡n cÃ³ thá»ƒ nháºn Ä‘Æ°á»£c thÃ´ng bÃ¡o Ä‘áº©y. NÃ³ hoáº¡t Ä‘á»™ng gáº§n giá»‘ng nhÆ° má»™t app Ä‘iá»‡n thoáº¡i!
       tips: Máº¹o
       title: Xin chÃ o %{name}!
   users:
+    blocked_email_provider: Dá»‹ch vá»¥ email nÃ y Ä‘Ã£ bá»‹ cáº¥m
     follow_limit_reached: Báº¡n chá»‰ cÃ³ thá»ƒ theo dÃµi tá»‘i Ä‘a %{limit} ngÆ°á»i
     generic_access_help_html: Gáº·p trá»¥c tráº·c vá»›i tÃ i khoáº£n? LiÃªn há»‡ %{email} Ä‘á»ƒ Ä‘Æ°á»£c trá»£ giÃºp
     invalid_email: Äá»‹a chá»‰ email khÃ´ng há»£p lá»‡
+    invalid_email_mx: Äá»‹a chá»‰ email khÃ´ng tá»“n táº¡i
     invalid_otp_token: MÃ£ xÃ¡c thá»±c hai bÆ°á»›c khÃ´ng há»£p lá»‡
     invalid_sign_in_token: MÃ£ an toÃ n khÃ´ng há»£p lá»‡
     otp_lost_help_html: Náº¿u báº¡n máº¥t quyá»n truy cáºp vÃ o cáº£ hai, báº¡n cÃ³ thá»ƒ Ä‘Äƒng nháºp báº±ng %{email}
@@ -1236,3 +1365,20 @@ vi:
   verification:
     explanation_html: 'Báº¡n cÃ³ thá»ƒ <strong>xÃ¡c minh mÃ¬nh lÃ  chá»§ sá»Ÿ há»¯u cá»§a cÃ¡c trang web á»Ÿ Ä‘áº§u trang cÃ¡ nhÃ¢n cá»§a báº¡n</strong>. Äá»ƒ xÃ¡c minh, trang web <strong>pháº£i</strong> chÃ¨n mÃ£ <code>rel="me"</code>. Ná»™i dung vÄƒn báº£n cá»§a liÃªn káº¿t khÃ´ng quan trá»ng. ÄÃ¢y lÃ  má»™t vÃ dá»¥:'
     verification: XÃ¡c minh
+  webauthn_credentials:
+    add: ThÃªm khÃ³a báº£o máºt má»›i
+    create:
+      error: CÃ³ váº¥n Ä‘á» khi thÃªm khÃ³a báº£o máºt. Xin thá» láº¡i.
+      success: ÄÃ£ thÃªm khÃ³a báº£o máºt má»›i thÃ nh cÃ´ng.
+    delete: XÃ³a
+    delete_confirmation: Báº¡n cÃ³ cháº¯c cháº¯n muá»‘n xÃ³a khÃ³a báº£o máºt nÃ y?
+    description_html: Náº¿u báº¡n kÃch hoáº¡t <strong>khÃ³a báº£o máºt</strong>, báº¡n sáº½ cáº§n dÃ¹ng má»™t trong nhá»¯ng khÃ³a báº£o máºt Ä‘Ã³ má»—i khi Ä‘Äƒng nháºp.
+    destroy:
+      error: CÃ³ váº¥n Ä‘á» khi xÃ³a khÃ³a báº£o máºt. Xin thá» láº¡i.
+      success: ÄÃ£ xÃ³a khÃ³a báº£o máºt thÃ nh cÃ´ng.
+    invalid_credential: KhÃ³a báº£o máºt khÃ´ng há»£p lá»‡
+    nickname_hint: Nháºp tÃªn má»›i cho khÃ³a báº£o máºt cá»§a báº¡n
+    not_enabled: Báº¡n chÆ°a kÃch hoáº¡t WebAuthn
+    not_supported: TrÃ¬nh duyá»‡t cá»§a báº¡n khÃ´ng há»— trá»£ khÃ³a báº£o máºt
+    otp_required: Äá»ƒ dÃ¹ng khÃ³a báº£o máºt, trÆ°á»›c tiÃªn hÃ£y kÃch hoáº¡t xÃ¡c thá»±c hai bÆ°á»›c.
+    registered_on: ÄÄƒng kÃ½ vÃ o %{date}
diff --git a/config/locales/zgh.yml b/config/locales/zgh.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0123836ecfd294f9c0e85d7b20d3987ea4b875c6
--- /dev/null
+++ b/config/locales/zgh.yml
@@ -0,0 +1,157 @@
+---
+zgh:
+  about:
+    about_this: âµ–â´¼
+    api: API
+    contact: â´°âµŽâµ¢â´°âµ¡â´°â´¹
+    learn_more: âµ™âµ™âµ âµ“â´³â´³â´°âµ”
+    status_count_after:
+      one: â´°â´·â´·â´°â´·
+      other: â´°â´·â´·â´°â´·âµ
+    unavailable_content_description:
+      domain: â´°âµŽâ´°â´½â´½â´°âµ¢
+    what_is_mastodon: âµŽâ´°'âµ¢â´· âµ‰â´³â´°âµ âµŽâ´°âµ™âµœâµ”â´·âµ“âµŽ?
+  accounts:
+    follow: â´¹â´¼âµ•
+    followers:
+      one: â´°âµŽâ´¹â´¼â´°âµ•
+      other: âµ‰âµŽâ´¹â´¼â´°âµ•âµ
+    media: âµ‰âµ™âµâµ–âµŽâµ‰âµ™âµ
+    never_active: âµ“âµ™â´°âµ”
+    roles:
+      bot: â´°â´±âµ“âµœ
+      group: âµœâ´°âµ”â´°â´±â´±âµ“âµœ
+    unfollow: â´½â´½âµ™ â´°â´¹â´¼â´¼âµ“âµ•
+  admin:
+    account_moderation_notes:
+      delete: â´½â´½âµ™
+    accounts:
+      change_email:
+        label: âµ™âµâ´¼âµ âµ‰âµŽâ´°âµ¢âµ
+        submit: âµ™âµâ´¼âµ âµ‰âµŽâ´°âµ¢âµ
+      confirm: âµ™âµâµœâµŽ
+      delete: â´½â´½âµ™ âµ‰â´¼âµ™â´½â´°
+      deleted: âµ‰âµœâµœâµ¡â´°â´½â´½âµ™
+      domain: âµ‰â´³âµ”
+      edit: âµ™âµâ´¼âµ
+      email: âµ‰âµŽâ´°âµ¢âµ
+      email_status: â´°â´·â´·â´°â´· âµ âµ¢âµ‰âµâ´°âµ¢âµ
+      followers: âµ‰âµŽâ´¹â´¼â´°âµ•âµ
+      location:
+        all: âµŽâ´°âµ•âµ•â´°
+        local: â´°â´·âµ–â´°âµ”â´°âµ
+      moderation:
+        all: âµŽâ´°âµ•âµ•â´°
+      public: â´°â´³â´·âµ“â´·â´°âµ
+      reject: â´°â´³âµ¢
+      roles:
+        user: âµ“âµâµ™âµ™âµ“âµŽâµ”âµ™
+      title: âµ‰âµŽâµ‰â´¹â´°âµâµ
+      web: âµ¡âµ‰â´±
+    action_logs:
+      action_types:
+        update_status: âµ™â´·âµ–âµ‰ â´°â´·â´·â´°â´·
+    announcements:
+      live: âµ“âµ™âµ”âµ‰â´·
+    custom_emojis:
+      by_domain: âµ‰â´³âµ”
+      copy: âµ™âµâµ–âµ
+      delete: â´½â´½âµ™
+      emoji: âµ‰âµŽâµ“âµŠâµ‰
+    domain_blocks:
+      domain: âµ‰â´³âµ”
+    email_domain_blocks:
+      add_new: âµ”âµâµ“ â´°âµŽâ´°âµ¢âµâµ“
+      delete: â´½â´½âµ™
+    instances:
+      moderation:
+        all: âµŽâ´°âµ•âµ•â´°
+    ip_blocks:
+      delete: â´½â´½âµ™
+      expires_in:
+        '1209600': 2 weeks
+        '15778476': 6 âµ¡â´°âµ¢âµ¢âµ“âµ”âµ
+        '2629746': â´°âµ¢âµ¢âµ“âµ”
+        '31556952': â´°âµ™â´³â´³âµ¯â´°âµ™
+        '86400': â´°âµ™âµ™
+        '94670856': 3 âµ‰âµ™â´³â´³âµ¯â´°âµ™âµ
+    relays:
+      delete: â´½â´½âµ™
+      status: â´°â´·â´·â´°â´·
+    reports:
+      notes:
+        delete: â´½â´½âµ™
+      status: â´°â´·â´·â´°â´·
+    settings:
+      site_title: âµ‰âµ™âµŽ âµ âµ“âµŽâ´°â´½â´½â´°âµ¢
+      title: âµœâµ‰âµ™âµ–â´°âµ âµ âµ¡â´°âµ™âµ‰âµœ
+    statuses:
+      batch:
+        delete: â´½â´½âµ™
+      media:
+        title: âµ‰âµ™âµâµ–âµŽâµ‰âµ™âµ
+      with_media: âµ™ âµ‰âµ™âµâµ–âµŽâµ‰âµ™âµ
+    tags:
+      name: âµ€â´°âµ›âµŸâ´°â´³
+      title: âµ‰âµ€â´°âµ›âµŸâ´°â´³âµ
+    warning_presets:
+      delete: â´½â´½âµ™
+  application_mailer:
+    view_profile: âµ™â´½âµ âµ‰â´¼âµ”âµ™
+  auth:
+    change_password: âµœâ´°â´³âµ“âµ”âµ‰ âµ âµ“âµ£âµ”â´°âµ¢
+    forgot_password: âµœâ´»âµœâµœâµ“â´· âµœâ´°â´³âµ“âµ”âµ‰ âµ âµ“âµ£âµ”â´°âµ¢ âµâµâ´½?
+    login: â´½âµ›âµŽ
+    logout: â´¼â´¼âµ–
+    or_log_in_with: âµâµ– â´½âµ›âµŽ âµ™
+    register: âµ£âµŽâµŽâ´»âµŽ
+    status:
+      account_status: â´°â´·â´·â´°â´· âµ âµ“âµŽâµ‰â´¹â´°âµ
+  authorize_follow:
+    follow: â´¹â´¼âµ•
+    title: â´¹â´¼âµ• %{acct}
+  deletes:
+    proceed: â´½â´½âµ™ â´°âµŽâµ‰â´¹â´°âµ
+  errors:
+    '400': The request you submitted was invalid or malformed.
+    '403': You don't have permission to view this page.
+    '404': The page you are looking for isn't here.
+    '406': This page is not available in the requested format.
+    '410': The page you were looking for doesn't exist here anymore.
+    '422': 
+    '429': Too many requests
+    '500': 
+    '503': The page could not be served due to a temporary server failure.
+  exports:
+    archive_takeout:
+      date: â´°âµ£âµŽâµ£
+  filters:
+    index:
+      delete: â´½â´½âµ™
+  footer:
+    more: âµ“â´³â´³â´°âµ”â€¦
+  generic:
+    all: âµŽâ´°âµ•âµ•â´°
+    copy: âµ™âµâµ–âµ
+    delete: â´½â´½âµ™
+  invites:
+    expires_in:
+      '1800': 30 âµœâµ“âµ™â´·âµ‰â´·âµ‰âµ
+      '21600': 6 âµœâµ™âµ”â´°â´³âµ‰âµ
+      '3600': âµœâ´°âµ™âµ”â´°â´³âµœ
+      '43200': 12 âµœâµ™âµ”â´°â´³âµ‰âµ
+      '604800': âµ‰âµŽâ´°âµâ´°âµ™âµ™
+      '86400': â´°âµ™âµ™
+    expires_in_prompt: âµ“âµ™â´°âµ”
+  notification_mailer:
+    mention:
+      action: âµ”â´°âµ”
+  relationships:
+    remove_selected_follows: â´½â´½âµ™ â´°â´¹â´¼â´¼âµ“âµ• âµ‰ âµ‰âµâµ™âµ™âµŽâµ”âµ™âµ âµœâµœâµ“âµ™âµœâµ¢âµâµ‰âµ
+  settings:
+    account: â´°âµŽâµ‰â´¹â´°âµ
+    account_settings: âµœâµ‰âµ™âµ–â´°âµ âµ âµ“âµŽâµ‰â´¹â´°âµ
+    back: â´°âµ–âµ“âµ âµ–âµ” âµŽâ´°âµ™âµœâµ“â´·âµ“âµ
+    edit_profile: âµ™âµâ´¼âµ âµ‰â´¼âµ”âµ™
+    notifications: âµœâµ‰âµâµ–âµŽâµ‰âµ™âµ‰âµ
+    profile: âµ‰â´¼âµ”âµ™
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 3d62230d88ee6def9cc6b587cfe97a431d697326..25e6869557b92635c6859c18c0cd090dfb572757 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -21,7 +21,9 @@ zh-CN:
     federation_hint_html: åœ¨%{instance} ä¸Šæ‹¥æœ‰è´¦å·åŽï¼Œä½ å¯ä»¥å…³æ³¨ä»»ä½• Mastodon æœåŠ¡å™¨æˆ–å…¶ä»–æœåŠ¡å™¨ä¸Šçš„äººã€‚
     get_apps: å°è¯•ç§»åŠ¨åº”ç”¨
     hosted_on: ä¸€ä¸ªåœ¨ %{domain} ä¸Šè¿è¡Œçš„ Mastodon å®žä¾‹
-    instance_actor_flash: è¿™ä¸ªè´¦å·æ˜¯ä¸ªè™šæ‹Ÿå¸å·ï¼Œä¸ä»£è¡¨ä»»ä½•ç”¨æˆ·ï¼Œåªç”¨æ¥ä»£è¡¨æœåŠ¡å™¨æœ¬èº«ã€‚å®ƒç”¨äºŽå’Œå…¶å®ƒæœåŠ¡å™¨äº’é€šï¼Œæ‰€ä»¥ä¸åº”è¯¥è¢«å°ç¦ï¼Œé™¤éžä½ æƒ³å°ç¦æ•´ä¸ªå®žä¾‹ã€‚ä½†æ˜¯æƒ³å°ç¦æ•´ä¸ªå®žä¾‹çš„æ—¶å€™ï¼Œä½ åº”è¯¥ç”¨åŸŸåå°ç¦ã€‚
+    instance_actor_flash: 'è¿™ä¸ªè´¦å·æ˜¯ä¸ªè™šæ‹Ÿå¸å·ï¼Œä¸ä»£è¡¨ä»»ä½•ç”¨æˆ·ï¼Œåªç”¨æ¥ä»£è¡¨æœåŠ¡å™¨æœ¬èº«ã€‚å®ƒç”¨äºŽå’Œå…¶å®ƒæœåŠ¡å™¨äº’é€šï¼Œæ‰€ä»¥ä¸åº”è¯¥è¢«å°ç¦ï¼Œé™¤éžä½ æƒ³å°ç¦æ•´ä¸ªå®žä¾‹ã€‚ä½†æ˜¯æƒ³å°ç¦æ•´ä¸ªå®žä¾‹çš„æ—¶å€™ï¼Œä½ åº”è¯¥ç”¨åŸŸåå°ç¦ã€‚
+
+'
     learn_more: äº†è§£è¯¦æƒ…
     privacy_policy: éšç§æ”¿ç–
     see_whats_happening: çœ‹ä¸€çœ‹çŽ°åœ¨åœ¨å‘ç”Ÿä»€ä¹ˆ
@@ -38,7 +40,7 @@ zh-CN:
       reason: åŽŸå› 
       rejecting_media: æ¥è‡ªè¿™äº›æœåŠ¡å™¨çš„åª’ä½“æ–‡ä»¶å°†ä¸ä¼šè¢«å¤„ç†æˆ–å˜å‚¨ï¼Œç¼©ç•¥å›¾ä¹Ÿä¸ä¼šæ˜¾ç¤ºï¼Œéœ€è¦æ‰‹åŠ¨ç‚¹å‡»æ‰“å¼€åŽŸå§‹æ–‡ä»¶ã€‚
       rejecting_media_title: è¢«è¿‡æ»¤çš„åª’ä½“æ–‡ä»¶
-      silenced: æ¥è‡ªè¿™äº›æœåŠ¡å™¨ä¸Šçš„å¸–åå°†ä¸ä¼šå‡ºçŽ°åœ¨å…¬å…±æ—¶é—´çº¿å’Œä¼šè¯ä¸ï¼›æ¤å¤–ï¼Œé™¤éžä½ å…³æ³¨äº†è¿™äº›æœåŠ¡å™¨ä¸Šçš„ç”¨æˆ·ï¼Œå¦åˆ™è¿™äº›ç”¨æˆ·çš„äº’åŠ¨ä¸ä¼šäº§ç”Ÿé€šçŸ¥ã€‚
+      silenced: æ¥è‡ªè¿™äº›æœåŠ¡å™¨ä¸Šçš„å¸–åå°†ä¸ä¼šå‡ºçŽ°åœ¨å…¬å…±æ—¶é—´è½´å’Œä¼šè¯ä¸ï¼Œé€šçŸ¥åŠŸèƒ½ä¹Ÿä¸ä¼šæé†’è¿™äº›ç”¨æˆ·çš„åŠ¨æ€ï¼›åªæœ‰ä½ å…³æ³¨äº†è¿™äº›ç”¨æˆ·ï¼Œæ‰ä¼šæ”¶åˆ°ç”¨æˆ·äº’åŠ¨çš„é€šçŸ¥æ¶ˆæ¯ã€‚
       silenced_title: å·²éšè—çš„æœåŠ¡å™¨
       suspended: è¿™äº›æœåŠ¡å™¨çš„æ•°æ®å°†ä¸ä¼šè¢«å¤„ç†ã€å˜å‚¨æˆ–è€…äº¤æ¢ï¼Œæœ¬ç«™ä¹Ÿå°†æ— æ³•å’Œæ¥è‡ªè¿™äº›æœåŠ¡å™¨çš„ç”¨æˆ·äº’åŠ¨æˆ–è€…äº¤æµã€‚
       suspended_title: å·²å°ç¦çš„æœåŠ¡å™¨
@@ -55,6 +57,7 @@ zh-CN:
     followers:
       other: å…³æ³¨è€…
     following: æ£åœ¨å…³æ³¨
+    instance_actor_flash: è¿™ä¸ªè´¦æˆ·æ˜¯è™šæ‹Ÿè´¦æˆ·ï¼Œç”¨æ¥ä»£è¡¨æœåŠ¡å™¨è‡ªèº«ï¼Œä¸ä»£è¡¨ä»»ä½•å®žé™…ç”¨æˆ·ã€‚å®ƒç”¨äºŽäº’é€šåŠŸèƒ½ï¼Œä¸åº”è¯¥å°ç¦ã€‚
     joined: åŠ å…¥äºŽ %{date}
     last_active: æœ€è¿‘æ´»åŠ¨
     link_verified_on: æ¤é“¾æŽ¥çš„æ‰€æœ‰æƒå·²åœ¨ %{date} æ£€æŸ¥
@@ -92,6 +95,7 @@ zh-CN:
       add_email_domain_block: å°ç¦ç”µåé‚®ç®±åŸŸå
       approve: æ‰¹å‡†
       approve_all: æ‰¹å‡†å…¨éƒ¨
+      approved_msg: æˆåŠŸæ‰¹å‡† %{username} çš„æ³¨å†Œç”³è¯·
       are_you_sure: ä½ ç¡®å®šå—ï¼Ÿ
       avatar: å¤´åƒ
       by_domain: åŸŸå
@@ -105,8 +109,10 @@ zh-CN:
       confirm: ç¡®è®¤
       confirmed: å·²ç¡®è®¤
       confirming: ç¡®è®¤ä¸
+      delete: åˆ é™¤æ•°æ®
       deleted: å·²åˆ é™¤
       demote: é™ä»»
+      destroyed_msg: "%{username} çš„æ•°æ®å·²è¿›å…¥ç‰å¾…é˜Ÿåˆ—ï¼Œå³å°†è¢«åˆ é™¤"
       disable: åœç”¨
       disable_two_factor_authentication: åœç”¨åŒé‡è®¤è¯
       disabled: å·²åœç”¨
@@ -117,10 +123,12 @@ zh-CN:
       email_status: ç”µåé‚®ä»¶åœ°å€çŠ¶æ€
       enable: å¯ç”¨
       enabled: å·²å¯ç”¨
+      enabled_msg: æˆåŠŸå¯ç”¨ %{username} çš„å¸å·
       followers: å…³æ³¨è€…
       follows: æ£åœ¨å…³æ³¨
       header: ä¸ªäººèµ„æ–™é¡µæ¨ªå¹…å›¾ç‰‡
       inbox_url: æ”¶ä»¶ç®±ï¼ˆInboxï¼‰URL
+      invite_request_text: åŠ å…¥ç†ç”±
       invited_by: é‚€è¯·è€…ä¸º
       ip: IP åœ°å€
       joined: åŠ å…¥äºŽ
@@ -132,17 +140,19 @@ zh-CN:
       login_status: ç™»å½•çŠ¶æ€
       media_attachments: åª’ä½“æ–‡ä»¶
       memorialize: è®¾ç½®ä¸ºè¿½æ‚¼å¸æˆ·
+      memorialized: è¢«æ‚¼å¿µ
+      memorialized_msg: æˆåŠŸå°† %{username} è½¬æ¢ä¸ºæ‚¼å¿µå¸å·
       moderation:
         active: æ´»è·ƒ
         all: å…¨éƒ¨
         pending: å¾…å®¡æ ¸
         silenced: å·²éšè—
         suspended: å·²å°ç¦
-        title: å¸æˆ·çŠ¶æ€
+        title: ç®¡ç†
       moderation_notes: ç®¡ç†å‘˜å¤‡æ³¨
       most_recent_activity: æœ€åŽä¸€æ¬¡æ´»è·ƒçš„æ—¶é—´
       most_recent_ip: æœ€åŽä¸€æ¬¡æ´»è·ƒçš„ IP åœ°å€
-      no_account_selected: å› ä¸ºæ²¡æœ‰å¸å·è¢«é€‰æ‹©ï¼Œæ‰€ä»¥æ²¡æœ‰æ›´æ”¹
+      no_account_selected: å› ä¸ºæ²¡æœ‰é€‰ä¸ä»»ä½•å¸å·ï¼Œæ‰€ä»¥æ²¡æœ‰æ›´æ”¹
       no_limits_imposed: æ— é™åˆ¶
       not_subscribed: æœªè®¢é˜…
       pending: å¾…å®¡æ ¸
@@ -152,10 +162,14 @@ zh-CN:
       public: å…¬å¼€é¡µé¢
       push_subscription_expires: PuSH è®¢é˜…è¿‡æœŸæ—¶é—´
       redownload: åˆ·æ–°ä¸ªäººèµ„æ–™
+      redownloaded_msg: æˆåŠŸä»Žæ¥æºå¤„åˆ·æ–° %{username} çš„ç”¨æˆ·èµ„æ–™
       reject: æ‹’ç»
       reject_all: æ‹’ç»å…¨éƒ¨
+      rejected_msg: æˆåŠŸæ‹’ç» %{username} çš„æ³¨å†Œç”³è¯·
       remove_avatar: åˆ é™¤å¤´åƒ
       remove_header: åˆ é™¤æ¨ªå¹…å›¾ç‰‡
+      removed_avatar_msg: æˆåŠŸåˆ é™¤ %{username} çš„å¤´åƒ
+      removed_header_msg: æˆåŠŸåˆ é™¤äº† %{username} çš„æ¨ªå¹…å›¾ç‰‡
       resend_confirmation:
         already_confirmed: è¯¥ç”¨æˆ·å·²è¢«ç¡®è®¤
         send: é‡å‘ç¡®è®¤é‚®ä»¶
@@ -172,6 +186,8 @@ zh-CN:
       search: æœç´¢
       search_same_email_domain: å…¶ä»–å…·æœ‰ç›¸åŒç”µåé‚®ç®±åŸŸåçš„ç”¨æˆ·
       search_same_ip: å…·æœ‰ç›¸åŒIPçš„å…¶ä»–ç”¨æˆ·
+      sensitive: æ•æ„Ÿå†…å®¹
+      sensitized: å·²æ ‡è®°ä¸ºæ•æ„Ÿå†…å®¹
       shared_inbox_url: å…¬ç”¨æ”¶ä»¶ç®±ï¼ˆShared Inboxï¼‰URL
       show:
         created_reports: è¿™ä¸ªå¸æˆ·æäº¤çš„ä¸¾æŠ¥
@@ -181,13 +197,19 @@ zh-CN:
       statuses: å˜Ÿæ–‡
       subscribe: è®¢é˜…
       suspended: å·²å°ç¦
+      suspension_irreversible: è¯¥å¸å·çš„æ•°æ®å·²è¢«ä¸å¯é€†è½¬åœ°åˆ é™¤ã€‚æ‚¨å¯ä»¥å–æ¶ˆæš‚åœè¯¥å¸å·ä»¥ä½¿å…¶å¯ç”¨ï¼Œä½†å®ƒä¸ä¼šæ¢å¤ä»¥å‰æ‹¥æœ‰çš„ä»»ä½•æ•°æ®ã€‚
+      suspension_reversible_hint_html: å¸å·å·²å°ç¦ï¼Œæ•°æ®å°†åœ¨ %{date} å®Œå…¨åˆ é™¤ã€‚ åœ¨æ¤ä¹‹å‰ï¼Œå¸å·ä»å¯æ¢å¤ï¼Œå¹¶ä¸”æ²¡æœ‰ä»»ä½•ä¸è‰¯å½±å“ã€‚ å¦‚æžœæ‚¨æƒ³ç«‹å³ç§»é™¤è¯¥å¸å·çš„æ‰€æœ‰æ•°æ®ï¼Œå¯ä»¥åœ¨ä¸‹é¢è¿›è¡Œã€‚
       time_in_queue: å·²ç»ç‰å¾…äº† %{time}
       title: ç”¨æˆ·
       unconfirmed_email: å¾…éªŒè¯çš„ç”µåé‚®ä»¶åœ°å€
+      undo_sensitized: åŽ»é™¤æ•æ„Ÿå†…å®¹æ ‡è®°
       undo_silenced: è§£é™¤éšè—
       undo_suspension: è§£é™¤å°ç¦
+      unsilenced_msg: æˆåŠŸè§£é™¤ %{username} çš„å¸å·é™åˆ¶
       unsubscribe: å–æ¶ˆè®¢é˜…
+      unsuspended_msg: å·²æˆåŠŸå–æ¶ˆå°ç¦ %{username} çš„å¸å·
       username: ç”¨æˆ·å
+      view_domain: æŸ¥çœ‹åŸŸåæ‘˜è¦
       warn: è¦å‘Š
       web: ç«™å†…é¡µé¢
       whitelisted: å…è®¸è·¨ç«™äº¤äº’
@@ -202,12 +224,14 @@ zh-CN:
         create_domain_allow: å…è®¸æ–°åŸŸå
         create_domain_block: å°ç¦æ–°åŸŸå
         create_email_domain_block: å°ç¦ç”µåé‚®ç®±åŸŸå
+        create_ip_block: æ–°å»º IP è§„åˆ™
         demote_user: ç»™ç”¨æˆ·é™èŒ
         destroy_announcement: åˆ é™¤å…¬å‘Š
         destroy_custom_emoji: åˆ é™¤è‡ªå®šä¹‰è¡¨æƒ…ç¬¦å·
         destroy_domain_allow: è§£é™¤åŸŸåå…è®¸
         destroy_domain_block: è§£é™¤åŸŸåå°ç¦
         destroy_email_domain_block: è§£é™¤ç”µåé‚®ç®±åŸŸåå°ç¦
+        destroy_ip_block: åˆ é™¤ IP è§„åˆ™
         destroy_status: åˆ é™¤å˜Ÿæ–‡
         disable_2fa_user: ç¦ç”¨åŒé‡è®¤è¯
         disable_custom_emoji: ç¦ç”¨è‡ªå®šä¹‰è¡¨æƒ…ç¬¦å·
@@ -220,13 +244,16 @@ zh-CN:
         reopen_report: é‡å¼€ä¸¾æŠ¥
         reset_password_user: é‡ç½®å¯†ç 
         resolve_report: å¤„ç†ä¸¾æŠ¥
+        sensitive_account: å°†ä½ å¸å·ä¸çš„åª’ä½“æ ‡è®°ä¸ºæ•æ„Ÿå†…å®¹
         silence_account: éšè—ç”¨æˆ·
         suspend_account: å°ç¦ç”¨æˆ·
         unassigned_report: å–æ¶ˆä¸¾æŠ¥çš„æŒ‡æ´¾
+        unsensitive_account: åŽ»é™¤ä½ å¸å·ä¸åª’ä½“çš„æ•æ„Ÿå†…å®¹æ ‡è®°
         unsilence_account: è§£é™¤è´¦å·éšè—
         unsuspend_account: è§£é™¤è´¦å·å°ç¦
         update_announcement: æ›´æ–°å…¬å‘Š
         update_custom_emoji: æ›´æ–°è‡ªå®šä¹‰è¡¨æƒ…ç¬¦å·
+        update_domain_block: æ›´æ–°åŸŸåå±è”½
         update_status: æ›´æ–°å˜Ÿæ–‡
       actions:
         assigned_to_self_report: "%{name} æŽ¥ç®¡äº†ä¸¾æŠ¥ %{target}"
@@ -238,12 +265,14 @@ zh-CN:
         create_domain_allow: "%{name} å…è®¸äº†å’ŒåŸŸå %{target} çš„è·¨ç«™äº¤äº’"
         create_domain_block: "%{name} å±è”½äº†åŸŸå %{target}"
         create_email_domain_block: "%{name} å±è”½äº†ç”µåé‚®ä»¶åŸŸå %{target}"
+        create_ip_block: "%{name} ä¸º IP %{target} åˆ›å»ºäº†è§„åˆ™"
         demote_user: "%{name} å¯¹ç”¨æˆ· %{target} è¿›è¡Œäº†é™ä»»æ“ä½œ"
         destroy_announcement: "%{name} åˆ é™¤äº†å…¬å‘Š %{target}"
         destroy_custom_emoji: "%{name} é”€æ¯äº†è‡ªå®šä¹‰è¡¨æƒ… %{target}"
         destroy_domain_allow: "%{name} æ‹’ç»äº†å’Œ %{target} è·¨ç«™äº¤äº’"
         destroy_domain_block: "%{name} è§£é™¤äº†å¯¹åŸŸå %{target} çš„å±è”½"
         destroy_email_domain_block: "%{name} è§£é™¤äº†å¯¹ç”µåé‚®ä»¶åŸŸå %{target} çš„å±è”½"
+        destroy_ip_block: "%{name} åˆ é™¤äº† IP %{target} çš„è§„åˆ™"
         destroy_status: "%{name} åˆ é™¤äº† %{target} çš„å˜Ÿæ–‡"
         disable_2fa_user: "%{name} åœç”¨äº†ç”¨æˆ· %{target} çš„åŒé‡è®¤è¯"
         disable_custom_emoji: "%{name} åœç”¨äº†è‡ªå®šä¹‰è¡¨æƒ… %{target}"
@@ -256,13 +285,16 @@ zh-CN:
         reopen_report: "%{name} é‡å¼€äº†ä¸¾æŠ¥ %{target}"
         reset_password_user: "%{name} é‡ç½®äº†ç”¨æˆ· %{target} çš„å¯†ç "
         resolve_report: "%{name} å¤„ç†äº†ä¸¾æŠ¥ %{target}"
+        sensitive_account: "%{name} å°† %{target} çš„åª’ä½“æ ‡è®°ä¸ºæ•æ„Ÿå†…å®¹"
         silence_account: "%{name} éšè—äº†ç”¨æˆ· %{target}"
         suspend_account: "%{name} å°ç¦äº†ç”¨æˆ· %{target}"
         unassigned_report: "%{name} æ”¾å¼ƒäº†ä¸¾æŠ¥ %{target} çš„æŽ¥ç®¡"
+        unsensitive_account: "%{name} åŽ»é™¤äº† %{target} åª’ä½“çš„æ•æ„Ÿå†…å®¹æ ‡è®°"
         unsilence_account: "%{name} è§£é™¤äº†ç”¨æˆ· %{target} çš„éšè—çŠ¶æ€"
         unsuspend_account: "%{name} è§£é™¤äº†ç”¨æˆ· %{target} çš„å°ç¦çŠ¶æ€"
         update_announcement: "%{name} æ›´æ–°äº†å…¬å‘Š %{target}"
         update_custom_emoji: "%{name} æ›´æ–°äº†è‡ªå®šä¹‰è¡¨æƒ… %{target}"
+        update_domain_block: "%{name} æ›´æ–°äº†å¯¹ %{target} çš„åŸŸåå±è”½"
         update_status: "%{name} åˆ·æ–°äº† %{target} çš„å˜Ÿæ–‡"
       deleted_status: "ï¼ˆå˜Ÿæ–‡å·²åˆ é™¤ï¼‰"
       empty: æ²¡æœ‰æ‰¾åˆ°æ—¥å¿—
@@ -365,7 +397,9 @@ zh-CN:
           noop: æ— 
           silence: è‡ªåŠ¨éšè—
           suspend: è‡ªåŠ¨å°ç¦
-        title: æ·»åŠ åŸŸåå±è”½
+        title: æ–°å¢žåŸŸåå±è”½
+      obfuscate: æ··æ·†åŸŸå
+      obfuscate_hint: å¦‚æžœå¯ç”¨äº†åŸŸååˆ—è¡¨å…¬å¼€é™åˆ¶ï¼Œå°±éƒ¨åˆ†æ··æ·†åˆ—è¡¨ä¸çš„åŸŸå
       private_comment: ç§å¯†è¯„è®º
       private_comment_hint: ç»™è¿™ä¸€åŸŸåé™åˆ¶æ·»åŠ å¤‡æ³¨ï¼Œä¾›ç›‘å¯Ÿå‘˜å†…éƒ¨ä½¿ç”¨
       public_comment: å…¬å¼€è¯„è®º
@@ -391,7 +425,7 @@ zh-CN:
       view: æŸ¥çœ‹åŸŸåå±è”½
     email_domain_blocks:
       add_new: æ·»åŠ æ–°æ¡ç›®
-      created_msg: ç”µåé‚®ä»¶åŸŸåå±è”½æ·»åŠ æˆåŠŸ
+      created_msg: æˆåŠŸå±è”½ç”µåé‚®ä»¶åŸŸå
       delete: åˆ é™¤
       destroyed_msg: ç”µåé‚®ä»¶åŸŸåå±è”½åˆ é™¤æˆåŠŸ
       domain: åŸŸå
@@ -404,6 +438,7 @@ zh-CN:
     instances:
       by_domain: åŸŸå
       delivery_available: å¯æŠ•é€’
+      empty: æš‚æ— åŸŸåã€‚
       known_accounts:
         other: "%{count} ä¸ªå·²çŸ¥å¸æˆ·"
       moderation:
@@ -426,6 +461,21 @@ zh-CN:
         expired: å·²å¤±æ•ˆ
         title: ç›é€‰
       title: é‚€è¯·ç”¨æˆ·
+    ip_blocks:
+      add_new: æ–°å»ºè§„åˆ™
+      created_msg: æˆåŠŸæ·»åŠ æ–° IP è§„åˆ™
+      delete: åˆ é™¤
+      expires_in:
+        '1209600': ä¸¤å‘¨
+        '15778476': 6ä¸ªæœˆ
+        '2629746': 1ä¸ªæœˆ
+        '31556952': 1å¹´
+        '86400': 1å¤©
+        '94670856': 3å¹´
+      new:
+        title: åˆ›å»ºæ–° IP è§„åˆ™
+      no_ip_block_selected: å› ä¸ºæ²¡æœ‰ IP è§„åˆ™è¢«é€‰ä¸ï¼Œæ‰€ä»¥æ²¡æœ‰æ›´æ”¹
+      title: IP è§„åˆ™
     pending_accounts:
       title: å¾…å¤„ç†çš„å¸æˆ· (%{count})
     relationships:
@@ -463,6 +513,8 @@ zh-CN:
       comment:
         none: æ²¡æœ‰
       created_at: ä¸¾æŠ¥æ—¶é—´
+      forwarded: å·²è½¬å‘
+      forwarded_to: è½¬å‘ä¸¾æŠ¥è‡³ %{domain}
       mark_as_resolved: æ ‡è®°ä¸ºâ€œå·²å¤„ç†â€
       mark_as_unresolved: æ ‡è®°ä¸ºâ€œæœªå¤„ç†â€
       notes:
@@ -506,9 +558,10 @@ zh-CN:
       domain_blocks_rationale:
         title: æ˜¾ç¤ºç†ç”±
       enable_bootstrap_timeline_accounts:
+        desc_html: è®©æ–°ç”¨æˆ·è‡ªåŠ¨å…³æ³¨æŒ‡å®šç”¨æˆ·ï¼Œè¿™æ ·ï¼Œä»–ä»¬çš„ä¸»é¡µæ—¶é—´çº¿å°±ä¸ä¼šåœ¨ä¸€å¼€å§‹çš„æ—¶å€™ç©ºç©ºè¡è¡
         title: å¼€å¯æ–°ç”¨æˆ·é»˜è®¤å…³æ³¨åŠŸèƒ½
       hero:
-        desc_html: ç”¨äºŽåœ¨é¦–é¡µå±•ç¤ºã€‚æŽ¨èåˆ†è¾¨çŽ‡ 600Ã—100px ä»¥ä¸Šã€‚æœªæŒ‡å®šçš„æƒ…å†µä¸‹å°†é»˜è®¤ä½¿ç”¨æœ¬ç«™ç¼©ç•¥å›¾
+        desc_html: å°†ç”¨äºŽåœ¨é¦–é¡µå±•ç¤ºã€‚æŽ¨èä½¿ç”¨åˆ†è¾¨çŽ‡ 600Ã—100px ä»¥ä¸Šçš„å›¾ç‰‡ã€‚å¦‚æœªè®¾ç½®ï¼Œå°†é»˜è®¤ä½¿ç”¨æœ¬ç«™ç¼©ç•¥å›¾ã€‚
         title: ä¸»é¢˜å›¾ç‰‡
       mascot:
         desc_html: ç”¨äºŽåœ¨é¦–é¡µå±•ç¤ºã€‚æŽ¨èåˆ†è¾¨çŽ‡ 293Ã—205px ä»¥ä¸Šã€‚æœªæŒ‡å®šçš„æƒ…å†µä¸‹å°†ä½¿ç”¨é»˜è®¤å‰ç¥¥ç‰©ã€‚
@@ -517,7 +570,7 @@ zh-CN:
         desc_html: æˆªè‡³ç›®å‰æœ¬æœåŠ¡å™¨åœ¨è”é‚¦å®‡å®™ä¸å·²å‘çŽ°çš„åŸŸå
         title: å…¬å¼€å·²çŸ¥å®žä¾‹çš„åˆ—è¡¨
       preview_sensitive_media:
-        desc_html: å§‹ç»ˆåœ¨ç«™å¤–é“¾æŽ¥é¢„è§ˆä¸å±•ç¤ºç¼©ç•¥å›¾ï¼Œæ— è®ºåª’ä½“å†…å®¹æ˜¯å¦æ ‡è®°ä¸ºæ•æ„Ÿ
+        desc_html: æ— è®ºåª’ä½“æ–‡ä»¶æ˜¯å¦æ ‡è®°ä¸ºæ•æ„Ÿå†…å®¹ï¼Œç«™å¤–é“¾æŽ¥é¢„è§ˆå§‹ç»ˆå‘ˆçŽ°ä¸ºç¼©ç•¥å›¾ã€‚
         title: åœ¨ OpenGraph é¢„è§ˆä¸æ˜¾ç¤ºæ•æ„Ÿåª’ä½“å†…å®¹
       profile_directory:
         desc_html: å…è®¸ç”¨æˆ·è¢«å‘çŽ°
@@ -532,6 +585,9 @@ zh-CN:
         min_invite_role:
           disabled: æ²¡æœ‰äºº
           title: å…è®¸å‘é€é‚€è¯·çš„ç”¨æˆ·ç»„
+        require_invite_text:
+          desc_html: å½“æ³¨å†Œéœ€è¦æ‰‹åŠ¨æ‰¹å‡†æ—¶ï¼Œå°†â€œä½ ä¸ºä»€ä¹ˆæƒ³è¦åŠ å…¥ï¼Ÿâ€è®¾ä¸ºå¿…å¡«é¡¹
+          title: è¦æ±‚æ–°ç”¨æˆ·å¡«å†™ç”³è¯·æ³¨å†Œçš„åŽŸå› 
       registrations_mode:
         modes:
           approved: æ³¨å†Œæ—¶éœ€è¦æ‰¹å‡†
@@ -623,7 +679,7 @@ zh-CN:
       body_remote: æ¥è‡ª %{domain} çš„ç”¨æˆ·ä¸¾æŠ¥äº†ç”¨æˆ· %{target}
       subject: æ¥è‡ª %{instance} çš„ç”¨æˆ·ä¸¾æŠ¥ï¼ˆ#%{id}ï¼‰
     new_trending_tag:
-      body: 'ä»Šæ—¥çš„çƒé—¨è¯é¢˜ #%{name} ä¹‹å‰æœªç»å®¡æ ¸ã€‚ç›´åˆ°ä½ å…è®¸ä¹‹å‰è¿™ä¸ªè¯é¢˜å°†ä¸ä¼šå…¬å¼€æ˜¾ç¤ºï¼Œæ´»ç€å°±ä¿æŒåŽŸæ ·è®©å®ƒçŸ³æ²‰å¤§æµ·ã€‚'
+      body: 'ä»Šæ—¥çš„çƒé—¨è¯é¢˜ #%{name} ä¹‹å‰æœªç»å®¡æ ¸ã€‚ç›´åˆ°ä½ å…è®¸ä¹‹å‰è¿™ä¸ªè¯é¢˜å°†ä¸ä¼šå…¬å¼€æ˜¾ç¤ºï¼Œæˆ–è€…å°±ä¿æŒåŽŸæ ·è®©å®ƒçŸ³æ²‰å¤§æµ·ã€‚'
       subject: åœ¨ %{instance} æœ‰æ–°è¯é¢˜ (#%{name}) å¾…å®¡æ ¸
   aliases:
     add_new: åˆ›å»ºåˆ«å
@@ -671,8 +727,11 @@ zh-CN:
       prefix_sign_up: çŽ°åœ¨å°±æ³¨å†Œ Mastodonï¼
       suffix: æ³¨å†Œä¸€ä¸ªå¸å·ï¼Œä½ å°±å¯ä»¥å…³æ³¨åˆ«äººã€å‘å¸ƒå˜Ÿæ–‡ã€å¹¶å’Œå…¶å®ƒä»»ä½•MastodonæœåŠ¡å™¨ä¸Šçš„ç”¨æˆ·äº¤æµï¼Œè€Œä¸”è¿˜æœ‰å…¶å®ƒæ›´å¤šåŠŸèƒ½ï¼
     didnt_get_confirmation: æ²¡æœ‰æ”¶åˆ°ç¡®è®¤é‚®ä»¶ï¼Ÿ
+    dont_have_your_security_key: æ²¡æœ‰æ‚¨çš„å®‰å…¨å¯†é’¥ï¼Ÿ
     forgot_password: å¿˜è®°å¯†ç ï¼Ÿ
     invalid_reset_password_token: å¯†ç é‡ç½®ä»¤ç‰Œæ— æ•ˆæˆ–å·²è¿‡æœŸã€‚è¯·é‡æ–°å‘èµ·é‡ç½®å¯†ç è¯·æ±‚ã€‚
+    link_to_otp: è¾“å…¥ä»Žæ‰‹æœºä¸èŽ·å¾—çš„ä¸¤æ¥éªŒè¯ä»£ç æˆ–æ¢å¤ä»£ç 
+    link_to_webauth: ä½¿ç”¨æ‚¨çš„å®‰å…¨å¯†é’¥è®¾å¤‡
     login: ç™»å½•
     logout: ç™»å‡º
     migrate_account: è¿ç§»åˆ°å¦ä¸€ä¸ªå¸æˆ·
@@ -697,7 +756,9 @@ zh-CN:
       functional: æ‚¨çš„å¸å·å¯ä»¥æ£å¸¸ä½¿ç”¨äº†ã€‚
       pending: å·¥ä½œäººå‘˜æ£åœ¨å®¡æ ¸æ‚¨çš„ç”³è¯·ã€‚è¿™éœ€è¦èŠ±ç‚¹æ—¶é—´ã€‚åœ¨ç”³è¯·è¢«æ‰¹å‡†åŽï¼Œæ‚¨å°†æ”¶åˆ°ä¸€å°ç”µåé‚®ä»¶ã€‚
       redirecting_to: æ‚¨çš„å¸æˆ·æ— æ•ˆï¼Œå› ä¸ºå®ƒå·²è¢«è®¾ç½®ä¸ºè·³è½¬åˆ° %{acct}
+    too_fast: è¡¨å•æäº¤è¿‡å¿«ï¼Œè¯·é‡è¯•ã€‚
     trouble_logging_in: ç™»å½•æœ‰é—®é¢˜ï¼Ÿ
+    use_security_key: ä½¿ç”¨å®‰å…¨å¯†é’¥
   authorize_follow:
     already_following: ä½ å·²ç»åœ¨å…³æ³¨æ¤ç”¨æˆ·äº†
     already_requested: ä½ å·²ç»å‘é‚£ä¸ªè´¦æˆ·å‘é€è¿‡å…³æ³¨è¯·æ±‚äº†
@@ -722,6 +783,7 @@ zh-CN:
   date:
     formats:
       default: "%Yå¹´%mæœˆ%dæ—¥"
+      with_month_name: "%Yå¹´%mæœˆ%dæ—¥"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}æ—¶"
@@ -786,6 +848,7 @@ zh-CN:
       request: è¯·æ±‚ä½ çš„å˜æ¡£
       size: å¤§å°
     blocks: å±è”½çš„ç”¨æˆ·
+    bookmarks: ä¹¦ç¾
     csv: CSV
     domain_blocks: åŸŸåå±è”½
     lists: åˆ—è¡¨
@@ -852,6 +915,8 @@ zh-CN:
     status: éªŒè¯çŠ¶æ€
     view_proof: æŸ¥çœ‹è¯æ˜Ž
   imports:
+    errors:
+      over_rows_processing_limit: åŒ…å«è¡Œæ•°è¶…è¿‡äº† %{count}
     modes:
       merge: åˆå¹¶
       merge_long: ä¿ç•™çŽ°æœ‰è®°å½•å¹¶æ·»åŠ æ–°çš„è®°å½•
@@ -861,6 +926,7 @@ zh-CN:
     success: æ•°æ®ä¸Šä¼ æˆåŠŸï¼Œæ£åœ¨å¤„ç†ä¸
     types:
       blocking: å±è”½åˆ—è¡¨
+      bookmarks: ä¹¦ç¾
       domain_blocking: åŸŸåå±è”½åˆ—è¡¨
       following: å…³æ³¨åˆ—è¡¨
       muting: éšè—åˆ—è¡¨
@@ -978,6 +1044,14 @@ zh-CN:
           quadrillion: Q
           thousand: K
           trillion: T
+  otp_authentication:
+    code_hint: è¾“å…¥è®¤è¯åº”ç”¨ç”Ÿæˆçš„ä»£ç ä»¥ç¡®è®¤æ“ä½œ
+    description_html: å¦‚æžœæ‚¨ä½¿ç”¨èº«ä»½éªŒè¯åº”ç”¨å¯ç”¨äº† <strong>åŒé‡èº«ä»½éªŒè¯</strong>ï¼Œ ç™»å½•å°†éœ€è¦ç”¨åˆ°æ‚¨çš„æ‰‹æœºï¼Œå®ƒå°†ç”Ÿæˆæ‚¨éœ€è¦çš„ä»¤ç‰Œã€‚
+    enable: å¯ç”¨
+    instructions_html: "<strong>è¯·ä½¿ç”¨ Google èº«ä»½éªŒè¯å™¨æˆ–å…¶ä»–çš„TOTPåŒé‡è®¤è¯æ‰‹æœºåº”ç”¨æ‰«ææ¤å¤„çš„äºŒç»´ç </strong>ã€‚å¯ç”¨åŒé‡è®¤è¯åŽï¼Œåœ¨ç™»å½•æ—¶ï¼Œä½ éœ€è¦è¾“å…¥è¯¥åº”ç”¨ç”Ÿæˆçš„ä»£ç ã€‚"
+    manual_instructions: å¦‚æžœä½ æ— æ³•æ‰«æäºŒç»´ç ï¼Œè¯·æ‰‹åŠ¨è¾“å…¥ä¸‹åˆ—æ–‡æœ¬ï¼š
+    setup: è®¾ç½®
+    wrong_code: è¾“å…¥çš„è®¤è¯ç æ— æ•ˆï¼è¯·ç¡®è®¤æœåŠ¡å™¨æ—¶é—´ä¸Žè®¾å¤‡æ—¶é—´æ˜¯å¦æ£ç¡®ï¼Ÿ
   pagination:
     newer: æ›´æ–°
     next: ä¸‹ä¸€é¡µ
@@ -1006,6 +1080,7 @@ zh-CN:
   relationships:
     activity: å¸å·æ´»åŠ¨
     dormant: ä¼‘çœ 
+    follow_selected_followers: å…³æ³¨é€‰ä¸çš„å…³æ³¨è€…
     followers: å…³æ³¨è€…
     following: æ£åœ¨å…³æ³¨
     invited: å·²é‚€è¯·
@@ -1102,6 +1177,7 @@ zh-CN:
     profile: ä¸ªäººèµ„æ–™
     relationships: å…³æ³¨ç®¡ç†
     two_factor_authentication: åŒé‡è®¤è¯
+    webauthn_authentication: å®‰å…¨å¯†é’¥
   spam_check:
     spam_detected: è¿™æ˜¯ä¸€ä¸ªè‡ªåŠ¨æŠ¥å‘Šã€‚å·²æ£€æµ‹åˆ°åžƒåœ¾ä¿¡æ¯ã€‚
   statuses:
@@ -1134,6 +1210,8 @@ zh-CN:
         other: "%{count} ç¥¨"
       vote: æŠ•ç¥¨
     show_more: æ˜¾ç¤ºæ›´å¤š
+    show_newer: æ˜¾ç¤ºæ›´æ–°å†…å®¹
+    show_older: æ˜¾ç¤ºæ›´æ—©å†…å®¹
     show_thread: æ˜¾ç¤ºå…¨éƒ¨å¯¹è¯
     sign_in_to_participate: ç™»å½•ä»¥åŠ å…¥å¯¹è¯
     title: "%{name}ï¼šâ€œ%{quote}â€"
@@ -1239,24 +1317,23 @@ zh-CN:
     mastodon-light: Mastodonï¼ˆäº®è‰²ä¸»é¢˜ï¼‰
   time:
     formats:
-      default: "%Yå¹´%-mæœˆ%dæ—¥ %H:%M"
-      month: "%Y å¹´ %B"
+      default: "%Yå¹´%mæœˆ%dæ—¥ %H:%M"
+      month: "%Yå¹´%mæœˆ"
   two_factor_authentication:
-    code_hint: è¾“å…¥è®¤è¯å™¨ç”Ÿæˆçš„ä»£ç ä»¥ç¡®è®¤æ“ä½œ
-    description_html: å¯ç”¨<strong>åŒé‡è®¤è¯</strong>åŽï¼Œä½ éœ€è¦è¾“å…¥æ‰‹æœºè®¤è¯å™¨ç”Ÿæˆçš„ä»£ç æ‰èƒ½ç™»å½•.
+    add: æ·»åŠ 
     disable: åœç”¨
-    enable: å¯ç”¨
+    disabled_success: åŒé‡èº«ä»½éªŒè¯æˆåŠŸç¦ç”¨
+    edit: ç¼–è¾‘
     enabled: åŒé‡è®¤è¯å·²å¯ç”¨
     enabled_success: åŒé‡è®¤è¯å¯ç”¨æˆåŠŸ
     generate_recovery_codes: ç”Ÿæˆæ¢å¤ä»£ç 
-    instructions_html: "<strong>è¯·ä½¿ç”¨ Google èº«ä»½éªŒè¯å™¨æˆ–å…¶ä»– TOTP åŒé‡è®¤è¯æ‰‹æœºåº”ç”¨æ‰«ææ¤å¤„çš„äºŒç»´ç </strong>ã€‚å¯ç”¨åŒé‡è®¤è¯åŽï¼Œä½ éœ€è¦è¾“å…¥è¯¥åº”ç”¨ç”Ÿæˆçš„ä»£ç æ¥ç™»å½•ä½ çš„å¸æˆ·ã€‚"
     lost_recovery_codes: å¦‚æžœä½ çš„æ‰‹æœºä¸æ…Žä¸¢å¤±ï¼Œä½ å¯ä»¥ä½¿ç”¨æ¢å¤ä»£ç æ¥é‡æ–°èŽ·å¾—å¯¹å¸æˆ·çš„è®¿é—®æƒã€‚å¦‚æžœä½ é—å¤±äº†æ¢å¤ä»£ç ï¼Œå¯ä»¥åœ¨æ¤å¤„é‡æ–°ç”Ÿæˆã€‚ä¹‹å‰ä½¿ç”¨çš„æ¢å¤ä»£ç å°†ä¼šå¤±æ•ˆã€‚
-    manual_instructions: å¦‚æžœä½ æ— æ³•æ‰«æäºŒç»´ç ï¼Œè¯·æ‰‹åŠ¨è¾“å…¥ä¸‹åˆ—æ–‡æœ¬ï¼š
+    methods: åŒé‡è®¤è¯
+    otp: èº«ä»½éªŒè¯åº”ç”¨
     recovery_codes: å¤‡ä»½æ¢å¤ä»£ç 
     recovery_codes_regenerated: æ¢å¤ä»£ç é‡æ–°ç”ŸæˆæˆåŠŸ
     recovery_instructions_html: å¦‚æžœä½ çš„æ‰‹æœºæ— æ³•ä½¿ç”¨ï¼Œä½ å¯ä»¥ä½¿ç”¨ä¸‹åˆ—ä»»æ„ä¸€ä¸ªæ¢å¤ä»£ç æ¥é‡æ–°èŽ·å¾—å¯¹å¸æˆ·çš„è®¿é—®æƒã€‚<strong>è¯·å¦¥å–„ä¿ç®¡å¥½ä½ çš„æ¢å¤ä»£ç </strong>ï¼ˆä¾‹å¦‚ï¼Œä½ å¯ä»¥å°†å®ƒä»¬æ‰“å°å‡ºæ¥ï¼Œç„¶åŽå’Œå…¶ä»–é‡è¦çš„æ–‡ä»¶æ”¾åœ¨ä¸€èµ·ï¼‰ã€‚
-    setup: è®¾ç½®
-    wrong_code: è¾“å…¥çš„è®¤è¯ç æ— æ•ˆï¼è¯·ç¡®è®¤æœåŠ¡å™¨æ—¶é—´ä¸Žè®¾å¤‡æ—¶é—´æ˜¯å¦æ£ç¡®ï¼Ÿ
+    webauthn: å®‰å…¨å¯†é’¥
   user_mailer:
     backup_ready:
       explanation: ä½ è¯·æ±‚äº†ä¸€ä»½ Mastodon å¸æˆ·çš„å®Œæ•´å¤‡ä»½ã€‚çŽ°åœ¨ä½ å¯ä»¥ä¸‹è½½äº†ï¼
@@ -1271,6 +1348,7 @@ zh-CN:
     warning:
       explanation:
         disable: è™½ç„¶æ‚¨çš„å¸æˆ·è¢«å†»ç»“ï¼Œæ‚¨çš„å¸æˆ·æ•°æ®ä»ç„¶å®Œæ•´ï¼›ä½†æ˜¯æ‚¨æ— æ³•åœ¨è§£é”å‰æ‰§è¡Œä»»ä½•æ“ä½œã€‚
+        sensitive: ä½ ä¸Šä¼ çš„åª’ä½“æ–‡ä»¶å’Œåª’ä½“é“¾æŽ¥å°†è¢«è§†ä½œæ•æ„Ÿå†…å®¹ã€‚
         silence: å½“æ‚¨çš„å¸æˆ·å—é™æ—¶ï¼Œåªæœ‰å·²ç»å…³æ³¨è¿‡ä½ çš„äººæ‰ä¼šè¿™å°æœåŠ¡å™¨ä¸Šçœ‹åˆ°ä½ çš„å˜Ÿæ–‡ï¼Œå¹¶ä¸”æ‚¨ä¼šè¢«æŽ’é™¤åœ¨å„ç§å…¬å…±åˆ—è¡¨ä¹‹å¤–ã€‚ä½†æ˜¯ï¼Œå…¶ä»–äººä»ç„¶å¯ä»¥æ‰‹åŠ¨å…³æ³¨ä½ ã€‚
         suspend: æ‚¨çš„å¸æˆ·å·²è¢«å°ç¦ï¼Œæ‰€æœ‰çš„å˜Ÿæ–‡å’Œæ‚¨ä¸Šä¼ çš„åª’ä½“æ–‡ä»¶éƒ½å·²ç»ä»Žè¯¥æœåŠ¡å™¨å’Œæ‚¨çš„å…³æ³¨è€…çš„æœåŠ¡å™¨ä¸Šåˆ é™¤å¹¶ä¸”ä¸å¯æ¢å¤ã€‚
       get_in_touch: æ‚¨å¯å›žå¤è¯¥é‚®ä»¶ä»¥è”ç³» %{instance} çš„å·¥ä½œäººå‘˜ã€‚
@@ -1279,11 +1357,13 @@ zh-CN:
       subject:
         disable: æ‚¨çš„å¸æˆ· %{acct} å·²è¢«å†»ç»“
         none: å¯¹ %{acct} çš„è¦å‘Š
+        sensitive: ä½ çš„å¸å· %{acct} æ‰€å‘å¸ƒçš„åª’ä½“å·²è¢«æ ‡è®°ä¸ºæ•æ„Ÿå†…å®¹
         silence: æ‚¨çš„å¸æˆ· %{acct} å·²ç»å—é™
         suspend: æ‚¨çš„å¸æˆ· %{acct} å·²è¢«å°ç¦ã€‚
       title:
         disable: è´¦å·å·²å†»ç»“
         none: è¦ç¤º
+        sensitive: ä½ çš„åª’ä½“è¢«æ ‡è®°ä¸ºæ•æ„Ÿå†…å®¹
         silence: å¸æˆ·å—é™
         suspend: è´¦å·è¢«å°ç¦
     welcome:
@@ -1304,9 +1384,11 @@ zh-CN:
       tips: å°è´´å£«
       title: "%{name}ï¼Œæ¬¢è¿Žä½ çš„åŠ å…¥ï¼"
   users:
+    blocked_email_provider: æ‚¨ä¸èƒ½ä½¿ç”¨æ¥è‡ªæ¤æä¾›å•†çš„é‚®ç®±
     follow_limit_reached: æ‚¨ä¸èƒ½å…³æ³¨è¶…è¿‡ %{limit} ä¸ªäºº
     generic_access_help_html: ç™»å½•è´¦å·å‡ºçŽ°é—®é¢˜ï¼Ÿä½ å¯ä»¥å‘ %{email} å¯»æ±‚å¸®åŠ©
     invalid_email: è¾“å…¥çš„ç”µåé‚®ä»¶åœ°å€æ— æ•ˆ
+    invalid_email_mx: ç”¨æˆ¶é‚®ç®±ä¼¼ä¹Žä¸å˜åœ¨
     invalid_otp_token: è¾“å…¥çš„åŒé‡è®¤è¯ä»£ç æ— æ•ˆ
     invalid_sign_in_token: æ— æ•ˆå®‰å…¨ç 
     otp_lost_help_html: å¦‚æžœä½ ä¸æ…Žä¸¢å¤±äº†æ‰€æœ‰çš„ä»£ç ï¼Œè¯·è”ç³» %{email} å¯»æ±‚å¸®åŠ©
@@ -1316,3 +1398,20 @@ zh-CN:
   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}
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 4dcdee999daaa5c1a4c3f7cf3012e575ad5a9c88..9fcee79f1130763116e9a7266350117763eee449 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1,120 +1,136 @@
 ---
 zh-HK:
   about:
-    about_hashtag_html: é€™äº›æ˜¯åŒ…å«ã€Œ<strong>#%{hashtag}</strong>ã€æ¨™ç±¤çš„å…¬é–‹æ–‡ç« ã€‚åªè¦ä½ æœ‰ä»»ä½• Mastodon æœå‹™ç«™ã€æˆ–è€…è¯ç›Ÿç¶²ç«™çš„ç”¨æˆ¶ï¼Œä¾¿å¯ä»¥èˆ‡ä»–å€‘äº’å‹•ã€‚
-    about_mastodon_html: Mastodonï¼ˆè¬è±¡ï¼‰æ˜¯<em>è‡ªç”±ã€é–‹æº</em>çš„ç¤¾äº¤ç¶²çµ¡ã€‚æœå‹™ç«™<em>å„è‡ªç¨ç«‹è€Œäº’é€£</em>ï¼Œé¿å…å–®ä¸€å•†æ¥æ©Ÿæ§‹å£Ÿæ–·ã€‚æ‰¾ä½ æ‰€ä¿¡ä»»çš„æœå‹™ç«™ï¼Œå»ºç«‹å¸³è™Ÿï¼Œä½ å³å¯èˆ‡ä»»ä½•æœå‹™ç«™ä¸Šçš„ç”¨æˆ¶æºé€šï¼Œäº«å—ç„¡ç¸«çš„<em>ç¶²çµ¡äº¤æµ</em>ã€‚
+    about_hashtag_html: é€™äº›æ˜¯åŒ…å«ã€Œ<strong>#%{hashtag}</strong>ã€æ¨™ç±¤çš„å…¬é–‹æ–‡ç« ã€‚åªè¦ä½ æ˜¯ä»»ä½•è¯ç›Ÿç¶²ç«™çš„ç”¨æˆ¶ï¼Œä¾¿å¯ä»¥èˆ‡ä»–å€‘äº’å‹•ã€‚
+    about_mastodon_html: Mastodonï¼ˆè¬è±¡ï¼‰æ˜¯å±¬æ–¼æœªä¾†çš„ç¤¾äº¤ç¶²çµ¡ï¸°ç„¡å»£å‘Šç…©æ“¾ã€ç„¡ä¼æ¥ç›£æŽ§ã€è¨è¨ˆè¬›é“ç¾©ã€åˆ†æ•£ç„¡å¤§å°ï¼ç«‹å³é‡å¥ªå€‹äººè³‡æ–™çš„æŽ§åˆ¶æ¬Šï¼Œä½¿ç”¨ Mastodon å§ï¼
     about_this: é—œæ–¼æœ¬æœå‹™ç«™
     active_count_after: æ´»èº
     active_footnote: æ¯æœˆæ´»èºä½¿ç”¨è€… (MAU)
     administered_by: ç®¡ç†è€…ï¼š
     api: API
-    apps: è¡Œå‹•æ‡‰ç”¨ç¨‹å¼
+    apps: æ‰‹æ©Ÿ App
     apps_platforms: åœ¨ iOSã€Android å’Œå…¶ä»–å¹³å°ä½¿ç”¨ Mastodon
     browse_directory: ä¾èˆˆè¶£ç€è¦½å€‹äººè³‡æ–™ç›®éŒ„å’ŒéŽæ¿¾å™¨
-    browse_local_posts: ç€è¦½é€™å°ä¼ºæœå™¨ä¸å…¬é–‹å˜Ÿæ–‡çš„ç›´æ’ä¸²æµ
-    browse_public_posts: åœ¨ Mastodon ç€è¦½å…¬é–‹å˜Ÿæ–‡çš„å³æ™‚ä¸²æµ
+    browse_local_posts: ç€è¦½é€™å€‹ä¼ºæœå™¨çš„å…¬é–‹æ–‡ç« å³æ™‚ä¸²æµ
+    browse_public_posts: åœ¨ Mastodon ç€è¦½å…¬é–‹æ–‡ç« çš„å³æ™‚ä¸²æµ
     contact: è¯çµ¡
     contact_missing: æœªè¨å®š
-    contact_unavailable: æœªå…¬é–‹
+    contact_unavailable: ä¸é©ç”¨
     discover_users: æŽ¢ç´¢ä½¿ç”¨è€…
-    documentation: æ–‡ä»¶
-    federation_hint_html: ä½ åªéœ€è¦æ“æœ‰ %{instance} çš„å¸³æˆ¶ï¼Œå°±å¯ä»¥è¿½è¹¤éš¨ä¾¿ä¸€å° Mastodon ä¼ºæœå™¨ä¸Šçš„äººç‰ç‰ã€‚
-    get_apps: å˜—è©¦è¡Œå‹•æ‡‰ç”¨ç¨‹å¼
-    hosted_on: åœ¨ %{domain} é‹ä½œçš„ Mastodon æœå‹™ç«™
+    documentation: èªªæ˜Žæ–‡ä»¶
+    federation_hint_html: ä½ åªéœ€è¦æ“æœ‰ %{instance} çš„å¸³æˆ¶ï¼Œå°±å¯ä»¥è¿½è¹¤ä»»ä½• Mastodon æœå‹™ç«™ä¸Šçš„äººï¼
+    get_apps: å˜—è©¦ä½¿ç”¨æ‰‹æ©Ÿ App
+    hosted_on: åœ¨ %{domain} é‹ä½œçš„ Mastodon ä¼ºæœå™¨
+    instance_actor_flash: |
+      é€™å€‹å¸³æˆ¶æ˜¯ä»£è¡¨ä¼ºæœå™¨ï¼Œè€Œéžä»£è¡¨ä»»ä½•å€‹äººç”¨æˆ¶çš„è™›æ“¬å¸³è™Ÿã€‚
+      æ¤å¸³æˆ¶æ˜¯ç‚ºè¯ç›Ÿå”å®šè€Œè¨ã€‚é™¤éžä½ æƒ³å°éŽ–æ•´å€‹ä¼ºæœå™¨çš„è©±ï¼Œå¦å‰‡è«‹ä¸è¦å°éŽ–é€™å€‹å¸³æˆ¶ã€‚å¦‚æžœä½ æƒ³å°éŽ–ä¼ºæœå™¨ï¼Œè«‹ä½¿ç”¨ç¶²åŸŸå°éŽ–ä»¥é”åˆ°ç›¸åŒæ•ˆæžœã€‚
     learn_more: äº†è§£æ›´å¤š
     privacy_policy: éš±ç§æ¬Šæ”¿ç–
     see_whats_happening: çœ‹çœ‹ç™¼ç”Ÿä»€éº¼äº‹
     server_stats: ä¼ºæœå™¨çµ±è¨ˆï¼š
     source_code: æºä»£ç¢¼
     status_count_after:
-      other: æ¢å˜Ÿæ–‡
-    status_count_before: ä»–å€‘å…±ç™¼ä½ˆäº†
+      other: ç¯‡æ–‡ç« 
+    status_count_before: å…±ç™¼ä½ˆäº†
     tagline: é—œæ³¨æœ‹å‹ä¸¦æŽ¢ç´¢æ–°æœ‹å‹
     terms: ä½¿ç”¨æ¢æ¬¾
-    unavailable_content: ç„¡æ³•å–å¾—çš„å…§å®¹
+    unavailable_content: å—é™åˆ¶çš„ä¼ºæœå™¨
     unavailable_content_description:
       domain: ä¼ºæœå™¨
       reason: åŽŸå› 
-      rejecting_media: ä¸æœƒè™•ç†æˆ–å„²å˜é€™äº›ä¼ºæœå™¨çš„åª’é«”æª”æ¡ˆï¼Œä¹Ÿä¸æœƒé¡¯ç¤ºç¸®åœ–ï¼Œéœ€è¦æ‰‹å‹•é»žé¸åŽŸå§‹æª”ï¼š
-      rejecting_media_title: éŽæ¿¾çš„åª’é«”
-      silenced_title: éœéŸ³çš„ä¼ºæœå™¨
-      suspended_title: æš«åœçš„ä¼ºæœå™¨
+      rejecting_media: é€™äº›ä¼ºæœå™¨çš„åª’é«”æª”æ¡ˆå°‡ä¸æœƒè¢«è™•ç†æˆ–å„²å˜ï¼Œæˆ‘å€‘äº¦ä¸æœƒå±•ç¤ºå…¶ç¸®åœ–ã€‚è«‹æ‰‹å‹•é»žæ“Šä»¥è§€çœ‹åŽŸå§‹æª”ï¼š
+      rejecting_media_title: è¢«ç¯©é¸çš„åª’é«”æª”æ¡ˆ
+      silenced: é™¤éžä½ å·²ç¶“é—œæ³¨å€‹åˆ¥ä½¿ç”¨è€…ï¼Œå¦å‰‡ä¾†è‡ªé€™äº›ä¼ºæœå™¨çš„æ–‡ç« å’Œé€šçŸ¥å°‡æœƒè¢«éš±è—ã€‚
+      silenced_title: å·²éœéŸ³çš„ä¼ºæœå™¨
+      suspended: ä¾†è‡ªé€™äº›ä¼ºæœå™¨çš„æ‰€æœ‰æ•¸æ“šå°‡ä¸æœƒè¢«è™•ç†ã€‚ä½ å°‡ä¸å¯èƒ½è¯çµ¡ä¾†è‡ªé€™äº›ä¼ºæœå™¨çš„ä½¿ç”¨è€…ã€‚
+      suspended_title: å·²åœæ¬Šçš„ä¼ºæœå™¨
+    unavailable_content_html: Mastodon é€šå¸¸è®“ä½ ç€è¦½å…¶ä»–ç¤¾äº¤è¯ç›Ÿç¶²ç«™çš„æ‰€æœ‰å…§å®¹ï¼Œä½†æ˜¯å°æ–¼é€™å€‹ç‰¹å®šç¶²ç«™ï¼Œæœ‰é€™äº›ç‰¹åˆ¥çš„ä¾‹å¤–è¦å‰‡ã€‚
     user_count_after:
       other: ä½ä½¿ç”¨è€…
-    user_count_before: é€™è£å…±è¨»å†Šæœ‰
-    what_is_mastodon: Mastodon æ˜¯ç”šéº¼ï¼Ÿ
+    user_count_before: æœ¬ç«™å…±æœ‰
+    what_is_mastodon: Mastodon ï¼ˆè¬è±¡ï¼‰æ˜¯ç”šéº¼ï¼Ÿ
   accounts:
     choices_html: "%{name} çš„é¸æ“‡ï¼š"
+    endorsements_hint: ä½ å¯ä»¥æŽ¨è–¦æ£åœ¨é—œæ³¨çš„äººï¼Œä»–å€‘æœƒè¢«é¡¯ç¤ºåœ¨ä½ çš„å€‹äººé é¢ã€‚
+    featured_tags_hint: ä½ å¯ä»¥æŽ¨è–¦ä¸åŒæ¨™ç±¤ï¼Œå®ƒå€‘ä¹Ÿæœƒåœ¨æ¤è™•å‡ºç¾ã€‚
     follow: é—œæ³¨
     followers:
       other: é—œæ³¨è€…
     following: æ£åœ¨é—œæ³¨
-    joined: åŠ å…¥æ–¼ %{date}
+    instance_actor_flash: é€™å€‹å¸³æˆ¶æ˜¯çµç›Ÿç”¨çš„æœ¬ä¼ºæœå™¨çš„è™›æ“¬è±¡å¾µï¼Œä¸¦ä¸ä»£è¡¨ä»»ä½•å€‹åˆ¥ç”¨æˆ¶ã€‚è«‹ä¸è¦æŠŠå¸³è™Ÿåœæ¬Šã€‚
+    joined: æ–¼ %{date} åŠ å…¥
     last_active: ä¸Šæ¬¡æ´»èºæ™‚é–“
     link_verified_on: æ¤é€£çµçš„æ‰€æœ‰æ¬Šå·²åœ¨ %{date} æª¢æŸ¥éŽ
     media: åª’é«”
     moved_html: "%{name} å·²ç¶“è½‰ç§»åˆ° %{new_profile_link}ï¼š"
     network_hidden: æ¤ä¿¡æ¯ä¸å¯ç”¨
     never_active: æ°¸ä¸
-    nothing_here: æš«æ™‚æœªæœ‰å…§å®¹å¯ä»¥é¡¯ç¤ºã€‚
+    nothing_here: æš«æ™‚æœªæœ‰å…§å®¹å¯ä»¥é¡¯ç¤ºï¼
     people_followed_by: "%{name} é—œæ³¨çš„äºº"
     people_who_follow: é—œæ³¨ %{name} çš„äºº
+    pin_errors:
+      following: ä½ åªèƒ½æŽ¨è–¦ä½ æ£åœ¨é—œæ³¨çš„ä½¿ç”¨è€…ã€‚
     posts:
-      other: å˜Ÿæ–‡
-    posts_tab_heading: å˜Ÿæ–‡
-    posts_with_replies: æ–‡ç« å’Œå›žè¦†
-    reserved_username: æ¤ç”¨æˆ¶åå·²è¢«ä¿ç•™
+      other: æ–‡ç« 
+    posts_tab_heading: æ–‡ç« 
+    posts_with_replies: åŒ…å«å›žè¦†çš„æ–‡ç« 
+    reserved_username: é€™å€‹ä½¿ç”¨è€…åç¨±å·²è¢«ä¿ç•™
     roles:
       admin: ç®¡ç†å“¡
       bot: æ©Ÿæ¢°äºº
       group: ç¾¤çµ„
-      moderator: ç›£å¯Ÿå“¡
+      moderator: æ¿ä¸»
     unavailable: ç„¡æ³•å–å¾—å€‹äººæª”æ¡ˆ
     unfollow: å–æ¶ˆé—œæ³¨
   admin:
     account_actions:
       action: åŸ·è¡Œå‹•ä½œ
-      title: åœ¨ %{acct} åŸ·è¡Œç®¡ç†å“¡å‹•ä½œ
+      title: åœ¨ %{acct} åŸ·è¡Œç®¡ç†æ“ä½œ
     account_moderation_notes:
-      create: è¨˜éŒ„
-      created_msg: ç®¡ç†è¨˜éŒ„å·²æ–°å¢ž
+      create: åŠ å…¥ç®¡ç†ç´€éŒ„
+      created_msg: å·²æ–°å¢žç®¡ç†ç´€éŒ„
       delete: åˆªé™¤
-      destroyed_msg: ç®¡ç†è¨˜éŒ„å·²è¢«åˆªé™¤
+      destroyed_msg: ç®¡ç†ç´€éŒ„å·²è¢«åˆªé™¤
     accounts:
-      add_email_domain_block: å°‡é›»åéƒµä»¶ç¶²åŸŸåŠ å…¥é»‘åå–®
+      add_email_domain_block: å°éŽ–é›»éƒµç¶²åŸŸ
       approve: æ ¸å‡†
       approve_all: å…¨éƒ¨æ‰¹å‡†
+      approved_msg: æˆåŠŸå¯©æ ¸äº†%{username} çš„æ–°å¸³è™Ÿç”³è«‹
       are_you_sure: ä½ ç¢ºå®šå—Žï¼Ÿ
       avatar: é åƒ
       by_domain: åŸŸå
       change_email:
         changed_msg: å¸³è™Ÿé›»éƒµæ›´æ–°æˆåŠŸï¼
         current_email: ç¾æ™‚é›»éƒµ
-        label: æ”¹è®Šé›»éƒµ
+        label: æ›´æ”¹é›»éƒµ
         new_email: æ–°çš„é›»éƒµ
         submit: æ”¹è®Šé›»éƒµ
         title: æ”¹è®Š %{username} çš„é›»éƒµ
       confirm: ç¢ºå®š
       confirmed: å·²ç¢ºå®š
       confirming: ç¢ºå®š
+      delete: åˆªé™¤è³‡æ–™
       deleted: å·²åˆªé™¤
-      demote: é™ä»»
+      demote: é™æ¬Š
+      destroyed_msg: å³å°‡åˆªé™¤ %{username} çš„æ•¸æ“š
       disable: åœç”¨
-      disable_two_factor_authentication: åœç”¨é›™é‡èªè‰
-      disabled: å·²åœç”¨
+      disable_two_factor_authentication: é—œé–‰é›™é‡èªè‰
+      disabled: å·²å‡çµ
       display_name: é¡¯ç¤ºåç¨±
       domain: åŸŸå
       edit: ç·¨è¼¯
       email: é›»éƒµåœ°å€
-      email_status: ç”µåé‚®ä»¶çŠ¶æ€
-      enable: å•Ÿç”¨
+      email_status: é›»éƒµç‹€æ…‹
+      enable: è§£é™¤å‡çµ
       enabled: å·²å•Ÿç”¨
+      enabled_msg: æˆåŠŸè§£é™¤ %{username} å¸³è™Ÿçš„å‡çµ
       followers: é—œæ³¨è€…
       follows: æ£åœ¨é—œæ³¨
-      header: é–‹é 
+      header: å€‹äººè³‡æ–™é é ‚åœ–ç‰‡
       inbox_url: æ”¶ä»¶ç®±ï¼ˆInboxï¼‰URL
+      invite_request_text: åŠ å…¥çš„åŽŸå› 
       invited_by: é‚€è«‹è€…
-      ip: IP ä½åŸŸ
+      ip: IP ä½å€
       joined: å·²åŠ å…¥
       location:
         all: å…¨éƒ¨
@@ -124,125 +140,179 @@ zh-HK:
       login_status: ç™»å…¥ç‹€æ…‹
       media_attachments: åª’é«”æª”æ¡ˆ
       memorialize: è¨å®šç‚ºè¿½æ‚¼å¸³æˆ¶
+      memorialized: è¢«æ‚¼å¿µçš„
+      memorialized_msg: æˆåŠŸå°‡%{username} çš„å¸³è™Ÿè®Šç‚ºç´€å¿µå¸³è™Ÿ
       moderation:
         active: æ´»èº
         all: å…¨éƒ¨
-        pending: ç‰å¾…ä¸
+        pending: è™•ç†ä¸
         silenced: è¢«éœéŸ³çš„
-        suspended: è¢«åœæ¬Šçš„
+        suspended: å·²åœæ¬Š
         title: ç®¡ç†æ“ä½œ
-      moderation_notes: ç®¡ç†è¨˜éŒ„
-      most_recent_activity: æœ€æ–°æ´»å‹•
-      most_recent_ip: æœ€æ–° IP ä½åŸŸ
-      no_account_selected: æœªé¸å–ä»»ä½•å¸³è™Ÿï¼Œå› æ¤æœªè®Šæ›´
+      moderation_notes: ç®¡ç†å‚™è¨»
+      most_recent_activity: æœ€è¿‘æ´»å‹•
+      most_recent_ip: æœ€è¿‘çš„ IP ä½å€
+      no_account_selected: å› æœªé¸æ“‡å¸³è™Ÿè€Œæœªæœ‰ä»»ä½•è®Šæ›´
       no_limits_imposed: æœªå—é™åˆ¶
       not_subscribed: æœªè¨‚é–±
       pending: ç‰å¾…å¯©æ ¸ä¸
-      perform_full_suspension: å®Œå…¨åœæ¬Š
-      promote: å‡ä»»
+      perform_full_suspension: å·²åœæ¬Š
+      promote: æå‡æ¬Šé™
       protocol: å”è°
-      public: å…¬å…±
+      public: å…¬é–‹
       push_subscription_expires: PuSH è¨‚é–±éŽæœŸ
-      redownload: æ›´æ–°é åƒ
+      redownload: æ›´æ–°é é¢
+      redownloaded_msg: æˆåŠŸé‡æ–°è¼‰å…¥ %{username} çš„å€‹äººè³‡æ–™é é¢
       reject: æ‹’çµ•
       reject_all: å…¨éƒ¨æ‹’çµ•
-      remove_avatar: å–æ¶ˆé åƒ
-      remove_header: ç§»é™¤é–‹é 
+      rejected_msg: æˆåŠŸæ‹’çµ•äº† %{username} çš„æ–°å¸³è™Ÿç”³è«‹
+      remove_avatar: åˆªé™¤é åƒ
+      remove_header: ç§»é™¤é é¢é ‚ç«¯
+      removed_avatar_msg: æˆåŠŸåˆªé™¤ %{username} çš„é åƒ
+      removed_header_msg: æˆåŠŸåˆªé™¤ %{username} çš„é é¢é ‚ç«¯åœ–ç‰‡
       resend_confirmation:
-        already_confirmed: è¯¥ç”¨æˆ·å·²è¢«ç¡®è®¤
-        send: é‡å‘ç¡®è®¤é‚®ä»¶
-        success: ç¡®è®¤ç”µåé‚®ä»¶æˆåŠŸå‘é€ï¼
+        already_confirmed: é€™å€‹ä½¿ç”¨è€…å…ˆå‰å·²ç¶“è¢«ç¢ºèªéŽ
+        send: é‡å¯„ç¢ºèªéƒµä»¶
+        success: ç¢ºèªé›»éƒµç™¼é€æˆåŠŸï¼
       reset: é‡è¨
       reset_password: é‡è¨å¯†ç¢¼
       resubscribe: é‡æ–°è¨‚é–±
-      role: èº«ä»½
+      role: æ¬Šé™
       roles:
         admin: ç®¡ç†å“¡
-        moderator: ç›£å¯Ÿå“¡
-        staff: ç®¡ç†äººå“¡
-        user: æ™®é€šç”¨æˆ¶
-      search: æœç´¢
-      search_same_email_domain: å…¶ä»–æœ‰åŒå€‹é›»åéƒµä»¶ç¶²åŸŸçš„ä½¿ç”¨è€…
-      search_same_ip: å…¶ä»–æœ‰åŒå€‹ IP çš„ä½¿ç”¨è€…
+        moderator: ç®¡ç†å“¡
+        staff: å·¥ä½œäººå“¡
+        user: æ™®é€šä½¿ç”¨è€…
+      search: æœå°‹
+      search_same_email_domain: å…¶ä»–æœ‰ç›¸åŒé›»éƒµç¶²åŸŸçš„ä½¿ç”¨è€…
+      search_same_ip: å…¶ä»–æœ‰ç›¸åŒ IP ä½å€çš„ä½¿ç”¨è€…
+      sensitive: æ•æ„Ÿå†…å®¹
+      sensitized: å·²æ¨™è¨˜ç‚ºæ•æ„Ÿå…§å®¹
       shared_inbox_url: å…¬å…±æ”¶ä»¶ç®±ï¼ˆShared Inboxï¼‰URL
       show:
-        created_reports: æ¤ç”¨æˆ¶æ‰€æèˆ‰å ±çš„ç´€éŒ„
-        targeted_reports: æ¤ç”¨æˆ¶è¢«èˆ‰å ±çš„ç´€éŒ„
+        created_reports: èˆ‰å ±ç´€éŒ„
+        targeted_reports: è¢«å…¶ä»–äººèˆ‰å ±çš„ç´€éŒ„
       silence: éœéŸ³
       silenced: å·²éœéŸ³
       statuses: æ–‡ç« 
       subscribe: è¨‚é–±
       suspended: å·²åœæ¬Š
-      time_in_queue: æ£åœ¨ä½‡åˆ—ç‰å¾… %{time}
-      title: ç”¨æˆ¶
+      suspension_irreversible: å·²æ°¸ä¹…åˆªé™¤æ¤å¸³è™Ÿçš„æ•¸æ“šã€‚ä½ å¯ä»¥å–æ¶ˆæ¤å¸³è™Ÿçš„åœæ¬Šç‹€æ…‹ï¼Œä½†å¸³è™Ÿçš„è³‡æ–™å·²è¢«æ°¸ä¹…åˆªé™¤ã€‚
+      suspension_reversible_hint_html: æ¤å¸³æˆ¶å·²è¢«åœæ¬ŠåŠæ‰€æœ‰æ•¸æ“šå°‡æœƒæ–¼ %{date} è¢«åˆªé™¤ã€‚åœ¨æ¤ä¹‹å‰ï¼Œä½ ä»å¯ä»¥å®Œå…¨å›žå¾©å¸³è™Ÿã€‚å¦‚æžœä½ æƒ³å³æ™‚åˆªé™¤æ¤å¸³æˆ¶çš„è³‡æ–™ï¼Œå¯ä»¥åœ¨ä¸‹é¢é€²è¡Œæ“ä½œã€‚
+      time_in_queue: æŽ’éšŠä¸ %{time}
+      title: å¸³è™Ÿ
       unconfirmed_email: æœªç¢ºèªçš„é›»éƒµ
+      undo_sensitized: å–æ¶ˆæ•æ„Ÿç‹€æ…‹
       undo_silenced: è§£é™¤éœéŸ³
       undo_suspension: è§£é™¤åœæ¬Š
+      unsilenced_msg: æˆåŠŸå–æ¶ˆå° %{username} å¸³è™Ÿçš„é™åˆ¶
       unsubscribe: å–æ¶ˆè¨‚é–±
-      username: ç”¨æˆ¶åç¨±
+      unsuspended_msg: æˆåŠŸå–æ¶ˆå° %{username} å¸³è™Ÿçš„åœæ¬Šæ“ä½œ
+      username: ä½¿ç”¨è€…åç¨±
+      view_domain: æŸ¥çœ‹åŸŸåæ¦‚è¦
       warn: è¦å‘Š
-      web: ç”¨æˆ¶é é¢
-      whitelisted: å·²åŠ å…¥ç™½åå–®
+      web: é é¢
+      whitelisted: å®¹è¨±äº’å‚³æ–‡ç« 
     action_logs:
       action_types:
-        assigned_to_self_report: æŒ‡æ´¾å›žå ±
-        change_email_user: è®Šæ›´ä½¿ç”¨è€…çš„é›»åä¿¡ç®±ä½å€
+        assigned_to_self_report: æŒ‡æ´¾èˆ‰å ±
+        change_email_user: æ›´æ”¹ä½¿ç”¨è€…çš„é›»éƒµ
         confirm_user: ç¢ºèªä½¿ç”¨è€…
-        create_account_warning: å»ºç«‹è¦å‘Š
+        create_account_warning: æ–°å¢žè¦å‘Š
         create_announcement: å»ºç«‹å…¬å‘Š
-        create_custom_emoji: å»ºç«‹è‡ªè¨‚é¡æ–‡å—
-        create_domain_allow: å»ºç«‹å…è¨±ç¶²åŸŸ
-        create_domain_block: å»ºç«‹é˜»æ“‹ç¶²åŸŸ
+        create_custom_emoji: æ–°å¢žè‡ªè¨‚çš„ Emoji
+        create_domain_allow: æ–°å¢žå…è¨±çš„åŸŸå
+        create_domain_block: å°éŽ–åŸŸå
+        create_email_domain_block: å°éŽ–é›»éƒµåŸŸå
+        create_ip_block: æ–°å¢žIPè¦å‰‡
+        demote_user: å°‡å¸³è™Ÿé™ç´š
+        destroy_announcement: åˆªé™¤å…¬å‘Š
+        destroy_custom_emoji: åˆªé™¤è‡ªå®šçš„ Emoji è¡¨æƒ…ç¬¦è™Ÿ
+        destroy_domain_allow: åˆªé™¤å…è¨±çš„åŸŸå
+        destroy_domain_block: åˆªé™¤å·²å°éŽ–çš„åŸŸå
+        destroy_email_domain_block: åˆªé™¤å·²å°éŽ–çš„é›»éƒµåŸŽå
+        destroy_ip_block: åˆªé™¤ IP è¦å‰‡
+        destroy_status: åˆªé™¤æ–‡ç« 
+        disable_2fa_user: åœç”¨å…©æ¥é©Ÿé©—è‰
+        disable_custom_emoji: åœç”¨è‡ªå®šçš„ Emoji è¡¨æƒ…ç¬¦è™Ÿ
+        disable_user: åœç”¨å¸³è™Ÿ
+        enable_custom_emoji: å•Ÿç”¨è‡ªå®šçš„ Emoji è¡¨æƒ…ç¬¦è™Ÿ
+        enable_user: å•Ÿç”¨å¸³è™Ÿ
+        memorialize_account: æŠŠå¸³è™Ÿè¨å®šç‚ºæ‚¼å¿µå¸³è™Ÿ
+        promote_user: æå‡å¸³è™Ÿæ¬Šé™
+        remove_avatar_user: åˆªé™¤é åƒ
+        reopen_report: é‡é–‹èˆ‰å ±å€‹æ¡ˆ
+        reset_password_user: é‡è¨å¯†ç¢¼
+        resolve_report: è§£æ±ºèˆ‰å ±å€‹æ¡ˆ
+        sensitive_account: æŠŠä½ çš„å¸³è™Ÿçš„åª’é«”è¨å®šç‚ºæ•æ„Ÿå…§å®¹
+        silence_account: æŠŠå¸³è™ŸéœéŸ³
+        suspend_account: æŠŠå¸³è™Ÿåœæ¬Š
+        unassigned_report: å–æ¶ˆæŒ‡æ´¾èˆ‰å ±
+        unsensitive_account: å–æ¶ˆæŠŠä½ å¸³è™Ÿçš„åª’é«”è¨å®šç‚ºæ•æ„Ÿå…§å®¹
+        unsilence_account: å–æ¶ˆå¸³è™Ÿçš„éœéŸ³ç‹€æ…‹
+        unsuspend_account: å–æ¶ˆå¸³è™Ÿçš„åœæ¬Šç‹€æ…‹
+        update_announcement: æ›´æ–°å…¬å‘Š
+        update_custom_emoji: æ›´æ–°è‡ªå®šçš„ Emoji è¡¨æƒ…ç¬¦è™Ÿ
+        update_domain_block: æ›´æ–°åŸŸåé˜»éš”
+        update_status: æ›´æ–°æ–‡ç« 
       actions:
         assigned_to_self_report: "%{name} æŒ‡æ´¾äº† %{target} çš„èˆ‰å ±çµ¦è‡ªå·±"
-        change_email_user: "%{name} æ”¹è®Šäº†ç”¨æˆ¶ %{target} çš„é›»éƒµåœ°å€"
-        confirm_user: "%{name} ç¢ºèªäº†ç”¨æˆ¶ %{target} çš„é›»éƒµåœ°å€"
-        create_account_warning: "%{name} å·²å° %{target} é€å‡ºè¦å‘Š"
-        create_announcement: "%{name} å»ºç«‹äº†æ–°å…¬å‘Š %{target}"
-        create_custom_emoji: "%{name} åŠ å…¥è‡ªè¨‚è¡¨æƒ…ç¬¦è™Ÿ %{target}"
-        create_domain_allow: "%{name} å°‡ %{target} ç¶²åŸŸåŠ å…¥é»‘åå–®äº†"
-        create_domain_block: "%{name} é˜»éš”äº†ç¶²åŸŸ %{target}"
-        create_email_domain_block: "%{name} é˜»éš”äº†é›»éƒµç¶²åŸŸ %{target}"
-        demote_user: "%{name} æŠŠç”¨æˆ¶ %{target} é™ä»»"
+        change_email_user: "%{name} æ”¹è®Šäº†ä½¿ç”¨è€… %{target} çš„é›»éƒµåœ°å€"
+        confirm_user: "%{name} ç¢ºèªäº†ä½¿ç”¨è€… %{target} çš„é›»éƒµåœ°å€"
+        create_account_warning: "%{name} å·²è¦å‘Šäº† %{target}"
+        create_announcement: "%{name} æ–°å¢žäº†å…¬å‘Š %{target}"
+        create_custom_emoji: "%{name} åŠ å…¥äº†æ–°çš„ Emoji %{target}"
+        create_domain_allow: "%{name} å’Œ %{target} ç¶²åŸŸçµç›Ÿäº†"
+        create_domain_block: "%{name} å°éŽ–äº†ç¶²åŸŸ %{target}"
+        create_email_domain_block: "%{name} å°éŽ–äº†é›»éƒµç¶²åŸŸ %{target}"
+        create_ip_block: "%{name} å·²ç¶“è¨å®šäº†é‡å° IP %{target} çš„è¦å‰‡"
+        demote_user: "%{name} æŠŠä½¿ç”¨è€… %{target} é™æ¬Š"
         destroy_announcement: "%{name} åˆªé™¤äº†å…¬å‘Š %{target}"
-        destroy_custom_emoji: "%{name} ç ´å£žäº† %{target} è¡¨æƒ…ç¬¦è™Ÿ"
-        destroy_domain_allow: "%{name} å¾žç™½åå–®ä¸ç§»é™¤äº† %{target} ç¶²åŸŸ"
-        destroy_domain_block: "%{name} å–æ¶ˆäº†å°ç¶²åŸŸ %{target} çš„é˜»éš”"
-        destroy_email_domain_block: "%{name} å–æ¶ˆäº†å°é›»éƒµç¶²åŸŸ %{target} çš„é˜»éš”"
+        destroy_custom_emoji: "%{name} åˆªé™¤äº† Emoji %{target}"
+        destroy_domain_allow: "%{name} ç¦æ¢äº†èˆ‡ %{target} ç¶²åŸŸé€²è¡Œè¨Šæ¯è¯ç¶²"
+        destroy_domain_block: "%{name} å–æ¶ˆäº†å°ç¶²åŸŸ %{target} çš„å°éŽ–"
+        destroy_email_domain_block: "%{name} å–æ¶ˆäº†å°é›»éƒµç¶²åŸŸ %{target} çš„å°éŽ–"
+        destroy_ip_block: "%{name} å·²ç¶“åˆªé™¤äº† IP %{target} çš„è¦å‰‡"
         destroy_status: "%{name} åˆªé™¤äº† %{target} çš„æ–‡ç« "
-        disable_2fa_user: "%{name} åœç”¨äº†ç”¨æˆ¶ %{target} çš„é›™é‡èªè‰"
-        disable_custom_emoji: "%{name} åœç”¨äº†è‡ªè¨‚è¡¨æƒ…ç¬¦è™Ÿ %{target}"
-        disable_user: "%{name} æŠŠç”¨æˆ¶ %{target} è¨å®šç‚ºç¦æ¢ç™»å…¥"
-        enable_custom_emoji: "%{name} å•Ÿç”¨äº†è‡ªè¨‚è¡¨æƒ…ç¬¦è™Ÿ %{target}"
-        enable_user: "%{name} æŠŠç”¨æˆ¶ %{target} è¨å®šç‚ºå…è¨±ç™»å…¥"
+        disable_2fa_user: "%{name} åœç”¨äº†ä½¿ç”¨è€… %{target} çš„é›™é‡èªè‰"
+        disable_custom_emoji: "%{name} åœç”¨äº† Emoji %{target}"
+        disable_user: "%{name} æŠŠä½¿ç”¨è€… %{target} è¨å®šç‚ºç¦æ¢ç™»å…¥"
+        enable_custom_emoji: "%{name} å•Ÿç”¨äº† Emoji %{target}"
+        enable_user: "%{name} æŠŠä½¿ç”¨è€… %{target} è¨å®šç‚ºå…è¨±ç™»å…¥"
         memorialize_account: "%{name} æŠŠ %{target} è¨å®šç‚ºè¿½æ‚¼å¸³æˆ¶"
-        promote_user: "%{name} å°ç”¨æˆ¶ %{target} è¿›è¡Œäº†å‡ä»»æ“ä½œ"
+        promote_user: "%{name} å°æå‡äº†ä½¿ç”¨è€… %{target} çš„æ¬Šé™"
         remove_avatar_user: "%{name} å–æ¶ˆäº† %{target} çš„é åƒ"
-        reopen_report: "%{name} é‡é–‹ %{target} çš„èˆ‰å ±"
-        reset_password_user: "%{name} é‡è¨äº†ç”¨æˆ¶ %{target} çš„å¯†ç¢¼"
-        resolve_report: "%{name} è™•ç†äº† %{target}ã€€çš„èˆ‰å ±"
-        silence_account: "%{name} éœéŸ³äº†ç”¨æˆ¶ %{target}"
-        suspend_account: "%{name} åœæ¬Šäº†ç”¨æˆ¶ %{target}"
+        reopen_report: "%{name} é‡é–‹ %{target} çš„èˆ‰å ±å€‹æ¡ˆ"
+        reset_password_user: "%{name} é‡è¨äº†ä½¿ç”¨è€… %{target} çš„å¯†ç¢¼"
+        resolve_report: "%{name} è™•ç†äº† %{target} çš„èˆ‰å ±å€‹æ¡ˆ"
+        sensitive_account: "%{name} å°‡ %{target} çš„åª’é«”æª”æ¡ˆåˆ—ç‚ºæ•æ„Ÿ"
+        silence_account: "%{name} éœéŸ³äº†å¸³è™Ÿ %{target}"
+        suspend_account: "%{name} å°‡å¸³è™Ÿ %{target} åœæ¬Š"
         unassigned_report: "%{name} å–æ¶ˆæŒ‡æ´¾ %{target} çš„èˆ‰å ±"
+        unsensitive_account: "%{name} å–æ¶ˆå°‡ %{target} çš„åª’é«”æª”æ¡ˆçš„è¨ç‚ºæ•æ„Ÿ"
         unsilence_account: "%{name} å–æ¶ˆäº†ç”¨æˆ¶ %{target} çš„éœéŸ³ç‹€æ…‹"
-        unsuspend_account: "%{name} å–æ¶ˆäº†ç”¨æˆ¶ %{target} çš„åœæ¬Šç‹€æ…‹"
+        unsuspend_account: "%{name} å–æ¶ˆäº†å¸³è™Ÿ %{target} çš„åœæ¬Šç‹€æ…‹"
         update_announcement: "%{name} æ›´æ–°äº†å…¬å‘Š %{target}"
-        update_custom_emoji: "%{name} æ›´æ–°äº†è‡ªè¨‚è¡¨æƒ…ç¬¦è™Ÿ %{target}"
-        update_status: "%{name} åˆ·æ–°äº† %{target} çš„æ–‡ç« "
-      deleted_status: "ï¼ˆå·²åˆªé™¤å˜Ÿæ–‡ï¼‰"
+        update_custom_emoji: "%{name} æ›´æ–°äº† Emoji è¡¨æƒ…ç¬¦è™Ÿ %{target}"
+        update_domain_block: "%{name} æ›´æ–°äº†å° %{target} çš„åŸŸåé˜»éš”"
+        update_status: "%{name} æ›´æ–°äº† %{target} çš„æ–‡ç« "
+      deleted_status: "ï¼ˆå·²åˆªé™¤æ–‡ç« ï¼‰"
+      empty: æ‰¾ä¸åˆ°ä»»ä½•æ—¥èªŒã€‚
+      filter_by_action: æŒ‰å‹•ä½œç¯©é¸
+      filter_by_user: æŒ‰å¸³è™Ÿç¯©é¸
       title: ç‡Ÿé‹æ—¥èªŒ
     announcements:
       destroyed_msg: æˆåŠŸåˆªé™¤å…¬å‘Šï¼
       edit:
         title: ç·¨è¼¯å…¬å‘Š
       empty: æ‰¾ä¸åˆ°å…¬å‘Šã€‚
-      live: ç›´æ’
+      live: åœ¨ç·š
       new:
         create: å»ºç«‹å…¬å‘Š
         title: æ–°å¢žå…¬å‘Š
       published_msg: æˆåŠŸç™¼å¸ƒå…¬å‘Šï¼
       scheduled_for: æŽ’å®š %{time}
-      scheduled_msg: å…¬å‘Šå·²æŽ’å®šå…¬é–‹ï¼
+      scheduled_msg: å…¬å‘Šå·²æŽ’ç¨‹ï¼
       title: å…¬å‘Š
       unpublished_msg: æˆåŠŸå–æ¶ˆç™¼å¸ƒå…¬å‘Šï¼
       updated_msg: æˆåŠŸæ›´æ–°å…¬å‘Šï¼
@@ -251,7 +321,7 @@ zh-HK:
       by_domain: ç¶²åŸŸ
       copied_msg: æˆåŠŸå°‡è¡¨æƒ…è¤‡è£½åˆ°æœ¬åœ°
       copy: è¤‡è£½
-      copy_failed_msg: ç„¡æ³•å°‡è¡¨æƒ…è¤‡è£½åˆ°æœ¬åœ°
+      copy_failed_msg: ç„¡æ³•å°‡è¡¨æƒ…ç¬¦è™Ÿè¤‡è£½åˆ°æœ¬åœ°
       create_new_category: å»ºç«‹æ–°åˆ†é¡ž
       created_msg: å·²æ–°å¢žè¡¨æƒ…ç¬¦è™Ÿ
       delete: åˆªé™¤
@@ -259,20 +329,22 @@ zh-HK:
       disable: åœç”¨
       disabled: å·²åœç”¨
       disabled_msg: å·²åœç”¨è¡¨æƒ…ç¬¦è™Ÿ
-      emoji: emoji
+      emoji: Emoji è¡¨æƒ…ç¬¦è™Ÿ
       enable: å•Ÿç”¨
       enabled: å·²å•Ÿç”¨
       enabled_msg: å·²å•Ÿç”¨è¡¨æƒ…ç¬¦è™Ÿ
       image_hint: PNG æ ¼å¼ï¼Œæœ€å¤§ 50KB
-      list: åˆ—è¡¨
-      listed: å·²é¡¯ç¤º
+      list: åˆ—å‡º
+      listed: å·²åˆ—å‡º
       new:
-        title: åŠ å…¥æ–°çš„è‡ªè¨‚è¡¨æƒ…ç¬¦è™Ÿ
+        title: åŠ å…¥æ–°çš„è‡ªè¨‚ Emoji è¡¨æƒ…ç¬¦è™Ÿ
+      not_permitted: ä½ ç„¡æ¬ŠåŸ·è¡Œæ¤æ“ä½œ
       overwrite: è¦†è“‹
       shortcode: çŸä»£ç¢¼
       shortcode_hint: è‡³å°‘ 2 å€‹å—å…ƒï¼Œåªèƒ½ä½¿ç”¨å—æ¯ã€æ•¸å—å’Œä¸‹åŠƒç·š
-      title: è‡ªè¨‚ emoji
+      title: è‡ªè¨‚ Emoji è¡¨æƒ…ç¬¦è™Ÿ
       uncategorized: æœªåˆ†é¡ž
+      unlist: éš±è—
       unlisted: å·²éš±è—
       update_failed_msg: ç„¡æ³•æ›´æ–°è¡¨æƒ…ç¬¦è™Ÿ
       updated_msg: å·²æ›´æ–°è¡¨æƒ…ç¬¦è™Ÿ
@@ -281,26 +353,26 @@ zh-HK:
       authorized_fetch_mode: å®‰å…¨æ¨¡å¼
       backlog: æœªè™•ç†å·¥ä½œæ•¸
       config: è¨å®š
-      feature_deletions: å¸³æˆ¶åˆªé™¤
+      feature_deletions: åˆªé™¤å¸³è™ŸåŠŸèƒ½
       feature_invites: é‚€è«‹é€£çµ
       feature_profile_directory: å€‹äººè³‡æ–™ç›®éŒ„
       feature_registrations: è¨»å†Š
-      feature_relay: è¯é‚¦ä¸ç¹¼ç«™
+      feature_relay: è¯ç¶²ä¸ç¹¼ç«™
       feature_spam_check: é˜²åžƒåœ¾è¨Šæ¯
       feature_timeline_preview: æ™‚é–“è»¸é è¦½
       features: åŠŸèƒ½
       hidden_service: èˆ‡éš±å¯†æœå‹™äº’é€£
-      open_reports: å¾…è™•ç†æª¢èˆ‰æ•¸
+      open_reports: æœªè™•ç†çš„èˆ‰å ±å€‹æ¡ˆæ•¸
       pending_tags: ç‰å¾…å¯©æ ¸çš„ä¸»é¡Œæ¨™ç±¤
       pending_users: ç‰å¾…å¯©æ ¸çš„ä½¿ç”¨è€…
       recent_users: æœ€è¿‘åŠ å…¥çš„ä½¿ç”¨è€…
       search: å…¨æ–‡æœå°‹
       single_user_mode: å–®ä¸€ä½¿ç”¨è€…æ¨¡å¼
-      software: è»Ÿé«”
+      software: è»Ÿä»¶
       space: å„²å˜ç©ºé–“ç”¨é‡
       title: å„€è¡¨æ¿
       total_users: ç¸½ä½¿ç”¨è€…æ•¸
-      trends: è¶¨å‹¢
+      trends: è¿‘æœŸæµè¡Œ
       week_interactions: æœ¬é€±äº’å‹•æ¬¡æ•¸
       week_users_active: æœ¬é€±æ´»èºä½¿ç”¨è€…æ•¸
       week_users_new: æœ¬é€±æ–°ä½¿ç”¨è€…æ•¸
@@ -311,22 +383,30 @@ zh-HK:
       destroyed_msg: ç¶²åŸŸå·²æˆåŠŸå¾žç™½åå–®ç§»é™¤
       undo: å¾žç™½åå–®ç§»é™¤
     domain_blocks:
-      add_new: æ–°å¢ž
-      created_msg: æ£è™•ç†åŸŸåé˜»éš”
+      add_new: æ–°å¢žåŸŸåé˜»éš”è¦å‰‡
+      created_msg: æ£è™•ç†é˜»éš”åŸŸåçš„è«‹æ±‚
       destroyed_msg: å·²æ’¤éŠ·åŸŸåé˜»éš”
       domain: åŸŸåé˜»éš”
+      edit: æ›´æ”¹åŸŸåé˜»éš”
+      existing_domain_block_html: ä½ å·²ç¶“å° %{name} æ–½åŠ äº†æ›´åš´æ ¼çš„é™åˆ¶ï¼Œä½ éœ€è¦å…ˆå°ä»–<a href="%{unblock_url}">å–æ¶ˆå°éŽ–</a>ã€‚
       new:
         create: æ–°å¢žåŸŸåé˜»éš”
-        hint: "ã€ŒåŸŸåé˜»éš”ã€ä¸æœƒéš”çµ•è©²åŸŸåç”¨æˆ¶çš„ç”¨æˆ¶é€²å…¥æœ¬ç«™è³‡æ–™åº«ï¼Œè€Œæ˜¯æœƒåœ¨æ™‚å€™è‡ªå‹•å¥—ç”¨ç‰¹å®šçš„å¯©æ‰¹æ“ä½œã€‚"
+        hint: "ã€ŒåŸŸåé˜»éš”ã€ä¸æœƒéš”çµ•è©²åŸŸåå¸³è™Ÿé€²å…¥æœ¬ç«™è³‡æ–™åº«ï¼Œä½†æ˜¯æœƒåœ¨ç¬¦åˆæ¢ä»¶çš„å¸³è™Ÿé€²å…¥è³‡æ–™åº«å¾Œï¼Œè‡ªå‹•å°å®ƒå€‘å¥—ç”¨ç‰¹å®šå¯©æ‰¹æ“ä½œã€‚"
         severity:
-          desc_html: "ã€Œ<strong>è‡ªå‹•éœéŸ³</strong>ã€ä»¤è©²åŸŸåä¸‹ç”¨æˆ¶çš„æ–‡ç« ï¼Œè¨ç‚ºåªå°é—œæ³¨è€…é¡¯ç¤ºï¼Œæ²’æœ‰é—œæ³¨çš„äººæœƒçœ‹ä¸åˆ°ã€‚ ã€Œ<strong>è‡ªå‹•åˆªé™¤</strong>ã€æœƒåˆªé™¤å°‡è©²åŸŸåä¸‹ç”¨æˆ¶çš„æ–‡ç« ã€åª’é«”æª”æ¡ˆå’Œå€‹äººè³‡æ–™ã€‚ã€Œ<strong>ç„¡</strong>ã€å‰‡æœƒæ‹’çµ•æŽ¥æ”¶ä¾†è‡ªè©²åŸŸåçš„åª’é«”æª”æ¡ˆã€‚"
+          desc_html: "ã€Œ<strong>è‡ªå‹•éœéŸ³</strong>ã€ä»¤è©²åŸŸåä¸‹å¸³è™Ÿçš„æ–‡ç« ï¼Œè¢«è¨ç‚ºåªå°é—œæ³¨è€…é¡¯ç¤ºï¼Œæ²’æœ‰é—œæ³¨çš„äººæœƒçœ‹ä¸åˆ°ã€‚ ã€Œ<strong>è‡ªå‹•åˆªé™¤</strong>ã€æœƒåˆªé™¤å°‡è©²åŸŸåä¸‹ç”¨æˆ¶çš„æ–‡ç« ã€åª’é«”æª”æ¡ˆå’Œå€‹äººè³‡æ–™ã€‚ã€Œ<strong>ç„¡</strong>ã€å‰‡æœƒæ‹’çµ•æŽ¥æ”¶ä¾†è‡ªè©²åŸŸåçš„åª’é«”æª”æ¡ˆã€‚"
           noop: ç„¡
           silence: è‡ªå‹•éœéŸ³
           suspend: è‡ªå‹•åˆªé™¤
         title: æ–°å¢žåŸŸåé˜»éš”
+      obfuscate: æ··æ·†åŸŸååç¨±
+      obfuscate_hint: å¦‚æžœå·²ç¶“å•Ÿç”¨äº†ç¶²åŸŸå»£å‘Šåˆ—è¡¨é™åˆ¶ï¼Œåœ¨åˆ—è¡¨éƒ¨ä»½æ··æ·†ç¶²åŸŸåç¨±
+      private_comment: ç§äººç•™è¨€
+      private_comment_hint: è«‹æä¾›æ›´å¤šæœ‰é—œæ¤åŸŸåé™åˆ¶çš„è³‡è¨Šä»¥ä¾›ç®¡ç†å“¡ä½œå…§éƒ¨åƒè€ƒã€‚
+      public_comment: å…¬é–‹ç•™è¨€
+      public_comment_hint: å¦‚æžœä½ å·²ç¶“å•Ÿç”¨åŸŸåé™åˆ¶åˆ—è¡¨çš„å…¬å‘Šï¼Œè«‹ç‚ºä¸€èˆ¬å¤§çœ¾æä¾›æ›´å¤šæœ‰é—œæ¤åŸŸåé™åˆ¶çš„è³‡è¨Šã€‚
       reject_media: æ‹’çµ•åª’é«”æª”æ¡ˆ
       reject_media_hint: åˆªé™¤æœ¬åœ°ç·©å˜çš„åª’é«”æª”æ¡ˆï¼Œå†ä¹Ÿä¸åœ¨æœªä¾†ä¸‹è¼‰é€™å€‹ç«™é»žçš„æª”æ¡ˆã€‚å’Œè‡ªå‹•åˆªé™¤ç„¡é—œ
-      reject_reports: æ‹’çµ•æª¢èˆ‰
+      reject_reports: æ‹’çµ•æª¢èˆ‰å€‹æ¡ˆ
       reject_reports_hint: å¿½ç•¥æ‰€æœ‰ä¾†è‡ªæ¤ç«™é»žçš„æª¢èˆ‰ã€‚èˆ‡åœæ¬Šç„¡é—œ
       rejecting_media: æ‹’çµ•åª’é«”æª”æ¡ˆ
       rejecting_reports: æ‹’çµ•æª¢èˆ‰ä¸
@@ -335,66 +415,120 @@ zh-HK:
         suspend: å·²åœæ¬Š
       show:
         affected_accounts:
-          other: å°‡å½±éŸ¿åˆ°è³‡æ–™åº«ä¸çš„ %{count} å€‹å¸³æˆ¶
+          other: å°‡å½±éŸ¿åˆ°è³‡æ–™åº«ä¸çš„ %{count} å€‹å¸³è™Ÿ
         retroactive:
-          silence: å°æ¤åŸŸåçš„æ‰€æœ‰ç”¨æˆ¶å–æ¶ˆéœéŸ³
-          suspend: å°æ¤åŸŸåçš„æ‰€æœ‰ç”¨æˆ¶å–æ¶ˆé™¤å
+          silence: å°æ¤åŸŸåçš„æ‰€æœ‰å¸³è™Ÿå–æ¶ˆéœéŸ³
+          suspend: å°æ¤åŸŸåçš„æ‰€æœ‰å¸³è™Ÿå–æ¶ˆé™¤å
         title: æ’¤éŠ· %{domain} çš„åŸŸåé˜»éš”
         undo: æ’¤éŠ·
-      undo: æ’¤éŠ·
+      undo: æ’¤éŠ·åŸŸåé˜»éš”
+      view: é¡¯ç¤ºæ£è¢«é˜»éš”çš„ç¶²åŸŸ
     email_domain_blocks:
-      add_new: åŠ å…¥æ–°é …ç›®
+      add_new: æ–°å¢ž
       created_msg: å·²æ–°å¢žé›»éƒµç¶²åŸŸé˜»éš”
       delete: åˆªé™¤
       destroyed_msg: å·²åˆªé™¤é›»éƒµç¶²åŸŸé˜»éš”
       domain: ç¶²åŸŸ
+      empty: ç¾æ™‚ä¸¦æ²’æœ‰é›»éƒµåŸŸåè¢«é˜»éš”ã€‚
+      from_html: ç”±%{domain}
       new:
         create: æ–°å¢žç¶²åŸŸ
         title: æ–°å¢žé›»éƒµç¶²åŸŸé˜»éš”
       title: é›»éƒµç¶²åŸŸé˜»éš”
     instances:
+      by_domain: åŸŸå
+      delivery_available: å¯å‚³é€
+      empty: æ‰¾ä¸åˆ°åŸŸåã€‚
+      known_accounts:
+        other: "%{count} å·²çŸ¥çš„å¸³è™Ÿ"
       moderation:
         all: å…¨éƒ¨
         limited: é™åˆ¶
         title: ç‰ˆä¸»
+      private_comment: ç§äººç•™è¨€
+      public_comment: å…¬é–‹ç•™è¨€
       title: å·²çŸ¥æœå‹™ç«™
-      total_followed_by_us: é–‹å§‹é—œæ³¨ä½ 
+      total_blocked_by_us: è¢«æˆ‘å€‘å°éŽ–
+      total_followed_by_them: è¢«ä»–å€‘é—œæ³¨
+      total_followed_by_us: è¢«æˆ‘å€‘é—œæ³¨
+      total_reported: é—œæ–¼ä»–å€‘çš„èˆ‰å ±
+      total_storage: åª’é«”é™„ä»¶
     invites:
+      deactivate_all: å…¨éƒ¨åœç”¨
       filter:
         all: å…¨éƒ¨
         available: å¯ç”¨
         expired: å·²å¤±æ•ˆ
         title: ç¯©é¸
-      title: é‚€è«‹ç”¨æˆ¶
+      title: é‚€è«‹
+    ip_blocks:
+      add_new: æ–°å¢žè¦å‰‡
+      created_msg: æˆåŠŸæ–°å¢ž IP è¦å‰‡
+      delete: åˆªé™¤
+      expires_in:
+        '1209600': 2 é€±
+        '15778476': 6 å€‹æœˆ
+        '2629746': 1 å€‹æœˆ
+        '31556952': 1 å¹´
+        '86400': 1 æ—¥
+        '94670856': 3 å¹´
+      new:
+        title: æ–°å¢ž IP è¦å‰‡
+      no_ip_block_selected: å› æœªé¸æ“‡ IP è¦å‰‡è€Œæœªæœ‰ä»»ä½•è®Šæ›´ã€‚
+      title: IP è¦å‰‡
+    pending_accounts:
+      title: å¾…è™•ç†å¸³æˆ¶ï¼ˆ%{count}ï¼‰
+    relationships:
+      title: "%{acct} çš„é—œä¿‚"
     relays:
-      description_html: "<strong>è¯é‚¦ä¸ç¹¼ç«™</strong> æ˜¯ç¨®ä¸ç¹¼ä¼ºæœå™¨ï¼Œæœƒåœ¨è¨‚é–±ä¸¦æŽ¨é€è‡³æ¤ä¸ç¹¼ç«™çš„ä¼ºæœå™¨ä¹‹é–“äº¤æ›å¤§é‡çš„å…¬é–‹å˜Ÿæ–‡ã€‚<strong>ä¸ç¹¼ç«™ä¹Ÿèƒ½å”åŠ©å°åž‹æˆ–ä¸åž‹ä¼ºæœå™¨å¾žè¯é‚¦ä¸æŽ¢ç´¢å…§å®¹</strong>ï¼Œè€Œç„¡é ˆæœ¬åœ°ä½¿ç”¨è€…æ‰‹å‹•é—œæ³¨é ç«¯ä¼ºæœå™¨çš„å…¶ä»–ä½¿ç”¨è€…ã€‚"
-      disabled: åœç”¨
+      add_new: æ–°å¢žä¸ç¹¼
+      delete: åˆªé™¤
+      description_html: "<strong>è¯ç›Ÿä¸ç¹¼ç«™</strong>æ˜¯ä¸€ç¨®ä¸ç¹¼ä¼ºæœå™¨ï¼Œæœƒåœ¨è¨‚é–±ä¸¦æŽ¨é€è‡³æ¤ä¸ç¹¼ç«™çš„ä¼ºæœå™¨ä¹‹é–“äº¤æ›å¤§é‡çš„å…¬é–‹å˜Ÿæ–‡ã€‚<strong>ä¸ç¹¼ç«™ä¹Ÿèƒ½å”åŠ©å°åž‹æˆ–ä¸åž‹ä¼ºæœå™¨å¾žè¯é‚¦ä¸æŽ¢ç´¢å…§å®¹</strong>ï¼Œè€Œç„¡é ˆæœ¬åœ°ä½¿ç”¨è€…æ‰‹å‹•é—œæ³¨é ç«¯ä¼ºæœå™¨çš„å…¶ä»–ä½¿ç”¨è€…ã€‚"
+      disable: åœç”¨
+      disabled: å·²åœç”¨
       enable: å•Ÿç”¨
+      enable_hint: å•Ÿç”¨å¾Œï¼Œä½ çš„ä¼ºæœå™¨å°‡è¨‚é–±è©²ä¸ç¹¼çš„æ‰€æœ‰å…¬é–‹æ–‡ç« ï¼Œä¸¦å°‡æœƒæ¤ä¼ºæœå™¨çš„å…¬é–‹æ–‡ç« ç™¼é€çµ¦å®ƒã€‚
+      enabled: å·²å•Ÿç”¨
+      inbox_url: ä¸ç¹¼ URL
+      pending: æ£åœ¨ç‰å¾…ä¸ç¹¼è¨±å¯
+      save_and_enable: å„²å˜ä¸¦å•Ÿç”¨
+      setup: å»ºç«‹ä¸ç¹¼é€šè¨Š
+      signatures_not_enabled: ä¸ç¹¼ä¸æœƒåœ¨å®‰å…¨æ¨¡å¼æˆ–æœ‰é™è¯ç›Ÿæ¨¡å¼è¢«é–‹å•“çš„æƒ…æ³ä¸‹æ£å¸¸é‹ä½œ
+      status: ç‹€æ…‹
+      title: ä¸ç¹¼
     report_notes:
-      created_msg: èˆ‰å ±ç†è¨˜å·²å»ºç«‹ã€‚
-      destroyed_msg: èˆ‰å ±ç†è¨˜å·²åˆªé™¤ã€‚
+      created_msg: èˆ‰å ±å‚™è¨»å·²å»ºç«‹ï¼
+      destroyed_msg: èˆ‰å ±å‚™è¨»å·²åˆªé™¤ï¼
     reports:
+      account:
+        notes:
+          other: "%{count} å‰‡å‚™è¨»"
+        reports:
+          other: "%{count} å‰‡èˆ‰å ±"
       action_taken_by: æ“ä½œåŸ·è¡Œè€…
       are_you_sure: ä½ ç¢ºèªå—Žï¼Ÿ
       assign_to_self: æŒ‡æ´¾çµ¦è‡ªå·±
-      assigned: æŒ‡æ´¾è² è²¬äºº
+      assigned: æŒ‡æ´¾ç‰ˆä¸»
+      by_target_domain: è¢«èˆ‰å ±å¸³è™Ÿçš„åŸŸå
       comment:
         none: æ²’æœ‰
       created_at: æ—¥æœŸ
+      forwarded: å·²è½‰å¯„
+      forwarded_to: å·²è½‰å¯„åˆ° %{domain}
       mark_as_resolved: æ¨™ç¤ºç‚ºã€Œå·²è™•ç†ã€
       mark_as_unresolved: æ¨™ç¤ºç‚ºã€Œæœªè™•ç†ã€
       notes:
-        create: å»ºç«‹ç†è¨˜
-        create_and_resolve: å»ºç«‹ç†è¨˜ä¸¦æ¨™ç¤ºç‚ºã€Œå·²è™•ç†ã€
-        create_and_unresolve: å»ºç«‹ç†è¨˜ä¸¦æ¨™ç¤ºç‚ºã€Œæœªè™•ç†ã€
+        create: å»ºç«‹å‚™è¨»
+        create_and_resolve: æ¨™ç¤ºç‚ºã€Œå·²è™•ç†ã€ä¸¦ç•™ä¸‹å‚™è¨»
+        create_and_unresolve: æ¨™ç¤ºç‚ºã€Œæœªè™•ç†ã€ä¸¦ç•™ä¸‹å‚™è¨»
         delete: åˆªé™¤
         placeholder: è¨˜éŒ„å·²åŸ·è¡Œçš„å‹•ä½œï¼Œæˆ–å…¶ä»–ç›¸é—œçš„æ›´æ–°â€¦â€¦
-      reopen: é‡é–‹èˆ‰å ±
+      reopen: é‡é–‹èˆ‰å ±å€‹æ¡ˆ
       report: 'èˆ‰å ± #%{id}'
       reported_account: èˆ‰å ±ç”¨æˆ¶
       reported_by: èˆ‰å ±è€…
       resolved: å·²è™•ç†
-      resolved_msg: èˆ‰å ±å·²è™•ç†ã€‚
+      resolved_msg: èˆ‰å ±å€‹æ¡ˆå·²è¢«è™•ç†ï¼
       status: ç‹€æ…‹
       title: èˆ‰å ±
       unassign: å–æ¶ˆæŒ‡æ´¾
@@ -402,41 +536,58 @@ zh-HK:
       updated_at: æ›´æ–°
     settings:
       activity_api_enabled:
-        desc_html: æœ¬ç«™ç”¨æˆ¶ç™¼ä½ˆçš„æ–‡ç« ï¼Œä»¥åŠæœ¬ç«™çš„æ´»èºç”¨æˆ¶å’Œä¸€é€±å…§æ–°ç”¨æˆ¶æ•¸
-        title: å…¬é–‹ç”¨æˆ¶æ´»èºåº¦çš„çµ±è¨ˆæ•¸æ“š
+        desc_html: æœ¬ç«™çš„æ–‡ç« æ•¸é‡ã€æ´»èºä½¿ç”¨è€…æ•¸é‡ã€åŠæ¯é€±æ–°è¨»å†Šä½¿ç”¨è€…æ•¸é‡
+        title: å…¬ä½ˆä½¿ç”¨è€…æ´»èºåº¦çš„çµ±è¨ˆæ•¸æ“š
       bootstrap_timeline_accounts:
-        desc_html: ä»¥åŠå½¢é€—è™Ÿåˆ†éš”å¤šå€‹ç”¨æˆ¶åã€‚åªèƒ½åŠ å…¥ä¾†è‡ªæœ¬ç«™ä¸”æœªé–‹å•Ÿä¿è·çš„å¸³è™Ÿã€‚å¦‚æžœç•™ç©ºï¼Œå‰‡é»˜èªé—œæ³¨æœ¬ç«™æ‰€æœ‰ç®¡ç†å“¡ã€‚
-        title: æ–°ç”¨æˆ¶é»˜èªé—œæ³¨
+        desc_html: ä»¥åŠå½¢é€—è™Ÿåˆ†éš”å¤šå€‹ä½¿ç”¨è€…åç¨±ã€‚åªèƒ½åŠ å…¥ä¾†è‡ªæœ¬ç«™ä¸”æœªé–‹å•Ÿä¿è·çš„å¸³è™Ÿã€‚å¦‚æžœç•™ç©ºï¼Œå‰‡é»˜èªé—œæ³¨æœ¬ç«™æ‰€æœ‰ç®¡ç†å“¡ã€‚
+        title: æ–°ä½¿ç”¨è€…é è¨é—œæ³¨çš„å°åƒ
       contact_information:
         email: è¼¸å…¥ä¸€å€‹å…¬é–‹çš„é›»éƒµåœ°å€
-        username: è¼¸å…¥ç”¨æˆ¶åç¨±
+        username: è¼¸å…¥ä½¿ç”¨è€…åç¨±
+      custom_css:
+        desc_html: é€éŽ CSS è‡ªè¨‚æ¯ä¸€é çš„å¤–è§€
+        title: è‡ªè¨‚ CSS
+      default_noindex:
+        desc_html: å½±éŸ¿æ‰€æœ‰æœªè‡ªè¡Œè¨å®šçš„å¸³è™Ÿ
+        title: é è¨å¸³è™Ÿä¸åœ¨æœå°‹å¼•æ“Žç´¢å¼•ä¹‹å…§
       domain_blocks:
         all: çµ¦ä»»ä½•äºº
         disabled: çµ¦æ²’æœ‰äºº
         title: é¡¯ç¤ºå°éŽ–çš„ç¶²åŸŸ
+        users: æ‰€æœ‰å·²ç™»å…¥çš„å¸³è™Ÿ
+      domain_blocks_rationale:
+        title: é¡¯ç¤ºåŽŸå› äºˆ
       enable_bootstrap_timeline_accounts:
-        title: å•Ÿç”¨æ–°ä½¿ç”¨è€…çš„é è¨è¿½è¹¤
+        desc_html: è‡ªå‹•ç‚ºæ–°ç”¨æˆ¶è¿½éš¨é è¨çš„å¸³è™Ÿï¼Œç‚ºä»–å€‘çš„é¦–é å‹•æ…‹å¢žåŠ ä¸€é»žè‰²å½©
+        title: å•Ÿç”¨ã€Œæ–°ä½¿ç”¨è€…é è¨é—œæ³¨ã€åŠŸèƒ½
       hero:
         desc_html: åœ¨é¦–é é¡¯ç¤ºã€‚æŽ¨è–¦æœ€å° 600x100pxã€‚å¦‚æžœç•™ç©ºï¼Œå°±æœƒé»˜èªç‚ºæœå‹™ç«™ç¸®åœ–
         title: ä¸»é¡Œåœ–ç‰‡
+      mascot:
+        desc_html: åœ¨ä¸åŒé é¢é¡¯ç¤ºã€‚æŽ¨è–¦æœ€å° 293Ã—205pxã€‚å¦‚æžœç•™ç©ºï¼Œå°±æœƒé»˜èªç‚ºä¼ºæœå™¨ç¸®åœ–ã€‚
+        title: ç¸®åœ–
       peers_api_enabled:
         desc_html: ç¾æ™‚æœ¬æœå‹™ç«™åœ¨ç¶²çµ¡ä¸å·²ç™¼ç¾çš„åŸŸå
         title: å…¬é–‹å·²çŸ¥æœå‹™ç«™çš„åˆ—è¡¨
       preview_sensitive_media:
+        desc_html: åœ¨å…¶ä»–é é¢é è¦½çš„é€£çµå°‡æœƒåœ¨æ•æ„Ÿåª’é«”çš„æƒ…æ³ä¸‹é¡¯ç¤ºç¸®åœ–
         title: åœ¨ OpenGraph é è¦½ä¸é¡¯ç¤ºæ•æ„Ÿåª’é«”
       profile_directory:
-        desc_html: å…è¨±èƒ½æŽ¢ç´¢ä½¿ç”¨è€…
+        desc_html: å…è¨±ä½¿ç”¨è€…è¢«æœå°‹
         title: å•Ÿç”¨å€‹äººè³‡æ–™ç›®éŒ„
       registrations:
         closed_message:
           desc_html: ç•¶æœ¬ç«™æš«åœæŽ¥å—è¨»å†Šæ™‚ï¼Œæœƒé¡¯ç¤ºé€™å€‹è¨Šæ¯ã€‚<br/> å¯ä½¿ç”¨ HTML
           title: æš«åœè¨»å†Šè¨Šæ¯
         deletion:
-          desc_html: å…è¨±æ‰€æœ‰äººåˆªé™¤è‡ªå·±çš„å¸³æˆ¶
-          title: é–‹æ”¾åˆªé™¤å¸³æˆ¶çš„æ¬Šé™
+          desc_html: å…è¨±æ‰€æœ‰äººåˆªé™¤è‡ªå·±çš„å¸³è™Ÿ
+          title: å®¹è¨±åˆªé™¤å¸³è™Ÿ
         min_invite_role:
           disabled: æ²’æœ‰äºº
           title: å…è¨±ç™¼é€é‚€è«‹çš„èº«ä»½
+        require_invite_text:
+          desc_html: å¦‚æžœå·²è¨å®šç‚ºæ‰‹å‹•å¯©æ ¸æ³¨å†Šï¼Œè«‹æŠŠã€ŒåŠ å…¥çš„åŽŸå› ã€è¨å®šç‚ºå¿…å¡«é …ç›®ã€‚
+          title: è¦æ±‚æ–°ç”¨æˆ¶å¡«å¯«æ³¨å†Šç”³è«‹
       registrations_mode:
         modes:
           approved: è¨»å†Šéœ€è¦æ ¸å‡†
@@ -444,11 +595,11 @@ zh-HK:
           open: ä»»ä½•äººçš†èƒ½è¨»å†Š
         title: è¨»å†Šæ¨¡å¼
       show_known_fediverse_at_about_page:
-        desc_html: å¦‚æžœé–‹å•Ÿï¼Œå°±æœƒåœ¨æ™‚é–“è»¸é è¦½é¡¯ç¤ºè·¨ç«™æ–‡ç« ï¼Œå¦å‰‡å°±åªæœƒé¡¯ç¤ºæœ¬ç«™æ–‡ç« ã€‚
-        title: åœ¨æ™‚é–“è»¸é è¦½é¡¯ç¤ºè·¨ç«™æ–‡ç« 
+        desc_html: å¦‚æžœåœç”¨ï¼Œå°‡æœƒåªåœ¨æœ¬ç«™çš„æ¡è¿Žé é¡¯ç¤ºæœ¬ç«™çš„æ–‡ç« ã€‚
+        title: åœ¨è¨ªå®¢é è¦½æœ¬ç«™çš„æ™‚é–“è»¸ä¸Šï¼Œé¡¯ç¤ºè·¨ç«™æ–‡ç« 
       show_staff_badge:
-        desc_html: åœ¨å€‹äººè³‡æ–™é ä¸Šé¡¯ç¤ºç®¡ç†äººå“¡æ¨™èªŒ
-        title: é¡¯ç¤ºç®¡ç†äººå“¡æ¨™èªŒ
+        desc_html: åœ¨å€‹äººè³‡æ–™é ä¸Šé¡¯ç¤ºå·¥ä½œäººå“¡æ¨™èªŒ
+        title: é¡¯ç¤ºå·¥ä½œäººå“¡æ¨™èªŒ
       site_description:
         desc_html: åœ¨é¦–é é¡¯ç¤ºï¼ŒåŠåœ¨ meta æ¨™ç±¤ä½¿ç”¨ä½œç¶²ç«™ä»‹ç´¹ã€‚<br/> ä½ å¯ä»¥åœ¨æ¤ä½¿ç”¨ <code>&lt;a&gt;</code> å’Œ <code>&lt;em&gt;</code> ç‰ HTML æ¨™ç±¤ã€‚
         title: æœ¬ç«™ä»‹ç´¹
@@ -456,12 +607,14 @@ zh-HK:
         desc_html: æœ¬ç«™è©³ç´°è³‡è¨Šé çš„å…§æ–‡<br/>ä½ å¯ä»¥åœ¨æ¤ä½¿ç”¨ HTML
         title: æœ¬ç«™è©³ç´°è³‡è¨Š
       site_short_description:
+        desc_html: "é¡¯ç¤ºåœ¨å´é‚Šæ¬„å’Œç¶²é æ¨™ç±¤(meta tags)ã€‚ä»¥ä¸€å¥è©±æè¿°Mastodonæ˜¯ç”šéº¼ï¼Œæœ‰ç”šéº¼ä»¤é€™å€‹ä¼ºæœå™¨è„«\U000294D9è€Œå‡ºã€‚"
         title: ä¼ºæœå™¨çŸæè¿°
       site_terms:
         desc_html: å¯ä»¥å¡«å¯«è‡ªå·±çš„éš±ç§æ¬Šæ”¿ç–ã€ä½¿ç”¨æ¢æ¬¾æˆ–å…¶ä»–æ³•å¾‹æ–‡æœ¬ã€‚å¯ä»¥ä½¿ç”¨ HTML æ¨™ç±¤
         title: è‡ªè¨‚ä½¿ç”¨æ¢æ¬¾
       site_title: æœ¬ç«™åç¨±
       spam_check_enabled:
+        desc_html: Mastodonå¯ä»¥è‡ªå‹•èˆ‰å ±ç”¢ç”Ÿé‡è¤‡çš„åžƒåœ¾å…§å®¹çš„å¸³è™Ÿï¼Œä¸éŽæœªå¿…æº–ç¢ºã€‚
         title: è‡ªå‹•é˜²å»£å‘Šè¨Šæ¯
       thumbnail:
         desc_html: ç”¨æ–¼åœ¨ OpenGraph å’Œ API ä¸é¡¯ç¤ºé è¦½åœ–ã€‚æŽ¨è–¦å¤§å° 1200Ã—630px
@@ -470,7 +623,11 @@ zh-HK:
         desc_html: åœ¨ä¸»é é¡¯ç¤ºæœ¬ç«™æ™‚é–“è»¸
         title: æ™‚é–“è»¸é è¦½
       title: ç¶²ç«™è¨å®š
+      trendable_by_default:
+        desc_html: å½±éŸ¿ä¹‹å‰ä¸¦æœªç¦æ¢çš„æ¨™ç±¤
+        title: å®¹è¨±æ¨™ç±¤ä¸éœ€è¦å¯©æ ¸ä¾†æˆç‚ºä»ŠæœŸæµè¡Œ
       trends:
+        desc_html: å…¬é–‹åœ°é¡¯ç¤ºå·²å¯©æ ¸çš„æ¨™ç±¤ç‚ºä»ŠæœŸæµè¡Œ
         title: è¶¨å‹¢ä¸»é¡Œæ¨™ç±¤
     site_uploads:
       delete: åˆªé™¤ä¸Šå‚³çš„æª”æ¡ˆ
@@ -490,14 +647,17 @@ zh-HK:
       title: å¸³æˆ¶æ–‡ç« 
       with_media: å«æœ‰åª’é«”æª”æ¡ˆ
     tags:
+      accounts_today: ä»Šæ—¥ç‰¹æ®Šä½¿ç”¨
+      accounts_week: ä»Šé€±ç‰¹æ®Šä½¿ç”¨
+      breakdown: æ ¹æ“šä¾†æºå‰–æžæ˜¯æ—¥ç”¨é‡
       context: ä¸Šä¸‹æ–‡
       directory: åœ¨ç›®éŒ„ä¸
       in_directory: ç›®éŒ„ä¸æœ‰ %{count} å€‹
       last_active: ä¸Šæ¬¡æ´»èº
       most_popular: æœ€ç†±é–€
       most_recent: æœ€è¿‘
-      name: Hashtag
-      review: å¯©æ ¸å˜Ÿæ–‡
+      name: ä¸»é¡Œæ¨™ç±¤
+      review: å¯©æ ¸æ–‡ç« 
       reviewed: å·²å¯©æ ¸
       title: ä¸»é¡Œæ¨™ç±¤
       trending_right_now: æœ€æ–°è¶¨å‹¢
@@ -508,53 +668,100 @@ zh-HK:
     warning_presets:
       add_new: æ–°å¢ž
       delete: åˆªé™¤
+      edit_preset: è¨å®šè¦å‘Šé è¨
+      title: ç®¡ç†è¦å‘Šé è¨
   admin_mailer:
+    new_pending_account:
+      body: ä»¥ä¸‹æ˜¯æ–°å¸³æˆ¶çš„è³‡è¨Šã€‚ä½ å¯ä»¥å¯©æ ¸é€™é …ç”³è«‹ã€‚
+      subject: åœ¨ %{instance} ä¸Šæœªå¯©æ ¸çš„æ–°ç”¨æˆ¶(%{username})
     new_report:
-      body: "%{reporter} èˆ‰å ±äº†ç”¨æˆ¶ %{target}"
-      body_remote: ä¾†è‡ª %{domain} çš„ç”¨æˆ¶èˆ‰å ±äº†ç”¨æˆ¶ %{target}
-      subject: ä¾†è‡ª %{instance} çš„ç”¨æˆ¶èˆ‰å ±ï¼ˆ#%{id}ï¼‰
+      body: "%{reporter} èˆ‰å ±äº† %{target}"
+      body_remote: ä¾†è‡ª %{domain} çš„äººèˆ‰å ±äº† %{target}
+      subject: é‡å° %{instance} çš„èˆ‰å ±ï¼ˆ#%{id}ï¼‰
+    new_trending_tag:
+      body: 'ä»Šå¤©æµè¡Œä½¿ç”¨æœªè¢«å¯©æ ¸çš„ #%{name} ä¸»é¡Œæ¨™ç±¤ã€‚åœ¨ä½ å…è¨±ä¹‹å‰ï¼Œå®ƒä¸æœƒè¢«å…¬é–‹åœ°é¡¯ç¤ºï¼Œä½ äº¦å¯ä»¥ç„¡è¦–å®ƒä½¿å®ƒä¸å†æ±¡æŸ“ä½ çš„çœ¼ç›ã€‚'
+      subject: åœ¨ %{instance} ä¸Šæœªå¯©æ ¸çš„ä¸»é¡Œæ¨™ç±¤ (%{name})
+  aliases:
+    add_new: å»ºç«‹åˆ¥å (Alias)
+    created_msg: æˆåŠŸå»ºç«‹åˆ¥å (alias)ã€‚ä½ å¯ä»¥å¾žèˆŠå¸³è™Ÿé–‹å§‹è½‰ç§»ã€‚
+    deleted_msg: æˆåŠŸåˆªé™¤åˆ¥å (alias)ã€‚ä½ å°‡ä¸å¯ä»¥ç”±èˆŠå¸³è™Ÿè½‰ç§»åˆ°ç•¶å‰å¸³è™Ÿã€‚
+    empty: ä½ æ²’æœ‰åˆ¥å (alias)ã€‚
+    hint_html: å¦‚æžœä½ æƒ³ç”±å¦ä¸€å€‹å¸³æˆ¶è½‰ç§»åˆ°æ¤å¸³è™Ÿï¼Œä½ å¯ä»¥åœ¨æ¤è™•å‰µå»ºåˆ¥å (alias)ï¼Œç„¶å¾Œç³»çµ±å®¹è¨±ä½ å°‡é—œæ³¨è€…ç”±èˆŠå¸³æˆ¶è½‰ç§»åˆ°æ¤å¸³è™Ÿã€‚æ¤æ“ä½œæ˜¯<strong>ç„¡å®³ä¸”å¯ä»¥é‚„åŽŸçš„</strong>ã€‚ <strong>å¸³è™Ÿé·ç§»ç¨‹åºï¼Œéœ€è¦åœ¨èˆŠå¸³è™Ÿå•Ÿå‹•</strong>ã€‚
+    remove: å–æ¶ˆé€£çµåˆ¥å (Alias)
   appearance:
+    advanced_web_interface: é€²éšŽç¶²é ä»‹é¢
+    advanced_web_interface_hint: å¦‚æžœä½ æƒ³å–„ç”¨æ•´å€‹èž¢å¹•é—Šåº¦ï¼Œä½ å¯ä»¥å•Ÿç”¨ã€Œé€²éšŽç¶²é ä»‹é¢ã€ï¼Œåœ¨ç•«é¢ä¸Šé…ç½®å¤šå€‹ä¸åŒçš„æ¬„ç›®ï¼Œè®“ä½ èƒ½æ ¹æ“šéœ€è¦ï¼ŒåŒæ™‚æŸ¥çœ‹ç›¡å¯èƒ½å¤šçš„ä¿¡æ¯ï¼Œæ”¯æ´çš„æ¬„ä½åŒ…æ‹¬ï¼šä¸»é ã€é€šçŸ¥ã€å…¶ä»–ç«™é»žå’Œä»»ä½•çš„åˆ—è¡¨å’Œæ¨™ç±¤ã€‚
+    animations_and_accessibility: å‹•ç•«å’Œè¼”åŠ©åŠŸèƒ½
+    confirmation_dialogs: ç¢ºèªå°è©±æ¡†
+    discovery: æŽ¢ç´¢
     localization:
       body: Mastodon æ˜¯ç”±å¿—é¡˜è€…ç¿»è¯çš„ã€‚
       guide_link: https://crowdin.com/project/mastodon
       guide_link_text: æ¯å€‹äººéƒ½èƒ½è²¢ç»ã€‚
+    sensitive_content: æ•æ„Ÿå…§å®¹
+    toot_layout: ç™¼æ–‡ä»‹é¢
   application_mailer:
-    notification_preferences: æ›´æ”¹é›»éƒµé¦–é¸é …
+    notification_preferences: æ›´æ”¹é›»éƒµè¨å®š
     salutation: "%{name}ï¼š"
     settings: ä¿®æ”¹é›»éƒµè¨å®šï¸°%{link}
     view: é€²å…¥ç€è¦½ï¸°
     view_profile: æª¢è¦–å€‹äººè³‡æ–™é 
     view_status: æª¢è¦–æ–‡ç« 
   applications:
-    created: å·²å»ºç«‹æ‡‰ç”¨
-    destroyed: å·²åˆªé™¤æ‡‰ç”¨
+    created: å·²å»ºç«‹æ‡‰ç”¨ç¨‹å¼
+    destroyed: å·²åˆªé™¤æ‡‰ç”¨ç¨‹å¼
     invalid_url: æ‰€æä¾›çš„ç¶²å€ä¸æ£ç¢º
     regenerate_token: é‡è¨ token
     token_regenerated: å·²é‡è¨ token
     warning: è¦å‘Šï¼Œä¸è¦æŠŠå®ƒåˆ†äº«çµ¦ä»»ä½•äººï¼
     your_token: token
   auth:
+    apply_for_account: è«‹æ±‚é‚€è«‹
     change_password: å¯†ç¢¼
-    delete_account: åˆªé™¤å¸³æˆ¶
-    delete_account_html: å¦‚æžœä½ æƒ³åˆªé™¤ä½ çš„å¸³æˆ¶ï¼Œè«‹<a href="%{path}">é»žæ“Šé€™è£¡ç¹¼çºŒ</a>ã€‚ä½ éœ€è¦ç¢ºèªä½ çš„æ“ä½œã€‚
+    checkbox_agreement_html: æˆ‘åŒæ„ <a href="%{rules_path}" target="_blank">çš„ä¼ºæœå™¨è¦å‰‡</a> å’Œ<a href="%{terms_path}" target="_blank">æœå‹™æ¢æ¬¾</a>
+    checkbox_agreement_without_rules_html: æˆ‘åŒæ„ <a href="%{terms_path}" target="_blank">æœå‹™æ¢æ¬¾</a>
+    delete_account: åˆªé™¤å¸³è™Ÿ
+    delete_account_html: å¦‚æžœä½ æƒ³åˆªé™¤ä½ çš„å¸³è™Ÿï¼Œè«‹<a href="%{path}">é»žæ“Šé€™è£¡ç¹¼çºŒ</a>ã€‚ä½ éœ€è¦ç¢ºèªä½ çš„æ“ä½œã€‚
+    description:
+      prefix_invited_by_user: "@%{name} é‚€è«‹ä½ åŠ å…¥é€™å€‹ Mastodon æœå‹™ç«™ï¼"
+      prefix_sign_up: ç«‹å³è¨»å†Š Mastodonï¼
+      suffix: æœ‰äº†ä¸€å€‹å¸³æˆ¶ï¼Œå°±å¯ä»¥å¾žä»»ä½•Mastodonæœå‹™å™¨é—œæ³¨ä»»ä½•äººï¼Œç™¼ä½ˆæ›´æ–°ä¸¦èˆ‡ä»»ä½•Mastodonæœå‹™å™¨çš„ç”¨æˆ¶äº¤æµï¼
     didnt_get_confirmation: æ²’æœ‰æ”¶åˆ°ç¢ºèªæŒ‡ç¤ºé›»éƒµï¼Ÿ
+    dont_have_your_security_key: æ‰¾ä¸åˆ°å®‰å…¨å¯†é‘°ï¼Ÿ
     forgot_password: å¿˜è¨˜äº†å¯†ç¢¼ï¼Ÿ
     invalid_reset_password_token: å¯†ç¢¼é‡ç½® token ç„¡æ•ˆæˆ–å·²éŽæœŸã€‚è«‹é‡æ–°é‡è¨å¯†ç¢¼ã€‚
+    link_to_otp: è«‹è¼¸å…¥å…©æ¥ä®•èªè‰ç¢¼æˆ–æ¢å¾©ç¢¼
+    link_to_webauth: ä½¿ç”¨ä½ çš„å®‰å…¨å¯†é‘°è£ç½®
     login: ç™»å…¥
     logout: ç™»å‡º
     migrate_account: è½‰ç§»åˆ°å¦ä¸€å€‹å¸³è™Ÿ
     migrate_account_html: æƒ³è¦å°‡é€™å€‹å¸³è™ŸæŒ‡å‘å¦ä¸€å€‹å¸³è™Ÿå¯<a href="%{path}">åˆ°é€™è£¡è¨å®š</a>ã€‚
     or_log_in_with: æˆ–ç™»å…¥æ–¼
     providers:
+      cas: CAS
       saml: SAML
     register: ç™»è¨˜
+    registration_closed: "%{instance} ä¸¦ä¸æŽ¥å—æ–°æˆå“¡è«‹æ±‚"
     resend_confirmation: é‡ç™¼ç¢ºèªæŒ‡ç¤ºé›»éƒµ
     reset_password: é‡è¨å¯†ç¢¼
     security: ç™»å…¥è³‡è¨Š
     set_new_password: è¨å®šæ–°å¯†ç¢¼
+    setup:
+      email_below_hint_html: å¦‚æžœä¸‹é¢çš„é›»éƒµåœ°å€ä¸æ£ç¢ºï¼Œä½ å¯åœ¨æ¤ä¿®æ”¹ï¼Œç„¶å¾ŒæŽ¥æ”¶é›»éƒµé€²è¡Œç¢ºèªã€‚
+      email_settings_hint_html: ç¢ºèªé›»éƒµå·²ç™¼é€è‡³ %{email}ã€‚é›»éƒµåœ°å€ä¸æ£ç¢ºçš„è©±ï¼Œä½ å¯ä»¥åœ¨å¸³æˆ¶è¨ç½®ä¸é€²è¡Œæ›´æ”¹ã€‚
+      title: è¨å®š
+    status:
+      account_status: å¸³æˆ¶æ–‡ç« 
+      confirming: æ£åœ¨ç‰å¾…ç¢ºèªé›»éƒµåœ°å€ã€‚
+      functional: ä½ çš„å¸³æˆ¶å¯ä»¥æ£å¸¸ä½¿ç”¨ã€‚
+      pending: ç®¡ç†å“¡æ£åœ¨è™•ç†ä½ çš„ç”³è«‹ã€‚å¯èƒ½æœƒéœ€è¦ä¸€é»žæ™‚é–“è™•ç†ã€‚æˆ‘å€‘å°‡æœƒåœ¨ç”³è«‹è¢«æ‰¹æº–çš„æ™‚å€™é¦¬ä¸Šå¯„é›»éƒµçµ¦ä½ ã€‚
+      redirecting_to: ä½ çš„å¸³æˆ¶å› ç‚ºæ£åœ¨é‡æ–°å®šå‘åˆ° %{acct}ï¼Œæ‰€ä»¥æš«æ™‚è¢«åœç”¨ã€‚
+    too_fast: ä½ å¤ªå¿«éžäº¤äº†ï¼Œè«‹å†è©¦ä¸€æ¬¡ã€‚
+    trouble_logging_in: ä¸èƒ½ç™»å…¥ï¼Ÿ
+    use_security_key: ä½¿ç”¨å®‰å…¨å¯†é‘°è£ç½®
   authorize_follow:
     already_following: ä½ å·²ç¶“é—œæ³¨äº†é€™å€‹å¸³è™Ÿ
-    already_requested: æ‚¨æ—©å·²å‘è©²å¸³æˆ¶å¯„é€è¿½è¹¤è«‹æ±‚
+    already_requested: ä½ å…ˆå‰å·²å‘è©²å¸³è™Ÿç™¼é€é—œæ³¨è«‹æ±‚
     error: å°ä¸èµ·ï¼Œå°‹æ‰¾é€™å€‹è·¨ç«™ç”¨æˆ¶çš„éŽç¨‹ç™¼ç”ŸéŒ¯èª¤
     follow: é—œæ³¨
     follow_request: é—œæ³¨è«‹æ±‚å·²ç™¼é€ç»™ï¼š
@@ -564,6 +771,19 @@ zh-HK:
       return: é¡¯ç¤ºå€‹äººè³‡æ–™é 
       web: è¿”å›žæœ¬ç«™
     title: é—œæ³¨ %{acct}
+  challenge:
+    confirm: ç¹¼çºŒ
+    hint_html: "<strong>æ¸©é¦¨æç¤º</strong> æˆ‘å€‘åœ¨æœªä¾†ä¸€å°æ™‚å…§ä¸æœƒå†è¦æ±‚ä½ å¡«å¯«å¯†ç¢¼ã€‚"
+    invalid_password: å¯†ç¢¼éŒ¯èª¤
+    prompt: ç¢ºèªå¯†ç¢¼ä»¥ç¹¼çºŒ
+  crypto:
+    errors:
+      invalid_key: ä¸æ˜¯ä¸€å€‹æœ‰æ•ˆçš„ Ed25519 æˆ– Curve25519 å¯†é‘°
+      invalid_signature: ä¸æ˜¯ä¸€å€‹æœ‰æ•ˆçš„ Ed25519 ç°½å
+  date:
+    formats:
+      default: "%Yå¹´%bæœˆ%dæ—¥"
+      with_month_name: "%B %d, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}å°æ™‚å‰"
@@ -579,14 +799,33 @@ zh-HK:
       x_months: "%{count}å€‹æœˆ"
       x_seconds: "%{count}ç§’"
   deletes:
+    challenge_not_passed: ä½ å¡«å¯«çš„è³‡æ–™ä¸æ£ç¢º
     confirm_password: è¼¸å…¥ä½ ç¾åœ¨çš„å¯†ç¢¼ä¾†é©—è‰èº«ä»½
+    confirm_username: è«‹å¡«å¯«ä½ çš„ç™»å…¥åç¨±ä»¥ç¢ºèªç¨‹åº
     proceed: åˆªé™¤å¸³æˆ¶
     success_msg: ä½ çš„å¸³æˆ¶å·²ç¶“æˆåŠŸåˆªé™¤
+    warning:
+      before: åœ¨ç¹¼çºŒä¹‹å‰ï¼Œè«‹ä»”ç´°é–±è®€ä»¥ä¸‹èªªæ˜Žï¼š
+      caches: å·²è¢«å…¶ä»–æœå‹™å™¨ç·©å˜çš„å…§å®¹å¯èƒ½ä¸æœƒæ¶ˆå¤±
+      data_removal: ä½ çš„æ–‡ç« å’Œå…¶ä»–è³‡æ–™å°‡è¢«æ°¸ä¹…åˆªé™¤
+      email_change_html: ä½ å¯ä»¥åœ¨ä¸åˆªé™¤å¸³æˆ¶çš„æƒ…æ³ä¸‹<a href="%{path}">æ›´æ”¹é›»åéƒµä»¶åœ°å€</a>
+      email_contact_html: å¦‚æžœä»ç„¶æ²’æœ‰é€é”ï¼Œä½ å¯ä»¥é€šéŽé›»åéƒµä»¶ç™¼é€åˆ°<a href="mailto:%{email}">%{email}</a>ä»¥ç²å¾—å”åŠ©
+      email_reconfirmation_html: å¦‚æžœä½ æ²’æœ‰æ”¶åˆ°ç¢ºèªé›»éƒµï¼Œä½ å¯ä»¥<a href="%{path}">è¦æ±‚å†æ¬¡ç™¼é€å®ƒ</a>
+      irreversible: ä½ å°‡ç„¡æ³•é‡å•Ÿä½ çš„å¸³æˆ¶
+      more_details_html: è«‹åƒè¦‹<a href="%{terms_path}">éš±ç§æ”¿ç–</a>ä»¥ç€è¦½ç´°ç¯€ã€‚
+      username_available: ä½ çš„ç™»å…¥åç¨±å°‡å¯è¢«å…¶ä»–äººä½¿ç”¨
+      username_unavailable: ä½ çš„ç™»å…¥åç¨±å°‡ä¸èƒ½è®“å…¶ä»–äººä½¿ç”¨
+  directories:
+    directory: å€‹äººè³‡æ–™ç›®éŒ„
+    explanation: æ ¹æ“šèˆˆè¶£èªè˜æ–°æœ‹å‹
+    explore_mastodon: æŽ¢ç´¢%{title}
+  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 çš„æ¬Šé™ï¼Ÿ
@@ -595,38 +834,100 @@ zh-HK:
     '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}">Mastodon æ‡‰ç”¨</a>ã€‚
+  existing_username_validator:
+    not_found: ç„¡æ³•æ‰¾åˆ°ä½æ–¼æœ¬ä¼ºæœå™¨çš„ç”¨æˆ¶
+    not_found_multiple: ç„¡æ³•æ‰¾åˆ°%{usernames}
   exports:
     archive_takeout:
       date: æ—¥æœŸ
       download: ä¸‹è¼‰æª”æ¡ˆ
-      hint_html: ä½ å¯ä»¥ä¸‹è¼‰åŒ…å«ä½ çš„<strong>æ–‡ç« å’Œåª’é«”</strong>çš„æª”æ¡ˆã€‚è³‡æ–™ä»¥ ActivityPub æ ¼å¼å„²å˜ï¼Œå¯ç”¨æ–¼ç›¸å®¹çš„è»Ÿé«”ã€‚ä½ å¯ä»¥æ¯ä¸ƒå¤©ä¸‹è¼‰ä¸€æ¬¡ã€‚
+      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: ä½ æ‰€æŽ¨è–¦çš„æ¨™ç±¤æ•¸é‡å·²ç¶“é”åˆ°ä¸Šé™
+    hint_html: "<strong>ç”šéº¼æ˜¯æŽ¨è–¦ä¸»é¡Œæ¨™ç±¤ï¼Ÿ</strong> å®ƒå€‘æœƒè¢«é¡¯ç¤ºåœ¨ä½ çš„å€‹äººè³‡æ–™é é¢ï¼Œè®“å…¶ä»–äººå¯ä»¥æ ¹æ“šæ¨™ç±¤ç€è¦½ä½ çš„å…¬é–‹æ–‡ç« ï¼Œä»¤äººå€‘æ›´æ˜“æ‰¾åˆ°ä½ å‰µä½œæˆ–è€…é•·æœŸä½œå“ï¼"
   filters:
+    contexts:
+      account: å€‹äººè³‡æ–™
+      home: ä¸»é å’Œåˆ—è¡¨
+      notifications: é€šçŸ¥
+      public: å…¬å…±æ™‚é–“è»¸
+      thread: å°è©±
+    edit:
+      title: ç·¨è¼¯ç¯©é¸å™¨
+    errors:
+      invalid_context: æ²’æœ‰æä¾›å…§æ–‡æˆ–å…§æ–‡ç„¡æ•ˆ
+      invalid_irreversible: ä¸å¯é€†çš„ç¯©é¸å™¨åªé©ç”¨æ”¾ä¸»é æˆ–é€šçŸ¥é é¢
     index:
-      empty: æ‚¨æ²’æœ‰éŽæ¿¾å™¨ã€‚
+      delete: åˆªé™¤
+      empty: ä½ æ²’æœ‰éŽæ¿¾å™¨ã€‚
+      title: ç¯©é¸
+    new:
+      title: æ–°å¢žç¯©é¸å™¨
   footer:
+    developers: é–‹ç™¼è€…
     more: æ›´å¤š......
+    resources: é …ç›®
+    trending_now: ä»ŠæœŸæµè¡Œ
   generic:
     all: å…¨éƒ¨
     changes_saved_msg: å·²æˆåŠŸå„²å˜ä¿®æ”¹ã€‚
     copy: è¤‡è£½
+    delete: åˆªé™¤
+    no_batch_actions_available: æ¤é ç›®æ²’æœ‰å¯ç”¨çš„æ‰¹æ¬¡æ“ä½œ
+    order_by: æŽ’åº
     save_changes: å„²å˜ä¿®æ”¹
     validation_errors:
       other: æäº¤çš„è³‡æ–™æœ‰ %{count} é …å•é¡Œ
+  html_validator:
+    invalid_markup: å«æœ‰ç„¡æ•ˆçš„HTMLæ¨™è¨˜ï¼š%{error}
+  identity_proofs:
+    active: æ´»èº
+    authorize: æ˜¯çš„ï¼Œè«‹æŽˆæ¬Š
+    authorize_connection_prompt: æŽˆæ¬Šæ¤åŠ å¯†é€šè¨Šï¼Ÿ
+    errors:
+      failed: åŠ å¯†é€šè¨Šå¤±æ•—ã€‚è«‹åœ¨%{provider} é‡è©¦ã€‚
+      keybase:
+        invalid_token: Keybase tokenså¿…å®šç‚º66å€‹16ä½å…ƒå—ç¬¦çš„ç°½åæª”æ•£åˆ—ã€‚
+        verification_failed: Keybaseä¸èƒ½è˜åˆ¥æ¤ä»¤ç‰Œç‚ºKeybaseç”¨æˆ¶%{kb_username} çš„ç°½åã€‚è«‹åœ¨Keybaseå†è©¦ä¸€æ¬¡ã€‚
+      wrong_user: æœªèƒ½ä»¥%{current} ç‚º %{proving} å»ºç«‹èº«ä»½é©—è‰ã€‚è«‹ç™»å…¥ç‚º%{proving} å†è©¦ä¸€æ¬¡ã€‚
+    explanation_html: åœ¨æ¤ä½ é€£çµå…¶ä»–ç¶²è·¯å¹³å°ï¼ˆå¦‚ Keybaseï¼‰ä¸Šçš„åŠ å¯†èº«ä»½ã€‚è®“å…¶ä»–äººå¯ä»¥åœ¨é‚£äº›å¹³å°ä¸Šï¼Œå‚³é€åŠ å¯†ä¿¡æ¯çµ¦ä½ ï¼Œä¸¦é©—è‰ä½ çš„èº«ä»½ã€‚
+    i_am_html: æˆ‘æ˜¯ %{service} ä¸Šçš„ %{username}
+    identity: èº«ä»½
+    inactive: åœç”¨
+    publicize_checkbox: ç™¼è¡¨æ–‡ç« ï¼š
+    publicize_toot: é©—è‰æˆåŠŸï¼æˆ‘åœ¨%{service} æ˜¯%{username} ï¼š%{url}
+    remove: åˆªé™¤å¸³è™Ÿçš„é©—è‰
+    removed: æˆåŠŸåˆªé™¤èº«ä»½é©—è‰
+    status: ç¢ºèªç‹€æ…‹
+    view_proof: æŸ¥çœ‹è‰æ˜Ž
   imports:
+    errors:
+      over_rows_processing_limit: åŒ…å«è¶…éŽ %{count} è¡Œ
+    modes:
+      merge: åˆä½µ
+      merge_long: ç•™ä¸‹èˆŠæœ‰è¨˜éŒ„ä¸¦æ·»åŠ æ–°çš„è³‡è¨Š
+      overwrite: è¦†è“‹
+      overwrite_long: ç”¨æ–°è¨˜éŒ„è¦†è“‹ç•¶å‰è¨˜éŒ„
     preface: ä½ å¯ä»¥åœ¨æ¤åŒ¯å…¥ä½ åœ¨å…¶ä»–æœå‹™ç«™æ‰€åŒ¯å‡ºçš„è³‡æ–™æª”ï¼ŒåŒ…æ‹¬ï¸°ä½ æ‰€é—œæ³¨çš„ç”¨æˆ¶ï¼Œè¢«ä½ å°éŽ–çš„ç”¨æˆ¶ã€‚
     success: ä½ å·²æˆåŠŸä¸Šè¼‰è³‡æ–™æª”ï¼Œæˆ‘å€‘æ£å°‡è³‡æ–™åŒ¯å…¥ï¼Œè«‹ç¨å€™
     types:
       blocking: è¢«ä½ å°éŽ–çš„ç”¨æˆ¶åå–®
+      bookmarks: æ›¸ç±¤
+      domain_blocking: åŸŸåå°éŽ–åå–®
       following: ä½ æ‰€é—œæ³¨çš„ç”¨æˆ¶åå–®
       muting: éœéŸ³åå–®
     upload: ä¸Šè¼‰
@@ -658,11 +959,45 @@ zh-HK:
   media_attachments:
     validations:
       images_and_video: ä¸èƒ½åœ¨å·²æœ‰åœ–ç‰‡çš„æ–‡ç« ä¸ŠåŠ å…¥å½±ç‰‡
+      not_ready: ç„¡æ³•é™„åŠ å°šæœªè™•ç†å®Œçš„æª”æ¡ˆã€‚ è«‹ç¨å¾Œå†è©¦ï¼
       too_many: ä¸å¯ä»¥åŠ å…¥è¶…éŽ 4 å€‹æª”æ¡ˆ
   migrations:
     acct: æ–°å¸³æˆ¶çš„ ç”¨æˆ¶å@åŸŸå
+    cancel: å–æ¶ˆå®šå‘
+    cancel_explanation: å–æ¶ˆé‡æ–°å®šå‘å°‡æœƒé‡æ–°æ¿€æ´»ç•¶å‰å¸³æˆ¶ï¼Œä½†ä¸¦ä¸æœƒé‚„åŽŸå·²ç§»è‡³è©²å¸³æˆ¶çš„é—œæ³¨è€…ã€‚
+    cancelled_msg: æˆåŠŸå–æ¶ˆå®šå‘ã€‚
+    errors:
+      already_moved: æ˜¯å·²ç¶“ç§»è‡³çš„ç›¸åŒå¸³æˆ¶
+      missing_also_known_as: ä¸æ˜¯æ¤å¸³æˆ¶çš„åˆ¥å(alias)
+      move_to_self: ä¸èƒ½ç§»è‡³ç•¶å‰å¸³æˆ¶
+      not_found: æ‰¾ä¸åˆ°
+      on_cooldown: ä½ æ£åœ¨è™•æ–¼å†·å»ç‹€æ…‹
+    followers_count: è½‰ç§»æ™‚çš„è¿½éš¨è€…
+    incoming_migrations: ç”±å¦ä¸€å€‹å¸³è™Ÿè½‰ç§»
+    incoming_migrations_html: è¦ç”±å…¶ä»–å¸³æˆ¶è½‰ç§»è‡³ç•¶å‰å¸³æˆ¶çš„è©±ï¼Œé¦–å…ˆä½ éœ€è¦ <a href="%{path}">æ–°å¢žå¸³æˆ¶åˆ¥å(alias)</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: æ–°å¸³æˆ¶å¿…é ˆé¦–å…ˆåå‘æ¨™è˜(back-reference)ç•¶å‰å¸³æˆ¶
+      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} è½‰ç§»ï¼Œé€™æ˜¯ä½ ä¹‹å‰åœ¨è©²å¸³è™Ÿç•™ä¸‹çš„å‚™æ³¨ï¼š
   notification_mailer:
     digest:
       action: æŸ¥çœ‹æ‰€æœ‰é€šçŸ¥
@@ -674,9 +1009,9 @@ zh-HK:
         other: "è‡ªå¾žä¸Šæ¬¡ç™»å…¥ä»¥ä¾†ï¼Œä½ æ”¶åˆ° %{count} å‰‡æ–°çš„é€šçŸ¥ \U0001F418"
       title: åœ¨ä½ ä¸åœ¨çš„é€™æ®µæ™‚é–“â€¦â€¦
     favourite:
-      body: æ‚¨çš„æ–‡ç« è¢« %{name} æ”¶è—ï¼š
-      subject: "%{name} æ”¶è—äº†ä½ çš„æ–‡ç« "
-      title: æ–°çš„æ”¶è—
+      body: ä½ çš„æ–‡ç« è¢« %{name} å–œæ„›ï¼š
+      subject: "%{name} å–œæ¡ä½ çš„æ–‡ç« "
+      title: æ–°çš„æœ€æ„›
     follow:
       body: "%{name} é–‹å§‹é—œæ³¨ä½ ï¼"
       subject: "%{name} ç¾æ£é—œæ³¨ä½ "
@@ -692,32 +1027,94 @@ zh-HK:
       subject: "%{name} åœ¨æ–‡ç« ä¸æåŠä½ "
       title: æ–°çš„æåŠ
     reblog:
-      body: æ‚¨çš„æ–‡ç« è¢« %{name} è½‰æŽ¨ï¼š
+      body: ä½ çš„æ–‡ç« è¢« %{name} è½‰æŽ¨ï¼š
       subject: "%{name} è½‰æŽ¨äº†ä½ çš„æ–‡ç« "
       title: æ–°çš„è½‰æŽ¨
+  notifications:
+    email_events: é›»éƒµé€šçŸ¥æ´»å‹•
+    email_events_hint: é¸æ“‡ä½ æƒ³æŽ¥æ”¶é€šçŸ¥çš„æ´»å‹•ï¼š
+    other_settings: å…¶ä»–é€šçŸ¥è¨å®š
   number:
     human:
       decimal_units:
         format: "%n%u"
         units:
-          billion: B
-          million: M
-          quadrillion: Q
-          thousand: K
-          trillion: T
+          billion: åå„„
+          million: ç™¾è¬
+          quadrillion: åƒå…†
+          thousand: åƒ
+          trillion: å…†
+  otp_authentication:
+    code_hint: è«‹è¼¸å…¥ä½ èªè‰å™¨æ‰€ç”¢ç”Ÿçš„ä»£ç¢¼ï¼Œä»¥ç¢ºèªè¨å®š
+    description_html: ç•¶ä½ å•Ÿç”¨<strong>é›™é‡èªè‰</strong>å¾Œï¼Œä½ ç™»å…¥æ™‚å°‡éœ€è¦ä½¿ç”¨ä½ çš„æ‰‹æ©Ÿæˆ–å…¶ä»–èªè‰å™¨æ‰€ç”¢ç”Ÿçš„ä»£ç¢¼ã€‚
+    enable: å•Ÿç”¨
+    instructions_html: "<strong>è«‹ç”¨ä½ æ‰‹æ©Ÿçš„èªè‰å™¨æ‡‰ç”¨ç¨‹å¼ï¼ˆå¦‚ Google Authenticatorã€Authyï¼‰ï¼ŒæŽƒæé€™è£çš„QR åœ–å½¢ç¢¼</strong>ã€‚åœ¨é›™é‡èªè‰å•Ÿç”¨å¾Œï¼Œä½ ç™»å…¥æ™‚å°‡é ˆè¦ä½¿ç”¨æ¤æ‡‰ç”¨ç¨‹å¼ç”¢ç”Ÿçš„èªè‰ç¢¼ã€‚"
+    manual_instructions: å¦‚æžœä½ ç„¡æ³•æŽƒæ QR åœ–å½¢ç¢¼ï¼Œè«‹æ‰‹å‹•è¼¸å…¥é€™å€‹æ–‡å—å¯†ç¢¼ï¸°
+    setup: è¨å®š
+    wrong_code: ä½ è¼¸å…¥çš„èªè‰ç¢¼ä¸¦ä¸æ£ç¢ºï¼å¯èƒ½ä¼ºæœå™¨æ™‚é–“å’Œä½ æ‰‹æ©Ÿä¸ä¸€è‡´ï¼Œè«‹æª¢æŸ¥ä½ æ‰‹æ©Ÿçš„æ™‚é˜ï¼Œæˆ–èˆ‡æœ¬ç«™ç®¡ç†å“¡è¯çµ¡ã€‚
   pagination:
     newer: è¼ƒæ–°
     next: ä¸‹ä¸€é 
     older: è¼ƒèˆŠ
     prev: ä¸Šä¸€é 
     truncate: "â€¦â€¦"
+  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: å…¬å…±æ™‚é–“è»¸
+  reactions:
+    errors:
+      limit_reached: å·²é”åˆ°å¯ä»¥çµ¦äºˆåæ‡‰æ¥µé™
+      unrecognized_emoji: ä¸èƒ½è˜åˆ¥é€™å€‹emoji
   relationships:
+    activity: å¸³æˆ¶æ´»å‹•
+    dormant: æ½›åœ¨
+    follow_selected_followers: é—œæ³¨æ‰€é¸çš„è¿½éš¨è€…
+    followers: è¿½éš¨è€…
+    following: æ£åœ¨é—œæ³¨
+    invited: å·²é‚€è«‹
+    last_active: ä¸Šæ¬¡æ´»èº
+    most_recent: æœ€è¿‘
+    moved: å·²è½‰ç§»
+    mutual: å…±åŒ
+    primary: ä¸»è¦
+    relationship: é—œä¿‚
+    remove_selected_domains: å¾žæ‰€é¸ä¼ºæœå™¨æ¸…é™¤æ‰€æœ‰è¿½éš¨è€…
     remove_selected_followers: åˆªé™¤æ‰€é¸é¸é …
+    remove_selected_follows: å–æ¶ˆé—œæ³¨æ‰€é¸ç”¨æˆ¶
+    status: å¸³æˆ¶å¸–æ–‡
   remote_follow:
-    acct: è«‹è¼¸å…¥ä½ çš„ï¸°ç”¨æˆ¶åç¨±@æœå‹™é»žåŸŸå
+    acct: è«‹è¼¸å…¥ä½ æƒ³ä½¿ç”¨çš„ã€Œä½¿ç”¨è€…åç¨±@åŸŸåã€èº«ä»½
     missing_resource: ç„¡æ³•æ‰¾åˆ°ä½ ç”¨æˆ¶çš„è½‰æŽ¥ç¶²å€
+    no_account_html: æ²’æœ‰å¸³è™Ÿï¼Ÿä½ å¯ä»¥<a href='%{sign_up_path}' target='_blank'>åœ¨é€™è£è¨»å†Š</a>
     proceed: ä¸‹ä¸€æ¥
     prompt: ä½ å¸Œæœ›é—œæ³¨ï¸°
+    reason_html: "<strong>ç‚ºç”šéº¼æœ‰å¿…è¦åšé€™å€‹æ¥é©Ÿï¼Ÿ</strong>å› ç‚º<code>%{instance}</code>æœªå¿…æ˜¯ä½ è¨»å†Šçš„ä¼ºæœå™¨ï¼Œæ‰€ä»¥æˆ‘å€‘é¦–å…ˆéœ€è¦å°‡ä½ å¸¶å›žä½ çš„ä¼ºæœå™¨ã€‚"
+  remote_interaction:
+    favourite:
+      proceed: ä¸‹ä¸€æ¥
+      prompt: ä½ è¦æ±‚æŠŠé€™ç¯‡æ–‡ç« åŠ å…¥æœ€æ„›ï¼š
+    reblog:
+      proceed: ç¹¼çºŒè½‰å˜Ÿ
+      prompt: ä½ æƒ³è½‰æŽ¨ï¼š
+    reply:
+      proceed: ä¸‹ä¸€æ¥
+      prompt: ä½ æƒ³å›žè¦†ï¼š
+  scheduled_statuses:
+    over_daily_limit: ä½ å·²ç¶“è¶…è¶Šäº†ç•¶å¤©æŽ’å®šç™¼æ–‡çš„é™é¡ (%{limit})
+    over_total_limit: ä½ å·²ç¶“è¶…è¶Šäº†æŽ’å®šç™¼æ–‡çš„é™é¡ (%{limit})
+    too_soon: ä¸å¯ä»¥æ”¹è®ŠéŽåŽ»å“¦ï¼Œå˜Ÿæ–‡åªå¯ä»¥æŽ’å®šåœ¨æœªä¾†
   sessions:
     activity: æœ€è¿‘æ´»å‹•
     browser: ç€è¦½å™¨
@@ -744,25 +1141,49 @@ zh-HK:
     explanation: é€™äº›æ˜¯ç¾åœ¨æ£ç™»å…¥æ–¼ä½ çš„ Mastodon å¸³è™Ÿçš„ç€è¦½å™¨ã€‚
     ip: IP ä½å€
     platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: Blackberry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
       ios: iOS
+      linux: Linux
       mac: Mac
+      other: æœªçŸ¥å¹³å°
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
     revoke: å–æ¶ˆ
     revoke_success: ä½œæ¥éšŽæ®µæˆåŠŸå–æ¶ˆ
     title: ä½œæ¥éšŽæ®µ
   settings:
+    account: å¸³æˆ¶
+    account_settings: å¸³æˆ¶è¨å®š
+    aliases: å¸³æˆ¶åˆ¥å(aliases)
+    appearance: å¤–è§€è¨å®š
     authorized_apps: æŽˆæ¬Šæ‡‰ç”¨ç¨‹å¼
     back: å›žåˆ° Mastodon
     delete: åˆªé™¤å¸³æˆ¶
     development: é–‹ç™¼
     edit_profile: ä¿®æ”¹å€‹äººè³‡æ–™
     export: åŒ¯å‡º
+    featured_tags: æŽ¨è–¦çš„æ¨™ç±¤
+    identity_proofs: èº«ä»½é©—è‰
     import: åŒ¯å…¥
+    import_and_export: åŒ¯å…¥åŠåŒ¯å‡º
     migrate: å¸³æˆ¶é·ç§»
     notifications: é€šçŸ¥
     preferences: åå¥½è¨å®š
+    profile: å€‹äººè³‡æ–™
+    relationships: é—œæ³¨åŠè¿½éš¨è€…
     two_factor_authentication: é›™é‡èªè‰
+    webauthn_authentication: å®‰å…¨é‘°åŒ™
+  spam_check:
+    spam_detected: æ¤ç‚ºç³»çµ±çš„è‡ªå‹•å ±å‘Šï¼šå·²ç™¼ç¾åžƒåœ¾è¨Šæ¯ã€‚
   statuses:
     attached:
+      audio:
+        other: "%{count} æ®µå½±ç‰‡"
       description: é™„ä»¶ï¼š %{attached}
       image:
         other: "%{count} å¹…åœ–ç‰‡"
@@ -773,7 +1194,7 @@ zh-HK:
     disallowed_hashtags:
       other: åŒ…å«ä¸å…è¨±çš„æ¨™ç±¤ï¼š %{tags}
     errors:
-      in_reply_not_found: æ‚¨å˜—è©¦å›žè¦†çš„å˜Ÿæ–‡çœ‹èµ·ä¾†ä¸å˜åœ¨ã€‚
+      in_reply_not_found: ä½ æ‰€å›žè¦†çš„å˜Ÿæ–‡ä¸¦ä¸å˜åœ¨ã€‚
     language_detection: è‡ªå‹•åµæ¸¬èªžè¨€
     open_in_web: é–‹å•Ÿç¶²é 
     over_character_limit: è¶…éŽäº† %{max} å—çš„é™åˆ¶
@@ -783,8 +1204,16 @@ zh-HK:
       private: ä¸èƒ½ç½®é ‚éžå…¬é–‹çš„æ–‡ç« 
       reblog: ä¸èƒ½ç½®é ‚è½‰æŽ¨
     poll:
+      total_people:
+        other: "%{count} äºº"
+      total_votes:
+        other: "%{count} ç¥¨"
       vote: æŠ•ç¥¨
     show_more: é¡¯ç¤ºæ›´å¤š
+    show_newer: é¡¯ç¤ºè¼ƒæ–°å˜Ÿæ–‡
+    show_older: é¡¯ç¤ºè¼ƒèˆŠå˜Ÿæ–‡
+    show_thread: é¡¯ç¤ºè¨Žè«–ä¸²
+    sign_in_to_participate: ç™»å…¥ä»¥åŠ å…¥è¨Žè«–
     title: "%{name}ï¼šã€Œ%{quote}ã€"
     visibilities:
       private: é—œæ³¨è€…è§€çœ‹
@@ -797,7 +1226,90 @@ zh-HK:
     pinned: ç½®é ‚æ–‡ç« 
     reblogged: è½‰æŽ¨
     sensitive_content: æ•æ„Ÿå…§å®¹
+  tags:
+    does_not_match_previous_name: å’ŒèˆŠæœ‰åç¨±ä¸¦ä¸ç¬¦åˆ
   terms:
+    body_html: |
+      <h2>éš±ç§æ¬Šæ”¿ç–</h2>
+      <h3 id="collect">æˆ‘å€‘è’é›†ç”šéº¼è³‡è¨Šï¼Ÿ</h3>
+
+      <ul>
+      <li><em>åŸºæœ¬å¸³æˆ¶è³‡è¨Š</em>ï¼šå¦‚æžœæ‚¨åœ¨æ¤æœå‹™å™¨ä¸Šè¨»å†Šï¼Œæˆ‘å€‘å¯èƒ½æœƒè¦æ±‚æ‚¨è¼¸å…¥ç”¨æˆ¶åã€é›»åéƒµä»¶åœ°å€å’Œå¯†ç¢¼ã€‚ æ‚¨é‚„å¯ä»¥è¼¸å…¥å…¶ä»–å€‹äººè³‡æ–™ä¿¡æ¯ï¼ˆä¾‹å¦‚é¡¯ç¤ºåç¨±å’Œè‡ªæˆ‘ç°¡ä»‹ï¼‰ï¼Œä¸¦ä¸Šå‚³å€‹äººè³‡æ–™åœ–ç‰‡å’Œæ¨™é¡Œåœ–ç‰‡ã€‚ ç”¨æˆ¶åã€é¡¯ç¤ºåç¨±ã€è‡ªæˆ‘ç°¡ä»‹ã€å€‹äººè³‡æ–™åœ–ç‰‡å’Œæ¨™é¡Œåœ–ç‰‡æœƒæŒçºŒå…¬é–‹ã€‚</li>
+      <li><em>å¸–æ–‡ï¼Œé—œæ³¨å’Œå…¶ä»–å…¬å…±ä¿¡æ¯</em>ï¼šæ‚¨çš„é—œæ³¨å’Œè¿½éš¨è€…åå–®ç‚ºå…¬é–‹è³‡è¨Šã€‚ åœ¨ç™¼ä½ˆå¸–æ–‡æ™‚ï¼Œæˆ‘å€‘å°‡æœƒå˜å„²æ—¥æœŸå’Œæ™‚é–“ï¼Œä»¥åŠæ‚¨ç”¨ä»¥ç™¼ä½ˆå¸–æ–‡çš„æ‡‰ç”¨ç¨‹åºã€‚ å¸–æ–‡å¯èƒ½åŒ…å«å¤šåª’é«”é™„ä»¶ï¼Œä¾‹å¦‚åœ–ç‰‡å’Œè¦–é »ã€‚ å…¬é–‹å’Œéžå…¬é–‹(unlisted)çš„å¸–æ–‡ç‚ºå…¬é–‹è³‡è¨Šã€‚ æ‚¨åœ¨å€‹äººè³‡æ–™ä¸ŠæŽ¨è–¦çš„å¸–æ–‡æ™‚ä¹Ÿæ˜¯å…¬é–‹çš„è³‡è¨Šã€‚ æ‚¨çš„è¿½éš¨è€…æœƒæ”¶åˆ°ä½ çš„å¸–æ–‡ï¼Œåœ¨æŸäº›æƒ…æ³ä¸‹ï¼Œå®ƒå€‘æœ‰å¯èƒ½æœƒåœ¨ä¸åŒçš„æœå‹™å™¨äº’ç›¸å‚³éžä¸¦å°‡å„²å˜å‰¯æœ¬ã€‚ æ‚¨åˆªé™¤å¸–æ–‡æ™‚äº¦åŒæ¨£æœƒå‚³éžçµ¦æ‚¨çš„è¿½éš¨è€…ã€‚ è½‰ç™¼æˆ–æ”¶è—å…¶ä»–å¸–æ–‡çš„æ“ä½œå§‹çµ‚æ˜¯å…¬é–‹çš„ã€‚</li>
+      <li><em>ç§è¨Šå’Œè¿½éš¨è€…é™å®šçš„å¸–æ–‡</em>ï¼šæ‰€æœ‰çš„å¸–åéƒ½åœ¨æœå‹™å™¨ä¸Šè¢«å„²å˜å’Œè™•ç†ã€‚ è¿½éš¨è€…é™å®šçš„å¸–æ–‡å°‡å‚³éžçµ¦æ‚¨çš„è¿½éš¨è€…å’Œå…¶ä¸æåŠçš„ç”¨å®¶ï¼Œè€Œç§è¨Šåƒ…æœƒå‚³éžçµ¦å…¶ä¸æåŠçš„ç”¨æˆ¶ã€‚ åœ¨æŸäº›æƒ…æ³ä¸‹ï¼Œå®ƒå€‘æœ‰å¯èƒ½æœƒåœ¨ä¸åŒçš„æœå‹™å™¨äº’ç›¸å‚³éžä¸¦å°‡å„²å˜å‰¯æœ¬ã€‚ æˆ‘å€‘å°‡åŠªåŠ›åœ°å°‡è¨ªå•æ¬Šé™åˆ¶ç‚ºåƒ…æŽˆæ¬Šäººå“¡ï¼Œä½†å…¶ä»–æœå‹™å™¨å¯èƒ½ç„¡æ³•é€™æ¨£åšã€‚ å› æ¤ï¼Œè«‹æª¢æŸ¥æ‚¨çš„è¿½éš¨è€…æ‰€å±¬çš„æœå‹™å™¨ã€‚ æ‚¨å¯ä»¥åœ¨è¨ç½®ä¸é¸æ“‡æ‰‹å‹•æ‰¹å‡†å’Œæ‹’çµ•æ–°è¿½éš¨è€…ã€‚<em>è«‹è¨˜ä½ï¼Œæœå‹™å™¨å’Œä»»ä½•æŽ¥æ”¶æœå‹™å™¨çš„æ“ä½œå“¡éƒ½å¯ä»¥æŸ¥çœ‹æ¤é¡žæ¶ˆæ¯</em>ï¼Œä¸¦ä¸”æ”¶ä»¶äººå¯ä»¥æˆªå±ï¼Œè¤‡è£½æˆ–ä»¥å…¶ä»–æ–¹å¼é‡æ–°åˆ†äº«ã€‚ <em>è«‹å‹¿åœ¨Mastodonä¸Šåˆ†äº«ä»»ä½•å±éšªä¿¡æ¯ã€‚</em> </li>
+      <li> <em> IPå’Œå…¶ä»–å…ƒæ•¸æ“š</em>ï¼šç™»éŒ„æ™‚ï¼Œæˆ‘å€‘æœƒè¨˜éŒ„æ‚¨ç™»éŒ„æ™‚ä½¿ç”¨çš„IPä½å€ä»¥åŠç€è¦½å™¨æ‡‰ç”¨ç¨‹åºçš„åç¨±ã€‚ æ‚¨å¯ä»¥åœ¨è¨ç½®ä¸æŸ¥çœ‹å’Œæ’¤æ¶ˆæ‰€æœ‰å·²ç™»éŒ„çš„ä½œæ¥éšŽæ®µã€‚ æœ€æ–°ä¸Šå‚³çš„IPä½å€æœ€å¤šå¯ä»¥å„²å˜12å€‹æœˆã€‚ æˆ‘å€‘é‚„å¯èƒ½ä¿ç•™æœå‹™å™¨æ—¥èªŒï¼Œå…¶ä¸åŒ…æ‹¬å°æˆ‘å€‘æœå‹™å™¨çš„æ¯å€‹è«‹æ±‚çš„IPåœ°ä½ã€‚</li>
+      </ul>
+
+      <hr class="spacer" />
+
+      <h3 id="use">æ‚¨çš„è³‡è¨Šå°‡æœƒè¢«ç”¨åœ¨ç”šéº¼ç”¨é€”ï¼Ÿ</h3>
+
+      <p>æˆ‘å€‘å¾žæ‚¨é‚£è£¡æ”¶é›†çš„ä»»ä½•è³‡è¨Šéƒ½å¯èƒ½é€šéŽä»¥ä¸‹æ–¹å¼ä½¿ç”¨ï¼š</p>
+
+      <ul>
+      <li>æä¾›Mastodonçš„æ ¸å¿ƒåŠŸèƒ½ï¼šæ‚¨åªå¯ä»¥åœ¨ç™»éŒ„å¾Œèˆ‡å…¶ä»–äººçš„å…§å®¹äº¤æµä¸¦ç™¼ä½ˆè‡ªå·±çš„å…§å®¹ã€‚ä¾‹å¦‚ï¼Œæ‚¨å¯ä»¥è¿½éš¨å…¶ä»–äººä»¥åœ¨è‡ªå·±çš„å€‹äººåŒ–ä¸»é ä¸æŸ¥çœ‹ä»–å€‘çš„å¸–æ–‡ã€‚</li>
+      <li>ç¤¾å€ç®¡ç†ï¼šä¾‹å¦‚å°‡æ‚¨çš„IPä½å€èˆ‡å…¶ä»–å·²çŸ¥çš„IPä½å€é€²è¡Œæ¯”è¼ƒä¾†é‘‘å®šé€ƒé¿å°éŽ–æˆ–å…¶ä»–ä¾µæ¬Šè¡Œç‚ºã€‚</li>
+      <li>æ‚¨çš„é›»éƒµåœ°å€ï¼šå¯èƒ½æœƒè¢«ç”¨æ–¼å‘æ‚¨ç™¼é€ä¿¡æ¯ï¼Œæœ‰é—œå…¶ä»–äººèˆ‡æ‚¨äº’å‹•æˆ–å‘æ‚¨ç™¼é€æ¶ˆæ¯çš„é€šçŸ¥ï¼Œä¸¦ç”¨æ–¼ç”è¤‡æŸ¥è©¢å’Œ/æˆ–å…¶ä»–è«‹æ±‚æˆ–å•é¡Œã€‚</li>
+      </ul>
+
+      <hr class="spacer" />
+
+      <h3 id="protect">æˆ‘å€‘å¦‚ä½•ä¿è·æ‚¨çš„è³‡è¨Šï¼Ÿ</h3>
+
+      <p>ç•¶æ‚¨è¼¸å…¥ï¼Œæäº¤æˆ–è¨ªå•æ‚¨çš„å€‹äººä¿¡æ¯æ™‚ï¼Œæˆ‘å€‘æœƒæŽ¡å–å„ç¨®å®‰å…¨æŽªæ–½ä¾†ç¶è·æ‚¨çš„å€‹äººä¿¡æ¯çš„å®‰å…¨ã€‚ é™¤å…¶ä»–äº‹é …å¤–ï¼Œæ‚¨çš„ç€è¦½å™¨ä½œæ¥éšŽæ®µä»¥åŠæ‡‰ç”¨ç¨‹åºå’ŒAPIä¹‹é–“çš„æµé‡å‡ä½¿ç”¨SSLé€²è¡Œä¿è·ã€‚æ‚¨çš„å¯†ç¢¼ä¹Ÿæœƒä»¥å¼·å¤§çš„å–®å‘ç®—æ³•é€²è¡Œæ•£åˆ—è™•ç†ã€‚ æ‚¨äº¦å¯ä»¥å•Ÿç”¨å¤šé‡é©—è‰ï¼Œä»¥é€²ä¸€æ¥å®‰å…¨åœ°è¨ªå•æ‚¨çš„å¸³æˆ¶ã€‚</p>
+
+      <hr class="spacer" />
+
+      <h3 id="data-retention">æˆ‘å€‘çš„æ•¸æ“šä¿ç•™æ”¿ç–</h3>
+
+      <p>æˆ‘å€‘æœƒè‡´åŠ›ï¼š</p>
+
+      <ul>
+      <li>ä¿ç•™åŒ…å«å°è©²æœå‹™å™¨æ‰€æœ‰è«‹æ±‚çš„IPä½å€çš„æœå‹™å™¨æ—¥èªŒï¼Œè€Œä¿ç•™æ™‚é–“å°‡ä¸æœƒè¶…éŽ90å¤©ã€‚</li>
+      <li>ä¿ç•™èˆ‡è¨»å†Šç”¨æˆ¶é—œè¯çš„IPä½å€ä¸è¶…éŽ12å€‹æœˆã€‚</li>
+      </ul>
+
+      <p>æ‚¨å¯ä»¥è«‹æ±‚ä¸¦ä¸‹è¼‰æ‚¨çš„å…§å®¹å‚™ä»½ï¼ŒåŒ…æ‹¬æ‚¨çš„å¸–æ–‡ï¼Œåª’é«”é™„ä»¶ï¼Œå€‹äººè³‡æ–™åœ–ç‰‡å’Œæ¨™é¡Œåœ–ç‰‡ã€‚</p>
+
+      <p>æ‚¨äº¦å¯ä»¥éš¨æ™‚ä¸å¯é€†åœ°åˆªé™¤æ‚¨çš„å¸³æˆ¶ã€‚</p>
+
+      <hr class="spacer"/>
+
+      <h3 id="cookies">æˆ‘å€‘ä½¿ç”¨cookieså—Žï¼Ÿ</h3>
+
+      <p>æ˜¯ã€‚ Cookiesæ˜¯ç«™é»žæˆ–å…¶æœå‹™æä¾›å•†é€šéŽWebç€è¦½å™¨ï¼ˆå¦‚æžœå…è¨±ï¼‰å‚³è¼¸åˆ°è¨ˆç®—æ©Ÿç¡¬ç›¤çš„å°æ–‡ä»¶ã€‚ é€™äº›cookiesä½¿ç«™é»žèƒ½å¤ è˜åˆ¥æ‚¨çš„ç€è¦½å™¨ï¼Œä¸¦ä¸”å¦‚æžœæ‚¨å·²ç¶“æ“æœ‰è¨»å†Šå¸³æˆ¶ï¼Œæœƒé€£çµè‡³æ‚¨çš„è¨»å†Šå¸³æˆ¶ã€‚</p>
+
+      <p>æˆ‘å€‘ä½¿ç”¨Cookieä¾†äº†è§£ä¸¦ä¿å˜æ‚¨çš„åå¥½ï¼Œä»¥ä¾›å°‡ä¾†è¨ªå•ã€‚</p>
+
+      <hr class="spacer" />
+
+      <h3 id="disclose">æˆ‘å€‘æœƒå¦é€éœ²ä»»ä½•ä¿¡æ¯çµ¦ç¬¬ä¸‰æ–¹æ©Ÿæ§‹ï¼Ÿ</h3>
+
+      <p>æˆ‘å€‘ä¸æœƒå°‡æ‚¨çš„å€‹äººèº«ä»½ä¿¡æ¯å‡ºå”®ï¼Œäº¤æ˜“æˆ–ä»¥å…¶ä»–æ–¹å¼è½‰è®“çµ¦ç¬¬ä¸‰æ–¹ã€‚ é€™ä¸åŒ…æ‹¬åŒæ„å°é€™äº›ä¿¡æ¯ä¿å¯†çš„é‹ç‡Ÿæ–¹ï¼Œå’Œæˆ‘å€‘é–‹å±•æ¥å‹™æˆ–ç‚ºæ‚¨æä¾›æœå‹™çš„å—ä¿¡ä»»çš„ç¬¬ä¸‰æ–¹ã€‚æˆ‘å€‘æˆ–æœƒåœ¨åŸºæ–¼å°æ³•å¾‹çš„å°Šé‡ï¼Œæˆ–åœ¨åŸ·è¡Œæˆ‘å€‘çš„ç¶²ç«™æ”¿ç–æˆ–ä¿è·æˆ‘å€‘æˆ–å…¶ä»–äººçš„æ¬Šåˆ©ã€è²¡ç”¢æˆ–å®‰å…¨æ™‚é‡‹å‡ºä½ çš„å€‹äººè³‡æ–™ã€‚</p>
+
+      <p>æ‚¨çš„å…¬é–‹å…§å®¹å¯èƒ½æœƒè¢«ç¶²çµ¡ä¸çš„å…¶ä»–æœå‹™å™¨ä¸‹è¼‰ã€‚ åªè¦é€™äº›è¿½éš¨è€…æˆ–æ”¶ä»¶äººä½æ–¼èˆ‡ä¹‹ä¸åŒçš„æœå‹™å™¨ä¸Šï¼Œæ‚¨çš„å…¬é–‹å¸–æ–‡å’Œè¿½éš¨è€…é™å®šå¸–æ–‡å°‡å‚³éžåˆ°æ‚¨çš„è¿½éš¨è€…æ‰€åœ¨çš„æœå‹™å™¨ï¼Œè€Œç§ä¿¡å°‡å‚³éžçµ¦æ”¶ä»¶äººçš„æœå‹™å™¨ã€‚</p>
+
+      <p>ç•¶æ‚¨æŽˆæ¬Šæ‡‰ç”¨ç¨‹åºä½¿ç”¨æ‚¨çš„å¸³æˆ¶æ™‚ï¼Œæ ¹æ“šæ‚¨æ‰¹å‡†çš„æ¬Šé™ç¯„åœï¼Œå®ƒå¯èƒ½æœƒè¨ªå•æ‚¨çš„å…¬é–‹è³‡è¨Šï¼Œæ‚¨çš„é—œæ³¨åˆ—è¡¨ï¼Œæ‚¨çš„é—œæ³¨è€…ï¼Œæ‚¨çš„åˆ—è¡¨ï¼Œæ‰€æœ‰å¸–æ–‡ä»¥åŠæ‚¨çš„æ”¶è—å¤¾ã€‚ æ‡‰ç”¨ç¨‹åºæ°¸é ç„¡æ³•å–å¾—æ‚¨çš„é›»åéƒµä»¶åœ°å€æˆ–å¯†ç¢¼ã€‚</p>
+
+      <hr class="spacer" />
+
+      <h3 id="children">å…’ç«¥åœ¨ç¶²ç«™çš„æ‡‰ç”¨</h3>
+
+      <p>å¦‚æžœæ¤æœå‹™å™¨ä½æ–¼æç›Ÿæˆ–EEAä¸ï¼šæˆ‘å€‘çš„ç¶²ç«™ï¼Œç”¢å“å’Œæœå‹™åªç‚º16æ²æˆ–ä»¥ä¸Šçš„äººæä¾›æœå‹™ã€‚ å¦‚æžœæ‚¨æœªæ»¿16æ²ï¼Œè«‹æŒ‰ç…§GDPRçš„è¦æ±‚ (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">æç›Ÿä¸€èˆ¬è³‡æ–™ä¿è·è¦ç¯„</a>)ä¸ä½¿ç”¨æ¤ç¶²ç«™ã€‚</p>
+
+      <p>å¦‚æžœæ¤æœå‹™å™¨ä½æ–¼ç¾Žåœ‹ï¼šæˆ‘å€‘çš„ç¶²ç«™ï¼Œç”¢å“å’Œæœå‹™åªç‚º13æ²æˆ–ä»¥ä¸Šçš„äººæä¾›æœå‹™ã€‚ å¦‚æžœæ‚¨æœªæ»¿13æ²ï¼Œè«‹æŒ‰ç…§COPPAçš„è¦æ±‚ (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">å…’ç«¥åœ¨ç·šéš±ç§æ¬Šä¿è·æ³•</a>)ä¸ä½¿ç”¨æ¤ç¶²ç«™ã€‚</p>
+
+      <p>åœ¨å…¶ä»–ç®¡è½„å€å…§ï¼Œæ³•å¾‹è¦æ±‚å¯èƒ½æœƒæœ‰æ‰€ä¸åŒã€‚</p>
+
+      <hr class="spacer" />
+
+      <h3 id="changes">éš±ç§æ¬Šæ”¿ç–æ›´æ”¹</h3>
+
+      <p>è«‹æ ¹æ“šè‹±æ–‡ç‰ˆæœ¬æ‰€æº–ï¼Œæ¤ä¸æ–‡ç‰ˆæœ¬åªç‚ºè‹±æ–‡ç‰ˆéš±ç§æ”¿ç–çš„ç¿»è¯ç‰ˆæœ¬</p>
+
+      <p>æ¤æ–‡ä»¶ä»¥ CC-BY-SA æŽˆæ¬Šã€‚è‹±æ–‡ç‰ˆæœ¬çš„ç™¼ä½ˆæ—¥æœŸç‚º2018å¹´3æœˆ7æ—¥ã€‚æ¤ä¸æ–‡ç¿»è¯çš„ç¿»è¯æ—¥æœŸç‚º2020å¹´11æœˆ28æ—¥ã€‚</p>
+
+      <p>æœ€åˆæ”¹ç·¨è‡ª <a href="https://github.com/discourse/discourse">Discourseçš„éš±ç§æ¬Šæ”¿ç–</a>.</p>
     title: "%{instance} ä½¿ç”¨æ¢æ¬¾å’Œéš±ç§æ¬Šæ”¿ç–"
   themes:
     contrast: é«˜å°æ¯”
@@ -806,47 +1318,100 @@ zh-HK:
   time:
     formats:
       default: "%Yå¹´%-mæœˆ%dæ—¥ %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
-    code_hint: è«‹è¼¸å…¥ä½ èªè‰å™¨ç”¢ç”Ÿçš„ä»£ç¢¼ï¼Œä»¥ç¢ºèªè¨å®š
-    description_html: ç•¶ä½ å•Ÿç”¨<strong>é›™é‡èªè‰</strong>å¾Œï¼Œä½ ç™»å…¥æ™‚å°‡éœ€è¦ä½¿ä½ æ‰‹æ©Ÿã€æˆ–å…¶ä»–ç¨®é¡žèªè‰å™¨ç”¢ç”Ÿçš„ä»£ç¢¼ã€‚
+    add: æ–°å¢ž
     disable: åœç”¨
-    enable: å•Ÿç”¨
+    disabled_success: å·²æˆåŠŸå•Ÿç”¨é›™é‡èªè‰
+    edit: ç·¨è¼¯
     enabled: é›™é‡èªè‰å·²å•Ÿç”¨
     enabled_success: å·²æˆåŠŸå•Ÿç”¨é›™é‡èªè‰
     generate_recovery_codes: ç”¢ç”Ÿå‚™ç”¨é©—è‰ç¢¼
-    instructions_html: "<strong>è«‹ç”¨ä½ æ‰‹æ©Ÿçš„èªè‰å™¨æ‡‰ç”¨ç¨‹å¼ï¼ˆå¦‚ Google Authenticatorã€Authyï¼‰ï¼ŒæŽƒæé€™è£çš„QR åœ–å½¢ç¢¼</strong>ã€‚åœ¨é›™é‡èªè‰å•Ÿç”¨å¾Œï¼Œä½ ç™»å…¥æ™‚å°‡é ˆè¦ä½¿ç”¨æ¤æ‡‰ç”¨ç¨‹å¼ç”¢ç”Ÿçš„èªè‰ç¢¼ã€‚"
     lost_recovery_codes: è®“ä½ å¯ä»¥åœ¨éºå¤±é›»è©±æ™‚ï¼Œä½¿ç”¨å‚™ç”¨é©—è‰ç¢¼ç™»å…¥ã€‚å¦‚æžœä½ éºå¤±äº†å‚™ç”¨é©—è‰ç¢¼ï¼Œå¯ä»¥åœ¨é€™è£ç”¢ç”Ÿä¸€æ‰¹æ–°çš„ï¼ŒèˆŠæœ‰çš„å‚™ç”¨é©—è‰ç¢¼å°‡æœƒå¤±æ•ˆã€‚
-    manual_instructions: å¦‚æžœä½ ç„¡æ³•æŽƒæ QR åœ–å½¢ç¢¼ï¼Œè«‹æ‰‹å‹•è¼¸å…¥é€™å€‹æ–‡å—å¯†ç¢¼ï¸°
+    methods: é›™é‡èªè‰
+    otp: å¤šé‡èªè‰è»Ÿä»¶
     recovery_codes: å‚™ä»½æ¢å¾©é©—è‰ç¢¼
     recovery_codes_regenerated: æˆåŠŸç”¢ç”Ÿæ–°çš„å‚™ç”¨é©—è‰ç¢¼
     recovery_instructions_html: å¦‚æžœä½ éºå¤±äº†å®‰è£èªè‰å™¨çš„è£ç½®ï¼ˆå¦‚ï¸°ä½ çš„é›»è©±ï¼‰ï¼Œä½ å¯ä»¥ä½¿ç”¨å‚™ç”¨é©—è‰ç¢¼é€²è¡Œç™»å…¥ã€‚è«‹ç¢ºä¿å°‡å‚™ç”¨é©—è‰ç¢¼æ”¶è—ç©©ç•¶ï¼Œï¼ˆå¦‚åˆ—å°å‡ºä¾†ï¼Œå’Œä½ å…¶ä»–é‡è¦æ–‡ä»¶ä¸€èµ·å˜æ”¾ï¼‰ã€‚
-    setup: è¨å®š
-    wrong_code: ä½ è¼¸å…¥çš„èªè‰ç¢¼ä¸¦ä¸æ£ç¢ºï¼å¯èƒ½ä¼ºæœå™¨æ™‚é–“å’Œä½ æ‰‹æ©Ÿä¸ä¸€è‡´ï¼Œè«‹æª¢æŸ¥ä½ æ‰‹æ©Ÿçš„æ™‚é˜ï¼Œæˆ–èˆ‡æœ¬ç«™ç®¡ç†å“¡è¯çµ¡ã€‚
+    webauthn: å®‰å…¨å¯†é‘°
   user_mailer:
     backup_ready:
       explanation: ä½ è¦æ±‚çš„ Mastodon å¸³è™Ÿå®Œæ•´å‚™ä»½æª”æ¡ˆç¾å·²å°±ç·’ï¼Œå¯ä¾›ä¸‹è¼‰ã€‚
       subject: ä½ çš„å‚™ä»½æª”å·²å¯ä¾›ä¸‹è¼‰
       title: æª”æ¡ˆåŒ¯å‡º
+    sign_in_token:
+      details: é€™æ˜¯å˜—è©¦çš„è©³ç´°è³‡è¨Š
+      explanation: æˆ‘å€‘ç™¼ç¾æœ‰äººå˜—è©¦ä»¥æœªä½¿ç”¨éŽçš„ IP ä½å€ç™»å…¥åˆ°ä½ çš„å¸³è™Ÿã€‚ å¦‚æžœé€™å€‹ç™»å…¥çš„äººæ˜¯ä½ ï¼Œè«‹åœ¨ã€Œç™»å…¥è«‹æ±‚ã€é é¢ä¸Šè¼¸å…¥ä»¥ä¸‹å®‰å…¨ä»£ç¢¼ï¼š
+      further_actions: å¦‚æžœé€™ä¸æ˜¯ä½ ï¼Œè«‹åˆ°é€™è£æ›´æ”¹ä½ çš„å¯†ç¢¼ï¼Œä¸¦å•Ÿç”¨é›™é‡èªè‰ï¼š
+      subject: è«‹ç¢ºèªç™»å…¥è«‹æ±‚
+      title: ç™»å…¥è«‹æ±‚
+    warning:
+      explanation:
+        disable: ä½ ä¸èƒ½ä»¥ä»»ä½•æ–¹å¼ç™»å…¥æˆ–ä½¿ç”¨ä½ çš„å¸³è™Ÿï¼Œä½†ä½ çš„å€‹äººè³‡æ–™é é¢å’Œå…¶ä»–è³‡æ–™ä»ä¿æŒå®Œæ•´ã€‚
+        sensitive: ä½ ä¸Šè¼‰çš„åª’é«”æª”æ¡ˆå’Œé€£çµåª’é«”å°‡è¢«æ¨™è¨˜ç‚ºæ•æ„Ÿé …ç›®ã€‚
+        silence: ä½ ä»ç„¶å¯ä»¥ä½¿ç”¨ä½ çš„å¸³è™Ÿï¼Œä½†åªæœ‰ä½ ç¾æ™‚çš„è¿½éš¨è€…æœƒçœ‹è¦‹ä½ åœ¨æ¤ä¼ºæœå™¨çš„å˜Ÿæ–‡ã€‚ä½ æˆ–å¾žå…¬é–‹åå†Šä¸è¢«å‰”é™¤ã€‚ä½†æ˜¯å…¶ä»–äººä»ç„¶å¯ä»¥ä¸»å‹•é—œæ³¨ä½ ã€‚
+        suspend: ä½ å°‡ä¸èƒ½ä½¿ç”¨æ‚¨çš„å¸³è™Ÿï¼Œä½ çš„å€‹äººè³‡æ–™é é¢åŠå…¶ä»–è³‡æ–™å°‡ä¸èƒ½å†è¢«å–å¾—ã€‚ä½ ä»å¯åœ¨è³‡æ–™è¢«å®Œå…¨åˆªé™¤å‰è«‹æ±‚ä¸‹è¼‰ä½ çš„æ•¸æ“šï¼Œä½†æˆ‘å€‘ä»æœƒä¿ç•™ä¸€éƒ¨ä»½è³‡æ–™ï¼Œä»¥é˜²æ¢æœ‰äººè¦é¿åœæ¬Šè™•ç½°ã€‚
+      get_in_touch: ä½ å¯ä»¥å›žè¦†æ¤é›»éƒµä¾†è·Ÿæˆ‘å€‘(%{instance})è¯çµ¡
+      review_server_policies: å¯©è¦–ä¼ºæœå™¨æ”¿ç–
+      statuses: ç‰¹åˆ¥æ˜¯ï¼š
+      subject:
+        disable: ä½ çš„å¸³è™Ÿ %{acct} å·²ç¶“è¢«æ¶·çµ
+        none: è¦å‘Šå¸³è™Ÿ%{acct}
+        sensitive: ä½ çš„å¸³è™Ÿ %{acct} çš„åª’é«”å·²è¢«æ¨™è¨˜ç‚ºæ•æ„Ÿå…§å®¹
+        silence: ä½ çš„å¸³è™Ÿ %{acct} å·²ç¶“è¢«é™åˆ¶
+        suspend: ä½ çš„å¸³è™Ÿ %{acct} å·²ç¶“è¢«åœæ¬Š
+      title:
+        disable: å¸³è™Ÿæ¶·çµ
+        none: è¦å‘Š
+        sensitive: ä½ çš„åª’é«”å·²è¢«æ¨™è¨˜ç‚ºæ•æ„Ÿå…§å®¹
+        silence: è³¬æˆ¶å·²è¢«é™åˆ¶
+        suspend: å¸³è™Ÿå·²åœç”¨
     welcome:
       edit_profile_action: è¨å®šå€‹äººè³‡æ–™
       edit_profile_step: ä½ å¯ä»¥è¨å®šä½ çš„å€‹äººè³‡æ–™ï¼ŒåŒ…æ‹¬ä¸Šå‚³é åƒã€æ©«å¹…åœ–ç‰‡ã€æ›´æ”¹é¡¯ç¤ºåç¨±ç‰ç‰ã€‚å¦‚æžœä½ æƒ³åœ¨æ–°çš„é—œæ³¨è€…é—œæ³¨ä½ ä¹‹å‰å°ä»–å€‘é€²è¡Œå¯©æ ¸ï¼Œä½ ä¹Ÿå¯ä»¥é¸æ“‡ç‚ºä½ çš„å¸³æˆ¶è¨ç‚ºã€Œç§äººã€ã€‚
       explanation: ä¸‹é¢æ˜¯å¹¾å€‹å°è²¼å£«ï¼Œå¸Œæœ›å®ƒå€‘èƒ½å¹«åˆ°ä½ 
       final_action: é–‹å§‹ç™¼æ–‡
       final_step: 'é–‹å§‹ç™¼æ–‡å§ï¼å³ä½¿ä½ ç¾åœ¨æ²’æœ‰é—œæ³¨è€…ï¼Œå…¶ä»–äººä»ç„¶èƒ½åœ¨æœ¬ç«™æ™‚é–“è»¸æˆ–è€…è©±é¡Œæ¨™ç±¤ç‰åœ°æ–¹çœ‹åˆ°ä½ çš„å…¬é–‹æ–‡ç« ã€‚è©¦è‘—ç”¨ #introductions é€™å€‹è©±é¡Œæ¨™ç±¤ä»‹ç´¹ä¸€ä¸‹è‡ªå·±å§ã€‚'
-      full_handle: ä½ çš„å®Œæ•´ç”¨æˆ¶åœ°å€
-      full_handle_hint: ä½ éœ€è¦æŠŠé€™å€‹å‘Šè¨´ä½ çš„æœ‹å‹å€‘ï¼Œé€™æ¨£ä»–å€‘å°±èƒ½å¾žå¦ä¸€å€‹å¯¦ä¾‹å‘ä½ ç™¼é€ä¿¡æ¯æˆ–è€…é—œæ³¨ä½ ã€‚
-      review_preferences_action: æ›´æ”¹é¦–é¸é …
-      review_preferences_step: è¨˜å¾—èª¿æ•´ä½ çš„åå¥½è¨ç½®ï¼Œæ¯”å¦‚ä½ æƒ³æŽ¥æ”¶ä»€éº¼é¡žåž‹çš„éƒµä»¶ï¼Œæˆ–è€…ä½ æƒ³æŠŠä½ çš„æ–‡ç« å¯è¦‹ç¯„åœé»˜èªè¨å®šç‚ºä»€éº¼ç´šåˆ¥ã€‚å¦‚æžœä½ æ²’æœ‰æšˆè»Šçš„è©±ï¼Œè€ƒæ…®ä¸€ä¸‹å•Ÿç”¨ã€Œè‡ªå‹•æ’æ”¾ GIF å‹•ç•«ã€é€™å€‹é¸é …å§ã€‚
-      subject: æ¡è¿Žä¾†åˆ° Mastodon
-      tip_federated_timeline: è·¨ç«™å…¬å…±æ™‚é–“è»¸å¯ä»¥è®“ä½ ä¸€çªºæ›´å»£é—Šçš„ Mastodon ç¶²çµ¡ã€‚ä¸éŽï¼Œç”±æ–¼å®ƒåªé¡¯ç¤ºä½ çš„é„°å±…å€‘æ‰€è¨‚é–±çš„å…§å®¹ï¼Œæ‰€ä»¥ä¸¦ä¸æ˜¯å…¨éƒ¨ã€‚
-      tip_following: é»˜èªæƒ…æ³ä¸‹ï¼Œä½ æœƒè‡ªå‹•é—œæ³¨ä½ æ‰€åœ¨æœå‹™ç«™çš„ç®¡ç†å“¡ã€‚æƒ³çµäº¤æ›´å¤šæœ‰è¶£çš„äººçš„è©±ï¼Œè¨˜å¾—å¤šé€›é€›æœ¬ç«™æ™‚é–“è»¸å’Œè·¨ç«™å…¬å…±æ™‚é–“è»¸å“¦ã€‚
-      tip_local_timeline: æœ¬ç«™æ™‚é–“è»¸å¯ä»¥è®“ä½ ä¸€çªº %{instance} ä¸Šçš„ç”¨æˆ¶ã€‚ä»–å€‘å°±æ˜¯é›¢ä½ æœ€è¿‘çš„é„°å±…ï¼
-      tip_mobile_webapp: å¦‚æžœä½ çš„ç§»å‹•è¨å‚™ç€è¦½å™¨å…è¨±ä½ å°‡ Mastodon æ·»åŠ åˆ°ä¸»å±å¹•ï¼Œä½ å°±èƒ½å¤ æŽ¥æ”¶æŽ¨é€æ¶ˆæ¯ã€‚å®ƒå°±åƒæœ¬åœ°æ‡‰ç”¨ä¸€æ¨£å¥½ä½¿ï¼
+      full_handle: ä½ çš„å®Œæ•´ Mastodon åœ°å€
+      full_handle_hint: é€™è¨Šæ¯å°‡é¡¯ç¤ºçµ¦ä½ æœ‹å‹å€‘ï¼Œè®“ä»–å€‘èƒ½å¾žå¦ä¸€å€‹æœå‹™ç«™ç™¼ä¿¡æ¯çµ¦ä½ ï¼Œæˆ–è€…é—œæ³¨ä½ çš„ã€‚
+      review_preferences_action: æ›´æ”¹åå¥½è¨å®š
+      review_preferences_step: è¨˜å¾—èª¿æ•´ä½ çš„åå¥½è¨å®šï¼Œæ¯”å¦‚ä½ æƒ³æŽ¥æ”¶ä»€éº¼é¡žåž‹çš„éƒµä»¶ï¼Œæˆ–è€…ä½ æƒ³æŠŠä½ çš„æ–‡ç« å¯è¦‹ç¯„åœé»˜èªè¨å®šç‚ºä»€éº¼ç´šåˆ¥ã€‚å¦‚æžœä½ æ²’æœ‰æšˆè»Šçš„è©±ï¼Œè€ƒæ…®ä¸€ä¸‹å•Ÿç”¨ã€Œè‡ªå‹•æ’æ”¾ GIF å‹•ç•«ã€é€™å€‹é¸é …å§ã€‚
+      subject: æ¡è¿Žä¾†åˆ° Mastodon (è¬è±¡)
+      tip_federated_timeline: è·¨ç«™æ™‚é–“è»¸å¯ä»¥è®“ä½ ä¸€çªºæ›´å»£é—Šçš„ Mastodon ç¶²çµ¡ã€‚ä¸éŽï¼Œç”±æ–¼å®ƒåªé¡¯ç¤ºä½ çš„é„°å±…å€‘æ‰€è¨‚é–±çš„å…§å®¹ï¼Œæ‰€ä»¥ä¸¦ä¸æ˜¯å…¨éƒ¨ã€‚
+      tip_following: ä½ æœƒé è¨é—œæ³¨ä½ æœå‹™ç«™çš„ç®¡ç†å“¡ã€‚æƒ³çµäº¤æ›´å¤šæœ‰è¶£çš„äººçš„è©±ï¼Œè¨˜å¾—å¤šé€›é€›æœ¬ç«™æ™‚é–“è»¸å’Œè·¨ç«™æ™‚é–“è»¸å“¦ã€‚
+      tip_local_timeline: æœ¬ç«™æ™‚é–“è»¸å¯ä»¥è®“ä½ ä¸€çªº %{instance} æœ¬ç«™ä¸Šçš„ç”¨æˆ¶ã€‚ä»–å€‘å°±æ˜¯é›¢ä½ æœ€è¿‘çš„é„°å±…ï¼
+      tip_mobile_webapp: å¦‚æžœä½ çš„ç§»å‹•è¨å‚™ç€è¦½å™¨æ”¯æ´ï¼Œä½ å¯ä»¥å°‡ Mastodon åŠ åˆ°è£ç½®çš„ä¸»ç•«é¢ï¼Œè®“ä½ å¯ä»¥é¸æ“‡æŽ¥æ”¶æŽ¨é€é€šçŸ¥ï¼Œå°±åƒæœ¬æ©Ÿçš„ App ä¸€æ¨£æ–¹ä¾¿ï¼
       tips: å°è²¼å£«
-      title: "%{name}ï¼Œæ¡è¿Žä½ çš„åŠ å…¥ï¼"
+      title: æ¡è¿Ž %{name} åŠ å…¥ï¼
   users:
+    blocked_email_provider: æ¤é›»éƒµæä¾›å•†ä¸¦ä¸è¢«å…è¨±
+    follow_limit_reached: ä½ ä¸èƒ½é—œæ³¨å¤šæ–¼%{limit} äºº
+    generic_access_help_html: ä¸èƒ½ç™»å…¥ï¼Ÿä½ å¯ä»¥å¯„é›»éƒµè‡³ %{email} å°‹æ±‚å”åŠ©
     invalid_email: é›»éƒµåœ°å€æ ¼å¼ä¸æ£ç¢º
-    invalid_otp_token: é›™é‡èªè‰ç¢ºèªç¢¼ä¸æ£ç¢º
-    otp_lost_help_html: å¦‚æžœä½ ç„¡æ³•è¨ªå•é€™å…©è€…ï¼Œå¯ä»¥é€šéŽ %{email} èˆ‡æˆ‘å€‘è¯ç¹«
-    seamless_external_login: ç”±æ–¼ä½ æ˜¯å¾žå¤–éƒ¨ç³»çµ±ç™»å…¥ï¼Œæ‰€ä»¥ä¸èƒ½è¨å®šå¯†ç¢¼å’Œé›»éƒµã€‚
+    invalid_email_mx: æ¤é›»éƒµåœ°å€ä¸å˜åœ¨
+    invalid_otp_token: é›™é‡èªè‰ç¢¼ä¸æ£ç¢º
+    invalid_sign_in_token: ç„¡æ•ˆçš„å®‰å…¨ç¢¼
+    otp_lost_help_html: å¦‚æžœé€™å…©è€…ä½ å‡ç„¡æ³•ç™»å…¥ï¼Œä½ å¯ä»¥è¯ç¹« %{email}
+    seamless_external_login: å› ç‚ºä½ æ£åœ¨ä½¿ç”¨ç¬¬ä¸‰æ–¹æœå‹™ç™»å…¥ï¼Œæ‰€ä»¥ä¸èƒ½è¨å®šå¯†ç¢¼å’Œé›»éƒµã€‚
     signed_in_as: ç›®å‰ç™»å…¥çš„å¸³æˆ¶ï¼š
+    suspicious_sign_in_confirmation: ä½ ä¼¼ä¹Žæœªæ›¾å¾žæ¤è¨å‚™ç™»å…¥ï¼Œè€Œä½ åˆæœ‰ä¸€æ®µæ™‚é–“æ²’æœ‰ç™»å…¥äº†ã€‚æˆ‘å€‘å‰›å‰›æŠŠå®‰å…¨ç¢¼å‚³é€åˆ°ä½ çš„é›»éƒµåœ°å€ï¼Œè«‹æŸ¥çœ‹ä½ çš„é›»éƒµä¿¡ç®±ï¼Œä»¥ç¢ºèªä½ æ˜¯å¸³è™Ÿæ“æœ‰è€…æœ¬äººã€‚
+  verification:
+    explanation_html: ä½ å¯ä»¥<strong>èªè‰å€‹äººè³‡æ–™é é¢çš„å…ƒæ•¸æ“š (Metadata) é€£çµæ˜¯å±¬æ–¼ä½ çš„</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} æ³¨å†Š
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 96dd012259a091950a3249caa10e0afe6c8b431d..da340a1bc3349836d44a5dbc75f9a310b36c5656 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -21,6 +21,9 @@ zh-TW:
     federation_hint_html: ä½ åªéœ€è¦æ“æœ‰ %{instance} çš„å¸³æˆ¶ï¼Œå°±å¯ä»¥è¿½è¹¤éš¨ä¾¿ä¸€å° Mastodon ä¼ºæœå™¨ä¸Šçš„äººç‰ç‰ã€‚
     get_apps: å˜—è©¦è¡Œå‹•æ‡‰ç”¨ç¨‹å¼
     hosted_on: åœ¨ %{domain} é‹ä½œçš„ Mastodon ç«™é»ž
+    instance_actor_flash: 'é€™å€‹å¸³æˆ¶æ˜¯å€‹ç”¨ä¾†ä»£è¡¨ä¼ºæœå™¨è‡ªå·²çš„è™›æ“¬è§’è‰²ï¼Œè€Œä¸æ˜¯å¯¦éš›çš„ä½¿ç”¨è€…ã€‚å®ƒæ˜¯ç”¨ä¾†è¯ç›Ÿç”¨çš„ï¼Œé™¤éžæ‚¨æƒ³è¦å°éŽ–æ•´å€‹ç«™å°ï¼Œä¸ç„¶ä¸è©²å°éŽ–å®ƒã€‚ä½†è¦å°éŽ–æ•´å€‹ç«™å°ï¼Œæ‚¨å¯ä»¥ä½¿ç”¨ç¶²åŸŸå°éŽ–åŠŸèƒ½ã€‚
+
+'
     learn_more: äº†è§£è©³ç´°
     privacy_policy: éš±ç§æ¬Šæ”¿ç–
     see_whats_happening: çœ‹çœ‹ç™¼ç”Ÿä»€éº¼äº‹
@@ -37,18 +40,24 @@ zh-TW:
       reason: åŽŸå› 
       rejecting_media: ä¸æœƒè™•ç†æˆ–å„²å˜é€™äº›ä¼ºæœå™¨çš„åª’é«”æª”æ¡ˆï¼Œä¹Ÿä¸æœƒé¡¯ç¤ºç¸®åœ–ï¼Œéœ€è¦æ‰‹å‹•é»žé¸åŽŸå§‹æª”ï¼š
       rejecting_media_title: éŽæ¿¾çš„åª’é«”
+      silenced: é€™äº›ä¼ºæœå™¨çš„å˜Ÿæ–‡æœƒè¢«å¾žå…¬é–‹æ™‚é–“è»¸èˆ‡å°è©±ä¸éš±è—ï¼Œè€Œä¸”èˆ‡å®ƒå€‘çš„ä½¿ç”¨è€…äº’å‹•ä¸¦ä¸æœƒç”¢ç”Ÿä»»ä½•é€šçŸ¥ï¼Œé™¤éžæ‚¨è¿½è¹¤ä»–å€‘ï¼š
       silenced_title: éœéŸ³çš„ä¼ºæœå™¨
+      suspended: ä¾†è‡ªé€™äº›ä¼ºæœå™¨çš„è³‡æ–™éƒ½ä¸æœƒè¢«è™•ç†ã€å„²å˜æˆ–äº¤æ›ï¼Œä¹Ÿç„¡æ³•å’Œé€™äº›ä¼ºæœå™¨ä¸Šçš„ä½¿ç”¨è€…äº’å‹•èˆ‡æºé€šï¼š
       suspended_title: æš«åœçš„ä¼ºæœå™¨
+    unavailable_content_html: Mastodon ä¸€èˆ¬ä¾†èªªå…è¨±æ‚¨é–±è®€ä¸¦å’Œä»»ä½•è¯ç›Ÿä¼ºæœå™¨ä¸Šçš„ä½¿ç”¨è€…äº’å‹•ã€‚é€™äº›ä¼ºæœå™¨æ˜¯é€™å€‹ç«™å°è¨ä¸‹çš„ä¾‹å¤–ã€‚
     user_count_after:
       other: ä½ä½¿ç”¨è€…
     user_count_before: è¨»å†Šä½¿ç”¨è€…æ•¸
     what_is_mastodon: ä»€éº¼æ˜¯ Mastodon?
   accounts:
     choices_html: "%{name} çš„é¸æ“‡ï¼š"
+    endorsements_hint: æŽ¨è–¦æ‚¨å·²ç¶“é—œæ³¨çš„äººï¼ŒæŠŠä»–å€‘é‡˜åœ¨æ‚¨çš„å€‹äººé é¢ã€‚
+    featured_tags_hint: æ‚¨å¯ä»¥æŽ¨è–¦ä¸åŒä¸»é¡Œæ¨™ç±¤ï¼Œå®ƒå€‘ä¹Ÿæœƒåœ¨æ¤è™•å‡ºç¾ã€‚
     follow: é—œæ³¨
     followers:
       other: é—œæ³¨è€…
     following: æ£åœ¨é—œæ³¨
+    instance_actor_flash: é€™å€‹å¸³è™Ÿæ˜¯ä¸€å€‹ç”¨ä¾†ä»£è¡¨æ¤ä¼ºæœå™¨çš„è™›æ“¬åŸ·è¡Œè€…ï¼Œè€ŒéžçœŸå¯¦ä½¿ç”¨è€…ã€‚å®ƒç”¨é€”ç‚ºç«™é»žè¯ç›Ÿä¸”ä¸æ‡‰è¢«åœæ¬Šã€‚
     joined: åŠ å…¥æ–¼ %{date}
     last_active: ä¸Šæ¬¡æ´»èºæ™‚é–“
     link_verified_on: æ¤é€£çµçš„æ‰€æœ‰æ¬Šå·²åœ¨ %{date} æª¢æŸ¥éŽ
@@ -59,6 +68,8 @@ zh-TW:
     nothing_here: æš«æ™‚æ²’æœ‰å…§å®¹å¯ä¾›é¡¯ç¤º!
     people_followed_by: "%{name} é—œæ³¨çš„äºº"
     people_who_follow: é—œæ³¨ %{name} çš„äºº
+    pin_errors:
+      following: ä½ åªèƒ½æŽ¨è–¦ä½ æ£åœ¨é—œæ³¨çš„ä½¿ç”¨è€…ã€‚
     posts:
       other: å˜Ÿæ–‡
     posts_tab_heading: å˜Ÿæ–‡
@@ -84,6 +95,7 @@ zh-TW:
       add_email_domain_block: å°‡é›»åéƒµä»¶ç¶²åŸŸåŠ å…¥é»‘åå–®
       approve: æ ¸å‡†
       approve_all: å…¨éƒ¨æ‰¹å‡†
+      approved_msg: æˆåŠŸå¯©æ ¸äº†%{username} çš„æ–°å¸³æˆ¶ç”³è«‹
       are_you_sure: æ‚¨ç¢ºå®šå—Ž?
       avatar: é åƒ
       by_domain: ç«™é»ž
@@ -97,8 +109,10 @@ zh-TW:
       confirm: ç¢ºå®š
       confirmed: å·²ç¢ºå®š
       confirming: ç¢ºå®š
+      delete: åˆªé™¤è³‡æ–™
       deleted: å·²åˆªé™¤
       demote: é™ç´š
+      destroyed_msg: å³å°‡åˆªé™¤ %{username} çš„æ•¸æ“š
       disable: åœç”¨
       disable_two_factor_authentication: åœç”¨å…©éšŽæ®µèªè‰
       disabled: å·²åœç”¨
@@ -109,10 +123,12 @@ zh-TW:
       email_status: é›»åä¿¡ç®±ç‹€æ…‹
       enable: å•Ÿç”¨
       enabled: å·²å•Ÿç”¨
+      enabled_msg: æˆåŠŸè§£é™¤ %{username} å¸³æˆ¶çš„å‡çµ
       followers: é—œæ³¨è€…
       follows: æ£åœ¨é—œæ³¨
       header: é–‹é 
       inbox_url: æ”¶ä»¶ç®± (Inbox) URL
+      invite_request_text: åŠ å…¥åŽŸå› 
       invited_by: é‚€è«‹è€…
       ip: IP ä½å€
       joined: å·²åŠ å…¥
@@ -124,6 +140,8 @@ zh-TW:
       login_status: ç™»å…¥ç‹€æ…‹
       media_attachments: å¤šåª’é«”é™„ä»¶
       memorialize: è¨å®šç‚ºè¿½æ‚¼å¸³æˆ¶
+      memorialized: è¢«æ‚¼å¿µçš„
+      memorialized_msg: æˆåŠŸå°‡%{username} çš„å¸³è™Ÿè®Šç‚ºç´€å¿µå¸³è™Ÿ
       moderation:
         active: æ´»èº
         all: å…¨éƒ¨
@@ -144,10 +162,14 @@ zh-TW:
       public: å…¬é–‹
       push_subscription_expires: PuSH è¨‚é–±éŽæœŸ
       redownload: é‡æ–°æ•´ç†å€‹äººè³‡æ–™
+      redownloaded_msg: æˆåŠŸé‡æ–°è¼‰å…¥%{username} çš„å€‹äººè³‡æ–™é é¢
       reject: æ‹’çµ•
       reject_all: å…¨éƒ¨æ‹’çµ•
+      rejected_msg: æˆåŠŸæ‹’çµ•äº†%{username} çš„æ–°å¸³è™Ÿç”³è«‹
       remove_avatar: å–æ¶ˆé åƒ
       remove_header: ç§»é™¤é–‹é 
+      removed_avatar_msg: æˆåŠŸåˆªé™¤äº† %{username} çš„é åƒ
+      removed_header_msg: æˆåŠŸåˆªé™¤äº† %{username} çš„é é¢é ‚ç«¯
       resend_confirmation:
         already_confirmed: æ¤ä½¿ç”¨è€…å·²è¢«ç¢ºèª
         send: é‡æ–°ç™¼é€é©—è‰ä¿¡
@@ -164,6 +186,8 @@ zh-TW:
       search: æœå°‹
       search_same_email_domain: å…¶ä»–æœ‰åŒå€‹é›»åéƒµä»¶ç¶²åŸŸçš„ä½¿ç”¨è€…
       search_same_ip: å…¶ä»–æœ‰åŒå€‹ IP çš„ä½¿ç”¨è€…
+      sensitive: æ•æ„Ÿå†…å®¹
+      sensitized: å·²æ¨™è¨˜ç‚ºæ•æ„Ÿå…§å®¹
       shared_inbox_url: å…±äº«æ”¶ä»¶ç®±ç¶²å€
       show:
         created_reports: å»ºç«‹æª¢èˆ‰
@@ -173,13 +197,19 @@ zh-TW:
       statuses: å˜Ÿæ–‡
       subscribe: è¨‚é–±
       suspended: å·²åœæ¬Š
+      suspension_irreversible: å·²æ°¸ä¹…åˆªé™¤é€™å€‹å¸³æˆ¶çš„æ•¸æ“šã€‚é›–ç„¶é€™å€‹å¸³æˆ¶çš„æ•¸æ“šå·²è¢«æ°¸ä¹…åˆªé™¤ï¼Œä½†æ˜¯æ‚¨ä»ç„¶å¯ä»¥å–æ¶ˆæš«åœé€™å€‹å¸³æˆ¶ã€‚
+      suspension_reversible_hint_html: é€™å€‹å¸³æˆ¶å·²è¢«æš«åœï¼Œæ‰€æœ‰æ•¸æ“šå°‡æœƒåœ¨ %{date} è¢«åˆªé™¤ã€‚åœ¨æ¤ä¹‹å‰ï¼Œæ‚¨å¯ä»¥å®Œå…¨å›žå¾©æ‚¨çš„å¸³æˆ¶ã€‚å¦‚æžœæ‚¨æƒ³å³æ™‚åˆªé™¤é€™å€‹å¸³æˆ¶çš„æ•¸æ“šï¼Œæ‚¨å¯ä»¥åœ¨ä¸‹é¢é€²è¡Œæ“ä½œã€‚
       time_in_queue: æ£åœ¨ä½‡åˆ—ç‰å¾… %{time}
       title: å¸³æˆ¶
       unconfirmed_email: æœªç¢ºèªçš„é›»åä¿¡ç®±ä½å€
+      undo_sensitized: å–æ¶ˆæ•æ„Ÿç‹€æ…‹
       undo_silenced: å–æ¶ˆéœéŸ³
       undo_suspension: å–æ¶ˆåœæ¬Š
+      unsilenced_msg: æˆåŠŸè§£é™¤ %{username} çš„å¸³æˆ¶é™åˆ¶
       unsubscribe: å–æ¶ˆè¨‚é–±
+      unsuspended_msg: æˆåŠŸå–æ¶ˆæš«åœ %{username} çš„å¸³æˆ¶
       username: ä½¿ç”¨è€…åç¨±
+      view_domain: æŸ¥çœ‹ç«™å°æ¦‚è¦
       warn: è¦å‘Š
       web: é é¢
       whitelisted: å·²åŠ å…¥ç™½åå–®
@@ -193,6 +223,38 @@ zh-TW:
         create_custom_emoji: å»ºç«‹è‡ªè¨‚é¡æ–‡å—
         create_domain_allow: å»ºç«‹å…è¨±ç¶²åŸŸ
         create_domain_block: å»ºç«‹é˜»æ“‹ç¶²åŸŸ
+        create_email_domain_block: å°éŽ–é›»åéƒµä»¶ç«™å°
+        create_ip_block: æ–°å¢žIPè¦å‰‡
+        demote_user: æŠŠç”¨æˆ¶é™ç´š
+        destroy_announcement: åˆªé™¤å…¬å‘Š
+        destroy_custom_emoji: åˆªé™¤è‡ªè¨‚é¡æ–‡å—
+        destroy_domain_allow: åˆªé™¤å…è¨±ç¶²åŸŸ
+        destroy_domain_block: åˆªé™¤é˜»æ“‹ç¶²åŸŸ
+        destroy_email_domain_block: åˆªé™¤é˜»æ“‹é›»éƒµç¶²åŸŸ
+        destroy_ip_block: åˆªé™¤ IP è¦å‰‡
+        destroy_status: åˆªé™¤ç‹€æ…‹
+        disable_2fa_user: åœç”¨å…©éšŽæ®µèªè‰
+        disable_custom_emoji: åœç”¨è‡ªè¨‚é¡æ–‡å—
+        disable_user: åœç”¨å¸³æˆ¶
+        enable_custom_emoji: å•“ç”¨è‡ªè¨‚é¡æ–‡å—
+        enable_user: å•“ç”¨å¸³æˆ¶
+        memorialize_account: è¨å®šæˆç´€å¿µå¸³è™Ÿ
+        promote_user: æŠŠç”¨æˆ¶å‡ç´š
+        remove_avatar_user: åˆªé™¤å¤§é è²¼
+        reopen_report: é‡é–‹èˆ‰å ±
+        reset_password_user: é‡è¨å¯†ç¢¼
+        resolve_report: æ¶ˆé™¤èˆ‰å ±
+        sensitive_account: æŠŠæ‚¨çš„å¸³è™Ÿçš„åª’é«”æ¨™è¨˜ç‚ºæ•æ„Ÿå…§å®¹
+        silence_account: éœéŸ³ç”¨æˆ¶
+        suspend_account: æš«åœç”¨æˆ¶
+        unassigned_report: å–æ¶ˆæŒ‡æ´¾èˆ‰å ±
+        unsensitive_account: å–æ¶ˆæŠŠæ‚¨çš„å¸³è™Ÿçš„åª’é«”è¨å®šç‚ºæ•æ„Ÿå…§å®¹
+        unsilence_account: å–æ¶ˆç”¨æˆ¶çš„éœéŸ³ç‹€æ…‹
+        unsuspend_account: å–æ¶ˆç”¨æˆ¶çš„æš«åœç‹€æ…‹
+        update_announcement: æ›´æ–°å…¬å‘Š
+        update_custom_emoji: æ›´æ–°è‡ªè¨‚é¡æ–‡å—
+        update_domain_block: æ›´æ–°å°éŽ–ç¶²åŸŸ
+        update_status: æ›´æ–°ç‹€æ…‹
       actions:
         assigned_to_self_report: "%{name} æŽ¥å—äº†æª¢èˆ‰ %{target}"
         change_email_user: "%{name} è®Šæ›´äº†ä½¿ç”¨è€… %{target} çš„é›»åä¿¡ç®±ä½å€"
@@ -203,12 +265,14 @@ zh-TW:
         create_domain_allow: "%{name} å°‡ %{target} ç¶²åŸŸåŠ å…¥é»‘åå–®äº†"
         create_domain_block: "%{name} å°éŽ–äº†ç«™é»ž %{target}"
         create_email_domain_block: "%{name} å°éŽ–äº†é›»åä¿¡ç®±ç¶²åŸŸ %{target}"
+        create_ip_block: "%{name} å·²ç¶“è¨å®šäº†IP %{target} çš„è¦å‰‡"
         demote_user: "%{name} æŠŠä½¿ç”¨è€… %{target} é™ç´š"
         destroy_announcement: "%{name} åˆªé™¤äº†å…¬å‘Š %{target}"
         destroy_custom_emoji: "%{name} ç ´å£žäº† %{target} è¡¨æƒ…ç¬¦è™Ÿ"
         destroy_domain_allow: "%{name} å¾žç™½åå–®ä¸ç§»é™¤äº† %{target} ç¶²åŸŸ"
         destroy_domain_block: "%{name} å–æ¶ˆäº†å°ç«™é»ž %{target} çš„å°éŽ–"
         destroy_email_domain_block: "%{name} å–æ¶ˆäº†å°é›»åä¿¡ç®±ç¶²åŸŸ %{target} çš„å°éŽ–"
+        destroy_ip_block: "%{name} å·²ç¶“åˆªé™¤äº† IP %{target} çš„è¦å‰‡"
         destroy_status: "%{name} åˆªé™¤äº† %{target} çš„å˜Ÿæ–‡"
         disable_2fa_user: "%{name} åœç”¨äº†ä½¿ç”¨è€… %{target} çš„å…©éšŽæ®µèªè‰"
         disable_custom_emoji: "%{name} åœç”¨äº†è‡ªè¨‚è¡¨æƒ…ç¬¦è™Ÿ %{target}"
@@ -221,15 +285,21 @@ zh-TW:
         reopen_report: "%{name} é‡æ–°é–‹å•Ÿ %{target} çš„æª¢èˆ‰"
         reset_password_user: "%{name} é‡æ–°è¨å®šäº†ä½¿ç”¨è€… %{target} çš„å¯†ç¢¼"
         resolve_report: "%{name} è™•ç†äº† %{target}ã€€çš„æª¢èˆ‰"
+        sensitive_account: "%{name} å°‡ %{target} çš„åª’é«”æª”æ¡ˆæ¨™è¨˜ç‚ºæ•æ„Ÿå…§å®¹"
         silence_account: "%{name} éœéŸ³äº†ä½¿ç”¨è€… %{target}"
         suspend_account: "%{name} åœæ¬Šäº†ä½¿ç”¨è€… %{target}"
         unassigned_report: "%{name} å–æ¶ˆæŒ‡æ´¾ %{target} çš„æª¢èˆ‰"
+        unsensitive_account: "%{name} å°‡ %{target} çš„åª’é«”æª”æ¡ˆçš„æ•æ„Ÿç‹€æ…‹å–æ¶ˆ"
         unsilence_account: "%{name} å–æ¶ˆäº†ä½¿ç”¨è€… %{target} çš„éœéŸ³ç‹€æ…‹"
         unsuspend_account: "%{name} å–æ¶ˆäº†ä½¿ç”¨è€… %{target} çš„åœæ¬Šç‹€æ…‹"
         update_announcement: "%{name} æ›´æ–°äº†å…¬å‘Š %{target}"
         update_custom_emoji: "%{name} æ›´æ–°äº†è‡ªè¨‚è¡¨æƒ…ç¬¦è™Ÿ %{target}"
+        update_domain_block: "%{name} æ›´æ–°å°éŽ–ç¶²åŸŸ %{target}"
         update_status: "%{name} é‡æ•´äº† %{target} çš„å˜Ÿæ–‡"
       deleted_status: "ï¼ˆå·²åˆªé™¤å˜Ÿæ–‡ï¼‰"
+      empty: æ‰¾ä¸åˆ° log
+      filter_by_action: æŒ‰å‹•ä½œç¯©é¸
+      filter_by_user: æŒ‰ä½¿ç”¨è€…ç¯©é¸
       title: ç‡Ÿé‹æ—¥èªŒ
     announcements:
       destroyed_msg: æˆåŠŸåˆªé™¤å…¬å‘Šï¼
@@ -268,11 +338,13 @@ zh-TW:
       listed: å·²é¡¯ç¤º
       new:
         title: åŠ å…¥æ–°çš„è‡ªè¨‚è¡¨æƒ…ç¬¦è™Ÿ
+      not_permitted: æ‚¨ç„¡æ¬ŠåŸ·è¡Œæ¤æ“ä½œ
       overwrite: è¦†è“‹
       shortcode: çŸä»£ç¢¼
       shortcode_hint: è‡³å°‘ 2 å€‹å—å…ƒï¼Œåªèƒ½ä½¿ç”¨å—æ¯ã€æ•¸å—å’Œä¸‹åŠƒç·š
       title: è‡ªè¨‚è¡¨æƒ…ç¬¦è™Ÿ
       uncategorized: æœªåˆ†é¡ž
+      unlist: ä¸å…¬é–‹
       unlisted: å·²éš±è—
       update_failed_msg: ç„¡æ³•æ›´æ–°è¡¨æƒ…ç¬¦è™Ÿ
       updated_msg: å·²æ›´æ–°è¡¨æƒ…ç¬¦è™Ÿ!
@@ -315,6 +387,8 @@ zh-TW:
       created_msg: æ£åœ¨é€²è¡Œç«™é»žå°éŽ–
       destroyed_msg: å·²æ’¤éŠ·ç«™é»žå°éŽ–
       domain: ç«™é»ž
+      edit: æ›´æ”¹å°éŽ–çš„ç«™å°
+      existing_domain_block_html: æ‚¨å·²ç¶“å° %{name} æ–½åŠ äº†æ›´åš´æ ¼çš„é™åˆ¶ï¼Œæ‚¨éœ€è¦å…ˆæŠŠä»–<a href="%{unblock_url}">å–æ¶ˆå°éŽ–</a>ã€‚
       new:
         create: æ–°å¢žå°éŽ–
         hint: ç«™é»žå°éŽ–å‹•ä½œä¸¦ä¸æœƒé˜»æ¢å¸³æˆ¶ç´€éŒ„è¢«æ–°å¢žè‡³è³‡æ–™åº«ï¼Œä½†æœƒè‡ªå‹•å›žæº¯æ€§åœ°å°é‚£äº›å¸³æˆ¶å¥—ç”¨ç‰¹å®šç®¡ç†è¨å®šã€‚
@@ -324,6 +398,12 @@ zh-TW:
           silence: éœéŸ³
           suspend: åœæ¬Š
         title: æ–°å¢žå°éŽ–ç«™é»ž
+      obfuscate: æ··æ·†ç¶²åŸŸåç¨±
+      obfuscate_hint: è‹¥å•Ÿç”¨ç¶²åŸŸå»£å‘Šåˆ—è¡¨é™åˆ¶ï¼Œæ–¼åˆ—è¡¨éƒ¨ä»½æ··æ·†ç¶²åŸŸåç¨±
+      private_comment: ç§äººç•™è¨€
+      private_comment_hint: è«‹æä¾›æ›´å¤šæœ‰é—œæ¤ç«™å°é™åˆ¶çš„è³‡è¨Šä»¥ä¾›ç‰ˆä¸»ä½œå…§éƒ¨åƒè€ƒã€‚
+      public_comment: å…¬é–‹ç•™è¨€
+      public_comment_hint: å¦‚æžœä½ å·²ç¶“å•Ÿç”¨ç«™å°é™åˆ¶åˆ—è¡¨çš„å…¬å‘Šï¼Œè«‹ç‚ºä¸€èˆ¬å¤§çœ¾æä¾›æ›´å¤šæœ‰é—œæ¤ç«™å°é™åˆ¶çš„è³‡è¨Šã€‚
       reject_media: æ‹’çµ•åª’é«”æª”æ¡ˆ
       reject_media_hint: åˆªé™¤æœ¬åœ°å¿«å–çš„åª’é«”æª”æ¡ˆï¼Œä¸¦ä¸”ä¸å†æŽ¥æ”¶ä¾†è‡ªè©²ç«™é»žçš„ä»»ä½•åª’é«”æª”æ¡ˆã€‚èˆ‡åœæ¬Šç„¡é—œ
       reject_reports: æ‹’çµ•æª¢èˆ‰
@@ -342,44 +422,99 @@ zh-TW:
         title: æ’¤éŠ· %{domain} çš„ç«™é»žå°éŽ–
         undo: æ’¤éŠ·
       undo: å¾©åŽŸæ¬²å°éŽ–åŸŸå
+      view: é¡¯ç¤ºé˜»æ“‹çš„ç¶²åŸŸ
     email_domain_blocks:
       add_new: åŠ å…¥æ–°é …ç›®
       created_msg: å·²æˆåŠŸå°‡é›»åä¿¡ç®±ç¶²åŸŸåŠ å…¥é»‘åå–®
       delete: åˆªé™¤
       destroyed_msg: å·²æˆåŠŸå¾žé»‘åå–®åˆªé™¤é›»åä¿¡ç®±ç¶²åŸŸ
       domain: ç«™é»ž
+      empty: ç¾åœ¨æ²’æœ‰é˜»æ“‹ä»»ä½• e-mail ç¶²åŸŸã€‚
+      from_html: ç”± %{domain}
       new:
         create: æ–°å¢žç«™é»ž
         title: æ–°å¢žé›»åä¿¡ç®±é»‘åå–®é …ç›®
       title: é›»åä¿¡ç®±é»‘åå–®
     instances:
+      by_domain: ç«™å°
+      delivery_available: å¯å‚³é€
+      empty: æ‰¾ä¸åˆ°ç¶²åŸŸ
+      known_accounts:
+        other: "%{count} å·²çŸ¥çš„å¸³æˆ¶"
       moderation:
         all: å…¨éƒ¨
         limited: é™åˆ¶
         title: ç‰ˆä¸»
+      private_comment: ç§äººç•™è¨€
+      public_comment: å…¬é–‹ç•™è¨€
       title: è¯é‚¦
+      total_blocked_by_us: è¢«æˆ‘å€‘å°éŽ–
+      total_followed_by_them: è¢«ä»–å€‘é—œæ³¨
+      total_followed_by_us: è¢«æˆ‘å€‘é—œæ³¨
+      total_reported: é—œæ–¼ä»–å€‘çš„èˆ‰å ±
+      total_storage: å¤šåª’é«”é™„æª”
     invites:
+      deactivate_all: å…¨éƒ¨åœç”¨
       filter:
         all: å…¨éƒ¨
         available: å¯ç”¨
         expired: å·²å¤±æ•ˆ
         title: ç¯©é¸
       title: é‚€è«‹ä½¿ç”¨è€…
+    ip_blocks:
+      add_new: å»ºç«‹è¦å‰‡
+      created_msg: æ›´æ–° IP è¦å‰‡æˆåŠŸ
+      delete: åˆªé™¤
+      expires_in:
+        '1209600': 2 å€‹æ˜ŸæœŸ
+        '15778476': 6 å€‹æœˆ
+        '2629746': 1 å€‹æœˆ
+        '31556952': 1 å¹´
+        '86400': 1 å¤©
+        '94670856': 3 å¹´
+      new:
+        title: å»ºç«‹æ–°çš„ IP è¦å‰‡
+      no_ip_block_selected: å› ç‚ºæ²’æœ‰é¸æ“‡ä»»ä½• IP è¦å‰‡ï¼Œæ‰€ä»¥ä»€éº¼äº‹éƒ½æ²’ç™¼ç”Ÿ
+      title: IP è¦å‰‡
+    pending_accounts:
+      title: å¾…è™•ç†å¸³æˆ¶(%{count})
+    relationships:
+      title: "%{acct} çš„é—œä¿‚"
     relays:
+      add_new: æ–°å¢žä¸ç¹¼ç«™
+      delete: åˆªé™¤
       description_html: "<strong>è¯é‚¦ä¸ç¹¼ç«™</strong> æ˜¯ç¨®ä¸ç¹¼ä¼ºæœå™¨ï¼Œæœƒåœ¨è¨‚é–±ä¸¦æŽ¨é€è‡³æ¤ä¸ç¹¼ç«™çš„ä¼ºæœå™¨ä¹‹é–“äº¤æ›å¤§é‡çš„å…¬é–‹å˜Ÿæ–‡ã€‚<strong>ä¸ç¹¼ç«™ä¹Ÿèƒ½å”åŠ©å°åž‹æˆ–ä¸åž‹ä¼ºæœå™¨å¾žè¯é‚¦ä¸æŽ¢ç´¢å…§å®¹</strong>ï¼Œè€Œç„¡é ˆæœ¬åœ°ä½¿ç”¨è€…æ‰‹å‹•é—œæ³¨é ç«¯ä¼ºæœå™¨çš„å…¶ä»–ä½¿ç”¨è€…ã€‚"
+      disable: åœç”¨
       disabled: åœç”¨
       enable: å•Ÿç”¨
+      enable_hint: å•Ÿç”¨å¾Œï¼Œä½ çš„ä¼ºæœå™¨å°‡è¨‚é–±è©²ä¸ç¹¼çš„æ‰€æœ‰å…¬é–‹æ–‡ç« ï¼Œä¸¦å°‡æœƒæ¤ä¼ºæœå™¨çš„å…¬é–‹æ–‡ç« ç™¼é€çµ¦å®ƒã€‚
+      enabled: å·²å•Ÿç”¨
+      inbox_url: ä¸ç¹¼URL
+      pending: ç‰å¾…ä¸ç¹¼ç«™å¯©æ ¸
+      save_and_enable: å„²å˜ä¸¦å•Ÿç”¨
+      setup: è¨å®šä¸ç¹¼é€£çµ
+      signatures_not_enabled: è‹¥å•Ÿç”¨å®‰å…¨æ¨¡å¼æˆ–å—é™çš„ç«™é»žè¯ç›Ÿæ¨¡å¼ï¼Œä¸ç¹¼å°‡ä¸æœƒæ£å¸¸é‹ä½œ
+      status: ç‹€æ…‹
+      title: ä¸ç¹¼
     report_notes:
       created_msg: æª¢èˆ‰è¨˜éŒ„å»ºç«‹æˆåŠŸ!
       destroyed_msg: æª¢èˆ‰è¨˜éŒ„åˆªé™¤æˆåŠŸ!
     reports:
+      account:
+        notes:
+          other: "%{count} å‰‡å‚™è¨»"
+        reports:
+          other: "%{count} å‰‡æª¢èˆ‰"
       action_taken_by: æ“ä½œåŸ·è¡Œè€…
       are_you_sure: ä½ ç¢ºå®šå—Ž?
       assign_to_self: æŒ‡æ´¾çµ¦è‡ªå·±
       assigned: æŒ‡æ´¾è² è²¬äºº
+      by_target_domain: æª¢èˆ‰å¸³è™Ÿä¹‹ç¶²åŸŸ
       comment:
         none: ç„¡
       created_at: æ—¥æœŸ
+      forwarded: å·²è½‰å¯„
+      forwarded_to: è½‰å¯„åˆ° %{domain}
       mark_as_resolved: æ¨™è¨˜ç‚ºã€Œå·²è§£æ±ºã€
       mark_as_unresolved: æ¨™è¨˜ç‚ºã€Œæœªè§£æ±ºã€
       notes:
@@ -409,19 +544,33 @@ zh-TW:
       contact_information:
         email: ç”¨æ–¼è¯çµ¡çš„å…¬é–‹é›»åä¿¡ç®±ä½å€
         username: è«‹è¼¸å…¥ä½¿ç”¨è€…åç¨±
+      custom_css:
+        desc_html: é€éŽæ–¼æ¯å€‹é é¢éƒ½è¼‰å…¥çš„ CSS èª¿æ•´å¤–è§€
+        title: è‡ªè¨‚ CSS
+      default_noindex:
+        desc_html: å½±éŸ¿æ‰€æœ‰æ²’æœ‰è®Šæ›´æ¤è¨å®šçš„ä½¿ç”¨è€…
+        title: é è¨å°‡ä½¿ç”¨è€…é€€å‡ºæœå°‹å¼•æ“Žç´¢å¼•
       domain_blocks:
         all: çµ¦ä»»ä½•äºº
         disabled: çµ¦æ²’æœ‰äºº
         title: é¡¯ç¤ºå°éŽ–çš„ç¶²åŸŸ
+        users: å¥—ç”¨è‡³æ‰€æœ‰ç™»å…¥çš„æœ¬æ©Ÿä½¿ç”¨è€…
+      domain_blocks_rationale:
+        title: é¡¯ç¤ºè§£é‡‹åŽŸå› 
       enable_bootstrap_timeline_accounts:
+        desc_html: ä½¿æ–°ä½¿ç”¨è€…è‡ªå‹•è·Ÿéš¨è¨å®šä¹‹å¸³è™Ÿï¼Œæ‰€ä»¥ä»–å€‘çš„é¦–é å‹•æ…‹ä¸€é–‹å§‹ä¸æœƒç©ºç™½
         title: å•Ÿç”¨æ–°ä½¿ç”¨è€…çš„é è¨è¿½è¹¤
       hero:
         desc_html: åœ¨é¦–é é¡¯ç¤ºã€‚æŽ¨è–¦æœ€å° 600x100pxã€‚å¦‚æžœç•™ç©ºï¼Œå°±æœƒé‡è¨å›žä¼ºæœå™¨é è¦½åœ–
         title: ä¸»é¡Œåœ–ç‰‡
+      mascot:
+        desc_html: åœ¨è¨±å¤šé é¢éƒ½æœƒé¡¯ç¤ºã€‚æŽ¨è–¦æœ€å° 293x205pxã€‚å¦‚æžœç•™ç©ºï¼Œå°‡æŽ¡ç”¨é è¨çš„å‰ç¥¥ç‰©
+        title: å‰ç¥¥ç‰©åœ–ç‰‡
       peers_api_enabled:
         desc_html: æœ¬ä¼ºæœå™¨åœ¨è¯é‚¦ä¸ç™¼ç¾çš„ç«™é»ž
         title: ç™¼å¸ƒå·²çŸ¥ä¼ºæœå™¨çš„åˆ—è¡¨
       preview_sensitive_media:
+        desc_html: é€£çµä¾†è‡ªå…¶ä»–ç¶²ç«™çš„é è¦½å°‡é¡¯ç¤ºæ–¼ç¸®åœ–ï¼Œå³ä½¿é€™äº›åª’é«”è¢«æ¨™è¨˜ç‚ºæ•æ„Ÿ
         title: åœ¨ OpenGraph é è¦½ä¸é¡¯ç¤ºæ•æ„Ÿåª’é«”
       profile_directory:
         desc_html: å…è¨±èƒ½æŽ¢ç´¢ä½¿ç”¨è€…
@@ -436,6 +585,8 @@ zh-TW:
         min_invite_role:
           disabled: æ²’æœ‰äºº
           title: å…è¨±ç™¼é€é‚€è«‹çš„èº«ä»½
+        require_invite_text:
+          title: è¦æ±‚æ–°ä½¿ç”¨è€…å¡«ç”³è«‹æ›¸ä»¥ç´¢å–é‚€è«‹
       registrations_mode:
         modes:
           approved: è¨»å†Šéœ€è¦æ ¸å‡†
@@ -469,6 +620,8 @@ zh-TW:
         desc_html: åœ¨ä¸»é é¡¯ç¤ºæœ¬ç«™æ™‚é–“è»¸
         title: æ™‚é–“è»¸é è¦½
       title: ç¶²ç«™è¨å®š
+      trendable_by_default:
+        title: å…è¨±ç†±é–€çš„ä¸»é¡Œæ¨™ç±¤ç›´æŽ¥é¡¯ç¤ºæ–¼è¶¨å‹¢å€ï¼Œä¸éœ€ç¶“éŽå¯©æ ¸
       trends:
         title: è¶¨å‹¢ä¸»é¡Œæ¨™ç±¤
     site_uploads:
@@ -489,6 +642,8 @@ zh-TW:
       title: å¸³æˆ¶å˜Ÿæ–‡
       with_media: å«æœ‰åª’é«”æª”æ¡ˆ
     tags:
+      accounts_today: æœ¬æ—¥ä¸é‡è¤‡ä½¿ç”¨è€…æ•¸
+      accounts_week: æœ¬é€±ä¸é‡è¤‡ä½¿ç”¨è€…æ•¸
       context: ä¸Šä¸‹æ–‡
       directory: åœ¨ç›®éŒ„ä¸
       in_directory: ç›®éŒ„ä¸æœ‰ %{count} å€‹
@@ -513,10 +668,16 @@ zh-TW:
       body_remote: ä¾†è‡ª %{domain} çš„ä½¿ç”¨è€…æª¢èˆ‰äº†ä½¿ç”¨è€… %{target}
       subject: ä¾†è‡ª %{instance} çš„ä½¿ç”¨è€…æª¢èˆ‰ï¼ˆ#%{id}ï¼‰
   appearance:
+    advanced_web_interface: é€²éšŽç¶²é ä»‹é¢
+    advanced_web_interface_hint: é€²éšŽç¶²é ç•Œé¢å¯è®“æ‚¨é…ç½®è¨±å¤šä¸åŒçš„æ¬„ä½ä¾†å–„ç”¨å¤šé¤˜çš„èž¢å¹•ç©ºé–“ï¼Œä¾éœ€è¦åŒæ™‚æŸ¥çœ‹ç›¡å¯èƒ½å¤šçš„è³‡è¨Šå¦‚ï¼šé¦–é ã€é€šçŸ¥ã€ç«™é»žè¯é‚¦æ™‚é–“è»¸ã€ä»»æ„æ•¸é‡çš„åˆ—è¡¨å’Œä¸»é¡Œæ¨™ç±¤ã€‚
+    animations_and_accessibility: å‹•ç•«èˆ‡å¯ç”¨æ€§
+    discovery: æŽ¢ç´¢
     localization:
       body: Mastodon æ˜¯ç”±å¿—é¡˜è€…ç¿»è¯çš„ã€‚
       guide_link: https://crowdin.com/project/mastodon
       guide_link_text: æ¯å€‹äººéƒ½èƒ½è²¢ç»ã€‚
+    sensitive_content: æ•æ„Ÿå…§å®¹
+    toot_layout: å˜Ÿæ–‡ä½ˆå±€
   application_mailer:
     notification_preferences: è®Šæ›´é›»åä¿¡ä»¶è¨å®š
     salutation: "%{name}ã€"
@@ -533,12 +694,16 @@ zh-TW:
     warning: è¦å‘Šï¼Œä¸è¦æŠŠå®ƒåˆ†äº«çµ¦ä»»ä½•äºº!
     your_token: ä½ çš„ token
   auth:
+    apply_for_account: ç´¢å–è¨»å†Šé‚€è«‹
     change_password: å¯†ç¢¼
     delete_account: åˆªé™¤å¸³æˆ¶
     delete_account_html: å¦‚æžœä½ æƒ³åˆªé™¤ä½ çš„å¸³æˆ¶ï¼Œè«‹<a href="%{path}">é»žæ“Šé€™è£¡ç¹¼çºŒ</a>ã€‚ä½ éœ€è¦ç¢ºèªä½ çš„æ“ä½œã€‚
+    description:
+      prefix_sign_up: ç¾åœ¨å°±è¨»å†Š Mastodon å¸³è™Ÿå§ï¼
     didnt_get_confirmation: æ²’æœ‰æ”¶åˆ°é©—è‰ä¿¡?
     forgot_password: å¿˜è¨˜å¯†ç¢¼ï¼Ÿ
     invalid_reset_password_token: å¯†ç¢¼é‡è¨ token ç„¡æ•ˆæˆ–å·²éŽæœŸã€‚è«‹é‡æ–°è¨å®šå¯†ç¢¼ã€‚
+    link_to_webauth: ä½¿ç”¨æ‚¨çš„å®‰å…¨é‡‘é‘°
     login: ç™»å…¥
     logout: ç™»å‡º
     migrate_account: è½‰ç§»åˆ°å¦ä¸€å€‹å¸³æˆ¶
@@ -547,10 +712,14 @@ zh-TW:
     providers:
       saml: SAML
     register: è¨»å†Š
+    registration_closed: "%{instance} ç¾åœ¨ä¸é–‹æ”¾æ–°æˆå“¡"
     resend_confirmation: é‡æ–°å¯„é€ç¢ºèªæŒ‡å¼•
     reset_password: é‡è¨å¯†ç¢¼
     security: ç™»å…¥è³‡è¨Š
     set_new_password: è¨å®šæ–°å¯†ç¢¼
+    setup:
+      email_settings_hint_html: è«‹ç¢ºèª e-mail æ˜¯å¦å‚³é€åˆ° %{email} ã€‚å¦‚æžœä¸å°çš„è©±ï¼Œå¯ä»¥å¾žå¸³è™Ÿè¨å®šä¿®æ”¹ã€‚
+      title: è¨å®š
   authorize_follow:
     already_following: ä½ å·²ç¶“é—œæ³¨äº†é€™å€‹ä½¿ç”¨è€…
     already_requested: æ‚¨æ—©å·²å‘è©²å¸³æˆ¶å¯„é€è¿½è¹¤è«‹æ±‚
@@ -609,15 +778,20 @@ zh-TW:
     lists: åˆ—è¡¨
     mutes: æ‚¨éœéŸ³çš„ä½¿ç”¨è€…
     storage: å„²å˜ç©ºé–“å¤§å°
+  featured_tags:
+    hint_html: "<strong>æŽ¨è–¦æ¨™ç±¤æ˜¯ä»€éº¼ï¼Ÿ</strong> é€™äº›æ¨™ç±¤å°‡é¡¯ç¤ºæ–¼æ‚¨çš„å…¬é–‹å€‹äººæª”æ¡ˆé ï¼Œè¨ªå®¢å¯ä»¥è—‰æ¤é–±è¦½æ‚¨æ¨™ç¤ºäº†é€™äº›æ¨™ç±¤çš„å˜Ÿæ–‡ï¼Œæ‹¿ä¾†å±•ç¤ºå‰µæ„ä½œå“æˆ–è€…é•·æœŸæ›´æ–°çš„å°ˆæ¡ˆå¾ˆå¥½ç”¨å”·ï¼"
   filters:
     index:
       empty: æ‚¨æ²’æœ‰éŽæ¿¾å™¨ã€‚
+      title: éŽæ¿¾å™¨
   footer:
     more: æ›´å¤š......
+    trending_now: ç¾æ£ç†±é–€
   generic:
     all: å…¨éƒ¨
     changes_saved_msg: å·²æˆåŠŸå„²å˜ä¿®æ”¹!
     copy: è¤‡è£½
+    delete: åˆªé™¤
     save_changes: å„²å˜ä¿®æ”¹
   imports:
     preface: æ‚¨å¯ä»¥åœ¨æ¤åŒ¯å…¥æ‚¨åœ¨å…¶ä»–ä¼ºæœå™¨æ‰€åŒ¯å‡ºçš„è³‡æ–™æª”ï¼ŒåŒ…æ‹¬é—œæ³¨çš„ä½¿ç”¨è€…ã€å°éŽ–çš„ä½¿ç”¨è€…åå–®ã€‚
@@ -656,6 +830,8 @@ zh-TW:
       too_many: ç„¡æ³•åŠ å…¥è¶…éŽ 4 å€‹æª”æ¡ˆ
   migrations:
     acct: æ–°å¸³æˆ¶çš„ ä½¿ç”¨è€…åç¨±@ç«™é»žç¶²åŸŸ
+    proceed_with_move: ç§»å‹•é—œæ³¨è€…
+    redirected_msg: æ‚¨çš„å¸³è™Ÿç¾åœ¨æŒ‡å‘ %{acct}
   moderation:
     title: ç‡Ÿé‹
   notification_mailer:
@@ -686,6 +862,10 @@ zh-TW:
       body: 'ä½ çš„å˜Ÿæ–‡è¢« %{name} è½‰å˜Ÿ:'
       subject: "%{name} è½‰å˜Ÿäº†ä½ çš„å˜Ÿæ–‡"
       title: æ–°çš„è½‰å˜Ÿ
+  notifications:
+    email_events: é›»åéƒµä»¶é€šçŸ¥è¨å®š
+    email_events_hint: é¸å–ä½ æƒ³æŽ¥æ”¶é€šçŸ¥çš„äº‹ä»¶ï¼š
+    other_settings: å…¶ä»–é€šçŸ¥è¨å®š
   number:
     human:
       decimal_units:
@@ -701,6 +881,8 @@ zh-TW:
     next: ä¸‹ä¸€é 
     older: è¼ƒèˆŠ
     prev: ä¸Šä¸€é 
+  preferences:
+    other: å…¶ä»–è¨å®š
   remote_follow:
     acct: è«‹è¼¸å…¥æ‚¨çš„ä½¿ç”¨è€…åç¨±@ç«™é»žç¶²åŸŸ
     missing_resource: ç„¡æ³•æ‰¾åˆ°è³‡æº
@@ -738,16 +920,19 @@ zh-TW:
     revoke_success: Session å–æ¶ˆæˆåŠŸ
     title: ä½œæ¥éšŽæ®µ
   settings:
+    appearance: å¤–è§€è¨å®š
     authorized_apps: å·²æŽˆæ¬Šæ‡‰ç”¨ç¨‹å¼
     back: å›žåˆ° Mastodon
     delete: åˆªé™¤å¸³æˆ¶
     development: é–‹ç™¼
     edit_profile: ç·¨è¼¯ä½¿ç”¨è€…è³‡è¨Š
     export: åŒ¯å‡º
+    featured_tags: æŽ¨è–¦æ¨™ç±¤
     import: åŒ¯å…¥
     migrate: å¸³æˆ¶æ¬é·
     notifications: é€šçŸ¥
     preferences: åå¥½è¨å®š
+    profile: ä½¿ç”¨è€…è³‡è¨Š
     two_factor_authentication: å…©éšŽæ®µèªè‰
   statuses:
     attached:
@@ -787,21 +972,14 @@ zh-TW:
     formats:
       default: "%Yå¹´%-mæœˆ%dæ—¥ %H:%M"
   two_factor_authentication:
-    code_hint: è«‹è¼¸å…¥æ‚¨èªè‰å™¨ç”¢ç”Ÿçš„ä»£ç¢¼ï¼Œä»¥é€²è¡Œèªè‰
-    description_html: å•Ÿç”¨<strong>å…©éšŽæ®µèªè‰</strong>å¾Œï¼Œç™»å…¥æ™‚å°‡éœ€è¦ä½¿æ‰‹æ©Ÿã€æˆ–å…¶ä»–ç¨®é¡žèªè‰å™¨ç”¢ç”Ÿçš„ä»£ç¢¼ã€‚
     disable: åœç”¨
-    enable: å•Ÿç”¨
     enabled: å…©éšŽæ®µèªè‰å·²å•Ÿç”¨
     enabled_success: å·²æˆåŠŸå•Ÿç”¨å…©éšŽæ®µèªè‰
     generate_recovery_codes: ç”¢ç”Ÿå‚™ç”¨é©—è‰ç¢¼
-    instructions_html: "<strong>è«‹ç”¨æ‚¨æ‰‹æ©Ÿçš„èªè‰å™¨æ‡‰ç”¨ç¨‹å¼ï¼ˆå¦‚ Google Authenticatorã€Authyï¼‰ï¼ŒæŽƒæé€™è£¡çš„ QR åœ–å½¢ç¢¼</strong>ã€‚åœ¨å…©éšŽæ®µèªè‰å•Ÿç”¨å¾Œï¼Œæ‚¨ç™»å…¥æ™‚å°‡é ˆè¦ä½¿ç”¨æ¤æ‡‰ç”¨ç¨‹å¼ç”¢ç”Ÿçš„èªè‰ç¢¼ã€‚"
     lost_recovery_codes: è®“ä½ å¯ä»¥åœ¨éºå¤±æ‰‹æ©Ÿæ™‚ï¼Œä½¿ç”¨å‚™ç”¨é©—è‰ç¢¼ç™»å…¥ã€‚å¦‚æžœä½ éºå¤±äº†å‚™ç”¨é©—è‰ç¢¼ï¼Œå¯ä»¥åœ¨é€™è£ç”¢ç”Ÿä¸€æ‰¹æ–°çš„ï¼ŒèˆŠæœ‰çš„å‚™ç”¨é©—è‰ç¢¼å°‡æœƒå¤±æ•ˆã€‚
-    manual_instructions: 'å¦‚æžœæ‚¨ç„¡æ³•æŽƒæ QR åœ–å½¢ç¢¼ï¼Œè«‹æ‰‹å‹•è¼¸å…¥:'
     recovery_codes: å‚™ä»½å‚™ç”¨é©—è‰ç¢¼
     recovery_codes_regenerated: æˆåŠŸç”¢ç”Ÿæ–°çš„å‚™ç”¨é©—è‰ç¢¼
     recovery_instructions_html: å¦‚æžœä½ çš„æ‰‹æ©Ÿç„¡æ³•ä½¿ç”¨ï¼Œä½ å¯ä»¥ä½¿ç”¨ä¸‹åˆ—ä»»æ„ä¸€å€‹å‚™ç”¨é©—è‰ç¢¼ä¾†é‡æ–°ç²å¾—å¸³æˆ¶çš„è¨ªå•æ¬Šã€‚<strong>è«‹å¦¥å–„ä¿ç®¡å¥½ä½ çš„å‚™ç”¨é©—è‰ç¢¼</strong>ï¼ˆä¾‹å¦‚ï¼Œä½ å¯ä»¥å°‡å®ƒå€‘åˆ—å°å‡ºä¾†ï¼Œèˆ‡ä½ çš„å…¶ä»–é‡è¦æ–‡ä»¶æ”¾åœ¨ä¸€èµ·ï¼‰ã€‚
-    setup: è¨å®š
-    wrong_code: æ‚¨è¼¸å…¥çš„èªè‰ç¢¼ç„¡æ•ˆ! è«‹ç¢ºèªä¼ºæœå™¨æ™‚é–“èˆ‡è¨å‚™æ™‚é–“æ˜¯å¦æ£ç¢º?
   user_mailer:
     backup_ready:
       explanation: ä½ è¦æ±‚çš„ Mastodon å¸³æˆ¶å®Œæ•´å‚™ä»½æª”æ¡ˆç¾å·²å°±ç·’ï¼Œå¯ä¾›ä¸‹è¼‰!
@@ -825,8 +1003,15 @@ zh-TW:
       tips: å°å¹«æ‰‹
       title: "%{name} æ¡è¿Žä½ çš„åŠ å…¥ï¼"
   users:
+    blocked_email_provider: ä¸å…è¨±ä½¿ç”¨é€™å€‹é›»åä¿¡ç®±æä¾›è€…
     invalid_email: é›»åä¿¡ç®±ä½å€ä¸æ£ç¢º
+    invalid_email_mx: ä¼¼ä¹Žæ²’æœ‰é€™å€‹é›»åä¿¡ç®±åœ°å€
     invalid_otp_token: å…©éšŽæ®µèªè‰ç¢¼ä¸æ£ç¢º
     otp_lost_help_html: å¦‚æžœä½ ç„¡æ³•è¨ªå•é€™å…©è€…ï¼Œå¯ä»¥é€šéŽ %{email} èˆ‡æˆ‘å€‘è¯ç¹«
     seamless_external_login: ç”±æ–¼ä½ æ˜¯å¾žå¤–éƒ¨ç³»çµ±ç™»å…¥ï¼Œæ‰€ä»¥ä¸èƒ½è¨å®šå¯†ç¢¼èˆ‡é›»åéƒµä»¶ã€‚
     signed_in_as: ç›®å‰ç™»å…¥çš„å¸³æˆ¶ï¼š
+  verification:
+    explanation_html: æ‚¨åœ¨ Mastodon å€‹äººè³‡æ–™é ä¸Šæ‰€åˆ—å‡ºçš„é€£çµï¼Œå¯ä»¥ç”¨æ¤æ–¹å¼<strong>é©—è‰æ‚¨ç¢ºå¯¦æŽŒæŽ§è©²é€£çµç¶²é çš„å…§å®¹</strong>ã€‚æ‚¨å¯ä»¥åœ¨é€£çµçš„ç¶²é ä¸ŠåŠ ä¸Šä¸€å€‹é€£å›ž Mastodon å€‹äººè³‡æ–™é çš„é€£çµï¼Œè©²é€£çµçš„åŽŸå§‹ç¢¼ <strong>å¿…é ˆ</strong>åŒ…å«<code>rel="me"</code>å±¬æ€§ã€‚é€£çµçš„é¡¯ç¤ºæ–‡å—å¯è‡ªç”±ç™¼æ®ï¼Œä»¥ä¸‹ç‚ºç¯„ä¾‹ï¼š
+    verification: é©—è‰é€£çµ
+  webauthn_credentials:
+    registered_on: è¨»å†Šæ–¼ %{date}
diff --git a/config/navigation.rb b/config/navigation.rb
index 8fd296d5a1194106395bf442c79e2268e1a03c34..4a56abe18cb639ad1c0e938bd15422bfa11b3031 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -21,7 +21,7 @@ SimpleNavigation::Configuration.run do |navigation|
 
     n.item :security, safe_join([fa_icon('lock fw'), t('settings.account')]), edit_user_registration_url do |s|
       s.item :password, safe_join([fa_icon('lock fw'), t('settings.account_settings')]), edit_user_registration_url, highlights_on: %r{/auth/edit|/settings/delete|/settings/migration|/settings/aliases}
-      s.item :two_factor_authentication, safe_join([fa_icon('mobile fw'), t('settings.two_factor_authentication')]), settings_two_factor_authentication_url, highlights_on: %r{/settings/two_factor_authentication}
+      s.item :two_factor_authentication, safe_join([fa_icon('mobile fw'), t('settings.two_factor_authentication')]), settings_two_factor_authentication_methods_url, highlights_on: %r{/settings/two_factor_authentication|/settings/otp_authentication|/settings/security_keys}
       s.item :authorized_apps, safe_join([fa_icon('list fw'), t('settings.authorized_apps')]), oauth_authorized_applications_url
     end
 
@@ -41,6 +41,7 @@ SimpleNavigation::Configuration.run do |navigation|
       s.item :tags, safe_join([fa_icon('hashtag fw'), t('admin.tags.title')]), admin_tags_path, highlights_on: %r{/admin/tags}
       s.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_url(limited: whitelist_mode? ? nil : '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks|/admin/domain_allows}, if: -> { current_user.admin? }
       s.item :email_domain_blocks, safe_join([fa_icon('envelope fw'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_url, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.admin? }
+      s.item :ip_blocks, safe_join([fa_icon('ban fw'), t('admin.ip_blocks.title')]), admin_ip_blocks_url, highlights_on: %r{/admin/ip_blocks}, if: -> { current_user.admin? }
     end
 
     n.item :admin, safe_join([fa_icon('cogs fw'), t('admin.title')]), admin_dashboard_url, if: proc { current_user.staff? } do |s|
diff --git a/config/routes.rb b/config/routes.rb
index 5b768807b45fcdc18e09fa79f56882fd5941dad0..c8a542be77d4d9742b85c0c49cefec8904fcb2df 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -37,6 +37,7 @@ Rails.application.routes.draw do
 
   resource :instance_actor, path: 'actor', only: [:show] do
     resource :inbox, only: [:create], module: :activitypub
+    resource :outbox, only: [:show], module: :activitypub
   end
 
   devise_scope :user do
@@ -45,6 +46,7 @@ Rails.application.routes.draw do
     namespace :auth do
       resource :setup, only: [:show, :update], controller: :setup
       resource :challenge, only: [:create], controller: :challenges
+      get 'sessions/security_key_options', to: 'sessions#webauthn_options'
     end
   end
 
@@ -81,6 +83,7 @@ Rails.application.routes.draw do
     resource :inbox, only: [:create], module: :activitypub
     resource :claim, only: [:create], module: :activitypub
     resources :collections, only: [:show], module: :activitypub
+    resource :followers_synchronization, only: [:show], module: :activitypub
   end
 
   resource :inbox, only: [:create], module: :activitypub
@@ -122,9 +125,25 @@ Rails.application.routes.draw do
       resources :mutes, only: :index, controller: :muted_accounts
       resources :lists, only: :index, controller: :lists
       resources :domain_blocks, only: :index, controller: :blocked_domains
+      resources :bookmarks, only: :index, controller: :bookmarks
+    end
+
+    resources :two_factor_authentication_methods, only: [:index] do
+      collection do
+        post :disable
+      end
     end
 
-    resource :two_factor_authentication, only: [:show, :create, :destroy]
+    resource :otp_authentication, only: [:show, :create], controller: 'two_factor_authentication/otp_authentication'
+
+    resources :webauthn_credentials, only: [:index, :new, :create, :destroy],
+              path: 'security_keys',
+              controller: 'two_factor_authentication/webauthn_credentials' do
+
+      collection do
+        get :options
+      end
+    end
 
     namespace :two_factor_authentication do
       resources :recovery_codes, only: [:create]
@@ -171,11 +190,7 @@ Rails.application.routes.draw do
     get '/dashboard', to: 'dashboard#index'
 
     resources :domain_allows, only: [:new, :create, :show, :destroy]
-    resources :domain_blocks, only: [:new, :create, :show, :destroy, :update] do
-      member do
-        get :edit
-      end
-    end
+    resources :domain_blocks, only: [:new, :create, :show, :destroy, :update, :edit]
 
     resources :email_domain_blocks, only: [:index, :new, :create, :destroy]
     resources :action_logs, only: [:index]
@@ -219,9 +234,10 @@ Rails.application.routes.draw do
 
     resources :report_notes, only: [:create, :destroy]
 
-    resources :accounts, only: [:index, :show] do
+    resources :accounts, only: [:index, :show, :destroy] do
       member do
         post :enable
+        post :unsensitive
         post :unsilence
         post :unsuspend
         post :redownload
@@ -270,6 +286,12 @@ Rails.application.routes.draw do
       end
     end
 
+    resources :ip_blocks, only: [:index, :new, :create] do
+      collection do
+        post :batch
+      end
+    end
+
     resources :account_moderation_notes, only: [:create, :destroy]
 
     resources :tags, only: [:index, :show, :update] do
@@ -419,6 +441,7 @@ Rails.application.routes.draw do
         resources :lists, only: :index, controller: 'accounts/lists'
         resources :circles, only: :index, controller: 'accounts/circles'
         resources :identity_proofs, only: :index, controller: 'accounts/identity_proofs'
+        resources :featured_tags, only: :index, controller: 'accounts/featured_tags'
 
         member do
           post :follow
@@ -457,9 +480,10 @@ Rails.application.routes.draw do
       end
 
       namespace :admin do
-        resources :accounts, only: [:index, :show] do
+        resources :accounts, only: [:index, :show, :destroy] do
           member do
             post :enable
+            post :unsensitive
             post :unsilence
             post :unsuspend
             post :approve
diff --git a/config/settings.yml b/config/settings.yml
index 002473643513b7d598746c70cd7d5dfaea817125..9cf68a096632d500c4ac1909c1544054555de6d7 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -26,6 +26,7 @@ defaults: &defaults
   expand_spoilers: false
   preview_sensitive_media: false
   reduce_motion: false
+  disable_swiping: false
   show_application: true
   system_font_ui: false
   noindex: false
@@ -69,6 +70,7 @@ defaults: &defaults
   spam_check_enabled: true
   show_domain_blocks: 'disabled'
   show_domain_blocks_rationale: 'disabled'
+  require_invite_text: false
 
 development:
   <<: *defaults
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 5de25de234be1f5ebcf246090c4a91cb9bce14cf..010923717eb922849631e59954bedd596724b63c 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -5,34 +5,51 @@
   - [push, 4]
   - [mailers, 2]
   - [pull]
+  - [scheduler]
+:scheduler:
+  :listened_queues_only: true
 :schedule:
   scheduled_statuses_scheduler:
     every: '5m'
     class: Scheduler::ScheduledStatusesScheduler
+    queue: scheduler
   trending_tags_scheduler:
     every: '5m'
     class: Scheduler::TrendingTagsScheduler
+    queue: scheduler
   media_cleanup_scheduler:
     cron: '<%= Random.rand(0..59) %> <%= Random.rand(3..5) %> * * *'
     class: Scheduler::MediaCleanupScheduler
+    queue: scheduler
   feed_cleanup_scheduler:
     cron: '<%= Random.rand(0..59) %> <%= Random.rand(0..2) %> * * *'
     class: Scheduler::FeedCleanupScheduler
+    queue: scheduler
   doorkeeper_cleanup_scheduler:
     cron: '<%= Random.rand(0..59) %> <%= Random.rand(0..2) %> * * 0'
     class: Scheduler::DoorkeeperCleanupScheduler
+    queue: scheduler
   user_cleanup_scheduler:
     cron: '<%= Random.rand(0..59) %> <%= Random.rand(4..6) %> * * *'
     class: Scheduler::UserCleanupScheduler
+    queue: scheduler
   ip_cleanup_scheduler:
     cron: '<%= Random.rand(0..59) %> <%= Random.rand(3..5) %> * * *'
     class: Scheduler::IpCleanupScheduler
+    queue: scheduler
   email_scheduler:
     cron: '0 10 * * 2'
     class: Scheduler::EmailScheduler
+    queue: scheduler
   backup_cleanup_scheduler:
     cron: '<%= Random.rand(0..59) %> <%= Random.rand(3..5) %> * * *'
     class: Scheduler::BackupCleanupScheduler
+    queue: scheduler
   pghero_scheduler:
     cron: '0 0 * * *'
     class: Scheduler::PgheroScheduler
+    queue: scheduler
+  instance_refresh_scheduler:
+    cron: '0 * * * *'
+    class: Scheduler::InstanceRefreshScheduler
+    queue: scheduler
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js
index 80a094c724e6a1986f23bc874150e2a697651685..25b6b7abd618b3ffa85ed90d624d5c0314e96712 100644
--- a/config/webpack/configuration.js
+++ b/config/webpack/configuration.js
@@ -2,39 +2,26 @@
 
 const { resolve } = require('path');
 const { env } = require('process');
-const { safeLoad } = require('js-yaml');
+const { load } = require('js-yaml');
 const { readFileSync } = require('fs');
 
 const configPath = resolve('config', 'webpacker.yml');
-const settings = safeLoad(readFileSync(configPath), 'utf8')[env.RAILS_ENV || env.NODE_ENV];
+const settings = load(readFileSync(configPath), 'utf8')[env.RAILS_ENV || env.NODE_ENV];
 
 const themePath = resolve('config', 'themes.yml');
-const themes = safeLoad(readFileSync(themePath), 'utf8');
-
-function removeOuterSlashes(string) {
-  return string.replace(/^\/*/, '').replace(/\/*$/, '');
-}
-
-function formatPublicPath(host = '', path = '') {
-  let formattedHost = removeOuterSlashes(host);
-  if (formattedHost && !/^http/i.test(formattedHost)) {
-    formattedHost = `//${formattedHost}`;
-  }
-  const formattedPath = removeOuterSlashes(path);
-  return `${formattedHost}/${formattedPath}/`;
-}
+const themes = load(readFileSync(themePath), 'utf8');
 
 const output = {
   path: resolve('public', settings.public_output_path),
-  publicPath: formatPublicPath(env.CDN_HOST, settings.public_output_path),
+  publicPath: `/${settings.public_output_path}/`,
 };
 
 module.exports = {
   settings,
   themes,
   env: {
-    CDN_HOST: env.CDN_HOST,
     NODE_ENV: env.NODE_ENV,
+    PUBLIC_OUTPUT_PATH: settings.public_output_path,
   },
   output,
 };
diff --git a/config/webpack/development.js b/config/webpack/development.js
index 774ecbc0764437301306f5db296308d2c34f38e0..c3cf1b655c0b5b650cbff0548bbdf9930f83828e 100644
--- a/config/webpack/development.js
+++ b/config/webpack/development.js
@@ -1,6 +1,6 @@
 // Note: You must restart bin/webpack-dev-server for changes to take effect
 
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const sharedConfig = require('./shared');
 const { settings, output } = require('./configuration');
 
diff --git a/config/webpack/production.js b/config/webpack/production.js
index bceffaf5c18e17c2d5b83f004c10bbedd5d8f452..f1d0dabae73837e12a0d37b088dec0d7ceb1c2e0 100644
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -2,7 +2,7 @@
 
 const path = require('path');
 const { URL } = require('url');
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 const OfflinePlugin = require('offline-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
@@ -87,7 +87,7 @@ module.exports = merge(sharedConfig, {
         '**/*.woff',
       ],
       ServiceWorker: {
-        entry: `imports-loader?ATTACHMENT_HOST=>${encodeURIComponent(JSON.stringify(attachmentHost))}!${encodeURI(path.join(__dirname, '../../app/javascript/mastodon/service_worker/entry.js'))}`,
+        entry: `imports-loader?additionalCode=${encodeURIComponent(`var ATTACHMENT_HOST=${JSON.stringify(attachmentHost)};`)}!${encodeURI(path.join(__dirname, '../../app/javascript/mastodon/service_worker/entry.js'))}`,
         cacheName: 'mastodon',
         output: '../assets/sw.js',
         publicPath: '/sw.js',
diff --git a/config/webpack/rules/index.js b/config/webpack/rules/index.js
index bbf6b0187b173ff92f326a99ccfe412973dddadc..92a384e6d8f5971b9a3c405a1ad054b895d24b1c 100644
--- a/config/webpack/rules/index.js
+++ b/config/webpack/rules/index.js
@@ -1,6 +1,7 @@
 const babel = require('./babel');
 const css = require('./css');
 const file = require('./file');
+const tesseract = require('./tesseract');
 const nodeModules = require('./node_modules');
 
 // Webpack loaders are processed in reverse order
@@ -8,6 +9,7 @@ const nodeModules = require('./node_modules');
 // Lastly, process static files using file loader
 module.exports = {
   file,
+  tesseract,
   css,
   nodeModules,
   babel,
diff --git a/config/webpack/rules/node_modules.js b/config/webpack/rules/node_modules.js
index 7ed05504bf3d29fcdfccaab9171031b61da2d111..c084d3a57eb0f4ae311ce3d702c47558a1e81021 100644
--- a/config/webpack/rules/node_modules.js
+++ b/config/webpack/rules/node_modules.js
@@ -4,7 +4,10 @@ const { settings, env } = require('../configuration');
 module.exports = {
   test: /\.(js|mjs)$/,
   include: /node_modules/,
-  exclude: /@babel(?:\/|\\{1,2})runtime/,
+  exclude: [
+    /@babel(?:\/|\\{1,2})runtime/,
+    /tesseract.js/,
+  ],
   use: [
     {
       loader: 'babel-loader',
diff --git a/config/webpack/rules/tesseract.js b/config/webpack/rules/tesseract.js
new file mode 100644
index 0000000000000000000000000000000000000000..de647c8d1041b4254f9268d0d4c5b8f89662402e
--- /dev/null
+++ b/config/webpack/rules/tesseract.js
@@ -0,0 +1,14 @@
+module.exports = {
+  test: [
+    /tesseract\.js\/dist\/worker\.min\.js$/,
+    /tesseract\.js\/dist\/worker\.min\.js.map$/,
+    /tesseract\.js-core\/tesseract-core\.wasm$/,
+    /tesseract\.js-core\/tesseract-core\.wasm.js$/,
+  ],
+  use: {
+    loader: 'file-loader',
+    options: {
+      name: 'ocr/[name]-[hash].[ext]',
+    },
+  },
+};
diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index 15a209253991f3fbe21d3678f474a64c2542df21..05828aebe076ef30e68e256fe32d12e2d837c5ac 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -5,7 +5,6 @@ const { basename, dirname, join, relative, resolve } = require('path');
 const { sync } = require('glob');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const AssetsManifestPlugin = require('webpack-assets-manifest');
-const CopyPlugin = require('copy-webpack-plugin');
 const extname = require('path-complete-extname');
 const { env, settings, themes, output } = require('./configuration');
 const rules = require('./rules');
@@ -80,17 +79,12 @@ module.exports = {
       chunkFilename: 'css/[name]-[contenthash:8].chunk.css',
     }),
     new AssetsManifestPlugin({
-      integrity: false,
+      integrity: true,
+      integrityHashes: ['sha256'],
       entrypoints: true,
       writeToDisk: true,
       publicPath: true,
     }),
-    new CopyPlugin({
-      patterns: [
-        { from: 'node_modules/tesseract.js/dist/worker.min.js', to: 'ocr' },
-        { from: 'node_modules/tesseract.js-core/tesseract-core.wasm.js', to: 'ocr' },
-      ],
-    }),
   ],
 
   resolve: {
diff --git a/config/webpack/tests.js b/config/webpack/tests.js
index 8b56eb92f29f37294e26df6f5ab1fda96d21d39f..f9d39f1b800fa30b28e344358ba2d5ee527983dd 100644
--- a/config/webpack/tests.js
+++ b/config/webpack/tests.js
@@ -1,6 +1,6 @@
 // Note: You must restart bin/webpack-dev-server for changes to take effect
 
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const sharedConfig = require('./shared.js');
 
 module.exports = merge(sharedConfig, {
diff --git a/db/migrate/20181127165847_add_show_replies_to_lists.rb b/db/migrate/20181127165847_add_show_replies_to_lists.rb
new file mode 100644
index 0000000000000000000000000000000000000000..f68c98dafc27890a95e8b7d104f715bb2bb2b1d6
--- /dev/null
+++ b/db/migrate/20181127165847_add_show_replies_to_lists.rb
@@ -0,0 +1,23 @@
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddShowRepliesToLists < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured do
+      add_column_with_default(
+        :lists,
+        :replies_policy,
+        :integer,
+        allow_null: false,
+        default: 0
+      )
+    end
+  end
+
+  def down
+    remove_column :lists, :replies_policy
+  end
+end
diff --git a/db/migrate/20200309150742_add_forwarded_to_reports.rb b/db/migrate/20200309150742_add_forwarded_to_reports.rb
new file mode 100644
index 0000000000000000000000000000000000000000..df278240ba2bd760ba26f965798953ac8b3db686
--- /dev/null
+++ b/db/migrate/20200309150742_add_forwarded_to_reports.rb
@@ -0,0 +1,5 @@
+class AddForwardedToReports < ActiveRecord::Migration[5.2]
+  def change
+    add_column :reports, :forwarded, :boolean
+  end
+end
diff --git a/db/migrate/20200317021758_add_expires_at_to_mutes.rb b/db/migrate/20200317021758_add_expires_at_to_mutes.rb
new file mode 100644
index 0000000000000000000000000000000000000000..eaae8319d7c11080081c20c5bc5bdd399186b6b0
--- /dev/null
+++ b/db/migrate/20200317021758_add_expires_at_to_mutes.rb
@@ -0,0 +1,5 @@
+class AddExpiresAtToMutes < ActiveRecord::Migration[5.2]
+  def change
+    add_column :mutes, :expires_at, :datetime
+  end
+end
diff --git a/db/migrate/20200614002136_add_sensitized_to_accounts.rb b/db/migrate/20200614002136_add_sensitized_to_accounts.rb
new file mode 100644
index 0000000000000000000000000000000000000000..bc2dfcb6363bad70f14d57d2b3ad5517cab85477
--- /dev/null
+++ b/db/migrate/20200614002136_add_sensitized_to_accounts.rb
@@ -0,0 +1,5 @@
+class AddSensitizedToAccounts < ActiveRecord::Migration[5.2]
+  def change
+    add_column :accounts, :sensitized_at, :datetime
+  end
+end
diff --git a/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb b/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb
index c5688681fc0c8f6dd1895bdca5d8f34c6c5d1679..c3aa8e33c26931b437b3a41a604f1f0f705a5e24 100644
--- a/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb
+++ b/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb
@@ -1,10 +1,30 @@
 class AddFixedLowercaseIndexToAccounts < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
+  class CorruptionError < StandardError
+    def cause
+      nil
+    end
+
+    def backtrace
+      []
+    end
+  end
+
   def up
-    rename_index :accounts, 'index_accounts_on_username_and_domain_lower', 'old_index_accounts_on_username_and_domain_lower' unless index_name_exists?(:accounts, 'old_index_accounts_on_username_and_domain_lower')
-    add_index :accounts, "lower (username), COALESCE(lower(domain), '')", name: 'index_accounts_on_username_and_domain_lower', unique: true, algorithm: :concurrently
-    remove_index :accounts, name: 'old_index_accounts_on_username_and_domain_lower'
+    if index_name_exists?(:accounts, 'old_index_accounts_on_username_and_domain_lower') && index_name_exists?(:accounts, 'index_accounts_on_username_and_domain_lower')
+      remove_index :accounts, name: 'index_accounts_on_username_and_domain_lower'
+    elsif index_name_exists?(:accounts, 'index_accounts_on_username_and_domain_lower')
+      rename_index :accounts, 'index_accounts_on_username_and_domain_lower', 'old_index_accounts_on_username_and_domain_lower'
+    end
+
+    begin
+      add_index :accounts, "lower (username), COALESCE(lower(domain), '')", name: 'index_accounts_on_username_and_domain_lower', unique: true, algorithm: :concurrently
+    rescue ActiveRecord::RecordNotUnique
+      raise CorruptionError, 'Migration failed because of index corruption, see https://docs.joinmastodon.org/admin/troubleshooting/index-corruption/#fixing'
+    end
+
+    remove_index :accounts, name: 'old_index_accounts_on_username_and_domain_lower' if index_name_exists?(:accounts, 'old_index_accounts_on_username_and_domain_lower')
   end
 
   def down
diff --git a/db/migrate/20200630190240_create_webauthn_credentials.rb b/db/migrate/20200630190240_create_webauthn_credentials.rb
new file mode 100644
index 0000000000000000000000000000000000000000..ea924238d4a3a96a7a3590a972a044f5fd76fff9
--- /dev/null
+++ b/db/migrate/20200630190240_create_webauthn_credentials.rb
@@ -0,0 +1,16 @@
+class CreateWebauthnCredentials < ActiveRecord::Migration[5.2]
+  def change
+    create_table :webauthn_credentials do |t|
+      t.string :external_id, null: false
+      t.string :public_key, null: false
+      t.string :nickname, null: false
+      t.bigint :sign_count, null: false, default: 0
+
+      t.index :external_id, unique: true
+
+      t.references :user, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20200630190544_add_webauthn_id_to_users.rb b/db/migrate/20200630190544_add_webauthn_id_to_users.rb
new file mode 100644
index 0000000000000000000000000000000000000000..95d3c92a867a00aea6b76fa02bb3da10fa74fbf9
--- /dev/null
+++ b/db/migrate/20200630190544_add_webauthn_id_to_users.rb
@@ -0,0 +1,5 @@
+class AddWebauthnIdToUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :users, :webauthn_id, :string
+  end
+end
diff --git a/db/migrate/20200908193330_create_account_deletion_requests.rb b/db/migrate/20200908193330_create_account_deletion_requests.rb
new file mode 100644
index 0000000000000000000000000000000000000000..e03183ae457876610afe44abbbcbce7900097e64
--- /dev/null
+++ b/db/migrate/20200908193330_create_account_deletion_requests.rb
@@ -0,0 +1,8 @@
+class CreateAccountDeletionRequests < ActiveRecord::Migration[5.2]
+  def change
+    create_table :account_deletion_requests do |t|
+      t.references :account, foreign_key: { on_delete: :cascade }
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20200917192924_add_notify_to_follows.rb b/db/migrate/20200917192924_add_notify_to_follows.rb
new file mode 100644
index 0000000000000000000000000000000000000000..d27471c447f0af57b4ff3281cae74b164fa20c91
--- /dev/null
+++ b/db/migrate/20200917192924_add_notify_to_follows.rb
@@ -0,0 +1,19 @@
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddNotifyToFollows < ActiveRecord::Migration[5.1]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured do
+      add_column_with_default :follows, :notify, :boolean, default: false, allow_null: false
+      add_column_with_default :follow_requests, :notify, :boolean, default: false, allow_null: false
+    end
+  end
+
+  def down
+    remove_column :follows, :notify
+    remove_column :follow_requests, :notify
+  end
+end
diff --git a/db/migrate/20200917193034_add_type_to_notifications.rb b/db/migrate/20200917193034_add_type_to_notifications.rb
new file mode 100644
index 0000000000000000000000000000000000000000..002be3aa00b0dc99827dab1ee0de68130e211a4e
--- /dev/null
+++ b/db/migrate/20200917193034_add_type_to_notifications.rb
@@ -0,0 +1,5 @@
+class AddTypeToNotifications < ActiveRecord::Migration[5.2]
+  def change
+    add_column :notifications, :type, :string
+  end
+end
diff --git a/db/migrate/20200917222316_add_index_notifications_on_type.rb b/db/migrate/20200917222316_add_index_notifications_on_type.rb
new file mode 100644
index 0000000000000000000000000000000000000000..9bd23c1d3d97a589c8477ca1a13cec5b5fb78e64
--- /dev/null
+++ b/db/migrate/20200917222316_add_index_notifications_on_type.rb
@@ -0,0 +1,7 @@
+class AddIndexNotificationsOnType < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    add_index :notifications, [:account_id, :id, :type], order: { id: :desc }, algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20201008202037_create_ip_blocks.rb b/db/migrate/20201008202037_create_ip_blocks.rb
new file mode 100644
index 0000000000000000000000000000000000000000..32acd6ede1759c0d172b9c46ac1c6a3a4fabdd30
--- /dev/null
+++ b/db/migrate/20201008202037_create_ip_blocks.rb
@@ -0,0 +1,12 @@
+class CreateIpBlocks < ActiveRecord::Migration[5.2]
+  def change
+    create_table :ip_blocks do |t|
+      t.inet :ip, null: false, default: '0.0.0.0'
+      t.integer :severity, null: false, default: 0
+      t.datetime :expires_at
+      t.text :comment, null: false, default: ''
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20201008220312_add_sign_up_ip_to_users.rb b/db/migrate/20201008220312_add_sign_up_ip_to_users.rb
new file mode 100644
index 0000000000000000000000000000000000000000..66cd624bbb8e1f96aa15eb515d2274311cf5bf80
--- /dev/null
+++ b/db/migrate/20201008220312_add_sign_up_ip_to_users.rb
@@ -0,0 +1,5 @@
+class AddSignUpIpToUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :users, :sign_up_ip, :inet
+  end
+end
diff --git a/db/migrate/20201017233919_add_suspension_origin_to_accounts.rb b/db/migrate/20201017233919_add_suspension_origin_to_accounts.rb
new file mode 100644
index 0000000000000000000000000000000000000000..f0db02143aed1df82fbf95347235aba7a1e59eda
--- /dev/null
+++ b/db/migrate/20201017233919_add_suspension_origin_to_accounts.rb
@@ -0,0 +1,5 @@
+class AddSuspensionOriginToAccounts < ActiveRecord::Migration[5.2]
+  def change
+    add_column :accounts, :suspension_origin, :integer
+  end
+end
diff --git a/db/migrate/20201206004238_create_instances.rb b/db/migrate/20201206004238_create_instances.rb
new file mode 100644
index 0000000000000000000000000000000000000000..a4b866894ad8bf830b002f1e7ff339b7330a34ad
--- /dev/null
+++ b/db/migrate/20201206004238_create_instances.rb
@@ -0,0 +1,9 @@
+class CreateInstances < ActiveRecord::Migration[5.2]
+  def change
+    create_view :instances, materialized: true
+
+    # To be able to refresh the view concurrently,
+    # at least one unique index is required
+    safety_assured { add_index :instances, :domain, unique: true }
+  end
+end
diff --git a/db/migrate/20201218054746_add_obfuscate_to_domain_blocks.rb b/db/migrate/20201218054746_add_obfuscate_to_domain_blocks.rb
new file mode 100644
index 0000000000000000000000000000000000000000..26f4ddb851dbb96441b8120de3f303dd01d487c2
--- /dev/null
+++ b/db/migrate/20201218054746_add_obfuscate_to_domain_blocks.rb
@@ -0,0 +1,15 @@
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddObfuscateToDomainBlocks < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured { add_column_with_default :domain_blocks, :obfuscate, :boolean, default: false, allow_null: false }
+  end
+
+  def down
+    remove_column :domain_blocks, :obfuscate
+  end
+end
diff --git a/db/post_migrate/20200917193528_migrate_notifications_type.rb b/db/post_migrate/20200917193528_migrate_notifications_type.rb
new file mode 100644
index 0000000000000000000000000000000000000000..88e4230842b4e175c7b2fb9b86efdaa6a0d85d4c
--- /dev/null
+++ b/db/post_migrate/20200917193528_migrate_notifications_type.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class MigrateNotificationsType < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  TYPES_TO_MIGRATE = {
+    'Mention'       => :mention,
+    'Status'        => :reblog,
+    'Follow'        => :follow,
+    'FollowRequest' => :follow_request,
+    'Favourite'     => :favourite,
+    'Poll'          => :poll,
+  }.freeze
+
+  def up
+    TYPES_TO_MIGRATE.each_pair do |activity_type, type|
+      Notification.where(activity_type: activity_type, type: nil).in_batches.update_all(type: type)
+    end
+  end
+
+  def down; end
+end
diff --git a/db/post_migrate/20200917222734_remove_index_notifications_on_account_activity.rb b/db/post_migrate/20200917222734_remove_index_notifications_on_account_activity.rb
new file mode 100644
index 0000000000000000000000000000000000000000..cb7f78e53bffddf230bc765b32b5cb15549b0cbc
--- /dev/null
+++ b/db/post_migrate/20200917222734_remove_index_notifications_on_account_activity.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class RemoveIndexNotificationsOnAccountActivity < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def up
+    remove_index :notifications, name: :account_activity
+    remove_index :notifications, name: :index_notifications_on_account_id_and_id
+  end
+
+  def down
+    add_index :notifications, [:account_id, :activity_id, :activity_type], unique: true, name: 'account_activity', algorithm: :concurrently
+    add_index :notifications, [:account_id, :id], order: { id: :desc }, algorithm: :concurrently
+  end
+end
diff --git a/db/post_migrate/20201017234926_fill_account_suspension_origin.rb b/db/post_migrate/20201017234926_fill_account_suspension_origin.rb
new file mode 100644
index 0000000000000000000000000000000000000000..ab7407d79e01d3aee17cf15ddbc1ee5836390bd4
--- /dev/null
+++ b/db/post_migrate/20201017234926_fill_account_suspension_origin.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class FillAccountSuspensionOrigin < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def up
+    Account.suspended.where(suspension_origin: nil).in_batches.update_all(suspension_origin: :local)
+  end
+
+  def down; end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 91869ce1aa732327b31ab310aac43ebb48d6e656..389b33b6142c08d0881dff644f0fcba73dbfc359 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_07_18_225817) do
+ActiveRecord::Schema.define(version: 2020_12_18_054746) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -36,6 +36,13 @@ ActiveRecord::Schema.define(version: 2020_07_18_225817) do
     t.index ["conversation_id"], name: "index_account_conversations_on_conversation_id"
   end
 
+  create_table "account_deletion_requests", force: :cascade do |t|
+    t.bigint "account_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_account_deletion_requests_on_account_id"
+  end
+
   create_table "account_domain_blocks", force: :cascade do |t|
     t.string "domain"
     t.datetime "created_at", null: false
@@ -182,6 +189,8 @@ ActiveRecord::Schema.define(version: 2020_07_18_225817) do
     t.integer "avatar_storage_schema_version"
     t.integer "header_storage_schema_version"
     t.string "devices_url"
+    t.integer "suspension_origin"
+    t.datetime "sensitized_at"
     t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin
     t.index "lower((username)::text), COALESCE(lower((domain)::text), ''::text)", name: "index_accounts_on_username_and_domain_lower", unique: true
     t.index ["moved_to_account_id"], name: "index_accounts_on_moved_to_account_id"
@@ -372,6 +381,7 @@ ActiveRecord::Schema.define(version: 2020_07_18_225817) do
     t.boolean "reject_reports", default: false, null: false
     t.text "private_comment"
     t.text "public_comment"
+    t.boolean "obfuscate", default: false, null: false
     t.index ["domain"], name: "index_domain_blocks_on_domain", unique: true
   end
 
@@ -425,6 +435,7 @@ ActiveRecord::Schema.define(version: 2020_07_18_225817) do
     t.bigint "target_account_id", null: false
     t.boolean "show_reblogs", default: true, null: false
     t.string "uri"
+    t.boolean "notify", default: false, null: false
     t.index ["account_id", "target_account_id"], name: "index_follow_requests_on_account_id_and_target_account_id", unique: true
   end
 
@@ -435,6 +446,7 @@ ActiveRecord::Schema.define(version: 2020_07_18_225817) do
     t.bigint "target_account_id", null: false
     t.boolean "show_reblogs", default: true, null: false
     t.string "uri"
+    t.boolean "notify", default: false, null: false
     t.index ["account_id", "target_account_id"], name: "index_follows_on_account_id_and_target_account_id", unique: true
     t.index ["target_account_id"], name: "index_follows_on_target_account_id"
   end
@@ -475,6 +487,15 @@ ActiveRecord::Schema.define(version: 2020_07_18_225817) do
     t.index ["user_id"], name: "index_invites_on_user_id"
   end
 
+  create_table "ip_blocks", force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "expires_at"
+    t.inet "ip", default: "0.0.0.0", null: false
+    t.integer "severity", default: 0, null: false
+    t.text "comment", default: "", null: false
+  end
+
   create_table "list_accounts", force: :cascade do |t|
     t.bigint "list_id", null: false
     t.bigint "account_id", null: false
@@ -489,6 +510,7 @@ ActiveRecord::Schema.define(version: 2020_07_18_225817) do
     t.string "title", default: "", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.integer "replies_policy", default: 0, null: false
     t.index ["account_id"], name: "index_lists_on_account_id"
   end
 
@@ -547,6 +569,7 @@ ActiveRecord::Schema.define(version: 2020_07_18_225817) do
     t.boolean "hide_notifications", default: true, null: false
     t.bigint "account_id", null: false
     t.bigint "target_account_id", null: false
+    t.datetime "expires_at"
     t.index ["account_id", "target_account_id"], name: "index_mutes_on_account_id_and_target_account_id", unique: true
     t.index ["target_account_id"], name: "index_mutes_on_target_account_id"
   end
@@ -558,8 +581,8 @@ ActiveRecord::Schema.define(version: 2020_07_18_225817) do
     t.datetime "updated_at", null: false
     t.bigint "account_id", null: false
     t.bigint "from_account_id", null: false
-    t.index ["account_id", "activity_id", "activity_type"], name: "account_activity", unique: true
-    t.index ["account_id", "id"], name: "index_notifications_on_account_id_and_id", order: { id: :desc }
+    t.string "type"
+    t.index ["account_id", "id", "type"], name: "index_notifications_on_account_id_and_id_and_type", order: { id: :desc }
     t.index ["activity_id", "activity_type"], name: "index_notifications_on_activity_id_and_activity_type"
     t.index ["from_account_id"], name: "index_notifications_on_from_account_id"
   end
@@ -716,6 +739,7 @@ ActiveRecord::Schema.define(version: 2020_07_18_225817) do
     t.bigint "target_account_id", null: false
     t.bigint "assigned_account_id"
     t.string "uri"
+    t.boolean "forwarded"
     t.index ["account_id"], name: "index_reports_on_account_id"
     t.index ["target_account_id"], name: "index_reports_on_target_account_id"
   end
@@ -901,6 +925,8 @@ ActiveRecord::Schema.define(version: 2020_07_18_225817) do
     t.boolean "approved", default: true, null: false
     t.string "sign_in_token"
     t.datetime "sign_in_token_sent_at"
+    t.string "webauthn_id"
+    t.inet "sign_up_ip"
     t.index ["account_id"], name: "index_users_on_account_id"
     t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
     t.index ["created_by_application_id"], name: "index_users_on_created_by_application_id"
@@ -930,9 +956,22 @@ ActiveRecord::Schema.define(version: 2020_07_18_225817) do
     t.index ["user_id"], name: "index_web_settings_on_user_id", unique: true
   end
 
+  create_table "webauthn_credentials", force: :cascade do |t|
+    t.string "external_id", null: false
+    t.string "public_key", null: false
+    t.string "nickname", null: false
+    t.bigint "sign_count", default: 0, null: false
+    t.bigint "user_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["external_id"], name: "index_webauthn_credentials_on_external_id", unique: true
+    t.index ["user_id"], name: "index_webauthn_credentials_on_user_id"
+  end
+
   add_foreign_key "account_aliases", "accounts", on_delete: :cascade
   add_foreign_key "account_conversations", "accounts", on_delete: :cascade
   add_foreign_key "account_conversations", "conversations", on_delete: :cascade
+  add_foreign_key "account_deletion_requests", "accounts", on_delete: :cascade
   add_foreign_key "account_domain_blocks", "accounts", name: "fk_206c6029bd", on_delete: :cascade
   add_foreign_key "account_identity_proofs", "accounts", on_delete: :cascade
   add_foreign_key "account_migrations", "accounts", column: "target_account_id", on_delete: :nullify
@@ -1032,4 +1071,30 @@ ActiveRecord::Schema.define(version: 2020_07_18_225817) do
   add_foreign_key "web_push_subscriptions", "oauth_access_tokens", column: "access_token_id", on_delete: :cascade
   add_foreign_key "web_push_subscriptions", "users", on_delete: :cascade
   add_foreign_key "web_settings", "users", name: "fk_11910667b2", on_delete: :cascade
+  add_foreign_key "webauthn_credentials", "users"
+
+  create_view "instances", materialized: true, sql_definition: <<-SQL
+      WITH domain_counts(domain, accounts_count) AS (
+           SELECT accounts.domain,
+              count(*) AS accounts_count
+             FROM accounts
+            WHERE (accounts.domain IS NOT NULL)
+            GROUP BY accounts.domain
+          )
+   SELECT domain_counts.domain,
+      domain_counts.accounts_count
+     FROM domain_counts
+  UNION
+   SELECT domain_blocks.domain,
+      COALESCE(domain_counts.accounts_count, (0)::bigint) AS accounts_count
+     FROM (domain_blocks
+       LEFT JOIN domain_counts ON (((domain_counts.domain)::text = (domain_blocks.domain)::text)))
+  UNION
+   SELECT domain_allows.domain,
+      COALESCE(domain_counts.accounts_count, (0)::bigint) AS accounts_count
+     FROM (domain_allows
+       LEFT JOIN domain_counts ON (((domain_counts.domain)::text = (domain_allows.domain)::text)));
+  SQL
+  add_index "instances", ["domain"], name: "index_instances_on_domain", unique: true
+
 end
diff --git a/db/views/instances_v01.sql b/db/views/instances_v01.sql
new file mode 100644
index 0000000000000000000000000000000000000000..94acd61a133266aaa70e4020e594872c5bb73960
--- /dev/null
+++ b/db/views/instances_v01.sql
@@ -0,0 +1,17 @@
+WITH domain_counts(domain, accounts_count)
+AS (
+  SELECT domain, COUNT(*) as accounts_count
+  FROM accounts
+  WHERE domain IS NOT NULL
+  GROUP BY domain
+)
+SELECT domain, accounts_count
+FROM domain_counts
+UNION
+SELECT domain_blocks.domain, COALESCE(domain_counts.accounts_count, 0)
+FROM domain_blocks
+LEFT OUTER JOIN domain_counts ON domain_counts.domain = domain_blocks.domain
+UNION
+SELECT domain_allows.domain, COALESCE(domain_counts.accounts_count, 0)
+FROM domain_allows
+LEFT OUTER JOIN domain_counts ON domain_counts.domain = domain_allows.domain
diff --git a/lib/chewy/strategy/custom_sidekiq.rb b/lib/chewy/strategy/custom_sidekiq.rb
index 3e54326ba8b31b01c76059f7495f0aa54f0b33db..794ae4ed44dc82aa54287f3490ce4743656f6dbb 100644
--- a/lib/chewy/strategy/custom_sidekiq.rb
+++ b/lib/chewy/strategy/custom_sidekiq.rb
@@ -2,29 +2,10 @@
 
 module Chewy
   class Strategy
-    class CustomSidekiq < Base
-      class Worker
-        include ::Sidekiq::Worker
-
-        sidekiq_options queue: 'pull'
-
-        def perform(type, ids, options = {})
-          options[:refresh] = !Chewy.disable_refresh_async if Chewy.disable_refresh_async
-          type.constantize.import!(ids, options)
-        end
-      end
-
-      def update(type, objects, _options = {})
-        return unless Chewy.enabled?
-
-        ids = type.root.id ? Array.wrap(objects) : type.adapter.identify(objects)
-
-        return if ids.empty?
-
-        Worker.perform_async(type.name, ids)
+    class CustomSidekiq < Sidekiq
+      def update(_type, _objects, _options = {})
+        super if Chewy.enabled?
       end
-
-      def leave; end
     end
   end
 end
diff --git a/lib/cli.rb b/lib/cli.rb
index 9162144cc48c5923df5800c07ae0c0594213ca1b..3f1658566b3acced06afcacfbc8a74f94b44b569 100644
--- a/lib/cli.rb
+++ b/lib/cli.rb
@@ -13,6 +13,8 @@ require_relative 'mastodon/preview_cards_cli'
 require_relative 'mastodon/cache_cli'
 require_relative 'mastodon/upgrade_cli'
 require_relative 'mastodon/email_domain_blocks_cli'
+require_relative 'mastodon/ip_blocks_cli'
+require_relative 'mastodon/maintenance_cli'
 require_relative 'mastodon/version'
 
 module Mastodon
@@ -57,6 +59,12 @@ module Mastodon
     desc 'email_domain_blocks SUBCOMMAND ...ARGS', 'Manage e-mail domain blocks'
     subcommand 'email_domain_blocks', Mastodon::EmailDomainBlocksCLI
 
+    desc 'ip_blocks SUBCOMMAND ...ARGS', 'Manage IP blocks'
+    subcommand 'ip_blocks', Mastodon::IpBlocksCLI
+
+    desc 'maintenance SUBCOMMAND ...ARGS', 'Various maintenance utilities'
+    subcommand 'maintenance', Mastodon::MaintenanceCLI
+
     option :dry_run, type: :boolean
     desc 'self-destruct', 'Erase the server from the federation'
     long_desc <<~LONG_DESC
diff --git a/lib/mastodon/accounts_cli.rb b/lib/mastodon/accounts_cli.rb
index 8c91c301358ada62e96f45b7ee2ac1fdfddc9dd8..653bfca3010a07710d2cd59a68e3c17c9aab55fd 100644
--- a/lib/mastodon/accounts_cli.rb
+++ b/lib/mastodon/accounts_cli.rb
@@ -77,7 +77,7 @@ module Mastodon
     def create(username)
       account  = Account.new(username: username)
       password = SecureRandom.hex
-      user     = User.new(email: options[:email], password: password, agreement: true, approved: true, admin: options[:role] == 'admin', moderator: options[:role] == 'moderator', confirmed_at: options[:confirmed] ? Time.now.utc : nil)
+      user     = User.new(email: options[:email], password: password, agreement: true, approved: true, admin: options[:role] == 'admin', moderator: options[:role] == 'moderator', confirmed_at: options[:confirmed] ? Time.now.utc : nil, bypass_invite_request_check: true)
 
       if options[:reattach]
         account = Account.find_local(username) || Account.new(username: username)
@@ -87,7 +87,7 @@ module Mastodon
           say('Use --force to reattach it anyway and delete the other user')
           return
         elsif account.user.present?
-          account.user.destroy!
+          DeleteAccountService.new.call(account, reserve_email: false)
         end
       end
 
@@ -192,10 +192,69 @@ module Mastodon
       end
 
       say("Deleting user with #{account.statuses_count} statuses, this might take a while...")
-      SuspendAccountService.new.call(account, reserve_email: false)
+      DeleteAccountService.new.call(account, reserve_email: false)
       say('OK', :green)
     end
 
+    option :force, type: :boolean, aliases: [:f], description: 'Override public key check'
+    desc 'merge FROM TO', 'Merge two remote accounts into one'
+    long_desc <<-LONG_DESC
+      Merge two remote accounts specified by their username@domain
+      into one, whereby the TO account is the one being merged into
+      and kept, while the FROM one is removed. It is primarily meant
+      to fix duplicates caused by other servers changing their domain.
+
+      The command by default only works if both accounts have the same
+      public key to prevent mistakes. To override this, use the --force.
+    LONG_DESC
+    def merge(from_acct, to_acct)
+      username, domain = from_acct.split('@')
+      from_account = Account.find_remote(username, domain)
+
+      if from_account.nil? || from_account.local?
+        say("No such account (#{from_acct})", :red)
+        exit(1)
+      end
+
+      username, domain = to_acct.split('@')
+      to_account = Account.find_remote(username, domain)
+
+      if to_account.nil? || to_account.local?
+        say("No such account (#{to_acct})", :red)
+        exit(1)
+      end
+
+      if from_account.public_key != to_account.public_key && !options[:force]
+        say("Accounts don't have the same public key, might not be duplicates!", :red)
+        say('Override with --force', :red)
+        exit(1)
+      end
+
+      to_account.merge_with!(from_account)
+      from_account.destroy
+
+      say('OK', :green)
+    end
+
+    desc 'fix-duplicates', 'Find duplicate remote accounts and merge them'
+    option :dry_run, type: :boolean
+    long_desc <<-LONG_DESC
+      Merge known remote accounts sharing an ActivityPub actor identifier.
+
+      Such duplicates can occur when a remote server admin misconfigures their
+      domain configuration.
+    LONG_DESC
+    def fix_duplicates
+      Account.remote.select(:uri, 'count(*)').group(:uri).having('count(*) > 1').pluck(:uri).each do |uri|
+        say("Duplicates found for #{uri}")
+        begin
+          ActivityPub::FetchRemoteAccountService.new.call(uri) unless options[:dry_run]
+        rescue => e
+          say("Error processing #{uri}: #{e}", :red)
+        end
+      end
+    end
+
     desc 'backup USERNAME', 'Request a backup for a user'
     long_desc <<-LONG_DESC
       Request a new backup for an account with a given USERNAME.
@@ -245,7 +304,7 @@ module Mastodon
         end
 
         if [404, 410].include?(code)
-          SuspendAccountService.new.call(account, reserve_username: false) unless options[:dry_run]
+          DeleteAccountService.new.call(account, reserve_username: false) unless options[:dry_run]
           1
         else
           # Touch account even during dry run to avoid getting the account into the window again
@@ -325,7 +384,7 @@ module Mastodon
       end
 
       processed, = parallelize_with_progress(Account.local.without_suspended) do |account|
-        FollowService.new.call(account, target_account)
+        FollowService.new.call(account, target_account, bypass_limit: true)
       end
 
       say("OK, followed target from #{processed} accounts", :green)
@@ -335,7 +394,8 @@ module Mastodon
     option :verbose, type: :boolean, aliases: [:v]
     desc 'unfollow ACCT', 'Make all local accounts unfollow account specified by ACCT'
     def unfollow(acct)
-      target_account = Account.find_remote(*acct.split('@'))
+      username, domain = acct.split('@')
+      target_account = Account.find_remote(username, domain)
 
       if target_account.nil?
         say('No such account', :red)
diff --git a/lib/mastodon/domains_cli.rb b/lib/mastodon/domains_cli.rb
index 558737c273e818f44020dd9e5591b4b65bed883d..3c2dfd4ec27b7857ae29cb38ab6f7616c01bf676 100644
--- a/lib/mastodon/domains_cli.rb
+++ b/lib/mastodon/domains_cli.rb
@@ -42,7 +42,7 @@ module Mastodon
       end
 
       processed, = parallelize_with_progress(scope) do |account|
-        SuspendAccountService.new.call(account, reserve_username: false, skip_side_effects: true) unless options[:dry_run]
+        DeleteAccountService.new.call(account, reserve_username: false, skip_side_effects: true) unless options[:dry_run]
       end
 
       DomainBlock.where(domain: domains).destroy_all unless options[:dry_run]
@@ -53,6 +53,8 @@ module Mastodon
       custom_emojis_count = custom_emojis.count
       custom_emojis.destroy_all unless options[:dry_run]
 
+      Instance.refresh unless options[:dry_run]
+
       say("Removed #{custom_emojis_count} custom emojis", :green)
     end
 
@@ -83,7 +85,7 @@ module Mastodon
       processed       = Concurrent::AtomicFixnum.new(0)
       failed          = Concurrent::AtomicFixnum.new(0)
       start_at        = Time.now.to_f
-      seed            = start ? [start] : Account.remote.domains
+      seed            = start ? [start] : Instance.pluck(:domain)
       blocked_domains = Regexp.new('\\.?' + DomainBlock.where(severity: 1).pluck(:domain).join('|') + '$')
       progress        = create_progress_bar
 
diff --git a/lib/mastodon/email_domain_blocks_cli.rb b/lib/mastodon/email_domain_blocks_cli.rb
index 7fe1efaaa5c13043f8f2f8ccb413e1b822fdb20f..55a637d68281c230f1b391dfd18126fb95ad9b33 100644
--- a/lib/mastodon/email_domain_blocks_cli.rb
+++ b/lib/mastodon/email_domain_blocks_cli.rb
@@ -63,7 +63,7 @@ module Mastodon
         ips       = []
 
         Resolv::DNS.open do |dns|
-          dns.timeouts = 1
+          dns.timeouts = 5
           hostnames = dns.getresources(email_domain_block.domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }
 
           ([email_domain_block.domain] + hostnames).uniq.each do |hostname|
diff --git a/lib/mastodon/emoji_cli.rb b/lib/mastodon/emoji_cli.rb
index da8fd6a0dc2b2322e9dbdc1aa8ae0b08b7691a61..0a1f538e6fc27a920712f02bb4cb5671fc87512b 100644
--- a/lib/mastodon/emoji_cli.rb
+++ b/lib/mastodon/emoji_cli.rb
@@ -43,7 +43,12 @@ module Mastodon
         tar.each do |entry|
           next unless entry.file? && entry.full_name.end_with?('.png')
 
-          shortcode    = [options[:prefix], File.basename(entry.full_name, '.*'), options[:suffix]].compact.join
+          filename = File.basename(entry.full_name, '.*')
+
+          # Skip macOS shadow files
+          next if filename.start_with?('._')
+
+          shortcode    = [options[:prefix], filename, options[:suffix]].compact.join
           custom_emoji = CustomEmoji.local.find_by(shortcode: shortcode)
 
           if custom_emoji && !options[:overwrite]
diff --git a/lib/mastodon/ip_blocks_cli.rb b/lib/mastodon/ip_blocks_cli.rb
new file mode 100644
index 0000000000000000000000000000000000000000..5c38c1aca07c91331874d19f9be7dcc934d7029a
--- /dev/null
+++ b/lib/mastodon/ip_blocks_cli.rb
@@ -0,0 +1,132 @@
+# frozen_string_literal: true
+
+require 'rubygems/package'
+require_relative '../../config/boot'
+require_relative '../../config/environment'
+require_relative 'cli_helper'
+
+module Mastodon
+  class IpBlocksCLI < Thor
+    def self.exit_on_failure?
+      true
+    end
+
+    option :severity, required: true, enum: %w(no_access sign_up_requires_approval), desc: 'Severity of the block'
+    option :comment, aliases: [:c], desc: 'Optional comment'
+    option :duration, aliases: [:d], type: :numeric, desc: 'Duration of the block in seconds'
+    option :force, type: :boolean, aliases: [:f], desc: 'Overwrite existing blocks'
+    desc 'add IP...', 'Add one or more IP blocks'
+    long_desc <<-LONG_DESC
+      Add one or more IP blocks. You can use CIDR syntax to
+      block IP ranges. You must specify --severity of the block. All
+      options will be copied for each IP block you create in one command.
+
+      You can add a --comment. If an IP block already exists for one of
+      the provided IPs, it will be skipped unless you use the --force
+      option to overwrite it.
+    LONG_DESC
+    def add(*addresses)
+      if addresses.empty?
+        say('No IP(s) given', :red)
+        exit(1)
+      end
+
+      skipped   = 0
+      processed = 0
+      failed    = 0
+
+      addresses.each do |address|
+        ip_block = IpBlock.find_by(ip: address)
+
+        if ip_block.present? && !options[:force]
+          say("#{address} is already blocked", :yellow)
+          skipped += 1
+          next
+        end
+
+        ip_block ||= IpBlock.new(ip: address)
+
+        ip_block.severity   = options[:severity]
+        ip_block.comment    = options[:comment] if options[:comment].present?
+        ip_block.expires_in = options[:duration]
+
+        if ip_block.save
+          processed += 1
+        else
+          say("#{address} could not be saved", :red)
+          failed += 1
+        end
+      end
+
+      say("Added #{processed}, skipped #{skipped}, failed #{failed}", color(processed, failed))
+    end
+
+    option :force, type: :boolean, aliases: [:f], desc: 'Remove blocks for ranges that cover given IP(s)'
+    desc 'remove IP...', 'Remove one or more IP blocks'
+    long_desc <<-LONG_DESC
+      Remove one or more IP blocks. Normally, only exact matches are removed. If
+      you want to ensure that all of the given IP addresses are unblocked, you
+      can use --force which will also remove any blocks for IP ranges that would
+      cover the given IP(s).
+    LONG_DESC
+    def remove(*addresses)
+      if addresses.empty?
+        say('No IP(s) given', :red)
+        exit(1)
+      end
+
+      processed = 0
+      skipped   = 0
+
+      addresses.each do |address|
+        ip_blocks = begin
+          if options[:force]
+            IpBlock.where('ip >>= ?', address)
+          else
+            IpBlock.where('ip <<= ?', address)
+          end
+        end
+
+        if ip_blocks.empty?
+          say("#{address} is not yet blocked", :yellow)
+          skipped += 1
+          next
+        end
+
+        ip_blocks.in_batches.destroy_all
+        processed += 1
+      end
+
+      say("Removed #{processed}, skipped #{skipped}", color(processed, 0))
+    end
+
+    option :format, aliases: [:f], enum: %w(plain nginx), desc: 'Format of the output'
+    desc 'export', 'Export blocked IPs'
+    long_desc <<-LONG_DESC
+      Export blocked IPs. Different formats are supported for usage with other
+      tools. Only blocks with no_access severity are returned.
+    LONG_DESC
+    def export
+      IpBlock.where(severity: :no_access).find_each do |ip_block|
+        case options[:format]
+        when 'nginx'
+          puts "deny #{ip_block.ip}/#{ip_block.ip.prefix};"
+        else
+          puts "#{ip_block.ip}/#{ip_block.ip.prefix}"
+        end
+      end
+    end
+
+    private
+
+    def color(processed, failed)
+      if !processed.zero? && failed.zero?
+        :green
+      elsif failed.zero?
+        :yellow
+      else
+        :red
+      end
+    end
+  end
+end
diff --git a/lib/mastodon/maintenance_cli.rb b/lib/mastodon/maintenance_cli.rb
new file mode 100644
index 0000000000000000000000000000000000000000..822051ceb879883984a270701c18d9130945bf54
--- /dev/null
+++ b/lib/mastodon/maintenance_cli.rb
@@ -0,0 +1,618 @@
+# frozen_string_literal: true
+
+require 'tty-prompt'
+require_relative '../../config/boot'
+require_relative '../../config/environment'
+require_relative 'cli_helper'
+
+module Mastodon
+  class MaintenanceCLI < Thor
+    include CLIHelper
+
+    def self.exit_on_failure?
+      true
+    end
+
+    MIN_SUPPORTED_VERSION = 2019_10_01_213028
+    MAX_SUPPORTED_VERSION = 2020_12_18_054746
+
+    # Stubs to enjoy ActiveRecord queries while not depending on a particular
+    # version of the code/database
+
+    class Status < ApplicationRecord; end
+    class StatusPin < ApplicationRecord; end
+    class Poll < ApplicationRecord; end
+    class Report < ApplicationRecord; end
+    class Tombstone < ApplicationRecord; end
+    class Favourite < ApplicationRecord; end
+    class Follow < ApplicationRecord; end
+    class FollowRequest < ApplicationRecord; end
+    class Block < ApplicationRecord; end
+    class Mute < ApplicationRecord; end
+    class AccountIdentityProof < ApplicationRecord; end
+    class AccountModerationNote < ApplicationRecord; end
+    class AccountPin < ApplicationRecord; end
+    class ListAccount < ApplicationRecord; end
+    class PollVote < ApplicationRecord; end
+    class Mention < ApplicationRecord; end
+    class AccountDomainBlock < ApplicationRecord; end
+    class AnnouncementReaction < ApplicationRecord; end
+    class FeaturedTag < ApplicationRecord; end
+    class CustomEmoji < ApplicationRecord; end
+    class CustomEmojiCategory < ApplicationRecord; end
+    class Bookmark < ApplicationRecord; end
+    class WebauthnCredential < ApplicationRecord; end
+
+    class PreviewCard < ApplicationRecord
+      self.inheritance_column = false
+    end
+
+    class MediaAttachment < ApplicationRecord
+      self.inheritance_column = nil
+    end
+
+    class AccountStat < ApplicationRecord
+      belongs_to :account, inverse_of: :account_stat
+    end
+
+    # Dummy class, to make migration possible across version changes
+    class Account < ApplicationRecord
+      has_one :user, inverse_of: :account
+      has_one :account_stat, inverse_of: :account
+
+      scope :local, -> { where(domain: nil) }
+
+      def local?
+        domain.nil?
+      end
+
+      def acct
+        local? ? username : "#{username}@#{domain}"
+      end
+
+      # This is a duplicate of the AccountMerging concern because we need it to
+      # be independent from code version.
+      def merge_with!(other_account)
+        # Since it's the same remote resource, the remote resource likely
+        # already believes we are following/blocking, so it's safe to
+        # re-attribute the relationships too. However, during the presence
+        # of the index bug users could have *also* followed the reference
+        # account already, therefore mass update will not work and we need
+        # to check for (and skip past) uniqueness errors
+
+        owned_classes = [
+          Status, StatusPin, MediaAttachment, Poll, Report, Tombstone, Favourite,
+          Follow, FollowRequest, Block, Mute, AccountIdentityProof,
+          AccountModerationNote, AccountPin, AccountStat, ListAccount,
+          PollVote, Mention
+        ]
+        owned_classes << AccountDeletionRequest if ActiveRecord::Base.connection.table_exists?(:account_deletion_requests)
+        owned_classes << AccountNote if ActiveRecord::Base.connection.table_exists?(:account_notes)
+
+        owned_classes.each do |klass|
+          klass.where(account_id: other_account.id).find_each do |record|
+            begin
+              record.update_attribute(:account_id, id)
+            rescue ActiveRecord::RecordNotUnique
+              next
+            end
+          end
+        end
+
+        target_classes = [Follow, FollowRequest, Block, Mute, AccountModerationNote, AccountPin]
+        target_classes << AccountNote if ActiveRecord::Base.connection.table_exists?(:account_notes)
+
+        target_classes.each do |klass|
+          klass.where(target_account_id: other_account.id).find_each do |record|
+            begin
+              record.update_attribute(:target_account_id, id)
+            rescue ActiveRecord::RecordNotUnique
+              next
+            end
+          end
+        end
+      end
+    end
+
+    class User < ApplicationRecord
+      belongs_to :account, inverse_of: :user
+    end
+
+    desc 'fix-duplicates', 'Fix duplicates in database and rebuild indexes'
+    long_desc <<~LONG_DESC
+      Delete or merge duplicate accounts, statuses, emojis, etc. and rebuild indexes.
+
+      This is useful if your database indexes are corrupted because of issues such as https://wiki.postgresql.org/wiki/Locale_data_changes
+
+      Mastodon has to be stopped to run this task, which will take a long time and may be destructive.
+    LONG_DESC
+    def fix_duplicates
+      @prompt = TTY::Prompt.new
+
+      if ActiveRecord::Migrator.current_version < MIN_SUPPORTED_VERSION
+        @prompt.warn 'Your version of the database schema is too old and is not supported by this script.'
+        @prompt.warn 'Please update to at least Mastodon 3.0.0 before running this script.'
+        exit(1)
+      elsif ActiveRecord::Migrator.current_version > MAX_SUPPORTED_VERSION
+        @prompt.warn 'Your version of the database schema is more recent than this script, this may cause unexpected errors.'
+        exit(1) unless @prompt.yes?('Continue anyway?')
+      end
+
+      @prompt.warn 'This task will take a long time to run and is potentially destructive.'
+      @prompt.warn 'Please make sure to stop Mastodon and have a backup.'
+      exit(1) unless @prompt.yes?('Continue?')
+
+      deduplicate_accounts!
+      deduplicate_users!
+      deduplicate_account_domain_blocks!
+      deduplicate_account_identity_proofs!
+      deduplicate_announcement_reactions!
+      deduplicate_conversations!
+      deduplicate_custom_emojis!
+      deduplicate_custom_emoji_categories!
+      deduplicate_domain_allows!
+      deduplicate_domain_blocks!
+      deduplicate_unavailable_domains!
+      deduplicate_email_domain_blocks!
+      deduplicate_media_attachments!
+      deduplicate_preview_cards!
+      deduplicate_statuses!
+      deduplicate_tags!
+      deduplicate_webauthn_credentials!
+
+      Rails.cache.clear
+
+      @prompt.say 'Finished!'
+    end
+
+    private
+
+    def deduplicate_accounts!
+      remove_index_if_exists!(:accounts, 'index_accounts_on_username_and_domain_lower')
+
+      @prompt.say 'Deduplicating accountsâ€¦ for local accounts, you will be asked to chose which account to keep unchanged.'
+
+      find_duplicate_accounts.each do |row|
+        accounts = Account.where(id: row['ids'].split(',')).to_a
+
+        if accounts.first.local?
+          deduplicate_local_accounts!(accounts)
+        else
+          deduplicate_remote_accounts!(accounts)
+        end
+      end
+
+      @prompt.say 'Restoring index_accounts_on_username_and_domain_lowerâ€¦'
+      if ActiveRecord::Migrator.current_version < 20200620164023
+        ActiveRecord::Base.connection.add_index :accounts, 'lower (username), lower(domain)', name: 'index_accounts_on_username_and_domain_lower', unique: true
+      else
+        ActiveRecord::Base.connection.add_index :accounts, "lower (username), COALESCE(lower(domain), '')", name: 'index_accounts_on_username_and_domain_lower', unique: true
+      end
+    end
+
+    def deduplicate_users!
+      remove_index_if_exists!(:users, 'index_users_on_confirmation_token')
+      remove_index_if_exists!(:users, 'index_users_on_email')
+      remove_index_if_exists!(:users, 'index_users_on_remember_token')
+      remove_index_if_exists!(:users, 'index_users_on_reset_password_token')
+
+      @prompt.say 'Deduplicating user recordsâ€¦'
+
+      # Deduplicating email
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users GROUP BY email HAVING count(*) > 1").each do |row|
+        users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse
+        ref_user = users.shift
+        @prompt.warn "Multiple users registered with e-mail address #{ref_user.email}."
+        @prompt.warn "e-mail will be disabled for the following accounts: #{user.map(&:account).map(&:acct).join(', ')}"
+        @prompt.warn 'Please reach out to them and set another address with `tootctl account modify` or delete them.'
+
+        i = 0
+        users.each do |user|
+          user.update!(email: "#{i} " + user.email)
+        end
+      end
+
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE confirmation_token IS NOT NULL GROUP BY confirmation_token HAVING count(*) > 1").each do |row|
+        users = User.where(id: row['ids'].split(',')).sort_by(&:created_at).reverse.drop(1)
+        @prompt.warn "Unsetting confirmation token for those accounts: #{users.map(&:account).map(&:acct).join(', ')}"
+
+        users.each do |user|
+          user.update!(confirmation_token: nil)
+        end
+      end
+
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE remember_token IS NOT NULL GROUP BY remember_token HAVING count(*) > 1").each do |row|
+        users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse.drop(1)
+        @prompt.warn "Unsetting remember token for those accounts: #{users.map(&:account).map(&:acct).join(', ')}"
+
+        users.each do |user|
+          user.update!(remember_token: nil)
+        end
+      end
+
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE reset_password_token IS NOT NULL GROUP BY reset_password_token HAVING count(*) > 1").each do |row|
+        users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse.drop(1)
+        @prompt.warn "Unsetting password reset token for those accounts: #{users.map(&:account).map(&:acct).join(', ')}"
+
+        users.each do |user|
+          user.update!(reset_password_token: nil)
+        end
+      end
+
+      @prompt.say 'Restoring users indexesâ€¦'
+      ActiveRecord::Base.connection.add_index :users, ['confirmation_token'], name: 'index_users_on_confirmation_token', unique: true
+      ActiveRecord::Base.connection.add_index :users, ['email'], name: 'index_users_on_email', unique: true
+      ActiveRecord::Base.connection.add_index :users, ['remember_token'], name: 'index_users_on_remember_token', unique: true
+      ActiveRecord::Base.connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true
+    end
+
+    def deduplicate_account_domain_blocks!
+      remove_index_if_exists!(:account_domain_blocks, 'index_account_domain_blocks_on_account_id_and_domain')
+
+      @prompt.say 'Removing duplicate account domain blocksâ€¦'
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM account_domain_blocks GROUP BY account_id, domain HAVING count(*) > 1").each do |row|
+        AccountDomainBlock.where(id: row['ids'].split(',').drop(1)).delete_all
+      end
+
+      @prompt.say 'Restoring account domain blocks indexesâ€¦'
+      ActiveRecord::Base.connection.add_index :account_domain_blocks, ['account_id', 'domain'], name: 'index_account_domain_blocks_on_account_id_and_domain', unique: true
+    end
+
+    def deduplicate_account_identity_proofs!
+      remove_index_if_exists!(:account_identity_proofs, 'index_account_proofs_on_account_and_provider_and_username')
+
+      @prompt.say 'Removing duplicate account identity proofsâ€¦'
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM account_identity_proofs GROUP BY account_id, provider, provider_username HAVING count(*) > 1").each do |row|
+        AccountIdentityProof.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+      end
+
+      @prompt.say 'Restoring account identity proofs indexesâ€¦'
+      ActiveRecord::Base.connection.add_index :account_identity_proofs, ['account_id', 'provider', 'provider_username'], name: 'index_account_proofs_on_account_and_provider_and_username', unique: true
+    end
+
+    def deduplicate_announcement_reactions!
+      return unless ActiveRecord::Base.connection.table_exists?(:announcement_reactions)
+
+      remove_index_if_exists!(:announcement_reactions, 'index_announcement_reactions_on_account_id_and_announcement_id')
+
+      @prompt.say 'Removing duplicate account identity proofsâ€¦'
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM announcement_reactions GROUP BY account_id, announcement_id, name HAVING count(*) > 1").each do |row|
+        AnnouncementReaction.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+      end
+
+      @prompt.say 'Restoring announcement_reactions indexesâ€¦'
+      ActiveRecord::Base.connection.add_index :announcement_reactions, ['account_id', 'announcement_id', 'name'], name: 'index_announcement_reactions_on_account_id_and_announcement_id', unique: true
+    end
+
+    def deduplicate_conversations!
+      remove_index_if_exists!(:conversations, 'index_conversations_on_uri')
+
+      @prompt.say 'Deduplicating conversationsâ€¦'
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM conversations WHERE uri IS NOT NULL GROUP BY uri HAVING count(*) > 1").each do |row|
+        conversations = Conversation.where(id: row['ids'].split(',')).sort_by(&:id).reverse
+
+        ref_conversation = conversations.shift
+
+        conversations.each do |other|
+          merge_conversations!(ref_conversation, other)
+          other.destroy
+        end
+      end
+
+      @prompt.say 'Restoring conversations indexesâ€¦'
+      ActiveRecord::Base.connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true
+    end
+
+    def deduplicate_custom_emojis!
+      remove_index_if_exists!(:custom_emojis, 'index_custom_emojis_on_shortcode_and_domain')
+
+      @prompt.say 'Deduplicating custom_emojisâ€¦'
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM custom_emojis GROUP BY shortcode, domain HAVING count(*) > 1").each do |row|
+        emojis = CustomEmoji.where(id: row['ids'].split(',')).sort_by(&:id).reverse
+
+        ref_emoji = emojis.shift
+
+        emojis.each do |other|
+          merge_custom_emojis!(ref_emoji, other)
+          other.destroy
+        end
+      end
+
+      @prompt.say 'Restoring custom_emojis indexesâ€¦'
+      ActiveRecord::Base.connection.add_index :custom_emojis, ['shortcode', 'domain'], name: 'index_custom_emojis_on_shortcode_and_domain', unique: true
+    end
+
+    def deduplicate_custom_emoji_categories!
+      remove_index_if_exists!(:custom_emoji_categories, 'index_custom_emoji_categories_on_name')
+
+      @prompt.say 'Deduplicating custom_emoji_categoriesâ€¦'
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM custom_emoji_categories GROUP BY name HAVING count(*) > 1").each do |row|
+        categories = CustomEmojiCategory.where(id: row['ids'].split(',')).sort_by(&:id).reverse
+
+        ref_category = categories.shift
+
+        categories.each do |other|
+          merge_custom_emoji_categories!(ref_category, other)
+          other.destroy
+        end
+      end
+
+      @prompt.say 'Restoring custom_emoji_categories indexesâ€¦'
+      ActiveRecord::Base.connection.add_index :custom_emoji_categories, ['name'], name: 'index_custom_emoji_categories_on_name', unique: true
+    end
+
+    def deduplicate_domain_allows!
+      remove_index_if_exists!(:domain_allows, 'index_domain_allows_on_domain')
+
+      @prompt.say 'Deduplicating domain_allowsâ€¦'
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM domain_allows GROUP BY domain HAVING count(*) > 1").each do |row|
+        DomainAllow.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+      end
+
+      @prompt.say 'Restoring domain_allows indexesâ€¦'
+      ActiveRecord::Base.connection.add_index :domain_allows, ['domain'], name: 'index_domain_allows_on_domain', unique: true
+    end
+
+    def deduplicate_domain_blocks!
+      remove_index_if_exists!(:domain_blocks, 'index_domain_blocks_on_domain')
+
+      @prompt.say 'Deduplicating domain_allowsâ€¦'
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM domain_blocks GROUP BY domain HAVING count(*) > 1").each do |row|
+        domain_blocks = DomainBlock.where(id: row['ids'].split(',')).by_severity.reverse.to_a
+
+        reject_media = domain_blocks.any?(&:reject_media?)
+        reject_reports = domain_blocks.any?(&:reject_reports?)
+
+        reference_block = domain_blocks.shift
+
+        private_comment = domain_blocks.reduce(reference_block.private_comment.presence) { |a, b| a || b.private_comment.presence }
+        public_comment  = domain_blocks.reduce(reference_block.public_comment.presence)  { |a, b| a || b.public_comment.presence }
+
+        reference_block.update!(reject_media: reject_media, reject_reports: reject_reports, private_comment: private_comment, public_comment: public_comment)
+
+        domain_blocks.each(&:destroy)
+      end
+
+      @prompt.say 'Restoring domain_blocks indexesâ€¦'
+      ActiveRecord::Base.connection.add_index :domain_blocks, ['domain'], name: 'index_domain_blocks_on_domain', unique: true
+    end
+
+    def deduplicate_unavailable_domains!
+      return unless ActiveRecord::Base.connection.table_exists?(:unavailable_domains)
+
+      remove_index_if_exists!(:unavailable_domains, 'index_unavailable_domains_on_domain')
+
+      @prompt.say 'Deduplicating unavailable_domainsâ€¦'
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM unavailable_domains GROUP BY domain HAVING count(*) > 1").each do |row|
+        UnavailableDomain.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+      end
+
+      @prompt.say 'Restoring domain_allows indexesâ€¦'
+      ActiveRecord::Base.connection.add_index :unavailable_domains, ['domain'], name: 'index_unavailable_domains_on_domain', unique: true
+    end
+
+    def deduplicate_email_domain_blocks!
+      remove_index_if_exists!(:email_domain_blocks, 'index_email_domain_blocks_on_domain')
+
+      @prompt.say 'Deduplicating email_domain_blocksâ€¦'
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM email_domain_blocks GROUP BY domain HAVING count(*) > 1").each do |row|
+        domain_blocks = EmailDomainBlock.where(id: row['ids'].split(',')).sort_by { |b| b.parent.nil? ? 1 : 0 }.to_a
+        domain_blocks.drop(1).each(&:destroy)
+      end
+
+      @prompt.say 'Restoring email_domain_blocks indexesâ€¦'
+      ActiveRecord::Base.connection.add_index :email_domain_blocks, ['domain'], name: 'index_email_domain_blocks_on_domain', unique: true
+    end
+
+    def deduplicate_media_attachments!
+      remove_index_if_exists!(:media_attachments, 'index_media_attachments_on_shortcode')
+
+      @prompt.say 'Deduplicating media_attachmentsâ€¦'
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM media_attachments WHERE shortcode IS NOT NULL GROUP BY shortcode HAVING count(*) > 1").each do |row|
+        MediaAttachment.where(id: row['ids'].split(',').drop(1)).update_all(shortcode: nil)
+      end
+
+      @prompt.say 'Restoring media_attachments indexesâ€¦'
+      ActiveRecord::Base.connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true
+    end
+
+    def deduplicate_preview_cards!
+      remove_index_if_exists!(:preview_cards, 'index_preview_cards_on_url')
+
+      @prompt.say 'Deduplicating preview_cardsâ€¦'
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM preview_cards GROUP BY url HAVING count(*) > 1").each do |row|
+        PreviewCard.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+      end
+
+      @prompt.say 'Restoring preview_cards indexesâ€¦'
+      ActiveRecord::Base.connection.add_index :preview_cards, ['url'], name: 'index_preview_cards_on_url', unique: true
+    end
+
+    def deduplicate_statuses!
+      remove_index_if_exists!(:statuses, 'index_statuses_on_uri')
+
+      @prompt.say 'Deduplicating statusesâ€¦'
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM statuses WHERE uri IS NOT NULL GROUP BY uri HAVING count(*) > 1").each do |row|
+        statuses = Status.where(id: row['ids'].split(',')).sort_by(&:id)
+        ref_status = statuses.shift
+        statuses.each do |status|
+          merge_statuses!(ref_status, status) if status.account_id == ref_status.account_id
+          status.destroy
+        end
+      end
+
+      @prompt.say 'Restoring statuses indexesâ€¦'
+      ActiveRecord::Base.connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true
+    end
+
+    def deduplicate_tags!
+      remove_index_if_exists!(:tags, 'index_tags_on_name_lower')
+
+      @prompt.say 'Deduplicating tagsâ€¦'
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM tags GROUP BY lower((name)::text) HAVING count(*) > 1").each do |row|
+        tags = Tag.where(id: row['ids'].split(',')).sort_by { |t| [t.usable?, t.trendable?, t.listable?].count(false) }
+        ref_tag = tags.shift
+        tags.each do |tag|
+          merge_tags!(ref_tag, tag)
+          tag.destroy
+        end
+      end
+
+      @prompt.say 'Restoring tags indexesâ€¦'
+      ActiveRecord::Base.connection.add_index :tags, 'lower((name)::text)', name: 'index_tags_on_name_lower', unique: true
+    end
+
+    def deduplicate_webauthn_credentials!
+      return unless ActiveRecord::Base.connection.table_exists?(:webauthn_credentials)
+
+      remove_index_if_exists!(:webauthn_credentials, 'index_webauthn_credentials_on_external_id')
+
+      @prompt.say 'Deduplicating webauthn_credentialsâ€¦'
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM webauthn_credentials GROUP BY external_id HAVING count(*) > 1").each do |row|
+        WebauthnCredential.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+      end
+
+      @prompt.say 'Restoring webauthn_credentials indexesâ€¦'
+      ActiveRecord::Base.connection.add_index :webauthn_credentials, ['external_id'], name: 'index_webauthn_credentials_on_external_id', unique: true
+    end
+
+    def deduplicate_local_accounts!(accounts)
+      accounts = accounts.sort_by(&:id).reverse
+
+      @prompt.warn "Multiple local accounts were found for username '#{accounts.first.username}'."
+      @prompt.warn 'All those accounts are distinct accounts but only the most recently-created one is fully-functionnal.'
+
+      accounts.each_with_index do |account, idx|
+        @prompt.say '%2d. %s: created at: %s; updated at: %s; last logged in at: %s; statuses: %5d; last status at: %s' % [idx, account.username, account.created_at, account.updated_at, account.user&.last_sign_in_at&.to_s || 'N/A', account.account_stat&.statuses_count || 0, account.account_stat&.last_status_at || 'N/A']
+      end
+
+      @prompt.say 'Please chose the one to keep unchanged, other ones will be automatically renamed.'
+
+      ref_id = @prompt.ask('Account to keep unchanged:') do |q|
+        q.required true
+        q.default 0
+        q.convert :int
+      end
+
+      accounts.delete_at(ref_id)
+
+      i = 0
+      accounts.each do |account|
+        i += 1
+        username = account.username + "_#{i}"
+
+        while Account.local.exists?(username: username)
+          i += 1
+          username = account.username + "_#{i}"
+        end
+
+        account.update!(username: username)
+      end
+    end
+
+    def deduplicate_remote_accounts!(accounts)
+      accounts = accounts.sort_by(&:updated_at).reverse
+
+      reference_account = accounts.shift
+
+      accounts.each do |other_account|
+        if other_account.public_key == reference_account.public_key
+          # The accounts definitely point to the same resource, so
+          # it's safe to re-attribute content and relationships
+          reference_account.merge_with!(other_account)
+        end
+
+        other_account.destroy
+      end
+    end
+
+    def merge_conversations!(main_conv, duplicate_conv)
+      owned_classes = [ConversationMute, AccountConversation]
+      owned_classes.each do |klass|
+        klass.where(conversation_id: duplicate_conv.id).find_each do |record|
+          begin
+            record.update_attribute(:account_id, main_conv.id)
+          rescue ActiveRecord::RecordNotUnique
+            next
+          end
+        end
+      end
+    end
+
+    def merge_custom_emojis!(main_emoji, duplicate_emoji)
+      owned_classes = [AnnouncementReaction]
+      owned_classes.each do |klass|
+        klass.where(custom_emoji_id: duplicate_emoji.id).update_all(custom_emoji_id: main_emoji.id)
+      end
+    end
+
+    def merge_custom_emoji_categories!(main_category, duplicate_category)
+      owned_classes = [CustomEmoji]
+      owned_classes.each do |klass|
+        klass.where(category_id: duplicate_category.id).update_all(category_id: main_category.id)
+      end
+    end
+
+    def merge_statuses!(main_status, duplicate_status)
+      owned_classes = [Favourite, Mention, Poll]
+      owned_classes << Bookmark if ActiveRecord::Base.connection.table_exists?(:bookmarks)
+      owned_classes.each do |klass|
+        klass.where(status_id: duplicate_status.id).find_each do |record|
+          begin
+            record.update_attribute(:status_id, main_status.id)
+          rescue ActiveRecord::RecordNotUnique
+            next
+          end
+        end
+      end
+
+      StatusPin.where(account_id: main_status.account_id, status_id: duplicate_status.id).find_each do |record|
+        begin
+          record.update_attribute(:status_id, main_status.id)
+        rescue ActiveRecord::RecordNotUnique
+          next
+        end
+      end
+
+      Status.where(in_reply_to_id: duplicate_status.id).find_each do |record|
+        begin
+          record.update_attribute(:in_reply_to_id, main_status.id)
+        rescue ActiveRecord::RecordNotUnique
+          next
+        end
+      end
+
+      Status.where(reblog_of_id: duplicate_status.id).find_each do |record|
+        begin
+          record.update_attribute(:reblog_of_id, main_status.id)
+        rescue ActiveRecord::RecordNotUnique
+          next
+        end
+      end
+    end
+
+    def merge_tags!(main_tag, duplicate_tag)
+      [FeaturedTag].each do |klass|
+        klass.where(tag_id: duplicate_tag.id).find_each do |record|
+          begin
+            record.update_attribute(:tag_id, main_tag.id)
+          rescue ActiveRecord::RecordNotUnique
+            next
+          end
+        end
+      end
+    end
+
+    def find_duplicate_accounts
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM accounts GROUP BY lower(username), COALESCE(lower(domain), '') HAVING count(*) > 1")
+    end
+
+    def remove_index_if_exists!(table, name)
+      ActiveRecord::Base.connection.remove_index(table, name: name)
+    rescue ArgumentError
+      nil
+    rescue ActiveRecord::StatementInvalid
+      nil
+    end
+  end
+end
diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb
index 2a4e3e379f3dfa751aa2588a96381ed59995ace4..5f4a414b1a59cee2f0e298c7d7ce0663f7541270 100644
--- a/lib/mastodon/media_cli.rb
+++ b/lib/mastodon/media_cli.rb
@@ -31,7 +31,7 @@ module Mastodon
       processed, aggregate = parallelize_with_progress(MediaAttachment.cached.where.not(remote_url: '').where('created_at < ?', time_ago)) do |media_attachment|
         next if media_attachment.file.blank?
 
-        size = media_attachment.file_file_size + (media_attachment.thumbnail_file_size || 0)
+        size = (media_attachment.file_file_size || 0) + (media_attachment.thumbnail_file_size || 0)
 
         unless options[:dry_run]
           media_attachment.file.destroy
@@ -47,6 +47,7 @@ module Mastodon
 
     option :start_after
     option :prefix
+    option :fix_permissions, type: :boolean, default: false
     option :dry_run, type: :boolean, default: false
     desc 'remove-orphans', 'Scan storage and check for files that do not belong to existing media attachments'
     long_desc <<~LONG_DESC
@@ -66,6 +67,7 @@ module Mastodon
       when :s3
         paperclip_instance = MediaAttachment.new.file
         s3_interface       = paperclip_instance.s3_interface
+        s3_permissions     = Paperclip::Attachment.default_options[:s3_permissions]
         bucket             = s3_interface.bucket(Paperclip::Attachment.default_options[:s3_credentials][:bucket])
         last_key           = options[:start_after]
 
@@ -86,10 +88,12 @@ module Mastodon
           record_map = preload_records_from_mixed_objects(objects)
 
           objects.each do |object|
+            object.acl.put(acl: s3_permissions) if options[:fix_permissions] && !options[:dry_run]
+
             path_segments = object.key.split('/')
             path_segments.delete('cache')
 
-            if path_segments.size != 7
+            unless [7, 10].include?(path_segments.size)
               progress.log(pastel.yellow("Unrecognized file found: #{object.key}"))
               next
             end
@@ -133,7 +137,7 @@ module Mastodon
           path_segments = key.split(File::SEPARATOR)
           path_segments.delete('cache')
 
-          if path_segments.size != 7
+          unless [7, 10].include?(path_segments.size)
             progress.log(pastel.yellow("Unrecognized file found: #{key}"))
             next
           end
@@ -258,7 +262,7 @@ module Mastodon
       path_segments = path.split('/')[2..-1]
       path_segments.delete('cache')
 
-      if path_segments.size != 7
+      unless [7, 10].include?(path_segments.size)
         say('Not a media URL', :red)
         exit(1)
       end
@@ -311,7 +315,7 @@ module Mastodon
         segments = object.key.split('/')
         segments.delete('cache')
 
-        next if segments.size != 7
+        next unless [7, 10].include?(segments.size)
 
         model_name = segments.first.classify
         record_id  = segments[2..-2].join.to_i
diff --git a/lib/mastodon/redis_config.rb b/lib/mastodon/redis_config.rb
index e9db9122fabaad4a979559b1b620bdbc45dbcf7f..c3c8ff8005d3262244328560c8689ba295bc52b1 100644
--- a/lib/mastodon/redis_config.rb
+++ b/lib/mastodon/redis_config.rb
@@ -23,7 +23,7 @@ end
 setup_redis_env_url
 setup_redis_env_url(:cache, false)
 
-namespace       = ENV.fetch('REDIS_NAMESPACE') { nil }
+namespace       = ENV.fetch('REDIS_NAMESPACE', nil)
 cache_namespace = namespace ? namespace + '_cache' : 'cache'
 
 REDIS_CACHE_PARAMS = {
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 104cb1807a4fd4c65036521499dcc0087cbb32f4..bd0915775411a873732c1957fdf81b9467a59ba8 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -9,7 +9,7 @@ module Mastodon
     end
 
     def minor
-      2
+      3
     end
 
     def patch
@@ -17,7 +17,7 @@ module Mastodon
     end
 
     def flags
-      'rc1'
+      ''
     end
 
     def suffix
@@ -33,16 +33,16 @@ module Mastodon
     end
 
     def repository
-      ENV.fetch('GITHUB_REPOSITORY') { 'tootsuite/mastodon' }
+      ENV.fetch('GITHUB_REPOSITORY', 'tootsuite/mastodon')
     end
 
     def source_base_url
-      ENV.fetch('SOURCE_BASE_URL') { "https://github.com/#{repository}" }
+      ENV.fetch('SOURCE_BASE_URL', "https://github.com/#{repository}")
     end
 
     # specify git tag or commit hash here
     def source_tag
-      ENV.fetch('SOURCE_TAG') { nil }
+      ENV.fetch('SOURCE_TAG', nil)
     end
 
     def source_url
diff --git a/lib/paperclip/attachment_extensions.rb b/lib/paperclip/attachment_extensions.rb
index 93df0a326f07c57dc5774c14bcd480e47a76e49e..94f7769b65b57c2ecfeb2ca7d72738ab6dc03892 100644
--- a/lib/paperclip/attachment_extensions.rb
+++ b/lib/paperclip/attachment_extensions.rb
@@ -35,6 +35,27 @@ module Paperclip
 
       formats.include?(other_extension.delete('.')) && File.basename(other_filename, other_extension) == File.basename(original_filename, File.extname(original_filename))
     end
+
+    def default_url(style_name = default_style)
+      @url_generator.for_as_default(style_name)
+    end
+
+    STOPLIGHT_THRESHOLD = 10
+    STOPLIGHT_COOLDOWN  = 30
+
+    # We overwrite this method to put a circuit breaker around
+    # calls to object storage, to stop hitting APIs that are slow
+    # to respond or don't respond at all and as such minimize the
+    # impact of object storage outages on application throughput
+    def save
+      Stoplight('object-storage') { super }.with_threshold(STOPLIGHT_THRESHOLD).with_cool_off_time(STOPLIGHT_COOLDOWN).with_error_handler do |error, handle|
+        if error.is_a?(Seahorse::Client::NetworkingError)
+          handle.call(error)
+        else
+          raise error
+        end
+      end.run
+    end
   end
 end
 
diff --git a/lib/paperclip/color_extractor.rb b/lib/paperclip/color_extractor.rb
index 44fe5ff1dafedb3558a14fb2ed96d426aa5abf20..f850dc067c68c16c1a35e91d952ad89e60d51c4e 100644
--- a/lib/paperclip/color_extractor.rb
+++ b/lib/paperclip/color_extractor.rb
@@ -5,6 +5,7 @@ require 'mime/types/columnar'
 module Paperclip
   class ColorExtractor < Paperclip::Processor
     MIN_CONTRAST        = 3.0
+    ACCENT_MIN_CONTRAST = 2.0
     FREQUENCY_THRESHOLD = 0.01
 
     def make
@@ -26,8 +27,9 @@ module Paperclip
 
       foreground_palette.each do |color|
         distance = ColorDiff.between(background_color, color)
+        contrast = w3c_contrast(background_color, color)
 
-        if distance > max_distance
+        if distance > max_distance && contrast >= ACCENT_MIN_CONTRAST
           max_distance = distance
           max_distance_color = color
         end
@@ -77,8 +79,8 @@ module Paperclip
     private
 
     def w3c_contrast(color1, color2)
-      luminance1 = (0.2126 * color1.r + 0.7152 * color1.g + 0.0722 * color1.b) + 0.05
-      luminance2 = (0.2126 * color2.r + 0.7152 * color2.g + 0.0722 * color2.b) + 0.05
+      luminance1 = color1.to_xyz.y * 0.01 + 0.05
+      luminance2 = color2.to_xyz.y * 0.01 + 0.05
 
       if luminance1 > luminance2
         luminance1 / luminance2
@@ -87,7 +89,7 @@ module Paperclip
       end
     end
 
-    # rubocop:disable Style/MethodParameterName
+    # rubocop:disable Naming/MethodParameterName
     def rgb_to_hsl(r, g, b)
       r /= 255.0
       g /= 255.0
@@ -154,7 +156,7 @@ module Paperclip
 
       [(r * 255).round, (g * 255).round, (b * 255).round]
     end
-    # rubocop:enable Style/MethodParameterName
+    # rubocop:enable Naming/MethodParameterName
 
     def lighten_or_darken(color, by)
       hue, saturation, light = rgb_to_hsl(color.r, color.g, color.b)
diff --git a/lib/paperclip/media_type_spoof_detector_extensions.rb b/lib/paperclip/media_type_spoof_detector_extensions.rb
index 363934d8d1395df9902f2779e6dcf4438315d869..43337cc6884222af8e5b61f4be9a65f71d3aa26b 100644
--- a/lib/paperclip/media_type_spoof_detector_extensions.rb
+++ b/lib/paperclip/media_type_spoof_detector_extensions.rb
@@ -18,7 +18,7 @@ module Paperclip
       @type_from_mime_magic ||= begin
         begin
           File.open(@file.path) do |file|
-            MimeMagic.by_magic(file)&.type
+            MimeMagic.by_magic(file)&.type || ''
           end
         rescue Errno::ENOENT
           ''
diff --git a/lib/paperclip/response_with_limit_adapter.rb b/lib/paperclip/response_with_limit_adapter.rb
index 7d897b8d672c8825c2e676a721c021f1f65043ba..17a2abd25f2c79af2a80473bdb8a6f5a3760b61b 100644
--- a/lib/paperclip/response_with_limit_adapter.rb
+++ b/lib/paperclip/response_with_limit_adapter.rb
@@ -16,10 +16,10 @@ module Paperclip
     private
 
     def cache_current_values
-      @original_filename = filename_from_content_disposition || filename_from_path || 'data'
+      @original_filename = filename_from_content_disposition.presence || filename_from_path.presence || 'data'
       @size = @target.response.content_length
       @tempfile = copy_to_tempfile(@target)
-      @content_type = @target.response.mime_type || ContentTypeDetector.new(@tempfile.path).detect
+      @content_type = ContentTypeDetector.new(@tempfile.path).detect
     end
 
     def copy_to_tempfile(source)
diff --git a/lib/paperclip/url_generator_extensions.rb b/lib/paperclip/url_generator_extensions.rb
index 1079efdbc4f231b7a3f4b07faf56be8c6037d4bb..e1d6df2c299cdeaf5abb332f741d1dc67db4038b 100644
--- a/lib/paperclip/url_generator_extensions.rb
+++ b/lib/paperclip/url_generator_extensions.rb
@@ -11,6 +11,10 @@ module Paperclip
         Addressable::URI.parse(url).normalize.to_str.gsub(escape_regex) { |m| "%#{m.ord.to_s(16).upcase}" }
       end
     end
+
+    def for_as_default(style_name)
+      attachment_options[:interpolator].interpolate(default_url, @attachment, style_name)
+    end
   end
 end
 
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index b76e90131f210ff4227ffca696902b25df012c60..f6c9c7eecfc21f5415447e1edf390674b2ed64bc 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -48,6 +48,20 @@ namespace :db do
     end
   end
 
+  task :post_migration_hook do
+    at_exit do
+      unless %w(C POSIX).include?(ActiveRecord::Base.connection.execute('SELECT datcollate FROM pg_database WHERE datname = current_database();').first['datcollate'])
+        warn <<~WARNING
+          Your database collation is susceptible to index corruption.
+            (This warning does not indicate that index corruption has occured and can be ignored)
+            (To learn more, visit: https://docs.joinmastodon.org/admin/troubleshooting/index-corruption/)
+        WARNING
+      end
+    end
+  end
+
+  Rake::Task['db:migrate'].enhance(['db:post_migration_hook'])
+
   # Before we load the schema, define the timestamp_id function.
   # Idiomatically, we might do this in a migration, but then it
   # wouldn't end up in schema.rb, so we'd need to figure out a way to
diff --git a/lib/tasks/emojis.rake b/lib/tasks/emojis.rake
index 0e7921ffc994b641242f015dc658a2c03cc6b2ac..d0b8fa890b3e0eda09a7ec26e6182d04701947c0 100644
--- a/lib/tasks/emojis.rake
+++ b/lib/tasks/emojis.rake
@@ -91,7 +91,7 @@ namespace :emojis do
   desc 'Generate emoji variants with white borders'
   task :generate_borders do
     src = Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json')
-    emojis = 'ðŸŽ±ðŸœâš«ðŸ–¤â¬›â—¼ï¸â—¾â—¼ï¸âœ’ï¸â–ªï¸ðŸ’£ðŸŽ³ðŸ“·ðŸ“¸â™£ï¸ðŸ•¶ï¸âœ´ï¸ðŸ”ŒðŸ’‚â€â™€ï¸ðŸ“½ï¸ðŸ³ðŸ¦ðŸ’‚ðŸ”ªðŸ•³ï¸ðŸ•¹ï¸ðŸ•‹ðŸ–Šï¸ðŸ–‹ï¸ðŸ’‚â€â™‚ï¸ðŸŽ¤ðŸŽ“ðŸŽ¥ðŸŽ¼â™ ï¸ðŸŽ©ðŸ¦ƒðŸ“¼ðŸ“¹ðŸŽ®ðŸƒðŸ´ðŸ‘½âš¾ðŸ”â˜ï¸ðŸ’¨ðŸ•Šï¸ðŸ‘€ðŸ¥ðŸ‘»ðŸâ•â”â›¸ï¸ðŸŒ©ï¸ðŸ”ŠðŸ”‡ðŸ“ƒðŸŒ§ï¸ðŸðŸšðŸ™ðŸ“ðŸ‘ðŸ’€â˜ ï¸ðŸŒ¨ï¸ðŸ”‰ðŸ”ˆðŸ’¬ðŸ’ðŸðŸ³ï¸âšªâ¬œâ—½â—»ï¸â–«ï¸'
+    emojis = 'ðŸŽ±ðŸœâš«ðŸ–¤â¬›â—¼ï¸â—¾â—¼ï¸âœ’ï¸â–ªï¸ðŸ’£ðŸŽ³ðŸ“·ðŸ“¸â™£ï¸ðŸ•¶ï¸âœ´ï¸ðŸ”ŒðŸ’‚â€â™€ï¸ðŸ“½ï¸ðŸ³ðŸ¦ðŸ’‚ðŸ”ªðŸ•³ï¸ðŸ•¹ï¸ðŸ•‹ðŸ–Šï¸ðŸ–‹ï¸ðŸ’‚â€â™‚ï¸ðŸŽ¤ðŸŽ“ðŸŽ¥ðŸŽ¼â™ ï¸ðŸŽ©ðŸ¦ƒðŸ“¼ðŸ“¹ðŸŽ®ðŸƒðŸ´ðŸžðŸ•ºðŸ‘½âš¾ðŸ”â˜ï¸ðŸ’¨ðŸ•Šï¸ðŸ‘€ðŸ¥ðŸ‘»ðŸâ•â”â›¸ï¸ðŸŒ©ï¸ðŸ”ŠðŸ”‡ðŸ“ƒðŸŒ§ï¸ðŸðŸšðŸ™ðŸ“ðŸ‘ðŸ’€â˜ ï¸ðŸŒ¨ï¸ðŸ”‰ðŸ”ˆðŸ’¬ðŸ’ðŸðŸ³ï¸âšªâ¬œâ—½â—»ï¸â–«ï¸'
 
     map = Oj.load(File.read(src))
 
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 9e80989ef0114194dd10386175844434c648f990..2ad1e778ba34cf0de2bf254eb74b6007b90e8ff1 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -412,7 +412,7 @@ namespace :mastodon do
 
           password = SecureRandom.hex(16)
 
-          user = User.new(admin: true, email: email, password: password, confirmed_at: Time.now.utc, account_attributes: { username: username })
+          user = User.new(admin: true, email: email, password: password, confirmed_at: Time.now.utc, account_attributes: { username: username }, bypass_invite_request_check: true)
           user.save(validate: false)
 
           prompt.ok "You can login with the password: #{password}"
diff --git a/lib/webpacker/helper_extensions.rb b/lib/webpacker/helper_extensions.rb
new file mode 100644
index 0000000000000000000000000000000000000000..8f46d763132b5d78aee93da580b884641283f4c2
--- /dev/null
+++ b/lib/webpacker/helper_extensions.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Webpacker::HelperExtensions
+  def javascript_pack_tag(name, **options)
+    src, integrity = current_webpacker_instance.manifest.lookup!(name, type: :javascript, with_integrity: true)
+    javascript_include_tag(src, options.merge(integrity: integrity))
+  end
+
+  def stylesheet_pack_tag(name, **options)
+    src, integrity = current_webpacker_instance.manifest.lookup!(name, type: :stylesheet, with_integrity: true)
+    stylesheet_link_tag(src, options.merge(integrity: integrity))
+  end
+
+  def preload_pack_asset(name, **options)
+    src, integrity = current_webpacker_instance.manifest.lookup!(name, with_integrity: true)
+    preload_link_tag(src, options.merge(integrity: integrity))
+  end
+end
+
+Webpacker::Helper.prepend(Webpacker::HelperExtensions)
diff --git a/lib/webpacker/manifest_extensions.rb b/lib/webpacker/manifest_extensions.rb
new file mode 100644
index 0000000000000000000000000000000000000000..789eb81ccf31735cd59ec03ba64592f2661293b0
--- /dev/null
+++ b/lib/webpacker/manifest_extensions.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Webpacker::ManifestExtensions
+  def lookup(name, pack_type = {})
+    asset = super
+
+    if pack_type[:with_integrity] && asset.respond_to?(:dig)
+      [asset.dig('src'), asset.dig('integrity')]
+    elsif asset.respond_to?(:dig)
+      asset.dig('src')
+    else
+      asset
+    end
+  end
+end
+
+Webpacker::Manifest.prepend(Webpacker::ManifestExtensions)
diff --git a/package.json b/package.json
index 37c6d97d3c753b8e8e585eb7b866ce8936fc8183..30926b651dbec4ea5f6bca6f1487b7af66953932 100644
--- a/package.json
+++ b/package.json
@@ -59,22 +59,23 @@
   },
   "private": true,
   "dependencies": {
-    "@babel/core": "^7.10.3",
+    "@babel/core": "^7.12.10",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/plugin-proposal-decorators": "^7.10.3",
-    "@babel/plugin-transform-react-inline-elements": "^7.10.4",
-    "@babel/plugin-transform-runtime": "^7.10.4",
-    "@babel/preset-env": "^7.10.4",
-    "@babel/preset-react": "^7.10.4",
-    "@babel/runtime": "^7.8.4",
-    "@clusterws/cws": "^2.0.0",
+    "@babel/plugin-proposal-decorators": "^7.12.12",
+    "@babel/plugin-transform-react-inline-elements": "^7.12.1",
+    "@babel/plugin-transform-runtime": "^7.12.10",
+    "@babel/preset-env": "^7.12.11",
+    "@babel/preset-react": "^7.12.10",
+    "@babel/runtime": "^7.12.5",
+    "@clusterws/cws": "^3.0.0",
     "@gamestdio/websocket": "^0.3.2",
-    "@rails/ujs": "^6.0.3",
-    "array-includes": "^3.1.1",
+    "@github/webauthn-json": "^0.5.7",
+    "@rails/ujs": "^6.1.0",
+    "array-includes": "^3.1.2",
     "arrow-key-navigation": "^1.2.0",
-    "autoprefixer": "^9.8.0",
-    "axios": "^0.19.2",
-    "babel-loader": "^8.1.0",
+    "autoprefixer": "^9.8.6",
+    "axios": "^0.21.1",
+    "babel-loader": "^8.2.2",
     "babel-plugin-lodash": "^3.3.4",
     "babel-plugin-preval": "^5.0.0",
     "babel-plugin-react-intl": "^6.2.0",
@@ -82,40 +83,40 @@
     "babel-runtime": "^6.26.0",
     "blurhash": "^1.1.3",
     "classnames": "^2.2.5",
-    "compression-webpack-plugin": "^4.0.0",
-    "copy-webpack-plugin": "^6.0.2",
-    "cross-env": "^7.0.2",
-    "css-loader": "^3.6.0",
+    "color-blend": "^3.0.1",
+    "compression-webpack-plugin": "^6.1.1",
+    "cross-env": "^7.0.3",
+    "css-loader": "^5.0.1",
     "cssnano": "^4.1.10",
-    "detect-passive-events": "^1.0.2",
+    "detect-passive-events": "^2.0.2",
     "dotenv": "^8.2.0",
     "emoji-mart": "Gargron/emoji-mart#build",
     "es6-symbol": "^3.1.3",
     "escape-html": "^1.0.3",
     "exif-js": "^2.3.0",
     "express": "^4.17.1",
-    "file-loader": "^6.0.0",
+    "file-loader": "^6.2.0",
     "font-awesome": "^4.7.0",
     "glob": "^7.1.6",
     "history": "^4.10.1",
-    "http-link-header": "^1.0.2",
+    "http-link-header": "^1.0.3",
     "immutable": "^3.8.2",
-    "imports-loader": "^0.8.0",
-    "intersection-observer": "^0.10.0",
+    "imports-loader": "^1.2.0",
+    "intersection-observer": "^0.12.0",
     "intl": "^1.2.5",
     "intl-messageformat": "^2.2.0",
     "intl-relativeformat": "^6.4.3",
-    "is-nan": "^1.3.0",
-    "js-yaml": "^3.13.1",
+    "is-nan": "^1.3.2",
+    "js-yaml": "^4.0.0",
     "lodash": "^4.17.19",
     "mark-loader": "^0.1.6",
     "marky": "^1.2.1",
-    "mini-css-extract-plugin": "^0.9.0",
+    "mini-css-extract-plugin": "^1.3.3",
     "mkdirp": "^1.0.4",
     "npmlog": "^4.1.2",
     "object-assign": "^4.1.1",
     "object-fit-images": "^3.2.3",
-    "object.values": "^1.1.1",
+    "object.values": "^1.1.2",
     "offline-plugin": "^5.0.7",
     "path-complete-extname": "^1.0.0",
     "pg": "^6.4.0",
@@ -124,8 +125,8 @@
     "promise.prototype.finally": "^3.1.2",
     "prop-types": "^15.5.10",
     "punycode": "^2.1.0",
-    "react": "^16.13.1",
-    "react-dom": "^16.13.1",
+    "react": "^16.14.0",
+    "react-dom": "^16.14.0",
     "react-hotkeys": "^1.1.4",
     "react-immutable-proptypes": "^2.2.0",
     "react-immutable-pure-component": "^2.2.2",
@@ -133,58 +134,59 @@
     "react-masonry-infinite": "^1.2.2",
     "react-motion": "^0.5.2",
     "react-notification": "^6.8.5",
-    "react-overlays": "^0.9.1",
-    "react-redux": "^7.2.0",
+    "react-overlays": "^0.9.3",
+    "react-redux": "^7.2.2",
     "react-redux-loading-bar": "^4.0.8",
     "react-router-dom": "^4.1.1",
     "react-router-scroll-4": "^1.0.0-beta.1",
-    "react-select": "^3.1.0",
+    "react-select": "^3.1.1",
     "react-sparklines": "^1.7.0",
     "react-swipeable-views": "^0.13.9",
-    "react-textarea-autosize": "^8.1.1",
+    "react-textarea-autosize": "^8.3.0",
     "react-toggle": "^4.1.1",
     "redis": "^3.0.2",
     "redux": "^4.0.5",
     "redux-immutable": "^4.0.0",
     "redux-thunk": "^2.2.0",
+    "regenerator-runtime": "^0.13.7",
     "rellax": "^1.12.1",
     "requestidlecallback": "^0.3.0",
     "reselect": "^4.0.0",
     "rimraf": "^3.0.2",
-    "sass": "^1.26.8",
-    "sass-loader": "^8.0.2",
+    "sass": "^1.32.0",
+    "sass-loader": "^10.1.0",
     "stacktrace-js": "^2.0.2",
     "stringz": "^2.1.0",
     "substring-trie": "^1.0.2",
-    "terser-webpack-plugin": "^3.0.6",
-    "tesseract.js": "2.0.0-alpha.16",
+    "terser-webpack-plugin": "^4.2.3",
+    "tesseract.js": "^2.1.1",
     "throng": "^4.0.0",
     "tiny-queue": "^0.2.1",
-    "uuid": "^8.2.0",
-    "webpack": "^4.43.0",
+    "uuid": "^8.3.1",
+    "webpack": "^4.44.2",
     "webpack-assets-manifest": "^3.1.1",
-    "webpack-bundle-analyzer": "^3.8.0",
+    "webpack-bundle-analyzer": "^4.3.0",
     "webpack-cli": "^3.3.12",
-    "webpack-merge": "^4.2.1",
-    "wicg-inert": "^3.0.3"
+    "webpack-merge": "^5.7.3",
+    "wicg-inert": "^3.1.0"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.11.0",
-    "@testing-library/react": "^10.4.3",
+    "@testing-library/jest-dom": "^5.11.8",
+    "@testing-library/react": "^11.2.2",
     "babel-eslint": "^10.1.0",
-    "babel-jest": "^26.1.0",
-    "eslint": "^6.8.0",
-    "eslint-plugin-import": "~2.21.2",
-    "eslint-plugin-jsx-a11y": "~6.3.1",
+    "babel-jest": "^26.6.3",
+    "eslint": "^7.17.0",
+    "eslint-plugin-import": "~2.22.1",
+    "eslint-plugin-jsx-a11y": "~6.4.1",
     "eslint-plugin-promise": "~4.2.1",
-    "eslint-plugin-react": "~7.20.0",
-    "jest": "^26.0.1",
+    "eslint-plugin-react": "~7.22.0",
+    "jest": "^26.6.3",
     "raf": "^3.4.1",
     "react-intl-translations-manager": "^5.0.3",
-    "react-test-renderer": "^16.13.1",
+    "react-test-renderer": "^16.14.0",
     "sass-lint": "^1.13.1",
-    "webpack-dev-server": "^3.11.0",
-    "yargs": "^15.4.0"
+    "webpack-dev-server": "^3.11.1",
+    "yargs": "^16.2.0"
   },
   "resolutions": {
     "kind-of": "^6.0.3"
diff --git a/public/emoji/1f41e_border.svg b/public/emoji/1f41e_border.svg
new file mode 100644
index 0000000000000000000000000000000000000000..5d4b1e3d7b35c29eeacf0b6e086912d7ed7a3156
--- /dev/null
+++ b/public/emoji/1f41e_border.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
+  <g>
+    <path d="M35 21H1c-.552 0-1-.447-1-1s.448-1 1-1h34c.553 0 1 .447 1 1s-.447 1-1 1zm-22.177-2l-.069-.002c-.092-.007-9.214-.714-10.734-8.235-.109-.542.241-1.069.782-1.178.543-.113 1.069.241 1.178.782 1.221 6.044 8.833 6.631 8.91 6.636.551.038.967.515.93 1.066-.036.527-.476.931-.997.931zM3 31c-.142 0-.286-.03-.423-.094-.5-.234-.716-.829-.482-1.33 3.166-6.77 11.038-7.721 11.372-7.758.548-.056 1.042.334 1.103.882.062.548-.332 1.043-.88 1.106-.071.008-7.099.876-9.783 6.617-.171.364-.532.577-.907.577zm19.753-12c-.522 0-.961-.405-.996-.934-.036-.551.381-1.027.931-1.064.081-.005 8.116-.617 9.332-6.636.108-.541.633-.895 1.179-.782.541.109.892.637.782 1.178-1.521 7.525-10.769 8.21-11.162 8.235l-.066.003zm10.248 12c-.377 0-.737-.213-.907-.576-2.694-5.763-10.124-6.609-10.198-6.617-.55-.058-.948-.55-.89-1.099.058-.55.555-.952 1.099-.89.352.037 8.634.983 11.802 7.758.233.501.018 1.096-.482 1.33-.139.064-.282.094-.424.094z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M24.989 7.766c-.069-2.626-1.277-4.216-3.095-5.04C21.961 2.5 22 2.257 22 2c0-1.105-.672-2-1.5-2S19 .895 19 2c0 .015.003.028.003.043C18.675 2.017 18.342 2 18 2s-.675.017-1.003.043c0-.015.003-.028.003-.043 0-1.105-.671-2-1.5-2S14 .895 14 2c0 .257.04.5.106.726-1.817.824-3.025 2.414-3.095 5.04C7.98 9.551 6 12.662 6 17c0 7.159 5.373 16.923 12 16.923 6.628 0 12-9.764 12-16.923 0-4.338-1.98-7.45-5.011-9.234z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M16.001 34.959C9.564 34.364 4.5 28.064 4.5 20.378 4.5 12.693 9.564 9.597 16 9c.33-.03 1-.046 1 2.294v22.541c0 1.171-.669 1.156-.999 1.124zm3.998 0c6.436-.595 11.501-6.895 11.501-14.581C31.5 12.693 26.435 9.597 20 9c-.33-.03-1-.046-1 2.294v22.541c0 1.171.67 1.156.999 1.124z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <g stroke="white" stroke-linejoin="round" stroke-width="4px">
+      <circle cx="13" cy="15" r="2"/>
+      <circle cx="10" cy="22" r="3"/>
+      <circle cx="13" cy="29" r="2"/>
+      <circle cx="24.5" cy="14.5" r="2.5"/>
+      <circle cx="22.5" cy="20.5" r="1.5"/>
+      <circle cx="28" cy="23" r="2"/>
+      <circle cx="24" cy="29" r="3"/>
+    </g>
+  </g>
+  <path d="M35 21H1c-.552 0-1-.447-1-1s.448-1 1-1h34c.553 0 1 .447 1 1s-.447 1-1 1zm-22.177-2l-.069-.002c-.092-.007-9.214-.714-10.734-8.235-.109-.542.241-1.069.782-1.178.543-.113 1.069.241 1.178.782 1.221 6.044 8.833 6.631 8.91 6.636.551.038.967.515.93 1.066-.036.527-.476.931-.997.931zM3 31c-.142 0-.286-.03-.423-.094-.5-.234-.716-.829-.482-1.33 3.166-6.77 11.038-7.721 11.372-7.758.548-.056 1.042.334 1.103.882.062.548-.332 1.043-.88 1.106-.071.008-7.099.876-9.783 6.617-.171.364-.532.577-.907.577zm19.753-12c-.522 0-.961-.405-.996-.934-.036-.551.381-1.027.931-1.064.081-.005 8.116-.617 9.332-6.636.108-.541.633-.895 1.179-.782.541.109.892.637.782 1.178-1.521 7.525-10.769 8.21-11.162 8.235l-.066.003zm10.248 12c-.377 0-.737-.213-.907-.576-2.694-5.763-10.124-6.609-10.198-6.617-.55-.058-.948-.55-.89-1.099.058-.55.555-.952 1.099-.89.352.037 8.634.983 11.802 7.758.233.501.018 1.096-.482 1.33-.139.064-.282.094-.424.094z" fill="#31373D"/>
+  <path fill="#31373D" d="M24.989 7.766c-.069-2.626-1.277-4.216-3.095-5.04C21.961 2.5 22 2.257 22 2c0-1.105-.672-2-1.5-2S19 .895 19 2c0 .015.003.028.003.043C18.675 2.017 18.342 2 18 2s-.675.017-1.003.043c0-.015.003-.028.003-.043 0-1.105-.671-2-1.5-2S14 .895 14 2c0 .257.04.5.106.726-1.817.824-3.025 2.414-3.095 5.04C7.98 9.551 6 12.662 6 17c0 7.159 5.373 16.923 12 16.923 6.628 0 12-9.764 12-16.923 0-4.338-1.98-7.45-5.011-9.234z"/>
+  <path fill="#DD2E44" d="M16.001 34.959C9.564 34.364 4.5 28.064 4.5 20.378 4.5 12.693 9.564 9.597 16 9c.33-.03 1-.046 1 2.294v22.541c0 1.171-.669 1.156-.999 1.124zm3.998 0c6.436-.595 11.501-6.895 11.501-14.581C31.5 12.693 26.435 9.597 20 9c-.33-.03-1-.046-1 2.294v22.541c0 1.171.67 1.156.999 1.124z"/>
+  <g fill="#31373D">
+    <circle cx="13" cy="15" r="2"/>
+    <circle cx="10" cy="22" r="3"/>
+    <circle cx="13" cy="29" r="2"/>
+    <circle cx="24.5" cy="14.5" r="2.5"/>
+    <circle cx="22.5" cy="20.5" r="1.5"/>
+    <circle cx="28" cy="23" r="2"/>
+    <circle cx="24" cy="29" r="3"/>
+  </g>
+</svg>
diff --git a/public/emoji/1f57a_border.svg b/public/emoji/1f57a_border.svg
new file mode 100644
index 0000000000000000000000000000000000000000..7d3729976cfa0d94ad71edf104e446e1844ed98e
--- /dev/null
+++ b/public/emoji/1f57a_border.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
+  <g>
+    <path d="M26.157 35.26c-.005-.034-.055-.214-.055-.214l-.057.027.004-.134c-.021-.58-.608-.51-.678-.516-.07-.006-.305.006-.596-.031-.29-.037-.57-.108-.816-.257-.287-.174-.678-.467-1.014-.663s-.758-.437-.758-.437-.367.682-1.127.654c-.409-.015-1.05-.337-1.133-.36-.11-.031-.159.031-.205.116-.046.086-.211.684-.211 1.005 0 .204.025.333.044.405l-.055-.017c-.025-.007-.049.012-.049.039v.687c0 .045.037.147.155.171.118.024 1.759.165 1.821.11s.13-.232.183-.257c.053-.024.603.094.859.155s.698.165 1.218.165 1.191-.153 1.607-.257c.415-.104.741-.243.815-.289.074-.046.053-.067.048-.102z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M21.19 35.405l-.41-.287c.008-.013.829-1.147 2.439-.666.092-.126.23-.324.363-.544l.428.26c-.24.396-.491.718-.501.731l-.111.142-.17-.061c-1.379-.491-2.031.415-2.038.425z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M14.268 35.26c-.005-.034-.055-.214-.055-.214l-.057.027.004-.134c-.021-.58-.608-.51-.678-.516-.07-.006-.305.006-.596-.031s-.57-.108-.816-.257c-.287-.174-.678-.467-1.014-.663s-.758-.437-.758-.437-.367.682-1.127.654c-.409-.015-1.05-.337-1.133-.36-.11-.031-.159.031-.205.116-.046.086-.211.684-.211 1.005 0 .204.025.333.044.405l-.055-.017c-.025-.007-.049.012-.049.039v.687c0 .045.037.147.155.171.118.024 1.759.165 1.821.11s.13-.232.183-.257c.053-.024.603.094.859.155s.698.165 1.218.165 1.191-.153 1.607-.257c.415-.104.741-.243.815-.289.073-.046.053-.067.048-.102z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M9.3 35.406l-.409-.288c.008-.012.823-1.149 2.439-.666.091-.126.23-.324.363-.544l.428.26c-.24.396-.491.718-.501.731l-.111.142-.17-.061c-1.366-.488-2.012.388-2.039.426z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M28.658 1.816c-.19-.089-.279.102-.279.102l-.378.812c.007-.014-.083-.071-.077-.082l.56-1.201s.089-.19-.102-.279-.279.102-.279.102l-.054.115-.472 1.013c.001-.003-.093-.049-.092-.051l.622-1.336s.089-.19-.102-.279c-.19-.089-.279.102-.279.102l-.622 1.336c-.001.002-.097-.039-.099-.036l.515-1.106s.089-.19-.102-.279c-.19-.089-.279.102-.279.102l-.702 1.507c-.048.103-.139.105-.179.078-.106-.072-.05-.26-.079-.424-.045-.25-.196-.415-.355-.418-.176-.003-.206.138-.192.187.028.095.073.254.126.506.037.177-.017.324-.017.324-.023.072-.085.318-.038.604.028.169.092.352.205.52l-.332.714 1.507.659.366-.956c.267-.119.5-.319.633-.604l.044-.095.631-1.355c.003-.004.091-.194-.099-.282z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M26.348 2.443c.04-.012.06-.036.075-.058.168.108.389.272.491.543.132.351.054.627-.028.798-.066.138-.172.168-.099-.047.092-.27.143-.866-.455-1.205l-.055-.03c.001 0 .037.009.071-.001z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M11.397 20.373c-.076-.064-.202-.171-.385-.352-.129-.128-.165-.279-.165-.279-.021-.073-.105-.312-.303-.524-.117-.126-.271-.243-.459-.319l-.116-.779-1.62.284.224.999c-.156.247-.24.542-.193.854l.016.104.224 1.478s.031.207.239.176.176-.239.176-.239L8.9 20.89c.002.015.108.013.11.026l.198 1.31s.031.207.239.176c.207-.031.176-.239.176-.239l-.019-.126-.167-1.105c0 .003.104-.01.105-.009l.221 1.457s.031.207.239.176c.207-.031.176-.239.176-.239l-.22-1.457c0-.002.103-.021.102-.024l.182 1.206s.031.207.239.176c.207-.031.176-.239.176-.239l-.249-1.644c-.017-.112.057-.165.106-.164.128.001.185.189.3.309.176.183.393.237.527.152.148-.092.095-.227.056-.259z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M25.814 3.729S23.755 8.05 23.512 8.19c-.219.126-1.719-.042-3.699.354-1.979.396-2.744-.155-4.769-.075-1.176.046-2.413.452-3.227.648-1.237.299-3.276 3.237-3.848 4.26-.443.791-.421 1.68-.327 2.372.078.578.058 1.486.82 3.41l1.719-.281s-.289-3.783-.043-4.192c.102-.169 1.323-2.119 2.303-2.473l8.188-.385s3.375-.485 4.302-1.167c.708-.521 2.497-6.251 2.497-6.251l-1.614-.681z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M15.546 5.857c.175-.172.407-.289.671-.314.613-.064 1.16.383 1.222.997l.319 3.153c.061.611-.384 1.16-.997 1.221-.615.063-1.161-.384-1.222-.997l-.32-3.153c-.035-.35.095-.676.327-.907z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M19.243 4.296c0 1.849-1.309 3.348-2.927 3.348s-2.929-1.499-2.929-3.348c0-1.848 1.311-3.347 2.929-3.347 1.618 0 2.927 1.499 2.927 3.347z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M17.89 2.018s-1.14 1.07-2.349 1.255c0 0-.723 1.171-.768 1.847 0 0-.45-1.081-.81-.9-.36.18-.496.855-.18 1.305.315.451.705 1.226.363 1.003-.689-.45-.79-.768-.976-1.07-.127-.206-.425-.943-.465-2.162-.024-.721.232-2.116 1.707-2.857 1.278-.644 3.287-.315 4.231.359.945.676 1.18 2.38.594 3.056 0 0-.085-.63-.488-1.14-.226-.283-.859-.696-.859-.696z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M12.407 9.474v9.253l7.083-.024s.625-2.703 1.034-4.549c.474-2.135-1.079-5.392-1.079-5.392l-1.082-.108-.212-1.011-1.056.4-.151 1.751-.456-1.666-1.548-.135-.184 1.067-2.349.414z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M11.781 9.593s.688 2.443.385 7.5c2.228-.038 3.963-.732 3.963-.732s.146-1.919-.228-3.615c-.546-2.469-1.105-3.921-1.105-3.921l-3.015.768zm6.516-1.246s.623 3.271.484 5.224c-.14 1.953-.235 2.694-.235 2.694s.441.486 1.57.466c.467-1.222.752-3.679.695-5.183-.059-1.585-1.002-3.127-1.002-3.127l-1.512-.074zm-5.89 10.38s-.607 6.995-.982 8.307c-.334 1.168-3.799 6.742-3.799 6.742s1.646.406 3.229.094c0 0 3.163-3.836 3.99-5.688.24-.539 1.835-5.521 1.835-5.521s1.712 1.908 2.863 3.599c.728 2.003.09 7.442.09 7.442s1.483.312 2.899.042c0 0 .859-5.397.651-7.688-.033-.367-.103-1.05-.245-1.309-.619-1.123-1.963-3.231-2.822-4.172-.774-.847-.625-1.873-.625-1.873l-7.084.025z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+  </g>
+  <path fill="#292F33" d="M26.157 35.26c-.005-.034-.055-.214-.055-.214l-.057.027.004-.134c-.021-.58-.608-.51-.678-.516-.07-.006-.305.006-.596-.031-.29-.037-.57-.108-.816-.257-.287-.174-.678-.467-1.014-.663s-.758-.437-.758-.437-.367.682-1.127.654c-.409-.015-1.05-.337-1.133-.36-.11-.031-.159.031-.205.116-.046.086-.211.684-.211 1.005 0 .204.025.333.044.405l-.055-.017c-.025-.007-.049.012-.049.039v.687c0 .045.037.147.155.171.118.024 1.759.165 1.821.11s.13-.232.183-.257c.053-.024.603.094.859.155s.698.165 1.218.165 1.191-.153 1.607-.257c.415-.104.741-.243.815-.289.074-.046.053-.067.048-.102z"/>
+  <path fill="#4B545D" d="M21.19 35.405l-.41-.287c.008-.013.829-1.147 2.439-.666.092-.126.23-.324.363-.544l.428.26c-.24.396-.491.718-.501.731l-.111.142-.17-.061c-1.379-.491-2.031.415-2.038.425z"/>
+  <path fill="#292F33" d="M14.268 35.26c-.005-.034-.055-.214-.055-.214l-.057.027.004-.134c-.021-.58-.608-.51-.678-.516-.07-.006-.305.006-.596-.031s-.57-.108-.816-.257c-.287-.174-.678-.467-1.014-.663s-.758-.437-.758-.437-.367.682-1.127.654c-.409-.015-1.05-.337-1.133-.36-.11-.031-.159.031-.205.116-.046.086-.211.684-.211 1.005 0 .204.025.333.044.405l-.055-.017c-.025-.007-.049.012-.049.039v.687c0 .045.037.147.155.171.118.024 1.759.165 1.821.11s.13-.232.183-.257c.053-.024.603.094.859.155s.698.165 1.218.165 1.191-.153 1.607-.257c.415-.104.741-.243.815-.289.073-.046.053-.067.048-.102z"/>
+  <path fill="#4B545D" d="M9.3 35.406l-.409-.288c.008-.012.823-1.149 2.439-.666.091-.126.23-.324.363-.544l.428.26c-.24.396-.491.718-.501.731l-.111.142-.17-.061c-1.366-.488-2.012.388-2.039.426z"/>
+  <path fill="#FFDC5D" d="M28.658 1.816c-.19-.089-.279.102-.279.102l-.378.812c.007-.014-.083-.071-.077-.082l.56-1.201s.089-.19-.102-.279-.279.102-.279.102l-.054.115-.472 1.013c.001-.003-.093-.049-.092-.051l.622-1.336s.089-.19-.102-.279c-.19-.089-.279.102-.279.102l-.622 1.336c-.001.002-.097-.039-.099-.036l.515-1.106s.089-.19-.102-.279c-.19-.089-.279.102-.279.102l-.702 1.507c-.048.103-.139.105-.179.078-.106-.072-.05-.26-.079-.424-.045-.25-.196-.415-.355-.418-.176-.003-.206.138-.192.187.028.095.073.254.126.506.037.177-.017.324-.017.324-.023.072-.085.318-.038.604.028.169.092.352.205.52l-.332.714 1.507.659.366-.956c.267-.119.5-.319.633-.604l.044-.095.631-1.355c.003-.004.091-.194-.099-.282z"/>
+  <path fill="#EF9645" d="M26.348 2.443c.04-.012.06-.036.075-.058.168.108.389.272.491.543.132.351.054.627-.028.798-.066.138-.172.168-.099-.047.092-.27.143-.866-.455-1.205l-.055-.03c.001 0 .037.009.071-.001z"/>
+  <path fill="#FFDC5D" d="M11.397 20.373c-.076-.064-.202-.171-.385-.352-.129-.128-.165-.279-.165-.279-.021-.073-.105-.312-.303-.524-.117-.126-.271-.243-.459-.319l-.116-.779-1.62.284.224.999c-.156.247-.24.542-.193.854l.016.104.224 1.478s.031.207.239.176.176-.239.176-.239L8.9 20.89c.002.015.108.013.11.026l.198 1.31s.031.207.239.176c.207-.031.176-.239.176-.239l-.019-.126-.167-1.105c0 .003.104-.01.105-.009l.221 1.457s.031.207.239.176c.207-.031.176-.239.176-.239l-.22-1.457c0-.002.103-.021.102-.024l.182 1.206s.031.207.239.176c.207-.031.176-.239.176-.239l-.249-1.644c-.017-.112.057-.165.106-.164.128.001.185.189.3.309.176.183.393.237.527.152.148-.092.095-.227.056-.259z"/>
+  <path fill="#292F33" d="M25.814 3.729S23.755 8.05 23.512 8.19c-.219.126-1.719-.042-3.699.354-1.979.396-2.744-.155-4.769-.075-1.176.046-2.413.452-3.227.648-1.237.299-3.276 3.237-3.848 4.26-.443.791-.421 1.68-.327 2.372.078.578.058 1.486.82 3.41l1.719-.281s-.289-3.783-.043-4.192c.102-.169 1.323-2.119 2.303-2.473l8.188-.385s3.375-.485 4.302-1.167c.708-.521 2.497-6.251 2.497-6.251l-1.614-.681z"/>
+  <path fill="#FFDC5D" d="M15.546 5.857c.175-.172.407-.289.671-.314.613-.064 1.16.383 1.222.997l.319 3.153c.061.611-.384 1.16-.997 1.221-.615.063-1.161-.384-1.222-.997l-.32-3.153c-.035-.35.095-.676.327-.907z"/>
+  <path fill="#FFDC5D" d="M19.243 4.296c0 1.849-1.309 3.348-2.927 3.348s-2.929-1.499-2.929-3.348c0-1.848 1.311-3.347 2.929-3.347 1.618 0 2.927 1.499 2.927 3.347z"/>
+  <path fill="#FFAC33" d="M17.89 2.018s-1.14 1.07-2.349 1.255c0 0-.723 1.171-.768 1.847 0 0-.45-1.081-.81-.9-.36.18-.496.855-.18 1.305.315.451.705 1.226.363 1.003-.689-.45-.79-.768-.976-1.07-.127-.206-.425-.943-.465-2.162-.024-.721.232-2.116 1.707-2.857 1.278-.644 3.287-.315 4.231.359.945.676 1.18 2.38.594 3.056 0 0-.085-.63-.488-1.14-.226-.283-.859-.696-.859-.696z"/>
+  <path fill="#DD2E44" d="M12.407 9.474v9.253l7.083-.024s.625-2.703 1.034-4.549c.474-2.135-1.079-5.392-1.079-5.392l-1.082-.108-.212-1.011-1.056.4-.151 1.751-.456-1.666-1.548-.135-.184 1.067-2.349.414z"/>
+  <path fill="#292F33" d="M11.781 9.593s.688 2.443.385 7.5c2.228-.038 3.963-.732 3.963-.732s.146-1.919-.228-3.615c-.546-2.469-1.105-3.921-1.105-3.921l-3.015.768zm6.516-1.246s.623 3.271.484 5.224c-.14 1.953-.235 2.694-.235 2.694s.441.486 1.57.466c.467-1.222.752-3.679.695-5.183-.059-1.585-1.002-3.127-1.002-3.127l-1.512-.074zm-5.89 10.38s-.607 6.995-.982 8.307c-.334 1.168-3.799 6.742-3.799 6.742s1.646.406 3.229.094c0 0 3.163-3.836 3.99-5.688.24-.539 1.835-5.521 1.835-5.521s1.712 1.908 2.863 3.599c.728 2.003.09 7.442.09 7.442s1.483.312 2.899.042c0 0 .859-5.397.651-7.688-.033-.367-.103-1.05-.245-1.309-.619-1.123-1.963-3.231-2.822-4.172-.774-.847-.625-1.873-.625-1.873l-7.084.025z"/>
+</svg>
diff --git a/public/shortcuts/direct.png b/public/shortcuts/direct.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8772c00e664042779abc16be73407e3e2cb0e89
Binary files /dev/null and b/public/shortcuts/direct.png differ
diff --git a/public/shortcuts/new-status.png b/public/shortcuts/new-status.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7095f3c457071547153ab5b99255d37d26b6457
Binary files /dev/null and b/public/shortcuts/new-status.png differ
diff --git a/public/shortcuts/notifications.png b/public/shortcuts/notifications.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b9d45718c82784e5c3380dcc9e4cd3fadb9e9b2
Binary files /dev/null and b/public/shortcuts/notifications.png differ
diff --git a/public/shortcuts/profile.png b/public/shortcuts/profile.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b3bf517ddaa5d49281a6f2ad32d3e6f49e8bb6f
Binary files /dev/null and b/public/shortcuts/profile.png differ
diff --git a/spec/controllers/account_follow_controller_spec.rb b/spec/controllers/account_follow_controller_spec.rb
index 9a93e1ebeacb0c306960b69aa8f9934834d70eeb..d33cd0499e5fe0fdee0b4f4c8c98392a2f4c60c2 100644
--- a/spec/controllers/account_follow_controller_spec.rb
+++ b/spec/controllers/account_follow_controller_spec.rb
@@ -16,17 +16,49 @@ describe AccountFollowController do
       allow(service).to receive(:call)
     end
 
-    it 'does not create for user who is not signed in' do
-      subject
-      expect(FollowService).not_to receive(:new)
+    context 'when account is permanently suspended' do
+      before do
+        alice.suspend!
+        alice.deletion_request.destroy
+        subject
+      end
+
+      it 'returns http gone' do
+        expect(response).to have_http_status(410)
+      end
+    end
+
+    context 'when account is temporarily suspended' do
+      before do
+        alice.suspend!
+        subject
+      end
+
+      it 'returns http forbidden' do
+        expect(response).to have_http_status(403)
+      end
+    end
+
+    context 'when signed out' do
+      before do
+        subject
+      end
+
+      it 'does not follow' do
+        expect(FollowService).not_to receive(:new)
+      end
     end
 
-    it 'redirects to account path' do
-      sign_in(user)
-      subject
+    context 'when signed in' do
+      before do
+        sign_in(user)
+        subject
+      end
 
-      expect(service).to have_received(:call).with(user.account, alice, with_rate_limit: true)
-      expect(response).to redirect_to(account_path(alice))
+      it 'redirects to account path' do
+        expect(service).to have_received(:call).with(user.account, alice, with_rate_limit: true)
+        expect(response).to redirect_to(account_path(alice))
+      end
     end
   end
 end
diff --git a/spec/controllers/account_unfollow_controller_spec.rb b/spec/controllers/account_unfollow_controller_spec.rb
index bdebcfa94c85efbe63f34ae8be2a687e36c56941..a11f7aa6846b6cb77904c73b01e59dd97d0a2087 100644
--- a/spec/controllers/account_unfollow_controller_spec.rb
+++ b/spec/controllers/account_unfollow_controller_spec.rb
@@ -16,17 +16,49 @@ describe AccountUnfollowController do
       allow(service).to receive(:call)
     end
 
-    it 'does not create for user who is not signed in' do
-      subject
-      expect(UnfollowService).not_to receive(:new)
+    context 'when account is permanently suspended' do
+      before do
+        alice.suspend!
+        alice.deletion_request.destroy
+        subject
+      end
+
+      it 'returns http gone' do
+        expect(response).to have_http_status(410)
+      end
+    end
+
+    context 'when account is temporarily suspended' do
+      before do
+        alice.suspend!
+        subject
+      end
+
+      it 'returns http forbidden' do
+        expect(response).to have_http_status(403)
+      end
+    end
+
+    context 'when signed out' do
+      before do
+        subject
+      end
+
+      it 'does not unfollow' do
+        expect(UnfollowService).not_to receive(:new)
+      end
     end
 
-    it 'redirects to account path' do
-      sign_in(user)
-      subject
+    context 'when signed in' do
+      before do
+        sign_in(user)
+        subject
+      end
 
-      expect(service).to have_received(:call).with(user.account, alice)
-      expect(response).to redirect_to(account_path(alice))
+      it 'redirects to account path' do
+        expect(service).to have_received(:call).with(user.account, alice)
+        expect(response).to redirect_to(account_path(alice))
+      end
     end
   end
 end
diff --git a/spec/controllers/accounts_controller_spec.rb b/spec/controllers/accounts_controller_spec.rb
index bd36f5494074ca727d7bc689449fb8f35125d0d6..f7d0b1af54e7ca88f7d0c992b55536821c58f992 100644
--- a/spec/controllers/accounts_controller_spec.rb
+++ b/spec/controllers/accounts_controller_spec.rb
@@ -5,6 +5,21 @@ RSpec.describe AccountsController, type: :controller do
 
   let(:account) { Fabricate(:user).account }
 
+  shared_examples 'cachable response' do
+    it 'does not set cookies' do
+      expect(response.cookies).to be_empty
+      expect(response.headers['Set-Cookies']).to be nil
+    end
+
+    it 'does not set sessions' do
+      expect(session).to be_empty
+    end
+
+    it 'returns public Cache-Control header' do
+      expect(response.headers['Cache-Control']).to include 'public'
+    end
+  end
+
   describe 'GET #show' do
     let(:format) { 'html' }
 
@@ -33,10 +48,17 @@ RSpec.describe AccountsController, type: :controller do
           expect(response).to have_http_status(404)
         end
       end
+    end
+
+    context 'as HTML' do
+      let(:format) { 'html' }
 
-      context 'when account is suspended' do
+      it_behaves_like 'preliminary checks'
+
+      context 'when account is permanently suspended' do
         before do
           account.suspend!
+          account.deletion_request.destroy
         end
 
         it 'returns http gone' do
@@ -44,12 +66,17 @@ RSpec.describe AccountsController, type: :controller do
           expect(response).to have_http_status(410)
         end
       end
-    end
 
-    context 'as HTML' do
-      let(:format) { 'html' }
+      context 'when account is temporarily suspended' do
+        before do
+          account.suspend!
+        end
 
-      it_behaves_like 'preliminary checks'
+        it 'returns http forbidden' do
+          get :show, params: { username: account.username, format: format }
+          expect(response).to have_http_status(403)
+        end
+      end
 
       shared_examples 'common response characteristics' do
         it 'returns http success' do
@@ -310,6 +337,29 @@ RSpec.describe AccountsController, type: :controller do
 
       it_behaves_like 'preliminary checks'
 
+      context 'when account is suspended permanently' do
+        before do
+          account.suspend!
+          account.deletion_request.destroy
+        end
+
+        it 'returns http gone' do
+          get :show, params: { username: account.username, format: format }
+          expect(response).to have_http_status(410)
+        end
+      end
+
+      context 'when account is suspended temporarily' do
+        before do
+          account.suspend!
+        end
+
+        it 'returns http success' do
+          get :show, params: { username: account.username, format: format }
+          expect(response).to have_http_status(200)
+        end
+      end
+
       context do
         before do
           get :show, params: { username: account.username, format: format }
@@ -323,9 +373,7 @@ RSpec.describe AccountsController, type: :controller do
           expect(response.content_type).to eq 'application/activity+json'
         end
 
-        it 'returns public Cache-Control header' do
-          expect(response.headers['Cache-Control']).to include 'public'
-        end
+        it_behaves_like 'cachable response'
 
         it 'renders account' do
           json = body_as_json
@@ -335,26 +383,8 @@ RSpec.describe AccountsController, type: :controller do
         context 'in authorized fetch mode' do
           let(:authorized_fetch_mode) { true }
 
-          it 'returns http success' do
-            expect(response).to have_http_status(200)
-          end
-
-          it 'returns application/activity+json' do
-            expect(response.content_type).to eq 'application/activity+json'
-          end
-
-          it 'returns public Cache-Control header' do
-            expect(response.headers['Cache-Control']).to include 'public'
-          end
-
-          it 'returns Vary header with Signature' do
-            expect(response.headers['Vary']).to include 'Signature'
-          end
-
-          it 'renders bare minimum account' do
-            json = body_as_json
-            expect(json).to include(:id, :type, :preferredUsername, :inbox, :publicKey)
-            expect(json).to_not include(:name, :summary)
+          it 'returns http unauthorized' do
+            expect(response).to have_http_status(401)
           end
         end
       end
@@ -401,9 +431,7 @@ RSpec.describe AccountsController, type: :controller do
           expect(response.content_type).to eq 'application/activity+json'
         end
 
-        it 'returns public Cache-Control header' do
-          expect(response.headers['Cache-Control']).to include 'public'
-        end
+        it_behaves_like 'cachable response'
 
         it 'renders account' do
           json = body_as_json
@@ -442,14 +470,35 @@ RSpec.describe AccountsController, type: :controller do
 
       it_behaves_like 'preliminary checks'
 
+      context 'when account is permanently suspended' do
+        before do
+          account.suspend!
+          account.deletion_request.destroy
+        end
+
+        it 'returns http gone' do
+          get :show, params: { username: account.username, format: format }
+          expect(response).to have_http_status(410)
+        end
+      end
+
+      context 'when account is temporarily suspended' do
+        before do
+          account.suspend!
+        end
+
+        it 'returns http forbidden' do
+          get :show, params: { username: account.username, format: format }
+          expect(response).to have_http_status(403)
+        end
+      end
+
       shared_examples 'common response characteristics' do
         it 'returns http success' do
           expect(response).to have_http_status(200)
         end
 
-        it 'returns public Cache-Control header' do
-          expect(response.headers['Cache-Control']).to include 'public'
-        end
+        it_behaves_like 'cachable response'
       end
 
       context do
diff --git a/spec/controllers/activitypub/collections_controller_spec.rb b/spec/controllers/activitypub/collections_controller_spec.rb
index 56be49be3d7c7dad3a47b3d4c2ce50c4c3574303..ac661e5e1d931a6c212d3def8453d22af56eb5be 100644
--- a/spec/controllers/activitypub/collections_controller_spec.rb
+++ b/spec/controllers/activitypub/collections_controller_spec.rb
@@ -6,6 +6,22 @@ RSpec.describe ActivityPub::CollectionsController, type: :controller do
   let!(:account) { Fabricate(:account) }
   let(:remote_account) { nil }
 
+  shared_examples 'cachable response' do
+    it 'does not set cookies' do
+      expect(response.cookies).to be_empty
+      expect(response.headers['Set-Cookies']).to be nil
+    end
+
+    it 'does not set sessions' do
+      response
+      expect(session).to be_empty
+    end
+
+    it 'returns public Cache-Control header' do
+      expect(response.headers['Cache-Control']).to include 'public'
+    end
+  end
+
   before do
     allow(controller).to receive(:signed_request_account).and_return(remote_account)
 
@@ -19,9 +35,8 @@ RSpec.describe ActivityPub::CollectionsController, type: :controller do
       context 'without signature' do
         let(:remote_account) { nil }
 
-        before do
-          get :show, params: { id: 'featured', account_username: account.username }
-        end
+        subject(:response) { get :show, params: { id: 'featured', account_username: account.username } }
+        subject(:body) { body_as_json }
 
         it 'returns http success' do
           expect(response).to have_http_status(200)
@@ -31,14 +46,32 @@ RSpec.describe ActivityPub::CollectionsController, type: :controller do
           expect(response.content_type).to eq 'application/activity+json'
         end
 
-        it 'returns public Cache-Control header' do
-          expect(response.headers['Cache-Control']).to include 'public'
-        end
+        it_behaves_like 'cachable response'
 
         it 'returns orderedItems with pinned statuses' do
-          json = body_as_json
-          expect(json[:orderedItems]).to be_an Array
-          expect(json[:orderedItems].size).to eq 2
+          expect(body[:orderedItems]).to be_an Array
+          expect(body[:orderedItems].size).to eq 2
+        end
+
+        context 'when account is permanently suspended' do
+          before do
+            account.suspend!
+            account.deletion_request.destroy
+          end
+
+          it 'returns http gone' do
+            expect(response).to have_http_status(410)
+          end
+        end
+
+        context 'when account is temporarily suspended' do
+          before do
+            account.suspend!
+          end
+
+          it 'returns http forbidden' do
+            expect(response).to have_http_status(403)
+          end
         end
       end
 
@@ -58,9 +91,7 @@ RSpec.describe ActivityPub::CollectionsController, type: :controller do
             expect(response.content_type).to eq 'application/activity+json'
           end
 
-          it 'returns public Cache-Control header' do
-            expect(response.headers['Cache-Control']).to include 'public'
-          end
+          it_behaves_like 'cachable response'
 
           it 'returns orderedItems with pinned statuses' do
             json = body_as_json
diff --git a/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb b/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..88f4554c2d6cbd70aa50d12ae06d1216d9eb1929
--- /dev/null
+++ b/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb
@@ -0,0 +1,77 @@
+require 'rails_helper'
+
+RSpec.describe ActivityPub::FollowersSynchronizationsController, type: :controller do
+  let!(:account)    { Fabricate(:account) }
+  let!(:follower_1) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/users/a') }
+  let!(:follower_2) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/users/b') }
+  let!(:follower_3) { Fabricate(:account, domain: 'foo.com', uri: 'https://foo.com/users/a') }
+
+  before do
+    follower_1.follow!(account)
+    follower_2.follow!(account)
+    follower_3.follow!(account)
+  end
+
+  before do
+    allow(controller).to receive(:signed_request_account).and_return(remote_account)
+  end
+
+  describe 'GET #show' do
+    context 'without signature' do
+      let(:remote_account) { nil }
+
+      before do
+        get :show, params: { account_username: account.username }
+      end
+
+      it 'returns http not authorized' do
+        expect(response).to have_http_status(401)
+      end
+    end
+
+    context 'with signature from example.com' do
+      let(:remote_account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/instance') }
+
+      subject(:response) { get :show, params: { account_username: account.username } }
+      subject(:body) { body_as_json }
+
+      it 'returns http success' do
+        expect(response).to have_http_status(200)
+      end
+
+      it 'returns application/activity+json' do
+        expect(response.content_type).to eq 'application/activity+json'
+      end
+
+      it 'returns orderedItems with followers from example.com' do
+        expect(body[:orderedItems]).to be_an Array
+        expect(body[:orderedItems].sort).to eq [follower_1.uri, follower_2.uri]
+      end
+
+      it 'returns private Cache-Control header' do
+        expect(response.headers['Cache-Control']).to eq 'max-age=0, private'
+      end
+
+      context 'when account is permanently suspended' do
+        before do
+          account.suspend!
+          account.deletion_request.destroy
+        end
+
+        it 'returns http gone' do
+          expect(response).to have_http_status(410)
+        end
+      end
+
+      context 'when account is temporarily suspended' do
+        before do
+          account.suspend!
+        end
+
+        it 'returns http forbidden' do
+          expect(response).to have_http_status(403)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/controllers/activitypub/inboxes_controller_spec.rb b/spec/controllers/activitypub/inboxes_controller_spec.rb
index f3bc23953a5c7bd834fa985f8689ac3760919099..973ad83bb3e28705450c055d0dba2b09bfe3bdaa 100644
--- a/spec/controllers/activitypub/inboxes_controller_spec.rb
+++ b/spec/controllers/activitypub/inboxes_controller_spec.rb
@@ -20,6 +20,83 @@ RSpec.describe ActivityPub::InboxesController, type: :controller do
       it 'returns http accepted' do
         expect(response).to have_http_status(202)
       end
+
+      context 'for a specific account' do
+        let(:account) { Fabricate(:account) }
+
+        subject(:response) { post :create, params: { account_username: account.username }, body: '{}' }
+
+        context 'when account is permanently suspended' do
+          before do
+            account.suspend!
+            account.deletion_request.destroy
+          end
+
+          it 'returns http gone' do
+            expect(response).to have_http_status(410)
+          end
+        end
+
+        context 'when account is temporarily suspended' do
+          before do
+            account.suspend!
+          end
+
+          it 'returns http accepted' do
+            expect(response).to have_http_status(202)
+          end
+        end
+      end
+    end
+
+    context 'with Collection-Synchronization header' do
+      let(:remote_account)             { Fabricate(:account, followers_url: 'https://example.com/followers', domain: 'example.com', uri: 'https://example.com/actor', protocol: :activitypub) }
+      let(:synchronization_collection) { remote_account.followers_url }
+      let(:synchronization_url)        { 'https://example.com/followers-for-domain' }
+      let(:synchronization_hash)       { 'somehash' }
+      let(:synchronization_header)     { "collectionId=\"#{synchronization_collection}\", digest=\"#{synchronization_hash}\", url=\"#{synchronization_url}\"" }
+
+      before do
+        allow(ActivityPub::FollowersSynchronizationWorker).to receive(:perform_async).and_return(nil)
+        allow_any_instance_of(Account).to receive(:local_followers_hash).and_return('somehash')
+
+        request.headers['Collection-Synchronization'] = synchronization_header
+        post :create, body: '{}'
+      end
+
+      context 'with mismatching target collection' do
+        let(:synchronization_collection) { 'https://example.com/followers2' }
+
+        it 'does not start a synchronization job' do
+          expect(ActivityPub::FollowersSynchronizationWorker).not_to have_received(:perform_async)
+        end
+      end
+
+      context 'with mismatching domain in partial collection attribute' do
+        let(:synchronization_url) { 'https://example.org/followers' }
+
+        it 'does not start a synchronization job' do
+          expect(ActivityPub::FollowersSynchronizationWorker).not_to have_received(:perform_async)
+        end
+      end
+
+      context 'with matching digest' do
+        it 'does not start a synchronization job' do
+          expect(ActivityPub::FollowersSynchronizationWorker).not_to have_received(:perform_async)
+        end
+      end
+
+      context 'with mismatching digest' do
+        let(:synchronization_hash) { 'wronghash' }
+
+        it 'starts a synchronization job' do
+          expect(ActivityPub::FollowersSynchronizationWorker).to have_received(:perform_async)
+        end
+      end
+
+      it 'returns http accepted' do
+        expect(response).to have_http_status(202)
+      end
     end
 
     context 'without signature' do
diff --git a/spec/controllers/activitypub/outboxes_controller_spec.rb b/spec/controllers/activitypub/outboxes_controller_spec.rb
index 03490533dd5926f343be5a50417eeb0687cce917..84e3a8956027857a2091cb2364fd33cac6e49d31 100644
--- a/spec/controllers/activitypub/outboxes_controller_spec.rb
+++ b/spec/controllers/activitypub/outboxes_controller_spec.rb
@@ -3,6 +3,22 @@ require 'rails_helper'
 RSpec.describe ActivityPub::OutboxesController, type: :controller do
   let!(:account) { Fabricate(:account) }
 
+  shared_examples 'cachable response' do
+    it 'does not set cookies' do
+      expect(response.cookies).to be_empty
+      expect(response.headers['Set-Cookies']).to be nil
+    end
+
+    it 'does not set sessions' do
+      response
+      expect(session).to be_empty
+    end
+
+    it 'returns public Cache-Control header' do
+      expect(response.headers['Cache-Control']).to include 'public'
+    end
+  end
+
   before do
     Fabricate(:status, account: account, visibility: :public)
     Fabricate(:status, account: account, visibility: :unlisted)
@@ -19,9 +35,8 @@ RSpec.describe ActivityPub::OutboxesController, type: :controller do
     context 'without signature' do
       let(:remote_account) { nil }
 
-      before do
-        get :show, params: { account_username: account.username, page: page }
-      end
+      subject(:response) { get :show, params: { account_username: account.username, page: page } }
+      subject(:body) { body_as_json }
 
       context 'with page not requested' do
         let(:page) { nil }
@@ -35,12 +50,30 @@ RSpec.describe ActivityPub::OutboxesController, type: :controller do
         end
 
         it 'returns totalItems' do
-          json = body_as_json
-          expect(json[:totalItems]).to eq 4
+          expect(body[:totalItems]).to eq 4
         end
 
-        it 'returns public Cache-Control header' do
-          expect(response.headers['Cache-Control']).to include 'public'
+        it_behaves_like 'cachable response'
+
+        context 'when account is permanently suspended' do
+          before do
+            account.suspend!
+            account.deletion_request.destroy
+          end
+
+          it 'returns http gone' do
+            expect(response).to have_http_status(410)
+          end
+        end
+
+        context 'when account is temporarily suspended' do
+          before do
+            account.suspend!
+          end
+
+          it 'returns http forbidden' do
+            expect(response).to have_http_status(403)
+          end
         end
       end
 
@@ -56,14 +89,32 @@ RSpec.describe ActivityPub::OutboxesController, type: :controller do
         end
 
         it 'returns orderedItems with public or unlisted statuses' do
-          json = body_as_json
-          expect(json[:orderedItems]).to be_an Array
-          expect(json[:orderedItems].size).to eq 2
-          expect(json[:orderedItems].all? { |item| item[:to].include?(ActivityPub::TagManager::COLLECTIONS[:public]) || item[:cc].include?(ActivityPub::TagManager::COLLECTIONS[:public]) }).to be true
+          expect(body[:orderedItems]).to be_an Array
+          expect(body[:orderedItems].size).to eq 2
+          expect(body[:orderedItems].all? { |item| item[:to].include?(ActivityPub::TagManager::COLLECTIONS[:public]) || item[:cc].include?(ActivityPub::TagManager::COLLECTIONS[:public]) }).to be true
         end
 
-        it 'returns public Cache-Control header' do
-          expect(response.headers['Cache-Control']).to include 'public'
+        it_behaves_like 'cachable response'
+
+        context 'when account is permanently suspended' do
+          before do
+            account.suspend!
+            account.deletion_request.destroy
+          end
+
+          it 'returns http gone' do
+            expect(response).to have_http_status(410)
+          end
+        end
+
+        context 'when account is temporarily suspended' do
+          before do
+            account.suspend!
+          end
+
+          it 'returns http forbidden' do
+            expect(response).to have_http_status(403)
+          end
         end
       end
     end
diff --git a/spec/controllers/activitypub/replies_controller_spec.rb b/spec/controllers/activitypub/replies_controller_spec.rb
index d956e1b35f0e043998c4188a6c6d64d96d29ceaa..25025975283e041bbddd970ce30ad4ad2732dca3 100644
--- a/spec/controllers/activitypub/replies_controller_spec.rb
+++ b/spec/controllers/activitypub/replies_controller_spec.rb
@@ -7,6 +7,22 @@ RSpec.describe ActivityPub::RepliesController, type: :controller do
   let(:remote_reply_id) { nil }
   let(:remote_account) { nil }
 
+  shared_examples 'cachable response' do
+    it 'does not set cookies' do
+      expect(response.cookies).to be_empty
+      expect(response.headers['Set-Cookies']).to be nil
+    end
+
+    it 'does not set sessions' do
+      response
+      expect(session).to be_empty
+    end
+
+    it 'returns public Cache-Control header' do
+      expect(response.headers['Cache-Control']).to include 'public'
+    end
+  end
+
   before do
     allow(controller).to receive(:signed_request_account).and_return(remote_account)
 
@@ -21,8 +37,32 @@ RSpec.describe ActivityPub::RepliesController, type: :controller do
 
   describe 'GET #index' do
     context 'with no signature' do
-      before do
-        get :index, params: { account_username: status.account.username, status_id: status.id }
+      subject(:response) { get :index, params: { account_username: status.account.username, status_id: status.id } }
+      subject(:body) { body_as_json }
+
+      context 'when account is permanently suspended' do
+        let(:parent_visibility) { :public }
+
+        before do
+          status.account.suspend!
+          status.account.deletion_request.destroy
+        end
+
+        it 'returns http gone' do
+          expect(response).to have_http_status(410)
+        end
+      end
+
+      context 'when account is temporarily suspended' do
+        let(:parent_visibility) { :public }
+
+        before do
+          status.account.suspend!
+        end
+
+        it 'returns http forbidden' do
+          expect(response).to have_http_status(403)
+        end
       end
 
       context 'when status is public' do
@@ -36,17 +76,13 @@ RSpec.describe ActivityPub::RepliesController, type: :controller do
           expect(response.content_type).to eq 'application/activity+json'
         end
 
-        it 'returns public Cache-Control header' do
-          expect(response.headers['Cache-Control']).to include 'public'
-        end
+        it_behaves_like 'cachable response'
 
         it 'returns items with account\'s own replies' do
-          json = body_as_json
-
-          expect(json[:first]).to be_a Hash
-          expect(json[:first][:items]).to be_an Array
-          expect(json[:first][:items].size).to eq 1
-          expect(json[:first][:items].all? { |item| item[:to].include?(ActivityPub::TagManager::COLLECTIONS[:public]) || item[:cc].include?(ActivityPub::TagManager::COLLECTIONS[:public]) }).to be true
+          expect(body[:first]).to be_a Hash
+          expect(body[:first][:items]).to be_an Array
+          expect(body[:first][:items].size).to eq 1
+          expect(body[:first][:items].all? { |item| item[:to].include?(ActivityPub::TagManager::COLLECTIONS[:public]) || item[:cc].include?(ActivityPub::TagManager::COLLECTIONS[:public]) }).to be true
         end
       end
 
@@ -87,9 +123,7 @@ RSpec.describe ActivityPub::RepliesController, type: :controller do
             expect(response.content_type).to eq 'application/activity+json'
           end
 
-          it 'returns public Cache-Control header' do
-            expect(response.headers['Cache-Control']).to include 'public'
-          end
+          it_behaves_like 'cachable response'
 
           context 'without only_other_accounts' do
             it 'returns items with account\'s own replies' do
diff --git a/spec/controllers/admin/instances_controller_spec.rb b/spec/controllers/admin/instances_controller_spec.rb
index 412b814439bc0f52d49f1b4f767ea3ec64b08af0..8c0b309f2a50db4fe2e43a766d75080622db6ce2 100644
--- a/spec/controllers/admin/instances_controller_spec.rb
+++ b/spec/controllers/admin/instances_controller_spec.rb
@@ -9,10 +9,10 @@ RSpec.describe Admin::InstancesController, type: :controller do
 
   describe 'GET #index' do
     around do |example|
-      default_per_page = Account.default_per_page
-      Account.paginates_per 1
+      default_per_page = Instance.default_per_page
+      Instance.paginates_per 1
       example.run
-      Account.paginates_per default_per_page
+      Instance.paginates_per default_per_page
     end
 
     it 'renders instances' do
diff --git a/spec/controllers/admin/two_factor_authentications_controller_spec.rb b/spec/controllers/admin/two_factor_authentications_controller_spec.rb
index 4c1aa88d7547f216353a80f0946400d5e8486a0c..b0e82d3d6637770982d7e8645455a9cbcd51653c 100644
--- a/spec/controllers/admin/two_factor_authentications_controller_spec.rb
+++ b/spec/controllers/admin/two_factor_authentications_controller_spec.rb
@@ -1,20 +1,51 @@
 require 'rails_helper'
+require 'webauthn/fake_client'
 
 describe Admin::TwoFactorAuthenticationsController do
   render_views
 
-  let(:user) { Fabricate(:user, otp_required_for_login: true) }
+  let(:user) { Fabricate(:user) }
   before do
     sign_in Fabricate(:user, admin: true), scope: :user
   end
 
   describe 'DELETE #destroy' do
-    it 'redirects to admin accounts page' do
-      delete :destroy, params: { user_id: user.id }
+    context 'when user has OTP enabled' do
+      before do
+        user.update(otp_required_for_login: true)
+      end
 
-      user.reload
-      expect(user.otp_required_for_login).to eq false
-      expect(response).to redirect_to(admin_accounts_path)
+      it 'redirects to admin accounts page' do
+        delete :destroy, params: { user_id: user.id }
+
+        user.reload
+        expect(user.otp_enabled?).to eq false
+        expect(response).to redirect_to(admin_accounts_path)
+      end
+    end
+
+    context 'when user has OTP and WebAuthn enabled' do
+      let(:fake_client) { WebAuthn::FakeClient.new('http://test.host') }
+
+      before do
+        user.update(otp_required_for_login: true, webauthn_id: WebAuthn.generate_user_id)
+
+        public_key_credential = WebAuthn::Credential.from_create(fake_client.create)
+        Fabricate(:webauthn_credential,
+                  user_id: user.id,
+                  external_id: public_key_credential.id,
+                  public_key: public_key_credential.public_key,
+                  nickname: 'Security Key')
+      end
+
+      it 'redirects to admin accounts page' do
+        delete :destroy, params: { user_id: user.id }
+
+        user.reload
+        expect(user.otp_enabled?).to eq false
+        expect(user.webauthn_enabled?).to eq false
+        expect(response).to redirect_to(admin_accounts_path)
+      end
     end
   end
 end
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
index 024409dab85328018d94bf44a3cf74f84c9b17d8..1e656503fbccb4994faf35c3222cd0729a03baa0 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -71,50 +71,80 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
     let(:scopes) { 'write:follows' }
     let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', locked: locked)).account }
 
-    before do
-      post :follow, params: { id: other_account.id }
-    end
+    context do
+      before do
+        post :follow, params: { id: other_account.id }
+      end
 
-    context 'with unlocked account' do
-      let(:locked) { false }
+      context 'with unlocked account' do
+        let(:locked) { false }
 
-      it 'returns http success' do
-        expect(response).to have_http_status(200)
-      end
+        it 'returns http success' do
+          expect(response).to have_http_status(200)
+        end
 
-      it 'returns JSON with following=true and requested=false' do
-        json = body_as_json
+        it 'returns JSON with following=true and requested=false' do
+          json = body_as_json
 
-        expect(json[:following]).to be true
-        expect(json[:requested]).to be false
-      end
+          expect(json[:following]).to be true
+          expect(json[:requested]).to be false
+        end
+
+        it 'creates a following relation between user and target user' do
+          expect(user.account.following?(other_account)).to be true
+        end
 
-      it 'creates a following relation between user and target user' do
-        expect(user.account.following?(other_account)).to be true
+        it_behaves_like 'forbidden for wrong scope', 'read:accounts'
       end
 
-      it_behaves_like 'forbidden for wrong scope', 'read:accounts'
+      context 'with locked account' do
+        let(:locked) { true }
+
+        it 'returns http success' do
+          expect(response).to have_http_status(200)
+        end
+
+        it 'returns JSON with following=false and requested=true' do
+          json = body_as_json
+
+          expect(json[:following]).to be false
+          expect(json[:requested]).to be true
+        end
+
+        it 'creates a follow request relation between user and target user' do
+          expect(user.account.requested?(other_account)).to be true
+        end
+
+        it_behaves_like 'forbidden for wrong scope', 'read:accounts'
+      end
     end
 
-    context 'with locked account' do
-      let(:locked) { true }
+    context 'modifying follow options' do
+      let(:locked) { false }
 
-      it 'returns http success' do
-        expect(response).to have_http_status(200)
+      before do
+        user.account.follow!(other_account, reblogs: false, notify: false)
       end
 
-      it 'returns JSON with following=false and requested=true' do
+      it 'changes reblogs option' do
+        post :follow, params: { id: other_account.id, reblogs: true }
+
         json = body_as_json
 
-        expect(json[:following]).to be false
-        expect(json[:requested]).to be true
+        expect(json[:following]).to be true
+        expect(json[:showing_reblogs]).to be true
+        expect(json[:notifying]).to be false
       end
 
-      it 'creates a follow request relation between user and target user' do
-        expect(user.account.requested?(other_account)).to be true
-      end
+      it 'changes notify option' do
+        post :follow, params: { id: other_account.id, notify: true }
+
+        json = body_as_json
 
-      it_behaves_like 'forbidden for wrong scope', 'read:accounts'
+        expect(json[:following]).to be true
+        expect(json[:showing_reblogs]).to be false
+        expect(json[:notifying]).to be true
+      end
     end
   end
 
diff --git a/spec/controllers/api/v1/admin/accounts_controller_spec.rb b/spec/controllers/api/v1/admin/accounts_controller_spec.rb
index f3f9946baac2dbb197586350c93ccc891d0a7710..f6be35f7f10036b79a7a4c5f73d317a597220a28 100644
--- a/spec/controllers/api/v1/admin/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/admin/accounts_controller_spec.rb
@@ -111,7 +111,7 @@ RSpec.describe Api::V1::Admin::AccountsController, type: :controller do
 
   describe 'POST #unsuspend' do
     before do
-      account.touch(:suspended_at)
+      account.suspend!
       post :unsuspend, params: { id: account.id }
     end
 
@@ -127,6 +127,24 @@ RSpec.describe Api::V1::Admin::AccountsController, type: :controller do
     end
   end
 
+  describe 'POST #unsensitive' do
+    before do
+      account.touch(:sensitized_at)
+      post :unsensitive, params: { id: account.id }
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+    it_behaves_like 'forbidden for wrong role', 'user'
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'unsensitives account' do
+      expect(account.reload.sensitized?).to be false
+    end
+  end
+
   describe 'POST #unsilence' do
     before do
       account.touch(:silenced_at)
diff --git a/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb b/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb
index aa5ca433fb794e38c1c80b24cfa7da74429174e3..7c75a4f7383d4bb1833628d0851c348120bf954f 100644
--- a/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb
@@ -72,6 +72,31 @@ describe Api::V1::Statuses::BookmarksController do
         end
       end
 
+      context 'with public status when blocked by its author' do
+        let(:status) { Fabricate(:status) }
+
+        before do
+          Bookmark.find_or_create_by!(account: user.account, status: status)
+          status.account.block!(user.account)
+          post :destroy, params: { status_id: status.id }
+        end
+
+        it 'returns http success' do
+          expect(response).to have_http_status(200)
+        end
+
+        it 'updates the bookmarked attribute' do
+          expect(user.account.bookmarked?(status)).to be false
+        end
+
+        it 'returns json with updated attributes' do
+          hash_body = body_as_json
+
+          expect(hash_body[:id]).to eq status.id.to_s
+          expect(hash_body[:bookmarked]).to be false
+        end
+      end
+
       context 'with private status that was not bookmarked' do
         let(:status) { Fabricate(:status, visibility: :private) }
 
diff --git a/spec/controllers/api/v1/statuses/favourites_controller_spec.rb b/spec/controllers/api/v1/statuses/favourites_controller_spec.rb
index 6e947f5d2b6f444229fae2aad4295cba8ada952b..4716ecae3c34fe917a3a85d3a0ef147eba9c791b 100644
--- a/spec/controllers/api/v1/statuses/favourites_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/favourites_controller_spec.rb
@@ -82,6 +82,31 @@ describe Api::V1::Statuses::FavouritesController do
         end
       end
 
+      context 'with public status when blocked by its author' do
+        let(:status) { Fabricate(:status) }
+
+        before do
+          FavouriteService.new.call(user.account, status)
+          status.account.block!(user.account)
+          post :destroy, params: { status_id: status.id }
+        end
+
+        it 'returns http success' do
+          expect(response).to have_http_status(200)
+        end
+
+        it 'updates the favourite attribute' do
+          expect(user.account.favourited?(status)).to be false
+        end
+
+        it 'returns json with updated attributes' do
+          hash_body = body_as_json
+
+          expect(hash_body[:id]).to eq status.id.to_s
+          expect(hash_body[:favourited]).to be false
+        end
+      end
+
       context 'with private status that was not favourited' do
         let(:status) { Fabricate(:status, visibility: :private) }
 
diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb
index c2e9f33a82a0bfff62e0257db9913a232a561bb7..ccf304a930ec2993a7b3eac91049583f48eb6aef 100644
--- a/spec/controllers/auth/registrations_controller_spec.rb
+++ b/spec/controllers/auth/registrations_controller_spec.rb
@@ -82,6 +82,10 @@ RSpec.describe Auth::RegistrationsController, type: :controller do
   describe 'POST #create' do
     let(:accept_language) { Rails.application.config.i18n.available_locales.sample.to_s }
 
+    before do
+      session[:registration_form_time] = 5.seconds.ago
+    end
+
     around do |example|
       current_locale = I18n.locale
       example.run
@@ -191,17 +195,21 @@ RSpec.describe Auth::RegistrationsController, type: :controller do
       end
     end
 
-    context 'approval-based registrations with valid invite' do
+    context 'approval-based registrations with valid invite and required invite text' do
       around do |example|
         registrations_mode = Setting.registrations_mode
+        require_invite_text = Setting.require_invite_text
         example.run
+        Setting.require_invite_text = require_invite_text
         Setting.registrations_mode = registrations_mode
       end
 
       subject do
+        inviter = Fabricate(:user, confirmed_at: 2.days.ago)
         Setting.registrations_mode = 'approved'
+        Setting.require_invite_text = true
         request.headers["Accept-Language"] = accept_language
-        invite = Fabricate(:invite, max_uses: nil, expires_at: 1.hour.from_now)
+        invite = Fabricate(:invite, user: inviter, max_uses: nil, expires_at: 1.hour.from_now)
         post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', 'invite_code': invite.code, agreement: 'true' } }
       end
 
diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index c387842cda909f62b19b011b1741e2b8e37ca411..d3a9a11ebbd71b105361aac465399f2213a6ebec 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'webauthn/fake_client'
 
 RSpec.describe Auth::SessionsController, type: :controller do
   render_views
@@ -183,90 +184,170 @@ RSpec.describe Auth::SessionsController, type: :controller do
     end
 
     context 'using two-factor authentication' do
-      let!(:user) do
-        Fabricate(:user, email: 'x@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret(32))
-      end
-
-      let!(:recovery_codes) do
-        codes = user.generate_otp_backup_codes!
-        user.save
-        return codes
-      end
-
-      context 'using email and password' do
-        before do
-          post :create, params: { user: { email: user.email, password: user.password } }
+      context 'with OTP enabled as second factor' do
+        let!(:user) do
+          Fabricate(:user, email: 'x@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret(32))
         end
 
-        it 'renders two factor authentication page' do
-          expect(controller).to render_template("two_factor")
+        let!(:recovery_codes) do
+          codes = user.generate_otp_backup_codes!
+          user.save
+          return codes
         end
-      end
 
-      context 'using upcase email and password' do
-        before do
-          post :create, params: { user: { email: user.email.upcase, password: user.password } }
-        end
+        context 'using email and password' do
+          before do
+            post :create, params: { user: { email: user.email, password: user.password } }
+          end
 
-        it 'renders two factor authentication page' do
-          expect(controller).to render_template("two_factor")
+          it 'renders two factor authentication page' do
+            expect(controller).to render_template("two_factor")
+            expect(controller).to render_template(partial: "_otp_authentication_form")
+          end
         end
-      end
 
-      context 'using a valid OTP' do
-        before do
-          post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id }
-        end
+        context 'using upcase email and password' do
+          before do
+            post :create, params: { user: { email: user.email.upcase, password: user.password } }
+          end
 
-        it 'redirects to home' do
-          expect(response).to redirect_to(root_path)
+          it 'renders two factor authentication page' do
+            expect(controller).to render_template("two_factor")
+            expect(controller).to render_template(partial: "_otp_authentication_form")
+          end
         end
 
-        it 'logs the user in' do
-          expect(controller.current_user).to eq user
+        context 'using a valid OTP' do
+          before do
+            post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+          end
+
+          it 'redirects to home' do
+            expect(response).to redirect_to(root_path)
+          end
+
+          it 'logs the user in' do
+            expect(controller.current_user).to eq user
+          end
         end
-      end
 
-      context 'when the server has an decryption error' do
-        before do
-          allow_any_instance_of(User).to receive(:validate_and_consume_otp!).and_raise(OpenSSL::Cipher::CipherError)
-          post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id }
+        context 'when the server has an decryption error' do
+          before do
+            allow_any_instance_of(User).to receive(:validate_and_consume_otp!).and_raise(OpenSSL::Cipher::CipherError)
+            post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+          end
+
+          it 'shows a login error' do
+            expect(flash[:alert]).to match I18n.t('users.invalid_otp_token')
+          end
+
+          it "doesn't log the user in" do
+            expect(controller.current_user).to be_nil
+          end
         end
 
-        it 'shows a login error' do
-          expect(flash[:alert]).to match I18n.t('users.invalid_otp_token')
+        context 'using a valid recovery code' do
+          before do
+            post :create, params: { user: { otp_attempt: recovery_codes.first } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+          end
+
+          it 'redirects to home' do
+            expect(response).to redirect_to(root_path)
+          end
+
+          it 'logs the user in' do
+            expect(controller.current_user).to eq user
+          end
         end
 
-        it "doesn't log the user in" do
-          expect(controller.current_user).to be_nil
+        context 'using an invalid OTP' do
+          before do
+            post :create, params: { user: { otp_attempt: 'wrongotp' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+          end
+
+          it 'shows a login error' do
+            expect(flash[:alert]).to match I18n.t('users.invalid_otp_token')
+          end
+
+          it "doesn't log the user in" do
+            expect(controller.current_user).to be_nil
+          end
         end
       end
 
-      context 'using a valid recovery code' do
-        before do
-          post :create, params: { user: { otp_attempt: recovery_codes.first } }, session: { attempt_user_id: user.id }
+      context 'with WebAuthn and OTP enabled as second factor' do
+        let!(:user) do
+          Fabricate(:user, email: 'x@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret(32))
         end
 
-        it 'redirects to home' do
-          expect(response).to redirect_to(root_path)
+        let!(:recovery_codes) do
+          codes = user.generate_otp_backup_codes!
+          user.save
+          return codes
         end
 
-        it 'logs the user in' do
-          expect(controller.current_user).to eq user
+        let!(:webauthn_credential) do
+          user.update(webauthn_id: WebAuthn.generate_user_id)
+          public_key_credential = WebAuthn::Credential.from_create(fake_client.create)
+          user.webauthn_credentials.create(
+            nickname: 'SecurityKeyNickname',
+            external_id: public_key_credential.id,
+            public_key: public_key_credential.public_key,
+            sign_count: '1000'
+           )
+          user.webauthn_credentials.take
         end
-      end
 
-      context 'using an invalid OTP' do
-        before do
-          post :create, params: { user: { otp_attempt: 'wrongotp' } }, session: { attempt_user_id: user.id }
+        let(:domain) { "#{Rails.configuration.x.use_https ? 'https' : 'http' }://#{Rails.configuration.x.web_domain}" }
+
+        let(:fake_client) { WebAuthn::FakeClient.new(domain) }
+
+        let(:challenge) { WebAuthn::Credential.options_for_get.challenge }
+
+        let(:sign_count) { 1234 }
+
+        let(:fake_credential) { fake_client.get(challenge: challenge, sign_count: sign_count) }
+
+        context 'using email and password' do
+          before do
+            post :create, params: { user: { email: user.email, password: user.password } }
+          end
+
+          it 'renders webauthn authentication page' do
+            expect(controller).to render_template("two_factor")
+            expect(controller).to render_template(partial: "_webauthn_form")
+          end
         end
 
-        it 'shows a login error' do
-          expect(flash[:alert]).to match I18n.t('users.invalid_otp_token')
+        context 'using upcase email and password' do
+          before do
+            post :create, params: { user: { email: user.email.upcase, password: user.password } }
+          end
+
+          it 'renders webauthn authentication page' do
+            expect(controller).to render_template("two_factor")
+            expect(controller).to render_template(partial: "_webauthn_form")
+          end
         end
 
-        it "doesn't log the user in" do
-          expect(controller.current_user).to be_nil
+        context 'using a valid webauthn credential' do
+          before do
+            @controller.session[:webauthn_challenge] = challenge
+
+            post :create, params: { user: { credential: fake_credential } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+          end
+
+          it 'instructs the browser to redirect to home' do
+            expect(body_as_json[:redirect_path]).to eq(root_path)
+          end
+
+          it 'logs the user in' do
+            expect(controller.current_user).to eq user
+          end
+
+          it 'updates the sign count' do
+            expect(webauthn_credential.reload.sign_count).to eq(sign_count)
+          end
         end
       end
     end
@@ -302,7 +383,7 @@ RSpec.describe Auth::SessionsController, type: :controller do
       context 'using a valid sign in token' do
         before do
           user.generate_sign_in_token && user.save
-          post :create, params: { user: { sign_in_token_attempt: user.sign_in_token } }, session: { attempt_user_id: user.id }
+          post :create, params: { user: { sign_in_token_attempt: user.sign_in_token } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
         end
 
         it 'redirects to home' do
@@ -316,7 +397,7 @@ RSpec.describe Auth::SessionsController, type: :controller do
 
       context 'using an invalid sign in token' do
         before do
-          post :create, params: { user: { sign_in_token_attempt: 'wrongotp' } }, session: { attempt_user_id: user.id }
+          post :create, params: { user: { sign_in_token_attempt: 'wrongotp' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
         end
 
         it 'shows a login error' do
diff --git a/spec/controllers/concerns/export_controller_concern_spec.rb b/spec/controllers/concerns/export_controller_concern_spec.rb
index e5861c801f54448442d09ffeebbec2c72f69de20..fce129bee2223aadd8624690704289a9ff1ee0d8 100644
--- a/spec/controllers/concerns/export_controller_concern_spec.rb
+++ b/spec/controllers/concerns/export_controller_concern_spec.rb
@@ -5,6 +5,7 @@ require 'rails_helper'
 describe ApplicationController, type: :controller do
   controller do
     include ExportControllerConcern
+
     def index
       send_export_file
     end
diff --git a/spec/controllers/follower_accounts_controller_spec.rb b/spec/controllers/follower_accounts_controller_spec.rb
index 34a0cf3f482ec58929e973f9ff27a3cdda07183d..f6d55f69326b611db81b20cce16093a52d8f6135 100644
--- a/spec/controllers/follower_accounts_controller_spec.rb
+++ b/spec/controllers/follower_accounts_controller_spec.rb
@@ -14,6 +14,27 @@ describe FollowerAccountsController do
     context 'when format is html' do
       subject(:response) { get :index, params: { account_username: alice.username, format: :html } }
 
+      context 'when account is permanently suspended' do
+        before do
+          alice.suspend!
+          alice.deletion_request.destroy
+        end
+
+        it 'returns http gone' do
+          expect(response).to have_http_status(410)
+        end
+      end
+
+      context 'when account is temporarily suspended' do
+        before do
+          alice.suspend!
+        end
+
+        it 'returns http forbidden' do
+          expect(response).to have_http_status(403)
+        end
+      end
+
       it 'assigns follows' do
         expect(response).to have_http_status(200)
 
@@ -48,6 +69,27 @@ describe FollowerAccountsController do
           expect(body['totalItems']).to eq 2
           expect(body['partOf']).to be_present
         end
+
+        context 'when account is permanently suspended' do
+          before do
+            alice.suspend!
+            alice.deletion_request.destroy
+          end
+
+          it 'returns http gone' do
+            expect(response).to have_http_status(410)
+          end
+        end
+
+        context 'when account is temporarily suspended' do
+          before do
+            alice.suspend!
+          end
+
+          it 'returns http forbidden' do
+            expect(response).to have_http_status(403)
+          end
+        end
       end
 
       context 'without page' do
@@ -58,6 +100,27 @@ describe FollowerAccountsController do
           expect(body['totalItems']).to eq 2
           expect(body['partOf']).to be_blank
         end
+
+        context 'when account is permanently suspended' do
+          before do
+            alice.suspend!
+            alice.deletion_request.destroy
+          end
+
+          it 'returns http gone' do
+            expect(response).to have_http_status(410)
+          end
+        end
+
+        context 'when account is temporarily suspended' do
+          before do
+            alice.suspend!
+          end
+
+          it 'returns http forbidden' do
+            expect(response).to have_http_status(403)
+          end
+        end
       end
     end
   end
diff --git a/spec/controllers/following_accounts_controller_spec.rb b/spec/controllers/following_accounts_controller_spec.rb
index e9a1f597df609af3c9331362e0016c396dd2bc97..0fc0967a632847828d0ce0cb1941feeb779a670d 100644
--- a/spec/controllers/following_accounts_controller_spec.rb
+++ b/spec/controllers/following_accounts_controller_spec.rb
@@ -14,6 +14,27 @@ describe FollowingAccountsController do
     context 'when format is html' do
       subject(:response) { get :index, params: { account_username: alice.username, format: :html } }
 
+      context 'when account is permanently suspended' do
+        before do
+          alice.suspend!
+          alice.deletion_request.destroy
+        end
+
+        it 'returns http gone' do
+          expect(response).to have_http_status(410)
+        end
+      end
+
+      context 'when account is temporarily suspended' do
+        before do
+          alice.suspend!
+        end
+
+        it 'returns http forbidden' do
+          expect(response).to have_http_status(403)
+        end
+      end
+
       it 'assigns follows' do
         expect(response).to have_http_status(200)
 
@@ -48,6 +69,27 @@ describe FollowingAccountsController do
           expect(body['totalItems']).to eq 2
           expect(body['partOf']).to be_present
         end
+
+        context 'when account is permanently suspended' do
+          before do
+            alice.suspend!
+            alice.deletion_request.destroy
+          end
+
+          it 'returns http gone' do
+            expect(response).to have_http_status(410)
+          end
+        end
+
+        context 'when account is temporarily suspended' do
+          before do
+            alice.suspend!
+          end
+
+          it 'returns http forbidden' do
+            expect(response).to have_http_status(403)
+          end
+        end
       end
 
       context 'without page' do
@@ -58,6 +100,27 @@ describe FollowingAccountsController do
           expect(body['totalItems']).to eq 2
           expect(body['partOf']).to be_blank
         end
+
+        context 'when account is permanently suspended' do
+          before do
+            alice.suspend!
+            alice.deletion_request.destroy
+          end
+
+          it 'returns http gone' do
+            expect(response).to have_http_status(410)
+          end
+        end
+
+        context 'when account is temporarily suspended' do
+          before do
+            alice.suspend!
+          end
+
+          it 'returns http forbidden' do
+            expect(response).to have_http_status(403)
+          end
+        end
       end
     end
   end
diff --git a/spec/controllers/remote_follow_controller_spec.rb b/spec/controllers/remote_follow_controller_spec.rb
index 3ef8f14d9f68c36386e19627380947d856b04b47..01d43f48c29f04c501b1a8dd1b17594a190a3500 100644
--- a/spec/controllers/remote_follow_controller_spec.rb
+++ b/spec/controllers/remote_follow_controller_spec.rb
@@ -43,8 +43,7 @@ describe RemoteFollowController do
         end
 
         it 'renders new when template is nil' do
-          link_with_nil_template = double(template: nil)
-          resource_with_link = double(link: link_with_nil_template)
+          resource_with_link = double(link: nil)
           allow_any_instance_of(WebfingerHelper).to receive(:webfinger!).with('acct:user@example.com').and_return(resource_with_link)
           post :create, params: { account_username: @account.to_param, remote_follow: { acct: 'user@example.com' } }
 
@@ -55,8 +54,7 @@ describe RemoteFollowController do
 
       context 'when webfinger values are good' do
         before do
-          link_with_template = double(template: 'http://example.com/follow_me?acct={uri}')
-          resource_with_link = double(link: link_with_template)
+          resource_with_link = double(link: 'http://example.com/follow_me?acct={uri}')
           allow_any_instance_of(WebfingerHelper).to receive(:webfinger!).with('acct:user@example.com').and_return(resource_with_link)
           post :create, params: { account_username: @account.to_param, remote_follow: { acct: 'user@example.com' } }
         end
@@ -78,8 +76,8 @@ describe RemoteFollowController do
         expect(response).to render_template(:new)
       end
 
-      it 'renders new with error when goldfinger fails' do
-        allow_any_instance_of(WebfingerHelper).to receive(:webfinger!).with('acct:user@example.com').and_raise(Goldfinger::Error)
+      it 'renders new with error when webfinger fails' do
+        allow_any_instance_of(WebfingerHelper).to receive(:webfinger!).with('acct:user@example.com').and_raise(Webfinger::Error)
         post :create, params: { account_username: @account.to_param, remote_follow: { acct: 'user@example.com' } }
 
         expect(response).to render_template(:new)
@@ -96,21 +94,42 @@ describe RemoteFollowController do
     end
   end
 
-  describe 'with a suspended account' do
+  context 'with a permanently suspended account' do
     before do
-      @account = Fabricate(:account, suspended: true)
+      @account = Fabricate(:account)
+      @account.suspend!
+      @account.deletion_request.destroy
     end
 
-    it 'returns 410 gone on GET to #new' do
+    it 'returns http gone on GET to #new' do
       get :new, params: { account_username: @account.to_param }
 
-      expect(response).to have_http_status(:gone)
+      expect(response).to have_http_status(410)
     end
 
-    it 'returns 410 gone on POST to #create' do
+    it 'returns http gone on POST to #create' do
       post :create, params: { account_username: @account.to_param }
 
-      expect(response).to have_http_status(:gone)
+      expect(response).to have_http_status(410)
+    end
+  end
+
+  context 'with a temporarily suspended account' do
+    before do
+      @account = Fabricate(:account)
+      @account.suspend!
+    end
+
+    it 'returns http forbidden on GET to #new' do
+      get :new, params: { account_username: @account.to_param }
+
+      expect(response).to have_http_status(403)
+    end
+
+    it 'returns http forbidden on POST to #create' do
+      post :create, params: { account_username: @account.to_param }
+
+      expect(response).to have_http_status(403)
     end
   end
 end
diff --git a/spec/controllers/settings/deletes_controller_spec.rb b/spec/controllers/settings/deletes_controller_spec.rb
index 996872efd1af639726dc957e2981fd7787559c7d..8d5c4774fd8541ce971eebc15199314f723238cc 100644
--- a/spec/controllers/settings/deletes_controller_spec.rb
+++ b/spec/controllers/settings/deletes_controller_spec.rb
@@ -77,26 +77,26 @@ describe Settings::DeletesController do
           expect(response).to redirect_to settings_delete_path
         end
       end
-    end
 
-    context 'when not signed in' do
-      it 'redirects' do
-        delete :destroy
-        expect(response).to redirect_to '/auth/sign_in'
-      end
-    end
+      context 'when account deletions are disabled' do
+        around do |example|
+          open_deletion = Setting.open_deletion
+          example.run
+          Setting.open_deletion = open_deletion
+        end
 
-    context do
-      around do |example|
-        open_deletion = Setting.open_deletion
-        example.run
-        Setting.open_deletion = open_deletion
+        it 'redirects' do
+          Setting.open_deletion = false
+          delete :destroy
+          expect(response).to redirect_to root_path
+        end
       end
+    end
 
+    context 'when not signed in' do
       it 'redirects' do
-        Setting.open_deletion = false
         delete :destroy
-        expect(response).to redirect_to root_path
+        expect(response).to redirect_to '/auth/sign_in'
       end
     end
   end
diff --git a/spec/controllers/settings/exports/bookmarks_controller_specs.rb b/spec/controllers/settings/exports/bookmarks_controller_specs.rb
new file mode 100644
index 0000000000000000000000000000000000000000..85761577bd9d21bfa119e11c4238e4b78f8a34ae
--- /dev/null
+++ b/spec/controllers/settings/exports/bookmarks_controller_specs.rb
@@ -0,0 +1,17 @@
+require 'rails_helper'
+
+describe Settings::Exports::BookmarksController do
+  render_views
+
+  describe 'GET #index' do
+    it 'returns a csv of the bookmarked toots' do
+      user = Fabricate(:user)
+      user.account.bookmarks.create!(status: Fabricate(:status, uri: 'https://foo.bar/statuses/1312'))
+
+      sign_in user, scope: :user
+      get :index, format: :csv
+
+      expect(response.body).to eq "https://foo.bar/statuses/1312\n"
+    end
+  end
+end
diff --git a/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
index 336f131279fc11a61269c69cd1463da922b8aa86..cdfeef8d6a7223a7d2a14ac8ee0d20730fb8fd00 100644
--- a/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
@@ -5,8 +5,6 @@ require 'rails_helper'
 describe Settings::TwoFactorAuthentication::ConfirmationsController do
   render_views
 
-  let(:user) { Fabricate(:user, email: 'local-part@domain', otp_secret: 'thisisasecretforthespecofnewview') }
-  let(:user_without_otp_secret) { Fabricate(:user, email: 'local-part@domain') }
 
   shared_examples 'renders :new' do
     it 'renders the new view' do
@@ -20,87 +18,101 @@ describe Settings::TwoFactorAuthentication::ConfirmationsController do
     end
   end
 
-  describe 'GET #new' do
-    context 'when signed in' do
-      subject do
-        sign_in user, scope: :user
-        get :new, session: { challenge_passed_at: Time.now.utc }
-      end
+  [true, false].each do |with_otp_secret|
+    let(:user) { Fabricate(:user, email: 'local-part@domain', otp_secret: with_otp_secret ? 'oldotpsecret' : nil) }
 
-      include_examples 'renders :new'
-    end
+    describe 'GET #new' do
+      context 'when signed in and a new otp secret has been setted in the session' do
+        subject do
+          sign_in user, scope: :user
+          get :new, session: { challenge_passed_at: Time.now.utc, new_otp_secret: 'thisisasecretforthespecofnewview' }
+        end
 
-    it 'redirects if not signed in' do
-      get :new
-      expect(response).to redirect_to('/auth/sign_in')
-    end
+        include_examples 'renders :new'
+      end
 
-    it 'redirects if user do not have otp_secret' do
-      sign_in user_without_otp_secret, scope: :user
-      get :new, session: { challenge_passed_at: Time.now.utc }
-      expect(response).to redirect_to('/settings/two_factor_authentication')
-    end
-  end
+      it 'redirects if not signed in' do
+        get :new
+        expect(response).to redirect_to('/auth/sign_in')
+      end
 
-  describe 'POST #create' do
-    context 'when signed in' do
-      before do
+      it 'redirects if a new otp_secret has not been setted in the session' do
         sign_in user, scope: :user
+        get :new, session: { challenge_passed_at: Time.now.utc }
+        expect(response).to redirect_to('/settings/otp_authentication')
       end
+    end
 
-      describe 'when form_two_factor_confirmation parameter is not provided' do
-        it 'raises ActionController::ParameterMissing' do
-          post :create, params: {}, session: { challenge_passed_at: Time.now.utc }
-          expect(response).to have_http_status(400)
+    describe 'POST #create' do
+      context 'when signed in' do
+        before do
+          sign_in user, scope: :user
         end
-      end
 
-      describe 'when creation succeeds' do
-        it 'renders page with success' do
-          otp_backup_codes = user.generate_otp_backup_codes!
-          expect_any_instance_of(User).to receive(:generate_otp_backup_codes!) do |value|
-            expect(value).to eq user
-            otp_backup_codes
-          end
-          expect_any_instance_of(User).to receive(:validate_and_consume_otp!) do |value, arg|
-            expect(value).to eq user
-            expect(arg).to eq '123456'
-            true
+        describe 'when form_two_factor_confirmation parameter is not provided' do
+          it 'raises ActionController::ParameterMissing' do
+            post :create, params: {}, session: { challenge_passed_at: Time.now.utc, new_otp_secret: 'thisisasecretforthespecofnewview' }
+            expect(response).to have_http_status(400)
           end
+        end
 
-          post :create, params: { form_two_factor_confirmation: { otp_attempt: '123456' } }, session: { challenge_passed_at: Time.now.utc }
-
-          expect(assigns(:recovery_codes)).to eq otp_backup_codes
-          expect(flash[:notice]).to eq 'Two-factor authentication successfully enabled'
-          expect(response).to have_http_status(200)
-          expect(response).to render_template('settings/two_factor_authentication/recovery_codes/index')
+        describe 'when creation succeeds' do
+          it 'renders page with success' do
+            otp_backup_codes = user.generate_otp_backup_codes!
+            expect_any_instance_of(User).to receive(:generate_otp_backup_codes!) do |value|
+              expect(value).to eq user
+              otp_backup_codes
+            end
+            expect_any_instance_of(User).to receive(:validate_and_consume_otp!) do |value, code, options|
+              expect(value).to eq user
+              expect(code).to eq '123456'
+              expect(options).to eq({ otp_secret: 'thisisasecretforthespecofnewview' })
+              true
+            end
+
+            expect do
+              post :create,
+                   params: { form_two_factor_confirmation: { otp_attempt: '123456' } },
+                   session: { challenge_passed_at: Time.now.utc, new_otp_secret: 'thisisasecretforthespecofnewview' }
+            end.to change { user.reload.otp_secret }.to 'thisisasecretforthespecofnewview'
+
+            expect(assigns(:recovery_codes)).to eq otp_backup_codes
+            expect(flash[:notice]).to eq 'Two-factor authentication successfully enabled'
+            expect(response).to have_http_status(200)
+            expect(response).to render_template('settings/two_factor_authentication/recovery_codes/index')
+          end
         end
-      end
 
-      describe 'when creation fails' do
-        subject do
-          expect_any_instance_of(User).to receive(:validate_and_consume_otp!) do |value, arg|
-            expect(value).to eq user
-            expect(arg).to eq '123456'
-            false
+        describe 'when creation fails' do
+          subject do
+            expect_any_instance_of(User).to receive(:validate_and_consume_otp!) do |value, code, options|
+              expect(value).to eq user
+              expect(code).to eq '123456'
+              expect(options).to eq({ otp_secret: 'thisisasecretforthespecofnewview' })
+              false
+            end
+
+            expect do
+              post :create,
+                   params: { form_two_factor_confirmation: { otp_attempt: '123456' } },
+                   session: { challenge_passed_at: Time.now.utc, new_otp_secret: 'thisisasecretforthespecofnewview' }
+            end.to not_change { user.reload.otp_secret }
           end
 
-          post :create, params: { form_two_factor_confirmation: { otp_attempt: '123456' } }, session: { challenge_passed_at: Time.now.utc }
-        end
+          it 'renders the new view' do
+            subject
+            expect(response.body).to include 'The entered code was invalid! Are server time and device time correct?'
+          end
 
-        it 'renders the new view' do
-          subject
-          expect(response.body).to include 'The entered code was invalid! Are server time and device time correct?'
+          include_examples 'renders :new'
         end
-
-        include_examples 'renders :new'
       end
-    end
 
-    context 'when not signed in' do
-      it 'redirects if not signed in' do
-        post :create, params: { form_two_factor_confirmation: { otp_attempt: '123456' } }
-        expect(response).to redirect_to('/auth/sign_in')
+      context 'when not signed in' do
+        it 'redirects if not signed in' do
+          post :create, params: { form_two_factor_confirmation: { otp_attempt: '123456' } }
+          expect(response).to redirect_to('/auth/sign_in')
+        end
       end
     end
   end
diff --git a/spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..17e8fa9b8212e9b581c0c112a529ca53ab3ccabb
--- /dev/null
+++ b/spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb
@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Settings::TwoFactorAuthentication::OtpAuthenticationController do
+  render_views
+
+  let(:user) { Fabricate(:user) }
+
+  describe 'GET #show' do
+    context 'when signed in' do
+      before do
+        sign_in user, scope: :user
+      end
+
+      describe 'when user has OTP enabled' do
+        before do
+          user.update(otp_required_for_login: true)
+        end
+
+        it 'redirects to two factor authentciation methods list page' do
+          get :show
+
+          expect(response).to redirect_to settings_two_factor_authentication_methods_path
+        end
+      end
+
+      describe 'when user does not have OTP enabled' do
+        before do
+          user.update(otp_required_for_login: false)
+        end
+
+        it 'returns http success' do
+          get :show
+
+          expect(response).to have_http_status(200)
+        end
+      end
+    end
+
+    context 'when not signed in' do
+      it 'redirects' do
+        get :show
+
+        expect(response).to redirect_to new_user_session_path
+      end
+    end
+  end
+
+  describe 'POST #create' do
+    context 'when signed in' do
+      before do
+        sign_in user, scope: :user
+      end
+
+      describe 'when user has OTP enabled' do
+        before do
+          user.update(otp_required_for_login: true)
+        end
+
+        describe 'when creation succeeds' do
+          it 'redirects to code confirmation page without updating user secret and setting otp secret in the session' do
+            expect do
+              post :create, session: { challenge_passed_at: Time.now.utc }
+            end.to not_change { user.reload.otp_secret }
+               .and change { session[:new_otp_secret] }
+
+            expect(response).to redirect_to(new_settings_two_factor_authentication_confirmation_path)
+          end
+        end
+      end
+
+      describe 'when user does not have OTP enabled' do
+        before do
+          user.update(otp_required_for_login: false)
+        end
+
+        describe 'when creation succeeds' do
+          it 'redirects to code confirmation page without updating user secret and setting otp secret in the session' do
+            expect do
+              post :create, session: { challenge_passed_at: Time.now.utc }
+            end.to not_change { user.reload.otp_secret }
+               .and change { session[:new_otp_secret] }
+
+            expect(response).to redirect_to(new_settings_two_factor_authentication_confirmation_path)
+          end
+        end
+      end
+    end
+
+    context 'when not signed in' do
+      it 'redirects to login' do
+        get :show
+
+        expect(response).to redirect_to new_user_session_path
+      end
+    end
+  end
+end
diff --git a/spec/controllers/settings/two_factor_authentication/webauthn_credentials_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/webauthn_credentials_controller_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..fe53b4dfc26c17da196225e20f617bfcd0b22e5c
--- /dev/null
+++ b/spec/controllers/settings/two_factor_authentication/webauthn_credentials_controller_spec.rb
@@ -0,0 +1,374 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'webauthn/fake_client'
+
+describe Settings::TwoFactorAuthentication::WebauthnCredentialsController do
+  render_views
+
+  let(:user) { Fabricate(:user) }
+  let(:domain) { "#{Rails.configuration.x.use_https ? 'https' : 'http' }://#{Rails.configuration.x.web_domain}" }
+  let(:fake_client) { WebAuthn::FakeClient.new(domain) }
+
+  def add_webauthn_credential(user)
+    Fabricate(:webauthn_credential, user_id: user.id, nickname: 'USB Key')
+  end
+
+  describe 'GET #new' do
+    context 'when signed in' do
+      before do
+        sign_in user, scope: :user
+      end
+
+      context 'when user has otp enabled' do
+        before do
+          user.update(otp_required_for_login: true)
+        end
+
+        it 'returns http success' do
+          get :new
+
+          expect(response).to have_http_status(200)
+        end
+      end
+
+      context 'when user does not have otp enabled' do
+        before do
+          user.update(otp_required_for_login: false)
+        end
+
+        it 'requires otp enabled first' do
+          get :new
+
+          expect(response).to redirect_to settings_two_factor_authentication_methods_path
+          expect(flash[:error]).to be_present
+        end
+      end
+    end
+  end
+
+  describe 'GET #index' do
+    context 'when signed in' do
+      before do
+        sign_in user, scope: :user
+      end
+
+      context 'when user has otp enabled' do
+        before do
+          user.update(otp_required_for_login: true)
+        end
+
+        context 'when user has webauthn enabled' do
+          before do
+            user.update(webauthn_id: WebAuthn.generate_user_id)
+            add_webauthn_credential(user)
+          end
+
+          it 'returns http success' do
+            get :index
+
+            expect(response).to have_http_status(200)
+          end
+        end
+
+        context 'when user does not has webauthn enabled' do
+          it 'redirects to 2FA methods list page' do
+            get :index
+
+            expect(response).to redirect_to settings_two_factor_authentication_methods_path
+            expect(flash[:error]).to be_present
+          end
+        end
+      end
+
+      context 'when user does not have otp enabled' do
+        before do
+          user.update(otp_required_for_login: false)
+        end
+
+        it 'requires otp enabled first' do
+          get :index
+
+          expect(response).to redirect_to settings_two_factor_authentication_methods_path
+          expect(flash[:error]).to be_present
+        end
+      end
+    end
+
+    context 'when not signed in' do
+      it 'redirects to login' do
+        delete :index
+
+        expect(response).to redirect_to new_user_session_path
+      end
+    end
+  end
+
+  describe 'GET /options #options' do
+    context 'when signed in' do
+      before do
+        sign_in user, scope: :user
+      end
+
+      context 'when user has otp enabled' do
+        before do
+          user.update(otp_required_for_login: true)
+        end
+
+        context 'when user has webauthn enabled' do
+          before do
+            user.update(webauthn_id: WebAuthn.generate_user_id)
+            add_webauthn_credential(user)
+          end
+
+          it 'returns http success' do
+            get :options
+
+            expect(response).to have_http_status(200)
+          end
+
+          it 'stores the challenge on the session' do
+            get :options
+
+            expect(@controller.session[:webauthn_challenge]).to be_present
+          end
+
+          it 'does not change webauthn_id' do
+            expect { get :options }.to_not change { user.webauthn_id }
+          end
+
+          it "includes existing credentials in list of excluded credentials" do
+            get :options
+
+            excluded_credentials_ids = JSON.parse(response.body)['excludeCredentials'].map { |credential| credential['id'] }
+            expect(excluded_credentials_ids).to match_array(user.webauthn_credentials.pluck(:external_id))
+          end
+        end
+
+        context 'when user does not have webauthn enabled' do
+          it 'returns http success' do
+            get :options
+
+            expect(response).to have_http_status(200)
+          end
+
+          it 'stores the challenge on the session' do
+            get :options
+
+            expect(@controller.session[:webauthn_challenge]).to be_present
+          end
+
+          it 'sets user webauthn_id' do
+            get :options
+
+            expect(user.reload.webauthn_id).to be_present
+          end
+        end
+      end
+
+      context 'when user has not enabled otp' do
+        before do
+          user.update(otp_required_for_login: false)
+        end
+
+        it 'requires otp enabled first' do
+          get :options
+
+          expect(response).to redirect_to settings_two_factor_authentication_methods_path
+          expect(flash[:error]).to be_present
+        end
+      end
+    end
+
+    context 'when not signed in' do
+      it 'redirects to login' do
+        get :options
+
+        expect(response).to redirect_to new_user_session_path
+      end
+    end
+  end
+
+  describe 'POST #create' do
+    let(:nickname) { 'SecurityKeyNickname' }
+
+    let(:challenge) do
+      WebAuthn::Credential.options_for_create(
+        user: { id: user.id, name: user.account.username, display_name: user.account.display_name }
+      ).challenge
+    end
+
+    let(:new_webauthn_credential) { fake_client.create(challenge: challenge) }
+
+    context 'when signed in' do
+      before do
+        sign_in user, scope: :user
+      end
+
+      context 'when user has enabled otp' do
+        before do
+          user.update(otp_required_for_login: true)
+        end
+
+        context 'when user has enabled webauthn' do
+          before do
+            user.update(webauthn_id: WebAuthn.generate_user_id)
+            add_webauthn_credential(user)
+          end
+
+          context 'when creation succeeds' do
+            it 'returns http success' do
+              @controller.session[:webauthn_challenge] = challenge
+
+              post :create, params: { credential: new_webauthn_credential, nickname: nickname }
+
+              expect(response).to have_http_status(200)
+            end
+
+            it 'adds a new credential to user credentials' do
+              @controller.session[:webauthn_challenge] = challenge
+
+              expect do
+                post :create, params: { credential: new_webauthn_credential, nickname: nickname }
+              end.to change { user.webauthn_credentials.count }.by(1)
+            end
+
+            it 'does not change webauthn_id' do
+              @controller.session[:webauthn_challenge] = challenge
+
+              expect do
+                post :create, params: { credential: new_webauthn_credential, nickname: nickname }
+              end.to_not change { user.webauthn_id }
+            end
+          end
+
+          context 'when the nickname is already used' do
+            it 'fails' do
+              @controller.session[:webauthn_challenge] = challenge
+
+              post :create, params: { credential: new_webauthn_credential, nickname: 'USB Key' }
+
+              expect(response).to have_http_status(500)
+              expect(flash[:error]).to be_present
+            end
+          end
+
+          context 'when the credential already exists' do
+            before do
+              user2 = Fabricate(:user)
+              public_key_credential = WebAuthn::Credential.from_create(new_webauthn_credential)
+              Fabricate(:webauthn_credential,
+                        user_id: user2.id,
+                        external_id: public_key_credential.id,
+                        public_key: public_key_credential.public_key)
+            end
+
+            it 'fails' do
+              @controller.session[:webauthn_challenge] = challenge
+
+              post :create, params: { credential: new_webauthn_credential, nickname: nickname }
+
+              expect(response).to have_http_status(500)
+              expect(flash[:error]).to be_present
+            end
+          end
+        end
+
+        context 'when user have not enabled webauthn' do
+          context 'creation succeeds' do
+            it 'creates a webauthn credential' do
+              @controller.session[:webauthn_challenge] = challenge
+
+              expect do
+                post :create, params: { credential: new_webauthn_credential, nickname: nickname }
+              end.to change { user.webauthn_credentials.count }.by(1)
+            end
+          end
+        end
+      end
+
+      context 'when user has not enabled otp' do
+        before do
+          user.update(otp_required_for_login: false)
+        end
+
+        it 'requires otp enabled first' do
+          post :create, params: { credential: new_webauthn_credential, nickname: nickname }
+
+          expect(response).to redirect_to settings_two_factor_authentication_methods_path
+          expect(flash[:error]).to be_present
+        end
+      end
+    end
+
+    context 'when not signed in' do
+      it 'redirects to login' do
+        post :create, params: { credential: new_webauthn_credential, nickname: nickname }
+
+        expect(response).to redirect_to new_user_session_path
+      end
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    context 'when signed in' do
+      before do
+        sign_in user, scope: :user
+      end
+
+      context 'when user has otp enabled' do
+        before do
+          user.update(otp_required_for_login: true)
+        end
+
+        context 'when user has webauthn enabled' do
+          before do
+            user.update(webauthn_id: WebAuthn.generate_user_id)
+            add_webauthn_credential(user)
+          end
+
+          context 'when deletion succeeds' do
+            it 'redirects to 2FA methods list and shows flash success' do
+              delete :destroy, params: { id: user.webauthn_credentials.take.id }
+
+              expect(response).to redirect_to settings_two_factor_authentication_methods_path
+              expect(flash[:success]).to be_present
+            end
+
+            it 'deletes the credential' do
+              expect do
+                delete :destroy, params: { id: user.webauthn_credentials.take.id }
+              end.to change { user.webauthn_credentials.count }.by(-1)
+            end
+          end
+        end
+
+        context 'when user does not have webauthn enabled' do
+          it 'redirects to 2FA methods list and shows flash error' do
+            delete :destroy, params: { id: '1' }
+
+            expect(response).to redirect_to settings_two_factor_authentication_methods_path
+            expect(flash[:error]).to be_present
+          end
+        end
+      end
+
+      context 'when user does not have otp enabled' do
+        it 'requires otp enabled first' do
+          delete :destroy, params: { id: '1' }
+
+          expect(response).to redirect_to settings_two_factor_authentication_methods_path
+          expect(flash[:error]).to be_present
+        end
+      end
+    end
+
+    context 'when not signed in' do
+      it 'redirects to login' do
+        delete :destroy, params: { id: '1' }
+
+        expect(response).to redirect_to new_user_session_path
+      end
+    end
+  end
+end
diff --git a/spec/controllers/settings/two_factor_authentication_methods_controller_spec.rb b/spec/controllers/settings/two_factor_authentication_methods_controller_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..66ffe89f3d81e6c3ad1c12da7f8e467c8f139223
--- /dev/null
+++ b/spec/controllers/settings/two_factor_authentication_methods_controller_spec.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Settings::TwoFactorAuthenticationMethodsController do
+  render_views
+
+  let(:user) { Fabricate(:user) }
+
+  describe 'GET #index' do
+    context 'when signed in' do
+      before do
+        sign_in user, scope: :user
+      end
+
+      describe 'when user has enabled otp' do
+        before do
+          user.update(otp_required_for_login: true)
+        end
+
+        it 'returns http success' do
+          get :index
+
+          expect(response).to have_http_status(200)
+        end
+      end
+
+      describe 'when user has not enabled otp' do
+        before do
+          user.update(otp_required_for_login: false)
+        end
+
+        it 'redirects to enable otp' do
+          get :index
+
+          expect(response).to redirect_to(settings_otp_authentication_path)
+        end
+      end
+    end
+
+    context 'when not signed in' do
+      it 'redirects' do
+        get :index
+
+        expect(response).to redirect_to '/auth/sign_in'
+      end
+    end
+  end
+end
diff --git a/spec/controllers/settings/two_factor_authentications_controller_spec.rb b/spec/controllers/settings/two_factor_authentications_controller_spec.rb
deleted file mode 100644
index 9df9763fd33bd848db890502e20d45da159b848e..0000000000000000000000000000000000000000
--- a/spec/controllers/settings/two_factor_authentications_controller_spec.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Settings::TwoFactorAuthenticationsController do
-  render_views
-
-  let(:user) { Fabricate(:user) }
-
-  describe 'GET #show' do
-    context 'when signed in' do
-      before do
-        sign_in user, scope: :user
-      end
-
-      describe 'when user requires otp for login already' do
-        it 'returns http success' do
-          user.update(otp_required_for_login: true)
-          get :show
-
-          expect(response).to have_http_status(200)
-        end
-      end
-
-      describe 'when user does not require otp for login' do
-        it 'returns http success' do
-          user.update(otp_required_for_login: false)
-          get :show
-
-          expect(response).to have_http_status(200)
-        end
-      end
-    end
-
-    context 'when not signed in' do
-      it 'redirects' do
-        get :show
-        expect(response).to redirect_to '/auth/sign_in'
-      end
-    end
-  end
-
-  describe 'POST #create' do
-    context 'when signed in' do
-      before do
-        sign_in user, scope: :user
-      end
-
-      describe 'when user requires otp for login already' do
-        it 'redirects to show page' do
-          user.update(otp_required_for_login: true)
-          post :create
-
-          expect(response).to redirect_to(settings_two_factor_authentication_path)
-        end
-      end
-
-      describe 'when creation succeeds' do
-        it 'updates user secret' do
-          before = user.otp_secret
-          post :create, session: { challenge_passed_at: Time.now.utc }
-
-          expect(user.reload.otp_secret).not_to eq(before)
-          expect(response).to redirect_to(new_settings_two_factor_authentication_confirmation_path)
-        end
-      end
-    end
-
-    context 'when not signed in' do
-      it 'redirects' do
-        get :show
-        expect(response).to redirect_to '/auth/sign_in'
-      end
-    end
-  end
-
-  describe 'POST #destroy' do
-    before do
-      user.update(otp_required_for_login: true)
-    end
-
-    context 'when signed in' do
-      before do
-        sign_in user, scope: :user
-      end
-
-      it 'turns off otp requirement with correct code' do
-        expect_any_instance_of(User).to receive(:validate_and_consume_otp!) do |value, arg|
-          expect(value).to eq user
-          expect(arg).to eq '123456'
-          true
-        end
-
-        post :destroy, params: { form_two_factor_confirmation: { otp_attempt: '123456' } }
-
-        expect(response).to redirect_to(settings_two_factor_authentication_path)
-        user.reload
-        expect(user.otp_required_for_login).to eq(false)
-      end
-
-      it 'does not turn off otp if code is incorrect' do
-        expect_any_instance_of(User).to receive(:validate_and_consume_otp!) do |value, arg|
-          expect(value).to eq user
-          expect(arg).to eq '057772'
-          false
-        end
-
-        post :destroy, params: { form_two_factor_confirmation: { otp_attempt: '057772' } }
-
-        user.reload
-        expect(user.otp_required_for_login).to eq(true)
-      end
-
-      it 'raises ActionController::ParameterMissing if code is missing' do
-        post :destroy
-        expect(response).to have_http_status(400)
-      end
-    end
-
-    it 'redirects if not signed in' do
-      get :show
-      expect(response).to redirect_to '/auth/sign_in'
-    end
-  end
-end
diff --git a/spec/controllers/statuses_controller_spec.rb b/spec/controllers/statuses_controller_spec.rb
index ba1f1370a631e521df5071587cae1fceb47ac565..9986efa51d27d9ca504fb1dc5acaeb919fc26039 100644
--- a/spec/controllers/statuses_controller_spec.rb
+++ b/spec/controllers/statuses_controller_spec.rb
@@ -5,14 +5,30 @@ require 'rails_helper'
 describe StatusesController do
   render_views
 
+  shared_examples 'cachable response' do
+    it 'does not set cookies' do
+      expect(response.cookies).to be_empty
+      expect(response.headers['Set-Cookies']).to be nil
+    end
+
+    it 'does not set sessions' do
+      expect(session).to be_empty
+    end
+
+    it 'returns public Cache-Control header' do
+      expect(response.headers['Cache-Control']).to include 'public'
+    end
+  end
+
   describe 'GET #show' do
     let(:account) { Fabricate(:account) }
     let(:status)  { Fabricate(:status, account: account) }
 
-    context 'when account is suspended' do
-      let(:account) { Fabricate(:account, suspended: true) }
-
+    context 'when account is permanently suspended' do
       before do
+        account.suspend!
+        account.deletion_request.destroy
+
         get :show, params: { account_username: account.username, id: status.id }
       end
 
@@ -21,6 +37,18 @@ describe StatusesController do
       end
     end
 
+    context 'when account is temporarily suspended' do
+      before do
+        account.suspend!
+
+        get :show, params: { account_username: account.username, id: status.id }
+      end
+
+      it 'returns http forbidden' do
+        expect(response).to have_http_status(403)
+      end
+    end
+
     context 'when status is a reblog' do
       let(:original_account) { Fabricate(:account, domain: 'example.com') }
       let(:original_status) { Fabricate(:status, account: original_account, url: 'https://example.com/123') }
@@ -80,9 +108,7 @@ describe StatusesController do
           expect(response.headers['Vary']).to eq 'Accept'
         end
 
-        it 'returns public Cache-Control header' do
-          expect(response.headers['Cache-Control']).to include 'public'
-        end
+        it_behaves_like 'cachable response'
 
         it 'returns Content-Type header' do
           expect(response.headers['Content-Type']).to include 'application/activity+json'
@@ -470,9 +496,7 @@ describe StatusesController do
             expect(response.headers['Vary']).to eq 'Accept'
           end
 
-          it 'returns public Cache-Control header' do
-            expect(response.headers['Cache-Control']).to include 'public'
-          end
+          it_behaves_like 'cachable response'
 
           it 'returns Content-Type header' do
             expect(response.headers['Content-Type']).to include 'application/activity+json'
@@ -665,10 +689,11 @@ describe StatusesController do
     let(:account) { Fabricate(:account) }
     let(:status)  { Fabricate(:status, account: account) }
 
-    context 'when account is suspended' do
-      let(:account) { Fabricate(:account, suspended: true) }
-
+    context 'when account is permanently suspended' do
       before do
+        account.suspend!
+        account.deletion_request.destroy
+
         get :activity, params: { account_username: account.username, id: status.id }
       end
 
@@ -677,6 +702,18 @@ describe StatusesController do
       end
     end
 
+    context 'when account is temporarily suspended' do
+      before do
+        account.suspend!
+
+        get :activity, params: { account_username: account.username, id: status.id }
+      end
+
+      it 'returns http forbidden' do
+        expect(response).to have_http_status(403)
+      end
+    end
+
     context 'when status is public' do
       pending
     end
diff --git a/spec/controllers/well_known/host_meta_controller_spec.rb b/spec/controllers/well_known/host_meta_controller_spec.rb
index b43ae19d87a2922d202cd65357e7496c0bf52c7d..643ba9cd3283aa1b1df379a428364a69395c263e 100644
--- a/spec/controllers/well_known/host_meta_controller_spec.rb
+++ b/spec/controllers/well_known/host_meta_controller_spec.rb
@@ -12,7 +12,7 @@ describe WellKnown::HostMetaController, type: :controller do
       expect(response.body).to eq <<XML
 <?xml version="1.0" encoding="UTF-8"?>
 <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
-  <Link rel="lrdd" type="application/xrd+xml" template="https://cb6e6126.ngrok.io/.well-known/webfinger?resource={uri}"/>
+  <Link rel="lrdd" template="https://cb6e6126.ngrok.io/.well-known/webfinger?resource={uri}"/>
 </XRD>
 XML
     end
diff --git a/spec/controllers/well_known/webfinger_controller_spec.rb b/spec/controllers/well_known/webfinger_controller_spec.rb
index 46f63185b9ec7c530d55d7bcab9407eba9052f22..cf7005b0e79a315b70557b178602093d7b5d46cc 100644
--- a/spec/controllers/well_known/webfinger_controller_spec.rb
+++ b/spec/controllers/well_known/webfinger_controller_spec.rb
@@ -4,95 +4,134 @@ describe WellKnown::WebfingerController, type: :controller do
   render_views
 
   describe 'GET #show' do
-    let(:alice) do
-      Fabricate(:account, username: 'alice')
+    let(:alternate_domains) { [] }
+    let(:alice) { Fabricate(:account, username: 'alice') }
+    let(:resource) { nil }
+
+    around(:each) do |example|
+      tmp = Rails.configuration.x.alternate_domains
+      Rails.configuration.x.alternate_domains = alternate_domains
+      example.run
+      Rails.configuration.x.alternate_domains = tmp
     end
 
-    before do
-      alice.private_key = <<-PEM
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDHgPoPJlrfMZrVcuF39UbVssa8r4ObLP3dYl9Y17Mgp5K4mSYD
-R/Y2ag58tSi6ar2zM3Ze3QYsNfTq0NqN1g89eAu0MbSjWqpOsgntRPJiFuj3hai2
-X2Im8TBrkiM/UyfTRgn8q8WvMoKbXk8Lu6nqv420eyqhhLxfUoCpxuem1QIDAQAB
-AoGBAIKsOh2eM7spVI8mdgQKheEG/iEsnPkQ2R8ehfE9JzjmSbXbqghQJDaz9NU+
-G3Uu4R31QT0VbCudE9SSA/UPFl82GeQG4QLjrSE+PSjSkuslgSXelJHfAJ+ycGax
-ajtPyiQD0e4c2loagHNHPjqK9OhHx9mFnZWmoagjlZ+mQGEpAkEA8GtqfS65IaRQ
-uVhMzpp25rF1RWOwaaa+vBPkd7pGdJEQGFWkaR/a9UkU+2C4ZxGBkJDP9FApKVQI
-RANEwN3/hwJBANRuw5+es6BgBv4PD387IJvuruW2oUtYP+Lb2Z5k77J13hZTr0db
-Oo9j1UbbR0/4g+vAcsDl4JD9c/9LrGYEpcMCQBon9Yvs+2M3lziy7JhFoc3zXIjS
-Ea1M4M9hcqe78lJYPeIH3z04o/+vlcLLgQRlmSz7NESmO/QtGkEcAezhuh0CQHji
-pzO4LeO/gXslut3eGcpiYuiZquOjToecMBRwv+5AIKd367Che4uJdh6iPcyGURvh
-IewfZFFdyZqnx20ui90CQQC1W2rK5Y30wAunOtSLVA30TLK/tKrTppMC3corjKlB
-FTX8IvYBNTbpEttc1VCf/0ccnNpfb0CrFNSPWxRj7t7D
------END RSA PRIVATE KEY-----
-PEM
-
-      alice.public_key = <<-PEM
------BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHgPoPJlrfMZrVcuF39UbVssa8
-r4ObLP3dYl9Y17Mgp5K4mSYDR/Y2ag58tSi6ar2zM3Ze3QYsNfTq0NqN1g89eAu0
-MbSjWqpOsgntRPJiFuj3hai2X2Im8TBrkiM/UyfTRgn8q8WvMoKbXk8Lu6nqv420
-eyqhhLxfUoCpxuem1QIDAQAB
------END PUBLIC KEY-----
-PEM
-
-      alice.save!
+    subject do
+      get :show, params: { resource: resource }, format: :json
     end
 
-    around(:each) do |example|
-      before = Rails.configuration.x.alternate_domains
-      example.run
-      Rails.configuration.x.alternate_domains = before
+    shared_examples 'a successful response' do
+      it 'returns http success' do
+        expect(response).to have_http_status(200)
+      end
+
+      it 'returns application/jrd+json' do
+        expect(response.content_type).to eq 'application/jrd+json'
+      end
+
+      it 'returns links for the account' do
+        json = body_as_json
+        expect(json[:subject]).to eq 'acct:alice@cb6e6126.ngrok.io'
+        expect(json[:aliases]).to include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
+      end
     end
 
-    it 'returns JSON when account can be found' do
-      get :show, params: { resource: alice.to_webfinger_s }, format: :json
+    context 'when an account exists' do
+      let(:resource) { alice.to_webfinger_s }
 
-      json = body_as_json
+      before do
+        subject
+      end
 
-      expect(response).to have_http_status(200)
-      expect(response.content_type).to eq 'application/jrd+json'
-      expect(json[:subject]).to eq 'acct:alice@cb6e6126.ngrok.io'
-      expect(json[:aliases]).to include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
+      it_behaves_like 'a successful response'
     end
 
-    it 'returns http not found when account cannot be found' do
-      get :show, params: { resource: 'acct:not@existing.com' }, format: :json
+    context 'when an account is temporarily suspended' do
+      let(:resource) { alice.to_webfinger_s }
 
-      expect(response).to have_http_status(:not_found)
+      before do
+        alice.suspend!
+        subject
+      end
+
+      it_behaves_like 'a successful response'
     end
 
-    it 'returns JSON when account can be found with alternate domains' do
-      Rails.configuration.x.alternate_domains = ['foo.org']
-      username, = alice.to_webfinger_s.split('@')
+    context 'when an account is permanently suspended or deleted' do
+      let(:resource) { alice.to_webfinger_s }
+
+      before do
+        alice.suspend!
+        alice.deletion_request.destroy
+        subject
+      end
 
-      get :show, params: { resource: "#{username}@foo.org" }, format: :json
+      it 'returns http gone' do
+        expect(response).to have_http_status(410)
+      end
+    end
+
+    context 'when an account is not found' do
+      let(:resource) { 'acct:not@existing.com' }
 
-      json = body_as_json
+      before do
+        subject
+      end
 
-      expect(response).to have_http_status(200)
-      expect(response.content_type).to eq 'application/jrd+json'
-      expect(json[:subject]).to eq 'acct:alice@cb6e6126.ngrok.io'
-      expect(json[:aliases]).to include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
+      it 'returns http not found' do
+        expect(response).to have_http_status(404)
+      end
     end
 
-    it 'returns http not found when account can not be found with alternate domains' do
-      Rails.configuration.x.alternate_domains = ['foo.org']
-      username, = alice.to_webfinger_s.split('@')
+    context 'with an alternate domain' do
+      let(:alternate_domains) { ['foo.org'] }
+
+      before do
+        subject
+      end
+
+      context 'when an account exists' do
+        let(:resource) do
+          username, = alice.to_webfinger_s.split('@')
+          "#{username}@foo.org"
+        end
+
+        it_behaves_like 'a successful response'
+      end
 
-      get :show, params: { resource: "#{username}@bar.org" }, format: :json
+      context 'when the domain is wrong' do
+        let(:resource) do
+          username, = alice.to_webfinger_s.split('@')
+          "#{username}@bar.org"
+        end
 
-      expect(response).to have_http_status(:not_found)
+        it 'returns http not found' do
+          expect(response).to have_http_status(404)
+        end
+      end
     end
 
-    it 'returns http bad request when not given a resource parameter' do
-      get :show, params: { }, format: :json
-      expect(response).to have_http_status(:bad_request)
+    context 'with no resource parameter' do
+      let(:resource) { nil }
+
+      before do
+        subject
+      end
+
+      it 'returns http bad request' do
+        expect(response).to have_http_status(400)
+      end
     end
 
-    it 'returns http bad request when given a nonsense parameter' do
-      get :show, params: { resource: 'df/:dfkj' }
-      expect(response).to have_http_status(:bad_request)
+    context 'with a nonsense parameter' do
+      let(:resource) { 'df/:dfkj' }
+
+      before do
+        subject
+      end
+
+      it 'returns http bad request' do
+        expect(response).to have_http_status(400)
+      end
     end
   end
 end
diff --git a/spec/fabricators/account_deletion_request_fabricator.rb b/spec/fabricators/account_deletion_request_fabricator.rb
new file mode 100644
index 0000000000000000000000000000000000000000..08a82ba3c3363331207214945af35cb5f474eaa5
--- /dev/null
+++ b/spec/fabricators/account_deletion_request_fabricator.rb
@@ -0,0 +1,3 @@
+Fabricator(:account_deletion_request) do
+  account
+end
diff --git a/spec/fabricators/ip_block_fabricator.rb b/spec/fabricators/ip_block_fabricator.rb
new file mode 100644
index 0000000000000000000000000000000000000000..31dc336e64be30e20ef7ee69a01479b80eb44f9a
--- /dev/null
+++ b/spec/fabricators/ip_block_fabricator.rb
@@ -0,0 +1,6 @@
+Fabricator(:ip_block) do
+  ip         ""
+  severity   ""
+  expires_at "2020-10-08 22:20:37"
+  comment    "MyText"
+end
\ No newline at end of file
diff --git a/spec/fabricators/webauthn_credential_fabricator.rb b/spec/fabricators/webauthn_credential_fabricator.rb
new file mode 100644
index 0000000000000000000000000000000000000000..496a7a7351bb8108d30f1e43cc6b01b75d98c325
--- /dev/null
+++ b/spec/fabricators/webauthn_credential_fabricator.rb
@@ -0,0 +1,7 @@
+Fabricator(:webauthn_credential) do
+  user_id { Fabricate(:user).id }
+  external_id { Base64.urlsafe_encode64(SecureRandom.random_bytes(16)) }
+  public_key { OpenSSL::PKey::EC.new("prime256v1").generate_key.public_key }
+  nickname 'USB key'
+  sign_count 0
+end
diff --git a/spec/fixtures/files/bookmark-imports.txt b/spec/fixtures/files/bookmark-imports.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7cc8901a0ac0711981d2cd34ad8575b9f70ab2d1
--- /dev/null
+++ b/spec/fixtures/files/bookmark-imports.txt
@@ -0,0 +1,4 @@
+https://example.com/statuses/1312
+https://local.com/users/foo/statuses/42
+https://unknown-remote.com/users/bar/statuses/1
+https://example.com/statuses/direct
diff --git a/spec/helpers/statuses_helper_spec.rb b/spec/helpers/statuses_helper_spec.rb
index 940ff072e602ff1e840a806f31bec1d19b67b3fb..cba659bfb5bc05ad099b20b127e26c8fe999dc1b 100644
--- a/spec/helpers/statuses_helper_spec.rb
+++ b/spec/helpers/statuses_helper_spec.rb
@@ -149,22 +149,4 @@ RSpec.describe StatusesHelper, type: :helper do
       expect(css_class).to eq 'h-cite'
     end
   end
-
-  describe '#rtl?' do
-    it 'is false if text is empty' do
-      expect(helper).not_to be_rtl ''
-    end
-
-    it 'is false if there are no right to left characters' do
-      expect(helper).not_to be_rtl 'hello world'
-    end
-
-    it 'is false if right to left characters are fewer than 1/3 of total text' do
-      expect(helper).not_to be_rtl 'hello ÝŸ world'
-    end
-
-    it 'is true if right to left characters are greater than 1/3 of total text' do
-      expect(helper).to be_rtl 'aaÝŸaaÝŸ'
-    end
-  end
 end
diff --git a/spec/lib/activitypub/activity/announce_spec.rb b/spec/lib/activitypub/activity/announce_spec.rb
index 60fd96a18ac69d2687698bf0ed756d1af5bdd4f3..b93fcbe66563a2f20386b88d0ce8a84e93c21c2f 100644
--- a/spec/lib/activitypub/activity/announce_spec.rb
+++ b/spec/lib/activitypub/activity/announce_spec.rb
@@ -73,6 +73,26 @@ RSpec.describe ActivityPub::Activity::Announce do
           expect(sender.reblogged?(sender.statuses.first)).to be true
         end
       end
+
+      context 'self-boost of a previously unknown status with correct attributedTo, inlined Collection in audience' do
+        let(:object_json) do
+          {
+            id: 'https://example.com/actor#bar',
+            type: 'Note',
+            content: 'Lorem ipsum',
+            attributedTo: 'https://example.com/actor',
+            to: {
+              'type': 'OrderedCollection',
+              'id': 'http://example.com/followers',
+              'first': 'http://example.com/followers?page=true',
+            }
+          }
+        end
+
+        it 'creates a reblog by sender of status' do
+          expect(sender.reblogged?(sender.statuses.first)).to be true
+        end
+      end
     end
 
     context 'when the status belongs to a local user' do
diff --git a/spec/lib/activitypub/activity/block_spec.rb b/spec/lib/activitypub/activity/block_spec.rb
index 94d37356dd14c23a98436a65f00161689d8d6554..42bdfdc810ef6ff23b774d246a3eed75122191d3 100644
--- a/spec/lib/activitypub/activity/block_spec.rb
+++ b/spec/lib/activitypub/activity/block_spec.rb
@@ -28,6 +28,28 @@ RSpec.describe ActivityPub::Activity::Block do
     end
   end
 
+  context 'when the recipient is already blocked' do
+    before do
+      sender.block!(recipient, uri: 'old')
+    end
+
+    describe '#perform' do
+      subject { described_class.new(json, sender) }
+
+      before do
+        subject.perform
+      end
+
+      it 'creates a block from sender to recipient' do
+        expect(sender.blocking?(recipient)).to be true
+      end
+
+      it 'sets the uri to that of last received block activity' do
+        expect(sender.block_relationships.find_by(target_account: recipient).uri).to eq 'foo'
+      end
+    end
+  end
+
   context 'when the recipient follows the sender' do
     before do
       recipient.follow!(sender)
diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb
index 2ac4acc12aa7be60e3a7820a64a4c14423c89d46..d2e9fe33ce4cfebb8bcd331d8ee9bb155f609616 100644
--- a/spec/lib/activitypub/activity/create_spec.rb
+++ b/spec/lib/activitypub/activity/create_spec.rb
@@ -18,6 +18,7 @@ RSpec.describe ActivityPub::Activity::Create do
 
     stub_request(:get, 'http://example.com/attachment.png').to_return(request_fixture('avatar.txt'))
     stub_request(:get, 'http://example.com/emoji.png').to_return(body: attachment_fixture('emojo.png'))
+    stub_request(:get, 'http://example.com/emojib.png').to_return(body: attachment_fixture('emojo.png'), headers: { 'Content-Type' => 'application/octet-stream' })
   end
 
   describe '#perform' do
@@ -120,6 +121,28 @@ RSpec.describe ActivityPub::Activity::Create do
         end
       end
 
+      context 'private with inlined Collection in audience' do
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            to: {
+              'type': 'OrderedCollection',
+              'id': 'http://example.com/followers',
+              'first': 'http://example.com/followers?page=true',
+            }
+          }
+        end
+
+        it 'creates status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.visibility).to eq 'private'
+        end
+      end
+
       context 'limited' do
         let(:recipient) { Fabricate(:account) }
 
@@ -451,6 +474,32 @@ RSpec.describe ActivityPub::Activity::Create do
         end
       end
 
+      context 'with emojis served with invalid content-type' do
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum :tinkong:',
+            tag: [
+              {
+                type: 'Emoji',
+                icon: {
+                  url: 'http://example.com/emojib.png',
+                },
+                name: 'tinkong',
+              },
+            ],
+          }
+        end
+
+        it 'creates status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.emojis.map(&:shortcode)).to include('tinkong')
+        end
+      end
+
       context 'with emojis missing name' do
         let(:object_json) do
           {
diff --git a/spec/lib/activitypub/activity/reject_spec.rb b/spec/lib/activitypub/activity/reject_spec.rb
index e7205df8dd6dcb30bfd18c304ef1fecdc4dd3917..fed4cd8cdc47eb61608748793dd25a0d90e758a8 100644
--- a/spec/lib/activitypub/activity/reject_spec.rb
+++ b/spec/lib/activitypub/activity/reject_spec.rb
@@ -3,6 +3,14 @@ require 'rails_helper'
 RSpec.describe ActivityPub::Activity::Reject do
   let(:sender)    { Fabricate(:account) }
   let(:recipient) { Fabricate(:account) }
+  let(:object_json) do
+    {
+      id: 'bar',
+      type: 'Follow',
+      actor: ActivityPub::TagManager.instance.uri_for(recipient),
+      object: ActivityPub::TagManager.instance.uri_for(sender),
+    }
+  end
 
   let(:json) do
     {
@@ -10,29 +18,105 @@ RSpec.describe ActivityPub::Activity::Reject do
       id: 'foo',
       type: 'Reject',
       actor: ActivityPub::TagManager.instance.uri_for(sender),
-      object: {
-        id: 'bar',
-        type: 'Follow',
-        actor: ActivityPub::TagManager.instance.uri_for(recipient),
-        object: ActivityPub::TagManager.instance.uri_for(sender),
-      },
+      object: object_json,
     }.with_indifferent_access
   end
 
   describe '#perform' do
     subject { described_class.new(json, sender) }
 
-    before do
-      Fabricate(:follow_request, account: recipient, target_account: sender)
-      subject.perform
+    context 'rejecting a pending follow request by target' do
+      before do
+        Fabricate(:follow_request, account: recipient, target_account: sender)
+        subject.perform
+      end
+
+      it 'does not create a follow relationship' do
+        expect(recipient.following?(sender)).to be false
+      end
+
+      it 'removes the follow request' do
+        expect(recipient.requested?(sender)).to be false
+      end
+    end
+
+    context 'rejecting a pending follow request by uri' do
+      before do
+        Fabricate(:follow_request, account: recipient, target_account: sender, uri: 'bar')
+        subject.perform
+      end
+
+      it 'does not create a follow relationship' do
+        expect(recipient.following?(sender)).to be false
+      end
+
+      it 'removes the follow request' do
+        expect(recipient.requested?(sender)).to be false
+      end
     end
 
-    it 'does not create a follow relationship' do
-      expect(recipient.following?(sender)).to be false
+    context 'rejecting a pending follow request by uri only' do
+      let(:object_json) { 'bar' }
+
+      before do
+        Fabricate(:follow_request, account: recipient, target_account: sender, uri: 'bar')
+        subject.perform
+      end
+
+      it 'does not create a follow relationship' do
+        expect(recipient.following?(sender)).to be false
+      end
+
+      it 'removes the follow request' do
+        expect(recipient.requested?(sender)).to be false
+      end
     end
 
-    it 'removes the follow request' do
-      expect(recipient.requested?(sender)).to be false
+    context 'rejecting an existing follow relationship by target' do
+      before do
+        Fabricate(:follow, account: recipient, target_account: sender)
+        subject.perform
+      end
+
+      it 'removes the follow relationship' do
+        expect(recipient.following?(sender)).to be false
+      end
+
+      it 'does not create a follow request' do
+        expect(recipient.requested?(sender)).to be false
+      end
+    end
+
+    context 'rejecting an existing follow relationship by uri' do
+      before do
+        Fabricate(:follow, account: recipient, target_account: sender, uri: 'bar')
+        subject.perform
+      end
+
+      it 'removes the follow relationship' do
+        expect(recipient.following?(sender)).to be false
+      end
+
+      it 'does not create a follow request' do
+        expect(recipient.requested?(sender)).to be false
+      end
+    end
+
+    context 'rejecting an existing follow relationship by uri only' do
+      let(:object_json) { 'bar' }
+
+      before do
+        Fabricate(:follow, account: recipient, target_account: sender, uri: 'bar')
+        subject.perform
+      end
+
+      it 'removes the follow relationship' do
+        expect(recipient.following?(sender)).to be false
+      end
+
+      it 'does not create a follow request' do
+        expect(recipient.requested?(sender)).to be false
+      end
     end
   end
 
diff --git a/spec/lib/activitypub/activity/undo_spec.rb b/spec/lib/activitypub/activity/undo_spec.rb
index 9545e1f46af6b98ba924ad53b5e84f2e2cc7ebdb..c0309e49dafcee0f6f523ec14957f4815d7b1f67 100644
--- a/spec/lib/activitypub/activity/undo_spec.rb
+++ b/spec/lib/activitypub/activity/undo_spec.rb
@@ -50,6 +50,19 @@ RSpec.describe ActivityPub::Activity::Undo do
           expect(sender.reblogged?(status)).to be false
         end
       end
+
+      context 'with only object uri' do
+        let(:object_json) { 'bar' }
+
+        before do
+          Fabricate(:status, reblog: status, account: sender, uri: 'bar')
+        end
+
+        it 'deletes the reblog by uri' do
+          subject.perform
+          expect(sender.reblogged?(status)).to be false
+        end
+      end
     end
 
     context 'with Accept' do
@@ -91,13 +104,22 @@ RSpec.describe ActivityPub::Activity::Undo do
       end
 
       before do
-        sender.block!(recipient)
+        sender.block!(recipient, uri: 'bar')
       end
 
       it 'deletes block from sender to recipient' do
         subject.perform
         expect(sender.blocking?(recipient)).to be false
       end
+
+      context 'with only object uri' do
+        let(:object_json) { 'bar' }
+
+        it 'deletes block from sender to recipient' do
+          subject.perform
+          expect(sender.blocking?(recipient)).to be false
+        end
+      end
     end
 
     context 'with Follow' do
@@ -113,13 +135,22 @@ RSpec.describe ActivityPub::Activity::Undo do
       end
 
       before do
-        sender.follow!(recipient)
+        sender.follow!(recipient, uri: 'bar')
       end
 
       it 'deletes follow from sender to recipient' do
         subject.perform
         expect(sender.following?(recipient)).to be false
       end
+
+      context 'with only object uri' do
+        let(:object_json) { 'bar' }
+
+        it 'deletes follow from sender to recipient' do
+          subject.perform
+          expect(sender.following?(recipient)).to be false
+        end
+      end
     end
 
     context 'with Like' do
diff --git a/spec/lib/activitypub/dereferencer_spec.rb b/spec/lib/activitypub/dereferencer_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..ce30513d762219f99aa34351a4207f4c61b11b3f
--- /dev/null
+++ b/spec/lib/activitypub/dereferencer_spec.rb
@@ -0,0 +1,73 @@
+require 'rails_helper'
+
+RSpec.describe ActivityPub::Dereferencer do
+  describe '#object' do
+    let(:object) { { '@context': 'https://www.w3.org/ns/activitystreams', id: 'https://example.com/foo', type: 'Note', content: 'Hoge' } }
+    let(:permitted_origin) { 'https://example.com' }
+    let(:signature_account) { nil }
+    let(:uri) { nil }
+
+    subject { described_class.new(uri, permitted_origin: permitted_origin, signature_account: signature_account).object }
+
+    before do
+      stub_request(:get, 'https://example.com/foo').to_return(body: Oj.dump(object), headers: { 'Content-Type' => 'application/activity+json' })
+    end
+
+    context 'with a URI' do
+      let(:uri) { 'https://example.com/foo' }
+
+      it 'returns object' do
+        expect(subject.with_indifferent_access).to eq object.with_indifferent_access
+      end
+
+      context 'with signature account' do
+        let(:signature_account) { Fabricate(:account) }
+
+        it 'makes signed request' do
+          subject
+          expect(a_request(:get, 'https://example.com/foo').with { |req| req.headers['Signature'].present? }).to have_been_made
+        end
+      end
+
+      context 'with different origin' do
+        let(:uri) { 'https://other-example.com/foo' }
+
+        it 'does not make request' do
+          subject
+          expect(a_request(:get, 'https://other-example.com/foo')).to_not have_been_made
+        end
+      end
+    end
+
+    context 'with a bearcap' do
+      let(:uri) { 'bear:?t=hoge&u=https://example.com/foo' }
+
+      it 'makes request with Authorization header' do
+        subject
+        expect(a_request(:get, 'https://example.com/foo').with(headers: { 'Authorization' => 'Bearer hoge' })).to have_been_made
+      end
+
+      it 'returns object' do
+        expect(subject.with_indifferent_access).to eq object.with_indifferent_access
+      end
+
+      context 'with signature account' do
+        let(:signature_account) { Fabricate(:account) }
+
+        it 'makes signed request' do
+          subject
+          expect(a_request(:get, 'https://example.com/foo').with { |req| req.headers['Signature'].present? && req.headers['Authorization'] == 'Bearer hoge' }).to have_been_made
+        end
+      end
+
+      context 'with different origin' do
+        let(:uri) { 'bear:?t=hoge&u=https://other-example.com/foo' }
+
+        it 'does not make request' do
+          subject
+          expect(a_request(:get, 'https://other-example.com/foo')).to_not have_been_made
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/fast_ip_map_spec.rb b/spec/lib/fast_ip_map_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c66f64828ac551b0485e03b540e994b733ba9561
--- /dev/null
+++ b/spec/lib/fast_ip_map_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe FastIpMap do
+  describe '#include?' do
+    subject { described_class.new([IPAddr.new('20.4.0.0/16'), IPAddr.new('145.22.30.0/24'), IPAddr.new('189.45.86.3')])}
+
+    it 'returns true for an exact match' do
+      expect(subject.include?(IPAddr.new('189.45.86.3'))).to be true
+    end
+
+    it 'returns true for a range match' do
+      expect(subject.include?(IPAddr.new('20.4.45.7'))).to be true
+    end
+
+    it 'returns false for no match' do
+      expect(subject.include?(IPAddr.new('145.22.40.64'))).to be false
+    end
+  end
+end
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
index 22eddd2ab6e3196771f8e9da9aca2d3b9b987218..0df85e5bcbb64968c81037b97037d4cb95b889c6 100644
--- a/spec/lib/feed_manager_spec.rb
+++ b/spec/lib/feed_manager_spec.rb
@@ -29,14 +29,14 @@ RSpec.describe FeedManager do
       it 'returns false for followee\'s status' do
         status = Fabricate(:status, text: 'Hello world', account: alice)
         bob.follow!(alice)
-        expect(FeedManager.instance.filter?(:home, status, bob.id)).to be false
+        expect(FeedManager.instance.filter?(:home, status, bob)).to be false
       end
 
       it 'returns false for reblog by followee' do
         status = Fabricate(:status, text: 'Hello world', account: jeff)
         reblog = Fabricate(:status, reblog: status, account: alice)
         bob.follow!(alice)
-        expect(FeedManager.instance.filter?(:home, reblog, bob.id)).to be false
+        expect(FeedManager.instance.filter?(:home, reblog, bob)).to be false
       end
 
       it 'returns true for reblog by followee of blocked account' do
@@ -44,7 +44,7 @@ RSpec.describe FeedManager do
         reblog = Fabricate(:status, reblog: status, account: alice)
         bob.follow!(alice)
         bob.block!(jeff)
-        expect(FeedManager.instance.filter?(:home, reblog, bob.id)).to be true
+        expect(FeedManager.instance.filter?(:home, reblog, bob)).to be true
       end
 
       it 'returns true for reblog by followee of muted account' do
@@ -52,7 +52,7 @@ RSpec.describe FeedManager do
         reblog = Fabricate(:status, reblog: status, account: alice)
         bob.follow!(alice)
         bob.mute!(jeff)
-        expect(FeedManager.instance.filter?(:home, reblog, bob.id)).to be true
+        expect(FeedManager.instance.filter?(:home, reblog, bob)).to be true
       end
 
       it 'returns true for reblog by followee of someone who is blocking recipient' do
@@ -60,14 +60,14 @@ RSpec.describe FeedManager do
         reblog = Fabricate(:status, reblog: status, account: alice)
         bob.follow!(alice)
         jeff.block!(bob)
-        expect(FeedManager.instance.filter?(:home, reblog, bob.id)).to be true
+        expect(FeedManager.instance.filter?(:home, reblog, bob)).to be true
       end
 
       it 'returns true for reblog from account with reblogs disabled' do
         status = Fabricate(:status, text: 'Hello world', account: jeff)
         reblog = Fabricate(:status, reblog: status, account: alice)
         bob.follow!(alice, reblogs: false)
-        expect(FeedManager.instance.filter?(:home, reblog, bob.id)).to be true
+        expect(FeedManager.instance.filter?(:home, reblog, bob)).to be true
       end
 
       it 'returns false for reply by followee to another followee' do
@@ -75,48 +75,49 @@ RSpec.describe FeedManager do
         reply  = Fabricate(:status, text: 'Nay', thread: status, account: alice)
         bob.follow!(alice)
         bob.follow!(jeff)
-        expect(FeedManager.instance.filter?(:home, reply, bob.id)).to be false
+        expect(FeedManager.instance.filter?(:home, reply, bob)).to be false
       end
 
       it 'returns false for reply by followee to recipient' do
         status = Fabricate(:status, text: 'Hello world', account: bob)
         reply  = Fabricate(:status, text: 'Nay', thread: status, account: alice)
         bob.follow!(alice)
-        expect(FeedManager.instance.filter?(:home, reply, bob.id)).to be false
+        expect(FeedManager.instance.filter?(:home, reply, bob)).to be false
       end
 
       it 'returns false for reply by followee to self' do
         status = Fabricate(:status, text: 'Hello world', account: alice)
         reply  = Fabricate(:status, text: 'Nay', thread: status, account: alice)
         bob.follow!(alice)
-        expect(FeedManager.instance.filter?(:home, reply, bob.id)).to be false
+        expect(FeedManager.instance.filter?(:home, reply, bob)).to be false
       end
 
       it 'returns true for reply by followee to non-followed account' do
         status = Fabricate(:status, text: 'Hello world', account: jeff)
         reply  = Fabricate(:status, text: 'Nay', thread: status, account: alice)
         bob.follow!(alice)
-        expect(FeedManager.instance.filter?(:home, reply, bob.id)).to be true
+        expect(FeedManager.instance.filter?(:home, reply, bob)).to be true
       end
 
       it 'returns true for the second reply by followee to a non-federated status' do
         reply        = Fabricate(:status, text: 'Reply 1', reply: true, account: alice)
         second_reply = Fabricate(:status, text: 'Reply 2', thread: reply, account: alice)
         bob.follow!(alice)
-        expect(FeedManager.instance.filter?(:home, second_reply, bob.id)).to be true
+        expect(FeedManager.instance.filter?(:home, second_reply, bob)).to be true
       end
 
       it 'returns false for status by followee mentioning another account' do
         bob.follow!(alice)
+        jeff.follow!(alice)
         status = PostStatusService.new.call(alice, text: 'Hey @jeff')
-        expect(FeedManager.instance.filter?(:home, status, bob.id)).to be false
+        expect(FeedManager.instance.filter?(:home, status, bob)).to be false
       end
 
       it 'returns true for status by followee mentioning blocked account' do
         bob.block!(jeff)
         bob.follow!(alice)
         status = PostStatusService.new.call(alice, text: 'Hey @jeff')
-        expect(FeedManager.instance.filter?(:home, status, bob.id)).to be true
+        expect(FeedManager.instance.filter?(:home, status, bob)).to be true
       end
 
       it 'returns true for reblog of a personally blocked domain' do
@@ -124,7 +125,7 @@ RSpec.describe FeedManager do
         alice.follow!(jeff)
         status = Fabricate(:status, text: 'Hello world', account: bob)
         reblog = Fabricate(:status, reblog: status, account: jeff)
-        expect(FeedManager.instance.filter?(:home, reblog, alice.id)).to be true
+        expect(FeedManager.instance.filter?(:home, reblog, alice)).to be true
       end
 
       context 'for irreversibly muted phrases' do
@@ -132,7 +133,7 @@ RSpec.describe FeedManager do
           alice.custom_filters.create!(phrase: 'bob', context: %w(home), irreversible: true)
           alice.follow!(jeff)
           status = Fabricate(:status, text: 'bobcats', account: jeff)
-          expect(FeedManager.instance.filter?(:home, status, alice.id)).to be_falsy
+          expect(FeedManager.instance.filter?(:home, status, alice)).to be_falsy
         end
 
         it 'returns true if phrase is contained' do
@@ -140,14 +141,14 @@ RSpec.describe FeedManager do
           alice.custom_filters.create!(phrase: 'pop tarts', context: %w(home), irreversible: true)
           alice.follow!(jeff)
           status = Fabricate(:status, text: 'i sure like POP TARts', account: jeff)
-          expect(FeedManager.instance.filter?(:home, status, alice.id)).to be true
+          expect(FeedManager.instance.filter?(:home, status, alice)).to be true
         end
 
         it 'matches substrings if whole_word is false' do
           alice.custom_filters.create!(phrase: 'take', context: %w(home), whole_word: false, irreversible: true)
           alice.follow!(jeff)
           status = Fabricate(:status, text: 'shiitake', account: jeff)
-          expect(FeedManager.instance.filter?(:home, status, alice.id)).to be true
+          expect(FeedManager.instance.filter?(:home, status, alice)).to be true
         end
 
         it 'returns true if phrase is contained in a poll option' do
@@ -155,7 +156,7 @@ RSpec.describe FeedManager do
           alice.custom_filters.create!(phrase: 'pop tarts', context: %w(home), irreversible: true)
           alice.follow!(jeff)
           status = Fabricate(:status, text: 'what do you prefer', poll: Fabricate(:poll, options: %w(farts POP TARts)), account: jeff)
-          expect(FeedManager.instance.filter?(:home, status, alice.id)).to be true
+          expect(FeedManager.instance.filter?(:home, status, alice)).to be true
         end
       end
     end
@@ -164,27 +165,27 @@ RSpec.describe FeedManager do
       it 'returns true for status that mentions blocked account' do
         bob.block!(jeff)
         status = PostStatusService.new.call(alice, text: 'Hey @jeff')
-        expect(FeedManager.instance.filter?(:mentions, status, bob.id)).to be true
+        expect(FeedManager.instance.filter?(:mentions, status, bob)).to be true
       end
 
       it 'returns true for status that replies to a blocked account' do
         status = Fabricate(:status, text: 'Hello world', account: jeff)
         reply  = Fabricate(:status, text: 'Nay', thread: status, account: alice)
         bob.block!(jeff)
-        expect(FeedManager.instance.filter?(:mentions, reply, bob.id)).to be true
+        expect(FeedManager.instance.filter?(:mentions, reply, bob)).to be true
       end
 
       it 'returns true for status by silenced account who recipient is not following' do
         status = Fabricate(:status, text: 'Hello world', account: alice)
         alice.silence!
-        expect(FeedManager.instance.filter?(:mentions, status, bob.id)).to be true
+        expect(FeedManager.instance.filter?(:mentions, status, bob)).to be true
       end
 
       it 'returns false for status by followed silenced account' do
         status = Fabricate(:status, text: 'Hello world', account: alice)
         alice.silence!
         bob.follow!(alice)
-        expect(FeedManager.instance.filter?(:mentions, status, bob.id)).to be false
+        expect(FeedManager.instance.filter?(:mentions, status, bob)).to be false
       end
     end
   end
@@ -309,62 +310,125 @@ RSpec.describe FeedManager do
   end
 
   describe '#push_to_list' do
+    let(:owner) { Fabricate(:account, username: 'owner') }
+    let(:alice) { Fabricate(:account, username: 'alice') }
+    let(:bob)   { Fabricate(:account, username: 'bob') }
+    let(:eve)   { Fabricate(:account, username: 'eve') }
+    let(:list)  { Fabricate(:list, account: owner) }
+
+    before do
+      owner.follow!(alice)
+      owner.follow!(bob)
+      owner.follow!(eve)
+
+      list.accounts << alice
+      list.accounts << bob
+    end
+
     it "does not push when the given status's reblog is already inserted" do
-      list = Fabricate(:list)
       reblog = Fabricate(:status)
       status = Fabricate(:status, reblog: reblog)
       FeedManager.instance.push_to_list(list, status)
 
       expect(FeedManager.instance.push_to_list(list, reblog)).to eq false
     end
-  end
 
-  describe '#merge_into_timeline' do
-    it "does not push source account's statuses whose reblogs are already inserted" do
-      account = Fabricate(:account, id: 0)
-      reblog = Fabricate(:status)
-      status = Fabricate(:status, reblog: reblog)
-      FeedManager.instance.push_to_home(account, status)
+    context 'when replies policy is set to no replies' do
+      before do
+        list.replies_policy = :none
+      end
 
-      FeedManager.instance.merge_into_timeline(account, reblog.account)
+      it 'pushes statuses that are not replies' do
+        status = Fabricate(:status, text: 'Hello world', account: bob)
+        expect(FeedManager.instance.push_to_list(list, status)).to eq true
+      end
 
-      expect(Redis.current.zscore("feed:home:0", reblog.id)).to eq nil
+      it 'pushes statuses that are replies to list owner' do
+        status = Fabricate(:status, text: 'Hello world', account: owner)
+        reply  = Fabricate(:status, text: 'Nay', thread: status, account: bob)
+        expect(FeedManager.instance.push_to_list(list, reply)).to eq true
+      end
+
+      it 'does not push replies to another member of the list' do
+        status = Fabricate(:status, text: 'Hello world', account: alice)
+        reply  = Fabricate(:status, text: 'Nay', thread: status, account: bob)
+        expect(FeedManager.instance.push_to_list(list, reply)).to eq false
+      end
     end
-  end
 
-  describe '#trim' do
-    let(:receiver) { Fabricate(:account) }
+    context 'when replies policy is set to list-only replies' do
+      before do
+        list.replies_policy = :list
+      end
 
-    it 'cleans up reblog tracking keys' do
-      reblogged      = Fabricate(:status)
-      status         = Fabricate(:status, reblog: reblogged)
-      another_status = Fabricate(:status, reblog: reblogged)
-      reblogs_key    = FeedManager.instance.key('home', receiver.id, 'reblogs')
-      reblog_set_key = FeedManager.instance.key('home', receiver.id, "reblogs:#{reblogged.id}")
+      it 'pushes statuses that are not replies' do
+        status = Fabricate(:status, text: 'Hello world', account: bob)
+        expect(FeedManager.instance.push_to_list(list, status)).to eq true
+      end
 
-      FeedManager.instance.push_to_home(receiver, status)
-      FeedManager.instance.push_to_home(receiver, another_status)
+      it 'pushes statuses that are replies to list owner' do
+        status = Fabricate(:status, text: 'Hello world', account: owner)
+        reply  = Fabricate(:status, text: 'Nay', thread: status, account: bob)
+        expect(FeedManager.instance.push_to_list(list, reply)).to eq true
+      end
 
-      # We should have a tracking set and an entry in reblogs.
-      expect(Redis.current.exists(reblog_set_key)).to be true
-      expect(Redis.current.zrange(reblogs_key, 0, -1)).to eq [reblogged.id.to_s]
+      it 'pushes replies to another member of the list' do
+        status = Fabricate(:status, text: 'Hello world', account: alice)
+        reply  = Fabricate(:status, text: 'Nay', thread: status, account: bob)
+        expect(FeedManager.instance.push_to_list(list, reply)).to eq true
+      end
 
-      # Push everything off the end of the feed.
-      FeedManager::MAX_ITEMS.times do
-        FeedManager.instance.push_to_home(receiver, Fabricate(:status))
+      it 'does not push replies to someone not a member of the list' do
+        status = Fabricate(:status, text: 'Hello world', account: eve)
+        reply  = Fabricate(:status, text: 'Nay', thread: status, account: bob)
+        expect(FeedManager.instance.push_to_list(list, reply)).to eq false
       end
+    end
 
-      # `trim` should be called automatically, but do it anyway, as
-      # we're testing `trim`, not side effects of `push`.
-      FeedManager.instance.trim('home', receiver.id)
+    context 'when replies policy is set to any reply' do
+      before do
+        list.replies_policy = :followed
+      end
+
+      it 'pushes statuses that are not replies' do
+        status = Fabricate(:status, text: 'Hello world', account: bob)
+        expect(FeedManager.instance.push_to_list(list, status)).to eq true
+      end
+
+      it 'pushes statuses that are replies to list owner' do
+        status = Fabricate(:status, text: 'Hello world', account: owner)
+        reply  = Fabricate(:status, text: 'Nay', thread: status, account: bob)
+        expect(FeedManager.instance.push_to_list(list, reply)).to eq true
+      end
+
+      it 'pushes replies to another member of the list' do
+        status = Fabricate(:status, text: 'Hello world', account: alice)
+        reply  = Fabricate(:status, text: 'Nay', thread: status, account: bob)
+        expect(FeedManager.instance.push_to_list(list, reply)).to eq true
+      end
 
-      # We should not have any reblog tracking data.
-      expect(Redis.current.exists(reblog_set_key)).to be false
-      expect(Redis.current.zrange(reblogs_key, 0, -1)).to be_empty
+      it 'pushes replies to someone not a member of the list' do
+        status = Fabricate(:status, text: 'Hello world', account: eve)
+        reply  = Fabricate(:status, text: 'Nay', thread: status, account: bob)
+        expect(FeedManager.instance.push_to_list(list, reply)).to eq true
+      end
+    end
+  end
+
+  describe '#merge_into_home' do
+    it "does not push source account's statuses whose reblogs are already inserted" do
+      account = Fabricate(:account, id: 0)
+      reblog = Fabricate(:status)
+      status = Fabricate(:status, reblog: reblog)
+      FeedManager.instance.push_to_home(account, status)
+
+      FeedManager.instance.merge_into_home(account, reblog.account)
+
+      expect(Redis.current.zscore("feed:home:0", reblog.id)).to eq nil
     end
   end
 
-  describe '#unpush' do
+  describe '#unpush_from_home' do
     let(:receiver) { Fabricate(:account) }
 
     it 'leaves a reblogged status if original was on feed' do
@@ -430,7 +494,7 @@ RSpec.describe FeedManager do
     end
   end
 
-  describe '#clear_from_timeline' do
+  describe '#clear_from_home' do
     let(:account)          { Fabricate(:account) }
     let(:followed_account) { Fabricate(:account) }
     let(:target_account)   { Fabricate(:account) }
@@ -448,8 +512,8 @@ RSpec.describe FeedManager do
       end
     end
 
-    it 'correctly cleans the timeline' do
-      FeedManager.instance.clear_from_timeline(account, target_account)
+    it 'correctly cleans the home timeline' do
+      FeedManager.instance.clear_from_home(account, target_account)
 
       expect(Redis.current.zrange("feed:home:#{account.id}", 0, -1)).to eq [status_1.id.to_s, status_7.id.to_s]
     end
diff --git a/spec/lib/spam_check_spec.rb b/spec/lib/spam_check_spec.rb
index d4d66a49930737df8fe489c48871d5151e400b4d..159d83257353db4445cede3f043c82e1cb996e25 100644
--- a/spec/lib/spam_check_spec.rb
+++ b/spec/lib/spam_check_spec.rb
@@ -150,9 +150,9 @@ RSpec.describe SpamCheck do
     let(:redis_key) { spam_check.send(:redis_key) }
 
     it 'remembers' do
-      expect(Redis.current.exists(redis_key)).to be true
+      expect(Redis.current.exists?(redis_key)).to be true
       spam_check.remember!
-      expect(Redis.current.exists(redis_key)).to be true
+      expect(Redis.current.exists?(redis_key)).to be true
     end
   end
 
@@ -166,9 +166,9 @@ RSpec.describe SpamCheck do
     end
 
     it 'resets' do
-      expect(Redis.current.exists(redis_key)).to be true
+      expect(Redis.current.exists?(redis_key)).to be true
       spam_check.reset!
-      expect(Redis.current.exists(redis_key)).to be false
+      expect(Redis.current.exists?(redis_key)).to be false
     end
   end
 
diff --git a/spec/mailers/previews/user_mailer_preview.rb b/spec/mailers/previews/user_mailer_preview.rb
index 313666412af308320996a9569287cceffb4420e8..6d87fd706e0be25bbc7135147bfcfa20a2d1a35f 100644
--- a/spec/mailers/previews/user_mailer_preview.rb
+++ b/spec/mailers/previews/user_mailer_preview.rb
@@ -33,6 +33,28 @@ class UserMailerPreview < ActionMailer::Preview
     UserMailer.two_factor_recovery_codes_changed(User.first)
   end
 
+  # Preview this email at http://localhost:3000/rails/mailers/user_mailer/webauthn_enabled
+  def webauthn_enabled
+    UserMailer.webauthn_enabled(User.first)
+  end
+
+  # Preview this email at http://localhost:3000/rails/mailers/user_mailer/webauthn_disabled
+  def webauthn_disabled
+    UserMailer.webauthn_disabled(User.first)
+  end
+
+  # Preview this email at http://localhost:3000/rails/mailers/user_mailer/webauthn_credential_added
+  def webauthn_credential_added
+    webauthn_credential = WebauthnCredential.new(nickname: 'USB Key')
+    UserMailer.webauthn_credential_added(User.first, webauthn_credential)
+  end
+
+  # Preview this email at http://localhost:3000/rails/mailers/user_mailer/webauthn_credential_deleted
+  def webauthn_credential_deleted
+    webauthn_credential = WebauthnCredential.new(nickname: 'USB Key')
+    UserMailer.webauthn_credential_deleted(User.first, webauthn_credential)
+  end
+
   # Preview this email at http://localhost:3000/rails/mailers/user_mailer/reconfirmation_instructions
   def reconfirmation_instructions
     user = User.first
diff --git a/spec/models/account_deletion_request_spec.rb b/spec/models/account_deletion_request_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..afaecbe2289eaffd5f2b76063fcfb39e7407db3f
--- /dev/null
+++ b/spec/models/account_deletion_request_spec.rb
@@ -0,0 +1,4 @@
+require 'rails_helper'
+
+RSpec.describe AccountDeletionRequest, type: :model do
+end
diff --git a/spec/models/account_filter_spec.rb b/spec/models/account_filter_spec.rb
index 176a0eeacd0ce055c8f71f664a689b2553eec8a5..0cdb373f6ac5a3d9cf49869b0df727e02a06e99f 100644
--- a/spec/models/account_filter_spec.rb
+++ b/spec/models/account_filter_spec.rb
@@ -5,7 +5,7 @@ describe AccountFilter do
     it 'defaults to recent local not-suspended account list' do
       filter = described_class.new({})
 
-      expect(filter.results).to eq Account.local.recent.without_suspended
+      expect(filter.results).to eq Account.local.without_instance_actor.recent.without_suspended
     end
   end
 
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 98d29e6f3d37defe194fe2d3d8922ca50e9214ad..1d000ed4d2eb878ea3bc6c8475dd3f8e6b8fd148 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -440,13 +440,6 @@ RSpec.describe Account, type: :model do
     end
   end
 
-  describe '.domains' do
-    it 'returns domains' do
-      Fabricate(:account, domain: 'domain')
-      expect(Account.remote.domains).to match_array(['domain'])
-    end
-  end
-
   describe '#statuses_count' do
     subject { Fabricate(:account) }
 
@@ -737,20 +730,6 @@ RSpec.describe Account, type: :model do
       end
     end
 
-    describe 'by_domain_accounts' do
-      it 'returns accounts grouped by domain sorted by accounts' do
-        2.times { Fabricate(:account, domain: 'example.com') }
-        Fabricate(:account, domain: 'example2.com')
-
-        results = Account.where('id > 0').by_domain_accounts
-        expect(results.length).to eq 2
-        expect(results.first.domain).to eq 'example.com'
-        expect(results.first.accounts_count).to eq 2
-        expect(results.last.domain).to eq 'example2.com'
-        expect(results.last.accounts_count).to eq 1
-      end
-    end
-
     describe 'local' do
       it 'returns an array of accounts who do not have a domain' do
         account_1 = Fabricate(:account, domain: nil)
@@ -817,4 +796,27 @@ RSpec.describe Account, type: :model do
 
   include_examples 'AccountAvatar', :account
   include_examples 'AccountHeader', :account
+
+  describe '#increment_count!' do
+    subject { Fabricate(:account) }
+
+    it 'increments the count in multi-threaded an environment when account_stat is not yet initialized' do
+      subject
+
+      increment_by   = 15
+      wait_for_start = true
+
+      threads = Array.new(increment_by) do
+        Thread.new do
+          true while wait_for_start
+          Account.find(subject.id).increment_count!(:followers_count)
+        end
+      end
+
+      wait_for_start = false
+      threads.each(&:join)
+
+      expect(subject.reload.followers_count).to eq 15
+    end
+  end
 end
diff --git a/spec/models/admin/account_action_spec.rb b/spec/models/admin/account_action_spec.rb
index 87fc285007867a129ec9a1baae59194cff9194e8..2366b9ca4af23c8dfb1c21b8411ce4217b329423 100644
--- a/spec/models/admin/account_action_spec.rb
+++ b/spec/models/admin/account_action_spec.rb
@@ -115,16 +115,16 @@ RSpec.describe Admin::AccountAction, type: :model do
     context 'account.local?' do
       let(:account) { Fabricate(:account, domain: nil) }
 
-      it 'returns ["none", "disable", "silence", "suspend"]' do
-        expect(subject).to eq %w(none disable silence suspend)
+      it 'returns ["none", "disable", "sensitive", "silence", "suspend"]' do
+        expect(subject).to eq %w(none disable sensitive silence suspend)
       end
     end
 
     context '!account.local?' do
       let(:account) { Fabricate(:account, domain: 'hoge.com') }
 
-      it 'returns ["silence", "suspend"]' do
-        expect(subject).to eq %w(silence suspend)
+      it 'returns ["sensitive", "silence", "suspend"]' do
+        expect(subject).to eq %w(sensitive silence suspend)
       end
     end
   end
diff --git a/spec/models/concerns/account_interactions_spec.rb b/spec/models/concerns/account_interactions_spec.rb
index e8ef61f66cc1a14419259628f3bec6c81613c865..85fbf7e79ca513c5be92889067bcab643315dcb9 100644
--- a/spec/models/concerns/account_interactions_spec.rb
+++ b/spec/models/concerns/account_interactions_spec.rb
@@ -14,7 +14,7 @@ describe AccountInteractions do
     context 'account with Follow' do
       it 'returns { target_account_id => true }' do
         Fabricate(:follow, account: account, target_account: target_account)
-        is_expected.to eq(target_account_id => { reblogs: true })
+        is_expected.to eq(target_account_id => { reblogs: true, notify: false })
       end
     end
 
@@ -539,6 +539,49 @@ describe AccountInteractions do
     end
   end
 
+  describe '#followers_hash' do
+    let(:me) { Fabricate(:account, username: 'Me') }
+    let(:remote_1) { Fabricate(:account, username: 'alice', domain: 'example.org', uri: 'https://example.org/users/alice') }
+    let(:remote_2) { Fabricate(:account, username: 'bob', domain: 'example.org', uri: 'https://example.org/users/bob') }
+    let(:remote_3) { Fabricate(:account, username: 'eve', domain: 'foo.org', uri: 'https://foo.org/users/eve') }
+
+    before do
+      remote_1.follow!(me)
+      remote_2.follow!(me)
+      remote_3.follow!(me)
+      me.follow!(remote_1)
+    end
+
+    context 'on a local user' do
+      it 'returns correct hash for remote domains' do
+        expect(me.remote_followers_hash('https://example.org/')).to eq '707962e297b7bd94468a21bc8e506a1bcea607a9142cd64e27c9b106b2a5f6ec'
+        expect(me.remote_followers_hash('https://foo.org/')).to eq 'ccb9c18a67134cfff9d62c7f7e7eb88e6b803446c244b84265565f4eba29df0e'
+      end
+
+      it 'invalidates cache as needed when removing or adding followers' do
+        expect(me.remote_followers_hash('https://example.org/')).to eq '707962e297b7bd94468a21bc8e506a1bcea607a9142cd64e27c9b106b2a5f6ec'
+        remote_1.unfollow!(me)
+        expect(me.remote_followers_hash('https://example.org/')).to eq '241b00794ce9b46aa864f3220afadef128318da2659782985bac5ed5bd436bff'
+        remote_1.follow!(me)
+        expect(me.remote_followers_hash('https://example.org/')).to eq '707962e297b7bd94468a21bc8e506a1bcea607a9142cd64e27c9b106b2a5f6ec'
+      end
+    end
+
+    context 'on a remote user' do
+      it 'returns correct hash for remote domains' do
+        expect(remote_1.local_followers_hash).to eq Digest::SHA256.hexdigest(ActivityPub::TagManager.instance.uri_for(me))
+      end
+
+      it 'invalidates cache as needed when removing or adding followers' do
+        expect(remote_1.local_followers_hash).to eq Digest::SHA256.hexdigest(ActivityPub::TagManager.instance.uri_for(me))
+        me.unfollow!(remote_1)
+        expect(remote_1.local_followers_hash).to eq '0000000000000000000000000000000000000000000000000000000000000000'
+        me.follow!(remote_1)
+        expect(remote_1.local_followers_hash).to eq Digest::SHA256.hexdigest(ActivityPub::TagManager.instance.uri_for(me))
+      end
+    end
+  end
+
   describe 'muting an account' do
     let(:me) { Fabricate(:account, username: 'Me') }
     let(:you) { Fabricate(:account, username: 'You') }
diff --git a/spec/models/follow_request_spec.rb b/spec/models/follow_request_spec.rb
index 2cf28b263cd58e97d08854e8edb73140bce12519..cc484a5b9216889b800cbbd7472b57c4a60232b3 100644
--- a/spec/models/follow_request_spec.rb
+++ b/spec/models/follow_request_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe FollowRequest, type: :model do
     let(:target_account) { Fabricate(:account) }
 
     it 'calls Account#follow!, MergeWorker.perform_async, and #destroy!' do
-      expect(account).to        receive(:follow!).with(target_account, reblogs: true, uri: follow_request.uri)
+      expect(account).to        receive(:follow!).with(target_account, reblogs: true, notify: false, uri: follow_request.uri)
       expect(MergeWorker).to    receive(:perform_async).with(target_account.id, account.id)
       expect(follow_request).to receive(:destroy!)
       follow_request.authorize!
diff --git a/spec/models/follow_spec.rb b/spec/models/follow_spec.rb
index 0c84e5e7bfa2458455859733d850cb746e1c3bbd..e723a1ef21143f222e52f094c0d9a9deacd197d0 100644
--- a/spec/models/follow_spec.rb
+++ b/spec/models/follow_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Follow, type: :model do
   let(:bob)   { Fabricate(:account, username: 'bob') }
 
   describe 'validations' do
-    subject { Follow.new(account: alice, target_account: bob) }
+    subject { Follow.new(account: alice, target_account: bob, rate_limit: true) }
 
     it 'has a valid fabricator' do
       follow = Fabricate.build(:follow)
diff --git a/spec/models/import_spec.rb b/spec/models/import_spec.rb
index 321761166ec50a34e59dda7d80ed9f1618ca1994..a5eec172264a4e09c9b403bde8f6bc07507dbd36 100644
--- a/spec/models/import_spec.rb
+++ b/spec/models/import_spec.rb
@@ -20,5 +20,15 @@ RSpec.describe Import, type: :model do
       import = Import.create(account: account, type: type)
       expect(import).to model_have_error_on_field(:data)
     end
+
+    it 'is invalid with too many rows in data' do
+      import = Import.create(account: account, type: type, data: StringIO.new("foo@bar.com\n" * (ImportService::ROWS_PROCESSING_LIMIT + 10)))
+      expect(import).to model_have_error_on_field(:data)
+    end
+
+    it 'is invalid when there are more rows when following limit' do
+      import = Import.create(account: account, type: type, data: StringIO.new("foo@bar.com\n" * (FollowLimitValidator.limit_for_account(account) + 10)))
+      expect(import).to model_have_error_on_field(:data)
+    end
   end
 end
diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb
index 30abfb86bf4d882dd13add846b47c0e4408c4676..b0596c56123562792680f2dff0d28517e506f33f 100644
--- a/spec/models/invite_spec.rb
+++ b/spec/models/invite_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe Invite, type: :model do
 
     it 'returns false when invite creator has been disabled' do
       invite = Fabricate(:invite, max_uses: nil, expires_at: nil)
-      SuspendAccountService.new.call(invite.user.account)
+      invite.user.account.suspend!
       expect(invite.valid_for_use?).to be false
     end
   end
diff --git a/spec/models/ip_block_spec.rb b/spec/models/ip_block_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..6603c6417aac93a99ca6dd81d1574c3dfa85f2b9
--- /dev/null
+++ b/spec/models/ip_block_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe IpBlock, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/public_feed_spec.rb b/spec/models/public_feed_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..0392a582c69cd12d4363e3b83d763e204e308d9d
--- /dev/null
+++ b/spec/models/public_feed_spec.rb
@@ -0,0 +1,212 @@
+require 'rails_helper'
+
+RSpec.describe PublicFeed, type: :model do
+  let(:account) { Fabricate(:account) }
+
+  describe '#get' do
+    subject { described_class.new(nil).get(20).map(&:id) }
+
+    it 'only includes statuses with public visibility' do
+      public_status = Fabricate(:status, visibility: :public)
+      private_status = Fabricate(:status, visibility: :private)
+
+      expect(subject).to include(public_status.id)
+      expect(subject).not_to include(private_status.id)
+    end
+
+    it 'does not include replies' do
+      status = Fabricate(:status)
+      reply = Fabricate(:status, in_reply_to_id: status.id)
+
+      expect(subject).to include(status.id)
+      expect(subject).not_to include(reply.id)
+    end
+
+    it 'does not include boosts' do
+      status = Fabricate(:status)
+      boost = Fabricate(:status, reblog_of_id: status.id)
+
+      expect(subject).to include(status.id)
+      expect(subject).not_to include(boost.id)
+    end
+
+    it 'filters out silenced accounts' do
+      account = Fabricate(:account)
+      silenced_account = Fabricate(:account, silenced: true)
+      status = Fabricate(:status, account: account)
+      silenced_status = Fabricate(:status, account: silenced_account)
+
+      expect(subject).to include(status.id)
+      expect(subject).not_to include(silenced_status.id)
+    end
+
+    context 'without local_only option' do
+      let(:viewer) { nil }
+
+      let!(:local_account)  { Fabricate(:account, domain: nil) }
+      let!(:remote_account) { Fabricate(:account, domain: 'test.com') }
+      let!(:local_status)   { Fabricate(:status, account: local_account) }
+      let!(:remote_status)  { Fabricate(:status, account: remote_account) }
+
+      subject { described_class.new(viewer).get(20).map(&:id) }
+
+      context 'without a viewer' do
+        let(:viewer) { nil }
+
+        it 'includes remote instances statuses' do
+          expect(subject).to include(remote_status.id)
+        end
+
+        it 'includes local statuses' do
+          expect(subject).to include(local_status.id)
+        end
+      end
+
+      context 'with a viewer' do
+        let(:viewer) { Fabricate(:account, username: 'viewer') }
+
+        it 'includes remote instances statuses' do
+          expect(subject).to include(remote_status.id)
+        end
+
+        it 'includes local statuses' do
+          expect(subject).to include(local_status.id)
+        end
+      end
+    end
+
+    context 'with a local_only option set' do
+      let!(:local_account)  { Fabricate(:account, domain: nil) }
+      let!(:remote_account) { Fabricate(:account, domain: 'test.com') }
+      let!(:local_status)   { Fabricate(:status, account: local_account) }
+      let!(:remote_status)  { Fabricate(:status, account: remote_account) }
+
+      subject { described_class.new(viewer, local: true).get(20).map(&:id) }
+
+      context 'without a viewer' do
+        let(:viewer) { nil }
+
+        it 'does not include remote instances statuses' do
+          expect(subject).to include(local_status.id)
+          expect(subject).not_to include(remote_status.id)
+        end
+      end
+
+      context 'with a viewer' do
+        let(:viewer) { Fabricate(:account, username: 'viewer') }
+
+        it 'does not include remote instances statuses' do
+          expect(subject).to include(local_status.id)
+          expect(subject).not_to include(remote_status.id)
+        end
+
+        it 'is not affected by personal domain blocks' do
+          viewer.block_domain!('test.com')
+          expect(subject).to include(local_status.id)
+          expect(subject).not_to include(remote_status.id)
+        end
+      end
+    end
+
+    context 'with a remote_only option set' do
+      let!(:local_account)  { Fabricate(:account, domain: nil) }
+      let!(:remote_account) { Fabricate(:account, domain: 'test.com') }
+      let!(:local_status)   { Fabricate(:status, account: local_account) }
+      let!(:remote_status)  { Fabricate(:status, account: remote_account) }
+
+      subject { described_class.new(viewer, remote: true).get(20).map(&:id) }
+
+      context 'without a viewer' do
+        let(:viewer) { nil }
+
+        it 'does not include local instances statuses' do
+          expect(subject).not_to include(local_status.id)
+          expect(subject).to include(remote_status.id)
+        end
+      end
+
+      context 'with a viewer' do
+        let(:viewer) { Fabricate(:account, username: 'viewer') }
+
+        it 'does not include local instances statuses' do
+          expect(subject).not_to include(local_status.id)
+          expect(subject).to include(remote_status.id)
+        end
+      end
+    end
+
+    describe 'with an account passed in' do
+      before do
+        @account = Fabricate(:account)
+      end
+
+      subject { described_class.new(@account).get(20).map(&:id) }
+
+      it 'excludes statuses from accounts blocked by the account' do
+        blocked = Fabricate(:account)
+        @account.block!(blocked)
+        blocked_status = Fabricate(:status, account: blocked)
+
+        expect(subject).not_to include(blocked_status.id)
+      end
+
+      it 'excludes statuses from accounts who have blocked the account' do
+        blocker = Fabricate(:account)
+        blocker.block!(@account)
+        blocked_status = Fabricate(:status, account: blocker)
+
+        expect(subject).not_to include(blocked_status.id)
+      end
+
+      it 'excludes statuses from accounts muted by the account' do
+        muted = Fabricate(:account)
+        @account.mute!(muted)
+        muted_status = Fabricate(:status, account: muted)
+
+        expect(subject).not_to include(muted_status.id)
+      end
+
+      it 'excludes statuses from accounts from personally blocked domains' do
+        blocked = Fabricate(:account, domain: 'example.com')
+        @account.block_domain!(blocked.domain)
+        blocked_status = Fabricate(:status, account: blocked)
+
+        expect(subject).not_to include(blocked_status.id)
+      end
+
+      context 'with language preferences' do
+        it 'excludes statuses in languages not allowed by the account user' do
+          user = Fabricate(:user, chosen_languages: [:en, :es])
+          @account.update(user: user)
+          en_status = Fabricate(:status, language: 'en')
+          es_status = Fabricate(:status, language: 'es')
+          fr_status = Fabricate(:status, language: 'fr')
+
+          expect(subject).to include(en_status.id)
+          expect(subject).to include(es_status.id)
+          expect(subject).not_to include(fr_status.id)
+        end
+
+        it 'includes all languages when user does not have a setting' do
+          user = Fabricate(:user, chosen_languages: nil)
+          @account.update(user: user)
+
+          en_status = Fabricate(:status, language: 'en')
+          es_status = Fabricate(:status, language: 'es')
+
+          expect(subject).to include(en_status.id)
+          expect(subject).to include(es_status.id)
+        end
+
+        it 'includes all languages when account does not have a user' do
+          expect(@account.user).to be_nil
+          en_status = Fabricate(:status, language: 'en')
+          es_status = Fabricate(:status, language: 'es')
+
+          expect(subject).to include(en_status.id)
+          expect(subject).to include(es_status.id)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb
index 4aee14cbd635384d2fb856f9bcf6ef07096abe14..20fb894e77f36988f18b1a49461a27b8ad5d35b5 100644
--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@@ -267,241 +267,6 @@ RSpec.describe Status, type: :model do
     end
   end
 
-  describe '.as_public_timeline' do
-    it 'only includes statuses with public visibility' do
-      public_status = Fabricate(:status, visibility: :public)
-      private_status = Fabricate(:status, visibility: :private)
-
-      results = Status.as_public_timeline
-      expect(results).to include(public_status)
-      expect(results).not_to include(private_status)
-    end
-
-    it 'does not include replies' do
-      status = Fabricate(:status)
-      reply = Fabricate(:status, in_reply_to_id: status.id)
-
-      results = Status.as_public_timeline
-      expect(results).to include(status)
-      expect(results).not_to include(reply)
-    end
-
-    it 'does not include boosts' do
-      status = Fabricate(:status)
-      boost = Fabricate(:status, reblog_of_id: status.id)
-
-      results = Status.as_public_timeline
-      expect(results).to include(status)
-      expect(results).not_to include(boost)
-    end
-
-    it 'filters out silenced accounts' do
-      account = Fabricate(:account)
-      silenced_account = Fabricate(:account, silenced: true)
-      status = Fabricate(:status, account: account)
-      silenced_status = Fabricate(:status, account: silenced_account)
-
-      results = Status.as_public_timeline
-      expect(results).to include(status)
-      expect(results).not_to include(silenced_status)
-    end
-
-    context 'without local_only option' do
-      let(:viewer) { nil }
-
-      let!(:local_account)  { Fabricate(:account, domain: nil) }
-      let!(:remote_account) { Fabricate(:account, domain: 'test.com') }
-      let!(:local_status)   { Fabricate(:status, account: local_account) }
-      let!(:remote_status)  { Fabricate(:status, account: remote_account) }
-
-      subject { Status.as_public_timeline(viewer, false) }
-
-      context 'without a viewer' do
-        let(:viewer) { nil }
-
-        it 'includes remote instances statuses' do
-          expect(subject).to include(remote_status)
-        end
-
-        it 'includes local statuses' do
-          expect(subject).to include(local_status)
-        end
-      end
-
-      context 'with a viewer' do
-        let(:viewer) { Fabricate(:account, username: 'viewer') }
-
-        it 'includes remote instances statuses' do
-          expect(subject).to include(remote_status)
-        end
-
-        it 'includes local statuses' do
-          expect(subject).to include(local_status)
-        end
-      end
-    end
-
-    context 'with a local_only option set' do
-      let!(:local_account)  { Fabricate(:account, domain: nil) }
-      let!(:remote_account) { Fabricate(:account, domain: 'test.com') }
-      let!(:local_status)   { Fabricate(:status, account: local_account) }
-      let!(:remote_status)  { Fabricate(:status, account: remote_account) }
-
-      subject { Status.as_public_timeline(viewer, true) }
-
-      context 'without a viewer' do
-        let(:viewer) { nil }
-
-        it 'does not include remote instances statuses' do
-          expect(subject).to include(local_status)
-          expect(subject).not_to include(remote_status)
-        end
-      end
-
-      context 'with a viewer' do
-        let(:viewer) { Fabricate(:account, username: 'viewer') }
-
-        it 'does not include remote instances statuses' do
-          expect(subject).to include(local_status)
-          expect(subject).not_to include(remote_status)
-        end
-
-        it 'is not affected by personal domain blocks' do
-          viewer.block_domain!('test.com')
-          expect(subject).to include(local_status)
-          expect(subject).not_to include(remote_status)
-        end
-      end
-    end
-
-    context 'with a remote_only option set' do
-      let!(:local_account)  { Fabricate(:account, domain: nil) }
-      let!(:remote_account) { Fabricate(:account, domain: 'test.com') }
-      let!(:local_status)   { Fabricate(:status, account: local_account) }
-      let!(:remote_status)  { Fabricate(:status, account: remote_account) }
-
-      subject { Status.as_public_timeline(viewer, :remote) }
-
-      context 'without a viewer' do
-        let(:viewer) { nil }
-
-        it 'does not include local instances statuses' do
-          expect(subject).not_to include(local_status)
-          expect(subject).to include(remote_status)
-        end
-      end
-
-      context 'with a viewer' do
-        let(:viewer) { Fabricate(:account, username: 'viewer') }
-
-        it 'does not include local instances statuses' do
-          expect(subject).not_to include(local_status)
-          expect(subject).to include(remote_status)
-        end
-      end
-    end
-
-    describe 'with an account passed in' do
-      before do
-        @account = Fabricate(:account)
-      end
-
-      it 'excludes statuses from accounts blocked by the account' do
-        blocked = Fabricate(:account)
-        Fabricate(:block, account: @account, target_account: blocked)
-        blocked_status = Fabricate(:status, account: blocked)
-
-        results = Status.as_public_timeline(@account)
-        expect(results).not_to include(blocked_status)
-      end
-
-      it 'excludes statuses from accounts who have blocked the account' do
-        blocked = Fabricate(:account)
-        Fabricate(:block, account: blocked, target_account: @account)
-        blocked_status = Fabricate(:status, account: blocked)
-
-        results = Status.as_public_timeline(@account)
-        expect(results).not_to include(blocked_status)
-      end
-
-      it 'excludes statuses from accounts muted by the account' do
-        muted = Fabricate(:account)
-        Fabricate(:mute, account: @account, target_account: muted)
-        muted_status = Fabricate(:status, account: muted)
-
-        results = Status.as_public_timeline(@account)
-        expect(results).not_to include(muted_status)
-      end
-
-      it 'excludes statuses from accounts from personally blocked domains' do
-        blocked = Fabricate(:account, domain: 'example.com')
-        @account.block_domain!(blocked.domain)
-        blocked_status = Fabricate(:status, account: blocked)
-
-        results = Status.as_public_timeline(@account)
-        expect(results).not_to include(blocked_status)
-      end
-
-      context 'with language preferences' do
-        it 'excludes statuses in languages not allowed by the account user' do
-          user = Fabricate(:user, chosen_languages: [:en, :es])
-          @account.update(user: user)
-          en_status = Fabricate(:status, language: 'en')
-          es_status = Fabricate(:status, language: 'es')
-          fr_status = Fabricate(:status, language: 'fr')
-
-          results = Status.as_public_timeline(@account)
-          expect(results).to include(en_status)
-          expect(results).to include(es_status)
-          expect(results).not_to include(fr_status)
-        end
-
-        it 'includes all languages when user does not have a setting' do
-          user = Fabricate(:user, chosen_languages: nil)
-          @account.update(user: user)
-
-          en_status = Fabricate(:status, language: 'en')
-          es_status = Fabricate(:status, language: 'es')
-
-          results = Status.as_public_timeline(@account)
-          expect(results).to include(en_status)
-          expect(results).to include(es_status)
-        end
-
-        it 'includes all languages when account does not have a user' do
-          expect(@account.user).to be_nil
-          en_status = Fabricate(:status, language: 'en')
-          es_status = Fabricate(:status, language: 'es')
-
-          results = Status.as_public_timeline(@account)
-          expect(results).to include(en_status)
-          expect(results).to include(es_status)
-        end
-      end
-    end
-  end
-
-  describe '.as_tag_timeline' do
-    it 'includes statuses with a tag' do
-      tag = Fabricate(:tag)
-      status = Fabricate(:status, tags: [tag])
-      other = Fabricate(:status)
-
-      results = Status.as_tag_timeline(tag)
-      expect(results).to include(status)
-      expect(results).not_to include(other)
-    end
-
-    it 'allows replies to be included' do
-      original = Fabricate(:status)
-      tag = Fabricate(:tag)
-      status = Fabricate(:status, tags: [tag], in_reply_to_id: original.id)
-
-      results = Status.as_tag_timeline(tag)
-      expect(results).to include(status)
-    end
-  end
-
   describe '.permitted_for' do
     subject { described_class.permitted_for(target_account, account).pluck(:visibility) }
 
diff --git a/spec/services/hashtag_query_service_spec.rb b/spec/models/tag_feed_spec.rb
similarity index 65%
rename from spec/services/hashtag_query_service_spec.rb
rename to spec/models/tag_feed_spec.rb
index 24282d2f0672e1defd94bd4bcc100bfe736c04f0..17d88eb99938f0d528b721ac71212fb86fc9d7a8 100644
--- a/spec/services/hashtag_query_service_spec.rb
+++ b/spec/models/tag_feed_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
-describe HashtagQueryService, type: :service do
-  describe '.call' do
+describe TagFeed, type: :service do
+  describe '#get' do
     let(:account) { Fabricate(:account) }
     let(:tag1) { Fabricate(:tag) }
     let(:tag2) { Fabricate(:tag) }
@@ -10,35 +10,35 @@ describe HashtagQueryService, type: :service do
     let!(:both) { Fabricate(:status, tags: [tag1, tag2]) }
 
     it 'can add tags in "any" mode' do
-      results = subject.call(tag1, { any: [tag2.name] })
+      results = described_class.new(tag1, nil, any: [tag2.name]).get(20)
       expect(results).to include status1
       expect(results).to include status2
       expect(results).to include both
     end
 
     it 'can remove tags in "all" mode' do
-      results = subject.call(tag1, { all: [tag2.name] })
+      results = described_class.new(tag1, nil, all: [tag2.name]).get(20)
       expect(results).to_not include status1
       expect(results).to_not include status2
       expect(results).to     include both
     end
 
     it 'can remove tags in "none" mode' do
-      results = subject.call(tag1, { none: [tag2.name] })
+      results = described_class.new(tag1, nil, none: [tag2.name]).get(20)
       expect(results).to     include status1
       expect(results).to_not include status2
       expect(results).to_not include both
     end
 
     it 'ignores an invalid mode' do
-      results = subject.call(tag1, { wark: [tag2.name] })
+      results = described_class.new(tag1, nil, wark: [tag2.name]).get(20)
       expect(results).to     include status1
       expect(results).to_not include status2
       expect(results).to     include both
     end
 
     it 'handles being passed non existant tag names' do
-      results = subject.call(tag1, { any: ['wark'] })
+      results = described_class.new(tag1, nil, any: ['wark']).get(20)
       expect(results).to     include status1
       expect(results).to_not include status2
       expect(results).to     include both
@@ -46,15 +46,23 @@ describe HashtagQueryService, type: :service do
 
     it 'can restrict to an account' do
       BlockService.new.call(account, status1.account)
-      results = subject.call(tag1, { none: [tag2.name] }, account)
+      results = described_class.new(tag1, account, none: [tag2.name]).get(20)
       expect(results).to_not include status1
     end
 
     it 'can restrict to local' do
       status1.account.update(domain: 'example.com')
       status1.update(local: false, uri: 'example.com/toot')
-      results = subject.call(tag1, { any: [tag2.name] }, nil, true)
+      results = described_class.new(tag1, nil, any: [tag2.name], local: true).get(20)
       expect(results).to_not include status1
     end
+
+    it 'allows replies to be included' do
+      original = Fabricate(:status)
+      status = Fabricate(:status, tags: [tag1], in_reply_to_id: original.id)
+
+      results = described_class.new(tag1, nil).get(20)
+      expect(results).to include(status)
+    end
   end
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 5686ec909ea6af9d3707308c58c1104cfc70fcfd..cded4c99bdca2a7d602be7c2180b0b9536493adf 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -151,6 +151,12 @@ RSpec.describe User, type: :model do
       expect(user.reload.otp_required_for_login).to be false
     end
 
+    it 'saves nil for otp_secret' do
+      user = Fabricate.build(:user, otp_secret: 'oldotpcode')
+      user.disable_two_factor!
+      expect(user.reload.otp_secret).to be nil
+    end
+
     it 'saves cleared otp_backup_codes' do
       user = Fabricate.build(:user, otp_backup_codes: %w(dummy dummy))
       user.disable_two_factor!
diff --git a/spec/models/webauthn_credentials_spec.rb b/spec/models/webauthn_credentials_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..a63ae6cd24893ea33c8169be9b526cd9ff75de60
--- /dev/null
+++ b/spec/models/webauthn_credentials_spec.rb
@@ -0,0 +1,80 @@
+require 'rails_helper'
+
+RSpec.describe WebauthnCredential, type: :model do
+  describe 'validations' do
+    it 'is invalid without an external id' do
+      webauthn_credential = Fabricate.build(:webauthn_credential, external_id: nil)
+
+      webauthn_credential.valid?
+
+      expect(webauthn_credential).to model_have_error_on_field(:external_id)
+    end
+
+    it 'is invalid without a public key' do
+      webauthn_credential = Fabricate.build(:webauthn_credential, public_key: nil)
+
+      webauthn_credential.valid?
+
+      expect(webauthn_credential).to model_have_error_on_field(:public_key)
+    end
+
+    it 'is invalid without a nickname' do
+      webauthn_credential = Fabricate.build(:webauthn_credential, nickname: nil)
+
+      webauthn_credential.valid?
+
+      expect(webauthn_credential).to model_have_error_on_field(:nickname)
+    end
+
+    it 'is invalid without a sign_count' do
+      webauthn_credential = Fabricate.build(:webauthn_credential, sign_count: nil)
+
+      webauthn_credential.valid?
+
+      expect(webauthn_credential).to model_have_error_on_field(:sign_count)
+    end
+
+    it 'is invalid if already exist a webauthn credential with the same external id' do
+      existing_webauthn_credential = Fabricate(:webauthn_credential, external_id: "_Typ0ygudDnk9YUVWLQayw")
+      new_webauthn_credential = Fabricate.build(:webauthn_credential, external_id: "_Typ0ygudDnk9YUVWLQayw")
+
+      new_webauthn_credential.valid?
+
+      expect(new_webauthn_credential).to model_have_error_on_field(:external_id)
+    end
+
+    it 'is invalid if user already registered a webauthn credential with the same nickname' do
+      user = Fabricate(:user)
+      existing_webauthn_credential = Fabricate(:webauthn_credential, user_id: user.id, nickname: 'USB Key')
+      new_webauthn_credential = Fabricate.build(:webauthn_credential, user_id: user.id, nickname: 'USB Key')
+
+      new_webauthn_credential.valid?
+
+      expect(new_webauthn_credential).to model_have_error_on_field(:nickname)
+    end
+
+    it 'is invalid if sign_count is not a number' do
+      webauthn_credential = Fabricate.build(:webauthn_credential, sign_count: 'invalid sign_count')
+
+      webauthn_credential.valid?
+
+      expect(webauthn_credential).to model_have_error_on_field(:sign_count)
+    end
+
+    it 'is invalid if sign_count is negative number' do
+      webauthn_credential = Fabricate.build(:webauthn_credential, sign_count: -1)
+
+      webauthn_credential.valid?
+
+      expect(webauthn_credential).to model_have_error_on_field(:sign_count)
+    end
+
+    it 'is invalid if sign_count is greater 2**63 - 1' do
+      webauthn_credential = Fabricate.build(:webauthn_credential, sign_count: 2**63)
+
+      webauthn_credential.valid?
+
+      expect(webauthn_credential).to model_have_error_on_field(:sign_count)
+    end
+  end
+end
diff --git a/spec/policies/account_policy_spec.rb b/spec/policies/account_policy_spec.rb
index 6648b0888bf6e830379875285f7699de23e4aeaf..1347ca4a03c8f53cd31678fe0a690619a3949af7 100644
--- a/spec/policies/account_policy_spec.rb
+++ b/spec/policies/account_policy_spec.rb
@@ -7,8 +7,9 @@ RSpec.describe AccountPolicy do
   let(:subject) { described_class }
   let(:admin)   { Fabricate(:user, admin: true).account }
   let(:john)    { Fabricate(:user).account }
+  let(:alice)   { Fabricate(:user).account }
 
-  permissions :index?, :show?, :unsuspend?, :unsilence?, :remove_avatar?, :remove_header? do
+  permissions :index? do
     context 'staff' do
       it 'permits' do
         expect(subject).to permit(admin)
@@ -22,6 +23,38 @@ RSpec.describe AccountPolicy do
     end
   end
 
+  permissions :show?, :unsilence?, :unsensitive?, :remove_avatar?, :remove_header? do
+    context 'staff' do
+      it 'permits' do
+        expect(subject).to permit(admin, alice)
+      end
+    end
+
+    context 'not staff' do
+      it 'denies' do
+        expect(subject).to_not permit(john, alice)
+      end
+    end
+  end
+
+  permissions :unsuspend? do
+    before do
+      alice.suspend!
+    end
+
+    context 'staff' do
+      it 'permits' do
+        expect(subject).to permit(admin, alice)
+      end
+    end
+
+    context 'not staff' do
+      it 'denies' do
+        expect(subject).to_not permit(john, alice)
+      end
+    end
+  end
+
   permissions :redownload?, :subscribe?, :unsubscribe? do
     context 'admin' do
       it 'permits' do
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 40ddf1f95d76a2f3eefbe4e141b2d18c78ebed61..86c2a9c52fd9e806f61dde6bd3d0821a28847004 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -70,6 +70,8 @@ RSpec::Sidekiq.configure do |config|
   config.warn_when_jobs_not_processed_by_sidekiq = false
 end
 
+RSpec::Matchers.define_negated_matcher :not_change, :change
+
 def request_fixture(name)
   File.read(Rails.root.join('spec', 'fixtures', 'requests', name))
 end
diff --git a/spec/services/activitypub/process_account_service_spec.rb b/spec/services/activitypub/process_account_service_spec.rb
index 5141e3f16568853048dc16dff00ed4f3daf75d6a..56e7f83211b4e069ebb896dec0d79d42a9eaae3b 100644
--- a/spec/services/activitypub/process_account_service_spec.rb
+++ b/spec/services/activitypub/process_account_service_spec.rb
@@ -73,4 +73,84 @@ RSpec.describe ActivityPub::ProcessAccountService, type: :service do
       expect(ProofProvider::Keybase::Worker).to have_received(:perform_async)
     end
   end
+
+  context 'when account is not suspended' do
+    let!(:account) { Fabricate(:account, username: 'alice', domain: 'example.com') }
+
+    let(:payload) do
+      {
+        id: 'https://foo.test',
+        type: 'Actor',
+        inbox: 'https://foo.test/inbox',
+        suspended: true,
+      }.with_indifferent_access
+    end
+
+    before do
+      allow(Admin::SuspensionWorker).to receive(:perform_async)
+    end
+
+    subject { described_class.new.call('alice', 'example.com', payload) }
+
+    it 'suspends account remotely' do
+      expect(subject.suspended?).to be true
+      expect(subject.suspension_origin_remote?).to be true
+    end
+
+    it 'queues suspension worker' do
+      subject
+      expect(Admin::SuspensionWorker).to have_received(:perform_async)
+    end
+  end
+
+  context 'when account is suspended' do
+    let!(:account) { Fabricate(:account, username: 'alice', domain: 'example.com', display_name: '') }
+
+    let(:payload) do
+      {
+        id: 'https://foo.test',
+        type: 'Actor',
+        inbox: 'https://foo.test/inbox',
+        suspended: false,
+        name: 'Hoge',
+      }.with_indifferent_access
+    end
+
+    before do
+      allow(Admin::UnsuspensionWorker).to receive(:perform_async)
+
+      account.suspend!(origin: suspension_origin)
+    end
+
+    subject { described_class.new.call('alice', 'example.com', payload) }
+
+    context 'locally' do
+      let(:suspension_origin) { :local }
+
+      it 'does not unsuspend it' do
+        expect(subject.suspended?).to be true
+      end
+
+      it 'does not update any attributes' do
+        expect(subject.display_name).to_not eq 'Hoge'
+      end
+    end
+
+    context 'remotely' do
+      let(:suspension_origin) { :remote }
+
+      it 'unsuspends it' do
+        expect(subject.suspended?).to be false
+      end
+
+      it 'queues unsuspension worker' do
+        subject
+        expect(Admin::UnsuspensionWorker).to have_received(:perform_async)
+      end
+
+      it 'updates attributes' do
+        expect(subject.display_name).to eq 'Hoge'
+      end
+    end
+  end
 end
diff --git a/spec/services/activitypub/process_collection_service_spec.rb b/spec/services/activitypub/process_collection_service_spec.rb
index b3baf6b6b545140891cfdf533ebf0967b5d22b14..00d71a86ab13bdc2509cc2ccf21cfb699462f27b 100644
--- a/spec/services/activitypub/process_collection_service_spec.rb
+++ b/spec/services/activitypub/process_collection_service_spec.rb
@@ -22,7 +22,48 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do
   subject { described_class.new }
 
   describe '#call' do
-    context 'when actor is the sender'
+    context 'when actor is suspended' do
+      before do
+        actor.suspend!(origin: :remote)
+      end
+
+      %w(Accept Add Announce Block Create Flag Follow Like Move Remove).each do |activity_type|
+        context "with #{activity_type} activity" do
+          let(:payload) do
+            {
+              '@context': 'https://www.w3.org/ns/activitystreams',
+              id: 'foo',
+              type: activity_type,
+              actor: ActivityPub::TagManager.instance.uri_for(actor),
+            }
+          end
+
+          it 'does not process payload' do
+            expect(ActivityPub::Activity).not_to receive(:factory)
+            subject.call(json, actor)
+          end
+        end
+      end
+
+      %w(Delete Reject Undo Update).each do |activity_type|
+        context "with #{activity_type} activity" do
+          let(:payload) do
+            {
+              '@context': 'https://www.w3.org/ns/activitystreams',
+              id: 'foo',
+              type: activity_type,
+              actor: ActivityPub::TagManager.instance.uri_for(actor),
+            }
+          end
+
+          it 'processes the payload' do
+            expect(ActivityPub::Activity).to receive(:factory)
+            subject.call(json, actor)
+          end
+        end
+      end
+    end
+
     context 'when actor differs from sender' do
       let(:forwarder) { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/other_account') }
 
diff --git a/spec/services/activitypub/synchronize_followers_service_spec.rb b/spec/services/activitypub/synchronize_followers_service_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..75dcf204b79517e4f641966a7acebc19278aff9b
--- /dev/null
+++ b/spec/services/activitypub/synchronize_followers_service_spec.rb
@@ -0,0 +1,105 @@
+require 'rails_helper'
+
+RSpec.describe ActivityPub::SynchronizeFollowersService, type: :service do
+  let(:actor)          { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/account', inbox_url: 'http://example.com/inbox') }
+  let(:alice)          { Fabricate(:account, username: 'alice') }
+  let(:bob)            { Fabricate(:account, username: 'bob') }
+  let(:eve)            { Fabricate(:account, username: 'eve') }
+  let(:mallory)        { Fabricate(:account, username: 'mallory') }
+  let(:collection_uri) { 'http://example.com/partial-followers' }
+
+  let(:items) do
+    [
+      ActivityPub::TagManager.instance.uri_for(alice),
+      ActivityPub::TagManager.instance.uri_for(eve),
+      ActivityPub::TagManager.instance.uri_for(mallory),
+    ]
+  end
+
+  let(:payload) do
+    {
+      '@context': 'https://www.w3.org/ns/activitystreams',
+      type: 'Collection',
+      id: collection_uri,
+      items: items,
+    }.with_indifferent_access
+  end
+
+  subject { described_class.new }
+
+  shared_examples 'synchronizes followers' do
+    before do
+      alice.follow!(actor)
+      bob.follow!(actor)
+      mallory.request_follow!(actor)
+
+      allow(ActivityPub::DeliveryWorker).to receive(:perform_async)
+
+      subject.call(actor, collection_uri)
+    end
+
+    it 'keeps expected followers' do
+      expect(alice.following?(actor)).to be true
+    end
+
+    it 'removes local followers not in the remote list' do
+      expect(bob.following?(actor)).to be false
+    end
+
+    it 'converts follow requests to follow relationships when they have been accepted' do
+      expect(mallory.following?(actor)).to be true
+    end
+
+    it 'sends an Undo Follow to the actor' do
+      expect(ActivityPub::DeliveryWorker).to have_received(:perform_async).with(anything, eve.id, actor.inbox_url)
+    end
+  end
+
+  describe '#call' do
+    context 'when the endpoint is a Collection of actor URIs' do
+      before do
+        stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload))
+      end
+
+      it_behaves_like 'synchronizes followers'
+    end
+
+    context 'when the endpoint is an OrderedCollection of actor URIs' do
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          type: 'OrderedCollection',
+          id: collection_uri,
+          orderedItems: items,
+        }.with_indifferent_access
+      end
+
+      before do
+        stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload))
+      end
+
+      it_behaves_like 'synchronizes followers'
+    end
+
+    context 'when the endpoint is a paginated Collection of actor URIs' do
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          type: 'Collection',
+          id: collection_uri,
+          first: {
+            type: 'CollectionPage',
+            partOf: collection_uri,
+            items: items,
+          }
+        }.with_indifferent_access
+      end
+
+      before do
+        stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload))
+      end
+
+      it_behaves_like 'synchronizes followers'
+    end
+  end
+end
diff --git a/spec/services/app_sign_up_service_spec.rb b/spec/services/app_sign_up_service_spec.rb
index e7c7f3ba15e6bfcb69df2996297f7e556be44cb7..e0c83b7041d1602560d62be5179be5342d606e1c 100644
--- a/spec/services/app_sign_up_service_spec.rb
+++ b/spec/services/app_sign_up_service_spec.rb
@@ -3,6 +3,7 @@ require 'rails_helper'
 RSpec.describe AppSignUpService, type: :service do
   let(:app) { Fabricate(:application, scopes: 'read write') }
   let(:good_params) { { username: 'alice', password: '12345678', email: 'good@email.com', agreement: true } }
+  let(:remote_ip) { IPAddr.new('198.0.2.1') }
 
   subject { described_class.new }
 
@@ -10,16 +11,16 @@ RSpec.describe AppSignUpService, type: :service do
     it 'returns nil when registrations are closed' do
       tmp = Setting.registrations_mode
       Setting.registrations_mode = 'none'
-      expect(subject.call(app, good_params)).to be_nil
+      expect(subject.call(app, remote_ip, good_params)).to be_nil
       Setting.registrations_mode = tmp
     end
 
     it 'raises an error when params are missing' do
-      expect { subject.call(app, {}) }.to raise_error ActiveRecord::RecordInvalid
+      expect { subject.call(app, remote_ip, {}) }.to raise_error ActiveRecord::RecordInvalid
     end
 
     it 'creates an unconfirmed user with access token' do
-      access_token = subject.call(app, good_params)
+      access_token = subject.call(app, remote_ip, good_params)
       expect(access_token).to_not be_nil
       user = User.find_by(id: access_token.resource_owner_id)
       expect(user).to_not be_nil
@@ -27,13 +28,13 @@ RSpec.describe AppSignUpService, type: :service do
     end
 
     it 'creates access token with the app\'s scopes' do
-      access_token = subject.call(app, good_params)
+      access_token = subject.call(app, remote_ip, good_params)
       expect(access_token).to_not be_nil
       expect(access_token.scopes.to_s).to eq 'read write'
     end
 
     it 'creates an account' do
-      access_token = subject.call(app, good_params)
+      access_token = subject.call(app, remote_ip, good_params)
       expect(access_token).to_not be_nil
       user = User.find_by(id: access_token.resource_owner_id)
       expect(user).to_not be_nil
@@ -42,7 +43,7 @@ RSpec.describe AppSignUpService, type: :service do
     end
 
     it 'creates an account with invite request text' do
-      access_token = subject.call(app, good_params.merge(reason: 'Foo bar'))
+      access_token = subject.call(app, remote_ip, good_params.merge(reason: 'Foo bar'))
       expect(access_token).to_not be_nil
       user = User.find_by(id: access_token.resource_owner_id)
       expect(user).to_not be_nil
diff --git a/spec/services/batched_remove_status_service_spec.rb b/spec/services/batched_remove_status_service_spec.rb
index f84256f187e17238b4b95026b65d9de32d9a005a..c1f54a6fd2a6b2b9d14c27ba088bb9675c5b3040 100644
--- a/spec/services/batched_remove_status_service_spec.rb
+++ b/spec/services/batched_remove_status_service_spec.rb
@@ -26,6 +26,11 @@ RSpec.describe BatchedRemoveStatusService, type: :service do
     subject.call([status1, status2])
   end
 
+  it 'removes statuses' do
+    expect { Status.find(status1.id) }.to raise_error ActiveRecord::RecordNotFound
+    expect { Status.find(status2.id) }.to raise_error ActiveRecord::RecordNotFound
+  end
+
   it 'removes statuses from author\'s home feed' do
     expect(HomeFeed.new(alice).get(10)).to_not include([status1.id, status2.id])
   end
@@ -38,10 +43,6 @@ RSpec.describe BatchedRemoveStatusService, type: :service do
     expect(Redis.current).to have_received(:publish).with("timeline:#{jeff.id}", any_args).at_least(:once)
   end
 
-  it 'notifies streaming API of author' do
-    expect(Redis.current).to have_received(:publish).with("timeline:#{alice.id}", any_args).at_least(:once)
-  end
-
   it 'notifies streaming API of public timeline' do
     expect(Redis.current).to have_received(:publish).with('timeline:public', any_args).at_least(:once)
   end
diff --git a/spec/services/delete_account_service_spec.rb b/spec/services/delete_account_service_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..cd7d32d5921940049015f2727b28ec57bf654b9a
--- /dev/null
+++ b/spec/services/delete_account_service_spec.rb
@@ -0,0 +1,96 @@
+require 'rails_helper'
+
+RSpec.describe DeleteAccountService, type: :service do
+  shared_examples 'common behavior' do
+    let!(:status) { Fabricate(:status, account: account) }
+    let!(:mention) { Fabricate(:mention, account: local_follower) }
+    let!(:status_with_mention) { Fabricate(:status, account: account, mentions: [mention]) }
+    let!(:media_attachment) { Fabricate(:media_attachment, account: account) }
+    let!(:notification) { Fabricate(:notification, account: account) }
+    let!(:favourite) { Fabricate(:favourite, account: account, status: Fabricate(:status, account: local_follower)) }
+    let!(:poll) { Fabricate(:poll, account: account) }
+    let!(:poll_vote) { Fabricate(:poll_vote, account: local_follower, poll: poll) }
+
+    let!(:active_relationship) { Fabricate(:follow, account: account, target_account: local_follower) }
+    let!(:passive_relationship) { Fabricate(:follow, account: local_follower, target_account: account) }
+    let!(:endorsement) { Fabricate(:account_pin, account: local_follower, target_account: account) }
+
+    let!(:mention_notification) { Fabricate(:notification, account: local_follower, activity: mention, type: :mention) }
+    let!(:status_notification) { Fabricate(:notification, account: local_follower, activity: status, type: :status) }
+    let!(:poll_notification) { Fabricate(:notification, account: local_follower, activity: poll, type: :poll) }
+    let!(:favourite_notification) { Fabricate(:notification, account: local_follower, activity: favourite, type: :favourite) }
+    let!(:follow_notification) { Fabricate(:notification, account: local_follower, activity: active_relationship, type: :follow) }
+
+    subject do
+      -> { described_class.new.call(account) }
+    end
+
+    it 'deletes associated owned records' do
+      is_expected.to change {
+        [
+          account.statuses,
+          account.media_attachments,
+          account.notifications,
+          account.favourites,
+          account.active_relationships,
+          account.passive_relationships,
+          account.polls,
+        ].map(&:count)
+      }.from([2, 1, 1, 1, 1, 1, 1]).to([0, 0, 0, 0, 0, 0, 0])
+    end
+
+    it 'deletes associated target records' do
+      is_expected.to change {
+        [
+          AccountPin.where(target_account: account),
+        ].map(&:count)
+      }.from([1]).to([0])
+    end
+
+    it 'deletes associated target notifications' do
+      is_expected.to change {
+        [
+          'poll', 'favourite', 'status', 'mention', 'follow'
+        ].map { |type| Notification.where(type: type).count }
+      }.from([1, 1, 1, 1, 1]).to([0, 0, 0, 0, 0])
+    end
+  end
+
+  describe '#call on local account' do
+    before do
+      stub_request(:post, "https://alice.com/inbox").to_return(status: 201)
+      stub_request(:post, "https://bob.com/inbox").to_return(status: 201)
+    end
+
+    let!(:remote_alice) { Fabricate(:account, inbox_url: 'https://alice.com/inbox', protocol: :activitypub) }
+    let!(:remote_bob) { Fabricate(:account, inbox_url: 'https://bob.com/inbox', protocol: :activitypub) }
+
+    include_examples 'common behavior' do
+      let!(:account) { Fabricate(:account) }
+      let!(:local_follower) { Fabricate(:account) }
+
+      it 'sends a delete actor activity to all known inboxes' do
+        subject.call
+        expect(a_request(:post, "https://alice.com/inbox")).to have_been_made.once
+        expect(a_request(:post, "https://bob.com/inbox")).to have_been_made.once
+      end
+    end
+  end
+
+  describe '#call on remote account' do
+    before do
+      stub_request(:post, "https://alice.com/inbox").to_return(status: 201)
+      stub_request(:post, "https://bob.com/inbox").to_return(status: 201)
+    end
+
+    include_examples 'common behavior' do
+      let!(:account) { Fabricate(:account, inbox_url: 'https://bob.com/inbox', protocol: :activitypub) }
+      let!(:local_follower) { Fabricate(:account) }
+
+      it 'sends a reject follow to follwer inboxes' do
+        subject.call
+        expect(a_request(:post, account.inbox_url)).to have_been_made.once
+      end
+    end
+  end
+end
diff --git a/spec/services/fan_out_on_write_service_spec.rb b/spec/services/fan_out_on_write_service_spec.rb
index b7fc7f7eda284cf25c300c2316f2627ab8f2d2bc..538dc25922bf80c874f06659b15f1b1537bdd930 100644
--- a/spec/services/fan_out_on_write_service_spec.rb
+++ b/spec/services/fan_out_on_write_service_spec.rb
@@ -28,10 +28,10 @@ RSpec.describe FanOutOnWriteService, type: :service do
   end
 
   it 'delivers status to hashtag' do
-    expect(Tag.find_by!(name: 'test').statuses.pluck(:id)).to include status.id
+    expect(TagFeed.new(Tag.find_by(name: 'test'), alice).get(20).map(&:id)).to include status.id
   end
 
   it 'delivers status to public timeline' do
-    expect(Status.as_public_timeline(alice).map(&:id)).to include status.id
+    expect(PublicFeed.new(alice).get(20).map(&:id)).to include status.id
   end
 end
diff --git a/spec/services/import_service_spec.rb b/spec/services/import_service_spec.rb
index 7618e9076184b90fb9ecb5f1593ff6adfbc1ecb0..764225aa7296c73e0ce3f41b12822bf2e6a64bc3 100644
--- a/spec/services/import_service_spec.rb
+++ b/spec/services/import_service_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 RSpec.describe ImportService, type: :service do
+  include RoutingHelper
+
   let!(:account) { Fabricate(:account, locked: false) }
   let!(:bob)     { Fabricate(:account, username: 'bob', locked: false) }
   let!(:eve)     { Fabricate(:account, username: 'eve', domain: 'example.com', locked: false, protocol: :activitypub, inbox_url: 'https://example.com/inbox') }
@@ -95,6 +97,7 @@ RSpec.describe ImportService, type: :service do
       let(:import) { Import.create(account: account, type: 'following', data: csv) }
       it 'follows the listed accounts, including boosts' do
         subject.call(import)
+
         expect(account.following.count).to eq 1
         expect(account.follow_requests.count).to eq 1
         expect(Follow.find_by(account: account, target_account: bob).show_reblogs).to be true
@@ -168,4 +171,44 @@ RSpec.describe ImportService, type: :service do
       end
     end
   end
+
+  context 'import bookmarks' do
+    subject { ImportService.new }
+
+    let(:csv) { attachment_fixture('bookmark-imports.txt') }
+
+    around(:each) do |example|
+      local_before = Rails.configuration.x.local_domain
+      web_before = Rails.configuration.x.web_domain
+      Rails.configuration.x.local_domain = 'local.com'
+      Rails.configuration.x.web_domain = 'local.com'
+      example.run
+      Rails.configuration.x.web_domain = web_before
+      Rails.configuration.x.local_domain = local_before
+    end
+
+    let(:local_account)  { Fabricate(:account, username: 'foo', domain: '') }
+    let!(:remote_status) { Fabricate(:status, uri: 'https://example.com/statuses/1312') }
+    let!(:direct_status) { Fabricate(:status, uri: 'https://example.com/statuses/direct', visibility: :direct) }
+
+    before do
+      service = double
+      allow(ActivityPub::FetchRemoteStatusService).to receive(:new).and_return(service)
+      allow(service).to receive(:call).with('https://unknown-remote.com/users/bar/statuses/1') do
+        Fabricate(:status, uri: 'https://unknown-remote.com/users/bar/statuses/1')
+      end
+    end
+
+    describe 'when no bookmarks are set' do
+      let(:import) { Import.create(account: account, type: 'bookmarks', data: csv) }
+      it 'adds the toots the user has access to to bookmarks' do
+        local_status = Fabricate(:status, account: local_account, uri: 'https://local.com/users/foo/statuses/42', id: 42, local: true)
+        subject.call(import)
+        expect(account.bookmarks.map(&:status).map(&:id)).to include(local_status.id)
+        expect(account.bookmarks.map(&:status).map(&:id)).to include(remote_status.id)
+        expect(account.bookmarks.map(&:status).map(&:id)).not_to include(direct_status.id)
+        expect(account.bookmarks.count).to eq 3
+      end
+    end
+  end
 end
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index 440018ac93d282994330367d64d28d57cd8d5373..f2cb22c5ef7508d1fd0a535dd379ecf0aec8a550 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -2,13 +2,14 @@ require 'rails_helper'
 
 RSpec.describe NotifyService, type: :service do
   subject do
-    -> { described_class.new.call(recipient, activity) }
+    -> { described_class.new.call(recipient, type, activity) }
   end
 
   let(:user) { Fabricate(:user) }
   let(:recipient) { user.account }
   let(:sender) { Fabricate(:account, domain: 'example.com') }
   let(:activity) { Fabricate(:follow, account: sender, target_account: recipient) }
+  let(:type) { :follow }
 
   it { is_expected.to change(Notification, :count).by(1) }
 
@@ -50,6 +51,7 @@ RSpec.describe NotifyService, type: :service do
 
   context 'for direct messages' do
     let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct)) }
+    let(:type)     { :mention }
 
     before do
       user.settings.interactions = user.settings.interactions.merge('must_be_following_dm' => enabled)
@@ -93,6 +95,7 @@ RSpec.describe NotifyService, type: :service do
   describe 'reblogs' do
     let(:status)   { Fabricate(:status, account: Fabricate(:account)) }
     let(:activity) { Fabricate(:status, account: sender, reblog: status) }
+    let(:type)     { :reblog }
 
     it 'shows reblogs by default' do
       recipient.follow!(sender)
@@ -114,6 +117,7 @@ RSpec.describe NotifyService, type: :service do
     let(:asshole)  { Fabricate(:account, username: 'asshole') }
     let(:reply_to) { Fabricate(:status, account: asshole) }
     let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, thread: reply_to)) }
+    let(:type)     { :mention }
 
     it 'does not notify when conversation is muted' do
       recipient.mute_conversation!(activity.status.conversation)
diff --git a/spec/services/remove_status_service_spec.rb b/spec/services/remove_status_service_spec.rb
index 06676ec45e20dd4120ab40fa7e2c9f749010ae02..7ce75b2c72b7b9fec6e7ae600f79be18246b84cb 100644
--- a/spec/services/remove_status_service_spec.rb
+++ b/spec/services/remove_status_service_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe RemoveStatusService, type: :service do
   subject { RemoveStatusService.new }
 
-  let!(:alice)  { Fabricate(:account) }
+  let!(:alice)  { Fabricate(:account, user: Fabricate(:user)) }
   let!(:bob)    { Fabricate(:account, username: 'bob', domain: 'example.com', salmon_url: 'http://example.com/salmon') }
   let!(:jeff)   { Fabricate(:account) }
   let!(:hank)   { Fabricate(:account, username: 'hank', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
@@ -17,23 +17,33 @@ RSpec.describe RemoveStatusService, type: :service do
     hank.follow!(alice)
 
     @status = PostStatusService.new.call(alice, text: 'Hello @bob@example.com')
+    FavouriteService.new.call(jeff, @status)
     Fabricate(:status, account: bill, reblog: @status, uri: 'hoge')
-    subject.call(@status)
   end
 
   it 'removes status from author\'s home feed' do
+    subject.call(@status)
     expect(HomeFeed.new(alice).get(10)).to_not include(@status.id)
   end
 
   it 'removes status from local follower\'s home feed' do
+    subject.call(@status)
     expect(HomeFeed.new(jeff).get(10)).to_not include(@status.id)
   end
 
   it 'sends delete activity to followers' do
+    subject.call(@status)
     expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.twice
   end
 
   it 'sends delete activity to rebloggers' do
+    subject.call(@status)
     expect(a_request(:post, 'http://example2.com/inbox')).to have_been_made
   end
+
+  it 'remove status from notifications' do
+    expect { subject.call(@status) }.to change {
+      Notification.where(activity_type: 'Favourite', from_account: jeff, account: alice).count
+    }.from(1).to(0)
+  end
 end
diff --git a/spec/services/resolve_account_service_spec.rb b/spec/services/resolve_account_service_spec.rb
index cea942e39cb8b0aab2d7b628819fd6b65268b827..a604e90b549794e33836b0ace0d091ca02c53c81 100644
--- a/spec/services/resolve_account_service_spec.rb
+++ b/spec/services/resolve_account_service_spec.rb
@@ -4,23 +4,101 @@ RSpec.describe ResolveAccountService, type: :service do
   subject { described_class.new }
 
   before do
-    stub_request(:get, "https://quitter.no/.well-known/host-meta").to_return(request_fixture('.host-meta.txt'))
-    stub_request(:get, "https://example.com/.well-known/webfinger?resource=acct:catsrgr8@example.com").to_return(status: 404)
     stub_request(:get, "https://example.com/.well-known/host-meta").to_return(status: 404)
     stub_request(:get, "https://quitter.no/avatar/7477-300-20160211190340.png").to_return(request_fixture('avatar.txt'))
-    stub_request(:get, "https://quitter.no/.well-known/webfinger?resource=acct:catsrgr8@quitter.no").to_return(status: 404)
     stub_request(:get, "https://ap.example.com/.well-known/webfinger?resource=acct:foo@ap.example.com").to_return(request_fixture('activitypub-webfinger.txt'))
     stub_request(:get, "https://ap.example.com/users/foo").to_return(request_fixture('activitypub-actor.txt'))
     stub_request(:get, "https://ap.example.com/users/foo.atom").to_return(request_fixture('activitypub-feed.txt'))
     stub_request(:get, %r{https://ap.example.com/users/foo/\w+}).to_return(status: 404)
+    stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:hoge@example.com').to_return(status: 410)
   end
 
-  it 'raises error if no such user can be resolved via webfinger' do
-    expect(subject.call('catsrgr8@quitter.no')).to be_nil
+  context 'when there is an LRDD endpoint but no resolvable account' do
+    before do
+      stub_request(:get, "https://quitter.no/.well-known/host-meta").to_return(request_fixture('.host-meta.txt'))
+      stub_request(:get, "https://quitter.no/.well-known/webfinger?resource=acct:catsrgr8@quitter.no").to_return(status: 404)
+    end
+
+    it 'returns nil' do
+      expect(subject.call('catsrgr8@quitter.no')).to be_nil
+    end
+  end
+
+  context 'when there is no LRDD endpoint nor resolvable account' do
+    before do
+      stub_request(:get, "https://example.com/.well-known/webfinger?resource=acct:catsrgr8@example.com").to_return(status: 404)
+    end
+
+    it 'returns nil' do
+      expect(subject.call('catsrgr8@example.com')).to be_nil
+    end
+  end
+
+  context 'when webfinger returns http gone' do
+    context 'for a previously known account' do
+      before do
+        Fabricate(:account, username: 'hoge', domain: 'example.com', last_webfingered_at: nil)
+        allow(AccountDeletionWorker).to receive(:perform_async)
+      end
+
+      it 'returns nil' do
+        expect(subject.call('hoge@example.com')).to be_nil
+      end
+
+      it 'queues account deletion worker' do
+        subject.call('hoge@example.com')
+        expect(AccountDeletionWorker).to have_received(:perform_async)
+      end
+    end
+
+    context 'for a previously unknown account' do
+      it 'returns nil' do
+        expect(subject.call('hoge@example.com')).to be_nil
+      end
+    end
+  end
+
+  context 'with a legitimate webfinger redirection' do
+    before do
+      webfinger = { subject: 'acct:foo@ap.example.com', links: [{ rel: 'self', href: 'https://ap.example.com/users/foo', type: 'application/activity+json' }] }
+      stub_request(:get, 'https://redirected.example.com/.well-known/webfinger?resource=acct:Foo@redirected.example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+    end
+
+    it 'returns new remote account' do
+      account = subject.call('Foo@redirected.example.com')
+
+      expect(account.activitypub?).to eq true
+      expect(account.acct).to eq 'foo@ap.example.com'
+      expect(account.inbox_url).to eq 'https://ap.example.com/users/foo/inbox'
+    end
+  end
+
+  context 'with a misconfigured redirection' do
+    before do
+      webfinger = { subject: 'acct:Foo@redirected.example.com', links: [{ rel: 'self', href: 'https://ap.example.com/users/foo', type: 'application/activity+json' }] }
+      stub_request(:get, 'https://redirected.example.com/.well-known/webfinger?resource=acct:Foo@redirected.example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+    end
+
+    it 'returns new remote account' do
+      account = subject.call('Foo@redirected.example.com')
+
+      expect(account.activitypub?).to eq true
+      expect(account.acct).to eq 'foo@ap.example.com'
+      expect(account.inbox_url).to eq 'https://ap.example.com/users/foo/inbox'
+    end
   end
 
-  it 'raises error if the domain does not have webfinger' do
-    expect(subject.call('catsrgr8@example.com')).to be_nil
+  context 'with too many webfinger redirections' do
+    before do
+      webfinger = { subject: 'acct:foo@evil.example.com', links: [{ rel: 'self', href: 'https://ap.example.com/users/foo', type: 'application/activity+json' }] }
+      stub_request(:get, 'https://redirected.example.com/.well-known/webfinger?resource=acct:Foo@redirected.example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+      webfinger2 = { subject: 'acct:foo@ap.example.com', links: [{ rel: 'self', href: 'https://ap.example.com/users/foo', type: 'application/activity+json' }] }
+      stub_request(:get, 'https://evil.example.com/.well-known/webfinger?resource=acct:foo@evil.example.com').to_return(body: Oj.dump(webfinger2), headers: { 'Content-Type': 'application/jrd+json' })
+    end
+
+    it 'returns new remote account' do
+      expect { subject.call('Foo@redirected.example.com') }.to raise_error Webfinger::RedirectError
+    end
   end
 
   context 'with an ActivityPub account' do
@@ -48,6 +126,41 @@ RSpec.describe ResolveAccountService, type: :service do
     end
   end
 
+  context 'with an already-known actor changing acct: URI' do
+    let!(:duplicate) { Fabricate(:account, username: 'foo', domain: 'old.example.com', uri: 'https://ap.example.com/users/foo') }
+    let!(:status)    { Fabricate(:status, account: duplicate, text: 'foo') }
+
+    it 'returns new remote account' do
+      account = subject.call('foo@ap.example.com')
+
+      expect(account.activitypub?).to eq true
+      expect(account.domain).to eq 'ap.example.com'
+      expect(account.inbox_url).to eq 'https://ap.example.com/users/foo/inbox'
+      expect(account.uri).to eq 'https://ap.example.com/users/foo'
+    end
+
+    it 'merges accounts' do
+      account = subject.call('foo@ap.example.com')
+
+      expect(status.reload.account_id).to eq account.id
+      expect(Account.where(uri: account.uri).count).to eq 1
+    end
+  end
+
+  context 'with an already-known acct: URI changing ActivityPub id' do
+    let!(:old_account) { Fabricate(:account, username: 'foo', domain: 'ap.example.com', uri: 'https://old.example.com/users/foo', last_webfingered_at: nil) }
+    let!(:status)    { Fabricate(:status, account: old_account, text: 'foo') }
+
+    it 'returns new remote account' do
+      account = subject.call('foo@ap.example.com')
+
+      expect(account.activitypub?).to eq true
+      expect(account.domain).to eq 'ap.example.com'
+      expect(account.inbox_url).to eq 'https://ap.example.com/users/foo/inbox'
+      expect(account.uri).to eq 'https://ap.example.com/users/foo'
+    end
+  end
+
   it 'processes one remote account at a time using locks' do
     wait_for_start = true
     fail_occurred  = false
diff --git a/spec/services/resolve_url_service_spec.rb b/spec/services/resolve_url_service_spec.rb
index aa4204637187d980ef2fc705fc4b442d63ff1375..a38b23590055f1cbd1076986da2753181e6bc821 100644
--- a/spec/services/resolve_url_service_spec.rb
+++ b/spec/services/resolve_url_service_spec.rb
@@ -15,5 +15,102 @@ describe ResolveURLService, type: :service do
 
       expect(subject.call(url)).to be_nil
     end
+
+    context 'searching for a remote private status' do
+      let(:account)  { Fabricate(:account) }
+      let(:poster)   { Fabricate(:account, domain: 'example.com') }
+      let(:url)      { 'https://example.com/@foo/42' }
+      let(:uri)      { 'https://example.com/users/foo/statuses/42' }
+      let!(:status)  { Fabricate(:status, url: url, uri: uri, account: poster, visibility: :private) }
+
+      before do
+        stub_request(:get, url).to_return(status: 404) if url.present?
+        stub_request(:get, uri).to_return(status: 404)
+      end
+
+      context 'when the account follows the poster' do
+        before do
+          account.follow!(poster)
+        end
+
+        context 'when the status uses Mastodon-style URLs' do
+          let(:url) { 'https://example.com/@foo/42' }
+          let(:uri) { 'https://example.com/users/foo/statuses/42' }
+
+          it 'returns status by url' do
+            expect(subject.call(url, on_behalf_of: account)).to eq(status)
+          end
+
+          it 'returns status by uri' do
+            expect(subject.call(uri, on_behalf_of: account)).to eq(status)
+          end
+        end
+
+        context 'when the status uses pleroma-style URLs' do
+          let(:url) { nil }
+          let(:uri) { 'https://example.com/objects/0123-456-789-abc-def' }
+
+          it 'returns status by uri' do
+            expect(subject.call(uri, on_behalf_of: account)).to eq(status)
+          end
+        end
+      end
+
+      context 'when the account does not follow the poster' do
+        context 'when the status uses Mastodon-style URLs' do
+          let(:url) { 'https://example.com/@foo/42' }
+          let(:uri) { 'https://example.com/users/foo/statuses/42' }
+
+          it 'does not return the status by url' do
+            expect(subject.call(url, on_behalf_of: account)).to be_nil
+          end
+
+          it 'does not return the status by uri' do
+            expect(subject.call(uri, on_behalf_of: account)).to be_nil
+          end
+        end
+
+        context 'when the status uses pleroma-style URLs' do
+          let(:url) { nil }
+          let(:uri) { 'https://example.com/objects/0123-456-789-abc-def' }
+
+          it 'returns status by uri' do
+            expect(subject.call(uri, on_behalf_of: account)).to be_nil
+          end
+        end
+      end
+    end
+
+    context 'searching for a local private status' do
+      let(:account) { Fabricate(:account) }
+      let(:poster)  { Fabricate(:account) }
+      let!(:status) { Fabricate(:status, account: poster, visibility: :private) }
+      let(:url)     { ActivityPub::TagManager.instance.url_for(status) }
+      let(:uri)     { ActivityPub::TagManager.instance.uri_for(status) }
+
+      context 'when the account follows the poster' do
+        before do
+          account.follow!(poster)
+        end
+
+        it 'returns status by url' do
+          expect(subject.call(url, on_behalf_of: account)).to eq(status)
+        end
+
+        it 'returns status by uri' do
+          expect(subject.call(uri, on_behalf_of: account)).to eq(status)
+        end
+      end
+
+      context 'when the account does not follow the poster' do
+        it 'does not return the status by url' do
+          expect(subject.call(url, on_behalf_of: account)).to be_nil
+        end
+
+        it 'does not return the status by uri' do
+          expect(subject.call(uri, on_behalf_of: account)).to be_nil
+        end
+      end
+    end
   end
 end
diff --git a/spec/services/suspend_account_service_spec.rb b/spec/services/suspend_account_service_spec.rb
deleted file mode 100644
index 32726d7639786356411ea06f3aa5720d16bf9d0f..0000000000000000000000000000000000000000
--- a/spec/services/suspend_account_service_spec.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe SuspendAccountService, type: :service do
-  describe '#call on local account' do
-    before do
-      stub_request(:post, "https://alice.com/inbox").to_return(status: 201)
-      stub_request(:post, "https://bob.com/inbox").to_return(status: 201)
-    end
-
-    subject do
-      -> { described_class.new.call(account) }
-    end
-
-    let!(:account) { Fabricate(:account) }
-    let!(:status) { Fabricate(:status, account: account) }
-    let!(:media_attachment) { Fabricate(:media_attachment, account: account) }
-    let!(:notification) { Fabricate(:notification, account: account) }
-    let!(:favourite) { Fabricate(:favourite, account: account) }
-    let!(:active_relationship) { Fabricate(:follow, account: account) }
-    let!(:passive_relationship) { Fabricate(:follow, target_account: account) }
-    let!(:remote_alice) { Fabricate(:account, inbox_url: 'https://alice.com/inbox', protocol: :activitypub) }
-    let!(:remote_bob) { Fabricate(:account, inbox_url: 'https://bob.com/inbox', protocol: :activitypub) }
-    let!(:endorsment) { Fabricate(:account_pin, account: passive_relationship.account, target_account: account) }
-
-    it 'deletes associated records' do
-      is_expected.to change {
-        [
-          account.statuses,
-          account.media_attachments,
-          account.notifications,
-          account.favourites,
-          account.active_relationships,
-          account.passive_relationships,
-          AccountPin.where(target_account: account),
-        ].map(&:count)
-      }.from([1, 1, 1, 1, 1, 1, 1]).to([0, 0, 0, 0, 0, 0, 0])
-    end
-
-    it 'sends a delete actor activity to all known inboxes' do
-      subject.call
-      expect(a_request(:post, "https://alice.com/inbox")).to have_been_made.once
-      expect(a_request(:post, "https://bob.com/inbox")).to have_been_made.once
-    end
-  end
-
-  describe '#call on remote account' do
-    before do
-      stub_request(:post, "https://alice.com/inbox").to_return(status: 201)
-      stub_request(:post, "https://bob.com/inbox").to_return(status: 201)
-    end
-
-    subject do
-      -> { described_class.new.call(remote_bob) }
-    end
-
-    let!(:account) { Fabricate(:account) }
-    let!(:remote_alice) { Fabricate(:account, inbox_url: 'https://alice.com/inbox', protocol: :activitypub) }
-    let!(:remote_bob) { Fabricate(:account, inbox_url: 'https://bob.com/inbox', protocol: :activitypub) }
-    let!(:status) { Fabricate(:status, account: remote_bob) }
-    let!(:media_attachment) { Fabricate(:media_attachment, account: remote_bob) }
-    let!(:notification) { Fabricate(:notification, account: remote_bob) }
-    let!(:favourite) { Fabricate(:favourite, account: remote_bob) }
-    let!(:active_relationship) { Fabricate(:follow, account: remote_bob, target_account: account) }
-    let!(:passive_relationship) { Fabricate(:follow, target_account: remote_bob) }
-
-    it 'deletes associated records' do
-      is_expected.to change {
-        [
-          remote_bob.statuses,
-          remote_bob.media_attachments,
-          remote_bob.notifications,
-          remote_bob.favourites,
-          remote_bob.active_relationships,
-          remote_bob.passive_relationships,
-        ].map(&:count)
-      }.from([1, 1, 1, 1, 1, 1]).to([0, 0, 0, 0, 0, 0])
-    end
-
-    it 'sends a reject follow to follwer inboxes' do
-      subject.call
-      expect(a_request(:post, remote_bob.inbox_url)).to have_been_made.once
-    end
-  end
-end
diff --git a/spec/services/unallow_domain_service_spec.rb b/spec/services/unallow_domain_service_spec.rb
index 559e152fb250e033b018ec6746c2ed7750c07d73..b93945b9a2ae45e04f7d1f5b6be133627982ca1d 100644
--- a/spec/services/unallow_domain_service_spec.rb
+++ b/spec/services/unallow_domain_service_spec.rb
@@ -55,9 +55,9 @@ RSpec.describe UnallowDomainService, type: :service do
       end
 
       it 'removes the remote accounts\'s statuses and media attachments' do
-        expect { bad_status1.reload }.to_not raise_exception ActiveRecord::RecordNotFound
-        expect { bad_status2.reload }.to_not raise_exception ActiveRecord::RecordNotFound
-        expect { bad_attachment.reload }.to_not raise_exception ActiveRecord::RecordNotFound
+        expect { bad_status1.reload }.to_not raise_error
+        expect { bad_status2.reload }.to_not raise_error
+        expect { bad_attachment.reload }.to_not raise_error
       end
     end
   end
diff --git a/spec/validators/blacklisted_email_validator_spec.rb b/spec/validators/blacklisted_email_validator_spec.rb
index ccc5dc0f485050fb017d3df4b9f8270250950bad..f0708dc4623724aa6b7c09dc4a3d38442ebbcfe6 100644
--- a/spec/validators/blacklisted_email_validator_spec.rb
+++ b/spec/validators/blacklisted_email_validator_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe BlacklistedEmailValidator, type: :validator do
       let(:blocked_email) { true }
 
       it 'calls errors.add' do
-        expect(errors).to have_received(:add).with(:email, I18n.t('users.invalid_email'))
+        expect(errors).to have_received(:add).with(:email, I18n.t('users.blocked_email_provider'))
       end
     end
 
@@ -25,7 +25,7 @@ RSpec.describe BlacklistedEmailValidator, type: :validator do
       let(:blocked_email) { false }
 
       it 'not calls errors.add' do
-        expect(errors).not_to have_received(:add).with(:email, I18n.t('users.invalid_email'))
+        expect(errors).not_to have_received(:add).with(:email, I18n.t('users.blocked_email_provider'))
       end
     end
   end
diff --git a/spec/workers/activitypub/delivery_worker_spec.rb b/spec/workers/activitypub/delivery_worker_spec.rb
index 351be185cd6939f533cc1dab5406272f27b54cac..f4633731e506769c19ea4f140b515aa7215b5d9c 100644
--- a/spec/workers/activitypub/delivery_worker_spec.rb
+++ b/spec/workers/activitypub/delivery_worker_spec.rb
@@ -3,16 +3,22 @@
 require 'rails_helper'
 
 describe ActivityPub::DeliveryWorker do
+  include RoutingHelper
+
   subject { described_class.new }
 
   let(:sender)  { Fabricate(:account) }
   let(:payload) { 'test' }
 
+  before do
+    allow_any_instance_of(Account).to receive(:remote_followers_hash).with('https://example.com/').and_return('somehash')
+  end
+
   describe 'perform' do
     it 'performs a request' do
       stub_request(:post, 'https://example.com/api').to_return(status: 200)
-      subject.perform(payload, sender.id, 'https://example.com/api')
-      expect(a_request(:post, 'https://example.com/api')).to have_been_made.once
+      subject.perform(payload, sender.id, 'https://example.com/api', { synchronize_followers: true })
+      expect(a_request(:post, 'https://example.com/api').with(headers: { 'Collection-Synchronization' => "collectionId=\"#{account_followers_url(sender)}\", digest=\"somehash\", url=\"#{account_followers_synchronization_url(sender)}\"" })).to have_been_made.once
     end
 
     it 'raises when request fails' do
diff --git a/spec/workers/refollow_worker_spec.rb b/spec/workers/refollow_worker_spec.rb
index 29771aa59b7e396948bc861157e421a163b9103b..df6731b6400041db44247083945c7618ff166528 100644
--- a/spec/workers/refollow_worker_spec.rb
+++ b/spec/workers/refollow_worker_spec.rb
@@ -23,8 +23,8 @@ describe RefollowWorker do
       result = subject.perform(account.id)
 
       expect(result).to be_nil
-      expect(service).to have_received(:call).with(alice, account, reblogs: true)
-      expect(service).to have_received(:call).with(bob, account, reblogs: false)
+      expect(service).to have_received(:call).with(alice, account, reblogs: true, notify: false, bypass_limit: true)
+      expect(service).to have_received(:call).with(bob, account, reblogs: false, notify: false, bypass_limit: true)
     end
   end
 end
diff --git a/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb b/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb
index 7fae680ba66a5df4ea96d8ef6bffe6520a416625..914eed829d298ee6ddca9c2d4512f25a983ec4f3 100644
--- a/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb
+++ b/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb
@@ -16,8 +16,8 @@ describe Scheduler::FeedCleanupScheduler do
 
     expect(Redis.current.zcard(feed_key_for(inactive_user))).to eq 0
     expect(Redis.current.zcard(feed_key_for(active_user))).to eq 1
-    expect(Redis.current.exists(feed_key_for(inactive_user, 'reblogs'))).to be false
-    expect(Redis.current.exists(feed_key_for(inactive_user, 'reblogs:2'))).to be false
+    expect(Redis.current.exists?(feed_key_for(inactive_user, 'reblogs'))).to be false
+    expect(Redis.current.exists?(feed_key_for(inactive_user, 'reblogs:2'))).to be false
   end
 
   def feed_key_for(user, subtype = nil)
diff --git a/streaming/index.js b/streaming/index.js
index 39e70c1ba7ef9ad1a1760b07616fe60c22773710..3279bd94ebc977a3195f06eb4ac7173c10488ca3 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -1,3 +1,5 @@
+// @ts-check
+
 const os = require('os');
 const throng = require('throng');
 const dotenv = require('dotenv');
@@ -12,7 +14,7 @@ const uuid = require('uuid');
 const fs = require('fs');
 
 const env = process.env.NODE_ENV || 'development';
-const alwaysRequireAuth = process.env.WHITELIST_MODE === 'true' || process.env.AUTHORIZED_FETCH === 'true';
+const alwaysRequireAuth = process.env.LIMITED_FEDERATION_MODE === 'true' || process.env.WHITELIST_MODE === 'true' || process.env.AUTHORIZED_FETCH === 'true';
 
 dotenv.config({
   path: env === 'production' ? '.env.production' : '.env',
@@ -20,6 +22,10 @@ dotenv.config({
 
 log.level = process.env.LOG_LEVEL || 'verbose';
 
+/**
+ * @param {string} dbUrl
+ * @return {Object.<string, any>}
+ */
 const dbUrlToConfig = (dbUrl) => {
   if (!dbUrl) {
     return {};
@@ -53,6 +59,10 @@ const dbUrlToConfig = (dbUrl) => {
   return config;
 };
 
+/**
+ * @param {Object.<string, any>} defaultConfig
+ * @param {string} redisUrl
+ */
 const redisUrlToClient = (defaultConfig, redisUrl) => {
   const config = defaultConfig;
 
@@ -71,6 +81,19 @@ const redisUrlToClient = (defaultConfig, redisUrl) => {
 
 const numWorkers = +process.env.STREAMING_CLUSTER_NUM || (env === 'development' ? 1 : Math.max(os.cpus().length - 1, 1));
 
+/**
+ * @param {string} json
+ * @return {Object.<string, any>|null}
+ */
+const parseJSON = (json) => {
+  try {
+    return JSON.parse(json);
+  } catch (err) {
+    log.error(err);
+    return null;
+  }
+};
+
 const startMaster = () => {
   if (!process.env.SOCKET && process.env.PORT && isNaN(+process.env.PORT)) {
     log.warn('UNIX domain socket is now supported by using SOCKET. Please migrate from PORT hack.');
@@ -108,6 +131,7 @@ const startWorker = (workerId) => {
   }
 
   const app = express();
+
   app.set('trusted proxy', process.env.TRUSTED_PROXY_IP || 'loopback,uniquelocal');
 
   const pgPool = new pg.Pool(Object.assign(pgConfigs[env], dbUrlToConfig(process.env.DATABASE_URL)));
@@ -130,6 +154,9 @@ const startWorker = (workerId) => {
   const redisSubscribeClient = redisUrlToClient(redisParams, process.env.REDIS_URL);
   const redisClient = redisUrlToClient(redisParams, process.env.REDIS_URL);
 
+  /**
+   * @type {Object.<string, Array.<function(string): void>>}
+   */
   const subs = {};
 
   redisSubscribeClient.on('message', (channel, message) => {
@@ -144,11 +171,11 @@ const startWorker = (workerId) => {
     callbacks.forEach(callback => callback(message));
   });
 
+  /**
+   * @param {string[]} channels
+   * @return {function(): void}
+   */
   const subscriptionHeartbeat = channels => {
-    if (!Array.isArray(channels)) {
-      channels = [channels];
-    }
-
     const interval = 6 * 60;
 
     const tellSubscribed = () => {
@@ -164,25 +191,66 @@ const startWorker = (workerId) => {
     };
   };
 
+  /**
+   * @param {string} channel
+   * @param {function(string): void} callback
+   */
   const subscribe = (channel, callback) => {
     log.silly(`Adding listener for ${channel}`);
     subs[channel] = subs[channel] || [];
+
     if (subs[channel].length === 0) {
       log.verbose(`Subscribe ${channel}`);
       redisSubscribeClient.subscribe(channel);
     }
+
     subs[channel].push(callback);
   };
 
+  /**
+   * @param {string} channel
+   * @param {function(string): void} callback
+   */
   const unsubscribe = (channel, callback) => {
     log.silly(`Removing listener for ${channel}`);
+
+    if (!subs[channel]) {
+      return;
+    }
+
     subs[channel] = subs[channel].filter(item => item !== callback);
+
     if (subs[channel].length === 0) {
       log.verbose(`Unsubscribe ${channel}`);
       redisSubscribeClient.unsubscribe(channel);
+      delete subs[channel];
     }
   };
 
+  const FALSE_VALUES = [
+    false,
+    0,
+    '0',
+    'f',
+    'F',
+    'false',
+    'FALSE',
+    'off',
+    'OFF',
+  ];
+
+  /**
+   * @param {any} value
+   * @return {boolean}
+   */
+  const isTruthy = value =>
+    value && !FALSE_VALUES.includes(value);
+
+  /**
+   * @param {any} req
+   * @param {any} res
+   * @param {function(Error=): void}
+   */
   const allowCrossDomain = (req, res, next) => {
     res.header('Access-Control-Allow-Origin', '*');
     res.header('Access-Control-Allow-Headers', 'Authorization, Accept, Cache-Control');
@@ -191,6 +259,11 @@ const startWorker = (workerId) => {
     next();
   };
 
+  /**
+   * @param {any} req
+   * @param {any} res
+   * @param {function(Error=): void}
+   */
   const setRequestId = (req, res, next) => {
     req.requestId = uuid.v4();
     res.header('X-Request-Id', req.requestId);
@@ -198,79 +271,118 @@ const startWorker = (workerId) => {
     next();
   };
 
+  /**
+   * @param {any} req
+   * @param {any} res
+   * @param {function(Error=): void}
+   */
   const setRemoteAddress = (req, res, next) => {
     req.remoteAddress = req.connection.remoteAddress;
 
     next();
   };
 
-  const accountFromToken = (token, allowedScopes, req, next) => {
+  /**
+   * @param {string} token
+   * @param {any} req
+   * @return {Promise.<void>}
+   */
+  const accountFromToken = (token, req) => new Promise((resolve, reject) => {
     pgPool.connect((err, client, done) => {
       if (err) {
-        next(err);
+        reject(err);
         return;
       }
 
-      client.query('SELECT oauth_access_tokens.resource_owner_id, users.account_id, users.chosen_languages, oauth_access_tokens.scopes, devices.device_id FROM oauth_access_tokens INNER JOIN users ON oauth_access_tokens.resource_owner_id = users.id LEFT OUTER JOIN devices ON oauth_access_tokens.id = devices.access_token_id WHERE oauth_access_tokens.token = $1 AND oauth_access_tokens.revoked_at IS NULL LIMIT 1', [token], (err, result) => {
+      client.query('SELECT oauth_access_tokens.id, oauth_access_tokens.resource_owner_id, users.account_id, users.chosen_languages, oauth_access_tokens.scopes, devices.device_id FROM oauth_access_tokens INNER JOIN users ON oauth_access_tokens.resource_owner_id = users.id LEFT OUTER JOIN devices ON oauth_access_tokens.id = devices.access_token_id WHERE oauth_access_tokens.token = $1 AND oauth_access_tokens.revoked_at IS NULL LIMIT 1', [token], (err, result) => {
         done();
 
         if (err) {
-          next(err);
+          reject(err);
           return;
         }
 
         if (result.rows.length === 0) {
           err = new Error('Invalid access token');
-          err.statusCode = 401;
-
-          next(err);
-          return;
-        }
-
-        const scopes = result.rows[0].scopes.split(' ');
+          err.status = 401;
 
-        if (allowedScopes.size > 0 && !scopes.some(scope => allowedScopes.includes(scope))) {
-          err = new Error('Access token does not cover required scopes');
-          err.statusCode = 401;
-
-          next(err);
+          reject(err);
           return;
         }
 
+        req.accessTokenId = result.rows[0].id;
+        req.scopes = result.rows[0].scopes.split(' ');
         req.accountId = result.rows[0].account_id;
         req.chosenLanguages = result.rows[0].chosen_languages;
-        req.allowNotifications = scopes.some(scope => ['read', 'read:notifications'].includes(scope));
+        req.allowNotifications = req.scopes.some(scope => ['read', 'read:notifications'].includes(scope));
         req.deviceId = result.rows[0].device_id;
 
-        next();
+        resolve();
       });
     });
-  };
+  });
 
-  const accountFromRequest = (req, next, required = true, allowedScopes = ['read']) => {
+  /**
+   * @param {any} req
+   * @param {boolean=} required
+   * @return {Promise.<void>}
+   */
+  const accountFromRequest = (req, required = true) => new Promise((resolve, reject) => {
     const authorization = req.headers.authorization;
-    const location = url.parse(req.url, true);
-    const accessToken = location.query.access_token || req.headers['sec-websocket-protocol'];
+    const location      = url.parse(req.url, true);
+    const accessToken   = location.query.access_token || req.headers['sec-websocket-protocol'];
 
     if (!authorization && !accessToken) {
       if (required) {
         const err = new Error('Missing access token');
-        err.statusCode = 401;
+        err.status = 401;
 
-        next(err);
+        reject(err);
         return;
       } else {
-        next();
+        resolve();
         return;
       }
     }
 
     const token = authorization ? authorization.replace(/^Bearer /, '') : accessToken;
 
-    accountFromToken(token, allowedScopes, req, next);
+    resolve(accountFromToken(token, req));
+  });
+
+  /**
+   * @param {any} req
+   * @return {string}
+   */
+  const channelNameFromPath = req => {
+    const { path, query } = req;
+    const onlyMedia = isTruthy(query.only_media);
+
+    switch(path) {
+    case '/api/v1/streaming/user':
+      return 'user';
+    case '/api/v1/streaming/user/notification':
+      return 'user:notification';
+    case '/api/v1/streaming/public':
+      return onlyMedia ? 'public:media' : 'public';
+    case '/api/v1/streaming/public/local':
+      return onlyMedia ? 'public:local:media' : 'public:local';
+    case '/api/v1/streaming/public/remote':
+      return onlyMedia ? 'public:remote:media' : 'public:remote';
+    case '/api/v1/streaming/hashtag':
+      return 'hashtag';
+    case '/api/v1/streaming/hashtag/local':
+      return 'hashtag:local';
+    case '/api/v1/streaming/direct':
+      return 'direct';
+    case '/api/v1/streaming/list':
+      return 'list';
+    default:
+      return undefined;
+    }
   };
 
-  const PUBLIC_STREAMS = [
+  const PUBLIC_CHANNELS = [
     'public',
     'public:media',
     'public:local',
@@ -281,99 +393,208 @@ const startWorker = (workerId) => {
     'hashtag:local',
   ];
 
-  const wsVerifyClient = (info, cb) => {
-    const location = url.parse(info.req.url, true);
-    const authRequired = alwaysRequireAuth || !PUBLIC_STREAMS.some(stream => stream === location.query.stream);
-    const allowedScopes = [];
+  /**
+   * @param {any} req
+   * @param {string} channelName
+   * @return {Promise.<void>}
+   */
+  const checkScopes = (req, channelName) => new Promise((resolve, reject) => {
+    log.silly(req.requestId, `Checking OAuth scopes for ${channelName}`);
+
+    // When accessing public channels, no scopes are needed
+    if (PUBLIC_CHANNELS.includes(channelName)) {
+      resolve();
+      return;
+    }
 
-    if (authRequired) {
-      allowedScopes.push('read');
-      if (location.query.stream === 'user:notification') {
-        allowedScopes.push('read:notifications');
-      } else {
-        allowedScopes.push('read:statuses');
-      }
+    // The `read` scope has the highest priority, if the token has it
+    // then it can access all streams
+    const requiredScopes = ['read'];
+
+    // When accessing specifically the notifications stream,
+    // we need a read:notifications, while in all other cases,
+    // we can allow access with read:statuses. Mind that the
+    // user stream will not contain notifications unless
+    // the token has either read or read:notifications scope
+    // as well, this is handled separately.
+    if (channelName === 'user:notification') {
+      requiredScopes.push('read:notifications');
+    } else {
+      requiredScopes.push('read:statuses');
     }
 
-    accountFromRequest(info.req, err => {
-      if (!err) {
-        cb(true, undefined, undefined);
-      } else {
-        log.error(info.req.requestId, err.toString());
-        cb(false, 401, 'Unauthorized');
+    if (requiredScopes.some(requiredScope => req.scopes.includes(requiredScope))) {
+      resolve();
+      return;
+    }
+
+    const err = new Error('Access token does not cover required scopes');
+    err.status = 401;
+
+    reject(err);
+  });
+
+  /**
+   * @param {any} info
+   * @param {function(boolean, number, string): void} callback
+   */
+  const wsVerifyClient = (info, callback) => {
+    // When verifying the websockets connection, we no longer pre-emptively
+    // check OAuth scopes and drop the connection if they're missing. We only
+    // drop the connection if access without token is not allowed by environment
+    // variables. OAuth scope checks are moved to the point of subscription
+    // to a specific stream.
+
+    accountFromRequest(info.req, alwaysRequireAuth).then(() => {
+      callback(true, undefined, undefined);
+    }).catch(err => {
+      log.error(info.req.requestId, err.toString());
+      callback(false, 401, 'Unauthorized');
+    });
+  };
+
+  /**
+   * @typedef SystemMessageHandlers
+   * @property {function(): void} onKill
+   */
+
+  /**
+   * @param {any} req
+   * @param {SystemMessageHandlers} eventHandlers
+   * @return {function(string): void}
+   */
+  const createSystemMessageListener = (req, eventHandlers) => {
+    return message => {
+      const json = parseJSON(message);
+
+      if (!json) return;
+
+      const { event } = json;
+
+      log.silly(req.requestId, `System message for ${req.accountId}: ${event}`);
+
+      if (event === 'kill') {
+        log.verbose(req.requestId, `Closing connection for ${req.accountId} due to expired access token`);
+        eventHandlers.onKill();
       }
-    }, authRequired, allowedScopes);
+    };
   };
 
-  const PUBLIC_ENDPOINTS = [
-    '/api/v1/streaming/public',
-    '/api/v1/streaming/public/local',
-    '/api/v1/streaming/public/remote',
-    '/api/v1/streaming/hashtag',
-    '/api/v1/streaming/hashtag/local',
-  ];
+  /**
+   * @param {any} req
+   * @param {any} res
+   */
+  const subscribeHttpToSystemChannel = (req, res) => {
+    const systemChannelId = `timeline:access_token:${req.accessTokenId}`;
+
+    const listener = createSystemMessageListener(req, {
+
+      onKill () {
+        res.end();
+      },
+
+    });
+
+    res.on('close', () => {
+      unsubscribe(`${redisPrefix}${systemChannelId}`, listener);
+    });
 
+    subscribe(`${redisPrefix}${systemChannelId}`, listener);
+  };
+
+  /**
+   * @param {any} req
+   * @param {any} res
+   * @param {function(Error=): void} next
+   */
   const authenticationMiddleware = (req, res, next) => {
     if (req.method === 'OPTIONS') {
       next();
       return;
     }
 
-    const authRequired = alwaysRequireAuth || !PUBLIC_ENDPOINTS.some(endpoint => endpoint === req.path);
-    const allowedScopes = [];
-
-    if (authRequired) {
-      allowedScopes.push('read');
-      if (req.path === '/api/v1/streaming/user/notification') {
-        allowedScopes.push('read:notifications');
-      } else {
-        allowedScopes.push('read:statuses');
-      }
-    }
-
-    accountFromRequest(req, next, authRequired, allowedScopes);
+    accountFromRequest(req, alwaysRequireAuth).then(() => checkScopes(req, channelNameFromPath(req))).then(() => {
+      subscribeHttpToSystemChannel(req, res);
+    }).then(() => {
+      next();
+    }).catch(err => {
+      next(err);
+    });
   };
 
-  const errorMiddleware = (err, req, res, {}) => {
+  /**
+   * @param {Error} err
+   * @param {any} req
+   * @param {any} res
+   * @param {function(Error=): void} next
+   */
+  const errorMiddleware = (err, req, res, next) => {
     log.error(req.requestId, err.toString());
-    res.writeHead(err.statusCode || 500, { 'Content-Type': 'application/json' });
-    res.end(JSON.stringify({ error: err.statusCode ? err.toString() : 'An unexpected error occurred' }));
+
+    if (res.headersSent) {
+      next(err);
+      return;
+    }
+
+    res.writeHead(err.status || 500, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ error: err.status ? err.toString() : 'An unexpected error occurred' }));
   };
 
+  /**
+   * @param {array}
+   * @param {number=} shift
+   * @return {string}
+   */
   const placeholders = (arr, shift = 0) => arr.map((_, i) => `$${i + 1 + shift}`).join(', ');
 
-  const authorizeListAccess = (id, req, next) => {
+  /**
+   * @param {string} listId
+   * @param {any} req
+   * @return {Promise.<void>}
+   */
+  const authorizeListAccess = (listId, req) => new Promise((resolve, reject) => {
+    const { accountId } = req;
+
     pgPool.connect((err, client, done) => {
       if (err) {
-        next(false);
+        reject();
         return;
       }
 
-      client.query('SELECT id, account_id FROM lists WHERE id = $1 LIMIT 1', [id], (err, result) => {
+      client.query('SELECT id, account_id FROM lists WHERE id = $1 LIMIT 1', [listId], (err, result) => {
         done();
 
-        if (err || result.rows.length === 0 || result.rows[0].account_id !== req.accountId) {
-          next(false);
+        if (err || result.rows.length === 0 || result.rows[0].account_id !== accountId) {
+          reject();
           return;
         }
 
-        next(true);
+        resolve();
       });
     });
-  };
+  });
 
+  /**
+   * @param {string[]} ids
+   * @param {any} req
+   * @param {function(string, string): void} output
+   * @param {function(string[], function(string): void): void} attachCloseHandler
+   * @param {boolean=} needsFiltering
+   * @param {boolean=} notificationOnly
+   * @return {function(string): void}
+   */
   const streamFrom = (ids, req, output, attachCloseHandler, needsFiltering = false, notificationOnly = false) => {
     const accountId  = req.accountId || req.remoteAddress;
     const streamType = notificationOnly ? ' (notification)' : '';
 
-    if (!Array.isArray(ids)) {
-      ids = [ids];
-    }
-
     log.verbose(req.requestId, `Starting stream from ${ids.join(', ')} for ${accountId}${streamType}`);
 
     const listener = message => {
-      const { event, payload, queued_at } = JSON.parse(message);
+      const json = parseJSON(message);
+
+      if (!json) return;
+
+      const { event, payload, queued_at } = json;
 
       const transmit = () => {
         const now            = new Date().getTime();
@@ -447,10 +668,18 @@ const startWorker = (workerId) => {
       subscribe(`${redisPrefix}${id}`, listener);
     });
 
-    attachCloseHandler(ids.map(id => `${redisPrefix}${id}`), listener);
+    if (attachCloseHandler) {
+      attachCloseHandler(ids.map(id => `${redisPrefix}${id}`), listener);
+    }
+
+    return listener;
   };
 
-  // Setup stream output to HTTP
+  /**
+   * @param {any} req
+   * @param {any} res
+   * @return {function(string, string): void}
+   */
   const streamToHttp = (req, res) => {
     const accountId = req.accountId || req.remoteAddress;
 
@@ -473,12 +702,12 @@ const startWorker = (workerId) => {
     };
   };
 
-  // Setup stream end for HTTP
-  const streamHttpEnd = (req, closeHandler = false) => (ids, listener) => {
-    if (!Array.isArray(ids)) {
-      ids = [ids];
-    }
-
+  /**
+   * @param {any} req
+   * @param {function(): void} [closeHandler]
+   * @return {function(string[], function(string): void)}
+   */
+  const streamHttpEnd = (req, closeHandler = undefined) => (ids, listener) => {
     req.on('close', () => {
       ids.forEach(id => {
         unsubscribe(id, listener);
@@ -490,37 +719,24 @@ const startWorker = (workerId) => {
     });
   };
 
-  // Setup stream output to WebSockets
-  const streamToWs = (req, ws) => (event, payload) => {
+  /**
+   * @param {any} req
+   * @param {any} ws
+   * @param {string[]} streamName
+   * @return {function(string, string): void}
+   */
+  const streamToWs = (req, ws, streamName) => (event, payload) => {
     if (ws.readyState !== ws.OPEN) {
       log.error(req.requestId, 'Tried writing to closed socket');
       return;
     }
 
-    ws.send(JSON.stringify({ event, payload }));
-  };
-
-  // Setup stream end for WebSockets
-  const streamWsEnd = (req, ws, closeHandler = false) => (id, listener) => {
-    const accountId = req.accountId || req.remoteAddress;
-
-    ws.on('close', () => {
-      log.verbose(req.requestId, `Ending stream for ${accountId}`);
-      unsubscribe(id, listener);
-      if (closeHandler) {
-        closeHandler();
-      }
-    });
-
-    ws.on('error', () => {
-      log.verbose(req.requestId, `Ending stream for ${accountId}`);
-      unsubscribe(id, listener);
-      if (closeHandler) {
-        closeHandler();
-      }
-    });
+    ws.send(JSON.stringify({ stream: streamName, event, payload }));
   };
 
+  /**
+   * @param {any} res
+   */
   const httpNotFound = res => {
     res.writeHead(404, { 'Content-Type': 'application/json' });
     res.end(JSON.stringify({ error: 'Not found' }));
@@ -538,157 +754,297 @@ const startWorker = (workerId) => {
   app.use(authenticationMiddleware);
   app.use(errorMiddleware);
 
-  app.get('/api/v1/streaming/user', (req, res) => {
-    const channels = [`timeline:${req.accountId}`];
-
-    if (req.deviceId) {
-      channels.push(`timeline:${req.accountId}:${req.deviceId}`);
-    }
-
-    streamFrom(channels, req, streamToHttp(req, res), streamHttpEnd(req, subscriptionHeartbeat(channels)));
-  });
-
-  app.get('/api/v1/streaming/user/notification', (req, res) => {
-    streamFrom(`timeline:${req.accountId}`, req, streamToHttp(req, res), streamHttpEnd(req), false, true);
-  });
-
-  app.get('/api/v1/streaming/public', (req, res) => {
-    const onlyMedia = req.query.only_media === '1' || req.query.only_media === 'true';
-    const channel   = onlyMedia ? 'timeline:public:media' : 'timeline:public';
-
-    streamFrom(channel, req, streamToHttp(req, res), streamHttpEnd(req), true);
-  });
-
-  app.get('/api/v1/streaming/public/local', (req, res) => {
-    const onlyMedia = req.query.only_media === '1' || req.query.only_media === 'true';
-    const channel   = onlyMedia ? 'timeline:public:local:media' : 'timeline:public:local';
-
-    streamFrom(channel, req, streamToHttp(req, res), streamHttpEnd(req), true);
-  });
-
-  app.get('/api/v1/streaming/public/remote', (req, res) => {
-    const onlyMedia = req.query.only_media === '1' || req.query.only_media === 'true';
-    const channel   = onlyMedia ? 'timeline:public:remote:media' : 'timeline:public:remote';
-
-    streamFrom(channel, req, streamToHttp(req, res), streamHttpEnd(req), true);
-  });
-
-  app.get('/api/v1/streaming/direct', (req, res) => {
-    const channel = `timeline:direct:${req.accountId}`;
-    streamFrom(channel, req, streamToHttp(req, res), streamHttpEnd(req, subscriptionHeartbeat(channel)), true);
-  });
-
-  app.get('/api/v1/streaming/hashtag', (req, res) => {
-    const { tag } = req.query;
-
-    if (!tag || tag.length === 0) {
-      httpNotFound(res);
-      return;
-    }
-
-    streamFrom(`timeline:hashtag:${tag.toLowerCase()}`, req, streamToHttp(req, res), streamHttpEnd(req), true);
-  });
-
-  app.get('/api/v1/streaming/hashtag/local', (req, res) => {
-    const { tag } = req.query;
+  app.get('/api/v1/streaming/*', (req, res) => {
+    channelNameToIds(req, channelNameFromPath(req), req.query).then(({ channelIds, options }) => {
+      const onSend = streamToHttp(req, res);
+      const onEnd  = streamHttpEnd(req, subscriptionHeartbeat(channelIds));
 
-    if (!tag || tag.length === 0) {
+      streamFrom(channelIds, req, onSend, onEnd, options.needsFiltering, options.notificationOnly);
+    }).catch(err => {
+      log.verbose(req.requestId, 'Subscription error:', err.toString());
       httpNotFound(res);
-      return;
-    }
-
-    streamFrom(`timeline:hashtag:${tag.toLowerCase()}:local`, req, streamToHttp(req, res), streamHttpEnd(req), true);
-  });
-
-  app.get('/api/v1/streaming/list', (req, res) => {
-    const listId = req.query.list;
-
-    authorizeListAccess(listId, req, authorized => {
-      if (!authorized) {
-        httpNotFound(res);
-        return;
-      }
-
-      const channel = `timeline:list:${listId}`;
-      streamFrom(channel, req, streamToHttp(req, res), streamHttpEnd(req, subscriptionHeartbeat(channel)));
     });
   });
 
   const wss = new WebSocketServer({ server, verifyClient: wsVerifyClient });
 
-  wss.on('connection', (ws, req) => {
-    const location = url.parse(req.url, true);
-    req.requestId  = uuid.v4();
-    req.remoteAddress = ws._socket.remoteAddress;
-
-    let channel;
-
-    switch(location.query.stream) {
+  /**
+   * @typedef StreamParams
+   * @property {string} [tag]
+   * @property {string} [list]
+   * @property {string} [only_media]
+   */
+
+  /**
+   * @param {any} req
+   * @param {string} name
+   * @param {StreamParams} params
+   * @return {Promise.<{ channelIds: string[], options: { needsFiltering: boolean, notificationOnly: boolean } }>}
+   */
+  const channelNameToIds = (req, name, params) => new Promise((resolve, reject) => {
+    switch(name) {
     case 'user':
-      channel = [`timeline:${req.accountId}`];
-
-      if (req.deviceId) {
-        channel.push(`timeline:${req.accountId}:${req.deviceId}`);
-      }
+      resolve({
+        channelIds: req.deviceId ? [`timeline:${req.accountId}`, `timeline:${req.accountId}:${req.deviceId}`] : [`timeline:${req.accountId}`],
+        options: { needsFiltering: false, notificationOnly: false },
+      });
 
-      streamFrom(channel, req, streamToWs(req, ws), streamWsEnd(req, ws, subscriptionHeartbeat(channel)));
       break;
     case 'user:notification':
-      streamFrom(`timeline:${req.accountId}`, req, streamToWs(req, ws), streamWsEnd(req, ws), false, true);
+      resolve({
+        channelIds: [`timeline:${req.accountId}`],
+        options: { needsFiltering: false, notificationOnly: true },
+      });
+
       break;
     case 'public':
-      streamFrom('timeline:public', req, streamToWs(req, ws), streamWsEnd(req, ws), true);
+      resolve({
+        channelIds: ['timeline:public'],
+        options: { needsFiltering: true, notificationOnly: false },
+      });
+
       break;
     case 'public:local':
-      streamFrom('timeline:public:local', req, streamToWs(req, ws), streamWsEnd(req, ws), true);
+      resolve({
+        channelIds: ['timeline:public:local'],
+        options: { needsFiltering: true, notificationOnly: false },
+      });
+
       break;
     case 'public:remote':
-      streamFrom('timeline:public:remote', req, streamToWs(req, ws), streamWsEnd(req, ws), true);
+      resolve({
+        channelIds: ['timeline:public:remote'],
+        options: { needsFiltering: true, notificationOnly: false },
+      });
+
       break;
     case 'public:media':
-      streamFrom('timeline:public:media', req, streamToWs(req, ws), streamWsEnd(req, ws), true);
+      resolve({
+        channelIds: ['timeline:public:media'],
+        options: { needsFiltering: true, notificationOnly: false },
+      });
+
       break;
     case 'public:local:media':
-      streamFrom('timeline:public:local:media', req, streamToWs(req, ws), streamWsEnd(req, ws), true);
+      resolve({
+        channelIds: ['timeline:public:local:media'],
+        options: { needsFiltering: true, notificationOnly: false },
+      });
+
       break;
     case 'public:remote:media':
-      streamFrom('timeline:public:remote:media', req, streamToWs(req, ws), streamWsEnd(req, ws), true);
+      resolve({
+        channelIds: ['timeline:public:remote:media'],
+        options: { needsFiltering: true, notificationOnly: false },
+      });
+
       break;
     case 'direct':
-      channel = `timeline:direct:${req.accountId}`;
-      streamFrom(channel, req, streamToWs(req, ws), streamWsEnd(req, ws, subscriptionHeartbeat(channel)), true);
+      resolve({
+        channelIds: [`timeline:direct:${req.accountId}`],
+        options: { needsFiltering: false, notificationOnly: false },
+      });
+
       break;
     case 'hashtag':
-      if (!location.query.tag || location.query.tag.length === 0) {
-        ws.close();
-        return;
+      if (!params.tag || params.tag.length === 0) {
+        reject('No tag for stream provided');
+      } else {
+        resolve({
+          channelIds: [`timeline:hashtag:${params.tag.toLowerCase()}`],
+          options: { needsFiltering: true, notificationOnly: false },
+        });
       }
 
-      streamFrom(`timeline:hashtag:${location.query.tag.toLowerCase()}`, req, streamToWs(req, ws), streamWsEnd(req, ws), true);
       break;
     case 'hashtag:local':
-      if (!location.query.tag || location.query.tag.length === 0) {
-        ws.close();
-        return;
+      if (!params.tag || params.tag.length === 0) {
+        reject('No tag for stream provided');
+      } else {
+        resolve({
+          channelIds: [`timeline:hashtag:${params.tag.toLowerCase()}:local`],
+          options: { needsFiltering: true, notificationOnly: false },
+        });
       }
 
-      streamFrom(`timeline:hashtag:${location.query.tag.toLowerCase()}:local`, req, streamToWs(req, ws), streamWsEnd(req, ws), true);
       break;
     case 'list':
-      const listId = location.query.list;
-
-      authorizeListAccess(listId, req, authorized => {
-        if (!authorized) {
-          ws.close();
-          return;
-        }
-
-        channel = `timeline:list:${listId}`;
-        streamFrom(channel, req, streamToWs(req, ws), streamWsEnd(req, ws, subscriptionHeartbeat(channel)));
+      authorizeListAccess(params.list, req).then(() => {
+        resolve({
+          channelIds: [`timeline:list:${params.list}`],
+          options: { needsFiltering: false, notificationOnly: false },
+        });
+      }).catch(() => {
+        reject('Not authorized to stream this list');
       });
+
       break;
     default:
-      ws.close();
+      reject('Unknown stream type');
+    }
+  });
+
+  /**
+   * @param {string} channelName
+   * @param {StreamParams} params
+   * @return {string[]}
+   */
+  const streamNameFromChannelName = (channelName, params) => {
+    if (channelName === 'list') {
+      return [channelName, params.list];
+    } else if (['hashtag', 'hashtag:local'].includes(channelName)) {
+      return [channelName, params.tag];
+    } else {
+      return [channelName];
+    }
+  };
+
+  /**
+   * @typedef WebSocketSession
+   * @property {any} socket
+   * @property {any} request
+   * @property {Object.<string, { listener: function(string): void, stopHeartbeat: function(): void }>} subscriptions
+   */
+
+  /**
+   * @param {WebSocketSession} session
+   * @param {string} channelName
+   * @param {StreamParams} params
+   */
+  const subscribeWebsocketToChannel = ({ socket, request, subscriptions }, channelName, params) =>
+    checkScopes(request, channelName).then(() => channelNameToIds(request, channelName, params)).then(({ channelIds, options }) => {
+      if (subscriptions[channelIds.join(';')]) {
+        return;
+      }
+
+      const onSend        = streamToWs(request, socket, streamNameFromChannelName(channelName, params));
+      const stopHeartbeat = subscriptionHeartbeat(channelIds);
+      const listener      = streamFrom(channelIds, request, onSend, undefined, options.needsFiltering, options.notificationOnly);
+
+      subscriptions[channelIds.join(';')] = {
+        listener,
+        stopHeartbeat,
+      };
+    }).catch(err => {
+      log.verbose(request.requestId, 'Subscription error:', err.toString());
+      socket.send(JSON.stringify({ error: err.toString() }));
+    });
+
+  /**
+   * @param {WebSocketSession} session
+   * @param {string} channelName
+   * @param {StreamParams} params
+   */
+  const unsubscribeWebsocketFromChannel = ({ socket, request, subscriptions }, channelName, params) =>
+    channelNameToIds(request, channelName, params).then(({ channelIds }) => {
+      log.verbose(request.requestId, `Ending stream from ${channelIds.join(', ')} for ${request.accountId}`);
+
+      const subscription = subscriptions[channelIds.join(';')];
+
+      if (!subscription) {
+        return;
+      }
+
+      const { listener, stopHeartbeat } = subscription;
+
+      channelIds.forEach(channelId => {
+        unsubscribe(`${redisPrefix}${channelId}`, listener);
+      });
+
+      stopHeartbeat();
+
+      delete subscriptions[channelIds.join(';')];
+    }).catch(err => {
+      log.verbose(request.requestId, 'Unsubscription error:', err);
+      socket.send(JSON.stringify({ error: err.toString() }));
+    });
+
+  /**
+   * @param {WebSocketSession} session
+   */
+  const subscribeWebsocketToSystemChannel = ({ socket, request, subscriptions }) => {
+    const systemChannelId = `timeline:access_token:${request.accessTokenId}`;
+
+    const listener = createSystemMessageListener(request, {
+
+      onKill () {
+        socket.close();
+      },
+
+    });
+
+    subscribe(`${redisPrefix}${systemChannelId}`, listener);
+
+    subscriptions[systemChannelId] = {
+      listener,
+      stopHeartbeat: () => {},
+    };
+  };
+
+  /**
+   * @param {string|string[]} arrayOrString
+   * @return {string}
+   */
+  const firstParam = arrayOrString => {
+    if (Array.isArray(arrayOrString)) {
+      return arrayOrString[0];
+    } else {
+      return arrayOrString;
+    }
+  };
+
+  wss.on('connection', (ws, req) => {
+    const location = url.parse(req.url, true);
+
+    req.requestId     = uuid.v4();
+    req.remoteAddress = ws._socket.remoteAddress;
+
+    /**
+     * @type {WebSocketSession}
+     */
+    const session = {
+      socket: ws,
+      request: req,
+      subscriptions: {},
+    };
+
+    const onEnd = () => {
+      const keys = Object.keys(session.subscriptions);
+
+      keys.forEach(channelIds => {
+        const { listener, stopHeartbeat } = session.subscriptions[channelIds];
+
+        channelIds.split(';').forEach(channelId => {
+          unsubscribe(`${redisPrefix}${channelId}`, listener);
+        });
+
+        stopHeartbeat();
+      });
+    };
+
+    ws.on('close', onEnd);
+    ws.on('error', onEnd);
+
+    ws.on('message', data => {
+      const json = parseJSON(data);
+
+      if (!json) return;
+
+      const { type, stream, ...params } = json;
+
+      if (type === 'subscribe') {
+        subscribeWebsocketToChannel(session, firstParam(stream), params);
+      } else if (type === 'unsubscribe') {
+        unsubscribeWebsocketFromChannel(session, firstParam(stream), params);
+      } else {
+        // Unknown action type
+      }
+    });
+
+    subscribeWebsocketToSystemChannel(session);
+
+    if (location.query.stream) {
+      subscribeWebsocketToChannel(session, firstParam(location.query.stream), location.query);
     }
   });
 
@@ -716,6 +1072,10 @@ const startWorker = (workerId) => {
   process.on('uncaughtException', onError);
 };
 
+/**
+ * @param {any} server
+ * @param {function(string): void} [onSuccess]
+ */
 const attachServerWithConfig = (server, onSuccess) => {
   if (process.env.SOCKET || process.env.PORT && isNaN(+process.env.PORT)) {
     server.listen(process.env.SOCKET || process.env.PORT, () => {
@@ -733,6 +1093,9 @@ const attachServerWithConfig = (server, onSuccess) => {
   }
 };
 
+/**
+ * @param {function(Error=): void} onSuccess
+ */
 const onPortAvailable = onSuccess => {
   const testServer = http.createServer();
 
diff --git a/yarn.lock b/yarn.lock
index 5449ae10ff52ab922630698b29fbb57ebb0842a1..450363e3046b3c9a6e6d18135b73f592bf882db7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,91 +2,46 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
-  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
+  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.10.3":
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.3.tgz#324bcfd8d35cd3d47dae18cde63d752086435e9a"
-  integrity sha512-fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==
-  dependencies:
-    "@babel/highlight" "^7.10.3"
+"@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
+  integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==
 
-"@babel/compat-data@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.4.tgz#706a6484ee6f910b719b696a9194f8da7d7ac241"
-  integrity sha512-t+rjExOrSVvjQQXNp5zAIYDp00KjdvGl/TpDX5REPr0S9IAIPQMTilcfG6q8c0QFmj9lSTVySV2VTsyggvtNIw==
-  dependencies:
-    browserslist "^4.12.0"
-    invariant "^2.2.4"
-    semver "^5.5.0"
-
-"@babel/core@^7.1.0", "@babel/core@^7.7.5":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.4.tgz#780e8b83e496152f8dd7df63892b2e052bf1d51d"
-  integrity sha512-3A0tS0HWpy4XujGc7QtOIHTeNwUgWaZc/WuS5YQrfhU67jnVmsD6OGPc1AKHH0LJHQICGncy3+YUjIhVlfDdcA==
+"@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.7.2", "@babel/core@^7.7.5":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd"
+  integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.10.4"
-    "@babel/helper-module-transforms" "^7.10.4"
-    "@babel/helpers" "^7.10.4"
-    "@babel/parser" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/generator" "^7.12.10"
+    "@babel/helper-module-transforms" "^7.12.1"
+    "@babel/helpers" "^7.12.5"
+    "@babel/parser" "^7.12.10"
+    "@babel/template" "^7.12.7"
+    "@babel/traverse" "^7.12.10"
+    "@babel/types" "^7.12.10"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
     json5 "^2.1.2"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/core@^7.10.3", "@babel/core@^7.7.2":
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.3.tgz#73b0e8ddeec1e3fdd7a2de587a60e17c440ec77e"
-  integrity sha512-5YqWxYE3pyhIi84L84YcwjeEgS+fa7ZjK6IBVGTjDVfm64njkR2lfDhVR5OudLk8x2GK59YoSyVv+L/03k1q9w==
-  dependencies:
-    "@babel/code-frame" "^7.10.3"
-    "@babel/generator" "^7.10.3"
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helpers" "^7.10.1"
-    "@babel/parser" "^7.10.3"
-    "@babel/template" "^7.10.3"
-    "@babel/traverse" "^7.10.3"
-    "@babel/types" "^7.10.3"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.2"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
+    lodash "^4.17.19"
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.10.3":
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.3.tgz#32b9a0d963a71d7a54f5f6c15659c3dbc2a523a5"
-  integrity sha512-drt8MUHbEqRzNR0xnF8nMehbY11b1SDkRw03PSNH/3Rb2Z35oxkddVSi3rcaak0YJQ86PCuE7Qx1jSFhbLNBMA==
+"@babel/generator@^7.12.10", "@babel/generator@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af"
+  integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==
   dependencies:
-    "@babel/types" "^7.10.3"
+    "@babel/types" "^7.12.11"
     jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.4.tgz#e49eeed9fe114b62fa5b181856a43a5e32f5f243"
-  integrity sha512-toLIHUIAgcQygFZRAQcsLQV3CBuX6yOIru1kJk/qqqvcRmZrYe6WavZTSG+bB8MxhnL9YPf+pKQfuiP161q7ng==
-  dependencies:
-    "@babel/types" "^7.10.4"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
     source-map "^0.5.0"
 
 "@babel/helper-annotate-as-pure@^7.10.4":
@@ -96,6 +51,13 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
+"@babel/helper-annotate-as-pure@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz#54ab9b000e60a93644ce17b3f37d313aaf1d115d"
+  integrity sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==
+  dependencies:
+    "@babel/types" "^7.12.10"
+
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"
@@ -104,14 +66,23 @@
     "@babel/helper-explode-assignable-expression" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-builder-react-jsx-experimental@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.4.tgz#d0ffb875184d749c63ffe1f4f65be15143ec322d"
-  integrity sha512-LyacH/kgQPgLAuaWrvvq1+E7f5bLyT8jXCh7nM67sRsy2cpIGfgWJ+FCnAKQXfY+F0tXUaN6FqLkp4JiCzdK8Q==
+"@babel/helper-builder-react-jsx-experimental@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.10.tgz#a58cb96a793dc0fcd5c9ed3bb36d62fdc60534c2"
+  integrity sha512-3Kcr2LGpL7CTRDTTYm1bzeor9qZbxbvU2AxsLA6mUG9gYarSfIKMK0UlU+azLWI+s0+BH768bwyaziWB2NOJlQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.12.10"
+    "@babel/helper-module-imports" "^7.12.5"
+    "@babel/types" "^7.12.10"
+
+"@babel/helper-builder-react-jsx-experimental@^7.12.4":
+  version "7.12.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz#55fc1ead5242caa0ca2875dcb8eed6d311e50f48"
+  integrity sha512-AjEa0jrQqNk7eDQOo0pTfUOwQBMF+xVqrausQwT9/rTKy0g04ggFNaJpaE09IQMn9yExluigWMJcj0WC7bq+Og==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-module-imports" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/helper-module-imports" "^7.12.1"
+    "@babel/types" "^7.12.1"
 
 "@babel/helper-builder-react-jsx@^7.10.4":
   version "7.10.4"
@@ -121,49 +92,35 @@
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-compilation-targets@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz#804ae8e3f04376607cc791b9d47d540276332bd2"
-  integrity sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==
+"@babel/helper-compilation-targets@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831"
+  integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==
   dependencies:
-    "@babel/compat-data" "^7.10.4"
-    browserslist "^4.12.0"
-    invariant "^2.2.4"
-    levenary "^1.1.1"
+    "@babel/compat-data" "^7.12.5"
+    "@babel/helper-validator-option" "^7.12.1"
+    browserslist "^4.14.5"
     semver "^5.5.0"
 
-"@babel/helper-create-class-features-plugin@^7.10.3":
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.3.tgz#2783daa6866822e3d5ed119163b50f0fc3ae4b35"
-  integrity sha512-iRT9VwqtdFmv7UheJWthGc/h2s7MqoweBF9RUj77NFZsg9VfISvBTum3k6coAhJ8RWv2tj3yUjA03HxPd0vfpQ==
-  dependencies:
-    "@babel/helper-function-name" "^7.10.3"
-    "@babel/helper-member-expression-to-functions" "^7.10.3"
-    "@babel/helper-optimise-call-expression" "^7.10.3"
-    "@babel/helper-plugin-utils" "^7.10.3"
-    "@babel/helper-replace-supers" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
-
-"@babel/helper-create-class-features-plugin@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.4.tgz#2d4015d0136bd314103a70d84a7183e4b344a355"
-  integrity sha512-9raUiOsXPxzzLjCXeosApJItoMnX3uyT4QdM2UldffuGApNrF8e938MwNpDCK9CPoyxrEoCgT+hObJc3mZa6lQ==
+"@babel/helper-create-class-features-plugin@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e"
+  integrity sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==
   dependencies:
     "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-member-expression-to-functions" "^7.10.4"
+    "@babel/helper-member-expression-to-functions" "^7.12.1"
     "@babel/helper-optimise-call-expression" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.12.1"
     "@babel/helper-split-export-declaration" "^7.10.4"
 
-"@babel/helper-create-regexp-features-plugin@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz#fdd60d88524659a0b6959c0579925e425714f3b8"
-  integrity sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==
+"@babel/helper-create-regexp-features-plugin@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz#18b1302d4677f9dc4740fe8c9ed96680e29d37e8"
+  integrity sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-regex" "^7.10.4"
-    regexpu-core "^4.7.0"
+    regexpu-core "^4.7.1"
 
 "@babel/helper-define-map@^7.10.4":
   version "7.10.4"
@@ -182,15 +139,6 @@
     "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-function-name@^7.10.3":
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.3.tgz#79316cd75a9fa25ba9787ff54544307ed444f197"
-  integrity sha512-FvSj2aiOd8zbeqijjgqdMDSyxsGHaMt5Tr0XjQsGKHD3/1FP3wksjnLAWzxw7lvXiej8W1Jt47SKTZ6upQNiRw==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.10.3"
-    "@babel/template" "^7.10.3"
-    "@babel/types" "^7.10.3"
-
 "@babel/helper-function-name@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
@@ -200,12 +148,14 @@
     "@babel/template" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-get-function-arity@^7.10.3":
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.3.tgz#3a28f7b28ccc7719eacd9223b659fdf162e4c45e"
-  integrity sha512-iUD/gFsR+M6uiy69JA6fzM5seno8oE85IYZdbVVEuQaZlEzMO2MXblh+KSPJgsZAUx0EEbWXU0yJaW7C9CdAVg==
+"@babel/helper-function-name@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz#1fd7738aee5dcf53c3ecff24f1da9c511ec47b42"
+  integrity sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==
   dependencies:
-    "@babel/types" "^7.10.3"
+    "@babel/helper-get-function-arity" "^7.12.10"
+    "@babel/template" "^7.12.7"
+    "@babel/types" "^7.12.11"
 
 "@babel/helper-get-function-arity@^7.10.4":
   version "7.10.4"
@@ -214,6 +164,13 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
+"@babel/helper-get-function-arity@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf"
+  integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==
+  dependencies:
+    "@babel/types" "^7.12.10"
+
 "@babel/helper-hoist-variables@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e"
@@ -221,59 +178,34 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-member-expression-to-functions@^7.10.1", "@babel/helper-member-expression-to-functions@^7.10.3":
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.3.tgz#bc3663ac81ac57c39148fef4c69bf48a77ba8dd6"
-  integrity sha512-q7+37c4EPLSjNb2NmWOjNwj0+BOyYlssuQ58kHEWk1Z78K5i8vTUsteq78HMieRPQSl/NtpQyJfdjt3qZ5V2vw==
+"@babel/helper-member-expression-to-functions@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz#fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c"
+  integrity sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==
   dependencies:
-    "@babel/types" "^7.10.3"
+    "@babel/types" "^7.12.1"
 
-"@babel/helper-member-expression-to-functions@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.4.tgz#7cd04b57dfcf82fce9aeae7d4e4452fa31b8c7c4"
-  integrity sha512-m5j85pK/KZhuSdM/8cHUABQTAslV47OjfIB9Cc7P+PvlAoBzdb79BGNfw8RhT5Mq3p+xGd0ZfAKixbrUZx0C7A==
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
+  integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
   dependencies:
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.5"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.10.1", "@babel/helper-module-imports@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz#4c5c54be04bd31670a7382797d75b9fa2e5b5620"
-  integrity sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==
+"@babel/helper-module-transforms@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c"
+  integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==
   dependencies:
-    "@babel/types" "^7.10.4"
-
-"@babel/helper-module-transforms@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz#24e2f08ee6832c60b157bb0936c86bef7210c622"
-  integrity sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.10.1"
-    "@babel/helper-replace-supers" "^7.10.1"
-    "@babel/helper-simple-access" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
-    "@babel/template" "^7.10.1"
-    "@babel/types" "^7.10.1"
-    lodash "^4.17.13"
-
-"@babel/helper-module-transforms@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.4.tgz#ca1f01fdb84e48c24d7506bb818c961f1da8805d"
-  integrity sha512-Er2FQX0oa3nV7eM1o0tNCTx7izmQtwAQsIiaLRWtavAAEcskb0XJ5OjJbVrYXWOTr8om921Scabn4/tzlx7j1Q==
-  dependencies:
-    "@babel/helper-module-imports" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.10.4"
-    "@babel/helper-simple-access" "^7.10.4"
-    "@babel/helper-split-export-declaration" "^7.10.4"
+    "@babel/helper-module-imports" "^7.12.1"
+    "@babel/helper-replace-supers" "^7.12.1"
+    "@babel/helper-simple-access" "^7.12.1"
+    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/helper-validator-identifier" "^7.10.4"
     "@babel/template" "^7.10.4"
-    "@babel/types" "^7.10.4"
-    lodash "^4.17.13"
-
-"@babel/helper-optimise-call-expression@^7.10.1", "@babel/helper-optimise-call-expression@^7.10.3":
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.3.tgz#f53c4b6783093195b0f69330439908841660c530"
-  integrity sha512-kT2R3VBH/cnSz+yChKpaKRJQJWxdGoc6SjioRId2wkeV3bK0wLLioFpJROrX0U4xr/NmxSSAWT/9Ih5snwIIzg==
-  dependencies:
-    "@babel/types" "^7.10.3"
+    "@babel/traverse" "^7.12.1"
+    "@babel/types" "^7.12.1"
+    lodash "^4.17.19"
 
 "@babel/helper-optimise-call-expression@^7.10.4":
   version "7.10.4"
@@ -282,7 +214,7 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.1", "@babel/helper-plugin-utils@^7.10.3", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
   integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
@@ -294,59 +226,38 @@
   dependencies:
     lodash "^4.17.13"
 
-"@babel/helper-remap-async-to-generator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz#fce8bea4e9690bbe923056ded21e54b4e8b68ed5"
-  integrity sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg==
+"@babel/helper-remap-async-to-generator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd"
+  integrity sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-wrap-function" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.1"
 
-"@babel/helper-replace-supers@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz#ec6859d20c5d8087f6a2dc4e014db7228975f13d"
-  integrity sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==
+"@babel/helper-replace-supers@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz#f15c9cc897439281891e11d5ce12562ac0cf3fa9"
+  integrity sha512-zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.10.1"
-    "@babel/helper-optimise-call-expression" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
-
-"@babel/helper-replace-supers@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz#d585cd9388ea06e6031e4cd44b6713cbead9e6cf"
-  integrity sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.10.4"
+    "@babel/helper-member-expression-to-functions" "^7.12.1"
     "@babel/helper-optimise-call-expression" "^7.10.4"
-    "@babel/traverse" "^7.10.4"
-    "@babel/types" "^7.10.4"
-
-"@babel/helper-simple-access@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz#08fb7e22ace9eb8326f7e3920a1c2052f13d851e"
-  integrity sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==
-  dependencies:
-    "@babel/template" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/traverse" "^7.12.1"
+    "@babel/types" "^7.12.1"
 
-"@babel/helper-simple-access@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz#0f5ccda2945277a2a7a2d3a821e15395edcf3461"
-  integrity sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==
+"@babel/helper-simple-access@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136"
+  integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==
   dependencies:
-    "@babel/template" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.1"
 
-"@babel/helper-split-export-declaration@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz#c6f4be1cbc15e3a868e4c64a17d5d31d754da35f"
-  integrity sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==
+"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
+  integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.12.1"
 
 "@babel/helper-split-export-declaration@^7.10.4":
   version "7.10.4"
@@ -355,16 +266,35 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-validator-identifier@^7.10.3":
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz#60d9847f98c4cea1b279e005fdb7c28be5412d15"
-  integrity sha512-bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw==
+"@babel/helper-split-export-declaration@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
+  integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
+  dependencies:
+    "@babel/types" "^7.11.0"
+
+"@babel/helper-split-export-declaration@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz#1b4cc424458643c47d37022223da33d76ea4603a"
+  integrity sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==
+  dependencies:
+    "@babel/types" "^7.12.11"
 
 "@babel/helper-validator-identifier@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
   integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
 
+"@babel/helper-validator-identifier@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
+  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
+
+"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz#d66cb8b7a3e7fe4c6962b32020a131ecf0847f4f"
+  integrity sha512-TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw==
+
 "@babel/helper-wrap-function@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz#8a6f701eab0ff39f765b5a1cfef409990e624b87"
@@ -375,32 +305,14 @@
     "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helpers@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.1.tgz#a6827b7cb975c9d9cef5fd61d919f60d8844a973"
-  integrity sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==
-  dependencies:
-    "@babel/template" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
-
-"@babel/helpers@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz#2abeb0d721aff7c0a97376b9e1f6f65d7a475044"
-  integrity sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==
+"@babel/helpers@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e"
+  integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==
   dependencies:
     "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.10.4"
-    "@babel/types" "^7.10.4"
-
-"@babel/highlight@^7.10.3":
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.3.tgz#c633bb34adf07c5c13156692f5922c81ec53f28d"
-  integrity sha512-Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.3"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
+    "@babel/traverse" "^7.12.5"
+    "@babel/types" "^7.12.5"
 
 "@babel/highlight@^7.10.4":
   version "7.10.4"
@@ -411,113 +323,125 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.4.tgz#9eedf27e1998d87739fb5028a5120557c06a1a64"
-  integrity sha512-8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79"
+  integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==
 
-"@babel/parser@^7.10.3", "@babel/parser@^7.7.0":
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.3.tgz#7e71d892b0d6e7d04a1af4c3c79d72c1f10f5315"
-  integrity sha512-oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA==
-
-"@babel/plugin-proposal-async-generator-functions@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.4.tgz#4b65abb3d9bacc6c657aaa413e56696f9f170fc6"
-  integrity sha512-MJbxGSmejEFVOANAezdO39SObkURO5o/8b6fSH6D1pi9RZQt+ldppKPXfqgUWpSQ9asM6xaSaSJIaeWMDRP0Zg==
+"@babel/plugin-proposal-async-generator-functions@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz#dc6c1170e27d8aca99ff65f4925bd06b1c90550e"
+  integrity sha512-d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-remap-async-to-generator" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.12.1"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
-"@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz#a33bf632da390a59c7a8c570045d1115cd778807"
-  integrity sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==
+"@babel/plugin-proposal-class-properties@^7.12.1", "@babel/plugin-proposal-class-properties@^7.8.3":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de"
+  integrity sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.4"
+    "@babel/helper-create-class-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-proposal-decorators@^7.10.3":
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.10.3.tgz#2fc6b5696028adccfcd14bc826c184c578b857f8"
-  integrity sha512-Rzwn5tcYFTdWWK3IrhMZkMDjzFQLIGYqHvv9XuzNnEB91Y6gHr/JjazYV1Yec9g0yMLhy1p/21eiW1P7f5UN4A==
+"@babel/plugin-proposal-decorators@^7.12.12":
+  version "7.12.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.12.tgz#067a6d3d6ca86d54cf56bb183239199c20daeafe"
+  integrity sha512-fhkE9lJYpw2mjHelBpM2zCbaA11aov2GJs7q4cFaXNrWx0H3bW58H9Esy2rdtYOghFBEYUDRIpvlgi+ZD+AvvQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.3"
-    "@babel/helper-plugin-utils" "^7.10.3"
-    "@babel/plugin-syntax-decorators" "^7.10.1"
+    "@babel/helper-create-class-features-plugin" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-decorators" "^7.12.1"
 
-"@babel/plugin-proposal-dynamic-import@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz#ba57a26cb98b37741e9d5bca1b8b0ddf8291f17e"
-  integrity sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==
+"@babel/plugin-proposal-dynamic-import@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz#43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc"
+  integrity sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
-"@babel/plugin-proposal-json-strings@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz#593e59c63528160233bd321b1aebe0820c2341db"
-  integrity sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==
+"@babel/plugin-proposal-export-namespace-from@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz#8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4"
+  integrity sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
+"@babel/plugin-proposal-json-strings@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c"
+  integrity sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz#02a7e961fc32e6d5b2db0649e01bf80ddee7e04a"
-  integrity sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==
+"@babel/plugin-proposal-logical-assignment-operators@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz#f2c490d36e1b3c9659241034a5d2cd50263a2751"
+  integrity sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c"
+  integrity sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-numeric-separator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz#ce1590ff0a65ad12970a609d78855e9a4c1aef06"
-  integrity sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==
+"@babel/plugin-proposal-numeric-separator@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b"
+  integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz#50129ac216b9a6a55b3853fdd923e74bf553a4c0"
-  integrity sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA==
+"@babel/plugin-proposal-object-rest-spread@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069"
+  integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.10.4"
+    "@babel/plugin-transform-parameters" "^7.12.1"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz#31c938309d24a78a49d68fdabffaa863758554dd"
-  integrity sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==
+"@babel/plugin-proposal-optional-catch-binding@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz#ccc2421af64d3aae50b558a71cede929a5ab2942"
+  integrity sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz#750f1255e930a1f82d8cdde45031f81a0d0adff7"
-  integrity sha512-ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ==
+"@babel/plugin-proposal-optional-chaining@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c"
+  integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-private-methods@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz#b160d972b8fdba5c7d111a145fc8c421fc2a6909"
-  integrity sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==
+"@babel/plugin-proposal-private-methods@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz#86814f6e7a21374c980c10d38b4493e703f4a389"
+  integrity sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.4"
+    "@babel/helper-create-class-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.10.4", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz#4483cda53041ce3413b7fe2f00022665ddfaa75d"
-  integrity sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==
+"@babel/plugin-proposal-unicode-property-regex@^7.12.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072"
+  integrity sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4":
@@ -534,19 +458,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-class-properties@^7.10.4", "@babel/plugin-syntax-class-properties@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz#6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c"
-  integrity sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==
+"@babel/plugin-syntax-class-properties@^7.12.1", "@babel/plugin-syntax-class-properties@^7.8.3":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978"
+  integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-decorators@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.10.1.tgz#16b869c4beafc9a442565147bda7ce0967bd4f13"
-  integrity sha512-a9OAbQhKOwSle1Vr0NJu/ISg1sPfdEkfRKWpgPuzhnWWzForou2gIeUIIwjAMHRekhhpJ7eulZlYs0H14Cbi+g==
+"@babel/plugin-syntax-decorators@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz#81a8b535b284476c41be6de06853a8802b98c5dd"
+  integrity sha512-ir9YW5daRrTYiy9UJ2TzdNIJEZu8KclVzDcfSt4iEmOtwQ4llPtWInNKJyKnVXp1vE4bbVd5S31M/im3mYMO1w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.0":
   version "7.8.3"
@@ -555,6 +479,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-export-namespace-from@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
+  integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
 "@babel/plugin-syntax-import-meta@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
@@ -569,14 +500,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz#39abaae3cbf710c4373d8429484e6ba21340166c"
-  integrity sha512-KCg9mio9jwiARCB7WAcQ7Y1q+qicILjoK8LP/VkPkEKaf5dkaZZK1EcTe91a3JJlZ3qy6L5s9X52boEYi8DM9g==
+"@babel/plugin-syntax-jsx@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz#9d9d357cc818aa7ae7935917c1257f67677a0926"
+  integrity sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
+"@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
   integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
@@ -618,400 +549,383 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-top-level-await@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz#4bbeb8917b54fcf768364e0a81f560e33a3ef57d"
-  integrity sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==
+"@babel/plugin-syntax-top-level-await@^7.12.1", "@babel/plugin-syntax-top-level-await@^7.8.3":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0"
+  integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-arrow-functions@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz#e22960d77e697c74f41c501d44d73dbf8a6a64cd"
-  integrity sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==
+"@babel/plugin-transform-arrow-functions@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3"
+  integrity sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-async-to-generator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz#41a5017e49eb6f3cda9392a51eef29405b245a37"
-  integrity sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==
+"@babel/plugin-transform-async-to-generator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1"
+  integrity sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==
   dependencies:
-    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-module-imports" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-remap-async-to-generator" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.12.1"
 
-"@babel/plugin-transform-block-scoped-functions@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz#1afa595744f75e43a91af73b0d998ecfe4ebc2e8"
-  integrity sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==
+"@babel/plugin-transform-block-scoped-functions@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz#f2a1a365bde2b7112e0a6ded9067fdd7c07905d9"
+  integrity sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-block-scoping@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.4.tgz#a670d1364bb5019a621b9ea2001482876d734787"
-  integrity sha512-J3b5CluMg3hPUii2onJDRiaVbPtKFPLEaV5dOPY5OeAbDi1iU/UbbFFTgwb7WnanaDy7bjU35kc26W3eM5Qa0A==
+"@babel/plugin-transform-block-scoping@^7.12.11":
+  version "7.12.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz#d93a567a152c22aea3b1929bb118d1d0a175cdca"
+  integrity sha512-VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    lodash "^4.17.13"
 
-"@babel/plugin-transform-classes@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz#405136af2b3e218bc4a1926228bc917ab1a0adc7"
-  integrity sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==
+"@babel/plugin-transform-classes@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6"
+  integrity sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-define-map" "^7.10.4"
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-optimise-call-expression" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.12.1"
     "@babel/helper-split-export-declaration" "^7.10.4"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz#9ded83a816e82ded28d52d4b4ecbdd810cdfc0eb"
-  integrity sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==
+"@babel/plugin-transform-computed-properties@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz#d68cf6c9b7f838a8a4144badbe97541ea0904852"
+  integrity sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-destructuring@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz#70ddd2b3d1bea83d01509e9bb25ddb3a74fc85e5"
-  integrity sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==
+"@babel/plugin-transform-destructuring@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz#b9a570fe0d0a8d460116413cb4f97e8e08b2f847"
+  integrity sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-dotall-regex@^7.10.4", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz#469c2062105c1eb6a040eaf4fac4b488078395ee"
-  integrity sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==
+"@babel/plugin-transform-dotall-regex@^7.12.1", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz#a1d16c14862817b6409c0a678d6f9373ca9cd975"
+  integrity sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-duplicate-keys@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz#697e50c9fee14380fe843d1f306b295617431e47"
-  integrity sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==
+"@babel/plugin-transform-duplicate-keys@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz#745661baba295ac06e686822797a69fbaa2ca228"
+  integrity sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-exponentiation-operator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz#5ae338c57f8cf4001bdb35607ae66b92d665af2e"
-  integrity sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==
+"@babel/plugin-transform-exponentiation-operator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz#b0f2ed356ba1be1428ecaf128ff8a24f02830ae0"
+  integrity sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==
   dependencies:
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-for-of@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz#c08892e8819d3a5db29031b115af511dbbfebae9"
-  integrity sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==
+"@babel/plugin-transform-for-of@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa"
+  integrity sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-function-name@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz#6a467880e0fc9638514ba369111811ddbe2644b7"
-  integrity sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==
+"@babel/plugin-transform-function-name@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz#2ec76258c70fe08c6d7da154003a480620eba667"
+  integrity sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==
   dependencies:
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-literals@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz#9f42ba0841100a135f22712d0e391c462f571f3c"
-  integrity sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==
+"@babel/plugin-transform-literals@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz#d73b803a26b37017ddf9d3bb8f4dc58bfb806f57"
+  integrity sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-member-expression-literals@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz#b1ec44fcf195afcb8db2c62cd8e551c881baf8b7"
-  integrity sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==
+"@babel/plugin-transform-member-expression-literals@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz#496038602daf1514a64d43d8e17cbb2755e0c3ad"
+  integrity sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-modules-amd@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.4.tgz#cb407c68b862e4c1d13a2fc738c7ec5ed75fc520"
-  integrity sha512-3Fw+H3WLUrTlzi3zMiZWp3AR4xadAEMv6XRCYnd5jAlLM61Rn+CRJaZMaNvIpcJpQ3vs1kyifYvEVPFfoSkKOA==
+"@babel/plugin-transform-modules-amd@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz#3154300b026185666eebb0c0ed7f8415fefcf6f9"
+  integrity sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz#66667c3eeda1ebf7896d41f1f16b17105a2fbca0"
-  integrity sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==
+"@babel/plugin-transform-modules-commonjs@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648"
+  integrity sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-simple-access" "^7.10.4"
+    "@babel/helper-simple-access" "^7.12.1"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.4.tgz#8f576afd943ac2f789b35ded0a6312f929c633f9"
-  integrity sha512-Tb28LlfxrTiOTGtZFsvkjpyjCl9IoaRI52AEU/VIwOwvDQWtbNJsAqTXzh+5R7i74e/OZHH2c2w2fsOqAfnQYQ==
+"@babel/plugin-transform-modules-systemjs@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz#663fea620d593c93f214a464cd399bf6dc683086"
+  integrity sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==
   dependencies:
     "@babel/helper-hoist-variables" "^7.10.4"
-    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-validator-identifier" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz#9a8481fe81b824654b3a0b65da3df89f3d21839e"
-  integrity sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==
+"@babel/plugin-transform-modules-umd@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz#eb5a218d6b1c68f3d6217b8fa2cc82fec6547902"
+  integrity sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz#78b4d978810b6f3bcf03f9e318f2fc0ed41aecb6"
-  integrity sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz#b407f5c96be0d9f5f88467497fa82b30ac3e8753"
+  integrity sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
 
-"@babel/plugin-transform-new-target@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz#9097d753cb7b024cb7381a3b2e52e9513a9c6888"
-  integrity sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==
+"@babel/plugin-transform-new-target@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz#80073f02ee1bb2d365c3416490e085c95759dec0"
+  integrity sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-object-super@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz#d7146c4d139433e7a6526f888c667e314a093894"
-  integrity sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==
+"@babel/plugin-transform-object-super@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e"
+  integrity sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.12.1"
 
-"@babel/plugin-transform-parameters@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.4.tgz#7b4d137c87ea7adc2a0f3ebf53266871daa6fced"
-  integrity sha512-RurVtZ/D5nYfEg0iVERXYKEgDFeesHrHfx8RT05Sq57ucj2eOYAP6eu5fynL4Adju4I/mP/I6SO0DqNWAXjfLQ==
+"@babel/plugin-transform-parameters@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz#d2e963b038771650c922eff593799c96d853255d"
+  integrity sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-property-literals@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz#f6fe54b6590352298785b83edd815d214c42e3c0"
-  integrity sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==
+"@babel/plugin-transform-property-literals@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz#41bc81200d730abb4456ab8b3fbd5537b59adecd"
+  integrity sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-react-display-name@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.4.tgz#b5795f4e3e3140419c3611b7a2a3832b9aef328d"
-  integrity sha512-Zd4X54Mu9SBfPGnEcaGcOrVAYOtjT2on8QZkLKEq1S/tHexG39d9XXGZv19VfRrDjPJzFmPfTAqOQS1pfFOujw==
+"@babel/plugin-transform-react-display-name@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz#1cbcd0c3b1d6648c55374a22fc9b6b7e5341c00d"
+  integrity sha512-cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-react-inline-elements@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-inline-elements/-/plugin-transform-react-inline-elements-7.10.4.tgz#9b7ea0051d3d10520bd7e0d5b021eb49fa311674"
-  integrity sha512-Pu5eO9xGwtsPA7N7Qp36D0BKdfmuh0rmWKBEoJHfzPWICOSkJX/UPwqLr1myCnjccpvkOhBcP2WFbEAPTAkYiA==
+"@babel/plugin-transform-react-inline-elements@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-inline-elements/-/plugin-transform-react-inline-elements-7.12.1.tgz#f7d507200923adbbdacb107feec7ad09cefae631"
+  integrity sha512-9ZuH22V68nUyLkhSJYKBqQr10d/gqmyAEeffpGXh3cRkETDUVDaY5PgX/dg8id419KoyWc5VCwsCgJVmxxAk3g==
   dependencies:
     "@babel/helper-builder-react-jsx" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-react-jsx-development@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.10.4.tgz#6ec90f244394604623880e15ebc3c34c356258ba"
-  integrity sha512-RM3ZAd1sU1iQ7rI2dhrZRZGv0aqzNQMbkIUCS1txYpi9wHQ2ZHNjo5TwX+UD6pvFW4AbWqLVYvKy5qJSAyRGjQ==
-  dependencies:
-    "@babel/helper-builder-react-jsx-experimental" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-jsx" "^7.10.4"
-
-"@babel/plugin-transform-react-jsx-self@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.4.tgz#cd301a5fed8988c182ed0b9d55e9bd6db0bd9369"
-  integrity sha512-yOvxY2pDiVJi0axdTWHSMi5T0DILN+H+SaeJeACHKjQLezEzhLx9nEF9xgpBLPtkZsks9cnb5P9iBEi21En3gg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-jsx" "^7.10.4"
-
-"@babel/plugin-transform-react-jsx-source@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.4.tgz#86baf0fcccfe58084e06446a80858e1deae8f291"
-  integrity sha512-FTK3eQFrPv2aveerUSazFmGygqIdTtvskG50SnGnbEUnRPcGx2ylBhdFIzoVS1ty44hEgcPoCAyw5r3VDEq+Ug==
+"@babel/plugin-transform-react-jsx-development@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.7.tgz#4c2a647de79c7e2b16bfe4540677ba3121e82a08"
+  integrity sha512-Rs3ETtMtR3VLXFeYRChle5SsP/P9Jp/6dsewBQfokDSzKJThlsuFcnzLTDRALiUmTC48ej19YD9uN1mupEeEDg==
   dependencies:
+    "@babel/helper-builder-react-jsx-experimental" "^7.12.4"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-jsx" "^7.10.4"
+    "@babel/plugin-syntax-jsx" "^7.12.1"
 
-"@babel/plugin-transform-react-jsx@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.4.tgz#673c9f913948764a4421683b2bef2936968fddf2"
-  integrity sha512-L+MfRhWjX0eI7Js093MM6MacKU4M6dnCRa/QPDwYMxjljzSCzzlzKzj9Pk4P3OtrPcxr2N3znR419nr3Xw+65A==
+"@babel/plugin-transform-react-jsx@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.10.tgz#a7af3097c73479123594c8c8fe39545abebd44e3"
+  integrity sha512-MM7/BC8QdHXM7Qc1wdnuk73R4gbuOpfrSUgfV/nODGc86sPY1tgmY2M9E9uAnf2e4DOIp8aKGWqgZfQxnTNGuw==
   dependencies:
     "@babel/helper-builder-react-jsx" "^7.10.4"
-    "@babel/helper-builder-react-jsx-experimental" "^7.10.4"
+    "@babel/helper-builder-react-jsx-experimental" "^7.12.10"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-jsx" "^7.10.4"
+    "@babel/plugin-syntax-jsx" "^7.12.1"
 
-"@babel/plugin-transform-react-pure-annotations@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.4.tgz#3eefbb73db94afbc075f097523e445354a1c6501"
-  integrity sha512-+njZkqcOuS8RaPakrnR9KvxjoG1ASJWpoIv/doyWngId88JoFlPlISenGXjrVacZUIALGUr6eodRs1vmPnF23A==
+"@babel/plugin-transform-react-pure-annotations@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz#05d46f0ab4d1339ac59adf20a1462c91b37a1a42"
+  integrity sha512-RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-regenerator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz#2015e59d839074e76838de2159db421966fd8b63"
-  integrity sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==
+"@babel/plugin-transform-regenerator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz#5f0a28d842f6462281f06a964e88ba8d7ab49753"
+  integrity sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==
   dependencies:
     regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-reserved-words@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz#8f2682bcdcef9ed327e1b0861585d7013f8a54dd"
-  integrity sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==
+"@babel/plugin-transform-reserved-words@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz#6fdfc8cc7edcc42b36a7c12188c6787c873adcd8"
+  integrity sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-runtime@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.4.tgz#594fb53453ea1b6f0779cceb48ce0718a447feb7"
-  integrity sha512-8ULlGv8p+Vuxu+kz2Y1dk6MYS2b/Dki+NO6/0ZlfSj5tMalfDL7jI/o/2a+rrWLqSXvnadEqc2WguB4gdQIxZw==
+"@babel/plugin-transform-runtime@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz#af0fded4e846c4b37078e8e5d06deac6cd848562"
+  integrity sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA==
   dependencies:
-    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-module-imports" "^7.12.5"
     "@babel/helper-plugin-utils" "^7.10.4"
-    resolve "^1.8.1"
     semver "^5.5.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz#9fd25ec5cdd555bb7f473e5e6ee1c971eede4dd6"
-  integrity sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==
+"@babel/plugin-transform-shorthand-properties@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz#0bf9cac5550fce0cfdf043420f661d645fdc75e3"
+  integrity sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-spread@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.4.tgz#4e2c85ea0d6abaee1b24dcfbbae426fe8d674cff"
-  integrity sha512-1e/51G/Ni+7uH5gktbWv+eCED9pP8ZpRhZB3jOaI3mmzfvJTWHkuyYTv0Z5PYtyM+Tr2Ccr9kUdQxn60fI5WuQ==
+"@babel/plugin-transform-spread@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz#527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e"
+  integrity sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
 
-"@babel/plugin-transform-sticky-regex@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz#8f3889ee8657581130a29d9cc91d7c73b7c4a28d"
-  integrity sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==
+"@babel/plugin-transform-sticky-regex@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad"
+  integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-regex" "^7.10.4"
 
-"@babel/plugin-transform-template-literals@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.4.tgz#e6375407b30fcb7fcfdbba3bb98ef3e9d36df7bc"
-  integrity sha512-4NErciJkAYe+xI5cqfS8pV/0ntlY5N5Ske/4ImxAVX7mk9Rxt2bwDTGv1Msc2BRJvWQcmYEC+yoMLdX22aE4VQ==
+"@babel/plugin-transform-template-literals@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843"
+  integrity sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-typeof-symbol@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz#9509f1a7eec31c4edbffe137c16cc33ff0bc5bfc"
-  integrity sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==
+"@babel/plugin-transform-typeof-symbol@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz#de01c4c8f96580bd00f183072b0d0ecdcf0dec4b"
+  integrity sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-unicode-escapes@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz#feae523391c7651ddac115dae0a9d06857892007"
-  integrity sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==
+"@babel/plugin-transform-unicode-escapes@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709"
+  integrity sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-unicode-regex@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz#e56d71f9282fac6db09c82742055576d5e6d80a8"
-  integrity sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==
+"@babel/plugin-transform-unicode-regex@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb"
+  integrity sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/preset-env@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.4.tgz#fbf57f9a803afd97f4f32e4f798bb62e4b2bef5f"
-  integrity sha512-tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw==
+"@babel/preset-env@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9"
+  integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw==
   dependencies:
-    "@babel/compat-data" "^7.10.4"
-    "@babel/helper-compilation-targets" "^7.10.4"
-    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/compat-data" "^7.12.7"
+    "@babel/helper-compilation-targets" "^7.12.5"
+    "@babel/helper-module-imports" "^7.12.5"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-proposal-async-generator-functions" "^7.10.4"
-    "@babel/plugin-proposal-class-properties" "^7.10.4"
-    "@babel/plugin-proposal-dynamic-import" "^7.10.4"
-    "@babel/plugin-proposal-json-strings" "^7.10.4"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.4"
-    "@babel/plugin-proposal-numeric-separator" "^7.10.4"
-    "@babel/plugin-proposal-object-rest-spread" "^7.10.4"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.10.4"
-    "@babel/plugin-proposal-optional-chaining" "^7.10.4"
-    "@babel/plugin-proposal-private-methods" "^7.10.4"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.10.4"
+    "@babel/helper-validator-option" "^7.12.11"
+    "@babel/plugin-proposal-async-generator-functions" "^7.12.1"
+    "@babel/plugin-proposal-class-properties" "^7.12.1"
+    "@babel/plugin-proposal-dynamic-import" "^7.12.1"
+    "@babel/plugin-proposal-export-namespace-from" "^7.12.1"
+    "@babel/plugin-proposal-json-strings" "^7.12.1"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
+    "@babel/plugin-proposal-numeric-separator" "^7.12.7"
+    "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.12.7"
+    "@babel/plugin-proposal-private-methods" "^7.12.1"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.12.1"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
-    "@babel/plugin-syntax-class-properties" "^7.10.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.1"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.10.4"
-    "@babel/plugin-transform-arrow-functions" "^7.10.4"
-    "@babel/plugin-transform-async-to-generator" "^7.10.4"
-    "@babel/plugin-transform-block-scoped-functions" "^7.10.4"
-    "@babel/plugin-transform-block-scoping" "^7.10.4"
-    "@babel/plugin-transform-classes" "^7.10.4"
-    "@babel/plugin-transform-computed-properties" "^7.10.4"
-    "@babel/plugin-transform-destructuring" "^7.10.4"
-    "@babel/plugin-transform-dotall-regex" "^7.10.4"
-    "@babel/plugin-transform-duplicate-keys" "^7.10.4"
-    "@babel/plugin-transform-exponentiation-operator" "^7.10.4"
-    "@babel/plugin-transform-for-of" "^7.10.4"
-    "@babel/plugin-transform-function-name" "^7.10.4"
-    "@babel/plugin-transform-literals" "^7.10.4"
-    "@babel/plugin-transform-member-expression-literals" "^7.10.4"
-    "@babel/plugin-transform-modules-amd" "^7.10.4"
-    "@babel/plugin-transform-modules-commonjs" "^7.10.4"
-    "@babel/plugin-transform-modules-systemjs" "^7.10.4"
-    "@babel/plugin-transform-modules-umd" "^7.10.4"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.10.4"
-    "@babel/plugin-transform-new-target" "^7.10.4"
-    "@babel/plugin-transform-object-super" "^7.10.4"
-    "@babel/plugin-transform-parameters" "^7.10.4"
-    "@babel/plugin-transform-property-literals" "^7.10.4"
-    "@babel/plugin-transform-regenerator" "^7.10.4"
-    "@babel/plugin-transform-reserved-words" "^7.10.4"
-    "@babel/plugin-transform-shorthand-properties" "^7.10.4"
-    "@babel/plugin-transform-spread" "^7.10.4"
-    "@babel/plugin-transform-sticky-regex" "^7.10.4"
-    "@babel/plugin-transform-template-literals" "^7.10.4"
-    "@babel/plugin-transform-typeof-symbol" "^7.10.4"
-    "@babel/plugin-transform-unicode-escapes" "^7.10.4"
-    "@babel/plugin-transform-unicode-regex" "^7.10.4"
+    "@babel/plugin-syntax-top-level-await" "^7.12.1"
+    "@babel/plugin-transform-arrow-functions" "^7.12.1"
+    "@babel/plugin-transform-async-to-generator" "^7.12.1"
+    "@babel/plugin-transform-block-scoped-functions" "^7.12.1"
+    "@babel/plugin-transform-block-scoping" "^7.12.11"
+    "@babel/plugin-transform-classes" "^7.12.1"
+    "@babel/plugin-transform-computed-properties" "^7.12.1"
+    "@babel/plugin-transform-destructuring" "^7.12.1"
+    "@babel/plugin-transform-dotall-regex" "^7.12.1"
+    "@babel/plugin-transform-duplicate-keys" "^7.12.1"
+    "@babel/plugin-transform-exponentiation-operator" "^7.12.1"
+    "@babel/plugin-transform-for-of" "^7.12.1"
+    "@babel/plugin-transform-function-name" "^7.12.1"
+    "@babel/plugin-transform-literals" "^7.12.1"
+    "@babel/plugin-transform-member-expression-literals" "^7.12.1"
+    "@babel/plugin-transform-modules-amd" "^7.12.1"
+    "@babel/plugin-transform-modules-commonjs" "^7.12.1"
+    "@babel/plugin-transform-modules-systemjs" "^7.12.1"
+    "@babel/plugin-transform-modules-umd" "^7.12.1"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.1"
+    "@babel/plugin-transform-new-target" "^7.12.1"
+    "@babel/plugin-transform-object-super" "^7.12.1"
+    "@babel/plugin-transform-parameters" "^7.12.1"
+    "@babel/plugin-transform-property-literals" "^7.12.1"
+    "@babel/plugin-transform-regenerator" "^7.12.1"
+    "@babel/plugin-transform-reserved-words" "^7.12.1"
+    "@babel/plugin-transform-shorthand-properties" "^7.12.1"
+    "@babel/plugin-transform-spread" "^7.12.1"
+    "@babel/plugin-transform-sticky-regex" "^7.12.7"
+    "@babel/plugin-transform-template-literals" "^7.12.1"
+    "@babel/plugin-transform-typeof-symbol" "^7.12.10"
+    "@babel/plugin-transform-unicode-escapes" "^7.12.1"
+    "@babel/plugin-transform-unicode-regex" "^7.12.1"
     "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.10.4"
-    browserslist "^4.12.0"
-    core-js-compat "^3.6.2"
-    invariant "^2.2.2"
-    levenary "^1.1.1"
+    "@babel/types" "^7.12.11"
+    core-js-compat "^3.8.0"
     semver "^5.5.0"
 
 "@babel/preset-modules@^0.1.3":
@@ -1025,18 +939,16 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-react@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.10.4.tgz#92e8a66d816f9911d11d4cc935be67adfc82dbcf"
-  integrity sha512-BrHp4TgOIy4M19JAfO1LhycVXOPWdDbTRep7eVyatf174Hff+6Uk53sDyajqZPu8W1qXRBiYOfIamek6jA7YVw==
+"@babel/preset-react@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.10.tgz#4fed65f296cbb0f5fb09de6be8cddc85cc909be9"
+  integrity sha512-vtQNjaHRl4DUpp+t+g4wvTHsLQuye+n0H/wsXIZRn69oz/fvNC7gQ4IK73zGJBaxvHoxElDvnYCthMcT7uzFoQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-transform-react-display-name" "^7.10.4"
-    "@babel/plugin-transform-react-jsx" "^7.10.4"
-    "@babel/plugin-transform-react-jsx-development" "^7.10.4"
-    "@babel/plugin-transform-react-jsx-self" "^7.10.4"
-    "@babel/plugin-transform-react-jsx-source" "^7.10.4"
-    "@babel/plugin-transform-react-pure-annotations" "^7.10.4"
+    "@babel/plugin-transform-react-display-name" "^7.12.1"
+    "@babel/plugin-transform-react-jsx" "^7.12.10"
+    "@babel/plugin-transform-react-jsx-development" "^7.12.7"
+    "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
 
 "@babel/runtime-corejs3@^7.10.2":
   version "7.10.3"
@@ -1046,14 +958,6 @@
     core-js-pure "^3.0.0"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime-corejs3@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.10.4.tgz#f29fc1990307c4c57b10dbd6ce667b27159d9e0d"
-  integrity sha512-BFlgP2SoLO9HJX9WBwN67gHWMBhDX/eDz64Jajd6mR/UAUzqrNMm99d4qHnVaKscAElZoFiPv+JpR/Siud5lXw==
-  dependencies:
-    core-js-pure "^3.0.0"
-    regenerator-runtime "^0.13.4"
-
 "@babel/runtime@7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz#adeb78fedfc855aa05bc041640f3f6f98e85424c"
@@ -1061,68 +965,44 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.2.0", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.3.tgz#670d002655a7c366540c67f6fd3342cd09500364"
-  integrity sha512-RzGO0RLSdokm9Ipe/YD+7ww8X2Ro79qiXZF3HU9ljrM+qnJmH1Vqth+hbiQZy761LnMJTMitHDuKVYTk3k4dLw==
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.2.0", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
+  integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.10.1", "@babel/template@^7.10.3":
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.3.tgz#4d13bc8e30bf95b0ce9d175d30306f42a2c9a7b8"
-  integrity sha512-5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA==
-  dependencies:
-    "@babel/code-frame" "^7.10.3"
-    "@babel/parser" "^7.10.3"
-    "@babel/types" "^7.10.3"
-
-"@babel/template@^7.10.4", "@babel/template@^7.3.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
-  integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/parser" "^7.10.4"
-    "@babel/types" "^7.10.4"
-
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.4.tgz#e642e5395a3b09cc95c8e74a27432b484b697818"
-  integrity sha512-aSy7p5THgSYm4YyxNGz6jZpXf+Ok40QF3aA2LyIONkDHpAcJzDUqlCKXv6peqYUs2gmic849C/t2HKw2a2K20Q==
+"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
+  integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.10.4"
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-split-export-declaration" "^7.10.4"
-    "@babel/parser" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/parser" "^7.12.7"
+    "@babel/types" "^7.12.7"
+
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5", "@babel/traverse@^7.7.0":
+  version "7.12.12"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.12.tgz#d0cd87892704edd8da002d674bc811ce64743376"
+  integrity sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==
+  dependencies:
+    "@babel/code-frame" "^7.12.11"
+    "@babel/generator" "^7.12.11"
+    "@babel/helper-function-name" "^7.12.11"
+    "@babel/helper-split-export-declaration" "^7.12.11"
+    "@babel/parser" "^7.12.11"
+    "@babel/types" "^7.12.12"
     debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.13"
+    lodash "^4.17.19"
 
-"@babel/traverse@^7.10.1", "@babel/traverse@^7.10.3", "@babel/traverse@^7.7.0":
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.3.tgz#0b01731794aa7b77b214bcd96661f18281155d7e"
-  integrity sha512-qO6623eBFhuPm0TmmrUFMT1FulCmsSeJuVGhiLodk2raUDFhhTECLd9E9jC4LBIWziqt4wgF6KuXE4d+Jz9yug==
-  dependencies:
-    "@babel/code-frame" "^7.10.3"
-    "@babel/generator" "^7.10.3"
-    "@babel/helper-function-name" "^7.10.3"
-    "@babel/helper-split-export-declaration" "^7.10.1"
-    "@babel/parser" "^7.10.3"
-    "@babel/types" "^7.10.3"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.10.1", "@babel/types@^7.10.3", "@babel/types@^7.10.4", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.4.tgz#369517188352e18219981efd156bfdb199fff1ee"
-  integrity sha512-UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==
+"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.12", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.12.12"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.12.tgz#4608a6ec313abbd87afa55004d373ad04a96c299"
+  integrity sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
-    lodash "^4.17.13"
+    "@babel/helper-validator-identifier" "^7.12.11"
+    lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
 "@bcoe/v8-coverage@^0.2.3":
@@ -1130,10 +1010,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@clusterws/cws@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@clusterws/cws/-/cws-2.0.0.tgz#73e6ee97b2dcb561d294caa47d48a195234e18a9"
-  integrity sha512-ZKG2vR0XJyyaXEvcV8cxzuspYnEl4owyqkdcMcHd/Pza9nAKQ5iH+yrEg1JsScg/zBIqTZ9D/3rWJavVwTy0mw==
+"@clusterws/cws@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@clusterws/cws/-/cws-3.0.0.tgz#518fc8e7d9066e220f6f6aef3158cc14d5a1e98e"
+  integrity sha512-6RO7IUbSlTO3l8XPN/9g21YGPF4HjfkidDzchkP0h6iwq5jYtji+KUCgyxcSYiuN7aWu8nGJDjBer7XJilPnOg==
 
 "@cnakazawa/watch@^1.0.3":
   version "1.0.4"
@@ -1225,6 +1105,22 @@
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.4.tgz#622a72bebd1e3f48d921563b4b60a762295a81fc"
   integrity sha512-6PYY5DVdAY1ifaQW6XYTnOMihmBVT27elqSjEoodchsGjzYlEsTQMcEhSud99kVawatyTZRTiVkJ/c6lwbQ7nA==
 
+"@eslint/eslintrc@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz#d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76"
+  integrity sha512-EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.1.1"
+    espree "^7.3.0"
+    globals "^12.1.0"
+    ignore "^4.0.6"
+    import-fresh "^3.2.1"
+    js-yaml "^3.13.1"
+    lodash "^4.17.19"
+    minimatch "^3.0.4"
+    strip-json-comments "^3.1.1"
+
 "@formatjs/intl-unified-numberformat@^3.3.3":
   version "3.3.6"
   resolved "https://registry.yarnpkg.com/@formatjs/intl-unified-numberformat/-/intl-unified-numberformat-3.3.6.tgz#ab69818f7568894023cb31fdb5b5c7eed62c6537"
@@ -1242,6 +1138,11 @@
   resolved "https://registry.yarnpkg.com/@gamestdio/websocket/-/websocket-0.3.2.tgz#321ba0976ee30fd14e51dbf8faa85ce7b325f76a"
   integrity sha512-J3n5SKim+ZoLbe44hRGI/VYAwSMCeIJuBy+FfP6EZaujEpNchPRFcIsVQLWAwpU1bP2Ji63rC+rEUOd1vjUB6Q==
 
+"@github/webauthn-json@^0.5.7":
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/@github/webauthn-json/-/webauthn-json-0.5.7.tgz#143bc67f6e0f75f8d188e565741507bb08c31214"
+  integrity sha512-SUYsttDxFSvWvvJssJpwzjmRCqYfdfqC9VCmAHQYfdKCVelyJteCHo9/lK1CB72mx/jrl6cFNY08aua4J2jIyg==
+
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
@@ -1258,89 +1159,93 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
   integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
 
-"@jest/console@^26.1.0":
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.1.0.tgz#f67c89e4f4d04dbcf7b052aed5ab9c74f915b954"
-  integrity sha512-+0lpTHMd/8pJp+Nd4lyip+/Iyf2dZJvcCqrlkeZQoQid+JlThA4M9vxHtheyrQ99jJTMQam+es4BcvZ5W5cC3A==
+"@jest/console@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2"
+  integrity sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==
   dependencies:
-    "@jest/types" "^26.1.0"
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
     chalk "^4.0.0"
-    jest-message-util "^26.1.0"
-    jest-util "^26.1.0"
+    jest-message-util "^26.6.2"
+    jest-util "^26.6.2"
     slash "^3.0.0"
 
-"@jest/core@^26.0.1", "@jest/core@^26.1.0":
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.1.0.tgz#4580555b522de412a7998b3938c851e4f9da1c18"
-  integrity sha512-zyizYmDJOOVke4OO/De//aiv8b07OwZzL2cfsvWF3q9YssfpcKfcnZAwDY8f+A76xXSMMYe8i/f/LPocLlByfw==
+"@jest/core@^26.6.3":
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad"
+  integrity sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==
   dependencies:
-    "@jest/console" "^26.1.0"
-    "@jest/reporters" "^26.1.0"
-    "@jest/test-result" "^26.1.0"
-    "@jest/transform" "^26.1.0"
-    "@jest/types" "^26.1.0"
+    "@jest/console" "^26.6.2"
+    "@jest/reporters" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
-    jest-changed-files "^26.1.0"
-    jest-config "^26.1.0"
-    jest-haste-map "^26.1.0"
-    jest-message-util "^26.1.0"
+    jest-changed-files "^26.6.2"
+    jest-config "^26.6.3"
+    jest-haste-map "^26.6.2"
+    jest-message-util "^26.6.2"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.1.0"
-    jest-resolve-dependencies "^26.1.0"
-    jest-runner "^26.1.0"
-    jest-runtime "^26.1.0"
-    jest-snapshot "^26.1.0"
-    jest-util "^26.1.0"
-    jest-validate "^26.1.0"
-    jest-watcher "^26.1.0"
+    jest-resolve "^26.6.2"
+    jest-resolve-dependencies "^26.6.3"
+    jest-runner "^26.6.3"
+    jest-runtime "^26.6.3"
+    jest-snapshot "^26.6.2"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
+    jest-watcher "^26.6.2"
     micromatch "^4.0.2"
     p-each-series "^2.1.0"
     rimraf "^3.0.0"
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
-"@jest/environment@^26.1.0":
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.1.0.tgz#378853bcdd1c2443b4555ab908cfbabb851e96da"
-  integrity sha512-86+DNcGongbX7ai/KE/S3/NcUVZfrwvFzOOWX/W+OOTvTds7j07LtC+MgGydH5c8Ri3uIrvdmVgd1xFD5zt/xA==
+"@jest/environment@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c"
+  integrity sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==
   dependencies:
-    "@jest/fake-timers" "^26.1.0"
-    "@jest/types" "^26.1.0"
-    jest-mock "^26.1.0"
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
+    jest-mock "^26.6.2"
 
-"@jest/fake-timers@^26.1.0":
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.1.0.tgz#9a76b7a94c351cdbc0ad53e5a748789f819a65fe"
-  integrity sha512-Y5F3kBVWxhau3TJ825iuWy++BAuQzK/xEa+wD9vDH3RytW9f2DbMVodfUQC54rZDX3POqdxCgcKdgcOL0rYUpA==
+"@jest/fake-timers@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad"
+  integrity sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==
   dependencies:
-    "@jest/types" "^26.1.0"
+    "@jest/types" "^26.6.2"
     "@sinonjs/fake-timers" "^6.0.1"
-    jest-message-util "^26.1.0"
-    jest-mock "^26.1.0"
-    jest-util "^26.1.0"
+    "@types/node" "*"
+    jest-message-util "^26.6.2"
+    jest-mock "^26.6.2"
+    jest-util "^26.6.2"
 
-"@jest/globals@^26.1.0":
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.1.0.tgz#6cc5d7cbb79b76b120f2403d7d755693cf063ab1"
-  integrity sha512-MKiHPNaT+ZoG85oMaYUmGHEqu98y3WO2yeIDJrs2sJqHhYOy3Z6F7F/luzFomRQ8SQ1wEkmahFAz2291Iv8EAw==
+"@jest/globals@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a"
+  integrity sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==
   dependencies:
-    "@jest/environment" "^26.1.0"
-    "@jest/types" "^26.1.0"
-    expect "^26.1.0"
+    "@jest/environment" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    expect "^26.6.2"
 
-"@jest/reporters@^26.1.0":
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.1.0.tgz#08952e90c90282e14ff49e927bdf1873617dae78"
-  integrity sha512-SVAysur9FOIojJbF4wLP0TybmqwDkdnFxHSPzHMMIYyBtldCW9gG+Q5xWjpMFyErDiwlRuPyMSJSU64A67Pazg==
+"@jest/reporters@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6"
+  integrity sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^26.1.0"
-    "@jest/test-result" "^26.1.0"
-    "@jest/transform" "^26.1.0"
-    "@jest/types" "^26.1.0"
+    "@jest/console" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
@@ -1351,63 +1256,63 @@
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
     istanbul-reports "^3.0.2"
-    jest-haste-map "^26.1.0"
-    jest-resolve "^26.1.0"
-    jest-util "^26.1.0"
-    jest-worker "^26.1.0"
+    jest-haste-map "^26.6.2"
+    jest-resolve "^26.6.2"
+    jest-util "^26.6.2"
+    jest-worker "^26.6.2"
     slash "^3.0.0"
     source-map "^0.6.0"
     string-length "^4.0.1"
     terminal-link "^2.0.0"
-    v8-to-istanbul "^4.1.3"
+    v8-to-istanbul "^7.0.0"
   optionalDependencies:
-    node-notifier "^7.0.0"
+    node-notifier "^8.0.0"
 
-"@jest/source-map@^26.1.0":
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.1.0.tgz#a6a020d00e7d9478f4b690167c5e8b77e63adb26"
-  integrity sha512-XYRPYx4eEVX15cMT9mstnO7hkHP3krNtKfxUYd8L7gbtia8JvZZ6bMzSwa6IQJENbudTwKMw5R1BePRD+bkEmA==
+"@jest/source-map@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535"
+  integrity sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==
   dependencies:
     callsites "^3.0.0"
     graceful-fs "^4.2.4"
     source-map "^0.6.0"
 
-"@jest/test-result@^26.1.0":
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.1.0.tgz#a93fa15b21ad3c7ceb21c2b4c35be2e407d8e971"
-  integrity sha512-Xz44mhXph93EYMA8aYDz+75mFbarTV/d/x0yMdI3tfSRs/vh4CqSxgzVmCps1fPkHDCtn0tU8IH9iCKgGeGpfw==
+"@jest/test-result@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18"
+  integrity sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==
   dependencies:
-    "@jest/console" "^26.1.0"
-    "@jest/types" "^26.1.0"
+    "@jest/console" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^26.1.0":
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.1.0.tgz#41a6fc8b850c3f33f48288ea9ea517c047e7f14e"
-  integrity sha512-Z/hcK+rTq56E6sBwMoQhSRDVjqrGtj1y14e2bIgcowARaIE1SgOanwx6gvY4Q9gTKMoZQXbXvptji+q5GYxa6Q==
+"@jest/test-sequencer@^26.6.3":
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17"
+  integrity sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==
   dependencies:
-    "@jest/test-result" "^26.1.0"
+    "@jest/test-result" "^26.6.2"
     graceful-fs "^4.2.4"
-    jest-haste-map "^26.1.0"
-    jest-runner "^26.1.0"
-    jest-runtime "^26.1.0"
+    jest-haste-map "^26.6.2"
+    jest-runner "^26.6.3"
+    jest-runtime "^26.6.3"
 
-"@jest/transform@^26.1.0":
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.1.0.tgz#697f48898c2a2787c9b4cb71d09d7e617464e509"
-  integrity sha512-ICPm6sUXmZJieq45ix28k0s+d/z2E8CHDsq+WwtWI6kW8m7I8kPqarSEcUN86entHQ570ZBRci5OWaKL0wlAWw==
+"@jest/transform@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b"
+  integrity sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/types" "^26.1.0"
+    "@jest/types" "^26.6.2"
     babel-plugin-istanbul "^6.0.0"
     chalk "^4.0.0"
     convert-source-map "^1.4.0"
     fast-json-stable-stringify "^2.0.0"
     graceful-fs "^4.2.4"
-    jest-haste-map "^26.1.0"
+    jest-haste-map "^26.6.2"
     jest-regex-util "^26.0.0"
-    jest-util "^26.1.0"
+    jest-util "^26.6.2"
     micromatch "^4.0.2"
     pirates "^4.0.1"
     slash "^3.0.0"
@@ -1424,37 +1329,17 @@
     "@types/yargs" "^15.0.0"
     chalk "^3.0.0"
 
-"@jest/types@^26.1.0":
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.1.0.tgz#f8afaaaeeb23b5cad49dd1f7779689941dcb6057"
-  integrity sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==
+"@jest/types@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
+  integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^1.1.1"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
-"@nodelib/fs.scandir@2.1.3":
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
-  integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
-  dependencies:
-    "@nodelib/fs.stat" "2.0.3"
-    run-parallel "^1.1.9"
-
-"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
-  integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
-
-"@nodelib/fs.walk@^1.2.3":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
-  integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
-  dependencies:
-    "@nodelib/fs.scandir" "2.1.3"
-    fastq "^1.6.0"
-
 "@npmcli/move-file@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz#de103070dac0f48ce49cf6693c23af59c0f70464"
@@ -1462,15 +1347,20 @@
   dependencies:
     mkdirp "^1.0.4"
 
-"@rails/ujs@^6.0.3":
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.3.tgz#e68a03278e30daea6a110aac5dfa33c60c53055d"
-  integrity sha512-CM9OEvoN9eXkaX7PXEnbsQLULJ97b9rVmwliZbz/iBOERLJ68Rk3ClJe+fQEMKU4CBZfky2lIRnfslOdUs9SLQ==
+"@polka/url@^1.0.0-next.9":
+  version "1.0.0-next.11"
+  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.11.tgz#aeb16f50649a91af79dbe36574b66d0f9e4d9f71"
+  integrity sha512-3NsZsJIA/22P3QUyrEDNA2D133H4j224twJrdipXN38dpnIOzAbUDtOwkcJ5pXmn75w7LSQDjA4tO9dm1XlqlA==
+
+"@rails/ujs@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.0.tgz#9a48df6511cb2b472c9f596c1f37dc0af022e751"
+  integrity sha512-kQNKyM4ePAc4u9eR1c4OqrbAHH+3SJXt++8izIjeaZeg+P7yBtgoF/dogMD/JPPowNC74ACFpM/4op0Ggp/fPw==
 
 "@sinonjs/commons@^1.7.0":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz#c8d68821a854c555bba172f3b06959a0039b236d"
-  integrity sha512-wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q==
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217"
+  integrity sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==
   dependencies:
     type-detect "4.0.8"
 
@@ -1481,39 +1371,46 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@testing-library/dom@^7.17.1":
-  version "7.18.1"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.18.1.tgz#c49530410fb184522b3b59c4f9cd6397dc5b462d"
-  integrity sha512-tGq4KAFjaI7j375sMM1RRVleWA0viJWs/w69B+nyDkqYLNkhdTHdV6mGkspJlkn3PUfyBDi3rERDv4PA/LrpVA==
+"@testing-library/dom@^7.28.1":
+  version "7.28.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.28.1.tgz#dea78be6e1e6db32ddcb29a449e94d9700c79eb9"
+  integrity sha512-acv3l6kDwZkQif/YqJjstT3ks5aaI33uxGNVIQmdKzbZ2eMKgg3EV2tB84GDdc72k3Kjhl6mO8yUt6StVIdRDg==
   dependencies:
-    "@babel/runtime" "^7.10.3"
+    "@babel/code-frame" "^7.10.4"
+    "@babel/runtime" "^7.12.5"
+    "@types/aria-query" "^4.2.0"
     aria-query "^4.2.2"
-    dom-accessibility-api "^0.4.5"
-    pretty-format "^25.5.0"
+    chalk "^4.1.0"
+    dom-accessibility-api "^0.5.4"
+    lz-string "^1.4.4"
+    pretty-format "^26.6.2"
 
-"@testing-library/jest-dom@^5.11.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.11.0.tgz#1439f08dc85ce7c6d3bbad0ee5d53b2206f55768"
-  integrity sha512-mhaCySy7dZlyfcxcYy+0jLllODHEiHkVdmwQ00wD0HrWiSx0fSVHz/0WmdlRkvhfSOuqsRsBUreXOtBvruWGQA==
+"@testing-library/jest-dom@^5.11.8":
+  version "5.11.8"
+  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.11.8.tgz#433a84d6f9a089485101b9e112ef03e5c30bcbfc"
+  integrity sha512-ScyKrWQM5xNcr79PkSewnA79CLaoxVskE+f7knTOhDD9ftZSA1Jw8mj+pneqhEu3x37ncNfW84NUr7lqK+mXjA==
   dependencies:
     "@babel/runtime" "^7.9.2"
     "@types/testing-library__jest-dom" "^5.9.1"
     aria-query "^4.2.2"
     chalk "^3.0.0"
-    css "^2.2.4"
+    css "^3.0.0"
     css.escape "^1.5.1"
-    jest-diff "^25.1.0"
-    jest-matcher-utils "^25.1.0"
     lodash "^4.17.15"
     redent "^3.0.0"
 
-"@testing-library/react@^10.4.3":
-  version "10.4.3"
-  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-10.4.3.tgz#c6f356688cffc51f6b35385583d664bb11a161f4"
-  integrity sha512-A/ydYXcwAcfY7vkPrfUkUTf9HQLL3/GtixTefcu3OyGQtAYQ7XBQj1S9FWbLEhfWa0BLwFwTBFS3Ao1O0tbMJg==
+"@testing-library/react@^11.2.2":
+  version "11.2.2"
+  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.2.tgz#099c6c195140ff069211143cb31c0f8337bdb7b7"
+  integrity sha512-jaxm0hwUjv+hzC+UFEywic7buDC9JQ1q3cDsrWVSDAPmLotfA6E6kUHlYm/zOeGCac6g48DR36tFHxl7Zb+N5A==
   dependencies:
-    "@babel/runtime" "^7.10.3"
-    "@testing-library/dom" "^7.17.1"
+    "@babel/runtime" "^7.12.5"
+    "@testing-library/dom" "^7.28.1"
+
+"@types/aria-query@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz#14264692a9d6e2fa4db3df5e56e94b5e25647ac0"
+  integrity sha512-iIgQNzCm0v7QMhhe4Jjn9uRh+I6GoPmt03CbEtwx3ao8/EfoQcmgtqH4vQ5Db/lxiIGaWDv6nwvunuh0RyX0+A==
 
 "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.3", "@types/babel__core@^7.1.7":
   version "7.1.9"
@@ -1542,9 +1439,16 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.0.12"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.12.tgz#22f49a028e69465390f87bb103ebd61bd086b8f5"
-  integrity sha512-t4CoEokHTfcyfb4hUaF9oOHu9RmmNWnm1CP0YmMqOOfClKascOmvlEM736vlqeScuGvBDsHkf8R2INd4DWreQA==
+  version "7.0.13"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.13.tgz#1874914be974a492e1b4cb00585cabb274e8ba18"
+  integrity sha512-i+zS7t6/s9cdQvbqKDARrcbrPvtJGlbYsMkazo03nTAK3RX9FNrLllXys22uiTGJapPOTZTQ35nHh4ISph4SLQ==
+  dependencies:
+    "@babel/types" "^7.3.0"
+
+"@types/babel__traverse@^7.0.4":
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03"
+  integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -1594,6 +1498,13 @@
     "@types/istanbul-lib-coverage" "*"
     "@types/istanbul-lib-report" "*"
 
+"@types/istanbul-reports@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821"
+  integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==
+  dependencies:
+    "@types/istanbul-lib-report" "*"
+
 "@types/jest@*":
   version "26.0.3"
   resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.3.tgz#79534e0e94857171c0edc596db0ebe7cb7863251"
@@ -1602,10 +1513,10 @@
     jest-diff "^25.2.1"
     pretty-format "^25.2.1"
 
-"@types/json-schema@^7.0.4":
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
-  integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
+"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
+  integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
 
 "@types/json5@^0.0.29":
   version "0.0.29"
@@ -1618,9 +1529,9 @@
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/node@*":
-  version "14.0.14"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.14.tgz#24a0b5959f16ac141aeb0c5b3cd7a15b7c64cbce"
-  integrity sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ==
+  version "14.11.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.1.tgz#56af902ad157e763f9ba63d671c39cda3193c835"
+  integrity sha512-oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -1633,9 +1544,9 @@
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
 "@types/prettier@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.1.tgz#b6e98083f13faa1e5231bfa3bdb1b0feff536b6d"
-  integrity sha512-boy4xPNEtiw6N3abRhBi/e7hNvy3Tt8E9ZRAQrwAGzoCGZS/1wjo9KY7JHhnfnEsG5wSjDbymCozUM9a3ea7OQ==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.2.tgz#5bb52ee68d0f8efa9cc0099920e56be6cc4e37f3"
+  integrity sha512-IkVfat549ggtkZUthUzEX49562eGikhSYeVGX97SkMFn+sTZrgRewXjQ4tPKFPCykZHkX1Zfd9OoELGqKU2jJA==
 
 "@types/q@^1.5.1":
   version "1.5.2"
@@ -1647,10 +1558,10 @@
   resolved "https://registry.yarnpkg.com/@types/schema-utils/-/schema-utils-1.0.0.tgz#295d36f01e2cb8bc3207ca1d9a68e210db6b40cb"
   integrity sha512-YesPanU1+WCigC/Aj1Mga8UCOjHIfMNHZ3zzDsUY7lI8GlKnh/Kv2QwJOQ+jNQ36Ru7IfzSedlG14hppYaN13A==
 
-"@types/stack-utils@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
-  integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
+"@types/stack-utils@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
+  integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
 
 "@types/testing-library__jest-dom@^5.9.1":
   version "5.9.1"
@@ -1827,9 +1738,9 @@
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
 abab@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
-  integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
+  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
 
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
   version "1.3.7"
@@ -1854,16 +1765,21 @@ acorn-jsx@^3.0.0:
   dependencies:
     acorn "^3.0.4"
 
-acorn-jsx@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
-  integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
+acorn-jsx@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
+  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
 
 acorn-walk@^7.1.1:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
+acorn-walk@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.0.0.tgz#56ae4c0f434a45fff4a125e7ea95fa9c98f67a16"
+  integrity sha512-oZRad/3SMOI/pxbbmqyurIx7jHw1wZDcR9G44L8pUVFEomX/0dH89SrM1KaDXuv1NpzAXz6Op/Xu/Qd5XXzdEA==
+
 acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
@@ -1879,20 +1795,20 @@ acorn@^6.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
   integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
 
-acorn@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.2.0.tgz#17ea7e40d7c8640ff54a694c889c26f31704effe"
-  integrity sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==
+acorn@^7.1.1, acorn@^7.4.0:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^7.1.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"
-  integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==
+acorn@^8.0.4:
+  version "8.0.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.0.4.tgz#7a3ae4191466a6984eee0fe3407a4f3aa9db8354"
+  integrity sha512-XNP0PqF1XD19ZlLKvB7cMmnZswW4C/03pRHgirB30uSJTaS3A3V1/P4sS3HPvFmjoriPCJQs+JDSbm4bL1TxGQ==
 
 aggregate-error@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0"
-  integrity sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
   dependencies:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
@@ -1907,10 +1823,10 @@ ajv-keywords@^1.0.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
   integrity sha1-MU3QpLM2j609/NxU7eYXG4htrzw=
 
-ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
-  integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
+ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
 ajv@^4.7.0:
   version "4.11.8"
@@ -1920,20 +1836,10 @@ ajv@^4.7.0:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.9.1:
-  version "6.12.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
-  integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@^6.5.5:
-  version "6.12.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
-  integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -1950,6 +1856,11 @@ ansi-colors@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
   integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
+ansi-colors@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
 ansi-escapes@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
@@ -2043,6 +1954,11 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
 aria-query@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"
@@ -2076,13 +1992,15 @@ array-flatten@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
-array-includes@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
-  integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
+array-includes@^3.1.1, array-includes@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.2.tgz#a8db03e0b88c8c6aeddc49cb132f9bcab4ebf9c8"
+  integrity sha512-w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0"
+    es-abstract "^1.18.0-next.1"
+    get-intrinsic "^1.0.1"
     is-string "^1.0.5"
 
 array-union@^1.0.1:
@@ -2092,11 +2010,6 @@ array-union@^1.0.1:
   dependencies:
     array-uniq "^1.0.1"
 
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
@@ -2115,19 +2028,29 @@ array.prototype.flat@^1.2.3:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
 
+array.prototype.flatmap@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz#1c13f84a178566042dd63de4414440db9222e443"
+  integrity sha512-OOEk+lkePcg+ODXIpvuU9PAryCikCJyo7GlDG1upleEpQRx6mzL9puEBkozQ5iAx20KV0l3DbyQwqciJtqe5Pg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+    function-bind "^1.1.1"
+
 arrow-key-navigation@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/arrow-key-navigation/-/arrow-key-navigation-1.2.0.tgz#edefc5f8b4fc4e384e7c20ddecf81db7ffc970a9"
   integrity sha512-ch4WOwtjXHFisaa7ey2duW1Qf2VJxoa+8llbsbWDP6wsCzm0DGAi8upv6GDhf5xGvbxhKW3Co9SDEhXq34xCtg==
 
-asn1.js@^4.0.0:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
-  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
+asn1.js@^5.2.0:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
+  integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
+    safer-buffer "^2.1.0"
 
 asn1@~0.2.3:
   version "0.2.4"
@@ -2159,10 +2082,10 @@ ast-types-flow@^0.0.7:
   resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
   integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
 
-astral-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
-  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
+astral-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
+  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
 async-each@^1.0.1:
   version "1.0.3"
@@ -2191,17 +2114,17 @@ atob@^2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@^9.8.0:
-  version "9.8.0"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.0.tgz#68e2d2bef7ba4c3a65436f662d0a56a741e56511"
-  integrity sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==
+autoprefixer@^9.8.6:
+  version "9.8.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
+  integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==
   dependencies:
     browserslist "^4.12.0"
-    caniuse-lite "^1.0.30001061"
-    chalk "^2.4.2"
+    caniuse-lite "^1.0.30001109"
+    colorette "^1.2.1"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.30"
+    postcss "^7.0.32"
     postcss-value-parser "^4.1.0"
 
 aws-sign2@~0.7.0:
@@ -2210,31 +2133,23 @@ aws-sign2@~0.7.0:
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.8.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2"
-  integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428"
+  integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==
 
-axe-core@^3.5.4:
-  version "3.5.5"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-3.5.5.tgz#84315073b53fa3c0c51676c588d59da09a192227"
-  integrity sha512-5P0QZ6J5xGikH780pghEdbEKijCTrruK9KxtPZCFWUpef0f6GipO+xEZ5GKCb020mmqgbiNO6TcA55CriL784Q==
-
-axios@^0.18.0:
-  version "0.18.1"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3"
-  integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==
-  dependencies:
-    follow-redirects "1.5.10"
-    is-buffer "^2.0.2"
+axe-core@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.0.2.tgz#c7cf7378378a51fcd272d3c09668002a4990b1cb"
+  integrity sha512-arU1h31OGFu+LPrOLGZ7nB45v940NMDMEJeNmbutu57P+UFDVnkZg3e+J1I2HJRZ9hT7gO8J91dn/PMrAiKakA==
 
-axios@^0.19.2:
-  version "0.19.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
-  integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
+axios@^0.21.1:
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
+  integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
   dependencies:
-    follow-redirects "1.5.10"
+    follow-redirects "^1.10.0"
 
-axobject-query@^2.1.2:
+axobject-query@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
   integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==
@@ -2251,29 +2166,28 @@ babel-eslint@^10.1.0:
     eslint-visitor-keys "^1.0.0"
     resolve "^1.12.0"
 
-babel-jest@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.1.0.tgz#b20751185fc7569a0f135730584044d1cb934328"
-  integrity sha512-Nkqgtfe7j6PxLO6TnCQQlkMm8wdTdnIF8xrdpooHCuD5hXRzVEPbPneTJKknH5Dsv3L8ip9unHDAp48YQ54Dkg==
+babel-jest@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056"
+  integrity sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==
   dependencies:
-    "@jest/transform" "^26.1.0"
-    "@jest/types" "^26.1.0"
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/babel__core" "^7.1.7"
     babel-plugin-istanbul "^6.0.0"
-    babel-preset-jest "^26.1.0"
+    babel-preset-jest "^26.6.2"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     slash "^3.0.0"
 
-babel-loader@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3"
-  integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==
+babel-loader@^8.2.2:
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
+  integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==
   dependencies:
-    find-cache-dir "^2.1.0"
+    find-cache-dir "^3.3.1"
     loader-utils "^1.4.0"
-    mkdirp "^0.5.3"
-    pify "^4.0.1"
+    make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
 babel-plugin-dynamic-import-node@^2.3.3:
@@ -2310,10 +2224,10 @@ babel-plugin-istanbul@^6.0.0:
     istanbul-lib-instrument "^4.0.0"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.1.0.tgz#c6a774da08247a28285620a64dfadbd05dd5233a"
-  integrity sha512-qhqLVkkSlqmC83bdMhM8WW4Z9tB+JkjqAqlbbohS9sJLT5Ha2vfzuKqg5yenXrAjOPG2YC0WiXdH3a9PvB+YYw==
+babel-plugin-jest-hoist@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz#8185bd030348d254c6d7dd974355e6a28b21e62d"
+  integrity sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==
   dependencies:
     "@babel/template" "^7.3.3"
     "@babel/types" "^7.3.3"
@@ -2372,10 +2286,10 @@ babel-plugin-transform-react-remove-prop-types@^0.4.24:
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a"
   integrity sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==
 
-babel-preset-current-node-syntax@^0.1.2:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz#b4b547acddbf963cba555ba9f9cbbb70bfd044da"
-  integrity sha512-uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ==
+babel-preset-current-node-syntax@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz#cf5feef29551253471cfa82fc8e0f5063df07a77"
+  integrity sha512-mGkvkpocWJes1CmMKtgGUwCeeq0pOhALyymozzDWYomHTbDLwueDYG6p4TK1YOeYHCzBzYPsWkgTto10JubI1Q==
   dependencies:
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-bigint" "^7.8.3"
@@ -2388,14 +2302,15 @@ babel-preset-current-node-syntax@^0.1.2:
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-top-level-await" "^7.8.3"
 
-babel-preset-jest@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.1.0.tgz#612f714e5b457394acfd863793c564cbcdb7d1c1"
-  integrity sha512-na9qCqFksknlEj5iSdw1ehMVR06LCCTkZLGKeEtxDDdhg8xpUF09m29Kvh1pRbZ07h7AQ5ttLYUwpXL4tO6w7w==
+babel-preset-jest@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz#747872b1171df032252426586881d62d31798fee"
+  integrity sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==
   dependencies:
-    babel-plugin-jest-hoist "^26.1.0"
-    babel-preset-current-node-syntax "^0.1.2"
+    babel-plugin-jest-hoist "^26.6.2"
+    babel-preset-current-node-syntax "^1.0.0"
 
 babel-runtime@^6.26.0:
   version "6.26.0"
@@ -2440,16 +2355,6 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-bfj@^6.1.1:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/bfj/-/bfj-6.1.2.tgz#325c861a822bcb358a41c78a33b8e6e2086dde7f"
-  integrity sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==
-  dependencies:
-    bluebird "^3.5.5"
-    check-types "^8.0.3"
-    hoopy "^0.1.4"
-    tryer "^1.0.1"
-
 big.js@^3.1.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
@@ -2466,9 +2371,9 @@ binary-extensions@^1.0.0:
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
 binary-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
-  integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9"
+  integrity sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==
 
 bindings@^1.5.0:
   version "1.5.0"
@@ -2498,9 +2403,9 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
   integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
 
 bn.js@^5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.2.tgz#c9686902d3c9a27729f43ab10f9d79c2004da7b0"
-  integrity sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
+  integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==
 
 body-parser@1.19.0:
   version "1.19.0"
@@ -2623,15 +2528,15 @@ browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
     randombytes "^2.0.1"
 
 browserify-sign@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.0.tgz#545d0b1b07e6b2c99211082bf1b12cce7a0b0e11"
-  integrity sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
+  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
   dependencies:
     bn.js "^5.1.1"
     browserify-rsa "^4.0.1"
     create-hash "^1.2.0"
     create-hmac "^1.1.7"
-    elliptic "^6.5.2"
+    elliptic "^6.5.3"
     inherits "^2.0.4"
     parse-asn1 "^5.1.5"
     readable-stream "^3.6.0"
@@ -2644,15 +2549,37 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.8.5:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
-  integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
-  dependencies:
-    caniuse-lite "^1.0.30001043"
-    electron-to-chromium "^1.3.413"
-    node-releases "^1.1.53"
-    pkg-up "^2.0.0"
+browserslist@^4.0.0, browserslist@^4.12.0:
+  version "4.14.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz#1c751461a102ddc60e40993639b709be7f2c4015"
+  integrity sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==
+  dependencies:
+    caniuse-lite "^1.0.30001135"
+    electron-to-chromium "^1.3.571"
+    escalade "^3.1.0"
+    node-releases "^1.1.61"
+
+browserslist@^4.14.5:
+  version "4.14.7"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6"
+  integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==
+  dependencies:
+    caniuse-lite "^1.0.30001157"
+    colorette "^1.2.1"
+    electron-to-chromium "^1.3.591"
+    escalade "^3.1.1"
+    node-releases "^1.1.66"
+
+browserslist@^4.15.0:
+  version "4.16.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.0.tgz#410277627500be3cb28a1bfe037586fbedf9488b"
+  integrity sha512-/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ==
+  dependencies:
+    caniuse-lite "^1.0.30001165"
+    colorette "^1.2.1"
+    electron-to-chromium "^1.3.621"
+    escalade "^3.1.1"
+    node-releases "^1.1.67"
 
 bser@2.1.1:
   version "2.1.1"
@@ -2726,17 +2653,17 @@ cacache@^12.0.2:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
-cacache@^15.0.3, cacache@^15.0.4:
-  version "15.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.4.tgz#b2c23cf4ac4f5ead004fb15a0efb0a20340741f1"
-  integrity sha512-YlnKQqTbD/6iyoJvEY3KJftjrdBYroCbxxYXzhOzsFLWlp6KX4BOlEf4mTx0cMUfVaTS3ENL2QtDWeRYoGLkkw==
+cacache@^15.0.5:
+  version "15.0.5"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0"
+  integrity sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==
   dependencies:
     "@npmcli/move-file" "^1.0.1"
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
     glob "^7.1.4"
     infer-owner "^1.0.4"
-    lru-cache "^5.1.1"
+    lru-cache "^6.0.0"
     minipass "^3.1.1"
     minipass-collect "^1.0.2"
     minipass-flush "^1.0.5"
@@ -2764,6 +2691,14 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+call-bind@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce"
+  integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.0"
+
 caller-callsite@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
@@ -2805,10 +2740,10 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz#5259f7c30e35e278f1bdc2a4d91230b37cad981e"
-  integrity sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==
+camelcase@^6.0.0, camelcase@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
+  integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
 caniuse-api@^3.0.0:
   version "3.0.0"
@@ -2820,10 +2755,20 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001061:
-  version "1.0.30001094"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001094.tgz#0b11d02e1cdc201348dbd8e3e57bd9b6ce82b175"
-  integrity sha512-ufHZNtMaDEuRBpTbqD93tIQnngmJ+oBknjvr0IbFympSdtFpAUFmNv4mVKbb53qltxFx0nK3iy32S9AqkLzUNA==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001135:
+  version "1.0.30001143"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001143.tgz#560f2cfb9f313d1d7e52eb8dac0e4e36c8821c0d"
+  integrity sha512-p/PO5YbwmCpBJPxjOiKBvAlUPgF8dExhfEpnsH+ys4N/791WHrYrGg0cyHiAURl5hSbx5vIcjKmQAP6sHDYH3w==
+
+caniuse-lite@^1.0.30001157:
+  version "1.0.30001159"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz#bebde28f893fa9594dadcaa7d6b8e2aa0299df20"
+  integrity sha512-w9Ph56jOsS8RL20K9cLND3u/+5WASWdhC/PPrf+V3/HsM3uHOavWOR1Xzakbv4Puo/srmPHudkmCRWM7Aq+/UA==
+
+caniuse-lite@^1.0.30001165:
+  version "1.0.30001171"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001171.tgz#3291e11e02699ad0a29e69b8d407666fc843eba7"
+  integrity sha512-5Alrh8TTYPG9IH4UkRqEBZoEToWRLvPbSQokvzSz0lii8/FOWKG4keO1HoYfPWs8IF/NH/dyNPg1cmJGvV3Zlg==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -2848,7 +2793,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0, chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.0, chalk@^2.0.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2865,7 +2810,7 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.0:
+chalk@^4.0.0, chalk@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
   integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
@@ -2878,25 +2823,10 @@ char-regex@^1.0.2:
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
-check-types@^7.4.0:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.4.0.tgz#0378ec1b9616ec71f774931a3c6516fad8c152f4"
-  integrity sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==
-
-check-types@^8.0.3:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/check-types/-/check-types-8.0.3.tgz#3356cca19c889544f2d7a95ed49ce508a0ecf552"
-  integrity sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==
-
-"chokidar@>=2.0.0 <4.0.0", chokidar@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8"
-  integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==
+"chokidar@>=2.0.0 <4.0.0", chokidar@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.1.tgz#e905bdecf10eaa0a0b1db0c664481cc4cbc22ba1"
+  integrity sha512-TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g==
   dependencies:
     anymatch "~3.1.1"
     braces "~3.0.2"
@@ -2962,6 +2892,11 @@ circular-json@^0.3.1:
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
   integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==
 
+cjs-module-lexer@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f"
+  integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==
+
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
@@ -2989,13 +2924,6 @@ cli-cursor@^1.0.1:
   dependencies:
     restore-cursor "^1.0.1"
 
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
-  dependencies:
-    restore-cursor "^3.1.0"
-
 cli-width@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
@@ -3019,6 +2947,15 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
+cliui@^7.0.2:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.3.tgz#ef180f26c8d9bff3927ee52428bfec2090427981"
+  integrity sha512-Gj3QHTkVMPKqwP3f7B4KPkBZRMR9r4rfi5bXFpg1a+Svvj8l7q5CnkBkVQzfxT5DFSsGk2+PascOgL0JYkL2kw==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
 clone-deep@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
@@ -3060,6 +2997,11 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
+color-blend@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/color-blend/-/color-blend-3.0.1.tgz#3882ed1190ca18760ffe11570d8537960171172b"
+  integrity sha512-KueDvNiKHAvVeApic0SxHZLyy4x3NELfTLzMHRpRRLi+9e2kWhpeWvtuH3Sjb92mOJYEUhRjb8z7lr4OqDv17Q==
+
 color-convert@^1.9.0, color-convert@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -3100,6 +3042,11 @@ color@^3.0.0:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
+colorette@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
+  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
+
 combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -3107,11 +3054,16 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.18.0, commander@^2.20.0, commander@^2.8.1:
+commander@^2.20.0, commander@^2.8.1:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
+commander@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75"
+  integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==
+
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -3129,15 +3081,15 @@ compressible@~2.0.16:
   dependencies:
     mime-db ">= 1.43.0 < 2"
 
-compression-webpack-plugin@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-4.0.0.tgz#7599f592050002a49cd3ad3ee18ae7371e266bca"
-  integrity sha512-DRoFQNTkQ8gadlk117Y2wxANU+MDY56b1FIZj/yJXucBOTViTHXjthM7G9ocnitksk4kLzt1N2RLF0gDjxI+hg==
+compression-webpack-plugin@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-6.1.1.tgz#ae8e4b2ffdb7396bb776e66918d751a20d8ccf0e"
+  integrity sha512-BEHft9M6lwOqVIQFMS/YJGmeCYXVOakC5KzQk05TFpMBlODByh1qNsZCWjUBxCQhUP9x0WfGidxTbGkjbWO/TQ==
   dependencies:
-    cacache "^15.0.3"
+    cacache "^15.0.5"
     find-cache-dir "^3.3.1"
-    schema-utils "^2.6.6"
-    serialize-javascript "^3.0.0"
+    schema-utils "^3.0.0"
+    serialize-javascript "^5.0.1"
     webpack-sources "^1.4.3"
 
 compression@^1.7.4:
@@ -3239,29 +3191,12 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-webpack-plugin@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.0.2.tgz#10efc6ad219a61acbf2f5fb50af83da38431bc34"
-  integrity sha512-9Gm8X0c6eXlKnmltMPFCBeGOKjtcRIyTt4VaO3k1TkNgVTe5Ov2lYsYVuyLp0kp8DItO3apewflM+1GYgh6V2Q==
-  dependencies:
-    cacache "^15.0.4"
-    fast-glob "^3.2.2"
-    find-cache-dir "^3.3.1"
-    glob-parent "^5.1.1"
-    globby "^11.0.1"
-    loader-utils "^2.0.0"
-    normalize-path "^3.0.0"
-    p-limit "^2.3.0"
-    schema-utils "^2.7.0"
-    serialize-javascript "^3.1.0"
-    webpack-sources "^1.4.3"
-
-core-js-compat@^3.6.2:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"
-  integrity sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==
+core-js-compat@^3.8.0:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.1.tgz#8d1ddd341d660ba6194cbe0ce60f4c794c87a36e"
+  integrity sha512-a16TLmy9NVD1rkjUGbwuyWkiDoN0FDpAwrfLONvHFQx0D9k7J9y0srwMT8QP/Z6HE3MIFaVynEeYwZwPX1o5RQ==
   dependencies:
-    browserslist "^4.8.5"
+    browserslist "^4.15.0"
     semver "7.0.0"
 
 core-js-pure@^3.0.0:
@@ -3270,9 +3205,9 @@ core-js-pure@^3.0.0:
   integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==
 
 core-js@^2.4.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.1.tgz#87416ae817de957a3f249b3b5ca475d4aaed6042"
-  integrity sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg==
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
+  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -3301,12 +3236,12 @@ cosmiconfig@^6.0.0:
     yaml "^1.7.2"
 
 create-ecdh@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
-  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
+  integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==
   dependencies:
     bn.js "^4.1.0"
-    elliptic "^6.0.0"
+    elliptic "^6.5.3"
 
 create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
   version "1.2.0"
@@ -3331,10 +3266,10 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-env@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.2.tgz#bd5ed31339a93a3418ac4f3ca9ca3403082ae5f9"
-  integrity sha512-KZP/bMEOJEDCkDQAyRhu3RL2ZO/SUVrxQVI0G3YEQ+OLbRA3c6zgixe8Mq8a/z7+HKlNEjo8oiLUs8iRijY2Rw==
+cross-env@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
+  integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
   dependencies:
     cross-spawn "^7.0.1"
 
@@ -3349,7 +3284,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.1:
+cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -3420,24 +3355,23 @@ css-list-helpers@^1.0.1:
   dependencies:
     tcomb "^2.5.0"
 
-css-loader@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645"
-  integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==
+css-loader@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.0.1.tgz#9e4de0d6636a6266a585bd0900b422c85539d25f"
+  integrity sha512-cXc2ti9V234cq7rJzFKhirb2L2iPy8ZjALeVJAozXYz9te3r4eqLSixNAbMDJSgJEQywqXzs8gonxaboeKqwiw==
   dependencies:
-    camelcase "^5.3.1"
+    camelcase "^6.2.0"
     cssesc "^3.0.0"
-    icss-utils "^4.1.1"
-    loader-utils "^1.2.3"
-    normalize-path "^3.0.0"
-    postcss "^7.0.32"
-    postcss-modules-extract-imports "^2.0.0"
-    postcss-modules-local-by-default "^3.0.2"
-    postcss-modules-scope "^2.2.0"
-    postcss-modules-values "^3.0.0"
+    icss-utils "^5.0.0"
+    loader-utils "^2.0.0"
+    postcss "^8.1.4"
+    postcss-modules-extract-imports "^3.0.0"
+    postcss-modules-local-by-default "^4.0.0"
+    postcss-modules-scope "^3.0.0"
+    postcss-modules-values "^4.0.0"
     postcss-value-parser "^4.1.0"
-    schema-utils "^2.7.0"
-    semver "^6.3.0"
+    schema-utils "^3.0.0"
+    semver "^7.3.2"
 
 css-select-base-adapter@^0.1.1:
   version "0.1.1"
@@ -3476,24 +3410,23 @@ css-tree@1.0.0-alpha.39:
     source-map "^0.6.1"
 
 css-what@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.2.1.tgz#f4a8f12421064621b456755e34a03a2c22df5da1"
-  integrity sha512-WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.3.0.tgz#10fec696a9ece2e591ac772d759aacabac38cd39"
+  integrity sha512-pv9JPyatiPaQ6pf4OvD/dbfm0o5LviWmwxNWzblYf/1u9QZd0ihV+PMwy5jdQWQ3349kZmKEx9WXuSka2dM4cg==
 
 css.escape@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
   integrity sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=
 
-css@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
-  integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==
+css@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d"
+  integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==
   dependencies:
-    inherits "^2.0.3"
+    inherits "^2.0.4"
     source-map "^0.6.1"
-    source-map-resolve "^0.5.2"
-    urix "^0.1.0"
+    source-map-resolve "^0.6.0"
 
 cssesc@^3.0.0:
   version "3.0.0"
@@ -3593,9 +3526,9 @@ cssstyle@^2.2.0:
     cssom "~0.3.6"
 
 csstype@^2.5.7, csstype@^2.6.7:
-  version "2.6.10"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz#e63af50e66d7c266edb6b32909cfd0aabe03928b"
-  integrity sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w==
+  version "2.6.13"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.13.tgz#a6893015b90e84dd6e85d0e3b442a1e84f2dbe0f"
+  integrity sha512-ul26pfSQTZW8dcOnD2iiJssfXw0gdNVX9IJDH/X3K5DGPfj+fUYe3kB+swUY6BF3oZDxaID3AJt+9/ojSAE05A==
 
 cyclist@^1.0.1:
   version "1.0.1"
@@ -3638,17 +3571,10 @@ debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@=3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.0.0, debug@^3.1.1, debug@^3.2.5:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+debug@^3.1.1, debug@^3.2.6:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
     ms "^2.1.1"
 
@@ -3664,17 +3590,10 @@ decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
-decamelize@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-3.2.0.tgz#84b8e8f4f8c579f938e35e2cc7024907e0090851"
-  integrity sha512-4TgkVUsmmu7oCSyGBm5FvfMoACuoh9EOidm7V5/J2X2djAwwt57qb3F2KMP2ITqODTCSwb+YRV+0Zqrv18k/hw==
-  dependencies:
-    xregexp "^4.2.4"
-
 decimal.js@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.0.tgz#39466113a9e036111d02f82489b5fd6b0b5ed231"
-  integrity sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3"
+  integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
@@ -3698,7 +3617,7 @@ deep-extend@^0.5.1:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz#b894a9dd90d3023fbf1c55a394fb858eb2066f1f"
   integrity sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==
 
-deep-is@~0.1.3:
+deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
@@ -3716,7 +3635,7 @@ default-gateway@^4.2.0:
     execa "^1.0.0"
     ip-regex "^2.1.0"
 
-define-properties@^1.1.2, define-properties@^1.1.3:
+define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
   integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
@@ -3806,20 +3725,20 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
   integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
-detect-passive-events@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/detect-passive-events/-/detect-passive-events-1.0.4.tgz#6ed477e6e5bceb79079735dcd357789d37f9a91a"
-  integrity sha1-btR35uW863kHlzXc01d4nTf5qRo=
+detect-passive-events@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/detect-passive-events/-/detect-passive-events-2.0.2.tgz#229d02a20c47371194a2def84144c07d83e324c2"
+  integrity sha512-Ru7Eiz+pCy++QpqaNOgaIjlM0PzxEsh3Etg3wtntNhW2r3H1/8KkcR8bX9ApPIZChiNO2Pz//60uUg29DPNh3Q==
 
 diff-sequences@^25.2.6:
   version "25.2.6"
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd"
   integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==
 
-diff-sequences@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.0.0.tgz#0760059a5c287637b842bd7085311db7060e88a6"
-  integrity sha512-JC/eHYEC3aSS0vZGjuoc4vHA0yAQTzhQQldXMeMF+JlxLGJlCO38Gma82NV9gk1jGFz8mDzUMeaKXvjRRdJ2dg==
+diff-sequences@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
+  integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
 
 diffie-hellman@^5.0.0:
   version "5.0.3"
@@ -3830,13 +3749,6 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
-  dependencies:
-    path-type "^4.0.0"
-
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
@@ -3879,10 +3791,10 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dom-accessibility-api@^0.4.5:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.4.5.tgz#d9c1cefa89f509d8cf132ab5d250004d755e76e3"
-  integrity sha512-HcPDilI95nKztbVikaN2vzwvmv0sE8Y2ZJFODy/m15n7mGXLeOKGiys9qWVbFbh+aq/KYj2lqMLybBOkYAEXqg==
+dom-accessibility-api@^0.5.4:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.4.tgz#b06d059cdd4a4ad9a79275f9d414a5c126241166"
+  integrity sha512-TvrjBckDy2c6v6RLxPv5QXOnU+SmF9nBII5621Ve5fu6Z/BDrENurBEvlC1f44lKEUVqOpK4w9E5Idc5/EgkLQ==
 
 dom-helpers@^3.2.1, dom-helpers@^3.4.0:
   version "3.4.0"
@@ -3938,9 +3850,9 @@ domutils@^1.7.0:
     domelementtype "1"
 
 dot-prop@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"
-  integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
+  integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
   dependencies:
     is-obj "^2.0.0"
 
@@ -3949,10 +3861,10 @@ dotenv@^8.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
   integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
 
-duplexer@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
+duplexer@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
+  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
 
 duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.7.1"
@@ -3977,17 +3889,27 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-ejs@^2.3.4, ejs@^2.6.1:
+ejs@^2.3.4:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
   integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
-electron-to-chromium@^1.3.413:
-  version "1.3.488"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.488.tgz#9226229f5fbc825959210e81e0bb3e63035d1c06"
-  integrity sha512-NReBdOugu1yl8ly+0VDtiQ6Yw/1sLjnvflWq0gvY1nfUXU2PbA+1XAVuEb7ModnwL/MfUPjby7e4pAFnSHiy6Q==
+electron-to-chromium@^1.3.571:
+  version "1.3.574"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.574.tgz#bdd87f62fe70165e5c862a0acf0cee9889e23aa3"
+  integrity sha512-kF8Bfe1h8X1pPwlw6oRoIXj0DevowviP6fl0wcljm+nZjy/7+Fos4THo1N/7dVGEJlyEqK9C8qNnbheH+Eazfw==
+
+electron-to-chromium@^1.3.591:
+  version "1.3.603"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.603.tgz#1b71bec27fb940eccd79245f6824c63d5f7e8abf"
+  integrity sha512-J8OHxOeJkoSLgBXfV9BHgKccgfLMHh+CoeRo6wJsi6m0k3otaxS/5vrHpMNSEYY4MISwewqanPOuhAtuE8riQQ==
+
+electron-to-chromium@^1.3.621:
+  version "1.3.633"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.633.tgz#16dd5aec9de03894e8d14a1db4cda8a369b9b7fe"
+  integrity sha512-bsVCsONiVX1abkWdH7KtpuDAhsQ3N3bjPYhROSAXE78roJKet0Y5wznA14JE9pzbwSZmSMAW6KiKYf1RvbTJkA==
 
-elliptic@^6.0.0, elliptic@^6.5.2:
+elliptic@^6.5.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
   integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
@@ -4000,6 +3922,11 @@ elliptic@^6.0.0, elliptic@^6.5.2:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.0"
 
+emittery@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz#c02375a927a40948c0345cc903072597f5270451"
+  integrity sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ==
+
 emoji-mart@Gargron/emoji-mart#build:
   version "2.6.3"
   resolved "https://codeload.github.com/Gargron/emoji-mart/tar.gz/934f314fd8322276765066e8a2a6be5bac61b1cf"
@@ -4041,19 +3968,26 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^4.1.0, enhanced-resolve@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.2.0.tgz#5d43bda4a0fd447cb0ebbe71bef8deff8805ad0d"
-  integrity sha512-S7eiFb/erugyd1rLb6mQ3Vuq+EXHv5cpCkNqqIkYkBgN2QdFnyCZzFBleqwGEx4lgNGYij81BWnCrFNK7vxvjQ==
+enhanced-resolve@^4.1.1, enhanced-resolve@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
+  integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.5.0"
     tapable "^1.0.0"
 
+enquirer@^2.3.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+  dependencies:
+    ansi-colors "^4.1.1"
+
 entities@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
-  integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
+  integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
 
 errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
@@ -4077,19 +4011,37 @@ error-stack-parser@^2.0.6:
     stackframe "^1.1.1"
 
 es-abstract@^1.17.0, es-abstract@^1.17.0-next.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5:
-  version "1.17.6"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a"
-  integrity sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==
+  version "1.17.7"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
+  integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
   dependencies:
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
     has "^1.0.3"
     has-symbols "^1.0.1"
-    is-callable "^1.2.0"
-    is-regex "^1.1.0"
-    object-inspect "^1.7.0"
+    is-callable "^1.2.2"
+    is-regex "^1.1.1"
+    object-inspect "^1.8.0"
     object-keys "^1.1.1"
-    object.assign "^4.1.0"
+    object.assign "^4.1.1"
+    string.prototype.trimend "^1.0.1"
+    string.prototype.trimstart "^1.0.1"
+
+es-abstract@^1.18.0-next.0, es-abstract@^1.18.0-next.1:
+  version "1.18.0-next.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
+  integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.2.2"
+    is-negative-zero "^2.0.0"
+    is-regex "^1.1.1"
+    object-inspect "^1.8.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.1"
     string.prototype.trimend "^1.0.1"
     string.prototype.trimstart "^1.0.1"
 
@@ -4169,6 +4121,11 @@ es6-weak-map@^2.0.1:
     es6-iterator "^2.0.3"
     es6-symbol "^3.1.1"
 
+escalade@^3.1.0, escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
 escape-html@^1.0.3, escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -4206,7 +4163,7 @@ escope@^3.6.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-import-resolver-node@^0.3.3:
+eslint-import-resolver-node@^0.3.4:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
   integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==
@@ -4222,17 +4179,17 @@ eslint-module-utils@^2.6.0:
     debug "^2.6.9"
     pkg-dir "^2.0.0"
 
-eslint-plugin-import@~2.21.2:
-  version "2.21.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.21.2.tgz#8fef77475cc5510801bedc95f84b932f7f334a7c"
-  integrity sha512-FEmxeGI6yaz+SnEB6YgNHlQK1Bs2DKLM+YF+vuTk5H8J9CLbJLtlPvRFgZZ2+sXiKAlN5dpdlrWOjK8ZoZJpQA==
+eslint-plugin-import@~2.22.1:
+  version "2.22.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
+  integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==
   dependencies:
     array-includes "^3.1.1"
     array.prototype.flat "^1.2.3"
     contains-path "^0.1.0"
     debug "^2.6.9"
     doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.3"
+    eslint-import-resolver-node "^0.3.4"
     eslint-module-utils "^2.6.0"
     has "^1.0.3"
     minimatch "^3.0.4"
@@ -4241,21 +4198,21 @@ eslint-plugin-import@~2.21.2:
     resolve "^1.17.0"
     tsconfig-paths "^3.9.0"
 
-eslint-plugin-jsx-a11y@~6.3.1:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.3.1.tgz#99ef7e97f567cc6a5b8dd5ab95a94a67058a2660"
-  integrity sha512-i1S+P+c3HOlBJzMFORRbC58tHa65Kbo8b52/TwCwSKLohwvpfT5rm2GjGWzOHTEuq4xxf2aRlHHTtmExDQOP+g==
+eslint-plugin-jsx-a11y@~6.4.1:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz#a2d84caa49756942f42f1ffab9002436391718fd"
+  integrity sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg==
   dependencies:
-    "@babel/runtime" "^7.10.2"
+    "@babel/runtime" "^7.11.2"
     aria-query "^4.2.2"
     array-includes "^3.1.1"
     ast-types-flow "^0.0.7"
-    axe-core "^3.5.4"
-    axobject-query "^2.1.2"
+    axe-core "^4.0.2"
+    axobject-query "^2.2.0"
     damerau-levenshtein "^1.0.6"
     emoji-regex "^9.0.0"
     has "^1.0.3"
-    jsx-ast-utils "^2.4.1"
+    jsx-ast-utils "^3.1.0"
     language-tags "^1.0.5"
 
 eslint-plugin-promise@~4.2.1:
@@ -4263,22 +4220,22 @@ eslint-plugin-promise@~4.2.1:
   resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a"
   integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==
 
-eslint-plugin-react@~7.20.0:
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz#f98712f0a5e57dfd3e5542ef0604b8739cd47be3"
-  integrity sha512-rqe1abd0vxMjmbPngo4NaYxTcR3Y4Hrmc/jg4T+sYz63yqlmJRknpEQfmWY+eDWPuMmix6iUIK+mv0zExjeLgA==
+eslint-plugin-react@~7.22.0:
+  version "7.22.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.22.0.tgz#3d1c542d1d3169c45421c1215d9470e341707269"
+  integrity sha512-p30tuX3VS+NWv9nQot9xIGAHBXR0+xJVaZriEsHoJrASGCJZDJ8JLNM0YqKqI0AKm6Uxaa1VUHoNEibxRCMQHA==
   dependencies:
     array-includes "^3.1.1"
+    array.prototype.flatmap "^1.2.3"
     doctrine "^2.1.0"
     has "^1.0.3"
-    jsx-ast-utils "^2.2.3"
-    object.entries "^1.1.1"
+    jsx-ast-utils "^2.4.1 || ^3.0.0"
+    object.entries "^1.1.2"
     object.fromentries "^2.0.2"
     object.values "^1.1.1"
     prop-types "^15.7.2"
-    resolve "^1.15.1"
+    resolve "^1.18.1"
     string.prototype.matchall "^4.0.2"
-    xregexp "^4.3.0"
 
 eslint-scope@^4.0.3:
   version "4.0.3"
@@ -4288,25 +4245,30 @@ eslint-scope@^4.0.3:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-scope@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"
-  integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==
+eslint-scope@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
   dependencies:
-    esrecurse "^4.1.0"
+    esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-utils@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
-  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
+eslint-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
+  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
-eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.2.0.tgz#74415ac884874495f78ec2a97349525344c981fa"
-  integrity sha512-WFb4ihckKil6hu3Dp798xdzSfddwKKU3+nGniKF6HfeW6OLd2OUDEPP7TcHtB5+QXOKg2s6B2DaMPE1Nn/kxKQ==
+eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
+
+eslint-visitor-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
+  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
 eslint@^2.7.0:
   version "2.13.1"
@@ -4347,46 +4309,46 @@ eslint@^2.7.0:
     text-table "~0.2.0"
     user-home "^2.0.0"
 
-eslint@^6.8.0:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
-  integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
+eslint@^7.17.0:
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.17.0.tgz#4ccda5bf12572ad3bf760e6f195886f50569adb0"
+  integrity sha512-zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
+    "@eslint/eslintrc" "^0.2.2"
     ajv "^6.10.0"
-    chalk "^2.1.0"
-    cross-spawn "^6.0.5"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
     debug "^4.0.1"
     doctrine "^3.0.0"
-    eslint-scope "^5.0.0"
-    eslint-utils "^1.4.3"
-    eslint-visitor-keys "^1.1.0"
-    espree "^6.1.2"
-    esquery "^1.0.1"
+    enquirer "^2.3.5"
+    eslint-scope "^5.1.1"
+    eslint-utils "^2.1.0"
+    eslint-visitor-keys "^2.0.0"
+    espree "^7.3.1"
+    esquery "^1.2.0"
     esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
+    file-entry-cache "^6.0.0"
     functional-red-black-tree "^1.0.1"
     glob-parent "^5.0.0"
     globals "^12.1.0"
     ignore "^4.0.6"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
-    inquirer "^7.0.0"
     is-glob "^4.0.0"
     js-yaml "^3.13.1"
     json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.14"
+    levn "^0.4.1"
+    lodash "^4.17.19"
     minimatch "^3.0.4"
-    mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    optionator "^0.8.3"
+    optionator "^0.9.1"
     progress "^2.0.0"
-    regexpp "^2.0.1"
-    semver "^6.1.2"
-    strip-ansi "^5.2.0"
-    strip-json-comments "^3.0.1"
-    table "^5.2.3"
+    regexpp "^3.1.0"
+    semver "^7.2.1"
+    strip-ansi "^6.0.0"
+    strip-json-comments "^3.1.0"
+    table "^6.0.4"
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
@@ -4398,43 +4360,43 @@ espree@^3.1.6:
     acorn "^5.5.0"
     acorn-jsx "^3.0.0"
 
-espree@^6.1.2:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d"
-  integrity sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==
+espree@^7.3.0, espree@^7.3.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
+  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
   dependencies:
-    acorn "^7.1.0"
-    acorn-jsx "^5.1.0"
-    eslint-visitor-keys "^1.1.0"
+    acorn "^7.4.0"
+    acorn-jsx "^5.3.1"
+    eslint-visitor-keys "^1.3.0"
 
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.0.1:
+esquery@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
   integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
   dependencies:
     estraverse "^5.1.0"
 
-esrecurse@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
-  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
+esrecurse@^4.1.0, esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
   dependencies:
-    estraverse "^4.1.0"
+    estraverse "^5.2.0"
 
-estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estraverse@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
-  integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
+estraverse@^5.1.0, estraverse@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
 
 esutils@^2.0.2:
   version "2.0.3"
@@ -4455,14 +4417,14 @@ event-emitter@~0.3.5:
     es5-ext "~0.10.14"
 
 eventemitter3@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384"
-  integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
 events@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"
-  integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
+  integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
 
 eventsource@^1.0.7:
   version "1.0.7"
@@ -4498,9 +4460,9 @@ execa@^1.0.0:
     strip-eof "^1.0.0"
 
 execa@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.2.tgz#ad87fb7b2d9d564f70d2b62d511bee41d5cbb240"
-  integrity sha512-QI2zLa6CjGWdiQsmSkZoGtDx2N+cQIGb3yNolGTdjSQzydzLgYYf8LRuagp7S7fPimjcrzUDSUFd/MgzELMi4Q==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
+  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
   dependencies:
     cross-spawn "^7.0.0"
     get-stream "^5.0.0"
@@ -4547,19 +4509,19 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-expect@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-26.1.0.tgz#8c62e31d0f8d5a8ebb186ee81473d15dd2fbf7c8"
-  integrity sha512-QbH4LZXDsno9AACrN9eM0zfnby9G+OsdNgZUohjg/P0mLy1O+/bzTAJGT6VSIjVCe8yKM6SzEl/ckEOFBT7Vnw==
+expect@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417"
+  integrity sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==
   dependencies:
-    "@jest/types" "^26.1.0"
+    "@jest/types" "^26.6.2"
     ansi-styles "^4.0.0"
-    jest-get-type "^26.0.0"
-    jest-matcher-utils "^26.1.0"
-    jest-message-util "^26.1.0"
+    jest-get-type "^26.3.0"
+    jest-matcher-utils "^26.6.2"
+    jest-message-util "^26.6.2"
     jest-regex-util "^26.0.0"
 
-express@^4.16.3, express@^4.17.1:
+express@^4.17.1:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
   integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
@@ -4622,15 +4584,6 @@ extend@~3.0.2:
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-external-editor@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
-  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
-  dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
-
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -4660,43 +4613,17 @@ fast-deep-equal@^3.1.1:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.1.1, fast-glob@^3.2.2:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
-  integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.0"
-    merge2 "^1.3.0"
-    micromatch "^4.0.2"
-    picomatch "^2.2.1"
-
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
-fastq@^1.6.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.8.0.tgz#550e1f9f59bbc65fe185cb6a9b4d95357107f481"
-  integrity sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==
-  dependencies:
-    reusify "^1.0.4"
-
-faye-websocket@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
-  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
-  dependencies:
-    websocket-driver ">=0.5.1"
-
-faye-websocket@~0.11.1:
+faye-websocket@^0.11.3:
   version "0.11.3"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
   integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==
@@ -4723,13 +4650,6 @@ figures@^1.3.5:
     escape-string-regexp "^1.0.5"
     object-assign "^4.1.0"
 
-figures@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.1.0.tgz#4b198dd07d8d71530642864af2d45dd9e459c4ec"
-  integrity sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
 file-entry-cache@^1.1.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-1.3.1.tgz#44c61ea607ae4be9c1402f41f44270cbfe334ff8"
@@ -4738,36 +4658,31 @@ file-entry-cache@^1.1.1:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
 
-file-entry-cache@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
-  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
+file-entry-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a"
+  integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==
   dependencies:
-    flat-cache "^2.0.1"
+    flat-cache "^3.0.4"
 
-file-loader@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.0.0.tgz#97bbfaab7a2460c07bcbd72d3a6922407f67649f"
-  integrity sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==
+file-loader@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
+  integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==
   dependencies:
     loader-utils "^2.0.0"
-    schema-utils "^2.6.5"
+    schema-utils "^3.0.0"
 
-file-type@^10.5.0:
-  version "10.11.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-10.11.0.tgz#2961d09e4675b9fb9a3ee6b69e9cd23f43fd1890"
-  integrity sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==
+file-type@^12.4.1:
+  version "12.4.2"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-12.4.2.tgz#a344ea5664a1d01447ee7fb1b635f72feb6169d9"
+  integrity sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg==
 
 file-uri-to-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
   integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
-filesize@^3.6.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
-  integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==
-
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -4863,19 +4778,18 @@ flat-cache@^1.2.1:
     rimraf "~2.6.2"
     write "^0.2.1"
 
-flat-cache@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
-  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
+flat-cache@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
+  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
   dependencies:
-    flatted "^2.0.0"
-    rimraf "2.6.3"
-    write "1.0.3"
+    flatted "^3.1.0"
+    rimraf "^3.0.2"
 
-flatted@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
-  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
+flatted@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz#a5d06b4a8b01e3a63771daa5cb7a1903e2e57067"
+  integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==
 
 flush-write-stream@^1.0.0:
   version "1.1.1"
@@ -4885,19 +4799,10 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
-follow-redirects@1.5.10:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
-  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
-  dependencies:
-    debug "=3.1.0"
-
-follow-redirects@^1.0.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz#afa14f08ba12a52963140fe43212658897bc0ecb"
-  integrity sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==
-  dependencies:
-    debug "^3.0.0"
+follow-redirects@^1.0.0, follow-redirects@^1.10.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
+  integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
 
 font-awesome@^4.7.0:
   version "4.7.0"
@@ -5056,11 +4961,20 @@ gensync@^1.0.0-beta.1:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
   integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
 
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
+get-intrinsic@^1.0.0, get-intrinsic@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be"
+  integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
@@ -5074,9 +4988,9 @@ get-stream@^4.0.0:
     pump "^3.0.0"
 
 get-stream@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9"
-  integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
   dependencies:
     pump "^3.0.0"
 
@@ -5100,7 +5014,7 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0:
+glob-parent@^5.0.0, glob-parent@~5.1.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
   integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
@@ -5172,18 +5086,6 @@ globals@^9.2.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
   integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
-globby@^11.0.1:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
-  integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.1.1"
-    ignore "^5.1.4"
-    merge2 "^1.3.0"
-    slash "^3.0.0"
-
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
@@ -5196,12 +5098,12 @@ globby@^6.1.0:
     pinkie-promise "^2.0.0"
 
 globule@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.1.tgz#90a25338f22b7fbeb527cee63c629aea754d33b9"
-  integrity sha512-OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.2.tgz#d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4"
+  integrity sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==
   dependencies:
     glob "~7.1.1"
-    lodash "~4.17.12"
+    lodash "~4.17.10"
     minimatch "~3.0.2"
 
 gonzales-pe-sl@^4.2.3:
@@ -5221,13 +5123,12 @@ growly@^1.3.0:
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
-gzip-size@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274"
-  integrity sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==
+gzip-size@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
+  integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==
   dependencies:
-    duplexer "^0.1.1"
-    pify "^4.0.1"
+    duplexer "^0.1.2"
 
 handle-thing@^2.0.0:
   version "2.0.1"
@@ -5240,11 +5141,11 @@ har-schema@^2.0.0:
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
 har-validator@~5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
-  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
   dependencies:
-    ajv "^6.5.5"
+    ajv "^6.12.3"
     har-schema "^2.0.0"
 
 has-ansi@^2.0.0:
@@ -5269,7 +5170,7 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.0, has-symbols@^1.0.1:
+has-symbols@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
@@ -5376,10 +5277,10 @@ hoist-non-react-statics@^2.5.0:
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
   integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
 
-hoist-non-react-statics@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
-  integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==
+hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
+  integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
   dependencies:
     react-is "^16.7.0"
 
@@ -5390,11 +5291,6 @@ homedir-polyfill@^1.0.1:
   dependencies:
     parse-passwd "^1.0.0"
 
-hoopy@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d"
-  integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==
-
 hosted-git-info@^2.1.4:
   version "2.8.8"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
@@ -5479,16 +5375,21 @@ http-errors@~1.7.2:
     statuses ">= 1.5.0 < 2"
     toidentifier "1.0.0"
 
-http-link-header@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/http-link-header/-/http-link-header-1.0.2.tgz#bea50f02e1c7996021f1013b428c63f77e0f4e11"
-  integrity sha512-z6YOZ8ZEnejkcCWlGZzYXNa6i+ZaTfiTg3WhlV/YvnNya3W/RbX1bMVUMTuCrg/DrtTCQxaFCkXCz4FtLpcebg==
+http-link-header@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/http-link-header/-/http-link-header-1.0.3.tgz#abbc2cdc5e06dd7e196a4983adac08a2d085ec90"
+  integrity sha512-nARK1wSKoBBrtcoESlHBx36c1Ln/gnbNQi1eB6MeTUefJIT3NvUOsV15bClga0k38f0q/kN5xxrGSDS3EFnm9w==
 
 "http-parser-js@>=0.4.0 <0.4.11":
   version "0.4.10"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
   integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=
 
+http-parser-js@>=0.5.1:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
+  integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
+
 http-proxy-middleware@0.19.1:
   version "0.19.1"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
@@ -5527,21 +5428,19 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24:
+iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-icss-utils@^4.0.0, icss-utils@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467"
-  integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==
-  dependencies:
-    postcss "^7.0.14"
+icss-utils@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.0.0.tgz#03ed56c3accd32f9caaf1752ebf64ef12347bb84"
+  integrity sha512-aF2Cf/CkEZrI/vsu5WI/I+akFgdbwQHVE9YRZxATrhH4PVIe6a3BIjwjEcW+z+jP/hNh+YvM3lAAn1wJQ6opSg==
 
-idb-keyval@^3.1.0:
+idb-keyval@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/idb-keyval/-/idb-keyval-3.2.0.tgz#cbbf354deb5684b6cdc84376294fc05932845bd6"
   integrity sha512-slx8Q6oywCCSfKgPgL0sEsXtPVnSbTLWpyiDcu6msHOyKOLari1TD1qocXVCft80umnkk3/Qqh3lwoFt8T/BPQ==
@@ -5566,11 +5465,6 @@ ignore@^4.0.6:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.1.4:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.6.tgz#643194ad4bf2712f37852e386b6998eff0db2106"
-  integrity sha512-cgXgkypZBcCnOgSihyeqbo6gjIaIyDqPQB7Ra4vhE9m6kigdGoQDMHjviFhRZo3IMlRy6yElosoviMs5YxZXUA==
-
 immutable@^3.8.2:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
@@ -5591,7 +5485,7 @@ import-fresh@^2.0.0:
     caller-path "^2.0.0"
     resolve-from "^3.0.0"
 
-import-fresh@^3.0.0, import-fresh@^3.1.0:
+import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
   integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
@@ -5622,13 +5516,15 @@ import-local@^3.0.2:
     pkg-dir "^4.2.0"
     resolve-cwd "^3.0.0"
 
-imports-loader@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-0.8.0.tgz#030ea51b8ca05977c40a3abfd9b4088fe0be9a69"
-  integrity sha512-kXWL7Scp8KQ4552ZcdVTeaQCZSLW+e6nJfp3cwUMB673T7Hr98Xjx5JK+ql7ADlJUvj1JS5O01RLbKoutN5QDQ==
+imports-loader@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-1.2.0.tgz#b06823d0bb42e6f5ff89bc893829000eda46693f"
+  integrity sha512-zPvangKEgrrPeqeUqH0Uhc59YqK07JqZBi9a9cQ3v/EKUIqrbJHY4CvUrDus2lgQa5AmPyXuGrWP8JJTqzE5RQ==
   dependencies:
-    loader-utils "^1.0.2"
+    loader-utils "^2.0.0"
+    schema-utils "^3.0.0"
     source-map "^0.6.1"
+    strip-comments "^2.0.1"
 
 imurmurhash@^0.1.4:
   version "0.1.4"
@@ -5674,9 +5570,9 @@ inherits@2.0.3:
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 ini@^1.3.4, ini@^1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
+  integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
 
 inquirer@^0.12.0:
   version "0.12.0"
@@ -5697,25 +5593,6 @@ inquirer@^0.12.0:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-inquirer@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.0.tgz#9e2b032dde77da1db5db804758b8fea3a970519a"
-  integrity sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^2.4.2"
-    cli-cursor "^3.1.0"
-    cli-width "^2.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.15"
-    mute-stream "0.0.8"
-    run-async "^2.2.0"
-    rxjs "^6.4.0"
-    string-width "^4.1.0"
-    strip-ansi "^5.1.0"
-    through "^2.3.6"
-
 internal-ip@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
@@ -5738,10 +5615,10 @@ interpret@^1.4.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
   integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
-intersection-observer@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.10.0.tgz#4d11d63c1ff67e21e62987be24d55218da1a1a69"
-  integrity sha512-fn4bQ0Xq8FTej09YC/jqKZwtijpvARlRp6wxL5WTA6yPe2YWSJ5RJh7Nm79rK2qB0wr6iDQzH60XGq5V/7u8YQ==
+intersection-observer@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.12.0.tgz#6c84628f67ce8698e5f9ccf857d97718745837aa"
+  integrity sha512-2Vkz8z46Dv401zTWudDGwO7KiGHNDkMv417T5ItcNYfmvHR/1qCTVBO9vwH8zZmQ0WkA/1ARwpysR9bsnop4NQ==
 
 intl-format-cache@^2.0.5:
   version "2.2.9"
@@ -5859,15 +5736,10 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-buffer@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
-  integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
-
-is-callable@^1.1.4, is-callable@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb"
-  integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==
+is-callable@^1.1.4, is-callable@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
+  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
 
 is-ci@^2.0.0:
   version "2.0.0"
@@ -5888,6 +5760,13 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
+is-core-module@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946"
+  integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -5931,9 +5810,14 @@ is-directory@^0.3.1:
   integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
 is-docker@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz#2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b"
-  integrity sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
+  integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==
+
+is-electron@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-electron/-/is-electron-2.2.0.tgz#8943084f09e8b731b3a7a0298a7b5d56f6b7eef0"
+  integrity sha512-SpMppC2XR3YdxSzczXReBjqs2zGscWQpBIKqwXYBFic0ERaxNVgwLCHwOLZeESfdJQjX0RDvrJ1lBXX2ij+G1Q==
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
@@ -5994,9 +5878,9 @@ is-my-ip-valid@^1.0.0:
   integrity sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==
 
 is-my-json-valid@^2.10.0:
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz#1345a6fca3e8daefc10d0fa77067f54cedafd59a"
-  integrity sha512-XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA==
+  version "2.20.5"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.20.5.tgz#5eca6a8232a687f68869b7361be1612e7512e5df"
+  integrity sha512-VTPuvvGQtxvCeghwspQu1rBgjYUT6FGxPlvFKbYuFtgc4ADsX3U5ihZOYN0qyU6u+d4X9xXb0IT5O6QpXKt87A==
   dependencies:
     generate-function "^2.0.0"
     generate-object-property "^1.1.0"
@@ -6004,13 +5888,19 @@ is-my-json-valid@^2.10.0:
     jsonpointer "^4.0.0"
     xtend "^4.0.0"
 
-is-nan@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.0.tgz#85d1f5482f7051c2019f5673ccebdb06f3b0db03"
-  integrity sha512-z7bbREymOqt2CCaZVly8aC4ML3Xhfi0ekuOnjO2L8vKdl+CttdVoGZQhd4adMFAsxQ5VeRVwORs4tU8RH+HFtQ==
+is-nan@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
+  integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
 
+is-negative-zero@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
+  integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -6047,11 +5937,6 @@ is-path-inside@^2.1.0:
   dependencies:
     path-is-inside "^1.0.2"
 
-is-plain-obj@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
-
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -6064,23 +5949,25 @@ is-potential-custom-element-name@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
   integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
 
-is-promise@^2.1.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
-  integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
-
 is-property@^1.0.0, is-property@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
   integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
 
-is-regex@^1.0.4, is-regex@^1.1.0:
+is-regex@^1.0.4:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff"
   integrity sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==
   dependencies:
     has-symbols "^1.0.1"
 
+is-regex@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
+  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
+  dependencies:
+    has-symbols "^1.0.1"
+
 is-resolvable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
@@ -6120,11 +6007,6 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
-is-url@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.2.tgz#498905a593bf47cc2d9e7f738372bbf7696c7f26"
-  integrity sha1-SYkFpZO/R8wtnn9zg3K792lsfyY=
-
 is-url@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
@@ -6140,7 +6022,7 @@ is-wsl@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
   integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
-is-wsl@^2.1.1:
+is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
   integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
@@ -6220,59 +6102,59 @@ istanbul-reports@^3.0.2:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-jest-changed-files@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.1.0.tgz#de66b0f30453bca2aff98e9400f75905da495305"
-  integrity sha512-HS5MIJp3B8t0NRKGMCZkcDUZo36mVRvrDETl81aqljT1S9tqiHRSpyoOvWg9ZilzZG9TDisDNaN1IXm54fLRZw==
+jest-changed-files@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0"
+  integrity sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==
   dependencies:
-    "@jest/types" "^26.1.0"
+    "@jest/types" "^26.6.2"
     execa "^4.0.0"
     throat "^5.0.0"
 
-jest-cli@^26.0.1:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.1.0.tgz#eb9ec8a18cf3b6aa556d9deaa9e24be12b43ad87"
-  integrity sha512-Imumvjgi3rU7stq6SJ1JUEMaV5aAgJYXIs0jPqdUnF47N/Tk83EXfmtvNKQ+SnFVI6t6mDOvfM3aA9Sg6kQPSw==
+jest-cli@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz#43117cfef24bc4cd691a174a8796a532e135e92a"
+  integrity sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==
   dependencies:
-    "@jest/core" "^26.1.0"
-    "@jest/test-result" "^26.1.0"
-    "@jest/types" "^26.1.0"
+    "@jest/core" "^26.6.3"
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
     import-local "^3.0.2"
     is-ci "^2.0.0"
-    jest-config "^26.1.0"
-    jest-util "^26.1.0"
-    jest-validate "^26.1.0"
+    jest-config "^26.6.3"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
     prompts "^2.0.1"
-    yargs "^15.3.1"
+    yargs "^15.4.1"
 
-jest-config@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.1.0.tgz#9074f7539acc185e0113ad6d22ed589c16a37a73"
-  integrity sha512-ONTGeoMbAwGCdq4WuKkMcdMoyfs5CLzHEkzFOlVvcDXufZSaIWh/OXMLa2fwKXiOaFcqEw8qFr4VOKJQfn4CVw==
+jest-config@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349"
+  integrity sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^26.1.0"
-    "@jest/types" "^26.1.0"
-    babel-jest "^26.1.0"
+    "@jest/test-sequencer" "^26.6.3"
+    "@jest/types" "^26.6.2"
+    babel-jest "^26.6.3"
     chalk "^4.0.0"
     deepmerge "^4.2.2"
     glob "^7.1.1"
     graceful-fs "^4.2.4"
-    jest-environment-jsdom "^26.1.0"
-    jest-environment-node "^26.1.0"
-    jest-get-type "^26.0.0"
-    jest-jasmine2 "^26.1.0"
+    jest-environment-jsdom "^26.6.2"
+    jest-environment-node "^26.6.2"
+    jest-get-type "^26.3.0"
+    jest-jasmine2 "^26.6.3"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.1.0"
-    jest-util "^26.1.0"
-    jest-validate "^26.1.0"
+    jest-resolve "^26.6.2"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
     micromatch "^4.0.2"
-    pretty-format "^26.1.0"
+    pretty-format "^26.6.2"
 
-jest-diff@^25.1.0, jest-diff@^25.2.1, jest-diff@^25.5.0:
+jest-diff@^25.2.1:
   version "25.5.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9"
   integrity sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==
@@ -6282,15 +6164,15 @@ jest-diff@^25.1.0, jest-diff@^25.2.1, jest-diff@^25.5.0:
     jest-get-type "^25.2.6"
     pretty-format "^25.5.0"
 
-jest-diff@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.1.0.tgz#00a549bdc936c9691eb4dc25d1fbd78bf456abb2"
-  integrity sha512-GZpIcom339y0OXznsEKjtkfKxNdg7bVbEofK8Q6MnevTIiR1jNhDWKhRX6X0SDXJlwn3dy59nZ1z55fLkAqPWg==
+jest-diff@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
+  integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
   dependencies:
     chalk "^4.0.0"
-    diff-sequences "^26.0.0"
-    jest-get-type "^26.0.0"
-    pretty-format "^26.1.0"
+    diff-sequences "^26.6.2"
+    jest-get-type "^26.3.0"
+    pretty-format "^26.6.2"
 
 jest-docblock@^26.0.0:
   version "26.0.0"
@@ -6299,143 +6181,139 @@ jest-docblock@^26.0.0:
   dependencies:
     detect-newline "^3.0.0"
 
-jest-each@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.1.0.tgz#e35449875009a22d74d1bda183b306db20f286f7"
-  integrity sha512-lYiSo4Igr81q6QRsVQq9LIkJW0hZcKxkIkHzNeTMPENYYDw/W/Raq28iJ0sLlNFYz2qxxeLnc5K2gQoFYlu2bA==
+jest-each@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb"
+  integrity sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==
   dependencies:
-    "@jest/types" "^26.1.0"
+    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
-    jest-get-type "^26.0.0"
-    jest-util "^26.1.0"
-    pretty-format "^26.1.0"
-
-jest-environment-jsdom@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.1.0.tgz#9dc7313ffe1b59761dad1fedb76e2503e5d37c5b"
-  integrity sha512-dWfiJ+spunVAwzXbdVqPH1LbuJW/kDL+FyqgA5YzquisHqTi0g9hquKif9xKm7c1bKBj6wbmJuDkeMCnxZEpUw==
-  dependencies:
-    "@jest/environment" "^26.1.0"
-    "@jest/fake-timers" "^26.1.0"
-    "@jest/types" "^26.1.0"
-    jest-mock "^26.1.0"
-    jest-util "^26.1.0"
-    jsdom "^16.2.2"
-
-jest-environment-node@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.1.0.tgz#8bb387b3eefb132eab7826f9a808e4e05618960b"
-  integrity sha512-DNm5x1aQH0iRAe9UYAkZenuzuJ69VKzDCAYISFHQ5i9e+2Tbeu2ONGY7YStubCLH8a1wdKBgqScYw85+ySxqxg==
-  dependencies:
-    "@jest/environment" "^26.1.0"
-    "@jest/fake-timers" "^26.1.0"
-    "@jest/types" "^26.1.0"
-    jest-mock "^26.1.0"
-    jest-util "^26.1.0"
+    jest-get-type "^26.3.0"
+    jest-util "^26.6.2"
+    pretty-format "^26.6.2"
+
+jest-environment-jsdom@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e"
+  integrity sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==
+  dependencies:
+    "@jest/environment" "^26.6.2"
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
+    jest-mock "^26.6.2"
+    jest-util "^26.6.2"
+    jsdom "^16.4.0"
+
+jest-environment-node@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz#824e4c7fb4944646356f11ac75b229b0035f2b0c"
+  integrity sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==
+  dependencies:
+    "@jest/environment" "^26.6.2"
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
+    jest-mock "^26.6.2"
+    jest-util "^26.6.2"
 
 jest-get-type@^25.2.6:
   version "25.2.6"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877"
   integrity sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==
 
-jest-get-type@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.0.0.tgz#381e986a718998dbfafcd5ec05934be538db4039"
-  integrity sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==
+jest-get-type@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
+  integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
 
-jest-haste-map@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.1.0.tgz#ef31209be73f09b0d9445e7d213e1b53d0d1476a"
-  integrity sha512-WeBS54xCIz9twzkEdm6+vJBXgRBQfdbbXD0dk8lJh7gLihopABlJmIQFdWSDDtuDe4PRiObsjZSUjbJ1uhWEpA==
+jest-haste-map@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa"
+  integrity sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==
   dependencies:
-    "@jest/types" "^26.1.0"
+    "@jest/types" "^26.6.2"
     "@types/graceful-fs" "^4.1.2"
+    "@types/node" "*"
     anymatch "^3.0.3"
     fb-watchman "^2.0.0"
     graceful-fs "^4.2.4"
-    jest-serializer "^26.1.0"
-    jest-util "^26.1.0"
-    jest-worker "^26.1.0"
+    jest-regex-util "^26.0.0"
+    jest-serializer "^26.6.2"
+    jest-util "^26.6.2"
+    jest-worker "^26.6.2"
     micromatch "^4.0.2"
     sane "^4.0.3"
     walker "^1.0.7"
-    which "^2.0.2"
   optionalDependencies:
     fsevents "^2.1.2"
 
-jest-jasmine2@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.1.0.tgz#4dfe349b2b2d3c6b3a27c024fd4cb57ac0ed4b6f"
-  integrity sha512-1IPtoDKOAG+MeBrKvvuxxGPJb35MTTRSDglNdWWCndCB3TIVzbLThRBkwH9P081vXLgiJHZY8Bz3yzFS803xqQ==
+jest-jasmine2@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz#adc3cf915deacb5212c93b9f3547cd12958f2edd"
+  integrity sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==
   dependencies:
     "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^26.1.0"
-    "@jest/source-map" "^26.1.0"
-    "@jest/test-result" "^26.1.0"
-    "@jest/types" "^26.1.0"
+    "@jest/environment" "^26.6.2"
+    "@jest/source-map" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
     chalk "^4.0.0"
     co "^4.6.0"
-    expect "^26.1.0"
+    expect "^26.6.2"
     is-generator-fn "^2.0.0"
-    jest-each "^26.1.0"
-    jest-matcher-utils "^26.1.0"
-    jest-message-util "^26.1.0"
-    jest-runtime "^26.1.0"
-    jest-snapshot "^26.1.0"
-    jest-util "^26.1.0"
-    pretty-format "^26.1.0"
+    jest-each "^26.6.2"
+    jest-matcher-utils "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-runtime "^26.6.3"
+    jest-snapshot "^26.6.2"
+    jest-util "^26.6.2"
+    pretty-format "^26.6.2"
     throat "^5.0.0"
 
-jest-leak-detector@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.1.0.tgz#039c3a07ebcd8adfa984b6ac015752c35792e0a6"
-  integrity sha512-dsMnKF+4BVOZwvQDlgn3MG+Ns4JuLv8jNvXH56bgqrrboyCbI1rQg6EI5rs+8IYagVcfVP2yZFKfWNZy0rK0Hw==
-  dependencies:
-    jest-get-type "^26.0.0"
-    pretty-format "^26.1.0"
-
-jest-matcher-utils@^25.1.0:
-  version "25.5.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz#fbc98a12d730e5d2453d7f1ed4a4d948e34b7867"
-  integrity sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==
+jest-leak-detector@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz#7717cf118b92238f2eba65054c8a0c9c653a91af"
+  integrity sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==
   dependencies:
-    chalk "^3.0.0"
-    jest-diff "^25.5.0"
-    jest-get-type "^25.2.6"
-    pretty-format "^25.5.0"
+    jest-get-type "^26.3.0"
+    pretty-format "^26.6.2"
 
-jest-matcher-utils@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.1.0.tgz#cf75a41bd413dda784f022de5a65a2a5c73a5c92"
-  integrity sha512-PW9JtItbYvES/xLn5mYxjMd+Rk+/kIt88EfH3N7w9KeOrHWaHrdYPnVHndGbsFGRJ2d5gKtwggCvkqbFDoouQA==
+jest-matcher-utils@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a"
+  integrity sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^26.1.0"
-    jest-get-type "^26.0.0"
-    pretty-format "^26.1.0"
+    jest-diff "^26.6.2"
+    jest-get-type "^26.3.0"
+    pretty-format "^26.6.2"
 
-jest-message-util@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.1.0.tgz#52573fbb8f5cea443c4d1747804d7a238a3e233c"
-  integrity sha512-dY0+UlldiAJwNDJ08SF0HdF32g9PkbF2NRK/+2iMPU40O6q+iSn1lgog/u0UH8ksWoPv0+gNq8cjhYO2MFtT0g==
+jest-message-util@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07"
+  integrity sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@jest/types" "^26.1.0"
-    "@types/stack-utils" "^1.0.1"
+    "@jest/types" "^26.6.2"
+    "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     micromatch "^4.0.2"
+    pretty-format "^26.6.2"
     slash "^3.0.0"
     stack-utils "^2.0.2"
 
-jest-mock@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.1.0.tgz#80d8286da1f05a345fbad1bfd6fa49a899465d3d"
-  integrity sha512-1Rm8EIJ3ZFA8yCIie92UbxZWj9SuVmUGcyhLHyAhY6WI3NIct38nVcfOPWhJteqSn8V8e3xOMha9Ojfazfpovw==
+jest-mock@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302"
+  integrity sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==
   dependencies:
-    "@jest/types" "^26.1.0"
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
 
-jest-pnp-resolver@^1.2.1:
+jest-pnp-resolver@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
   integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
@@ -6445,170 +6323,186 @@ jest-regex-util@^26.0.0:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28"
   integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==
 
-jest-resolve-dependencies@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.1.0.tgz#1ce36472f864a5dadf7dc82fa158e1c77955691b"
-  integrity sha512-fQVEPHHQ1JjHRDxzlLU/buuQ9om+hqW6Vo928aa4b4yvq4ZHBtRSDsLdKQLuCqn5CkTVpYZ7ARh2fbA8WkRE6g==
+jest-resolve-dependencies@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6"
+  integrity sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==
   dependencies:
-    "@jest/types" "^26.1.0"
+    "@jest/types" "^26.6.2"
     jest-regex-util "^26.0.0"
-    jest-snapshot "^26.1.0"
+    jest-snapshot "^26.6.2"
 
-jest-resolve@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.1.0.tgz#a530eaa302b1f6fa0479079d1561dd69abc00e68"
-  integrity sha512-KsY1JV9FeVgEmwIISbZZN83RNGJ1CC+XUCikf/ZWJBX/tO4a4NvA21YixokhdR9UnmPKKAC4LafVixJBrwlmfg==
+jest-resolve@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507"
+  integrity sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==
   dependencies:
-    "@jest/types" "^26.1.0"
+    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
-    jest-pnp-resolver "^1.2.1"
-    jest-util "^26.1.0"
+    jest-pnp-resolver "^1.2.2"
+    jest-util "^26.6.2"
     read-pkg-up "^7.0.1"
-    resolve "^1.17.0"
+    resolve "^1.18.1"
     slash "^3.0.0"
 
-jest-runner@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.1.0.tgz#457f7fc522afe46ca6db1dccf19f87f500b3288d"
-  integrity sha512-elvP7y0fVDREnfqit0zAxiXkDRSw6dgCkzPCf1XvIMnSDZ8yogmSKJf192dpOgnUVykmQXwYYJnCx641uLTgcw==
+jest-runner@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159"
+  integrity sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==
   dependencies:
-    "@jest/console" "^26.1.0"
-    "@jest/environment" "^26.1.0"
-    "@jest/test-result" "^26.1.0"
-    "@jest/types" "^26.1.0"
+    "@jest/console" "^26.6.2"
+    "@jest/environment" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
     chalk "^4.0.0"
+    emittery "^0.7.1"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
-    jest-config "^26.1.0"
+    jest-config "^26.6.3"
     jest-docblock "^26.0.0"
-    jest-haste-map "^26.1.0"
-    jest-jasmine2 "^26.1.0"
-    jest-leak-detector "^26.1.0"
-    jest-message-util "^26.1.0"
-    jest-resolve "^26.1.0"
-    jest-runtime "^26.1.0"
-    jest-util "^26.1.0"
-    jest-worker "^26.1.0"
+    jest-haste-map "^26.6.2"
+    jest-leak-detector "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-resolve "^26.6.2"
+    jest-runtime "^26.6.3"
+    jest-util "^26.6.2"
+    jest-worker "^26.6.2"
     source-map-support "^0.5.6"
     throat "^5.0.0"
 
-jest-runtime@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.1.0.tgz#45a37af42115f123ed5c51f126c05502da2469cb"
-  integrity sha512-1qiYN+EZLmG1QV2wdEBRf+Ci8i3VSfIYLF02U18PiUDrMbhfpN/EAMMkJtT02jgJUoaEOpHAIXG6zS3QRMzRmA==
-  dependencies:
-    "@jest/console" "^26.1.0"
-    "@jest/environment" "^26.1.0"
-    "@jest/fake-timers" "^26.1.0"
-    "@jest/globals" "^26.1.0"
-    "@jest/source-map" "^26.1.0"
-    "@jest/test-result" "^26.1.0"
-    "@jest/transform" "^26.1.0"
-    "@jest/types" "^26.1.0"
+jest-runtime@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b"
+  integrity sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==
+  dependencies:
+    "@jest/console" "^26.6.2"
+    "@jest/environment" "^26.6.2"
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/globals" "^26.6.2"
+    "@jest/source-map" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
+    cjs-module-lexer "^0.6.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
     glob "^7.1.3"
     graceful-fs "^4.2.4"
-    jest-config "^26.1.0"
-    jest-haste-map "^26.1.0"
-    jest-message-util "^26.1.0"
-    jest-mock "^26.1.0"
+    jest-config "^26.6.3"
+    jest-haste-map "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-mock "^26.6.2"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.1.0"
-    jest-snapshot "^26.1.0"
-    jest-util "^26.1.0"
-    jest-validate "^26.1.0"
+    jest-resolve "^26.6.2"
+    jest-snapshot "^26.6.2"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
     slash "^3.0.0"
     strip-bom "^4.0.0"
-    yargs "^15.3.1"
+    yargs "^15.4.1"
 
-jest-serializer@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.1.0.tgz#72a394531fc9b08e173dc7d297440ac610d95022"
-  integrity sha512-eqZOQG/0+MHmr25b2Z86g7+Kzd5dG9dhCiUoyUNJPgiqi38DqbDEOlHcNijyfZoj74soGBohKBZuJFS18YTJ5w==
+jest-serializer@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz#d139aafd46957d3a448f3a6cdabe2919ba0742d1"
+  integrity sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==
   dependencies:
+    "@types/node" "*"
     graceful-fs "^4.2.4"
 
-jest-snapshot@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.1.0.tgz#c36ed1e0334bd7bd2fe5ad07e93a364ead7e1349"
-  integrity sha512-YhSbU7eMTVQO/iRbNs8j0mKRxGp4plo7sJ3GzOQ0IYjvsBiwg0T1o0zGQAYepza7lYHuPTrG5J2yDd0CE2YxSw==
+jest-snapshot@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz#f3b0af1acb223316850bd14e1beea9837fb39c84"
+  integrity sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==
   dependencies:
     "@babel/types" "^7.0.0"
-    "@jest/types" "^26.1.0"
+    "@jest/types" "^26.6.2"
+    "@types/babel__traverse" "^7.0.4"
     "@types/prettier" "^2.0.0"
     chalk "^4.0.0"
-    expect "^26.1.0"
+    expect "^26.6.2"
     graceful-fs "^4.2.4"
-    jest-diff "^26.1.0"
-    jest-get-type "^26.0.0"
-    jest-haste-map "^26.1.0"
-    jest-matcher-utils "^26.1.0"
-    jest-message-util "^26.1.0"
-    jest-resolve "^26.1.0"
+    jest-diff "^26.6.2"
+    jest-get-type "^26.3.0"
+    jest-haste-map "^26.6.2"
+    jest-matcher-utils "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-resolve "^26.6.2"
     natural-compare "^1.4.0"
-    pretty-format "^26.1.0"
+    pretty-format "^26.6.2"
     semver "^7.3.2"
 
-jest-util@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.1.0.tgz#80e85d4ba820decacf41a691c2042d5276e5d8d8"
-  integrity sha512-rNMOwFQevljfNGvbzNQAxdmXQ+NawW/J72dmddsK0E8vgxXCMtwQ/EH0BiWEIxh0hhMcTsxwAxINt7Lh46Uzbg==
+jest-util@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
+  integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==
   dependencies:
-    "@jest/types" "^26.1.0"
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     is-ci "^2.0.0"
     micromatch "^4.0.2"
 
-jest-validate@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.1.0.tgz#942c85ad3d60f78250c488a7f85d8f11a29788e7"
-  integrity sha512-WPApOOnXsiwhZtmkDsxnpye+XLb/tUISP+H6cHjfUIXvlG+eKwP+isnivsxlHCPaO9Q5wvbhloIBkdF3qUn+Nw==
+jest-validate@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec"
+  integrity sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==
   dependencies:
-    "@jest/types" "^26.1.0"
+    "@jest/types" "^26.6.2"
     camelcase "^6.0.0"
     chalk "^4.0.0"
-    jest-get-type "^26.0.0"
+    jest-get-type "^26.3.0"
     leven "^3.1.0"
-    pretty-format "^26.1.0"
+    pretty-format "^26.6.2"
 
-jest-watcher@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.1.0.tgz#99812a0cd931f0cb3d153180426135ab83e4d8f2"
-  integrity sha512-ffEOhJl2EvAIki613oPsSG11usqnGUzIiK7MMX6hE4422aXOcVEG3ySCTDFLn1+LZNXGPE8tuJxhp8OBJ1pgzQ==
+jest-watcher@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975"
+  integrity sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==
   dependencies:
-    "@jest/test-result" "^26.1.0"
-    "@jest/types" "^26.1.0"
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
-    jest-util "^26.1.0"
+    jest-util "^26.6.2"
     string-length "^4.0.1"
 
-jest-worker@^26.0.0, jest-worker@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.1.0.tgz#65d5641af74e08ccd561c240e7db61284f82f33d"
-  integrity sha512-Z9P5pZ6UC+kakMbNJn+tA2RdVdNX5WH1x+5UCBZ9MxIK24pjYtFt96fK+UwBTrjLYm232g1xz0L3eTh51OW+yQ==
+jest-worker@^26.5.0:
+  version "26.5.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.5.0.tgz#87deee86dbbc5f98d9919e0dadf2c40e3152fa30"
+  integrity sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^7.0.0"
+
+jest-worker@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
+  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
   dependencies:
+    "@types/node" "*"
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-26.0.1.tgz#5c51a2e58dff7525b65f169721767173bf832694"
-  integrity sha512-29Q54kn5Bm7ZGKIuH2JRmnKl85YRigp0o0asTc6Sb6l2ch1DCXIeZTLLFy9ultJvhkTqbswF5DEx4+RlkmCxWg==
+jest@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef"
+  integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==
   dependencies:
-    "@jest/core" "^26.0.1"
+    "@jest/core" "^26.6.3"
     import-local "^3.0.2"
-    jest-cli "^26.0.1"
+    jest-cli "^26.6.3"
 
 js-base64@^2.1.9:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.2.tgz#cf9301bc5cc756892a9a6c8d7138322e5944fb0d"
-  integrity sha512-1hgLrLIrmCgZG+ID3VoLNLOSwjGnoZa8tyrUdEteMeIzsT6PH7PMLyUvbDwzNE56P3PNxyvuIOx4Uh2E5rzQIw==
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
+  integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
 
 js-string-escape@1.0.1:
   version "1.0.1"
@@ -6620,31 +6514,30 @@ js-string-escape@1.0.1:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.1:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
-  integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
+js-yaml@^3.13.1, js-yaml@^3.4.6, js-yaml@^3.5.1, js-yaml@^3.5.4:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.4.6, js-yaml@^3.5.1, js-yaml@^3.5.4:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+js-yaml@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f"
+  integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==
   dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
+    argparse "^2.0.1"
 
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
-jsdom@^16.2.2:
-  version "16.2.2"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.2.2.tgz#76f2f7541646beb46a938f5dc476b88705bedf2b"
-  integrity sha512-pDFQbcYtKBHxRaP55zGXCJWgFHkDAYbKcsXEK/3Icu9nKYZkutUXfLBwbD+09XDutkYSHcgfQLZ0qvpAAm9mvg==
+jsdom@^16.4.0:
+  version "16.4.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb"
+  integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==
   dependencies:
     abab "^2.0.3"
     acorn "^7.1.1"
@@ -6666,7 +6559,7 @@ jsdom@^16.2.2:
     tough-cookie "^3.0.1"
     w3c-hr-time "^1.0.2"
     w3c-xmlserializer "^2.0.0"
-    webidl-conversions "^6.0.0"
+    webidl-conversions "^6.1.0"
     whatwg-encoding "^1.0.5"
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
@@ -6715,7 +6608,7 @@ json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json3@^3.3.2:
+json3@^3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
   integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
@@ -6759,9 +6652,9 @@ jsonify@~0.0.0:
   integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
 jsonpointer@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
-  integrity sha1-T9kss04OnbPInIYi7PUfm5eMbLk=
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.1.0.tgz#501fb89986a2389765ba09e6053299ceb4f2c2cc"
+  integrity sha512-CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg==
 
 jsprim@^1.2.2:
   version "1.4.1"
@@ -6773,13 +6666,13 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-jsx-ast-utils@^2.2.3, jsx-ast-utils@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz#1114a4c1209481db06c690c2b4f488cc665f657e"
-  integrity sha512-z1xSldJ6imESSzOjd3NNkieVJKRlKYSOtMG8SFyCj2FIrvSaSuli/WjpBkEzCBoR9bYYYFgqJw61Xhu7Lcgk+w==
+"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz#642f1d7b88aa6d7eb9d8f2210e166478444fa891"
+  integrity sha512-d4/UOjg+mxAWxCiF0c5UTSwyqbchkbqCvK87aBovhnh8GtysTjWmgC63tY0cJx/HzGgm9qnA147jVBdpOiQ2RA==
   dependencies:
     array-includes "^3.1.1"
-    object.assign "^4.1.0"
+    object.assign "^4.1.1"
 
 keycode@^2.1.7:
   version "2.2.0"
@@ -6801,6 +6694,11 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
+klona@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
+  integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
+
 knot.js@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/knot.js/-/knot.js-1.1.5.tgz#28e72522f703f50fe98812fde224dd72728fef5d"
@@ -6828,13 +6726,6 @@ leven@^3.1.0:
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
-levenary@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
-  integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
-  dependencies:
-    leven "^3.1.0"
-
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -6843,6 +6734,22 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+  dependencies:
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
+
+line-column@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/line-column/-/line-column-1.0.2.tgz#d25af2936b6f4849172b312e4792d1d987bc34a2"
+  integrity sha1-0lryk2tvSEkXKzEuR5LR2Ye8NKI=
+  dependencies:
+    isarray "^1.0.0"
+    isobject "^2.0.0"
+
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -6873,7 +6780,7 @@ loader-utils@0.2.x:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
+loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
   integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
@@ -6969,15 +6876,15 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.3.0, lodash@~4.17.12:
-  version "4.17.19"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
-  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
+lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.3.0, lodash@~4.17.10:
+  version "4.17.20"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
 
 loglevel@^1.6.8:
-  version "1.6.8"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171"
-  integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
+  integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
 
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
   version "1.4.0"
@@ -6993,6 +6900,18 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+lz-string@^1.4.4:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26"
+  integrity sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY=
+
 make-dir@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -7001,7 +6920,7 @@ make-dir@^2.0.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
-make-dir@^3.0.0, make-dir@^3.0.2:
+make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
   integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
@@ -7092,11 +7011,6 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge2@^1.3.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
-  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-
 merge@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
@@ -7159,6 +7073,11 @@ mime@1.6.0:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
+mime@^2.3.1:
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74"
+  integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==
+
 mime@^2.4.4:
   version "2.4.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
@@ -7174,14 +7093,13 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
-mini-css-extract-plugin@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz#47f2cf07aa165ab35733b1fc97d4c46c0564339e"
-  integrity sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==
+mini-css-extract-plugin@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.3.tgz#7802e62b34199aa7d1a62e654395859a836486a0"
+  integrity sha512-7lvliDSMiuZc81kI+5/qxvn47SCM7BehXex3f2c6l/pR3Goj58IQxZh9nuPQ3AkGQgoETyXuIqLDaO5Oa0TyBw==
   dependencies:
-    loader-utils "^1.1.0"
-    normalize-url "1.9.1"
-    schema-utils "^1.0.0"
+    loader-utils "^2.0.0"
+    schema-utils "^3.0.0"
     webpack-sources "^1.1.0"
 
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
@@ -7226,9 +7144,9 @@ minipass-flush@^1.0.5:
     minipass "^3.0.0"
 
 minipass-pipeline@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz#55f7839307d74859d6e8ada9c3ebe72cec216a34"
-  integrity sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
+  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
   dependencies:
     minipass "^3.0.0"
 
@@ -7239,10 +7157,10 @@ minipass@^3.0.0, minipass@^3.1.1:
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.0.tgz#fd52c645301ef09a63a2c209697c294c6ce02cf3"
-  integrity sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==
+minizlib@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
   dependencies:
     minipass "^3.0.0"
     yallist "^4.0.0"
@@ -7271,7 +7189,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
+mkdirp@^0.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -7333,16 +7251,16 @@ mute-stream@0.0.5:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
   integrity sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=
 
-mute-stream@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-
 nan@^2.12.1:
   version "2.14.1"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
   integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==
 
+nanoid@^3.1.16:
+  version "3.1.16"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.16.tgz#b21f0a7d031196faf75314d7c65d36352beeef64"
+  integrity sha512-+AK8MN0WHji40lj8AEuwLOvLSbWYApQpre/aFJZD71r43wVRLrOYS4FmJOPQYon1TqB462RzrrxlfA74XRES8w==
+
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -7370,10 +7288,10 @@ negotiator@0.6.2:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
-neo-async@^2.5.0, neo-async@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
-  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
+neo-async@^2.5.0, neo-async@^2.6.1, neo-async@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
 next-tick@~1.0.0:
   version "1.0.0"
@@ -7385,10 +7303,15 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-node-forge@0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"
-  integrity sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==
+node-fetch@^2.6.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+
+node-forge@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
+  integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
 
 node-int64@^0.4.0:
   version "0.4.0"
@@ -7429,22 +7352,27 @@ node-modules-regexp@^1.0.0:
   resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
   integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
 
-node-notifier@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-7.0.1.tgz#a355e33e6bebacef9bf8562689aed0f4230ca6f9"
-  integrity sha512-VkzhierE7DBmQEElhTGJIoiZa1oqRijOtgOlsXg32KrJRXsPy0NXFBqWGW/wTswnJlDCs5viRYaqWguqzsKcmg==
+node-notifier@^8.0.0:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1"
+  integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA==
   dependencies:
     growly "^1.3.0"
-    is-wsl "^2.1.1"
-    semver "^7.2.1"
+    is-wsl "^2.2.0"
+    semver "^7.3.2"
     shellwords "^0.1.1"
-    uuid "^7.0.3"
+    uuid "^8.3.0"
     which "^2.0.2"
 
-node-releases@^1.1.53:
-  version "1.1.58"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.58.tgz#8ee20eef30fa60e52755fcc0942def5a734fe935"
-  integrity sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==
+node-releases@^1.1.61:
+  version "1.1.61"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz#707b0fca9ce4e11783612ba4a2fcba09047af16e"
+  integrity sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==
+
+node-releases@^1.1.66, node-releases@^1.1.67:
+  version "1.1.67"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"
+  integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
@@ -7473,16 +7401,6 @@ normalize-range@^0.1.2:
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
-normalize-url@1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
-  integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
-  dependencies:
-    object-assign "^4.0.1"
-    prepend-http "^1.0.0"
-    query-string "^4.1.0"
-    sort-keys "^1.0.0"
-
 normalize-url@^3.0.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
@@ -7563,20 +7481,20 @@ object-fit-images@^3.2.3:
   resolved "https://registry.yarnpkg.com/object-fit-images/-/object-fit-images-3.2.4.tgz#6c299d38fdf207746e5d2d46c2877f6f25d15b52"
   integrity sha512-G+7LzpYfTfqUyrZlfrou/PLLLAPNC52FTy5y1CBywX+1/FkxIloOyQXBmZ3Zxa2AWO+lMF0JTuvqbr7G5e5CWg==
 
-object-inspect@^1.7.0:
+object-inspect@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
   integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
 
 object-is@^1.0.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz#c5d2e87ff9e119f78b7a088441519e2eec1573b6"
-  integrity sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz#2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"
+  integrity sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==
   dependencies:
     define-properties "^1.1.3"
-    es-abstract "^1.17.5"
+    es-abstract "^1.18.0-next.1"
 
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
+object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -7588,17 +7506,17 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+object.assign@^4.1.0, object.assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd"
+  integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==
   dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.0"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
 
-object.entries@^1.1.1:
+object.entries@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz#bc73f00acb6b6bb16c203434b10f9a7e797d3add"
   integrity sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==
@@ -7632,14 +7550,14 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.0, object.values@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
-  integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
+object.values@^1.1.0, object.values@^1.1.1, object.values@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz#7a2015e06fcb0f546bd652486ce8583a4731c731"
+  integrity sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
+    es-abstract "^1.18.0-next.1"
     has "^1.0.3"
 
 obuf@^1.0.0, obuf@^1.1.2:
@@ -7683,9 +7601,9 @@ onetime@^1.0.0:
   integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=
 
 onetime@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
-  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
@@ -7694,10 +7612,10 @@ opencollective-postinstall@^2.0.2:
   resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"
   integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==
 
-opener@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"
-  integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==
+opener@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
+  integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
 
 opn@^5.5.0:
   version "5.5.0"
@@ -7706,7 +7624,7 @@ opn@^5.5.0:
   dependencies:
     is-wsl "^1.1.0"
 
-optionator@^0.8.1, optionator@^0.8.3:
+optionator@^0.8.1:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
   integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
@@ -7718,6 +7636,18 @@ optionator@^0.8.1, optionator@^0.8.3:
     type-check "~0.3.2"
     word-wrap "~1.2.3"
 
+optionator@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+  dependencies:
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+    word-wrap "^1.2.3"
+
 original@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
@@ -7735,11 +7665,6 @@ os-homedir@^1.0.0:
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
-os-tmpdir@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-
 p-each-series@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48"
@@ -7757,17 +7682,17 @@ p-limit@^1.1.0:
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.3.0:
+p-limit@^2.0.0, p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.1.tgz#584784ac0722d1aed09f19f90ed2999af6ce2839"
-  integrity sha512-mw/p92EyOzl2MhauKodw54Rx5ZK4624rNfgNaBguFZkHzyUG9WsDzFF5/yQVEJinbJDdP4jEfMN+uBquiGnaLg==
+p-limit@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe"
+  integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==
   dependencies:
     p-try "^2.0.0"
 
@@ -7848,13 +7773,12 @@ parent-module@^1.0.0:
     callsites "^3.0.0"
 
 parse-asn1@^5.0.0, parse-asn1@^5.1.5:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e"
-  integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
+  integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
   dependencies:
-    asn1.js "^4.0.0"
+    asn1.js "^5.2.0"
     browserify-aes "^1.0.0"
-    create-hash "^1.1.0"
     evp_bytestokey "^1.0.0"
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
@@ -7890,9 +7814,9 @@ parse-json@^4.0.0:
     json-parse-better-errors "^1.0.1"
 
 parse-json@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f"
-  integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.1.tgz#7cfe35c1ccd641bce3981467e6c2ece61b3b3878"
+  integrity sha512-ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     error-ex "^1.3.1"
@@ -8119,26 +8043,19 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
-  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
-  dependencies:
-    find-up "^2.1.0"
-
 pluralize@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
   integrity sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=
 
 portfinder@^1.0.26:
-  version "1.0.26"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.26.tgz#475658d56ca30bed72ac7f1378ed350bd1b64e70"
-  integrity sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==
+  version "1.0.28"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
+  integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
   dependencies:
     async "^2.6.2"
     debug "^3.1.1"
-    mkdirp "^0.5.1"
+    mkdirp "^0.5.5"
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
@@ -8146,9 +8063,9 @@ posix-character-classes@^0.1.0:
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 postcss-calc@^7.0.1:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.2.tgz#504efcd008ca0273120568b0792b16cdcde8aac1"
-  integrity sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.4.tgz#5e177ddb417341e6d4a193c5d9fd8ada79094f8b"
+  integrity sha512-0I79VRAd1UTkaHzY9w83P39YGO/M3bG7/tNLrHGEunBolfoGM0hSjrGvjoeaj0JE/zIw5GsI2KZ0UwDJqv5hjw==
   dependencies:
     postcss "^7.0.27"
     postcss-selector-parser "^6.0.2"
@@ -8202,9 +8119,9 @@ postcss-discard-overridden@^4.0.1:
     postcss "^7.0.0"
 
 postcss-load-config@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.0.tgz#c84d692b7bb7b41ddced94ee62e8ab31b417b003"
-  integrity sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz#c5ea504f2c4aef33c7359a34de3573772ad7502a"
+  integrity sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==
   dependencies:
     cosmiconfig "^5.0.0"
     import-cwd "^2.0.0"
@@ -8281,38 +8198,33 @@ postcss-minify-selectors@^4.0.2:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
-postcss-modules-extract-imports@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e"
-  integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==
-  dependencies:
-    postcss "^7.0.5"
+postcss-modules-extract-imports@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
+  integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
 
-postcss-modules-local-by-default@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz#e8a6561be914aaf3c052876377524ca90dbb7915"
-  integrity sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==
+postcss-modules-local-by-default@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
+  integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
   dependencies:
-    icss-utils "^4.1.1"
-    postcss "^7.0.16"
+    icss-utils "^5.0.0"
     postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.0.0"
+    postcss-value-parser "^4.1.0"
 
-postcss-modules-scope@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee"
-  integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==
+postcss-modules-scope@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06"
+  integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==
   dependencies:
-    postcss "^7.0.6"
-    postcss-selector-parser "^6.0.0"
+    postcss-selector-parser "^6.0.4"
 
-postcss-modules-values@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10"
-  integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==
+postcss-modules-values@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"
+  integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==
   dependencies:
-    icss-utils "^4.0.0"
-    postcss "^7.0.6"
+    icss-utils "^5.0.0"
 
 postcss-normalize-charset@^4.0.1:
   version "4.0.1"
@@ -8442,7 +8354,7 @@ postcss-selector-parser@^3.0.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
+postcss-selector-parser@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
   integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
@@ -8451,6 +8363,16 @@ postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
+postcss-selector-parser@^6.0.4:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3"
+  integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==
+  dependencies:
+    cssesc "^3.0.0"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+    util-deprecate "^1.0.2"
+
 postcss-svgo@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz#17b997bc711b333bab143aaed3b8d3d6e3d38258"
@@ -8475,7 +8397,7 @@ postcss-value-parser@^3.0.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
+postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
@@ -8490,7 +8412,7 @@ postcss@^5.0.16:
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.27, postcss@^7.0.30, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27, postcss@^7.0.32:
   version "7.0.32"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
   integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
@@ -8499,6 +8421,16 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.2
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
+postcss@^8.1.4:
+  version "8.1.6"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.1.6.tgz#b022ba2cfb8701da234d073ed3128c5a384c35ff"
+  integrity sha512-JuifSl4h8dJ70SiMXKjzCxhalE6p2TnMHuq9G8ftyXj2jg6SXzqCsEuxMj9RkmJoO5D+Z9YrWunNkxqpRT02qg==
+  dependencies:
+    colorette "^1.2.1"
+    line-column "^1.0.2"
+    nanoid "^3.1.16"
+    source-map "^0.6.1"
+
 postgres-array@~1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-1.0.3.tgz#c561fc3b266b21451fc6555384f4986d78ec80f5"
@@ -8510,9 +8442,9 @@ postgres-bytea@~1.0.0:
   integrity sha1-AntTPAqokOJtFy1Hz5zOzFIazTU=
 
 postgres-date@~1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.5.tgz#710b27de5f27d550f6e80b5d34f7ba189213c2ee"
-  integrity sha512-pdau6GRPERdAYUQwkBnGKxEfPyhVZXG/JiS44iZWiNdSOWE09N2lUgN6yshuq6fVSon4Pm0VMXd1srUUkLe9iA==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz#51bc086006005e5061c591cee727f2531bf641a8"
+  integrity sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==
 
 postgres-interval@^1.1.0:
   version "1.2.0"
@@ -8521,16 +8453,16 @@ postgres-interval@^1.1.0:
   dependencies:
     xtend "^4.0.0"
 
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-prepend-http@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
-
 pretty-format@^25.2.1, pretty-format@^25.5.0:
   version "25.5.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a"
@@ -8541,20 +8473,15 @@ pretty-format@^25.2.1, pretty-format@^25.5.0:
     ansi-styles "^4.0.0"
     react-is "^16.12.0"
 
-pretty-format@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.1.0.tgz#272b9cd1f1a924ab5d443dc224899d7a65cb96ec"
-  integrity sha512-GmeO1PEYdM+non4BKCj+XsPJjFOJIPnsLewqhDVoqY1xo0yNmDas7tC2XwpMrRAHR3MaE2hPo37deX5OisJ2Wg==
+pretty-format@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
+  integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
   dependencies:
-    "@jest/types" "^26.1.0"
+    "@jest/types" "^26.6.2"
     ansi-regex "^5.0.0"
     ansi-styles "^4.0.0"
-    react-is "^16.12.0"
-
-private@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
+    react-is "^17.0.1"
 
 process-nextick-args@~2.0.0:
   version "2.0.1"
@@ -8700,14 +8627,6 @@ qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-query-string@^4.1.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
-  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
-  dependencies:
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
-
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@@ -8719,9 +8638,9 @@ querystring@0.2.0:
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
 querystringify@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
-  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
 quote@^0.4.0:
   version "0.4.0"
@@ -8765,10 +8684,10 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-react-dom@^16.13.1:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f"
-  integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==
+react-dom@^16.14.0:
+  version "16.14.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89"
+  integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -8842,11 +8761,16 @@ react-intl@^2.9.0:
     intl-relativeformat "^2.1.0"
     invariant "^2.1.1"
 
-react-is@^16.12.0, react-is@^16.3.2, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6, react-is@^16.9.0:
+react-is@^16.12.0, react-is@^16.13.1, react-is@^16.3.2, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
+react-is@^17.0.1:
+  version "17.0.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
+  integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
+
 react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
@@ -8877,10 +8801,10 @@ react-notification@^6.8.5:
   dependencies:
     prop-types "^15.6.2"
 
-react-overlays@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-0.9.1.tgz#d4702bfe5b5e9335b676ff5a940253771fdeed12"
-  integrity sha512-b0asy/zHtRd0i2+2/uNxe3YVprF3bRT1guyr791DORjCzE/HSBMog+ul83CdtKQ1kZ+pLnxWCu5W3BMysFhHdQ==
+react-overlays@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-0.9.3.tgz#5bac8c1e9e7e057a125181dee2d784864dd62902"
+  integrity sha512-u2T7nOLnK+Hrntho4p0Nxh+BsJl0bl4Xuwj/Y0a56xywLMetgAfyjnDVrudLXsNcKGaspoC+t3C1V80W9QQTdQ==
   dependencies:
     classnames "^2.2.5"
     dom-helpers "^3.2.1"
@@ -8897,16 +8821,16 @@ react-redux-loading-bar@^4.0.8:
     prop-types "^15.6.2"
     react-lifecycles-compat "^3.0.2"
 
-react-redux@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.0.tgz#f970f62192b3981642fec46fd0db18a074fe879d"
-  integrity sha512-EvCAZYGfOLqwV7gh849xy9/pt55rJXPwmYvI4lilPM5rUT/1NxuuN59ipdBksRVSvz0KInbPnp4IfoXJXCqiDA==
+react-redux@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.2.tgz#03862e803a30b6b9ef8582dadcc810947f74b736"
+  integrity sha512-8+CQ1EvIVFkYL/vu6Olo7JFLWop1qRUeb46sGtIMDCSpgwPQq8fPLpirIB0iTqFe9XYEFPHssdX8/UwN6pAkEA==
   dependencies:
-    "@babel/runtime" "^7.5.5"
-    hoist-non-react-statics "^3.3.0"
+    "@babel/runtime" "^7.12.1"
+    hoist-non-react-statics "^3.3.2"
     loose-envify "^1.4.0"
     prop-types "^15.7.2"
-    react-is "^16.9.0"
+    react-is "^16.13.1"
 
 react-router-dom@^4.1.1:
   version "4.3.1"
@@ -8941,10 +8865,10 @@ react-router@^4.3.1:
     prop-types "^15.6.1"
     warning "^4.0.1"
 
-react-select@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.1.0.tgz#ab098720b2e9fe275047c993f0d0caf5ded17c27"
-  integrity sha512-wBFVblBH1iuCBprtpyGtd1dGMadsG36W5/t2Aj8OE6WbByDg5jIFyT7X5gT+l0qmT5TqWhxX+VsKJvCEl2uL9g==
+react-select@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.1.1.tgz#156a5b4a6c22b1e3d62a919cb1fd827adb4060bc"
+  integrity sha512-HjC6jT2BhUxbIbxMZWqVcDibrEpdUJCfGicN0MMV+BQyKtCaPTgFekKWiOizSCy4jdsLMGjLqcFGJMhVGWB0Dg==
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@emotion/cache" "^10.0.9"
@@ -8993,20 +8917,20 @@ react-swipeable-views@^0.13.9:
     react-swipeable-views-utils "^0.13.9"
     warning "^4.0.1"
 
-react-test-renderer@^16.13.1:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.1.tgz#de25ea358d9012606de51e012d9742e7f0deabc1"
-  integrity sha512-Sn2VRyOK2YJJldOqoh8Tn/lWQ+ZiKhyZTPtaO0Q6yNj+QDbmRkVFap6pZPy3YQk8DScRDfyqm/KxKYP9gCMRiQ==
+react-test-renderer@^16.14.0:
+  version "16.14.0"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.14.0.tgz#e98360087348e260c56d4fe2315e970480c228ae"
+  integrity sha512-L8yPjqPE5CZO6rKsKXRO/rVPiaCOy0tQQJbC+UjPNlobl5mad59lvPjwFsQHTvL03caVDIVr9x9/OSgDe6I5Eg==
   dependencies:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
     react-is "^16.8.6"
     scheduler "^0.19.1"
 
-react-textarea-autosize@^8.1.1:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.1.1.tgz#d31dd1d04235af11161765782c70cb27c2c2832e"
-  integrity sha512-yJv7CbyXv8hb0xHpii9yQpMK0kwZ3A4TChRc5qGxQlHDR064oqStHbcuvexErRvJipTnDGNkcpGvE3hLnY0KAg==
+react-textarea-autosize@^8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.0.tgz#e6e2fd186d9f61bb80ac6e2dcb4c55504f93c2fa"
+  integrity sha512-3GLWFAan2pbwBeoeNDoqGmSbrShORtgWfaWX0RJDivsUrpShh01saRM5RU/i4Zmf+whpBVEY5cA90Eq8Ub1N3w==
   dependencies:
     "@babel/runtime" "^7.10.2"
     use-composed-ref "^1.0.0"
@@ -9039,10 +8963,10 @@ react-transition-group@^4.3.0:
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react@^16.13.1:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
-  integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==
+react@^16.14.0:
+  version "16.14.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
+  integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -9140,9 +9064,9 @@ redent@^3.0.0:
     strip-indent "^3.0.0"
 
 redis-commands@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.5.0.tgz#80d2e20698fe688f227127ff9e5164a7dd17e785"
-  integrity sha512-6KxamqpZ468MeQC3bkWmCB1fp56XL64D4Kf0zJSwDZbVLLm7KFkoIcHrgRvQ+sk8dnhySs7+yBg94yIkAK7aJg==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.6.0.tgz#36d4ca42ae9ed29815cdb30ad9f97982eba1ce23"
+  integrity sha512-2jnZ0IkjZxvguITjFTrGiLyzQZcTvaw8DAaCXxZq/dsHXz7KfMQ3OUJy7Tz9vnRtZRVz6VRCPDvruvU8Ts44wQ==
 
 redis-errors@^1.0.0, redis-errors@^1.2.0:
   version "1.2.0"
@@ -9206,18 +9130,17 @@ regenerator-runtime@^0.12.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
   integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
 
-regenerator-runtime@^0.13.4:
-  version "0.13.5"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
-  integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
+regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7:
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
+  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
 
 regenerator-transform@^0.14.2:
-  version "0.14.4"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
-  integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
+  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
   dependencies:
     "@babel/runtime" "^7.8.4"
-    private "^0.1.8"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
@@ -9235,15 +9158,15 @@ regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.0:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
 
-regexpp@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
-  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
+regexpp@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
+  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
 
-regexpu-core@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
-  integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==
+regexpu-core@^4.7.1:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
+  integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
   dependencies:
     regenerate "^1.4.0"
     regenerate-unicode-properties "^8.2.0"
@@ -9284,19 +9207,19 @@ repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-request-promise-core@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
-  integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
+request-promise-core@1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
+  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
   dependencies:
-    lodash "^4.17.15"
+    lodash "^4.17.19"
 
 request-promise-native@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
-  integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
+  integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
   dependencies:
-    request-promise-core "1.1.3"
+    request-promise-core "1.1.4"
     stealthy-require "^1.1.1"
     tough-cookie "^2.3.3"
 
@@ -9426,11 +9349,12 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.8.1:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
-  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
+resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
   dependencies:
+    is-core-module "^2.1.0"
     path-parse "^1.0.6"
 
 restore-cursor@^1.0.1:
@@ -9441,14 +9365,6 @@ restore-cursor@^1.0.1:
     exit-hook "^1.0.0"
     onetime "^1.0.0"
 
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
-  dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -9459,11 +9375,6 @@ retry@^0.12.0:
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
   integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
 
-reusify@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
-  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
-
 rgb-regex@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1"
@@ -9474,13 +9385,6 @@ rgba-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
 
-rimraf@2.6.3, rimraf@~2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
@@ -9495,6 +9399,13 @@ rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
+rimraf@~2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  dependencies:
+    glob "^7.1.3"
+
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -9515,18 +9426,6 @@ run-async@^0.1.0:
   dependencies:
     once "^1.3.0"
 
-run-async@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
-  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
-  dependencies:
-    is-promise "^2.1.0"
-
-run-parallel@^1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
-  integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
-
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
@@ -9539,13 +9438,6 @@ rx-lite@^3.1.2:
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
   integrity sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=
 
-rxjs@^6.4.0:
-  version "6.5.5"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
-  integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
-  dependencies:
-    tslib "^1.9.0"
-
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -9603,21 +9495,21 @@ sass-lint@^1.13.1:
     path-is-absolute "^1.0.0"
     util "^0.10.3"
 
-sass-loader@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.2.tgz#debecd8c3ce243c76454f2e8290482150380090d"
-  integrity sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==
+sass-loader@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.0.tgz#1727fcc0c32ab3eb197cda61d78adf4e9174a4b3"
+  integrity sha512-ZCKAlczLBbFd3aGAhowpYEy69Te3Z68cg8bnHHl6WnSCvnKpbM6pQrz957HWMa8LKVuhnD9uMplmMAHwGQtHeg==
   dependencies:
-    clone-deep "^4.0.1"
-    loader-utils "^1.2.3"
-    neo-async "^2.6.1"
-    schema-utils "^2.6.1"
-    semver "^6.3.0"
+    klona "^2.0.4"
+    loader-utils "^2.0.0"
+    neo-async "^2.6.2"
+    schema-utils "^3.0.0"
+    semver "^7.3.2"
 
-sass@^1.26.8:
-  version "1.26.8"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.26.8.tgz#312652530721f9568d4c4000b0db07ec6eb23325"
-  integrity sha512-yvtzyrKLGiXQu7H12ekXqsfoGT/aTKeMDyVzCB675k1HYuaj0py63i8Uf4SI9CHXj6apDhpfwbUr3gGOjdpu2Q==
+sass@^1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.0.tgz#10101a026c13080b14e2b374d4e15ee24400a4d3"
+  integrity sha512-fhyqEbMIycQA4blrz/C0pYhv2o4x2y6FYYAH0CshBw3DXh5D5wyERgxw0ptdau1orc/GhNrhF7DFN2etyOCEng==
   dependencies:
     chokidar ">=2.0.0 <4.0.0"
 
@@ -9650,14 +9542,23 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.2.0, schema-utils@^2.6.1, schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
-  integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
+schema-utils@^2.2.0, schema-utils@^2.6.5:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
+  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
   dependencies:
-    "@types/json-schema" "^7.0.4"
-    ajv "^6.12.2"
-    ajv-keywords "^3.4.1"
+    "@types/json-schema" "^7.0.5"
+    ajv "^6.12.4"
+    ajv-keywords "^3.5.2"
+
+schema-utils@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef"
+  integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==
+  dependencies:
+    "@types/json-schema" "^7.0.6"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
 
 scroll-behavior@^0.9.1:
   version "0.9.12"
@@ -9672,12 +9573,12 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
-selfsigned@^1.10.7:
-  version "1.10.7"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.7.tgz#da5819fd049d5574f28e88a9bcc6dbc6e6f3906b"
-  integrity sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==
+selfsigned@^1.10.8:
+  version "1.10.8"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30"
+  integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==
   dependencies:
-    node-forge "0.9.0"
+    node-forge "^0.10.0"
 
 "semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
   version "5.7.1"
@@ -9694,15 +9595,17 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@^6.0.0, semver@^6.1.2, semver@^6.3.0:
+semver@^6.0.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
 semver@^7.2.1, semver@^7.3.2:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
-  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+  dependencies:
+    lru-cache "^6.0.0"
 
 send@0.17.1:
   version "0.17.1"
@@ -9728,17 +9631,10 @@ serialize-javascript@^2.1.2:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
-serialize-javascript@^3.0.0, serialize-javascript@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea"
-  integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==
-  dependencies:
-    randombytes "^2.1.0"
-
-serialize-javascript@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
-  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
+serialize-javascript@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
+  integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==
   dependencies:
     randombytes "^2.1.0"
 
@@ -9850,12 +9746,12 @@ shellwords@^0.1.1:
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
 side-channel@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947"
-  integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz#cdc46b057550bbab63706210838df5d4c19519c3"
+  integrity sha512-A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g==
   dependencies:
-    es-abstract "^1.17.0-next.1"
-    object-inspect "^1.7.0"
+    es-abstract "^1.18.0-next.0"
+    object-inspect "^1.8.0"
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.3"
@@ -9869,6 +9765,15 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
+sirv@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.10.tgz#3e591f5a9ae2520f50d5830f5fae38d97e7be194"
+  integrity sha512-H5EZCoZaggEUQy8ocKsF7WAToGuZhjJlLvM3XOef46CbdIgbNeQ1p32N1PCuCjkVYwrAVOSMacN6CXXgIzuspg==
+  dependencies:
+    "@polka/url" "^1.0.0-next.9"
+    mime "^2.3.1"
+    totalist "^1.0.0"
+
 sisteransi@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
@@ -9889,14 +9794,14 @@ slice-ansi@0.0.4:
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
   integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=
 
-slice-ansi@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
-  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
+slice-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
+  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
   dependencies:
-    ansi-styles "^3.2.0"
-    astral-regex "^1.0.0"
-    is-fullwidth-code-point "^2.0.0"
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
@@ -9928,40 +9833,33 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-sockjs-client@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"
-  integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==
+sockjs-client@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.0.tgz#2f8ff5d4b659e0d092f7aba0b7c386bd2aa20add"
+  integrity sha512-8Dt3BDi4FYNrCFGTL/HtwVzkARrENdwOUf1ZoW/9p3M8lZdFT35jVdrHza+qgxuG9H3/shR4cuX/X9umUrjP8Q==
   dependencies:
-    debug "^3.2.5"
+    debug "^3.2.6"
     eventsource "^1.0.7"
-    faye-websocket "~0.11.1"
-    inherits "^2.0.3"
-    json3 "^3.3.2"
-    url-parse "^1.4.3"
+    faye-websocket "^0.11.3"
+    inherits "^2.0.4"
+    json3 "^3.3.3"
+    url-parse "^1.4.7"
 
-sockjs@0.3.20:
-  version "0.3.20"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855"
-  integrity sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==
+sockjs@^0.3.21:
+  version "0.3.21"
+  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417"
+  integrity sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==
   dependencies:
-    faye-websocket "^0.10.0"
+    faye-websocket "^0.11.3"
     uuid "^3.4.0"
-    websocket-driver "0.6.5"
-
-sort-keys@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
-  integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0=
-  dependencies:
-    is-plain-obj "^1.0.0"
+    websocket-driver "^0.7.4"
 
 source-list-map@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
-source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
+source-map-resolve@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
   integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
@@ -9972,7 +9870,15 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.6, source-map-support@~0.5.12:
+source-map-resolve@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
+  integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==
+  dependencies:
+    atob "^2.1.2"
+    decode-uri-component "^0.2.0"
+
+source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.19:
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
   integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
@@ -10000,7 +9906,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.3:
+source-map@^0.7.3, source-map@~0.7.2:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
@@ -10027,9 +9933,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
-  integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce"
+  integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
@@ -10193,11 +10099,6 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
   integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
-strict-uri-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
-
 string-length@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1"
@@ -10328,6 +10229,11 @@ strip-bom@^4.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
   integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
 
+strip-comments@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b"
+  integrity sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==
+
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -10345,10 +10251,10 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
-strip-json-comments@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
-  integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
 strip-json-comments@~1.0.1:
   version "1.0.4"
@@ -10396,9 +10302,9 @@ supports-color@^6.1.0:
     has-flag "^3.0.0"
 
 supports-color@^7.0.0, supports-color@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
-  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
     has-flag "^4.0.0"
 
@@ -10451,15 +10357,15 @@ table@^3.7.8:
     slice-ansi "0.0.4"
     string-width "^2.0.0"
 
-table@^5.2.3:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/table/-/table-5.4.1.tgz#0691ae2ebe8259858efb63e550b6d5f9300171e8"
-  integrity sha512-E6CK1/pZe2N75rGZQotFOdmzWQ1AILtgYbMAbAjvms0S1l5IDB47zG3nCnFGB/w+7nB3vKofbLXCH7HPBo864w==
+table@^6.0.4:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.0.4.tgz#c523dd182177e926c723eb20e1b341238188aa0d"
+  integrity sha512-sBT4xRLdALd+NFBvwOz8bw4b15htyythha+q+DVZqy2RS08PPC8O2sZFgJYEY7bJvbCFKccs+WIZ/cd+xxTWCw==
   dependencies:
-    ajv "^6.9.1"
-    lodash "^4.17.11"
-    slice-ansi "^2.1.0"
-    string-width "^3.0.0"
+    ajv "^6.12.4"
+    lodash "^4.17.20"
+    slice-ansi "^4.0.0"
+    string-width "^4.2.0"
 
 tapable@^1.0.0, tapable@^1.1.3:
   version "1.1.3"
@@ -10467,14 +10373,14 @@ tapable@^1.0.0, tapable@^1.1.3:
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
 tar@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.2.tgz#5df17813468a6264ff14f766886c622b84ae2f39"
-  integrity sha512-Glo3jkRtPcvpDlAs/0+hozav78yoXKFr+c4wgw62NNMO3oo4AaJdCo21Uu7lcwr55h39W2XD1LMERc64wtbItg==
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f"
+  integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
     minipass "^3.0.0"
-    minizlib "^2.1.0"
+    minizlib "^2.1.1"
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
@@ -10506,22 +10412,22 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser-webpack-plugin@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-3.0.6.tgz#db0a108bbdd3680d72c9b491fbabad09ba207b99"
-  integrity sha512-z3HLOOPUHkCNGkeEHqqiMAIy1pjpHwS1o+i6Zn0Ws3EAvHJj46737efNNEvJ0Vx9BdDQM83d56qySDJOSORA0A==
+terser-webpack-plugin@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz#28daef4a83bd17c1db0297070adc07fc8cfc6a9a"
+  integrity sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==
   dependencies:
-    cacache "^15.0.4"
+    cacache "^15.0.5"
     find-cache-dir "^3.3.1"
-    jest-worker "^26.0.0"
-    p-limit "^3.0.1"
-    schema-utils "^2.6.6"
-    serialize-javascript "^4.0.0"
+    jest-worker "^26.5.0"
+    p-limit "^3.0.2"
+    schema-utils "^3.0.0"
+    serialize-javascript "^5.0.1"
     source-map "^0.6.1"
-    terser "^4.8.0"
+    terser "^5.3.4"
     webpack-sources "^1.4.3"
 
-terser@^4.1.2, terser@^4.8.0:
+terser@^4.1.2:
   version "4.8.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
   integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
@@ -10530,35 +10436,36 @@ terser@^4.1.2, terser@^4.8.0:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-tesseract.js-core@^2.0.0-beta.12:
+terser@^5.3.4:
+  version "5.3.4"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.4.tgz#e510e05f86e0bd87f01835c3238839193f77a60c"
+  integrity sha512-dxuB8KQo8Gt6OVOeLg/rxfcxdNZI/V1G6ze1czFUzPeCFWZRtvZMgSzlZZ5OYBZ4HoG607F6pFPNLekJyV+yVw==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.7.2"
+    source-map-support "~0.5.19"
+
+tesseract.js-core@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/tesseract.js-core/-/tesseract.js-core-2.2.0.tgz#6ef78051272a381969fac3e45a226e85022cffef"
   integrity sha512-a8L+OJTbUipBsEDsJhDPlnLB0TY1MkTZqw5dqUwmiDSjUzwvU7HWLg/2+WDRulKUi4LE+7PnHlaBlW0k+V0U0w==
 
-tesseract.js-utils@^1.0.0-beta.8:
-  version "1.0.0-beta.8"
-  resolved "https://registry.yarnpkg.com/tesseract.js-utils/-/tesseract.js-utils-1.0.0-beta.8.tgz#d1ef25c12609a337c3e0ac12a33f9903f3145a68"
-  integrity sha512-qjHBfWfzo2o1ZY9XI0Wh2hmpp38+mIgCMOk60W5Yyie/pBl421VLBKOZUEwQgpbLnOJ24VU6Q8yXsVgtFFHcFg==
+tesseract.js@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/tesseract.js/-/tesseract.js-2.1.1.tgz#5c50fc95542ce8d834cb952bfb75a8fc85f1441d"
+  integrity sha512-utg0A8UzT1KwBvZf+UMGmM8LU6izeol6yIem0Z44+7Qqd/YWgRVQ99XOG18ApTOXX48lGE++PDwlcZYkv0ygRQ==
   dependencies:
-    axios "^0.18.0"
     bmp-js "^0.1.0"
-    file-type "^10.5.0"
-    idb-keyval "^3.1.0"
+    file-type "^12.4.1"
+    idb-keyval "^3.2.0"
+    is-electron "^2.2.0"
     is-url "^1.2.4"
-    zlibjs "^0.3.1"
-
-tesseract.js@2.0.0-alpha.16:
-  version "2.0.0-alpha.16"
-  resolved "https://registry.yarnpkg.com/tesseract.js/-/tesseract.js-2.0.0-alpha.16.tgz#1e17717234a1464481abe12283f2c3ac79603d2e"
-  integrity sha512-8g3je2Kl8rkAFtpmwilGGj+8rCiPClNQaCjW6IafOPNn7hzFnVdL6fU6rG1Xsrc4Twv0HOa75kbpx5u70/WbTA==
-  dependencies:
-    axios "^0.18.0"
-    check-types "^7.4.0"
-    is-url "1.2.2"
+    node-fetch "^2.6.0"
     opencollective-postinstall "^2.0.2"
+    regenerator-runtime "^0.13.3"
     resolve-url "^0.2.1"
-    tesseract.js-core "^2.0.0-beta.12"
-    tesseract.js-utils "^1.0.0-beta.8"
+    tesseract.js-core "^2.2.0"
+    zlibjs "^0.3.1"
 
 test-exclude@^6.0.0:
   version "6.0.0"
@@ -10631,13 +10538,6 @@ tiny-warning@^1.0.0:
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
 
-tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
-  dependencies:
-    os-tmpdir "~1.0.2"
-
 tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
@@ -10690,6 +10590,11 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
+totalist@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
+  integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
+
 tough-cookie@^2.3.3, tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
@@ -10714,11 +10619,6 @@ tr46@^2.0.2:
   dependencies:
     punycode "^2.1.1"
 
-tryer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
-  integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==
-
 ts-essentials@^2.0.3:
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz#c9303f3d74f75fa7528c3d49b80e089ab09d8745"
@@ -10756,6 +10656,13 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+  dependencies:
+    prelude-ls "^1.2.1"
+
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
@@ -10899,9 +10806,9 @@ upath@^1.1.1:
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
 uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
+  integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==
   dependencies:
     punycode "^2.1.0"
 
@@ -10910,7 +10817,7 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-parse@^1.4.3:
+url-parse@^1.4.3, url-parse@^1.4.7:
   version "1.4.7"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
   integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
@@ -10933,10 +10840,17 @@ use-composed-ref@^1.0.0:
   dependencies:
     ts-essentials "^2.0.3"
 
-use-latest@^1.0.0:
+use-isomorphic-layout-effect@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/use-latest/-/use-latest-1.0.0.tgz#c86d2e4893b15f27def69da574a47136d107facb"
-  integrity sha512-CxmFi75KTXeTIBlZq3LhJ4Hz98pCaRKZHCpnbiaEHIr5QnuHvH8lKYoluPBt/ik7j/hFVPB8K3WqF6mQvLyQTg==
+  resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.0.0.tgz#f56b4ed633e1c21cd9fc76fe249002a1c28989fb"
+  integrity sha512-JMwJ7Vd86NwAt1jH7q+OIozZSIxA4ND0fx6AsOe2q1H8ooBUp5aN6DvVCqZiIaYU6JaMRJGyR0FO7EBCIsb/Rg==
+
+use-latest@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/use-latest/-/use-latest-1.1.0.tgz#7bf9684555869c3f5f37e10d0884c8accf4d3aa6"
+  integrity sha512-gF04d0ZMV3AMB8Q7HtfkAWe+oq1tFXP6dZKwBHQF5nVXtGsh2oAYeeqma5ZzxtlpOcW8Ro/tLcfmEodjDeqtuw==
+  dependencies:
+    use-isomorphic-layout-effect "^1.0.0"
 
 use@^3.1.0:
   version "3.1.1"
@@ -10950,7 +10864,7 @@ user-home@^2.0.0:
   dependencies:
     os-homedir "^1.0.0"
 
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
@@ -10996,25 +10910,20 @@ uuid@^3.3.2, uuid@^3.4.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-uuid@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
-  integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
-
-uuid@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.2.0.tgz#cb10dd6b118e2dada7d0cd9730ba7417c93d920e"
-  integrity sha512-CYpGiFTUrmI6OBMkAdjSDM0k5h8SkkiTP4WAjQgDgNB1S3Ou9VBEvr6q0Kv2H1mMk7IWfxYGpMH5sd5AvcIV2Q==
+uuid@^8.3.0, uuid@^8.3.1:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
 v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
-  integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"
+  integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==
 
-v8-to-istanbul@^4.1.3:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz#b97936f21c0e2d9996d4985e5c5156e9d4e49cd6"
-  integrity sha512-Rw6vJHj1mbdK8edjR7+zuJrpDtKIgNdAvTSAcpYfgMIw+u2dPDntD3dgN4XQFLU2/fvFQdzj+EeSGfd/jnY5fQ==
+v8-to-istanbul@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz#b4fe00e35649ef7785a9b7fcebcea05f37c332fc"
+  integrity sha512-fLL2rFuQpMtm9r8hrAV2apXX/WqHJ6+IC4/eQVdMDGBUgH/YMV4Gv3duk3kjmyg6uiQWBAA9nJwue4iJUOkHeA==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
@@ -11104,15 +11013,15 @@ watchpack-chokidar2@^2.0.0:
   dependencies:
     chokidar "^2.1.8"
 
-watchpack@^1.6.1:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.2.tgz#c02e4d4d49913c3e7e122c3325365af9d331e9aa"
-  integrity sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==
+watchpack@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz#6e9da53b3c80bb2d6508188f5b200410866cd30b"
+  integrity sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==
   dependencies:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
   optionalDependencies:
-    chokidar "^3.4.0"
+    chokidar "^3.4.1"
     watchpack-chokidar2 "^2.0.0"
 
 wbuf@^1.1.0, wbuf@^1.7.3:
@@ -11127,7 +11036,7 @@ webidl-conversions@^5.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
   integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
 
-webidl-conversions@^6.0.0:
+webidl-conversions@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
@@ -11145,24 +11054,20 @@ webpack-assets-manifest@^3.1.1:
     tapable "^1.0.0"
     webpack-sources "^1.0.0"
 
-webpack-bundle-analyzer@^3.8.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.8.0.tgz#ce6b3f908daf069fd1f7266f692cbb3bded9ba16"
-  integrity sha512-PODQhAYVEourCcOuU+NiYI7WdR8QyELZGgPvB1y2tjbUpbmcQOt5Q7jEK+ttd5se0KSBKD9SXHCEozS++Wllmw==
-  dependencies:
-    acorn "^7.1.1"
-    acorn-walk "^7.1.1"
-    bfj "^6.1.1"
-    chalk "^2.4.1"
-    commander "^2.18.0"
-    ejs "^2.6.1"
-    express "^4.16.3"
-    filesize "^3.6.1"
-    gzip-size "^5.0.0"
-    lodash "^4.17.15"
-    mkdirp "^0.5.1"
-    opener "^1.5.1"
-    ws "^6.0.0"
+webpack-bundle-analyzer@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.3.0.tgz#2f3c0ca9041d5ee47fa418693cf56b4a518b578b"
+  integrity sha512-J3TPm54bPARx6QG8z4cKBszahnUglcv70+N+8gUqv2I5KOFHJbzBiLx+pAp606so0X004fxM7hqRu10MLjJifA==
+  dependencies:
+    acorn "^8.0.4"
+    acorn-walk "^8.0.0"
+    chalk "^4.1.0"
+    commander "^6.2.0"
+    gzip-size "^6.0.0"
+    lodash "^4.17.20"
+    opener "^1.5.2"
+    sirv "^1.0.7"
+    ws "^7.3.1"
 
 webpack-cli@^3.3.12:
   version "3.3.12"
@@ -11192,10 +11097,10 @@ webpack-dev-middleware@^3.7.2:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-dev-server@^3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c"
-  integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==
+webpack-dev-server@^3.11.1:
+  version "3.11.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.1.tgz#c74028bf5ba8885aaf230e48a20e8936ab8511f0"
+  integrity sha512-u4R3mRzZkbxQVa+MBWi2uVpB5W59H3ekZAJsQlKUTdl7Elcah2EhygTPLmeFXybQkf9i2+L0kn7ik9SnXa6ihQ==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
@@ -11217,11 +11122,11 @@ webpack-dev-server@^3.11.0:
     p-retry "^3.0.1"
     portfinder "^1.0.26"
     schema-utils "^1.0.0"
-    selfsigned "^1.10.7"
+    selfsigned "^1.10.8"
     semver "^6.3.0"
     serve-index "^1.9.1"
-    sockjs "0.3.20"
-    sockjs-client "1.4.0"
+    sockjs "^0.3.21"
+    sockjs-client "^1.5.0"
     spdy "^4.0.2"
     strip-ansi "^3.0.1"
     supports-color "^6.1.0"
@@ -11239,12 +11144,13 @@ webpack-log@^2.0.0:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
 
-webpack-merge@^4.2.1:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
-  integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
+webpack-merge@^5.7.3:
+  version "5.7.3"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213"
+  integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==
   dependencies:
-    lodash "^4.17.15"
+    clone-deep "^4.0.1"
+    wildcard "^2.0.0"
 
 webpack-sources@^1.0.0, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
   version "1.4.3"
@@ -11254,10 +11160,10 @@ webpack-sources@^1.0.0, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^4.43.0:
-  version "4.43.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.43.0.tgz#c48547b11d563224c561dad1172c8aa0b8a678e6"
-  integrity sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==
+webpack@^4.44.2:
+  version "4.44.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.2.tgz#6bfe2b0af055c8b2d1e90ed2cd9363f841266b72"
+  integrity sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-module-context" "1.9.0"
@@ -11267,7 +11173,7 @@ webpack@^4.43.0:
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^4.1.0"
+    enhanced-resolve "^4.3.0"
     eslint-scope "^4.0.3"
     json-parse-better-errors "^1.0.2"
     loader-runner "^2.4.0"
@@ -11280,16 +11186,9 @@ webpack@^4.43.0:
     schema-utils "^1.0.0"
     tapable "^1.1.3"
     terser-webpack-plugin "^1.4.3"
-    watchpack "^1.6.1"
+    watchpack "^1.7.4"
     webpack-sources "^1.4.1"
 
-websocket-driver@0.6.5:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36"
-  integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=
-  dependencies:
-    websocket-extensions ">=0.1.1"
-
 websocket-driver@>=0.5.1:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"
@@ -11299,6 +11198,15 @@ websocket-driver@>=0.5.1:
     safe-buffer ">=5.1.0"
     websocket-extensions ">=0.1.1"
 
+websocket-driver@^0.7.4:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
+  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
+  dependencies:
+    http-parser-js ">=0.5.1"
+    safe-buffer ">=5.1.0"
+    websocket-extensions ">=0.1.1"
+
 websocket-extensions@>=0.1.1:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
@@ -11317,13 +11225,13 @@ whatwg-mimetype@^2.3.0:
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
 whatwg-url@^8.0.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.1.0.tgz#c628acdcf45b82274ce7281ee31dd3c839791771"
-  integrity sha512-vEIkwNi9Hqt4TV9RdnaBPNt+E2Sgmo3gePebCRgZ1R7g6d23+53zCTnuB0amKI4AXq6VM8jj2DUAa0S1vjJxkw==
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.2.2.tgz#85e7f9795108b53d554cec640b2e8aee2a0d4bfd"
+  integrity sha512-PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ==
   dependencies:
     lodash.sortby "^4.7.0"
     tr46 "^2.0.2"
-    webidl-conversions "^5.0.0"
+    webidl-conversions "^6.1.0"
 
 which-module@^2.0.0:
   version "2.0.0"
@@ -11344,10 +11252,10 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
-wicg-inert@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/wicg-inert/-/wicg-inert-3.0.3.tgz#7d05eaed64176887ee4c66fc0c4d6fe4b38ccce5"
-  integrity sha512-XwXf8K0NN4cpagjBlZ2/j/5Sjf6dW3HNbfywEy1y6Z8PJKvSHVGiuc5Id/9RZ6EmGq+GQCGTo7B2SK0Misbr6g==
+wicg-inert@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/wicg-inert/-/wicg-inert-3.1.0.tgz#6525f12db188b83f0051bed2ddcf6c1aa5b17590"
+  integrity sha512-P0ZiWaN9SxOkJbYtF/PIwmIRO8UTqTJtyl33QTQlHfAb6h15T0Dp5m7WTJ8N6UWIoj+KU5M0a8EtfRZLlHiP0Q==
 
 wide-align@^1.1.0:
   version "1.1.3"
@@ -11356,7 +11264,12 @@ wide-align@^1.1.0:
   dependencies:
     string-width "^1.0.2 || 2"
 
-word-wrap@~1.2.3:
+wildcard@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
+  integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
+
+word-wrap@^1.2.3, word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
@@ -11386,6 +11299,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -11401,13 +11323,6 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-write@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
-  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
-  dependencies:
-    mkdirp "^0.5.1"
-
 write@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
@@ -11415,17 +11330,17 @@ write@^0.2.1:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@^6.0.0, ws@^6.2.1:
+ws@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
   integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7.2.3:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
-  integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==
+ws@^7.2.3, ws@^7.3.1:
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz#a5dd76a24197940d4a8bb9e0e152bb4503764da7"
+  integrity sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==
 
 xml-name-validator@^3.0.0:
   version "3.0.0"
@@ -11437,13 +11352,6 @@ xmlchars@^2.2.0:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
-xregexp@^4.2.4, xregexp@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz#7e92e73d9174a99a59743f67a4ce879a04b5ae50"
-  integrity sha512-7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.8.3"
-
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
@@ -11454,6 +11362,11 @@ y18n@^4.0.0:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
+y18n@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18"
+  integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==
+
 yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
@@ -11485,6 +11398,11 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^20.2.2:
+  version "20.2.3"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.3.tgz#92419ba867b858c868acf8bae9bf74af0dd0ce26"
+  integrity sha512-emOFRT9WVHw03QSvN5qor9QQT9+sw5vwxfYweivSMHTcAXPefwVae2FjO7JJjj8hCE4CzPOPeFM83VwT29HCww==
+
 yargs@^13.3.2:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
@@ -11501,13 +11419,13 @@ yargs@^13.3.2:
     y18n "^4.0.0"
     yargs-parser "^13.1.2"
 
-yargs@^15.3.1, yargs@^15.4.0:
-  version "15.4.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.0.tgz#53949fb768309bac1843de9b17b80051e9805ec2"
-  integrity sha512-D3fRFnZwLWp8jVAAhPZBsmeIHY8tTsb8ItV9KaAaopmC6wde2u6Yw29JBIZHXw14kgkRnYmDgmQU4FVMDlIsWw==
+yargs@^15.4.1:
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
   dependencies:
     cliui "^6.0.0"
-    decamelize "^3.2.0"
+    decamelize "^1.2.0"
     find-up "^4.1.0"
     get-caller-file "^2.0.1"
     require-directory "^2.1.1"
@@ -11518,6 +11436,19 @@ yargs@^15.3.1, yargs@^15.4.0:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
+yargs@^16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
 zlibjs@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/zlibjs/-/zlibjs-0.3.1.tgz#50197edb28a1c42ca659cc8b4e6a9ddd6d444554"