Initial documentation for the censorship circumvention/autoconnect screen

docs/source/locale/en/LC_MESSAGES/advanced.po

@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-09 19:49-0700\n"
+"POT-Creation-Date: 2022-03-31 16:26+1100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.9.1\n"
 
 #: ../../source/advanced.rst:2
 msgid "Advanced Usage"
@@ -27,31 +27,33 @@ 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."
+"Everything in OnionShare is temporary by default. When OnionShare tabs "
+"are closed, addresses no longer exist and can't be used again. Your "
+"OnionShare service can also be persistent. If you host a website, "
+"persistence means it will be available on the same OnionShare address "
+"even if you reboot your computer."
 msgstr ""
 
 #: ../../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."
+"open it when I open OnionShare\" box before starting your server. A "
+"purple pin icon appears to the left of its server status to tell you the "
+"tab is saved."
 msgstr ""
 
 #: ../../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 private key."
+"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
 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 ""
 
 #: ../../source/advanced.rst:26
@@ -66,41 +68,34 @@ msgstr ""
 
 #: ../../source/advanced.rst:30
 msgid ""
-"When browsing to an OnionShare service in Tor Browser, Tor Browser will "
-"prompt for the private key to be entered."
+"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:32
-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 private key altogether."
-msgstr ""
-
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:33
 msgid ""
 "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 won't need a private key to "
-"view in Tor Browser."
+"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:40
+#: ../../source/advanced.rst:39
 msgid "Custom Titles"
 msgstr ""
 
-#: ../../source/advanced.rst:42
+#: ../../source/advanced.rst:41
 msgid ""
-"By default, when people load an OnionShare service in Tor Browser they "
-"see the default title for the type of service. For example, the default "
-"title of a chat service is \"OnionShare Chat\"."
+"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:44
 msgid ""
-"If you want to choose a custom title, set the \"Custom title\" setting "
-"before starting a server."
+"If you edit the \"Custom title\" setting before starting a server you can"
+" change it."
 msgstr ""
 
 #: ../../source/advanced.rst:47
@@ -116,79 +111,74 @@ msgid ""
 "set the respective desired dates and times."
 msgstr ""
 
-#: ../../source/advanced.rst:52
+#: ../../source/advanced.rst:53
 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:55
+#: ../../source/advanced.rst:56
 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 ""
 
-#: ../../source/advanced.rst:60
+#: ../../source/advanced.rst:62
 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:67
+#: ../../source/advanced.rst:70
 msgid "Command-line Interface"
 msgstr ""
 
-#: ../../source/advanced.rst:69
+#: ../../source/advanced.rst:72
 msgid ""
 "In addition to its graphical interface, OnionShare has a command-line "
 "interface."
 msgstr ""
 
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:74
 msgid ""
 "You can install just the command-line version of OnionShare using "
 "``pip3``::"
 msgstr ""
 
-#: ../../source/advanced.rst:75
+#: ../../source/advanced.rst:78
 msgid ""
 "Note that you will also need the ``tor`` package installed. In macOS, "
 "install it with: ``brew install tor``"
 msgstr ""
 
-#: ../../source/advanced.rst:77
+#: ../../source/advanced.rst:80
 msgid "Then run it like this::"
 msgstr ""
 
-#: ../../source/advanced.rst:81
+#: ../../source/advanced.rst:84
 msgid ""
-"For information about installing it on different operating systems, see "
-"the `CLI readme file "
+"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:83
-msgid ""
-"If you installed OnionShare using the Linux Snapcraft package, you can "
-"also just run ``onionshare.cli`` to access the command-line interface "
-"version."
+"in the Git repository."
 msgstr ""
 
 #: ../../source/advanced.rst:86
+msgid ""
+"If you installed OnionShare using the Snap package, you can also just run"
+" ``onionshare.cli`` to access the command-line interface version."
+msgstr ""
+
+#: ../../source/advanced.rst:89
 msgid "Usage"
 msgstr ""
 
