Update translations

7 files changed, 1210 insertions, 548 deletions

diff --git a/docs/source/locale/ja/LC_MESSAGES/advanced.po b/docs/source/locale/ja/LC_MESSAGES/advanced.po
index 31b78cde..ae1a478e 100644
--- a/docs/source/locale/ja/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/ja/LC_MESSAGES/advanced.po
@@ -7,17 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2022-10-09 15:01-0700\n"
 "PO-Revision-Date: 2022-01-11 05:54+0000\n"
 "Last-Translator: Taro Tanaka <anon_japan@protonmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ja\n"
+"Language-Team: ja <LL@li.org>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.10.1\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: ../../source/advanced.rst:2
 msgid "Advanced Usage"
@@ -29,72 +28,79 @@ msgstr "タブを保存する"
 
 #: ../../source/advanced.rst:9
 msgid ""
-"Everything in OnionShare is temporary by default. If you close an "
-"OnionShare tab, its address no longer exists and it can't be used again. "
-"Sometimes you might want an OnionShare service to be persistent. This is "
-"useful if you want to host a website available from the same OnionShare "
-"address even if you reboot your computer."
+"Closing OnionShare tabs you host destroys them, preventing reuse. "
+"Persistently hosted websites are available on the same address even if "
+"the computer they are shared from is rebooted."
 msgstr ""
-"OnionShareのデフォルト設定では、全ての機能は一時的です。OnionShareタブを閉じると、そのアドレスは消えて再びに使えません。場合によっては"
-"永続的なOnionShareサービスが必要かもしれない。例えばパソコンを再起動しても、永続的なアドレスでOnionShareウェブサイトをホストしたい場合"
-"には役立つでしょう。"
 
-#: ../../source/advanced.rst:13
+#: ../../source/advanced.rst:12
 msgid ""
-"To make any tab persistent, check the \"Save this tab, and automatically "
-"open it when I open OnionShare\" box before starting the server. When a "
-"tab is saved a purple pin icon appears to the left of its server status."
+"Make any tab persistent by checking the \"Always open this tab when "
+"OnionShare is started\" box before starting your server."
 msgstr ""
-"タブを永続的にするのに、サービスを実行する前に「このタブを保存し、OnionShareがスタートアップの時に自動的に開く」というボックスをチェックする。保"
-"存された場合、紫色のピンはタブの左側に表示されます。"
 
-#: ../../source/advanced.rst:18
+#: ../../source/advanced.rst:16
 msgid ""
-"When you quit OnionShare and then open it again, your saved tabs will "
-"start opened. You'll have to manually start each service, but when you do"
-" they will start with the same OnionShare address and password."
+"When opening OnionShare, your saved tabs from the prior session will "
+"start opened. Each service then can be started manually, and will be "
+"available on the same OnionShare address and be protected by the same "
+"private key."
 msgstr ""
 
-#: ../../source/advanced.rst:21
+#: ../../source/advanced.rst:19
+#, fuzzy
 msgid ""
-"If you save a tab, a copy of that tab's onion service secret key will be "
-"stored on your computer with your OnionShare settings."
+"If you save a tab, a copy of its onion service secret key is stored on "
+"your computer."
 msgstr "タブを保存すると、そのonionサービスの秘密鍵はOnionShare設定と一緒にパソコンに保存されます。"
 
+#: ../../source/advanced.rst:24
+msgid "Turn Off Private Key"
+msgstr ""
+
 #: ../../source/advanced.rst:26
-msgid "Turn Off Passwords"
+msgid ""
+"By default, all OnionShare services are protected with a private key, "
+"which Tor calls \"client authentication\"."
 msgstr ""
 
 #: ../../source/advanced.rst:28
 msgid ""
-"By default, all OnionShare services are protected with the username "
-"``onionshare`` and a randomly-generated password. If someone takes 20 "
-"wrong guesses at the password, your onion service is automatically "
-"stopped to prevent a brute force attack against the OnionShare service."
+"The Tor Browser will ask you to enter your private key when you load an "
+"OnionShare service. If you want allow the public to use your service, "
+"it's better to disable the private key altogether."
 msgstr ""
 
 #: ../../source/advanced.rst:31
 msgid ""
-"Sometimes you might want your OnionShare service to be accessible to the "
-"public, like if you want to set up an OnionShare receive service so the "
-"public can securely and anonymously send you files. In this case, it's "
-"better to disable the password altogether. If you don't do this, someone "
-"can force your server to stop just by making 20 wrong guesses of your "
-"password, even if they know the correct password."
+"To turn off the private key for any tab, check the \"This is a public "
+"OnionShare service (disables private key)\" box before starting the "
+"server. Then the server will be public and a private key is not needed to"
+" load it in the Tor Browser."
+msgstr ""
+
+#: ../../source/advanced.rst:37
+msgid "Custom Titles"
+msgstr ""
+
+#: ../../source/advanced.rst:39
+msgid ""
+"When people load OnionShare services in the Tor Browser they see the "
+"default title for each type of service. For example, the default title "
+"for chat services is \"OnionShare Chat\"."
 msgstr ""
 
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:42
 msgid ""
-"To turn off the password for any tab, just check the \"Don't use a "
-"password\" box before starting the server. Then the server will be public"
-" and won't have a password."
+"If you edit the \"Custom title\" setting before starting a server you can"
+" change it."
 msgstr ""
 
-#: ../../source/advanced.rst:38
+#: ../../source/advanced.rst:45
 msgid "Scheduled Times"
 msgstr "予定した時間"
 
-#: ../../source/advanced.rst:40
+#: ../../source/advanced.rst:47
 msgid ""
 "OnionShare supports scheduling exactly when a service should start and "
 "stop. Before starting a server, click \"Show advanced settings\" in its "
@@ -102,56 +108,49 @@ msgid ""
 "scheduled time\", \"Stop onion service at scheduled time\", or both, and "
 "set the respective desired dates and times."
 msgstr ""
-"OnionShareでは、サービスの開始・停止する時間を予定することができます。サーバーを起動する前に、そのタブに「詳細設定を表示」をクリックして、「 "
-"指定の日時にonionサービスを起動する 」または「 指定の日時にonionサービスを停止する "
+"OnionShareでは、サービスの開始・停止する時間を予定することができます。サーバーを起動する前に、そのタブに「詳細設定を表示」をクリックして、「"
+" 指定の日時にonionサービスを起動する 」または「 指定の日時にonionサービスを停止する "
 "」それとも両方のボックスをチェックして、希望日時を入力する。"
 
-#: ../../source/advanced.rst:43
+#: ../../source/advanced.rst:51
 msgid ""
-"If you scheduled a service to start in the future, when you click the "
-"\"Start sharing\" button you will see a timer counting down until it "
-"starts. If you scheduled it to stop in the future, after it's started you"
-" will see a timer counting down to when it will stop automatically."
+"Services scheduled to start in the future display a countdown timer when "
+"when the \"Start sharing\" button is clicked. Services scheduled to stop "
+"in the future display a countdown timer when started."
 msgstr ""
-"サービスを将来に起動するよう設定した場合、「 共有を開始 "
-"」ボタンをクリックすると開始時間までの減算カウンターが表示されます。将来に停止するよう設定した場合、「 共有を開始 "
-"」ボタンをクリックすると普通に開始して、停止する時間までの減算カウンターは表示されます。"
 
-#: ../../source/advanced.rst:46
+#: ../../source/advanced.rst:54
 msgid ""
 "**Scheduling an OnionShare service to automatically start can be used as "
-"a dead man's switch**, where your service will be made public at a given "
-"time in the future if anything happens to you. If nothing happens to you,"
-" you can cancel the service before it's scheduled to start."
+"a dead man's switch**. This means your service is made public at a given "
+"time in the future if you are not there to prevent it. If nothing happens"
+" to you, you can cancel the service before it's scheduled to start."
 msgstr ""
-"**自動的な起動を予定することで、OnionShareのサービスを「デッドマン装置」として使えます。** "
-"最悪の事態が起きた場合、特定時間にサービスは自動的に立ち上がります。何も起きなかったら、立ち上がる時点の前に停止できます。"
 
-#: ../../source/advanced.rst:51
+#: ../../source/advanced.rst:60
 msgid ""
-"**Scheduling an OnionShare service to automatically stop can be useful to"
-" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the Internet for more than a few "
-"days."
+"**Scheduling an OnionShare service to automatically stop limits its "
+"exposure**. If you want to share secret info or something that will be "
+"outdated, you can do so for selected limited time."
 msgstr ""
 
-#: ../../source/advanced.rst:56
+#: ../../source/advanced.rst:68
 msgid "Command-line Interface"
 msgstr "コマンドライン・インターフェース"
 
-#: ../../source/advanced.rst:58
+#: ../../source/advanced.rst:70
 msgid ""
 "In addition to its graphical interface, OnionShare has a command-line "
 "interface."
 msgstr "グラフィカル・インターフェースに加えて、OnionShareにはコマンドライン・インターフェースがあります。"
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:72
 msgid ""
 "You can install just the command-line version of OnionShare using "
 "``pip3``::"
 msgstr "``pip3``:: を利用して、OnionShareのコマンドライン版のみをインストールできます。"
 
-#: ../../source/advanced.rst:64
+#: ../../source/advanced.rst:76
 msgid ""
 "Note that you will also need the ``tor`` package installed. In macOS, "
 "install it with: ``brew install tor``"
@@ -159,67 +158,48 @@ msgstr ""
 "``tor`` パッケージもインストールする必要があるとご了承ください。macOSの場合は ``brew install tor`` "
 "でインストールできます"
 
-#: ../../source/advanced.rst:66
+#: ../../source/advanced.rst:78
 msgid "Then run it like this::"
 msgstr "そして以下のコマンドで実行できます ::"
 
-#: ../../source/advanced.rst:70
+#: ../../source/advanced.rst:82
 msgid ""
-"If you installed OnionShare using the Linux Snapcraft package, you can "
-"also just run ``onionshare.cli`` to access the command-line interface "
-"version."
+"Info about installing it on different operating systems can be found in "
+"the `CLI README file "
+"<https://github.com/onionshare/onionshare/blob/develop/cli/README.md>`_ "
+"in the Git repository."
+msgstr ""
+
+#: ../../source/advanced.rst:84
+#, fuzzy
+msgid ""
+"If you installed OnionShare using the Snap package, you can also just run"
+" ``onionshare.cli`` to access the command-line interface version."
 msgstr ""
 "LinuxのSnapcraftパッケージでOnionShareをインストールした場合、``onionshare.cli`` "
 "を実行するだけでコマンドライン・インターフェイスをアクセスできます。"
 
-#: ../../source/advanced.rst:73
+#: ../../source/advanced.rst:87
 msgid "Usage"
 msgstr "使用方法"
 
-#: ../../source/advanced.rst:75
-msgid ""
-"You can browse the command-line documentation by running ``onionshare "
-"--help``::"
+#: ../../source/advanced.rst:89
+#, fuzzy
+msgid "Browse the command-line documentation by running ``onionshare --help``::"
 msgstr "コマンドラインのドキュメンテーションを閲覧するには、 ``onionshare --help``::"
 
-#: ../../source/advanced.rst:132
-msgid "Legacy Addresses"
+#: ../../source/advanced.rst:151
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: ../../source/advanced.rst:134
+#: ../../source/advanced.rst:153
 msgid ""
-"OnionShare uses v3 Tor onion services by default. These are modern onion "
-"addresses that have 56 characters, for example::"
+"The OnionShare desktop application contains some keyboard shortcuts, for "
+"convenience and accessibility::"
 msgstr ""
 
-#: ../../source/advanced.rst:139
-msgid ""
-"OnionShare still has support for v2 onion addresses, the old type of "
-"onion addresses that have 16 characters, for example::"
-msgstr ""
-
-#: ../../source/advanced.rst:143
-msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
-"not recommended, as v3 onion addresses are more secure."
-msgstr ""
-
-#: ../../source/advanced.rst:145
-msgid ""
-"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" from its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally turn "
-"on Tor client authentication. Once you start a server in legacy mode you "
-"cannot remove legacy mode in that tab. Instead you must start a separate "
-"service in a separate tab."
-msgstr ""
-
-#: ../../source/advanced.rst:150
-msgid ""
-"Tor Project plans to `completely deprecate v2 onion services "
-"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will be removed from OnionShare before "
-"then."
+#: ../../source/advanced.rst:158
+msgid "And from the main mode chooser screen::"
 msgstr ""
 
 #~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
@@ -420,3 +400,161 @@ msgstr ""
 #~ " services will soon be removed from"
 #~ " OnionShare as well."
 #~ msgstr ""
