add reload button

Merge develop V12.102.1

.config/example.yml

@@ -15,7 +15,10 @@ url: https://example.tld/
 #───┘ Port and TLS settings └───────────────────────────────────
 
 #
-# Misskey requires a reverse proxy to support HTTPS connections.
+# Misskey supports two deployment options for public.
+#
+
+# Option 1: With Reverse Proxy
 #
 #                 +----- https://example.tld/ ------------+
 #   +------+      |+-------------+      +----------------+|
@@ -23,12 +26,30 @@ url: https://example.tld/
 #   +------+      |+-------------+      +----------------+|
 #                 +---------------------------------------+
 #
-#   You need to set up a reverse proxy. (e.g. nginx)
-#   An encrypted connection with HTTPS is highly recommended
-#   because tokens may be transferred in GET requests.
+#   You need to setup reverse proxy. (eg. nginx)
+#   You do not define 'https' section.
 
-# The port that your Misskey server should listen on.
-port: 3000
+# Option 2: Standalone
+#
+#                 +- https://example.tld/ -+
+#   +------+      |   +---------------+    |
+#   | User | ---> |   | Misskey (443) |    |
+#   +------+      |   +---------------+    |
+#                 +------------------------+
+#
+#   You need to run Misskey as root.
+#   You need to set Certificate in 'https' section.
+
+# To use option 1, uncomment below line.
+#port: 3000    # A port that your Misskey server should listen.
+
+# To use option 2, uncomment below lines.
+#port: 443
+
+#https:
+#  # path for certification
+#  key: /etc/letsencrypt/live/example.tld/privkey.pem
+#  cert: /etc/letsencrypt/live/example.tld/fullchain.pem
 
 #   ┌──────────────────────────┐
 #───┘ PostgreSQL configuration └────────────────────────────────
@@ -134,9 +155,6 @@ id: 'aid'
 # Media Proxy
 #mediaProxy: https://example.com/proxy
 
-# Proxy remote files (default: false)
-#proxyRemoteFiles: true
-
 # Sign to ActivityPub GET request (default: false)
 #signToActivityPubGet: true
 

.github/ISSUE_TEMPLATE/01_bug-report.md

@@ -16,11 +16,11 @@ First, in order to avoid duplicate Issues, please search to see if the problem y
 
 <!-- Tell us what the bug is -->
 
-## 🥰 Expected Behavior
+## 🙂 Expected Behavior
 
 <!--- Tell us what should happen -->
 
-## 🤬 Actual Behavior
+## ☹️ Actual Behavior
 
 <!--- Tell us what happens instead of the expected behavior -->
 
@@ -33,7 +33,3 @@ First, in order to avoid duplicate Issues, please search to see if the problem y
 ## 📌 Environment
 
 <!-- Tell us where on the platform it happens -->
-
-Misskey version:
-Your OS:
-Your browser:

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,11 @@
-<!-- ℹ お読みください / README
+<!-- ℹ お読みください
 PRありがとうございます！ PRを作成する前に、コントリビューションガイドをご確認ください:
-Thank you for your PR! Before creating a PR, please check the contribution guide:
 https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md
 -->
+<!-- ℹ README
+Thank you for your PR! Before creating a PR, please check the contribution guide:
+https://github.com/misskey-dev/misskey/blob/develop/docs/CONTRIBUTING.en.md
+-->
 
 # What
 <!-- このPRで何をしたのか？ どう変わるのか？ -->

.github/dependabot.yml

@@ -5,18 +5,7 @@
 
 version: 2
 updates:
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 0
-- package-ecosystem: npm
-  directory: "/packages/backend"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 0
-- package-ecosystem: npm
-  directory: "/packages/client"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 0
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.github/workflows/docker-image.yml

@@ -1,18 +0,0 @@
-name: Docker Image CI
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)

.github/workflows/lint.yml

@@ -14,12 +14,12 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: true
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v1
       with:
-        node-version: 16.x
-        cache: 'yarn'
-        cache-dependency-path: |
-          packages/backend/yarn.lock
-          packages/client/yarn.lock
+        node-version: 12.x
+    - uses: actions/cache@v2
+      with:
+        path: '**/node_modules'
+        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
     - run: yarn install
     - run: yarn lint

.github/workflows/test.yml

@@ -33,13 +33,9 @@ jobs:
       with:
         submodules: true
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-        cache: 'yarn'
-        cache-dependency-path: |
-          packages/backend/yarn.lock
-          packages/client/yarn.lock
     - name: Install dependencies
       run: yarn install
     - name: Check yarn.lock
@@ -84,13 +80,13 @@ jobs:
     #- uses: browser-actions/setup-firefox@latest
     #  if: ${{ matrix.browser == 'firefox' }}
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-        cache: 'yarn'
-        cache-dependency-path: |
-          packages/backend/yarn.lock
-          packages/client/yarn.lock
+    - uses: actions/cache@v2
+      with:
+        path: '**/node_modules'
+        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
     - name: Install dependencies
       run: yarn install
     - name: Check yarn.lock

.node-version

@@ -1 +1 @@
-v16.14.0
+v16.6.2

CHANGELOG.md

@@ -2,209 +2,11 @@
 ## 12.x.x (unreleased)
 
 ### Improvements
-- 
 
 ### Bugfixes
-- 
 
-You should also include the user name that made the change.
 -->
 
-## 12.110.1 (2022/04/23)
-
-### Bugfixes
-- Fix GOP rendering @syuilo
-- Improve performance of antenna, clip, and list @xianon
-
-## 12.110.0 (2022/04/11)
-
-### Improvements
-- Improve webhook @syuilo
-- Client: Show loading icon on splash screen @syuilo
-
-### Bugfixes
-- API: parameter validation of users/show was wrong
-- Federation: リモートインスタンスへのダイレクト投稿が届かない問題を修正 @syuilo
-
-## 12.109.2 (2022/04/03)
-
-### Bugfixes
-- API: admin/update-meta was not working @syuilo
-- Client: テーマを切り替えたり読み込んだりするとmeta[name="theme-color"]のcontentがundefinedになる問題を修正 @tamaina
-
-## 12.109.1 (2022/04/02)
-
-### Bugfixes
-- API: Renoteが行えない問題を修正
-
-## 12.109.0 (2022/04/02)
-
-### Improvements
-- Webhooks @syuilo
-- Bull Dashboardを組み込み、ジョブキューの確認や操作を行えるように @syuilo
-  - Bull Dashboardを開くには、最初だけ一旦ログアウトしてから再度管理者権限を持つアカウントでログインする必要があります
-- Check that installed Node.js version fulfills version requirement @ThatOneCalculator
-- Server: overall performance improvements @syuilo
-- Federation: avoid duplicate activity delivery @Johann150
-- Federation: limit federation of reactions on direct notes @Johann150
-- Client: タッチパッド・タッチスクリーンでのデッキの操作性を向上 @tamaina
-
-### Bugfixes
-- email address validation was not working @ybw2016v
-- API: fix endpoint endpoint @Johann150
-- API: fix admin/meta endpoint @syuilo
-- API: improved validation and documentation for endpoints that accept different variants of input @Johann150
-- API: `notes/create`: The `mediaIds` property is now deprecated. @Johann150
-  - Use `fileIds` instead, it has the same behaviour.
-- Client: URIエンコーディングが異常でdecodeURIComponentが失敗するとURLが表示できなくなる問題を修正 @tamaina
-
-## 12.108.1 (2022/03/12)
-
-### Bugfixes
-- リレーが動作しない問題を修正 @xianonn
-- ulidを使用していると動作しない問題を修正 @syuilo
-- 外部からOGPが正しく取得できない問題を修正 @syuilo
-- instance can not get the files from other instance when there are items in allowedPrivateNetworks in .config/default.yml @ybw2016v
-
-## 12.108.0 (2022/03/09)
-
-### NOTE
-このバージョンからNode v16.14.0以降が必要です
-
-### Changes
-- ノートの最大文字数を設定できる機能が廃止され、デフォルトで一律3000文字になりました @syuilo
-- Misskey can no longer terminate HTTPS connections. @Johann150
-  - If you did not use a reverse proxy (e.g. nginx) before, you will probably need to adjust
-    your configuration file and set up a reverse proxy. The `https` configuration key is no
-    longer recognized!
-
-### Improvements
-- インスタンスデフォルトテーマを設定できるように @syuilo
-- ミュートに期限を設定できるように @syuilo
-- アンケートが終了したときに通知が作成されるように @syuilo
-- プロフィールの追加情報を最大16まで保存できるように @syuilo
-- 連合チャートにPub&Subを追加 @syuilo
-- 連合チャートにActiveを追加 @syuilo
-- デフォルトで10秒以上時間がかかるデータベースへのクエリは中断されるように @syuilo
-	- 設定ファイルの`db.extra`に`statement_timeout`を設定することでタイムアウト時間を変更できます
-- Client: スプラッシュスクリーンにインスタンスのアイコンを表示するように @syuilo
-
-### Bugfixes
-- Client: リアクションピッカーの高さが低くなったまま戻らないことがあるのを修正 @syuilo
-- Client: ユーザー名オートコンプリートが正しく動作しない問題を修正 @syuilo
-- Client: タッチ操作だとウィジェットの編集がしにくいのを修正 @xianonn
-- Client: register_note_view_interruptor()が動かないのを修正 @syuilo
-- Client: iPhone X以降(?)でページの内容が全て表示しきれないのを修正 @tamaina
-- Client: fix image caption on mobile @nullobsi
-
-## 12.107.0 (2022/02/12)
-
-### Improvements
-- クライアント: テーマを追加 @syuilo
-
-### Bugfixes
-- API: stats APIで内部エラーが発生する問題を修正 @syuilo
-- クライアント: ソフトミュートですべてがマッチしてしまう場合があるのを修正 @tamaina
-- クライアント: デバイスのスクリーンのセーフエリアを考慮するように @syuilo
-- クライアント: 一部環境でサイドバーの投稿ボタンが表示されない問題を修正 @syuilo
-
-## 12.106.3 (2022/02/11)
-
-### Improvements
-- クライアント: スマートフォンでの余白を調整 @syuilo
-
-### Bugfixes
-- クライアント: ノートの詳細が表示されない問題を修正 @syuilo
-
-## 12.106.2 (2022/02/11)
-
-### Bugfixes
-- クライアント: 削除したノートがタイムラインから自動で消えない問題を修正 @syuilo
-- クライアント: リアクション数が正しくないことがある問題を修正 @syuilo
-- 一部環境でマイグレーションが動作しない問題を修正 @syuilo
-
-## 12.106.1 (2022/02/11)
-
-### Bugfixes
-- クライアント: ワードミュートが保存できない問題を修正 @syuilo
-
-## 12.106.0 (2022/02/11)
-
-### Improvements
-- Improve federation chart @syuilo
-- クライアント: リアクションピッカーのサイズを設定できるように @syuilo
-- クライアント: リアクションピッカーの幅、高さ制限を緩和 @syuilo
-- Docker: Update to Node v16.13.2 @mei23
-- Update dependencies
-
-### Bugfixes
-- validate regular expressions in word mutes @Johann150
-
-## 12.105.0 (2022/02/09)
-
-### Improvements
-- インスタンスのテーマカラーを設定できるように @syuilo
-
-### Bugfixes
-- 一部環境でマイグレーションが失敗する問題を修正 @syuilo
-
-## 12.104.0 (2022/02/09)
-
-### Note
-ビルドする前に`npm run clean`を実行してください。
-
-このリリースはマイグレーションの規模が大きいため、インスタンスによってはマイグレーションに時間がかかる可能性があります。
-マイグレーションが終わらない場合は、チャートの情報はリセットされてしまいますが`__chart__`で始まるテーブルの**レコード**を全て削除(テーブル自体は消さないでください)してから再度試す方法もあります。
-
-### Improvements
-- チャートエンジンの強化 @syuilo
-	- テーブルサイズの削減
-	- notes/instance/perUserNotesチャートに添付ファイル付きノートの数を追加
-	- activeUsersチャートに新しい項目を追加
-	- federationチャートに新しい項目を追加
-	- apRequestチャートを追加
-	- networkチャート廃止
-- クライアント: 自インスタンス情報ページでチャートを見れるように @syuilo
-- クライアント: デバイスの種類を手動指定できるように @syuilo
-- クライアント: UIのアイコンを更新 @syuilo
-- クライアント: UIのアイコンをセルフホスティングするように @syuilo
-- NodeInfo のユーザー数と投稿数の内容を見直す @xianonn
-
-### Bugfixes
-- Client: タイムライン種別を切り替えると「新しいノートがあります」の表示が残留してしまうのを修正 @tamaina
-- Client: UIのサイズがおかしくなる問題の修正 @tamaina
-- Client: Setting instance information of notes to always show breaks the timeline @Johann150
-- Client: 環境に依っては返信する際のカーソル位置が正しくない問題を修正 @syuilo
-- Client: コントロールパネルのユーザー、ファイルにて、インスタンスの表示範囲切り替えが機能しない問題を修正 @syuilo
-- Client: アップデートお知らせダイアログが出ないのを修正 @syuilo
-- Client: Follows/Followers Visibility changes won't be saved unless clicking on an other checkbox @Johann150
-- API: Fix API cast @mei23
-- add instance favicon where it's missing @solfisher
-- チャートの定期resyncが動作していない問題を修正 @syuilo
-
-## 12.103.1 (2022/02/02)
-
-### Bugfixes
-- クライアント: ツールチップの表示位置が正しくない問題を修正
-
-## 12.103.0 (2022/02/02)
-
-### Improvements
-- クライアント: 連合インスタンスページからインスタンス情報再取得を行えるように
-
-### Bugfixes
-- クライアント: 投稿のNSFW画像を表示したあとにリアクションが更新されると画像が非表示になる問題を修正
-- クライアント: 「クリップ」ページが開かない問題を修正
-- クライアント: トレンドウィジェットが動作しないのを修正
-- クライアント: フェデレーションウィジェットが動作しないのを修正
-- クライアント: リアクション設定で絵文字ピッカーが開かないのを修正
-- クライアント: DMページでメンションが含まれる問題を修正
-- クライアント: 投稿フォームのハッシュタグ保持フィールドが動作しない問題を修正
-- クライアント: サイドビューが動かないのを修正
-- クライアント: ensure that specified users does not get duplicates
-- Add `img-src` and `media-src` directives to `Content-Security-Policy` for
-  files and media proxy
-
 ## 12.102.1 (2022/01/27)
 ### Bugfixes
 - チャットが表示できない問題を修正

CONTRIBUTING.md

@@ -3,12 +3,9 @@ We're glad you're interested in contributing Misskey! In this document you will
 
 **ℹ️ Important:** This project uses Japanese as its major language, **but you do not need to translate and write the Issues/PRs in Japanese.**
 Also, you might receive comments on your Issue/PR in Japanese, but you do not need to reply to them in Japanese as well.\
-The accuracy of machine translation into Japanese is not high, so it will be easier for us to understand if you write it in the original language.
+The accuracy of translation into Japanese is not high, so it will be easier for us to understand if you write it in the original language.
 It will also allow the reader to use the translation tool of their preference if necessary.
 
-## Roadmap
-See [ROADMAP.md](./ROADMAP.md)
-
 ## Issues
 Before creating an issue, please check the following:
 - To avoid duplication, please search for similar issues before creating a new issue.
@@ -19,9 +16,6 @@ Before creating an issue, please check the following:
 ## Before implementation
 When you want to add a feature or fix a bug, **first have the design and policy reviewed in an Issue** (if it is not there, please make one). Without this step, there is a high possibility that the PR will not be merged even if it is implemented.
 
-At this point, you also need to clarify the goals of the PR you will create, and make sure that the other members of the team are aware of them.
-PRs that do not have a clear set of do's and don'ts tend to be bloated and difficult to review.
-
 Also, when you start implementation, assign yourself to the Issue (if you cannot do it yourself, ask another member to assign you). By expressing your intention to work the Issue, you can prevent conflicts in the work.
 
 ## Well-known branches
@@ -45,23 +39,6 @@ Thank you for your PR! Before creating a PR, please check the following:
 
 Thanks for your cooperation 🤗
 