-#: ../../source/advanced.rst:88
-msgid ""
-"You can browse the command-line documentation by running ``onionshare "
-"--help``::"
+#: ../../source/advanced.rst:91
+msgid "Browse the command-line documentation by running ``onionshare --help``::"
 msgstr ""
 
 #~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
@@ -508,3 +498,132 @@ msgstr ""
 #~ " in the git repository."
 #~ 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 ""
+
+#~ 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 ""
+
+#~ 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 private"
+#~ " key."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "When browsing to an OnionShare service"
+#~ " in Tor Browser, Tor Browser will "
+#~ "prompt for the private key to be"
+#~ " entered."
+#~ 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 "
+#~ "private key altogether."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "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 won't need a private "
+#~ "key to view in Tor Browser."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, when people load an "
+#~ "OnionShare service in Tor Browser they"
+#~ " see the default title for the "
+#~ "type of service. For example, the "
+#~ "default title of a chat service is"
+#~ " \"OnionShare Chat\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to choose a custom "
+#~ "title, set the \"Custom title\" setting"
+#~ " before starting a server."
+#~ 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 ""
+
+#~ msgid ""
+#~ "For information about installing it on"
+#~ " different operating systems, see the "
+#~ "`CLI readme file "
+#~ "<https://github.com/onionshare/onionshare/blob/develop/cli/README.md>`_"
+#~ " in the git repository."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "You can browse the command-line "
+#~ "documentation by running ``onionshare "
+#~ "--help``::"
+#~ msgstr ""
+

docs/source/locale/en/LC_MESSAGES/connecting.po