+
+#~ msgid ""
+#~ "Everything in OnionShare is temporary by"
+#~ " default. If you close an OnionShare"
+#~ " tab, its address no longer exists"
+#~ " and it can't be used again. "
+#~ "Sometimes you might want an OnionShare"
+#~ " service to be persistent. This is"
+#~ " useful if you want to host a"
+#~ " website available from the same "
+#~ "OnionShare address even if you reboot"
+#~ " your computer."
+#~ msgstr "OnionShareのデフォルト設定では、全ての機能は一時的です。OnionShareタブを閉じると、そのアドレスは消えて再びに使えません。場合によっては永続的なOnionShareサービスが必要かもしれない。例えばパソコンを再起動しても、永続的なアドレスでOnionShareウェブサイトをホストしたい場合には役立つでしょう。"
+
+#~ msgid ""
+#~ "To make any tab persistent, check "
+#~ "the \"Save this tab, and automatically"
+#~ " open it when I open OnionShare\" "
+#~ "box before starting the server. When "
+#~ "a tab is saved a purple pin "
+#~ "icon appears to the left of its"
+#~ " server status."
+#~ msgstr "タブを永続的にするのに、サービスを実行する前に「このタブを保存し、OnionShareがスタートアップの時に自動的に開く」というボックスをチェックする。保存された場合、紫色のピンはタブの左側に表示されます。"
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start opened. You'll have to "
+#~ "manually start each service, but when"
+#~ " you do they will start with "
+#~ "the same OnionShare address and "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid "Turn Off Passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username ``onionshare``"
+#~ " and a randomly-generated password. "
+#~ "If someone takes 20 wrong guesses "
+#~ "at the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes you might want your OnionShare"
+#~ " service to be accessible to the "
+#~ "public, like if you want to set"
+#~ " up an OnionShare receive service so"
+#~ " the public can securely and "
+#~ "anonymously send you files. In this "
+#~ "case, it's better to disable the "
+#~ "password altogether. If you don't do "
+#~ "this, someone can force your server "
+#~ "to stop just by making 20 wrong"
+#~ " guesses of your password, even if"
+#~ " they know the correct password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To turn off the password for any"
+#~ " tab, just check the \"Don't use "
+#~ "a password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the \"Start sharing\" button you"
+#~ " will see a timer counting down "
+#~ "until it starts. If you scheduled "
+#~ "it to stop in the future, after"
+#~ " it's started you will see a "
+#~ "timer counting down to when it "
+#~ "will stop automatically."
+#~ msgstr ""
+#~ "サービスを将来に起動するよう設定した場合、「 共有を開始 "
+#~ "」ボタンをクリックすると開始時間までの減算カウンターが表示されます。将来に停止するよう設定した場合、「 共有を開始 "
+#~ "」ボタンをクリックすると普通に開始して、停止する時間までの減算カウンターは表示されます。"
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically start can be used as "
+#~ "a dead man's switch**, where your "
+#~ "service will be made public at a"
+#~ " given time in the future if "
+#~ "anything happens to you. If nothing "
+#~ "happens to you, you can cancel the"
+#~ " service before it's scheduled to "
+#~ "start."
+#~ msgstr ""
+#~ "**自動的な起動を予定することで、OnionShareのサービスを「デッドマン装置」として使えます。** "
+#~ "最悪の事態が起きた場合、特定時間にサービスは自動的に立ち上がります。何も起きなかったら、立ち上がる時点の前に停止できます。"
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " Internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Legacy Addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses v3 Tor onion services"
+#~ " by default. These are modern onion"
+#~ " addresses that have 56 characters, "
+#~ "for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare still has support for v2 "
+#~ "onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\", and they are not"
+#~ " recommended, as v3 onion addresses "
+#~ "are more secure."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" from its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "turn on Tor client authentication. Once"
+#~ " you start a server in legacy "
+#~ "mode you cannot remove legacy mode "
+#~ "in that tab. Instead you must "
+#~ "start a separate service in a "
+#~ "separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will be removed from "
+#~ "OnionShare before then."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ja/LC_MESSAGES/develop.po b/docs/source/locale/ja/LC_MESSAGES/develop.po
index c60ba186..4698a37f 100644
--- a/docs/source/locale/ja/LC_MESSAGES/develop.po
+++ b/docs/source/locale/ja/LC_MESSAGES/develop.po
@@ -7,17 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2022-10-09 15:01-0700\n"
 "PO-Revision-Date: 2022-10-09 21:13+0000\n"
 "Last-Translator: trace <dev_trace@tuta.io>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ja\n"
+"Language-Team: ja <LL@li.org>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.14.1\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: ../../source/develop.rst:2
 msgid "Developing OnionShare"
@@ -39,14 +38,12 @@ msgid ""
 "<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
 "click \"Join a Team\", and type \"onionshare\"."
 msgstr ""
-"OnionShare は、プロジェクトについて議論し、質問し、アイデアやデザインを共有し"
-"、将来の開発計画を立てるために、オープンな Keybase チームを設けています。(ま"
-"た、OnionShareアドレスのように、OnionShareコミュニティの他の人にエンドツーエ"
-"ンドで暗号化されたダイレクトメッセージを簡単に送信することができます。)"
-"Keybase を使用するには、`Keybase app <https://keybase.io/download>`_ "
-"をダウンロードし、アカウントを作成し、`join this team <https://keybase.io/"
-"team/onionshare>`_ を作成します。アプリ内の「Teams」から「Join a "
-"Team」をクリックし、「onionshare」と入力してください。"
+"OnionShare は、プロジェクトについて議論し、質問し、アイデアやデザインを共有し、将来の開発計画を立てるために、オープンな Keybase"
+" "
+"チームを設けています。(また、OnionShareアドレスのように、OnionShareコミュニティの他の人にエンドツーエンドで暗号化されたダイレクトメッセージを簡単に送信することができます。)Keybase"
+" を使用するには、`Keybase app <https://keybase.io/download>`_ "
+"をダウンロードし、アカウントを作成し、`join this team <https://keybase.io/team/onionshare>`_"
+" を作成します。アプリ内の「Teams」から「Join a Team」をクリックし、「onionshare」と入力してください。"
 
 #: ../../source/develop.rst:12
 msgid ""
@@ -54,9 +51,8 @@ msgid ""
 "<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
 "and and designers to discuss the project."
 msgstr ""
-"また、OnionShareは、開発者やデザイナーがプロジェクトについて議論するためのメ"
-"ーリングリスト<https://lists.riseup.net/www/subscribe/onionshare-"
-"dev>`_があります。"
+"また、OnionShareは、開発者やデザイナーがプロジェクトについて議論するためのメーリングリスト<https://lists.riseup.net/www/subscribe"
+"/onionshare-dev>`_があります。"
 
 #: ../../source/develop.rst:15
 msgid "Contributing Code"
@@ -65,7 +61,7 @@ msgstr ""
 #: ../../source/develop.rst:17
 msgid ""
 "OnionShare source code is to be found in this Git repository: "
-"https://github.com/micahflee/onionshare"
+"https://github.com/onionshare/onionshare"
 msgstr ""
 
 #: ../../source/develop.rst:19
@@ -73,7 +69,7 @@ msgid ""
 "If you'd like to contribute code to OnionShare, it helps to join the "
 "Keybase team and ask questions about what you're thinking of working on. "
 "You should also review all of the `open issues "
-"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
+"<https://github.com/onionshare/onionshare/issues>`_ on GitHub to see if "
 "there are any you'd like to tackle."
 msgstr ""
 
@@ -91,7 +87,7 @@ msgstr "開発を開始する"
 #: ../../source/develop.rst:29
 msgid ""
 "OnionShare is developed in Python. To get started, clone the Git "
-"repository at https://github.com/micahflee/onionshare/ and then consult "
+"repository at https://github.com/onionshare/onionshare/ and then consult "
 "the ``cli/README.md`` file to learn how to set up your development "
 "environment for the command-line version, and the ``desktop/README.md`` "
 "file to learn how to set up your development environment for the "
@@ -104,10 +100,7 @@ msgid ""
 "Those files contain the necessary technical instructions and commands "
 "install dependencies for your platform, and to run OnionShare from the "
 "source tree."
-msgstr ""
-"これらのファイルには、OnionShareをソースツリーから実行するために必要な技術的"
-"な説明と、お使いのプラットフォーム用の依存関係をインストールするためのコマン"
-"ドが含まれています。"
+msgstr "これらのファイルには、OnionShareをソースツリーから実行するために必要な技術的な説明と、お使いのプラットフォーム用の依存関係をインストールするためのコマンドが含まれています。"
 
 #: ../../source/develop.rst:35
 msgid "Debugging tips"
@@ -126,19 +119,16 @@ msgid ""
 "initialized, when events occur (like buttons clicked, settings saved or "
 "reloaded), and other debug info. For example::"
 msgstr ""
-"開発時には、ターミナルから OnionShare を実行し、コマンドに ``--verbose`` ("
-"または ``-v``) フラグを追加すると便利です。これは、特定のオブジェクトが初期化"
-"されたとき、イベントが発生したとき（ボタンのクリック、設定の保存や再読み込み"
-"など）、その他のデバッグ情報など、多くの役立つメッセージをターミナルに出力し"
-"ます。たとえば、次のようになります。"
+"開発時には、ターミナルから OnionShare を実行し、コマンドに ``--verbose`` (または ``-v``) "
+"フラグを追加すると便利です。これは、特定のオブジェクトが初期化されたとき、イベントが発生したとき（ボタンのクリック、設定の保存や再読み込みなど）、その他のデバッグ情報など、多くの役立つメッセージをターミナルに出力します。たとえば、次のようになります。"
 
 #: ../../source/develop.rst:117
 msgid ""
 "You can add your own debug messages by running the ``Common.log`` method "
 "from ``onionshare/common.py``. For example::"
 msgstr ""
-"``onionshare/common.py`` から ``Common.log`` メソッドを実行することで、"
-"独自のデバッグ メッセージを追加できます。例えば::"
+"``onionshare/common.py`` から ``Common.log`` メソッドを実行することで、独自のデバッグ "
+"メッセージを追加できます。例えば::"
 
 #: ../../source/develop.rst:121
 msgid ""
@@ -157,22 +147,21 @@ msgid ""
 "altogether during development. You can do this with the ``--local-only`` "
 "flag. For example::"
 msgstr ""
-"Tor は遅いため、開発中にオニオン "
-"サービスの開始を完全にスキップすると便利な場合がよくあります。これは "
-"``--local-only`` フラグで行うことができます。例えば：："
+"Tor は遅いため、開発中にオニオン サービスの開始を完全にスキップすると便利な場合がよくあります。これは ``--local-only`` "
+"フラグで行うことができます。例えば：："
 
-#: ../../source/develop.rst:164
+#: ../../source/develop.rst:165
 msgid ""
-"In this case, you load the URL ``http://onionshare:train-"
-"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
-" using the Tor Browser."
+"In this case, you load the URL ``http://127.0.0.1:17641`` in a normal "
+"web-browser like Firefox, instead of using the Tor Browser. The private "
+"key is not actually needed in local-only mode, so you can ignore it."
 msgstr ""
 
-#: ../../source/develop.rst:167
+#: ../../source/develop.rst:168
 msgid "Contributing Translations"
 msgstr "翻訳へ貢献する"
 
-#: ../../source/develop.rst:169
+#: ../../source/develop.rst:170
 msgid ""
 "Help make OnionShare easier to use and more familiar and welcoming for "
 "people by translating it on `Hosted Weblate "
@@ -181,26 +170,25 @@ msgid ""
 "needed."
 msgstr ""
 "OnionShare をより使いやすく、より親しみやすくするために、`Hosted Weblate "
-"<https://hosted.weblate.org/projects/onionshare/>`_ で翻訳することに協力して"
-"ください。「OnionShare」は常にラテン文字で表記し、必要であれば「OnionShare "
+"<https://hosted.weblate.org/projects/onionshare/>`_ "
+"で翻訳することに協力してください。「OnionShare」は常にラテン文字で表記し、必要であれば「OnionShare "
 "(ローカル名)」を使用してください。"
 
-#: ../../source/develop.rst:171
+#: ../../source/develop.rst:172
 msgid "To help translate, make a Hosted Weblate account and start contributing."
 msgstr "翻訳を手伝うには、Hosted Weblateのアカウントを作り、投稿を始めてください。"
 
-#: ../../source/develop.rst:174
+#: ../../source/develop.rst:175
 msgid "Suggestions for Original English Strings"
 msgstr ""
 
-#: ../../source/develop.rst:176
+#: ../../source/develop.rst:177
 msgid ""
 "Sometimes the original English strings are wrong, or don't match between "
 "the application and the documentation."
-msgstr "場合によっては、元の英語の文字列が間違っていたり、アプリケーションとドキュメ"
-"ント間で一致しない場合があります。"
+msgstr "場合によっては、元の英語の文字列が間違っていたり、アプリケーションとドキュメント間で一致しない場合があります。"
 
-#: ../../source/develop.rst:178
+#: ../../source/develop.rst:179
 msgid ""
 "File source string improvements by adding @kingu to your Weblate comment,"
 " or open a GitHub issue or pull request. The latter ensures all upstream "
@@ -208,11 +196,11 @@ msgid ""
 "the usual code review processes."
 msgstr ""
 
-#: ../../source/develop.rst:182
+#: ../../source/develop.rst:183
 msgid "Status of Translations"
 msgstr ""
 
-#: ../../source/develop.rst:183
+#: ../../source/develop.rst:184
 msgid ""
 "Here is the current translation status. If you want start a translation "
 "in a language not yet started, please write to the mailing list: "
@@ -434,3 +422,42 @@ msgstr ""
 
 #~ msgid "Do the same for other untranslated lines."
 #~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare source code is to be "
+#~ "found in this Git repository: "
+#~ "https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "you'd like to tackle."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, clone the Git "
+#~ "repository at https://github.com/micahflee/onionshare/ "
+#~ "and then consult the ``cli/README.md`` "
+#~ "file to learn how to set up "
+#~ "your development environment for the "
+#~ "command-line version, and the "
+#~ "``desktop/README.md`` file to learn how "
+#~ "to set up your development environment"
+#~ " for the graphical version."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:train-system@127.0.0.1:17635`` in "
+#~ "a normal web-browser like Firefox, "
+#~ "instead of using the Tor Browser."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ja/LC_MESSAGES/features.po b/docs/source/locale/ja/LC_MESSAGES/features.po
index 912833f1..de37ad9a 100644
--- a/docs/source/locale/ja/LC_MESSAGES/features.po
+++ b/docs/source/locale/ja/LC_MESSAGES/features.po
@@ -7,17 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2022-10-09 15:01-0700\n"
 "PO-Revision-Date: 2021-12-10 02:52+0000\n"
 "Last-Translator: Taro Tanaka <anon_japan@protonmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ja\n"
+"Language-Team: ja <LL@li.org>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.10-dev\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: ../../source/features.rst:4
 msgid "How OnionShare Works"
@@ -30,38 +29,46 @@ msgid ""
 "<https://community.torproject.org/onion-services/>`_."
 msgstr ""
 "ウェブサーバーが自宅のパソコンでローカルに作られ、`Tor <https://www.torproject.org/>`_ネットワーク上で "
