Update docs translations

18 files changed, 272 insertions, 339 deletions

diff --git a/docs/gettext/.doctrees/advanced.doctree b/docs/gettext/.doctrees/advanced.doctree
index 3a21850b..df910e50 100644
--- a/docs/gettext/.doctrees/advanced.doctree
+++ b/docs/gettext/.doctrees/advanced.doctree
diff --git a/docs/gettext/.doctrees/develop.doctree b/docs/gettext/.doctrees/develop.doctree
index 9985cf37..50cbb244 100644
--- a/docs/gettext/.doctrees/develop.doctree
+++ b/docs/gettext/.doctrees/develop.doctree
diff --git a/docs/gettext/.doctrees/environment.pickle b/docs/gettext/.doctrees/environment.pickle
index d7ebd020..2210d69f 100644
--- a/docs/gettext/.doctrees/environment.pickle
+++ b/docs/gettext/.doctrees/environment.pickle
diff --git a/docs/gettext/.doctrees/features.doctree b/docs/gettext/.doctrees/features.doctree
index ec327d02..3ca2703d 100644
--- a/docs/gettext/.doctrees/features.doctree
+++ b/docs/gettext/.doctrees/features.doctree
diff --git a/docs/gettext/.doctrees/help.doctree b/docs/gettext/.doctrees/help.doctree
index 7fe3c6d9..95e2b864 100644
--- a/docs/gettext/.doctrees/help.doctree
+++ b/docs/gettext/.doctrees/help.doctree
diff --git a/docs/gettext/.doctrees/index.doctree b/docs/gettext/.doctrees/index.doctree
index c716ae3f..13372791 100644
--- a/docs/gettext/.doctrees/index.doctree
+++ b/docs/gettext/.doctrees/index.doctree
diff --git a/docs/gettext/.doctrees/install.doctree b/docs/gettext/.doctrees/install.doctree
index 43677bc4..f61ef2f9 100644
--- a/docs/gettext/.doctrees/install.doctree
+++ b/docs/gettext/.doctrees/install.doctree
diff --git a/docs/gettext/.doctrees/security.doctree b/docs/gettext/.doctrees/security.doctree
index 62107b01..71303eef 100644
--- a/docs/gettext/.doctrees/security.doctree
+++ b/docs/gettext/.doctrees/security.doctree
diff --git a/docs/gettext/.doctrees/tor.doctree b/docs/gettext/.doctrees/tor.doctree
index 737471c7..a001547b 100644
--- a/docs/gettext/.doctrees/tor.doctree
+++ b/docs/gettext/.doctrees/tor.doctree
diff --git a/docs/gettext/advanced.pot b/docs/gettext/advanced.pot
index 15b92627..c3288812 100644
--- a/docs/gettext/advanced.pot
+++ b/docs/gettext/advanced.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,137 +17,117 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
 msgstr ""
 
 #: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
 msgstr ""
 
 #: ../../source/advanced.rst:9
-msgid "By default, everything in OnionShare is temporary. As soon as you close an OnionShare tab its address no longer exists and can't be used again. But sometimes you might want an OnionShare service to be persistent. For example, this would be useful if you want to host a website that can keep the same URL even if you reboot your computer."
+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 ""
 
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
 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 ""
 
-#: ../../source/advanced.rst:15
-msgid "When you quit OnionShare and then open it again, your saved tabs will start out open. You'll have to manually start each service, but when you do they will start with the same OnionShare address, and with the same password."
+#: ../../source/advanced.rst:18
+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 ""
 
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
 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."
 msgstr ""
 
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
-msgstr ""
-
-#: ../../source/advanced.rst:24
-msgid "By default, all OnionShare services are protected with the username `onionshare` and a randomly-generated password. If someone makes 20 wrong guesses of the password, your onion service is automatically stopped to prevent a brute force attack against the OnionShare service."
-msgstr ""
-
 #: ../../source/advanced.rst:26
-msgid "But sometimes you might want your OnionShare service to be accessible to the public. For example, 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."
+msgid "Turn Off Passwords"
 msgstr ""
 
 #: ../../source/advanced.rst:28
-msgid "To disable 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."
+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 ""
 
 #: ../../source/advanced.rst:31
-msgid "Scheduled times"
-msgstr ""
-
-#: ../../source/advanced.rst:33
-msgid "OnionShare supports scheduling exactly when a service should start and stop. Before starting server, click \"Show advanced settings\" in its tab and then check the boxes next to either \"Start onion service at scheduled time\", \"Stop onion service at scheduled time\", or both, and set the desired dates and times."
+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 ""
 
 #: ../../source/advanced.rst:35
-msgid "If you scheduled a service to start in the future, when you click the start button you will see a timer counting down until it will start. 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."
+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 ""
 
-#: ../../source/advanced.rst:37
-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."
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
 msgstr ""
 
-#: ../../source/advanced.rst:41
-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."
+#: ../../source/advanced.rst:40
+msgid "OnionShare supports scheduling exactly when a service should start and stop. Before starting a server, click \"Show advanced settings\" in its tab and then check the boxes next to either \"Start onion service at scheduled time\", \"Stop onion service at scheduled time\", or both, and set the respective desired dates and times."
 msgstr ""
 
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:43
+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 ""
 