@@ -0,0 +1,291 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) Micah Lee, et al.
+# This file is distributed under the same license as the OnionShare package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: OnionShare 2.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-03-31 16:39+1100\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.1\n"
+
+#: ../../source/connecting.rst:2
+msgid "Getting connected to Tor"
+msgstr ""
+
+#: ../../source/connecting.rst:4
+msgid ""
+"When OnionShare starts, it will present a screen asking you to connect to"
+" the Tor network."
+msgstr ""
+
+#: ../../source/connecting.rst:8
+msgid ""
+"You have several choices. 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/connecting.rst:10
+msgid ""
+"If you want to manually configure Bridges or other Tor settings before "
+"you connect, you can click 'Network Settings'."
+msgstr ""
+
+#: ../../source/connecting.rst:13
+msgid "Automatic censorship circumvention"
+msgstr ""
+
+#: ../../source/connecting.rst:15
+msgid ""
+"When OnionShare fails to connect to Tor, it might be because Tor is "
+"censored in your country."
+msgstr ""
+
+#: ../../source/connecting.rst:17
+msgid ""
+"If this occurs, a screen will be displayed that will offer you to either "
+"'Use a Bridge' (automatically choosing one for you), or 'Try Again "
+"without a Bridge'."
+msgstr ""
+
+#: ../../source/connecting.rst:22
+msgid "What 'Use a Bridge' does"
+msgstr ""
+
+#: ../../source/connecting.rst:24
+msgid ""
+"Bridges are a way to connect to the Tor network via intermediate services"
+" that are hopefully not blocked by your network provider (whereas normal "
+"connections might be)."
+msgstr ""
+
+#: ../../source/connecting.rst:26
+msgid ""
+"Clicking 'Use a Bridge' 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 the Tor"
+" Project's Censorship Circumvention API. The use of the Meek proxy is to "
+"hide the fact that you are trying to find a way to connect to Tor."
+msgstr ""
+
+#: ../../source/connecting.rst:28
+msgid ""
+"Before clicking 'Use a Bridge', you can choose either 'Automatically "
+"determine my country from my IP address' or 'Manually select my country'."
+msgstr ""
+
+#: ../../source/connecting.rst:30
+msgid ""
+"If you choose the former option, the Censorship Circumvention API will "
+"consider your IP address (yes, your real IP address) to determine what "
+"country you might reside in."
+msgstr ""
+
+#: ../../source/connecting.rst:32
+msgid ""
+"Based on the country information, the API will try to automatically find "
+"bridges that suit your location."
+msgstr ""
+
+#: ../../source/connecting.rst:36
+msgid ""
+"If you choose to manually select a country, OnionShare will still make a "
+"request to the Censorship Circumvention API, but will tell the API the "
+"country code. The API will then try to fetch bridges for that country "
+"that you specified."
+msgstr ""
+
+#: ../../source/connecting.rst:38
+msgid ""
+"If it finds any such bridges, OnionShare will try to reconnect to Tor "
+"using those bridges."
+msgstr ""
+
+#: ../../source/connecting.rst:40
+msgid ""
+"If the API does not find any bridges for your location, OnionShare will "
+"ask the API for 'fallback' options. At the time of writing, this is "
+"likely to be the obfs4 built-in bridges."
+msgstr ""
+
+#: ../../source/connecting.rst:42
+msgid ""
+"OnionShare will also attempt to use the obfs4 built-in bridges if for "
+"some reason it could not connect to the API itself, or the API returned "
+"an error."
+msgstr ""
+
+#: ../../source/connecting.rst:44
+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/connecting.rst:46
+msgid ""
+"Even though it is 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/connecting.rst:49
+msgid "What 'Try again without a Bridge' does"
+msgstr ""
+
+#: ../../source/connecting.rst:51
+msgid ""
+"Clicking 'Try again without a Bridge' will retry the normal OnionShare "
+"connection attempt to Tor. It won't talk to the Tor Censorship "
+"Circumvention API or use Meek."
+msgstr ""
+
+#: ../../source/connecting.rst:54
+msgid "Connect to Tor automatically"
+msgstr ""
+
+#: ../../source/connecting.rst:56
+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."
+msgstr ""
+
+#: ../../source/connecting.rst:58
+msgid ""
+"If the connection fails, you can still try bridges or reconfigure Tor via"
+" the 'Network Settings'."
+msgstr ""
+
+#~ msgid ""
+#~ "If you want to use Bridges to "
+#~ "connect to Tor, you can click "
+#~ "Network Settings to configure your type"
+#~ " of Tor connection or any bridge "
+#~ "settings. You can read more about "
+#~ "the Tor Settings screen at "
+#~ ":ref:`tor_settings`"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When OnionShare tries to connect to "
+#~ "Tor, and experiences a problem, it "
+#~ "may be because Tor is censored in"
+#~ " your country."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If this occurs, a screen will be"
+#~ " displayed that will offer you to "
+#~ "either 'Use a Bridge' (automatically "
+#~ "choosing one for you), or 'Try "
+#~ "Again without a Bridge'. You can "
+#~ "also click 'Network Settings' to "
+#~ "configure other custom bridges or for"
+#~ " other ways to use Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can choose either 'Automatically "
+#~ "determine my country from my IP "
+#~ "address' or 'Manually select my "
+#~ "country', before clicking 'Use a "
+#~ "Bridge'."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you choose to automatically determine"
+#~ " your country, clicking 'Use a "
+#~ "Bridge' 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 the Tor Project's Censorship "
+#~ "Circumvention API. The use of the "
+#~ "Meek proxy is to defeat any "
+#~ "censorship attempt against your computer's "
+#~ "ability to reach the API itself."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The Censorship Circumvention API will "
+#~ "consider your IP address (yes, your "
+#~ "real IP address) to determine what "
+#~ "country you might reside in."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you choose to manually select a"
+#~ " country, OnionShare will still make "
+#~ "a Meek-driven request to the "
+#~ "Censorship Circumvention API, but will "
+#~ "tell the API the country code. The"
+#~ " API will then try to fetch "
+#~ "bridges for that country that you "
+#~ "specified."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If the API does not find any "
+#~ "bridges for your location, OnionShare "
+#~ "will ask the API for 'fallback' "
+#~ "options. At the time of writing, "
+#~ "this is likely to be the OBFS4 "
+#~ "built-in bridges."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "It's important to note that the "
+#~ "requests to the Censorship Circumvention "
+#~ "API do not go over the Tor "
+#~ "Network (if you could use Tor "
+#~ "already, you wouldn't need to talk "
+#~ "to the API!). Even though it is"
+#~ " 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 ""
+
+#~ msgid ""
+#~ "Clicking 'Try again without a Bridge'"
+#~ " will simply retry the normal "
+#~ "OnionShare connection attempt to Tor. It"
+#~ " won't talk to the Tor Censorship "
+#~ "Circumvention API or use Meek."
+#~ msgstr ""
+
+#~ 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 instead of "
+#~ "presenting you with the configuration "
+#~ "options."
+#~ msgstr ""
+
+#~ msgid "If the connection fails, you can still try bridges."
+#~ msgstr ""
+