-## Reviewers guide
-Be willing to comment on the good points and not just the things you want fixed 💯
-
-### Review perspective
-- Scope
-  - Are the goals of the PR clear?
-  - Is the granularity of the PR appropriate?
-- Security
-	- Does merging this PR create a vulnerability?
-- Performance
-	- Will merging this PR cause unexpected performance degradation?
-	- Is there a more efficient way?
-- Testing
-	- Does the test ensure the expected behavior?
-	- Are there any omissions or gaps?
-	- Does it check for anomalies?
-
 ## Localization (l10n)
 Misskey uses [Crowdin](https://crowdin.com/project/misskey) for localization management.
 You can improve our translations with your Crowdin account.
@@ -201,13 +178,11 @@ MongoDBの時とは違い、findOneでレコードを取得する時に対象レ
 MongoDBは`null`で返してきてたので、その感覚で`if (x === null)`とか書くとバグる。代わりに`if (x == null)`と書いてください
 
 ### Migration作成方法
-packages/backendで:
-```sh
-npx typeorm migration:generate -d ormconfig.js -o <migration name>
+```
+npx ts-node ./node_modules/typeorm/cli.js migration:generate -n 変更の名前 -o
 ```
 
-- 生成後、ファイルをmigration下に移してください
-- 作成されたスクリプトは不必要な変更を含むため除去してください
+作成されたスクリプトは不必要な変更を含むため除去してください。
 
 ### コネクションには`markRaw`せよ
 **Vueのコンポーネントのdataオプションとして**misskey.jsのコネクションを設定するとき、必ず`markRaw`でラップしてください。インスタンスが不必要にリアクティブ化されることで、misskey.js内の処理で不具合が発生するとともに、パフォーマンス上の問題にも繋がる。なお、Composition APIを使う場合はこの限りではない(リアクティブ化はマニュアルなため)。

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.14.0-alpine3.15 AS base
+FROM node:16.6.2-alpine3.13 AS base
 
 ENV NODE_ENV=production
 
@@ -32,3 +32,4 @@ COPY --from=builder /misskey/packages/client/node_modules ./packages/client/node
 COPY . ./
 
 CMD ["npm", "run", "migrateandstart"]
+

README.md

@@ -1,7 +1,168 @@
-## これってなに？
-[Misskey](https://github.com/misskey-dev/misskey)ベースのSNS
+[![Misskey](https://github.com/misskey-dev/assets/blob/main/banner.png?raw=true)](https://join.misskey.page/)
 
-## 本家との違い
-[ここ](https://nullc.at/nca10.net/)にかいてあるよ
-## 導入方法
-[MisskeyHub](https://misskey-hub.net/docs/install.html)をみてね
+<div align="center">
+
+**🌎 A forever evolving, interplanetary microblogging platform. 🚀**
+
+**Misskey** is a distributed microblogging platform with advanced features such as Reactions and a highly customizable UI.
+
+[Learn more](https://misskey-hub.net/)
+
+---
+
+[✨ Find an instance](https://misskey-hub.net/instances.html)
+•
+[📦 Create your own instance](https://misskey-hub.net/docs/install.html)
+•
+[🛠️ Contribute](./CONTRIBUTING.md)
+•
+[🚀 Join the community](https://discord.gg/Wp8gVStHW3)
+
+---
+
+<a href="https://www.patreon.com/syuilo"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160" /></a>
+
+</div>
+
+<div>
+
+<a href="https://xn--931a.moe/"><img src="https://github.com/misskey-dev/misskey/blob/develop/assets/ai.png?raw=true" align="right" height="320px"/></a>
+
+## ✨ Features
+- **ActivityPub support**\
+	It is possible to interact with other software.
+- **Reactions**\
+	You can add "reactions" to each post, making it easy for you to express your feelings.
+- **Drive**\
+	An interface to manage uploaded files such as images, videos, sounds, etc.
+	You can also organize your favorite content into folders, making it easy to share again.
+- **Rich Web UI**\
+	Misskey has a rich WebUI by default.
+	It is highly customizable by flexibly changing the layout and installing various widgets and themes.
+	Furthermore, plug-ins can be created using AiScript, a original programming language.
+- and more...
+
+</div>
+
+<div style="clear: both;"></div>
+
+## Sponsors
+<div align="center">
+	<a class="rss3" title="RSS3" href="https://rss3.io/" target="_blank" style="display: inline-block;"><img src="https://rss3.io/assets/images/Logo.svg" alt="RSS3" style="display: inline-block; height: 60px;"></a>
+</div>
+
+## Backers
+<!-- PATREON_START -->
+<table><tr>
+<td><img src="https://c8.patreon.com/2/200/20832595" alt="Roujo " width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/27956229" alt="Oliver Maximilian Seidel" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/3.png?token-time=2145916800&token-hash=oH_i7gJjNT7Ot6j9JiVwy7ZJIBqACVnzLqlz4YrDAZA%3D" alt="weepjp " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19045173/cb91c0f345c24d4ebfd05f19906d5e26/1.png?token-time=2145916800&token-hash=o_zKBytJs_AxHwSYw_5R8eD0eSJe3RoTR3kR3Q0syN0%3D" alt="kiritan " width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/27648259" alt="みなしま " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/24430516/b1964ac5b9f746d2a12ff53dbc9aa40a/1.jpg?token-time=2145916800&token-hash=bmEiMGYpp3bS7hCCbymjGGsHBZM3AXuBOFO3Kro37PU%3D" alt="Eduardo Quiros" width="100"></td>
+</tr><tr>
+<td><a href="https://www.patreon.com/user?u=20832595">Roujo </a></td>
+<td><a href="https://www.patreon.com/user?u=27956229">Oliver Maximilian Seidel</a></td>
+<td><a href="https://www.patreon.com/weepjp">weepjp </a></td>
+<td><a href="https://www.patreon.com/user?u=19045173">kiritan </a></td>
+<td><a href="https://www.patreon.com/user?u=27648259">みなしま </a></td>
+<td><a href="https://www.patreon.com/user?u=24430516">Eduardo Quiros</a></td>
+</tr></table>
+<table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/14215107/1cbe1912c26143919fa0faca16f12ce1/4.jpg?token-time=2145916800&token-hash=BslMqDjTjz8KYANLvxL87agHTugHa0dMPUzT-hwR6Vk%3D" alt="Nesakko" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/776209" alt="Demogrognard" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/3075183/c2ae575c604e420297f000ccc396e395/1.jpeg?token-time=2145916800&token-hash=O9qmPtpo6wWb0OuvnkEekhk_1WO2MTdytLr7ZgsAr80%3D" alt="Liaizon Wakest" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/557245" alt="mkatze " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/23915207/25428766ecd745478e600b3d7f871eb2/1.png?token-time=2145916800&token-hash=urCLLA4KjJZX92Y1CxcBP4d8bVTHGkiaPnQZp-Tqz68%3D" alt="kabo2468y " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/8249688/4aacf36b6b244ab1bc6653591b6640df/2.png?token-time=2145916800&token-hash=1ZEf2w6L34253cZXS_HlVevLEENWS9QqrnxGUAYblPo%3D" alt="AureoleArk " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5670915/ee175f0bfb6347ffa4ea101a8c097bff/1.jpg?token-time=2145916800&token-hash=mPLM9CA-riFHx-myr3bLZJuH2xBRHA9se5VbHhLIOuA%3D" alt="osapon " width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/16869916" alt="見当かなみ " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/36813045/29876ea679d443bcbba3c3f16edab8c2/2.jpeg?token-time=2145916800&token-hash=YCKWnIhrV9rjUCV9KqtJnEqjy_uGYF3WMXftjUdpi7o%3D" alt="Wataru Manji (manji0)" width="100"></td>
+</tr><tr>
+<td><a href="https://www.patreon.com/Nesakko">Nesakko</a></td>
+<td><a href="https://www.patreon.com/user?u=776209">Demogrognard</a></td>
+<td><a href="https://www.patreon.com/wakest">Liaizon Wakest</a></td>
+<td><a href="https://www.patreon.com/user?u=557245">mkatze </a></td>
+<td><a href="https://www.patreon.com/user?u=23915207">kabo2468y </a></td>
+<td><a href="https://www.patreon.com/AureoleArk">AureoleArk </a></td>
+<td><a href="https://www.patreon.com/osapon">osapon </a></td>
+<td><a href="https://www.patreon.com/user?u=16869916">見当かなみ </a></td>
+<td><a href="https://www.patreon.com/user?u=36813045">Wataru Manji (manji0)</a></td>
+</tr></table>
+<table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18899730/6a22797f68254034a854d69ea2445fc8/1.png?token-time=2145916800&token-hash=b_uj57yxo5VzkSOUS7oXE_762dyOTB_oxzbO6lFNG3k%3D" alt="YuzuRyo61 " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5788159/af42076ab3354bb49803cfba65f94bee/1.jpg?token-time=2145916800&token-hash=iSaxp_Yr2-ZiU2YVi9rcpZZj9mj3UvNSMrZr4CU4qtA%3D" alt="mewl hayabusa" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/28779508/3cd4cb7f017f4ee0864341e3464d42f9/1.png?token-time=2145916800&token-hash=eGQtR15be44kgvh8fw2Jx8Db4Bv15YBp2ldxh0EKRxA%3D" alt="S Y" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/16542964" alt="Takumi Sugita" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/17866454" alt="sikyosyounin " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3.png?token-time=2145916800&token-hash=KjfQL8nf3AIf6WqzLshBYAyX44piAqOAZiYXgZS_H6A%3D" alt="YUKIMOCHI" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/38837364/9421361c54c645ac8f5fc442a40c32e9/1.png?token-time=2145916800&token-hash=TUZB48Nem3BeUPLBH6s3P6WyKBnQOy0xKaDSTBBUNzA%3D" alt="xianon" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/26340354/08834cf767b3449e93098ef73a434e2f/2.png?token-time=2145916800&token-hash=nyM8DnKRL8hR47HQ619mUzsqVRpkWZjgtgBU9RY15Uc%3D" alt="totokoro " width="100"></td>
+</tr><tr>
+<td><a href="https://www.patreon.com/Yuzulia">YuzuRyo61 </a></td>
+<td><a href="https://www.patreon.com/hs_sh_net">mewl hayabusa</a></td>
+<td><a href="https://www.patreon.com/user?u=28779508">S Y</a></td>
+<td><a href="https://www.patreon.com/user?u=16542964">Takumi Sugita</a></td>
+<td><a href="https://www.patreon.com/user?u=17866454">sikyosyounin </a></td>
+<td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
+<td><a href="https://www.patreon.com/user?u=38837364">xianon</a></td>
+<td><a href="https://www.patreon.com/user?u=26340354">totokoro </a></td>
+</tr></table>
+<table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19356899/496b4681d33b4520bd7688e0fd19c04d/2.jpeg?token-time=2145916800&token-hash=_sTj3dUBOhn9qwiJ7F19Qd-yWWfUqJC_0jG1h0agEqQ%3D" alt="sheeta.s " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5827393/59893c191dda408f9cabd0f20a3a5627/1.jpeg?token-time=2145916800&token-hash=i9N05vOph-eP1LTLb9_npATjYOpntL0ZsHNaZFSsPmE%3D" alt="motcha " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/20494440/540beaf2445f408ea6597bc61e077bb3/1.png?token-time=2145916800&token-hash=UJ0JQge64Bx9XmN_qYA1inMQhrWf4U91fqz7VAKJeSg%3D" alt="axtuki1 " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13737140/1adf7835017d479280d90fe8d30aade2/1.png?token-time=2145916800&token-hash=0pdle8h5pDZrww0BDOjdz6zO-HudeGTh36a3qi1biVU%3D" alt="Satsuki Yanagi" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17880724/311738c8a48f4a6b9443c2445a75adde/1.jpg?token-time=2145916800&token-hash=nVAntpybQrznE0rg05keLrSE6ogPKJXB13rmrJng42c%3D" alt="takimura " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13100201/fc5be4fa90444f09a9c8a06f72385272/1.png?token-time=2145916800&token-hash=i8PjlgfOB2LPEdbtWyx8ZPsBKhGcNZqcw_FQmH71UGU%3D" alt="aqz tamaina" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/9109588/e3cffc48d20a4e43afe04123e696781d/3.png?token-time=2145916800&token-hash=T_VIUA0IFIbleZv4pIjiszZGnQonwn34sLCYFIhakBo%3D" alt="nafuchoco " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/16900731/619ab87cc08448439222631ebb26802f/1.gif?token-time=2145916800&token-hash=o27K7M02s1z-LkDUEO5Oa7cu-GviRXeOXxryi4o_6VU%3D" alt="Atsuko Tominaga" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4389829/9f709180ac714651a70f74a82f3ffdb9/3.png?token-time=2145916800&token-hash=FTm3WVom4dJ9NwWMU4OpCL_8Yc13WiwEbKrDPyTZTPs%3D" alt="natalie" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/26144593/9514b10a5c1b42a3af58621aee213d1d/1.png?token-time=2145916800&token-hash=v1PYRsjzu4c_mndN4Hvi_dlispZJsuGRCQeNS82pUSM%3D" alt="EBISUME" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5923936/2a743cbfbff946c2af3f09026047c0da/2.png?token-time=2145916800&token-hash=h6yphW1qnM0n_NOWaf8qtszMRLXEwIxfk5beu4RxdT0%3D" alt="noellabo " width="100"></td>
+</tr><tr>
+<td><a href="https://www.patreon.com/user?u=19356899">sheeta.s </a></td>
+<td><a href="https://www.patreon.com/user?u=5827393">motcha </a></td>
+<td><a href="https://www.patreon.com/user?u=20494440">axtuki1 </a></td>
+<td><a href="https://www.patreon.com/user?u=13737140">Satsuki Yanagi</a></td>
+<td><a href="https://www.patreon.com/takimura">takimura </a></td>
+<td><a href="https://www.patreon.com/aqz">aqz tamaina</a></td>
+<td><a href="https://www.patreon.com/user?u=9109588">nafuchoco </a></td>
+<td><a href="https://www.patreon.com/user?u=16900731">Atsuko Tominaga</a></td>
+<td><a href="https://www.patreon.com/user?u=4389829">natalie</a></td>
+<td><a href="https://www.patreon.com/user?u=26144593">EBISUME</a></td>
+<td><a href="https://www.patreon.com/noellabo">noellabo </a></td>
+</tr></table>
+<table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/2384390/5681180e1efb46a8b28e0e8d4c8b9037/1.jpg?token-time=2145916800&token-hash=SJcMy-Q1BcS940-LFUVOMfR7-5SgrzsEQGhYb3yowFk%3D" alt="CG " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18072312/98e894d960314fa7bc236a72a39488fe/1.jpg?token-time=2145916800&token-hash=7bkMqTwHPRsJPGAq42PYdDXDZBVGLqdgr1ZmBxX8GFQ%3D" alt="Hekovic " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/24641572/b4fd175424814f15b0ca9178d2d2d2e4/1.png?token-time=2145916800&token-hash=e2fyqdbuJbpCckHcwux7rbuW6OPkKdERcus0u2wIEWU%3D" alt="uroco @99" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/14661394" alt="Chandler " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1.png?token-time=2145916800&token-hash=hBayGfOmQH3kRMdNnDe4oCZD_9fsJWSt29xXR3KRMVk%3D" alt="Nokotaro Takeda" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/23932002" alt="nenohi " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/9481273/7fa89168e72943859c3d3c96e424ed31/4.jpeg?token-time=2145916800&token-hash=5w1QV1qXe-NdWbdFmp1H7O_-QBsSiV0haumk3XTHIEg%3D" alt="Efertone " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1.jpeg?token-time=2145916800&token-hash=vGe7wXGqmA8Q7m-kDNb6fyGdwk-Dxk4F-ut8ZZu51RM%3D" alt="Takashi Shibuya" width="100"></td>
+</tr><tr>
+<td><a href="https://www.patreon.com/Corset">CG </a></td>
+<td><a href="https://www.patreon.com/hekovic">Hekovic </a></td>
+<td><a href="https://www.patreon.com/user?u=24641572">uroco @99</a></td>
+<td><a href="https://www.patreon.com/user?u=14661394">Chandler </a></td>
+<td><a href="https://www.patreon.com/takenoko">Nokotaro Takeda</a></td>
+<td><a href="https://www.patreon.com/user?u=23932002">nenohi </a></td>
+<td><a href="https://www.patreon.com/efertone">Efertone </a></td>
+<td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
+</tr></table>
+
+**Last updated:** Sun, 26 Jul 2020 07:00:10 UTC
+<!-- PATREON_END -->
+
+[backer-url]: #backers
+[backer-badge]: https://opencollective.com/misskey/backers/badge.svg
+[backers-image]: https://opencollective.com/misskey/backers.svg
+[sponsor-url]: #sponsors
+[sponsor-badge]: https://opencollective.com/misskey/sponsors/badge.svg
+[sponsors-image]: https://opencollective.com/misskey/sponsors.svg
+[support-url]: https://opencollective.com/misskey#support
+
+[syuilo-link]:      https://syuilo.com
+[syuilo-icon]:      https://avatars2.githubusercontent.com/u/4439005?v=3&s=70

ROADMAP.md

@@ -1,36 +0,0 @@
-# Roadmap
-The order of individual tasks is a guide only and is subject to change depending on the situation.
-Also, the later tasks are more indefinite and are subject to change as development progresses.
-
-## (1) Improve maintainability \<current phase\>
-This is the phase we are at now. We need to make a high-maintenance environment that can withstand future development.
-
-- Make the number of type errors zero (backend)
-  - Probably need to switch some libraries to others that make it difficult to reduce type errors
-    - e.g. koa to fastify https://github.com/misskey-dev/misskey/issues/7537
-- Improve CI
-  - Fix tests
-    - mocha, jest, etc. do not support the combination of `TypeScript + ESM + Path alias`, and the tests currently do not work.
-  - Fix random test failures - https://github.com/misskey-dev/misskey/issues/7985 and https://github.com/misskey-dev/misskey/issues/7986
-  - Add more tests
-    - May need to implement a mechanism that allows for DI
-- Improve documentation
-
-## (2) Improve functionality
-Once Phase 1 is complete and an environment conducive to the development of a stable system is in place, the implementation of new functions can begin gradually.
-
-- OAuth2 support https://github.com/misskey-dev/misskey/issues/8262
-- GraphQL support?
-
-## (3) Improve scalability
-Once the development of the feature has settled down, this may be an opportunity to make larger modifications.
-
-- Rewriting in Rust?
-
-## (4) Change the world
-It is time to promote Misskey and change the world.
-
-- Become more major than services such as Twitter and become critical infrastructure for the world
-- MiOS will be developed and integrated into various systems - What is MiOS?
-- Letting Ai-chan interfere with the real world
-- Make Misskey a member of GAFA; Misskey's office must be a reinforced concrete brutalist building with a courtyard.

cypress/integration/basic.js

@@ -176,7 +176,3 @@ describe('After user singed in', () => {
 		cy.contains('Hello, Misskey!');
   });
 });
-
-// TODO: 投稿フォームの公開範囲指定のテスト
-// TODO: 投稿フォームのファイル添付のテスト
-// TODO: 投稿フォームのハッシュタグ保持フィールドのテスト

docker-compose.yml

@@ -1,31 +1,52 @@
-version: "3"
-
-services:
-  db:
-    restart: always
-    image: postgres:12.2-alpine
-    ports:
-      - "5432:5432"
-    networks:
-      - internal_network
-      - external_network
-    env_file:
-      - .config/docker.env
-    volumes:
-      - ./db:/var/lib/postgresql/data
-
-  redis:
-    restart: always
-    image: redis:4.0-alpine
-    ports:
-      - "6379:6379"
-    networks:
-      - internal_network
-      - external_network
-    volumes:
-      - ./redis:/data
-
-networks:
-  internal_network:
-    internal: true
-  external_network:
+version: "3"
+
+services:
+  web:
+    build: .
+    restart: always
+    links:
+      - db
+      - redis
+#      - es
+    ports:
+      - "127.0.0.1:3000:3000"
+    networks:
+      - internal_network
+      - external_network
+    volumes:
+      - ./files:/misskey/files
+      - ./.config:/misskey/.config:ro
+
+  redis:
+    restart: always
+    image: redis:4.0-alpine
+    networks:
+      - internal_network
+    volumes:
+      - ./redis:/data
+
+  db:
+    restart: always
+    image: postgres:12.2-alpine
+    networks:
+      - internal_network
+    env_file:
+      - .config/docker.env
+    volumes:
+      - ./db:/var/lib/postgresql/data
+
+#  es:
+#    restart: always
+#    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.2
+#    environment:
+#      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+#      - "TAKE_FILE_OWNERSHIP=111"
+#    networks:
+#      - internal_network
+#    volumes:
+#      - ./elasticsearch:/usr/share/elasticsearch/data
+
+networks:
+  internal_network:
+    internal: true
+  external_network:

explanation/instancecolor.md

@@ -1,6 +0,0 @@
-`packages/backend/src/server/web/views/base.pug` の中の
-```
-meta(name='theme-color' content='#好きな色')
-meta(name='theme-color-orig' content='#好きな色')
-```
-の好きな色の部分を変更する(Hex値)

explanation/ncatlang.md

@@ -1,15 +0,0 @@
-## 主な変更点
-- なとナがにゃ
-- コピーがコビー
-- あなたが僕
-- パスワードが鍵
-- doneがドネ
-- ユーザー名が名前
-- バナーがバニャーニャ
-- ユーザーネームがid
-- コントロールパネルがコンソトールパネル
-
-## ぬるきゃごの導入方法
-1. `./locales/ja-JP.yml` を `ja-NCAT.yml` に変更
-2. `ja-NCAT.yml` を `./locales` のなかに入れる
-3. `./locales/inde.js` の `const languages` に `ja-NCAT` を追加する

gulpfile.js

@@ -19,10 +19,6 @@ gulp.task('copy:client:fonts', () =>
 	gulp.src('./packages/client/node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/_client_dist_/fonts/'))
 );
 
-gulp.task('copy:client:fontawesome', () =>
-	gulp.src('./packages/client/node_modules/@fortawesome/fontawesome-free/**/*').pipe(gulp.dest('./built/_client_dist_/fontawesome/'))
-);
-
 gulp.task('copy:client:locales', cb => {
 	fs.mkdirSync('./built/_client_dist_/locales', { recursive: true });
 
@@ -54,7 +50,7 @@ gulp.task('build:backend:style', () => {
 });
 
 gulp.task('build', gulp.parallel(
-	'copy:client:locales', 'copy:backend:views', 'build:backend:script', 'build:backend:style', 'copy:client:fonts', 'copy:client:fontawesome'
+	'copy:client:locales', 'copy:backend:views', 'build:backend:script', 'build:backend:style', 'copy:client:fonts'
 ));
 
 gulp.task('default', gulp.task('build'));

locales/ar-SA.yml

@@ -32,7 +32,7 @@ uploading: "يرفع..."
 save: "حفظ"
 users: "المستخدمون"
 addUser: "اضافة مستخدم"
-favorite: "أضفها للمفضلة"
+favorite: "إضافة إلى المفضلة"
 favorites: "المفضلات"
 unfavorite: "إزالة من المفضلة"
 favorited: "أُضيف إلى المفضلة."
@@ -106,7 +106,6 @@ clickToShow: "اضغط للعرض"
 sensitive: "محتوى حساس"
 add: "إضافة"
 reaction: "التفاعلات"
-reactionSetting: "التفاعلات المراد عرضها في منتقي التفاعلات."
 reactionSettingDescription2: "اسحب لترتيب ، انقر للحذف ، استخدم \"+\" للإضافة."
 rememberNoteVisibility: "تذكر إعدادت مدى رؤية الملاحظات"
 attachCancel: "أزل المرفق"
@@ -140,8 +139,6 @@ flagAsBot: "علّمه كحساب آلي"
 flagAsBotDescription: "فعّل هذا الخيار إذا كان هذا الحساب يُدار عبر برمجية. إذا فُعل فسيكون بمثابة علامة للمطورين الآخرين لتجنب سلاسل لا متناهية من التفاعل بين حسابات الآلية وضبط أنظمة ميسكي للتعامل مع هذا الحساب كآلي."
 flagAsCat: "علّم هذا الحساب كحساب قط"
 flagAsCatDescription: "فعّل هذا الخيار لوضع علامة على الحساب لتوضيح أنه حساب قط."
-flagShowTimelineReplies: "أظهر التعليقات في الخيط الزمني"
-flagShowTimelineRepliesDescription: "يظهر الردود في الخط الزمني"
 autoAcceptFollowed: "اقبل طلبات المتابعة تلقائيا من الحسابات المتابَعة"
 addAccount: "أضف حساباً"
 loginFailed: "فشل الولوج"
@@ -189,7 +186,7 @@ clearCachedFiles: "امسح التخزين المؤقت"
 clearCachedFilesConfirm: "أتريد حذف التخزين المؤقت للملفات البعيدة؟"
 blockedInstances: "المثلاء المحجوبون"
 blockedInstancesDescription: "قائمة بالمثلاء التي تريد حظرها بحيث كل نطاق في سطر لوحده. بعد إدراجهم لن يتمكنوا من التفاعل مع هذا المثيل."
-muteAndBlock: "المكتومون والمحجوبون"
+muteAndBlock: "تم كتمها / تم حجبها"
 mutedUsers: "الحسابات المكتومة"
 blockedUsers: "الحسابات المحجوبة"
 noUsers: "ليس هناك مستخدمون"
@@ -233,8 +230,6 @@ resetAreYouSure: "هل تريد إعادة التعيين؟"
 saved: "حُفظ"
 messaging: "المحادثة"
 upload: "ارفع"
-keepOriginalUploading: "ابق الصورة الأصلية"
-keepOriginalUploadingDescription: "يحفظ الصور المرفوعة على حالتها الأصلية، وان عطّل ستولد نسخة مخصصة من الصورة."
 fromDrive: "من المخزن"
 fromUrl: "عبر رابط"
 uploadFromUrl: "ارفع عبر رابط"
@@ -281,7 +276,6 @@ emptyDrive: "قرص التخزين فارغ"
 emptyFolder: "هذا المجلد فارغ"
 unableToDelete: "لا يمكن حذفه"
 inputNewFileName: "ادخل الإسم الجديد للملف"
-inputNewDescription: "أدخل تعليقًا توضيحيًا"
 inputNewFolderName: "ادخل الإسم الجديد للمجلد"
 circularReferenceFolder: "المجلد المستهدف ينتمي للمجلد الذي تريد حذفه"
 hasChildFilesOrFolders: "الان الملف غير فارغ. لا يمكن حذفه"
@@ -321,6 +315,8 @@ disablingTimelinesInfo: "سيتمكن المديرون والمشرفون من
 registration: "إنشاء حساب"
 enableRegistration: "تفعيل إنشاء الحسابات الجديدة"
 invite: "دعوة"
+proxyRemoteFiles: "جلب الملفات البعيدة عبر وكيل"
+proxyRemoteFilesDescription: "إذا فُعّل هذا الإعداد ، ستُجلب الملفات البعيدة غير الموجودة في التخزين المحلي للخادم عبر وكيل وتُنشأ لها صور مصغرة. لن يأثر على تخزين الخادم."
 driveCapacityPerLocalAccount: "حصة التخزين لكل مستخدم محلي"
 driveCapacityPerRemoteAccount: "حصة التخزين لكل مستخدم بعيد"
 inMb: "بالميغابايت"
@@ -349,7 +345,6 @@ name: "الإسم"
 antennaSource: "مصدر الهوائي"
 antennaKeywords: "الكلمات المفتاحية للإستقبال"
 antennaExcludeKeywords: "الكلمات المفتاحية المستثناة"
-antennaKeywordsDescription: "افصل بينهم بمسافة لاستخدام معامل \"و\" أو بسطر لاستخدام معامل \"أو\""
 notifyAntenna: "نبهني بصول ملاحظات جديدة"
 withFileAntenna: "ملاحظات تحوي ملفات فقط"
 antennaUsersDescription: "اكتب اسم مستخدم لكل سطر"
@@ -415,6 +410,7 @@ next: "التالية"
 retype: "أعد الكتابة"
 noteOf: "ملاحظات {user}"
 inviteToGroup: "دعوة إلى فريق"
+maxNoteTextLength: "حد عدد المحارف لكل ملاحظة"
 quoteAttached: "اِقتُبسَ"
 quoteQuestion: "أتريد تضمينها كاقتباس"
 noMessagesYet: "ليس هناك رسائل بعد"
@@ -473,7 +469,6 @@ hideThisNote: "إخفاء هذه الملاحظة"
 showFeaturedNotesInTimeline: "أظهر الملاحظات الشائعة في الخيط الزمني"
 objectStorageBaseUrl: "الرابط الأساسي"
 objectStoragePrefix: "البادئة"
-objectStoragePrefixDesc: "ستُحفظ الملفات في مجلدات تحوي اسماءها هذه البادئة."
 objectStorageEndpoint: "نقطة النهاية"
 objectStorageRegion: "المنطقة"
 objectStorageUseSSL: "استخدم SSL"
@@ -490,7 +485,7 @@ none: "لا شيء"
 showInPage: "اعرض في الصفحة"
 popout: "منبثقة"
 volume: "مستوى الصوت"
-masterVolume: "حجم الصوت الرئيس"
+masterVolume: "القرص الرئيسي"
 details: "التفاصيل"
 chooseEmoji: "اختر إيموجي"
 unableToProcess: "يتعذر إكمال العملية"
@@ -521,7 +516,6 @@ divider: "فاصل"
 addItem: "إضافة عنصر"
 relays: "المُرَحلات"
 addRelay: "إضافة مُرحّل"
-inboxUrl: "رابط صندوق الوارد"
 addedRelays: "المرحلات المضافة"
 serviceworkerInfo: "يجب أن يفعل لإرسال الإشعارات."
 deletedNote: "ملاحظة محذوفة"
@@ -534,8 +528,6 @@ enablePlayer: "افتح مشغل الفيديو"
 disablePlayer: "أغلق مشغل الفيديو"
 themeEditor: "مصمم القوالب"
 description: "الوصف"
-describeFile: "أضف تعليقًا توضيحيًا"
-enterFileDescription: "أدخل تعليقًا توضيحيًا"
 author: "الكاتب"
 leaveConfirm: "لديك تغييرات غير محفوظة. أتريد المتابعة دون حفظها؟"
 manage: "إدارة "
@@ -567,9 +559,6 @@ smtpPass: "الكلمة السرية"
 emptyToDisableSmtpAuth: "اترك اسم المستخدم وكلمة المرور فارغين لتعطيل التحقق من SMTP"
 smtpSecureInfo: "عطل هذا الخيار عند استخدام STARTTLS"
 wordMute: "حظر الكلمات"
-regexpError: "خطأ في التعبير النمطي"
-instanceMute: "المثلاء المكتومون"
-userSaysSomething: "كتب {name} شيءً"
 makeActive: "تفعيل"
 display: "المظهر"
 copy: "نسخ"
@@ -596,16 +585,10 @@ reportAbuse: "أبلغ"
 reportAbuseOf: "أبلغ عن {name}"
 fillAbuseReportDescription: "أكتب بالتفصيل سبب البلاغ، إذا كنت تبلغ عن ملاحظة أرفق رابط لها."
 abuseReported: "أُرسل البلاغ، شكرًا لك"
-reporter: "المُبلّغ"
-reporteeOrigin: "أصل البلاغ"
-reporterOrigin: "أصل المُبلّغ"
-forwardReport: "وجّه البلاغ إلى المثيل البعيد"
-forwardReportIsAnonymous: "في المثيل البعيد سيظهر المبلّغ كحساب مجهول."
 send: "أرسل"
 abuseMarkAsResolved: "علّم البلاغ كمحلول"
 openInNewTab: "افتح في لسان جديد"
 defaultNavigationBehaviour: "سلوك الملاحة الافتراضي"
-editTheseSettingsMayBreakAccount: "تعديل هذه الإعدادات قد يسبب عطبًا لحسابك"
 instanceTicker: "معلومات المثيل الأصلي للملاحظات"
 waitingFor: "في انتظار {x}"
 random: "عشوائي"
@@ -636,15 +619,10 @@ no: "لا"
 driveFilesCount: "عدد الملفات في قرص التخزين"
 driveUsage: "المستغل من قرص التخزين"
 noCrawleDescription: "يطلب من محركات البحث ألّا يُفهرسوا ملفك الشخصي وملاحظات وصفحاتك وما شابه."
-alwaysMarkSensitive: "علّم افتراضيًا جميع ملاحظاتي كذات محتوى حساس"
-loadRawImages: "حمّل الصور الأصلية بدلًا من المصغرات"
 disableShowingAnimatedImages: "لا تشغّل الصور المتحركة"
-verificationEmailSent: "أُرسل بريد التحقق. أنقر على الرابط المضمن لإكمال التحقق."
 notSet: "لم يعيّن"
 emailVerified: "تُحقّق من بريدك الإلكتروني"
 noteFavoritesCount: "عدد الملاحظات المفضلة"
-pageLikesCount: "عدد الصفحات التي أعجبت بها"
-pageLikedCount: "عدد صفحاتك المُعجب بها"
 contact: "التواصل"
 useSystemFont: "استخدم الخط الافتراضية للنظام"
 clips: "مشابك"
@@ -652,11 +630,7 @@ experimentalFeatures: "ميّزات اختبارية"
 developer: "المطور"
 makeExplorable: "أظهر الحساب في صفحة \"استكشاف\""
 makeExplorableDescription: "بتعطيل هذا الخيار لن يظهر حسابك في صفحة \"استكشاف\""
-showGapBetweenNotesInTimeline: "أظهر فجوات بين المشاركات في الخيط الزمني"
-wide: "عريض"
-narrow: "رفيع"
 reloadToApplySetting: "سيُطبق هذا الإعداد بعد إعادة تحميل الصفحة، أتريد إعادة تحميلها الآن؟"
-needReloadToApply: "سيطبق هذا بعد إعادة التحميل."
 showTitlebar: "اعرض شريط العنوان"
 clearCache: "امسح التخزين المؤقت"
 onlineUsersCount: "{n} مستخدم متصل"
@@ -687,7 +661,6 @@ capacity: "السعة"
 inUse: "مستخدم"
 editCode: "حرر الشفرة"
 apply: "تطبيق"
-receiveAnnouncementFromInstance: "استلم إشعارات من هذا المثيل"
 emailNotification: "إشعارات البريد الكتروني"
 inChannelSearch: "ابحث عن قناة"
 useReactionPickerForContextMenu: "افتح منتقي التفاعلات عند النقر بالزر الأيمن"
@@ -701,7 +674,6 @@ unlikeConfirm: "أتريد إلغاء إعجابك؟"
 fullView: "ملء الشاشة"
 quitFullView: "اخرج من وضع ملء للشاشة"
 addDescription: "أضف وصفًا"
-userPagePinTip: "لعرض ملاحظة هنا اختر \"دبسها على الصفحة الشخصية\" من قائمة تلك الملاحظة."
 notSpecifiedMentionWarning: "في الملاحظة ذكر لمستخدمين لن يستلموها."
 info: "عن"
 userInfo: "معلومات المستخدم"
@@ -776,31 +748,11 @@ makeReactionsPublicDescription: "هذا سيجعل قائمة تفاعلاتك
 classic: "تقليدي"
 muteThread: "اكتم النقاش"
 unmuteThread: "ارفع الكتم عن النقاش"
-ffVisibility: "مرئية المتابِعين/المتابَعين"
-ffVisibilityDescription: "يسمح لك بتحديد من يمكنهم رؤية متابِعيك ومتابَعيك."
 deleteAccountConfirm: "سيحذف حسابك نهائيًا، أتريد المتابعة؟"
 incorrectPassword: "كلمة السر خاطئة."
-voteConfirm: "متيقِّن من تصويتك لـ {choice}؟"
 hide: "إخفاء"
 leaveGroup: "مغادرة الفريق"
-leaveGroupConfirm: "متيقن من مغادرة \"{name}\"؟"
 welcomeBackWithName: "مرحبًا بك مجددًا {name}"
-clickToFinishEmailVerification: "انقر [{ok}] لاستيثاق بريدك الإلكتروني."
-overridedDeviceKind: "نوع الجهاز"
-smartphone: "هاتف ذكي"
-tablet: "جهاز لوحي"
-auto: "تلقائي"
-themeColor: "لون السمة"
-size: "الحجم"
-numberOfColumn: "عدد الأعمدة"
-searchByGoogle: "غوغل"
-mutePeriod: "مدة الكتم"
-indefinitely: "أبدًا"
-tenMinutes: "10 دقائق"
-oneHour: "ساعة"
-oneDay: "يوم"
-oneWeek: "أسبوع"
-failedToFetchAccountInformation: "تعذر جلب معلومات الحساب"
 _emailUnavailable:
   used: "هذا البريد الإلكتروني مستخدم"
   format: "صيغة البريد الإلكتروني غير صالحة"
@@ -823,7 +775,6 @@ _accountDelete:
   inProgress: "عملية الحذف جارية"
 _ad:
   back: "رجوع"
-  reduceFrequencyOfThisAd: "قلل عرض هذا الإعلان"
 _forgotPassword:
   enterEmail: "أدخل البريد الإلكتروني المرتبط بحسابك لكي يرسل إليك رابط لإعادة تعيين كلمة المرور."
   ifNoEmail: "إذا لم تربط حسابك ببريد إلكتروني سيتوجب عليك التواصل مع مدير الموقع."
@@ -850,7 +801,7 @@ _registry:
   createKey: "أنشئ مفتاحًا"
 _aboutMisskey:
   about: "ميسكي هو برمجية مفتوحة المصدر يطورها syuilo منذ 2014."
-  contributors: "المساهمون الرئيسيون"
+  contributors: "المساهم الرئيسي"
   allContributors: "كل المساهمين"
   source: "الشفرة المصدرية"
   translation: "ترجم ميسكي"
@@ -872,14 +823,10 @@ _mfm:
   urlDescription: "يمكن عرض الروابط"
   link: "رابط"
   bold: "عريض"
-  boldDescription: "جعل الحروف أثخن لإبرازها."
   small: "صغير"
-  smallDescription: "يعرض المحتوى صغيرًا ورفيعًا."
   center: "وسط"
-  centerDescription: "يمركز المحتوى في الوَسَط."
   quote: "اقتبس"
   emoji: "إيموجي مخصص"
-  emojiDescription: "إحاطة اسم الإيموجي بنقطتي تفسير سيستبدله بصورة الإيموجي."
   search: "البحث"
   flip: "اقلب"
   flipDescription: "يقلب المحتوى عموديًا أو أفقيًا"
@@ -891,28 +838,15 @@ _mfm:
   jumpDescription: "يمنح للمحتوى حركة قفز."
   bounce: "تأثير (ارتداد)"
   bounceDescription: "يمنح للمحتوى حركة ارتدادية"
-  shake: "تأثير (اهتزاز)"
-  shakeDescription: "يمنح المحتوى حركة اهتزازية."
-  spin: "تأثير (دوران)"
-  spinDescription: "يمنح المحتوى حركة دورانية."
   x2: "كبير"
-  x2Description: "يُكبر المحتوى"
   x3: "كبير جداً"
-  x3Description: "يُضخم المحتوى"
-  x4: "هائل"
-  x4Description: "يُضخم المحتوى أكثر مما سبق."
   blur: "طمس"
-  blurDescription: "يطمس المحتوى، لكن بالتمرير فوقه سيظهر بوضوح."
   font: "الخط"
-  fontDescription: "الخط المستخدم لعرض المحتوى."
   rainbow: "قوس قزح"
   rainbowDescription: "اجعل المحتوى يظهر بألوان الطيف"
   rotate: "تدوير"
-  rotateDescription: "يُدير المحتوى بزاوية معيّنة."
 _instanceTicker:
-  none: "لا تظهره بتاتًا"
   remote: "أظهر للمستخدمين البِعاد"
-  always: "أظهره دائمًا"
 _serverDisconnectedBehavior:
   reload: "إعادة تحميل تلقائية"
   dialog: "أظهر مربع حوار التحذيرات"
@@ -932,18 +866,12 @@ _menuDisplay:
   hide: "إخفاء"
 _wordMute:
   muteWords: "الكلمات المحظورة"
-  muteWordsDescription: "افصل بينهم بمسافة لاستخدام معامل \"و\" أو بسطر لاستخدام معامل \"أو\"."
   muteWordsDescription2: "احصر الكلمات المفتاحية بين بين شرطتين مائلتين لاستخدامها كتعابير نمطية"
   softDescription: "اخف الملاحظات التي تستوف الشروط من الخيط الزمني."
   hardDescription: "اخف الملاحظات التي تستوف الشروط من الخيط الزمني.بالإضافة إلى أن هذه الملاحظات ستبقى مخفية حتى وإن تغيرت الشروط."
   soft: "لينة"
   hard: "قاسية"
   mutedNotes: "الملاحظات المكتومة"
-_instanceMute:
-  instanceMuteDescription: "هذه سيحجب كل ملاحظات الخوادم المحجوبة ومشاركاتها والردود على تلك الملاحظات حتى وإن كانت من خادم غير محجوب."
-  instanceMuteDescription2: "مدخلة لكل سطر"
-  title: "يخفي ملاحظات الخوادم المسرودة."
-  heading: "قائمة الخوادم المحجوبة"
 _theme:
   explore: "استكشف قوالب المظهر"
   install: "تنصيب قالب"
@@ -1160,12 +1088,9 @@ _postForm:
   quotePlaceholder: "اقتبس هذه الملاحظة…"
   channelPlaceholder: "انشر في قناة..."
   _placeholders:
-    a: "ما الذي تنوي فعله؟"
-    b: "ماذا يحدث حولك ؟"
     c: "ما الذي تفكر فيه؟"
     d: "ما الذي تريد قوله؟"
     e: "أكتب..."
-    f: "بانتظارك لتكتب..."
 _profile:
   name: "الإسم"
   username: "اسم المستخدم"
@@ -1184,25 +1109,21 @@ _exportOrImport:
   muteList: "المستخدمون المكتومون"
   blockingList: "المستخدمون المحجوبون"
   userLists: "القوائم"
-  excludeMutingUsers: "استثن الحسابات المكتومة"
-  excludeInactiveUsers: "استثن المستخدمين الخاملين"
 _charts:
-  federation: "الفديرالية"
-  apRequest: "الطلبات"
-  usersIncDec: "تباين عدد المستخدمين"
+  usersIncDec: "اختلاف عدد المستخدمين"
   usersTotal: "مجموع عدد المستخدمين والمستخدمات"
   activeUsers: "المستخدمون النشطون"
-  notesIncDec: "تباين عدد الملاحظات"
-  localNotesIncDec: "تباين عدد الملاحظات المحلية"
-  remoteNotesIncDec: "تباين عدد الملاحظات البعيدة"
+  notesIncDec: "اختلاف عدد الملاحظات"
+  localNotesIncDec: "اختلاف عدد الملاحظات المحلية"
+  remoteNotesIncDec: "اختلاف عدد الملاحظات البعيدة"
   notesTotal: "إجمالي الملاحظات"
-  filesIncDec: "تباين عدد الملفات"
+  filesIncDec: "اختلاف عدد الملفات"
   filesTotal: "العدد الإجمالي للملفات"
 _instanceCharts:
   requests: "الطلبات"
-  users: "تباين عدد المستخدمين"
-  notes: "تباين عدد الملاحظات"
-  files: "تباين عدد الملفات"
+  users: "اختلاف عدد المستخدمين"
+  notes: "اختلاف عدد الملاحظات"
+  files: "اختلاف عدد الملفات"
 _timelines:
   home: "الرئيسي"
   local: "المحلي"
@@ -1216,29 +1137,20 @@ _pages:
   updated: "نجح تعديل الصفحة"
   deleted: "نجح حذف الصفحة"
   pageSetting: "إعدادات الصفحة"
-  nameAlreadyExists: "رابط الصفحة موجود مسبقًا"
-  invalidNameTitle: "رابط الصفحة ليس صالحًا"
-  invalidNameText: "تأكد أن عنوان الصفحة ليس فارغًا"
-  editThisPage: "عدّل هذه الصفحة"
   viewSource: "اظهر المصدر"
   viewPage: "اعرض صفحاتك"
   like: "أعجبني"
   unlike: "أزل الإعجاب"
   my: "صفحاتي"
-  liked: "الصفحات المُعجب بها"
   featured: "الأكثر شعبية"
   contents: "المحتوى"
-  variables: "متغيّرات"
   title: "العنوان"
-  url: "رابط الصفحة"
   summary: "ملخص الصفحة"
   alignCenter: "توسيط العناصر"
   hideTitleWhenPinned: "اخف عنوان الصفحة عند تدبيسها في ملف الشخصي"
   font: "الخط"
   fontSerif: "Serif"
   fontSansSerif: "Sans Serif"
-  eyeCatchingImageSet: "عيّن صورة مصغّرة"
-  eyeCatchingImageRemove: "احذف صورة مصغّرة"
   chooseBlock: "إضافة كتلة"
   selectType: "اختر النوع"
   enterVariableName: "أدخل اسم المتغيّر"
@@ -1487,7 +1399,6 @@ _notification:
   youReceivedFollowRequest: "تلقيتَ طلب متابعة"
   yourFollowRequestAccepted: "قُبل طلب المتابعة"
   youWereInvitedToGroup: "دُعيت إلى فريقٍ"
-  pollEnded: "ظهرت نتائج الاستطلاع"
   _types:
     all: "الكل"
     follow: "متابِعون جدد"
@@ -1496,10 +1407,8 @@ _notification:
     renote: "أعد النشر"
     quote: "الاقتباسات"
     reaction: "التفاعلات"
-    pollVote: "مصوِت شارك في الاستطلاع"
     receiveFollowRequest: "طلبات المتابعة المتلقاة"
     followRequestAccepted: "طلبات المتابعة المقبولة"
-    groupInvited: "دعوات الفريق"
     app: "إشعارات التطبيقات المرتبطة"
 _deck:
   alwaysShowMainColumn: "أظهر العمود الرئيسي دائمًا"

locales/ca-ES.yml

@@ -1,26 +0,0 @@
----
-_lang_: "Català"
-headlineMisskey: "Una xarxa connectada per notes"
-search: "Cercar"
-notifications: "Notificacions"
-username: "Nom d'usuari"
-password: "Contrasenya"
-forgotPassword: "Contrasenya oblidada"
-fetchingAsApObject: "Cercant en el Fediverse..."
-ok: "OK"
-gotIt: "Ho he entès!"
-cancel: "Cancel·lar"
-smtpUser: "Nom d'usuari"
-smtpPass: "Contrasenya"
-searchByGoogle: "Cercar"
-_mfm:
-  search: "Cercar"
-_sfx:
-  notification: "Notificacions"
-_widgets:
-  notifications: "Notificacions"
-_profile:
-  username: "Nom d'usuari"
-_deck:
-  _columns:
-    notifications: "Notificacions"

locales/cs-CZ.yml

@@ -449,7 +449,6 @@ clearCache: "Vyprázdnit mezipaměť"
 info: "Informace"
 user: "Uživatelé"
 administration: "Administrace"
-searchByGoogle: "Vyhledávání"
 _email:
   _follow:
     title: "Máte nového následovníka"

locales/de-DE.yml

@@ -14,16 +14,16 @@ gotIt: "Verstanden!"
 cancel: "Abbrechen"
 enterUsername: "Benutzername eingeben"
 renotedBy: "Renote von {user}"
-noNotes: "Keine Notizen gefunden"
-noNotifications: "Keine Benachrichtigungen gefunden"
+noNotes: "Keine Notizen"
+noNotifications: "Keine Benachrichtigungen"
 instance: "Instanz"
 settings: "Einstellungen"
 basicSettings: "Allgemeine Einstellungen"
 otherSettings: "Weitere Einstellungen"
-openInWindow: "In einem Fenster öffnen"
+openInWindow: "In Fenster öffnen"
 profile: "Profil"
 timeline: "Chronik"
-noAccountDescription: "Dieser Nutzer hat seine Profilbeschreibung noch nicht ausgefüllt"
+noAccountDescription: "Dieser Nutzer hat seine Profilbeschreibung noch nicht ausgefüllt."
 login: "Anmelden"
 loggingIn: "Du wirst angemeldet …"
 logout: "Abmelden"
@@ -38,8 +38,8 @@ unfavorite: "Aus Favoriten entfernen"
 favorited: "Zu Favoriten hinzugefügt."
 alreadyFavorited: "Bereits zu den Favoriten hinzugefügt."
 cantFavorite: "Hinzufügen zu Favoriten fehlgeschlagen."
-pin: "An dein Profil anheften"
-unpin: "Von deinem Profil lösen"
+pin: "Anheften"
+unpin: "Lösen"
 copyContent: "Inhalt kopieren"
 copyLink: "Link kopieren"
 delete: "Löschen"
@@ -47,7 +47,7 @@ deleteAndEdit: "Löschen und Bearbeiten"
 deleteAndEditConfirm: "Möchtest du diese Notiz wirklich löschen und bearbeiten? Alle Reaktionen, Renotes und Antworten dieser Notiz werden verloren gehen."
 addToList: "Zu Liste hinzufügen"
 sendMessage: "Nachricht senden"
-copyUsername: "Benutzernamen kopieren"
+copyUsername: "Benutzername kopieren"
 searchUser: "Nach einem Benutzer suchen"
 reply: "Antworten"
 loadMore: "Mehr laden"
@@ -63,12 +63,12 @@ import: "Import"
 export: "Export"
 files: "Dateien"
 download: "Herunterladen"
-driveFileDeleteConfirm: "Möchtest du die Datei „{name}“ wirklich löschen? Notizen mit dieser Datei werden ebenso verschwinden."
+driveFileDeleteConfirm: "Möchtest du die Datei „{name}“ wirklich löschen? Die zugehörige Notiz wird ebenso verschwinden."
 unfollowConfirm: "Möchtest du {name} nicht mehr folgen?"
 exportRequested: "Du hast einen Export angefragt. Dies kann etwas Zeit in Anspruch nehmen. Sobald der Export abgeschlossen ist, wird er deiner Drive hinzugefügt."
 importRequested: "Du hast einen Import angefragt. Dies kann etwas Zeit in Anspruch nehmen."
 lists: "Listen"
-noLists: "Keine Listen gefunden"
+noLists: "Keine Listen"
 note: "Notiz"
 notes: "Notizen"
 following: "Folgt"
@@ -79,16 +79,16 @@ manageLists: "Listen verwalten"
 error: "Fehler"
 somethingHappened: "Ein Fehler ist aufgetreten"
 retry: "Wiederholen"
-pageLoadError: "Die Seite konnte nicht geladen werden."
+pageLoadError: "Laden der Seite fehlgeschlagen."
 pageLoadErrorDescription: "Dieser Fehler wird meist durch Netzwerkfehler oder den Browser-Cache verursacht. Bitte leere den Cache oder versuche es nach einiger Zeit erneut."
 serverIsDead: "Dieser Server antwortet nicht. Bitte warte einen Moment und versuche es dann erneut."
 youShouldUpgradeClient: "Bitte aktualisiere diese Seite, um eine neuere Version deines Clients zu verwenden."
-enterListName: "Listennamen eingeben"
+enterListName: "Name der Liste eingeben"
 privacy: "Privatsphäre"
 makeFollowManuallyApprove: "Follow-Anfragen benötigen Bestätigung"
 defaultNoteVisibility: "Standardsichtbarkeit"
 follow: "Folgen"
-followRequest: "Follow-Anfrage senden"
+followRequest: "Follow-Anfrage"
 followRequests: "Follow-Anfragen"
 unfollow: "Nicht mehr folgen"
 followRequestPending: "Follow-Anfrage ausstehend"
@@ -107,11 +107,11 @@ sensitive: "NSFW"
 add: "Hinzufügen"
 reaction: "Reaktionen"
 reactionSetting: "In der Reaktionsauswahl anzuzeigende Reaktionen"
-reactionSettingDescription2: "Ziehe um Anzuordnen, klicke um zu löschen, drücke „+“ um hinzuzufügen"
+reactionSettingDescription2: "Ziehe zum Anordnen, klicke zum Löschen, drücke + zum Hinzufügen"
 rememberNoteVisibility: "Notizsichtbarkeit merken"
 attachCancel: "Anhang entfernen"
 markAsSensitive: "Als NSFW markieren"
-unmarkAsSensitive: "Als nicht NSFW markieren"
+unmarkAsSensitive: "NSFW-Markierung entfernen"
 enterFileName: "Dateinamen eingeben"
 mute: "Stummschalten"
 unmute: "Stummschaltung aufheben"
@@ -129,20 +129,18 @@ selectWidget: "Widget auswählen"
 editWidgets: "Widgets bearbeiten"
 editWidgetsExit: "Fertig"
 customEmojis: "Benutzerdefinierte Emojis"
-emoji: "Emoji"
+emoji: "Emojis"
 emojis: "Emojis"
 emojiName: "Emoji-Name"
 emojiUrl: "Emoji-URL"
 addEmoji: "Emoji hinzufügen"
 settingGuide: "Empfohlene Einstellung"
 cacheRemoteFiles: "Dateien von fremden Instanzen im Cache speichern"
-cacheRemoteFilesDescription: "Ist diese Einstellung deaktiviert, so werden Dateien fremder Instanzen direkt von dort geladen. Hierdurch wird Speicherplatz auf diesem Server gespart, aber durch fehlende Generierung von Vorschaubildern mehr Bandbreite verwendet."
+cacheRemoteFilesDescription: "Ist diese Einstellung deaktiviert, so werden Dateien fremder Instanzen direkt von dort geladen. Hierdurch wird Speicherplatz auf dem Server gespart, aber durch fehlende Generierung von Vorschaubildern mehr Bandbreite verwendet."
 flagAsBot: "Als Bot markieren"
 flagAsBotDescription: "Aktiviere diese Option, falls dieses Benutzerkonto durch ein Programm gesteuert wird. Falls aktiviert, agiert es als Flag für andere Entwickler zur Verhinderung von endlosen Kettenreaktionen mit anderen Bots und lässt Misskeys interne Systeme dieses Benutzerkonto als Bot behandeln."
 flagAsCat: "Als Katze markieren"
 flagAsCatDescription: "Aktiviere diese Option, um dieses Benutzerkonto als Katze zu markieren."
-flagShowTimelineReplies: "Antworten in der Chronik anzeigen"
-flagShowTimelineRepliesDescription: "Ist diese Option aktiviert, so werden Antworten von Benutzern auf die Notizen anderer Benutzer in der Chronik angezeigt."
 autoAcceptFollowed: "Follow-Anfragen von Benutzern, denen du folgst, automatisch akzeptieren"
 addAccount: "Benutzerkonto hinzufügen"
 loginFailed: "Anmeldung fehlgeschlagen"
@@ -151,12 +149,12 @@ general: "Allgemein"
 wallpaper: "Hintergrund"
 setWallpaper: "Hintergrund festlegen"
 removeWallpaper: "Hintergrund entfernen"
-searchWith: "Suchen: {q}"
+searchWith: "Suche: {q}"
 youHaveNoLists: "Du hast keine Listen"
 followConfirm: "Möchtest du {name} wirklich folgen?"
 proxyAccount: "Proxy-Benutzerkonto"
 proxyAccountDescription: "Ein Proxy-Benutzerkonto ist ein Benutzerkonto, das sich für Nutzer unter bestimmten Konditionen wie ein Follower aus einer fremden Instanz verhält. Zum Beispiel wird die Aktivität eines Nutzers aus einer fremden Instanz nicht an diese Instanz übermittelt, falls es keinen Benutzer dieser Instanz gibt, der diesem Nutzer aus fremder Instanz folgt. In diesem Fall folgt stattdessen das Proxy-Benutzerkonto."
-host: "Hostname"
+host: "Host"
 selectUser: "Benutzer auswählen"
 recipient: "Empfänger"
 annotation: "Anmerkung"
@@ -194,17 +192,17 @@ blockedInstancesDescription: "Gib die Hostnamen der Instanzen, welche blockiert
 muteAndBlock: "Stummschaltungen und Blockierungen"
 mutedUsers: "Stummgeschaltete Benutzer"
 blockedUsers: "Blockierte Benutzer"
-noUsers: "Keine Benutzer gefunden"
+noUsers: "Keine Benutzer"
 editProfile: "Profil bearbeiten"
 noteDeleteConfirm: "Möchtest du diese Notiz wirklich löschen?"
-pinLimitExceeded: "Du kannst nicht noch mehr Notizen anheften."
-intro: "Misskey ist installiert! Lass uns nun ein Administratorkonto einrichten."
+pinLimitExceeded: "Es können nicht noch mehr Notizen angeheftet werden"
+intro: "Misskey Installation abgeschlossen! Lass uns nun ein Administratorkonto erstellen."
 done: "Fertig"
 processing: "In Bearbeitung …"
 preview: "Vorschau"
 default: "Standard"
-noCustomEmojis: "Keine benutzerdefinierten Emojis gefunden"
-noJobs: "Keine Jobs vorhanden"
+noCustomEmojis: "Keine benutzerdefinierten Emojis vorhanden"
+noJobs: "Es gibt keine Jobs"
 federating: "Wird föderiert"
 blocked: "Blockiert"
 suspended: "Gesperrt"
@@ -217,10 +215,10 @@ instanceFollowers: "Follower der Instanz"
 instanceUsers: "Benutzer der Instanz"
 changePassword: "Passwort ändern"
 security: "Sicherheit"
-retypedNotMatch: "Die Eingaben stimmen nicht überein."
+retypedNotMatch: "Beide Eingaben stimmen nicht überein."
 currentPassword: "Aktuelles Passwort"
 newPassword: "Neues Passwort"
-newPasswordRetype: "Neues Passwort bestätigen"
+newPasswordRetype: "Neues Passwort (wiederholen)"
 attachFile: "Datei anhängen"
 more: "Mehr!"
 featured: "Beliebt"
@@ -234,11 +232,9 @@ removed: "Erfolgreich gelöscht"
 removeAreYouSure: "Möchtest du „{x}“ wirklich entfernen?"
 deleteAreYouSure: "Möchtest du „{x}“ wirklich löschen?"
 resetAreYouSure: "Wirklich zurücksetzen?"
-saved: "Erfolgreich gespeichert"
+saved: "Gespeichert"
 messaging: "Chat"
 upload: "Hochladen"
-keepOriginalUploading: "Originalbild speichern"
-keepOriginalUploadingDescription: "Speichert das Originalbild so, wie es ist. Ist dies deaktiviert, wird eine Version zum Anzeigen im Internet generiert."
 fromDrive: "Aus Drive"
 fromUrl: "Von einer URL"
 uploadFromUrl: "Von einer URL hochladen"
@@ -295,7 +291,7 @@ avatar: "Profilbild"
 banner: "Banner"
 nsfw: "NSFW"
 whenServerDisconnected: "Bei Verbindungsverlust zum Server"
-disconnectedFromServer: "Die Verbindung zum Server wurde getrennt"
+disconnectedFromServer: "Verbindung zum Server wurde getrennt"
 reload: "Aktualisieren"
 doNothing: "Ignorieren"
 reloadConfirm: "Seite neu laden?"
@@ -307,7 +303,7 @@ normal: "Normal"
 instanceName: "Name der Instanz"
 instanceDescription: "Beschreibung der Instanz"
 maintainerName: "Betreiber"
-maintainerEmail: "Betreiber-Email"
+maintainerEmail: "Betreiber-E-Mail"
 tosUrl: "URL der Nutzungsbedingungen"
 thisYear: "Jahr"
 thisMonth: "Monat"
@@ -325,18 +321,20 @@ disablingTimelinesInfo: "Administratoren und Moderatoren haben immer Zugriff auf
 registration: "Registrieren"
 enableRegistration: "Registration neuer Benutzer erlauben"
 invite: "Einladen"
-driveCapacityPerLocalAccount: "Drive-Kapazität pro lokalem Benutzerkonto"
+proxyRemoteFiles: "Dateien fremder Instanzen durch Proxy leiten"
+proxyRemoteFilesDescription: "Wenn diese Einstellung aktiviert ist, dann werden Dateien von fremdem Instanzen, welche entweder nicht lokal gespeichert sind oder durch Überschreiten des Speicherlimits gelöscht wurden, durch einen Proxy geleitet. Hierbei wird auch ein Vorschaubild generiert. \n Dies hat keinen Effekt auf den Speicherplatz des Servers."
+driveCapacityPerLocalAccount: "Drive-Kapazität pro lokales Benutzerkonto"
 driveCapacityPerRemoteAccount: "Drive-Kapazität pro Benutzer fremder Instanzen"
 inMb: "In Megabytes"
 iconUrl: "Icon-URL (favicon etc)"
 bannerUrl: "Banner-URL"
 backgroundImageUrl: "Hintergrundbild-URL"
-basicInfo: "Grundlegende Informationen"
+basicInfo: "Basisdaten"
 pinnedUsers: "Angeheftete Benutzer"
 pinnedUsersDescription: "Gib durch Leerzeichen getrennte Benutzer an, die an die \"Erkunden\"-Seite angeheftet werden sollen."
 pinnedPages: "Angeheftete Seiten"
-pinnedPagesDescription: "Gib durch Leerzeilen getrennte Pfäde zu Seiten an, die an die Startseite dieser Instanz angeheftet werden sollen.\n"
-pinnedClipId: "ID des anzuheftenden Clips"
+pinnedPagesDescription: "Gib durch Leerzeilen getrennte Pfäde zu Seiten an, die du an die Startseite dieser Instanz anheften möchtest.\n"
+pinnedClipId: "ID des angehefteten Clips"
 pinnedNotes: "Angeheftete Notizen"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "hCaptcha aktivieren"
@@ -346,14 +344,14 @@ recaptcha: "reCAPTCHA"
 enableRecaptcha: "reCAPTCHA aktivieren"
 recaptchaSiteKey: "Site key"
 recaptchaSecretKey: "Secret key"
-avoidMultiCaptchaConfirm: "Das Verwenden von mehreren Captcha-Systemen kann zu Störungen führen. Sollen die anderen Systeme deaktiviert werden? Durch Abbrechen können mehrere Systeme aktiviert bleiben."
+avoidMultiCaptchaConfirm: "Das Verwenden von mehreren Captcha-Systemen kann zu Störungen führen. Möchtest du die anderen Systeme deaktivieren? Du kannst mehrere Systeme aktiviert lassen, in dem du auf Abbrechen drückst."
 antennas: "Antennen"
 manageAntennas: "Antennen verwalten"
 name: "Name"
 antennaSource: "Antennenquelle"
 antennaKeywords: "Zu beobachtende Schlüsselwörter"
 antennaExcludeKeywords: "Zu ignorierende Schlüsselwörter"
-antennaKeywordsDescription: "Zum Nutzen einer \"UND\"-Verknüpfung Einträge mit Leerzeichen trennen, zum Nutzen einer \"ODER\"-Verknüpfung Einträge mit einem Zeilenumbruch trennen"
+antennaKeywordsDescription: "Mit Leerzeichen für eine \"UND\"-Verknüpfung trennen, durch Zeilenumbrüche für eine \"ODER\"-Verknüpfung trennen"
 notifyAntenna: "Über neue Notizen benachrichtigen"
 withFileAntenna: "Nur Notizen mit Dateien"
 enableServiceworker: "ServiceWorker aktivieren"
@@ -374,14 +372,14 @@ recentlyDiscoveredUsers: "Vor kurzem gefundene Benutzer"
 exploreUsersCount: "Es gibt {count} Benutzer"
 exploreFediverse: "Das Fediverse erkunden"
 popularTags: "Beliebte Schlagwörter"
-userList: "Liste"
+userList: "Listen"
 about: "Über"
 aboutMisskey: "Über Misskey"
 administrator: "Administrator"
 token: "Token"
 twoStepAuthentication: "Zwei-Faktor-Authentifizierung"
 moderator: "Moderator"
-nUsersMentioned: "Von {n} Benutzern erwähnt"
+nUsersMentioned: "{n} Benutzer reden darüber"
 securityKey: "Sicherheitsschlüssel"
 securityKeyName: "Schlüsselname"
 registerSecurityKey: "Sicherheitsschlüssel registrieren"
@@ -389,7 +387,7 @@ lastUsed: "Zuletzt benutzt"
 unregister: "Deaktivieren"
 passwordLessLogin: "Passwortloses Anmelden einrichten"
 resetPassword: "Passwort zurücksetzen"
-newPasswordIs: "Das neue Passwort ist „{password}“"
+newPasswordIs: "Das neue Passwort ist \"{password}\""
 reduceUiAnimation: "Animationen der Benutzeroberfläche reduzieren"
 share: "Teilen"
 notFound: "Nicht gefunden"
@@ -405,7 +403,7 @@ close: "Schließen"
 group: "Gruppe"
 groups: "Gruppen"
 createGroup: "Gruppe erstellen"
-ownedGroups: "Meine Gruppen"
+ownedGroups: "Eigene Gruppen"
 joinedGroups: "Beigetretene Gruppen"
 invites: "Einladungen"
 groupName: "Gruppenname"
@@ -413,29 +411,30 @@ members: "Mitglieder"
 transfer: "Übertragen"
 messagingWithUser: "Privatchat"
 messagingWithGroup: "Gruppenchat"
-title: "Titel"
+title: "Betreff"
 text: "Text"
 enable: "Aktivieren"
 next: "Weiter"
 retype: "Erneut eingeben"
 noteOf: "Notiz von {user}"
 inviteToGroup: "Zu Gruppe einladen"
-quoteAttached: "Zitat"
-quoteQuestion: "Als Zitat anhängen?"
-noMessagesYet: "Noch keine Nachrichten vorhanden"
+maxNoteTextLength: "Maximale Länge von Notizen"
+quoteAttached: "Zitiert"
+quoteQuestion: "Als Zitat anfügen?"
+noMessagesYet: "Noch keine Nachrichten"
 newMessageExists: "Du hast eine neue Nachricht"
 onlyOneFileCanBeAttached: "Es kann pro Nachricht nur eine Datei angehängt werden"
-signinRequired: "Bitte melde dich an"
+signinRequired: "Anmeldung erforderlich"
 invitations: "Einladungen"
 invitationCode: "Einladungscode"
-checking: "Wird überprüft …"
+checking: "Wird überprüft..."
 available: "Verfügbar"
 unavailable: "Unverfügbar"
-usernameInvalidFormat: "Du kannst Klein- und Großbuchstaben, Zahlen sowie Unterstriche verwenden"
+usernameInvalidFormat: "Klein- und Großbuchstaben, Zahlen sowie Unterstriche sind verwendbar."
 tooShort: "Zu kurz"
 tooLong: "Zu lang"
 weakPassword: "Schwaches Passwort"
-normalPassword: "Durchschnittliches Passwort"
+normalPassword: "Normales Passwort"
 strongPassword: "Starkes Passwort"
 passwordMatched: "Stimmt überein"
 passwordNotMatched: "Stimmt nicht überein"
@@ -451,18 +450,18 @@ useOsNativeEmojis: "Eingebaute Emojis des Betriebssystems benutzen"
 disableDrawer: "Keine ausfahrbaren Menüs verwenden"
 youHaveNoGroups: "Keine Gruppen vorhanden"
 joinOrCreateGroup: "Lass dich zu einer Gruppe einladen oder erstelle deine eigene."
-noHistory: "Kein Verlauf gefunden"
+noHistory: "Kein Verlauf"
 signinHistory: "Anmeldungsverlauf"
 disableAnimatedMfm: "MFM, die Animationen enthalten, deaktivieren"
-doing: "In Bearbeitung …"
+doing: "In Bearbeitung..."
 category: "Kategorie"
 tags: "Schlagwörter"
-docSource: "Quellcode dieses Dokuments"
+docSource: "Quelle dieses Dokuments"
 createAccount: "Benutzerkonto erstellen"
 existingAccount: "Bestehendes Benutzerkonto"
 regenerate: "Regenerieren"
 fontSize: "Schriftgröße"
-noFollowRequests: "Keine ausstehenden Follow-Anfragen vorhanden"
+noFollowRequests: "Du hast keine ausstehende Follow-Anfragen"
 openImageInNewTab: "Bilder in neuem Tab öffnen"
 dashboard: "Dashboard"
 local: "Lokal"
@@ -473,25 +472,25 @@ dayOverDayChanges: "Veränderung zu Gestern"
 appearance: "Aussehen"
 clientSettings: "Client-Einstellungen"
 accountSettings: "Benutzerkonto-Einstellungen"
-promotion: "Werbung"
-promote: "Werbung schalten"
+promotion: "Hervorgehoben"
+promote: "Hervorheben"
 numberOfDays: "Anzahl der Tage"
 hideThisNote: "Diese Notiz verstecken"
-showFeaturedNotesInTimeline: "Beliebte Notizen in der Chronik anzeigen"
-objectStorage: "Object Storage"
-useObjectStorage: "Object Storage verwenden"
+showFeaturedNotesInTimeline: "Beliebte Notizen in Chronik anzeigen"
+objectStorage: "Objektspeicher"
+useObjectStorage: "Objektspeicher verwenden"
 objectStorageBaseUrl: "Basis-URL"
-objectStorageBaseUrlDesc: "Die als Referenz verwendete URL. Verwendest du einen CDN oder Proxy, gib dessen URL an. Für S3 verwende 'https://<bucket>.s3.amazonaws.com'. Für GCS o.ä. verwende 'https://storage.googleapis.com/<bucket>'."
+objectStorageBaseUrlDesc: "Als Referenz verwendete URL. Verwendest du einen CDN oder Proxy, gib dessen URL an. S3: 'https://<bucket>.s3.amazonaws.com', GCS: 'https://storage.googleapis.com/<bucket>' etc."
 objectStorageBucket: "Bucket"
-objectStorageBucketDesc: "Bitte gib den Namen des Buckets an, der bei deinem Anbieter verwendet wird."
+objectStorageBucketDesc: "Bitte gib den Bucket-Namen an, der bei deinem Anbieter verwendet wird."
 objectStoragePrefix: "Prefix"
 objectStoragePrefixDesc: "Dateien werden in Ordnern unter diesem Prefix gespeichert."
 objectStorageEndpoint: "Endpoint"
-objectStorageEndpointDesc: "Im Falle von S3 leerlassen, für andere Anbieter den relevanten Endpoint im Format „<host>“ oder „<host>:<port>“ angeben."
+objectStorageEndpointDesc: "Im Falle von S3 leerlassen, für andere Anbieter den relevanten Endpoint im Format \"<host>\" oder \"<host>:<port>\" angeben."
 objectStorageRegion: "Region"
-objectStorageRegionDesc: "Gib eine Region wie z.B. „xx-east-1“ an. Falls dein Anbieter nicht zwischen Regionen unterscheidet, lass dieses Feld leer oder gib „us-east-1“ an."
+objectStorageRegionDesc: "Gib eine Region wie z.B. \"xx-east-1\" an. Falls dein Anbieter nicht zwischen Regionen unterscheidet, lass dieses Feld leer oder gib \"us-east-1\" an."
 objectStorageUseSSL: "SSL verwenden"
-objectStorageUseSSLDesc: "Deaktiviere dies, falls du für API-Verbindungen kein HTTPS verwenden wirst"
+objectStorageUseSSLDesc: "Deaktiviere dies, falls du für die API-Verbindungen kein HTTPS verwenden wirst"
 objectStorageUseProxy: "Über Proxy verbinden"
 objectStorageUseProxyDesc: "Deaktiviere dies, falls du keinen Proxy für den Objektspeicher verwenden wirst"
 objectStorageSetPublicRead: "Bei Upload auf \"public-read\" stellen"
@@ -502,7 +501,7 @@ newNoteRecived: "Es gibt neue Notizen"
 sounds: "Töne"
 listen: "Anhören"
 none: "Nichts"
-showInPage: "In einer Seite anzeigen"
+showInPage: "In Seite anzeigen"
 popout: "Pop-Up"
 volume: "Lautstärke"
 masterVolume: "Gesamtlautstärke"
@@ -521,7 +520,7 @@ sort: "Sortieren"
 ascendingOrder: "Aufsteigende Reihenfolge"
 descendingOrder: "Absteigende Reihenfolge"
 scratchpad: "Testumgebung"
-scratchpadDescription: "Die Testumgebung bietet einen Bereich für AiScript-Experimente. Dort kannst du AiScript schreiben, ausführen sowie dessen Auswirkungen auf Misskey überprüfen."
+scratchpadDescription: "Die Testumgebung bietet eine Umgebung für AiScript-Experimente. Dort kannst du AiScript schreiben, ausführen sowie dessen Auswirkungen auf Misskey überprüfen."
 output: "Ausgabe"
 script: "Skript"
 disablePagesScript: "AiScript auf Seiten deaktivieren"
@@ -544,14 +543,14 @@ addedRelays: "Hinzugefügte Relays"
 serviceworkerInfo: "Muss für Push-Benachrichtigungen aktiviert sein."
 deletedNote: "Gelöschte Notiz"
 invisibleNote: "Private Notiz"
-enableInfiniteScroll: "Automatisch mehr laden"
+enableInfiniteScroll: "Automatisch mehr Notizen laden"
 visibility: "Sichtbarkeit"
 poll: "Umfrage"
 useCw: "Inhaltswarnung verwenden"
 enablePlayer: "Video-Player öffnen"
 disablePlayer: "Video-Player schließen"
 expandTweet: "Tweet ausklappen"
-themeEditor: "Farbschema-Editor"
+themeEditor: "Farbthemen-Editor"
 description: "Beschreibung"
 describeFile: "Beschreibung hinzufügen"
 enterFileDescription: "Beschreibung eingeben"
@@ -587,13 +586,11 @@ smtpHost: "Host"
 smtpPort: "Port"
 smtpUser: "Benutzername"
 smtpPass: "Passwort"
-emptyToDisableSmtpAuth: "Benutzername und Passwort leer lassen, um SMTP-Verifizierung zu deaktivieren"
+emptyToDisableSmtpAuth: "Benutzername und Passwort leer lassen um SMTP-Verifizierung zu deaktivieren"
 smtpSecure: "Für SMTP-Verbindungen implizit SSL/TLS verwenden"
-smtpSecureInfo: "Schalte dies aus, falls du STARTTLS verwendest."
-testEmail: "Emailversand testen"
-wordMute: "Wortstummschaltung"
-regexpError: "Fehler in einem regulären Ausdruck"
-regexpErrorDescription: "Im regulären Ausdruck deiner {tab}en Wortstummschaltungen ist ein Fehler aufgetreten:"
+smtpSecureInfo: "Schalte dies aus, falls du STARTTLS verwendest"
+testEmail: "Email-Versand testen"
+wordMute: "Wort-Stummschaltung"
 instanceMute: "Instanzstummschaltungen"
 userSaysSomething: "{name} hat etwas gesagt"
 makeActive: "Aktivieren"
@@ -607,11 +604,11 @@ database: "Datenbank"
 channel: "Kanäle"
 create: "Erstellen"
 notificationSetting: "Benachrichtigungseinstellungen"
-notificationSettingDesc: "Wähle die Art der anzuzeigenden Benachrichtigungen."
+notificationSettingDesc: "Wähle die Art der anzuzeigenden Benachrichtigung"
 useGlobalSetting: "Globale Einstellung verwenden"
-useGlobalSettingDesc: "Ist diese Option aktiviert, werden die Benachrichtigungseinstellungen deines Benutzerkontos verwendet. Durch ausschalten dieser Option können individuelle Einstellungen vorgenommen werden."
-other: "Anderes"
-regenerateLoginToken: "Anmeldetoken regenerieren"
+useGlobalSettingDesc: "Ist dies eingeschaltet, so werden die Benachrichtigungseinstellungen deines Benutzerkontos verwendet. Wenn dies ausgeschaltet ist, können individuelle Einstellungen vorgenommen werden."
+other: "Andere"
+regenerateLoginToken: "Anmeldungstoken regenerieren"
 regenerateLoginTokenDescription: "Den zur Anmeldung intern verwendeten Token regenerieren. Normalerweise wird dies nicht benötigt. Bei Regeneration werden alle Geräte ausgeloggt."
 setMultipleBySeparatingWithSpace: "Trenne Elemente durch ein Leerzeichen um mehrere Einstellungen zu kofigurieren."
 fileIdOrUrl: "Datei-ID oder URL"
@@ -621,7 +618,7 @@ abuseReports: "Meldungen"
 reportAbuse: "Melden"
 reportAbuseOf: "{name} melden"
 fillAbuseReportDescription: "Bitte gib zusätzliche Informationen zu dieser Meldung an. Falls es sich um eine spezielle Notiz handelt, bitte gib dessen URL an."
-abuseReported: "Deine Meldung wurde versendet. Vielen Dank."
+abuseReported: "Die Meldung wurde versendet. Vielen Dank."
 reporter: "Melder"
 reporteeOrigin: "Herkunft des Gemeldeten"
 reporterOrigin: "Herkunft des Meldenden"
@@ -634,18 +631,18 @@ openInSideView: "In Seitenansicht öffnen"
 defaultNavigationBehaviour: "Standardnavigationsverhalten"
 editTheseSettingsMayBreakAccount: "Bei Bearbeitung dieser Einstellungen besteht die Gefahr, dein Benutzerkonto zu beschädigen."
 instanceTicker: "Instanz-Informationen von Notizen"
-waitingFor: "Warte auf {x} …"
+waitingFor: "Warte auf {x}"
 random: "Zufällig"
 system: "System"
 switchUi: "UI wechseln"
 desktop: "Desktop"
-clip: "Clip erstellen"
+clip: "Clip"
 createNew: "Neu erstellen"
 optional: "Optional"
 createNewClip: "Neuen Clip erstellen"
 public: "Öffentlich"
 i18nInfo: "Misskey wird durch freiwillige Helfer in viele verschiedene Sprachen übersetzt. Auf {link} kannst du mithelfen."
-manageAccessTokens: "Zugriffstokens verwalten"
+manageAccessTokens: "Zugriffstoken verwalten"
 accountInfo: "Benutzerkonto-Informationen"
 notesCount: "Anzahl der Notizen"
 repliesCount: "Anzahl gesendeter Antworten"
@@ -660,15 +657,15 @@ pollVotesCount: "Anzahl gesendeter Antworten auf Umfragen"
 pollVotedCount: "Anzahl erhaltener Antworten auf Umfragen"
 yes: "Ja"
 no: "Nein"
-driveFilesCount: "Anzahl der Dateien in Drive"
+driveFilesCount: "Anzahl an Drive-Dateien"
 driveUsage: "Drive-Auslastung"
 noCrawle: "Crawler-Indexierung ablehnen"
-noCrawleDescription: "Suchmaschinen bitten, die eigene Profilseite, Notizen, Seiten usw. nicht zu indexieren."
-lockedAccountInfo: "Auch wenn du Follow-Anfragen auf manuelle Bestätigung setzt, wird jede deiner Notizen öffentlich sichtbar sein, sofern du ihre Notizsichtbarkeit nicht auf \"Nur Follower\" setzt."
+noCrawleDescription: "Suchmaschinen bitten, die eigene Profilseite, Notizen, Seiten usw. nicht zu indexieren"
+lockedAccountInfo: "Auch wenn du Follow-Anfragen auf manuelle Bestätigung setzt, wird jeder deine Notizen öffentlich sehen können, sofern du die Notizsichtbarkeit nicht auf \"Nur Follower\" setzt."
 alwaysMarkSensitive: "Medien standardmäßig als NSFW markieren"
 loadRawImages: "Anstatt Vorschaubilder immer Originalbilder anzeigen"
 disableShowingAnimatedImages: "Animierte Bilder nicht abspielen"
-verificationEmailSent: "Eine Bestätigungsmail wurde an deine Email-Adresse versendet. Besuche den dort enthaltenen Link, um die Verifizierung abzuschließen."
+verificationEmailSent: "Eine Verifizierungsnachricht wurde versendet. Besuche den dort enthaltenen Link, um die Verifizierung abzuschließen."
 notSet: "Nicht konfiguriert"
 emailVerified: "Email-Adresse bestätigt"
 noteFavoritesCount: "Anzahl an als Favorit markierter Notizen"
@@ -679,12 +676,12 @@ useSystemFont: "Standardschriftart des Systems verwenden"
 clips: "Clips"
 experimentalFeatures: "Experimentelle Funktionalitäten"
 developer: "Entwickler"
-makeExplorable: "Benutzerkonto in „Erkunden“ sichtbar machen"
-makeExplorableDescription: "Wenn diese Option deaktiviert ist, ist dein Benutzerkonto nicht im „Erkunden“-Bereich sichtbar."
+makeExplorable: "Benutzerkonto in \"Erkunden\" sichtbar machen"
+makeExplorableDescription: "Wenn diese Option deaktiviert ist, ist dein Benutzerkonto nicht im \"Erkunden\"-Bereich sichtbar."
 showGapBetweenNotesInTimeline: "Abstände zwischen Notizen auf der Chronik anzeigen"
 duplicate: "Duplizieren"
 left: "Links"
-center: "Mittig"
+center: "Mitte"
 wide: "Breit"
 narrow: "Schmal"
 reloadToApplySetting: "Diese Einstellung tritt nach einer Aktualisierung der Seite in Kraft. Jetzt aktualisieren?"
@@ -695,19 +692,19 @@ onlineUsersCount: "{n} Benutzer sind online"
 nUsers: "{n} Benutzer"
 nNotes: "{n} Notizen"
 sendErrorReports: "Fehlerberichte senden"
-sendErrorReportsDescription: "Ist diese Option aktiviert, so werden beim Auftreten von Fehlern detaillierte Fehlerinformationen an Misskey weitergegeben, was zur Verbesserung der Qualität von Misskey beiträgt.\nEnthalten in diesen Informationen sind u.a. die Version deines Betriebssystems, welchen Browser du verwendest und ein Verlauf deiner Aktivitäten innerhalb Misskey."
-myTheme: "Mein Farbschema"
+sendErrorReportsDescription: "Ist diese Option aktiviert, so werden beim Auftreten von Fehlern detaillierte Fehlerinformationen an Misskey weitergegeben, was zur Verbesserung der Qualität von Misskey beiträgt.\nEnthalten in diesen Informationen sind u.a. die Version deines Betriebssystems, welchen Browser du verwendest und ein Verlauf deiner Aktivitäten."
+myTheme: "Mein Farbthema"
 backgroundColor: "Hintergrundfarbe"
 accentColor: "Akzentfarbe"
 textColor: "Textfarbe"
-saveAs: "Speichern als …"
+saveAs: "Speichern als…"
 advanced: "Fortgeschritten"
 value: "Wert"
 createdAt: "Erstellt am"
 updatedAt: "Zuletzt geändert am"
 saveConfirm: "Änderungen speichern?"
 deleteConfirm: "Wirklich löschen?"
-invalidValue: "Dieser Wert ist ungültig."
+invalidValue: "Ungültiger Wert."
 registry: "Registry"
 closeAccount: "Benutzerkonto schließen"
 currentVersion: "Momentane Version"
@@ -720,11 +717,11 @@ inUse: "Verwendet"
 editCode: "Code bearbeiten"
 apply: "Anwenden"
 receiveAnnouncementFromInstance: "Benachrichtigungen von dieser Instanz empfangen"
-emailNotification: "Email-Benachrichtigungen"
+emailNotification: "E-Mail-Benachrichtigungen"
 publish: "Veröffentlichen"
 inChannelSearch: "In Kanal suchen"
 useReactionPickerForContextMenu: "Reaktionsauswahl durch Rechtsklick öffnen"
-typingUsers: "{users} ist/sind am schreiben …"
+typingUsers: "{users} ist/sind am schreiben..."
 jumpToSpecifiedDate: "Zu bestimmtem Datum springen"
 showingPastTimeline: "Es wird eine alte Chronik angezeigt"
 clear: "Zurückkehren"
@@ -734,19 +731,19 @@ unlikeConfirm: "\"Gefällt mir\" wirklich entfernen?"
 fullView: "Vollansicht"
 quitFullView: "Vollansicht verlassen"
 addDescription: "Beschreibung hinzufügen"
-userPagePinTip: "Um Notizen hier erscheinen zu lassen, drücke \"An dein Profil anheften\" im Menü individueller Notizen."
+userPagePinTip: "Um Notizen hier erscheinen zu lassen, drücke \"Anheften\" im Menü individueller Notizen."
 notSpecifiedMentionWarning: "Diese Notiz enthält Erwähnungen von Nutzern, die nicht als Empfänger ausgewählt sind"
 info: "Über"
 userInfo: "Benutzerinformation"
 unknown: "Unbekannt"
-onlineStatus: "Onlinestatus"
-hideOnlineStatus: "Onlinestatus verbergen"
-hideOnlineStatusDescription: "Das Verbergen deines Onlinestatuses reduziert die Nützlichkeit von Funktionen wie der Suche."
+onlineStatus: "Online-Status"
+hideOnlineStatus: "Online-Status verbergen"
+hideOnlineStatusDescription: "Das Verbergen deines Online-Statuses reduziert die Nützlichkeit von Funktionen wie der Suche."
 online: "Online"
 active: "Aktiv"
 offline: "Offline"
 notRecommended: "Nicht empfohlen"
-botProtection: "Schutz vor Bots"
+botProtection: "Bot-Schutz"
 instanceBlocking: "Blockierte Instanzen"
 selectAccount: "Benutzerkonto auswählen"
 switchAccount: "Konto wechseln"
@@ -758,9 +755,9 @@ administration: "Verwaltung"
 accounts: "Benutzerkonten"
 switch: "Wechseln"
 noMaintainerInformationWarning: "Betreiberinformationen sind nicht konfiguriert."
-noBotProtectionWarning: "Schutz vor Bots ist nicht konfiguriert."
+noBotProtectionWarning: "Bot-Schutz ist nicht konfiguriert."
 configure: "Konfigurieren"
-postToGallery: "Neuen Galeriebeitrag erstellen"
+postToGallery: "Neuen Galerie-Beitrag erstellen"
 gallery: "Galerie"
 recentPosts: "Neue Beiträge"
 popularPosts: "Beliebte Beiträge"
@@ -772,7 +769,7 @@ priority: "Priorität"
 high: "Hoch"
 middle: "Mittel"
 low: "Niedrig"
-emailNotConfiguredWarning: "Keine Email-Adresse hinterlegt."
+emailNotConfiguredWarning: "Keine Email-Adresse hinterlegt"
 ratio: "Verhältnis"
 previewNoteText: "Vorschau anzeigen"
 customCss: "Benutzerdefiniertes CSS"
@@ -790,9 +787,9 @@ misskeyUpdated: "Misskey wurde aktualisiert!"
 whatIsNew: "Änderungen anzeigen"
 translate: "Übersetzen"
 translatedFrom: "Aus {x} übersetzt"
-accountDeletionInProgress: "Die Löschung deines Benutzerkontos ist momentan in Bearbeitung."
+accountDeletionInProgress: "Löschung des Benutzerkontos momentan in Bearbeitung"
 usernameInfo: "Ein Name, durch den dein Benutzerkonto auf diesem Server identifiziert werden kann. Du kannst das Alphabet (a~z, A~Z), Ziffern (0~9) oder Unterstriche (_) verwenden. Benutzernamen können später nicht geändert werden."
-aiChanMode: "Ai-Modus"
+aiChanMode: "Ai Modus"
 keepCw: "Inhaltswarnungen beibehalten"
 pubSub: "Pub/Sub Benutzerkonten"
 lastCommunication: "Letzte Kommunikation"
@@ -801,7 +798,7 @@ unresolved: "Ungelöst"
 breakFollow: "Follower entfernen"
 itsOn: "Eingeschaltet"
 itsOff: "Ausgeschaltet"
-emailRequiredForSignup: "Angabe einer Email-Adresse als benötigt markieren"
+emailRequiredForSignup: "Angaben einer Email-Adresse als benötigt markieren"
 unread: "Ungelesen"
 filter: "Filter"
 controlPanel: "Systemsteuerung"
@@ -816,32 +813,13 @@ ffVisibilityDescription: "Konfiguriere wer sehen kann, wem du folgst sowie wer d
 continueThread: "Weiteren Threadverlauf anzeigen"
 deleteAccountConfirm: "Dein Benutzerkonto wird unwiderruflich gelöscht. Trotzdem fortfahren?"
 incorrectPassword: "Falsches Passwort."
-voteConfirm: "Wirklich für „{choice}“ abstimmen?"
+voteConfirm: "Wirklich für \"{choice}\" abstimmen?"
 hide: "Inhalt verbergen"
 leaveGroup: "Gruppe verlassen"
-leaveGroupConfirm: "Möchtest du „{name}“ wirklich verlassen?"
+leaveGroupConfirm: "Möchtest du \"{name}\" wirklich verlassen?"
 useDrawerReactionPickerForMobile: "Auf mobilen Geräten ausfahrbare Reaktionsauswahl anzeigen"
 welcomeBackWithName: "Willkommen zurück, {name}"
 clickToFinishEmailVerification: "Drücke bitte auf [{ok}], um die Email-Bestätigung abzuschließen."
-overridedDeviceKind: "Gerätetyp"
-smartphone: "Smartphone"
-tablet: "Tablet"
-auto: "Automatisch"
-themeColor: "Farbe der Instanz-Information"
-size: "Größe"
-numberOfColumn: "Spaltenanzahl"
-searchByGoogle: "Googlen"
-instanceDefaultLightTheme: "Instanzweites Standardfarbschema (Hell)"
-instanceDefaultDarkTheme: "Instanzweites Standardfarbschema (Dunkel)"
-instanceDefaultThemeDescription: "Gib den Farbschemencode im Objektformat ein."
-mutePeriod: "Stummschaltungsdauer"
-indefinitely: "Dauerhaft"
-tenMinutes: "10 Minuten"
-oneHour: "Eine Stunde"
-oneDay: "Einen Tag"
-oneWeek: "Eine Woche"
-reflectMayTakeTime: "Es kann etwas dauern, bis sich dies widerspiegelt."
-failedToFetchAccountInformation: "Benutzerkontoinformationen konnten nicht abgefragt werden"
 _emailUnavailable:
   used: "Diese Email-Adresse wird bereits verwendet"
   format: "Das Format dieser Email-Adresse ist ungültig"
@@ -854,20 +832,20 @@ _ffVisibility:
   private: "Privat"
 _signup:
   almostThere: "Fast geschafft"
-  emailAddressInfo: "Bitte gib deine Email-Adresse ein. Sie wird nicht öffentlich einsehbar sein."
+  emailAddressInfo: "Bitte gib deine Email-Adresse ein."
   emailSent: "An deine Email-Adresse ({email}) wurde soeben eine Bestätigungsmail geschickt. Bitte klicke auf den enthaltenen Link, um die Erstellung deines Benutzerkontos abzuschließen."
 _accountDelete:
   accountDelete: "Benutzerkonto löschen"
-  mayTakeTime: "Da die Löschung eines Benutzerkontos ein aufwendiger Prozess ist, kann dessen Dauer davon abhängen, wie viel Inhalt von diesem erstellt wurde oder wie viele Dateien von diesem hochgeladen wurden."
+  mayTakeTime: "Da die Löschung eines Benutzerkontos ein aufwendiger Prozess ist, kann dessen Dauer davon abhängen, wie viel Inhalt in diesem erstellt wurde oder wie viele Dateien hochgeladen wurden."
   sendEmail: "Sobald die Löschung abgeschlossen ist, wird an die mit ihm verknüpfte Email-Adresse eine Benachrichtigung versendet."
-  requestAccountDelete: "Löschung deines Benutzerkontos anfordern"
-  started: "Die Löschung wurde eingeleitet."
+  requestAccountDelete: "Löschung des Benutzerkontos anfordern"
+  started: "Löschung wurde eingeleitet."
   inProgress: "Löschung in Bearbeitung"
 _ad:
   back: "Zurück"
   reduceFrequencyOfThisAd: "Diese Werbung weniger anzeigen"
 _forgotPassword:
-  enterEmail: "Gib die Email-Adresse ein, mit der du dich registriert hast. An diese wird ein Link gesendet, mit dem du dein Passwort zurücksetzen kannst."
+  enterEmail: "Gib die Email-Adresse ein, mit der du dich registriert hast. An diese wird ein Link gesendet, mit der du dein Passwort zurücksetzen kannst."
   ifNoEmail: "Solltest du bei der Registrierung keine Email-Adresse angegeben haben, wende dich bitte an den Administrator."
   contactAdmin: "Diese Instanz unterstützt die Verwendung von Email-Adressen nicht. Wende dich an den Administrator, um dein Passwort zurückzusetzen."
 _gallery:
@@ -891,7 +869,7 @@ _registry:
   domain: "Domain"
   createKey: "Schlüssel erstellen"
 _aboutMisskey:
-  about: "Misskey ist Open-Source-Software, welche von syuilo seit 2014 entwickelt wird."
+  about: "Misskey ist Open-Source-Software die von syuilo seit 2014 entwickelt wird."
   contributors: "Hauptmitwirkende"
   allContributors: "Alle Mitwirkenden"
   source: "Quellcode"
@@ -908,13 +886,13 @@ _mfm:
   intro: "MFM ist eine Misskey-exklusive Markup-Sprache, die in Misskey an vielen Stellen verwendet werden kann. Hier kannst du eine Liste von verfügbarer MFM-Syntax einsehen."
   dummy: "Misskey erweitert die Welt des Fediverse"
   mention: "Erwähnung"
-  mentionDescription: "Mit At-Zeichen und Benutzername kann ein individueller Nutzer angegeben werden."
+  mentionDescription: "Mit At-Zeichen und Nutzername kann ein individueller Nutzer angegeben werden."
   hashtag: "Hashtag"
   hashtagDescription: "Mit einer Raute und Text kann ein Hashtag angegeben werden."
   url: "URL"
   urlDescription: "Zeigt URLs an."
   link: "Link"
-  linkDescription: "Zeigt spezifische Textabschnitte als URL an."
+  linkDescription: "Spezifische Textabschnitte als URL anzeigen."
   bold: "Fett"
   boldDescription: "Zeichen zur Betonung dicker erscheinen lassen."
   small: "Klein"
@@ -938,19 +916,19 @@ _mfm:
   flip: "Spiegelung"
   flipDescription: "Inhalt horizontal oder vertikal gespiegelt anzeigen."
   jelly: "Animation (Dehnen)"
-  jellyDescription: "Verleiht Inhalt eine sich dehnende Animation."
+  jellyDescription: "Verleiht dem Inhalt eine sich dehnende Animation."
   tada: "Animation (Tada)"
-  tadaDescription: "Verleiht Inhalt eine Animation mit \"Tada!\"-Gefühl"
+  tadaDescription: "Verleiht eine Animation mit \"Tada!\"-Gefühl"
   jump: "Animation (Sprung)"
-  jumpDescription: "Verleiht Inhalt eine springende Animation."
+  jumpDescription: "Verleiht dem Inhalt eine springende Animation."
   bounce: "Animation (Federn)"
-  bounceDescription: "Verleiht Inhalt eine federnde Animation."
+  bounceDescription: "Verleiht dem Inhalt eine federnde Animation."
   shake: "Animation (Zittern)"
-  shakeDescription: "Verleiht Inhalt eine zitternde Animation."
+  shakeDescription: "Verleiht dem Inhalt eine zitternde Animation."
   twitch: "Animation (Zucken)"
-  twitchDescription: "Verleiht Inhalt eine sehr stark zuckende Animation."
+  twitchDescription: "Verleiht dem Inhalt eine sehr stark zuckende Animation."
   spin: "Animation (Rotieren)"
-  spinDescription: "Verleiht Inhalt eine rotierende Animation."
+  spinDescription: "Verleiht dem Inhalt eine rotierende Animation."
   x2: "Groß"
   x2Description: "Inhalte größer anzeigen."
   x3: "Sehr groß"
@@ -958,7 +936,7 @@ _mfm:
   x4: "Unglaublich groß"
   x4Description: "Lässt Inhalte noch größer als größer als groß angezeigt werden."
   blur: "Weichzeichnen"
-  blurDescription: "Inhalte durch Weihzeichnung verschwimmen lassen. Durch das Bewegen des Mauszeigers über den Inhalt wird er klar angezeigt."
+  blurDescription: "Inhalte durch Weihzeichnung verschwimmen lassen. Durch das Bewegen des Mauszeigers auf den Inhalt wird er klar angezeigt."
   font: "Schriftart"
   fontDescription: "Setzt die Schriftart des Inhaltes fest."
   rainbow: "Regenbogen"
@@ -966,7 +944,7 @@ _mfm:
   sparkle: "Glitzer"
   sparkleDescription: "Verleiht Inhalt einen glitzernden Partikeleffekt."
   rotate: "Drehen"
-  rotateDescription: "Dreht den Inhalt um einen angegebenen Winkel."
+  rotateDescription: "Dreht den Inhalt um einen angegebenen Winkel"
 _instanceTicker:
   none: "Nie anzeigen"
   remote: "Für Benutzer fremder Instanzen anzeigen"
@@ -992,7 +970,7 @@ _menuDisplay:
   hide: "Ausblenden"
 _wordMute:
   muteWords: "Stummgeschaltete Wörter"
-  muteWordsDescription: "Zum Nutzen einer \"UND\"-Verknüpfung Einträge mit Leerzeichen trennen, zum Nutzen einer \"ODER\"-Verknüpfung Einträge mit einem Zeilenumbruch trennen."
+  muteWordsDescription: "Mit Leerzeichen für eine \"UND\"-Verknüpfung trennen, durch Zeilenumbrüche für eine \"ODER\"-Verknüpfung trennen."
   muteWordsDescription2: "Umgib Schlüsselworter mit Schrägstrichen, um Reguläre Ausdrücke zu verwenden."
   softDescription: "Notizen, die die angegebenen Konditionen erfüllen, in der Chronik ausblenden."
   hardDescription: "Verhindern, dass Notizen, die die angegebenen Konditionen erfüllen, der Chronik hinzugefügt werden. Zudem werden diese Notizen auch nicht der Chronik hinzugefügt, falls die Konditionen geändert werden."
@@ -1005,17 +983,17 @@ _instanceMute:
   title: "Blendet Notizen von stummgeschalteten Instanzen aus."
   heading: "Liste der stummzuschaltenden Instanzen"
 _theme:
-  explore: "Farbschemata erforschen"
-  install: "Farbschmata installieren"
-  manage: "Farbschemaverwaltung"
-  code: "Farbschemencode"
+  explore: "Themen erforschen"
+  install: "Thema installieren"
+  manage: "Themaverwaltung"
+  code: "Themencode"
   description: "Beschreibung"
   installed: "{name} wurde installiert"
-  installedThemes: "Installierte Farbschemata"
-  builtinThemes: "Eingebaute Farbschemata"
-  alreadyInstalled: "Dieses Farbschema ist bereits installiert"
-  invalid: "Der Code dieses Farbschemas ist ungültig"
-  make: "Farbschema erstellen"
+  installedThemes: "Installierte Themen"
+  builtinThemes: "Eingebaute Themen"
+  alreadyInstalled: "Dieses Thema ist bereits installiert"
+  invalid: "Der Themencode dieses Themas ist ungültig"
+  make: "Farbthema erstellen"
   base: "Vorlage"
   addConstant: "Konstante hinzufügen"
   constant: "Konstante"
@@ -1032,7 +1010,7 @@ _theme:
   darken: "Verdunkeln"
   lighten: "Erhellen"
   inputConstantName: "Name der Konstanten eingeben"
-  importInfo: "Hier kannst du Farbschemencode einfügen, um ihn in den Editor zu importieren"
+  importInfo: "Du kannst hier Themencode einfügen, um ihn in den Editor zu importieren"
   deleteConstantConfirm: "Die Konstante {const} wirklich löschen?"
   keys:
     accent: "Akzentfarbe"
@@ -1069,7 +1047,7 @@ _theme:
     toastFg: "Text von Benachrichtigungen"
     buttonBg: "Hintergrund von Schaltflächen"
     buttonHoverBg: "Hintergrund von Schaltflächen (Mouseover)"
-    inputBorder: "Rahmen von Eingabefeldern"
+    inputBorder: "Rahmen des Eingabefelds"
     listItemHoverBg: "Hintergrund von Listeneinträgen (Mouseover)"
     driveFolderBg: "Hintergrund von Drive-Ordnern"
     wallpaperOverlay: "Hintergrundbild-Overlay"
@@ -1110,7 +1088,7 @@ _tutorial:
   step2_1: "Lass uns zuerst dein Profil vervollständigen, bevor du Notizen schreibst oder jemandem folgst."
   step2_2: "Informationen darüber, was für eine Person du bist, macht es anderen leichter zu wissen, ob sie deine Notizen sehen wollen und ob sie dir folgen möchten."
   step3_1: "Mit dem Einrichten deines Profils fertig?"
-  step3_2: "Dann lass uns als nächstes versuchen, eine Notiz zu schreiben. Dies kannst du tun, indem du auf den Knopf mit dem Stift-Icon auf dem Bildschirm drückst."
+  step3_2: "Dann lass uns als nächstes versuchen, eine Notiz zu schreiben. Dies kannst du tun, indem du auf das Stift-Icon oben auf dem Bildschirm drückst."
   step3_3: "Fülle das Fenster aus und drücke auf den Knopf oben rechts zum Senden."
   step3_4: "Fällt dir nichts ein, das du schreiben möchtest? Versuch's mit \"Hallo Misskey!\""
   step4_1: "Fertig mit dem Senden deiner ersten Notiz?"
@@ -1120,8 +1098,8 @@ _tutorial:
   step5_3: "Klicke zum Anzeigen des Profils eines Benutzers auf dessen Profilbild und dann auf den \"Folgen\"-Knopf, um diesem zu folgen."
   step5_4: "Je nach Benutzer kann es etwas Zeit in Anspruch nehmen, bis dieser deine Follow-Anfrage bestätigt."
   step6_1: "Wenn du nun auch die Notizen anderer Benutzer in deiner Chronik siehst, hast du auch diesmal alles richtig gemacht."
-  step6_2: "Du kannst ebenso „Reaktionen“ verwenden, um schnell auf Notizen anderer Benutzer zu reagieren."
-  step6_3: "Um eine Reaktion anzufügen, klicke auf das „+“-Symbol in der Notiz und wähle ein Emoji aus, mit dem du reagieren möchtest."
+  step6_2: "Du kannst ebenso \"Reaktionen\" verwenden, um schnell auf Notizen anderer Benutzer zu reagieren."
+  step6_3: "Um eine Reaktion anzufügen, klicke auf das \"+\"-Symbol in der Notiz und wähle ein Emoji aus, mit dem du reagieren möchtest."
   step7_1: "Glückwunsch! Du hast die Einführung in die Verwendung von Misskey abgeschlossen."
   step7_2: "Wenn du mehr über Misskey lernen möchtest, schau dich im {help}-Bereich um."
   step7_3: "Und nun, viel Spaß mit Misskey! 🚀"
@@ -1168,7 +1146,7 @@ _permissions:
   "read:gallery-likes": "Liste deiner mit \"Gefällt mir\" markierten Galerie-Beiträge lesen"
   "write:gallery-likes": "Liste deiner mit \"Gefällt mir\" markierten Galerie-Beiträge bearbeiten"
 _auth:
-  shareAccess: "Möchtest du „{name}“ authorisieren, auf dieses Benutzerkonto zugreifen zu können?"
+  shareAccess: "Möchtest du \"{name}\" authorisieren, auf dieses Benuzerkonto zugreifen zu können?"
   shareAccessAsk: "Bist du dir sicher, dass du diese Anwendung authorisieren möchtest, auf dein Benutzerkonto zugreifen zu können?"
   permissionAsk: "Diese Anwendung fordert folgende Berechtigungen"
   pleaseGoBack: "Bitte kehre zur Anwendung zurück"
@@ -1189,7 +1167,7 @@ _weekday:
   friday: "Freitag"
   saturday: "Samstag"
 _widgets:
-  memo: "Merkzettel"
+  memo: "Memo"
   notifications: "Benachrichtigungen"
   timeline: "Chronik"
   calendar: "Kalender"
@@ -1220,8 +1198,8 @@ _poll:
   canMultipleVote: "Auswahl mehrerer Antworten erlauben"
   expiration: "Abstimmung beenden"
   infinite: "Nie"
-  at: "Beenden am …"
-  after: "Beenden nach …"
+  at: "Beenden am..."
+  after: "Beenden nach..."
   deadlineDate: "Enddatum"
   deadlineTime: "Zeit"
   duration: "Dauer"
@@ -1247,24 +1225,24 @@ _visibility:
   localOnly: "Nur Lokal"
   localOnlyDescription: "Unsichtbar für Benutzer anderer Instanzen"
 _postForm:
-  replyPlaceholder: "Dieser Notiz antworten …"
-  quotePlaceholder: "Diese Notiz zitieren …"
+  replyPlaceholder: "Dieser Notiz antworten..."
+  quotePlaceholder: "Diese Notiz zitieren..."
   channelPlaceholder: "In einen Kanal senden"
   _placeholders:
     a: "Was machst du momentan?"
     b: "Was ist um dich herum los?"
     c: "Was geht dir durch den Kopf?"
     d: "Was möchtest du sagen?"
-    e: "Fang an zu schreiben …"
-    f: "Ich warte darauf, dass du schreibst …"
+    e: "Fang an zu schreiben..."
+    f: "Ich warte darauf, dass du schreibst..."
 _profile:
   name: "Name"
   username: "Benutzername"
-  description: "Profilbeschreibung"
-  youCanIncludeHashtags: "Du kannst auch Hashtags in deiner Profilbeschreibung verwenden."
+  description: "Über mich"
+  youCanIncludeHashtags: "Du kannst auch Hashtags in deiner Beschreibung verwenden."
   metadata: "Zusätzliche Informationen"
   metadataEdit: "Zusätzliche Informationen bearbeiten"
-  metadataDescription: "Hierdurch kannst du auf deinem Profil zusätzliche Informationsblöcke anzeigen lassen."
+  metadataDescription: "Du kannst auf deinem Profil vier zusätzliche Informationsblöcke anzeigen lassen."
   metadataLabel: "Beschriftung"
   metadataContent: "Inhalt"
   changeAvatar: "Profilbild ändern"
@@ -1278,30 +1256,30 @@ _exportOrImport:
   excludeMutingUsers: "Stummgeschaltete Benutzer aussortieren"
   excludeInactiveUsers: "Inaktive Benutzer aussortieren"
 _charts:
-  federation: "Föderation"
-  apRequest: "Anfragen"
+  federationInstancesIncDec: "Unterschied in der Anzahl von förderierenden Instanzen"
+  federationInstancesTotal: "Anzahl aller föderierenden Instanzen"
   usersIncDec: "Unterschied in der Anzahl von Benutzern"
   usersTotal: "Anzahl aller Benutzer"
   activeUsers: "Aktive Benutzer"
-  notesIncDec: "Unterschied in der Anzahl an Notizen"
-  localNotesIncDec: "Unterschied in der Anzahl an lokalen Notizen"
-  remoteNotesIncDec: "Unterschied in der Anzahl an Notizen von fremden Instanzen"
+  notesIncDec: "Unterschied in der Anzahl von Notizen"
+  localNotesIncDec: "Unterschied in der Anzahl von lokalen Notizen"
+  remoteNotesIncDec: "Unterschied in Anzahl der Notizen von fremden Instanzen"
   notesTotal: "Anzahl aller Notizen"
-  filesIncDec: "Unterschied in der Anzahl an Dateien"
-  filesTotal: "Anzahl aller Dateien"
+  filesIncDec: "Unterschied an Dateien"
+  filesTotal: "Summe der Dateien"
   storageUsageIncDec: "Unterschied in der Höhe der Speichernutzung"
   storageUsageTotal: "Gesamte Speichernutzung"
 _instanceCharts:
   requests: "Anfragen"
-  users: "Unterschied in der Anzahl an Benutzern"
+  users: "Unterschied in der Anzahl von Benutzern"
   usersTotal: "Gesamtanzahl an Benutzern"
-  notes: "Unterschied in der Anzahl an Notizen"
+  notes: "Unterschied in der Anzahl von Notizen"
   notesTotal: "Gesamtanzahl an Notizen"
-  ff: "Unterschied in der Anzahl an gefolgten Benutzern und Followern"
+  ff: "Unterschied in der Anzahl von gefolgten Benutzern und Followern"
   ffTotal: "Gesamtanzahl an gefolgten Benutzern und Followern"
   cacheSize: "Unterschied in der Größe des Caches"
   cacheSizeTotal: "Gesamtgröße des Caches"
-  files: "Unterschied in der Anzahl an Dateien"
+  files: "Unterschied in der Anzahl der Dateien"
   filesTotal: "Gesamtanzahl an Dateien"
 _timelines:
   home: "Startseite"
@@ -1311,7 +1289,7 @@ _timelines:
 _pages:
   newPage: "Seite erstellen"
   editPage: "Seite bearbeiten"
-  readPage: "Quelltextansicht"
+  readPage: "Quelltext-Ansicht"
   created: "Seite erfolgreich erstellt"
   updated: "Seite erfolgreich aktualisiert"
   deleted: "Seite erfolgreich gelöscht"
@@ -1335,7 +1313,7 @@ _pages:
   url: "Seiten-URL"
   summary: "Zusammenfassung"
   alignCenter: "Zentrieren"
-  hideTitleWhenPinned: "Seitentitel wenn angeheftet ausblenden"
+  hideTitleWhenPinned: "Seitentitel ausblenden, wenn angeheftet"
   font: "Schriftart"
   fontSerif: "Serif"
   fontSansSerif: "Sans Serif"
@@ -1372,7 +1350,7 @@ _pages:
       name: "Variablenname"
       text: "Titel"
       default: "Standardwert"
-    numberInput: "Zahleneingabe"
+    numberInput: "Nummereingabe"
     _numberInput:
       name: "Variablenname"
       text: "Titel"
@@ -1396,7 +1374,7 @@ _pages:
     _counter:
       name: "Variablenname"
       text: "Titel"
-      inc: "Schrittgröße"
+      inc: "Erhöhen um"
     _button:
       text: "Titel"
       colored: "Farbig"
@@ -1442,10 +1420,10 @@ _pages:
       strLen: "Textlänge"
       _strLen:
         arg1: "Text"
-      strPick: "Text extrahieren"
+      strPick: "Zeichen extrahieren"
       _strPick:
         arg1: "Text"
-        arg2: "Textposition"
+        arg2: "Zeichenposition"
       strReplace: "Textersetzung"
       _strReplace:
         arg1: "Text"
@@ -1456,7 +1434,7 @@ _pages:
         arg1: "Text"
       join: "Text zusammenfügen"
       _join:
-        arg1: "Liste"
+        arg1: "Listen"
         arg2: "Trennzeichen"
       add: "Addieren"
       _add:
@@ -1585,7 +1563,7 @@ _pages:
       _for:
         arg1: "Anzahl der Schleifendurchläufe"
         arg2: "Aktion"
-    typeError: "Slot {slot} akzeptiert Werte vom Typ „{expect}“, aber es wurde ein „{actual}“ Wert angegeben!"
+    typeError: "Slot {slot} akzeptiert Werte vom Typ \"{expect}\", aber es wurde ein \"{actual}\" Wert angegeben!"
     thereIsEmptySlot: "Slot {slot} ist leer!"
     types:
       string: "Text"
@@ -1596,7 +1574,7 @@ _pages:
     emptySlot: "Leerer Slot"
     enviromentVariables: "Umgebungsvariable"
     pageVariables: "Seitenelemente"
-    argVariables: "Eingabeslots"
+    argVariables: "Eingabe-Slots"
 _relayStatus:
   requesting: "Ausstehend"
   accepted: "Akzeptiert"
@@ -1614,7 +1592,6 @@ _notification:
   youReceivedFollowRequest: "Du hast eine Follow-Anfrage erhalten"
   yourFollowRequestAccepted: "Deine Follow-Anfrage wurde akzeptiert"
   youWereInvitedToGroup: "Du wurdest in eine Gruppe eingeladen"
-  pollEnded: "Umfrageergebnisse sind verfügbar"
   _types:
     all: "Alle"
     follow: "Neue Follower"
@@ -1624,7 +1601,6 @@ _notification:
     quote: "Zitationen"
     reaction: "Reaktionen"
     pollVote: "Antworten auf Umfragen"
-    pollEnded: "Ende von Umfragen"
     receiveFollowRequest: "Erhaltene Follow-Anfragen"
     followRequestAccepted: "Akzeptierte Follow-Anfragen"
     groupInvited: "Erhaltene Gruppeneinladungen"
@@ -1635,10 +1611,10 @@ _deck:
   columnMargin: "Spaltenabstand"
   columnHeaderHeight: "Spaltenkopfhöhe"
   addColumn: "Spalte hinzufügen"
-  swapLeft: "Mit linker Spalte tauschen"
-  swapRight: "Mit rechter Spalte tauschen"
-  swapUp: "Mit oberer Spalte tauschen"
-  swapDown: "Mit unterer Spalte tauschen"
+  swapLeft: "Nach links verschieben"
+  swapRight: "Nach rechts verschieben"
+  swapUp: "Nach oben verschieben"
+  swapDown: "Nach unten verschieben"
   stackLeft: "Auf linke Spalte stapeln"
   popRight: "Nach rechts vom Stapel nehmen"
   profile: "Profil"

locales/en-US.yml

@@ -8,7 +8,7 @@ notifications: "Notifications"
 username: "Username"
 password: "Password"
 forgotPassword: "Forgot password"
-fetchingAsApObject: "Fetching from the Fediverse..."
+fetchingAsApObject: "Fetching from Fediverse..."
 ok: "OK"
 gotIt: "Got it!"
 cancel: "Cancel"
@@ -32,9 +32,9 @@ uploading: "Uploading..."
 save: "Save"
 users: "Users"
 addUser: "Add a user"
-favorite: "Add to favorites"
+favorite: "Favorite"
 favorites: "Favorites"
-unfavorite: "Remove from favorites"
+unfavorite: "Unfavorite"
 favorited: "Added to favorites."
 alreadyFavorited: "Already added to favorites."
 cantFavorite: "Couldn't add to favorites."
@@ -43,7 +43,7 @@ unpin: "Unpin from profile"
 copyContent: "Copy contents"
 copyLink: "Copy link"
 delete: "Delete"
-deleteAndEdit: "Delete and edit"
+deleteAndEdit: "Delete and Edit"
 deleteAndEditConfirm: "Are you sure you want to delete this note and edit it? You will lose all reactions, renotes and replies to it."
 addToList: "Add to list"
 sendMessage: "Send a message"
@@ -77,25 +77,23 @@ followsYou: "Follows you"
 createList: "Create list"
 manageLists: "Manage lists"
 error: "Error"
-somethingHappened: "An error has occurred"
+somethingHappened: "An error occurred"
 retry: "Retry"
-pageLoadError: "An error occurred loading the page."
+pageLoadError: "Failed to load page."
 pageLoadErrorDescription: "This is normally caused by network errors or the browser's cache. Try clearing the cache and then try again after waiting a little while."
 serverIsDead: "This server is not responding. Please wait for a while and try again."
 youShouldUpgradeClient: "To view this page, please refresh to update your client."
-enterListName: "Enter a name for the list"
+enterListName: "Enter a list name"
 privacy: "Privacy"
 makeFollowManuallyApprove: "Follow requests require approval"
 defaultNoteVisibility: "Default visibility"
 follow: "Follow"
-followRequest: "Send follow request"
+followRequest: "Request follow"
 followRequests: "Follow requests"
 unfollow: "Unfollow"
-followRequestPending: "Follow request pending"
+followRequestPending: "Pending follow request"
 enterEmoji: "Enter an emoji"
 renote: "Renote"
-renoteHomeOnly: "Renote to home only"
-renoteFollowersOnly: "Renote to followers only"
 unrenote: "Take back renote"
 renoted: "Renoted."
 cantRenote: "This post can't be renoted."
@@ -109,12 +107,12 @@ sensitive: "NSFW"
 add: "Add"
 reaction: "Reactions"
 reactionSetting: "Reactions to show in the reaction picker"
-reactionSettingDescription2: "Drag to reorder, click to delete, press \"+\" to add."
+reactionSettingDescription2: "Drag to reorder, Click to delete, Press \"+\" to add"
 rememberNoteVisibility: "Remember note visibility settings"
 attachCancel: "Remove attachment"
 markAsSensitive: "Mark as NSFW"
-unmarkAsSensitive: "Unmark as NSFW"
-enterFileName: "Enter filename"
+unmarkAsSensitive: "Undo NSFW"
+enterFileName: "Enter file name"
 mute: "Mute"
 unmute: "Unmute"
 block: "Block"
@@ -143,8 +141,6 @@ flagAsBot: "Mark this account as a bot"
 flagAsBotDescription: "Enable this option if this account is controlled by a program. If enabled, it will act as a flag for other developers to prevent endless interaction chains with other bots and adjust Misskey's internal systems to treat this account as a bot."
 flagAsCat: "Mark this account as a cat"
 flagAsCatDescription: "Enable this option to mark this account as a cat."
-flagShowTimelineReplies: "Show replies in timeline"
-flagShowTimelineRepliesDescription: "Shows replies of users to notes of other users in the timeline if turned on."
 autoAcceptFollowed: "Automatically approve follow requests from users you're following"
 addAccount: "Add account"
 loginFailed: "Failed to sign in"
@@ -170,8 +166,8 @@ latestRequestReceivedAt: "Last request received"
 latestStatus: "Latest status"
 storageUsage: "Storage usage"
 charts: "Charts"
-perHour: "Per Hour"
-perDay: "Per Day"
+perHour: "per Hour"
+perDay: "per Day"
 stopActivityDelivery: "Stop sending activities"
 blockThisInstance: "Block this instance"
 operations: "Operations"
@@ -192,7 +188,7 @@ clearQueueConfirmText: "Any undelivered notes remaining in the queue will not be
 clearCachedFiles: "Clear cache"
 clearCachedFilesConfirm: "Are you sure that you want to delete all cached remote files?"
 blockedInstances: "Blocked Instances"
-blockedInstancesDescription: "List the hostnames of the instances that you want to block. Listed instances will no longer be able to communicate with this instance."
+blockedInstancesDescription: "List the hosts of the instances to be blocked separated by line breaks. Blocked instances will no longer be able to communicate with this instance."
 muteAndBlock: "Mutes and Blocks"
 mutedUsers: "Muted users"
 blockedUsers: "Blocked users"
@@ -239,8 +235,6 @@ resetAreYouSure: "Really reset?"
 saved: "Saved"
 messaging: "Chat"
 upload: "Upload"
-keepOriginalUploading: "Keep original image"
-keepOriginalUploadingDescription: "Saves the originally uploaded image as-is. If turned off, a version to display on the web will be generated on upload."
 fromDrive: "From Drive"
 fromUrl: "From URL"
 uploadFromUrl: "Upload from a URL"
@@ -327,6 +321,8 @@ disablingTimelinesInfo: "Adminstrators and Moderators will always have access to
 registration: "Register"
 enableRegistration: "Enable new user registration"
 invite: "Invite"
+proxyRemoteFiles: "Proxy remote files"
+proxyRemoteFilesDescription: "If enabled, remote files that are either not stored locally or were deleted due to exceeding the storage limit will be proxied, including generation of thumbnails. This does not affect the server's storage."
 driveCapacityPerLocalAccount: "Drive capacity per local user"
 driveCapacityPerRemoteAccount: "Drive capacity per remote user"
 inMb: "In megabytes"
@@ -336,9 +332,9 @@ backgroundImageUrl: "Background image URL"
 basicInfo: "Basic info"
 pinnedUsers: "Pinned users"
 pinnedUsersDescription: "List usernames separated by line breaks to be pinned in the \"Explore\" tab."
-pinnedPages: "Pinned Pages"
-pinnedPagesDescription: "Enter the paths of the Pages you want to pin to the top page of this instance, separated by line breaks."
-pinnedClipId: "ID of the clip to pin"
+pinnedPages: "Pinned pages"
+pinnedPagesDescription: "Enter the paths of the pages you want to pin to the top page of this instance, separated by line breaks."
+pinnedClipId: "ID of the pinned clip"
 pinnedNotes: "Pinned notes"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Enable hCaptcha"
@@ -348,7 +344,7 @@ recaptcha: "reCAPTCHA"
 enableRecaptcha: "Enable reCAPTCHA"
 recaptchaSiteKey: "Site key"
 recaptchaSecretKey: "Secret key"
-avoidMultiCaptchaConfirm: "Using multiple Captcha systems may cause interference between them. Would you like to disable the other Captcha systems currently active? If you would like them to stay enabled, press cancel."
+avoidMultiCaptchaConfirm: "Using multiple Captcha systems may cause interferences. Would you like to disable the other Captcha systems? You can leave multiple enabled by pressing cancel."
 antennas: "Antennas"
 manageAntennas: "Manage Antennas"
 name: "Name"
@@ -369,13 +365,13 @@ silence: "Silence"
 silenceConfirm: "Are you sure that you want to silence this user?"
 unsilence: "Undo silencing"
 unsilenceConfirm: "Are you sure that you want to undo the silencing of this user?"
-popularUsers: "Popular users"
-recentlyUpdatedUsers: "Recently active users"
+popularUsers: "Trending users"
+recentlyUpdatedUsers: "Users with recent activity"
 recentlyRegisteredUsers: "Newly joined users"
 recentlyDiscoveredUsers: "Newly discovered users"
 exploreUsersCount: "There are {count} users"
 exploreFediverse: "Explore the Fediverse"
-popularTags: "Popular tags"
+popularTags: "Trending Tags"
 userList: "Lists"
 about: "About"
 aboutMisskey: "About Misskey"
@@ -383,13 +379,13 @@ administrator: "Administrator"
 token: "Token"
 twoStepAuthentication: "Two-factor authentication"
 moderator: "Moderator"
-nUsersMentioned: "Mentioned by {n} users"
+nUsersMentioned: "{n} users mentioned"
 securityKey: "Security key"
 securityKeyName: "Key name"
 registerSecurityKey: "Register a security key"
 lastUsed: "Last used"
 unregister: "Unregister"
-passwordLessLogin: "Password-less login"
+passwordLessLogin: "Set up password-less login"
 resetPassword: "Reset password"
 newPasswordIs: "The new password is \"{password}\""
 reduceUiAnimation: "Reduce UI animations"
@@ -422,10 +418,11 @@ next: "Next"
 retype: "Enter again"
 noteOf: "Note by {user}"
 inviteToGroup: "Invite to group"
-quoteAttached: "Quote"
+maxNoteTextLength: "Character limit for notes"
+quoteAttached: "Quoted"
 quoteQuestion: "Append as quote?"
 noMessagesYet: "No messages yet"
-newMessageExists: "There are new messages"
+newMessageExists: "You've got a new message"
 onlyOneFileCanBeAttached: "You can only attach one file to a message"
 signinRequired: "Please sign in"
 invitations: "Invites"
@@ -437,7 +434,7 @@ usernameInvalidFormat: "You can use upper- and lowercase letters, numbers, and u
 tooShort: "Too short"
 tooLong: "Too long"
 weakPassword: "Weak password"
-normalPassword: "Average password"
+normalPassword: "Normal password"
 strongPassword: "Strong password"
 passwordMatched: "Matches"
 passwordNotMatched: "Does not match"
@@ -465,7 +462,7 @@ existingAccount: "Existing account"
 regenerate: "Regenerate"
 fontSize: "Font size"
 noFollowRequests: "You don't have any pending follow requests"
-openImageInNewTab: "Open images in new tab"
+openImageInNewTab: "Open image in new tab"
 dashboard: "Dashboard"
 local: "Local"
 remote: "Remote"
@@ -473,17 +470,17 @@ total: "Total"
 weekOverWeekChanges: "Changes to last week"
 dayOverDayChanges: "Changes to yesterday"
 appearance: "Appearance"
-clientSettings: "Client Settings"
+clientSettings: "Client settings"
 accountSettings: "Account Settings"
 promotion: "Promoted"
 promote: "Promote"
 numberOfDays: "Number of days"
 hideThisNote: "Hide this note"
-showFeaturedNotesInTimeline: "Show featured notes in timelines"
+showFeaturedNotesInTimeline: "Show Featured notes in Timelines"
 objectStorage: "Object Storage"
 useObjectStorage: "Use object storage"
 objectStorageBaseUrl: "Base URL"
-objectStorageBaseUrlDesc: "The URL used as reference. Specify the URL of your CDN or Proxy if you are using either.\nFor S3 use 'https://<bucket>.s3.amazonaws.com' and for GCS or equivalent services use 'https://storage.googleapis.com/<bucket>', etc."
+objectStorageBaseUrlDesc: "URL used as reference. Specify the URL of your CDN or Proxy if you are using either. S3: 'https://<bucket>.s3.amazonaws.com', GCS: 'https://storage.googleapis.com/<bucket>' etc."
 objectStorageBucket: "Bucket"
 objectStorageBucketDesc: "Please specify the bucket name used at your provider."
 objectStoragePrefix: "Prefix"
@@ -491,7 +488,7 @@ objectStoragePrefixDesc: "Files will be stored under directories with this prefi
 objectStorageEndpoint: "Endpoint"
 objectStorageEndpointDesc: "Leave this empty if you are using AWS S3, otherwise specify the endpoint as '<host>' or '<host>:<port>', depending on the service you are using."
 objectStorageRegion: "Region"
-objectStorageRegionDesc: "Specify a region like 'xx-east-1'. If your service does not distinguish between regions, leave this blank or enter 'us-east-1'."
+objectStorageRegionDesc: "Specify a region like 'xx-east-1'. If your service does not distinct between regions, leave this blank or enter 'us-east-1'."
 objectStorageUseSSL: "Use SSL"
 objectStorageUseSSLDesc: "Turn this off if you are not going to use HTTPS for API connections"
 objectStorageUseProxy: "Connect over Proxy"
@@ -523,17 +520,17 @@ sort: "Sort"
 ascendingOrder: "Ascending"
 descendingOrder: "Descending"
 scratchpad: "Scratchpad"
-scratchpadDescription: "The Scratchpad provides an environment for AiScript experiments. You can write, execute, and check the results of it interacting with Misskey in it."
+scratchpadDescription: "The Scratchpad provides an environment for AiScript experiments. You can write, execute, and check the results of it interacting with Misskey."
 output: "Output"
 script: "Script"
 disablePagesScript: "Disable AiScript on Pages"
 updateRemoteUser: "Update remote user information"
-deleteAllFiles: "Delete all files"
+deleteAllFiles: "Delete All Files"
 deleteAllFilesConfirm: "Are you sure that you want to delete all files?"
 removeAllFollowing: "Unfollow all followed users"
 removeAllFollowingDescription: "Executing this unfollows all accounts from {host}. Please run this if the instance e.g. no longer exists."
 userSuspended: "This user has been suspended."
-userSilenced: "This user is being silenced."
+userSilenced: "This user has been silenced."
 yourAccountSuspendedTitle: "This account is suspended"
 yourAccountSuspendedDescription: "This account has been suspended due to breaking the server's terms of services or similar. Contact the administrator if you would like to know a more detailed reason. Please do not create a new account."
 menu: "Menu"
@@ -546,7 +543,7 @@ addedRelays: "Added Relays"
 serviceworkerInfo: "Must be enabled for push notifications."
 deletedNote: "Deleted note"
 invisibleNote: "Invisible note"
-enableInfiniteScroll: "Automatically load more"
+enableInfiniteScroll: "Enable infinite scrolling"
 visibility: "Visiblility"
 poll: "Poll"
 useCw: "Hide content"
@@ -584,7 +581,7 @@ enableEmail: "Enable email distribution"
 emailConfigInfo: "Used to confirm your email during sign-up or if you forget your password"
 email: "Email"
 emailAddress: "Email address"
-smtpConfig: "SMTP Server Configuration"
+smtpConfig: "SMTP Server configuration"
 smtpHost: "Host"
 smtpPort: "Port"
 smtpUser: "Username"
@@ -594,9 +591,7 @@ smtpSecure: "Use implicit SSL/TLS for SMTP connections"
 smtpSecureInfo: "Turn this off when using STARTTLS"
 testEmail: "Test email delivery"
 wordMute: "Word mute"
-regexpError: "Regular Expression error"
-regexpErrorDescription: "An error occurred in the regular expression on line {line} of your {tab} word mutes:"
-instanceMute: "Instance Mutes"
+instanceMute: "Instance mutes"
 userSaysSomething: "{name} said something"
 makeActive: "Activate"
 display: "Display"
@@ -609,14 +604,14 @@ database: "Database"
 channel: "Channels"
 create: "Create"
 notificationSetting: "Notification settings"
-notificationSettingDesc: "Select the types of notification to display."
-useGlobalSetting: "Use global settings"
+notificationSettingDesc: "Select the type of notification to display"
+useGlobalSetting: "Use global setting"
 useGlobalSettingDesc: "If turned on, your account's notification settings will be used. If turned off, individual configurations can be made."
 other: "Other"
 regenerateLoginToken: "Regenerate login token"
-regenerateLoginTokenDescription: "Regenerates the token used internally during login. Normally this action is not necessary. If regenerated, all devices will be logged out."
+regenerateLoginTokenDescription: "Regenerate the token used internally during login. Normally this action is not necessary. If regenerated, all devices will be logged out."
 setMultipleBySeparatingWithSpace: "Separate multiple entries with spaces."
-fileIdOrUrl: "File ID or URL"
+fileIdOrUrl: "File-ID or URL"
 behavior: "Behavior"
 sample: "Sample"
 abuseReports: "Reports"
@@ -690,14 +685,14 @@ center: "Center"
 wide: "Wide"
 narrow: "Narrow"
 reloadToApplySetting: "This setting will only apply after a page reload. Reload now?"
-needReloadToApply: "A reload is required for this to be reflected."
+needReloadToApply: "This setting will only apply after a page reload."
 showTitlebar: "Show title bar"
 clearCache: "Clear cache"
 onlineUsersCount: "{n} users are online"
 nUsers: "{n} Users"
 nNotes: "{n} Notes"
 sendErrorReports: "Send error reports"
-sendErrorReportsDescription: "When turned on, detailed error information will be shared with Misskey when a problem occurs, helping to improve the quality of Misskey.\nThis will include information such the version of your OS, what browser you're using, your activity in Misskey, etc."
+sendErrorReportsDescription: "When turned on, detailed error information will be shared with Misskey when a problem occurs, helping to improve the quality of Misskey.\nThis will include information such the version of your OS, what browser you're using, your activity history, etc."
 myTheme: "My theme"
 backgroundColor: "Background color"
 accentColor: "Accent color"
@@ -795,12 +790,12 @@ translatedFrom: "Translated from {x}"
 accountDeletionInProgress: "Account deletion is currently in progress"
 usernameInfo: "A name that identifies your account from others on this server.  You can use the alphabet (a~z, A~Z), digits (0~9) or underscores (_). Usernames cannot be changed later."
 aiChanMode: "Ai Mode"
-keepCw: "Keep content warnings"
+keepCw: "Keep Content Warnings"
 pubSub: "Pub/Sub Accounts"
 lastCommunication: "Last communication"
 resolved: "Resolved"
 unresolved: "Unresolved"
-breakFollow: "Remove follower"
+breakFollow: "Unfollow"
 itsOn: "Enabled"
 itsOff: "Disabled"
 emailRequiredForSignup: "Require email address for sign-up"
@@ -820,30 +815,11 @@ deleteAccountConfirm: "This will irreversibly delete your account. Proceed?"
 incorrectPassword: "Incorrect password."
 voteConfirm: "Confirm your vote for \"{choice}\"?"
 hide: "Hide"
-leaveGroup: "Leave group"
+leaveGroup: "Leave Group"
 leaveGroupConfirm: "Are you sure you want to leave \"{name}\"?"
 useDrawerReactionPickerForMobile: "Display reaction picker as drawer on mobile"
 welcomeBackWithName: "Welcome back, {name}"
 clickToFinishEmailVerification: "Please click [{ok}] to complete email verification."
-overridedDeviceKind: "Device type"
-smartphone: "Smartphone"
-tablet: "Tablet"
-auto: "Auto"
-themeColor: "Instance Ticker Color"
-size: "Size"
-numberOfColumn: "Number of columns"
-searchByGoogle: "Google"
-instanceDefaultLightTheme: "Instance-wide default light theme"
-instanceDefaultDarkTheme: "Instance-wide default dark theme"
-instanceDefaultThemeDescription: "Enter the theme code in object format."
-mutePeriod: "Mute duration"
-indefinitely: "Permanently"
-tenMinutes: "10 minutes"
-oneHour: "One hour"
-oneDay: "One day"
-oneWeek: "One week"
-reflectMayTakeTime: "It may take some time for this to be reflected."
-failedToFetchAccountInformation: "Could not fetch account information"
 _emailUnavailable:
   used: "This email address is already being used"
   format: "The format of this email address is invalid"
@@ -856,10 +832,10 @@ _ffVisibility:
   private: "Private"
 _signup:
   almostThere: "Almost there"
-  emailAddressInfo: "Please enter your email address. It will not be made public."
+  emailAddressInfo: "Please enter your email address."
   emailSent: "A confirmation email has been sent to your email address ({email}). Please click the included link to complete account creation."
 _accountDelete:
-  accountDelete: "Delete account"
+  accountDelete: "Delete Account"
   mayTakeTime: "As account deletion is a resource-heavy process, it may take some time to complete depending on how much content you have created and how many files you have uploaded."
   sendEmail: "Once account deletion has been completed, an email will be sent to the email address registered to this account."
   requestAccountDelete: "Request account deletion"
@@ -870,8 +846,8 @@ _ad:
   reduceFrequencyOfThisAd: "Show this ad less"
 _forgotPassword:
   enterEmail: "Enter the email address you used to register. A link with which you can reset your password will then be sent to it."
-  ifNoEmail: "If you did not use an email during registration, please contact the instance administrator instead."
-  contactAdmin: "This instance does not support using email addresses, please contact the instance administrator to reset your password instead."
+  ifNoEmail: "If you did not use an email during registration, please contact the administrator instead."
+  contactAdmin: "This instance does not support using email addresses, please contact the administrator to reset your password instead."
 _gallery:
   my: "My Gallery"
   liked: "Liked Posts"
@@ -923,14 +899,14 @@ _mfm:
   smallDescription: "Displays content small and thin."
   center: "Center"
   centerDescription: "Displays content centered."
-  inlineCode: "Code (Inline)"
+  inlineCode: "Code (In-line)"
   inlineCodeDescription: "Displays inline syntax highlighting for (program) code."
   blockCode: "Code (Block)"
   blockCodeDescription: "Displays syntax highlighting for multi-line (program) code in a block."
-  inlineMath: "Math (Inline)"
+  inlineMath: "Math (In-line)"
   inlineMathDescription: "Display math formulas (KaTeX) in-line"
   blockMath: "Math (Block)"
-  blockMathDescription: "Display multi-line math formulas (KaTeX) in a block"
+  blockMathDescription: "Display multi-line Math formulas (KaTeX) in a block"
   quote: "Quote"
   quoteDescription: "Displays content as a quote."
   emoji: "Custom Emoji"
@@ -960,7 +936,7 @@ _mfm:
   x4: "Unbelievably big"
   x4Description: "Displays content even bigger than bigger than big."
   blur: "Blur"
-  blurDescription: "Blurs content. It will be displayed clearly when hovered over."
+  blurDescription: "Content can be blurred via this effect. It will be displayed clearly when hovered over."
   font: "Font"
   fontDescription: "Sets the font to display content in."
   rainbow: "Rainbow"
@@ -1092,10 +1068,10 @@ _ago:
   unknown: "Unknown"
   future: "Future"
   justNow: "Just now"
-  secondsAgo: "{n} second(s) ago"
-  minutesAgo: "{n} minute(s) ago"
-  hoursAgo: "{n} hour(s) ago"
-  daysAgo: "{n} day(s) ago"
+  secondsAgo: "{n} seconds ago"
+  minutesAgo: "{n} minutes ago"
+  hoursAgo: "{n} hours ago"
+  daysAgo: "{n} days ago"
   weeksAgo: "{n} week(s) ago"
   monthsAgo: "{n} month(s) ago"
   yearsAgo: "{n} year(s) ago"
@@ -1112,17 +1088,17 @@ _tutorial:
   step2_1: "Let's finish setting up your profile before writing a note or following anyone."
   step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your notes or follow you."
   step3_1: "Finished setting up your profile?"
-  step3_2: "Then let's try posting a note next. You can do so by pressing the button with a pencil icon on the screen."
+  step3_2: "Then let's try posting a note next. You can do this by pressing the pencil icon on the top of the screen."
   step3_3: "Fill in the modal and press the button on the top right to post."
   step3_4: "Have nothing to say? Try \"just setting up my msky\"!"
   step4_1: "Finished posting your first note?"
   step4_2: "Hurray! Now your first note should be displayed on your timeline."
   step5_1: "Now, let's try making your timeline more lively by following other people."
-  step5_2: "{featured} will show you popular notes in this instance. {explore} will let you find popular users. Try finding people you'd like to follow there!"
+  step5_2: "{featured} will show you trending notes in this instance. {explore} will let you find trending users. Try finding people you'd like to follow there!"
   step5_3: "To follow other users, click on their icon and press the \"Follow\" button on their profile."
   step5_4: "If the other user has a lock icon next to their name, it may take some time for that user to manually approve your follow request."
   step6_1: "You should be able to see other users' notes on your timeline now."
-  step6_2: "You can also put \"reactions\" on other people's notes to quickly respond to them."
+  step6_2: "You can also put \"reactions\" on other people's notes to quickly respond."
   step6_3: "To attach a \"reaction\", press the \"+\" mark on another user's note and choose an emoji you'd like to react with."
   step7_1: "Congratulations! You have now finished Misskey's basic tutorial."
   step7_2: "If you would like to learn more about Misskey, try the {help} section."
@@ -1153,7 +1129,7 @@ _permissions:
   "write:mutes": "Edit your list of muted users"
   "write:notes": "Compose or delete notes"
   "read:notifications": "View your notifications"
-  "write:notifications": "Manage your notifications"
+  "write:notifications": "Work with your notifications"
   "read:reactions": "View your reactions"
   "write:reactions": "Edit your reactions"
   "write:votes": "Vote on a poll"
@@ -1163,18 +1139,18 @@ _permissions:
   "write:page-likes": "Edit your likes on pages"
   "read:user-groups": "View your user groups"
   "write:user-groups": "Edit or delete your user groups"
-  "read:channels": "View your channels"
-  "write:channels": "Edit your channels"
+  "read:channels": "Read your channels"
+  "write:channels": "Modify your channels"
   "read:gallery": "View your gallery"
   "write:gallery": "Edit your gallery"
-  "read:gallery-likes": "View your list of liked gallery posts"
-  "write:gallery-likes": "Edit your list of liked gallery posts"
+  "read:gallery-likes": "View list of liked gallery posts"
+  "write:gallery-likes": "Edit list of liked gallery posts"
 _auth:
   shareAccess: "Would you like to authorize \"{name}\" to access this account?"
   shareAccessAsk: "Are you sure you want to authorize this application to access your account?"
   permissionAsk: "This application requests the following permissions"
   pleaseGoBack: "Please go back to the application"
-  callback: "Returning to the application"
+  callback: "Returning back to the application"
   denied: "Access denied"
 _antennaSources:
   all: "All notes"
@@ -1202,7 +1178,7 @@ _widgets:
   photos: "Photos"
   digitalClock: "Digital clock"
   federation: "Federation"
-  postForm: "Posting form"
+  postForm: "Compose a note"
   slideshow: "Slideshow"
   button: "Button"
   onlineUsers: "Online users"
@@ -1233,10 +1209,10 @@ _poll:
   showResult: "View results"
   voted: "Voted"
   closed: "Ended"
-  remainingDays: "{d} day(s) {h} hour(s) remaining"
-  remainingHours: "{h} hour(s) {m} minute(s) remaining"
-  remainingMinutes: "{m} minute(s) {s} second(s) remaining"
-  remainingSeconds: "{s} second(s) remaining"
+  remainingDays: "{d} days {h} hours remaining"
+  remainingHours: "{h} hours {m} minutes remaining"
+  remainingMinutes: "{m} minutes {s} seconds remaining"
+  remainingSeconds: "{s} seconds remaining"
 _visibility:
   public: "Public"
   publicDescription: "Your note will be visible for all users"
@@ -1266,7 +1242,7 @@ _profile:
   youCanIncludeHashtags: "You can also include hashtags in your bio."
   metadata: "Additional Information"
   metadataEdit: "Edit additional Information"
-  metadataDescription: "Using these, you can display additional information fields in your profile."
+  metadataDescription: "You can display up to four additional information fields in your profile."
   metadataLabel: "Label"
   metadataContent: "Content"
   changeAvatar: "Change avatar"
@@ -1280,31 +1256,31 @@ _exportOrImport:
   excludeMutingUsers: "Exclude muted users"
   excludeInactiveUsers: "Exclude inactive users"
 _charts:
-  federation: "Federation"
-  apRequest: "Requests"
-  usersIncDec: "Difference in the number of users"
-  usersTotal: "Total number of users"
+  federationInstancesIncDec: "Difference in # of federating instances"
+  federationInstancesTotal: "Total # of federating instances"
+  usersIncDec: "Difference in # of users"
+  usersTotal: "Total # of users"
   activeUsers: "Active users"
-  notesIncDec: "Difference in the number of notes"
-  localNotesIncDec: "Difference in the number of local notes"
-  remoteNotesIncDec: "Difference in the number of remote notes"
-  notesTotal: "Total number of notes"
-  filesIncDec: "Difference in the number of files"
-  filesTotal: "Total number of files"
+  notesIncDec: "Difference in # of notes"
+  localNotesIncDec: "Difference in # of local notes"
+  remoteNotesIncDec: "Difference in # of remote notes"
+  notesTotal: "Total # of notes"
+  filesIncDec: "Difference in # of files"
+  filesTotal: "Total # of files"
   storageUsageIncDec: "Difference in storage usage"
   storageUsageTotal: "Total storage usage"
 _instanceCharts:
   requests: "Requests"
-  users: "Difference in the number of users"
-  usersTotal: "Cumulative number of users"
-  notes: "Difference in the number of notes"
-  notesTotal: "Cumulative number of notes"
-  ff: "Difference in the number of followed users / followers "
-  ffTotal: "Cumulative number of followed users / followers"
+  users: "Difference in # of users"
+  usersTotal: "Cumulative total # of users"
+  notes: "Difference in # of notes"
+  notesTotal: "Cumulative total # of notes"
+  ff: "Difference in # of followed users / followers "
+  ffTotal: "Cumulative total # of followed users / followers"
   cacheSize: "Difference in cache size"
   cacheSizeTotal: "Cumulative total cache size"
-  files: "Difference in the number of files"
-  filesTotal: "Cumulative number of files"
+  files: "Difference in # of files"
+  filesTotal: "Cumulative total # of files"
 _timelines:
   home: "Home"
   local: "Local"
@@ -1313,7 +1289,7 @@ _timelines:
 _pages:
   newPage: "Create a new Page"
   editPage: "Edit this Page"
-  readPage: "Viewing this Page's source"
+  readPage: "Source view activated"
   created: "Page successfully created"
   updated: "Page successfully edited"
   deleted: "Page successfully deleted"
@@ -1328,7 +1304,7 @@ _pages:
   unlike: "Remove like"
   my: "My Pages"
   liked: "Liked Pages"
-  featured: "Popular"
+  featured: "Featured"
   inspector: "Inspector"
   contents: "Contents"
   content: "Page block"
@@ -1359,10 +1335,10 @@ _pages:
     if: "If"
     _if:
       variable: "Variable"
-    post: "Posting form"
+    post: "Compose a note"
     _post:
       text: "Content"
-      attachCanvasImage: "Attach canvas image"
+      attachCanvasImage: "Post with canvas image"
       canvasId: "Canvas ID"
     textInput: "Text input"
     _textInput:
@@ -1398,11 +1374,11 @@ _pages:
     _counter:
       name: "Variable name"
       text: "Title"
-      inc: "Step"
+      inc: "Increase by"
     _button:
       text: "Title"
       colored: "Colored"
-      action: "Behavior when the button is pressed"
+      action: "Operation when the button is pressed"
       _action:
         dialog: "Show a dialog"
         _dialog:
@@ -1444,11 +1420,11 @@ _pages:
       strLen: "Text length"
       _strLen:
         arg1: "Text"
-      strPick: "Extract string"
+      strPick: "Extract character"
       _strPick:
         arg1: "Text"
-        arg2: "String location"
-      strReplace: "Replacement string"
+        arg2: "Character location"
+      strReplace: "Text replacement"
       _strReplace:
         arg1: "Text"
         arg2: "Text to be replaced"
@@ -1542,7 +1518,7 @@ _pages:
         arg2: "Maximum value"
       dailyRandomPick: "Randomly choose from a list (Changes once a day for each user)"
       _dailyRandomPick:
-        arg1: "List"
+        arg1: "Lists"
       seedRandom: "Random (with seed)"
       _seedRandom:
         arg1: "Seed"
@@ -1616,7 +1592,6 @@ _notification:
   youReceivedFollowRequest: "You've received a follow request"
   yourFollowRequestAccepted: "Your follow request was accepted"
   youWereInvitedToGroup: "You've been invited to a group"
-  pollEnded: "Poll results have become available"
   _types:
     all: "All"
     follow: "New followers"
@@ -1626,7 +1601,6 @@ _notification:
     quote: "Quotes"
     reaction: "Reactions"
     pollVote: "Votes on polls"
-    pollEnded: "Polls ending"
     receiveFollowRequest: "Received follow requests"
     followRequestAccepted: "Accepted follow requests"
     groupInvited: "Group invitations"
@@ -1637,12 +1611,12 @@ _deck:
   columnMargin: "Margin between columns"
   columnHeaderHeight: "Column header height"
   addColumn: "Add column"
-  swapLeft: "Swap with the left column"
-  swapRight: "Swap with the right column"
-  swapUp: "Swap with the above column"
-  swapDown: "Swap with the below column"
-  stackLeft: "Stack with the left column"
-  popRight: "Pop column to the right"
+  swapLeft: "Swap left"
+  swapRight: "Swap right"
+  swapUp: "Swap with above"
+  swapDown: "Swap with below"
+  stackLeft: "Stack on left column"
+  popRight: "Pop to the right"
   profile: "Profile"
   _columns:
     main: "Main"

locales/es-ES.yml

@@ -321,6 +321,8 @@ disablingTimelinesInfo: "Aunque se desactiven estas lineas de tiempo, por conven
 registration: "Registro"
 enableRegistration: "Permitir nuevos registros"
 invite: "Invitar"
+proxyRemoteFiles: "Hacer proxy de archivos remotos"
+proxyRemoteFilesDescription: "Si activa esta configuración, los archivos remotos no almacenados o borrados por exceso de capacidad serán mostrados via proxy local y generarán una miniatura. Eso no afectará el almacenamiento del servidor."
 driveCapacityPerLocalAccount: "Capacidad del drive por usuario local"
 driveCapacityPerRemoteAccount: "Capacidad del drive por usuario remoto"
 inMb: "En megabytes"
@@ -416,6 +418,7 @@ next: "Siguiente"
 retype: "Intentar de nuevo"
 noteOf: "Notas de {user}"
 inviteToGroup: "Invitar al grupo"
+maxNoteTextLength: "Límite de caracteres en una nota"
 quoteAttached: "Cita añadida"
 quoteQuestion: "¿Quiere añadir una cita?"
 noMessagesYet: "Aún no hay chat"
@@ -762,8 +765,6 @@ muteThread: "Ocultar hilo"
 unmuteThread: "Mostrar hilo"
 ffVisibility: "Visibilidad de seguidores y seguidos"
 hide: "Ocultar"
-searchByGoogle: "Buscar"
-indefinitely: "Sin límite de tiempo"
 _ffVisibility:
   public: "Publicar"
 _accountDelete:
@@ -1090,8 +1091,8 @@ _exportOrImport:
   blockingList: "Bloqueados"
   userLists: "Listas"
 _charts:
-  federation: "Federación"
-  apRequest: "Pedidos"
+  federationInstancesIncDec: "Variación de instancias federando"
+  federationInstancesTotal: "Total de instancias federando"
   usersIncDec: "Variación de usuarios"
   usersTotal: "Total de usuarios"
   activeUsers: "Cantidad de usuarios activos"

locales/fr-FR.yml

@@ -141,7 +141,6 @@ flagAsBot: "Ce compte est un robot"
 flagAsBotDescription: "Si ce compte est géré de manière automatisée, choisissez cette option. Si elle est activée, elle agira comme un marqueur pour les autres développeurs afin d'éviter des chaînes d'interaction sans fin avec d'autres robots et d'ajuster les systèmes internes de Misskey pour traiter ce compte comme un robot."
 flagAsCat: "Ce compte est un chat"
 flagAsCatDescription: "Activer l'option \" Je suis un chat \" pour ce compte."
-flagShowTimelineReplies: "Afficher les réponses dans le fil"
 autoAcceptFollowed: "Accepter automatiquement les demandes d’abonnement venant d’utilisateur·rice·s que vous suivez"
 addAccount: "Ajouter un compte"
 loginFailed: "Échec de la connexion"
@@ -236,7 +235,6 @@ resetAreYouSure: "Voulez-vous réinitialiser ?"
 saved: "Enregistré"
 messaging: "Discuter"
 upload: "Téléverser"
-keepOriginalUploading: "Garder l’image d’origine"
 fromDrive: "Depuis le Drive"
 fromUrl: "Depuis une URL"
 uploadFromUrl: "Téléverser via une URL"
@@ -323,6 +321,8 @@ disablingTimelinesInfo: "Même si vous désactivez ces fils, les administrateur
 registration: "S’inscrire"
 enableRegistration: "Autoriser les nouvelles inscriptions"
 invite: "Inviter"
+proxyRemoteFiles: "Utiliser les fichiers distants comme proxy"
+proxyRemoteFilesDescription: "Si vous activez ce paramètre, les fichiers distants non stockés ou supprimés en raison d'une capacité excédentaire seront affichés via un proxy local et généreront une miniature. Cela n'affectera pas le stockage du serveur."
 driveCapacityPerLocalAccount: "Volume du Drive par utilisateur local"
 driveCapacityPerRemoteAccount: "Volume du Drive par utilisateur distant"
 inMb: "en mégaoctets"
@@ -418,6 +418,7 @@ next: "Suivant"
 retype: "Confirmation"
 noteOf: "Notes de {user}"
 inviteToGroup: "Inviter dans un groupe"
+maxNoteTextLength: "Limite du nombre de caractères pour les notes"
 quoteAttached: "Avec citation"
 quoteQuestion: "Souhaitez-vous ajouter une citation ?"
 noMessagesYet: "Pas encore de discussion"
@@ -589,7 +590,6 @@ smtpSecure: "Utiliser SSL/TLS implicitement dans les connexions SMTP"
 smtpSecureInfo: "Désactiver cette option lorsque STARTTLS est utilisé"
 testEmail: "Tester la distribution de courriel"
 wordMute: "Filtre de mots"
-regexpError: "Erreur d’expression régulière"
 instanceMute: "Instance en sourdine"
 userSaysSomething: "{name} a dit quelque chose"
 makeActive: "Activer"
@@ -618,7 +618,6 @@ reportAbuse: "Signaler"
 reportAbuseOf: "Signaler {name}"
 fillAbuseReportDescription: "Veuillez expliquer les raisons du signalement. S'il s'agit d'une note précise, veuillez en donner le lien."
 abuseReported: "Le rapport est envoyé. Merci."
-reporter: "Signalé par"
 reporteeOrigin: "Origine du signalement"
 reporterOrigin: "Signalé par"
 forwardReport: "Transférer le signalement à l’instance distante"
@@ -744,7 +743,6 @@ notRecommended: "Déconseillé"
 botProtection: "Protection contre les bots"
 instanceBlocking: "Instances bloquées"
 selectAccount: "Sélectionner un compte"
-switchAccount: "Changer de compte"
 enabled: "Activé"
 disabled: "Désactivé"
 quickAction: "Actions rapides"
@@ -805,34 +803,16 @@ makeReactionsPublic: "Rendre les réactions publiques"
 makeReactionsPublicDescription: "Ceci rendra la liste de toutes vos réactions données publique."
 classic: "Classique"
 muteThread: "Mettre ce thread en sourdine"
-unmuteThread: "Ne plus masquer le fil"
 ffVisibility: "Visibilité des abonnés/abonnements"
 ffVisibilityDescription: "Permet de configurer qui peut voir les personnes que tu suis et les personnes qui te suivent."
 continueThread: "Afficher la suite du fil"
 deleteAccountConfirm: "Votre compte sera supprimé. Êtes vous certain ?"
 incorrectPassword: "Le mot de passe est incorrect."
-voteConfirm: "Confirmez-vous votre vote pour « {choice} » ?"
 hide: "Masquer"
 leaveGroup: "Quitter le groupe"
 leaveGroupConfirm: "Êtes vous sûr de vouloir quitter \"{name}\" ?"
 welcomeBackWithName: "Heureux de vous revoir, {name}"
 clickToFinishEmailVerification: "Veuillez cliquer sur [{ok}] afin de compléter la vérification par courriel."
-overridedDeviceKind: "Type d’appareil"
-smartphone: "Smartphone"
-tablet: "Tablette"
-auto: "Automatique"
-themeColor: "Couleur du thème"
-size: "Taille"
-numberOfColumn: "Nombre de colonnes"
-searchByGoogle: "Google"
-instanceDefaultLightTheme: "Thème clair par défaut sur toute l’instance"
-instanceDefaultDarkTheme: "Thème sombre par défaut sur toute l’instance"
-mutePeriod: "Durée de mise en sourdine"
-indefinitely: "Illimité"
-tenMinutes: "10 minutes"
-oneHour: "1 heure"
-oneDay: "1 jour"
-oneWeek: "1 semaine"
 _emailUnavailable:
   used: "Non disponible"
   format: "Le format de cette adresse de courriel est invalide"
@@ -989,8 +969,6 @@ _wordMute:
   hard: "Strict"
   mutedNotes: "Notes filtrées"
 _instanceMute:
-  instanceMuteDescription2: "Séparer avec de nouvelles lignes"
-  title: "Masque les notes venant des instances listées."
   heading: "Instances à mettre en sourdine"
 _theme:
   explore: "Explorer les thèmes"
@@ -1216,7 +1194,7 @@ _poll:
   votesCount: "{n} votes"
   totalVotes: "{n} votes au total"
   vote: "Voter"
-  showResult: "Voir résultats"
+  showResult: "Voir les résultats"
   voted: "Déjà voté"
   closed: "Terminé"
   remainingDays: "{d} jours, {h} heures restantes"
@@ -1263,11 +1241,10 @@ _exportOrImport:
   muteList: "Comptes masqués"
   blockingList: "Comptes bloqués"
   userLists: "Listes"
-  excludeMutingUsers: "Exclure les utilisateur·rice·s mis en sourdine"
   excludeInactiveUsers: "Exclure les utilisateur·rice·s inactifs"
 _charts:
-  federation: "Fédération"
-  apRequest: "Requêtes"
+  federationInstancesIncDec: "Variation du nombre d'instances fédérées"
+  federationInstancesTotal: "Nombre total d'instances fédérées"
   usersIncDec: "Variation du nombre d'utilisateur·rice·s"
   usersTotal: "Nombre des utilisateur·rice·s au total"
   activeUsers: "Nombre d'utilisateurices actif·ve·s"

locales/hr-HR.yml

@@ -1 +0,0 @@
----

locales/id-ID.yml

@@ -106,7 +106,6 @@ clickToShow: "Klik untuk melihat"
 sensitive: "Konten sensitif"
 add: "Tambahkan"
 reaction: "Reaksi"
-reactionSetting: "Reaksi untuk dimunculkan di bilah reaksi"
 reactionSettingDescription2: "Geser untuk memindah urutkan, klik untuk menghapus, tekan \"+\" untuk menambahkan"
 rememberNoteVisibility: "Ingat pengaturan visibilitas catatan"
 attachCancel: "Hapus lampiran"
@@ -141,8 +140,6 @@ flagAsBot: "Atur akun ini sebagai Bot"
 flagAsBotDescription: "Jika akun ini dikendalikan oleh program, tetapkanlah opsi ini. Jika diaktifkan, ini akan berfungsi sebagai tanda bagi pengembang lain untuk mencegah interaksi berantai dengan bot lain dan menyesuaikan sistem internal Misskey untuk memperlakukan akun ini sebagai bot."
 flagAsCat: "Atur akun ini sebagai kucing"
 flagAsCatDescription: "Nyalakan tanda ini untuk menandai akun ini sebagai kucing."
-flagShowTimelineReplies: "Tampilkan balasan di linimasa"
-flagShowTimelineRepliesDescription: "Menampilkan balasan pengguna dari note pengguna lain di linimasa apabila dinyalakan."
 autoAcceptFollowed: "Setujui otomatis permintaan mengikuti dari pengguna yang kamu ikuti"
 addAccount: "Tambahkan akun"
 loginFailed: "Gagal untuk masuk"
@@ -237,8 +234,6 @@ resetAreYouSure: "Yakin mau atur ulang?"
 saved: "Telah disimpan"
 messaging: "Pesan"
 upload: "Unggah"
-keepOriginalUploading: "Simpan gambar asli"
-keepOriginalUploadingDescription: "Simpan gambar yang diunggah sebagaimana gambar aslinya. Bila dimatikan, versi tampilan web akan dihasilkan pada saat diunggah."
 fromDrive: "Dari Drive"
 fromUrl: "Dari URL"
 uploadFromUrl: "Unggah dari URL"
@@ -325,6 +320,8 @@ disablingTimelinesInfo: "Admin dan Moderator akan selalu memiliki akses ke semua
 registration: "Pendaftaran"
 enableRegistration: "Nyalakan pendaftaran pengguna baru"
 invite: "Undang"
+proxyRemoteFiles: "Proksi berkas remote"
+proxyRemoteFilesDescription: "Jika diaktifkan, berkas luar yang (1) tidak disimpan secara lokal atau (2) terhapus dari melewati batas penyimpanan akan diproksi secara lokal (dengan thumbnail). Ini tidak akan mempengaruhi server penyimpanan."
 driveCapacityPerLocalAccount: "Kapasitas drive per pengguna lokal"
 driveCapacityPerRemoteAccount: "Kapasitas drive per pengguna remote"
 inMb: "dalam Megabytes"
@@ -420,6 +417,7 @@ next: "Selanjutnya"
 retype: "Masukkan ulang"
 noteOf: "Catatan milik {user}"
 inviteToGroup: "Undang ke grup"
+maxNoteTextLength: "Batas karakter catatan"
 quoteAttached: "Dikutip"
 quoteQuestion: "Apakah kamu ingin menambahkan kutipan?"
 noMessagesYet: "Tidak ada pesan"
@@ -448,7 +446,6 @@ uiLanguage: "Bahasa antarmuka pengguna"
 groupInvited: "Telah diundang ke grup"
 aboutX: "Tentang {x}"
 useOsNativeEmojis: "Gunakan Emoji bawaan sistem operasi"
-disableDrawer: "Jangan gunakan menu bergaya laci"
 youHaveNoGroups: "Kamu tidak memiliki grup"
 joinOrCreateGroup: "Bergabunglah dengan grup atau kamu dapat membuat grupmu sendiri."
 noHistory: "Tidak ada riwayat"
@@ -592,8 +589,6 @@ smtpSecure: "Gunakan SSL/TLS implisit untuk koneksi SMTP"
 smtpSecureInfo: "Matikan ini ketika menggunakan STARTTLS"
 testEmail: "Tes pengiriman surel"
 wordMute: "Bisukan kata"
-regexpError: "Kesalahan ekspresi reguler"
-instanceMute: "Bisuka instansi"
 userSaysSomething: "{name} mengatakan sesuatu"
 makeActive: "Aktifkan"
 display: "Tampilkan"
@@ -621,11 +616,8 @@ reportAbuse: "Laporkan"
 reportAbuseOf: "Laporkan {name}"
 fillAbuseReportDescription: "Mohon isi rincian laporan. Jika laporan ini mengenai catatan yang spesifik, mohon lampirkan serta URL catatan tersebut."
 abuseReported: "Laporan kamu telah dikirimkan. Terima kasih."
-reporter: "Pelapor"
 reporteeOrigin: "Yang dilaporkan"
 reporterOrigin: "Pelapor"
-forwardReport: "Teruskan laporan ke instansi luar"
-forwardReportIsAnonymous: "Untuk melindungi privasi akun kamu, akun anonim dari sistem akan digunakan sebagai pelapor pada instansi luar."
 send: "Kirim"
 abuseMarkAsResolved: "Tandai laporan sebagai selesai"
 openInNewTab: "Buka di tab baru"
@@ -687,7 +679,6 @@ center: "Tengah"
 wide: "Lebar"
 narrow: "Sempit"
 reloadToApplySetting: "Pengaturan ini akan diterapkan saat memuat halaman kembali. Apakah kamu ingin memuat halaman kembali sekarang?"
-needReloadToApply: "Pengaturan ini hanya akan diterapkan setelah memuat ulang halaman."
 showTitlebar: "Tampilkan bilah judul"
 clearCache: "Hapus tembolok"
 onlineUsersCount: "{n} orang sedang daring"
@@ -748,7 +739,6 @@ notRecommended: "Tidak disarankan"
 botProtection: "Perlindungan Bot"
 instanceBlocking: "Instansi yang diblokir"
 selectAccount: "Pilih akun"
-switchAccount: "Ganti akun"
 enabled: "Aktif"
 disabled: "Nonaktif"
 quickAction: "Aksi cepat"
@@ -797,7 +787,6 @@ pubSub: "Akun Pub/Sub"
 lastCommunication: "Komunikasi terakhir"
 resolved: "Selesai"
 unresolved: "Belum selesai"
-breakFollow: "Batalkan mengikuti"
 itsOn: "Aktif"
 itsOff: "Nonaktif"
 emailRequiredForSignup: "Membutuhkan alamat surel untuk mendaftar"
@@ -817,29 +806,6 @@ deleteAccountConfirm: "Akun akan dihapus. Apakah kamu yakin?"
 incorrectPassword: "Kata sandi salah."
 voteConfirm: "Konfirmasi suara kamu untuk ({choice})？"
 hide: "Sembunyikan"
-leaveGroup: "Keluar grup"
-leaveGroupConfirm: "Apakah kamu yakin untuk keluar dari \"{name}\"?"
-useDrawerReactionPickerForMobile: "Tampilkan bilah reaksi sebagai laci di ponsel"
-welcomeBackWithName: "Selamat datang kembali, {name}."
-clickToFinishEmailVerification: "Mohon klik [{ok}] untuk menyelesaikan verifikasi email."
-overridedDeviceKind: "Tipe perangkat"
-smartphone: "Ponsel"
-tablet: "Tablet"
-auto: "Otomatis"
-themeColor: "Warna Tema"
-size: "Ukuran"
-numberOfColumn: "Jumlah per kolom"
-searchByGoogle: "Penelusuran"
-instanceDefaultLightTheme: "Bawaan instan tema terang"
-instanceDefaultDarkTheme: "Bawaan instan tema gelap"
-instanceDefaultThemeDescription: "Masukkan kode tema di format obyek."
-mutePeriod: "Batas waktu bisu"
-indefinitely: "Selamanya"
-tenMinutes: "10 Menit"
-oneHour: "1 Jam"
-oneDay: "1 Hari"
-oneWeek: "1 Bulan"
-failedToFetchAccountInformation: "Gagal untuk mendapatkan informasi akun"
 _emailUnavailable:
   used: "Alamat surel ini telah digunakan"
   format: "Format tidak valid."
@@ -997,11 +963,6 @@ _wordMute:
   soft: "Lembut"
   hard: "Keras"
   mutedNotes: "Catatan yang dibisukan"
-_instanceMute:
-  instanceMuteDescription: "Pengaturan ini akan membisukan note/renote apa saja dari instansi yang terdaftar, termasuk pengguna yang membalas pengguna lain dalam instansi yang dibisukan."
-  instanceMuteDescription2: "Pisah dengan baris baru"
-  title: "Sembunyikan note dari instansi terdaftar."
-  heading: "Daftar instansi yang akan dibisukan"
 _theme:
   explore: "Jelajahi tema"
   install: "Pasang tema"
@@ -1273,11 +1234,9 @@ _exportOrImport:
   muteList: "Bisukan"
   blockingList: "Blokir"
   userLists: "Daftar"
-  excludeMutingUsers: "Kecualikan pengguna yang dibisukan"
-  excludeInactiveUsers: "Kecualikan pengguna tidak aktif"
 _charts:
-  federation: "Federasi"
-  apRequest: "Permintaan"
+  federationInstancesIncDec: "Perbedaan jumlah # instansi yang memfederasi"
+  federationInstancesTotal: "Jumlah # instansi yang memfederasi"
   usersIncDec: "Perbedaan dalam # pengguna"
   usersTotal: "Jumlah # pengguna"
   activeUsers: "Pengguna aktif"
@@ -1612,7 +1571,6 @@ _notification:
   youReceivedFollowRequest: "Kamu menerima permintaan mengikuti"
   yourFollowRequestAccepted: "Permintaan mengikuti kamu telah diterima"
   youWereInvitedToGroup: "Telah diundang ke grup"
-  pollEnded: "Hasil Kuesioner telah keluar"
   _types:
     all: "Semua"
     follow: "Ikuti"
@@ -1622,7 +1580,6 @@ _notification:
     quote: "Kutip"
     reaction: "Reaksi"
     pollVote: "Memilih di angket"
-    pollEnded: "Jajak pendapat berakhir"
     receiveFollowRequest: "Permintaan mengikuti diterima"
     followRequestAccepted: "Permintaan mengikuti disetujui"
     groupInvited: "Diundang ke grup"

locales/index.js

@@ -19,10 +19,12 @@ const languages = [
 	'da-DK',
 	'de-DE',
 	'en-US',
+	'eo-UY',
 	'es-ES',
 	'fr-FR',
 	'id-ID',
 	'it-IT',
+	'ja-NY',
 	'ja-JP',
 	'ja-KS',
 	'kab-KAB',
@@ -33,7 +35,6 @@ const languages = [
 	'pl-PL',
 	'pt-PT',
 	'ru-RU',
-	'sk-SK',
 	'ug-CN',
 	'uk-UA',
 	'zh-CN',
@@ -56,6 +57,7 @@ module.exports = Object.entries(locales)
 		const [lang] = k.split('-');
 		switch (k) {
 			case 'ja-JP': return v;
+			case 'ja-NY':
 			case 'ja-KS':
 			case 'en-US': return merge(locales['ja-JP'], v);
 			default: return merge(

locales/it-IT.yml

@@ -321,6 +321,8 @@ disablingTimelinesInfo: "Anche se disabiliti queste timeline, gli amministratori
 registration: "Iscriviti"
 enableRegistration: "Permettere nuove registrazioni"
 invite: "Invita"
+proxyRemoteFiles: "Usare file remoti come proxy"
+proxyRemoteFilesDescription: "Attivando questa opzione i file remoti non salvati o cancellati perché eccedenti il limite di archiviazione verranno inoltrati tramite proxy, inclusa la generazione di anteprime. Non ha effetto sullo spazio di archiviazione del server."
 driveCapacityPerLocalAccount: "Volume del Drive per utente locale"
 driveCapacityPerRemoteAccount: "Volume del Drive per utente remoto"
 inMb: "in Megabytes"
@@ -416,6 +418,7 @@ next: "Avanti"
 retype: "Conferma"
 noteOf: "Note di {user}"
 inviteToGroup: "Invitare al gruppo"
+maxNoteTextLength: "Lunghezza massima delle note"
 quoteAttached: "Citazione allegata"
 quoteQuestion: "Vuoi aggiungere una citazione?"
 noMessagesYet: "Ancora nessuna chat"
@@ -802,8 +805,6 @@ leaveGroupConfirm: "Uscire da「{name}」?"
 useDrawerReactionPickerForMobile: "Mostra sul drawer da dispositivo mobile"
 welcomeBackWithName: "Bentornato/a, {name}"
 clickToFinishEmailVerification: "Fai click su [{ok}] per completare la verifica dell'indirizzo email."
-searchByGoogle: "Cerca"
-indefinitely: "Non scade"
 _emailUnavailable:
   used: "Email già in uso"
   format: "Formato email non valido"
@@ -1176,8 +1177,8 @@ _exportOrImport:
   blockingList: "Account bloccati"
   userLists: "Liste"
 _charts:
-  federation: "Federazione"
-  apRequest: "Richieste"
+  federationInstancesIncDec: "Variazione del numero di istanze federate"
+  federationInstancesTotal: "Numero totale di istanze federate"
   usersIncDec: "Variazione del numero di utenti"
   usersTotal: "Numero totale di utenti"
   activeUsers: "Numero di utenti attivi"

locales/ja-KS.yml

@@ -81,8 +81,6 @@ somethingHappened: "なんかアカンことが起こったで"
 retry: "もっぺんやる？"
 pageLoadError: "ページの読み込みに失敗してしもうたで…"
 pageLoadErrorDescription: "これは普通、ネットワークかブラウザキャッシュが原因やからね。キャッシュをクリアするか、もうちっとだけ待ってくれへんか？"
-serverIsDead: "The server is not responding. Please wait for a while before trying again."
-youShouldUpgradeClient: "To display this page, please reload and use a new version client. "
 enterListName: "リスト名を入れてや"
 privacy: "プライバシー"
 makeFollowManuallyApprove: "自分が認めた人だけがこのアカウントをフォローできるようにする"
@@ -106,7 +104,6 @@ clickToShow: "押したら見えるで"
 sensitive: "ちょっとアカンやつやで"
 add: "増やす"
 reaction: "リアクション"
-reactionSetting: "Reaction that will be displayed in Picker. "
 reactionSettingDescription2: "ドラッグで並び替え、クリックで削除、＋を押して追加やで。"
 rememberNoteVisibility: "公開範囲覚えといて"
 attachCancel: "のっけるのやめる"
@@ -141,8 +138,6 @@ flagAsBot: "Botやで"
 flagAsBotDescription: "もしこのアカウントがプログラムによって運用されるんやったら、このフラグをオンにしてたのむで。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Misskeyのシステム上での扱いがBotに合ったもんになるんやで。"
 flagAsCat: "Catやで"
 flagAsCatDescription: "ワレ、猫ちゃんならこのフラグをつけてみ？"
-flagShowTimelineReplies: "It will display the reply to the note in the timeline. "
-flagShowTimelineRepliesDescription: "It will display the reply to notes other than the user notes in the timeline when you turn it on. "
 autoAcceptFollowed: "フォローしとるユーザーからのフォローリクエストを勝手に許可しとく"
 addAccount: "アカウントを追加"
 loginFailed: "ログインに失敗してしもうた…"
@@ -237,8 +232,6 @@ resetAreYouSure: "リセットしてええん？"
 saved: "保存したで！"
 messaging: "チャット"
 upload: "アップロード"
-keepOriginalUploading: "Retain the original image. "
-keepOriginalUploadingDescription: "When uploading the clip, the original version will be retained. Turning it of then uploading will produce images for public use. "
 fromDrive: "ドライブから"
 fromUrl: "URLから"
 uploadFromUrl: "URLアップロード"
@@ -323,6 +316,8 @@ disablingTimelinesInfo: "ここらへんのタイムラインを使えんよう
 registration: "登録"
 enableRegistration: "一見さんでも誰でもいらっしゃ～い"
 invite: "来てや"
+proxyRemoteFiles: "リモートのファイルをプロキシする"
+proxyRemoteFilesDescription: "この設定を有効にしたら、保存してなかったり容量が足らんくて消されたリモートファイルをローカルでプロキシして、サムネイルを作るようになるで。サーバーの容量には関係ないで。"
 driveCapacityPerLocalAccount: "ローカルユーザーひとりあたりのドライブ容量"
 driveCapacityPerRemoteAccount: "リモートユーザーひとりあたりのドライブ容量"
 inMb: "メガバイト単位"
@@ -415,6 +410,7 @@ next: "次"
 retype: "もっかい入力"
 noteOf: "{user}のノート"
 inviteToGroup: "グループに招く"
+maxNoteTextLength: "ノートの文字数制限"
 quoteAttached: "引用付いとるで"
 quoteQuestion: "引用として添付してもええか？"
 noMessagesYet: "まだチャットはあらへんで"
@@ -655,8 +651,6 @@ global: "グローバル"
 sent: "送信"
 hashtags: "ハッシュタグ"
 hide: "隠す"
-searchByGoogle: "探す"
-indefinitely: "無期限"
 _ad:
   back: "戻る"
 _gallery:
@@ -890,8 +884,6 @@ _exportOrImport:
   blockingList: "ブロック"
   userLists: "リスト"
 _charts:
-  federation: "連合"
-  apRequest: "リクエスト"
   usersTotal: "ユーザーの合計"
   activeUsers: "アクティブユーザー数"
   notesIncDec: "ノートの増減"

locales/kab-KAB.yml

@@ -55,7 +55,6 @@ accountInfo: "Talɣut n umiḍan"
 emailNotification: "Ilɣa imayl"
 selectAccount: "Fren amiḍan"
 accounts: "Imiḍan"
-searchByGoogle: "Nadi"
 _email:
   _follow:
     title: "Yeṭṭafaṛ-ik·em-id"

locales/kn-IN.yml

@@ -59,7 +59,6 @@ remove: "ಅಳಿಸು"
 smtpUser: "ಬಳಕೆಹೆಸರು"
 smtpPass: "ಗುಪ್ತಪದ"
 user: "ಬಳಕೆದಾರ"
-searchByGoogle: "ಹುಡುಕು"
 _email:
   _follow:
     title: "ಹಿಂಬಾಲಿಸಿದರು"

locales/ko-KR.yml

@@ -106,7 +106,6 @@ clickToShow: "클릭하여 보기"
 sensitive: "열람주의"
 add: "추가"
 reaction: "리액션"
-reactionSetting: "선택기에 표시할 리액션"
 reactionSettingDescription2: "끌어서 순서 변경, 클릭해서 삭제, ＋를 눌러서 추가할 수 있습니다."
 rememberNoteVisibility: "공개 범위를 기억하기"
 attachCancel: "첨부 취소"
@@ -141,8 +140,6 @@ flagAsBot: "나는 봇입니다"
 flagAsBotDescription: "이 계정을 자동화된 수단으로 운용할 경우에 활성화해 주세요. 이 플래그를 활성화하면, 다른 봇이 이를 참고하여 봇 끼리의 무한 연쇄 반응을 회피하거나, 이 계정의 시스템 상에서의 취급이 Bot 운영에 최적화되는 등의 변화가 생깁니다."
 flagAsCat: "나는 고양이다냥"
 flagAsCatDescription: "이 계정이 고양이라면 활성화 해주세요."
-flagShowTimelineReplies: "타임라인에 노트의 답글을 표시하기"
-flagShowTimelineRepliesDescription: "이 설정을 활성화하면 타임라인에 다른 유저 간의 답글을 표시합니다."
 autoAcceptFollowed: "팔로우 중인 유저로부터의 팔로우 요청을 자동 수락"
 addAccount: "계정 추가"
 loginFailed: "로그인에 실패했습니다"
@@ -237,8 +234,6 @@ resetAreYouSure: "초기화 하시겠습니까?"
 saved: "저장하였습니다"
 messaging: "대화"
 upload: "업로드"
-keepOriginalUploading: "원본 이미지를 유지"
-keepOriginalUploadingDescription: "이미지를 업로드할 때에 원본을 그대로 유지합니다. 비활성화하면 업로드할 때 브라우저에서 웹 공개용 이미지를 생성합니다."
 fromDrive: "드라이브에서"
 fromUrl: "URL로부터"
 uploadFromUrl: "URL 업로드"
@@ -325,6 +320,8 @@ disablingTimelinesInfo: "특정 타임라인을 비활성화하더라도 관리
 registration: "등록"
 enableRegistration: "신규 회원가입을 활성화"
 invite: "초대"
+proxyRemoteFiles: "리모트 파일 프록시"
+proxyRemoteFilesDescription: "이 설정을 활성화할 경우, 저장되지 않았거나 저장용량 초과로 삭제된 리모트 파일을 로컬에서 프록시하여 썸네일을 생성하게 됩니다. 서버의 스토리지에는 영향을 주지 않습니다."
 driveCapacityPerLocalAccount: "로컬 유저 한 명당 드라이브 용량"
 driveCapacityPerRemoteAccount: "리모트 유저 한 명당 드라이브 용량"
 inMb: "메가바이트 단위"
@@ -420,6 +417,7 @@ next: "다음"
 retype: "다시 입력"
 noteOf: "{user}의 노트"
 inviteToGroup: "그룹에 초대하기"
+maxNoteTextLength: "노트의 문자 수 제한"
 quoteAttached: "인용함"
 quoteQuestion: "인용해서 작성하시겠습니까?"
 noMessagesYet: "아직 대화가 없습니다"
@@ -448,7 +446,6 @@ uiLanguage: "UI 표시 언어"
 groupInvited: "그룹에 초대되었습니다"
 aboutX: "{x}에 대하여"
 useOsNativeEmojis: "OS 기본 이모지를 사용"
-disableDrawer: "드로어 메뉴를 사용하지 않기"
 youHaveNoGroups: "그룹이 없습니다"
 joinOrCreateGroup: "다른 그룹의 초대를 받거나, 직접 새 그룹을 만들어 보세요."
 noHistory: "기록이 없습니다"
@@ -620,11 +617,8 @@ reportAbuse: "신고"
 reportAbuseOf: "{name}을 신고하기"
 fillAbuseReportDescription: "신고하려는 이유를 자세히 알려주세요. 특정 게시물을 신고할 때에는 게시물의 URL도 포함해 주세요."
 abuseReported: "신고를 보냈습니다. 신고해 주셔서 감사합니다."
-reporter: "신고자"
 reporteeOrigin: "피신고자"
 reporterOrigin: "신고자"
-forwardReport: "리모트 인스턴스에도 신고 내용 보내기"
-forwardReportIsAnonymous: "리모트 인스턴스에서는 나의 정보를 볼 수 없으며, 익명의 시스템 계정으로 표시됩니다."
 send: "전송"
 abuseMarkAsResolved: "해결됨으로 표시"
 openInNewTab: "새 탭에서 열기"
@@ -686,7 +680,6 @@ center: "가운데"
 wide: "넓게"
 narrow: "좁게"
 reloadToApplySetting: "이 설정을 적용하려면 페이지를 새로고침해야 합니다. 바로 새로고침하시겠습니까?"
-needReloadToApply: "변경 사항은 새로고침하면 적용됩니다."
 showTitlebar: "타이틀 바를 표시하기"
 clearCache: "캐시 비우기"
 onlineUsersCount: "{n}명이 접속 중"
@@ -747,7 +740,6 @@ notRecommended: "추천하지 않음"
 botProtection: "Bot 방어"
 instanceBlocking: "인스턴스 차단"
 selectAccount: "계정 선택"
-switchAccount: "계정 바꾸기"
 enabled: "활성화"
 disabled: "비활성화"
 quickAction: "빠른 동작"
@@ -816,17 +808,6 @@ deleteAccountConfirm: "계정이 삭제되고 되돌릴 수 없게 됩니다.
 incorrectPassword: "비밀번호가 올바르지 않습니다."
 voteConfirm: "\"{choice}\"에 투표하시겠습니까?"
 hide: "숨기기"
-leaveGroup: "그룹 나가기"
-leaveGroupConfirm: "\"{name}\"에서 나갈까요?"
-useDrawerReactionPickerForMobile: "모바일에서 드로어 메뉴로 표시"
-welcomeBackWithName: "환영합니다, {name}님"
-clickToFinishEmailVerification: "[{ok}]를 눌러 이메일 인증을 완료하세요."
-overridedDeviceKind: "장치 유형"
-smartphone: "스마트폰"
-tablet: "태블릿"
-auto: "자동"
-searchByGoogle: "검색"
-indefinitely: "무기한"
 _emailUnavailable:
   used: "이 메일 주소는 사용중입니다"
   format: "형식이 올바르지 않습니다"
@@ -1263,8 +1244,8 @@ _exportOrImport:
   excludeMutingUsers: "뮤트한 유저 제외하기"
   excludeInactiveUsers: "휴면 중인 계정 제외하기"
 _charts:
-  federation: "연합"
-  apRequest: "요청"
+  federationInstancesIncDec: "연합 인스턴스 수 증감"
+  federationInstancesTotal: "연합 인스턴스 수 합계"
   usersIncDec: "유저 수 증감"
   usersTotal: "유저 수 합계"
   activeUsers: "활성 유저 수"

locales/nl-NL.yml

@@ -119,23 +119,6 @@ unblock: "Deblokkeren"
 suspend: "Opschorten"
 unsuspend: "Heractiveren"
 blockConfirm: "Weet je zeker dat je dit account wil blokkeren?"
-unblockConfirm: "Ben je zeker dat je deze account wil blokkeren?"
-suspendConfirm: "Ben je zeker dat je deze account wil suspenderen?"
-unsuspendConfirm: "Ben je zeker dat je deze account wil opnieuw aanstellen?"
-flagAsBot: "Markeer dit account als een robot."
-flagAsBotDescription: "Als dit account van een programma wordt beheerd, zet deze vlag aan. Het aanzetten helpt andere ontwikkelaars om bijvoorbeeld onbedoelde feedback loops te doorbreken of om Misskey meer geschikt te maken."
-flagAsCat: "Markeer dit account als een kat."
-flagAsCatDescription: "Zet deze vlag aan als je wilt aangeven dat dit account een kat is."
-flagShowTimelineReplies: "Toon antwoorden op de tijdlijn."
-flagShowTimelineRepliesDescription: "Als je dit vlag aanzet, toont de tijdlijn ook antwoorden op andere en niet alleen jouw eigen notities."
-autoAcceptFollowed: "Accepteer verzoeken om jezelf te volgen vanzelf als je de verzoeker al volgt."
-addAccount: "Account toevoegen"
-loginFailed: "Aanmelding mislukt."
-showOnRemote: "Toon op de externe instantie."
-general: "Algemeen"
-wallpaper: "Achtergrond"
-setWallpaper: "Achtergrond instellen"
-removeWallpaper: "Achtergrond verwijderen"
 searchWith: "Zoeken: {q}"
 youHaveNoLists: "Je hebt geen lijsten"
 followConfirm: "Weet je zeker dat je {name} wilt volgen?"
@@ -222,8 +205,6 @@ resetAreYouSure: "Resetten?"
 saved: "Opgeslagen"
 messaging: "Chat"
 upload: "Uploaden"
-keepOriginalUploading: "Origineel beeld behouden."
-keepOriginalUploadingDescription: "Bewaar de originele versie bij het uploaden van afbeeldingen. Indien uitgeschakeld, wordt bij het uploaden een alternatieve versie voor webpublicatie genereert."
 fromDrive: "Van schijf"
 fromUrl: "Van  URL"
 uploadFromUrl: "Uploaden vanaf een URL"
@@ -264,36 +245,9 @@ renameFile: "Wijzig bestandsnaam"
 folderName: "Mapnaam"
 createFolder: "Map aanmaken"
 renameFolder: "Map hernoemen"
-deleteFolder: "Map verwijderen"
-addFile: "Bestand toevoegen"
-emptyDrive: "Jouw Drive is leeg."
-emptyFolder: "Deze map is leeg"
-unableToDelete: "Kan niet worden verwijderd"
-inputNewFileName: "Voer een nieuwe naam in"
-copyUrl: "URL kopiëren"
-rename: "Hernoemen"
-avatar: "Avatar"
-banner: "Banner"
 nsfw: "NSFW"
-whenServerDisconnected: "Wanneer de verbinding met de server wordt onderbroken"
-disconnectedFromServer: "Verbinding met de server onderbroken."
-inMb: "in megabytes"
 pinnedNotes: "Vastgemaakte notitie"
 userList: "Lijsten"
-aboutMisskey: "Over Misskey"
-administrator: "Beheerder"
-token: "Token"
-securityKeyName: "Sleutelnaam"
-registerSecurityKey: "Zekerheids-Sleutel registreren"
-lastUsed: "Laatst gebruikt"
-unregister: "Uitschrijven"
-passwordLessLogin: "Inloggen zonder wachtwoord"
-resetPassword: "Wachtwoord terugzetten"
-newPasswordIs: "Het nieuwe wachtwoord is „{password}”."
-reduceUiAnimation: "Verminder beweging in de UI"
-share: "Delen"
-notFound: "Niet gevonden"
-cacheClear: "Cache verwijderen"
 smtpHost: "Server"
 smtpUser: "Gebruikersnaam"
 smtpPass: "Wachtwoord"
@@ -302,7 +256,6 @@ user: "Gebruikers"
 muteThread: "Discussies dempen "
 unmuteThread: "Dempen van discussie ongedaan maken"
 hide: "Verbergen"
-searchByGoogle: "Zoeken"
 _email:
   _follow:
     title: "volgde jou"
@@ -338,8 +291,6 @@ _exportOrImport:
   userLists: "Lijsten"
   excludeMutingUsers: "Negeer gedempte gebruikers"
   excludeInactiveUsers: "Negeer inactieve gebruikers"
-_charts:
-  federation: "Federatie"
 _timelines:
   home: "Startpagina"
 _pages:

locales/pl-PL.yml

@@ -320,6 +320,8 @@ disablingTimelinesInfo: "Administratorzy i moderatorzy będą zawsze mieć dost
 registration: "Zarejestruj się"
 enableRegistration: "Włącz rejestrację nowych użytkowników"
 invite: "Zaproś"
+proxyRemoteFiles: "Przekierowuj pliki obcych instancji przez proxy"
+proxyRemoteFilesDescription: "Gdy ta opcja jest włączona, zdalne pliki które nie są przechowywane lokalnie, lub zostały usunięte z powodu przekroczenia limitu miejsca będą kierowane przez proxy, razem z generowaniem miniatur. Nie ma to żadnego wpływu na przestrzeń dyskową serwera."
 driveCapacityPerLocalAccount: "Powierzchnia dyskowa na lokalnego użytkownika"
 driveCapacityPerRemoteAccount: "Powierzchnia dyskowa na zdalnego użytkownika"
 inMb: "W megabajtach"
@@ -415,6 +417,7 @@ next: "Dalej"
 retype: "Wprowadź ponownie"
 noteOf: "Wpisy {user}"
 inviteToGroup: "Zaproś do grupy"
+maxNoteTextLength: "Limit znaków dla wpisów"
 quoteAttached: "Zacytowano"
 quoteQuestion: "Czy na pewno chcesz umieścić cytat?"
 noMessagesYet: "Nie napisano jeszcze wiadomości"
@@ -758,8 +761,6 @@ received: "Otrzymane"
 hashtags: "Hashtag"
 pubSub: "Konta Pub/Sub"
 hide: "Ukryj"
-searchByGoogle: "Szukaj"
-indefinitely: "Nigdy"
 _ffVisibility:
   public: "Publikuj"
 _ad:
@@ -1083,8 +1084,7 @@ _exportOrImport:
   blockingList: "Zablokuj"
   userLists: "Listy"
 _charts:
-  federation: "Federacja"
-  apRequest: "Żądania"
+  federationInstancesTotal: "Łącznie sfederowanych instancji"
   usersTotal: "Łącznie # użytkowników"
   activeUsers: "Aktywni użytkownicy"
 _instanceCharts:

locales/pt-PT.yml

@@ -1,7 +1,6 @@
 ---
 _lang_: "Português"
 headlineMisskey: "Rede conectada por notas"
-introMisskey: "Bem-vindo! Misskey é um serviço de microblogue descentralizado de código aberto.\nCria \"notas\" e partilha o que te ocorre com todos à tua volta. 📡\nCom \"reações\" podes também expressar logo o que sentes às notas de todos. 👍\nExploremos um novo mundo! 🚀"
 monthAndDay: "{day}/{month}"
 search: "Pesquisar"
 notifications: "Notificações"
@@ -23,7 +22,6 @@ otherSettings: "Outras configurações"
 openInWindow: "Abrir numa janela"
 profile: "Perfil"
 timeline: "Timeline"
-noAccountDescription: "Este usuário não tem uma descrição."
 login: "Iniciar sessão"
 loggingIn: "Iniciando sessão…"
 logout: "Sair"
@@ -31,12 +29,8 @@ signup: "Registrar-se"
 uploading: "Enviando…"
 save: "Guardar"
 users: "Usuários"
-addUser: "Adicionar usuário"
 favorite: "Favoritar"
 favorites: "Favoritar"
-unfavorite: "Remover dos favoritos"
-favorited: "Adicionado aos favoritos."
-alreadyFavorited: "Já adicionado aos favoritos."
 showMore: "Ver mais"
 youGotNewFollower: "Você tem um novo seguidor"
 followRequestAccepted: "Pedido de seguir aceito"
@@ -67,7 +61,6 @@ pinnedNotes: "Post fixado"
 smtpUser: "Nome de usuário"
 smtpPass: "Senha"
 user: "Usuários"
-searchByGoogle: "Pesquisar"
 _email:
   _follow:
     title: "Você tem um novo seguidor"

locales/ro-RO.yml

@@ -1,650 +0,0 @@
----
-_lang_: "Română"
-headlineMisskey: "O rețea conectată prin note"
-introMisskey: "Bine ai venit! Misskey este un serviciu de microblogging open source și decentralizat.\nCreează \"note\" cu care să îți poți împărți gândurile cu oricine din jurul tău. 📡\nCu \"reacții\" îți poți expirma rapid părerea despre notele oricui. 👍\nHai să explorăm o lume nouă! 🚀"
-monthAndDay: "{day}/{month}"
-search: "Caută"
-notifications: "Notificări"
-username: "Nume de utilizator"
-password: "Parolă"
-forgotPassword: "Am uitat parola"
-fetchingAsApObject: "Se aduce din Fediverse..."
-ok: "OK"
-gotIt: "Am înțeles!"
-cancel: "Anulează"
-enterUsername: "Introdu numele de utilizator"
-renotedBy: "Re-notat de {user}"
-noNotes: "Nicio notă"
-noNotifications: "Nicio notificare"
-instance: "Instanță"
-settings: "Setări"
-basicSettings: "Setări generale"
-otherSettings: "Alte Setări"
-openInWindow: "Deschide într-o fereastră"
-profile: "Profil"
-timeline: "Cronologie"
-noAccountDescription: "Acest utilizator încă nu a scris un bio."
-login: "Autentifică-te"
-loggingIn: "Se autentifică"
-logout: "Deconectează-te"
-signup: "Înregistrează-te"
-uploading: "Se încarcă"
-save: "Salvează"
-users: "Utilizatori"
-addUser: "Adăugă utilizator"
-favorite: "Adaugă la favorite"
-favorites: "Favorite"
-unfavorite: "Elimină din favorite"
-favorited: "Adăugat la favorite."
-alreadyFavorited: "Deja adăugat la favorite."
-cantFavorite: "Nu se poate adăuga la favorite."
-pin: "Fixează pe profil"
-unpin: "Anulati fixare"
-copyContent: "Copiază conținutul"
-copyLink: "Copiază link-ul"
-delete: "Şterge"
-deleteAndEdit: "Șterge și editează"
-deleteAndEditConfirm: "Ești sigur că vrei să ștergi această notă și să o editezi? Vei pierde reacțiile, re-notele și răspunsurile acesteia."
-addToList: "Adaugă în listă"
-sendMessage: "Trimite un mesaj"
-copyUsername: "Copiază numele de utilizator"
-searchUser: "Caută un utilizator"
-reply: "Răspunde"
-loadMore: "Incarcă mai mult"
-showMore: "Arată mai mult"
-youGotNewFollower: "te-a urmărit"
-receiveFollowRequest: "Cerere de urmărire primită"
-followRequestAccepted: "Cerere de urmărire acceptată"
-mention: "Mențiune"
-mentions: "Mențiuni"
-directNotes: "Note directe"
-importAndExport: "Importă / Exportă"
-import: "Importă"
-export: "Exportă"
-files: "Fișiere"
-download: "Descarcă"
-driveFileDeleteConfirm: "Ești sigur ca vrei să ștergi fișierul \"{name}\"? Notele atașate fișierului vor fi șterse și ele."
-unfollowConfirm: "Ești sigur ca vrei să nu mai urmărești pe {name}?"
-exportRequested: "Ai cerut un export. S-ar putea să ia un pic. Va fi adăugat in Drive-ul tău odată completat."
-importRequested: "Ai cerut un import. S-ar putea să ia un pic."
-lists: "Liste"
-noLists: "Nu ai nici o listă"
-note: "Notă"
-notes: "Note"
-following: "Urmărești"
-followers: "Urmăritori"
-followsYou: "Te urmărește"
-createList: "Creează listă"
-manageLists: "Gestionează listele"
-error: "Eroare"
-somethingHappened: "A survenit o eroare"
-retry: "Reîncearcă"
-pageLoadError: "A apărut o eroare la încărcarea paginii."
-pageLoadErrorDescription: "De obicei asta este cauzat de o eroare de rețea sau cache-ul browser-ului. Încearcă să cureți cache-ul și apoi să încerci din nou puțin mai târziu."
-serverIsDead: "Serverul nu răspunde. Te rugăm să aștepți o perioadă și să încerci din nou."
-youShouldUpgradeClient: "Pentru a vedea această pagină, te rugăm să îți actualizezi clientul."
-enterListName: "Introdu un nume pentru listă"
-privacy: "Confidenţialitate"
-makeFollowManuallyApprove: "Fă cererile de urmărire să necesite aprobare"
-defaultNoteVisibility: "Vizibilitate implicită"
-follow: "Urmărești"
-followRequest: "Trimite cerere de urmărire"
-followRequests: "Cereri de urmărire"
-unfollow: "Nu mai urmări"
-followRequestPending: "Cerere de urmărire în așteptare"
-enterEmoji: "Introdu un emoji"
-renote: "Re-notează"
-unrenote: "Ia înapoi re-nota"
-renoted: "Re-notat."
-cantRenote: "Această postare nu poate fi re-notată."
-cantReRenote: "O re-notă nu poate fi re-notată."
-quote: "Citează"
-pinnedNote: "Notă fixată"
-pinned: "Fixat pe profil"
-you: "Tu"
-clickToShow: "Click pentru a afișa"
-sensitive: "NSFW"
-add: "Adaugă"
-reaction: "Reacție"
-reactionSetting: "Reacții care să apară in selectorul de reacții"
-reactionSettingDescription2: "Trage pentru a rearanja, apasă pe \"+\" pentru a adăuga."
-rememberNoteVisibility: "Amintește setarea de vizibilitate a notelor"
-attachCancel: "Înlătură atașament"
-markAsSensitive: "Marchează ca NSFW"
-unmarkAsSensitive: "Demarchează ca NSFW"
-enterFileName: "Introduceţi numele fişierului"
-mute: "Amuțește"
-unmute: "Înlătură amuțirea"
-block: "Blochează"
-unblock: "Deblochează"
-suspend: "Suspendă"
-unsuspend: "Anulează suspendare"
-blockConfirm: "Ești sigur că vrei să blochezi acest cont?"
-unblockConfirm: "Ești sigur ca vrei să deblochezi acest cont?"
-suspendConfirm: "Ești sigur ca vrei să suspendezi acest cont?"
-unsuspendConfirm: "Ești sigur ca vrei să nu mai suspendezi acest cont?"
-selectList: "Selectează o listă"
-selectAntenna: "Selectează o antenă"
-selectWidget: "Selectați un widget"
-editWidgets: "Editează widget-urile"
-editWidgetsExit: "Terminat"
-customEmojis: "Emoji personalizat"
-emoji: "Emoji"
-emojis: "Emoji-uri"
-emojiName: "Numele emoji-ului"
-emojiUrl: "URL-ul emoji-ului"
-addEmoji: "Adaugă un emoji"
-settingGuide: "Setări recomandate"
-cacheRemoteFiles: "Ține fișierele externe in cache"
-cacheRemoteFilesDescription: "Când această setare este dezactivată, fișierele externe sunt încărcate direct din instanța externă. Dezactivarea va scădea utilizarea spațiului de stocare, dar va crește traficul, deoarece thumbnail-urile nu vor fi generate."
-flagAsBot: "Marchează acest cont ca bot"
-flagAsBotDescription: "Activează această opțiune dacă acest cont este controlat de un program. Daca e activată, aceasta va juca rolul unui indicator pentru dezvoltatori pentru a preveni interacțiunea în lanțuri infinite cu ceilalți boți și ajustează sistemele interne al Misskey pentru a trata acest cont drept un bot."
-flagAsCat: "Marchează acest cont ca pisică"
-flagAsCatDescription: "Activează această opțiune dacă acest cont este o pisică."
-flagShowTimelineReplies: "Arată răspunsurile în cronologie"
-flagShowTimelineRepliesDescription: "Dacă e activată vor fi arătate în cronologie răspunsurile utilizatorilor către alte notele altor utilizatori."
-autoAcceptFollowed: "Aprobă automat cererile de urmărire de la utilizatorii pe care îi urmărești"
-addAccount: "Adaugă un cont"
-loginFailed: "Autentificare eșuată"
-showOnRemote: "Vezi mai multe pe instanța externă"
-general: "General"
-wallpaper: "Imagine de fundal"
-setWallpaper: "Setați imaginea de fundal"
-removeWallpaper: "Șterge imagine de fundal"
-searchWith: "Caută: {q}"
-youHaveNoLists: "Nu ai nici o listă"
-followConfirm: "Ești sigur ca vrei să urmărești pe {name}?"
-proxyAccount: "Cont proxy"
-proxyAccountDescription: "Un cont proxy este un cont care se comportă ca un urmăritor extern pentru utilizatorii puși sub anumite condiții. De exemplu, când un cineva adaugă un utilizator extern intr-o listă, activitatea utilizatorului extern nu va fi adusă în instanță daca nici un utilizator local nu urmărește acel utilizator, așa că în schimb contul proxy îl va urmări."
-host: "Gazdă"
-selectUser: "Selectează un utilizator"
-recipient: "Destinatar"
-annotation: "Adnotări"
-federation: "Federație"
-instances: "Instanțe"
-registeredAt: "Înregistrat în"
-latestRequestSentAt: "Ultima cerere trimisă"
-latestRequestReceivedAt: "Ultima cerere primită"
-latestStatus: "Ultimul status"
-storageUsage: "Utilizare stocare"
-charts: "Diagrame"
-perHour: "Pe oră"
-perDay: "Pe zi"
-stopActivityDelivery: "Nu mai trimite activități"
-blockThisInstance: "Blochează această instanță"
-operations: "Operațiuni"
-software: "Software"
-version: "Versiune"
-metadata: "Metadata"
-withNFiles: "{n} fișier(e)"
-monitor: "Monitor"
-jobQueue: "coada de job-uri"
-cpuAndMemory: "CPU și memorie"
-network: "Rețea"
-disk: "Disk"
-instanceInfo: "Informații despre instanță"
-statistics: "Statistici"
-clearQueue: "Șterge coada"
-clearQueueConfirmTitle: "Ești sigur că vrei să cureți coada?"
-clearQueueConfirmText: "Orice notă rămasă în coadă nu va fi federată. De obicei această operație nu este necesară."
-clearCachedFiles: "Golește cache-ul"
-clearCachedFilesConfirm: "Ești sigur că vrei să ștergi toate fișierele externe din cache?"
-blockedInstances: "Instanțe blocate"
-blockedInstancesDescription: "Scrie hostname-urile instanțelor pe care dorești să le blochezi. Instanțele listate nu vor mai putea să comunice cu această instanță."
-muteAndBlock: "Amuțiri și Blocări"
-mutedUsers: "Utilizatori amuțiți"
-blockedUsers: "Utilizatori blocați"
-noUsers: "Niciun utilizator"
-editProfile: "Editează profilul"
-noteDeleteConfirm: "Ești sigur că vrei să ștergi această notă?"
-pinLimitExceeded: "Nu poți mai fixa mai multe note"
-intro: "Misskey s-a instalat! Te rog crează un utilizator admin."
-done: "Gata"
-processing: "Se procesează"
-preview: "Previzualizare"
-default: "Prestabilit"
-noCustomEmojis: "Nu e niciun emoji"
-noJobs: "Nu e niciun job"
-federating: "Federație"
-blocked: "Blocat"
-suspended: "Suspendat"
-all: "Tot"
-subscribing: "Abonare"
-publishing: "Publicare"
-notResponding: "Nu răspunde"
-instanceFollowing: "Urmărind în instanță"
-instanceFollowers: "Urmăritori ai instanței"
-instanceUsers: "Utilizatori ai acestei instanțe"
-changePassword: "Schimbă parolă"
-security: "Securitate"
-retypedNotMatch: "Intrările nu corespund"
-currentPassword: "Parola curentă"
-newPassword: "Parola nouă"
-newPasswordRetype: "Rescrie parola nouă"
-attachFile: "Atașează fișiere"
-more: "Mai mult!"
-featured: "Evidențiat"
-usernameOrUserId: "Nume sau ID de utilizator"
-noSuchUser: "Utilizatorul nu a fost găsit"
-lookup: "Privire"
-announcements: "Anunțuri"
-imageUrl: "URL-ul imaginii"
-remove: "Şterge"
-removed: "Șterș cu succes"
-removeAreYouSure: "Ești sigur că vrei să înlături {x}?"
-deleteAreYouSure: "Ești sigur că vrei să ștergi {x}?"
-resetAreYouSure: "Sigur vrei să resetezi?"
-saved: "Salvat"
-messaging: "Chat"
-upload: "Încarcă"
-keepOriginalUploading: "Păstrează imaginea originală"
-keepOriginalUploadingDescription: "Salvează imaginea originala încărcată fără modificări. Dacă e oprită, o versiune pentru afișarea pe web va fi generată la încărcare."
-fromDrive: "Din Drive"
-fromUrl: "Din URL"
-uploadFromUrl: "Încarcă dintr-un URL"
-uploadFromUrlDescription: "URL-ul fișierului pe care dorești să îl încarci"
-uploadFromUrlRequested: "Încărcare solicitată"
-uploadFromUrlMayTakeTime: "S-ar putea să ia puțin până se finalizează încărcarea."
-explore: "Explorează"
-messageRead: "Citit"
-noMoreHistory: "Nu există mai mult istoric"
-startMessaging: "Începe un chat nou"
-nUsersRead: "citit de {n}"
-agreeTo: "Sunt de acord cu {0}"
-tos: "Termenii de utilizare"
-start: "Să începem"
-home: "Acasă"
-remoteUserCaution: "Deoarece acest utilizator este dintr-o instanță externă, informația afișată poate fi incompletă."
-activity: "Activitate"
-images: "Imagini"
-birthday: "Zi de naștere"
-yearsOld: "{age} ani"
-registeredDate: "Data înregistrării"
-location: "Locație"
-theme: "Teme"
-themeForLightMode: "Temă folosită pentru Modul Luminat"
-themeForDarkMode: "Temă folosită pentru Modul Întunecat"
-light: "Luminos"
-dark: "Întunecat"
-lightThemes: "Teme luminoase"
-darkThemes: "Teme întunecate"
-syncDeviceDarkMode: "Sincronizează Modul Întunecat cu setările dispozitivului"
-drive: "Drive"
-fileName: "Nume fișier"
-selectFile: "Alege un fisier"
-selectFiles: "Alege fișiere"
-selectFolder: "Selectează un folder"
-selectFolders: "Selectează folderele"
-renameFile: "Redenumește fișier"
-folderName: "Nume folder"
-createFolder: "Crează folder"
-renameFolder: "Redenumește acest folder"
-deleteFolder: "Șterge acest folder"
-addFile: "Adăugați un fișier"
-emptyDrive: "Drive-ul tău e gol"
-emptyFolder: "Folder-ul acesta este gol"
-unableToDelete: "Nu se poate șterge"
-inputNewFileName: "Introdu un nou nume de fișier"
-inputNewDescription: "Introdu o descriere nouă"
-inputNewFolderName: "Introdu un nume de folder nou"
-circularReferenceFolder: "Destinația folderului este un subfolder al folderului pe care dorești să îl muți."
-hasChildFilesOrFolders: "Acest folder nu este gol, așa că nu poate fi șters."
-copyUrl: "Copiază URL"
-rename: "Redenumește"
-avatar: "Avatar"
-banner: "Banner"
-nsfw: "NSFW"
-whenServerDisconnected: "Când pierzi conexiunea cu serverul"
-disconnectedFromServer: "Conecțiunea cu serverul a fost pierdută"
-reload: "Reîncarcă"
-doNothing: "Ignoră"
-reloadConfirm: "Ai dori să reîmprospătezi cronologia?"
-watch: "Vezi"
-unwatch: "Oprește-te din văzut"
-accept: "Acceptă"
-reject: "Respinge"
-normal: "Normal"
-instanceName: "Numele instanței"
-instanceDescription: "Descrierea instanței"
-maintainerName: "Administrator"
-maintainerEmail: "Email-ul administratorului"
-tosUrl: "URL-ul Termenilor de utilizare"
-thisYear: "An"
-thisMonth: "Lună"
-today: "Azi"
-dayX: "{day}"
-monthX: "{month}"
-yearX: "{year}"
-pages: "Pagini"
-integration: "Integrare"
-connectService: "Conectează"
-disconnectService: "Deconectează"
-enableLocalTimeline: "Activează cronologia locală"
-enableGlobalTimeline: "Activeaza cronologia globală"
-disablingTimelinesInfo: "Administratorii și Moderatorii vor avea mereu access la toate cronologiile, chiar dacă nu sunt activate."
-registration: "Inregistrare"
-enableRegistration: "Activează înregistrările pentru utilizatori noi"
-invite: "Invită"
-driveCapacityPerLocalAccount: "Capacitatea Drive-ului per utilizator local"
-driveCapacityPerRemoteAccount: "Capacitatea Drive-ului per utilizator extern"
-inMb: "În megabytes"
-iconUrl: "URL-ul iconiței"
-bannerUrl: "URL-ul imaginii de banner"
-backgroundImageUrl: "URL-ul imaginii de fundal"
-basicInfo: "Informații de bază"
-pinnedUsers: "Utilizatori fixați"
-pinnedUsersDescription: "Scrie utilizatorii, separați prin pauză de rând, care vor fi fixați pe pagina \"Explorează\"."
-pinnedPages: "Pagini fixate"
-pinnedPagesDescription: "Introdu linkurile Paginilor pe care le vrei fixate in vâruful paginii acestei instanțe, separate de pauze de rând."
-pinnedClipId: "ID-ul clip-ului pe care să îl fixezi"
-pinnedNotes: "Notă fixată"
-hcaptcha: "hCaptcha"
-enableHcaptcha: "Activează hCaptcha"
-hcaptchaSiteKey: "Site key"
-hcaptchaSecretKey: "Secret key"
-recaptcha: "reCAPTCHA"
-enableRecaptcha: "Activează reCAPTCHA"
-recaptchaSiteKey: "Site key"
-recaptchaSecretKey: "Secret key"
-avoidMultiCaptchaConfirm: "Folosirea mai multor sisteme Captcha poate cauza interferență între acestea. Ai dori să dezactivezi alte sisteme Captcha acum active? Dacă preferi să rămână activate, apasă Anulare."
-antennas: "Antene"
-manageAntennas: "Gestionează Antenele"
-name: "Nume"
-antennaSource: "Sursa antenei"
-antennaKeywords: "Cuvinte cheie ascultate"
-antennaExcludeKeywords: "Cuvinte cheie excluse"
-antennaKeywordsDescription: "Separă cu spații pentru o condiție ȘI sau cu o întrerupere de rând pentru o condiție SAU."
-notifyAntenna: "Notifică-mă pentru note noi"
-withFileAntenna: "Doar note cu fișiere"
-enableServiceworker: "Activează ServiceWorker"
-antennaUsersDescription: "Scrie un nume de utilizator per linie"
-caseSensitive: "Sensibil la majuscule și minuscule"
-withReplies: "Include răspunsuri"
-connectedTo: "Următoarele conturi sunt conectate"
-notesAndReplies: "Note și răspunsuri"
-withFiles: "Incluzând fișiere"
-silence: "Amuțește"
-silenceConfirm: "Ești sigur că vrei să amuțești acest utilizator?"
-unsilence: "Anulează amuțirea"
-unsilenceConfirm: "Ești sigur că vrei să anulezi amuțirea acestui utilizator?"
-popularUsers: "Utilizatori populari"
-recentlyUpdatedUsers: "Utilizatori activi recent"
-recentlyRegisteredUsers: "Utilizatori ce s-au alăturat recent"
-recentlyDiscoveredUsers: "Utilizatori descoperiți recent"
-exploreUsersCount: "Aici sunt {count} utilizatori"
-exploreFediverse: "Explorează Fediverse-ul"
-popularTags: "Taguri populare"
-userList: "Liste"
-about: "Despre"
-aboutMisskey: "Despre Misskey"
-administrator: "Administrator"
-token: "Token"
-twoStepAuthentication: "Autentificare în doi pași"
-moderator: "Moderator"
-nUsersMentioned: "Menționat de {n} utilizatori"
-securityKey: "Cheie de securitate"
-securityKeyName: "Numele cheii"
-registerSecurityKey: "Înregistrează o cheie de securitate"
-lastUsed: "Ultima utilizată"
-unregister: "Dezînregistrează"
-passwordLessLogin: "Autentificare fără parolă"
-resetPassword: "Resetează parola"
-newPasswordIs: "Noua parolă este \"{password}\""
-reduceUiAnimation: "Redu animațiile interfeței"
-share: "Distribuie"
-notFound: "Nu a fost găsit"
-notFoundDescription: "N-a fost găsită nicio pagină cu acest URL."
-uploadFolder: "Folder implicit pentru încărcări"
-cacheClear: "Golește cache-ul"
-markAsReadAllNotifications: "Marchează toate notificările drept citit"
-markAsReadAllUnreadNotes: "Marchează toate notele drept citit"
-markAsReadAllTalkMessages: "Marchează toate mesajele drept citit"
-help: "Ajutor"
-inputMessageHere: "Introdu un mesaj aici"
-close: "Închide"
-group: "Grup"
-groups: "Grupuri"
-createGroup: "Crează un grup"
-ownedGroups: "Grupuri deținute"
-joinedGroups: "Grupuri alăturate"
-invites: "Invită"
-groupName: "Numele grupului"
-members: "Membri"
-transfer: "Transferă"
-messagingWithUser: "Chat privat"
-messagingWithGroup: "Chat de grup"
-title: "Titlu"
-text: "Text"
-enable: "Activează"
-next: "Următorul"
-retype: "Introdu din nou"
-noteOf: "Notă de {user}"
-inviteToGroup: "Invită în grup"
-quoteAttached: "Citat"
-quoteQuestion: "Vrei să adaugi ca citat?"
-noMessagesYet: "Niciun mesaj încă"
-newMessageExists: "Ai mesaje noi"
-onlyOneFileCanBeAttached: "Poți atașa un singur fișier la un mesaj"
-signinRequired: "Te rog autentifică-te"
-invitations: "Invită"
-invitationCode: "Cod de invitație"
-checking: "Se verifică..."
-available: "Disponibil"
-unavailable: "Indisponibil"
-usernameInvalidFormat: "Poți folosi litere mari și mici, numere și underscore-uri."
-tooShort: "Prea scurt"
-tooLong: "Prea lung"
-weakPassword: "Parolă slabă"
-normalPassword: "Parolă medie"
-strongPassword: "Parolă puternică"
-passwordMatched: "Se potrivește!"
-passwordNotMatched: "Nu se potrivește"
-signinWith: "Autentifică-te cu {x}"
-signinFailed: "Nu se poate autentifica. Numele de utilizator sau parola introduse sunt incorecte."
-tapSecurityKey: "Apasă pe cheia ta de securitate."
-or: "Sau"
-language: "Limbă"
-uiLanguage: "Limba interfeței"
-groupInvited: "Ai fost invitat într-un grup"
-aboutX: "Despre {x}"
-useOsNativeEmojis: "Folosește emojiuri native OS-ului"
-disableDrawer: "Nu folosi meniuri în stil sertar"
-youHaveNoGroups: "Nu ai niciun grup"
-joinOrCreateGroup: "Primește o invitație într-un grup sau creează unul nou."
-noHistory: "Nu există istoric"
-signinHistory: "Istoric autentificări"
-disableAnimatedMfm: "Dezactivează MFM cu animații"
-doing: "Se procesează..."
-category: "Categorie"
-tags: "Etichete"
-docSource: "Sursa acestui document"
-createAccount: "Creează un cont"
-existingAccount: "Cont existent"
-regenerate: "Regenerează"
-fontSize: "Mărimea fontului"
-noFollowRequests: "Nu ai nicio cerere de urmărire în așteptare"
-openImageInNewTab: "Deschide imaginile în taburi noi"
-dashboard: "Panou de control"
-local: "Local"
-remote: "Extern"
-total: "Total"
-weekOverWeekChanges: "Schimbări până săptămâna trecută"
-dayOverDayChanges: "Schimbări până ieri"
-appearance: "Aspect"
-clientSettings: "Setări client"
-accountSettings: "Setări cont"
-promotion: "Promovat"
-promote: "Promovează"
-numberOfDays: "Numărul zilelor"
-hideThisNote: "Ascunde această notă"
-showFeaturedNotesInTimeline: "Arată notele recomandate în cronologii"
-objectStorage: "Object Storage"
-useObjectStorage: "Folosește Object Storage"
-objectStorageBaseUrl: "URL de bază"
-objectStorageBaseUrlDesc: "URL-ul este folosit pentru referință. Specifică URL-ul CDN-ului sau Proxy-ului tău dacă folosești unul. Pentru S3 folosește 'https://<bucket>.s3.amazonaws.com' și pentru GCS sau servicii echivalente folosește 'https://storage.googleapis.com/<bucket>', etc."
-objectStorageBucket: "Bucket"
-objectStorageBucketDesc: "Te rog specifică numele bucket-ului furnizorului tău."
-objectStoragePrefix: "Prefix"
-objectStoragePrefixDesc: "Fișierele vor fi stocate sub directoare cu acest prefix."
-objectStorageEndpoint: "Endpoint"
-objectStorageEndpointDesc: "Lasă acest câmp gol dacă folosești AWS S3, dacă nu specifică endpoint-ul ca '<host>' sau '<host>:<port>', depinzând de ce serviciu folosești."
-objectStorageRegion: "Regiune"
-objectStorageRegionDesc: "Specifică o regiune precum 'xx-east-1'. Dacă serviciul tău nu face distincția între regiuni lasă acest câmp gol sau introdu 'us-east-1'."
-objectStorageUseSSL: "Folosește SSl"
-objectStorageUseSSLDesc: "Oprește această opțiune dacă nu vei folosi HTTPS pentru conexiunile API-ului"
-objectStorageUseProxy: "Conectează-te prin Proxy"
-objectStorageUseProxyDesc: "Oprește această opțiune dacă vei nu folosi un Proxy pentru conexiunile API-ului"
-objectStorageSetPublicRead: "Setează \"public-read\" pentru încărcare"
-serverLogs: "Loguri server"
-deleteAll: "Șterge tot"
-showFixedPostForm: "Arată caseta de postare în vârful cronologie"
-newNoteRecived: "Sunt note noi"
-sounds: "Sunete"
-listen: "Ascultă"
-none: "Nimic"
-showInPage: "Arată în pagină"
-popout: "Scoate în afară"
-volume: "Volum"
-masterVolume: "Volumul principal"
-details: "Detalii"
-chooseEmoji: "Alege un emoji"
-unableToProcess: "Această operație nu poate fi completată"
-recentUsed: "Folosit recent"
-install: "Instalează"
-uninstall: "Dezinstalează"
-installedApps: "Aplicații autorizate"
-nothing: "Nu e nimic de văzut aici"
-installedDate: "Autorizat la data de"
-lastUsedDate: "Folosit ultima oara la"
-state: "Stare"
-sort: "Sortează"
-ascendingOrder: "Crescător"
-descendingOrder: "Descrescător"
-scratchpad: "Scratchpad"
-scratchpadDescription: "Scratchpad-ul oferă un mediu de experimentare în AiScript. Poți scrie, executa și verifica rezultatele acestuia interacționând cu Misskey în el."
-output: "Ieșire"
-script: "Script"
-disablePagesScript: "Dezactivează AiScript în Pagini"
-updateRemoteUser: "Actualizează informațiile utilizatorului extern"
-deleteAllFiles: "Șterge toate fișierele"
-deleteAllFilesConfirm: "Ești sigur că vrei să ștergi toate fișierele?"
-removeAllFollowing: "Dezurmărește toți utilizatorii urmăriți"
-removeAllFollowingDescription: "Asta va dez-urmări toate conturile din {host}. Te rog execută asta numai dacă instanța, de ex., nu mai există."
-userSuspended: "Acest utilizator a fost suspendat."
-userSilenced: "Acest utilizator a fost setat silențios."
-yourAccountSuspendedTitle: "Acest cont a fost suspendat"
-yourAccountSuspendedDescription: "Acest cont a fost suspendat din cauza încălcării termenilor de serviciu al serverului sau ceva similar. Contactează administratorul dacă ai dori să afli un motiv mai detaliat. Te rog nu crea un cont nou."
-menu: "Meniu"
-divider: "Separator"
-addItem: "Adaugă element"
-relays: "Relee"
-addRelay: "Adaugă Releu"
-inboxUrl: "URL-ul inbox-ului"
-addedRelays: "Relee adăugate"
-serviceworkerInfo: "Trebuie să fie activat pentru notificări push."
-deletedNote: "Notă ștearsă"
-invisibleNote: "Note ascunse"
-enableInfiniteScroll: "Încarcă mai mult automat"
-visibility: "Vizibilitate"
-poll: "Sondaj"
-useCw: "Ascunde conținutul"
-enablePlayer: "Deschide player-ul video"
-disablePlayer: "Închide player-ul video"
-expandTweet: "Expandează tweet"
-themeEditor: "Editor de teme"
-description: "Descriere"
-describeFile: "Adaugă titrări"
-enterFileDescription: "Introdu titrările"
-author: "Autor"
-leaveConfirm: "Ai schimbări nesalvate. Vrei să renunți la ele?"
-manage: "Gestionare"
-plugins: "Pluginuri"
-deck: "Deck"
-undeck: "Părăsește Deck"
-useBlurEffectForModal: "Folosește efect de blur pentru modale"
-smtpHost: "Gazdă"
-smtpUser: "Nume de utilizator"
-smtpPass: "Parolă"
-clearCache: "Golește cache-ul"
-info: "Despre"
-user: "Utilizatori"
-administration: "Gestionare"
-searchByGoogle: "Caută"
-_email:
-  _follow:
-    title: "te-a urmărit"
-_mfm:
-  mention: "Mențiune"
-  quote: "Citează"
-  emoji: "Emoji personalizat"
-  search: "Caută"
-_theme:
-  description: "Descriere"
-  keys:
-    mention: "Mențiune"
-    renote: "Re-notează"
-    divider: "Separator"
-_sfx:
-  note: "Note"
-  notification: "Notificări"
-  chat: "Chat"
-_widgets:
-  notifications: "Notificări"
-  timeline: "Cronologie"
-  activity: "Activitate"
-  federation: "Federație"
-  jobQueue: "coada de job-uri"
-_cw:
-  show: "Incarcă mai mult"
-_visibility:
-  home: "Acasă"
-  followers: "Urmăritori"
-_profile:
-  name: "Nume"
-  username: "Nume de utilizator"
-_exportOrImport:
-  followingList: "Urmărești"
-  muteList: "Amuțește"
-  blockingList: "Blochează"
-  userLists: "Liste"
-_charts:
-  federation: "Federație"
-_timelines:
-  home: "Acasă"
-_pages:
-  blocks:
-    image: "Imagini"
-  script:
-    categories:
-      list: "Liste"
-    blocks:
-      _join:
-        arg1: "Liste"
-      _randomPick:
-        arg1: "Liste"
-      _dailyRandomPick:
-        arg1: "Liste"
-      _seedRandomPick:
-        arg2: "Liste"
-      _pick:
-        arg1: "Liste"
-      _listLen:
-        arg1: "Liste"
-    types:
-      array: "Liste"
-_notification:
-  youWereFollowed: "te-a urmărit"
-  youWereInvitedToGroup: "Ai fost invitat într-un grup"
-  _types:
-    follow: "Urmărești"
-    mention: "Mențiune"
-    renote: "Re-notează"
-    quote: "Citează"
-    reaction: "Reacție"
-_deck:
-  _columns:
-    notifications: "Notificări"
-    tl: "Cronologie"
-    antenna: "Antene"
-    list: "Liste"
-    mentions: "Mențiuni"

locales/ru-RU.yml

@@ -235,7 +235,6 @@ resetAreYouSure: "На самом деле сбросить?"
 saved: "Сохранено"
 messaging: "Сообщения"
 upload: "Загрузить"
-keepOriginalUploading: "Сохранить исходное изображение"
 fromDrive: "С «диска»"
 fromUrl: "По ссылке"
 uploadFromUrl: "Загрузить по ссылке"
@@ -322,6 +321,8 @@ disablingTimelinesInfo: "У администраторов и модератор
 registration: "Регистрация"
 enableRegistration: "Разрешить регистрацию"
 invite: "Пригласить"
+proxyRemoteFiles: "Файлы с других сайтов пускать через прокси"
+proxyRemoteFilesDescription: "Когда эта настройка включена, файлы с других серверов, которые не сохранены или удалены для освобождения места, будут проксироваться локально, а так же для них будут создаваться миниатюры. Эта настройка не затрагивает хранение на сервере."
 driveCapacityPerLocalAccount: "Объём диска на одного локального пользователя"
 driveCapacityPerRemoteAccount: "Объём диска на одного пользователя с другого сайта"
 inMb: "В мегабайтах"
@@ -417,6 +418,7 @@ next: "Дальше"
 retype: "Введите ещё раз"
 noteOf: "Что пишет {user}"
 inviteToGroup: "Пригласить в группу"
+maxNoteTextLength: "Максимальная длина текста"
 quoteAttached: "Цитата"
 quoteQuestion: "Хотите добавить цитату?"
 noMessagesYet: "Пока ни одного сообщения"
@@ -741,7 +743,6 @@ notRecommended: "Не рекомендуется"
 botProtection: "Ботозащита"
 instanceBlocking: "Блокировка инстансов"
 selectAccount: "Выберите учётную запись"
-switchAccount: "Сменить учётную запись"
 enabled: "Вкл."
 disabled: "Откл."
 quickAction: "Быстрое действие"
@@ -815,8 +816,6 @@ leaveGroupConfirm: "Покинуть группу «{name}»?"
 useDrawerReactionPickerForMobile: "Выдвижная палитра на мобильном устройстве"
 welcomeBackWithName: "С возвращением, {name}!"
 clickToFinishEmailVerification: "Пожалуйста, нажмите [{ok}], чтобы завершить подтверждение адреса электронной почты."
-searchByGoogle: "Поиск"
-indefinitely: "вечно"
 _emailUnavailable:
   used: "Уже используется"
   format: "Неверный формат"
@@ -1250,8 +1249,8 @@ _exportOrImport:
   excludeMutingUsers: "За исключением заглушенных пользователей"
   excludeInactiveUsers: "Без неактивных учётных записей"
 _charts:
-  federation: "Федерация"
-  apRequest: "Запросы"
+  federationInstancesIncDec: "Изменение внешних связей"
+  federationInstancesTotal: "Количество внешних связей"
   usersIncDec: "Изменение числа пользователей"
   usersTotal: "Количество пользователей"
   activeUsers: "Активные пользователи"

locales/si-LK.yml

@@ -1 +0,0 @@
----

locales/tr-TR.yml

@@ -47,7 +47,6 @@ remove: "Sil"
 smtpUser: "Kullanıcı Adı"
 smtpPass: "Şifre"
 user: "Kullanıcı"
-searchByGoogle: "Arama"
 _mfm:
   search: "Arama"
 _sfx:

locales/ug-CN.yml

@@ -1,6 +1,5 @@
 ---
 _lang_: "ياپونچە"
 search: "ئىزدەش"
-searchByGoogle: "ئىزدەش"
 _mfm:
   search: "ئىزدەش"

locales/uk-UA.yml

@@ -312,6 +312,8 @@ disablingTimelinesInfo: "Адміністратори та модератори
 registration: "Реєстрація"
 enableRegistration: "Дозволити реєстрацію"
 invite: "Запросити"
+proxyRemoteFiles: "Проксувати файли з інших інстансів"
+proxyRemoteFilesDescription: "При увімкненні віддалені файли, які не зберігаються локально або були видалені через недостатнії обсяг пам'яті, будуть локально проксовані включаючи обкладинки. Це налаштування не впливає на пам'ять серверу. "
 driveCapacityPerLocalAccount: "Об'єм диска на одного локального користувача"
 driveCapacityPerRemoteAccount: "Об'єм диска на одного віддаленого користувача"
 inMb: "В мегабайтах"
@@ -405,6 +407,7 @@ next: "Далі"
 retype: "Введіть ще раз"
 noteOf: "Нотатка {user}"
 inviteToGroup: "Запрошення до групи"
+maxNoteTextLength: "Максимальна довжина нотатки"
 quoteAttached: "Цитата"
 quoteQuestion: "Ви хочете додати цитату?"
 noMessagesYet: "Ще немає повідомлень"
@@ -685,8 +688,6 @@ global: "Глобальна"
 sent: "Відправити"
 hashtags: "Хештеґ"
 hide: "Сховати"
-searchByGoogle: "Пошук"
-indefinitely: "Ніколи"
 _ad:
   back: "Назад"
 _gallery:
@@ -1037,8 +1038,7 @@ _exportOrImport:
   blockingList: "Заблокувати"
   userLists: "Списки"
 _charts:
-  federation: "Федіверс"
-  apRequest: "Запити"
+  federationInstancesTotal: "Загальна кількість федеративних інстансів"
   usersTotal: "Загальна кількість користувачів"
   activeUsers: "Активні користувачі"
   notesTotal: "Загальна кількість нотаток"

locales/vi-VN.yml

@@ -1,48 +0,0 @@
----
-_lang_: "Tiếng Việt"
-headlineMisskey: "Mạng xã hội liên hợp"
-monthAndDay: "{day} tháng {month}"
-search: "Tìm kiếm"
-notifications: "Thông báo"
-username: "Tên người dùng"
-password: "Mật khẩu"
-forgotPassword: "Quên mật khẩu"
-ok: "Đồng ý"
-renotedBy: "Chia sẻ bởi {user}"
-flagAsBot: "Đánh dấu đây là tài khoản bot"
-searchWith: "Tìm kiếm: {q}"
-followConfirm: "Bạn có chắc muốn theo dõi {name}？"
-cpuAndMemory: "CPU và Dung lượng"
-dayX: "{day}"
-yearX: "{year}"
-aboutMisskey: "Về Misskey"
-smtpUser: "Tên người dùng"
-smtpPass: "Mật khẩu"
-reportAbuseOf: "Báo cáo {name}"
-renotedCount: "Lượt chia sẻ"
-translatedFrom: "Dịch từ {x}"
-searchByGoogle: "Google"
-_mfm:
-  search: "Tìm kiếm"
-_theme:
-  installed: "{name} đã được cài đặt"
-_sfx:
-  notification: "Thông báo"
-_ago:
-  unknown: "Không rõ"
-  future: "Tương lai"
-  justNow: "Vừa xong"
-  secondsAgo: "{n}s trước"
-  minutesAgo: "{n} phút trước"
-  hoursAgo: "{n} giờ trước"
-  daysAgo: "{n} ngày trước"
-  weeksAgo: "{n} tuần trước"
-  monthsAgo: "{n} tháng trước"
-  yearsAgo: "{n} năm trước"
-_widgets:
-  notifications: "Thông báo"
-_profile:
-  username: "Tên người dùng"
-_deck:
-  _columns:
-    notifications: "Thông báo"

locales/zh-CN.yml

@@ -8,12 +8,12 @@ notifications: "通知"
 username: "用户名"
 password: "密码"
 forgotPassword: "忘记密码"
-fetchingAsApObject: "在联邦宇宙查询中..."
+fetchingAsApObject: "联合查询"
 ok: "OK"
 gotIt: "我明白了"
 cancel: "取消"
 enterUsername: "输入用户名"
-renotedBy: "由 {user} 转贴"
+renotedBy: "由 {user} 转推"
 noNotes: "没有帖文"
 noNotifications: "无通知"
 instance: "实例"
@@ -69,7 +69,7 @@ exportRequested: "导出请求已提交，这可能需要花一些时间，导
 importRequested: "导入请求已提交，这可能需要花一点时间。"
 lists: "列表"
 noLists: "列表为空"
-note: "发帖"
+note: "帖子"
 notes: "帖子"
 following: "关注中"
 followers: "关注者"
@@ -85,7 +85,7 @@ serverIsDead: "服务器没有响应。 请稍等片刻，然后重试。"
 youShouldUpgradeClient: "请重新加载并使用新版本的客户端查看此页面。"
 enterListName: "输入列表名称"
 privacy: "隐私"
-makeFollowManuallyApprove: "关注请求需要批准"
+makeFollowManuallyApprove: "关注者的关注请求需要批准"
 defaultNoteVisibility: "默认可见性"
 follow: "关注"
 followRequest: "关注申请"
@@ -141,9 +141,7 @@ flagAsBot: "这是一个机器人账号"
 flagAsBotDescription: "如果此帐户由程序控制，请启用此项。启用后，此标志可以帮助其他开发人员防止机器人之间产生无限互动的行为，并让Misskey的内部系统将此帐户识别为机器人。"
 flagAsCat: "将这个账户设定为一只猫"
 flagAsCatDescription: "如果您想表明此帐户是一只猫，请打开此标志。"
-flagShowTimelineReplies: "在时间线上显示帖子的回复"
-flagShowTimelineRepliesDescription: "启用时，时间线除了显示用户的帖子外，还会显示其他用户对帖子的回复。"
-autoAcceptFollowed: "自动允许关注者的关注"
+autoAcceptFollowed: "自动允许关注"
 addAccount: "添加账户"
 loginFailed: "登录失败"
 showOnRemote: "转到所在实例显示"
@@ -162,7 +160,7 @@ recipient: "收件人"
 annotation: "注解"
 federation: "联合"
 instances: "实例"
-registeredAt: "初次观测"
+registeredAt: "初次观察"
 latestRequestSentAt: "上次发送的请求"
 latestRequestReceivedAt: "上次收到的请求"
 latestStatus: "最后状态"
@@ -237,8 +235,6 @@ resetAreYouSure: "恢复默认设置？"
 saved: "已保存"
 messaging: "聊天"
 upload: "本地上传"
-keepOriginalUploading: "保留原图"
-keepOriginalUploadingDescription: "上传图片时保留原始图片。关闭时，浏览器会在上传时生成一张用于web发布的图片。"
 fromDrive: "从网盘中"
 fromUrl: "从 URL"
 uploadFromUrl: "从网址上传"
@@ -254,7 +250,7 @@ agreeTo: "{0}人同意"
 tos: "服务条款"
 start: "开始"
 home: "首页"
-remoteUserCaution: "由于此用户来自其它实例，显示的信息可能不完整。"
+remoteUserCaution: "由于是远程用户，信息不完整。"
 activity: "活动"
 images: "图片"
 birthday: "生日"
@@ -325,6 +321,8 @@ disablingTimelinesInfo: "即使时间线功能被禁用，出于便利性的原
 registration: "注册"
 enableRegistration: "允许新用户注册"
 invite: "邀请"
+proxyRemoteFiles: "代理远程文件"
+proxyRemoteFilesDescription: "启用此设置后，由于超出存储容量而导致未保存被删除的远程文件将被本地代理，并且会生成缩略图。不会影响服务器的存储。"
 driveCapacityPerLocalAccount: "每个用户的网盘空间"
 driveCapacityPerRemoteAccount: "每个远程用户的网盘容量"
 inMb: "以兆字节(MegaByte)为单位"
@@ -372,7 +370,7 @@ recentlyUpdatedUsers: "最近投稿的用户"
 recentlyRegisteredUsers: "最近登录的用户"
 recentlyDiscoveredUsers: "最近发现的用户"
 exploreUsersCount: "有{count}个用户"
-exploreFediverse: "探索联邦宇宙"
+exploreFediverse: "探索Fediverse"
 popularTags: "热门标签"
 userList: "列表"
 about: "关于"
@@ -420,6 +418,7 @@ next: "下一个"
 retype: "重新输入"
 noteOf: "{user}的帖子"
 inviteToGroup: "群组邀请"
+maxNoteTextLength: "帖子的字数限制"
 quoteAttached: "已引用"
 quoteQuestion: "是否引用此链接内容？"
 noMessagesYet: "现在没有新的聊天"
@@ -561,7 +560,7 @@ manage: "管理"
 plugins: "插件"
 deck: "Deck"
 undeck: "取消Deck"
-useBlurEffectForModal: "对话框使用模糊效果"
+useBlurEffectForModal: "模态框使用模糊效果"
 useFullReactionPicker: "使用全功能的回应工具栏"
 width: "宽度"
 height: "高度"
@@ -592,8 +591,6 @@ smtpSecure: "在 SMTP 连接中使用隐式 SSL / TLS"
 smtpSecureInfo: "使用STARTTLS时关闭。"
 testEmail: "邮件发送测试"
 wordMute: "文字屏蔽"
-regexpError: "正则表达式错误"
-regexpErrorDescription: "{tab} 屏蔽文字的第 {line} 行的正则表达式有错误："
 instanceMute: "实例的屏蔽"
 userSaysSomething: "{name}说了什么"
 makeActive: "启用"
@@ -622,11 +619,8 @@ reportAbuse: "举报"
 reportAbuseOf: "举报{name}"
 fillAbuseReportDescription: "请填写举报的详细原因。如果有对方发的帖子，请同时填写URL地址。"
 abuseReported: "内容已发送。感谢您的报告。"
-reporter: "报告者"
 reporteeOrigin: "举报来源"
 reporterOrigin: "举报者来源"
-forwardReport: "将报告转发给远程实例"
-forwardReportIsAnonymous: "在远程实例上显示的报告者是匿名的系统账号，而不是您的账号。"
 send: "发送"
 abuseMarkAsResolved: "处理完毕"
 openInNewTab: "在新标签页中打开"
@@ -823,25 +817,6 @@ leaveGroupConfirm: "确定离开「{name}」？"
 useDrawerReactionPickerForMobile: "在移动设备上使用抽屉显示"
 welcomeBackWithName: "欢迎回来，{name}"
 clickToFinishEmailVerification: "点击 [{ok}] 完成电子邮件地址认证。"
-overridedDeviceKind: "设备类型"
-smartphone: "智能手机"
-tablet: "平板"
-auto: "自动"
-themeColor: "主题颜色"
-size: "大小"
-numberOfColumn: "列数"
-searchByGoogle: "Google"
-instanceDefaultLightTheme: "实例默认浅色主题"
-instanceDefaultDarkTheme: "实例默认深色主题"
-instanceDefaultThemeDescription: "以对象格式键入主题代码"
-mutePeriod: "屏蔽期限"
-indefinitely: "永久"
-tenMinutes: "10分钟"
-oneHour: "1小时"
-oneDay: "1天"
-oneWeek: "1周"
-reflectMayTakeTime: "可能需要一些时间才能体现出效果。"
-failedToFetchAccountInformation: "获取账户信息失败"
 _emailUnavailable:
   used: "已经被使用过"
   format: "无效的格式"
@@ -906,7 +881,7 @@ _nsfw:
 _mfm:
   cheatSheet: "MFM代码速查表"
   intro: "MFM是一种在Misskey中的各个位置使用的专用标记语言。在这里您可以看到MFM中可用的语法列表。"
-  dummy: "通过Misskey扩展联邦宇宙的世界"
+  dummy: "通过Misskey扩展Fediverse的世界"
   mention: "提及"
   mentionDescription: "可以使用 @+用户名 来指示特定用户"
   hashtag: "话题标签"
@@ -969,7 +944,7 @@ _mfm:
   rotateDescription: "旋转指定的角度。"
 _instanceTicker:
   none: "不显示"
-  remote: "仅远程用户"
+  remote: "显示给远程用户"
   always: "始终显示"
 _serverDisconnectedBehavior:
   reload: "自动重载"
@@ -1053,7 +1028,7 @@ _theme:
     mention: "提及"
     mentionMe: "提及"
     renote: "转发"
-    modalBg: "对话框背景"
+    modalBg: "模态框背景"
     divider: "分割线"
     scrollbarHandle: "滚动条"
     scrollbarHandleHover: "滚动条（悬停）"
@@ -1219,7 +1194,7 @@ _poll:
   noMore: "无法再添加更多了"
   canMultipleVote: "允许多个投票"
   expiration: "截止时间"
-  infinite: "永久"
+  infinite: "不限时间"
   at: "指定日期"
   after: "指定时间"
   deadlineDate: "截止日期"
@@ -1240,7 +1215,7 @@ _visibility:
   publicDescription: "您的帖子将出现在全局时间线上"
   home: "首页"
   homeDescription: "仅发送至首页的时间线"
-  followers: "仅关注者"
+  followers: "关注者"
   followersDescription: "仅发送至关注者"
   specified: "指定用户"
   specifiedDescription: "仅发送至指定用户"
@@ -1278,8 +1253,8 @@ _exportOrImport:
   excludeMutingUsers: "排除屏蔽用户"
   excludeInactiveUsers: "排除不活跃用户"
 _charts:
-  federation: "联合"
-  apRequest: "请求"
+  federationInstancesIncDec: "联合：增加/减少"
+  federationInstancesTotal: "联合总数"
   usersIncDec: "用户数量：增加/减少"
   usersTotal: "用户总数"
   activeUsers: "活跃用户数"
@@ -1614,7 +1589,6 @@ _notification:
   youReceivedFollowRequest: "您有新的关注请求"
   yourFollowRequestAccepted: "您的关注请求已通过"
   youWereInvitedToGroup: "您有新的群组邀请"
-  pollEnded: "问卷调查结果已生成。"
   _types:
     all: "全部"
     follow: "关注中"
@@ -1624,7 +1598,6 @@ _notification:
     quote: "引用"
     reaction: "回应"
     pollVote: "问卷调查被投票"
-    pollEnded: "问卷调查结束"
     receiveFollowRequest: "收到关注请求"
     followRequestAccepted: "关注请求已通过"
     groupInvited: "加入群组邀请"

locales/zh-TW.yml

@@ -81,8 +81,6 @@ somethingHappened: "發生錯誤"
 retry: "重試"
 pageLoadError: "載入頁面失敗"
 pageLoadErrorDescription: "這通常是因為網路錯誤或是瀏覽器快取殘留的原因。請先清除瀏覽器快取，稍後再重試"
-serverIsDead: "伺服器沒有回應。請稍等片刻，然後重試。"
-youShouldUpgradeClient: "請重新載入以使用新版本的客戶端顯示此頁面"
 enterListName: "輸入清單名稱"
 privacy: "隱私"
 makeFollowManuallyApprove: "手動審核追隨請求"
@@ -106,7 +104,6 @@ clickToShow: "按一下以顯示"
 sensitive: "敏感內容"
 add: "新增"
 reaction: "情感"
-reactionSetting: "在選擇器中顯示反應"
 reactionSettingDescription2: "拖動以重新列序，點擊以刪除，按下 + 添加。"
 rememberNoteVisibility: "記住貼文可見性"
 attachCancel: "移除附件"
@@ -141,7 +138,6 @@ flagAsBot: "此使用者是機器人"
 flagAsBotDescription: "如果本帳戶是由程式控制，請啟用此選項。啟用後，會作為標示幫助其他開發者防止機器人之間產生無限互動的行為，並會調整Misskey內部系統將本帳戶識別為機器人"
 flagAsCat: "此使用者是貓"
 flagAsCatDescription: "如果想將本帳戶標示為一隻貓，請開啟此標示"
-flagShowTimelineReplies: "在時間軸上顯示貼文的回覆"
 autoAcceptFollowed: "自動追隨中使用者的追隨請求"
 addAccount: "添加帳戶"
 loginFailed: "登入失敗"
@@ -322,6 +318,8 @@ disablingTimelinesInfo: "即使您關閉了時間線功能，管理員和協調
 registration: "註冊"
 enableRegistration: "開啟新使用者註冊"
 invite: "邀請"
+proxyRemoteFiles: "遠端代理檔案"
+proxyRemoteFilesDescription: "啟用此設置後，由於超出存儲容量而未保存或刪除的遠程文件將被本地代理，並且將生成預覽圖。這不影響伺服器的存儲。"
 driveCapacityPerLocalAccount: "每個本地用戶的雲端空間大小"
 driveCapacityPerRemoteAccount: "每個非本地用戶的雲端容量"
 inMb: "以Mbps為單位"
@@ -417,6 +415,7 @@ next: "下一步"
 retype: "重新輸入"
 noteOf: "{user}的貼文"
 inviteToGroup: "邀請至群組"
+maxNoteTextLength: "貼文的字數限制"
 quoteAttached: "引用"
 quoteQuestion: "是否要引用？"
 noMessagesYet: "沒有訊息"
@@ -603,9 +602,6 @@ reportAbuse: "檢舉"
 reportAbuseOf: "檢舉{name}"
 fillAbuseReportDescription: "請填寫檢舉的詳細理由。可以的話，請附上針對的URL網址。"
 abuseReported: "回報已送出。感謝您的報告。"
-reporter: "檢舉者"
-reporteeOrigin: "檢舉來源"
-reporterOrigin: "檢舉者來源"
 send: "發送"
 abuseMarkAsResolved: "處理完畢"
 openInNewTab: "在新分頁中開啟"
@@ -741,7 +737,6 @@ postToGallery: "發佈到相簿"
 gallery: "相簿"
 recentPosts: "最新貼文"
 popularPosts: "熱門的貼文"
-shareWithNote: "在貼文中分享"
 ads: "廣告"
 expiration: "期限"
 memo: "備忘錄"
@@ -751,35 +746,12 @@ middle: "中"
 low: "低"
 emailNotConfiguredWarning: "沒有設定電子郵件地址"
 ratio: "%"
-previewNoteText: "預覽文本"
-customCss: "自定義 CSS"
 global: "公開"
 sent: "發送"
-received: "收取"
-searchResult: "搜尋結果"
 hashtags: "#tag"
-troubleshooting: "故障排除"
-useBlurEffect: "在 UI 上使用模糊效果"
-misskeyUpdated: "Misskey 更新完成！"
-translate: "翻譯"
-translatedFrom: "從 {x} 翻譯"
-accountDeletionInProgress: "正在刪除帳戶"
-pubSub: "Pub/Sub 帳戶"
-resolved: "已解決"
-unresolved: "未解決"
-breakFollow: "移除追蹤者"
 hide: "隱藏"
-leaveGroupConfirm: "確定離開「{name}」？"
-auto: "自動"
-searchByGoogle: "搜尋"
-indefinitely: "無期限"
 _ffVisibility:
   public: "發佈"
-  private: "私密"
-_signup:
-  almostThere: "即將完成"
-_accountDelete:
-  inProgress: "正在刪除"
 _ad:
   back: "返回"
   reduceFrequencyOfThisAd: "降低此廣告的頻率 "
@@ -1142,8 +1114,6 @@ _exportOrImport:
   blockingList: "封鎖"
   userLists: "清單"
 _charts:
-  federation: "站台聯邦"
-  apRequest: "請求"
   usersIncDec: "使用者増減"
   usersTotal: "使用者合共"
   activeUsers: "活躍使用者"

package.json

@@ -1,10 +1,10 @@
 {
 	"name": "misskey",
-	"version": "12.110.1-nca10.net-v1",
+	"version": "12.102.1-simkey",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/misskey-dev/misskey.git"
+		"url": "https://github.com/sim1222/misskey.git"
 	},
 	"private": true,
 	"scripts": {
@@ -13,7 +13,8 @@
 		"start": "cd packages/backend && node --experimental-json-modules ./built/index.js",
 		"start:test": "cd packages/backend && cross-env NODE_ENV=test node --experimental-json-modules ./built/index.js",
 		"init": "npm run migrate",
-		"migrate": "cd packages/backend && npx typeorm migration:run -d ormconfig.js",
+		"ormconfig": "node ./packages/backend/ormconfig.js",
+		"migrate": "cd packages/backend && npx typeorm migration:run",
 		"migrateandstart": "npm run migrate && npm run start",
 		"gulp": "gulp build",
 		"watch": "npm run dev",
@@ -41,10 +42,12 @@
 		"js-yaml": "4.1.0"
 	},
 	"devDependencies": {
-		"@typescript-eslint/parser": "5.18.0",
+		"@redocly/openapi-core": "1.0.0-beta.79",
+		"@types/fluent-ffmpeg": "2.1.20",
+		"@typescript-eslint/parser": "5.10.0",
 		"cross-env": "7.0.3",
-		"cypress": "9.5.3",
+		"cypress": "9.3.1",
 		"start-server-and-test": "1.14.0",
-		"typescript": "4.6.3"
+		"typescript": "4.5.5"
 	}
 }

packages/backend/.mocharc.json

@@ -1,9 +1,6 @@
 {
 	"extension": ["ts","js","cjs","mjs"],
-	"node-option": [
-		"experimental-specifier-resolution=node",
-		"loader=./test/loader.js"
-	],
+	"require": ["ts-node/register", "tsconfig-paths/register"],
 	"slow": 1000,
 	"timeout": 35000,
 	"exit": true

packages/backend/@types/langmap.d.ts

@@ -0,0 +1,10 @@
+declare module 'langmap' {
+	type Lang = {
+		nativeName: string;
+		englishName: string;
+	};
+
+	const langmap: { [lang: string]: Lang };
+
+	export = langmap;
+}

packages/backend/@types/probe-image-size.d.ts

@@ -1,5 +1,5 @@
 declare module 'probe-image-size' {
-	import { ReadStream } from 'node:fs';
+	import { ReadStream } from 'fs';
 
 	type ProbeOptions = {
 		retries: 1;

packages/backend/migration/1000000000000-Init.js

@@ -1,6 +1,6 @@
-
-
-export class Init1000000000000 {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class Init1000000000000 {
     async up(queryRunner) {
         await queryRunner.query(`CREATE TYPE "log_level_enum" AS ENUM('error', 'warning', 'info', 'success', 'debug')`);
         await queryRunner.query(`CREATE TABLE "log" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "domain" character varying(64) array NOT NULL DEFAULT '{}'::varchar[], "level" "log_level_enum" NOT NULL, "worker" character varying(8) NOT NULL, "machine" character varying(128) NOT NULL, "message" character varying(1024) NOT NULL, "data" jsonb NOT NULL DEFAULT '{}', CONSTRAINT "PK_350604cbdf991d5930d9e618fbd" PRIMARY KEY ("id"))`);
@@ -480,3 +480,4 @@ export class Init1000000000000 {
         await queryRunner.query(`DROP TYPE "log_level_enum"`);
     }
 }
+exports.Init1000000000000 = Init1000000000000;

packages/backend/migration/1556348509290-Pages.js

@@ -1,6 +1,6 @@
-
-
-export class Pages1556348509290 {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class Pages1556348509290 {
     async up(queryRunner) {
         await queryRunner.query(`CREATE TYPE "page_visibility_enum" AS ENUM('public', 'followers', 'specified')`);
         await queryRunner.query(`CREATE TABLE "page" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, "title" character varying(256) NOT NULL, "name" character varying(256) NOT NULL, "summary" character varying(256), "alignCenter" boolean NOT NULL, "font" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "eyeCatchingImageId" character varying(32), "content" jsonb NOT NULL DEFAULT '[]', "variables" jsonb NOT NULL DEFAULT '[]', "visibility" "page_visibility_enum" NOT NULL, "visibleUserIds" character varying(32) array NOT NULL DEFAULT '{}'::varchar[], CONSTRAINT "PK_742f4117e065c5b6ad21b37ba1f" PRIMARY KEY ("id"))`);
@@ -26,3 +26,4 @@ export class Pages1556348509290 {
         await queryRunner.query(`DROP TYPE "page_visibility_enum"`);
     }
 }
+exports.Pages1556348509290 = Pages1556348509290;

packages/backend/migration/1556746559567-UserProfile.js

@@ -1,6 +1,6 @@
-
-
-export class UserProfile1556746559567 {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class UserProfile1556746559567 {
     async up(queryRunner) {
         await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "githubId" TYPE VARCHAR(64) USING "githubId"::VARCHAR(64)`);
         await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "discordExpiresDate" TYPE VARCHAR(64) USING "discordExpiresDate"::VARCHAR(64)`);
@@ -11,3 +11,4 @@ export class UserProfile1556746559567 {
         await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "discordExpiresDate" TYPE INTEGER USING NULL`);
     }
 }