-#: ../../source/advanced.rst:48
-msgid "In addition to its graphical interface, OnionShare has a command line interface."
+#: ../../source/advanced.rst:46
+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 ""
 
 #: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid "If you installed OnionShare using the Flatpak package, unfortunately the command line interface isn't supported."
+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 ""
 
-#: ../../source/advanced.rst:55
-msgid "If you installed OnionShare using an operating system package, you can just run ``onionshare`` from the terminal."
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
 msgstr ""
 
 #: ../../source/advanced.rst:58
-msgid "macOS"
+msgid "In addition to its graphical interface, OnionShare has a command-line interface."
 msgstr ""
 
 #: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid "You can install just the command-line version of OnionShare using ``pip3``::"
 msgstr ""
 
 #: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
+msgid "Note that you will also need the ``tor`` package installed. In macOS, install it with: ``brew install tor``"
 msgstr ""
 
-#: ../../source/advanced.rst:67
-msgid "Windows"
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
 msgstr ""
 
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:70
+msgid "If you installed OnionShare using the Linux Snapcraft package, you can also just run ``onionshare.cli`` to access the command-line interface version."
 msgstr ""
 
-#: ../../source/advanced.rst:71
-msgid "If you really want to use it anyway, you can set up a Windows development environment (see :ref:`starting_development`) and then run this in a command prompt::"
-msgstr ""
-
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
 msgid "Usage"
 msgstr ""
 
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid "You can browse the command-line documentation by running ``onionshare --help``::"
 msgstr ""
 
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
 msgstr ""
 
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
 msgid "OnionShare uses v3 Tor onion services by default. These are modern onion addresses that have 56 characters, for example::"
 msgstr ""
 
-#: ../../source/advanced.rst:140
-msgid "But it still has support for v2 onion addresses, the old type of onion addresses that have 16 characters, for example::"
+#: ../../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:144
-msgid "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion addresses are more secure, and using legacy addresses is not recommended."
+#: ../../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:146
-msgid "To use legacy addresses, before starting a server click \"Show advanced settings\" in its tab and check the \"Use a legacy address (v2 onion service, not recommended)\" box. In legacy mode you can optionally enable 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."
+#: ../../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:148
-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 soon be removed from OnionShare as well."
+#: ../../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."
 msgstr ""
diff --git a/docs/gettext/develop.pot b/docs/gettext/develop.pot
index cd1bfc11..7038de40 100644
--- a/docs/gettext/develop.pot
+++ b/docs/gettext/develop.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,153 +25,101 @@ msgid "Collaborating"
 msgstr ""
 
 #: ../../source/develop.rst:9
-msgid "OnionShare has an open Keybase team that we use to discuss the project, including asking questions, sharing ideas and designs, and making plans for future development. (It's also an easy way to send end-to-end encrypted direct messages to others in the OnionShare community, like OnionShare addresses.) To use Keybase, you need to download the `Keybase app <https://keybase.io/download>`_, make an account, and `join this team <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, click \"Join a Team\", and type \"onionshare\"."
+msgid "OnionShare has an open Keybase team to discuss the project, ask questions, share ideas and designs, and making plans for future development. (It's also an easy way to send end-to-end encrypted direct messages to others in the OnionShare community, like OnionShare addresses.) To use Keybase, download the `Keybase app <https://keybase.io/download>`_, make an account, and `join this team <https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", click \"Join a Team\", and type \"onionshare\"."
 msgstr ""
 
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
 msgid "OnionShare also has a `mailing list <https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers and and designers to discuss the project."
 msgstr ""
 
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
 msgstr ""
 
-#: ../../source/develop.rst:16
-msgid "OnionShare source code is in this git repository: https://github.com/micahflee/onionshare"
+#: ../../source/develop.rst:17
+msgid "OnionShare source code is to be found in this Git repository: https://github.com/micahflee/onionshare"
 msgstr ""
 
-#: ../../source/develop.rst:18
-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 that you'd like to develop."
+#: ../../source/develop.rst:19
+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 ""
 
-#: ../../source/develop.rst:20
-msgid "When you're ready to contribute code, open a pull request in the GitHub repository and one of the project maintainers will review it and possible ask questions, request changes, reject it, or merge it into the project."
-msgstr ""
-
-#: ../../source/develop.rst:25
-msgid "Starting development"
+#: ../../source/develop.rst:22
+msgid "When you're ready to contribute code, open a pull request in the GitHub repository and one of the project maintainers will review it and possibly ask questions, request changes, reject it, or merge it into the project."
 msgstr ""
 
 #: ../../source/develop.rst:27
-msgid "OnionShare is developed in Python. To get started, you should clone the git repository at https://github.com/micahflee/onionshare/ and then consult the ``BUILD.md`` file."
+msgid "Starting Development"
 msgstr ""
 
 #: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+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 ""
 
 #: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid "Those files contain the necessary technical instructions and commands install dependencies for your platform, and to run OnionShare from the source tree."
 msgstr ""
 
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
 msgid "Debugging tips"
 msgstr ""
 
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
 msgid "Verbose mode"
 msgstr ""
 
-#: ../../source/develop.rst:42
-msgid "When developing, it's convenient to run OnionShare from a terminal and add the ``--verbose`` (or ``-v``) flag to the command. This will print a lot of helpful messages to the terminal such as when certain objects are initialized, when events occur (like buttons clicked, settings saved or reloaded), and other debug information. For example::"
+#: ../../source/develop.rst:40
+msgid "When developing, it's convenient to run OnionShare from a terminal and add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot of helpful messages to the terminal, such as when certain objects are initialized, when events occur (like buttons clicked, settings saved or reloaded), and other debug info. For example::"
 msgstr ""
 