-"`「オニオン・サービス」 <https://community.torproject.org/onion-services/"
-">`_として閲覧できるようにされます。."
+"`「オニオン・サービス」 <https://community.torproject.org/onion-"
+"services/>`_として閲覧できるようにされます。."
 
 #: ../../source/features.rst:8
-msgid ""
-"By default, OnionShare web addresses are protected with a random "
-"password. A typical OnionShare address might look something like this::"
+msgid "By default, OnionShare web addresses are protected with a private key."
 msgstr ""
 
-#: ../../source/features.rst:12
-msgid ""
-"You're responsible for securely sharing that URL using a communication "
-"channel of your choice like in an encrypted chat message, or using "
-"something less secure like unencrypted e-mail, depending on your `threat "
-"model <https://ssd.eff.org/module/your-security-plan>`_."
+#: ../../source/features.rst:10
+msgid "OnionShare addresses look something like this::"
 msgstr ""
 
 #: ../../source/features.rst:14
+msgid "And private keys might look something like this::"
+msgstr ""
+
+#: ../../source/features.rst:18
+msgid ""
+"You're responsible for securely sharing that URL and private key using a "
+"communication channel of your choice like in an encrypted chat message, "
+"or using something less secure like unencrypted email, depending on your "
+"`threat model <https://ssd.eff.org/module/your-security-plan>`_."
+msgstr ""
+
+#: ../../source/features.rst:20
 msgid ""
 "The people you send the URL to then copy and paste it into their `Tor "
 "Browser <https://www.torproject.org/>`_ to access the OnionShare service."
+" Tor Browser will then prompt for the private key, which the people can "
+"also then copy and paste in."
 msgstr ""
 
-#: ../../source/features.rst:16
+#: ../../source/features.rst:24
 msgid ""
 "If you run OnionShare on your laptop to send someone files, and then "
 "suspend it before the files are sent, the service will not be available "
-"until your laptop is unsuspended and on the Internet again. OnionShare "
+"until your laptop is unsuspended and on the internet again. OnionShare "
 "works best when working with people in real-time."
 msgstr ""
 
-#: ../../source/features.rst:18
+#: ../../source/features.rst:26
 msgid ""
 "Because your own computer is the web server, *no third party can access "
 "anything that happens in OnionShare*, not even the developers of "
@@ -69,108 +76,130 @@ msgid ""
 "Tor onion services too, it also protects your anonymity. See the "
 ":doc:`security design </security>` for more info."
 msgstr ""
-"ウェブサーバーは自宅のパソコンだからこそ、開発者さえも、*第三者はOnionShare内のコンテンツにアクセスできない。*完全にプライベートです。そしてO"
-"nionShareはTorのオニオン・サービスに基づいているので、匿名性も守られています。詳しくは「`security design "
-"</security>`」という:doc:を訪れて下さい。"
+"ウェブサーバーは自宅のパソコンだからこそ、開発者さえも、*第三者はOnionShare内のコンテンツにアクセスできない。*完全にプライベートです。そしてOnionShareはTorのオニオン・サービスに基づいているので、匿名性も守られています。詳しくは「`security"
+" design </security>`」という:doc:を訪れて下さい。"
 
-#: ../../source/features.rst:21
+#: ../../source/features.rst:29
 msgid "Share Files"
 msgstr "ファイルを共有"
 
-#: ../../source/features.rst:23
+#: ../../source/features.rst:31
 msgid ""
 "You can use OnionShare to send files and folders to people securely and "
 "anonymously. Open a share tab, drag in the files and folders you wish to "
 "share, and click \"Start sharing\"."
-msgstr ""
-"OnionShareで、ファイルやフォルダーを安全そして匿名で他の人と共有できます。共有タブを開いて、共有したいファイルをドラッグアンドドロップして、「共"
-"有を開始」をクリックする。"
+msgstr "OnionShareで、ファイルやフォルダーを安全そして匿名で他の人と共有できます。共有タブを開いて、共有したいファイルをドラッグアンドドロップして、「共有を開始」をクリックする。"
 
-#: ../../source/features.rst:27 ../../source/features.rst:93
+#: ../../source/features.rst:35 ../../source/features.rst:112
 msgid ""
 "After you add files, you'll see some settings. Make sure you choose the "
 "setting you're interested in before you start sharing."
 msgstr "ファイルを追加したら、設定は表示されます。共有を開始する前に、ふさわしい設定を選択して下さい。"
 
-#: ../../source/features.rst:31
+#: ../../source/features.rst:39
 msgid ""
 "As soon as someone finishes downloading your files, OnionShare will "
-"automatically stop the server, removing the website from the Internet. To"
+"automatically stop the server, removing the website from the internet. To"
 " allow multiple people to download them, uncheck the \"Stop sharing after"
 " files have been sent (uncheck to allow downloading individual files)\" "
 "box."
 msgstr ""
 
-#: ../../source/features.rst:34
+#: ../../source/features.rst:42
 msgid ""
 "Also, if you uncheck this box, people will be able to download the "
 "individual files you share rather than a single compressed version of all"
 " the files."
 msgstr "このチェックを外すと、全ファイルの圧縮された版ではなく各ファイルを別々にダウンロードできるようにします。"
 
-#: ../../source/features.rst:36
+#: ../../source/features.rst:44
 msgid ""
 "When you're ready to share, click the \"Start sharing\" button. You can "
 "always click \"Stop sharing\", or quit OnionShare, immediately taking the"
 " website down. You can also click the \"↑\" icon in the top-right corner "
 "to show the history and progress of people downloading files from you."
-msgstr ""
-"共有の始めたい時に、「共有を開始」ボタンをクリックして下さい。いつでも「共有を停止」ボタンをクリックしたら、もしくはOnionShareを閉じたらウェブサ"
-"イトは停止されます。右上にある「↑」ボタンをクリックすると、ファイルのダウンロード状態・歴史は表示されます。"
+msgstr "共有の始めたい時に、「共有を開始」ボタンをクリックして下さい。いつでも「共有を停止」ボタンをクリックしたら、もしくはOnionShareを閉じたらウェブサイトは停止されます。右上にある「↑」ボタンをクリックすると、ファイルのダウンロード状態・歴史は表示されます。"
 
-#: ../../source/features.rst:40
+#: ../../source/features.rst:48
 msgid ""
-"Now that you have a OnionShare, copy the address and send it to the "
-"person you want to receive the files. If the files need to stay secure, "
-"or the person is otherwise exposed to danger, use an encrypted messaging "
-"app."
+"Now that you have a OnionShare, copy the address and the private key and "
+"send it to the person you want to receive the files. If the files need to"
+" stay secure, or the person is otherwise exposed to danger, use an "
+"encrypted messaging app."
 msgstr ""
 
-#: ../../source/features.rst:42
+#: ../../source/features.rst:50
 msgid ""
 "That person then must load the address in Tor Browser. After logging in "
-"with the random password included in the web address, the files can be "
-"downloaded directly from your computer by clicking the \"Download Files\""
-" link in the corner."
+"with the private key, the files can be downloaded directly from your "
+"computer by clicking the \"Download Files\" link in the corner."
+msgstr ""
+
+#: ../../source/features.rst:55
+msgid "Receive Files and Messages"
+msgstr ""
+
+#: ../../source/features.rst:57
+msgid ""
+"You can use OnionShare to let people anonymously submit files and "
+"messages directly to your computer, essentially turning it into an "
+"anonymous dropbox. Open a receive tab and choose the settings that you "
+"want."
 msgstr ""
 
-#: ../../source/features.rst:47
-msgid "Receive Files"
+#: ../../source/features.rst:62
+msgid "You can browse for a folder to save messages and files that get submitted."
+msgstr ""
+
+#: ../../source/features.rst:64
+msgid ""
+"You can check \"Disable submitting text\" if want to only allow file "
+"uploads, and you can check \"Disable uploading files\" if you want to "
+"only allow submitting text messages, like for an anonymous contact form."
 msgstr ""
 
-#: ../../source/features.rst:49
+#: ../../source/features.rst:66
 msgid ""
-"You can use OnionShare to let people anonymously upload files directly to"
-" your computer, essentially turning it into an anonymous dropbox. Open a "
-"\"Receive tab\", choose where you want to save the files and other "
-"settings, and then click \"Start Receive Mode\"."
+"You can check \"Use notification webhook\" and then choose a webhook URL "
+"if you want to be notified when someone submits files or messages to your"
+" OnionShare service. If you use this feature, OnionShare will make an "
+"HTTP POST request to this URL whenever someone submits files or messages."
+" For example, if you want to get an encrypted text messaging on the "
+"messaging app `Keybase <https://keybase.io/>`_, you can start a "
+"conversation with `@webhookbot <https://keybase.io/webhookbot>`_, type "
+"``!webhook create onionshare-alerts``, and it will respond with a URL. "
+"Use that as the notification webhook URL. If someone uploads a file to "
+"your receive mode service, @webhookbot will send you a message on Keybase"
+" letting you know as soon as it happens."
 msgstr ""
 
-#: ../../source/features.rst:54
+#: ../../source/features.rst:71
 msgid ""
-"This starts the OnionShare service. Anyone loading this address in their "
-"Tor Browser will be able to upload files to your computer."
+"When you are ready, click \"Start Receive Mode\". This starts the "
+"OnionShare service. Anyone loading this address in their Tor Browser will"
+" be able to submit files and messages which get uploaded to your "
+"computer."
 msgstr ""
 
-#: ../../source/features.rst:58
+#: ../../source/features.rst:75
 msgid ""
 "You can also click the down \"↓\" icon in the top-right corner to show "
 "the history and progress of people sending files to you."
 msgstr "右上にある「↓」ボタンをクリックすると、ファイルのアップロード状態・歴史は表示されます。"
 
-#: ../../source/features.rst:60
-msgid "Here is what it looks like for someone sending you files."
+#: ../../source/features.rst:77
+msgid "Here is what it looks like for someone sending you files and messages."
 msgstr ""
 
-#: ../../source/features.rst:64
+#: ../../source/features.rst:81
 msgid ""
-"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in the home folder on your "
-"computer, automatically organized into separate subfolders based on the "
-"time that the files get uploaded."
+"When someone submits files or messages to your receive service, by "
+"default they get saved to a folder called ``OnionShare`` in the home "
+"folder on your computer, automatically organized into separate subfolders"
+" based on the time that the files get uploaded."
 msgstr ""
 
-#: ../../source/features.rst:66
+#: ../../source/features.rst:83
 msgid ""
 "Setting up an OnionShare receiving service is useful for journalists and "
 "others needing to securely accept documents from anonymous sources. When "
@@ -178,23 +207,22 @@ msgid ""
 "quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
 "whistleblower submission system."
 msgstr ""
-"OnionShareのファイル受信サービスは匿名情報筋から安全に文書を受け入るのにジャーナリストなどに役立つでしょう。このように使うと、OnionShar"
-"eはライトウェイト、単純、そして安全性の少し低い`SecureDrop <https://securedrop.org/"
-">`_（安全に匿名情報源から情報を入手するためのシステム）の代替品になります。"
+"OnionShareのファイル受信サービスは匿名情報筋から安全に文書を受け入るのにジャーナリストなどに役立つでしょう。このように使うと、OnionShareはライトウェイト、単純、そして安全性の少し低い`SecureDrop"
+" <https://securedrop.org/>`_（安全に匿名情報源から情報を入手するためのシステム）の代替品になります。"
 
-#: ../../source/features.rst:69
+#: ../../source/features.rst:86
 msgid "Use at your own risk"
 msgstr "自己責任で使って下さい"
 
-#: ../../source/features.rst:71
+#: ../../source/features.rst:88
 msgid ""
-"Just like with malicious e-mail attachments, it's possible someone could "
+"Just like with malicious email attachments, it's possible someone could "
 "try to attack your computer by uploading a malicious file to your "
 "OnionShare service. OnionShare does not add any safety mechanisms to "
 "protect your system from malicious files."
 msgstr ""
 
-#: ../../source/features.rst:73
+#: ../../source/features.rst:90
 msgid ""
 "If you receive an Office document or a PDF through OnionShare, you can "
 "convert these documents into PDFs that are safe to open using `Dangerzone"
@@ -203,43 +231,47 @@ msgid ""
 "<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
 "disposableVM."
 msgstr ""
-"OnionShareでオフィス文書やPDFを受信する場合、`Dangerzone <https://dangerzone.rocks/"
-">`_を使って安全に開けるようなPDFファイルに変換できます。さらに、`Tails <https://tails.boum.org/>`_または`"
-"Qubes <https://qubes-os.org/>`_ の使い捨て仮想マシンを使ってより安全に信頼できないファイルを開くことができます。"
+"OnionShareでオフィス文書やPDFを受信する場合、`Dangerzone "
+"<https://dangerzone.rocks/>`_を使って安全に開けるようなPDFファイルに変換できます。さらに、`Tails "
+"<https://tails.boum.org/>`_または`Qubes <https://qubes-os.org/>`_ "
+"の使い捨て仮想マシンを使ってより安全に信頼できないファイルを開くことができます。"
 
-#: ../../source/features.rst:76
+#: ../../source/features.rst:92
+msgid "However, it is always safe to open text messages sent through OnionShare."
+msgstr ""
+
+#: ../../source/features.rst:95
 msgid "Tips for running a receive service"
 msgstr "ファイル受信サービスを管理するアドバイス"
 
-#: ../../source/features.rst:78
+#: ../../source/features.rst:97
 msgid ""
 "If you want to host your own anonymous dropbox using OnionShare, it's "
 "recommended you do so on a separate, dedicated computer always powered on"
-" and connected to the Internet, and not on the one you use on a regular "
+" and connected to the internet, and not on the one you use on a regular "
 "basis."
 msgstr ""
 
-#: ../../source/features.rst:80
+#: ../../source/features.rst:99
 msgid ""
 "If you intend to put the OnionShare address on your website or social "
 "media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
-"public service (see :ref:`turn_off_passwords`)."
+"public service (see :ref:`turn_off_private_key`). It's also a good idea "
+"to give it a custom title (see :ref:`custom_titles`)."
 msgstr ""
 