+exports.UserProfile1556746559567 = UserProfile1556746559567;

packages/backend/migration/1557476068003-PinnedUsers.js

@@ -1,6 +1,6 @@
-
-
-export class PinnedUsers1557476068003 {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class PinnedUsers1557476068003 {
     async up(queryRunner) {
         await queryRunner.query(`ALTER TABLE "meta" ADD "pinnedUsers" character varying(256) array NOT NULL DEFAULT '{}'::varchar[]`);
     }
@@ -8,3 +8,4 @@ export class PinnedUsers1557476068003 {
         await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "pinnedUsers"`);
     }
 }
+exports.PinnedUsers1557476068003 = PinnedUsers1557476068003;

packages/backend/migration/1557761316509-AddSomeUrls.js

@@ -1,6 +1,6 @@
-
-
-export class AddSomeUrls1557761316509 {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class AddSomeUrls1557761316509 {
     async up(queryRunner) {
         await queryRunner.query(`ALTER TABLE "meta" ADD "ToSUrl" character varying(512)`);
         await queryRunner.query(`ALTER TABLE "meta" ADD "repositoryUrl" character varying(512) NOT NULL DEFAULT 'https://github.com/misskey-dev/misskey'`);
@@ -12,3 +12,4 @@ export class AddSomeUrls1557761316509 {
         await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "ToSUrl"`);
     }
 }