docs/source/locale/en/LC_MESSAGES/install.po

@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-09 19:15-0700\n"
+"POT-Creation-Date: 2022-03-31 16:26+1100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.9.1\n"
 
 #: ../../source/install.rst:2
 msgid "Installation"
@@ -39,15 +39,16 @@ msgstr ""
 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 ""
 
 #: ../../source/install.rst:17
 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."
+"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 ""
 
 #: ../../source/install.rst:19
@@ -57,7 +58,7 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
@@ -72,9 +73,9 @@ 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``. See :ref:`cli`"
-" for more information."
+"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
@@ -103,18 +104,18 @@ msgid ""
 "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
 msgstr ""
 
-#: ../../source/install.rst:45
+#: ../../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 ""
 
-#: ../../source/install.rst:48
+#: ../../source/install.rst:49
 msgid "Signatures"
 msgstr ""
 
-#: ../../source/install.rst:50
+#: ../../source/install.rst:51
 msgid ""
 "You can find the signatures (as ``.asc`` files), as well as Windows, "
 "macOS, Flatpak, Snap, and source packages, at "
@@ -123,35 +124,35 @@ msgid ""
 "<https://github.com/micahflee/onionshare/releases>`_."
 msgstr ""
 
-#: ../../source/install.rst:54
+#: ../../source/install.rst:55
 msgid "Verifying"
 msgstr ""
 
-#: ../../source/install.rst:56
+#: ../../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 "
 "binary for macOS in a terminal like this::"
 msgstr ""
 
-#: ../../source/install.rst:60
+#: ../../source/install.rst:61
 msgid "Or for Windows, in a command-prompt like this::"
 msgstr ""
 
-#: ../../source/install.rst:64
+#: ../../source/install.rst:65
 msgid "The expected output looks like this::"
 msgstr ""
 
-#: ../../source/install.rst:76
+#: ../../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 defined a level of \"trust\" of "
-"Micah's PGP key.)"
+"Micah's (the core developer) PGP key.)"
 msgstr ""
 
-#: ../../source/install.rst:78
+#: ../../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"
@@ -364,3 +365,45 @@ msgstr ""
 #~ msgid "Command Line Only"
 #~ msgstr ""
 
+#~ 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."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can install just the command "
+#~ "line version of OnionShare on any "
+#~ "operating system using the Python "
+#~ "package manager ``pip``. See :ref:`cli` "
+#~ "for more information."
+#~ msgstr ""
+
+#~ 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 defined a level "
+#~ "of \"trust\" of Micah's PGP key.)"
+#~ msgstr ""
+

docs/source/locale/en/LC_MESSAGES/security.po

@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-10 12:35-0700\n"
+"POT-Creation-Date: 2022-03-31 16:26+1100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.9.1\n"
 
 #: ../../source/security.rst:2
 msgid "Security Design"
@@ -37,13 +37,13 @@ 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."
+"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 ""
 
-#: ../../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 "
@@ -54,7 +54,7 @@ msgid ""
 "the onion service's private key."
 msgstr ""
 
-#: ../../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"
@@ -63,40 +63,40 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 
-#: ../../source/security.rst:17
+#: ../../source/security.rst:28
 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, they will also need "
-"to guess the private key used for client authentication in order to "
-"access it (unless the OnionShare user chooses make their service public "
-"by turning off the private key -- see :ref:`turn_off_private_key`)."
+"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 ""
 
-#: ../../source/security.rst:20
+#: ../../source/security.rst:33
 msgid "What OnionShare doesn't protect against"
 msgstr ""
 
-#: ../../source/security.rst:22
+#: ../../source/security.rst:35
 msgid ""
 "**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 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 communicated 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."
