aboutsummaryrefslogtreecommitdiff
path: root/docs/source/locale
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2022-07-04 17:17:45 -0400
committerMicah Lee <micah@micahflee.com>2022-07-04 17:17:45 -0400
commit3966e42160e0b80bed01f892e399cb56f66cc516 (patch)
tree1aa242168d0861306d6a73dde0a347a67ebdbe4e /docs/source/locale
parentbdd15ab59d4423d2dd2b7da51916253314de1e0a (diff)
downloadonionshare-3966e42160e0b80bed01f892e399cb56f66cc516.tar.gz
onionshare-3966e42160e0b80bed01f892e399cb56f66cc516.zip
Build latest docs
Diffstat (limited to 'docs/source/locale')
-rw-r--r--docs/source/locale/de/LC_MESSAGES/security.po8
-rw-r--r--docs/source/locale/de/LC_MESSAGES/tor.po330
-rw-r--r--docs/source/locale/el/LC_MESSAGES/security.po8
-rw-r--r--docs/source/locale/el/LC_MESSAGES/tor.po320
-rw-r--r--docs/source/locale/en/LC_MESSAGES/security.po21
-rw-r--r--docs/source/locale/en/LC_MESSAGES/tor.po344
-rw-r--r--docs/source/locale/es/LC_MESSAGES/security.po8
-rw-r--r--docs/source/locale/es/LC_MESSAGES/tor.po320
-rw-r--r--docs/source/locale/fr/LC_MESSAGES/security.po56
-rw-r--r--docs/source/locale/fr/LC_MESSAGES/tor.po384
-rw-r--r--docs/source/locale/it/LC_MESSAGES/security.po23
-rw-r--r--docs/source/locale/it/LC_MESSAGES/tor.po320
-rw-r--r--docs/source/locale/nb_NO/LC_MESSAGES/security.po8
-rw-r--r--docs/source/locale/nb_NO/LC_MESSAGES/tor.po319
-rw-r--r--docs/source/locale/pl/LC_MESSAGES/security.po8
-rw-r--r--docs/source/locale/pl/LC_MESSAGES/tor.po337
-rw-r--r--docs/source/locale/pt_BR/LC_MESSAGES/security.po8
-rw-r--r--docs/source/locale/pt_BR/LC_MESSAGES/tor.po321
-rw-r--r--docs/source/locale/ru/LC_MESSAGES/security.po8
-rw-r--r--docs/source/locale/ru/LC_MESSAGES/tor.po322
-rw-r--r--docs/source/locale/tr/LC_MESSAGES/security.po8
-rw-r--r--docs/source/locale/tr/LC_MESSAGES/tor.po318
-rw-r--r--docs/source/locale/uk/LC_MESSAGES/security.po8
-rw-r--r--docs/source/locale/uk/LC_MESSAGES/tor.po320
24 files changed, 3147 insertions, 980 deletions
diff --git a/docs/source/locale/de/LC_MESSAGES/security.po b/docs/source/locale/de/LC_MESSAGES/security.po
index 390f08ef..6578cd08 100644
--- a/docs/source/locale/de/LC_MESSAGES/security.po
+++ b/docs/source/locale/de/LC_MESSAGES/security.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2021-09-19 18:10+0000\n"
"Last-Translator: Michael Breidenbach <leahc@tutanota.com>\n"
"Language: de\n"
"Language-Team: de <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/security.rst:2
msgid "Security Design"
@@ -83,7 +83,7 @@ msgstr ""
#: ../../source/security.rst:28
#, fuzzy
msgid ""
-"**If an attacker learns about the onion service, it still can't access "
+"**If an attacker learns about the onion service, they still can't access "
"anything.** Prior attacks against the Tor network to enumerate onion "
"services allowed attackers to discover private ``.onion`` addresses. To "
"access an OnionShare service from its address, the private key used for "
diff --git a/docs/source/locale/de/LC_MESSAGES/tor.po b/docs/source/locale/de/LC_MESSAGES/tor.po
index 74339f21..e763cf14 100644
--- a/docs/source/locale/de/LC_MESSAGES/tor.po
+++ b/docs/source/locale/de/LC_MESSAGES/tor.po
@@ -7,38 +7,185 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2021-09-13 10:46+0000\n"
"Last-Translator: nautilusx <translate@disroot.org>\n"
"Language: de\n"
"Language-Team: de <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
msgstr "Mit dem Tor-Netzwerk verbinden"
-#: ../../source/tor.rst:6
-#, fuzzy
+#: ../../source/tor.rst:4
+msgid ""
+"When OnionShare starts, it will show you a screen asking you to connect "
+"to the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:8
msgid ""
-"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."
+"You can toggle on the switch \"Connect to Tor automatically\" before "
+"clicking \"Connect to Tor\". This means that next time OnionShare starts,"
+" it will automatically connect with its Tor connection settings from the "
+"last session, instead of presenting you with the connection options. If "
+"the connection fails, you can still try bridges or reconfigure Tor via "
+"the \"Network Settings\" button."
msgstr ""
-"Lege fest, wie OnionShare sich mit Tor verbinden soll, indem du auf das "
-"„⚙“-Symbol am unteren rechten Rand vom OnionShare-Fenster klickst, um die"
-" entsprechenden Einstellungen zu sehen."
#: ../../source/tor.rst:11
-msgid "Use the Tor version built into OnionShare"
+msgid ""
+"You can click \"Connect to Tor\" to begin the connection process. If "
+"there are no problems with your network, including any attempts to block "
+"your access to the Tor network, this should hopefully work the first "
+"time."
msgstr ""
#: ../../source/tor.rst:13
msgid ""
+"Or, if you want to manually configure Bridges or other Tor settings "
+"before you connect, you can click \"Network Settings\"."
+msgstr ""
+
+#: ../../source/tor.rst:16
+msgid "Automatic censorship circumvention"
+msgstr ""
+
+#: ../../source/tor.rst:18
+msgid ""
+"When you click \"Connect to Tor\", if OnionShare fails to connect, it "
+"might be because Tor is censored in your country or on your local "
+"network."
+msgstr ""
+
+#: ../../source/tor.rst:20
+msgid "If this occurs, you will have these choices:"
+msgstr ""
+
+#: ../../source/tor.rst:22
+msgid "Try again without a bridge"
+msgstr ""
+
+#: ../../source/tor.rst:23
+msgid "Automatically determine my country from my IP address for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:24
+msgid "Manually select my country for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:28
+msgid ""
+"If you choose the \"Try again without a bridge\" option, OnionShare will "
+"retry connecting to Tor like normal, without attempting to bypass "
+"censorship."
+msgstr ""
+
+#: ../../source/tor.rst:30
+msgid ""
+"The other two options will attempt to automatically bypass censorship "
+"using Tor bridges. If your network provider is blocking access to the Tor"
+" network, you can hopefully still connect to a Tor bridge, which will "
+"then connect you to the Tor network, circumventing the censorship. Both "
+"of these options use the Tor Project's Censorship Circumvention API to "
+"provide you with bridge settings that should work for you. OnionShare "
+"will temporarily use the `Meek "
+"<https://gitlab.torproject.org/legacy/trac/-/wikis/doc/meek/>`_ domain-"
+"fronting proxy to make a non-Tor connection from your computer to Tor's "
+"Censorship Circumvention API. The Meek proxy hides the fact that you are "
+"trying to find a way to connect to Tor."
+msgstr ""
+
+#: ../../source/tor.rst:36
+msgid ""
+"If you choose \"Automatically determine my country from my IP address for"
+" bridge settings\", the Censorship Circumvention API will consider your "
+"IP address (yes, your real IP address) to determine what country you "
+"might reside in. Based on the country information, the API will try to "
+"automatically find bridges that suit your location."
+msgstr ""
+
+#: ../../source/tor.rst:41
+msgid ""
+"If you choose \"Manually select my country for bridge settings\", the "
+"Censorship API will find the bridges that suit the country that you "
+"specified."
+msgstr ""
+
+#: ../../source/tor.rst:46
+msgid "How automatic censorship circumvention works"
+msgstr ""
+
+#: ../../source/tor.rst:48
+msgid ""
+"If the Censorship Circumvention API finds bridges that it believes will "
+"suit you, OnionShare will try to reconnect to Tor using those bridges. If"
+" the API does not find any bridges for your location, OnionShare will ask"
+" the API for \"fallback\" options, and then try to reconnect using those."
+msgstr ""
+
+#: ../../source/tor.rst:50
+msgid ""
+"If for some reason OnionShare fails to connect to the Censorship API "
+"itself, or if the API returns an error message, OnionShare will attempt "
+"to use the obfs4 built-in bridges."
+msgstr ""
+
+#: ../../source/tor.rst:52
+msgid ""
+"It's important to note that the requests to the Censorship Circumvention "
+"API do not go over the Tor network (because if you could connect to Tor "
+"already, you wouldn't need to connect to the API)."
+msgstr ""
+
+#: ../../source/tor.rst:54
+msgid ""
+"Even though it's hard for an adversary to discover where the Meek request"
+" is going, this may still be risky for some users. Therefore, it is an "
+"opt-in feature. The use of Meek and non-torified network requests are "
+"limited only to making one or two requests to the Censorship "
+"Circumvention API. Then Meek is stopped, and all further network requests"
+" happen over the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:56
+msgid ""
+"If you are uncomfortable with making a request that doesn't go over the "
+"Tor network, you can click \"Network Settings\" (or the Settings icon in "
+"the bottom right corner, followed by the Tor Settings tab in the screen "
+"that appears), and manually configure bridges. After you save any bridge "
+"settings, OnionShare will try to reconnect using those bridges."
+msgstr ""
+
+#: ../../source/tor.rst:59
+msgid "Manually configure Tor settings"
+msgstr ""
+
+#: ../../source/tor.rst:61
+msgid ""
+"You can get to the Tor settings by clicking \"Network Settings\" on the "
+"welcome screen, or by clicking the \"⚙\" icon in the bottom-right corner "
+"of the application, and then switch to the Tor Settings tab in the screen"
+" that appears."
+msgstr ""
+
+#: ../../source/tor.rst:65
+msgid ""
+"Here are the different ways you can configure OnionShare to connect to "
+"Tor:"
+msgstr ""
+
+#: ../../source/tor.rst:68
+msgid "Use the Tor version built into OnionShare"
+msgstr ""
+
+#: ../../source/tor.rst:70
+msgid ""
"This is the default, simplest and most reliable way that OnionShare "
"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
@@ -46,7 +193,7 @@ msgstr ""
"einfachste und zuverlässigste Weg. Es empfiehlt sich daher für die "
"meisten Nutzer."
-#: ../../source/tor.rst:16
+#: ../../source/tor.rst:73
msgid ""
"When you open OnionShare, it launches an already configured ``tor`` "
"process in the background for OnionShare to use. It doesn't interfere "
@@ -59,37 +206,23 @@ msgstr ""
"Tor Browser oder den systemweiten ``tor``-Dienst unabhängig voneinander "
"nutzen kannst."
-#: ../../source/tor.rst:20
-msgid "Getting Around Censorship"
-msgstr ""
-
-#: ../../source/tor.rst:22
-#, fuzzy
-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."
+#: ../../source/tor.rst:76
+msgid "**Using bridges**"
msgstr ""
-"Falls dein Internetzugang zensiert wird, kannst du OnionShare so "
-"konfigurieren, dass es sich mit dem Tor-Netzwerk verbindet, indem du "
-"`Tor-Bridges <https://2019.www.torproject.org/docs/bridges.html.en>`_ "
-"benutzt. Wenn OnionShare sich ohne eine Brücke mit Tor verbindet, "
-"brauchst du keine Brücke zu benutzen."
-#: ../../source/tor.rst:24
+#: ../../source/tor.rst:78
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."
+"To use a bridge, you must select \"Use the Tor version built into "
+"OnionShare\" and check the \"Use a bridge\" checkbox."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:80
msgid ""
"Try using a built-in bridge first. Using `obfs4` or `snowflake` bridges "
"is recommended over using `meek-azure`."
msgstr ""
-#: ../../source/tor.rst:31
+#: ../../source/tor.rst:84
msgid ""
"If using a built-in bridge doesn't work, you can request a bridge from "
"torproject.org. You will have to solve a CAPTCHA in order to request a "
@@ -97,17 +230,17 @@ msgid ""
"access to Tor bridges.)"
msgstr ""
-#: ../../source/tor.rst:35
+#: ../../source/tor.rst:88
msgid ""
"You also have the option of using a bridge that you learned about from a "
"trusted source."
msgstr ""
-#: ../../source/tor.rst:38
+#: ../../source/tor.rst:91
msgid "Attempt auto-configuration with Tor Browser"
msgstr "Versuche automatische Konfiguration mittels Tor Browser"
-#: ../../source/tor.rst:40
+#: ../../source/tor.rst:93
msgid ""
"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
"and don't want two ``tor`` processes running, you can use the ``tor`` "
@@ -120,11 +253,11 @@ msgstr ""
"Damit dies funktionierst, musst du den Tor Browser im Hintergrund "
"geöffnet lassen, so lange du OnionShare nutzt."
-#: ../../source/tor.rst:44
+#: ../../source/tor.rst:97
msgid "Using a system ``tor`` in Windows"
msgstr "Nutze einen systemweiten Tor-Dienst in Windows"
-#: ../../source/tor.rst:46
+#: ../../source/tor.rst:99
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
@@ -132,7 +265,7 @@ msgstr ""
"Nur etwas für Fortgeschrittene. Hierfür musst du wissen, wie du "
"Textdateien editierst und mit Administratorrechten arbeitest."
-#: ../../source/tor.rst:48
+#: ../../source/tor.rst:101
msgid ""
"Download the Tor Windows Expert Bundle `from "
"<https://www.torproject.org/download/tor/>`_. Extract the compressed file"
@@ -145,7 +278,7 @@ msgstr ""
"``C:\\Programme (x86)\\``. Benenne den entpackten Ordner, der ``Data`` "
"und ``Tor`` beinhaltet, nach ``tor-win32`` um."
-#: ../../source/tor.rst:52
+#: ../../source/tor.rst:105
msgid ""
"Make up a control port password. (Using 7 words in a sequence like "
"``comprised stumble rummage work avenging construct volatile`` is a good "
@@ -159,7 +292,7 @@ msgstr ""
"--hash-password`` aus, um einen Hash deines Passworts zu erzeugen. Zum "
"Beispiel::"
-#: ../../source/tor.rst:59
+#: ../../source/tor.rst:112
msgid ""
"The hashed password output is displayed after some warnings (which you "
"can ignore). In the case of the above example, it is "
@@ -169,7 +302,7 @@ msgstr ""
"ignorieren kannst). In meinem Fall war es "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:114
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
"win32\\torrc`` and put your hashed password output in it, replacing the "
@@ -179,7 +312,7 @@ msgstr ""
"win32\\torrc`` und füge den Passwort-Hash ein, wobei "
"``HashedControlPassword`` mit dem gerade erzeugten ersetzt wird::"
-#: ../../source/tor.rst:66
+#: ../../source/tor.rst:119
msgid ""
"In your administrator command prompt, install ``tor`` as a service using "
"the appropriate ``torrc`` file you just created (as described in "
@@ -191,19 +324,20 @@ msgstr ""
"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ für "
"weitere Informationen). Zum Beispiel so::"
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:123
msgid "You are now running a system ``tor`` process in Windows!"
msgstr "Jetzt hast du einen systemweiten Tor-Dienst in Windows am Laufen!"
-#: ../../source/tor.rst:72
+#: ../../source/tor.rst:125
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
-"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
-"\"Tor authentication settings\" choose \"Password\" and set the password "
-"to the control port password you picked above. Click the \"Test "
-"Connection to Tor\" button. If all goes well, you should see \"Connected "
-"to the Tor controller\"."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using control port\", and set \"Control port\" to ``127.0.0.1``"
+" and \"Port\" to ``9051``. Under \"Tor authentication settings\" choose "
+"\"Password\" and set the password to the control port password you picked"
+" above. Click the \"Test Connection to Tor\" button. If all goes well, "
+"you should see \"Connected to the Tor controller\"."
msgstr ""
"Öffne OnionShare und klicke auf das „⚙“-Symbol. Unter „Wie soll sich "
"OnionShare mit Tor verbinden?“ wähle „Verbinde über Steuerungsport“ und "
@@ -213,11 +347,11 @@ msgstr ""
" dann auf „Verbindung zu Tor testen“. Wenn alles geklappt hat, sollte "
"„Mit dem Tor-Controller verbunden“ erscheinen."
-#: ../../source/tor.rst:81
+#: ../../source/tor.rst:134
msgid "Using a system ``tor`` in macOS"
msgstr "Benutze einen systemweiten Tor-Dienst in macOS"
-#: ../../source/tor.rst:83
+#: ../../source/tor.rst:136
msgid ""
"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it, and then install Tor::"
@@ -225,21 +359,23 @@ msgstr ""
"Installiere zunächst `Homebrew <http://brew.sh/>`_, falls du es noch "
"nicht hast. Installiere dann Tor::"
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:140
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr "Konfiguriere Tor nun so, dass es Verbindungen von OnionShare aus zulässt::"
-#: ../../source/tor.rst:94
+#: ../../source/tor.rst:147
msgid "And start the system Tor service::"
msgstr "Und starte den systemweiten Tor-Dienst::"
-#: ../../source/tor.rst:98
+#: ../../source/tor.rst:151
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
-"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
-"Under \"Tor authentication settings\" choose \"No authentication, or "
-"cookie authentication\". Click the \"Test Connection to Tor\" button."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using socket file\", and set the socket file to be "
+"``/usr/local/var/run/tor/control.socket``. Under \"Tor authentication "
+"settings\" choose \"No authentication, or cookie authentication\". Click "
+"the \"Test Connection to Tor\" button."
msgstr ""
"Öffne OnionShare und klicke auf das „⚙“-Symbol. Unter “Wie soll sich "
"OnionShare mit Tor verbinden?“ wähle „Verbinde über Socket-Datei“ und "
@@ -248,17 +384,17 @@ msgstr ""
"Identifizierung, oder Identifizierung über Cookie“. Klicke auf den Button"
" „Verbindung zu Tor testen“."
-#: ../../source/tor.rst:104 ../../source/tor.rst:124
+#: ../../source/tor.rst:157 ../../source/tor.rst:177
msgid "If all goes well, you should see \"Connected to the Tor controller\"."
msgstr ""
"Falls alles geklappt hat, solltest du „Mit dem Tor-Controller verbunden“ "
"sehen."
-#: ../../source/tor.rst:107
+#: ../../source/tor.rst:160
msgid "Using a system ``tor`` in Linux"
msgstr "Einen systemweiten Tor-Dienst unter Linux nutzen"
-#: ../../source/tor.rst:109
+#: ../../source/tor.rst:162
msgid ""
"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
"similar Linux distro, It is recommended to use the Tor Project's "
@@ -269,7 +405,7 @@ msgstr ""
"ähnliche Distribution nutzt, empfiehlt sich das `offizielle Repository "
"<https://support.torproject.org/de/apt/tor-deb-repo/>`_ des Tor-Projekts."
-#: ../../source/tor.rst:111
+#: ../../source/tor.rst:164
msgid ""
"Next, add your user to the group that runs the ``tor`` process (in the "
"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
@@ -280,7 +416,7 @@ msgstr ""
"konfiguriere OnionShare so, dass es sich über die Socket-Datei des "
"systemweiten Tor-Dienstes verbindet."
-#: ../../source/tor.rst:113
+#: ../../source/tor.rst:166
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
@@ -288,14 +424,15 @@ msgstr ""
"Füge deinen Benutzer der Gruppe ``debian-tor`` mit folgendem Befehl hinzu"
" (ersetze dabei ``Nutzername`` mit deinem tatsächlichen Nutzernamen)::"
-#: ../../source/tor.rst:117
+#: ../../source/tor.rst:170
+#, fuzzy
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."
+"Reboot your computer. After it boots up again, open OnionShare, click the"
+" \"⚙\" icon in it, and switch to the Tor Settings tab. Under \"How should"
+" OnionShare connect to Tor?\" choose \"Connect using socket file\". Set "
+"the socket file to be ``/var/run/tor/control``. Under \"Tor "
+"authentication settings\" choose \"No authentication, or cookie "
+"authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
"Starte deinen Rechner neu. Öffne dann OnionShare und klicke auf das "
"„⚙“-Symbol. Unter „Wie soll sich OnionShare mit Tor verbinden?“ wähle "
@@ -495,3 +632,46 @@ msgstr ""
#~ " zuerst die intergrierten „obfs4 pluggable"
#~ " transports“ probieren."
+#~ msgid ""
+#~ "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 ""
+#~ "Lege fest, wie OnionShare sich mit "
+#~ "Tor verbinden soll, indem du auf "
+#~ "das „⚙“-Symbol am unteren rechten Rand"
+#~ " vom OnionShare-Fenster klickst, um "
+#~ "die entsprechenden Einstellungen zu sehen."
+
+#~ msgid "Getting Around Censorship"
+#~ msgstr ""
+
+#~ 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 ""
+#~ "Falls dein Internetzugang zensiert wird, "
+#~ "kannst du OnionShare so konfigurieren, "
+#~ "dass es sich mit dem Tor-Netzwerk"
+#~ " verbindet, indem du `Tor-Bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_ "
+#~ "benutzt. Wenn OnionShare sich ohne eine"
+#~ " Brücke mit Tor verbindet, brauchst "
+#~ "du keine Brücke zu benutzen."
+
+#~ 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 ""
+
diff --git a/docs/source/locale/el/LC_MESSAGES/security.po b/docs/source/locale/el/LC_MESSAGES/security.po
index 052b9afe..73db03ec 100644
--- a/docs/source/locale/el/LC_MESSAGES/security.po
+++ b/docs/source/locale/el/LC_MESSAGES/security.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2021-10-10 10:03+0000\n"
"Last-Translator: george kitsoukakis <norhorn@gmail.com>\n"
"Language: el\n"
"Language-Team: el <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/security.rst:2
msgid "Security Design"
@@ -83,7 +83,7 @@ msgstr ""
#: ../../source/security.rst:28
#, fuzzy
msgid ""
-"**If an attacker learns about the onion service, it still can't access "
+"**If an attacker learns about the onion service, they still can't access "
"anything.** Prior attacks against the Tor network to enumerate onion "
"services allowed attackers to discover private ``.onion`` addresses. To "
"access an OnionShare service from its address, the private key used for "
diff --git a/docs/source/locale/el/LC_MESSAGES/tor.po b/docs/source/locale/el/LC_MESSAGES/tor.po
index 8feef3eb..f7e9f6fe 100644
--- a/docs/source/locale/el/LC_MESSAGES/tor.po
+++ b/docs/source/locale/el/LC_MESSAGES/tor.po
@@ -7,37 +7,184 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2022-01-20 11:57+0000\n"
"Last-Translator: george kitsoukakis <norhorn@gmail.com>\n"
"Language: el\n"
"Language-Team: el <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
msgstr "Σύνδεση στο Tor"
-#: ../../source/tor.rst:6
-#, fuzzy
+#: ../../source/tor.rst:4
+msgid ""
+"When OnionShare starts, it will show you a screen asking you to connect "
+"to the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:8
msgid ""
-"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."
+"You can toggle on the switch \"Connect to Tor automatically\" before "
+"clicking \"Connect to Tor\". This means that next time OnionShare starts,"
+" it will automatically connect with its Tor connection settings from the "
+"last session, instead of presenting you with the connection options. If "
+"the connection fails, you can still try bridges or reconfigure Tor via "
+"the \"Network Settings\" button."
msgstr ""
-"Επιλέξτε τον τρόπο σύνδεσης του OnionShare με το Tor, κάνοντας κλικ στο "
-"εικονίδιο του Tor κάτω δεξιά στο παράθυρο του OnionShare για να ανοίξει η"
-" καρτέλα των ρυθμίσεων."
#: ../../source/tor.rst:11
+msgid ""
+"You can click \"Connect to Tor\" to begin the connection process. If "
+"there are no problems with your network, including any attempts to block "
+"your access to the Tor network, this should hopefully work the first "
+"time."
+msgstr ""
+
+#: ../../source/tor.rst:13
+msgid ""
+"Or, if you want to manually configure Bridges or other Tor settings "
+"before you connect, you can click \"Network Settings\"."
+msgstr ""
+
+#: ../../source/tor.rst:16
+msgid "Automatic censorship circumvention"
+msgstr ""
+
+#: ../../source/tor.rst:18
+msgid ""
+"When you click \"Connect to Tor\", if OnionShare fails to connect, it "
+"might be because Tor is censored in your country or on your local "
+"network."
+msgstr ""
+
+#: ../../source/tor.rst:20
+msgid "If this occurs, you will have these choices:"
+msgstr ""
+
+#: ../../source/tor.rst:22
+msgid "Try again without a bridge"
+msgstr ""
+
+#: ../../source/tor.rst:23
+msgid "Automatically determine my country from my IP address for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:24
+msgid "Manually select my country for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:28
+msgid ""
+"If you choose the \"Try again without a bridge\" option, OnionShare will "
+"retry connecting to Tor like normal, without attempting to bypass "
+"censorship."
+msgstr ""
+
+#: ../../source/tor.rst:30
+msgid ""
+"The other two options will attempt to automatically bypass censorship "
+"using Tor bridges. If your network provider is blocking access to the Tor"
+" network, you can hopefully still connect to a Tor bridge, which will "
+"then connect you to the Tor network, circumventing the censorship. Both "
+"of these options use the Tor Project's Censorship Circumvention API to "
+"provide you with bridge settings that should work for you. OnionShare "
+"will temporarily use the `Meek "
+"<https://gitlab.torproject.org/legacy/trac/-/wikis/doc/meek/>`_ domain-"
+"fronting proxy to make a non-Tor connection from your computer to Tor's "
+"Censorship Circumvention API. The Meek proxy hides the fact that you are "
+"trying to find a way to connect to Tor."
+msgstr ""
+
+#: ../../source/tor.rst:36
+msgid ""
+"If you choose \"Automatically determine my country from my IP address for"
+" bridge settings\", the Censorship Circumvention API will consider your "
+"IP address (yes, your real IP address) to determine what country you "
+"might reside in. Based on the country information, the API will try to "
+"automatically find bridges that suit your location."
+msgstr ""
+
+#: ../../source/tor.rst:41
+msgid ""
+"If you choose \"Manually select my country for bridge settings\", the "
+"Censorship API will find the bridges that suit the country that you "
+"specified."
+msgstr ""
+
+#: ../../source/tor.rst:46
+msgid "How automatic censorship circumvention works"
+msgstr ""
+
+#: ../../source/tor.rst:48
+msgid ""
+"If the Censorship Circumvention API finds bridges that it believes will "
+"suit you, OnionShare will try to reconnect to Tor using those bridges. If"
+" the API does not find any bridges for your location, OnionShare will ask"
+" the API for \"fallback\" options, and then try to reconnect using those."
+msgstr ""
+
+#: ../../source/tor.rst:50
+msgid ""
+"If for some reason OnionShare fails to connect to the Censorship API "
+"itself, or if the API returns an error message, OnionShare will attempt "
+"to use the obfs4 built-in bridges."
+msgstr ""
+
+#: ../../source/tor.rst:52
+msgid ""
+"It's important to note that the requests to the Censorship Circumvention "
+"API do not go over the Tor network (because if you could connect to Tor "
+"already, you wouldn't need to connect to the API)."
+msgstr ""
+
+#: ../../source/tor.rst:54
+msgid ""
+"Even though it's hard for an adversary to discover where the Meek request"
+" is going, this may still be risky for some users. Therefore, it is an "
+"opt-in feature. The use of Meek and non-torified network requests are "
+"limited only to making one or two requests to the Censorship "
+"Circumvention API. Then Meek is stopped, and all further network requests"
+" happen over the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:56
+msgid ""
+"If you are uncomfortable with making a request that doesn't go over the "
+"Tor network, you can click \"Network Settings\" (or the Settings icon in "
+"the bottom right corner, followed by the Tor Settings tab in the screen "
+"that appears), and manually configure bridges. After you save any bridge "
+"settings, OnionShare will try to reconnect using those bridges."
+msgstr ""
+
+#: ../../source/tor.rst:59
+msgid "Manually configure Tor settings"
+msgstr ""
+
+#: ../../source/tor.rst:61
+msgid ""
+"You can get to the Tor settings by clicking \"Network Settings\" on the "
+"welcome screen, or by clicking the \"⚙\" icon in the bottom-right corner "
+"of the application, and then switch to the Tor Settings tab in the screen"
+" that appears."
+msgstr ""
+
+#: ../../source/tor.rst:65
+msgid ""
+"Here are the different ways you can configure OnionShare to connect to "
+"Tor:"
+msgstr ""
+
+#: ../../source/tor.rst:68
msgid "Use the Tor version built into OnionShare"
msgstr "Χρήση της έκδοσης Tor στο OnioShare"
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:70
msgid ""
"This is the default, simplest and most reliable way that OnionShare "
"connects to Tor. For this reason, it's recommended for most users."
@@ -45,7 +192,7 @@ msgstr ""
"Ο προεπιλεγμένος, απλούστερος και συχνότερος τρόπος σύνδεσης του "
"OnionShare με το Tor, όπου προτείνεται για τους περισσότερους χρήστες."
-#: ../../source/tor.rst:16
+#: ../../source/tor.rst:73
msgid ""
"When you open OnionShare, it launches an already configured ``tor`` "
"process in the background for OnionShare to use. It doesn't interfere "
@@ -57,32 +204,21 @@ msgstr ""
"υπολογιστή σας, οπότε μπορείτε να χρησιμοποιήσετε το Tor Browser ή το "
"σύστημα ``tor`` ξεχωριστά."
-#: ../../source/tor.rst:20
-msgid "Getting Around Censorship"
-msgstr "Παράκαμψη της λογοκρισίας"
-
-#: ../../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-"
-"manual.torproject.org/bridges/>`_. If OnionShare connects to Tor without "
-"one, you don't need to use a bridge."
+#: ../../source/tor.rst:76
+msgid "**Using bridges**"
msgstr ""
-"Εάν λογοκρίνεται η πρόσβασή σας στο Διαδίκτυο, μπορείτε να ρυθμίσετε το "
-"OnionShare να συνδέεται με χρήση των `Tor bridges <https://tb-"
-"manual.torproject.org/bridges/>`_. Εάν το OnionShare συνδέεται απευθείας "
-"στο Tor, δεν χρειάζεται να χρησιμοποιήσετε μια γέφυρα."
-#: ../../source/tor.rst:24
+#: ../../source/tor.rst:78
+#, fuzzy
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."
+"To use a bridge, you must select \"Use the Tor version built into "
+"OnionShare\" and check the \"Use a bridge\" checkbox."
msgstr ""
"Για χρήση γέφυρας, ανοίξτε την καρτέλα ρυθμίσεων του Tor. Επιλέξτε το "
"\"Χρήση της έκδοσης Tor με το OnionShare\" και επιλέξτε το \"Χρήση "
"γέφυρας\"."
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:80
msgid ""
"Try using a built-in bridge first. Using `obfs4` or `snowflake` bridges "
"is recommended over using `meek-azure`."
@@ -90,7 +226,7 @@ msgstr ""
"Δοκιμάστε αρχικά μια ενσωματωμένη γέφυρα. Η χρήση των γεφυρών `obfs4` ή "
"`snowflake` προτείνονται με χρήση του `meek-azure`."
-#: ../../source/tor.rst:31
+#: ../../source/tor.rst:84
msgid ""
"If using a built-in bridge doesn't work, you can request a bridge from "
"torproject.org. You will have to solve a CAPTCHA in order to request a "
@@ -102,7 +238,7 @@ msgstr ""
"αίτηση της γέφυρας. (Με αυτό τον τρόπο καθίσταται δυσκολότερο για τις "
"κυβερνήσεις και παρόχους να μπλοκάρουν τις γέφυρες του Tor)."
-#: ../../source/tor.rst:35
+#: ../../source/tor.rst:88
msgid ""
"You also have the option of using a bridge that you learned about from a "
"trusted source."
@@ -110,11 +246,11 @@ msgstr ""
"Μπορείτε να χρησιμοποιήσετε μια γέφυρα που ήδη γνωρίσετε από μια έμπιστη "
"πηγή."
-#: ../../source/tor.rst:38
+#: ../../source/tor.rst:91
msgid "Attempt auto-configuration with Tor Browser"
msgstr "Αυτόματη ρύθμιση με Tor Browser"
-#: ../../source/tor.rst:40
+#: ../../source/tor.rst:93
msgid ""
"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
"and don't want two ``tor`` processes running, you can use the ``tor`` "
@@ -127,11 +263,11 @@ msgstr ""
"ότι πρέπει να διατηρήσετε το Tor Browser ανοιχτό στο παρασκήνιο ενώ "
"χρησιμοποιείτε το OnionShare."
-#: ../../source/tor.rst:44
+#: ../../source/tor.rst:97
msgid "Using a system ``tor`` in Windows"
msgstr "Χρήση του συστήματος ``tor`` σε Windows"
-#: ../../source/tor.rst:46
+#: ../../source/tor.rst:99
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
@@ -139,7 +275,7 @@ msgstr ""
"Είναι αρκετά προχωρημένο. Θα πρέπει να γνωρίζετε επεξεργασία αρχείων "
"απλού κειμένου και να μπορείτε να κάνετε εργασίες ως διαχειριστής."
-#: ../../source/tor.rst:48
+#: ../../source/tor.rst:101
msgid ""
"Download the Tor Windows Expert Bundle `from "
"<https://www.torproject.org/download/tor/>`_. Extract the compressed file"
@@ -151,7 +287,7 @@ msgstr ""
"αντιγράψτε το στο φάκελο ``C:\\Program Files (x86)\\`` μετονομάστε το "
"φάκελο με περιεχόμενα τα ``Data`` και ``Tor`` σε ``tor-win32``."
-#: ../../source/tor.rst:52
+#: ../../source/tor.rst:105
msgid ""
"Make up a control port password. (Using 7 words in a sequence like "
"``comprised stumble rummage work avenging construct volatile`` is a good "
@@ -166,7 +302,7 @@ msgstr ""
"χρησιμοποιήστε το ``tor. exe --hash-password`` για τη δημιουργία ενός "
"αναγνωριστικού του κωδικού πρόσβασής σας. Για παράδειγμα::"
-#: ../../source/tor.rst:59
+#: ../../source/tor.rst:112
msgid ""
"The hashed password output is displayed after some warnings (which you "
"can ignore). In the case of the above example, it is "
@@ -177,7 +313,7 @@ msgstr ""
"παράδειγμα, εμφανίζεται "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:114
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
"win32\\torrc`` and put your hashed password output in it, replacing the "
@@ -187,7 +323,7 @@ msgstr ""
"win32\\torrc`` και προσθέστε το αναγνωριστικό του κωδικού πρόσβασης, "
"αντικαθιστώντας το ``HashedControlPassword`` με αυτό που δημιουργήθηκε::"
-#: ../../source/tor.rst:66
+#: ../../source/tor.rst:119
msgid ""
"In your administrator command prompt, install ``tor`` as a service using "
"the appropriate ``torrc`` file you just created (as described in "
@@ -199,19 +335,20 @@ msgstr ""
"``torrc`` που μόλις δημιουργήσατε (όπως περιγράφεται σε "
"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Όπως::"
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:123
msgid "You are now running a system ``tor`` process in Windows!"
msgstr "Εκτελείτε πλέον μια υπηρεσία του συστήματος ``tor`` σε Windows!"
-#: ../../source/tor.rst:72
+#: ../../source/tor.rst:125
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
-"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
-"\"Tor authentication settings\" choose \"Password\" and set the password "
-"to the control port password you picked above. Click the \"Test "
-"Connection to Tor\" button. If all goes well, you should see \"Connected "
-"to the Tor controller\"."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using control port\", and set \"Control port\" to ``127.0.0.1``"
+" and \"Port\" to ``9051``. Under \"Tor authentication settings\" choose "
+"\"Password\" and set the password to the control port password you picked"
+" above. Click the \"Test Connection to Tor\" button. If all goes well, "
+"you should see \"Connected to the Tor controller\"."
msgstr ""
"Ανοίξτε το OnionShare και κάντε κλικ στο εικονίδιο \"⚙\". Κάτω από το "
"\"Πώς να συνδέεται το OnionShare με το Tor;'' επιλέξτε το \"Σύνδεση μέσω "
@@ -221,11 +358,11 @@ msgstr ""
"Κάντε κλικ στο κουμπί \"Έλεγχος της σύνδεσης με το Tor\". Εάν όλα είναι "
"σωστά θα δείτε το μήνυμα \"Εγινε σύνδεση με τον ελεγκτή Tor\"."
-#: ../../source/tor.rst:81
+#: ../../source/tor.rst:134
msgid "Using a system ``tor`` in macOS"
msgstr "Χρήση του συστήματος ``tor`` σε macOS"
-#: ../../source/tor.rst:83
+#: ../../source/tor.rst:136
msgid ""
"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it, and then install Tor::"
@@ -233,21 +370,23 @@ msgstr ""
"Εγκαταστήστε αρχικά το `Homebrew <https://brew.sh/>`_ εάν δεν το έχετε "
"ήδη. Στη συνέχεια εγκαταστήστε το Tor::"
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:140
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr "Ρυθμίστε το Tor ώστε να επιτρέπει τις συνδέσεις από το OnionShare::"
-#: ../../source/tor.rst:94
+#: ../../source/tor.rst:147
msgid "And start the system Tor service::"
msgstr "Και ξεκινήστε την υπηρεσία του συστήματος Tor::"
-#: ../../source/tor.rst:98
+#: ../../source/tor.rst:151
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
-"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
-"Under \"Tor authentication settings\" choose \"No authentication, or "
-"cookie authentication\". Click the \"Test Connection to Tor\" button."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using socket file\", and set the socket file to be "
+"``/usr/local/var/run/tor/control.socket``. Under \"Tor authentication "
+"settings\" choose \"No authentication, or cookie authentication\". Click "
+"the \"Test Connection to Tor\" button."
msgstr ""
"Ανοίξτε το OnionShare και κάντε κλικ στο εικονίδιο \"⚙\". Κάτω από το "
"\"Πώς να συνδέεται το OnionShare με το Tor;'' επιλέξτε το \"Σύνδεση μέσω "
@@ -256,17 +395,17 @@ msgstr ""
"επαλήθευσης Tor\" επιλέξτε \"Χωρίς επαλήθευση ή επαλήθευση με cookie\". "
"Κάντε κλικ στο κουμπί \"Έλεγχος σύνδεσης με το Tor\"."
-#: ../../source/tor.rst:104 ../../source/tor.rst:124
+#: ../../source/tor.rst:157 ../../source/tor.rst:177
msgid "If all goes well, you should see \"Connected to the Tor controller\"."
msgstr ""
"εάν όλα είναι σωστά θα δείτε το μήνυμα \"Εγινε σύνδεση με τον ελεγκτή "
"Tor\"."
-#: ../../source/tor.rst:107
+#: ../../source/tor.rst:160
msgid "Using a system ``tor`` in Linux"
msgstr "Χρήση του συστήματος ``tor`` σε Linux"
-#: ../../source/tor.rst:109
+#: ../../source/tor.rst:162
msgid ""
"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
"similar Linux distro, It is recommended to use the Tor Project's "
@@ -278,7 +417,7 @@ msgstr ""
"Project από το επίσημο αποθετήριο <https://support.torproject.org/apt"
"/tor-deb-repo/>`_."
-#: ../../source/tor.rst:111
+#: ../../source/tor.rst:164
msgid ""
"Next, add your user to the group that runs the ``tor`` process (in the "
"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
@@ -289,7 +428,7 @@ msgstr ""
"ρυθμίστε το OnionShare ώστε να συνδεθεί με το αρχείο μετάβασής σας στο "
"σύστημα ``tor``."
-#: ../../source/tor.rst:113
+#: ../../source/tor.rst:166
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
@@ -297,14 +436,15 @@ msgstr ""
"Προσθέστε τον χρήστη σας στην ομάδα ``debian-tor`` εκτελόντας την εντολή "
"(αντικαταστήστε το ``όνομα χρήστη`` με το δικό σας::"
-#: ../../source/tor.rst:117
+#: ../../source/tor.rst:170
+#, fuzzy
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."
+"Reboot your computer. After it boots up again, open OnionShare, click the"
+" \"⚙\" icon in it, and switch to the Tor Settings tab. Under \"How should"
+" OnionShare connect to Tor?\" choose \"Connect using socket file\". Set "
+"the socket file to be ``/var/run/tor/control``. Under \"Tor "
+"authentication settings\" choose \"No authentication, or cookie "
+"authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
"Επανεκκινήστε τον υπολογιστή σας. Ανοίξτε το OnionShare και κάντε κλικ "
"στο εικονίδιο \"⚙\". Κάτω από το \"Πώς να συνδέεται το OnionShare με το "
@@ -561,3 +701,37 @@ msgstr ""
#~ "πρέπει να χρησιμοποιήσετε μια γέφυρα, "
#~ "δοκιμάστε πρώτα τις obfs4."
+#~ msgid ""
+#~ "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 ""
+#~ "Επιλέξτε τον τρόπο σύνδεσης του "
+#~ "OnionShare με το Tor, κάνοντας κλικ "
+#~ "στο εικονίδιο του Tor κάτω δεξιά "
+#~ "στο παράθυρο του OnionShare για να "
+#~ "ανοίξει η καρτέλα των ρυθμίσεων."
+
+#~ msgid "Getting Around Censorship"
+#~ msgstr "Παράκαμψη της λογοκρισίας"
+
+#~ 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 ""
+#~ "Εάν λογοκρίνεται η πρόσβασή σας στο "
+#~ "Διαδίκτυο, μπορείτε να ρυθμίσετε το "
+#~ "OnionShare να συνδέεται με χρήση των "
+#~ "`Tor bridges <https://tb-"
+#~ "manual.torproject.org/bridges/>`_. Εάν το OnionShare"
+#~ " συνδέεται απευθείας στο Tor, δεν "
+#~ "χρειάζεται να χρησιμοποιήσετε μια γέφυρα."
+
diff --git a/docs/source/locale/en/LC_MESSAGES/security.po b/docs/source/locale/en/LC_MESSAGES/security.po
index bc2529ae..4832f4be 100644
--- a/docs/source/locale/en/LC_MESSAGES/security.po
+++ b/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: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/security.rst:2
msgid "Security Design"
@@ -65,7 +65,7 @@ msgstr ""
#: ../../source/security.rst:28
msgid ""
-"**If an attacker learns about the onion service, it still can't access "
+"**If an attacker learns about the onion service, they still can't access "
"anything.** Prior attacks against the Tor network to enumerate onion "
"services allowed attackers to discover private ``.onion`` addresses. To "
"access an OnionShare service from its address, the private key used for "
@@ -412,3 +412,18 @@ msgstr ""
#~ "anonymity is a goal."
#~ 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 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 ""
+
diff --git a/docs/source/locale/en/LC_MESSAGES/tor.po b/docs/source/locale/en/LC_MESSAGES/tor.po
index 4bab1145..2a65b559 100644
--- a/docs/source/locale/en/LC_MESSAGES/tor.po
+++ b/docs/source/locale/en/LC_MESSAGES/tor.po
@@ -8,69 +8,212 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
msgstr ""
-#: ../../source/tor.rst:6
+#: ../../source/tor.rst:4
msgid ""
-"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."
+"When OnionShare starts, it will show you a screen asking you to connect "
+"to the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:8
+msgid ""
+"You can toggle on the switch \"Connect to Tor automatically\" before "
+"clicking \"Connect to Tor\". This means that next time OnionShare starts,"
+" it will automatically connect with its Tor connection settings from the "
+"last session, instead of presenting you with the connection options. If "
+"the connection fails, you can still try bridges or reconfigure Tor via "
+"the \"Network Settings\" button."
msgstr ""
#: ../../source/tor.rst:11
-msgid "Use the Tor version built into OnionShare"
+msgid ""
+"You can click \"Connect to Tor\" to begin the connection process. If "
+"there are no problems with your network, including any attempts to block "
+"your access to the Tor network, this should hopefully work the first "
+"time."
msgstr ""
#: ../../source/tor.rst:13
msgid ""
-"This is the default, simplest and most reliable way that OnionShare "
-"connects to Tor. For this reason, it's recommended for most users."
+"Or, if you want to manually configure Bridges or other Tor settings "
+"before you connect, you can click \"Network Settings\"."
msgstr ""
#: ../../source/tor.rst:16
+msgid "Automatic censorship circumvention"
+msgstr ""
+
+#: ../../source/tor.rst:18
msgid ""
-"When you 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."
+"When you click \"Connect to Tor\", if OnionShare fails to connect, it "
+"might be because Tor is censored in your country or on your local "
+"network."
msgstr ""
#: ../../source/tor.rst:20
-msgid "Getting Around Censorship"
+msgid "If this occurs, you will have these choices:"
msgstr ""
#: ../../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-"
-"manual.torproject.org/bridges/>`_. If OnionShare connects to Tor without "
-"one, you don't need to use a bridge."
+msgid "Try again without a bridge"
+msgstr ""
+
+#: ../../source/tor.rst:23
+msgid "Automatically determine my country from my IP address for bridge settings"
msgstr ""
#: ../../source/tor.rst:24
+msgid "Manually select my country for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:28
+msgid ""
+"If you choose the \"Try again without a bridge\" option, OnionShare will "
+"retry connecting to Tor like normal, without attempting to bypass "
+"censorship."
+msgstr ""
+
+#: ../../source/tor.rst:30
+msgid ""
+"The other two options will attempt to automatically bypass censorship "
+"using Tor bridges. If your network provider is blocking access to the Tor"
+" network, you can hopefully still connect to a Tor bridge, which will "
+"then connect you to the Tor network, circumventing the censorship. Both "
+"of these options use the Tor Project's Censorship Circumvention API to "
+"provide you with bridge settings that should work for you. OnionShare "
+"will temporarily use the `Meek "
+"<https://gitlab.torproject.org/legacy/trac/-/wikis/doc/meek/>`_ domain-"
+"fronting proxy to make a non-Tor connection from your computer to Tor's "
+"Censorship Circumvention API. The Meek proxy hides the fact that you are "
+"trying to find a way to connect to Tor."
+msgstr ""
+
+#: ../../source/tor.rst:36
+msgid ""
+"If you choose \"Automatically determine my country from my IP address for"
+" bridge settings\", the Censorship Circumvention API will consider your "
+"IP address (yes, your real IP address) to determine what country you "
+"might reside in. Based on the country information, the API will try to "
+"automatically find bridges that suit your location."
+msgstr ""
+
+#: ../../source/tor.rst:41
+msgid ""
+"If you choose \"Manually select my country for bridge settings\", the "
+"Censorship API will find the bridges that suit the country that you "
+"specified."
+msgstr ""
+
+#: ../../source/tor.rst:46
+msgid "How automatic censorship circumvention works"
+msgstr ""
+
+#: ../../source/tor.rst:48
+msgid ""
+"If the Censorship Circumvention API finds bridges that it believes will "
+"suit you, OnionShare will try to reconnect to Tor using those bridges. If"
+" the API does not find any bridges for your location, OnionShare will ask"
+" the API for \"fallback\" options, and then try to reconnect using those."
+msgstr ""
+
+#: ../../source/tor.rst:50
+msgid ""
+"If for some reason OnionShare fails to connect to the Censorship API "
+"itself, or if the API returns an error message, OnionShare will attempt "
+"to use the obfs4 built-in bridges."
+msgstr ""
+
+#: ../../source/tor.rst:52
+msgid ""
+"It's important to note that the requests to the Censorship Circumvention "
+"API do not go over the Tor network (because if you could connect to Tor "
+"already, you wouldn't need to connect to the API)."
+msgstr ""
+
+#: ../../source/tor.rst:54
+msgid ""
+"Even though it's hard for an adversary to discover where the Meek request"
+" is going, this may still be risky for some users. Therefore, it is an "
+"opt-in feature. The use of Meek and non-torified network requests are "
+"limited only to making one or two requests to the Censorship "
+"Circumvention API. Then Meek is stopped, and all further network requests"
+" happen over the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:56
+msgid ""
+"If you are uncomfortable with making a request that doesn't go over the "
+"Tor network, you can click \"Network Settings\" (or the Settings icon in "
+"the bottom right corner, followed by the Tor Settings tab in the screen "
+"that appears), and manually configure bridges. After you save any bridge "
+"settings, OnionShare will try to reconnect using those bridges."
+msgstr ""
+
+#: ../../source/tor.rst:59
+msgid "Manually configure Tor settings"
+msgstr ""
+
+#: ../../source/tor.rst:61
+msgid ""
+"You can get to the Tor settings by clicking \"Network Settings\" on the "
+"welcome screen, or by clicking the \"⚙\" icon in the bottom-right corner "
+"of the application, and then switch to the Tor Settings tab in the screen"
+" that appears."
+msgstr ""
+
+#: ../../source/tor.rst:65
+msgid ""
+"Here are the different ways you can configure OnionShare to connect to "
+"Tor:"
+msgstr ""
+
+#: ../../source/tor.rst:68
+msgid "Use the Tor version built into OnionShare"
+msgstr ""
+
+#: ../../source/tor.rst:70
+msgid ""
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
+msgstr ""
+
+#: ../../source/tor.rst:73
+msgid ""
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
+msgstr ""
+
+#: ../../source/tor.rst:76
+msgid "**Using bridges**"
+msgstr ""
+
+#: ../../source/tor.rst:78
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."
+"To use a bridge, you must select \"Use the Tor version built into "
+"OnionShare\" and check the \"Use a bridge\" checkbox."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:80
msgid ""
"Try using a built-in bridge first. Using `obfs4` or `snowflake` bridges "
"is recommended over using `meek-azure`."
msgstr ""
-#: ../../source/tor.rst:31
+#: ../../source/tor.rst:84
msgid ""
"If using a built-in bridge doesn't work, you can request a bridge from "
"torproject.org. You will have to solve a CAPTCHA in order to request a "
@@ -78,17 +221,17 @@ msgid ""
"access to Tor bridges.)"
msgstr ""
-#: ../../source/tor.rst:35
+#: ../../source/tor.rst:88
msgid ""
"You also have the option of using a bridge that you learned about from a "
"trusted source."
msgstr ""
-#: ../../source/tor.rst:38
+#: ../../source/tor.rst:91
msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:40
+#: ../../source/tor.rst:93
msgid ""
"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
"and don't want two ``tor`` processes running, you can use the ``tor`` "
@@ -96,17 +239,17 @@ msgid ""
"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:44
+#: ../../source/tor.rst:97
msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:46
+#: ../../source/tor.rst:99
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:48
+#: ../../source/tor.rst:101
msgid ""
"Download the Tor Windows Expert Bundle `from "
"<https://www.torproject.org/download/tor/>`_. Extract the compressed file"
@@ -114,7 +257,7 @@ msgid ""
"the extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:52
+#: ../../source/tor.rst:105
msgid ""
"Make up a control port password. (Using 7 words in a sequence like "
"``comprised stumble rummage work avenging construct volatile`` is a good "
@@ -123,21 +266,21 @@ msgid ""
"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:59
+#: ../../source/tor.rst:112
msgid ""
"The hashed password output is displayed after some warnings (which you "
"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:114
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:66
+#: ../../source/tor.rst:119
msgid ""
"In your administrator command prompt, install ``tor`` as a service using "
"the appropriate ``torrc`` file you just created (as described in "
@@ -145,57 +288,58 @@ msgid ""
"this::"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:123
msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:72
+#: ../../source/tor.rst:125
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
-"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
-"\"Tor authentication settings\" choose \"Password\" and set the password "
-"to the control port password you picked above. Click the \"Test "
-"Connection to Tor\" button. If all goes well, you should see \"Connected "
-"to the Tor controller\"."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using control port\", and set \"Control port\" to ``127.0.0.1``"
+" and \"Port\" to ``9051``. Under \"Tor authentication settings\" choose "
+"\"Password\" and set the password to the control port password you picked"
+" above. Click the \"Test Connection to Tor\" button. If all goes well, "
+"you should see \"Connected to the Tor controller\"."
msgstr ""
-#: ../../source/tor.rst:81
+#: ../../source/tor.rst:134
msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:83
+#: ../../source/tor.rst:136
msgid ""
"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it, and then install Tor::"
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:140
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:94
+#: ../../source/tor.rst:147
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:98
+#: ../../source/tor.rst:151
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
-"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
-"Under \"Tor authentication settings\" choose \"No authentication, or "
-"cookie authentication\". Click the \"Test Connection to Tor\" button."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using socket file\", and set the socket file to be "
+"``/usr/local/var/run/tor/control.socket``. Under \"Tor authentication "
+"settings\" choose \"No authentication, or cookie authentication\". Click "
+"the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:104 ../../source/tor.rst:124
+#: ../../source/tor.rst:157 ../../source/tor.rst:177
msgid "If all goes well, you should see \"Connected to the Tor controller\"."
msgstr ""
-#: ../../source/tor.rst:107
+#: ../../source/tor.rst:160
msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:109
+#: ../../source/tor.rst:162
msgid ""
"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
"similar Linux distro, It is recommended to use the Tor Project's "
@@ -203,27 +347,27 @@ msgid ""
"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:111
+#: ../../source/tor.rst:164
msgid ""
"Next, add your user to the group that runs the ``tor`` process (in the "
"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:113
+#: ../../source/tor.rst:166
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:117
+#: ../../source/tor.rst:170
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."
+"Reboot your computer. After it boots up again, open OnionShare, click the"
+" \"⚙\" icon in it, and switch to the Tor Settings tab. Under \"How should"
+" OnionShare connect to Tor?\" choose \"Connect using socket file\". Set "
+"the socket file to be ``/var/run/tor/control``. Under \"Tor "
+"authentication settings\" choose \"No authentication, or cookie "
+"authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
@@ -517,3 +661,75 @@ msgstr ""
#~ "Tor Settings tab."
#~ msgstr ""
+#~ msgid ""
+#~ "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 ""
+
+#~ msgid "Getting Around Censorship"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
diff --git a/docs/source/locale/es/LC_MESSAGES/security.po b/docs/source/locale/es/LC_MESSAGES/security.po
index 6ebd67f5..21c8fe15 100644
--- a/docs/source/locale/es/LC_MESSAGES/security.po
+++ b/docs/source/locale/es/LC_MESSAGES/security.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2021-09-28 02:35+0000\n"
"Last-Translator: carlosm2 <carlosm2@riseup.net>\n"
"Language: es\n"
"Language-Team: none\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/security.rst:2
msgid "Security Design"
@@ -83,7 +83,7 @@ msgstr ""
#: ../../source/security.rst:28
#, fuzzy
msgid ""
-"**If an attacker learns about the onion service, it still can't access "
+"**If an attacker learns about the onion service, they still can't access "
"anything.** Prior attacks against the Tor network to enumerate onion "
"services allowed attackers to discover private ``.onion`` addresses. To "
"access an OnionShare service from its address, the private key used for "
diff --git a/docs/source/locale/es/LC_MESSAGES/tor.po b/docs/source/locale/es/LC_MESSAGES/tor.po
index 10cbfd21..f9e29fb7 100644
--- a/docs/source/locale/es/LC_MESSAGES/tor.po
+++ b/docs/source/locale/es/LC_MESSAGES/tor.po
@@ -7,37 +7,184 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2022-01-20 11:57+0000\n"
"Last-Translator: Zuhualime Akoochimoya <zakooch@protonmail.ch>\n"
"Language: es\n"
"Language-Team: none\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
msgstr "Conectar a Tor"
-#: ../../source/tor.rst:6
-#, fuzzy
+#: ../../source/tor.rst:4
+msgid ""
+"When OnionShare starts, it will show you a screen asking you to connect "
+"to the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:8
msgid ""
-"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."
+"You can toggle on the switch \"Connect to Tor automatically\" before "
+"clicking \"Connect to Tor\". This means that next time OnionShare starts,"
+" it will automatically connect with its Tor connection settings from the "
+"last session, instead of presenting you with the connection options. If "
+"the connection fails, you can still try bridges or reconfigure Tor via "
+"the \"Network Settings\" button."
msgstr ""
-"Elige una manera de conectar OnionShare a Tor haciendo clic en el ícono "
-"cebolla de Tor, abajo a la derecha de la ventana OnionShare, para ir a "
-"sus ajustes."
#: ../../source/tor.rst:11
+msgid ""
+"You can click \"Connect to Tor\" to begin the connection process. If "
+"there are no problems with your network, including any attempts to block "
+"your access to the Tor network, this should hopefully work the first "
+"time."
+msgstr ""
+
+#: ../../source/tor.rst:13
+msgid ""
+"Or, if you want to manually configure Bridges or other Tor settings "
+"before you connect, you can click \"Network Settings\"."
+msgstr ""
+
+#: ../../source/tor.rst:16
+msgid "Automatic censorship circumvention"
+msgstr ""
+
+#: ../../source/tor.rst:18
+msgid ""
+"When you click \"Connect to Tor\", if OnionShare fails to connect, it "
+"might be because Tor is censored in your country or on your local "
+"network."
+msgstr ""
+
+#: ../../source/tor.rst:20
+msgid "If this occurs, you will have these choices:"
+msgstr ""
+
+#: ../../source/tor.rst:22
+msgid "Try again without a bridge"
+msgstr ""
+
+#: ../../source/tor.rst:23
+msgid "Automatically determine my country from my IP address for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:24
+msgid "Manually select my country for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:28
+msgid ""
+"If you choose the \"Try again without a bridge\" option, OnionShare will "
+"retry connecting to Tor like normal, without attempting to bypass "
+"censorship."
+msgstr ""
+
+#: ../../source/tor.rst:30
+msgid ""
+"The other two options will attempt to automatically bypass censorship "
+"using Tor bridges. If your network provider is blocking access to the Tor"
+" network, you can hopefully still connect to a Tor bridge, which will "
+"then connect you to the Tor network, circumventing the censorship. Both "
+"of these options use the Tor Project's Censorship Circumvention API to "
+"provide you with bridge settings that should work for you. OnionShare "
+"will temporarily use the `Meek "
+"<https://gitlab.torproject.org/legacy/trac/-/wikis/doc/meek/>`_ domain-"
+"fronting proxy to make a non-Tor connection from your computer to Tor's "
+"Censorship Circumvention API. The Meek proxy hides the fact that you are "
+"trying to find a way to connect to Tor."
+msgstr ""
+
+#: ../../source/tor.rst:36
+msgid ""
+"If you choose \"Automatically determine my country from my IP address for"
+" bridge settings\", the Censorship Circumvention API will consider your "
+"IP address (yes, your real IP address) to determine what country you "
+"might reside in. Based on the country information, the API will try to "
+"automatically find bridges that suit your location."
+msgstr ""
+
+#: ../../source/tor.rst:41
+msgid ""
+"If you choose \"Manually select my country for bridge settings\", the "
+"Censorship API will find the bridges that suit the country that you "
+"specified."
+msgstr ""
+
+#: ../../source/tor.rst:46
+msgid "How automatic censorship circumvention works"
+msgstr ""
+
+#: ../../source/tor.rst:48
+msgid ""
+"If the Censorship Circumvention API finds bridges that it believes will "
+"suit you, OnionShare will try to reconnect to Tor using those bridges. If"
+" the API does not find any bridges for your location, OnionShare will ask"
+" the API for \"fallback\" options, and then try to reconnect using those."
+msgstr ""
+
+#: ../../source/tor.rst:50
+msgid ""
+"If for some reason OnionShare fails to connect to the Censorship API "
+"itself, or if the API returns an error message, OnionShare will attempt "
+"to use the obfs4 built-in bridges."
+msgstr ""
+
+#: ../../source/tor.rst:52
+msgid ""
+"It's important to note that the requests to the Censorship Circumvention "
+"API do not go over the Tor network (because if you could connect to Tor "
+"already, you wouldn't need to connect to the API)."
+msgstr ""
+
+#: ../../source/tor.rst:54
+msgid ""
+"Even though it's hard for an adversary to discover where the Meek request"
+" is going, this may still be risky for some users. Therefore, it is an "
+"opt-in feature. The use of Meek and non-torified network requests are "
+"limited only to making one or two requests to the Censorship "
+"Circumvention API. Then Meek is stopped, and all further network requests"
+" happen over the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:56
+msgid ""
+"If you are uncomfortable with making a request that doesn't go over the "
+"Tor network, you can click \"Network Settings\" (or the Settings icon in "
+"the bottom right corner, followed by the Tor Settings tab in the screen "
+"that appears), and manually configure bridges. After you save any bridge "
+"settings, OnionShare will try to reconnect using those bridges."
+msgstr ""
+
+#: ../../source/tor.rst:59
+msgid "Manually configure Tor settings"
+msgstr ""
+
+#: ../../source/tor.rst:61
+msgid ""
+"You can get to the Tor settings by clicking \"Network Settings\" on the "
+"welcome screen, or by clicking the \"⚙\" icon in the bottom-right corner "
+"of the application, and then switch to the Tor Settings tab in the screen"
+" that appears."
+msgstr ""
+
+#: ../../source/tor.rst:65
+msgid ""
+"Here are the different ways you can configure OnionShare to connect to "
+"Tor:"
+msgstr ""
+
+#: ../../source/tor.rst:68
msgid "Use the Tor version built into OnionShare"
msgstr "Usa la versión de Tor incorporada dentro de OnionShare"
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:70
msgid ""
"This is the default, simplest and most reliable way that OnionShare "
"connects to Tor. For this reason, it's recommended for most users."
@@ -46,7 +193,7 @@ msgstr ""
" también es la más simple y confiable. Por esta razón se recomienda para "
"la mayoría de los usuarios."
-#: ../../source/tor.rst:16
+#: ../../source/tor.rst:73
msgid ""
"When you open OnionShare, it launches an already configured ``tor`` "
"process in the background for OnionShare to use. It doesn't interfere "
@@ -58,32 +205,21 @@ msgstr ""
"``tor`` en tu computadora, por lo que puedes usar el Navegador Tor, o el "
"``tor`` de sistema, por su cuenta."
-#: ../../source/tor.rst:20
-msgid "Getting Around Censorship"
-msgstr "Pasando por alto a la Censura"
-
-#: ../../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-"
-"manual.torproject.org/bridges/>`_. If OnionShare connects to Tor without "
-"one, you don't need to use a bridge."
+#: ../../source/tor.rst:76
+msgid "**Using bridges**"
msgstr ""
-"Si tu acceso a Internet está censurado, puedes configurar OnionShare para"
-" conectarse a la red Tor usando `puentes Tor <https://tb-"
-"manual.torproject.org/bridges/>`_. Si OnionShare se conecta exitosamente "
-"a Tor, no necesitas usar un puente."
-#: ../../source/tor.rst:24
+#: ../../source/tor.rst:78
+#, fuzzy
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."
+"To use a bridge, you must select \"Use the Tor version built into "
+"OnionShare\" and check the \"Use a bridge\" checkbox."
msgstr ""
"Para usar un puente, abre la pestaña de Configuraciones de Tor. Debes "
"seleccionar \"Usar la versión de Tor incorporada dentro de OnionShare\" y"
" marcar la casilla \"Usar un puente\"."
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:80
msgid ""
"Try using a built-in bridge first. Using `obfs4` or `snowflake` bridges "
"is recommended over using `meek-azure`."
@@ -91,7 +227,7 @@ msgstr ""
"Primero intenta usar un puente incorporado. Usar puentes `obfs4` o "
"`snowflake` es recomendado, en vez de usar `meek-azure`."
-#: ../../source/tor.rst:31
+#: ../../source/tor.rst:84
msgid ""
"If using a built-in bridge doesn't work, you can request a bridge from "
"torproject.org. You will have to solve a CAPTCHA in order to request a "
@@ -103,7 +239,7 @@ msgstr ""
"solicitar un puente. (Esto hace que sea más difícil a los gobiernos o "
"ISPs bloquear el acceso a los puentes Tor.)"
-#: ../../source/tor.rst:35
+#: ../../source/tor.rst:88
msgid ""
"You also have the option of using a bridge that you learned about from a "
"trusted source."
@@ -111,11 +247,11 @@ msgstr ""
"También tienes la opción de usar un puente del que te hayas enterado por "
"una fuente confiable."
-#: ../../source/tor.rst:38
+#: ../../source/tor.rst:91
msgid "Attempt auto-configuration with Tor Browser"
msgstr "Intentar configuración automática con el Navegador Tor"
-#: ../../source/tor.rst:40
+#: ../../source/tor.rst:93
msgid ""
"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
"and don't want two ``tor`` processes running, you can use the ``tor`` "
@@ -127,11 +263,11 @@ msgstr ""
" del Navegador Tor. Ten en cuenta que necesitas mantenerlo abierto en "
"segundo plano mientras estés usando OnionShare para que esto funcione."
-#: ../../source/tor.rst:44
+#: ../../source/tor.rst:97
msgid "Using a system ``tor`` in Windows"
msgstr "Usar un ``tor`` de sistema en Windows"
-#: ../../source/tor.rst:46
+#: ../../source/tor.rst:99
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
@@ -139,7 +275,7 @@ msgstr ""
"Esto es bastante avanzado. Necesitarás saber cómo editar archivos de "
"texto y hacer cosas como administrador."
-#: ../../source/tor.rst:48
+#: ../../source/tor.rst:101
msgid ""
"Download the Tor Windows Expert Bundle `from "
"<https://www.torproject.org/download/tor/>`_. Extract the compressed file"
@@ -152,7 +288,7 @@ msgstr ""
"Renombra la carpeta extraida con las subcarpetas ``Data`` y ``Tor`` en "
"ella a ``tor-win32``."
-#: ../../source/tor.rst:52
+#: ../../source/tor.rst:105
msgid ""
"Make up a control port password. (Using 7 words in a sequence like "
"``comprised stumble rummage work avenging construct volatile`` is a good "
@@ -166,7 +302,7 @@ msgstr ""
"comando (``cmd``) como administrador, y usa ``tor.exe --hash-password`` "
"para generar un hash de tu contraseña. Por ejemplo::"
-#: ../../source/tor.rst:59
+#: ../../source/tor.rst:112
msgid ""
"The hashed password output is displayed after some warnings (which you "
"can ignore). In the case of the above example, it is "
@@ -176,7 +312,7 @@ msgstr ""
" (que puedes ignorar). En el caso del ejemplo de arriba, es "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:114
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
"win32\\torrc`` and put your hashed password output in it, replacing the "
@@ -186,7 +322,7 @@ msgstr ""
"win32\\torrc`` y escríbelo en él, reemplazando el "
"``HashedControlPassword`` con el que acabas de generar:"
-#: ../../source/tor.rst:66
+#: ../../source/tor.rst:119
msgid ""
"In your administrator command prompt, install ``tor`` as a service using "
"the appropriate ``torrc`` file you just created (as described in "
@@ -199,19 +335,20 @@ msgstr ""
"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). De esta"
" manera::"
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:123
msgid "You are now running a system ``tor`` process in Windows!"
msgstr "¡Ahora estás ejecutando un proceso ``tor`` de sistema en Windows!"
-#: ../../source/tor.rst:72
+#: ../../source/tor.rst:125
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
-"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
-"\"Tor authentication settings\" choose \"Password\" and set the password "
-"to the control port password you picked above. Click the \"Test "
-"Connection to Tor\" button. If all goes well, you should see \"Connected "
-"to the Tor controller\"."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using control port\", and set \"Control port\" to ``127.0.0.1``"
+" and \"Port\" to ``9051``. Under \"Tor authentication settings\" choose "
+"\"Password\" and set the password to the control port password you picked"
+" above. Click the \"Test Connection to Tor\" button. If all goes well, "
+"you should see \"Connected to the Tor controller\"."
msgstr ""
"Abre OnionShare y haz clic en el ícono \"⚙\". Bajo \"¿Cómo debería "
"conectarse OnionShare a Tor?\", elige \"Conectar usando puerto de "
@@ -221,11 +358,11 @@ msgstr ""
"que elegiste arriba. Haz clic en el botón \"Probar Conexión a Tor\". Si "
"todo va bien, deberías ver \"Conectado al controlador Tor\"."
-#: ../../source/tor.rst:81
+#: ../../source/tor.rst:134
msgid "Using a system ``tor`` in macOS"
msgstr "Usar un ``tor`` de sistema en macOS"
-#: ../../source/tor.rst:83
+#: ../../source/tor.rst:136
msgid ""
"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it, and then install Tor::"
@@ -233,21 +370,23 @@ msgstr ""
"Primero, instala `Homebrew <http://brew.sh/>`_ si es que todavía no lo "
"tienes, y luego instala Tor::"
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:140
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr "Ahora configura Tor para permitir conexiones desde OnionShare::"
-#: ../../source/tor.rst:94
+#: ../../source/tor.rst:147
msgid "And start the system Tor service::"
msgstr "E inicia el servicio Tor de sistema::"
-#: ../../source/tor.rst:98
+#: ../../source/tor.rst:151
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
-"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
-"Under \"Tor authentication settings\" choose \"No authentication, or "
-"cookie authentication\". Click the \"Test Connection to Tor\" button."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using socket file\", and set the socket file to be "
+"``/usr/local/var/run/tor/control.socket``. Under \"Tor authentication "
+"settings\" choose \"No authentication, or cookie authentication\". Click "
+"the \"Test Connection to Tor\" button."
msgstr ""
"Abre OnionShare y haz clic en el ícono \"⚙\". Bajo \"¿Cómo debería "
"conectarse OnionShare a Tor?\", elige \"Conectar usando un archivo "
@@ -256,15 +395,15 @@ msgstr ""
"autenticación de Tor\", elige \"Sin autenticación, o autenticación por "
"cookies\". Haz clic en el botón \"Probar Conexión a Tor\"."
-#: ../../source/tor.rst:104 ../../source/tor.rst:124
+#: ../../source/tor.rst:157 ../../source/tor.rst:177
msgid "If all goes well, you should see \"Connected to the Tor controller\"."
msgstr "Si todo va bien, deberías ver \"Conectado al controlador Tor\"."
-#: ../../source/tor.rst:107
+#: ../../source/tor.rst:160
msgid "Using a system ``tor`` in Linux"
msgstr "Usando un ``tor`` de sistema en Linux"
-#: ../../source/tor.rst:109
+#: ../../source/tor.rst:162
msgid ""
"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
"similar Linux distro, It is recommended to use the Tor Project's "
@@ -276,7 +415,7 @@ msgstr ""
"oficial <https://support.torproject.org/apt/tor-deb-repo/>`_ del Tor "
"Project."
-#: ../../source/tor.rst:111
+#: ../../source/tor.rst:164
msgid ""
"Next, add your user to the group that runs the ``tor`` process (in the "
"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
@@ -286,7 +425,7 @@ msgstr ""
"caso de Debian y Ubuntu, ``debian-tor``) y configura OnionShare para "
"conectarse al archivo socket de control de tu ``tor`` de sistema."
-#: ../../source/tor.rst:113
+#: ../../source/tor.rst:166
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
@@ -294,14 +433,15 @@ msgstr ""
"Agrega tu usuario al grupo ``debian-tor`` ejecutando este comando "
"(reemplaza ``username`` con tu nombre de usuario real)::"
-#: ../../source/tor.rst:117
+#: ../../source/tor.rst:170
+#, fuzzy
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."
+"Reboot your computer. After it boots up again, open OnionShare, click the"
+" \"⚙\" icon in it, and switch to the Tor Settings tab. Under \"How should"
+" OnionShare connect to Tor?\" choose \"Connect using socket file\". Set "
+"the socket file to be ``/var/run/tor/control``. Under \"Tor "
+"authentication settings\" choose \"No authentication, or cookie "
+"authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
"Reinicia tu computadora. Luego del arranque, abre OnionShare y haz clic "
"en el ícono \"⚙\". Bajo \"¿Cómo debería conectarse OnionShare a Tor?\", "
@@ -496,3 +636,37 @@ msgstr ""
#~ "necesitas usar un puente, intenta "
#~ "primero con los obfs4 incorporados."
+#~ msgid ""
+#~ "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 ""
+#~ "Elige una manera de conectar OnionShare"
+#~ " a Tor haciendo clic en el "
+#~ "ícono cebolla de Tor, abajo a la"
+#~ " derecha de la ventana OnionShare, "
+#~ "para ir a sus ajustes."
+
+#~ msgid "Getting Around Censorship"
+#~ msgstr "Pasando por alto a la Censura"
+
+#~ 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 ""
+#~ "Si tu acceso a Internet está "
+#~ "censurado, puedes configurar OnionShare para"
+#~ " conectarse a la red Tor usando "
+#~ "`puentes Tor <https://tb-"
+#~ "manual.torproject.org/bridges/>`_. Si OnionShare se"
+#~ " conecta exitosamente a Tor, no "
+#~ "necesitas usar un puente."
+
diff --git a/docs/source/locale/fr/LC_MESSAGES/security.po b/docs/source/locale/fr/LC_MESSAGES/security.po
index cc2320e6..95e90dc0 100644
--- a/docs/source/locale/fr/LC_MESSAGES/security.po
+++ b/docs/source/locale/fr/LC_MESSAGES/security.po
@@ -7,17 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2021-03-10 10:02+0000\n"
"Last-Translator: AO Localisation Lab <ao@localizationlab.org>\n"
-"Language-Team: none\n"
"Language: fr\n"
+"Language-Team: none\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.12.1\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/security.rst:2
msgid "Security Design"
@@ -84,8 +83,9 @@ msgstr ""
"de l’utilisateur d’OnionShare."
#: ../../source/security.rst:28
+#, fuzzy
msgid ""
-"**If an attacker learns about the onion service, it still can't access "
+"**If an attacker learns about the onion service, they still can't access "
"anything.** Prior attacks against the Tor network to enumerate onion "
"services allowed attackers to discover private ``.onion`` addresses. To "
"access an OnionShare service from its address, the private key used for "
@@ -93,14 +93,14 @@ msgid ""
" public by turning off the private key -- see "
":ref:`turn_off_private_key`)."
msgstr ""
-"** Si un assaillant prend connaissance du service oignon, il ne peut quand "
-"même accéder à rien.** Les attaques précédentes contre le réseau Tor pour "
-"énumérer les services oignon ont permis à l’attaquant de découvrir des "
-"adresses ``.onion`` privées. Si une attaque découvre une adresse OnionShare "
-"privée, afin d’y accéder, l’assaillant devra aussi deviner la clé privée "
-"utilisée pour l’authentification client (à moins que l’utilisateur d’"
-"OnionShare choisisse de rendre son service public en désactivant la clé "
-"privée -- voir :ref:`turn_off_private_key`)."
+"** Si un assaillant prend connaissance du service oignon, il ne peut "
+"quand même accéder à rien.** Les attaques précédentes contre le réseau "
+"Tor pour énumérer les services oignon ont permis à l’attaquant de "
+"découvrir des adresses ``.onion`` privées. Si une attaque découvre une "
+"adresse OnionShare privée, afin d’y accéder, l’assaillant devra aussi "
+"deviner la clé privée utilisée pour l’authentification client (à moins "
+"que l’utilisateur d’OnionShare choisisse de rendre son service public en "
+"désactivant la clé privée -- voir :ref:`turn_off_private_key`)."
#: ../../source/security.rst:33
msgid "What OnionShare doesn't protect against"
@@ -122,15 +122,15 @@ msgid ""
msgstr ""
"**Communiquer l’adresse OnionShare et la clé privée pourrait être "
"dangereux.** La communication de l’adresse OnionShare à autrui est la "
-"responsabilité de l’utilisateur d’OnionShare. Si elle est envoyée de façon "
-"non sécurisée (par exemple par un courriel surveillé par un assaillant), une "
-"oreille indiscrète peut en déduire qu’OnionShare est utilisé. Si la personne "
-"qui surveille charge l’adresse dans le Navigateur Tor alors que le service "
-"est encore en fonction, elle peut y accéder. Pour éviter cela, l’adresse "
-"doit être communiquée de façon sécurisée, par un texto chiffré (probablement "
-"avec les messages éphémères activés), un courriel chiffré ou en personne. "
-"Cela n’est pas nécessaire si OnionShare est utilisé pour quelque chose qui n’"
-"est pas secret."
+"responsabilité de l’utilisateur d’OnionShare. Si elle est envoyée de "
+"façon non sécurisée (par exemple par un courriel surveillé par un "
+"assaillant), une oreille indiscrète peut en déduire qu’OnionShare est "
+"utilisé. Si la personne qui surveille charge l’adresse dans le Navigateur"
+" Tor alors que le service est encore en fonction, elle peut y accéder. "
+"Pour éviter cela, l’adresse doit être communiquée de façon sécurisée, par"
+" un texto chiffré (probablement avec les messages éphémères activés), un "
+"courriel chiffré ou en personne. Cela n’est pas nécessaire si OnionShare "
+"est utilisé pour quelque chose qui n’est pas secret."
#: ../../source/security.rst:42
#, fuzzy
@@ -142,11 +142,11 @@ msgid ""
" unless anonymity is a goal."
msgstr ""
"**Communiquer l’adresse OnionShare et la clé privée pourrait ne pas être "
-"anonyme.** Des précautions supplémentaires doivent être prises pour faire en "
-"sorte que l’adresse OnionShare est communiquée anonymement. Un nouveau "
-"compte de courriel ou de dialogue en ligne auquel vous n’accédez que par Tor "
-"peut être utilisé pour partager l’adresse. Ce n’est pas nécessaire, à moins "
-"que l’anonymat ne soit l’objectif."
+"anonyme.** Des précautions supplémentaires doivent être prises pour faire"
+" en sorte que l’adresse OnionShare est communiquée anonymement. Un "
+"nouveau compte de courriel ou de dialogue en ligne auquel vous n’accédez "
+"que par Tor peut être utilisé pour partager l’adresse. Ce n’est pas "
+"nécessaire, à moins que l’anonymat ne soit l’objectif."
#~ msgid "Security design"
#~ msgstr ""
diff --git a/docs/source/locale/fr/LC_MESSAGES/tor.po b/docs/source/locale/fr/LC_MESSAGES/tor.po
index 73767f25..6d884fe3 100644
--- a/docs/source/locale/fr/LC_MESSAGES/tor.po
+++ b/docs/source/locale/fr/LC_MESSAGES/tor.po
@@ -7,39 +7,184 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2021-10-22 20:45+0000\n"
"Last-Translator: aezjrareareare <jeromechaland@riseup.net>\n"
"Language: fr\n"
"Language-Team: none\n"
-"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.12.1\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
msgstr "Connexion à Tor"
-#: ../../source/tor.rst:6
-#, fuzzy
+#: ../../source/tor.rst:4
+msgid ""
+"When OnionShare starts, it will show you a screen asking you to connect "
+"to the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:8
msgid ""
-"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."
+"You can toggle on the switch \"Connect to Tor automatically\" before "
+"clicking \"Connect to Tor\". This means that next time OnionShare starts,"
+" it will automatically connect with its Tor connection settings from the "
+"last session, instead of presenting you with the connection options. If "
+"the connection fails, you can still try bridges or reconfigure Tor via "
+"the \"Network Settings\" button."
msgstr ""
-"Choisissez une façon de connecter OnionShare à Tor en cliquant sur l’icône d’"
-"oignon de Tor en bas à droite de la fenêtre d’OnionShare pour ouvrir l’"
-"onglet des paramètres de Tor."
#: ../../source/tor.rst:11
+msgid ""
+"You can click \"Connect to Tor\" to begin the connection process. If "
+"there are no problems with your network, including any attempts to block "
+"your access to the Tor network, this should hopefully work the first "
+"time."
+msgstr ""
+
+#: ../../source/tor.rst:13
+msgid ""
+"Or, if you want to manually configure Bridges or other Tor settings "
+"before you connect, you can click \"Network Settings\"."
+msgstr ""
+
+#: ../../source/tor.rst:16
+msgid "Automatic censorship circumvention"
+msgstr ""
+
+#: ../../source/tor.rst:18
+msgid ""
+"When you click \"Connect to Tor\", if OnionShare fails to connect, it "
+"might be because Tor is censored in your country or on your local "
+"network."
+msgstr ""
+
+#: ../../source/tor.rst:20
+msgid "If this occurs, you will have these choices:"
+msgstr ""
+
+#: ../../source/tor.rst:22
+msgid "Try again without a bridge"
+msgstr ""
+
+#: ../../source/tor.rst:23
+msgid "Automatically determine my country from my IP address for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:24
+msgid "Manually select my country for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:28
+msgid ""
+"If you choose the \"Try again without a bridge\" option, OnionShare will "
+"retry connecting to Tor like normal, without attempting to bypass "
+"censorship."
+msgstr ""
+
+#: ../../source/tor.rst:30
+msgid ""
+"The other two options will attempt to automatically bypass censorship "
+"using Tor bridges. If your network provider is blocking access to the Tor"
+" network, you can hopefully still connect to a Tor bridge, which will "
+"then connect you to the Tor network, circumventing the censorship. Both "
+"of these options use the Tor Project's Censorship Circumvention API to "
+"provide you with bridge settings that should work for you. OnionShare "
+"will temporarily use the `Meek "
+"<https://gitlab.torproject.org/legacy/trac/-/wikis/doc/meek/>`_ domain-"
+"fronting proxy to make a non-Tor connection from your computer to Tor's "
+"Censorship Circumvention API. The Meek proxy hides the fact that you are "
+"trying to find a way to connect to Tor."
+msgstr ""
+
+#: ../../source/tor.rst:36
+msgid ""
+"If you choose \"Automatically determine my country from my IP address for"
+" bridge settings\", the Censorship Circumvention API will consider your "
+"IP address (yes, your real IP address) to determine what country you "
+"might reside in. Based on the country information, the API will try to "
+"automatically find bridges that suit your location."
+msgstr ""
+
+#: ../../source/tor.rst:41
+msgid ""
+"If you choose \"Manually select my country for bridge settings\", the "
+"Censorship API will find the bridges that suit the country that you "
+"specified."
+msgstr ""
+
+#: ../../source/tor.rst:46
+msgid "How automatic censorship circumvention works"
+msgstr ""
+
+#: ../../source/tor.rst:48
+msgid ""
+"If the Censorship Circumvention API finds bridges that it believes will "
+"suit you, OnionShare will try to reconnect to Tor using those bridges. If"
+" the API does not find any bridges for your location, OnionShare will ask"
+" the API for \"fallback\" options, and then try to reconnect using those."
+msgstr ""
+
+#: ../../source/tor.rst:50
+msgid ""
+"If for some reason OnionShare fails to connect to the Censorship API "
+"itself, or if the API returns an error message, OnionShare will attempt "
+"to use the obfs4 built-in bridges."
+msgstr ""
+
+#: ../../source/tor.rst:52
+msgid ""
+"It's important to note that the requests to the Censorship Circumvention "
+"API do not go over the Tor network (because if you could connect to Tor "
+"already, you wouldn't need to connect to the API)."
+msgstr ""
+
+#: ../../source/tor.rst:54
+msgid ""
+"Even though it's hard for an adversary to discover where the Meek request"
+" is going, this may still be risky for some users. Therefore, it is an "
+"opt-in feature. The use of Meek and non-torified network requests are "
+"limited only to making one or two requests to the Censorship "
+"Circumvention API. Then Meek is stopped, and all further network requests"
+" happen over the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:56
+msgid ""
+"If you are uncomfortable with making a request that doesn't go over the "
+"Tor network, you can click \"Network Settings\" (or the Settings icon in "
+"the bottom right corner, followed by the Tor Settings tab in the screen "
+"that appears), and manually configure bridges. After you save any bridge "
+"settings, OnionShare will try to reconnect using those bridges."
+msgstr ""
+
+#: ../../source/tor.rst:59
+msgid "Manually configure Tor settings"
+msgstr ""
+
+#: ../../source/tor.rst:61
+msgid ""
+"You can get to the Tor settings by clicking \"Network Settings\" on the "
+"welcome screen, or by clicking the \"⚙\" icon in the bottom-right corner "
+"of the application, and then switch to the Tor Settings tab in the screen"
+" that appears."
+msgstr ""
+
+#: ../../source/tor.rst:65
+msgid ""
+"Here are the different ways you can configure OnionShare to connect to "
+"Tor:"
+msgstr ""
+
+#: ../../source/tor.rst:68
msgid "Use the Tor version built into OnionShare"
msgstr "Utiliser la version de Tor intégrée à OnionShare"
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:70
msgid ""
"This is the default, simplest and most reliable way that OnionShare "
"connects to Tor. For this reason, it's recommended for most users."
@@ -48,7 +193,7 @@ msgstr ""
"OnionShare de se connecter à Tor. C’est pourquoi ce choix est recommandé "
"pour la plupart des utilisateurs."
-#: ../../source/tor.rst:16
+#: ../../source/tor.rst:73
msgid ""
"When you open OnionShare, it launches an already configured ``tor`` "
"process in the background for OnionShare to use. It doesn't interfere "
@@ -61,64 +206,53 @@ msgstr ""
"vous pouvez donc utiliser indépendamment le Navigateur Tor ou le ``tor`` "
"du système."
-#: ../../source/tor.rst:20
-msgid "Getting Around Censorship"
-msgstr "Contourner la censure"
-
-#: ../../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-"
-"manual.torproject.org/bridges/>`_. If OnionShare connects to Tor without "
-"one, you don't need to use a bridge."
+#: ../../source/tor.rst:76
+msgid "**Using bridges**"
msgstr ""
-"Si votre accès à Internet est censuré, vous pouvez configurer OnionShare "
-"pour qu’il se connecte au réseau Tor en utilisant `des ponts Tor <https://tb-"
-"manual.torproject.org/fr/bridges//>`_. Si OnionShare se connecte à Tor sans, "
-"vous n’avez pas besoin d’utiliser de pont."
-#: ../../source/tor.rst:24
+#: ../../source/tor.rst:78
+#, fuzzy
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."
+"To use a bridge, you must select \"Use the Tor version built into "
+"OnionShare\" and check the \"Use a bridge\" checkbox."
msgstr ""
"Pour utiliser un pont, ouvrez l’onglet des paramètres de Tor. Vous devez "
"sélectionner « Utiliser la version de Tor intégrée dans OnionShare » et "
"cocher « Utiliser un pont »."
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:80
msgid ""
"Try using a built-in bridge first. Using `obfs4` or `snowflake` bridges "
"is recommended over using `meek-azure`."
msgstr ""
-"Essayez d’abord d’utiliser un pont intégré. Il est recommandé d’utiliser les "
-"ponts `obfs4` ou `snowflake` plutôt que `meek-azure`."
+"Essayez d’abord d’utiliser un pont intégré. Il est recommandé d’utiliser "
+"les ponts `obfs4` ou `snowflake` plutôt que `meek-azure`."
-#: ../../source/tor.rst:31
+#: ../../source/tor.rst:84
msgid ""
"If using a built-in bridge doesn't work, you can request a bridge from "
"torproject.org. You will have to solve a CAPTCHA in order to request a "
"bridge. (This makes it more difficult for governments or ISPs to block "
"access to Tor bridges.)"
msgstr ""
-"Si utiliser un pont intégré ne fonctionne pas, vous pouvez demander un pont "
-"à torproject.org. Vous devrez résoudre un captcha afin de demander un pont. ("
-"Cela rend plus difficile le blocage de l’accès aux ponts Tor par les "
-"gouvernements ou les FAI.)"
+"Si utiliser un pont intégré ne fonctionne pas, vous pouvez demander un "
+"pont à torproject.org. Vous devrez résoudre un captcha afin de demander "
+"un pont. (Cela rend plus difficile le blocage de l’accès aux ponts Tor "
+"par les gouvernements ou les FAI.)"
-#: ../../source/tor.rst:35
+#: ../../source/tor.rst:88
msgid ""
"You also have the option of using a bridge that you learned about from a "
"trusted source."
msgstr ""
-"Vous avez aussi la possibilité d’utiliser un pont dont vous avez appris l’"
-"existence auprès d’une source fiable."
+"Vous avez aussi la possibilité d’utiliser un pont dont vous avez appris "
+"l’existence auprès d’une source fiable."
-#: ../../source/tor.rst:38
+#: ../../source/tor.rst:91
msgid "Attempt auto-configuration with Tor Browser"
msgstr "Tenter la configuration automatique avec le Navigateur Tor"
-#: ../../source/tor.rst:40
+#: ../../source/tor.rst:93
msgid ""
"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
"and don't want two ``tor`` processes running, you can use the ``tor`` "
@@ -132,11 +266,11 @@ msgstr ""
"ouvert en arrière-plan pendant que vous utilisez OnionShare pour que "
"cette approche fonctionne."
-#: ../../source/tor.rst:44
+#: ../../source/tor.rst:97
msgid "Using a system ``tor`` in Windows"
msgstr "Utiliser un ``tor`` système dans Windows"
-#: ../../source/tor.rst:46
+#: ../../source/tor.rst:99
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
@@ -145,7 +279,7 @@ msgstr ""
" des fichiers en texte brut et effectuer des opérations en tant "
"qu’administrateur."
-#: ../../source/tor.rst:48
+#: ../../source/tor.rst:101
msgid ""
"Download the Tor Windows Expert Bundle `from "
"<https://www.torproject.org/download/tor/>`_. Extract the compressed file"
@@ -157,7 +291,7 @@ msgstr ""
" le dossier résultant sur ``C:\\Program Files (x86)\\`` Renommez en "
"``tor-win32`` le dossier résultant qui comprend ``Data`` et ``Tor``."
-#: ../../source/tor.rst:52
+#: ../../source/tor.rst:105
msgid ""
"Make up a control port password. (Using 7 words in a sequence like "
"``comprised stumble rummage work avenging construct volatile`` is a good "
@@ -172,7 +306,7 @@ msgstr ""
"utilisé ``tor.exe --hash-password`` pour générer une empreinte de votre "
"mot de passe. Par exemple :"
-#: ../../source/tor.rst:59
+#: ../../source/tor.rst:112
msgid ""
"The hashed password output is displayed after some warnings (which you "
"can ignore). In the case of the above example, it is "
@@ -183,7 +317,7 @@ msgstr ""
"dessus, l’empreinte est "
"``16:62C47B4E61BE73F26077E5CE7B180A2DFCB2F687D54248927AE82C0BCD``."
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:114
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
"win32\\torrc`` and put your hashed password output in it, replacing the "
@@ -194,7 +328,7 @@ msgstr ""
"remplaçant la valeur ``HashedControlPassword`` par l’empreinte que vous "
"venez de générer :"
-#: ../../source/tor.rst:66
+#: ../../source/tor.rst:119
msgid ""
"In your administrator command prompt, install ``tor`` as a service using "
"the appropriate ``torrc`` file you just created (as described in "
@@ -207,34 +341,35 @@ msgstr ""
"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Comme "
"ceci :"
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:123
msgid "You are now running a system ``tor`` process in Windows!"
msgstr "Vous exécutez désormais un processus ``tor``système sur Windows."
-#: ../../source/tor.rst:72
+#: ../../source/tor.rst:125
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
-"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
-"\"Tor authentication settings\" choose \"Password\" and set the password "
-"to the control port password you picked above. Click the \"Test "
-"Connection to Tor\" button. If all goes well, you should see \"Connected "
-"to the Tor controller\"."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using control port\", and set \"Control port\" to ``127.0.0.1``"
+" and \"Port\" to ``9051``. Under \"Tor authentication settings\" choose "
+"\"Password\" and set the password to the control port password you picked"
+" above. Click the \"Test Connection to Tor\" button. If all goes well, "
+"you should see \"Connected to the Tor controller\"."
msgstr ""
"Ouvrez OnionShare et cliquez l’icône « ⚙ ». Sous « Comment OnionShare "
-"devrait-il se connecter à Tor ? », choisissez « Se connecter en utilisant le "
-"port de contrôle » et définissez « Port de contrôle » à ``127.0.0.1`` et « "
-"Port » à ``9051``. Sous « Paramètres d’authentification de Tor », choisissez "
-"« Mot de passe » et définissez le même mot de passe que celui choisi "
-"précédemment pour le port de contrôle. Cliquez sur le bouton « Tester la "
-"connexion à Tor ». Si tout se passe bien, vous devriez voir « Vous êtes "
-"connecté au contrôleur Tor. »."
-
-#: ../../source/tor.rst:81
+"devrait-il se connecter à Tor ? », choisissez « Se connecter en utilisant"
+" le port de contrôle » et définissez « Port de contrôle » à ``127.0.0.1``"
+" et « Port » à ``9051``. Sous « Paramètres d’authentification de Tor », "
+"choisissez « Mot de passe » et définissez le même mot de passe que celui "
+"choisi précédemment pour le port de contrôle. Cliquez sur le bouton « "
+"Tester la connexion à Tor ». Si tout se passe bien, vous devriez voir « "
+"Vous êtes connecté au contrôleur Tor. »."
+
+#: ../../source/tor.rst:134
msgid "Using a system ``tor`` in macOS"
msgstr "Utiliser un ``tor``système sous macOS"
-#: ../../source/tor.rst:83
+#: ../../source/tor.rst:136
msgid ""
"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it, and then install Tor::"
@@ -242,23 +377,25 @@ msgstr ""
"Si ce n’est pas déjà fait, installez d’abord `Homebrew "
"<https://brew.sh/>`_, puis installez Tor :"
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:140
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
"Maintenant, configurez Tor pour autoriser les connexions à partir "
"d’OnionShare :"
-#: ../../source/tor.rst:94
+#: ../../source/tor.rst:147
msgid "And start the system Tor service::"
msgstr "Et démarrez le service Tor du système :"
-#: ../../source/tor.rst:98
+#: ../../source/tor.rst:151
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
-"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
-"Under \"Tor authentication settings\" choose \"No authentication, or "
-"cookie authentication\". Click the \"Test Connection to Tor\" button."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using socket file\", and set the socket file to be "
+"``/usr/local/var/run/tor/control.socket``. Under \"Tor authentication "
+"settings\" choose \"No authentication, or cookie authentication\". Click "
+"the \"Test Connection to Tor\" button."
msgstr ""
"Ouvrez OnionShare et cliquez sur l’icône ⚙. Sous « Comment OnionShare "
"devrait-il se connecter à Tor ? », choisissez « Se connecter en utilisant"
@@ -268,39 +405,40 @@ msgstr ""
"Pas d’authentification, ou authentification par témoin ». Cliquez sur le "
"bouton « Tester la connexion à Tor »."
-#: ../../source/tor.rst:104 ../../source/tor.rst:124
+#: ../../source/tor.rst:157 ../../source/tor.rst:177
msgid "If all goes well, you should see \"Connected to the Tor controller\"."
msgstr ""
"Si tout se passe bien, vous devriez voir « Vous êtes connecté au "
"contrôleur Tor »."
-#: ../../source/tor.rst:107
+#: ../../source/tor.rst:160
msgid "Using a system ``tor`` in Linux"
msgstr "Utiliser un ``tor`` système dans Linux"
-#: ../../source/tor.rst:109
+#: ../../source/tor.rst:162
msgid ""
"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
"similar Linux distro, It is recommended to use the Tor Project's "
"`official repository <https://support.torproject.org/apt/tor-deb-"
"repo/>`_."
msgstr ""
-"Installez d’abord le paquet ``tor``. Si vous utilisez Debian, Ubuntu ou une "
-"version de Linux semblable, il est recommandé d’utiliser le `dépôt officiel "
-"<https://support.torproject.org/apt/tor-deb-repo/>`_ du Projet Tor."
+"Installez d’abord le paquet ``tor``. Si vous utilisez Debian, Ubuntu ou "
+"une version de Linux semblable, il est recommandé d’utiliser le `dépôt "
+"officiel <https://support.torproject.org/apt/tor-deb-repo/>`_ du Projet "
+"Tor."
-#: ../../source/tor.rst:111
+#: ../../source/tor.rst:164
msgid ""
"Next, add your user to the group that runs the ``tor`` process (in the "
"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
"connect to your system ``tor``'s control socket file."
msgstr ""
-"Ensuite, ajoutez votre utilisateur au groupe qui exécute le processus ``tor``"
-" (dans le cas de Debian et Ubuntu, ``debian-tor`), et configurez OnionShare "
-"pour qu’il se connecte au fichier système de contrôle de l’interface de "
-"connexion de ``tor`` ."
+"Ensuite, ajoutez votre utilisateur au groupe qui exécute le processus "
+"``tor`` (dans le cas de Debian et Ubuntu, ``debian-tor`), et configurez "
+"OnionShare pour qu’il se connecte au fichier système de contrôle de "
+"l’interface de connexion de ``tor`` ."
-#: ../../source/tor.rst:113
+#: ../../source/tor.rst:166
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
@@ -308,22 +446,23 @@ msgstr ""
"Ajoutez votre utilisateur au groupe ``debian-tor`` en exécutant cette "
"commande (remplacez ``username`` par votre nom d’utilisateur) ::"
-#: ../../source/tor.rst:117
+#: ../../source/tor.rst:170
+#, fuzzy
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."
+"Reboot your computer. After it boots up again, open OnionShare, click the"
+" \"⚙\" icon in it, and switch to the Tor Settings tab. Under \"How should"
+" OnionShare connect to Tor?\" choose \"Connect using socket file\". Set "
+"the socket file to be ``/var/run/tor/control``. Under \"Tor "
+"authentication settings\" choose \"No authentication, or cookie "
+"authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
"Redémarrez votre ordinateur. Une fois redémarré, ouvrez OnionShare et "
-"cliquer l’icône « ⚙ ». Sous « Comment OnionShare devrait-il se connecter à "
-"Tor ? », choisissez « Se connecter en utilisant un fichier d’interface de "
-"connexion ». Définissez le fichier d’interface de connexion comme étant ``/"
-"var/run/tor/control``. Sous de « Paramètres d’authentification de Tor » "
-"choisissez « Pas d’authentification, ou authentification par témoin ». "
-"Cliquez sur le bouton « Tester la connexion à Tor »."
+"cliquer l’icône « ⚙ ». Sous « Comment OnionShare devrait-il se connecter "
+"à Tor ? », choisissez « Se connecter en utilisant un fichier d’interface "
+"de connexion ». Définissez le fichier d’interface de connexion comme "
+"étant ``/var/run/tor/control``. Sous de « Paramètres d’authentification "
+"de Tor » choisissez « Pas d’authentification, ou authentification par "
+"témoin ». Cliquez sur le bouton « Tester la connexion à Tor »."
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
@@ -605,3 +744,40 @@ msgstr ""
#~ " vous avez besoin d'utiliser un pont,"
#~ " essayer ceux fournis dans obfs4 en"
#~ " premier."
+
+#~ msgid ""
+#~ "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 ""
+#~ "Choisissez une façon de connecter "
+#~ "OnionShare à Tor en cliquant sur "
+#~ "l’icône d’oignon de Tor en bas à"
+#~ " droite de la fenêtre d’OnionShare "
+#~ "pour ouvrir l’onglet des paramètres de"
+#~ " Tor."
+
+#~ msgid "Getting Around Censorship"
+#~ msgstr "Contourner la censure"
+
+#~ 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 ""
+#~ "Si votre accès à Internet est "
+#~ "censuré, vous pouvez configurer OnionShare "
+#~ "pour qu’il se connecte au réseau "
+#~ "Tor en utilisant `des ponts Tor "
+#~ "<https://tb-manual.torproject.org/fr/bridges//>`_. Si "
+#~ "OnionShare se connecte à Tor sans, "
+#~ "vous n’avez pas besoin d’utiliser de "
+#~ "pont."
+
diff --git a/docs/source/locale/it/LC_MESSAGES/security.po b/docs/source/locale/it/LC_MESSAGES/security.po
index 90d81f75..f8191a1d 100644
--- a/docs/source/locale/it/LC_MESSAGES/security.po
+++ b/docs/source/locale/it/LC_MESSAGES/security.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2021-04-09 19:26+0000\n"
"Last-Translator: rc <coluccini.riccardo@gmail.com>\n"
"Language: it\n"
"Language-Team: it <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/security.rst:2
msgid "Security Design"
@@ -81,7 +81,7 @@ msgstr ""
#: ../../source/security.rst:28
msgid ""
-"**If an attacker learns about the onion service, it still can't access "
+"**If an attacker learns about the onion service, they still can't access "
"anything.** Prior attacks against the Tor network to enumerate onion "
"services allowed attackers to discover private ``.onion`` addresses. To "
"access an OnionShare service from its address, the private key used for "
@@ -326,3 +326,18 @@ msgstr ""
#~ " :ref:`turn_off_private_key`)."
#~ 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 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 ""
+
diff --git a/docs/source/locale/it/LC_MESSAGES/tor.po b/docs/source/locale/it/LC_MESSAGES/tor.po
index c0cdb63d..5fd36608 100644
--- a/docs/source/locale/it/LC_MESSAGES/tor.po
+++ b/docs/source/locale/it/LC_MESSAGES/tor.po
@@ -7,37 +7,184 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2022-01-20 11:57+0000\n"
"Last-Translator: albanobattistella <albano_battistella@hotmail.com>\n"
"Language: it\n"
"Language-Team: it <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
msgstr "Connessione a Tor in corso"
-#: ../../source/tor.rst:6
-#, fuzzy
+#: ../../source/tor.rst:4
+msgid ""
+"When OnionShare starts, it will show you a screen asking you to connect "
+"to the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:8
msgid ""
-"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."
+"You can toggle on the switch \"Connect to Tor automatically\" before "
+"clicking \"Connect to Tor\". This means that next time OnionShare starts,"
+" it will automatically connect with its Tor connection settings from the "
+"last session, instead of presenting you with the connection options. If "
+"the connection fails, you can still try bridges or reconfigure Tor via "
+"the \"Network Settings\" button."
msgstr ""
-"Scegli un modo per connettere OnionShare a Tor facendo clic sull'icona "
-"Tor onion in basso a destra nella finestra di OnionShare per aprire la "
-"scheda Impostazioni Tor."
#: ../../source/tor.rst:11
+msgid ""
+"You can click \"Connect to Tor\" to begin the connection process. If "
+"there are no problems with your network, including any attempts to block "
+"your access to the Tor network, this should hopefully work the first "
+"time."
+msgstr ""
+
+#: ../../source/tor.rst:13
+msgid ""
+"Or, if you want to manually configure Bridges or other Tor settings "
+"before you connect, you can click \"Network Settings\"."
+msgstr ""
+
+#: ../../source/tor.rst:16
+msgid "Automatic censorship circumvention"
+msgstr ""
+
+#: ../../source/tor.rst:18
+msgid ""
+"When you click \"Connect to Tor\", if OnionShare fails to connect, it "
+"might be because Tor is censored in your country or on your local "
+"network."
+msgstr ""
+
+#: ../../source/tor.rst:20
+msgid "If this occurs, you will have these choices:"
+msgstr ""
+
+#: ../../source/tor.rst:22
+msgid "Try again without a bridge"
+msgstr ""
+
+#: ../../source/tor.rst:23
+msgid "Automatically determine my country from my IP address for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:24
+msgid "Manually select my country for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:28
+msgid ""
+"If you choose the \"Try again without a bridge\" option, OnionShare will "
+"retry connecting to Tor like normal, without attempting to bypass "
+"censorship."
+msgstr ""
+
+#: ../../source/tor.rst:30
+msgid ""
+"The other two options will attempt to automatically bypass censorship "
+"using Tor bridges. If your network provider is blocking access to the Tor"
+" network, you can hopefully still connect to a Tor bridge, which will "
+"then connect you to the Tor network, circumventing the censorship. Both "
+"of these options use the Tor Project's Censorship Circumvention API to "
+"provide you with bridge settings that should work for you. OnionShare "
+"will temporarily use the `Meek "
+"<https://gitlab.torproject.org/legacy/trac/-/wikis/doc/meek/>`_ domain-"
+"fronting proxy to make a non-Tor connection from your computer to Tor's "
+"Censorship Circumvention API. The Meek proxy hides the fact that you are "
+"trying to find a way to connect to Tor."
+msgstr ""
+
+#: ../../source/tor.rst:36
+msgid ""
+"If you choose \"Automatically determine my country from my IP address for"
+" bridge settings\", the Censorship Circumvention API will consider your "
+"IP address (yes, your real IP address) to determine what country you "
+"might reside in. Based on the country information, the API will try to "
+"automatically find bridges that suit your location."
+msgstr ""
+
+#: ../../source/tor.rst:41
+msgid ""
+"If you choose \"Manually select my country for bridge settings\", the "
+"Censorship API will find the bridges that suit the country that you "
+"specified."
+msgstr ""
+
+#: ../../source/tor.rst:46
+msgid "How automatic censorship circumvention works"
+msgstr ""
+
+#: ../../source/tor.rst:48
+msgid ""
+"If the Censorship Circumvention API finds bridges that it believes will "
+"suit you, OnionShare will try to reconnect to Tor using those bridges. If"
+" the API does not find any bridges for your location, OnionShare will ask"
+" the API for \"fallback\" options, and then try to reconnect using those."
+msgstr ""
+
+#: ../../source/tor.rst:50
+msgid ""
+"If for some reason OnionShare fails to connect to the Censorship API "
+"itself, or if the API returns an error message, OnionShare will attempt "
+"to use the obfs4 built-in bridges."
+msgstr ""
+
+#: ../../source/tor.rst:52
+msgid ""
+"It's important to note that the requests to the Censorship Circumvention "
+"API do not go over the Tor network (because if you could connect to Tor "
+"already, you wouldn't need to connect to the API)."
+msgstr ""
+
+#: ../../source/tor.rst:54
+msgid ""
+"Even though it's hard for an adversary to discover where the Meek request"
+" is going, this may still be risky for some users. Therefore, it is an "
+"opt-in feature. The use of Meek and non-torified network requests are "
+"limited only to making one or two requests to the Censorship "
+"Circumvention API. Then Meek is stopped, and all further network requests"
+" happen over the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:56
+msgid ""
+"If you are uncomfortable with making a request that doesn't go over the "
+"Tor network, you can click \"Network Settings\" (or the Settings icon in "
+"the bottom right corner, followed by the Tor Settings tab in the screen "
+"that appears), and manually configure bridges. After you save any bridge "
+"settings, OnionShare will try to reconnect using those bridges."
+msgstr ""
+
+#: ../../source/tor.rst:59
+msgid "Manually configure Tor settings"
+msgstr ""
+
+#: ../../source/tor.rst:61
+msgid ""
+"You can get to the Tor settings by clicking \"Network Settings\" on the "
+"welcome screen, or by clicking the \"⚙\" icon in the bottom-right corner "
+"of the application, and then switch to the Tor Settings tab in the screen"
+" that appears."
+msgstr ""
+
+#: ../../source/tor.rst:65
+msgid ""
+"Here are the different ways you can configure OnionShare to connect to "
+"Tor:"
+msgstr ""
+
+#: ../../source/tor.rst:68
msgid "Use the Tor version built into OnionShare"
msgstr "Usa la versione Tor integrata in OnionShare"
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:70
msgid ""
"This is the default, simplest and most reliable way that OnionShare "
"connects to Tor. For this reason, it's recommended for most users."
@@ -46,7 +193,7 @@ msgstr ""
" si connette a Tor. Per questo motivo, è consigliato per la maggior parte"
" degli utenti."
-#: ../../source/tor.rst:16
+#: ../../source/tor.rst:73
msgid ""
"When you open OnionShare, it launches an already configured ``tor`` "
"process in the background for OnionShare to use. It doesn't interfere "
@@ -58,32 +205,21 @@ msgstr ""
"processi ``tor`` sul tuo computer, quindi puoi usare il Tor Browser o il "
"sistema ``tor`` da soli."
-#: ../../source/tor.rst:20
-msgid "Getting Around Censorship"
-msgstr "Come aggirare la censura"
-
-#: ../../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-"
-"manual.torproject.org/bridges/>`_. If OnionShare connects to Tor without "
-"one, you don't need to use a bridge."
+#: ../../source/tor.rst:76
+msgid "**Using bridges**"
msgstr ""
-"Se il tuo accesso a Internet è censurato, puoi configurare OnionShare per"
-" la connessione alla rete Tor usando `Tor bridges <https://tb-"
-"manual.torproject.org/bridges/>`_. Se OnionShare si connette a Tor senza "
-"uno, non è necessario utilizzare un bridge."
-#: ../../source/tor.rst:24
+#: ../../source/tor.rst:78
+#, fuzzy
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."
+"To use a bridge, you must select \"Use the Tor version built into "
+"OnionShare\" and check the \"Use a bridge\" checkbox."
msgstr ""
"Per utilizzare un bridge, apri la scheda Impostazioni Tor. Devi "
"selezionare \"Usa la versione Tor incorporata in OnionShare\" e "
"selezionare la casella \"Usa un bridge\"."
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:80
msgid ""
"Try using a built-in bridge first. Using `obfs4` or `snowflake` bridges "
"is recommended over using `meek-azure`."
@@ -91,7 +227,7 @@ msgstr ""
"Prova prima a usare un bridge integrato. Si consiglia di utilizzare i "
"bridge `obfs4` o `snowflake` rispetto a `meek-azure`."
-#: ../../source/tor.rst:31
+#: ../../source/tor.rst:84
msgid ""
"If using a built-in bridge doesn't work, you can request a bridge from "
"torproject.org. You will have to solve a CAPTCHA in order to request a "
@@ -103,7 +239,7 @@ msgstr ""
"bridge. (Ciò rende più difficile per i governi o gli ISP bloccare "
"l'accesso ai bridge Tor.)"
-#: ../../source/tor.rst:35
+#: ../../source/tor.rst:88
msgid ""
"You also have the option of using a bridge that you learned about from a "
"trusted source."
@@ -111,11 +247,11 @@ msgstr ""
"Hai anche la possibilità di utilizzare un bridge che hai appreso da una "
"fonte attendibile."
-#: ../../source/tor.rst:38
+#: ../../source/tor.rst:91
msgid "Attempt auto-configuration with Tor Browser"
msgstr "Tenta la configurazione automatica con il Browser Tor"
-#: ../../source/tor.rst:40
+#: ../../source/tor.rst:93
msgid ""
"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
"and don't want two ``tor`` processes running, you can use the ``tor`` "
@@ -127,11 +263,11 @@ msgstr ""
"processo `` tor`` dal Browser Tor. Tieni presente che devi tenere il "
"Browser Tor aperto in background mentre usi OnionShare affinché funzioni."
-#: ../../source/tor.rst:44
+#: ../../source/tor.rst:97
msgid "Using a system ``tor`` in Windows"
msgstr "Utilizzando un sistema ``tor`` su Windows"
-#: ../../source/tor.rst:46
+#: ../../source/tor.rst:99
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
@@ -139,7 +275,7 @@ msgstr ""
"Questo è abbastanza avanzato. Avrai bisogno di sapere come modificare i "
"file di testo in chiaro e fare cose come amministratore."
-#: ../../source/tor.rst:48
+#: ../../source/tor.rst:101
msgid ""
"Download the Tor Windows Expert Bundle `from "
"<https://www.torproject.org/download/tor/>`_. Extract the compressed file"
@@ -152,7 +288,7 @@ msgstr ""
"cartella all'interno che hanno il nome ``Data`` e ``Tor`` in ``tor-"
"win32``."
-#: ../../source/tor.rst:52
+#: ../../source/tor.rst:105
msgid ""
"Make up a control port password. (Using 7 words in a sequence like "
"``comprised stumble rummage work avenging construct volatile`` is a good "
@@ -166,7 +302,7 @@ msgstr ""
"comandi (``cmd``) come amministratore e usa ``tor. exe --hash-password`` "
"per generare un hash della tua password. Per esempio::"
-#: ../../source/tor.rst:59
+#: ../../source/tor.rst:112
msgid ""
"The hashed password output is displayed after some warnings (which you "
"can ignore). In the case of the above example, it is "
@@ -176,7 +312,7 @@ msgstr ""
"(che è possibile ignorare). Nel caso dell'esempio precedente, è "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:114
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
"win32\\torrc`` and put your hashed password output in it, replacing the "
@@ -186,7 +322,7 @@ msgstr ""
" '' e inseriscici l'output della password con l'hash, sostituendo "
"``HashedControlPassword`` con quello appena generato:"
-#: ../../source/tor.rst:66
+#: ../../source/tor.rst:119
msgid ""
"In your administrator command prompt, install ``tor`` as a service using "
"the appropriate ``torrc`` file you just created (as described in "
@@ -199,19 +335,20 @@ msgstr ""
"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Come "
"questo::"
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:123
msgid "You are now running a system ``tor`` process in Windows!"
msgstr "Ora stai eseguendo un processo di sistema ``tor`` su Windows!"
-#: ../../source/tor.rst:72
+#: ../../source/tor.rst:125
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
-"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
-"\"Tor authentication settings\" choose \"Password\" and set the password "
-"to the control port password you picked above. Click the \"Test "
-"Connection to Tor\" button. If all goes well, you should see \"Connected "
-"to the Tor controller\"."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using control port\", and set \"Control port\" to ``127.0.0.1``"
+" and \"Port\" to ``9051``. Under \"Tor authentication settings\" choose "
+"\"Password\" and set the password to the control port password you picked"
+" above. Click the \"Test Connection to Tor\" button. If all goes well, "
+"you should see \"Connected to the Tor controller\"."
msgstr ""
"Apri OnionShare e fai clic sull'icona \"⚙\" al suo interno. In \"Come "
"dovrebbe OnionShare connettersi a Tor?\" scegli \"Connetti usando la "
@@ -222,11 +359,11 @@ msgstr ""
"a Tor\". Se tutto va bene, dovresti vedere \"Connesso al controller "
"Tor\"."
-#: ../../source/tor.rst:81
+#: ../../source/tor.rst:134
msgid "Using a system ``tor`` in macOS"
msgstr "Utilizzando un sistema ``tor`` su macOS"
-#: ../../source/tor.rst:83
+#: ../../source/tor.rst:136
msgid ""
"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it, and then install Tor::"
@@ -234,21 +371,23 @@ msgstr ""
"Innanzitutto, installa `Homebrew <https://brew.sh/index_it>`_ se non lo "
"hai già. Quindi, installa Tor::"
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:140
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr "Ora configura Tor per consentire le connessioni da OnionShare::"
-#: ../../source/tor.rst:94
+#: ../../source/tor.rst:147
msgid "And start the system Tor service::"
msgstr "E avvia il servizio di sistema Tor:"
-#: ../../source/tor.rst:98
+#: ../../source/tor.rst:151
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
-"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
-"Under \"Tor authentication settings\" choose \"No authentication, or "
-"cookie authentication\". Click the \"Test Connection to Tor\" button."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using socket file\", and set the socket file to be "
+"``/usr/local/var/run/tor/control.socket``. Under \"Tor authentication "
+"settings\" choose \"No authentication, or cookie authentication\". Click "
+"the \"Test Connection to Tor\" button."
msgstr ""
"Apri OnionShare e fai clic sull'icona \"⚙\" al suo interno. In \"Come "
"dovrebbe OnionShare connettersi a Tor?\" scegli \"Connetti usando il file"
@@ -257,15 +396,15 @@ msgstr ""
"autenticazione di Tor\" scegli \"Nessuna autenticazione o autenticazione "
"cookie\". Fai clic sul pulsante \"Prova connessione a Tor\"."
-#: ../../source/tor.rst:104 ../../source/tor.rst:124
+#: ../../source/tor.rst:157 ../../source/tor.rst:177
msgid "If all goes well, you should see \"Connected to the Tor controller\"."
msgstr "Se tutto va bene, dovresti vedere \"Connesso al controller di Tor\"."
-#: ../../source/tor.rst:107
+#: ../../source/tor.rst:160
msgid "Using a system ``tor`` in Linux"
msgstr "Utilizzando un sistema ``tor`` su Linux"
-#: ../../source/tor.rst:109
+#: ../../source/tor.rst:162
msgid ""
"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
"similar Linux distro, It is recommended to use the Tor Project's "
@@ -277,7 +416,7 @@ msgstr ""
"`repository ufficiale del progetto Tor "
"<https://support.torproject.org/it/apt/tor-deb-repo/>`_."
-#: ../../source/tor.rst:111
+#: ../../source/tor.rst:164
msgid ""
"Next, add your user to the group that runs the ``tor`` process (in the "
"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
@@ -288,7 +427,7 @@ msgstr ""
"OnionShare per connettersi al file socket di controllo del tuo sistema "
"``tor``."
-#: ../../source/tor.rst:113
+#: ../../source/tor.rst:166
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
@@ -296,14 +435,15 @@ msgstr ""
"Aggiungi il tuo utente al gruppo ``debian-tor`` eseguendo questo comando "
"(sostituisci ``username`` con il tuo nome utente effettivo):"
-#: ../../source/tor.rst:117
+#: ../../source/tor.rst:170
+#, fuzzy
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."
+"Reboot your computer. After it boots up again, open OnionShare, click the"
+" \"⚙\" icon in it, and switch to the Tor Settings tab. Under \"How should"
+" OnionShare connect to Tor?\" choose \"Connect using socket file\". Set "
+"the socket file to be ``/var/run/tor/control``. Under \"Tor "
+"authentication settings\" choose \"No authentication, or cookie "
+"authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
"Riavvia il computer. Dopo il riavvio, apri OnionShare e fai clic "
"sull'icona \"⚙\" al suo interno. In \"Come dovrebbe OnionShare "
@@ -557,3 +697,37 @@ msgstr ""
#~ "Se hai bisogno di usare un bridge,"
#~ " prova prima quelli incorporati obfs4."
+#~ msgid ""
+#~ "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 ""
+#~ "Scegli un modo per connettere OnionShare"
+#~ " a Tor facendo clic sull'icona Tor"
+#~ " onion in basso a destra nella "
+#~ "finestra di OnionShare per aprire la "
+#~ "scheda Impostazioni Tor."
+
+#~ msgid "Getting Around Censorship"
+#~ msgstr "Come aggirare la censura"
+
+#~ 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 ""
+#~ "Se il tuo accesso a Internet è "
+#~ "censurato, puoi configurare OnionShare per "
+#~ "la connessione alla rete Tor usando "
+#~ "`Tor bridges <https://tb-"
+#~ "manual.torproject.org/bridges/>`_. Se OnionShare si"
+#~ " connette a Tor senza uno, non "
+#~ "è necessario utilizzare un bridge."
+
diff --git a/docs/source/locale/nb_NO/LC_MESSAGES/security.po b/docs/source/locale/nb_NO/LC_MESSAGES/security.po
index 2e4cff38..4b723af7 100644
--- a/docs/source/locale/nb_NO/LC_MESSAGES/security.po
+++ b/docs/source/locale/nb_NO/LC_MESSAGES/security.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2022-02-14 08:55+0000\n"
"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
"Language: nb_NO\n"
"Language-Team: none\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/security.rst:2
msgid "Security Design"
@@ -79,7 +79,7 @@ msgstr ""
#: ../../source/security.rst:28
#, fuzzy
msgid ""
-"**If an attacker learns about the onion service, it still can't access "
+"**If an attacker learns about the onion service, they still can't access "
"anything.** Prior attacks against the Tor network to enumerate onion "
"services allowed attackers to discover private ``.onion`` addresses. To "
"access an OnionShare service from its address, the private key used for "
diff --git a/docs/source/locale/nb_NO/LC_MESSAGES/tor.po b/docs/source/locale/nb_NO/LC_MESSAGES/tor.po
index e63a4da0..c4d44f7e 100644
--- a/docs/source/locale/nb_NO/LC_MESSAGES/tor.po
+++ b/docs/source/locale/nb_NO/LC_MESSAGES/tor.po
@@ -7,36 +7,184 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2022-02-14 08:55+0000\n"
"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
"Language: nb_NO\n"
"Language-Team: none\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
msgstr "Tilkobling til Tor"
-#: ../../source/tor.rst:6
-#, fuzzy
+#: ../../source/tor.rst:4
+msgid ""
+"When OnionShare starts, it will show you a screen asking you to connect "
+"to the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:8
msgid ""
-"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."
+"You can toggle on the switch \"Connect to Tor automatically\" before "
+"clicking \"Connect to Tor\". This means that next time OnionShare starts,"
+" it will automatically connect with its Tor connection settings from the "
+"last session, instead of presenting you with the connection options. If "
+"the connection fails, you can still try bridges or reconfigure Tor via "
+"the \"Network Settings\" button."
msgstr ""
-"Velg en måte å koble OnionShare til Tor ved å klikke på \"⚙\"-ikonet "
-"nederst til høyre i OnionShare-vinduet for å komme til de innstillingene."
#: ../../source/tor.rst:11
+msgid ""
+"You can click \"Connect to Tor\" to begin the connection process. If "
+"there are no problems with your network, including any attempts to block "
+"your access to the Tor network, this should hopefully work the first "
+"time."
+msgstr ""
+
+#: ../../source/tor.rst:13
+msgid ""
+"Or, if you want to manually configure Bridges or other Tor settings "
+"before you connect, you can click \"Network Settings\"."
+msgstr ""
+
+#: ../../source/tor.rst:16
+msgid "Automatic censorship circumvention"
+msgstr ""
+
+#: ../../source/tor.rst:18
+msgid ""
+"When you click \"Connect to Tor\", if OnionShare fails to connect, it "
+"might be because Tor is censored in your country or on your local "
+"network."
+msgstr ""
+
+#: ../../source/tor.rst:20
+msgid "If this occurs, you will have these choices:"
+msgstr ""
+
+#: ../../source/tor.rst:22
+msgid "Try again without a bridge"
+msgstr ""
+
+#: ../../source/tor.rst:23
+msgid "Automatically determine my country from my IP address for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:24
+msgid "Manually select my country for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:28
+msgid ""
+"If you choose the \"Try again without a bridge\" option, OnionShare will "
+"retry connecting to Tor like normal, without attempting to bypass "
+"censorship."
+msgstr ""
+
+#: ../../source/tor.rst:30
+msgid ""
+"The other two options will attempt to automatically bypass censorship "
+"using Tor bridges. If your network provider is blocking access to the Tor"
+" network, you can hopefully still connect to a Tor bridge, which will "
+"then connect you to the Tor network, circumventing the censorship. Both "
+"of these options use the Tor Project's Censorship Circumvention API to "
+"provide you with bridge settings that should work for you. OnionShare "
+"will temporarily use the `Meek "
+"<https://gitlab.torproject.org/legacy/trac/-/wikis/doc/meek/>`_ domain-"
+"fronting proxy to make a non-Tor connection from your computer to Tor's "
+"Censorship Circumvention API. The Meek proxy hides the fact that you are "
+"trying to find a way to connect to Tor."
+msgstr ""
+
+#: ../../source/tor.rst:36
+msgid ""
+"If you choose \"Automatically determine my country from my IP address for"
+" bridge settings\", the Censorship Circumvention API will consider your "
+"IP address (yes, your real IP address) to determine what country you "
+"might reside in. Based on the country information, the API will try to "
+"automatically find bridges that suit your location."
+msgstr ""
+
+#: ../../source/tor.rst:41
+msgid ""
+"If you choose \"Manually select my country for bridge settings\", the "
+"Censorship API will find the bridges that suit the country that you "
+"specified."
+msgstr ""
+
+#: ../../source/tor.rst:46
+msgid "How automatic censorship circumvention works"
+msgstr ""
+
+#: ../../source/tor.rst:48
+msgid ""
+"If the Censorship Circumvention API finds bridges that it believes will "
+"suit you, OnionShare will try to reconnect to Tor using those bridges. If"
+" the API does not find any bridges for your location, OnionShare will ask"
+" the API for \"fallback\" options, and then try to reconnect using those."
+msgstr ""
+
+#: ../../source/tor.rst:50
+msgid ""
+"If for some reason OnionShare fails to connect to the Censorship API "
+"itself, or if the API returns an error message, OnionShare will attempt "
+"to use the obfs4 built-in bridges."
+msgstr ""
+
+#: ../../source/tor.rst:52
+msgid ""
+"It's important to note that the requests to the Censorship Circumvention "
+"API do not go over the Tor network (because if you could connect to Tor "
+"already, you wouldn't need to connect to the API)."
+msgstr ""
+
+#: ../../source/tor.rst:54
+msgid ""
+"Even though it's hard for an adversary to discover where the Meek request"
+" is going, this may still be risky for some users. Therefore, it is an "
+"opt-in feature. The use of Meek and non-torified network requests are "
+"limited only to making one or two requests to the Censorship "
+"Circumvention API. Then Meek is stopped, and all further network requests"
+" happen over the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:56
+msgid ""
+"If you are uncomfortable with making a request that doesn't go over the "
+"Tor network, you can click \"Network Settings\" (or the Settings icon in "
+"the bottom right corner, followed by the Tor Settings tab in the screen "
+"that appears), and manually configure bridges. After you save any bridge "
+"settings, OnionShare will try to reconnect using those bridges."
+msgstr ""
+
+#: ../../source/tor.rst:59
+msgid "Manually configure Tor settings"
+msgstr ""
+
+#: ../../source/tor.rst:61
+msgid ""
+"You can get to the Tor settings by clicking \"Network Settings\" on the "
+"welcome screen, or by clicking the \"⚙\" icon in the bottom-right corner "
+"of the application, and then switch to the Tor Settings tab in the screen"
+" that appears."
+msgstr ""
+
+#: ../../source/tor.rst:65
+msgid ""
+"Here are the different ways you can configure OnionShare to connect to "
+"Tor:"
+msgstr ""
+
+#: ../../source/tor.rst:68
msgid "Use the Tor version built into OnionShare"
msgstr "Bruk den innebygde Tor-versjonen fra OnionShare"
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:70
msgid ""
"This is the default, simplest and most reliable way that OnionShare "
"connects to Tor. For this reason, it's recommended for most users."
@@ -45,7 +193,7 @@ msgstr ""
"den enkleste og mest pålitelige måten. Derfor er det også anbefalt for de"
" fleste brukerne."
-#: ../../source/tor.rst:16
+#: ../../source/tor.rst:73
msgid ""
"When you open OnionShare, it launches an already configured ``tor`` "
"process in the background for OnionShare to use. It doesn't interfere "
@@ -57,33 +205,20 @@ msgstr ""
"innvirkning på andre ``tor``-prosesser på datamaskinen, så du kan bruke "
"Tor-nettleseren på systemet, eller ``tor`` på egenhånd."
-#: ../../source/tor.rst:20
-msgid "Getting Around Censorship"
-msgstr "Omgåelse av sensur"
-
-#: ../../source/tor.rst:22
-#, fuzzy
-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."
+#: ../../source/tor.rst:76
+msgid "**Using bridges**"
msgstr ""
-"Hvis din tilgang til Internett er sensurert, kan du sette opp OnionShare "
-"slik at det kobler til Tor-nettverket ved bruk av `Tor-broer "
-"<https://2019.www.torproject.org/docs/bridges.html.en>`_. Hvis OnionShare"
-" klarer å koble til uten, trenger du ikke å bruke en bro."
-#: ../../source/tor.rst:24
+#: ../../source/tor.rst:78
#, fuzzy
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."
+"To use a bridge, you must select \"Use the Tor version built into "
+"OnionShare\" and check the \"Use a bridge\" checkbox."
msgstr ""
"For å bruke en bro må du åpne Tor-innstillingsfanen. Velg «Bruk den "
"innebygde Tor-versjonen fra OnionShare» og huk av i «Bruk en bro»-boksen."
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:80
#, fuzzy
msgid ""
"Try using a built-in bridge first. Using `obfs4` or `snowflake` bridges "
@@ -92,7 +227,7 @@ msgstr ""
"Prøv å bruke en innebygd bro først. `obfs4` eller `snowflake`-broer "
"anbefales framfor bruk av`meek-azure`."
-#: ../../source/tor.rst:31
+#: ../../source/tor.rst:84
#, fuzzy
msgid ""
"If using a built-in bridge doesn't work, you can request a bridge from "
@@ -105,18 +240,18 @@ msgstr ""
" (Dette gjør det vanskeligere for myndigheter og ISP-er å blokkere "
"tilgang til Tor-broer.)"
-#: ../../source/tor.rst:35
+#: ../../source/tor.rst:88
#, fuzzy
msgid ""
"You also have the option of using a bridge that you learned about from a "
"trusted source."
msgstr "Du kan også bruke en bro du har lært om fra en tiltrodd kilde."
-#: ../../source/tor.rst:38
+#: ../../source/tor.rst:91
msgid "Attempt auto-configuration with Tor Browser"
msgstr "Forsøk automatisk oppsett med Tor-nettleseren"
-#: ../../source/tor.rst:40
+#: ../../source/tor.rst:93
msgid ""
"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
"and don't want two ``tor`` processes running, you can use the ``tor`` "
@@ -129,11 +264,11 @@ msgstr ""
"nettleseren. Ha i minne at du må ha Tor-nettleseren åpen i bakgrunnen "
"mens du bruker OnionShare for at dette skal virke."
-#: ../../source/tor.rst:44
+#: ../../source/tor.rst:97
msgid "Using a system ``tor`` in Windows"
msgstr "Bruk av systemets Tor i Windows"
-#: ../../source/tor.rst:46
+#: ../../source/tor.rst:99
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
@@ -141,7 +276,7 @@ msgstr ""
"Dette er ganske avansert. Du må vite hvordan du redigerer filer i "
"klartekst og gjøre ting som administrator."
-#: ../../source/tor.rst:48
+#: ../../source/tor.rst:101
#, fuzzy
msgid ""
"Download the Tor Windows Expert Bundle `from "
@@ -155,7 +290,7 @@ msgstr ""
" Gi den den utpakkede mappen med ``Data`` og ``Tor`` i den den nye navnet"
" ``tor-win32``."
-#: ../../source/tor.rst:52
+#: ../../source/tor.rst:105
msgid ""
"Make up a control port password. (Using 7 words in a sequence like "
"``comprised stumble rummage work avenging construct volatile`` is a good "
@@ -169,7 +304,7 @@ msgstr ""
"administrator og bruke ``tor.exe --hash-password`` for å generere en "
"sjekksum for ditt passord. For eksempel::"
-#: ../../source/tor.rst:59
+#: ../../source/tor.rst:112
msgid ""
"The hashed password output is displayed after some warnings (which you "
"can ignore). In the case of the above example, it is "
@@ -179,7 +314,7 @@ msgstr ""
" kan se bort fra). For eksmplet ovenfor, er den "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:114
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
"win32\\torrc`` and put your hashed password output in it, replacing the "
@@ -189,7 +324,7 @@ msgstr ""
" og sett inn den sjekksummerte utdataen for passordet i den, slik at det "
"erstatter ``HashedControlPassword`` med det du akkurat genererte::"
-#: ../../source/tor.rst:66
+#: ../../source/tor.rst:119
msgid ""
"In your administrator command prompt, install ``tor`` as a service using "
"the appropriate ``torrc`` file you just created (as described in "
@@ -200,20 +335,20 @@ msgstr ""
"bruke den egnede ``torrc``-filen du akkurat oppretet (som beskrevet i "
"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Slik::"
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:123
msgid "You are now running a system ``tor`` process in Windows!"
msgstr "Du kjører nå en systembasert``tor``-prosess i Windows!"
-#: ../../source/tor.rst:72
+#: ../../source/tor.rst:125
#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
-"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
-"\"Tor authentication settings\" choose \"Password\" and set the password "
-"to the control port password you picked above. Click the \"Test "
-"Connection to Tor\" button. If all goes well, you should see \"Connected "
-"to the Tor controller\"."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using control port\", and set \"Control port\" to ``127.0.0.1``"
+" and \"Port\" to ``9051``. Under \"Tor authentication settings\" choose "
+"\"Password\" and set the password to the control port password you picked"
+" above. Click the \"Test Connection to Tor\" button. If all goes well, "
+"you should see \"Connected to the Tor controller\"."
msgstr ""
"Åpne OnionShare og klikk på \"⚙\"-ikonet i programmet. I \"Hvordan skal "
"OnionShare koble til Tor?\", velg \"Koble til ved bruk av kontrollport\","
@@ -223,11 +358,11 @@ msgstr ""
"ovenfor. Klikk på \"Test tilkoblingen til Tor\"-knappen. Hvis alt går "
"bra, vil du se \"Tilkoblet til Tor-kontrolleren\"."
-#: ../../source/tor.rst:81
+#: ../../source/tor.rst:134
msgid "Using a system ``tor`` in macOS"
msgstr "Bruk av systemets Tor i macOS"
-#: ../../source/tor.rst:83
+#: ../../source/tor.rst:136
#, fuzzy
msgid ""
"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
@@ -236,21 +371,23 @@ msgstr ""
"Først må du installere `Homebrew <https://brew.sh/>`_ hvis du ikke "
"allerede har det, og så installere Tor::"
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:140
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr "Sett opp Tor for å tillate tilkoblinger fra OnionShare::"
-#: ../../source/tor.rst:94
+#: ../../source/tor.rst:147
msgid "And start the system Tor service::"
msgstr "Og start den systembaserte Tor-tjenesten::"
-#: ../../source/tor.rst:98
+#: ../../source/tor.rst:151
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
-"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
-"Under \"Tor authentication settings\" choose \"No authentication, or "
-"cookie authentication\". Click the \"Test Connection to Tor\" button."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using socket file\", and set the socket file to be "
+"``/usr/local/var/run/tor/control.socket``. Under \"Tor authentication "
+"settings\" choose \"No authentication, or cookie authentication\". Click "
+"the \"Test Connection to Tor\" button."
msgstr ""
"Åpne OnionShare og klikk på \"⚙\"-ikonet i det. Under \"Hvordan skal "
"OnionShare koble til Tor?\" velger du \"Koble til ved bruk av socket-"
@@ -260,15 +397,15 @@ msgstr ""
"kakebasert identitetsbekreftelse\". Klikk på \"Test tilkobling til "
"Tor\"-knappen."
-#: ../../source/tor.rst:104 ../../source/tor.rst:124
+#: ../../source/tor.rst:157 ../../source/tor.rst:177
msgid "If all goes well, you should see \"Connected to the Tor controller\"."
msgstr "Hvis alt går bra, vil du se «Tilkoblet til Tor-kontrolleren»."
-#: ../../source/tor.rst:107
+#: ../../source/tor.rst:160
msgid "Using a system ``tor`` in Linux"
msgstr "Bruk av systemets Tor på Linux"
-#: ../../source/tor.rst:109
+#: ../../source/tor.rst:162
msgid ""
"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
"similar Linux distro, It is recommended to use the Tor Project's "
@@ -280,7 +417,7 @@ msgstr ""
"`offisielle pakkebrønn <https://support.torproject.org/apt/tor-deb-"
"repo/>`_."
-#: ../../source/tor.rst:111
+#: ../../source/tor.rst:164
msgid ""
"Next, add your user to the group that runs the ``tor`` process (in the "
"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
@@ -290,7 +427,7 @@ msgstr ""
"``tor``-prosessen (som for Debian og Ubuntu er ``debian-tor`` og setter "
"opp OnionShare til å koblet til ditt systems ``tor``-kontrollsocket-fil."
-#: ../../source/tor.rst:113
+#: ../../source/tor.rst:166
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
@@ -298,14 +435,15 @@ msgstr ""
"Legg så til din bruker i ``debian-tor``-gruppen ved å kjøre denne "
"kommandoen (erstatt ``username`` med ditt faktiske brukernavn)::"
-#: ../../source/tor.rst:117
+#: ../../source/tor.rst:170
+#, fuzzy
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."
+"Reboot your computer. After it boots up again, open OnionShare, click the"
+" \"⚙\" icon in it, and switch to the Tor Settings tab. Under \"How should"
+" OnionShare connect to Tor?\" choose \"Connect using socket file\". Set "
+"the socket file to be ``/var/run/tor/control``. Under \"Tor "
+"authentication settings\" choose \"No authentication, or cookie "
+"authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
"Utfør en omstart av datamaskinen. Etter at den starter opp igjen, åpner "
"du OnionShare og klikker på \"⚙\"-ikonet i det. Under «Hvordan skal "
@@ -557,3 +695,38 @@ msgstr ""
#~ "Hvis du må bruke en bro, prøv "
#~ "de innebygde obfs4-baserte broene først."
+#~ msgid ""
+#~ "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 ""
+#~ "Velg en måte å koble OnionShare "
+#~ "til Tor ved å klikke på "
+#~ "\"⚙\"-ikonet nederst til høyre i "
+#~ "OnionShare-vinduet for å komme til de"
+#~ " innstillingene."
+
+#~ msgid "Getting Around Censorship"
+#~ msgstr "Omgåelse av sensur"
+
+#~ 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 ""
+#~ "Hvis din tilgang til Internett er "
+#~ "sensurert, kan du sette opp OnionShare"
+#~ " slik at det kobler til Tor-"
+#~ "nettverket ved bruk av `Tor-broer "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. Hvis"
+#~ " OnionShare klarer å koble til uten,"
+#~ " trenger du ikke å bruke en "
+#~ "bro."
+
diff --git a/docs/source/locale/pl/LC_MESSAGES/security.po b/docs/source/locale/pl/LC_MESSAGES/security.po
index 95c704bc..a0f09ebc 100644
--- a/docs/source/locale/pl/LC_MESSAGES/security.po
+++ b/docs/source/locale/pl/LC_MESSAGES/security.po
@@ -7,17 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2021-10-13 17:58+0000\n"
"Last-Translator: Rafał Godek <p3run@tutanota.com>\n"
"Language: pl\n"
"Language-Team: pl <LL@li.org>\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && "
-"(n%100<10 || n%100>=20) ? 1 : 2\n"
+"(n%100<10 || n%100>=20) ? 1 : 2;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/security.rst:2
msgid "Security Design"
@@ -82,7 +82,7 @@ msgstr ""
#: ../../source/security.rst:28
#, fuzzy
msgid ""
-"**If an attacker learns about the onion service, it still can't access "
+"**If an attacker learns about the onion service, they still can't access "
"anything.** Prior attacks against the Tor network to enumerate onion "
"services allowed attackers to discover private ``.onion`` addresses. To "
"access an OnionShare service from its address, the private key used for "
diff --git a/docs/source/locale/pl/LC_MESSAGES/tor.po b/docs/source/locale/pl/LC_MESSAGES/tor.po
index ea361ffc..4f6e0561 100644
--- a/docs/source/locale/pl/LC_MESSAGES/tor.po
+++ b/docs/source/locale/pl/LC_MESSAGES/tor.po
@@ -7,37 +7,185 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2021-09-19 15:37+0000\n"
"Last-Translator: Rafał Godek <p3run@tutanota.com>\n"
"Language: pl\n"
"Language-Team: pl <LL@li.org>\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && "
-"(n%100<10 || n%100>=20) ? 1 : 2\n"
+"(n%100<10 || n%100>=20) ? 1 : 2;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
msgstr "Łączenie się z siecią Tor"
-#: ../../source/tor.rst:6
-#, fuzzy
+#: ../../source/tor.rst:4
+msgid ""
+"When OnionShare starts, it will show you a screen asking you to connect "
+"to the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:8
msgid ""
-"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."
+"You can toggle on the switch \"Connect to Tor automatically\" before "
+"clicking \"Connect to Tor\". This means that next time OnionShare starts,"
+" it will automatically connect with its Tor connection settings from the "
+"last session, instead of presenting you with the connection options. If "
+"the connection fails, you can still try bridges or reconfigure Tor via "
+"the \"Network Settings\" button."
msgstr ""
-"Wybierz sposób połączenia OnionShare z siecią Tor, klikając ikonę cebuli w "
-"prawym dolnym rogu okna OnionShare, aby przejść do zakładki Ustawień Tor."
#: ../../source/tor.rst:11
+msgid ""
+"You can click \"Connect to Tor\" to begin the connection process. If "
+"there are no problems with your network, including any attempts to block "
+"your access to the Tor network, this should hopefully work the first "
+"time."
+msgstr ""
+
+#: ../../source/tor.rst:13
+msgid ""
+"Or, if you want to manually configure Bridges or other Tor settings "
+"before you connect, you can click \"Network Settings\"."
+msgstr ""
+
+#: ../../source/tor.rst:16
+msgid "Automatic censorship circumvention"
+msgstr ""
+
+#: ../../source/tor.rst:18
+msgid ""
+"When you click \"Connect to Tor\", if OnionShare fails to connect, it "
+"might be because Tor is censored in your country or on your local "
+"network."
+msgstr ""
+
+#: ../../source/tor.rst:20
+msgid "If this occurs, you will have these choices:"
+msgstr ""
+
+#: ../../source/tor.rst:22
+msgid "Try again without a bridge"
+msgstr ""
+
+#: ../../source/tor.rst:23
+msgid "Automatically determine my country from my IP address for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:24
+msgid "Manually select my country for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:28
+msgid ""
+"If you choose the \"Try again without a bridge\" option, OnionShare will "
+"retry connecting to Tor like normal, without attempting to bypass "
+"censorship."
+msgstr ""
+
+#: ../../source/tor.rst:30
+msgid ""
+"The other two options will attempt to automatically bypass censorship "
+"using Tor bridges. If your network provider is blocking access to the Tor"
+" network, you can hopefully still connect to a Tor bridge, which will "
+"then connect you to the Tor network, circumventing the censorship. Both "
+"of these options use the Tor Project's Censorship Circumvention API to "
+"provide you with bridge settings that should work for you. OnionShare "
+"will temporarily use the `Meek "
+"<https://gitlab.torproject.org/legacy/trac/-/wikis/doc/meek/>`_ domain-"
+"fronting proxy to make a non-Tor connection from your computer to Tor's "
+"Censorship Circumvention API. The Meek proxy hides the fact that you are "
+"trying to find a way to connect to Tor."
+msgstr ""
+
+#: ../../source/tor.rst:36
+msgid ""
+"If you choose \"Automatically determine my country from my IP address for"
+" bridge settings\", the Censorship Circumvention API will consider your "
+"IP address (yes, your real IP address) to determine what country you "
+"might reside in. Based on the country information, the API will try to "
+"automatically find bridges that suit your location."
+msgstr ""
+
+#: ../../source/tor.rst:41
+msgid ""
+"If you choose \"Manually select my country for bridge settings\", the "
+"Censorship API will find the bridges that suit the country that you "
+"specified."
+msgstr ""
+
+#: ../../source/tor.rst:46
+msgid "How automatic censorship circumvention works"
+msgstr ""
+
+#: ../../source/tor.rst:48
+msgid ""
+"If the Censorship Circumvention API finds bridges that it believes will "
+"suit you, OnionShare will try to reconnect to Tor using those bridges. If"
+" the API does not find any bridges for your location, OnionShare will ask"
+" the API for \"fallback\" options, and then try to reconnect using those."
+msgstr ""
+
+#: ../../source/tor.rst:50
+msgid ""
+"If for some reason OnionShare fails to connect to the Censorship API "
+"itself, or if the API returns an error message, OnionShare will attempt "
+"to use the obfs4 built-in bridges."
+msgstr ""
+
+#: ../../source/tor.rst:52
+msgid ""
+"It's important to note that the requests to the Censorship Circumvention "
+"API do not go over the Tor network (because if you could connect to Tor "
+"already, you wouldn't need to connect to the API)."
+msgstr ""
+
+#: ../../source/tor.rst:54
+msgid ""
+"Even though it's hard for an adversary to discover where the Meek request"
+" is going, this may still be risky for some users. Therefore, it is an "
+"opt-in feature. The use of Meek and non-torified network requests are "
+"limited only to making one or two requests to the Censorship "
+"Circumvention API. Then Meek is stopped, and all further network requests"
+" happen over the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:56
+msgid ""
+"If you are uncomfortable with making a request that doesn't go over the "
+"Tor network, you can click \"Network Settings\" (or the Settings icon in "
+"the bottom right corner, followed by the Tor Settings tab in the screen "
+"that appears), and manually configure bridges. After you save any bridge "
+"settings, OnionShare will try to reconnect using those bridges."
+msgstr ""
+
+#: ../../source/tor.rst:59
+msgid "Manually configure Tor settings"
+msgstr ""
+
+#: ../../source/tor.rst:61
+msgid ""
+"You can get to the Tor settings by clicking \"Network Settings\" on the "
+"welcome screen, or by clicking the \"⚙\" icon in the bottom-right corner "
+"of the application, and then switch to the Tor Settings tab in the screen"
+" that appears."
+msgstr ""
+
+#: ../../source/tor.rst:65
+msgid ""
+"Here are the different ways you can configure OnionShare to connect to "
+"Tor:"
+msgstr ""
+
+#: ../../source/tor.rst:68
msgid "Use the Tor version built into OnionShare"
msgstr "Użyj wersji Tor wbudowanej w OnionShare"
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:70
msgid ""
"This is the default, simplest and most reliable way that OnionShare "
"connects to Tor. For this reason, it's recommended for most users."
@@ -46,7 +194,7 @@ msgstr ""
"OnionShare łączy się z siecią Tor. Z tego powodu jest on zalecany dla "
"większości użytkowników."
-#: ../../source/tor.rst:16
+#: ../../source/tor.rst:73
msgid ""
"When you open OnionShare, it launches an already configured ``tor`` "
"process in the background for OnionShare to use. It doesn't interfere "
@@ -58,39 +206,28 @@ msgstr ""
"twoim komputerze, więc możesz samodzielnie używać przeglądarki Tor lub "
"systemu ``tor``."
-#: ../../source/tor.rst:20
-msgid "Getting Around Censorship"
-msgstr "Obchodzenie cenzury"
-
-#: ../../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-"
-"manual.torproject.org/bridges/>`_. If OnionShare connects to Tor without "
-"one, you don't need to use a bridge."
+#: ../../source/tor.rst:76
+msgid "**Using bridges**"
msgstr ""
-"Jeśli twój dostęp do Internetu jest ocenzurowany, możesz skonfigurować "
-"OnionShare, aby łączyć się z siecią Tor za pomocą `Mostków Tor <https://tb-"
-"manual.torproject.org/bridges/>`_. Jeśli OnionShare łączy się z Torem bez "
-"problemu, nie musisz używać mostka."
-#: ../../source/tor.rst:24
+#: ../../source/tor.rst:78
+#, fuzzy
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."
+"To use a bridge, you must select \"Use the Tor version built into "
+"OnionShare\" and check the \"Use a bridge\" checkbox."
msgstr ""
-"Aby użyć mostka, otwórz zakładkę Ustawienia Tor. Musisz wybrać „Użyj wersji "
-"Tora wbudowanej w OnionShare” i zaznacz pole wyboru „Użyj mostka”."
+"Aby użyć mostka, otwórz zakładkę Ustawienia Tor. Musisz wybrać „Użyj "
+"wersji Tora wbudowanej w OnionShare” i zaznacz pole wyboru „Użyj mostka”."
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:80
msgid ""
"Try using a built-in bridge first. Using `obfs4` or `snowflake` bridges "
"is recommended over using `meek-azure`."
msgstr ""
-"Spróbuj najpierw użyć wbudowanego mostka. Korzystanie z mostków `obfs4` lub "
-"`snowflake` jest zalecane zamiast używania `meek-azure`."
+"Spróbuj najpierw użyć wbudowanego mostka. Korzystanie z mostków `obfs4` "
+"lub `snowflake` jest zalecane zamiast używania `meek-azure`."
-#: ../../source/tor.rst:31
+#: ../../source/tor.rst:84
msgid ""
"If using a built-in bridge doesn't work, you can request a bridge from "
"torproject.org. You will have to solve a CAPTCHA in order to request a "
@@ -98,23 +235,23 @@ msgid ""
"access to Tor bridges.)"
msgstr ""
"Jeśli wbudowany mostek nie działa, możesz poprosić o mostek ze strony "
-"torproject.org. Będziesz musiał rozwiązać CAPTCHA, aby poprosić o mostek. ("
-"Utrudnia to rządom lub dostawcom usług internetowych blokowanie dostępu do "
-"mostków Tora.)"
+"torproject.org. Będziesz musiał rozwiązać CAPTCHA, aby poprosić o mostek."
+" (Utrudnia to rządom lub dostawcom usług internetowych blokowanie dostępu"
+" do mostków Tora.)"
-#: ../../source/tor.rst:35
+#: ../../source/tor.rst:88
msgid ""
"You also have the option of using a bridge that you learned about from a "
"trusted source."
msgstr ""
-"Masz również możliwość skorzystania z mostka, o którym dowiedziałeś się z "
-"zaufanego źródła."
+"Masz również możliwość skorzystania z mostka, o którym dowiedziałeś się z"
+" zaufanego źródła."
-#: ../../source/tor.rst:38
+#: ../../source/tor.rst:91
msgid "Attempt auto-configuration with Tor Browser"
msgstr "Spróbuj automatycznej konfiguracji przy pomocy Tor Browser"
-#: ../../source/tor.rst:40
+#: ../../source/tor.rst:93
msgid ""
"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
"and don't want two ``tor`` processes running, you can use the ``tor`` "
@@ -126,11 +263,11 @@ msgstr ""
"przeglądarki Tor. Pamiętaj, że aby to zadziałało, musisz mieć otwartą "
"przeglądarkę Tor w tle podczas korzystania z OnionShare."
-#: ../../source/tor.rst:44
+#: ../../source/tor.rst:97
msgid "Using a system ``tor`` in Windows"
msgstr "Używanie systemowego ``tor`` w systemie Windows"
-#: ../../source/tor.rst:46
+#: ../../source/tor.rst:99
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
@@ -138,7 +275,7 @@ msgstr ""
"To dość zaawansowane. Musisz wiedzieć, jak edytować pliki tekstowe i "
"robić różne rzeczy jako administrator."
-#: ../../source/tor.rst:48
+#: ../../source/tor.rst:101
msgid ""
"Download the Tor Windows Expert Bundle `from "
"<https://www.torproject.org/download/tor/>`_. Extract the compressed file"
@@ -151,7 +288,7 @@ msgstr ""
"nazwę wyodrębnionego folderu zawierającego ``Data`` i ``Tor`` na ``tor-"
"win32``."
-#: ../../source/tor.rst:52
+#: ../../source/tor.rst:105
msgid ""
"Make up a control port password. (Using 7 words in a sequence like "
"``comprised stumble rummage work avenging construct volatile`` is a good "
@@ -165,7 +302,7 @@ msgstr ""
"administrator i użyj ``tor. exe --hash-password`` aby wygenerować hash "
"hasła. Na przykład::"
-#: ../../source/tor.rst:59
+#: ../../source/tor.rst:112
msgid ""
"The hashed password output is displayed after some warnings (which you "
"can ignore). In the case of the above example, it is "
@@ -175,7 +312,7 @@ msgstr ""
"zignorować). W przypadku powyższego przykładu jest to "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:114
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
"win32\\torrc`` and put your hashed password output in it, replacing the "
@@ -185,7 +322,7 @@ msgstr ""
"win32\\torrc`` i umieść w nim zahashowane hasło, zastępując "
"``HashedControlPassword`` tym, który właśnie wygenerowałeś::"
-#: ../../source/tor.rst:66
+#: ../../source/tor.rst:119
msgid ""
"In your administrator command prompt, install ``tor`` as a service using "
"the appropriate ``torrc`` file you just created (as described in "
@@ -197,19 +334,20 @@ msgstr ""
"`<https://2019.www.torproject.org/docs/faq.html .en#NTService>`_). Jak "
"poniżej::"
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:123
msgid "You are now running a system ``tor`` process in Windows!"
msgstr "Systemowy proces ``tor`` działa teraz w systemie Windows!"
-#: ../../source/tor.rst:72
+#: ../../source/tor.rst:125
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
-"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
-"\"Tor authentication settings\" choose \"Password\" and set the password "
-"to the control port password you picked above. Click the \"Test "
-"Connection to Tor\" button. If all goes well, you should see \"Connected "
-"to the Tor controller\"."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using control port\", and set \"Control port\" to ``127.0.0.1``"
+" and \"Port\" to ``9051``. Under \"Tor authentication settings\" choose "
+"\"Password\" and set the password to the control port password you picked"
+" above. Click the \"Test Connection to Tor\" button. If all goes well, "
+"you should see \"Connected to the Tor controller\"."
msgstr ""
"Otwórz OnionShare i kliknij w nim ikonę „⚙”. W sekcji „W jaki sposób "
"OnionShare powinien połączyć się z siecią Tor?” wybierz „Połącz za pomocą"
@@ -219,11 +357,11 @@ msgstr ""
"przycisk „Sprawdź połączenie z siecią Tor”. Jeśli wszystko pójdzie "
"dobrze, powinieneś zobaczyć „Połączono z kontrolerem Tor”."
-#: ../../source/tor.rst:81
+#: ../../source/tor.rst:134
msgid "Using a system ``tor`` in macOS"
msgstr "Używanie systemowego ``tor`` w systemie macOS"
-#: ../../source/tor.rst:83
+#: ../../source/tor.rst:136
msgid ""
"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it, and then install Tor::"
@@ -231,21 +369,23 @@ msgstr ""
"Najpierw zainstaluj `Homebrew <https://brew.sh/>`_, jeśli jeszcze go nie "
"masz, a następnie zainstaluj Tora::"
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:140
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr "Teraz skonfiguruj Tora, aby zezwalał na połączenia z OnionShare::"
-#: ../../source/tor.rst:94
+#: ../../source/tor.rst:147
msgid "And start the system Tor service::"
msgstr "Uruchom systemową usługę Tor::"
-#: ../../source/tor.rst:98
+#: ../../source/tor.rst:151
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
-"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
-"Under \"Tor authentication settings\" choose \"No authentication, or "
-"cookie authentication\". Click the \"Test Connection to Tor\" button."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using socket file\", and set the socket file to be "
+"``/usr/local/var/run/tor/control.socket``. Under \"Tor authentication "
+"settings\" choose \"No authentication, or cookie authentication\". Click "
+"the \"Test Connection to Tor\" button."
msgstr ""
"Otwórz OnionShare i kliknij w nim ikonę „⚙”. W sekcji „W jaki sposób "
"OnionShare powinien połączyć się z siecią Tor?” wybierz \"Połącz używając"
@@ -256,17 +396,17 @@ msgstr ""
"ustaw hasło na hasło portu sterowania wybrane powyżej. Kliknij przycisk "
"„Sprawdź połączenie z siecią Tor”."
-#: ../../source/tor.rst:104 ../../source/tor.rst:124
+#: ../../source/tor.rst:157 ../../source/tor.rst:177
msgid "If all goes well, you should see \"Connected to the Tor controller\"."
msgstr ""
"Jeśli wszystko pójdzie dobrze, powinieneś zobaczyć „Połączono z "
"kontrolerem Tor”."
-#: ../../source/tor.rst:107
+#: ../../source/tor.rst:160
msgid "Using a system ``tor`` in Linux"
msgstr "Używanie systemowego ``tor`` w systemie Linux"
-#: ../../source/tor.rst:109
+#: ../../source/tor.rst:162
msgid ""
"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
"similar Linux distro, It is recommended to use the Tor Project's "
@@ -277,7 +417,7 @@ msgstr ""
"podobnej dystrybucji Linuksa, zaleca się użycie `oficjalnego repozytorium"
" Projektu Tor <https://support.torproject.org/apt/tor-deb-repo/>`_."
-#: ../../source/tor.rst:111
+#: ../../source/tor.rst:164
msgid ""
"Next, add your user to the group that runs the ``tor`` process (in the "
"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
@@ -287,7 +427,7 @@ msgstr ""
"``tor`` (w przypadku Debiana i Ubuntu, ``debian-tor``) i skonfiguruj "
"OnionShare, aby połączyć z Twoim systemem sterujący plik gniazda ``tor``."
-#: ../../source/tor.rst:113
+#: ../../source/tor.rst:166
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
@@ -295,14 +435,15 @@ msgstr ""
"Dodaj swojego użytkownika do grupy ``debian-tor``, uruchamiając to "
"polecenie (zamień ``username`` na swoją rzeczywistą nazwę użytkownika)::"
-#: ../../source/tor.rst:117
+#: ../../source/tor.rst:170
+#, fuzzy
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."
+"Reboot your computer. After it boots up again, open OnionShare, click the"
+" \"⚙\" icon in it, and switch to the Tor Settings tab. Under \"How should"
+" OnionShare connect to Tor?\" choose \"Connect using socket file\". Set "
+"the socket file to be ``/var/run/tor/control``. Under \"Tor "
+"authentication settings\" choose \"No authentication, or cookie "
+"authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
"Zrestartuj swój komputer. Po ponownym uruchomieniu otwórz OnionShare i "
"kliknij w nim ikonę „⚙”. W sekcji „W jaki sposób OnionShare powinien "
@@ -592,3 +733,37 @@ msgstr ""
#~ "`BridgeDB <https://bridges.torproject.org/>`_ Tora. "
#~ "Jeśli potrzebujesz użyć mostka, wypróbuj "
#~ "najpierw wbudowane obfs4."
+
+#~ msgid ""
+#~ "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 ""
+#~ "Wybierz sposób połączenia OnionShare z "
+#~ "siecią Tor, klikając ikonę cebuli w "
+#~ "prawym dolnym rogu okna OnionShare, aby"
+#~ " przejść do zakładki Ustawień Tor."
+
+#~ msgid "Getting Around Censorship"
+#~ msgstr "Obchodzenie cenzury"
+
+#~ 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 ""
+#~ "Jeśli twój dostęp do Internetu jest "
+#~ "ocenzurowany, możesz skonfigurować OnionShare, "
+#~ "aby łączyć się z siecią Tor za "
+#~ "pomocą `Mostków Tor <https://tb-"
+#~ "manual.torproject.org/bridges/>`_. Jeśli OnionShare "
+#~ "łączy się z Torem bez problemu, "
+#~ "nie musisz używać mostka."
+
diff --git a/docs/source/locale/pt_BR/LC_MESSAGES/security.po b/docs/source/locale/pt_BR/LC_MESSAGES/security.po
index 4e74ddfa..0b7fd16f 100644
--- a/docs/source/locale/pt_BR/LC_MESSAGES/security.po
+++ b/docs/source/locale/pt_BR/LC_MESSAGES/security.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2021-10-23 18:43+0000\n"
"Last-Translator: Gabriel Cardoso <g.cardoso@mailfence.com>\n"
"Language: pt_BR\n"
"Language-Team: pt_BR <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=n > 1\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/security.rst:2
msgid "Security Design"
@@ -82,7 +82,7 @@ msgstr ""
#: ../../source/security.rst:28
#, fuzzy
msgid ""
-"**If an attacker learns about the onion service, it still can't access "
+"**If an attacker learns about the onion service, they still can't access "
"anything.** Prior attacks against the Tor network to enumerate onion "
"services allowed attackers to discover private ``.onion`` addresses. To "
"access an OnionShare service from its address, the private key used for "
diff --git a/docs/source/locale/pt_BR/LC_MESSAGES/tor.po b/docs/source/locale/pt_BR/LC_MESSAGES/tor.po
index d5dc7a9f..3f83c29c 100644
--- a/docs/source/locale/pt_BR/LC_MESSAGES/tor.po
+++ b/docs/source/locale/pt_BR/LC_MESSAGES/tor.po
@@ -7,37 +7,184 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2021-12-02 14:52+0000\n"
"Last-Translator: Venilson Carneiro <venilsoncarneiro@pm.me>\n"
"Language: pt_BR\n"
"Language-Team: pt_BR <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=n > 1\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
msgstr "Conectando ao Tor"
-#: ../../source/tor.rst:6
-#, fuzzy
+#: ../../source/tor.rst:4
+msgid ""
+"When OnionShare starts, it will show you a screen asking you to connect "
+"to the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:8
msgid ""
-"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."
+"You can toggle on the switch \"Connect to Tor automatically\" before "
+"clicking \"Connect to Tor\". This means that next time OnionShare starts,"
+" it will automatically connect with its Tor connection settings from the "
+"last session, instead of presenting you with the connection options. If "
+"the connection fails, you can still try bridges or reconfigure Tor via "
+"the \"Network Settings\" button."
msgstr ""
-"Escolha uma forma de conectar o OnionShare ao Tor clicando no icone \"⚙\""
-" no canto inferior direito da janela do OnionShare para acessar as "
-"opções."
#: ../../source/tor.rst:11
+msgid ""
+"You can click \"Connect to Tor\" to begin the connection process. If "
+"there are no problems with your network, including any attempts to block "
+"your access to the Tor network, this should hopefully work the first "
+"time."
+msgstr ""
+
+#: ../../source/tor.rst:13
+msgid ""
+"Or, if you want to manually configure Bridges or other Tor settings "
+"before you connect, you can click \"Network Settings\"."
+msgstr ""
+
+#: ../../source/tor.rst:16
+msgid "Automatic censorship circumvention"
+msgstr ""
+
+#: ../../source/tor.rst:18
+msgid ""
+"When you click \"Connect to Tor\", if OnionShare fails to connect, it "
+"might be because Tor is censored in your country or on your local "
+"network."
+msgstr ""
+
+#: ../../source/tor.rst:20
+msgid "If this occurs, you will have these choices:"
+msgstr ""
+
+#: ../../source/tor.rst:22
+msgid "Try again without a bridge"
+msgstr ""
+
+#: ../../source/tor.rst:23
+msgid "Automatically determine my country from my IP address for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:24
+msgid "Manually select my country for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:28
+msgid ""
+"If you choose the \"Try again without a bridge\" option, OnionShare will "
+"retry connecting to Tor like normal, without attempting to bypass "
+"censorship."
+msgstr ""
+
+#: ../../source/tor.rst:30
+msgid ""
+"The other two options will attempt to automatically bypass censorship "
+"using Tor bridges. If your network provider is blocking access to the Tor"
+" network, you can hopefully still connect to a Tor bridge, which will "
+"then connect you to the Tor network, circumventing the censorship. Both "
+"of these options use the Tor Project's Censorship Circumvention API to "
+"provide you with bridge settings that should work for you. OnionShare "
+"will temporarily use the `Meek "
+"<https://gitlab.torproject.org/legacy/trac/-/wikis/doc/meek/>`_ domain-"
+"fronting proxy to make a non-Tor connection from your computer to Tor's "
+"Censorship Circumvention API. The Meek proxy hides the fact that you are "
+"trying to find a way to connect to Tor."
+msgstr ""
+
+#: ../../source/tor.rst:36
+msgid ""
+"If you choose \"Automatically determine my country from my IP address for"
+" bridge settings\", the Censorship Circumvention API will consider your "
+"IP address (yes, your real IP address) to determine what country you "
+"might reside in. Based on the country information, the API will try to "
+"automatically find bridges that suit your location."
+msgstr ""
+
+#: ../../source/tor.rst:41
+msgid ""
+"If you choose \"Manually select my country for bridge settings\", the "
+"Censorship API will find the bridges that suit the country that you "
+"specified."
+msgstr ""
+
+#: ../../source/tor.rst:46
+msgid "How automatic censorship circumvention works"
+msgstr ""
+
+#: ../../source/tor.rst:48
+msgid ""
+"If the Censorship Circumvention API finds bridges that it believes will "
+"suit you, OnionShare will try to reconnect to Tor using those bridges. If"
+" the API does not find any bridges for your location, OnionShare will ask"
+" the API for \"fallback\" options, and then try to reconnect using those."
+msgstr ""
+
+#: ../../source/tor.rst:50
+msgid ""
+"If for some reason OnionShare fails to connect to the Censorship API "
+"itself, or if the API returns an error message, OnionShare will attempt "
+"to use the obfs4 built-in bridges."
+msgstr ""
+
+#: ../../source/tor.rst:52
+msgid ""
+"It's important to note that the requests to the Censorship Circumvention "
+"API do not go over the Tor network (because if you could connect to Tor "
+"already, you wouldn't need to connect to the API)."
+msgstr ""
+
+#: ../../source/tor.rst:54
+msgid ""
+"Even though it's hard for an adversary to discover where the Meek request"
+" is going, this may still be risky for some users. Therefore, it is an "
+"opt-in feature. The use of Meek and non-torified network requests are "
+"limited only to making one or two requests to the Censorship "
+"Circumvention API. Then Meek is stopped, and all further network requests"
+" happen over the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:56
+msgid ""
+"If you are uncomfortable with making a request that doesn't go over the "
+"Tor network, you can click \"Network Settings\" (or the Settings icon in "
+"the bottom right corner, followed by the Tor Settings tab in the screen "
+"that appears), and manually configure bridges. After you save any bridge "
+"settings, OnionShare will try to reconnect using those bridges."
+msgstr ""
+
+#: ../../source/tor.rst:59
+msgid "Manually configure Tor settings"
+msgstr ""
+
+#: ../../source/tor.rst:61
+msgid ""
+"You can get to the Tor settings by clicking \"Network Settings\" on the "
+"welcome screen, or by clicking the \"⚙\" icon in the bottom-right corner "
+"of the application, and then switch to the Tor Settings tab in the screen"
+" that appears."
+msgstr ""
+
+#: ../../source/tor.rst:65
+msgid ""
+"Here are the different ways you can configure OnionShare to connect to "
+"Tor:"
+msgstr ""
+
+#: ../../source/tor.rst:68
msgid "Use the Tor version built into OnionShare"
msgstr "Use a versão do Tor que está integrada no OnionShare"
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:70
msgid ""
"This is the default, simplest and most reliable way that OnionShare "
"connects to Tor. For this reason, it's recommended for most users."
@@ -46,7 +193,7 @@ msgstr ""
"conecta ao Tor . Por esta razão, é recomendado para a maioria dos "
"usuários."
-#: ../../source/tor.rst:16
+#: ../../source/tor.rst:73
msgid ""
"When you open OnionShare, it launches an already configured ``tor`` "
"process in the background for OnionShare to use. It doesn't interfere "
@@ -58,32 +205,21 @@ msgstr ""
"com outros processos ``tor`` em seu computador, então você pode utilizar "
"o Navegador Tor ou o sistema ``tor`` por conta própria."
-#: ../../source/tor.rst:20
-msgid "Getting Around Censorship"
-msgstr "Contornando a Censura"
-
-#: ../../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-"
-"manual.torproject.org/bridges/>`_. If OnionShare connects to Tor without "
-"one, you don't need to use a bridge."
+#: ../../source/tor.rst:76
+msgid "**Using bridges**"
msgstr ""
-"Se o seu acesso à internet for censurado, você pode configurar o "
-"OnionShare para conectar-se à rede Tor usando `Tor bridges <https://tb-"
-"manual.torproject.org/bridges/>` _. Se o OnionShare se conectar à rede "
-"Tor sem o uso de uma bridge, você não precisa usa-las."
-#: ../../source/tor.rst:24
+#: ../../source/tor.rst:78
+#, fuzzy
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."
+"To use a bridge, you must select \"Use the Tor version built into "
+"OnionShare\" and check the \"Use a bridge\" checkbox."
msgstr ""
"Para usar uma ponte, abra a aba Configurações do Tor. Você deve "
"selecionar \"Use the Tor version built into OnionShare\" e marcar a caixa"
" de seleção \"Use a bridge\"."
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:80
msgid ""
"Try using a built-in bridge first. Using `obfs4` or `snowflake` bridges "
"is recommended over using `meek-azure`."
@@ -91,7 +227,7 @@ msgstr ""
"Tente usar primeiro uma ponte embutida. Recomenda-se utilizar pontes "
"\"obfs4\" ou \"snowflake\" em vez de utilizar \"meek-azure\"."
-#: ../../source/tor.rst:31
+#: ../../source/tor.rst:84
msgid ""
"If using a built-in bridge doesn't work, you can request a bridge from "
"torproject.org. You will have to solve a CAPTCHA in order to request a "
@@ -103,7 +239,7 @@ msgstr ""
"solicitar uma ponte. (Isto torna mais difícil para os governos ou ISPs "
"(provedores de internet) bloquearem o acesso às pontes Tor)."
-#: ../../source/tor.rst:35
+#: ../../source/tor.rst:88
msgid ""
"You also have the option of using a bridge that you learned about from a "
"trusted source."
@@ -111,11 +247,11 @@ msgstr ""
"Você também tem a opção de usar uma ponte que você teve acesso a partir "
"de uma fonte confiável."
-#: ../../source/tor.rst:38
+#: ../../source/tor.rst:91
msgid "Attempt auto-configuration with Tor Browser"
msgstr "Tentativa de configuração automática com o navegador Tor"
-#: ../../source/tor.rst:40
+#: ../../source/tor.rst:93
msgid ""
"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
"and don't want two ``tor`` processes running, you can use the ``tor`` "
@@ -127,11 +263,11 @@ msgstr ""
"do navegador Tor. Lembre-se de que você precisa manter o navegador Tor "
"aberto em segundo plano enquanto usa o OnionShare para que isso funcione."
-#: ../../source/tor.rst:44
+#: ../../source/tor.rst:97
msgid "Using a system ``tor`` in Windows"
msgstr "Usando um sistema ``tor``no Windows"
-#: ../../source/tor.rst:46
+#: ../../source/tor.rst:99
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
@@ -139,7 +275,7 @@ msgstr ""
"Isso é bastante avançado. Você precisará saber como editar arquivos de "
"texto simples e fazer coisas como administrador."
-#: ../../source/tor.rst:48
+#: ../../source/tor.rst:101
msgid ""
"Download the Tor Windows Expert Bundle `from "
"<https://www.torproject.org/download/tor/>`_. Extract the compressed file"
@@ -152,7 +288,7 @@ msgstr ""
"`` Renomeie a pasta extraída com `` Data`` e `` Tor`` nela para `` tor-"
"win32``."
-#: ../../source/tor.rst:52
+#: ../../source/tor.rst:105
msgid ""
"Make up a control port password. (Using 7 words in a sequence like "
"``comprised stumble rummage work avenging construct volatile`` is a good "
@@ -166,7 +302,7 @@ msgstr ""
"cmd``) como administrador e use `` tor. exe --hash-password`` para gerar "
"um hash de sua senha. Por exemplo::"
-#: ../../source/tor.rst:59
+#: ../../source/tor.rst:112
msgid ""
"The hashed password output is displayed after some warnings (which you "
"can ignore). In the case of the above example, it is "
@@ -176,7 +312,7 @@ msgstr ""
"ignorar). No caso do exemplo acima, é `` 16: "
"00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:114
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
"win32\\torrc`` and put your hashed password output in it, replacing the "
@@ -186,7 +322,7 @@ msgstr ""
"tor-win32 \\ torrc`` e coloque sua saída de senha hash nele, substituindo"
" o `` HashedControlPassword`` pelo que você acabou de gerar ::"
-#: ../../source/tor.rst:66
+#: ../../source/tor.rst:119
msgid ""
"In your administrator command prompt, install ``tor`` as a service using "
"the appropriate ``torrc`` file you just created (as described in "
@@ -198,19 +334,20 @@ msgstr ""
" descrito em `<https://2019.www.torproject.org/docs/faq.html .en # "
"NTService> `_). Assim::"
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:123
msgid "You are now running a system ``tor`` process in Windows!"
msgstr "Você agora está executando um processo `` tor`` do sistema no Windows!"
-#: ../../source/tor.rst:72
+#: ../../source/tor.rst:125
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
-"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
-"\"Tor authentication settings\" choose \"Password\" and set the password "
-"to the control port password you picked above. Click the \"Test "
-"Connection to Tor\" button. If all goes well, you should see \"Connected "
-"to the Tor controller\"."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using control port\", and set \"Control port\" to ``127.0.0.1``"
+" and \"Port\" to ``9051``. Under \"Tor authentication settings\" choose "
+"\"Password\" and set the password to the control port password you picked"
+" above. Click the \"Test Connection to Tor\" button. If all goes well, "
+"you should see \"Connected to the Tor controller\"."
msgstr ""
"Abra o OnionShare e clique no ícone \"⚙\" nele. Em \"Como o OnionShare "
"deve se conectar ao Tor?\" escolha \"Conectar usando a porta de "
@@ -220,11 +357,11 @@ msgstr ""
"escolheu acima. Clique no botão \"Testar conexão com o Tor\". Se tudo "
"correr bem, você deverá ver \"Conectado ao controlador Tor\"."
-#: ../../source/tor.rst:81
+#: ../../source/tor.rst:134
msgid "Using a system ``tor`` in macOS"
msgstr "Usando um sistema `` tor`` no macOS"
-#: ../../source/tor.rst:83
+#: ../../source/tor.rst:136
msgid ""
"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it, and then install Tor::"
@@ -232,21 +369,23 @@ msgstr ""
"Primeiro, instale o `Homebrew <https://brew.sh/>` _ se você ainda não o "
"tiver, e então instale o Tor ::"
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:140
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr "Agora configure o Tor para permitir conexões do OnionShare ::"
-#: ../../source/tor.rst:94
+#: ../../source/tor.rst:147
msgid "And start the system Tor service::"
msgstr "E inicie o serviço Tor do sistema ::"
-#: ../../source/tor.rst:98
+#: ../../source/tor.rst:151
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
-"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
-"Under \"Tor authentication settings\" choose \"No authentication, or "
-"cookie authentication\". Click the \"Test Connection to Tor\" button."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using socket file\", and set the socket file to be "
+"``/usr/local/var/run/tor/control.socket``. Under \"Tor authentication "
+"settings\" choose \"No authentication, or cookie authentication\". Click "
+"the \"Test Connection to Tor\" button."
msgstr ""
"Abra o OnionShare e clique no ícone \"⚙\" nele. Em \"Como o OnionShare "
"deve se conectar ao Tor?\" escolha \"Conectar usando arquivo de soquete\""
@@ -255,15 +394,15 @@ msgstr ""
" autenticação ou autenticação de cookie\". Clique no botão \"Testar "
"conexão com o Tor\"."
-#: ../../source/tor.rst:104 ../../source/tor.rst:124
+#: ../../source/tor.rst:157 ../../source/tor.rst:177
msgid "If all goes well, you should see \"Connected to the Tor controller\"."
msgstr "Se tudo correr bem, você deverá ver \"Conectado ao controlador Tor\"."
-#: ../../source/tor.rst:107
+#: ../../source/tor.rst:160
msgid "Using a system ``tor`` in Linux"
msgstr "Usando um sistema `` tor`` no Linux"
-#: ../../source/tor.rst:109
+#: ../../source/tor.rst:162
msgid ""
"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
"similar Linux distro, It is recommended to use the Tor Project's "
@@ -275,7 +414,7 @@ msgstr ""
"`repositório oficial do Projeto Tor <https://support.torproject.org/apt"
"/tor-deb-repo/>` _."
-#: ../../source/tor.rst:111
+#: ../../source/tor.rst:164
msgid ""
"Next, add your user to the group that runs the ``tor`` process (in the "
"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
@@ -285,7 +424,7 @@ msgstr ""
" (no caso do Debian e Ubuntu, `` debian-tor``) e configure o OnionShare "
"para se conectar ao arquivo de soquete de controle do sistema `` tor``."
-#: ../../source/tor.rst:113
+#: ../../source/tor.rst:166
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
@@ -293,14 +432,15 @@ msgstr ""
"Adicione seu usuário ao grupo `` debian-tor`` executando este comando "
"(substitua `` username`` pelo seu nome de usuário real) ::"
-#: ../../source/tor.rst:117
+#: ../../source/tor.rst:170
+#, fuzzy
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."
+"Reboot your computer. After it boots up again, open OnionShare, click the"
+" \"⚙\" icon in it, and switch to the Tor Settings tab. Under \"How should"
+" OnionShare connect to Tor?\" choose \"Connect using socket file\". Set "
+"the socket file to be ``/var/run/tor/control``. Under \"Tor "
+"authentication settings\" choose \"No authentication, or cookie "
+"authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
"Reinicie o computador. Depois de inicializar novamente, abra o OnionShare"
" e clique no ícone \"⚙\" nele. Em \"Como o OnionShare deve se conectar ao"
@@ -592,3 +732,38 @@ msgstr ""
#~ " ponte, tente primeiro as obfs4 "
#~ "integradas."
+#~ msgid ""
+#~ "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 ""
+#~ "Escolha uma forma de conectar o "
+#~ "OnionShare ao Tor clicando no icone "
+#~ "\"⚙\" no canto inferior direito da "
+#~ "janela do OnionShare para acessar as "
+#~ "opções."
+
+#~ msgid "Getting Around Censorship"
+#~ msgstr "Contornando a Censura"
+
+#~ 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 ""
+#~ "Se o seu acesso à internet for "
+#~ "censurado, você pode configurar o "
+#~ "OnionShare para conectar-se à rede "
+#~ "Tor usando `Tor bridges <https://tb-"
+#~ "manual.torproject.org/bridges/>` _. Se o "
+#~ "OnionShare se conectar à rede Tor "
+#~ "sem o uso de uma bridge, você "
+#~ "não precisa usa-las."
+
diff --git a/docs/source/locale/ru/LC_MESSAGES/security.po b/docs/source/locale/ru/LC_MESSAGES/security.po
index 7d7f7cb0..712a7d9f 100644
--- a/docs/source/locale/ru/LC_MESSAGES/security.po
+++ b/docs/source/locale/ru/LC_MESSAGES/security.po
@@ -7,17 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2021-09-25 12:36+0000\n"
"Last-Translator: Alexander Tarasenko <alexound.login@gmail.com>\n"
"Language: ru\n"
"Language-Team: ru <LL@li.org>\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/security.rst:2
msgid "Security Design"
@@ -84,7 +84,7 @@ msgstr ""
#: ../../source/security.rst:28
#, fuzzy
msgid ""
-"**If an attacker learns about the onion service, it still can't access "
+"**If an attacker learns about the onion service, they still can't access "
"anything.** Prior attacks against the Tor network to enumerate onion "
"services allowed attackers to discover private ``.onion`` addresses. To "
"access an OnionShare service from its address, the private key used for "
diff --git a/docs/source/locale/ru/LC_MESSAGES/tor.po b/docs/source/locale/ru/LC_MESSAGES/tor.po
index 5980d0d4..0d0f783d 100644
--- a/docs/source/locale/ru/LC_MESSAGES/tor.po
+++ b/docs/source/locale/ru/LC_MESSAGES/tor.po
@@ -7,38 +7,185 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2021-12-17 04:52+0000\n"
"Last-Translator: Alexander Tarasenko <alexound.login@gmail.com>\n"
"Language: ru\n"
"Language-Team: ru <LL@li.org>\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
msgstr "Подключение к сети Тор"
-#: ../../source/tor.rst:6
-#, fuzzy
+#: ../../source/tor.rst:4
+msgid ""
+"When OnionShare starts, it will show you a screen asking you to connect "
+"to the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:8
msgid ""
-"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."
+"You can toggle on the switch \"Connect to Tor automatically\" before "
+"clicking \"Connect to Tor\". This means that next time OnionShare starts,"
+" it will automatically connect with its Tor connection settings from the "
+"last session, instead of presenting you with the connection options. If "
+"the connection fails, you can still try bridges or reconfigure Tor via "
+"the \"Network Settings\" button."
msgstr ""
-"Чтобы выбрать способ подключения OnionShare к сети Tor, нажмите на значок"
-" \"⚙\" в нижнем правом углу окна OnionShare. Так Вы попадёте в настройки "
-"приложения."
#: ../../source/tor.rst:11
+msgid ""
+"You can click \"Connect to Tor\" to begin the connection process. If "
+"there are no problems with your network, including any attempts to block "
+"your access to the Tor network, this should hopefully work the first "
+"time."
+msgstr ""
+
+#: ../../source/tor.rst:13
+msgid ""
+"Or, if you want to manually configure Bridges or other Tor settings "
+"before you connect, you can click \"Network Settings\"."
+msgstr ""
+
+#: ../../source/tor.rst:16
+msgid "Automatic censorship circumvention"
+msgstr ""
+
+#: ../../source/tor.rst:18
+msgid ""
+"When you click \"Connect to Tor\", if OnionShare fails to connect, it "
+"might be because Tor is censored in your country or on your local "
+"network."
+msgstr ""
+
+#: ../../source/tor.rst:20
+msgid "If this occurs, you will have these choices:"
+msgstr ""
+
+#: ../../source/tor.rst:22
+msgid "Try again without a bridge"
+msgstr ""
+
+#: ../../source/tor.rst:23
+msgid "Automatically determine my country from my IP address for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:24
+msgid "Manually select my country for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:28
+msgid ""
+"If you choose the \"Try again without a bridge\" option, OnionShare will "
+"retry connecting to Tor like normal, without attempting to bypass "
+"censorship."
+msgstr ""
+
+#: ../../source/tor.rst:30
+msgid ""
+"The other two options will attempt to automatically bypass censorship "
+"using Tor bridges. If your network provider is blocking access to the Tor"
+" network, you can hopefully still connect to a Tor bridge, which will "
+"then connect you to the Tor network, circumventing the censorship. Both "
+"of these options use the Tor Project's Censorship Circumvention API to "
+"provide you with bridge settings that should work for you. OnionShare "
+"will temporarily use the `Meek "
+"<https://gitlab.torproject.org/legacy/trac/-/wikis/doc/meek/>`_ domain-"
+"fronting proxy to make a non-Tor connection from your computer to Tor's "
+"Censorship Circumvention API. The Meek proxy hides the fact that you are "
+"trying to find a way to connect to Tor."
+msgstr ""
+
+#: ../../source/tor.rst:36
+msgid ""
+"If you choose \"Automatically determine my country from my IP address for"
+" bridge settings\", the Censorship Circumvention API will consider your "
+"IP address (yes, your real IP address) to determine what country you "
+"might reside in. Based on the country information, the API will try to "
+"automatically find bridges that suit your location."
+msgstr ""
+
+#: ../../source/tor.rst:41
+msgid ""
+"If you choose \"Manually select my country for bridge settings\", the "
+"Censorship API will find the bridges that suit the country that you "
+"specified."
+msgstr ""
+
+#: ../../source/tor.rst:46
+msgid "How automatic censorship circumvention works"
+msgstr ""
+
+#: ../../source/tor.rst:48
+msgid ""
+"If the Censorship Circumvention API finds bridges that it believes will "
+"suit you, OnionShare will try to reconnect to Tor using those bridges. If"
+" the API does not find any bridges for your location, OnionShare will ask"
+" the API for \"fallback\" options, and then try to reconnect using those."
+msgstr ""
+
+#: ../../source/tor.rst:50
+msgid ""
+"If for some reason OnionShare fails to connect to the Censorship API "
+"itself, or if the API returns an error message, OnionShare will attempt "
+"to use the obfs4 built-in bridges."
+msgstr ""
+
+#: ../../source/tor.rst:52
+msgid ""
+"It's important to note that the requests to the Censorship Circumvention "
+"API do not go over the Tor network (because if you could connect to Tor "
+"already, you wouldn't need to connect to the API)."
+msgstr ""
+
+#: ../../source/tor.rst:54
+msgid ""
+"Even though it's hard for an adversary to discover where the Meek request"
+" is going, this may still be risky for some users. Therefore, it is an "
+"opt-in feature. The use of Meek and non-torified network requests are "
+"limited only to making one or two requests to the Censorship "
+"Circumvention API. Then Meek is stopped, and all further network requests"
+" happen over the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:56
+msgid ""
+"If you are uncomfortable with making a request that doesn't go over the "
+"Tor network, you can click \"Network Settings\" (or the Settings icon in "
+"the bottom right corner, followed by the Tor Settings tab in the screen "
+"that appears), and manually configure bridges. After you save any bridge "
+"settings, OnionShare will try to reconnect using those bridges."
+msgstr ""
+
+#: ../../source/tor.rst:59
+msgid "Manually configure Tor settings"
+msgstr ""
+
+#: ../../source/tor.rst:61
+msgid ""
+"You can get to the Tor settings by clicking \"Network Settings\" on the "
+"welcome screen, or by clicking the \"⚙\" icon in the bottom-right corner "
+"of the application, and then switch to the Tor Settings tab in the screen"
+" that appears."
+msgstr ""
+
+#: ../../source/tor.rst:65
+msgid ""
+"Here are the different ways you can configure OnionShare to connect to "
+"Tor:"
+msgstr ""
+
+#: ../../source/tor.rst:68
msgid "Use the Tor version built into OnionShare"
msgstr "Использовать версию Tor встроенную в OnionShare"
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:70
msgid ""
"This is the default, simplest and most reliable way that OnionShare "
"connects to Tor. For this reason, it's recommended for most users."
@@ -46,7 +193,7 @@ msgstr ""
"Это самый простой, надёжный, используемый по-умолчанию способ подключения"
" OnionShare к сети Tor, рекомендуемый для большиства пользователей."
-#: ../../source/tor.rst:16
+#: ../../source/tor.rst:73
msgid ""
"When you open OnionShare, it launches an already configured ``tor`` "
"process in the background for OnionShare to use. It doesn't interfere "
@@ -58,33 +205,21 @@ msgstr ""
"компьютере процессам ``tor``, так что возможно параллельное "
"использование, системного ``tor`` или Tor Browser."
-#: ../../source/tor.rst:20
-msgid "Getting Around Censorship"
-msgstr "Обойти цензуру"
-
-#: ../../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-"
-"manual.torproject.org/bridges/>`_. If OnionShare connects to Tor without "
-"one, you don't need to use a bridge."
+#: ../../source/tor.rst:76
+msgid "**Using bridges**"
msgstr ""
-"Если доступ к сети Интернет подвергается цензуре, можно настроить "
-"подключение OnionShare к сети Tor при помощи `мостов Tor` "
-"<https://2019.www.torproject.org/docs/bridges.html.en>`_. Если OnionShare"
-" успешно подключается к сети Tor, использование сетевого моста "
-"необязательно."
-#: ../../source/tor.rst:24
+#: ../../source/tor.rst:78
+#, fuzzy
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."
+"To use a bridge, you must select \"Use the Tor version built into "
+"OnionShare\" and check the \"Use a bridge\" checkbox."
msgstr ""
"Чтобы изспользовать мост, откройте вкладку \"Настройки Tor\". Нужно "
"выбрать пункт \"Использовать версию Tor встроенную в OnionShare\" и "
"установить флажок \"Использовать мост\"."
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:80
msgid ""
"Try using a built-in bridge first. Using `obfs4` or `snowflake` bridges "
"is recommended over using `meek-azure`."
@@ -92,7 +227,7 @@ msgstr ""
"Попробуйте сначала использовать встроенные мосты. Бльше рекомендуется "
"использование мостов `obfs4` или `snowflake`, нежели `meek-azure`."
-#: ../../source/tor.rst:31
+#: ../../source/tor.rst:84
msgid ""
"If using a built-in bridge doesn't work, you can request a bridge from "
"torproject.org. You will have to solve a CAPTCHA in order to request a "
@@ -104,7 +239,7 @@ msgstr ""
"мост. (Это затрудняет правительству и поставщикам услуг интернета "
"блокировку мостов Tor.)"
-#: ../../source/tor.rst:35
+#: ../../source/tor.rst:88
msgid ""
"You also have the option of using a bridge that you learned about from a "
"trusted source."
@@ -112,11 +247,11 @@ msgstr ""
"Также вы можете использовать мост, о котором вы узнали из доверенного "
"источника."
-#: ../../source/tor.rst:38
+#: ../../source/tor.rst:91
msgid "Attempt auto-configuration with Tor Browser"
msgstr "Попытка автоматической конфигурации при помощи Tor Browser"
-#: ../../source/tor.rst:40
+#: ../../source/tor.rst:93
msgid ""
"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
"and don't want two ``tor`` processes running, you can use the ``tor`` "
@@ -130,11 +265,11 @@ msgstr ""
"запущен в фоновом режиме в течение всего времени использования "
"OnionShare."
-#: ../../source/tor.rst:44
+#: ../../source/tor.rst:97
msgid "Using a system ``tor`` in Windows"
msgstr "Использование системного процесса ``tor`` в ОС Windows"
-#: ../../source/tor.rst:46
+#: ../../source/tor.rst:99
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
@@ -143,7 +278,7 @@ msgstr ""
"редактирование конфигурационных файлов и администрирование операционной "
"системы."
-#: ../../source/tor.rst:48
+#: ../../source/tor.rst:101
msgid ""
"Download the Tor Windows Expert Bundle `from "
"<https://www.torproject.org/download/tor/>`_. Extract the compressed file"
@@ -155,7 +290,7 @@ msgstr ""
"скопируйте содержимое в директорию ``C:\\Program Files (x86)\\``. "
"Переименуйте директорию, содержащую ``Data`` и ``Tor`` в ``tor-win32``."
-#: ../../source/tor.rst:52
+#: ../../source/tor.rst:105
msgid ""
"Make up a control port password. (Using 7 words in a sequence like "
"``comprised stumble rummage work avenging construct volatile`` is a good "
@@ -169,7 +304,7 @@ msgstr ""
"``cmd`` с правами администратора и выполните команду ``tor.exe --hash-"
"password`` чтобы захешировать придуманный пароль. Например::"
-#: ../../source/tor.rst:59
+#: ../../source/tor.rst:112
msgid ""
"The hashed password output is displayed after some warnings (which you "
"can ignore). In the case of the above example, it is "
@@ -179,7 +314,7 @@ msgstr ""
"(которые можно проигнорировать). В примере, показанном выше, это "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:114
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
"win32\\torrc`` and put your hashed password output in it, replacing the "
@@ -189,7 +324,7 @@ msgstr ""
"win32\\torrc`` и записать туда только что созданный, захешированный "
"пароль, заменив ``HashedControlPassword``::"
-#: ../../source/tor.rst:66
+#: ../../source/tor.rst:119
msgid ""
"In your administrator command prompt, install ``tor`` as a service using "
"the appropriate ``torrc`` file you just created (as described in "
@@ -202,19 +337,20 @@ msgstr ""
"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_. "
"Например::"
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:123
msgid "You are now running a system ``tor`` process in Windows!"
msgstr "Теперь ``tor`` запущен как системный процесс в ОС Windows!"
-#: ../../source/tor.rst:72
+#: ../../source/tor.rst:125
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
-"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
-"\"Tor authentication settings\" choose \"Password\" and set the password "
-"to the control port password you picked above. Click the \"Test "
-"Connection to Tor\" button. If all goes well, you should see \"Connected "
-"to the Tor controller\"."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using control port\", and set \"Control port\" to ``127.0.0.1``"
+" and \"Port\" to ``9051``. Under \"Tor authentication settings\" choose "
+"\"Password\" and set the password to the control port password you picked"
+" above. Click the \"Test Connection to Tor\" button. If all goes well, "
+"you should see \"Connected to the Tor controller\"."
msgstr ""
"Теперь нужно запустить OnionShare и нажать на значок \"⚙\" . Под "
"заголовком \"Как OnionShare следует подключаться к сети Tor?\" выберите "
@@ -225,11 +361,11 @@ msgstr ""
"кнопку \"Проверить подключение к сети Tor\". Если всё прошло хорошо, то "
"появится сообщение \"Подключено к контроллеру Tor\"."
-#: ../../source/tor.rst:81
+#: ../../source/tor.rst:134
msgid "Using a system ``tor`` in macOS"
msgstr "Использование системного процесса ``tor`` в macOS"
-#: ../../source/tor.rst:83
+#: ../../source/tor.rst:136
msgid ""
"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it, and then install Tor::"
@@ -237,21 +373,23 @@ msgstr ""
"Прежде всего, при необходимости установите `Homebrew <https://brew.sh/>`_"
" . Затем установите Tor::"
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:140
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr "Теперь настройте Tor так, чтобы OnionShare мог его использовать::"
-#: ../../source/tor.rst:94
+#: ../../source/tor.rst:147
msgid "And start the system Tor service::"
msgstr "И запустите сервис Tor::"
-#: ../../source/tor.rst:98
+#: ../../source/tor.rst:151
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
-"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
-"Under \"Tor authentication settings\" choose \"No authentication, or "
-"cookie authentication\". Click the \"Test Connection to Tor\" button."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using socket file\", and set the socket file to be "
+"``/usr/local/var/run/tor/control.socket``. Under \"Tor authentication "
+"settings\" choose \"No authentication, or cookie authentication\". Click "
+"the \"Test Connection to Tor\" button."
msgstr ""
"Запустите OnionShare и нажмите на значок \"⚙\". Под заголовком \"Как "
"OnionShare следует подключаться к сети Tor?\" выберите \"Использовать "
@@ -261,17 +399,17 @@ msgstr ""
"cookie-аутентификация\". Нажмите кнопку \"Проверить подключение к сети "
"Tor\"."
-#: ../../source/tor.rst:104 ../../source/tor.rst:124
+#: ../../source/tor.rst:157 ../../source/tor.rst:177
msgid "If all goes well, you should see \"Connected to the Tor controller\"."
msgstr ""
"Если всё прошло хорошо, то появится сообщение \"Подключено к контроллеру "
"Tor\"."
-#: ../../source/tor.rst:107
+#: ../../source/tor.rst:160
msgid "Using a system ``tor`` in Linux"
msgstr "Использование системного ``tor`` в ОС Linux"
-#: ../../source/tor.rst:109
+#: ../../source/tor.rst:162
msgid ""
"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
"similar Linux distro, It is recommended to use the Tor Project's "
@@ -283,7 +421,7 @@ msgstr ""
"репозиторий <https://support.torproject.org/apt/tor-deb-repo/>`_ Tor "
"Project."
-#: ../../source/tor.rst:111
+#: ../../source/tor.rst:164
msgid ""
"Next, add your user to the group that runs the ``tor`` process (in the "
"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
@@ -294,7 +432,7 @@ msgstr ""
"``debian-tor``) и настроить подключение OnionShare к системному процессу "
"``tor`` при помощи файла сокета."
-#: ../../source/tor.rst:113
+#: ../../source/tor.rst:166
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
@@ -302,14 +440,15 @@ msgstr ""
"Добавьте свого пользователя в группу ``debian-tor`` при помощи команды "
"(измените ``username`` на имя своего пользователя))::"
-#: ../../source/tor.rst:117
+#: ../../source/tor.rst:170
+#, fuzzy
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."
+"Reboot your computer. After it boots up again, open OnionShare, click the"
+" \"⚙\" icon in it, and switch to the Tor Settings tab. Under \"How should"
+" OnionShare connect to Tor?\" choose \"Connect using socket file\". Set "
+"the socket file to be ``/var/run/tor/control``. Under \"Tor "
+"authentication settings\" choose \"No authentication, or cookie "
+"authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
"Перезагрузите компьютер. После загрузки операционной системы запустите "
"OnionShare и нажмите на значок \"⚙\" . Под заголовком \"Как OnionShare "
@@ -581,3 +720,38 @@ msgstr ""
#~ " мостов необходимо, рекомендуется в первую"
#~ " очередь попробовать транспорты obfs4."
+#~ msgid ""
+#~ "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 ""
+#~ "Чтобы выбрать способ подключения OnionShare"
+#~ " к сети Tor, нажмите на значок "
+#~ "\"⚙\" в нижнем правом углу окна "
+#~ "OnionShare. Так Вы попадёте в настройки"
+#~ " приложения."
+
+#~ msgid "Getting Around Censorship"
+#~ msgstr "Обойти цензуру"
+
+#~ 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 ""
+#~ "Если доступ к сети Интернет подвергается"
+#~ " цензуре, можно настроить подключение "
+#~ "OnionShare к сети Tor при помощи "
+#~ "`мостов Tor` "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. Если"
+#~ " OnionShare успешно подключается к сети "
+#~ "Tor, использование сетевого моста "
+#~ "необязательно."
+
diff --git a/docs/source/locale/tr/LC_MESSAGES/security.po b/docs/source/locale/tr/LC_MESSAGES/security.po
index 8d4cad99..a1cfc050 100644
--- a/docs/source/locale/tr/LC_MESSAGES/security.po
+++ b/docs/source/locale/tr/LC_MESSAGES/security.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2021-10-02 12:36+0000\n"
"Last-Translator: Kaya Zeren <kayazeren@gmail.com>\n"
"Language: tr\n"
"Language-Team: tr <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/security.rst:2
msgid "Security Design"
@@ -83,7 +83,7 @@ msgstr ""
#: ../../source/security.rst:28
#, fuzzy
msgid ""
-"**If an attacker learns about the onion service, it still can't access "
+"**If an attacker learns about the onion service, they still can't access "
"anything.** Prior attacks against the Tor network to enumerate onion "
"services allowed attackers to discover private ``.onion`` addresses. To "
"access an OnionShare service from its address, the private key used for "
diff --git a/docs/source/locale/tr/LC_MESSAGES/tor.po b/docs/source/locale/tr/LC_MESSAGES/tor.po
index 39a56cfd..cf9441ec 100644
--- a/docs/source/locale/tr/LC_MESSAGES/tor.po
+++ b/docs/source/locale/tr/LC_MESSAGES/tor.po
@@ -7,37 +7,184 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2021-11-25 15:52+0000\n"
"Last-Translator: Oğuz Ersen <oguzersen@protonmail.com>\n"
"Language: tr\n"
"Language-Team: tr <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
msgstr "Tor Bağlantısı Kurmak"
-#: ../../source/tor.rst:6
-#, fuzzy
+#: ../../source/tor.rst:4
+msgid ""
+"When OnionShare starts, it will show you a screen asking you to connect "
+"to the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:8
msgid ""
-"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."
+"You can toggle on the switch \"Connect to Tor automatically\" before "
+"clicking \"Connect to Tor\". This means that next time OnionShare starts,"
+" it will automatically connect with its Tor connection settings from the "
+"last session, instead of presenting you with the connection options. If "
+"the connection fails, you can still try bridges or reconfigure Tor via "
+"the \"Network Settings\" button."
msgstr ""
-"OnionShare penceresinin sağ alt kısmındaki Tor onion simgesine tıklayarak"
-" ayarlara gidin ve OnionShare ile Tor bağlantısı kurmanın bir yolunu "
-"seçin."
#: ../../source/tor.rst:11
+msgid ""
+"You can click \"Connect to Tor\" to begin the connection process. If "
+"there are no problems with your network, including any attempts to block "
+"your access to the Tor network, this should hopefully work the first "
+"time."
+msgstr ""
+
+#: ../../source/tor.rst:13
+msgid ""
+"Or, if you want to manually configure Bridges or other Tor settings "
+"before you connect, you can click \"Network Settings\"."
+msgstr ""
+
+#: ../../source/tor.rst:16
+msgid "Automatic censorship circumvention"
+msgstr ""
+
+#: ../../source/tor.rst:18
+msgid ""
+"When you click \"Connect to Tor\", if OnionShare fails to connect, it "
+"might be because Tor is censored in your country or on your local "
+"network."
+msgstr ""
+
+#: ../../source/tor.rst:20
+msgid "If this occurs, you will have these choices:"
+msgstr ""
+
+#: ../../source/tor.rst:22
+msgid "Try again without a bridge"
+msgstr ""
+
+#: ../../source/tor.rst:23
+msgid "Automatically determine my country from my IP address for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:24
+msgid "Manually select my country for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:28
+msgid ""
+"If you choose the \"Try again without a bridge\" option, OnionShare will "
+"retry connecting to Tor like normal, without attempting to bypass "
+"censorship."
+msgstr ""
+
+#: ../../source/tor.rst:30
+msgid ""
+"The other two options will attempt to automatically bypass censorship "
+"using Tor bridges. If your network provider is blocking access to the Tor"
+" network, you can hopefully still connect to a Tor bridge, which will "
+"then connect you to the Tor network, circumventing the censorship. Both "
+"of these options use the Tor Project's Censorship Circumvention API to "
+"provide you with bridge settings that should work for you. OnionShare "
+"will temporarily use the `Meek "
+"<https://gitlab.torproject.org/legacy/trac/-/wikis/doc/meek/>`_ domain-"
+"fronting proxy to make a non-Tor connection from your computer to Tor's "
+"Censorship Circumvention API. The Meek proxy hides the fact that you are "
+"trying to find a way to connect to Tor."
+msgstr ""
+
+#: ../../source/tor.rst:36
+msgid ""
+"If you choose \"Automatically determine my country from my IP address for"
+" bridge settings\", the Censorship Circumvention API will consider your "
+"IP address (yes, your real IP address) to determine what country you "
+"might reside in. Based on the country information, the API will try to "
+"automatically find bridges that suit your location."
+msgstr ""
+
+#: ../../source/tor.rst:41
+msgid ""
+"If you choose \"Manually select my country for bridge settings\", the "
+"Censorship API will find the bridges that suit the country that you "
+"specified."
+msgstr ""
+
+#: ../../source/tor.rst:46
+msgid "How automatic censorship circumvention works"
+msgstr ""
+
+#: ../../source/tor.rst:48
+msgid ""
+"If the Censorship Circumvention API finds bridges that it believes will "
+"suit you, OnionShare will try to reconnect to Tor using those bridges. If"
+" the API does not find any bridges for your location, OnionShare will ask"
+" the API for \"fallback\" options, and then try to reconnect using those."
+msgstr ""
+
+#: ../../source/tor.rst:50
+msgid ""
+"If for some reason OnionShare fails to connect to the Censorship API "
+"itself, or if the API returns an error message, OnionShare will attempt "
+"to use the obfs4 built-in bridges."
+msgstr ""
+
+#: ../../source/tor.rst:52
+msgid ""
+"It's important to note that the requests to the Censorship Circumvention "
+"API do not go over the Tor network (because if you could connect to Tor "
+"already, you wouldn't need to connect to the API)."
+msgstr ""
+
+#: ../../source/tor.rst:54
+msgid ""
+"Even though it's hard for an adversary to discover where the Meek request"
+" is going, this may still be risky for some users. Therefore, it is an "
+"opt-in feature. The use of Meek and non-torified network requests are "
+"limited only to making one or two requests to the Censorship "
+"Circumvention API. Then Meek is stopped, and all further network requests"
+" happen over the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:56
+msgid ""
+"If you are uncomfortable with making a request that doesn't go over the "
+"Tor network, you can click \"Network Settings\" (or the Settings icon in "
+"the bottom right corner, followed by the Tor Settings tab in the screen "
+"that appears), and manually configure bridges. After you save any bridge "
+"settings, OnionShare will try to reconnect using those bridges."
+msgstr ""
+
+#: ../../source/tor.rst:59
+msgid "Manually configure Tor settings"
+msgstr ""
+
+#: ../../source/tor.rst:61
+msgid ""
+"You can get to the Tor settings by clicking \"Network Settings\" on the "
+"welcome screen, or by clicking the \"⚙\" icon in the bottom-right corner "
+"of the application, and then switch to the Tor Settings tab in the screen"
+" that appears."
+msgstr ""
+
+#: ../../source/tor.rst:65
+msgid ""
+"Here are the different ways you can configure OnionShare to connect to "
+"Tor:"
+msgstr ""
+
+#: ../../source/tor.rst:68
msgid "Use the Tor version built into OnionShare"
msgstr "OnionShare üzerindeki Tor sürümü kullanılsın"
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:70
msgid ""
"This is the default, simplest and most reliable way that OnionShare "
"connects to Tor. For this reason, it's recommended for most users."
@@ -46,7 +193,7 @@ msgstr ""
" ve en güvenilir yoludur. Bu nedenle çoğu kullanıcı için bu seçenek "
"önerilir."
-#: ../../source/tor.rst:16
+#: ../../source/tor.rst:73
msgid ""
"When you open OnionShare, it launches an already configured ``tor`` "
"process in the background for OnionShare to use. It doesn't interfere "
@@ -58,32 +205,21 @@ msgstr ""
"bilgisayarınızdaki diğer ``tor`` işlemlerine müdahale etmez, böylece Tor "
"Browser veya sistemin ``tor`` işlemini kendi başına kullanabilirsiniz."
-#: ../../source/tor.rst:20
-msgid "Getting Around Censorship"
-msgstr "Sansürden Kurtulma"
-
-#: ../../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-"
-"manual.torproject.org/bridges/>`_. If OnionShare connects to Tor without "
-"one, you don't need to use a bridge."
+#: ../../source/tor.rst:76
+msgid "**Using bridges**"
msgstr ""
-"İnternet erişiminiz sansürleniyorsa, OnionShare uygulamasını Tor ağına "
-"`Tor köprüleri <https://tb-manual.torproject.org/bridges/>`_ kullanarak "
-"bağlanacak şekilde yapılandırabilirsiniz. OnionShare, Tor köprüsü olmadan"
-" bağlanıyorsa köprü kullanmanıza gerek yoktur."
-#: ../../source/tor.rst:24
+#: ../../source/tor.rst:78
+#, fuzzy
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."
+"To use a bridge, you must select \"Use the Tor version built into "
+"OnionShare\" and check the \"Use a bridge\" checkbox."
msgstr ""
"Bir köprü kullanmak için Tor Ayarları sekmesini açın. \"OnionShare "
"üzerindeki Tor sürümü kullanılsın\" seçeneğini seçmeli ve \"Köprü "
"kullan\" onay kutusunu işaretlemelisiniz."
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:80
msgid ""
"Try using a built-in bridge first. Using `obfs4` or `snowflake` bridges "
"is recommended over using `meek-azure`."
@@ -91,7 +227,7 @@ msgstr ""
"Önce yerleşik bir köprü kullanmayı deneyin. `meek-azure` yerine `obfs4` "
"veya `snowflake` köprülerinin kullanılması tavsiye edilir."
-#: ../../source/tor.rst:31
+#: ../../source/tor.rst:84
msgid ""
"If using a built-in bridge doesn't work, you can request a bridge from "
"torproject.org. You will have to solve a CAPTCHA in order to request a "
@@ -103,7 +239,7 @@ msgstr ""
"gerekecek. (Bu, hükümetlerin veya ISS'lerin Tor köprülerine erişimi "
"engellemesini zorlaştırır.)"
-#: ../../source/tor.rst:35
+#: ../../source/tor.rst:88
msgid ""
"You also have the option of using a bridge that you learned about from a "
"trusted source."
@@ -111,11 +247,11 @@ msgstr ""
"Ayrıca güvenilir bir kaynaktan öğrendiğiniz bir köprüyü kullanma "
"seçeneğiniz de vardır."
-#: ../../source/tor.rst:38
+#: ../../source/tor.rst:91
msgid "Attempt auto-configuration with Tor Browser"
msgstr "Tor Browser ile otomatik yapılandırma denensin"
-#: ../../source/tor.rst:40
+#: ../../source/tor.rst:93
msgid ""
"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
"and don't want two ``tor`` processes running, you can use the ``tor`` "
@@ -127,11 +263,11 @@ msgstr ""
"işlemini kullanabilirsiniz. Bunun çalışması için OnionShare kullanırken "
"arka planda Tor Browser uygulamasını açık tutmanız gerektiğini unutmayın."
-#: ../../source/tor.rst:44
+#: ../../source/tor.rst:97
msgid "Using a system ``tor`` in Windows"
msgstr "Windows üzerinde sistem ``tor` hizmetini kullanmak"
-#: ../../source/tor.rst:46
+#: ../../source/tor.rst:99
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
@@ -140,7 +276,7 @@ msgstr ""
"düzenleyeceğinizi ve yönetici olarak işleri nasıl yapacağınızı bilmeniz "
"gerekir."
-#: ../../source/tor.rst:48
+#: ../../source/tor.rst:101
msgid ""
"Download the Tor Windows Expert Bundle `from "
"<https://www.torproject.org/download/tor/>`_. Extract the compressed file"
@@ -153,7 +289,7 @@ msgstr ""
"klasörlerinin bulunduğu ayıklanmış klasörü ``tor-win32`` olarak yeniden "
"adlandırın."
-#: ../../source/tor.rst:52
+#: ../../source/tor.rst:105
msgid ""
"Make up a control port password. (Using 7 words in a sequence like "
"``comprised stumble rummage work avenging construct volatile`` is a good "
@@ -167,7 +303,7 @@ msgstr ""
"komut istemi (``cmd``) açın ve parolanızın karıştırılan kodunu oluşturmak"
" için ``tor.exe --hash-password`` komutunu kullanın. Örneğin::"
-#: ../../source/tor.rst:59
+#: ../../source/tor.rst:112
msgid ""
"The hashed password output is displayed after some warnings (which you "
"can ignore). In the case of the above example, it is "
@@ -178,7 +314,7 @@ msgstr ""
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF`` "
"olacaktır."
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:114
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
"win32\\torrc`` and put your hashed password output in it, replacing the "
@@ -189,7 +325,7 @@ msgstr ""
"oluşturduğunuzla değiştirerek içine parolanızın karıştırılan çıktısını "
"koyun::"
-#: ../../source/tor.rst:66
+#: ../../source/tor.rst:119
msgid ""
"In your administrator command prompt, install ``tor`` as a service using "
"the appropriate ``torrc`` file you just created (as described in "
@@ -202,19 +338,20 @@ msgstr ""
"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Bunun "
"gibi::"
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:123
msgid "You are now running a system ``tor`` process in Windows!"
msgstr "Artık Windows üzerinde bir sistem ``tor`` işlemi çalıştırıyorsunuz!"
-#: ../../source/tor.rst:72
+#: ../../source/tor.rst:125
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
-"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
-"\"Tor authentication settings\" choose \"Password\" and set the password "
-"to the control port password you picked above. Click the \"Test "
-"Connection to Tor\" button. If all goes well, you should see \"Connected "
-"to the Tor controller\"."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using control port\", and set \"Control port\" to ``127.0.0.1``"
+" and \"Port\" to ``9051``. Under \"Tor authentication settings\" choose "
+"\"Password\" and set the password to the control port password you picked"
+" above. Click the \"Test Connection to Tor\" button. If all goes well, "
+"you should see \"Connected to the Tor controller\"."
msgstr ""
"OnionShare uygulamasını açın ve \"⚙\" simgesine tıklayın. \"OnionShare "
"ile Tor bağlantısı nasıl kurulmalı?\" altındaki \"Denetim kapı numarası "
@@ -226,11 +363,11 @@ msgstr ""
"Her şey yolunda giderse, \"Tor denetleyicisi ile bağlantı kuruldu\" "
"ifadesini göreceksiniz."
-#: ../../source/tor.rst:81
+#: ../../source/tor.rst:134
msgid "Using a system ``tor`` in macOS"
msgstr "macOS üzerinde sistem ``tor` işlemini kullanmak"
-#: ../../source/tor.rst:83
+#: ../../source/tor.rst:136
msgid ""
"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it, and then install Tor::"
@@ -238,23 +375,25 @@ msgstr ""
"Henüz kurmadıysanız, önce `Homebrew <https://brew.sh/>`_ ve ardından Tor "
"kurun::"
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:140
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
"Sonra Tor hizmetini OnionShare uygulamasından gelen bağlantılara izin "
"verecek şekilde yapılandırın::"
-#: ../../source/tor.rst:94
+#: ../../source/tor.rst:147
msgid "And start the system Tor service::"
msgstr "Ve sistem Tor hizmetini başlatın::"
-#: ../../source/tor.rst:98
+#: ../../source/tor.rst:151
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
-"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
-"Under \"Tor authentication settings\" choose \"No authentication, or "
-"cookie authentication\". Click the \"Test Connection to Tor\" button."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using socket file\", and set the socket file to be "
+"``/usr/local/var/run/tor/control.socket``. Under \"Tor authentication "
+"settings\" choose \"No authentication, or cookie authentication\". Click "
+"the \"Test Connection to Tor\" button."
msgstr ""
"OnionShare uygulamasını açın ve \"⚙\" simgesine tıklayın. \"OnionShare "
"ile Tor bağlantısı nasıl kurulmalı?\" altındaki \"Soket dosyası "
@@ -264,17 +403,17 @@ msgstr ""
"doğrulaması\" seçeneğini seçin. \"Tor bağlantısını sına\" düğmesine "
"tıklayın."
-#: ../../source/tor.rst:104 ../../source/tor.rst:124
+#: ../../source/tor.rst:157 ../../source/tor.rst:177
msgid "If all goes well, you should see \"Connected to the Tor controller\"."
msgstr ""
"Her şey yolunda giderse, \"Tor denetleyicisi ile bağlantı kuruldu\" "
"ifadesini göreceksiniz."
-#: ../../source/tor.rst:107
+#: ../../source/tor.rst:160
msgid "Using a system ``tor`` in Linux"
msgstr "Linux üzerinde sistem ``tor` işlemini kullanmak"
-#: ../../source/tor.rst:109
+#: ../../source/tor.rst:162
msgid ""
"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
"similar Linux distro, It is recommended to use the Tor Project's "
@@ -286,7 +425,7 @@ msgstr ""
"<https://support.torproject.org/apt/tor-deb-repo/>`_ kullanmanız "
"önerilir."
-#: ../../source/tor.rst:111
+#: ../../source/tor.rst:164
msgid ""
"Next, add your user to the group that runs the ``tor`` process (in the "
"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
@@ -297,7 +436,7 @@ msgstr ""
"sisteminizin ``tor`` işleminin denetim soketi dosyasına bağlanacak "
"şekilde yapılandırın."
-#: ../../source/tor.rst:113
+#: ../../source/tor.rst:166
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
@@ -305,14 +444,15 @@ msgstr ""
"Bu komutu çalıştırarak kullanıcınızı ``debian-tor`` grubuna ekleyin "
"(``username`` ifadesini gerçek kullanıcı adınızla değiştirin)::"
-#: ../../source/tor.rst:117
+#: ../../source/tor.rst:170
+#, fuzzy
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."
+"Reboot your computer. After it boots up again, open OnionShare, click the"
+" \"⚙\" icon in it, and switch to the Tor Settings tab. Under \"How should"
+" OnionShare connect to Tor?\" choose \"Connect using socket file\". Set "
+"the socket file to be ``/var/run/tor/control``. Under \"Tor "
+"authentication settings\" choose \"No authentication, or cookie "
+"authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
"Bilgisayarınızı yeniden başlatın. Yeniden başlatıldıktan sonra OnionShare"
" uygulamasını açın ve \"⚙\" simgesine tıklayın. \"OnionShare ile Tor "
@@ -584,3 +724,35 @@ msgstr ""
#~ " Bir köprü kullanmanız gerekirse, önce "
#~ "yerleşik obfs4 olanları deneyin."
+#~ msgid ""
+#~ "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 ""
+#~ "OnionShare penceresinin sağ alt kısmındaki "
+#~ "Tor onion simgesine tıklayarak ayarlara "
+#~ "gidin ve OnionShare ile Tor bağlantısı"
+#~ " kurmanın bir yolunu seçin."
+
+#~ msgid "Getting Around Censorship"
+#~ msgstr "Sansürden Kurtulma"
+
+#~ 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 ""
+#~ "İnternet erişiminiz sansürleniyorsa, OnionShare "
+#~ "uygulamasını Tor ağına `Tor köprüleri "
+#~ "<https://tb-manual.torproject.org/bridges/>`_ kullanarak"
+#~ " bağlanacak şekilde yapılandırabilirsiniz. "
+#~ "OnionShare, Tor köprüsü olmadan bağlanıyorsa"
+#~ " köprü kullanmanıza gerek yoktur."
+
diff --git a/docs/source/locale/uk/LC_MESSAGES/security.po b/docs/source/locale/uk/LC_MESSAGES/security.po
index 728ddfea..6d2db4cc 100644
--- a/docs/source/locale/uk/LC_MESSAGES/security.po
+++ b/docs/source/locale/uk/LC_MESSAGES/security.po
@@ -7,17 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2021-09-11 01:40+0000\n"
"Last-Translator: Ihor Hordiichuk <igor_ck@outlook.com>\n"
"Language: uk\n"
"Language-Team: none\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/security.rst:2
msgid "Security Design"
@@ -83,7 +83,7 @@ msgstr ""
#: ../../source/security.rst:28
#, fuzzy
msgid ""
-"**If an attacker learns about the onion service, it still can't access "
+"**If an attacker learns about the onion service, they still can't access "
"anything.** Prior attacks against the Tor network to enumerate onion "
"services allowed attackers to discover private ``.onion`` addresses. To "
"access an OnionShare service from its address, the private key used for "
diff --git a/docs/source/locale/uk/LC_MESSAGES/tor.po b/docs/source/locale/uk/LC_MESSAGES/tor.po
index 3838fcf8..e342004e 100644
--- a/docs/source/locale/uk/LC_MESSAGES/tor.po
+++ b/docs/source/locale/uk/LC_MESSAGES/tor.po
@@ -7,38 +7,185 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-04 17:16-0400\n"
"PO-Revision-Date: 2021-11-25 15:52+0000\n"
"Last-Translator: Ihor Hordiichuk <igor_ck@outlook.com>\n"
"Language: uk\n"
"Language-Team: none\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\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"
+"Generated-By: Babel 2.10.3\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
msgstr "З'єднання з Tor"
-#: ../../source/tor.rst:6
-#, fuzzy
+#: ../../source/tor.rst:4
+msgid ""
+"When OnionShare starts, it will show you a screen asking you to connect "
+"to the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:8
msgid ""
-"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."
+"You can toggle on the switch \"Connect to Tor automatically\" before "
+"clicking \"Connect to Tor\". This means that next time OnionShare starts,"
+" it will automatically connect with its Tor connection settings from the "
+"last session, instead of presenting you with the connection options. If "
+"the connection fails, you can still try bridges or reconfigure Tor via "
+"the \"Network Settings\" button."
msgstr ""
-"Виберіть спосіб під'єднання OnionShare до Tor, натиснувши піктограму Tor "
-"onion у нижньому правому куті вікна OnionShare, щоб перейти до вкладки "
-"налаштувань Tor."
#: ../../source/tor.rst:11
+msgid ""
+"You can click \"Connect to Tor\" to begin the connection process. If "
+"there are no problems with your network, including any attempts to block "
+"your access to the Tor network, this should hopefully work the first "
+"time."
+msgstr ""
+
+#: ../../source/tor.rst:13
+msgid ""
+"Or, if you want to manually configure Bridges or other Tor settings "
+"before you connect, you can click \"Network Settings\"."
+msgstr ""
+
+#: ../../source/tor.rst:16
+msgid "Automatic censorship circumvention"
+msgstr ""
+
+#: ../../source/tor.rst:18
+msgid ""
+"When you click \"Connect to Tor\", if OnionShare fails to connect, it "
+"might be because Tor is censored in your country or on your local "
+"network."
+msgstr ""
+
+#: ../../source/tor.rst:20
+msgid "If this occurs, you will have these choices:"
+msgstr ""
+
+#: ../../source/tor.rst:22
+msgid "Try again without a bridge"
+msgstr ""
+
+#: ../../source/tor.rst:23
+msgid "Automatically determine my country from my IP address for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:24
+msgid "Manually select my country for bridge settings"
+msgstr ""
+
+#: ../../source/tor.rst:28
+msgid ""
+"If you choose the \"Try again without a bridge\" option, OnionShare will "
+"retry connecting to Tor like normal, without attempting to bypass "
+"censorship."
+msgstr ""
+
+#: ../../source/tor.rst:30
+msgid ""
+"The other two options will attempt to automatically bypass censorship "
+"using Tor bridges. If your network provider is blocking access to the Tor"
+" network, you can hopefully still connect to a Tor bridge, which will "
+"then connect you to the Tor network, circumventing the censorship. Both "
+"of these options use the Tor Project's Censorship Circumvention API to "
+"provide you with bridge settings that should work for you. OnionShare "
+"will temporarily use the `Meek "
+"<https://gitlab.torproject.org/legacy/trac/-/wikis/doc/meek/>`_ domain-"
+"fronting proxy to make a non-Tor connection from your computer to Tor's "
+"Censorship Circumvention API. The Meek proxy hides the fact that you are "
+"trying to find a way to connect to Tor."
+msgstr ""
+
+#: ../../source/tor.rst:36
+msgid ""
+"If you choose \"Automatically determine my country from my IP address for"
+" bridge settings\", the Censorship Circumvention API will consider your "
+"IP address (yes, your real IP address) to determine what country you "
+"might reside in. Based on the country information, the API will try to "
+"automatically find bridges that suit your location."
+msgstr ""
+
+#: ../../source/tor.rst:41
+msgid ""
+"If you choose \"Manually select my country for bridge settings\", the "
+"Censorship API will find the bridges that suit the country that you "
+"specified."
+msgstr ""
+
+#: ../../source/tor.rst:46
+msgid "How automatic censorship circumvention works"
+msgstr ""
+
+#: ../../source/tor.rst:48
+msgid ""
+"If the Censorship Circumvention API finds bridges that it believes will "
+"suit you, OnionShare will try to reconnect to Tor using those bridges. If"
+" the API does not find any bridges for your location, OnionShare will ask"
+" the API for \"fallback\" options, and then try to reconnect using those."
+msgstr ""
+
+#: ../../source/tor.rst:50
+msgid ""
+"If for some reason OnionShare fails to connect to the Censorship API "
+"itself, or if the API returns an error message, OnionShare will attempt "
+"to use the obfs4 built-in bridges."
+msgstr ""
+
+#: ../../source/tor.rst:52
+msgid ""
+"It's important to note that the requests to the Censorship Circumvention "
+"API do not go over the Tor network (because if you could connect to Tor "
+"already, you wouldn't need to connect to the API)."
+msgstr ""
+
+#: ../../source/tor.rst:54
+msgid ""
+"Even though it's hard for an adversary to discover where the Meek request"
+" is going, this may still be risky for some users. Therefore, it is an "
+"opt-in feature. The use of Meek and non-torified network requests are "
+"limited only to making one or two requests to the Censorship "
+"Circumvention API. Then Meek is stopped, and all further network requests"
+" happen over the Tor network."
+msgstr ""
+
+#: ../../source/tor.rst:56
+msgid ""
+"If you are uncomfortable with making a request that doesn't go over the "
+"Tor network, you can click \"Network Settings\" (or the Settings icon in "
+"the bottom right corner, followed by the Tor Settings tab in the screen "
+"that appears), and manually configure bridges. After you save any bridge "
+"settings, OnionShare will try to reconnect using those bridges."
+msgstr ""
+
+#: ../../source/tor.rst:59
+msgid "Manually configure Tor settings"
+msgstr ""
+
+#: ../../source/tor.rst:61
+msgid ""
+"You can get to the Tor settings by clicking \"Network Settings\" on the "
+"welcome screen, or by clicking the \"⚙\" icon in the bottom-right corner "
+"of the application, and then switch to the Tor Settings tab in the screen"
+" that appears."
+msgstr ""
+
+#: ../../source/tor.rst:65
+msgid ""
+"Here are the different ways you can configure OnionShare to connect to "
+"Tor:"
+msgstr ""
+
+#: ../../source/tor.rst:68
msgid "Use the Tor version built into OnionShare"
msgstr "Використовуйте версію Tor, вбудовану в OnionShare"
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:70
msgid ""
"This is the default, simplest and most reliable way that OnionShare "
"connects to Tor. For this reason, it's recommended for most users."
@@ -46,7 +193,7 @@ msgstr ""
"Це типовий і водночас найпростіший та найнадійніший спосіб з'єднання "
"OnionShare з Tor. З цієї причини радимо його для більшості користувачів."
-#: ../../source/tor.rst:16
+#: ../../source/tor.rst:73
msgid ""
"When you open OnionShare, it launches an already configured ``tor`` "
"process in the background for OnionShare to use. It doesn't interfere "
@@ -58,32 +205,21 @@ msgstr ""
"іншим процесам ``tor`` на вашому комп'ютері, тому ви можете окремо "
"використовувати браузер Tor або систему ``tor`` ."
-#: ../../source/tor.rst:20
-msgid "Getting Around Censorship"
-msgstr "Обхід цензури"
-
-#: ../../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-"
-"manual.torproject.org/bridges/>`_. If OnionShare connects to Tor without "
-"one, you don't need to use a bridge."
+#: ../../source/tor.rst:76
+msgid "**Using bridges**"
msgstr ""
-"Якщо ваш доступ до інтернету цензуровано, ви можете налаштувати "
-"OnionShare для з'єднання з мережею Tor за допомогою `мостів Tor <https"
-"://tb-manual.torproject.org/bridges/>`_. Якщо OnionShare під'єднано до "
-"Tor без них, вам не потрібно користуватися мостом."
-#: ../../source/tor.rst:24
+#: ../../source/tor.rst:78
+#, fuzzy
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."
+"To use a bridge, you must select \"Use the Tor version built into "
+"OnionShare\" and check the \"Use a bridge\" checkbox."
msgstr ""
"Щоб використовувати міст, відкрийте вкладку Налаштування Tor. Ви повинні "
"вибрати «Використовувати версію Tor, вбудовану в OnionShare» і встановити"
" прапорець «Використовувати міст»."
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:80
msgid ""
"Try using a built-in bridge first. Using `obfs4` or `snowflake` bridges "
"is recommended over using `meek-azure`."
@@ -91,7 +227,7 @@ msgstr ""
"Спочатку спробуйте використовувати вбудований міст. Радимо користуватися "
"мостами `obfs4` або `snowflake`, а `meek-azure` — лише якщо це утруднено."
-#: ../../source/tor.rst:31
+#: ../../source/tor.rst:84
msgid ""
"If using a built-in bridge doesn't work, you can request a bridge from "
"torproject.org. You will have to solve a CAPTCHA in order to request a "
@@ -103,7 +239,7 @@ msgstr ""
" ускладнює урядамв або постачальникам інтернету блокування доступу до "
"мостів Tor.)"
-#: ../../source/tor.rst:35
+#: ../../source/tor.rst:88
msgid ""
"You also have the option of using a bridge that you learned about from a "
"trusted source."
@@ -111,11 +247,11 @@ msgstr ""
"У вас також є можливість використовувати міст, про який ви дізналися з "
"надійного джерела."
-#: ../../source/tor.rst:38
+#: ../../source/tor.rst:91
msgid "Attempt auto-configuration with Tor Browser"
msgstr "Спроба автоматичного налаштування за допомогою браузера Tor"
-#: ../../source/tor.rst:40
+#: ../../source/tor.rst:93
msgid ""
"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
"and don't want two ``tor`` processes running, you can use the ``tor`` "
@@ -128,11 +264,11 @@ msgstr ""
"працювало, потрібно тримати браузер Tor у фоновому режимі під час "
"використання OnionShare."
-#: ../../source/tor.rst:44
+#: ../../source/tor.rst:97
msgid "Using a system ``tor`` in Windows"
msgstr "Користування системним ``tor`` на Windows"
-#: ../../source/tor.rst:46
+#: ../../source/tor.rst:99
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
@@ -140,7 +276,7 @@ msgstr ""
"Це досить просунуто. Вам потрібно знати, як редагувати файли зі звичайним"
" текстом та виконувати дії від імені адміністратором."
-#: ../../source/tor.rst:48
+#: ../../source/tor.rst:101
msgid ""
"Download the Tor Windows Expert Bundle `from "
"<https://www.torproject.org/download/tor/>`_. Extract the compressed file"
@@ -152,7 +288,7 @@ msgstr ""
" копіюйте видобуту теку до ``C:\\Program Files (x86)\\`` й перейменуйте "
"теку з ``Data`` та ``Tor`` в середині на ``tor-win32``."
-#: ../../source/tor.rst:52
+#: ../../source/tor.rst:105
msgid ""
"Make up a control port password. (Using 7 words in a sequence like "
"``comprised stumble rummage work avenging construct volatile`` is a good "
@@ -166,7 +302,7 @@ msgstr ""
"адміністратор і використовуйте ``tor.exe --hash-password``, щоб створити "
"хеш вашого пароля. Наприклад::"
-#: ../../source/tor.rst:59
+#: ../../source/tor.rst:112
msgid ""
"The hashed password output is displayed after some warnings (which you "
"can ignore). In the case of the above example, it is "
@@ -176,7 +312,7 @@ msgstr ""
"знехтувати). У моєму випадку це було "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:114
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
"win32\\torrc`` and put your hashed password output in it, replacing the "
@@ -186,7 +322,7 @@ msgstr ""
"win32\\torrc`` та помістіть свій хешований пароль до теки, замінивши "
"``HashedControlPassword`` на той, який ви щойно створили::"
-#: ../../source/tor.rst:66
+#: ../../source/tor.rst:119
msgid ""
"In your administrator command prompt, install ``tor`` as a service using "
"the appropriate ``torrc`` file you just created (as described in "
@@ -198,19 +334,20 @@ msgstr ""
"описано у "
"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Як це::"
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:123
msgid "You are now running a system ``tor`` process in Windows!"
msgstr "Тепер ви використовуєте системний процес ``tor`` на Windows!"
-#: ../../source/tor.rst:72
+#: ../../source/tor.rst:125
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
-"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
-"\"Tor authentication settings\" choose \"Password\" and set the password "
-"to the control port password you picked above. Click the \"Test "
-"Connection to Tor\" button. If all goes well, you should see \"Connected "
-"to the Tor controller\"."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using control port\", and set \"Control port\" to ``127.0.0.1``"
+" and \"Port\" to ``9051``. Under \"Tor authentication settings\" choose "
+"\"Password\" and set the password to the control port password you picked"
+" above. Click the \"Test Connection to Tor\" button. If all goes well, "
+"you should see \"Connected to the Tor controller\"."
msgstr ""
"Відкрийте OnionShare і натисніть на ньому піктограму «⚙». У розділі «Як "
"OnionShare повинен з'єднуватися з Tor?\" виберіть «Під'єднатися через "
@@ -220,11 +357,11 @@ msgstr ""
"вибрали раніше. Натисніть кнопку «Перевірити з'єднання з Tor». Якщо все "
"добре, ви побачите «З'єднано з контролером Tor»."
-#: ../../source/tor.rst:81
+#: ../../source/tor.rst:134
msgid "Using a system ``tor`` in macOS"
msgstr "Користування системним ``tor`` на macOS"
-#: ../../source/tor.rst:83
+#: ../../source/tor.rst:136
msgid ""
"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it, and then install Tor::"
@@ -232,21 +369,23 @@ msgstr ""
"Спочатку встановіть `Homebrew <https://brew.sh/>`_, якщо у вас його ще "
"немає. Потім встановіть Tor::"
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:140
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr "Тепер налаштуйте Tor, щоб дозволити з'єднання з OnionShare::"
-#: ../../source/tor.rst:94
+#: ../../source/tor.rst:147
msgid "And start the system Tor service::"
msgstr "І запустіть системну Tor-службу::"
-#: ../../source/tor.rst:98
+#: ../../source/tor.rst:151
+#, fuzzy
msgid ""
-"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
-"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
-"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
-"Under \"Tor authentication settings\" choose \"No authentication, or "
-"cookie authentication\". Click the \"Test Connection to Tor\" button."
+"Open OnionShare, click the \"⚙\" icon in it, and switch to the Tor "
+"Settings tab. Under \"How should OnionShare connect to Tor?\" choose "
+"\"Connect using socket file\", and set the socket file to be "
+"``/usr/local/var/run/tor/control.socket``. Under \"Tor authentication "
+"settings\" choose \"No authentication, or cookie authentication\". Click "
+"the \"Test Connection to Tor\" button."
msgstr ""
"Відкрийте OnionShare. Клацніть піктограму «⚙». У розділі «Як OnionShare "
"повинен з'єднуватися з Tor?» виберіть «Під'єднуватися через файл сокета» "
@@ -255,15 +394,15 @@ msgstr ""
"автентифікації Tor» виберіть «Без автентифікації або автентифікація через"
" cookie». Натисніть кнопку «Перевірити з'єднання з Tor»."
-#: ../../source/tor.rst:104 ../../source/tor.rst:124
+#: ../../source/tor.rst:157 ../../source/tor.rst:177
msgid "If all goes well, you should see \"Connected to the Tor controller\"."
msgstr "Якщо все добре, ви побачите «З'єднано з контролером Tor»."
-#: ../../source/tor.rst:107
+#: ../../source/tor.rst:160
msgid "Using a system ``tor`` in Linux"
msgstr "Користування системним ``tor`` на Linux"
-#: ../../source/tor.rst:109
+#: ../../source/tor.rst:162
msgid ""
"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
"similar Linux distro, It is recommended to use the Tor Project's "
@@ -274,7 +413,7 @@ msgstr ""
"Ubuntu або подібний дистрибутив Linux, я раджу вам використовувати "
"`офіційне сховище <https://support.torproject.org/apt/tor-deb-repo/>`_."
-#: ../../source/tor.rst:111
+#: ../../source/tor.rst:164
msgid ""
"Next, add your user to the group that runs the ``tor`` process (in the "
"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
@@ -284,7 +423,7 @@ msgstr ""
" з Debian і Ubuntu, ``debian-tor``) і налаштуйте OnionShare для "
"під'єднання до файлу керування сокетом ``tor`` вашої системи."
-#: ../../source/tor.rst:113
+#: ../../source/tor.rst:166
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
@@ -292,14 +431,15 @@ msgstr ""
"Додайте свого користувача до групи ``debian-tor``, запустивши цю команду "
"(замініть ``username`` вашим іменем користувача)::"
-#: ../../source/tor.rst:117
+#: ../../source/tor.rst:170
+#, fuzzy
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."
+"Reboot your computer. After it boots up again, open OnionShare, click the"
+" \"⚙\" icon in it, and switch to the Tor Settings tab. Under \"How should"
+" OnionShare connect to Tor?\" choose \"Connect using socket file\". Set "
+"the socket file to be ``/var/run/tor/control``. Under \"Tor "
+"authentication settings\" choose \"No authentication, or cookie "
+"authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
"Перезапустіть комп'ютер. Після запуску, відкрийте OnionShare. Клацніть "
"піктограму «⚙». У розділі «Як OnionShare повинен з'єднуватися з Tor?» "
@@ -491,3 +631,37 @@ msgstr ""
#~ "потрібно використовувати міст, спершу "
#~ "спробуйте вбудовані obfs4."
+#~ msgid ""
+#~ "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 ""
+#~ "Виберіть спосіб під'єднання OnionShare до "
+#~ "Tor, натиснувши піктограму Tor onion у"
+#~ " нижньому правому куті вікна OnionShare,"
+#~ " щоб перейти до вкладки налаштувань "
+#~ "Tor."
+
+#~ msgid "Getting Around Censorship"
+#~ msgstr "Обхід цензури"
+
+#~ 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 ""
+#~ "Якщо ваш доступ до інтернету "
+#~ "цензуровано, ви можете налаштувати OnionShare"
+#~ " для з'єднання з мережею Tor за "
+#~ "допомогою `мостів Tor <https://tb-"
+#~ "manual.torproject.org/bridges/>`_. Якщо OnionShare "
+#~ "під'єднано до Tor без них, вам не"
+#~ " потрібно користуватися мостом."
+