-#: ../../source/develop.rst:111
+#: ../../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 ""
 
-#: ../../source/develop.rst:115
-msgid "This can be useful when learning the chain of events that occur when using the application or the value of certain variables before and after they are manipulated."
+#: ../../source/develop.rst:121
+msgid "This can be useful when learning the chain of events that occur when using OnionShare, or the value of certain variables before and after they are manipulated."
 msgstr ""
 
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
 msgstr ""
 
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
 msgid "Tor is slow, and it's often convenient to skip starting onion services altogether during development. You can do this with the ``--local-only`` flag. For example::"
 msgstr ""
 
-#: ../../source/develop.rst:157
-msgid "In this case, you load the URL ``http://onionshare:eject-snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid "If you want to obtain debug output from the ``onionshare-gui.exe`` in Windows, you will need to edit ``install\\pyinstaller.spec`` and change ``console=False`` to ``console=True``."
-msgstr ""
-
 #: ../../source/develop.rst:164
-msgid "Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to comment out the ``signtool`` commands in the ``build_exe.bat`` and the ``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+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 ""
 
-#: ../../source/develop.rst:166
-msgid "After this, you can run ``onionshare-gui.exe -v`` from a command prompt to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
 msgstr ""
 
 #: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid "Help make OnionShare easier to use and more familiar and welcoming for people by translating it on `Hosted Weblate <https://hosted.weblate.org/projects/onionshare/>`_. Always keep the \"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if needed."
 msgstr ""
 
 #: ../../source/develop.rst:171
-msgid "Most of the OnionShare is translatable. You can help make it easier to use and more familiar and welcoming for people around the globe. The Localization Lab has some `documentation about translating OnionShare <https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
 msgstr ""
 
-#: ../../source/develop.rst:173
-msgid "OnionShare uses Weblate to keep track of translations. You can view the OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
 msgstr ""
 
-#: ../../source/develop.rst:175
-msgid "To help translate, make a Hosted Weblate account and start contributing to that project."
+#: ../../source/develop.rst:176
+msgid "Sometimes the original English strings are wrong, or don't match between the application and the documentation."
 msgstr ""
 
 #: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
-msgid "Sometimes the original English strings could be improved, making them easier to translate into other languages."
+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 developers see the suggestion, and can potentially modify the string via the usual code review processes."
 msgstr ""
 
 #: ../../source/develop.rst:182
-msgid "If you have suggestions for a better English string, please open a GitHub issue rather than commenting in Weblate. This ensures the upstream developers will definitely see the suggestion, and can potentially modify the string via the usual code review processes."
-msgstr ""
-
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
-msgid "Here is the current translation status. If you want start a translation in a language not to be found here, please write us to the mailing list: onionshare-dev@lists.riseup.net"
-msgstr ""
-
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
-
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
-
-#: ../../source/develop.rst:195
-msgid "Duplicate the line that begins with ``Comment=``. Add the language code to the new line so it becomes ``Comment[lang]=`` (lang should be your language). You can see what language codes are used for translation by looking at the ``share/locale/*.json`` filenames::"
+msgid "Status of Translations"
 msgstr ""
 
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
+#: ../../source/develop.rst:183
+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: onionshare-dev@lists.riseup.net"
 msgstr ""
diff --git a/docs/gettext/features.pot b/docs/gettext/features.pot
index 4fef3fe5..836890a4 100644
--- a/docs/gettext/features.pot
+++ b/docs/gettext/features.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
 msgstr ""
 
 #: ../../source/features.rst:6
-msgid "OnionShare works by starting web servers locally on your own computer and making them accessible to other people as `Tor <https://www.torproject.org/>`_ `onion services <https://community.torproject.org/onion-services/>`_."
+msgid "Web servers are started locally on your computer and made accessible to other people as `Tor <https://www.torproject.org/>`_ `onion services <https://community.torproject.org/onion-services/>`_."
 msgstr ""
 
 #: ../../source/features.rst:8
@@ -29,19 +29,19 @@ msgid "By default, OnionShare web addresses are protected with a random password
 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 a Twitter or Facebook message, depending on your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+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 ""
 
 #: ../../source/features.rst:14
-msgid "The people who you send the URL to must then copy and paste it into `Tor Browser <https://www.torproject.org/>`_ to access the OnionShare service."
+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 ""
 
 #: ../../source/features.rst:16
-msgid "With OnionShare, *your own computer is the web server*. If you run OnionShare on your laptop to send someone files, and then suspend your laptop before the files have been downloaded, the service will not be available until your laptop is unsuspended and connected to the internet again. OnionShare works best when working with people in real-time."
+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 ""
 
 #: ../../source/features.rst:18
-msgid "Because your own computer is the web server, *no third party can access anything that happens in OnionShare*, not even the developers of OnionShare. It's completely private. And because OnionShare is based on Tor onion services too, it also protects your anonymity. See the :doc:`security design </security>` for more information."
+msgid "Because your own computer is the web server, *no third party can access anything that happens in OnionShare*, not even the developers of OnionShare. It's completely private. And because OnionShare is based on Tor onion services too, it also protects your anonymity. See the :doc:`security design </security>` for more info."
 msgstr ""
 
 #: ../../source/features.rst:21