+"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 ""
 
-#: ../../source/security.rst:24
+#: ../../source/security.rst:42
 msgid ""
 "**Communicating the OnionShare address and private key might not be "
-"anonymous.** Extra precautions must be taken to ensure the OnionShare "
-"address is communicated anonymously. A new email or chat account, only "
+"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 ""
@@ -348,3 +348,67 @@ msgstr ""
 #~ "for something that isn't secret."
 #~ 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 ""
+
+#~ 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, they will also need to "
+#~ "guess the private key used for "
+#~ "client authentication in order to access"
+#~ " it (unless the OnionShare user "
+#~ "chooses make their service public by "
+#~ "turning off the private key -- see"
+#~ " :ref:`turn_off_private_key`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**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 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 communicated "
+#~ "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 ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address and "
+#~ "private key 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."
+#~ msgstr ""
+

docs/source/locale/en/LC_MESSAGES/tor.po

@@ -8,36 +8,37 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-23 19:33-0800\n"
+"POT-Creation-Date: 2022-03-31 16:26+1100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.9.1\n"
 
 #: ../../source/tor.rst:2
 msgid "Connecting to Tor"
 msgstr ""
 
-#: ../../source/tor.rst:4
+#: ../../source/tor.rst:6
 msgid ""
-"Pick a way to connect OnionShare to Tor by clicking the Tor onion icon in"
-" the bottom right of the OnionShare window to open the Tor Settings tab."
-msgstr ""
-
-#: ../../source/tor.rst:9
-msgid "Use the Tor version built into OnionShare"
+"Pick a way to connect OnionShare to Tor by clicking Network Settings from"
+" the welcome screen, or the Tor onion icon in the bottom right of the "
+"OnionShare window to open the Tor Settings tab."
 msgstr ""
 
 #: ../../source/tor.rst:11
+msgid "Use the Tor version built into OnionShare"
+msgstr ""
+
+#: ../../source/tor.rst:13
 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:14
+#: ../../source/tor.rst:16
 msgid ""
 "When you open OnionShare, it launches an already configured ``tor`` "
 "process in the background for OnionShare to use. It doesn't interfere "
@@ -45,11 +46,11 @@ msgid ""
 "Browser or the system ``tor`` on their own."
 msgstr ""
 
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
 msgid "Getting Around Censorship"
 msgstr ""
 
-#: ../../source/tor.rst:20
+#: ../../source/tor.rst:22
 msgid ""
 "If your access to the internet is censored, you can configure OnionShare "
 "to connect to the Tor network using `Tor bridges <https://tb-"
@@ -57,19 +58,19 @@ msgid ""
 "one, you don't need to use a bridge."
 msgstr ""
 
-#: ../../source/tor.rst:22
+#: ../../source/tor.rst:24
 msgid ""
 "To use a bridge, open the Tor Settings tab. You must select \"Use the Tor"
 " version built into OnionShare\" and check the \"Use a bridge\" checkbox."
 msgstr ""
 
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:27
 msgid ""
 "Try using a built-in bridge first. Using `obfs4` or `snowflake` bridges "
 "is recommended over using `meek-azure`."
 msgstr ""
 
-#: ../../source/tor.rst:29
+#: ../../source/tor.rst:31
 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 "
@@ -77,17 +78,17 @@ msgid ""
 "access to Tor bridges.)"
 msgstr ""
 
-#: ../../source/tor.rst:33
+#: ../../source/tor.rst:35
 msgid ""
 "You also have the option of using a bridge that you learned about from a "
 "trusted source."
 msgstr ""
 
-#: ../../source/tor.rst:36
+#: ../../source/tor.rst:38
 msgid "Attempt auto-configuration with Tor Browser"
 msgstr ""
 
-#: ../../source/tor.rst:38
+#: ../../source/tor.rst:40
 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`` "
@@ -95,17 +96,17 @@ msgid ""
 "open in the background while you're using OnionShare for this to work."
 msgstr ""
 
-#: ../../source/tor.rst:42
+#: ../../source/tor.rst:44
 msgid "Using a system ``tor`` in Windows"
 msgstr ""
 