-#: ../../source/features.rst:83
+#: ../../source/features.rst:102
 msgid "Host a Website"
 msgstr "ウェブサイトをホストする"
 
-#: ../../source/features.rst:85
+#: ../../source/features.rst:104
 msgid ""
 "To host a static HTML website with OnionShare, open a website tab, drag "
 "the files and folders that make up the static content there, and click "
 "\"Start sharing\" when you are ready."
-msgstr ""
-"OnionShareでスタティック型のウェブサイトをホストするのに、ウェブサイトのタブを開いて、スタティック型のコンテンツが含まれるファイルやフォルダーを"
-"ドラッグアンドドロップして、そして「共有を開始」をクリックする。"
+msgstr "OnionShareでスタティック型のウェブサイトをホストするのに、ウェブサイトのタブを開いて、スタティック型のコンテンツが含まれるファイルやフォルダーをドラッグアンドドロップして、そして「共有を開始」をクリックする。"
 
-#: ../../source/features.rst:89
+#: ../../source/features.rst:108
 msgid ""
 "If you add an ``index.html`` file, it will render when someone loads your"
 " website. You should also include any other HTML files, CSS files, "
@@ -247,129 +279,128 @@ msgid ""
 "OnionShare only supports hosting *static* websites. It can't host "
 "websites that execute code or use databases. So you can't for example use"
 " WordPress.)"
-msgstr ""
-"``index.html``ファイルも追加すると、ウェブサイトがロードされる時にレンダーリングされます。サイトを構成するHTMLファイル、CSSファイル、"
-"JavaScriptファイル、そして画像データも追加する必要があります。（OnionShareはスタティック型のウェブサイトのみをホストできることをご了承"
-"ください。コードを実行するまたデータベースを利用するウェブサイトをホストできません。例えばWordPressを使えません。）"
+msgstr "``index.html``ファイルも追加すると、ウェブサイトがロードされる時にレンダーリングされます。サイトを構成するHTMLファイル、CSSファイル、JavaScriptファイル、そして画像データも追加する必要があります。（OnionShareはスタティック型のウェブサイトのみをホストできることをご了承ください。コードを実行するまたデータベースを利用するウェブサイトをホストできません。例えばWordPressを使えません。）"
 
-#: ../../source/features.rst:91
+#: ../../source/features.rst:110
 msgid ""
 "If you don't have an ``index.html`` file, it will show a directory "
 "listing instead, and people loading it can look through the files and "
 "download them."
 msgstr "``index.html``ファイルがない場合はディレクトリのリストは表示され、サイトをロードする人々はファイルを閲覧、ダウンロードできます。"
 
-#: ../../source/features.rst:98
+#: ../../source/features.rst:117
 msgid "Content Security Policy"
 msgstr "コンテンツセキュリティポリシー"
 
-#: ../../source/features.rst:100
+#: ../../source/features.rst:119
 msgid ""
 "By default OnionShare helps secure your website by setting a strict "
-"`Content Security Police "
+"`Content Security Policy "
 "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
 "However, this prevents third-party content from loading inside the web "
 "page."
 msgstr ""
 
-#: ../../source/features.rst:102
+#: ../../source/features.rst:121
 msgid ""
 "If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, check the \"Don't send Content Security "
-"Policy header (allows your website to use third-party resources)\" box "
-"before starting the service."
+"JavaScript libraries from CDNs, you have two options:"
+msgstr ""
+
+#: ../../source/features.rst:123
+msgid ""
+"You can disable sending a Content Security Policy header by checking the "
+"\"Don't send Content Security Policy header (allows your website to use "
+"third-party resources)\" box before starting the service."
+msgstr ""
+
+#: ../../source/features.rst:124
+msgid "You can send a custom Content Security Policy header."
 msgstr ""
 
-#: ../../source/features.rst:105
+#: ../../source/features.rst:127
 msgid "Tips for running a website service"
 msgstr "ウェブサイトのサービスを管理するアドバイス"
 
-#: ../../source/features.rst:107
+#: ../../source/features.rst:129
 msgid ""
 "If you want to host a long-term website using OnionShare (meaning not "
-"something to quickly show someone something), it's recommended you do it "
-"on a separate, dedicated computer always powered on and connected to the "
-"Internet, and not on the one you use on a regular basis. Save the tab "
-"(see :ref:`save_tabs`) so you can resume the website with the same "
+"just to quickly show someone something), it's recommended you do it on a "
+"separate, dedicated computer that is always powered on and connected to "
+"the internet, and not on the one you use on a regular basis. Save the tab"
+" (see :ref:`save_tabs`) so you can resume the website with the same "
 "address if you close OnionShare and re-open it later."
 msgstr ""
 
-#: ../../source/features.rst:110
+#: ../../source/features.rst:132
 msgid ""
 "If your website is intended for the public, you should run it as a public"
-" service (see :ref:`turn_off_passwords`)."
+" service (see :ref:`turn_off_private_key`)."
 msgstr ""
 
-#: ../../source/features.rst:113
+#: ../../source/features.rst:135
 msgid "Chat Anonymously"
 msgstr "匿名でチャット"
 
-#: ../../source/features.rst:115
+#: ../../source/features.rst:137
 msgid ""
 "You can use OnionShare to set up a private, secure chat room that doesn't"
 " log anything. Just open a chat tab and click \"Start chat server\"."
-msgstr ""
-"OnionShareを使って、何も記録しないプライベート、安全なチャットルームを作れます。チャットタブを開いて、「チャットサーバーを始動」をクリックする。"
+msgstr "OnionShareを使って、何も記録しないプライベート、安全なチャットルームを作れます。チャットタブを開いて、「チャットサーバーを始動」をクリックする。"
 
-#: ../../source/features.rst:119
+#: ../../source/features.rst:141
 msgid ""
-"After you start the server, copy the OnionShare address and send it to "
-"the people you want in the anonymous chat room. If it's important to "
-"limit exactly who can join, use an encrypted messaging app to send out "
-"the OnionShare address."
+"After you start the server, copy the OnionShare address and private key "
+"and send them to the people you want in the anonymous chat room. If it's "
+"important to limit exactly who can join, use an encrypted messaging app "
+"to send out the OnionShare address and private key."
 msgstr ""
 
-#: ../../source/features.rst:124
+#: ../../source/features.rst:146
 msgid ""
 "People can join the chat room by loading its OnionShare address in Tor "
 "Browser. The chat room requires JavasScript, so everyone who wants to "
 "participate must have their Tor Browser security level set to "
 "\"Standard\" or \"Safer\", instead of \"Safest\"."
-msgstr ""
-"他の人はTorブラウザでOnionShareのアドレスを訪れたらチャットに参加できます。チャットルームにはJavaScriptが必要だから、参加したい方は"
-"Torブラウザのセキュリティレベルを「最も安全」ではなく「標準」または「より安全」に設定する必要があります。"
+msgstr "他の人はTorブラウザでOnionShareのアドレスを訪れたらチャットに参加できます。チャットルームにはJavaScriptが必要だから、参加したい方はTorブラウザのセキュリティレベルを「最も安全」ではなく「標準」または「より安全」に設定する必要があります。"
 
-#: ../../source/features.rst:127
+#: ../../source/features.rst:149
 msgid ""
 "When someone joins the chat room they get assigned a random name. They "
 "can change their name by typing a new name in the box in the left panel "
 "and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
 "get displayed at all, even if others were already chatting in the room."
-msgstr ""
-"チャットルームに入る方はランダムのユーザ名を付けられます。左パネルにあるボックスに新しいユーザ名を入力して「↵」を押すと変更できます。入る前に他のユーザが"
-"チャットしてたかどうかにもかかわらず、チャット歴史はどこにも保存されていないので表示されません。"
+msgstr "チャットルームに入る方はランダムのユーザ名を付けられます。左パネルにあるボックスに新しいユーザ名を入力して「↵」を押すと変更できます。入る前に他のユーザがチャットしてたかどうかにもかかわらず、チャット歴史はどこにも保存されていないので表示されません。"
 
-#: ../../source/features.rst:133
+#: ../../source/features.rst:155
 msgid ""
 "In an OnionShare chat room, everyone is anonymous. Anyone can change "
 "their name to anything, and there is no way to confirm anyone's identity."
 msgstr "OnionShareのチャットルームに、皆は匿名です。誰でも自由にユーザ名を変更できる、そして身元を認証する方法はありません。"
 
-#: ../../source/features.rst:136
+#: ../../source/features.rst:158
 msgid ""
 "However, if you create an OnionShare chat room and securely send the "
 "address only to a small group of trusted friends using encrypted "
 "messages, you can be reasonably confident the people joining the chat "
 "room are your friends."
-msgstr ""
-"でもOnionShareのチャットルームを作って、安全な通信でアドレスを信頼できる友達の少人数グループのみと共有すれば、チャットルームに入るユーザは実際に"
-"友達だとそれなりに確信できるでしょう。"
+msgstr "でもOnionShareのチャットルームを作って、安全な通信でアドレスを信頼できる友達の少人数グループのみと共有すれば、チャットルームに入るユーザは実際に友達だとそれなりに確信できるでしょう。"
 
-#: ../../source/features.rst:139
+#: ../../source/features.rst:161
 msgid "How is this useful?"
 msgstr "これは何の役に立ちますか？"
 
-#: ../../source/features.rst:141
+#: ../../source/features.rst:163
 msgid ""
 "If you need to already be using an encrypted messaging app, what's the "
 "point of an OnionShare chat room to begin with? It leaves less traces."
 msgstr "どうぜ暗号化メッセンジャーアプリを使う必要あるなら、OnionShareのチャットルームには何の意味がありますか？より少ない痕跡を残します。"
 
-#: ../../source/features.rst:143
+#: ../../source/features.rst:165
 msgid ""
 "If you for example send a message to a Signal group, a copy of your "
-"message ends up on each device (the devices, and computers if they set up"
-" Signal Desktop) of each member of the group. Even if disappearing "
+"message ends up on each device (the smartphones, and computers if they "
+"set up Signal Desktop) of each member of the group. Even if disappearing "
 "messages is turned on, it's hard to confirm all copies of the messages "
 "are actually deleted from all devices, and from any other places (like "
 "notifications databases) they may have been saved to. OnionShare chat "
@@ -377,21 +408,21 @@ msgid ""
 "minimum."
 msgstr ""
 
-#: ../../source/features.rst:146
+#: ../../source/features.rst:168
 msgid ""
 "OnionShare chat rooms can also be useful for people wanting to chat "
 "anonymously and securely with someone without needing to create any "
 "accounts. For example, a source can send an OnionShare address to a "
-"journalist using a disposable e-mail address, and then wait for the "
+"journalist using a disposable email address, and then wait for the "
 "journalist to join the chat room, all without compromosing their "
 "anonymity."
 msgstr ""
 
-#: ../../source/features.rst:150
+#: ../../source/features.rst:172
 msgid "How does the encryption work?"
 msgstr "暗号化の仕組みは何ですか？"
 
-#: ../../source/features.rst:152
+#: ../../source/features.rst:174
 msgid ""
 "Because OnionShare relies on Tor onion services, connections between the "
 "Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
@@ -399,12 +430,9 @@ msgid ""
 "server through the E2EE onion connection, which then sends it to all "
 "other members of the chat room using WebSockets, through their E2EE onion"
 " connections."
-msgstr ""
-"OnionShareはTorオニオンサービスに頼るので、TorブラウザとOnionShareの間の接続は全て終端間暗号化されている（E2EE）。メッセージ"
-"はOnionShareチャットルームに投稿されるとき、E2EEオニオン接続を介してサーバーに送られて、サーバーがWebSocketを使ってE2EEオニオン"
-"接続を介して他のユーザに送ります。"
+msgstr "OnionShareはTorオニオンサービスに頼るので、TorブラウザとOnionShareの間の接続は全て終端間暗号化されている（E2EE）。メッセージはOnionShareチャットルームに投稿されるとき、E2EEオニオン接続を介してサーバーに送られて、サーバーがWebSocketを使ってE2EEオニオン接続を介して他のユーザに送ります。"
 
-#: ../../source/features.rst:154
+#: ../../source/features.rst:176
 msgid ""
 "OnionShare doesn't implement any chat encryption on its own. It relies on"
 " the Tor onion service's encryption instead."
@@ -797,3 +825,216 @@ msgstr "OnionShare自体はチャットの暗号を実行せず、Torオニオ�
 #~ "WebSockets, through their E2EE onion "
 #~ "connections."
 #~ msgstr ""
