summaryrefslogtreecommitdiff
path: root/src/docs/en-US
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-08-21 17:58:32 +0900
committerGitHub <noreply@github.com>2021-08-21 17:58:32 +0900
commita59dfff12fd8a3d08e3b951bc66af1e7dd13d5d9 (patch)
tree506f0a0f05ad3c3565a3951e542c2101dccba3e7 /src/docs/en-US
parent:art: (diff)
downloadsharkey-a59dfff12fd8a3d08e3b951bc66af1e7dd13d5d9.tar.gz
sharkey-a59dfff12fd8a3d08e3b951bc66af1e7dd13d5d9.tar.bz2
sharkey-a59dfff12fd8a3d08e3b951bc66af1e7dd13d5d9.zip
New Crowdin updates (#7646)
* New translations mute-and-block.md (Ukrainian) * New translations mute-and-block.md (Czech) * New translations mute-and-block.md (Danish) * New translations mute-and-block.md (German) * New translations mute-and-block.md (Italian) * New translations mute-and-block.md (Korean) * New translations mute-and-block.md (Dutch) * New translations mute-and-block.md (Norwegian) * New translations mute-and-block.md (Polish) * New translations mute-and-block.md (Portuguese) * New translations mute-and-block.md (Russian) * New translations mute-and-block.md (Chinese Simplified) * New translations mute-and-block.md (Spanish) * New translations mute-and-block.md (Chinese Traditional) * New translations mute-and-block.md (English) * New translations mute-and-block.md (Indonesian) * New translations mute-and-block.md (Thai) * New translations mute-and-block.md (Esperanto) * New translations mute-and-block.md (Uyghur) * New translations mute-and-block.md (Lojban) * New translations mute-and-block.md (Kannada) * New translations mute-and-block.md (Haitian Creole) * New translations mute-and-block.md (Kabyle) * New translations mute-and-block.md (Arabic) * New translations mute-and-block.md (French) * New translations mute-and-block.md (Japanese, Kansai) * New translations glossary.md (German) * New translations links.md (German) * New translations links.md (English) * New translations report-issue.md (German) * New translations changelog.md (German) * New translations apps.md (German) * New translations ja-JP.yml (Esperanto) * New translations ja-JP.yml (Esperanto) * New translations ja-JP.yml (Esperanto) * New translations ja-JP.yml (Esperanto) * New translations ja-JP.yml (Esperanto) * New translations ja-JP.yml (Esperanto) * New translations disable-timelines.md (Japanese, Kansai) * New translations disable-timelines.md (Japanese, Kansai) * New translations faq.md (Japanese, Kansai) * New translations aiscript.md (Japanese, Kansai) * New translations faq.md (Japanese, Kansai) * New translations misskey.md (Japanese, Kansai) * New translations aiscript.md (Japanese, Kansai) * New translations reaction.md (Japanese, Kansai) * New translations ja-JP.yml (Esperanto) * New translations ja-JP.yml (Esperanto) * New translations ja-JP.yml (Esperanto) * New translations ja-JP.yml (Esperanto) * New translations ja-JP.yml (Esperanto) * New translations glossary.md (Japanese, Kansai) * New translations glossary.md (Kabyle) * New translations glossary.md (Haitian Creole) * New translations glossary.md (Kannada) * New translations glossary.md (Lojban) * New translations glossary.md (Uyghur) * New translations glossary.md (Esperanto) * New translations glossary.md (Indonesian) * New translations misskey.md (English) * New translations glossary.md (Thai) * New translations glossary.md (English) * New translations glossary.md (Chinese Traditional) * New translations glossary.md (Dutch) * New translations glossary.md (Chinese Simplified) * New translations glossary.md (Ukrainian) * New translations glossary.md (Russian) * New translations glossary.md (Portuguese) * New translations glossary.md (Polish) * New translations glossary.md (Norwegian) * New translations glossary.md (Korean) * New translations glossary.md (French) * New translations glossary.md (Italian) * New translations glossary.md (German) * New translations glossary.md (Danish) * New translations glossary.md (Czech) * New translations glossary.md (Arabic) * New translations glossary.md (Spanish) * New translations note.md (French) * New translations glossary.md (Chinese Simplified) * New translations faq.md (French) * New translations faq.md (Chinese Simplified) * New translations faq.md (Kabyle) * New translations faq.md (Haitian Creole) * New translations faq.md (Kannada) * New translations faq.md (Lojban) * New translations faq.md (Uyghur) * New translations faq.md (Esperanto) * New translations faq.md (Thai) * New translations faq.md (Indonesian) * New translations faq.md (English) * New translations faq.md (Chinese Traditional) * New translations faq.md (Ukrainian) * New translations faq.md (Spanish) * New translations faq.md (Russian) * New translations faq.md (Portuguese) * New translations faq.md (Polish) * New translations faq.md (Norwegian) * New translations faq.md (Dutch) * New translations faq.md (Korean) * New translations faq.md (Italian) * New translations faq.md (German) * New translations faq.md (Danish) * New translations faq.md (Czech) * New translations faq.md (Arabic) * New translations faq.md (Japanese, Kansai) * New translations faq.md (French) * New translations misskey.md (French) * New translations faq.md (French) * New translations misskey.md (French) * New translations faq.md (French) * New translations troubleshooting.md (French) * New translations troubleshooting.md (French) * New translations troubleshooting.md (French) * New translations troubleshooting.md (French) * New translations troubleshooting.md (French) * New translations troubleshooting.md (French) * New translations troubleshooting.md (French) * New translations word-mute.md (Ukrainian) * New translations word-mute.md (Czech) * New translations word-mute.md (Danish) * New translations word-mute.md (German) * New translations word-mute.md (Italian) * New translations word-mute.md (Korean) * New translations word-mute.md (Dutch) * New translations word-mute.md (Norwegian) * New translations word-mute.md (Polish) * New translations word-mute.md (Portuguese) * New translations word-mute.md (Russian) * New translations word-mute.md (Chinese Simplified) * New translations word-mute.md (Spanish) * New translations word-mute.md (Chinese Traditional) * New translations word-mute.md (English) * New translations word-mute.md (Indonesian) * New translations word-mute.md (Thai) * New translations word-mute.md (Esperanto) * New translations word-mute.md (Uyghur) * New translations word-mute.md (Lojban) * New translations word-mute.md (Kannada) * New translations word-mute.md (Haitian Creole) * New translations word-mute.md (Kabyle) * New translations word-mute.md (Arabic) * New translations word-mute.md (French) * New translations word-mute.md (Japanese, Kansai) * New translations glossary.md (English) * New translations glossary.md (English) * New translations glossary.md (English) * New translations glossary.md (English) * New translations faq.md (English) * New translations faq.md (English) * New translations glossary.md (English) * New translations word-mute.md (English) * New translations word-mute.md (English) * New translations word-mute.md (English) * New translations ja-JP.yml (English) * New translations ja-JP.yml (English) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English)
Diffstat (limited to 'src/docs/en-US')
-rw-r--r--src/docs/en-US/features/mute-and-block.md41
-rw-r--r--src/docs/en-US/features/word-mute.md20
-rw-r--r--src/docs/en-US/general/faq.md3
-rw-r--r--src/docs/en-US/general/glossary.md10
-rw-r--r--src/docs/en-US/general/links.md2
-rw-r--r--src/docs/en-US/general/misskey.md2
6 files changed, 74 insertions, 4 deletions
diff --git a/src/docs/en-US/features/mute-and-block.md b/src/docs/en-US/features/mute-and-block.md
new file mode 100644
index 0000000000..a9e8fcc1cd
--- /dev/null
+++ b/src/docs/en-US/features/mute-and-block.md
@@ -0,0 +1,41 @@
+# Mutes and Blocks
+好みではないユーザーがいる場合は、ミュートを行うことでそのユーザーが自分から見えないようにすることができます。 また、より強力な措置として、ブロックを行うことでそのユーザーから自分のコンテンツが見えないようになるほか、自分に対して関わることができないようにすることができます。 ミュートされていることは相手は分かりませんが、ブロックされていることは相手に分かります。どちらを選ぶかはご自身の判断で行ってください。
+
+<div class="info">ℹ️ ミュートとブロックは併用できます。</div>
+
+<div class="warn">⚠️ 利用規約に違反するような、迷惑なユーザーがいる場合は運営者に報告することも検討してください。</div>
+
+設定>ミュートとブロック から、自分がミュートまたはブロックしているユーザー一覧を確認することができます。
+
+## Mute
+ユーザーをミュートすると、そのユーザーに関する次のコンテンツがMisskeyに表示されなくなります:
+
+- タイムラインや投稿の検索結果内の、そのユーザーの投稿(およびそれらの投稿に対する返信やRenote)
+- そのユーザーからの通知
+- メッセージ履歴一覧内の、そのユーザーとのメッセージ履歴
+- など
+
+ユーザーをミュートするには、対象のユーザーのユーザーページのメニューを開き、「ミュート」ボタンを押します。
+
+<div class="info">ℹ️ ミュートを行ったことは相手に通知されず、ミュートされていることを知ることもできません。</div>
+
+## Block
+ユーザーをブロックすると、そのユーザーからあなたのコンテンツが見えないようになり、またあなたに対して以下のようなアクションをすることができなくなります。
+
+- フォローする
+- ユーザーリストに追加する
+- 返信する、Renoteする
+- リアクションする、アンケートに投票する
+- メッセージを送信する
+- など
+
+また、
+
+- ブロックする際に既にそのユーザーからフォローされていた場合はフォローが解除されます。
+- ブロックする際に既にそのユーザーがあなたをユーザーリストに入れていた場合はそのリストからあなたが削除されます。
+
+ユーザーをブロックするには、対象のユーザーのユーザーページのメニューを開き、「ブロック」ボタンを押します。
+
+<div class="warn">⚠️ ブロックを行ったこと自体は相手に通知されませんが、フォローを行ったりなどの上記のアクションが行えなくなるので間接的にブロックされていることは分かります。</div>
+
+<div class="warn">⚠️ 相手から自分のコンテンツが見えなくなりますが、相手がアカウントを切り替えたりログアウト状態になれば見ることができます。あくまで簡易的、補助的なものとしてお考えください。</div>
diff --git a/src/docs/en-US/features/word-mute.md b/src/docs/en-US/features/word-mute.md
new file mode 100644
index 0000000000..77283c8620
--- /dev/null
+++ b/src/docs/en-US/features/word-mute.md
@@ -0,0 +1,20 @@
+# Word mute
+Through setting up word mutes, you can make notes satisfying set conditions not appear on your timeline anymore.
+
+There are two types of word mutes: soft and hard.Below is an explanation of the setup process and effect of both.
+
+## Soft word mute
+With soft mutes, the word mute is processed within the client (app) you are using.
+
+When a note meets the set conditions, it will be hidden behind text stating "(username) said something".
+You can display the note as it was by clicking on this text.
+
+## Hard word mute
+With hard mutes, the server judges whether the content of a new incoming note meets the set conditions similar to antennas, and will completely exclude it from your timeline if so.
+
+To summarize, a hard word mute has the following features:
+
+* Only new notes created after configuration will be affected by the mute.
+* If the conditions are changed, previously hard muted notes will still remain muted.
+* Timelines will not be filled with "(...) said something".
+* Hard mutes will function even for apps without functionality for soft mutes.
diff --git a/src/docs/en-US/general/faq.md b/src/docs/en-US/general/faq.md
index 37827903a8..32d3632983 100644
--- a/src/docs/en-US/general/faq.md
+++ b/src/docs/en-US/general/faq.md
@@ -23,3 +23,6 @@ Only administrators can add, edit or delete custom emoji. If you'd like to do ei
## "I want to develop a Bot."
It is possible to develop a Bot using the Misskey API. Please, [see here](../advanced/develop-bot).
+
+## Which service does the note translation function use?
+[DeepL](https://www.deepl.com/) is being used for this.
diff --git a/src/docs/en-US/general/glossary.md b/src/docs/en-US/general/glossary.md
index 9f6dde06f8..53164a0a59 100644
--- a/src/docs/en-US/general/glossary.md
+++ b/src/docs/en-US/general/glossary.md
@@ -49,14 +49,20 @@ Those users amongst all existing ones who are continually using their account.
## Instance
todo
+## Custom Emoji
+Emoji provided by your server.Emoji that are not specifically provided by your server but are available by default are called "Unicode Emoji".
+
## Control Panel
-The settings screen of an instance.
+todo
## Server
todo
## Silence
-A state in which the visibility of the notes by said user cannot be set to "Public" anymore.Can be set for individual users by Moderators.For details, see [here.](../features/silence)
+A state in which the visibility of the notes by said user cannot be set to "Public" anymore.Can be set for individual users by the discretion of Moderators.For details, see [here.](../features/silence)
+
+## Job Queue
+A system used for sequentially broadcasting activities to other servers etc.
## Suspend
A state which makes the account of a user unusable.
diff --git a/src/docs/en-US/general/links.md b/src/docs/en-US/general/links.md
index 1952160359..11a44e894f 100644
--- a/src/docs/en-US/general/links.md
+++ b/src/docs/en-US/general/links.md
@@ -1,4 +1,4 @@
-# A collection of links
+# Links
## Websites
- [Official Discord](https://discord.gg/Wp8gVStHW3) - The official Discord server for Misskey
diff --git a/src/docs/en-US/general/misskey.md b/src/docs/en-US/general/misskey.md
index 50b34a80b1..8ae8982444 100644
--- a/src/docs/en-US/general/misskey.md
+++ b/src/docs/en-US/general/misskey.md
@@ -76,7 +76,7 @@ No.Misskey is a project completely different from Mastodon or other alike projec
### Are there any apps for iOS / Android available?
While no official Misskey app for either OS exists, there are several third-party applications. For details, please check [here](./apps).
-However, functionality of third-party applications will inevitably lag behind the official Web client, so unless you really want to use a native application, we recommend the official Web client instead. As the Misskey Web client supports PWA, it is possible to make it act as if it was a native application instead. For details regarding this, please check [here](todo).
+However, functionality of third-party applications will inevitably lag behind the official Web client, so unless you really want to use a native application, we recommend the official Web client instead. As the Misskey Web client supports PWA, it is also possible to make it act as if it was a native application instead. For details regarding this, please check [here](todo).
### Where can I download Misskey's logo or icon?
(Coming soon)