@@ -49,178 +49,178 @@ msgid "Share Files"
 msgstr ""
 
 #: ../../source/features.rst:23
-msgid "You can use OnionShare to securely and anonymously send files and folders to people. Just open a share tab, drag in the files and folders you wish to share, and click \"Start sharing\"."
+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 ""
 
 #: ../../source/features.rst:27
-#: ../../source/features.rst:91
-msgid "After you add files, you'll see some settings. Make sure you choose the setting you're interested in first before you start sharing."
+#: ../../source/features.rst:93
+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
-msgid "By default, as soon as someone finishes downloading your files, OnionShare will automatically stop the server, completely removing the website from the internet. If you want to allow multiple people to download these files, uncheck the \"Stop sharing after files have been sent (uncheck to allow downloading individual files)\" box."
+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 ""
 
-#: ../../source/features.rst:33
-msgid "Also, if you uncheck this box, people will be able to download individual files that you share rather than a single compressed version of all of the files."
+#: ../../source/features.rst:34
+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:35
-msgid "When you're ready to share, click the \"Start sharing\" button. You can always click \"Stop sharing\", or quit OnionShare, to immediate take the website down. You can also click the up arrow icon in the top-right corner to show the history and progress of people downloading files from you."
+#: ../../source/features.rst:36
+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 ""
 
-#: ../../source/features.rst:39
-msgid "Now that you have a website that's sharing files, copy the address and send it to the person you want to receive the files. If the files need to stay secure, you should use an encrypted messaging app."
+#: ../../source/features.rst:40
+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 ""
 
-#: ../../source/features.rst:41
-msgid "That person then must load the address in Tor Browser. After logging in with the random password that's included in the web address, they will be able to download the files directly from your computer by clicking the \"Download Files\" link in the corner."
+#: ../../source/features.rst:42
+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 ""
 
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
 msgid "Receive Files"
 msgstr ""
 
-#: ../../source/features.rst:48
-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 files to get downloaded and other settings, and then click \"Start Receive Mode\"."
-msgstr ""
-
-#: ../../source/features.rst:52
-msgid "This will start the OnionShare service. Anyone that loads this address in Tor Browser will be able to upload files to your computer."
+#: ../../source/features.rst:49
+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 ""
 
-#: ../../source/features.rst:56
-msgid "You can also click the down arrow icon in the top-right corner to show the history and progress of people sending files to you."
+#: ../../source/features.rst:54
+msgid "This starts the OnionShare service. Anyone loading this address in their Tor Browser will be able to upload files to your computer."
 msgstr ""
 
 #: ../../source/features.rst:58
-msgid "Here is what it looks like for someone sending you files."
+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:62
-msgid "When someone uploads files to your receive service, by default they get saved to a folder called ``OnionShare`` in your home folder on your computer, and they get automatically organized into separate subfolders based on the time that the files get uploaded."
+#: ../../source/features.rst:60
+msgid "Here is what it looks like for someone sending you files."
 msgstr ""
 
 #: ../../source/features.rst:64
-msgid "Setting up an OnionShare receiving service is useful for journalists and others that need to securely accept documents from anonymous sources. When used in this way, OnionShare is sort of like a lightweight, simpler, not quite as secure version of `SecureDrop <https://securedrop.org/>`_, the whistleblower submission system."
+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 ""
 
-#: ../../source/features.rst:67
-msgid "Use at your own risk"
+#: ../../source/features.rst:66
+msgid "Setting up an OnionShare receiving service is useful for journalists and others needing to securely accept documents from anonymous sources. When used in this way, OnionShare is sort of like a lightweight, simpler, not quite as secure version of `SecureDrop <https://securedrop.org/>`_, the whistleblower submission system."
 msgstr ""
 
 #: ../../source/features.rst:69
-msgid "Just like with malicious email attachments, it's possible that someone could try to hack 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, so use at your own risk."
+msgid "Use at your own risk"
 msgstr ""
 
 #: ../../source/features.rst:71
-msgid "If you receive an Office document or a PDF through OnionShare, you can convert these documents into PDFs that you know are safe to open using `Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself when opening untrusted documents by opening them in `Tails <https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ disposable VM."
+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 ""
 
-#: ../../source/features.rst:74
-msgid "Tips for running a receive service"
+#: ../../source/features.rst:73
+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 <https://dangerzone.rocks/>`_. You can also protect yourself when opening untrusted documents by opening them in `Tails <https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ disposableVM."
 msgstr ""
 
 #: ../../source/features.rst:76
-msgid "If you want to host your own anonymous dropbox using OnionShare, it's recommended that you do it on a separate, dedicated computer that's always powered on and connected to the internet, and not on the one you use on a regular basis."
+msgid "Tips for running a receive service"
 msgstr ""
 
 #: ../../source/features.rst:78
-msgid "If you intend on advertising the OnionShare address on your website or social media profiles, then you should save the tab (see :ref:`save_tabs`) and run it as a public service (see :ref:`disable_passwords`)."
+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 ""
 
-#: ../../source/features.rst:81
-msgid "Host a Website"
+#: ../../source/features.rst:80
+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 ""
 
 #: ../../source/features.rst:83
-msgid "You can use OnionShare to host a static HTML website with just a click. Just open a website tab, drag in the files and folders that make up the static website, and click when you're ready click \"Start sharing\"."
+msgid "Host a Website"
 msgstr ""
 