+
+#~ msgid ""
+#~ "By default, OnionShare web addresses are"
+#~ " protected with a random password. A"
+#~ " typical OnionShare address might look "
+#~ "something like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like unencrypted "
+#~ "e-mail, depending on your `threat model"
+#~ " <https://ssd.eff.org/module/your-security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people you send the URL to "
+#~ "then copy and paste it into their"
+#~ " `Tor Browser <https://www.torproject.org/>`_ to"
+#~ " access the OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you run OnionShare on your "
+#~ "laptop to send someone files, and "
+#~ "then suspend it before the files "
+#~ "are sent, the service will not be"
+#~ " available until your laptop is "
+#~ "unsuspended and on the Internet again."
+#~ " OnionShare works best when working "
+#~ "with people in real-time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "As soon as someone finishes downloading"
+#~ " your files, OnionShare will automatically"
+#~ " stop the server, removing the "
+#~ "website from the Internet. To allow "
+#~ "multiple people to download them, "
+#~ "uncheck the \"Stop sharing after files"
+#~ " have been sent (uncheck to allow "
+#~ "downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a OnionShare, "
+#~ "copy the address and send it to"
+#~ " the person you want to receive "
+#~ "the files. If the files need to"
+#~ " stay secure, or the person is "
+#~ "otherwise exposed to danger, use an "
+#~ "encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password included"
+#~ " in the web address, the files "
+#~ "can be downloaded directly from your "
+#~ "computer by clicking the \"Download "
+#~ "Files\" link in the corner."
+#~ msgstr ""
+
+#~ msgid "Receive Files"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " \"Receive tab\", choose where you "
+#~ "want to save the files and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This starts the OnionShare service. "
+#~ "Anyone loading this address in their "
+#~ "Tor Browser will be able to upload"
+#~ " files to your computer."
+#~ msgstr ""
+
+#~ msgid "Here is what it looks like for someone sending you files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in the home folder on your "
+#~ "computer, automatically organized into "
+#~ "separate subfolders based on the time"
+#~ " that the files get uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious e-mail "
+#~ "attachments, it's possible someone could "
+#~ "try to attack your computer by "
+#~ "uploading a malicious file to your "
+#~ "OnionShare service. OnionShare does not "
+#~ "add any safety mechanisms to protect "
+#~ "your system from malicious files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended you do so on a "
+#~ "separate, dedicated computer always powered"
+#~ " on and connected to the Internet,"
+#~ " and not on the one you use "
+#~ "on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend to put the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, save the tab"
+#~ " (see :ref:`save_tabs`) and run it as"
+#~ " a public service (see "
+#~ ":ref:`turn_off_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare helps secure your"
+#~ " website by setting a strict `Content"
+#~ " Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However, this prevents third-"
+#~ "party content from loading inside the"
+#~ " web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, check "
+#~ "the \"Don't send Content Security Policy"
+#~ " header (allows your website to use"
+#~ " third-party resources)\" box before "
+#~ "starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (meaning "
+#~ "not something to quickly show someone"
+#~ " something), it's recommended you do "
+#~ "it on a separate, dedicated computer "
+#~ "always powered on and connected to "
+#~ "the Internet, and not on the one"
+#~ " you use on a regular basis. "
+#~ "Save the tab (see :ref:`save_tabs`) so"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended for "
+#~ "the public, you should run it as"
+#~ " a public service (see "
+#~ ":ref:`turn_off_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people you want in the "
+#~ "anonymous chat room. If it's important"
+#~ " to limit exactly who can join, "
+#~ "use an encrypted messaging app to "
+#~ "send out the OnionShare address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you for example send a message"
+#~ " to a Signal group, a copy of"
+#~ " your message ends up on each "
+#~ "device (the devices, and computers if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is turned on, "
+#~ "it's hard to confirm all copies of"
+#~ " the messages are actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so the problem is"
+#~ " reduced to a minimum."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for people wanting to chat "
+#~ "anonymously and securely with someone "
+#~ "without needing to create any accounts."
+#~ " For example, a source can send "
+#~ "an OnionShare address to a journalist"
+#~ " using a disposable e-mail address, "
+#~ "and then wait for the journalist "
+#~ "to join the chat room, all without"
+#~ " compromosing their anonymity."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ja/LC_MESSAGES/help.po b/docs/source/locale/ja/LC_MESSAGES/help.po
index 5db4b4eb..ff9f7206 100644
--- a/docs/source/locale/ja/LC_MESSAGES/help.po
+++ b/docs/source/locale/ja/LC_MESSAGES/help.po
@@ -7,17 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2022-10-09 15:01-0700\n"
 "PO-Revision-Date: 2022-01-31 12:53+0000\n"
 "Last-Translator: Taro Tanaka <anon_japan@protonmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ja\n"
+"Language-Team: ja <LL@li.org>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.11-dev\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: ../../source/help.rst:2
 msgid "Getting Help"
@@ -38,14 +37,16 @@ msgid "Check the GitHub Issues"
 msgstr "GitHubのissuesをチェック"
 
 #: ../../source/help.rst:12
+#, fuzzy
 msgid ""
 "If it isn't on the website, please check the `GitHub issues "
-"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
-" else has encountered the same problem and either raised it with the "
-"developers, or maybe even posted a solution."
+"<https://github.com/onionshare/onionshare/issues>`_. It's possible "
+"someone else has encountered the same problem and either raised it with "
+"the developers, or maybe even posted a solution."
 msgstr ""
-"ウェブサイトに見つけれない場合、`GitHubイシュー <https://github.com/micahflee/onionshare/issues>`"
-"_ をチェックして下さい。他の方が同じ問題を直面した可能性がある、そして開発者に持ち掛けたそれとも解決を見つけたかもしれない。"
+"ウェブサイトに見つけれない場合、`GitHubイシュー "
+"<https://github.com/micahflee/onionshare/issues>`_ "
+"をチェックして下さい。他の方が同じ問題を直面した可能性がある、そして開発者に持ち掛けたそれとも解決を見つけたかもしれない。"
 
 #: ../../source/help.rst:15
 msgid "Submit an Issue Yourself"
@@ -55,13 +56,10 @@ msgstr "新しいissueを提出する"
 msgid ""
 "If you are unable to find a solution, or wish to ask a question or "
 "suggest a new feature, please `submit an issue "
-"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
+"<https://github.com/onionshare/onionshare/issues/new>`_. This requires "
 "`creating a GitHub account <https://help.github.com/articles/signing-up-"
 "for-a-new-github-account/>`_."
 msgstr ""
-"解決を見つけれない場合、または質問したいそれとも新機能を提案したい場合、`イシューを提出して下さい <https://github.com/"
-"micahflee/onionshare/issues/new>`_。`Githubのアカウントを作成する <https://help.github."
-"com/articles/signing-up-for-a-new-github-account/>`_ 必要があります。"
 
 #: ../../source/help.rst:20
 msgid "Join our Keybase Team"
@@ -124,3 +122,19 @@ msgstr "プロジェクトを議論するためのKeybaseチームに参加す�
 #~ "that we use to discuss the "
 #~ "project."
 #~ msgstr ""
+
+#~ msgid ""
+#~ "If you are unable to find a "
+#~ "solution, or wish to ask a "
+#~ "question or suggest a new feature, "
+#~ "please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating a GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+#~ "解決を見つけれない場合、または質問したいそれとも新機能を提案したい場合、`イシューを提出して下さい "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_。`Githubのアカウントを作成する"
+#~ " <https://help.github.com/articles/signing-up-for-a"
+#~ "-new-github-account/>`_ 必要があります。"
+
diff --git a/docs/source/locale/ja/LC_MESSAGES/install.po b/docs/source/locale/ja/LC_MESSAGES/install.po
index 5cf0de13..036c1f9b 100644
--- a/docs/source/locale/ja/LC_MESSAGES/install.po
+++ b/docs/source/locale/ja/LC_MESSAGES/install.po
@@ -7,17 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-12-13 15:48-0800\n"
+"POT-Creation-Date: 2022-10-09 15:01-0700\n"
 "PO-Revision-Date: 2022-01-31 12:53+0000\n"
 "Last-Translator: Taro Tanaka <anon_japan@protonmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ja\n"
+"Language-Team: ja <LL@li.org>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.11-dev\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: ../../source/install.rst:2
 msgid "Installation"
@@ -32,42 +31,45 @@ msgid ""
 "You can download OnionShare for Windows and macOS from the `OnionShare "
 "website <https://onionshare.org/>`_."
 msgstr ""
-"WindowsやmacOSの場合は`OnionShareホームページ <https://onionshare.org/>`_からダウンロードできます。"
+"WindowsやmacOSの場合は`OnionShareホームページ "
+"<https://onionshare.org/>`_からダウンロードできます。"
 
 #: ../../source/install.rst:12
-msgid "Install in Linux"
-msgstr "Linuxでインストールする"
+msgid "Linux"
+msgstr ""
 
 #: ../../source/install.rst:14
+#, fuzzy
 msgid ""
 "There are various ways to install OnionShare for Linux, but the "
 "recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
-" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
-"that you'll always use the newest version and run OnionShare inside of a "
-"sandbox."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
 msgstr ""
-"Linuxの場合は、様々なインストールする方法がありますが、勧められる方法は`Flatpak <https://flatpak.org/>`_ または`"
-"Snap <https://snapcraft.io/"
-">`_のパッケージの利用です。FlatpakやSnapでは、必ず最新バージョンを入手できます、そしてサンドボックスに実行されます。"
+"Linuxの場合は、様々なインストールする方法がありますが、勧められる方法は`Flatpak <https://flatpak.org/>`_ "
+"または`Snap "
+"<https://snapcraft.io/>`_のパッケージの利用です。FlatpakやSnapでは、必ず最新バージョンを入手できます、そしてサンドボックスに実行されます。"
 
 #: ../../source/install.rst:17
+#, fuzzy
 msgid ""
-"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
-" but which you use is up to you. Both work in all Linux distributions."
-msgstr ""
-"UbuntuにはSnapのサポートが組み込まれて、そしてFedoraにはFlatpakのサポートが組み込まれているけど、両方とも全てのLinuxディストリ"
-"ビューションに実行できるのでお好みで選んで下さい。"
+"Snapcraft support is built-in to Ubuntu and Fedora comes with Flatpak "
+"support, but which you use is up to you. Both work in all Linux "
+"distributions."
+msgstr "UbuntuにはSnapのサポートが組み込まれて、そしてFedoraにはFlatpakのサポートが組み込まれているけど、両方とも全てのLinuxディストリビューションに実行できるのでお好みで選んで下さい。"
 
 #: ../../source/install.rst:19
 msgid ""
 "**Install OnionShare using Flatpak**: "
 "https://flathub.org/apps/details/org.onionshare.OnionShare"
 msgstr ""
-"**FlatpakでOnionShareをインストール**: https://flathub.org/apps/details/org."
-"onionshare.OnionShare"
+"**FlatpakでOnionShareをインストール**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
+#, fuzzy
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
 msgstr "**SnapでOnionShareをインストール**: https://snapcraft.io/onionshare"
 
 #: ../../source/install.rst:23
@@ -75,29 +77,38 @@ msgid ""
 "You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
-"もしよろしければ、PGP署名された``.flatpak`` や ``.snap``パッケージを https://onionshare.org/dist/ "
-"からダウンロードしてインストールできます。"
+"もしよろしければ、PGP署名された``.flatpak`` や ``.snap``パッケージを "
+"https://onionshare.org/dist/ からダウンロードしてインストールできます。"
 
 #: ../../source/install.rst:28
+msgid "Command-line only"
+msgstr ""
+
+#: ../../source/install.rst:30
+msgid ""
+"You can install just the command-line version of OnionShare on any "
+"operating system using the Python package manager ``pip``. :ref:`cli` has"
+" more info."
+msgstr ""
+
+#: ../../source/install.rst:35
 msgid "Verifying PGP signatures"
 msgstr "PGP署名を確認する方法"
 
-#: ../../source/install.rst:30
+#: ../../source/install.rst:37
 msgid ""
 "You can verify that the package you download is legitimate and hasn't "
 "been tampered with by verifying its PGP signature. For Windows and macOS,"
 " this step is optional and provides defense in depth: the OnionShare "
 "binaries include operating system-specific signatures, and you can just "
 "rely on those alone if you'd like."
-msgstr ""
-"PGP署名を確認することによって、ダウンロードしたパッケージが改ざんされていないかを確認できます。WindowsやmacOSの場合、OnionShareバ"
-"イナリーにはOSに特有の署名があるので、確認は任意です。もしよろしければ、OS署名のみに頼ることができます。"
+msgstr "PGP署名を確認することによって、ダウンロードしたパッケージが改ざんされていないかを確認できます。WindowsやmacOSの場合、OnionShareバイナリーにはOSに特有の署名があるので、確認は任意です。もしよろしければ、OS署名のみに頼ることができます。"
 
-#: ../../source/install.rst:34
+#: ../../source/install.rst:41
 msgid "Signing key"
 msgstr "署名キー"
 
-#: ../../source/install.rst:36
+#: ../../source/install.rst:43
 msgid ""
 "Packages are signed by Micah Lee, the core developer, using his PGP "
 "public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
@@ -107,23 +118,25 @@ msgid ""
 msgstr ""
 "パッケージは主任開発者のMicah "
 "Leeさんに署名されています。公開キー指紋は``927F419D7EC82C2F149C1BD1403C2657CD994F73``。Micah "
-"Leeさんの公開鍵を` keys.openpgp.org のキーサーバーからダウンロードできます <https://keys.openpgp.org/"
-"vks/v1/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_。"
+"Leeさんの公開鍵を` keys.openpgp.org のキーサーバーからダウンロードできます "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_。"
 
-#: ../../source/install.rst:38
+#: ../../source/install.rst:46
 msgid ""
 "You must have GnuPG installed to verify signatures. For macOS you "
 "probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
 "probably want `Gpg4win <https://www.gpg4win.org/>`_."
 msgstr ""
-"署名を確認するのに、GnuPGをインストールする必要があります。macOSの場合は`GPGTools <https://gpgtools.org/"
-">`_、そしてWindowsの場合は`Gpg4win <https://www.gpg4win.org/>`_を利用できます。"
+"署名を確認するのに、GnuPGをインストールする必要があります。macOSの場合は`GPGTools "
+"<https://gpgtools.org/>`_、そしてWindowsの場合は`Gpg4win "
+"<https://www.gpg4win.org/>`_を利用できます。"
 
-#: ../../source/install.rst:41
+#: ../../source/install.rst:49
 msgid "Signatures"
 msgstr "署名"
 
-#: ../../source/install.rst:43
+#: ../../source/install.rst:51
 msgid ""
 "You can find the signatures (as ``.asc`` files), as well as Windows, "
 "macOS, Flatpak, Snap, and source packages, at "
@@ -132,15 +145,15 @@ msgid ""
 "<https://github.com/micahflee/onionshare/releases>`_."
 msgstr ""
 "署名（``.asc`` "
-"ファイルの形として）そしてWindows、macOS、Flatpak、Snap、またはソースのパッケージはhttps://onionshare.org/"
-"dist/ から入手できます（各バージョンのフォルダーに）。`GitHubのリリースページ <https://github.com/micahflee/"
-"onionshare/releases>`_にもあります。"
+"ファイルの形として）そしてWindows、macOS、Flatpak、Snap、またはソースのパッケージはhttps://onionshare.org/dist/"
+" から入手できます（各バージョンのフォルダーに）。`GitHubのリリースページ "
+"<https://github.com/micahflee/onionshare/releases>`_にもあります。"
 