+exports.AddSomeUrls1557761316509 = AddSomeUrls1557761316509;

packages/backend/migration/1557932705754-ObjectStorageSetting.js

@@ -1,6 +1,6 @@
-
-
-export class ObjectStorageSetting1557932705754 {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class ObjectStorageSetting1557932705754 {
     async up(queryRunner) {
         await queryRunner.query(`ALTER TABLE "meta" ADD "useObjectStorage" boolean NOT NULL DEFAULT false`);
         await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageBucket" character varying(512)`);
@@ -26,3 +26,4 @@ export class ObjectStorageSetting1557932705754 {
         await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "useObjectStorage"`);
     }
 }
+exports.ObjectStorageSetting1557932705754 = ObjectStorageSetting1557932705754;

packages/backend/migration/1558072954435-PageLike.js

@@ -1,6 +1,6 @@
-
-
-export class PageLike1558072954435 {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class PageLike1558072954435 {
     async up(queryRunner) {
         await queryRunner.query(`CREATE TABLE "page_like" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "pageId" character varying(32) NOT NULL, CONSTRAINT "PK_813f034843af992d3ae0f43c64c" PRIMARY KEY ("id"))`);
         await queryRunner.query(`CREATE INDEX "IDX_0e61efab7f88dbb79c9166dbb4" ON "page_like" ("userId") `);
@@ -18,3 +18,4 @@ export class PageLike1558072954435 {
         await queryRunner.query(`DROP TABLE "page_like"`);
     }
 }
+exports.PageLike1558072954435 = PageLike1558072954435;

packages/backend/migration/1558103093633-UserGroup.js

@@ -1,6 +1,6 @@
-
-
-export class UserGroup1558103093633 {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class UserGroup1558103093633 {
     async up(queryRunner) {
         await queryRunner.query(`CREATE TABLE "user_group" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "name" character varying(256) NOT NULL, "userId" character varying(32) NOT NULL, "isPrivate" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_3c29fba6fe013ec8724378ce7c9" PRIMARY KEY ("id"))`);
         await queryRunner.query(`CREATE INDEX "IDX_20e30aa35180e317e133d75316" ON "user_group" ("createdAt") `);
@@ -36,3 +36,4 @@ export class UserGroup1558103093633 {
         await queryRunner.query(`DROP TABLE "user_group"`);
     }
 }
+exports.UserGroup1558103093633 = UserGroup1558103093633;

packages/backend/migration/1558257926829-UserGroupInvite.js

@@ -1,6 +1,6 @@
-
-
-export class UserGroupInvite1558257926829 {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class UserGroupInvite1558257926829 {
     async up(queryRunner) {
         await queryRunner.query(`CREATE TABLE "user_group_invite" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "userGroupId" character varying(32) NOT NULL, CONSTRAINT "PK_3893884af0d3a5f4d01e7921a97" PRIMARY KEY ("id"))`);
         await queryRunner.query(`CREATE INDEX "IDX_1039988afa3bf991185b277fe0" ON "user_group_invite" ("userId") `);
@@ -20,3 +20,4 @@ export class UserGroupInvite1558257926829 {
         await queryRunner.query(`DROP TABLE "user_group_invite"`);
     }
 }
+exports.UserGroupInvite1558257926829 = UserGroupInvite1558257926829;

packages/backend/migration/1558266512381-UserListJoining.js

@@ -1,6 +1,6 @@
-
-
-export class UserListJoining1558266512381 {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class UserListJoining1558266512381 {
     async up(queryRunner) {
         await queryRunner.query(`CREATE UNIQUE INDEX "IDX_90f7da835e4c10aca6853621e1" ON "user_list_joining" ("userId", "userListId") `);
     }
@@ -8,3 +8,4 @@ export class UserListJoining1558266512381 {
         await queryRunner.query(`DROP INDEX "IDX_90f7da835e4c10aca6853621e1"`);
     }
 }
+exports.UserListJoining1558266512381 = UserListJoining1558266512381;

packages/backend/migration/1561706992953-webauthn.js

@@ -1,6 +1,6 @@
-
-
-export class webauthn1561706992953 {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class webauthn1561706992953 {
     async up(queryRunner) {
         await queryRunner.query(`CREATE TABLE "attestation_challenge" ("id" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "challenge" character varying(64) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "registrationChallenge" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_d0ba6786e093f1bcb497572a6b5" PRIMARY KEY ("id", "userId"))`);
         await queryRunner.query(`CREATE INDEX "IDX_f1a461a618fa1755692d0e0d59" ON "attestation_challenge" ("userId") `);
@@ -24,3 +24,4 @@ export class webauthn1561706992953 {
         await queryRunner.query(`DROP TABLE "attestation_challenge"`);
     }
 }
+exports.webauthn1561706992953 = webauthn1561706992953;

packages/backend/migration/1561873850023-ChartIndexes.js

@@ -1,6 +1,6 @@
-
-
-export class ChartIndexes1561873850023 {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class ChartIndexes1561873850023 {
     async up(queryRunner) {
         await queryRunner.query(`CREATE INDEX "IDX_0ad37b7ef50f4ddc84363d7ccc" ON "__chart__active_users" ("date") `);
         await queryRunner.query(`CREATE INDEX "IDX_15e91a03aeeac9dbccdf43fc06" ON "__chart__active_users" ("span") `);
@@ -196,3 +196,4 @@ export class ChartIndexes1561873850023 {
         await queryRunner.query(`DROP INDEX "IDX_8cb40cfc8f3c28261e6f887b03"`);
     }
 }
+exports.ChartIndexes1561873850023 = ChartIndexes1561873850023;

packages/backend/migration/1562422242907-PasswordLessLogin.js

@@ -1,6 +1,6 @@
-
-
-export class PasswordLessLogin1562422242907 {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class PasswordLessLogin1562422242907 {
     async up(queryRunner) {
         await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "usePasswordLessLogin" boolean DEFAULT false NOT NULL`);
     }
@@ -8,3 +8,4 @@ export class PasswordLessLogin1562422242907 {
         await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "usePasswordLessLogin"`);
     }
 }
+exports.PasswordLessLogin1562422242907 = PasswordLessLogin1562422242907;

packages/backend/migration/1562444565093-PinnedPage.js

@@ -1,6 +1,6 @@
-
-
-export class PinnedPage1562444565093 {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class PinnedPage1562444565093 {
     async up(queryRunner) {
         await queryRunner.query(`ALTER TABLE "user_profile" ADD "pinnedPageId" character varying(32)`);
         await queryRunner.query(`ALTER TABLE "user_profile" ADD CONSTRAINT "UQ_6dc44f1ceb65b1e72bacef2ca27" UNIQUE ("pinnedPageId")`);
@@ -12,3 +12,4 @@ export class PinnedPage1562444565093 {
         await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "pinnedPageId"`);
     }
 }
+exports.PinnedPage1562444565093 = PinnedPage1562444565093;

packages/backend/migration/1562448332510-PageTitleHideOption.js

@@ -1,6 +1,6 @@
-
-
-export class PageTitleHideOption1562448332510 {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class PageTitleHideOption1562448332510 {
     async up(queryRunner) {
         await queryRunner.query(`ALTER TABLE "page" ADD "hideTitleWhenPinned" boolean NOT NULL DEFAULT false`);
     }
@@ -8,3 +8,4 @@ export class PageTitleHideOption1562448332510 {
         await queryRunner.query(`ALTER TABLE "page" DROP COLUMN "hideTitleWhenPinned"`);
     }
 }
+exports.PageTitleHideOption1562448332510 = PageTitleHideOption1562448332510;

packages/backend/migration/1562869971568-ModerationLog.js

@@ -1,6 +1,6 @@
-
-
-export class ModerationLog1562869971568 {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class ModerationLog1562869971568 {
     async up(queryRunner) {
         await queryRunner.query(`CREATE TABLE "moderation_log" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "type" character varying(128) NOT NULL, "info" jsonb NOT NULL, CONSTRAINT "PK_d0adca6ecfd068db83e4526cc26" PRIMARY KEY ("id"))`);
         await queryRunner.query(`CREATE INDEX "IDX_a08ad074601d204e0f69da9a95" ON "moderation_log" ("userId") `);
@@ -12,3 +12,4 @@ export class ModerationLog1562869971568 {
         await queryRunner.query(`DROP TABLE "moderation_log"`);
     }
 }
+exports.ModerationLog1562869971568 = ModerationLog1562869971568;

packages/backend/migration/1563757595828-UsedUsername.js

@@ -1,6 +1,6 @@
-
-
-export class UsedUsername1563757595828 {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class UsedUsername1563757595828 {
     async up(queryRunner) {
         await queryRunner.query(`CREATE TABLE "used_username" ("username" character varying(128) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, CONSTRAINT "PK_78fd79d2d24c6ac2f4cc9a31a5d" PRIMARY KEY ("username"))`);
     }
@@ -8,3 +8,4 @@ export class UsedUsername1563757595828 {
         await queryRunner.query(`DROP TABLE "used_username"`);
     }
 }
+exports.UsedUsername1563757595828 = UsedUsername1563757595828;

packages/backend/migration/1565634203341-room.js

@@ -1,6 +1,6 @@
-
-
-export class room1565634203341 {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class room1565634203341 {
     async up(queryRunner) {
         await queryRunner.query(`ALTER TABLE "user_profile" ADD "room" jsonb NOT NULL DEFAULT '{}'`);
     }
@@ -8,3 +8,4 @@ export class room1565634203341 {
         await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "room"`);
     }
 }
+exports.room1565634203341 = room1565634203341;

packages/backend/migration/1571220798684-CustomEmojiCategory.js

@@ -1,6 +1,6 @@
-
-
-export class CustomEmojiCategory1571220798684 {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class CustomEmojiCategory1571220798684 {
     async up(queryRunner) {
         await queryRunner.query(`ALTER TABLE "emoji" ADD "category" character varying(128)`, undefined);
     }
@@ -8,3 +8,4 @@ export class CustomEmojiCategory1571220798684 {
         await queryRunner.query(`ALTER TABLE "emoji" DROP COLUMN "category"`, undefined);
     }
 }
+exports.CustomEmojiCategory1571220798684 = CustomEmojiCategory1571220798684;