-#: ../../source/tor.rst:44
+#: ../../source/tor.rst:46
 msgid ""
 "This is fairly advanced. You'll need to know how edit plaintext files and"
 " do stuff as an administrator."
 msgstr ""
 
-#: ../../source/tor.rst:46
+#: ../../source/tor.rst:48
 msgid ""
 "Download the Tor Windows Expert Bundle `from "
 "<https://www.torproject.org/download/tor/>`_. Extract the compressed file"
@@ -113,7 +114,7 @@ msgid ""
 "the extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
 msgstr ""
 
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:52
 msgid ""
 "Make up a control port password. (Using 7 words in a sequence like "
 "``comprised stumble rummage work avenging construct volatile`` is a good "
@@ -122,21 +123,21 @@ msgid ""
 "your password. For example::"
 msgstr ""
 
-#: ../../source/tor.rst:57
+#: ../../source/tor.rst:59
 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:59
+#: ../../source/tor.rst:61
 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:64
+#: ../../source/tor.rst:66
 msgid ""
 "In your administrator command prompt, install ``tor`` as a service using "
 "the appropriate ``torrc`` file you just created (as described in "
@@ -144,11 +145,11 @@ msgid ""
 "this::"
 msgstr ""
 
-#: ../../source/tor.rst:68
+#: ../../source/tor.rst:70
 msgid "You are now running a system ``tor`` process in Windows!"
 msgstr ""
 
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:72
 msgid ""
 "Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
 "OnionShare connect to Tor?\" choose \"Connect using control port\", and "
@@ -159,25 +160,25 @@ msgid ""
 "to the Tor controller\"."
 msgstr ""
 
-#: ../../source/tor.rst:79
+#: ../../source/tor.rst:81
 msgid "Using a system ``tor`` in macOS"
 msgstr ""
 
-#: ../../source/tor.rst:81
+#: ../../source/tor.rst:83
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
 "it, and then install Tor::"
 msgstr ""
 
-#: ../../source/tor.rst:85
+#: ../../source/tor.rst:87
 msgid "Now configure Tor to allow connections from OnionShare::"
 msgstr ""
 
-#: ../../source/tor.rst:92
+#: ../../source/tor.rst:94
 msgid "And start the system Tor service::"
 msgstr ""
 
-#: ../../source/tor.rst:96
+#: ../../source/tor.rst:98
 msgid ""
 "Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
 "OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
@@ -186,15 +187,15 @@ msgid ""
 "cookie authentication\". Click the \"Test Connection to Tor\" button."
 msgstr ""
 
-#: ../../source/tor.rst:102 ../../source/tor.rst:122
+#: ../../source/tor.rst:104 ../../source/tor.rst:124
 msgid "If all goes well, you should see \"Connected to the Tor controller\"."
 msgstr ""
 
-#: ../../source/tor.rst:105
+#: ../../source/tor.rst:107
 msgid "Using a system ``tor`` in Linux"
 msgstr ""
 
-#: ../../source/tor.rst:107
+#: ../../source/tor.rst:109
 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 "
@@ -202,20 +203,20 @@ msgid ""
 "repo/>`_."
 msgstr ""
 
-#: ../../source/tor.rst:109
+#: ../../source/tor.rst:111
 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:111
+#: ../../source/tor.rst:113
 msgid ""
 "Add your user to the ``debian-tor`` group by running this command "
 "(replace ``username`` with your actual username)::"
 msgstr ""
 
-#: ../../source/tor.rst:115
+#: ../../source/tor.rst:117
 msgid ""
 "Reboot your computer. After it boots up again, open OnionShare and click "
 "the \"⚙\" icon in it. Under \"How should OnionShare connect to Tor?\" "
@@ -508,3 +509,11 @@ msgstr ""
 #~ "in obfs4 ones first."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Pick a way to connect OnionShare "
+#~ "to Tor by clicking the Tor onion"
+#~ " icon in the bottom right of "
+#~ "the OnionShare window to open the "
+#~ "Tor Settings tab."
+#~ msgstr ""
+