-#: ../../source/install.rst:47
+#: ../../source/install.rst:55
 msgid "Verifying"
 msgstr "確認する方法"
 
-#: ../../source/install.rst:49
+#: ../../source/install.rst:57
 msgid ""
 "Once you have imported Micah's public key into your GnuPG keychain, "
 "downloaded the binary and and ``.asc`` signature, you can verify the "
@@ -149,35 +162,33 @@ msgstr ""
 "Micah Leeさんの公開キーをGnuPGキーチェーンにインポートしたら、そしてバイナリーと``.asc`` "
 "署名をダウンロードしたら、macOSでターミナルに以下のように確認できます::"
 
-#: ../../source/install.rst:53
+#: ../../source/install.rst:61
 msgid "Or for Windows, in a command-prompt like this::"
 msgstr "またはWindowsの場合はコマンド・プロンプトで以下のように::"
 
-#: ../../source/install.rst:57
+#: ../../source/install.rst:65
 msgid "The expected output looks like this::"
 msgstr "予想される出力は以下のように表示されるはず::"
 
-#: ../../source/install.rst:69
+#: ../../source/install.rst:77
 msgid ""
-"If you don't see 'Good signature from', there might be a problem with the"
-" integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The \"WARNING:\" shown above, is not a problem with"
-" the package, it only means you haven't already defined any level of "
-"'trust' of Micah's PGP key.)"
+"If you don't see ``Good signature from``, there might be a problem with "
+"the integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The ``WARNING:`` shown above, is not a problem with"
+" the package, it only means you haven't defined a level of \"trust\" of "
+"Micah's (the core developer) PGP key.)"
 msgstr ""
-"「Good signature from」が表示されない場合、ファイル整合性には問題があるという意味です（悪質な理由またはその他の理由で）。インストールし"
-"ないで下さい。（以上に表示された「WARNING:」はパッケージの問題ではなく、ただMicahさんの公開鍵に「信用レベル」をまだ割り当てなかったからです）"
 
-#: ../../source/install.rst:71
+#: ../../source/install.rst:79
 msgid ""
 "If you want to learn more about verifying PGP signatures, the guides for "
 "`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
 " the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
 "signature/>`_ may be useful."
 msgstr ""
-"PGP署名を確認する方法の詳しくは、`Qubes OS <https://www.qubes-os.org/security/"
-"verifying-signatures/>`_または`Torプロジェクト <https://support.torproject.org/tbb/"
-"how-to-verify-signature/>`_のガイドは役立つでしょう。"
+"PGP署名を確認する方法の詳しくは、`Qubes OS <https://www.qubes-os.org/security/verifying-"
+"signatures/>`_または`Torプロジェクト <https://support.torproject.org/tbb/how-to-"
+"verify-signature/>`_のガイドは役立つでしょう。"
 
 #~ msgid "Install on Windows or macOS"
 #~ msgstr ""
@@ -364,3 +375,22 @@ msgstr ""
 #~ "Project <https://support.torproject.org/tbb/how-to-"
 #~ "verify-signature/>`_ may be helpful."
 #~ msgstr ""
+
+#~ msgid "Install in Linux"
+#~ msgstr "Linuxでインストールする"
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', there might be a problem "
+#~ "with the integrity of the file "
+#~ "(malicious or otherwise), and you should"
+#~ " not install the package. (The "
+#~ "\"WARNING:\" shown above, is not a "
+#~ "problem with the package, it only "
+#~ "means you haven't already defined any"
+#~ " level of 'trust' of Micah's PGP "
+#~ "key.)"
+#~ msgstr ""
+#~ "「Good signature "
+#~ "from」が表示されない場合、ファイル整合性には問題があるという意味です（悪質な理由またはその他の理由で）。インストールしないで下さい。（以上に表示された「WARNING:」はパッケージの問題ではなく、ただMicahさんの公開鍵に「信用レベル」をまだ割り当てなかったからです）"
+
diff --git a/docs/source/locale/ja/LC_MESSAGES/security.po b/docs/source/locale/ja/LC_MESSAGES/security.po
index 41120bfe..7e24d5d0 100644
--- a/docs/source/locale/ja/LC_MESSAGES/security.po
+++ b/docs/source/locale/ja/LC_MESSAGES/security.po
@@ -7,17 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-12-13 15:48-0800\n"
+"POT-Creation-Date: 2022-10-09 15:01-0700\n"
 "PO-Revision-Date: 2022-05-09 02:16+0000\n"
 "Last-Translator: lx3k <lx3kvdms@anonaddy.me>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ja\n"
+"Language-Team: ja <LL@li.org>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.12.1\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: ../../source/security.rst:2
 msgid "Security Design"
@@ -39,16 +38,13 @@ msgstr "OnionShareが防衛できる脅威"
 msgid ""
 "**Third parties don't have access to anything that happens in "
 "OnionShare.** Using OnionShare means hosting services directly on your "
-"computer. When sharing files with OnionShare, they are not uploaded to "
-"any server. If you make an OnionShare chat room, your computer acts as a "
-"server for that too. This avoids the traditional model of having to trust"
-" the computers of others."
+"computer. When sharing your files with OnionShare, they are not uploaded "
+"to any third-party server. If you make an OnionShare chat room, your "
+"computer acts as a server for that too. This avoids the traditional model"
+" of having to trust the computers of others."
 msgstr ""
-"**第三者はOnionShare内のデータやプロセスにアクセスできません。** OnionShareでは、全てのサービスは自宅のパソコンから直接にホストさ"
-"れます。OnionShareでファイルを共有するときに、外部サーバーにアップロードされません。OnionShareのチャットルームを作るときにも、自宅のパ"
-"ソコンはサーバー役になります。つまり、第三者のパソコンを信頼するという従来型モデルの必要がありません。"
 
-#: ../../source/security.rst:13
+#: ../../source/security.rst:17
 msgid ""
 "**Network eavesdroppers can't spy on anything that happens in OnionShare "
 "in transit.** The connection between the Tor onion service and Tor "
@@ -58,11 +54,10 @@ msgid ""
 "Browser with OnionShare's onion service, the traffic is encrypted using "
 "the onion service's private key."
 msgstr ""
-"**ネットワーク上の盗聴者がOnionShareで送受信されるデータを傍受できません。** TorオニオンサービスとTorブラウザの間の接続は終端間暗号化"
-"されます。つまり、ネットワーク盗聴者は解読できないTorトラフィックしか傍受できません。たとえ盗聴者は悪用rendezvousノードを使ってTorブラウザ"
-"/OnionShareのオニオンサービス間のトラフィックをルーティングしても、オニオンサービスの秘密鍵で暗号化されるから解読できません。"
+"**ネットワーク上の盗聴者がOnionShareで送受信されるデータを傍受できません。** "
+"TorオニオンサービスとTorブラウザの間の接続は終端間暗号化されます。つまり、ネットワーク盗聴者は解読できないTorトラフィックしか傍受できません。たとえ盗聴者は悪用rendezvousノードを使ってTorブラウザ/OnionShareのオニオンサービス間のトラフィックをルーティングしても、オニオンサービスの秘密鍵で暗号化されるから解読できません。"
 
-#: ../../source/security.rst:15
+#: ../../source/security.rst:23
 msgid ""
 "**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
 "Tor Browser protect the anonymity of the users. As long as the OnionShare"
@@ -70,64 +65,55 @@ msgid ""
 "Browser users, the Tor Browser users and eavesdroppers can't learn the "
 "identity of the OnionShare user."
 msgstr ""
-"**OnionShareユーザの匿名性はTorに保護されます。** OnionShareとTorブラウザはユーザの匿名性を保護します。OnionShare"
-"ユーザが匿名でTorブラウザのユーザとアドレスを共有する限り、誰もがOnionShareユーザの身元を突き止めることができません。"
+"**OnionShareユーザの匿名性はTorに保護されます。** "
+"OnionShareとTorブラウザはユーザの匿名性を保護します。OnionShareユーザが匿名でTorブラウザのユーザとアドレスを共有する限り、誰もがOnionShareユーザの身元を突き止めることができません。"
 
-#: ../../source/security.rst:17
+#: ../../source/security.rst:28
 msgid ""
-"**If an attacker learns about the onion service, it still can't access "
+"**If an attacker learns about the onion service, they still can't access "
 "anything.** Prior attacks against the Tor network to enumerate onion "
-"services allowed the attacker to discover private .onion addresses. If an"
-" attack discovers a private OnionShare address, a password will be "
-"prevent them from accessing it (unless the OnionShare user chooses to "
-"turn it off and make it public). The password is generated by choosing "
-"two random words from a list of 6800 words, making 6800², or about 46 "
-"million possible passwords. Only 20 wrong guesses can be made before "
-"OnionShare stops the server, preventing brute force attacks against the "
-"password."
+"services allowed attackers to discover private ``.onion`` addresses. To "
+"access an OnionShare service from its address, the private key used for "
+"client authentication must be guessed (unless the service is already made"
+" public by turning off the private key -- see "
+":ref:`turn_off_private_key`)."
 msgstr ""
-"**攻撃者がonionサービスの存在を発見しても、何もアクセスできません。** 以前、onionサービスを列挙するためのTorネットワークに対する攻撃は攻"
-"撃者にプライベートなonionサービスのアドレスを漏らしました。攻撃者がプライベートなonionアドレスを発見する場合、パスワードが設定されたらアクセスは"
-"防がれます（少なくともOnionShareユーザーがパスワードを無効にして、onionサービスを公開モードに設定しない限り）。パスワードは6800個の単語"
-"リストからランダムに2個を選んで作成されます、つまり4600万（6800²）の可能な組み合わせがあります。パスワードの試行回数は20回に限定されますので、"
-"総当たり攻撃の場合はサーバーが停止されて、アクセスは防がれます。"
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:33
 msgid "What OnionShare doesn't protect against"
 msgstr "OnionShareが防衛できない脅威"
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:35
+#, fuzzy
 msgid ""
-"**Communicating the OnionShare address might not be secure.** "
-"Communicating the OnionShare address to people is the responsibility of "
-"the OnionShare user. If sent insecurely (such as through an email message"
-" monitored by an attacker), an eavesdropper can tell that OnionShare is "
-"being used. If the eavesdropper loads the address in Tor Browser while "
-"the service is still up, they can access it. To avoid this, the address "
-"must be communicateed securely, via encrypted text message (probably with"
-" disappearing messages enabled), encrypted email, or in person. This "
-"isn't necessary when using OnionShare for something that isn't secret."
+"**Communicating the OnionShare address and private key might not be "
+"secure.** Communicating the OnionShare address to people is the "
+"responsibility of the OnionShare user. If sent insecurely (such as "
+"through an e-mail message monitored by an attacker), an eavesdropper can "
+"tell that OnionShare is being used. Eavesdroppers can access services "
+"that are still up by loading their addresses and/or lost key in the Tor "
+"Browser. Avoid this by communicating the address securely, via encrypted "
+"text message (probably with disappearing messages enabled), encrypted "
+"e-mail, or in person. This isn't necessary when using OnionShare for "
+"something that isn't secret."
 msgstr ""
-"**OnionShare アドレスの共有は安全ではないかもしれません。** OnionShare アドレ"
-"スを他人との共有する際は注意してください。安全でない方法で共有されたら（例え"
-"ば攻撃者に監視されたメールアカウントで）、盗聴者は OnionShare が使用されてい"
-"ることを知ることができます。サービスが起動される間、盗聴者はTorブラウザでアド"
-"レスを閲覧してアクセスできます。このリスクを回避するため、アドレスを安全な方"
-"法で共有する必要があります。例えば暗号化メッセンジャーアプリ（おそらく消える"
-"メッセージ機能を使って）、暗号化メール、または対面で。"
-"もちろん機密性のない目的に OnionShare を使う場合、この必要はありません。"
+"**OnionShare アドレスの共有は安全ではないかもしれません。** OnionShare "
+"アドレスを他人との共有する際は注意してください。安全でない方法で共有されたら（例えば攻撃者に監視されたメールアカウントで）、盗聴者は "
+"OnionShare "
+"が使用されていることを知ることができます。サービスが起動される間、盗聴者はTorブラウザでアドレスを閲覧してアクセスできます。このリスクを回避するため、アドレスを安全な方法で共有する必要があります。例えば暗号化メッセンジャーアプリ（おそらく消えるメッセージ機能を使って）、暗号化メール、または対面で。もちろん機密性のない目的に"
+" OnionShare を使う場合、この必要はありません。"
 
-#: ../../source/security.rst:24
+#: ../../source/security.rst:42
+#, fuzzy
 msgid ""
-"**Communicating the OnionShare address might not be anonymous.** Extra "
-"precautions must be taken to ensure the OnionShare address is "
-"communicated anonymously. A new email or chat account, only accessed over"
-" Tor, can be used to share the address. This isn't necessary unless "
-"anonymity is a goal."
+"**Communicating the OnionShare address and private key might not be "
+"anonymous.** Extra precaution must be taken to ensure the OnionShare "
+"address is communicated anonymously. A new e-mail or chat account, only "
+"accessed over Tor, can be used to share the address. This isn't necessary"
+" unless anonymity is a goal."
 msgstr ""
-"**OnionShareアドレスの共有は匿名ではないかもしれない。** OnionShareアドレスを匿名で共有したい場合、ことさら用心に注意する必要があ"
-"ります。Torのみでアクセスされる新しいチャットまたはメールアカウントでアドレスを共有するのはおすすめします。匿名性を目的にしない場合はこういう予防策の必"
-"要がありません。"
+"**OnionShareアドレスの共有は匿名ではないかもしれない。** "
+"OnionShareアドレスを匿名で共有したい場合、ことさら用心に注意する必要があります。Torのみでアクセスされる新しいチャットまたはメールアカウントでアドレスを共有するのはおすすめします。匿名性を目的にしない場合はこういう予防策の必要がありません。"
 
 #~ msgid "Security design"
 #~ msgstr ""
