aboutsummaryrefslogtreecommitdiff
path: root/docs/source/locale/en/LC_MESSAGES/tor.po
diff options
context:
space:
mode:
Diffstat (limited to 'docs/source/locale/en/LC_MESSAGES/tor.po')
-rw-r--r--docs/source/locale/en/LC_MESSAGES/tor.po151
1 files changed, 102 insertions, 49 deletions
diff --git a/docs/source/locale/en/LC_MESSAGES/tor.po b/docs/source/locale/en/LC_MESSAGES/tor.po
index b11638a9..9e685032 100644
--- a/docs/source/locale/en/LC_MESSAGES/tor.po
+++ b/docs/source/locale/en/LC_MESSAGES/tor.po
@@ -8,7 +8,7 @@ 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: 2021-11-23 19:33-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"
@@ -23,12 +23,12 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
-" bottom right of the OnionShare window to get to its settings."
+"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`` bundled with OnionShare"
+msgid "Use the Tor version built into OnionShare"
msgstr ""
#: ../../source/tor.rst:11
@@ -46,28 +46,66 @@ msgid ""
msgstr ""
#: ../../source/tor.rst:18
-msgid "Attempt auto-configuration with Tor Browser"
+msgid "Getting Around Censorship"
msgstr ""
#: ../../source/tor.rst:20
msgid ""
+"If your access to the internet is censored, you can configure OnionShare "
+"to connect to the Tor network using `Tor bridges <https://tb-"
+"manual.torproject.org/bridges/>`_. If OnionShare connects to Tor without "
+"one, you don't need to use a bridge."
+msgstr ""
+
+#: ../../source/tor.rst:22
+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
+msgid ""
+"Try using a built-in bridge first. Using `obfs4` or `snowflake` bridges "
+"is recommended over using `meek-azure`."
+msgstr ""
+
+#: ../../source/tor.rst:29
+msgid ""
+"If using a built-in bridge doesn't work, you can request a bridge from "
+"torproject.org. You will have to solve a CAPTCHA in order to request a "
+"bridge. (This makes it more difficult for governments or ISPs to block "
+"access to Tor bridges.)"
+msgstr ""
+
+#: ../../source/tor.rst:33
+msgid ""
+"You also have the option of using a bridge that you learned about from a "
+"trusted source."
+msgstr ""
+
+#: ../../source/tor.rst:36
+msgid "Attempt auto-configuration with Tor Browser"
+msgstr ""
+
+#: ../../source/tor.rst:38
+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:24
+#: ../../source/tor.rst:42
msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:26
+#: ../../source/tor.rst:44
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:28
+#: ../../source/tor.rst:46
msgid ""
"Download the Tor Windows Expert Bundle `from "
"<https://www.torproject.org/download/tor/>`_. Extract the compressed file"
@@ -75,7 +113,7 @@ msgid ""
"the extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:50
msgid ""
"Make up a control port password. (Using 7 words in a sequence like "
"``comprised stumble rummage work avenging construct volatile`` is a good "
@@ -84,21 +122,21 @@ msgid ""
"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:57
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:41
+#: ../../source/tor.rst:59
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:46
+#: ../../source/tor.rst:64
msgid ""
"In your administrator command prompt, install ``tor`` as a service using "
"the appropriate ``torrc`` file you just created (as described in "
@@ -106,11 +144,11 @@ msgid ""
"this::"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:68
msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:52
+#: ../../source/tor.rst:70
msgid ""
"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
@@ -121,25 +159,25 @@ msgid ""
"to the Tor controller\"."
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:79
msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:63
+#: ../../source/tor.rst:81
msgid ""
"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it, and then install Tor::"
msgstr ""
-#: ../../source/tor.rst:67
+#: ../../source/tor.rst:85
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:74
+#: ../../source/tor.rst:92
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:96
msgid ""
"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
@@ -148,15 +186,15 @@ msgid ""
"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:84 ../../source/tor.rst:104
+#: ../../source/tor.rst:102 ../../source/tor.rst:122
msgid "If all goes well, you should see \"Connected to the Tor controller\"."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:105
msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:107
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 "
@@ -164,20 +202,20 @@ msgid ""
"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:91
+#: ../../source/tor.rst:109
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:93
+#: ../../source/tor.rst:111
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:97
+#: ../../source/tor.rst:115
msgid ""
"Reboot your computer. After it boots up again, open OnionShare and click "
"the \"⚙\" icon in it. Under \"How should OnionShare connect to Tor?\" "
@@ -187,30 +225,6 @@ msgid ""
"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:107
-msgid "Using Tor bridges"
-msgstr ""
-
-#: ../../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:111
-msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
-msgstr ""
-
-#: ../../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 ""
-
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
@@ -455,3 +469,42 @@ msgstr ""
#~ "bridge."
#~ msgstr ""
+#~ msgid ""
+#~ "Pick a way to connect OnionShare "
+#~ "to Tor by clicking the \"⚙\" icon"
+#~ " in the bottom right of the "
+#~ "OnionShare window to get to its "
+#~ "settings."
+#~ msgstr ""
+
+#~ msgid "Use the ``tor`` bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid "Using Tor bridges"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
+#~ msgstr ""
+
+#~ 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 ""
+