-#: ../../source/features.rst:87
-msgid "If you add an ``index.html`` file, when someone loads your website it will render this page. You should also include any other HTML files, CSS files, JavaScript files, and images that make up the website. (Note that 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.)"
+#: ../../source/features.rst:85
+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 ""
 
 #: ../../source/features.rst:89
-msgid "If you don't have an ``index.html`` file, then it will show a directory listing instead, and people who load it can look through the files and download them."
+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, JavaScript files, and images that make up the website. (Note that 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 ""
 
-#: ../../source/features.rst:96
-msgid "Content Security Policy"
+#: ../../source/features.rst:91
+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 ""
 
 #: ../../source/features.rst:98
-msgid "By default OnionShare will help secure your website by setting a strict `Content Security Police <https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However this will prevent third-party content from loading inside the web page."
+msgid "Content Security Policy"
 msgstr ""
 
 #: ../../source/features.rst:100
-msgid "If you want to load content from third-party websites, like assets or JavaScript libraries from CDNs, then you must check the \"Disable Content Security Policy header (allows your website to use third-party resources)\" box before starting the service."
+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 ""
 
-#: ../../source/features.rst:103
-msgid "Tips for running a website service"
+#: ../../source/features.rst:102
+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 ""
 
 #: ../../source/features.rst:105
-msgid "If you want to host a long-term website using OnionShare (that isn't just to quickly show someone something), it's recommended that you do it on a separate, dedicated computer that's always powered on and connected to the internet, and not on the one you use on a regular basis. You should also save the tab (see :ref:`save_tabs`) so that you can resume the website with the same address if you close OnionShare and re-open it later."
+msgid "Tips for running a website service"
 msgstr ""
 
 #: ../../source/features.rst:107
-msgid "If your website is intended to be viewed by the public, you should run it as a public service (see :ref:`disable_passwords`)."
+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 ""
 
 #: ../../source/features.rst:110
+msgid "If your website is intended for the public, you should run it as a public service (see :ref:`turn_off_passwords`)."
+msgstr ""
+
+#: ../../source/features.rst:113
 msgid "Chat Anonymously"
 msgstr ""
 
-#: ../../source/features.rst:112
-msgid "You can use OnionShare to set up a completely anonymous, secure chat room that doesn't log anything or leave any traces. Just open a chat tab and click \"Start chat server\"."
+#: ../../source/features.rst:115
+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 ""
 
-#: ../../source/features.rst:116
-msgid "After you start the server, copy the OnionShare address and send it to the people who will join this anonymous chat room. If it's important to limit exactly who can join, you should use an encrypted messaging app to send the OnionShare address."
+#: ../../source/features.rst:119
+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 ""
 
-#: ../../source/features.rst:120
-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 set their security level to Standard or Safer instead of Safest."
+#: ../../source/features.rst:124
+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 ""
 
-#: ../../source/features.rst:122
-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 enter. No chat history will get displayed at all, even if others were already chatting in the room, because the chat history isn't saved anywhere."
+#: ../../source/features.rst:127
+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 ""
 
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
 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 ""
 
-#: ../../source/features.rst:128
-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, then you can be reasonably confident that the people who join the chat room are your friends."
+#: ../../source/features.rst:136
+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 ""
 
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
 msgid "How is this useful?"
 msgstr ""
 
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
 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 ""
 
-#: ../../source/features.rst:135
-msgid "If you send a message to a Signal group, for example, a copy of your message ends up on each device (the phones and computers, if they set up Signal Desktop) of each member of the group. Even if disappearing messages is enabled, it's hard to confirm that all copies of the messages were 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 this isn't a problem."
+#: ../../source/features.rst:143
+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 ""
 
-#: ../../source/features.rst:137
-msgid "OnionShare chat rooms can also be useful for anonymous people wanting to chat securely with someone without needing to create any accounts. For example, a source can send an OnionShare address to a journalist using a disposable email address, and then wait for the journalist to join the chat room, all without compromosing their anonymity."
+#: ../../source/features.rst:146
+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 ""
 
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
 msgid "How does the encryption work?"
 msgstr ""
 
-#: ../../source/features.rst:142
-msgid "Because OnionShare relies on Tor onion services, connections between Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When someone posts a message to an OnionShare chat room, they send it to the 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."
+#: ../../source/features.rst:152
+msgid "Because OnionShare relies on Tor onion services, connections between the Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When someone posts a message to an OnionShare chat room, they send it to the 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 ""
 
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
 msgid "OnionShare doesn't implement any chat encryption on its own. It relies on the Tor onion service's encryption instead."
 msgstr ""
diff --git a/docs/gettext/help.pot b/docs/gettext/help.pot
index 0996bae3..1f91e4c3 100644
--- a/docs/gettext/help.pot
+++ b/docs/gettext/help.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,38 +20,34 @@ msgstr ""
 msgid "Getting Help"
 msgstr ""
 
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
 msgstr ""
 
 #: ../../source/help.rst:7
-msgid "Read this website"
+msgid "You will find instructions on how to use OnionShare. Look through all of the sections first to see if anything answers your questions."
 msgstr ""
 
-#: ../../source/help.rst:9
-msgid "This website is full of instructions on how to use OnionShare. Look through all of the sections first to see if it answers your questions."
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
 msgstr ""
 
 #: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+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."
 msgstr ""
 
-#: ../../source/help.rst:14
-msgid "If you can't find a solution in this website, please check the `GitHub issues <https://github.com/micahflee/onionshare/issues>`_. It's possible that someone else has encountered the same problem and has either raised it with the developers, or maybe even posted a solution."
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
 msgstr ""
 
 #: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+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 ""
 
-#: ../../source/help.rst:19
-msgid "If you can't find a solution to your problem, or you wish to ask a question or suggest a new feature, please `submit an issue <https://github.com/micahflee/onionshare/issues/new>`_. This requires `creating an GitHub account <https://help.github.com/articles/signing-up-for-a-new-github-account/>`_."
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
 msgstr ""
 
 #: ../../source/help.rst:22
-msgid "Join our Keybase team"
-msgstr ""
-
-#: ../../source/help.rst:24
-msgid "See :ref:`collaborating` for instructions on how to join our Keybase team that we use to discuss the project."
+msgid "See :ref:`collaborating` on how to join the Keybase team used to discuss the project."
 msgstr ""
diff --git a/docs/gettext/index.pot b/docs/gettext/index.pot
index edd6e67d..faa41716 100644
--- a/docs/gettext/index.pot
+++ b/docs/gettext/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:46-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/docs/gettext/install.pot b/docs/gettext/install.pot
index 58bedab2..7f33fe4a 100644
--- a/docs/gettext/install.pot
+++ b/docs/gettext/install.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,81 +21,85 @@ msgid "Installation"
 msgstr ""
 
 #: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
 msgstr ""
 
 #: ../../source/install.rst:7
 msgid "You can download OnionShare for Windows and macOS from the `OnionShare website <https://onionshare.org/>`_."
 msgstr ""
 
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
 msgstr ""
 
 #: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+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 `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft ensure that you'll always use the newest version and run OnionShare inside of a sandbox."
 msgstr ""
 
-#: ../../source/install.rst:16
-msgid "There are various ways to install OnionShare for Linux, but the recommended way is to use the Flatpak package. Flatpak ensures that you'll always use the most latest dependencies and run OnionShare inside of a sandbox."
+#: ../../source/install.rst:17
+msgid "Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
-#: ../../source/install.rst:18
-msgid "Make sure you have ``flatpak`` installed and the Flathub repository added by following `these instructions <https://flatpak.org/setup/>`_ for your Linux distribution."
+#: ../../source/install.rst:19
+msgid "**Install OnionShare using Flatpak**: https://flathub.org/apps/details/org.onionshare.OnionShare"
 msgstr ""
 
-#: ../../source/install.rst:20
-msgid "Then install OnionShare from Flathub by following `the instructions here <https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
 msgstr ""
 
-#: ../../source/install.rst:25
-msgid "Verifying PGP signatures"
+#: ../../source/install.rst:23
+msgid "You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
-#: ../../source/install.rst:27
-msgid "You can verify that the Windows, macOS, or source 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 installers also include their operating system-specific signatures, and you can just rely on those alone if you'd like."
+#: ../../source/install.rst:28
+msgid "Verifying PGP signatures"
 msgstr ""
 
 #: ../../source/install.rst:30
+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 ""
+
+#: ../../source/install.rst:34
 msgid "Signing key"
 msgstr ""
 
-#: ../../source/install.rst:32
-msgid "Windows, macOS, and source packaged are signed by Micah Lee, the core developer, using his PGP public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#: ../../source/install.rst:36
+msgid "Packages are signed by Micah Lee, the core developer, using his PGP public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
 msgstr ""
 
-#: ../../source/install.rst:34
-msgid "In order to verify signatures, you must have GnuPG installed. For macOS you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+#: ../../source/install.rst:38
+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 ""
 
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
 msgid "Signatures"
 msgstr ""
 
-#: ../../source/install.rst:39
-msgid "You can find the signatures (``.asc`` files), as well as Windows, macOS, and source packages, at https://onionshare.org/dist/ in the folders named for each version of OnionShare. You can also find them on the `GitHub Releases page <https://github.com/micahflee/onionshare/releases>`_."
+#: ../../source/install.rst:43
+msgid "You can find the signatures (``.asc`` files), as well as Windows, macOS, Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ in the folders named for each version of OnionShare. You can also find them on the `GitHub Releases page <https://github.com/micahflee/onionshare/releases>`_."
 msgstr ""
 
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
 msgid "Verifying"
 msgstr ""
 
-#: ../../source/install.rst:44
-msgid "Once you have imported Micah's public key into your GnuPG keychain, downloaded the binary, and downloaded the ``.asc`` signature, you can verify the binary for macOS in terminal like this::"
+#: ../../source/install.rst:49
+msgid "Once you have imported Micah's public key into your GnuPG keychain, downloaded the binary, and downloaded the ``.asc`` signature, you can verify the binary for macOS in a terminal like this::"
 msgstr ""
 
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
 msgstr ""
 
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
 msgstr ""
 
-#: ../../source/install.rst:64
-msgid "If you don't see 'Good signature from', then there might be a problem with the integrity of the file (malicious or otherwise), and you perhaps should not install the package. (The WARNING shown above, is not a problem with the package: it only means you have not defined any level of 'trust' regarding Micah's PGP key itself.)"
+#: ../../source/install.rst:69
+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 ""
 
-#: ../../source/install.rst:66
-msgid "If you want to learn more about verifying PGP signatures, guides for `Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and the `Tor Project <https://2019.www.torproject.org/docs/verifying-signatures.html.en>`_ may be helpful."
+#: ../../source/install.rst:71
+msgid "If you want to learn more about verifying PGP signatures, 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 helpful."
 msgstr ""
diff --git a/docs/gettext/security.pot b/docs/gettext/security.pot
index 2bf3fb0a..c038037a 100644
--- a/docs/gettext/security.pot
+++ b/docs/gettext/security.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
 msgstr ""
 
 #: ../../source/security.rst:4
-msgid "First read :ref:`how_it_works` to understand the basics of how OnionShare works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
 msgstr ""
 
 #: ../../source/security.rst:6
@@ -33,11 +33,11 @@ msgid "What OnionShare protects against"
 msgstr ""
 
 #: ../../source/security.rst:11
-msgid "**Third parties don't have access to anything that happens in OnionShare.** When you use OnionShare, you host services directly on your computer. For example, when you share files with OnionShare, you don't upload these files to any server, and when you start an OnionShare chat room, your computer is the chat room server itself. Traditional ways of sharing files or setting up websites and chat rooms require trusting a service with access to your data."
+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 ""
 
 #: ../../source/security.rst:13
-msgid "**Network eavesdroppers can't spy on anything that happens in OnionShare in transit.** Because connections between Tor onion services and Tor Browser are end-to-end encrypted, no network attackers can eavesdrop on what happens in an OnionShare service. If the eavesdropper is positioned on the OnionShare user's end, the Tor Browser user's end, or is a malicious Tor node, they will only see Tor traffic. If the eavesdropper is a malicious rendezvous node used to connect Tor Browser with OnionShare's onion service, the traffic will be encrypted using the onion service key."
+msgid "**Network eavesdroppers can't spy on anything that happens in OnionShare in transit.** The connection between the Tor onion service and Tor Browser is end-to-end encrypted. This means network attackers can't eavesdrop on anything except encrypted Tor traffic. Even if an eavesdropper is a malicious rendezvous node used to connect the Tor Browser with OnionShare's onion service, the traffic is encrypted using the onion service's private key."
 msgstr ""
 
 #: ../../source/security.rst:15
@@ -45,7 +45,7 @@ msgid "**Anonymity of OnionShare users are protected by Tor.** OnionShare and To
 msgstr ""
 
 #: ../../source/security.rst:17
-msgid "**If an attacker learns about the onion service, they still can't access anything.** There have been attacks against the Tor network that can enumerate onion services. Even if someone discovers the .onion address of an OnionShare onion service, they can't access it without also knowing the service's random password (unless, of course, the OnionShare users chooses to disable the password and make it public). The password is generated by choosing two random words from a list of 6800 words, meaning there are 6800^2, or about 46 million possible password. But they can only make 20 wrong guesses before OnionShare stops the server, preventing brute force attacks against the password."
+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^2, 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 ""
 
 #: ../../source/security.rst:20
@@ -53,9 +53,9 @@ msgid "What OnionShare doesn't protect against"
 msgstr ""
 
 #: ../../source/security.rst:22
-msgid "**Communicating the OnionShare address might not be secure.** The OnionShare user is responsible for securely communicating the OnionShare address with people. If they send it insecurely (such as through an email message, and their email is being monitored by an attacker), the eavesdropper will learn that they're using OnionShare. If the attacker loads the address in Tor Browser before the legitimate recipient gets to it, they can access the service. If this risk fits the user's threat model, they must find a more secure way to communicate the address, such as in an encrypted email, chat, or voice call. This isn't necessary in cases where OnionShare is being used for something that isn't secret."
+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."
 msgstr ""
 
 #: ../../source/security.rst:24
-msgid "**Communicating the OnionShare address might not be anonymous.** While OnionShare and Tor Browser allow for anonymity, if the user wishes to remain anonymous they must take extra steps to ensure this while communicating the OnionShare address. For example, they might need to use Tor to create a new anonymous email or chat account, and only access it over Tor, to use for sharing the address. This isn't necessary in cases where there's no need to protect anonymity, such as co-workers who know each other sharing work documents."
+msgid "**Communicating the OnionShare address might not be anonymous.** Extra steps 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."
 msgstr ""
diff --git a/docs/gettext/sphinx.pot b/docs/gettext/sphinx.pot
index 05bdc208..ffc3bc79 100644
--- a/docs/gettext/sphinx.pot
+++ b/docs/gettext/sphinx.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/docs/gettext/tor.pot b/docs/gettext/tor.pot
index 5f7adb04..0812a342 100644
--- a/docs/gettext/tor.pot
+++ b/docs/gettext/tor.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,117 +21,122 @@ msgid "Connecting to Tor"
 msgstr ""
 
 #: ../../source/tor.rst:4
-msgid "There are several options for how OnionShare should connect to Tor. You can change them in Settings, which you can get to by clicking the gear icon in the bottom-right of the window."
+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 ""
 
 #: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
 msgstr ""
 
 #: ../../source/tor.rst:11
-msgid "This is the default way that OnionShare connects to Tor, and it's also the simplest and most reliable way. For this reason, it's recommended for most users."
+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 ""
 
-#: ../../source/tor.rst:13
-msgid "When you open OnionShare, it will launch a Tor process in the background that's configured specifically for OnionShare to use. This Tor process won't interfere with other Tor processes on your computer, so you're free to run Tor Browser or use a system Tor in the background."
+#: ../../source/tor.rst:14
+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 ""
 
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
 msgstr ""
 
-#: ../../source/tor.rst:18
-msgid "You can configure OnionShare to connect to the Tor that comes with Tor Browser. First, `download Tor Browser <https://www.torproject.org>`_ here if you don't already have it. With this setting selected, you need to keep Tor Browser open in the background while you're using OnionShare."
+#: ../../source/tor.rst:20
+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 ""
 
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
 msgstr ""
 
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
 msgid "This is fairly advanced. You'll need to know how edit plaintext files and do stuff as an administrator."
 msgstr ""
 
-#: ../../source/tor.rst:25
-msgid "Download the Tor Windows Expert Bundle, which you can get `from here <https://www.torproject.org/download/tor/>`_. Extract the zip file and copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename the folder to ``tor-win32``, so that inside that folder is the ``Data`` and ``Tor`` folders."
+#: ../../source/tor.rst:28
+msgid "Download the Tor Windows Expert Bundle `from <https://www.torproject.org/download/tor/>`_. Extract the ZIP file and copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
 msgstr ""
 
-#: ../../source/tor.rst:27
-msgid "Make up a control port password. I'm going to use ``comprised stumble rummage work avenging construct volatile`` as my password. Now open a command prompt as an administrator, and use ``tor.exe --hash-password`` to generate a hash of your password. For example::"
+#: ../../source/tor.rst:32
+msgid "Make up a control port password. (Using 7 words in a sequence like ``comprised stumble rummage work avenging construct volatile`` is a good idea for a password.) Now open a command prompt (``cmd``) as an administrator, and use ``tor.exe --hash-password`` to generate a hash of your password. For example::"
 msgstr ""
 
-#: ../../source/tor.rst:32
-msgid "The hashed password output is displayed after some warnings (which you can ignore). In my case, it was ``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#: ../../source/tor.rst:39
+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 ""
 
-#: ../../source/tor.rst:34
-msgid "Now create a new text file at ``C:\\Program Files (x86)\\tor-win32\\torrc`` and put this in it, replacing the ``HashedControlPassword`` with the one you just generated::"
+#: ../../source/tor.rst:41
+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 ""
 
-#: ../../source/tor.rst:39
-msgid "In your administrator command prompt, install tor as a service using the appropriate ``torrc`` file you just created (see `here <https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more information on doing this). Like this::"
+#: ../../source/tor.rst:46
+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 ""
 
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
 msgstr ""
 
-#: ../../source/tor.rst:45
-msgid "Open OnionShare. Click the Settings icon. Under \"How should OnionShare connect to Tor?\" choose \"Connect using control port\", and set the control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor authentication options\" choose \"Password\" and set the password to your password, in my case ``comprised stumble rummage work avenging construct volatile``. Click the \"Test Settings\" button. If all goes well, you should see successfully connected to tor."
+#: ../../source/tor.rst:52
+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\"."
 msgstr ""
 
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
 msgstr ""
 
-#: ../../source/tor.rst:50
-msgid "First, install `Homebrew <http://brew.sh/>`_ if you don't already have it. Then, install Tor::"
+#: ../../source/tor.rst:63
+msgid "First, install `Homebrew <https://brew.sh/>`_ if you don't already have it. Then, install Tor::"
 msgstr ""
 
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
 msgid "Now configure Tor to allow connections from OnionShare::"
 msgstr ""
 
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
 msgid "And start the system Tor service::"
 msgstr ""
 
-#: ../../source/tor.rst:65
-msgid "Open OnionShare. Click the Settings icon. 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 options\" choose \"No authentication, or cookie authentication\". Click the \"Test Settings\" button. If all goes well, you should see successfully connected to tor."
+#: ../../source/tor.rst:78
+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."
+msgstr ""
+
+#: ../../source/tor.rst:84
+#: ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
 msgstr ""
 
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
 msgstr ""
 
-#: ../../source/tor.rst:70
-msgid "First, install the tor package. If you're using Debian, Ubuntu, or a similar Linux distro, I recommend you use Tor Project's `official repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For example, in Ubuntu 20.04::"
+#: ../../source/tor.rst:89
+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 ""
 
-#: ../../source/tor.rst:78
-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 connect to your system Tor's control socket file."
+#: ../../source/tor.rst:91
+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 connect to your system ``tor``'s control socket file."
 msgstr ""
 
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
 msgid "Add your user to the ``debian-tor`` group by running this command (replace ``username`` with your actual username)::"
 msgstr ""
 
-#: ../../source/tor.rst:84
-msgid "Reboot your computer. After it boots up again, open OnionShare. Click the Settings icon. Under \"How should OnionShare connect to Tor?\" choose \"Connect using socket file\", and set the socket file to be ``/var/run/tor/control``. Under \"Tor authentication options\" choose \"No authentication, or cookie authentication\". Click the \"Test Settings\" button. If all goes well, you should see successfully connect to Tor."
+#: ../../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 ""
 
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
 msgid "Using Tor bridges"
 msgstr ""
 
-#: ../../source/tor.rst:89
-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 successfully connects to Tor, you don't need to use a bridge."
+#: ../../source/tor.rst:109
+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 ""
 
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
 msgstr ""
 
-#: ../../source/tor.rst:93
-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, you should try the built-in obfs4 ones first."
+#: ../../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 ""