@@ -267,3 +253,43 @@ msgstr ""
 #~ " share the address. This isn't "
 #~ "necessary unless anonymity is a goal."
 #~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "Using OnionShare means hosting services "
+#~ "directly on your computer. When sharing"
+#~ " files with OnionShare, they are not"
+#~ " uploaded to any server. If you "
+#~ "make an OnionShare chat room, your "
+#~ "computer acts as a server for that"
+#~ " too. This avoids the traditional "
+#~ "model of having to trust the "
+#~ "computers of others."
+#~ msgstr ""
+#~ "**第三者はOnionShare内のデータやプロセスにアクセスできません。** "
+#~ "OnionShareでは、全てのサービスは自宅のパソコンから直接にホストされます。OnionShareでファイルを共有するときに、外部サーバーにアップロードされません。OnionShareのチャットルームを作るときにも、自宅のパソコンはサーバー役になります。つまり、第三者のパソコンを信頼するという従来型モデルの必要がありません。"
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " a password will be prevent them "
+#~ "from accessing it (unless the OnionShare"
+#~ " user chooses to turn it off "
+#~ "and make it public). The password "
+#~ "is generated by choosing two random "
+#~ "words from a list of 6800 words,"
+#~ " making 6800², or about 46 million"
+#~ " possible passwords. Only 20 wrong "
+#~ "guesses can be made before OnionShare"
+#~ " stops the server, preventing brute "
+#~ "force attacks against the password."
+#~ msgstr ""
+#~ "**攻撃者がonionサービスの存在を発見しても、何もアクセスできません。** "
+#~ "以前、onionサービスを列挙するためのTorネットワークに対する攻撃は攻撃者にプライベートなonionサービスのアドレスを漏らしました。攻撃者がプライベートなonionアドレスを発見する場合、パスワードが設定されたらアクセスは防がれます（少なくともOnionShareユーザーがパスワードを無効にして、onionサービスを公開モードに設定しない限り）。パスワードは6800個の単語リストからランダムに2個を選んで作成されます、つまり4600万（6800²）の可能な組み合わせがあります。パスワードの試行回数は20回に限定されますので、総当たり攻撃の場合はサーバーが停止されて、アクセスは防がれます。"
+
diff --git a/docs/source/locale/ja/LC_MESSAGES/tor.po b/docs/source/locale/ja/LC_MESSAGES/tor.po
index 4be451a3..b6b38c4d 100644
--- a/docs/source/locale/ja/LC_MESSAGES/tor.po
+++ b/docs/source/locale/ja/LC_MESSAGES/tor.po
@@ -7,17 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-12-13 15:48-0800\n"
+"POT-Creation-Date: 2022-10-09 15:01-0700\n"
 "PO-Revision-Date: 2022-01-31 12:53+0000\n"
 "Last-Translator: Taro Tanaka <anon_japan@protonmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ja\n"
+"Language-Team: ja <LL@li.org>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.11-dev\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.10.3\n"
 
 #: ../../source/tor.rst:2
 msgid "Connecting to Tor"
@@ -25,56 +24,234 @@ msgstr "Torと接続する方法"
 
 #: ../../source/tor.rst:4
 msgid ""
-"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
-" bottom right of the OnionShare window to get to its settings."
-msgstr "OnionShareのTorと接続する方法を選択するのに、右下にある \"⚙\"アイコンをクリックして設定画面を開く。"
+"When OnionShare starts, it will show you a screen asking you to connect "
+"to the Tor network."
+msgstr ""
 
-#: ../../source/tor.rst:9
-msgid "Use the ``tor`` bundled with OnionShare"
-msgstr "OnionShareとバンドルされた``tor``を利用"
+#: ../../source/tor.rst:8
+msgid ""
+"You can toggle on the switch \"Connect to Tor automatically\" before "
+"clicking \"Connect to Tor\". This means that next time OnionShare starts,"
+" it will automatically connect with its Tor connection settings from the "
+"last session, instead of presenting you with the connection options. If "
+"the connection fails, you can still try bridges or reconfigure Tor via "
+"the \"Network Settings\" button."
+msgstr ""
 
 #: ../../source/tor.rst:11
 msgid ""
+"You can click \"Connect to Tor\" to begin the connection process. If "
+"there are no problems with your network, including any attempts to block "
+"your access to the Tor network, this should hopefully work the first "
+"time."
+msgstr ""
+
+#: ../../source/tor.rst:13
+msgid ""
+"Or, if you want to manually configure Bridges or other Tor settings "
+"before you connect, you can click \"Network Settings\"."
+msgstr ""
+
+#: ../../source/tor.rst:16
+msgid "Automatic censorship circumvention"
+msgstr ""
+
+#: ../../source/tor.rst:18
+msgid ""
+"When you click \"Connect to Tor\", if OnionShare fails to connect, it "
+"might be because Tor is censored in your country or on your local "
+"network."
+msgstr ""
+
+#: ../../source/tor.rst:20
+msgid "If this occurs, you will have these choices:"
+msgstr ""
+
+#: ../../source/tor.rst:22
+msgid "Try again without a bridge"
+msgstr ""
+
+#: ../../source/tor.rst:23
+msgid "Automatically determine my country from my IP address for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:24
+msgid "Manually select my country for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:28
+msgid ""
+"If you choose the \"Try again without a bridge\" option, OnionShare will "
+"retry connecting to Tor like normal, without attempting to bypass "
+"censorship."
+msgstr ""
+
+#: ../../source/tor.rst:30
+msgid ""
+"The other two options will attempt to automatically bypass censorship "
+"using Tor bridges. If your network provider is blocking access to the Tor"
+" network, you can hopefully still connect to a Tor bridge, which will "
+"then connect you to the Tor network, circumventing the censorship. Both "
+"of these options use the Tor Project's Censorship Circumvention API to "
+"provide you with bridge settings that should work for you. OnionShare "
+"will temporarily use the `Meek "
+"<https://gitlab.torproject.org/legacy/trac/-/wikis/doc/meek/>`_ domain-"
+"fronting proxy to make a non-Tor connection from your computer to Tor's "
+"Censorship Circumvention API. The Meek proxy hides the fact that you are "
+"trying to find a way to connect to Tor."
+msgstr ""
+
+#: ../../source/tor.rst:36
+msgid ""
+"If you choose \"Automatically determine my country from my IP address for"
+" bridge settings\", the Censorship Circumvention API will consider your "
+"IP address (yes, your real IP address) to determine what country you "
+"might reside in. Based on the country information, the API will try to "
+"automatically find bridges that suit your location."
+msgstr ""
+
+#: ../../source/tor.rst:41
+msgid ""
+"If you choose \"Manually select my country for bridge settings\", the "
+"Censorship API will find the bridges that suit the country that you "
+"specified."
+msgstr ""
+
+#: ../../source/tor.rst:46
+msgid "How automatic censorship circumvention works"
+msgstr ""
+
+#: ../../source/tor.rst:48
+msgid ""
+"If the Censorship Circumvention API finds bridges that it believes will "
+"suit you, OnionShare will try to reconnect to Tor using those bridges. If"
+" the API does not find any bridges for your location, OnionShare will ask"
+" the API for \"fallback\" options, and then try to reconnect using those."
+msgstr ""
+
+#: ../../source/tor.rst:50
+msgid ""
+"If for some reason OnionShare fails to connect to the Censorship API "
+"itself, or if the API returns an error message, OnionShare will attempt "
+"to use the obfs4 built-in bridges."
+msgstr ""
+
+#: ../../source/tor.rst:52
+msgid ""
+"It's important to note that the requests to the Censorship Circumvention "
+"API do not go over the Tor network (because if you could connect to Tor "
+"already, you wouldn't need to connect to the API)."
+msgstr ""
+
+#: ../../source/tor.rst:54
+msgid ""
+"Even though it's hard for an adversary to discover where the Meek request"
+" is going, this may still be risky for some users. Therefore, it is an "
+"opt-in feature. The use of Meek and non-torified network requests are "
+"limited only to making one or two requests to the Censorship "
+"Circumvention API. Then Meek is stopped, and all further network requests"
+" happen over the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:56
+msgid ""
+"If you are uncomfortable with making a request that doesn't go over the "
+"Tor network, you can click \"Network Settings\" (or the Settings icon in "
+"the bottom right corner, followed by the Tor Settings tab in the screen "
+"that appears), and manually configure bridges. After you save any bridge "
+"settings, OnionShare will try to reconnect using those bridges."
+msgstr ""
+
+#: ../../source/tor.rst:59
+msgid "Manually configure Tor settings"
+msgstr ""
+
+#: ../../source/tor.rst:61
+msgid ""
+"You can get to the Tor settings by clicking \"Network Settings\" on the "
+"welcome screen, or by clicking the \"⚙\" icon in the bottom-right corner "
+"of the application, and then switch to the Tor Settings tab in the screen"
+" that appears."
+msgstr ""
+
+#: ../../source/tor.rst:65
+msgid ""
+"Here are the different ways you can configure OnionShare to connect to "
+"Tor:"
+msgstr ""
+
+#: ../../source/tor.rst:68
+msgid "Use the Tor version built into OnionShare"
+msgstr ""
+
+#: ../../source/tor.rst:70
+msgid ""
 "This is the default, simplest and most reliable way that OnionShare "
 "connects to Tor. For this reason, it's recommended for most users."
 msgstr "OnionShareのTor接続設定の中で、これは一番簡単そして確実なデフォルト方法です。こういうわけで、ほとんどのユーザに勧められます。"
 
-#: ../../source/tor.rst:14
+#: ../../source/tor.rst:73
 msgid ""
 "When you open OnionShare, it launches an already configured ``tor`` "
 "process in the background for OnionShare to use. It doesn't interfere "
 "with other ``tor`` processes on your computer, so you can use the Tor "
 "Browser or the system ``tor`` on their own."
+msgstr "OnionShareを開くと、すでに設定されてる``tor``プロセスはバックグラウンドに実行されてOnionShareに利用されます。パソコンに他の``tor``プロセスと妨げないので、無事にTorブラウザまたはシステムの``tor``を同時に使えます。"
+
+#: ../../source/tor.rst:76
+#, fuzzy
+msgid "**Using bridges**"
+msgstr "Torブリッジの利用"
+
+#: ../../source/tor.rst:78
+msgid ""
+"To use a bridge, you must select \"Use the Tor version built into "
+"OnionShare\" and check the \"Use a bridge\" checkbox."
 msgstr ""
-"OnionShareを開くと、すでに設定されてる``tor``プロセスはバックグラウンドに実行されてOnionShareに利用されます。パソコンに他の``"
-"tor``プロセスと妨げないので、無事にTorブラウザまたはシステムの``tor``を同時に使えます。"
 
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:80
+msgid ""
+"Try using a built-in bridge first. Using `obfs4` or `snowflake` bridges "
+"is recommended over using `meek-azure`."
+msgstr ""
+
+#: ../../source/tor.rst:84
+msgid ""
+"If using a built-in bridge doesn't work, you can request a bridge from "
+"torproject.org. You will have to solve a CAPTCHA in order to request a "
+"bridge. (This makes it more difficult for governments or ISPs to block "
+"access to Tor bridges.)"
+msgstr ""
+
+#: ../../source/tor.rst:88
+msgid ""
+"You also have the option of using a bridge that you learned about from a "
+"trusted source."
+msgstr ""
+
+#: ../../source/tor.rst:91
 msgid "Attempt auto-configuration with Tor Browser"
 msgstr "Torブラウザとの自動的な設定を試す"
 
-#: ../../source/tor.rst:20
+#: ../../source/tor.rst:93
 msgid ""
 "If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
 "and don't want two ``tor`` processes running, you can use the ``tor`` "
 "process from the Tor Browser. Keep in mind you need to keep Tor Browser "
 "open in the background while you're using OnionShare for this to work."
-msgstr ""
-"`Torブラウザをダウンロード<https://www.torproject.org>`_してたら、余計な``tor``プロセスを実行したくない場合はOn"
-"ionShareがTorブラウザの``tor``プロセスを利用できます。OnionShareを利用する間にTorブラウザを開いたままにしておく必要があるこ"
-"とに留意して下さい。"
+msgstr "`Torブラウザをダウンロード<https://www.torproject.org>`_してたら、余計な``tor``プロセスを実行したくない場合はOnionShareがTorブラウザの``tor``プロセスを利用できます。OnionShareを利用する間にTorブラウザを開いたままにしておく必要があることに留意して下さい。"
 
-#: ../../source/tor.rst:24
+#: ../../source/tor.rst:97
 msgid "Using a system ``tor`` in Windows"
 msgstr "Windowsのシステム``tor``を利用"
 
-#: ../../source/tor.rst:26
+#: ../../source/tor.rst:99
 msgid ""
 "This is fairly advanced. You'll need to know how edit plaintext files and"
 " do stuff as an administrator."
 msgstr "これはかなり先進の設定です。プレーンテキストファイルの編集そして管理者としてパソコンをいじり方を知る必要があります。"
 
-#: ../../source/tor.rst:28
+#: ../../source/tor.rst:101
 msgid ""
 "Download the Tor Windows Expert Bundle `from "
 "<https://www.torproject.org/download/tor/>`_. Extract the compressed file"
@@ -82,11 +259,11 @@ msgid ""
 "the extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
 msgstr ""
 "<https://www.torproject.org/download/tor/>`_からTorの「Windows Expert "
-"Bundle」をダウンロードする。圧縮したファイルを解凍して、解凍されたフォルダーを``C:\\Program Files (x86)\\"
-"``にコピーする。解凍されたフォルダー名を「``Data``」に変えて、その中の「``Tor``」フォルダーを「``tor-"
+"Bundle」をダウンロードする。圧縮したファイルを解凍して、解凍されたフォルダーを``C:\\Program Files "
+"(x86)\\``にコピーする。解凍されたフォルダー名を「``Data``」に変えて、その中の「``Tor``」フォルダーを「``tor-"
 "win32``」に名前を変える。"
 
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:105
 msgid ""
 "Make up a control port password. (Using 7 words in a sequence like "
 "``comprised stumble rummage work avenging construct volatile`` is a good "
@@ -94,107 +271,103 @@ msgid ""
 "administrator, and use ``tor.exe --hash-password`` to generate a hash of "
 "your password. For example::"
 msgstr ""
-"コントロールポートのパスワードを作る（７語の順序は良いパスワードになります、例えば``comprised stumble rummage work "
-"avenging construct volatile``）。次は管理者としてコマンド・プロンプトを開いて（``cmd``）、「``tor.exe "
-"--hash-password``」を入力してパスワードのハッシュを生成する。例えば::"
+"コントロールポートのパスワードを作る（７語の順序は良いパスワードになります、例えば``comprised stumble rummage work"
+" avenging construct "
+"volatile``）。次は管理者としてコマンド・プロンプトを開いて（``cmd``）、「``tor.exe --hash-"
+"password``」を入力してパスワードのハッシュを生成する。例えば::"
 
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:112
 msgid ""
 "The hashed password output is displayed after some warnings (which you "
 "can ignore). In the case of the above example, it is "
 "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
-msgstr ""
-"警告メッセージの後、ハッシュ化パスワードの出力は表示されます（警告を無視しても問題ありません）。以上の例の場合は「``16:00322E903D96DE9"
-"86058BB9ABDA91E010D7A863768635AC38E213FDBEF``」になります。"
+msgstr "警告メッセージの後、ハッシュ化パスワードの出力は表示されます（警告を無視しても問題ありません）。以上の例の場合は「``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``」になります。"
 
-#: ../../source/tor.rst:41
+#: ../../source/tor.rst:114
 msgid ""
 "Now create a new text file at ``C:\\Program Files (x86)\\tor-"
 "win32\\torrc`` and put your hashed password output in it, replacing the "
 "``HashedControlPassword`` with the one you just generated::"
 msgstr ""
-"次は``C:\\Program Files (x86)\\tor-win32\\torrc`` に新しいテキストファイルを作成して、生成したハッシュ化パス"
-"ワードの出力を「``HashedControlPassword``」を上書きするようにファイルの中に入力する::"
+"次は``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+"に新しいテキストファイルを作成して、生成したハッシュ化パスワードの出力を「``HashedControlPassword``」を上書きするようにファイルの中に入力する::"
 
-#: ../../source/tor.rst:46
+#: ../../source/tor.rst:119
 msgid ""
 "In your administrator command prompt, install ``tor`` as a service using "
 "the appropriate ``torrc`` file you just created (as described in "
 "`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
 "this::"
-msgstr ""
-"管理者のコマンド・プロンプトに、先に生成した``torrc``ファイルを使ってサービスとして``tor``をインストールする（`<https://2019"
-".www.torproject.org/docs/faq.html.en#NTService>`_に説明される通りに）。以下のように::"
+msgstr "管理者のコマンド・プロンプトに、先に生成した``torrc``ファイルを使ってサービスとして``tor``をインストールする（`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_に説明される通りに）。以下のように::"
 
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:123
 msgid "You are now running a system ``tor`` process in Windows!"
 msgstr "Windowsに``tor``のシステムプロセスを実行するようになりました！"
 
-#: ../../source/tor.rst:52
+#: ../../source/tor.rst:125
+#, fuzzy
 msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
-"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
-"\"Tor authentication settings\" choose \"Password\" and set the password "
-"to the control port password you picked above. Click the \"Test "
-"Connection to Tor\" button. If all goes well, you should see \"Connected "
-"to the Tor controller\"."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using control port\", and set \"Control port\" to ``127.0.0.1``"
+" and \"Port\" to ``9051``. Under \"Tor authentication settings\" choose "
+"\"Password\" and set the password to the control port password you picked"
+" above. Click the \"Test Connection to Tor\" button. If all goes well, "
+"you should see \"Connected to the Tor controller\"."
 msgstr ""
-"OnionShareを開いて、下にある \"⚙\"アイコンをクリックする"
-"。「OnionShareがどうやってTorと接続して欲しい？」の下に、「コントロールポートを使用して接続する」を選択し、「コントロールポート」を``127"
-".0.0.1``、そして「ポート」を``9051``に設定する。「Tor認証設定」に「パスワード」を選択し、この前に作ったコントロールポートのパスワードに"
-"設定する。「Torへの接続をテストする」ボタンをクリックする。全てがうまくいくと「Torコントローラーと接続完了」が表示されます。"
+"OnionShareを開いて、下にある "
+"\"⚙\"アイコンをクリックする。「OnionShareがどうやってTorと接続して欲しい？」の下に、「コントロールポートを使用して接続する」を選択し、「コントロールポート」を``127.0.0.1``、そして「ポート」を``9051``に設定する。「Tor認証設定」に「パスワード」を選択し、この前に作ったコントロールポートのパスワードに設定する。「Torへの接続をテストする」ボタンをクリックする。全てがうまくいくと「Torコントローラーと接続完了」が表示されます。"
 
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:134
 msgid "Using a system ``tor`` in macOS"
 msgstr "macOSのシステム``tor``を利用"
 
-#: ../../source/tor.rst:63
+#: ../../source/tor.rst:136
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
 "it, and then install Tor::"
 msgstr "まずは`Homebrew <https://brew.sh/>`_をインストールして、そしてTorをインストールする::"
 
-#: ../../source/tor.rst:67
+#: ../../source/tor.rst:140
 msgid "Now configure Tor to allow connections from OnionShare::"
 msgstr "次はTorをOnionShareからの接続を受け入れるように設定する::"
 
-#: ../../source/tor.rst:74
+#: ../../source/tor.rst:147
 msgid "And start the system Tor service::"
 msgstr "そしてシステムのTorサービスを実行する::"
 
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:151
+#, fuzzy
 msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
-"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
-"Under \"Tor authentication settings\" choose \"No authentication, or "
-"cookie authentication\". Click the \"Test Connection to Tor\" button."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using socket file\", and set the socket file to be "
+"``/usr/local/var/run/tor/control.socket``. Under \"Tor authentication "
+"settings\" choose \"No authentication, or cookie authentication\". Click "
+"the \"Test Connection to Tor\" button."
 msgstr ""
-"OnionShareを開いて、下にある \"⚙\"アイコンをクリックする"
-"。「OnionShareがどうやってTorと接続して欲しい？」の下に、「ソケットファイル」を選択し、ソケットファイルを``/usr/local/var/"
-"run/tor/control."
-"socket``に設定する。「Tor認証設定」に「認証なし、それともクッキー認証」を選択する。「Torへの接続をテストする」ボタンをクリックする。"
+"OnionShareを開いて、下にある "
+"\"⚙\"アイコンをクリックする。「OnionShareがどうやってTorと接続して欲しい？」の下に、「ソケットファイル」を選択し、ソケットファイルを``/usr/local/var/run/tor/control.socket``に設定する。「Tor認証設定」に「認証なし、それともクッキー認証」を選択する。「Torへの接続をテストする」ボタンをクリックする。"
 
-#: ../../source/tor.rst:84 ../../source/tor.rst:104
+#: ../../source/tor.rst:157 ../../source/tor.rst:177
 msgid "If all goes well, you should see \"Connected to the Tor controller\"."
 msgstr "全てがうまくいくと「Torコントローラーと接続完了」が表示されます。"
 
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:160
 msgid "Using a system ``tor`` in Linux"
 msgstr "Linuxのシステム``tor``を利用"
 
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:162
 msgid ""
 "First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
 "similar Linux distro, It is recommended to use the Tor Project's "
 "`official repository <https://support.torproject.org/apt/tor-deb-"
 "repo/>`_."
 msgstr ""
-"まずは``tor``パッケージをインストールする。Debian、Ubuntu、または似てるようなディストリビューションを使う場合は、Torプロジェクトの`"
-"公式リポジトリ <https://support.torproject.org/apt/tor-deb-repo/>`_を使うようお進められます。"
+"まずは``tor``パッケージをインストールする。Debian、Ubuntu、または似てるようなディストリビューションを使う場合は、Torプロジェクトの`公式リポジトリ"
+" <https://support.torproject.org/apt/tor-deb-repo/>`_を使うようお進められます。"
 
-#: ../../source/tor.rst:91
+#: ../../source/tor.rst:164
 msgid ""
 "Next, add your user to the group that runs the ``tor`` process (in the "
 "case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
@@ -203,55 +376,24 @@ msgstr ""
 "次は``tor``プロセスを実行するグループ（DebianやUbuntuの場合は``debian-"
 "tor``）にユーザを追加して、OnionShareをシステム``tor``のコントロールソケットファイルと接続できるように設定する。"
 
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:166
 msgid ""
 "Add your user to the ``debian-tor`` group by running this command "
 "(replace ``username`` with your actual username)::"
-msgstr ""
-"以下のコマンドを実行してユーザを``debian-tor``グループに追加できます（``username``に実際のユーザ名と書き換えて下さい）::"
-
-#: ../../source/tor.rst:97
-msgid ""
-"Reboot your computer. After it boots up again, open OnionShare and click "
-"the \"⚙\" icon in it. Under \"How should OnionShare connect to Tor?\" "
-"choose \"Connect using socket file\". Set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication settings\" choose "
-"\"No authentication, or cookie authentication\". Click the \"Test "
-"Connection to Tor\" button."
-msgstr ""
-"パソコンを再起動する。そしてOnionShareを開いて、下にある \"⚙\"アイコンをクリックする"
-"。「OnionShareがどうやってTorと接続して欲しい？」の下に、「ソケットファイル」を選択し、ソケットファイルを``/var/run/tor/"
-"control``に設定する。「Tor認証設定」に「認証なし、それともクッキー認証」を選択する。「Torへの接続をテストする」ボタンをクリックする。"
-
-#: ../../source/tor.rst:107
-msgid "Using Tor bridges"
-msgstr "Torブリッジの利用"
+msgstr "以下のコマンドを実行してユーザを``debian-tor``グループに追加できます（``username``に実際のユーザ名と書き換えて下さい）::"
 
-#: ../../source/tor.rst:109
+#: ../../source/tor.rst:170
+#, fuzzy
 msgid ""
-"If your access to the Internet is censored, you can configure OnionShare "
-"to connect to the Tor network using `Tor bridges "
-"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"connects to Tor without one, you don't need to use a bridge."
+"Reboot your computer. After it boots up again, open OnionShare, click the"
+" \"⚙\" icon in it, and switch to the Tor Settings tab. Under \"How should"
+" OnionShare connect to Tor?\" choose \"Connect using socket file\". Set "
+"the socket file to be ``/var/run/tor/control``. Under \"Tor "
+"authentication settings\" choose \"No authentication, or cookie "
+"authentication\". Click the \"Test Connection to Tor\" button."
 msgstr ""
-"インターネットへのアクセスは検閲される場合、OnionShareを `Torブリッジ <https://2019.www.torproject.org/"
-"docs/bridges.html.en>`_ "
-"を使ってTorネットワークと接続するように設定できます。普通にTorと接続できる場合はブリッジの利用が必要ありません。"
-
-#: ../../source/tor.rst:111
-msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
-msgstr "ブリッジを設定するのに、OnionShareに\"⚙\"アイコンをクリックする。"
-
-#: ../../source/tor.rst:113
-msgid ""
-"You can use the built-in obfs4 pluggable transports, the built-in "
-"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
-"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, try the built-in obfs4 ones first."
-msgstr ""
-"組み込まれるobfs4 pluggable transports、meek_lite (Azure) pluggable transports、"
-"それともTorの `BridgeDB <https://bridges.torproject.org/>`_ "
-"から入手できるカスタム・ブリッジを利用できます。ブリッジを使う必要がある場合、組み込まれるobfs4を先に使ってみて下さい。"
+"パソコンを再起動する。そしてOnionShareを開いて、下にある "
+"\"⚙\"アイコンをクリックする。「OnionShareがどうやってTorと接続して欲しい？」の下に、「ソケットファイル」を選択し、ソケットファイルを``/var/run/tor/control``に設定する。「Tor認証設定」に「認証なし、それともクッキー認証」を選択する。「Torへの接続をテストする」ボタンをクリックする。"
 
 #~ msgid "Using a system Tor in Mac OS X"
 #~ msgstr ""
@@ -485,3 +627,47 @@ msgstr ""
 #~ "if you don't already have it. "
 #~ "Then, install Tor::"
 #~ msgstr ""
+
+#~ msgid ""
+#~ "Pick a way to connect OnionShare "
+#~ "to Tor by clicking the \"⚙\" icon"
+#~ " in the bottom right of the "
+#~ "OnionShare window to get to its "
+#~ "settings."
+#~ msgstr "OnionShareのTorと接続する方法を選択するのに、右下にある \"⚙\"アイコンをクリックして設定画面を開く。"
+
+#~ msgid "Use the ``tor`` bundled with OnionShare"
+#~ msgstr "OnionShareとバンドルされた``tor``を利用"
+
+#~ msgid ""
+#~ "If your access to the Internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare connects to Tor without one,"
+#~ " you don't need to use a "
+#~ "bridge."
+#~ msgstr ""
+#~ "インターネットへのアクセスは検閲される場合、OnionShareを `Torブリッジ "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_ "
+#~ "を使ってTorネットワークと接続するように設定できます。普通にTorと接続できる場合はブリッジの利用が必要ありません。"
+
+#~ msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
+#~ msgstr "ブリッジを設定するのに、OnionShareに\"⚙\"アイコンをクリックする。"
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, try the built-"
+#~ "in obfs4 ones first."
+#~ msgstr ""
+#~ "組み込まれるobfs4 pluggable transports、meek_lite (Azure)"
+#~ " pluggable transports、それともTorの `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_ "
+#~ "から入手できるカスタム・ブリッジを利用できます。ブリッジを使う必要がある場合、組み込まれるobfs4を先に使ってみて下さい。"
+