aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2020-11-15 14:44:58 -0800
committerMicah Lee <micah@micahflee.com>2020-11-15 14:44:58 -0800
commitfdeafac4668f0062c632a1132d401d8800d3dace (patch)
tree27976d188556ef44585a0989dfd8aeaf6c1ba8b9
parent766144649e5ccb1ea39d03936230cb49d662ca68 (diff)
downloadonionshare-fdeafac4668f0062c632a1132d401d8800d3dace.tar.gz
onionshare-fdeafac4668f0062c632a1132d401d8800d3dace.zip
Update docs translations
-rwxr-xr-xdocs/build.sh2
-rw-r--r--docs/gettext/.doctrees/advanced.doctreebin29050 -> 27303 bytes
-rw-r--r--docs/gettext/.doctrees/develop.doctreebin41566 -> 35678 bytes
-rw-r--r--docs/gettext/.doctrees/environment.picklebin38898 -> 37236 bytes
-rw-r--r--docs/gettext/.doctrees/features.doctreebin43702 -> 42216 bytes
-rw-r--r--docs/gettext/.doctrees/help.doctreebin8171 -> 7679 bytes
-rw-r--r--docs/gettext/.doctrees/index.doctreebin3439 -> 3439 bytes
-rw-r--r--docs/gettext/.doctrees/install.doctreebin20103 -> 20688 bytes
-rw-r--r--docs/gettext/.doctrees/security.doctreebin15257 -> 13511 bytes
-rw-r--r--docs/gettext/.doctrees/tor.doctreebin28661 -> 30078 bytes
-rw-r--r--docs/gettext/advanced.pot108
-rw-r--r--docs/gettext/develop.pot126
-rw-r--r--docs/gettext/features.pot150
-rw-r--r--docs/gettext/help.pot30
-rw-r--r--docs/gettext/index.pot2
-rw-r--r--docs/gettext/install.pot70
-rw-r--r--docs/gettext/security.pot16
-rw-r--r--docs/gettext/sphinx.pot2
-rw-r--r--docs/gettext/tor.pot107
-rw-r--r--docs/source/locale/ar/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/ar/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/ar/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/ar/LC_MESSAGES/help.po104
-rw-r--r--docs/source/locale/ar/LC_MESSAGES/install.po236
-rw-r--r--docs/source/locale/ar/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/ar/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/ca/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/ca/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/ca/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/ca/LC_MESSAGES/help.po104
-rw-r--r--docs/source/locale/ca/LC_MESSAGES/install.po236
-rw-r--r--docs/source/locale/ca/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/ca/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/da/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/da/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/da/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/da/LC_MESSAGES/help.po104
-rw-r--r--docs/source/locale/da/LC_MESSAGES/install.po236
-rw-r--r--docs/source/locale/da/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/da/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/de/LC_MESSAGES/advanced.po420
-rw-r--r--docs/source/locale/de/LC_MESSAGES/develop.po531
-rw-r--r--docs/source/locale/de/LC_MESSAGES/features.po770
-rw-r--r--docs/source/locale/de/LC_MESSAGES/help.po98
-rw-r--r--docs/source/locale/de/LC_MESSAGES/install.po270
-rw-r--r--docs/source/locale/de/LC_MESSAGES/security.po350
-rw-r--r--docs/source/locale/de/LC_MESSAGES/tor.po477
-rw-r--r--docs/source/locale/el/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/el/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/el/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/el/LC_MESSAGES/help.po104
-rw-r--r--docs/source/locale/el/LC_MESSAGES/install.po236
-rw-r--r--docs/source/locale/el/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/el/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/en/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/en/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/en/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/en/LC_MESSAGES/help.po104
-rw-r--r--docs/source/locale/en/LC_MESSAGES/install.po236
-rw-r--r--docs/source/locale/en/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/en/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/es/LC_MESSAGES/advanced.po349
-rw-r--r--docs/source/locale/es/LC_MESSAGES/develop.po460
-rw-r--r--docs/source/locale/es/LC_MESSAGES/features.po831
-rw-r--r--docs/source/locale/es/LC_MESSAGES/help.po105
-rw-r--r--docs/source/locale/es/LC_MESSAGES/install.po274
-rw-r--r--docs/source/locale/es/LC_MESSAGES/security.po317
-rw-r--r--docs/source/locale/es/LC_MESSAGES/tor.po418
-rw-r--r--docs/source/locale/fa/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/fa/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/fa/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/fa/LC_MESSAGES/help.po104
-rw-r--r--docs/source/locale/fa/LC_MESSAGES/install.po236
-rw-r--r--docs/source/locale/fa/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/fa/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/fr/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/fr/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/fr/LC_MESSAGES/features.po710
-rw-r--r--docs/source/locale/fr/LC_MESSAGES/help.po102
-rw-r--r--docs/source/locale/fr/LC_MESSAGES/install.po239
-rw-r--r--docs/source/locale/fr/LC_MESSAGES/security.po176
-rw-r--r--docs/source/locale/fr/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/ga/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/ga/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/ga/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/ga/LC_MESSAGES/help.po104
-rw-r--r--docs/source/locale/ga/LC_MESSAGES/install.po236
-rw-r--r--docs/source/locale/ga/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/ga/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/is/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/is/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/is/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/is/LC_MESSAGES/help.po104
-rw-r--r--docs/source/locale/is/LC_MESSAGES/install.po236
-rw-r--r--docs/source/locale/is/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/is/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/it/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/it/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/it/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/it/LC_MESSAGES/help.po104
-rw-r--r--docs/source/locale/it/LC_MESSAGES/install.po236
-rw-r--r--docs/source/locale/it/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/it/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/ja/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/ja/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/ja/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/ja/LC_MESSAGES/help.po104
-rw-r--r--docs/source/locale/ja/LC_MESSAGES/install.po236
-rw-r--r--docs/source/locale/ja/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/ja/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/nb_NO/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/nb_NO/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/nb_NO/LC_MESSAGES/features.po710
-rw-r--r--docs/source/locale/nb_NO/LC_MESSAGES/help.po102
-rw-r--r--docs/source/locale/nb_NO/LC_MESSAGES/install.po239
-rw-r--r--docs/source/locale/nb_NO/LC_MESSAGES/security.po176
-rw-r--r--docs/source/locale/nb_NO/LC_MESSAGES/tor.po401
-rw-r--r--docs/source/locale/nl/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/nl/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/nl/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/nl/LC_MESSAGES/help.po104
-rw-r--r--docs/source/locale/nl/LC_MESSAGES/install.po236
-rw-r--r--docs/source/locale/nl/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/nl/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/pl/LC_MESSAGES/advanced.po379
-rw-r--r--docs/source/locale/pl/LC_MESSAGES/develop.po412
-rw-r--r--docs/source/locale/pl/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/pl/LC_MESSAGES/help.po104
-rw-r--r--docs/source/locale/pl/LC_MESSAGES/install.po236
-rw-r--r--docs/source/locale/pl/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/pl/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/pt_BR/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/pt_BR/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/pt_BR/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/pt_BR/LC_MESSAGES/help.po104
-rw-r--r--docs/source/locale/pt_BR/LC_MESSAGES/install.po236
-rw-r--r--docs/source/locale/pt_BR/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/pt_BR/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/pt_PT/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/pt_PT/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/pt_PT/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/pt_PT/LC_MESSAGES/help.po104
-rw-r--r--docs/source/locale/pt_PT/LC_MESSAGES/install.po236
-rw-r--r--docs/source/locale/pt_PT/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/pt_PT/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/ro/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/ro/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/ro/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/ro/LC_MESSAGES/help.po104
-rw-r--r--docs/source/locale/ro/LC_MESSAGES/install.po236
-rw-r--r--docs/source/locale/ro/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/ro/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/ru/LC_MESSAGES/advanced.po379
-rw-r--r--docs/source/locale/ru/LC_MESSAGES/develop.po405
-rw-r--r--docs/source/locale/ru/LC_MESSAGES/features.po705
-rw-r--r--docs/source/locale/ru/LC_MESSAGES/help.po99
-rw-r--r--docs/source/locale/ru/LC_MESSAGES/install.po244
-rw-r--r--docs/source/locale/ru/LC_MESSAGES/security.po196
-rw-r--r--docs/source/locale/ru/LC_MESSAGES/tor.po394
-rw-r--r--docs/source/locale/sr@latin/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/sr@latin/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/sr@latin/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/sr@latin/LC_MESSAGES/help.po104
-rw-r--r--docs/source/locale/sr@latin/LC_MESSAGES/install.po236
-rw-r--r--docs/source/locale/sr@latin/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/sr@latin/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/sv/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/sv/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/sv/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/sv/LC_MESSAGES/help.po104
-rw-r--r--docs/source/locale/sv/LC_MESSAGES/install.po236
-rw-r--r--docs/source/locale/sv/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/sv/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/te/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/te/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/te/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/te/LC_MESSAGES/help.po104
-rw-r--r--docs/source/locale/te/LC_MESSAGES/install.po236
-rw-r--r--docs/source/locale/te/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/te/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/tr/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/tr/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/tr/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/tr/LC_MESSAGES/help.po96
-rw-r--r--docs/source/locale/tr/LC_MESSAGES/install.po269
-rw-r--r--docs/source/locale/tr/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/tr/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/uk/LC_MESSAGES/advanced.po344
-rw-r--r--docs/source/locale/uk/LC_MESSAGES/develop.po499
-rw-r--r--docs/source/locale/uk/LC_MESSAGES/features.po773
-rw-r--r--docs/source/locale/uk/LC_MESSAGES/help.po97
-rw-r--r--docs/source/locale/uk/LC_MESSAGES/install.po272
-rw-r--r--docs/source/locale/uk/LC_MESSAGES/security.po307
-rw-r--r--docs/source/locale/uk/LC_MESSAGES/tor.po459
-rw-r--r--docs/source/locale/zh_CN/LC_MESSAGES/advanced.po373
-rw-r--r--docs/source/locale/zh_CN/LC_MESSAGES/develop.po397
-rw-r--r--docs/source/locale/zh_CN/LC_MESSAGES/features.po703
-rw-r--r--docs/source/locale/zh_CN/LC_MESSAGES/help.po104
-rw-r--r--docs/source/locale/zh_CN/LC_MESSAGES/install.po236
-rw-r--r--docs/source/locale/zh_CN/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/zh_CN/LC_MESSAGES/tor.po386
-rw-r--r--docs/source/locale/zh_TW/LC_MESSAGES/advanced.po375
-rw-r--r--docs/source/locale/zh_TW/LC_MESSAGES/develop.po404
-rw-r--r--docs/source/locale/zh_TW/LC_MESSAGES/features.po707
-rw-r--r--docs/source/locale/zh_TW/LC_MESSAGES/help.po100
-rw-r--r--docs/source/locale/zh_TW/LC_MESSAGES/install.po249
-rw-r--r--docs/source/locale/zh_TW/LC_MESSAGES/security.po194
-rw-r--r--docs/source/locale/zh_TW/LC_MESSAGES/tor.po389
208 files changed, 48870 insertions, 17691 deletions
diff --git a/docs/build.sh b/docs/build.sh
index f120fab7..c0acdcc1 100755
--- a/docs/build.sh
+++ b/docs/build.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-VERSION=`cat ../share/version.txt`
+VERSION=`cat ../cli/onionshare_cli/resources/version.txt`
# Supported locales
LOCALES="ar ca da de el en es fa fr ga it is ja nb_NO nl pl pt_BR pt_PT ro ru sr@latin sv te tr uk zh_CN zh_TW"
diff --git a/docs/gettext/.doctrees/advanced.doctree b/docs/gettext/.doctrees/advanced.doctree
index 3a21850b..df910e50 100644
--- a/docs/gettext/.doctrees/advanced.doctree
+++ b/docs/gettext/.doctrees/advanced.doctree
Binary files differ
diff --git a/docs/gettext/.doctrees/develop.doctree b/docs/gettext/.doctrees/develop.doctree
index 9985cf37..50cbb244 100644
--- a/docs/gettext/.doctrees/develop.doctree
+++ b/docs/gettext/.doctrees/develop.doctree
Binary files differ
diff --git a/docs/gettext/.doctrees/environment.pickle b/docs/gettext/.doctrees/environment.pickle
index d7ebd020..2210d69f 100644
--- a/docs/gettext/.doctrees/environment.pickle
+++ b/docs/gettext/.doctrees/environment.pickle
Binary files differ
diff --git a/docs/gettext/.doctrees/features.doctree b/docs/gettext/.doctrees/features.doctree
index ec327d02..3ca2703d 100644
--- a/docs/gettext/.doctrees/features.doctree
+++ b/docs/gettext/.doctrees/features.doctree
Binary files differ
diff --git a/docs/gettext/.doctrees/help.doctree b/docs/gettext/.doctrees/help.doctree
index 7fe3c6d9..95e2b864 100644
--- a/docs/gettext/.doctrees/help.doctree
+++ b/docs/gettext/.doctrees/help.doctree
Binary files differ
diff --git a/docs/gettext/.doctrees/index.doctree b/docs/gettext/.doctrees/index.doctree
index c716ae3f..13372791 100644
--- a/docs/gettext/.doctrees/index.doctree
+++ b/docs/gettext/.doctrees/index.doctree
Binary files differ
diff --git a/docs/gettext/.doctrees/install.doctree b/docs/gettext/.doctrees/install.doctree
index 43677bc4..f61ef2f9 100644
--- a/docs/gettext/.doctrees/install.doctree
+++ b/docs/gettext/.doctrees/install.doctree
Binary files differ
diff --git a/docs/gettext/.doctrees/security.doctree b/docs/gettext/.doctrees/security.doctree
index 62107b01..71303eef 100644
--- a/docs/gettext/.doctrees/security.doctree
+++ b/docs/gettext/.doctrees/security.doctree
Binary files differ
diff --git a/docs/gettext/.doctrees/tor.doctree b/docs/gettext/.doctrees/tor.doctree
index 737471c7..a001547b 100644
--- a/docs/gettext/.doctrees/tor.doctree
+++ b/docs/gettext/.doctrees/tor.doctree
Binary files differ
diff --git a/docs/gettext/advanced.pot b/docs/gettext/advanced.pot
index 15b92627..c3288812 100644
--- a/docs/gettext/advanced.pot
+++ b/docs/gettext/advanced.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,137 +17,117 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
-msgid "By default, everything in OnionShare is temporary. As soon as you close an OnionShare tab its address no longer exists and can't be used again. But sometimes you might want an OnionShare service to be persistent. For example, this would be useful if you want to host a website that can keep the same URL even if you reboot your computer."
+msgid "Everything in OnionShare is temporary by default. If you close an OnionShare tab, its address no longer exists and it can't be used again. Sometimes you might want an OnionShare service to be persistent. This is useful if you want to host a website available from the same OnionShare address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid "To make any tab persistent, check the \"Save this tab, and automatically open it when I open OnionShare\" box before starting the server. When a tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
-msgid "When you quit OnionShare and then open it again, your saved tabs will start out open. You'll have to manually start each service, but when you do they will start with the same OnionShare address, and with the same password."
+#: ../../source/advanced.rst:18
+msgid "When you quit OnionShare and then open it again, your saved tabs will start opened. You'll have to manually start each service, but when you do they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid "If you save a tab, a copy of that tab's onion service secret key will be stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
-msgstr ""
-
-#: ../../source/advanced.rst:24
-msgid "By default, all OnionShare services are protected with the username `onionshare` and a randomly-generated password. If someone makes 20 wrong guesses of the password, your onion service is automatically stopped to prevent a brute force attack against the OnionShare service."
-msgstr ""
-
#: ../../source/advanced.rst:26
-msgid "But sometimes you might want your OnionShare service to be accessible to the public. For example, if you want to set up an OnionShare receive service so the public can securely and anonymously send you files. In this case, it's better to disable the password altogether. If you don't do this, someone can force your server to stop just by making 20 wrong guesses of your password, even if they know the correct password."
+msgid "Turn Off Passwords"
msgstr ""
#: ../../source/advanced.rst:28
-msgid "To disable the password for any tab, just check the \"Don't use a password\" box before starting the server. Then the server will be public and won't have a password."
+msgid "By default, all OnionShare services are protected with the username ``onionshare`` and a randomly-generated password. If someone takes 20 wrong guesses at the password, your onion service is automatically stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
#: ../../source/advanced.rst:31
-msgid "Scheduled times"
-msgstr ""
-
-#: ../../source/advanced.rst:33
-msgid "OnionShare supports scheduling exactly when a service should start and stop. Before starting server, click \"Show advanced settings\" in its tab and then check the boxes next to either \"Start onion service at scheduled time\", \"Stop onion service at scheduled time\", or both, and set the desired dates and times."
+msgid "Sometimes you might want your OnionShare service to be accessible to the public, like if you want to set up an OnionShare receive service so the public can securely and anonymously send you files. In this case, it's better to disable the password altogether. If you don't do this, someone can force your server to stop just by making 20 wrong guesses of your password, even if they know the correct password."
msgstr ""
#: ../../source/advanced.rst:35
-msgid "If you scheduled a service to start in the future, when you click the start button you will see a timer counting down until it will start. If you scheduled it to stop in the future, after it's started you will see a timer counting down to when it will stop automatically."
+msgid "To turn off the password for any tab, just check the \"Don't use a password\" box before starting the server. Then the server will be public and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:37
-msgid "**Scheduling an OnionShare service to automatically start can be used as a dead man's switch**, where your service will be made public at a given time in the future if anything happens to you. If nothing happens to you, you can cancel the service before it's scheduled to start."
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:41
-msgid "**Scheduling an OnionShare service to automatically stop can be useful to limit exposure**, like if you want to share secret documents while making sure they're not available on the internet for more than a few days."
+#: ../../source/advanced.rst:40
+msgid "OnionShare supports scheduling exactly when a service should start and stop. Before starting a server, click \"Show advanced settings\" in its tab and then check the boxes next to either \"Start onion service at scheduled time\", \"Stop onion service at scheduled time\", or both, and set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:43
+msgid "If you scheduled a service to start in the future, when you click the \"Start sharing\" button you will see a timer counting down until it starts. If you scheduled it to stop in the future, after it's started you will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:48
-msgid "In addition to its graphical interface, OnionShare has a command line interface."
+#: ../../source/advanced.rst:46
+msgid "**Scheduling an OnionShare service to automatically start can be used as a dead man's switch**, where your service will be made public at a given time in the future if anything happens to you. If nothing happens to you, you can cancel the service before it's scheduled to start."
msgstr ""
#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid "If you installed OnionShare using the Flatpak package, unfortunately the command line interface isn't supported."
+msgid "**Scheduling an OnionShare service to automatically stop can be useful to limit exposure**, like if you want to share secret documents while making sure they're not available on the Internet for more than a few days."
msgstr ""
-#: ../../source/advanced.rst:55
-msgid "If you installed OnionShare using an operating system package, you can just run ``onionshare`` from the terminal."
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
#: ../../source/advanced.rst:58
-msgid "macOS"
+msgid "In addition to its graphical interface, OnionShare has a command-line interface."
msgstr ""
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid "You can install just the command-line version of OnionShare using ``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
+msgid "Note that you will also need the ``tor`` package installed. In macOS, install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:67
-msgid "Windows"
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:70
+msgid "If you installed OnionShare using the Linux Snapcraft package, you can also just run ``onionshare.cli`` to access the command-line interface version."
msgstr ""
-#: ../../source/advanced.rst:71
-msgid "If you really want to use it anyway, you can set up a Windows development environment (see :ref:`starting_development`) and then run this in a command prompt::"
-msgstr ""
-
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid "You can browse the command-line documentation by running ``onionshare --help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid "OnionShare uses v3 Tor onion services by default. These are modern onion addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
-msgid "But it still has support for v2 onion addresses, the old type of onion addresses that have 16 characters, for example::"
+#: ../../source/advanced.rst:139
+msgid "OnionShare still has support for v2 onion addresses, the old type of onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
-msgid "OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion addresses are more secure, and using legacy addresses is not recommended."
+#: ../../source/advanced.rst:143
+msgid "OnionShare calls v2 onion addresses \"legacy addresses\", and they are not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
-msgid "To use legacy addresses, before starting a server click \"Show advanced settings\" in its tab and check the \"Use a legacy address (v2 onion service, not recommended)\" box. In legacy mode you can optionally enable Tor client authentication. Once you start a server in legacy mode you cannot remove legacy mode in that tab. Instead you must start a separate service in a separate tab."
+#: ../../source/advanced.rst:145
+msgid "To use legacy addresses, before starting a server click \"Show advanced settings\" from its tab and check the \"Use a legacy address (v2 onion service, not recommended)\" box. In legacy mode you can optionally turn on Tor client authentication. Once you start a server in legacy mode you cannot remove legacy mode in that tab. Instead you must start a separate service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
-msgid "Tor Project plans to `completely deprecate v2 onion services <https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, 2021, and legacy onion services will soon be removed from OnionShare as well."
+#: ../../source/advanced.rst:150
+msgid "Tor Project plans to `completely deprecate v2 onion services <https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, 2021, and legacy onion services will be removed from OnionShare before then."
msgstr ""
diff --git a/docs/gettext/develop.pot b/docs/gettext/develop.pot
index cd1bfc11..7038de40 100644
--- a/docs/gettext/develop.pot
+++ b/docs/gettext/develop.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,153 +25,101 @@ msgid "Collaborating"
msgstr ""
#: ../../source/develop.rst:9
-msgid "OnionShare has an open Keybase team that we use to discuss the project, including asking questions, sharing ideas and designs, and making plans for future development. (It's also an easy way to send end-to-end encrypted direct messages to others in the OnionShare community, like OnionShare addresses.) To use Keybase, you need to download the `Keybase app <https://keybase.io/download>`_, make an account, and `join this team <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, click \"Join a Team\", and type \"onionshare\"."
+msgid "OnionShare has an open Keybase team to discuss the project, ask questions, share ideas and designs, and making plans for future development. (It's also an easy way to send end-to-end encrypted direct messages to others in the OnionShare community, like OnionShare addresses.) To use Keybase, download the `Keybase app <https://keybase.io/download>`_, make an account, and `join this team <https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid "OnionShare also has a `mailing list <https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
-msgid "OnionShare source code is in this git repository: https://github.com/micahflee/onionshare"
+#: ../../source/develop.rst:17
+msgid "OnionShare source code is to be found in this Git repository: https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
-msgid "If you'd like to contribute code to OnionShare, it helps to join the Keybase team and ask questions about what you're thinking of working on. You should also review all of the `open issues <https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if there are any that you'd like to develop."
+#: ../../source/develop.rst:19
+msgid "If you'd like to contribute code to OnionShare, it helps to join the Keybase team and ask questions about what you're thinking of working on. You should also review all of the `open issues <https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
-msgid "When you're ready to contribute code, open a pull request in the GitHub repository and one of the project maintainers will review it and possible ask questions, request changes, reject it, or merge it into the project."
-msgstr ""
-
-#: ../../source/develop.rst:25
-msgid "Starting development"
+#: ../../source/develop.rst:22
+msgid "When you're ready to contribute code, open a pull request in the GitHub repository and one of the project maintainers will review it and possibly ask questions, request changes, reject it, or merge it into the project."
msgstr ""
#: ../../source/develop.rst:27
-msgid "OnionShare is developed in Python. To get started, you should clone the git repository at https://github.com/micahflee/onionshare/ and then consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid "OnionShare is developed in Python. To get started, clone the Git repository at https://github.com/micahflee/onionshare/ and then consult the ``cli/README.md`` file to learn how to set up your development environment for the command-line version, and the ``desktop/README.md`` file to learn how to set up your development environment for the graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid "Those files contain the necessary technical instructions and commands install dependencies for your platform, and to run OnionShare from the source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
-msgid "When developing, it's convenient to run OnionShare from a terminal and add the ``--verbose`` (or ``-v``) flag to the command. This will print a lot of helpful messages to the terminal such as when certain objects are initialized, when events occur (like buttons clicked, settings saved or reloaded), and other debug information. For example::"
+#: ../../source/develop.rst:40
+msgid "When developing, it's convenient to run OnionShare from a terminal and add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot of helpful messages to the terminal, such as when certain objects are initialized, when events occur (like buttons clicked, settings saved or reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid "You can add your own debug messages by running the ``Common.log`` method from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
-msgid "This can be useful when learning the chain of events that occur when using the application or the value of certain variables before and after they are manipulated."
+#: ../../source/develop.rst:121
+msgid "This can be useful when learning the chain of events that occur when using OnionShare, or the value of certain variables before and after they are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid "Tor is slow, and it's often convenient to skip starting onion services altogether during development. You can do this with the ``--local-only`` flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid "In this case, you load the URL ``http://onionshare:eject-snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid "If you want to obtain debug output from the ``onionshare-gui.exe`` in Windows, you will need to edit ``install\\pyinstaller.spec`` and change ``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
-msgid "Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to comment out the ``signtool`` commands in the ``build_exe.bat`` and the ``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+msgid "In this case, you load the URL ``http://onionshare:train-system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid "After this, you can run ``onionshare-gui.exe -v`` from a command prompt to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid "Help make OnionShare easier to use and more familiar and welcoming for people by translating it on `Hosted Weblate <https://hosted.weblate.org/projects/onionshare/>`_. Always keep the \"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid "Most of the OnionShare is translatable. You can help make it easier to use and more familiar and welcoming for people around the globe. The Localization Lab has some `documentation about translating OnionShare <https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid "OnionShare uses Weblate to keep track of translations. You can view the OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
-msgid "To help translate, make a Hosted Weblate account and start contributing to that project."
+#: ../../source/develop.rst:176
+msgid "Sometimes the original English strings are wrong, or don't match between the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
-msgid "Sometimes the original English strings could be improved, making them easier to translate into other languages."
+msgid "File source string improvements by adding @kingu to your Weblate comment, or open a GitHub issue or pull request. The latter ensures all upstream developers see the suggestion, and can potentially modify the string via the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid "If you have suggestions for a better English string, please open a GitHub issue rather than commenting in Weblate. This ensures the upstream developers will definitely see the suggestion, and can potentially modify the string via the usual code review processes."
-msgstr ""
-
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
-msgid "Here is the current translation status. If you want start a translation in a language not to be found here, please write us to the mailing list: onionshare-dev@lists.riseup.net"
-msgstr ""
-
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
-
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
-
-#: ../../source/develop.rst:195
-msgid "Duplicate the line that begins with ``Comment=``. Add the language code to the new line so it becomes ``Comment[lang]=`` (lang should be your language). You can see what language codes are used for translation by looking at the ``share/locale/*.json`` filenames::"
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
+#: ../../source/develop.rst:183
+msgid "Here is the current translation status. If you want start a translation in a language not yet started, please write to the mailing list: onionshare-dev@lists.riseup.net"
msgstr ""
diff --git a/docs/gettext/features.pot b/docs/gettext/features.pot
index 4fef3fe5..836890a4 100644
--- a/docs/gettext/features.pot
+++ b/docs/gettext/features.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
-msgid "OnionShare works by starting web servers locally on your own computer and making them accessible to other people as `Tor <https://www.torproject.org/>`_ `onion services <https://community.torproject.org/onion-services/>`_."
+msgid "Web servers are started locally on your computer and made accessible to other people as `Tor <https://www.torproject.org/>`_ `onion services <https://community.torproject.org/onion-services/>`_."
msgstr ""
#: ../../source/features.rst:8
@@ -29,19 +29,19 @@ msgid "By default, OnionShare web addresses are protected with a random password
msgstr ""
#: ../../source/features.rst:12
-msgid "You're responsible for securely sharing that URL using a communication channel of your choice like in an encrypted chat message, or using something less secure like a Twitter or Facebook message, depending on your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+msgid "You're responsible for securely sharing that URL using a communication channel of your choice like in an encrypted chat message, or using something less secure like unencrypted e-mail, depending on your `threat model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
-msgid "The people who you send the URL to must then copy and paste it into `Tor Browser <https://www.torproject.org/>`_ to access the OnionShare service."
+msgid "The people you send the URL to then copy and paste it into their `Tor Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
-msgid "With OnionShare, *your own computer is the web server*. If you run OnionShare on your laptop to send someone files, and then suspend your laptop before the files have been downloaded, the service will not be available until your laptop is unsuspended and connected to the internet again. OnionShare works best when working with people in real-time."
+msgid "If you run OnionShare on your laptop to send someone files, and then suspend it before the files are sent, the service will not be available until your laptop is unsuspended and on the Internet again. OnionShare works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
-msgid "Because your own computer is the web server, *no third party can access anything that happens in OnionShare*, not even the developers of OnionShare. It's completely private. And because OnionShare is based on Tor onion services too, it also protects your anonymity. See the :doc:`security design </security>` for more information."
+msgid "Because your own computer is the web server, *no third party can access anything that happens in OnionShare*, not even the developers of OnionShare. It's completely private. And because OnionShare is based on Tor onion services too, it also protects your anonymity. See the :doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -49,178 +49,178 @@ msgid "Share Files"
msgstr ""
#: ../../source/features.rst:23
-msgid "You can use OnionShare to securely and anonymously send files and folders to people. Just open a share tab, drag in the files and folders you wish to share, and click \"Start sharing\"."
+msgid "You can use OnionShare to send files and folders to people securely and anonymously. Open a share tab, drag in the files and folders you wish to share, and click \"Start sharing\"."
msgstr ""
#: ../../source/features.rst:27
-#: ../../source/features.rst:91
-msgid "After you add files, you'll see some settings. Make sure you choose the setting you're interested in first before you start sharing."
+#: ../../source/features.rst:93
+msgid "After you add files, you'll see some settings. Make sure you choose the setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
-msgid "By default, as soon as someone finishes downloading your files, OnionShare will automatically stop the server, completely removing the website from the internet. If you want to allow multiple people to download these files, uncheck the \"Stop sharing after files have been sent (uncheck to allow downloading individual files)\" box."
+msgid "As soon as someone finishes downloading your files, OnionShare will automatically stop the server, removing the website from the Internet. To allow multiple people to download them, uncheck the \"Stop sharing after files have been sent (uncheck to allow downloading individual files)\" box."
msgstr ""
-#: ../../source/features.rst:33
-msgid "Also, if you uncheck this box, people will be able to download individual files that you share rather than a single compressed version of all of the files."
+#: ../../source/features.rst:34
+msgid "Also, if you uncheck this box, people will be able to download the individual files you share rather than a single compressed version of all the files."
msgstr ""
-#: ../../source/features.rst:35
-msgid "When you're ready to share, click the \"Start sharing\" button. You can always click \"Stop sharing\", or quit OnionShare, to immediate take the website down. You can also click the up arrow icon in the top-right corner to show the history and progress of people downloading files from you."
+#: ../../source/features.rst:36
+msgid "When you're ready to share, click the \"Start sharing\" button. You can always click \"Stop sharing\", or quit OnionShare, immediately taking the website down. You can also click the \"↑\" icon in the top-right corner to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
-msgid "Now that you have a website that's sharing files, copy the address and send it to the person you want to receive the files. If the files need to stay secure, you should use an encrypted messaging app."
+#: ../../source/features.rst:40
+msgid "Now that you have a OnionShare, copy the address and send it to the person you want to receive the files. If the files need to stay secure, or the person is otherwise exposed to danger, use an encrypted messaging app."
msgstr ""
-#: ../../source/features.rst:41
-msgid "That person then must load the address in Tor Browser. After logging in with the random password that's included in the web address, they will be able to download the files directly from your computer by clicking the \"Download Files\" link in the corner."
+#: ../../source/features.rst:42
+msgid "That person then must load the address in Tor Browser. After logging in with the random password included in the web address, the files can be downloaded directly from your computer by clicking the \"Download Files\" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
-msgid "You can use OnionShare to let people anonymously upload files directly to your computer, essentially turning it into an anonymous dropbox. Open a receive tab, choose where you want files to get downloaded and other settings, and then click \"Start Receive Mode\"."
-msgstr ""
-
-#: ../../source/features.rst:52
-msgid "This will start the OnionShare service. Anyone that loads this address in Tor Browser will be able to upload files to your computer."
+#: ../../source/features.rst:49
+msgid "You can use OnionShare to let people anonymously upload files directly to your computer, essentially turning it into an anonymous dropbox. Open a \"Receive tab\", choose where you want to save the files and other settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:56
-msgid "You can also click the down arrow icon in the top-right corner to show the history and progress of people sending files to you."
+#: ../../source/features.rst:54
+msgid "This starts the OnionShare service. Anyone loading this address in their Tor Browser will be able to upload files to your computer."
msgstr ""
#: ../../source/features.rst:58
-msgid "Here is what it looks like for someone sending you files."
+msgid "You can also click the down \"↓\" icon in the top-right corner to show the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:62
-msgid "When someone uploads files to your receive service, by default they get saved to a folder called ``OnionShare`` in your home folder on your computer, and they get automatically organized into separate subfolders based on the time that the files get uploaded."
+#: ../../source/features.rst:60
+msgid "Here is what it looks like for someone sending you files."
msgstr ""
#: ../../source/features.rst:64
-msgid "Setting up an OnionShare receiving service is useful for journalists and others that need to securely accept documents from anonymous sources. When used in this way, OnionShare is sort of like a lightweight, simpler, not quite as secure version of `SecureDrop <https://securedrop.org/>`_, the whistleblower submission system."
+msgid "When someone uploads files to your receive service, by default they get saved to a folder called ``OnionShare`` in the home folder on your computer, automatically organized into separate subfolders based on the time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:67
-msgid "Use at your own risk"
+#: ../../source/features.rst:66
+msgid "Setting up an OnionShare receiving service is useful for journalists and others needing to securely accept documents from anonymous sources. When used in this way, OnionShare is sort of like a lightweight, simpler, not quite as secure version of `SecureDrop <https://securedrop.org/>`_, the whistleblower submission system."
msgstr ""
#: ../../source/features.rst:69
-msgid "Just like with malicious email attachments, it's possible that someone could try to hack your computer by uploading a malicious file to your OnionShare service. OnionShare does not add any safety mechanisms to protect your system from malicious files, so use at your own risk."
+msgid "Use at your own risk"
msgstr ""
#: ../../source/features.rst:71
-msgid "If you receive an Office document or a PDF through OnionShare, you can convert these documents into PDFs that you know are safe to open using `Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself when opening untrusted documents by opening them in `Tails <https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ disposable VM."
+msgid "Just like with malicious e-mail attachments, it's possible someone could try to attack your computer by uploading a malicious file to your OnionShare service. OnionShare does not add any safety mechanisms to protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:74
-msgid "Tips for running a receive service"
+#: ../../source/features.rst:73
+msgid "If you receive an Office document or a PDF through OnionShare, you can convert these documents into PDFs that are safe to open using `Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself when opening untrusted documents by opening them in `Tails <https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ disposableVM."
msgstr ""
#: ../../source/features.rst:76
-msgid "If you want to host your own anonymous dropbox using OnionShare, it's recommended that you do it on a separate, dedicated computer that's always powered on and connected to the internet, and not on the one you use on a regular basis."
+msgid "Tips for running a receive service"
msgstr ""
#: ../../source/features.rst:78
-msgid "If you intend on advertising the OnionShare address on your website or social media profiles, then you should save the tab (see :ref:`save_tabs`) and run it as a public service (see :ref:`disable_passwords`)."
+msgid "If you want to host your own anonymous dropbox using OnionShare, it's recommended you do so on a separate, dedicated computer always powered on and connected to the Internet, and not on the one you use on a regular basis."
msgstr ""
-#: ../../source/features.rst:81
-msgid "Host a Website"
+#: ../../source/features.rst:80
+msgid "If you intend to put the OnionShare address on your website or social media profiles, save the tab (see :ref:`save_tabs`) and run it as a public service (see :ref:`turn_off_passwords`)."
msgstr ""
#: ../../source/features.rst:83
-msgid "You can use OnionShare to host a static HTML website with just a click. Just open a website tab, drag in the files and folders that make up the static website, and click when you're ready click \"Start sharing\"."
+msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:87
-msgid "If you add an ``index.html`` file, when someone loads your website it will render this page. You should also include any other HTML files, CSS files, JavaScript files, and images that make up the website. (Note that OnionShare only supports hosting *static* websites. It can't host websites that execute code or use databases. So you can't, for example, use WordPress.)"
+#: ../../source/features.rst:85
+msgid "To host a static HTML website with OnionShare, open a website tab, drag the files and folders that make up the static content there, and click \"Start sharing\" when you are ready."
msgstr ""
#: ../../source/features.rst:89
-msgid "If you don't have an ``index.html`` file, then it will show a directory listing instead, and people who load it can look through the files and download them."
+msgid "If you add an ``index.html`` file, it will render when someone loads your website. You should also include any other HTML files, CSS files, JavaScript files, and images that make up the website. (Note that OnionShare only supports hosting *static* websites. It can't host websites that execute code or use databases. So you can't for example use WordPress.)"
msgstr ""
-#: ../../source/features.rst:96
-msgid "Content Security Policy"
+#: ../../source/features.rst:91
+msgid "If you don't have an ``index.html`` file, it will show a directory listing instead, and people loading it can look through the files and download them."
msgstr ""
#: ../../source/features.rst:98
-msgid "By default OnionShare will help secure your website by setting a strict `Content Security Police <https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However this will prevent third-party content from loading inside the web page."
+msgid "Content Security Policy"
msgstr ""
#: ../../source/features.rst:100
-msgid "If you want to load content from third-party websites, like assets or JavaScript libraries from CDNs, then you must check the \"Disable Content Security Policy header (allows your website to use third-party resources)\" box before starting the service."
+msgid "By default OnionShare helps secure your website by setting a strict `Content Security Police <https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However, this prevents third-party content from loading inside the web page."
msgstr ""
-#: ../../source/features.rst:103
-msgid "Tips for running a website service"
+#: ../../source/features.rst:102
+msgid "If you want to load content from third-party websites, like assets or JavaScript libraries from CDNs, check the \"Don't send Content Security Policy header (allows your website to use third-party resources)\" box before starting the service."
msgstr ""
#: ../../source/features.rst:105
-msgid "If you want to host a long-term website using OnionShare (that isn't just to quickly show someone something), it's recommended that you do it on a separate, dedicated computer that's always powered on and connected to the internet, and not on the one you use on a regular basis. You should also save the tab (see :ref:`save_tabs`) so that you can resume the website with the same address if you close OnionShare and re-open it later."
+msgid "Tips for running a website service"
msgstr ""
#: ../../source/features.rst:107
-msgid "If your website is intended to be viewed by the public, you should run it as a public service (see :ref:`disable_passwords`)."
+msgid "If you want to host a long-term website using OnionShare (meaning not something to quickly show someone something), it's recommended you do it on a separate, dedicated computer always powered on and connected to the Internet, and not on the one you use on a regular basis. Save the tab (see :ref:`save_tabs`) so you can resume the website with the same address if you close OnionShare and re-open it later."
msgstr ""
#: ../../source/features.rst:110
+msgid "If your website is intended for the public, you should run it as a public service (see :ref:`turn_off_passwords`)."
+msgstr ""
+
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
-msgid "You can use OnionShare to set up a completely anonymous, secure chat room that doesn't log anything or leave any traces. Just open a chat tab and click \"Start chat server\"."
+#: ../../source/features.rst:115
+msgid "You can use OnionShare to set up a private, secure chat room that doesn't log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
-msgid "After you start the server, copy the OnionShare address and send it to the people who will join this anonymous chat room. If it's important to limit exactly who can join, you should use an encrypted messaging app to send the OnionShare address."
+#: ../../source/features.rst:119
+msgid "After you start the server, copy the OnionShare address and send it to the people you want in the anonymous chat room. If it's important to limit exactly who can join, use an encrypted messaging app to send out the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
-msgid "People can join the chat room by loading its OnionShare address in Tor Browser. The chat room requires JavasScript, so everyone who wants to participate must set their security level to Standard or Safer instead of Safest."
+#: ../../source/features.rst:124
+msgid "People can join the chat room by loading its OnionShare address in Tor Browser. The chat room requires JavasScript, so everyone who wants to participate must have their Tor Browser security level set to \"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
-msgid "When someone joins the chat room they get assigned a random name. They can change their name by typing a new name in the box in the left panel and pressing enter. No chat history will get displayed at all, even if others were already chatting in the room, because the chat history isn't saved anywhere."
+#: ../../source/features.rst:127
+msgid "When someone joins the chat room they get assigned a random name. They can change their name by typing a new name in the box in the left panel and pressing ↵. Since the chat history isn't saved anywhere, it doesn't get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid "In an OnionShare chat room, everyone is anonymous. Anyone can change their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
-msgid "However, if you create an OnionShare chat room and securely send the address only to a small group of trusted friends using encrypted messages, then you can be reasonably confident that the people who join the chat room are your friends."
+#: ../../source/features.rst:136
+msgid "However, if you create an OnionShare chat room and securely send the address only to a small group of trusted friends using encrypted messages, you can be reasonably confident the people joining the chat room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid "If you need to already be using an encrypted messaging app, what's the point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
-msgid "If you send a message to a Signal group, for example, a copy of your message ends up on each device (the phones and computers, if they set up Signal Desktop) of each member of the group. Even if disappearing messages is enabled, it's hard to confirm that all copies of the messages were actually deleted from all devices, and from any other places (like notifications databases) they may have been saved to. OnionShare chat rooms don't store any messages anywhere, so this isn't a problem."
+#: ../../source/features.rst:143
+msgid "If you for example send a message to a Signal group, a copy of your message ends up on each device (the devices, and computers if they set up Signal Desktop) of each member of the group. Even if disappearing messages is turned on, it's hard to confirm all copies of the messages are actually deleted from all devices, and from any other places (like notifications databases) they may have been saved to. OnionShare chat rooms don't store any messages anywhere, so the problem is reduced to a minimum."
msgstr ""
-#: ../../source/features.rst:137
-msgid "OnionShare chat rooms can also be useful for anonymous people wanting to chat securely with someone without needing to create any accounts. For example, a source can send an OnionShare address to a journalist using a disposable email address, and then wait for the journalist to join the chat room, all without compromosing their anonymity."
+#: ../../source/features.rst:146
+msgid "OnionShare chat rooms can also be useful for people wanting to chat anonymously and securely with someone without needing to create any accounts. For example, a source can send an OnionShare address to a journalist using a disposable e-mail address, and then wait for the journalist to join the chat room, all without compromosing their anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
-msgid "Because OnionShare relies on Tor onion services, connections between Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When someone posts a message to an OnionShare chat room, they send it to the server through the E2EE onion connection, which then sends it to all other members of the chat room using WebSockets, through their E2EE onion connections."
+#: ../../source/features.rst:152
+msgid "Because OnionShare relies on Tor onion services, connections between the Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When someone posts a message to an OnionShare chat room, they send it to the server through the E2EE onion connection, which then sends it to all other members of the chat room using WebSockets, through their E2EE onion connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid "OnionShare doesn't implement any chat encryption on its own. It relies on the Tor onion service's encryption instead."
msgstr ""
diff --git a/docs/gettext/help.pot b/docs/gettext/help.pot
index 0996bae3..1f91e4c3 100644
--- a/docs/gettext/help.pot
+++ b/docs/gettext/help.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,38 +20,34 @@ msgstr ""
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
+msgid "You will find instructions on how to use OnionShare. Look through all of the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:9
-msgid "This website is full of instructions on how to use OnionShare. Look through all of the sections first to see if it answers your questions."
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+msgid "If it isn't on the website, please check the `GitHub issues <https://github.com/micahflee/onionshare/issues>`_. It's possible someone else has encountered the same problem and either raised it with the developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:14
-msgid "If you can't find a solution in this website, please check the `GitHub issues <https://github.com/micahflee/onionshare/issues>`_. It's possible that someone else has encountered the same problem and has either raised it with the developers, or maybe even posted a solution."
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+msgid "If you are unable to find a solution, or wish to ask a question or suggest a new feature, please `submit an issue <https://github.com/micahflee/onionshare/issues/new>`_. This requires `creating a GitHub account <https://help.github.com/articles/signing-up-for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:19
-msgid "If you can't find a solution to your problem, or you wish to ask a question or suggest a new feature, please `submit an issue <https://github.com/micahflee/onionshare/issues/new>`_. This requires `creating an GitHub account <https://help.github.com/articles/signing-up-for-a-new-github-account/>`_."
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
#: ../../source/help.rst:22
-msgid "Join our Keybase team"
-msgstr ""
-
-#: ../../source/help.rst:24
-msgid "See :ref:`collaborating` for instructions on how to join our Keybase team that we use to discuss the project."
+msgid "See :ref:`collaborating` on how to join the Keybase team used to discuss the project."
msgstr ""
diff --git a/docs/gettext/index.pot b/docs/gettext/index.pot
index edd6e67d..faa41716 100644
--- a/docs/gettext/index.pot
+++ b/docs/gettext/index.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:46-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/docs/gettext/install.pot b/docs/gettext/install.pot
index 58bedab2..7f33fe4a 100644
--- a/docs/gettext/install.pot
+++ b/docs/gettext/install.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,81 +21,85 @@ msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
msgid "You can download OnionShare for Windows and macOS from the `OnionShare website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid "There are various ways to install OnionShare for Linux, but the recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft ensure that you'll always use the newest version and run OnionShare inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
-msgid "There are various ways to install OnionShare for Linux, but the recommended way is to use the Flatpak package. Flatpak ensures that you'll always use the most latest dependencies and run OnionShare inside of a sandbox."
+#: ../../source/install.rst:17
+msgid "Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
-msgid "Make sure you have ``flatpak`` installed and the Flathub repository added by following `these instructions <https://flatpak.org/setup/>`_ for your Linux distribution."
+#: ../../source/install.rst:19
+msgid "**Install OnionShare using Flatpak**: https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
-msgid "Then install OnionShare from Flathub by following `the instructions here <https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
msgstr ""
-#: ../../source/install.rst:25
-msgid "Verifying PGP signatures"
+#: ../../source/install.rst:23
+msgid "You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:27
-msgid "You can verify that the Windows, macOS, or source package you download is legitimate and hasn't been tampered with by verifying its PGP signature. For Windows and macOS, this step is optional and provides defense in depth: the installers also include their operating system-specific signatures, and you can just rely on those alone if you'd like."
+#: ../../source/install.rst:28
+msgid "Verifying PGP signatures"
msgstr ""
#: ../../source/install.rst:30
+msgid "You can verify that the package you download is legitimate and hasn't been tampered with by verifying its PGP signature. For Windows and macOS, this step is optional and provides defense in depth: the OnionShare binaries include operating system-specific signatures, and you can just rely on those alone if you'd like."
+msgstr ""
+
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
-msgid "Windows, macOS, and source packaged are signed by Micah Lee, the core developer, using his PGP public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#: ../../source/install.rst:36
+msgid "Packages are signed by Micah Lee, the core developer, using his PGP public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
-msgid "In order to verify signatures, you must have GnuPG installed. For macOS you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+#: ../../source/install.rst:38
+msgid "You must have GnuPG installed to verify signatures. For macOS you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
-msgid "You can find the signatures (``.asc`` files), as well as Windows, macOS, and source packages, at https://onionshare.org/dist/ in the folders named for each version of OnionShare. You can also find them on the `GitHub Releases page <https://github.com/micahflee/onionshare/releases>`_."
+#: ../../source/install.rst:43
+msgid "You can find the signatures (``.asc`` files), as well as Windows, macOS, Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ in the folders named for each version of OnionShare. You can also find them on the `GitHub Releases page <https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
-msgid "Once you have imported Micah's public key into your GnuPG keychain, downloaded the binary, and downloaded the ``.asc`` signature, you can verify the binary for macOS in terminal like this::"
+#: ../../source/install.rst:49
+msgid "Once you have imported Micah's public key into your GnuPG keychain, downloaded the binary, and downloaded the ``.asc`` signature, you can verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
-msgid "If you don't see 'Good signature from', then there might be a problem with the integrity of the file (malicious or otherwise), and you perhaps should not install the package. (The WARNING shown above, is not a problem with the package: it only means you have not defined any level of 'trust' regarding Micah's PGP key itself.)"
+#: ../../source/install.rst:69
+msgid "If you don't see 'Good signature from', there might be a problem with the integrity of the file (malicious or otherwise), and you should not install the package. (The WARNING shown above, is not a problem with the package: it only means you haven't already defined any level of 'trust' of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
-msgid "If you want to learn more about verifying PGP signatures, guides for `Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and the `Tor Project <https://2019.www.torproject.org/docs/verifying-signatures.html.en>`_ may be helpful."
+#: ../../source/install.rst:71
+msgid "If you want to learn more about verifying PGP signatures, guides for `Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and the `Tor Project <https://support.torproject.org/tbb/how-to-verify-signature/>`_ may be helpful."
msgstr ""
diff --git a/docs/gettext/security.pot b/docs/gettext/security.pot
index 2bf3fb0a..c038037a 100644
--- a/docs/gettext/security.pot
+++ b/docs/gettext/security.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid "First read :ref:`how_it_works` to understand the basics of how OnionShare works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -33,11 +33,11 @@ msgid "What OnionShare protects against"
msgstr ""
#: ../../source/security.rst:11
-msgid "**Third parties don't have access to anything that happens in OnionShare.** When you use OnionShare, you host services directly on your computer. For example, when you share files with OnionShare, you don't upload these files to any server, and when you start an OnionShare chat room, your computer is the chat room server itself. Traditional ways of sharing files or setting up websites and chat rooms require trusting a service with access to your data."
+msgid "**Third parties don't have access to anything that happens in OnionShare.** Using OnionShare means hosting services directly on your computer. When sharing files with OnionShare, they are not uploaded to any server. If you make an OnionShare chat room, your computer acts as a server for that too. This avoids the traditional model of having to trust the computers of others."
msgstr ""
#: ../../source/security.rst:13
-msgid "**Network eavesdroppers can't spy on anything that happens in OnionShare in transit.** Because connections between Tor onion services and Tor Browser are end-to-end encrypted, no network attackers can eavesdrop on what happens in an OnionShare service. If the eavesdropper is positioned on the OnionShare user's end, the Tor Browser user's end, or is a malicious Tor node, they will only see Tor traffic. If the eavesdropper is a malicious rendezvous node used to connect Tor Browser with OnionShare's onion service, the traffic will be encrypted using the onion service key."
+msgid "**Network eavesdroppers can't spy on anything that happens in OnionShare in transit.** The connection between the Tor onion service and Tor Browser is end-to-end encrypted. This means network attackers can't eavesdrop on anything except encrypted Tor traffic. Even if an eavesdropper is a malicious rendezvous node used to connect the Tor Browser with OnionShare's onion service, the traffic is encrypted using the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -45,7 +45,7 @@ msgid "**Anonymity of OnionShare users are protected by Tor.** OnionShare and To
msgstr ""
#: ../../source/security.rst:17
-msgid "**If an attacker learns about the onion service, they still can't access anything.** There have been attacks against the Tor network that can enumerate onion services. Even if someone discovers the .onion address of an OnionShare onion service, they can't access it without also knowing the service's random password (unless, of course, the OnionShare users chooses to disable the password and make it public). The password is generated by choosing two random words from a list of 6800 words, meaning there are 6800^2, or about 46 million possible password. But they can only make 20 wrong guesses before OnionShare stops the server, preventing brute force attacks against the password."
+msgid "**If an attacker learns about the onion service, it still can't access anything.** Prior attacks against the Tor network to enumerate onion services allowed the attacker to discover private .onion addresses. If an attack discovers a private OnionShare address, a password will be prevent them from accessing it (unless the OnionShare user chooses to turn it off and make it public).. The password is generated by choosing two random words from a list of 6800 words, making 6800^2, or about 46 million possible passwords. Only 20 wrong guesses can be made before OnionShare stops the server, preventing brute force attacks against the password."
msgstr ""
#: ../../source/security.rst:20
@@ -53,9 +53,9 @@ msgid "What OnionShare doesn't protect against"
msgstr ""
#: ../../source/security.rst:22
-msgid "**Communicating the OnionShare address might not be secure.** The OnionShare user is responsible for securely communicating the OnionShare address with people. If they send it insecurely (such as through an email message, and their email is being monitored by an attacker), the eavesdropper will learn that they're using OnionShare. If the attacker loads the address in Tor Browser before the legitimate recipient gets to it, they can access the service. If this risk fits the user's threat model, they must find a more secure way to communicate the address, such as in an encrypted email, chat, or voice call. This isn't necessary in cases where OnionShare is being used for something that isn't secret."
+msgid "**Communicating the OnionShare address might not be secure.** Communicating the OnionShare address to people is the responsibility of the OnionShare user. If sent insecurely (such as through an email message monitored by an attacker), an eavesdropper can tell that OnionShare is being used. If the eavesdropper loads the address in Tor Browser while the service is still up, they can access it. To avoid this, the address must be communicateed securely, via encrypted text message (probably with disappearing messages enabled), encrypted email, or in person. This isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
-msgid "**Communicating the OnionShare address might not be anonymous.** While OnionShare and Tor Browser allow for anonymity, if the user wishes to remain anonymous they must take extra steps to ensure this while communicating the OnionShare address. For example, they might need to use Tor to create a new anonymous email or chat account, and only access it over Tor, to use for sharing the address. This isn't necessary in cases where there's no need to protect anonymity, such as co-workers who know each other sharing work documents."
+msgid "**Communicating the OnionShare address might not be anonymous.** Extra steps must be taken to ensure the OnionShare address is communicated anonymously. A new email or chat account, only accessed over Tor, can be used to share the address. This isn't necessary unless anonymity is a goal."
msgstr ""
diff --git a/docs/gettext/sphinx.pot b/docs/gettext/sphinx.pot
index 05bdc208..ffc3bc79 100644
--- a/docs/gettext/sphinx.pot
+++ b/docs/gettext/sphinx.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/docs/gettext/tor.pot b/docs/gettext/tor.pot
index 5f7adb04..0812a342 100644
--- a/docs/gettext/tor.pot
+++ b/docs/gettext/tor.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,117 +21,122 @@ msgid "Connecting to Tor"
msgstr ""
#: ../../source/tor.rst:4
-msgid "There are several options for how OnionShare should connect to Tor. You can change them in Settings, which you can get to by clicking the gear icon in the bottom-right of the window."
+msgid "Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
-msgid "This is the default way that OnionShare connects to Tor, and it's also the simplest and most reliable way. For this reason, it's recommended for most users."
+msgid "This is the default, simplest and most reliable way that OnionShare connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
-msgid "When you open OnionShare, it will launch a Tor process in the background that's configured specifically for OnionShare to use. This Tor process won't interfere with other Tor processes on your computer, so you're free to run Tor Browser or use a system Tor in the background."
+#: ../../source/tor.rst:14
+msgid "When you open OnionShare, it launches an already configured ``tor`` process in the background for OnionShare to use. It doesn't interfere with other ``tor`` processes on your computer, so you can use the Tor Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
-msgid "You can configure OnionShare to connect to the Tor that comes with Tor Browser. First, `download Tor Browser <https://www.torproject.org>`_ here if you don't already have it. With this setting selected, you need to keep Tor Browser open in the background while you're using OnionShare."
+#: ../../source/tor.rst:20
+msgid "If you have `downloaded the Tor Browser <https://www.torproject.org>`_ and don't want two ``tor`` processes running, you can use the ``tor`` process from the Tor Browser. Keep in mind you need to keep Tor Browser open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid "This is fairly advanced. You'll need to know how edit plaintext files and do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
-msgid "Download the Tor Windows Expert Bundle, which you can get `from here <https://www.torproject.org/download/tor/>`_. Extract the zip file and copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename the folder to ``tor-win32``, so that inside that folder is the ``Data`` and ``Tor`` folders."
+#: ../../source/tor.rst:28
+msgid "Download the Tor Windows Expert Bundle `from <https://www.torproject.org/download/tor/>`_. Extract the ZIP file and copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
-msgid "Make up a control port password. I'm going to use ``comprised stumble rummage work avenging construct volatile`` as my password. Now open a command prompt as an administrator, and use ``tor.exe --hash-password`` to generate a hash of your password. For example::"
+#: ../../source/tor.rst:32
+msgid "Make up a control port password. (Using 7 words in a sequence like ``comprised stumble rummage work avenging construct volatile`` is a good idea for a password.) Now open a command prompt (``cmd``) as an administrator, and use ``tor.exe --hash-password`` to generate a hash of your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
-msgid "The hashed password output is displayed after some warnings (which you can ignore). In my case, it was ``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#: ../../source/tor.rst:39
+msgid "The hashed password output is displayed after some warnings (which you can ignore). In the case of the above example, it is ``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
-msgid "Now create a new text file at ``C:\\Program Files (x86)\\tor-win32\\torrc`` and put this in it, replacing the ``HashedControlPassword`` with the one you just generated::"
+#: ../../source/tor.rst:41
+msgid "Now create a new text file at ``C:\\Program Files (x86)\\tor-win32\\torrc`` and put your hashed password output in it, replacing the ``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
-msgid "In your administrator command prompt, install tor as a service using the appropriate ``torrc`` file you just created (see `here <https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more information on doing this). Like this::"
+#: ../../source/tor.rst:46
+msgid "In your administrator command prompt, install ``tor`` as a service using the appropriate ``torrc`` file you just created (as described in `<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
-msgid "Open OnionShare. Click the Settings icon. Under \"How should OnionShare connect to Tor?\" choose \"Connect using control port\", and set the control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor authentication options\" choose \"Password\" and set the password to your password, in my case ``comprised stumble rummage work avenging construct volatile``. Click the \"Test Settings\" button. If all goes well, you should see successfully connected to tor."
+#: ../../source/tor.rst:52
+msgid "Open OnionShare and click the \"⚙\" icon in it. Under \"How should OnionShare connect to Tor?\" choose \"Connect using control port\", and set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under \"Tor authentication settings\" choose \"Password\" and set the password to the control port password you picked above Click the \"Test Connection to Tor\" button. If all goes well, you should see \"Connected to the Tor controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
-msgid "First, install `Homebrew <http://brew.sh/>`_ if you don't already have it. Then, install Tor::"
+#: ../../source/tor.rst:63
+msgid "First, install `Homebrew <https://brew.sh/>`_ if you don't already have it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
-msgid "Open OnionShare. Click the Settings icon. Under \"How should OnionShare connect to Tor?\" choose \"Connect using socket file\", and set the socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor authentication options\" choose \"No authentication, or cookie authentication\". Click the \"Test Settings\" button. If all goes well, you should see successfully connected to tor."
+#: ../../source/tor.rst:78
+msgid "Open OnionShare and click the \"⚙\" icon in it. Under \"How should OnionShare connect to Tor?\" choose \"Connect using socket file\", and set the socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor authentication settings\" choose \"No authentication, or cookie authentication\". Click the \"Test Connection to Tor\" button."
+msgstr ""
+
+#: ../../source/tor.rst:84
+#: ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
-msgid "First, install the tor package. If you're using Debian, Ubuntu, or a similar Linux distro, I recommend you use Tor Project's `official repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For example, in Ubuntu 20.04::"
+#: ../../source/tor.rst:89
+msgid "First, install the ``tor`` package. If you're using Debian, Ubuntu, or a similar Linux distro, It is recommended to use the Tor Project's `official repository <https://support.torproject.org/apt/tor-deb-repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
-msgid "Next, add your user to the group that runs the Tor process (in the case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect to your system Tor's control socket file."
+#: ../../source/tor.rst:91
+msgid "Next, add your user to the group that runs the ``tor`` process (in the case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid "Add your user to the ``debian-tor`` group by running this command (replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
-msgid "Reboot your computer. After it boots up again, open OnionShare. Click the Settings icon. Under \"How should OnionShare connect to Tor?\" choose \"Connect using socket file\", and set the socket file to be ``/var/run/tor/control``. Under \"Tor authentication options\" choose \"No authentication, or cookie authentication\". Click the \"Test Settings\" button. If all goes well, you should see successfully connect to Tor."
+#: ../../source/tor.rst:97
+msgid "Reboot your computer. After it boots up again, open OnionShare and click the \"⚙\" icon in it. Under \"How should OnionShare connect to Tor?\" choose \"Connect using socket file\". Set the socket file to be ``/var/run/tor/control``. Under \"Tor authentication settings\" choose \"No authentication, or cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
-msgid "If your access to the internet is censored, you can configure OnionShare to connect to the Tor network using `Tor bridges <https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare successfully connects to Tor, you don't need to use a bridge."
+#: ../../source/tor.rst:109
+msgid "If your access to the Internet is censored, you can configure OnionShare to connect to the Tor network using `Tor bridges <https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
-msgid "You can use the built-in obfs4 pluggable transports, the built-in meek_lite (Azure) pluggable transports, or custom bridges, which you can obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you need to use a bridge, you should try the built-in obfs4 ones first."
+#: ../../source/tor.rst:113
+msgid "You can use the built-in obfs4 pluggable transports, the built-in meek_lite (Azure) pluggable transports, or custom bridges, which you can obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
diff --git a/docs/source/locale/ar/LC_MESSAGES/advanced.po b/docs/source/locale/ar/LC_MESSAGES/advanced.po
index c3847657..8b9457ea 100644
--- a/docs/source/locale/ar/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/ar/LC_MESSAGES/advanced.po
@@ -8,104 +8,103 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -113,115 +112,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ar/LC_MESSAGES/develop.po b/docs/source/locale/ar/LC_MESSAGES/develop.po
index f20ff51c..79008008 100644
--- a/docs/source/locale/ar/LC_MESSAGES/develop.po
+++ b/docs/source/locale/ar/LC_MESSAGES/develop.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -27,230 +27,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ar/LC_MESSAGES/features.po b/docs/source/locale/ar/LC_MESSAGES/features.po
index 29841dd8..e71451fb 100644
--- a/docs/source/locale/ar/LC_MESSAGES/features.po
+++ b/docs/source/locale/ar/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ar/LC_MESSAGES/help.po b/docs/source/locale/ar/LC_MESSAGES/help.po
index d965eb13..d1eb81e9 100644
--- a/docs/source/locale/ar/LC_MESSAGES/help.po
+++ b/docs/source/locale/ar/LC_MESSAGES/help.po
@@ -8,65 +8,113 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
-msgstr ""
-
-#: ../../source/help.rst:9
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ar/LC_MESSAGES/install.po b/docs/source/locale/ar/LC_MESSAGES/install.po
index a2f5b321..640c688c 100644
--- a/docs/source/locale/ar/LC_MESSAGES/install.po
+++ b/docs/source/locale/ar/LC_MESSAGES/install.po
@@ -8,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -31,113 +31,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ar/LC_MESSAGES/security.po b/docs/source/locale/ar/LC_MESSAGES/security.po
index 13d11a17..79923cda 100644
--- a/docs/source/locale/ar/LC_MESSAGES/security.po
+++ b/docs/source/locale/ar/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ar/LC_MESSAGES/tor.po b/docs/source/locale/ar/LC_MESSAGES/tor.po
index a4d227cd..f8716f64 100644
--- a/docs/source/locale/ar/LC_MESSAGES/tor.po
+++ b/docs/source/locale/ar/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ca/LC_MESSAGES/advanced.po b/docs/source/locale/ca/LC_MESSAGES/advanced.po
index c3847657..8b9457ea 100644
--- a/docs/source/locale/ca/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/ca/LC_MESSAGES/advanced.po
@@ -8,104 +8,103 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -113,115 +112,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ca/LC_MESSAGES/develop.po b/docs/source/locale/ca/LC_MESSAGES/develop.po
index f20ff51c..79008008 100644
--- a/docs/source/locale/ca/LC_MESSAGES/develop.po
+++ b/docs/source/locale/ca/LC_MESSAGES/develop.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -27,230 +27,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ca/LC_MESSAGES/features.po b/docs/source/locale/ca/LC_MESSAGES/features.po
index 29841dd8..e71451fb 100644
--- a/docs/source/locale/ca/LC_MESSAGES/features.po
+++ b/docs/source/locale/ca/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ca/LC_MESSAGES/help.po b/docs/source/locale/ca/LC_MESSAGES/help.po
index d965eb13..d1eb81e9 100644
--- a/docs/source/locale/ca/LC_MESSAGES/help.po
+++ b/docs/source/locale/ca/LC_MESSAGES/help.po
@@ -8,65 +8,113 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
-msgstr ""
-
-#: ../../source/help.rst:9
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ca/LC_MESSAGES/install.po b/docs/source/locale/ca/LC_MESSAGES/install.po
index a2f5b321..640c688c 100644
--- a/docs/source/locale/ca/LC_MESSAGES/install.po
+++ b/docs/source/locale/ca/LC_MESSAGES/install.po
@@ -8,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -31,113 +31,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ca/LC_MESSAGES/security.po b/docs/source/locale/ca/LC_MESSAGES/security.po
index 13d11a17..79923cda 100644
--- a/docs/source/locale/ca/LC_MESSAGES/security.po
+++ b/docs/source/locale/ca/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ca/LC_MESSAGES/tor.po b/docs/source/locale/ca/LC_MESSAGES/tor.po
index a4d227cd..f8716f64 100644
--- a/docs/source/locale/ca/LC_MESSAGES/tor.po
+++ b/docs/source/locale/ca/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/da/LC_MESSAGES/advanced.po b/docs/source/locale/da/LC_MESSAGES/advanced.po
index c3847657..8b9457ea 100644
--- a/docs/source/locale/da/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/da/LC_MESSAGES/advanced.po
@@ -8,104 +8,103 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -113,115 +112,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/da/LC_MESSAGES/develop.po b/docs/source/locale/da/LC_MESSAGES/develop.po
index f20ff51c..79008008 100644
--- a/docs/source/locale/da/LC_MESSAGES/develop.po
+++ b/docs/source/locale/da/LC_MESSAGES/develop.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -27,230 +27,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/da/LC_MESSAGES/features.po b/docs/source/locale/da/LC_MESSAGES/features.po
index 29841dd8..e71451fb 100644
--- a/docs/source/locale/da/LC_MESSAGES/features.po
+++ b/docs/source/locale/da/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/da/LC_MESSAGES/help.po b/docs/source/locale/da/LC_MESSAGES/help.po
index d965eb13..d1eb81e9 100644
--- a/docs/source/locale/da/LC_MESSAGES/help.po
+++ b/docs/source/locale/da/LC_MESSAGES/help.po
@@ -8,65 +8,113 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
-msgstr ""
-
-#: ../../source/help.rst:9
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/da/LC_MESSAGES/install.po b/docs/source/locale/da/LC_MESSAGES/install.po
index a2f5b321..640c688c 100644
--- a/docs/source/locale/da/LC_MESSAGES/install.po
+++ b/docs/source/locale/da/LC_MESSAGES/install.po
@@ -8,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -31,113 +31,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/da/LC_MESSAGES/security.po b/docs/source/locale/da/LC_MESSAGES/security.po
index 13d11a17..79923cda 100644
--- a/docs/source/locale/da/LC_MESSAGES/security.po
+++ b/docs/source/locale/da/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/da/LC_MESSAGES/tor.po b/docs/source/locale/da/LC_MESSAGES/tor.po
index a4d227cd..f8716f64 100644
--- a/docs/source/locale/da/LC_MESSAGES/tor.po
+++ b/docs/source/locale/da/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/de/LC_MESSAGES/advanced.po b/docs/source/locale/de/LC_MESSAGES/advanced.po
index 61e9527d..768f224f 100644
--- a/docs/source/locale/de/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/de/LC_MESSAGES/advanced.po
@@ -7,105 +7,94 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-11-09 09:26+0000\n"
"Last-Translator: mv87 <mv87@dismail.de>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: de\n"
+"Language-Team: de <LL@li.org>\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.3.2\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+#, fuzzy
+msgid "Advanced Usage"
msgstr "Fortgeschrittene Nutzung"
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+#, fuzzy
+msgid "Save Tabs"
msgstr "Reiter speichern"
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-"Standardmäßig ist in OnionShare alles temporär. Sobald du einen OnionShare-"
-"Reiter schließt, existiert seine Adresse nicht mehr und kann nicht noch "
-"einmal verwendet werden. Manchmal aber kann es sinnvoll sein, einen "
-"dauerhaften OnionShare-Dienst zu haben. Das kann zum Beispiel der Fall sein, "
-"wenn man eine Webseite hosten möchte, die ihre URL auch nach einem Neustart "
-"des Rechners behalten soll."
-
-#: ../../source/advanced.rst:11
+
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-"Um einen beliebigen Reiter dauerhaft zu machen, setze den Haken bei “"
-"Speichere diesen Reiter und öffne ihn automatisch, wenn ich OnionShare "
+"Um einen beliebigen Reiter dauerhaft zu machen, setze den Haken bei "
+"“Speichere diesen Reiter und öffne ihn automatisch, wenn ich OnionShare "
"starte”, bevor du den Dienst startest. So gespeicherte Tabs erhalten ein "
"purpurfarbenen Stecknadelsymbol links dem Status des Dienstes."
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
+#, fuzzy
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
"Wenn du OnionShare beendest und dann wieder öffnest, werden deine "
"gespeicherten Reiter wieder geöffnet. Du musst dann zwar jeden Dienst "
-"manuell starten, aber wenn du dies tust, starten die Dienste mit derselben "
-"OnionShare-Adresse und mit demselben Passwort wie zuvor."
+"manuell starten, aber wenn du dies tust, starten die Dienste mit "
+"derselben OnionShare-Adresse und mit demselben Passwort wie zuvor."
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-"Wenn du einen Reiter speicherst, wird eine Kopie des zum jeweiligen Onion-"
-"Dienst gehörenden geheimen Schlüssels auf deinem Rechner, zusammen mit "
-"deinen OnionShare-Einstellungen, abgespeichert."
+"Wenn du einen Reiter speicherst, wird eine Kopie des zum jeweiligen "
+"Onion-Dienst gehörenden geheimen Schlüssels auf deinem Rechner, zusammen "
+"mit deinen OnionShare-Einstellungen, abgespeichert."
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
-msgstr "Passwörter deaktivieren"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
+msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-"Standardmäßig werden alle OnionShare-Dienste mit dem Benutzernamen "
-"`onionshare`und einem zufällig erzeugten Passwort geschützt. Wenn jemand 20 "
-"falsche Versuche bei der Eingabe des Passworts macht, wird der OnionShare-"
-"Dienst automatisch gestoppt, um einen Brute-Force-Angriff darauf zu "
-"verhindern."
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-"Manchmal aber kann es sinnvoll sein, einen OnionShare-Dienst öffentlich "
-"zugänglich zu machen."
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
+#, fuzzy
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
@@ -113,143 +102,127 @@ msgstr ""
"Haken bei “Kein Passwort verwenden”, bevor du den Dienst startest. Der "
"Dienst wird dann öffentlich sein und kein Passwort erfordern."
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+#, fuzzy
+msgid "Scheduled Times"
msgstr "Geplante Zeiten"
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
+#, fuzzy
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-"OnionShare erlaubt eine genaue Zeitsteuerung, wann ein Dienst starten und "
-"stoppen soll. Bevor du den Dienst startest, klicke im jeweiligen Reiter auf “"
-"Erweiterte Einstellungen anzeigen” und setze die Haken bei “Onion-Dienst zu "
-"einem festgelegten Zeitpunkt starten”, “Onion-Dienst zu einem festgelegten "
-"Zeitpunkt stoppen” oder bei beiden, und lege das jeweilig gewünschte Datum "
-"samt Uhrzeit fest."
-
-#: ../../source/advanced.rst:35
+"OnionShare erlaubt eine genaue Zeitsteuerung, wann ein Dienst starten und"
+" stoppen soll. Bevor du den Dienst startest, klicke im jeweiligen Reiter "
+"auf “Erweiterte Einstellungen anzeigen” und setze die Haken bei “Onion-"
+"Dienst zu einem festgelegten Zeitpunkt starten”, “Onion-Dienst zu einem "
+"festgelegten Zeitpunkt stoppen” oder bei beiden, und lege das jeweilig "
+"gewünschte Datum samt Uhrzeit fest."
+
+#: ../../source/advanced.rst:43
+#, fuzzy
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-"Wenn einer geplanter Dienst in der Zukunft starten soll, siehst du nach dem "
-"Klick auf den Start-Button einen Timer, der bis zum Start abläuft. Wenn "
-"einer geplanter Dienst in der Zukunft stoppen soll, siehst du nach dem Start "
-"einen Timer, der bis zum Stopp abläuft."
+"Wenn einer geplanter Dienst in der Zukunft starten soll, siehst du nach "
+"dem Klick auf den Start-Button einen Timer, der bis zum Start abläuft. "
+"Wenn einer geplanter Dienst in der Zukunft stoppen soll, siehst du nach "
+"dem Start einen Timer, der bis zum Stopp abläuft."
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
"time in the future if anything happens to you. If nothing happens to you,"
" you can cancel the service before it's scheduled to start."
msgstr ""
-"**Der automatische, zeitgesteuerte Start eines OnionShare-Dienstes kann als "
-"sog. “Totmanneinrichtung” oder “Kanarienvogel” genutzt werden**, wobei dein "
-"Dienst öffentlich ans Netz geht, falls dir etwas zustößt. Falls dir nichts "
-"zustößt, kannst du den Dienst deaktvieren, bevor er gemäß Zeitsteuerung "
-"starten würde."
+"**Der automatische, zeitgesteuerte Start eines OnionShare-Dienstes kann "
+"als sog. “Totmanneinrichtung” oder “Kanarienvogel” genutzt werden**, "
+"wobei dein Dienst öffentlich ans Netz geht, falls dir etwas zustößt. "
+"Falls dir nichts zustößt, kannst du den Dienst deaktvieren, bevor er "
+"gemäß Zeitsteuerung starten würde."
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
+#, fuzzy
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
"**Der automatische, zeigesteuerte Stopp eines OnionShare-Dienstes kann "
-"sinnvoll sein, um den Dienst nicht mehr als nötig einem Zugriff von außen "
-"auszusetzen**; beispielsweise, wenn du geheime Dokumente freigeben möchtest "
-"und diese nicht länger als für ein paar Tage über das Internet zugänglich "
-"sein sollen."
-
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+"sinnvoll sein, um den Dienst nicht mehr als nötig einem Zugriff von außen"
+" auszusetzen**; beispielsweise, wenn du geheime Dokumente freigeben "
+"möchtest und diese nicht länger als für ein paar Tage über das Internet "
+"zugänglich sein sollen."
+
+#: ../../source/advanced.rst:56
+#, fuzzy
+msgid "Command-line Interface"
msgstr "Kommandozeilen-Schnittstelle"
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
+#, fuzzy
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
"Zusätzlich zur grafischen Oberfläche verfügt OnionShre auch über eine "
"Kommandozeilen-Schnittstelle."
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr "Linux"
-
-#: ../../source/advanced.rst:53
+#: ../../source/advanced.rst:60
msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
-"Falls du OnionShare über ein Flatpak-Paket installiert hast, steht die "
-"Kommandozeilen-Schnittstelle leider nicht zur Verfügung."
-#: ../../source/advanced.rst:55
+#: ../../source/advanced.rst:64
msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-"Falls du OnionShare über ein Paket speziell für dein Betriebssystem "
-"installiert hast, kannst du einfach ``onionshare`` auf der Kommandozeile "
-"ausführen."
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr "macOS"
-
-#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-"Erstelle eine symbolische Verknüpfung zur Binärdatei der Kommandozeilen-"
-"Anwendung:"
-#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr "Jetzt kannst du ``onionshare`` im Terminal ausführen."
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
-msgstr "Windows"
-
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
-msgstr "Die Kommandozeilen-Schnittstelle wird unter Windows nicht unterstützt."
-
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
+#, fuzzy
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-"Falls du es dennoch nutzen möchtest, kannst du eine Entwicklungsumgebung für "
-"Windows aufsetzen (siehe :ref:`starting_development`) und dann Folgendes auf "
-"der Befehlszeile ausführen::"
+"Falls du OnionShare über ein Paket speziell für dein Betriebssystem "
+"installiert hast, kannst du einfach ``onionshare`` auf der Kommandozeile "
+"ausführen."
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr "Benutzung"
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+#, fuzzy
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
"Die Dokumentation zur Kommandozeile kann über den Befehl ``onionshare "
"--help`` abgerufen werden::"
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+#, fuzzy
+msgid "Legacy Addresses"
msgstr "Veraltetes Adressformat"
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
@@ -257,52 +230,165 @@ msgstr ""
"OnionShare nutzt standardmäßig Tor-OnionDienste der Version 3. Dies sind "
"moderne .onion-Adressen von 56 Zeichen Länge, z.B.::"
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
+#, fuzzy
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-"OnionShare unterstützt jedoch immer noch .onion-Adressen der Version 2, die "
-"alte Version von .onion-Adressen mit 16 Zeichen Länge, z.B.::"
+"OnionShare unterstützt jedoch immer noch .onion-Adressen der Version 2, "
+"die alte Version von .onion-Adressen mit 16 Zeichen Länge, z.B.::"
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
+#, fuzzy
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
"OnionShare bezeichnet .onion-Adressen der Version 2 als \"veraltetes "
-"Adressformat\". Adressen der Version 3 sind sicherer, und eine Nutzung der "
-"veralteten Adressen wird nicht empfohlen."
+"Adressformat\". Adressen der Version 3 sind sicherer, und eine Nutzung "
+"der veralteten Adressen wird nicht empfohlen."
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
+#, fuzzy
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
"Um solche veralteten Adressen zu nutzen, klicke vor dem Start eines "
"entsprechenden Dienstes in seinem Reiter auf \"Erweiterte Einstellungen "
-"anzeigen\"; setze dort den Haken bei \"Benutze ein veraltetes Adressformat "
-"(Onion-Dienste-Adressformat v2, nicht empfohlen)\". In diesem veralteten "
-"Modus kannst du die Client-Authorisierung aktivieren. Sobald ein Dienst in "
-"dem veralteten Modus gestartet wurde, kann man dies in dem entsprechenden "
-"Reiter nicht rückgängig machen; stattdessen müsstest du einen separaten "
-"Dienst in einem eigenem Reiter starten."
-
-#: ../../source/advanced.rst:148
+"anzeigen\"; setze dort den Haken bei \"Benutze ein veraltetes "
+"Adressformat (Onion-Dienste-Adressformat v2, nicht empfohlen)\". In "
+"diesem veralteten Modus kannst du die Client-Authorisierung aktivieren. "
+"Sobald ein Dienst in dem veralteten Modus gestartet wurde, kann man dies "
+"in dem entsprechenden Reiter nicht rückgängig machen; stattdessen "
+"müsstest du einen separaten Dienst in einem eigenem Reiter starten."
+
+#: ../../source/advanced.rst:150
+#, fuzzy
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
-"Das Tor-Projekt plant, .onion-Dienste der Version 2 zum 15. Oktober 2021 `"
-"vollständig zu entfernen <https://blog.torproject.org/v2-deprecation-"
+"Das Tor-Projekt plant, .onion-Dienste der Version 2 zum 15. Oktober 2021 "
+"`vollständig zu entfernen <https://blog.torproject.org/v2-deprecation-"
"timeline>`_, und die Unterstützung für diese Dienste wird auch bald aus "
"OnionShare entfernt werden."
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+#~ "Standardmäßig ist in OnionShare alles "
+#~ "temporär. Sobald du einen OnionShare-"
+#~ "Reiter schließt, existiert seine Adresse "
+#~ "nicht mehr und kann nicht noch "
+#~ "einmal verwendet werden. Manchmal aber "
+#~ "kann es sinnvoll sein, einen dauerhaften"
+#~ " OnionShare-Dienst zu haben. Das kann"
+#~ " zum Beispiel der Fall sein, wenn "
+#~ "man eine Webseite hosten möchte, die "
+#~ "ihre URL auch nach einem Neustart "
+#~ "des Rechners behalten soll."
+
+#~ msgid "Disable passwords"
+#~ msgstr "Passwörter deaktivieren"
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+#~ "Standardmäßig werden alle OnionShare-Dienste"
+#~ " mit dem Benutzernamen `onionshare`und "
+#~ "einem zufällig erzeugten Passwort geschützt."
+#~ " Wenn jemand 20 falsche Versuche bei"
+#~ " der Eingabe des Passworts macht, "
+#~ "wird der OnionShare-Dienst automatisch "
+#~ "gestoppt, um einen Brute-Force-Angriff"
+#~ " darauf zu verhindern."
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+#~ "Manchmal aber kann es sinnvoll sein, "
+#~ "einen OnionShare-Dienst öffentlich zugänglich"
+#~ " zu machen."
+
+#~ msgid "Linux"
+#~ msgstr "Linux"
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+#~ "Falls du OnionShare über ein Flatpak-"
+#~ "Paket installiert hast, steht die "
+#~ "Kommandozeilen-Schnittstelle leider nicht zur "
+#~ "Verfügung."
+
+#~ msgid "macOS"
+#~ msgstr "macOS"
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+#~ "Erstelle eine symbolische Verknüpfung zur "
+#~ "Binärdatei der Kommandozeilen-Anwendung:"
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr "Jetzt kannst du ``onionshare`` im Terminal ausführen."
+
+#~ msgid "Windows"
+#~ msgstr "Windows"
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr "Die Kommandozeilen-Schnittstelle wird unter Windows nicht unterstützt."
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+#~ "Falls du es dennoch nutzen möchtest, "
+#~ "kannst du eine Entwicklungsumgebung für "
+#~ "Windows aufsetzen (siehe "
+#~ ":ref:`starting_development`) und dann Folgendes "
+#~ "auf der Befehlszeile ausführen::"
+
diff --git a/docs/source/locale/de/LC_MESSAGES/develop.po b/docs/source/locale/de/LC_MESSAGES/develop.po
index a0474edd..31800342 100644
--- a/docs/source/locale/de/LC_MESSAGES/develop.po
+++ b/docs/source/locale/de/LC_MESSAGES/develop.po
@@ -7,17 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: 2020-11-09 09:26+0000\n"
"Last-Translator: mv87 <mv87@dismail.de>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: de\n"
+"Language-Team: de <LL@li.org>\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.3.2\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -29,307 +28,421 @@ msgstr "Zusammenarbeit"
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-"OnionShare hat ein offenes Keybase-Team, wo wir über das Projekt "
-"diskutieren, Fragen stellen, Ideen und Designs austauschen und Pläne für die "
-"künftige Entwicklung machen. (Dort kann man auch einfach Ende zu Ende "
-"verschlüsselte Direktnachrichten an andere Mitglieder der OnionShare-"
-"Community schicken, wie z.B. OnionShare-Adressen.) Um Keybase zu nutzen, "
-"musst du die `Keybase-App <https://keybase.io/download>`_ herunterladen, ein "
-"Benutzerkonto erstellen und `diesem Team beitreten <https://keybase.io/team/"
-"onionshare>`_. In der App gehe auf Teams, klicke auf “einem Team beitreten” "
-"und gib “onionshare” ein."
-
-#: ../../source/develop.rst:11
+
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-"OnionShare hat auch eine `Mailinglist <https://lists.riseup.net/www/"
-"subscribe/onionshare-dev>`_ für Entwickler und Designer, um sich über das "
-"Projekt auszutauschen."
+"OnionShare hat auch eine `Mailinglist "
+"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ für Entwickler "
+"und Designer, um sich über das Projekt auszutauschen."
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+#, fuzzy
+msgid "Contributing Code"
msgstr "Code beitragen"
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
+#, fuzzy
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-"OnionShares Quellcode findet sich in diesem git-Repository: https://github."
-"com/micahflee/onionshare"
+"OnionShares Quellcode findet sich in diesem git-Repository: "
+"https://github.com/micahflee/onionshare"
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
+#, fuzzy
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-"Wenn du Code zu OnionShare beitragen willst, solltest du dem Keybase-Team "
-"beitreten und dort zur Diskussion stellen, was du gerne beitragen möchtest. "
-"Du solltest auch einen Blick auf alle `offenen Issues <https://github.com/"
-"micahflee/onionshare/issues>`_ auf GitHub werfen, um zu sehen, ob dort etwas "
-"für dich zum Weiterentwickeln dabei ist."
-
-#: ../../source/develop.rst:20
+"Wenn du Code zu OnionShare beitragen willst, solltest du dem Keybase-Team"
+" beitreten und dort zur Diskussion stellen, was du gerne beitragen "
+"möchtest. Du solltest auch einen Blick auf alle `offenen Issues "
+"<https://github.com/micahflee/onionshare/issues>`_ auf GitHub werfen, um "
+"zu sehen, ob dort etwas für dich zum Weiterentwickeln dabei ist."
+
+#: ../../source/develop.rst:22
+#, fuzzy
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-"Wenn du bereit bist, Code beizusteuern, lege einen Pull-Request im GitHub-"
-"Repository an und einer der Projektbetreuer wird einen Blick darüber werfen "
-"und ggfs. Fragen stellen, Änderungen anfragen, ihn zurückweisen oder ihn in "
-"das Projekt einpflegen."
-
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr "Mit der Entwicklung beginnen"
+"Wenn du bereit bist, Code beizusteuern, lege einen Pull-Request im "
+"GitHub-Repository an und einer der Projektbetreuer wird einen Blick "
+"darüber werfen und ggfs. Fragen stellen, Änderungen anfragen, ihn "
+"zurückweisen oder ihn in das Projekt einpflegen."
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
-msgstr ""
-"OnionShare ist in Python geschrieben. Um loszulegen, solltest du das Git-"
-"Repositor unter https://github.com/micahflee/onionshare/ klonen und dann "
-"einen Blick in die ``BUILD.MD``-Datei werfen."
+#, fuzzy
+msgid "Starting Development"
+msgstr "Mit der Entwicklung beginnen"
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
-"Diese Datei enthält die notwendigen technischen Instruktionen und Befehle:"
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
-msgstr "Installiere die Abhängigkeiten für deine Plattform"
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr "OnionShare aus dem Quellcode-Baum ausführen, ohne ein Paket zu bauen"
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr "Pakete bauen"
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
-msgstr "Ein OnionShare-Release erstellen"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
+msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr "Debugging-Tipps"
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr "Verbose-Modus"
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
+#, fuzzy
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
"Beim Entwickeln ist es hilfreich, OnionShare über die Kommandozeile "
-"auszuführen und dabei die ``--verbose``- (oder ``-v``-) Flagge zu setzen. "
-"Dadurch werden viele hilfreiche Nachrichten auf der Kommandozeile "
+"auszuführen und dabei die ``--verbose``- (oder ``-v``-) Flagge zu setzen."
+" Dadurch werden viele hilfreiche Nachrichten auf der Kommandozeile "
"ausgegeben, zum Bespiel wenn bestimmte Objekte initialisiert wurden oder "
-"wenn Ereignisse eintreten (Klicken von Buttons, Speichern oder Auffrischen "
-"von Einstellungen), sowie andere Debug-Informationen. Zum Beispiel::"
+"wenn Ereignisse eintreten (Klicken von Buttons, Speichern oder "
+"Auffrischen von Einstellungen), sowie andere Debug-Informationen. Zum "
+"Beispiel::"
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-"Du kannst deine eigenen Debug-Nachrichten einbauen, indem du die ``Common."
-"log``-Methode aus ``onionshare/common.py`` ausführst. Zum Beispiel::"
+"Du kannst deine eigenen Debug-Nachrichten einbauen, indem du die "
+"``Common.log``-Methode aus ``onionshare/common.py`` ausführst. Zum "
+"Beispiel::"
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
+#, fuzzy
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
"Das kann nützlich sein, wenn du die Abfolge von Events beim Benutzen der "
-"Anwendung oder den Wert bestimmter Variablen vor oder nach deren Änderung "
-"herausfinden möchtest."
+"Anwendung oder den Wert bestimmter Variablen vor oder nach deren Änderung"
+" herausfinden möchtest."
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+#, fuzzy
+msgid "Local Only"
msgstr "Nur lokal"
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
"Tor ist langsam, und oft ist es ratsam, bei der Entwicklung keine Onion-"
-"Dienste zu starten. Dies kannst du mit der ``--local-only``-Flagge tun. Zum "
-"Beispiel::"
-
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-"In diesem Fall lädst du die URL ``http://onionshare:eject-snack@127.0.0."
-"1:17614`` in einem normalen Webbrowser wie Firefox anstelle des Tor Browsers."
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr "Debugging unter Windows"
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-"Wenn du Debug-Meldungen von der ``onionshare-gui.exe`` unter Windows "
-"erhalten willst, musst du die Datei ``install\\pyinstaller.spec`` editieren "
-"und den Wert ``console=False`` nach ``console=True`` ändern."
+"Dienste zu starten. Dies kannst du mit der ``--local-only``-Flagge tun. "
+"Zum Beispiel::"
#: ../../source/develop.rst:164
+#, fuzzy
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-"Dann musst du die .exe-Datei mit ``install\\build_exe.bat`` erneut bauen ("
-"eventuell musst du die ``signtool``-Befehle in den Dateien ``build_exe.bat`` "
-"und ``onionshare.nsi`` auskommentieren, wie es auch in den Instruktionen in "
-"der ``BUILD.md`` steht)."
+"In diesem Fall lädst du die URL ``http://onionshare:eject-"
+"snack@127.0.0.1:17614`` in einem normalen Webbrowser wie Firefox anstelle"
+" des Tor Browsers."
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
-msgstr ""
-"Danach kannst du den Befehl ``onionshare-gui.exe -v`` auf der Kommandozeile "
-"ausführen und die Debug-Meldungen sehen."
+#: ../../source/develop.rst:167
+#, fuzzy
+msgid "Contributing Translations"
+msgstr "Übersetzungen beitragen"
#: ../../source/develop.rst:169
-msgid "Contributing translations"
-msgstr "Übersetzungen beitragen"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
+msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#, fuzzy
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-"Der Großteil von OnionShare kann übersetzt werden. Du kannst dazu beitragen, "
-"es benutzerfreundlicher, vertrauter und einladender für Leute auf der ganzen "
-"Welt zu machen. Das Localization-Lab hat `eine Übersetzungsanleitung für "
-"OnionShare <https://wiki.localizationlab.org/index.php/OnionShare>`_."
+"Um bei der Übersetzung mitzuhelfen, erstelle dir ein Benutzerkonto für "
+"``Hosted Weblate``, und schon kann es losgehen."
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+#, fuzzy
+msgid "Suggestions for Original English Strings"
msgstr ""
-"Zum Überblick und zur Koordinierung der Übersetzungen verwendet OnionShare "
-"die Plattform Weblate . Du kannst dir die entsprechende OnionShare-"
-"Projektseite hier ansehen: https://hosted.weblate.org/projects/onionshare/"
+"Vorschläge für die ursprüngliche englischsprache Zeichenketten "
+"(\"strings\")"
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
-"Um bei der Übersetzung mitzuhelfen, erstelle dir ein Benutzerkonto für ``"
-"Hosted Weblate``, und schon kann es losgehen."
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-"Vorschläge für die ursprüngliche englischsprache Zeichenketten (\"strings\")"
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
-"Manchmal können bereits die ursprünglich englischsprachigen Zeichenketten "
-"verbessert werden, so dass diese wiederum leichter in andere Sprachen "
-"übersetzt werden können."
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
-msgstr ""
-"Wenn du einen Verbesserungsvorschlag für eine ursprünglich englischsprachige "
-"Zeichenkette hast, öffne bitte lieber ein Issue auf GitHub anstelle einen "
-"Kommentar in Weblate zu erstellen. Damit wird sichergestellt, dass die "
-"Hauptentwickler den Vorschlag auch wirklich sehen, und sie können die "
-"Zeichenkette ggfs. im Rahmen des üblichen Code-Reviews abändern."
-
-#: ../../source/develop.rst:185
-msgid "Status of translations"
+#, fuzzy
+msgid "Status of Translations"
msgstr "Übersetzungsstatus"
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
+#, fuzzy
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
"Hier siehst du den aktuellen Stand der Übersetzungen. Wenn du eine "
-"Übersetzung in einer Sprache beginnen möchtest, die hier nicht gelistet ist, "
-"schreibe uns bitte auf der Mailinglist: onionshare-dev@lists.riseup.net"
-
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr "Die .desktop-Datei übersetzen"
-
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr "Du kannst auch die ``install/onionshare.desktop``-Datei übersetzen."
+"Übersetzung in einer Sprache beginnen möchtest, die hier nicht gelistet "
+"ist, schreibe uns bitte auf der Mailinglist: onionshare-"
+"dev@lists.riseup.net"
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
-"Dupliziere die Zeile, die mit ``Comment=`` beginnt. Füge der neuen Zeile den "
-"Sprachcode hinzu, so dass daraus ``Comment[lang]=`` wird (lang muss durch "
-"den Sprachcode der neuen Sprache ersetzt werden). Welche Sprachcodes für die "
-"Übersetzungen benutzt werden, kannst du an den Dateienamen in ``share/locale/"
-"*.json`` sehen::"
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr "Tu dasselbe für die anderen noch nicht übersetzten Zeilen."
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
+#~ "OnionShare hat ein offenes Keybase-Team,"
+#~ " wo wir über das Projekt diskutieren,"
+#~ " Fragen stellen, Ideen und Designs "
+#~ "austauschen und Pläne für die künftige"
+#~ " Entwicklung machen. (Dort kann man "
+#~ "auch einfach Ende zu Ende verschlüsselte"
+#~ " Direktnachrichten an andere Mitglieder der"
+#~ " OnionShare-Community schicken, wie z.B."
+#~ " OnionShare-Adressen.) Um Keybase zu "
+#~ "nutzen, musst du die `Keybase-App "
+#~ "<https://keybase.io/download>`_ herunterladen, ein "
+#~ "Benutzerkonto erstellen und `diesem Team "
+#~ "beitreten <https://keybase.io/team/onionshare>`_. In "
+#~ "der App gehe auf Teams, klicke auf"
+#~ " “einem Team beitreten” und gib "
+#~ "“onionshare” ein."
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ "OnionShare ist in Python geschrieben. Um"
+#~ " loszulegen, solltest du das Git-"
+#~ "Repositor unter https://github.com/micahflee/onionshare/"
+#~ " klonen und dann einen Blick in "
+#~ "die ``BUILD.MD``-Datei werfen."
+
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+#~ "Diese Datei enthält die notwendigen "
+#~ "technischen Instruktionen und Befehle:"
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr "Installiere die Abhängigkeiten für deine Plattform"
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr "OnionShare aus dem Quellcode-Baum ausführen, ohne ein Paket zu bauen"
+
+#~ msgid "Building packages"
+#~ msgstr "Pakete bauen"
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr "Ein OnionShare-Release erstellen"
+
+#~ msgid "Debugging in Windows"
+#~ msgstr "Debugging unter Windows"
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+#~ "Wenn du Debug-Meldungen von der "
+#~ "``onionshare-gui.exe`` unter Windows erhalten "
+#~ "willst, musst du die Datei "
+#~ "``install\\pyinstaller.spec`` editieren und den "
+#~ "Wert ``console=False`` nach ``console=True`` "
+#~ "ändern."
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+#~ "Dann musst du die .exe-Datei mit"
+#~ " ``install\\build_exe.bat`` erneut bauen "
+#~ "(eventuell musst du die ``signtool``-Befehle"
+#~ " in den Dateien ``build_exe.bat`` und "
+#~ "``onionshare.nsi`` auskommentieren, wie es "
+#~ "auch in den Instruktionen in der "
+#~ "``BUILD.md`` steht)."
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+#~ "Danach kannst du den Befehl "
+#~ "``onionshare-gui.exe -v`` auf der "
+#~ "Kommandozeile ausführen und die Debug-"
+#~ "Meldungen sehen."
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+#~ "Der Großteil von OnionShare kann "
+#~ "übersetzt werden. Du kannst dazu "
+#~ "beitragen, es benutzerfreundlicher, vertrauter "
+#~ "und einladender für Leute auf der "
+#~ "ganzen Welt zu machen. Das "
+#~ "Localization-Lab hat `eine Übersetzungsanleitung"
+#~ " für OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+#~ "Zum Überblick und zur Koordinierung der"
+#~ " Übersetzungen verwendet OnionShare die "
+#~ "Plattform Weblate . Du kannst dir "
+#~ "die entsprechende OnionShare-Projektseite hier"
+#~ " ansehen: https://hosted.weblate.org/projects/onionshare/"
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+#~ "Manchmal können bereits die ursprünglich "
+#~ "englischsprachigen Zeichenketten verbessert werden,"
+#~ " so dass diese wiederum leichter in"
+#~ " andere Sprachen übersetzt werden können."
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+#~ "Wenn du einen Verbesserungsvorschlag für "
+#~ "eine ursprünglich englischsprachige Zeichenkette "
+#~ "hast, öffne bitte lieber ein Issue "
+#~ "auf GitHub anstelle einen Kommentar in"
+#~ " Weblate zu erstellen. Damit wird "
+#~ "sichergestellt, dass die Hauptentwickler den"
+#~ " Vorschlag auch wirklich sehen, und "
+#~ "sie können die Zeichenkette ggfs. im "
+#~ "Rahmen des üblichen Code-Reviews "
+#~ "abändern."
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr "Die .desktop-Datei übersetzen"
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr "Du kannst auch die ``install/onionshare.desktop``-Datei übersetzen."
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+#~ "Dupliziere die Zeile, die mit "
+#~ "``Comment=`` beginnt. Füge der neuen "
+#~ "Zeile den Sprachcode hinzu, so dass "
+#~ "daraus ``Comment[lang]=`` wird (lang muss "
+#~ "durch den Sprachcode der neuen Sprache"
+#~ " ersetzt werden). Welche Sprachcodes für"
+#~ " die Übersetzungen benutzt werden, kannst"
+#~ " du an den Dateienamen in "
+#~ "``share/locale/*.json`` sehen::"
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr "Tu dasselbe für die anderen noch nicht übersetzten Zeilen."
+
diff --git a/docs/source/locale/de/LC_MESSAGES/features.po b/docs/source/locale/de/LC_MESSAGES/features.po
index 5edfbe28..bc9fc5d0 100644
--- a/docs/source/locale/de/LC_MESSAGES/features.po
+++ b/docs/source/locale/de/LC_MESSAGES/features.po
@@ -7,31 +7,31 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: 2020-11-09 09:26+0000\n"
"Last-Translator: mv87 <mv87@dismail.de>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: de\n"
+"Language-Team: de <LL@li.org>\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.3.2\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+#, fuzzy
+msgid "How OnionShare Works"
msgstr "Wie OnionShare funktioniert"
#: ../../source/features.rst:6
+#, fuzzy
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
-"OnionShare startet Webserver lokal auf deinem Rechner und macht sie anderen "
-"Leuten als `Tor <https://www.torproject.org/>`_ `Onion-"
+"OnionShare startet Webserver lokal auf deinem Rechner und macht sie "
+"anderen Leuten als `Tor <https://www.torproject.org/>`_ `Onion-"
"Dienste<https://community.torproject.org/onion-services/>`_ zugänglich."
#: ../../source/features.rst:8
@@ -44,21 +44,23 @@ msgstr ""
"aussehen::"
#: ../../source/features.rst:12
+#, fuzzy
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
-"Du musst diese URL über einen sicheren Kommunikationskanal deiner Wahl mit "
-"anderen teilen, beispielsweise über eine verschlüsselte Chatnachricht, oder "
-"über einen weniger sicheren Weg wie zum Beispiel einerTwitter- oder Facebook-"
-"Nachricht, abhängig von deiner persönlichen `Bedrohungsanalyse <https://ssd."
-"eff.org/en/module/your-security-plan>`_."
+"Du musst diese URL über einen sicheren Kommunikationskanal deiner Wahl "
+"mit anderen teilen, beispielsweise über eine verschlüsselte "
+"Chatnachricht, oder über einen weniger sicheren Weg wie zum Beispiel "
+"einerTwitter- oder Facebook-Nachricht, abhängig von deiner persönlichen "
+"`Bedrohungsanalyse <https://ssd.eff.org/en/module/your-security-plan>`_."
#: ../../source/features.rst:14
+#, fuzzy
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
"Die Empfänger deiner URL müssen diese kopieren und in den `Tor Browser "
@@ -67,29 +69,23 @@ msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
-"Bei OnionShare *ist dein eigener Rechner der Webserver*. Falls du OnionShare "
-"auf deinem Laptop laufen hast, um jemandem Dateien zu schicken, und du "
-"deinen Laptop vor Ende der Dateiübertragung in den Ruhezustand schickst, "
-"wird der Service so lange nicht funktionieren, bis du deinen Laptop wieder "
-"aufweckst und mit dem Internet verbindest. OnionShare funktioniert am "
-"besten, wenn du mit Leuten in Echtzeit zusammenarbeitest."
#: ../../source/features.rst:18
+#, fuzzy
msgid ""
"Because your own computer is the web server, *no third party can access "
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
-"Weil dein eigener Rechner der Webserver ist, *hat kein Dritter Zugriff auf "
-"das, was ihr mit OnionShare tut*, nicht einmal die Entwickler von "
+"Weil dein eigener Rechner der Webserver ist, *hat kein Dritter Zugriff "
+"auf das, was ihr mit OnionShare tut*, nicht einmal die Entwickler von "
"OnionShare. Es ist vollständig geheim. Und weil OnionShare auch auf Tors "
"Onion-Diensten basiert, schützt es auch deine Anonymität. Für weitere "
"Informationen siehe :doc:`security design </security>`."
@@ -99,355 +95,342 @@ msgid "Share Files"
msgstr "Dateien freigeben"
#: ../../source/features.rst:23
+#, fuzzy
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-"Du kannst OnionShare dazu verwenden, um Dateien und Ordner sicher und anonym "
-"an andere Leute zu schicken. Öffne einfach einen Freigabe-Reiter, ziehe die "
-"freizugebenden Dateien und Ordner dort hinein, und klicke auf “Freigabe "
-"starten”."
+"Du kannst OnionShare dazu verwenden, um Dateien und Ordner sicher und "
+"anonym an andere Leute zu schicken. Öffne einfach einen Freigabe-Reiter, "
+"ziehe die freizugebenden Dateien und Ordner dort hinein, und klicke auf "
+"“Freigabe starten”."
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
+#, fuzzy
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
-"Nachdem du Dateien hinzugefügt hast, werden dir Einstellungsmöglichkeiten "
-"angezeigt. Wähle die passenden Einstellungen, bevor du die Freigabe startest."
+"Nachdem du Dateien hinzugefügt hast, werden dir Einstellungsmöglichkeiten"
+" angezeigt. Wähle die passenden Einstellungen, bevor du die Freigabe "
+"startest."
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-"Standardmäßig wird OnionShare den entsprechenden Webserver stoppen, sobald "
-"jemand deine Dateien vollständig heruntergeladen hat, und die Webseite wird "
-"wieder vollständig aus dem Internet verschwinden. Wenn du mehreren Personen "
-"den Download dieser Dateien ermöglichen willst, entferne den Haken bei “"
-"Dateifreigabe beenden, sobald alle Dateien versendet wurden (abwählen, um "
-"das Herunterladen einzelner Dateien zu erlauben)”."
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
+#, fuzzy
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-"Wenn du diesen Haken entfernst, können Leute außerdem die Dateien einzeln "
-"herunterladen (anstelle einer einzigen komprimierten Datei, die alle "
+"Wenn du diesen Haken entfernst, können Leute außerdem die Dateien einzeln"
+" herunterladen (anstelle einer einzigen komprimierten Datei, die alle "
"Einzeldateien enthält)."
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
+#, fuzzy
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-"Wenn du bereit zum Freigeben bist, klicke auf den “Freigabe starten”-Button. "
-"Du kannst jederzeit auf “Freigabe beenden” klicken oder OnionShare beenden, "
-"um die Webseite augenblicklich vom Internet zu nehmen. Du kannst außerdem "
-"auf den “Nach oben”-Pfeil in der oberen rechten Ecke klicken, um dir den "
-"Verlauf und den Fortschritt der Downloads anzeigen zu lassen."
+"Wenn du bereit zum Freigeben bist, klicke auf den “Freigabe "
+"starten”-Button. Du kannst jederzeit auf “Freigabe beenden” klicken oder "
+"OnionShare beenden, um die Webseite augenblicklich vom Internet zu "
+"nehmen. Du kannst außerdem auf den “Nach oben”-Pfeil in der oberen "
+"rechten Ecke klicken, um dir den Verlauf und den Fortschritt der "
+"Downloads anzeigen zu lassen."
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-"Da du jetzt eine Webseite hast, über die Dateien freigegeben werden, kannst "
-"du die Adresse kopieren und der Person schicken, welche die Dateien "
-"empfangen soll. Falls die Dateien nicht öffentlich bleiben sollen, solltest "
-"du zum Verschicken der Adresse einen verschlüsselten Messenger benutzen."
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
+#, fuzzy
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-"Diese Person muss nun die Adresse mit dem Tor Browser öffnen. Nachdem sie "
-"sich mit dem zufällig erzeugten Passwort eingeloggt hat, das in der Adresse "
-"enthalten ist, kann sie die Dateien direkt von deinem Rechner über den “"
-"Dateien herunterladen”-Link herunterladen."
+"Diese Person muss nun die Adresse mit dem Tor Browser öffnen. Nachdem sie"
+" sich mit dem zufällig erzeugten Passwort eingeloggt hat, das in der "
+"Adresse enthalten ist, kann sie die Dateien direkt von deinem Rechner "
+"über den “Dateien herunterladen”-Link herunterladen."
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr "Dateien empfangen"
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
+#, fuzzy
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
"Du kannst OnionShare dazu benutzen, um anderen Personen das anonyme "
-"Hochladen von Dateien direkt auf deinen Rechner zu ermöglichen; hierdurch "
-"wird dein Rechner sozusagen zu einem anonymen Briefkasten. Öffne einen “"
-"Dateien Empfangen”-Reiter, wähle einen Speicherpfad und andere "
+"Hochladen von Dateien direkt auf deinen Rechner zu ermöglichen; hierdurch"
+" wird dein Rechner sozusagen zu einem anonymen Briefkasten. Öffne einen "
+"“Dateien Empfangen”-Reiter, wähle einen Speicherpfad und andere "
"Einstellungen, und klicke dann auf “Empfangsmodus starten”."
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
+#, fuzzy
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-"Damit der OnionShare-Service gestartet. Jeder der diese Adresse mit dem Tor "
-"Browser öffnet, kann Dateien auf deinen Rechner hochladen."
+"Damit der OnionShare-Service gestartet. Jeder der diese Adresse mit dem "
+"Tor Browser öffnet, kann Dateien auf deinen Rechner hochladen."
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
+#, fuzzy
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
"Du kannst außerdem auf den “Nach oben”-Pfeil in der oberen rechten Ecke "
"klicken, um dir den Verlauf und den Fortschritt der Uploads auf deinen "
"rechner anzeigen zu lassen."
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr "So sieht es aus, wenn jemand Dateien bei dir hochlädt."
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-"Wenn jemand Dateien auf deinen Rechner hochlädt, werden sie standardmäßig in "
-"einen Ordner namens ``OnionShare`` in deinem Benuterverzeichnis abgelegt; "
-"sie werden automatisch in einzelne Unterverzeichnisse einsortiert, abhängig "
-"von der Uhrzeit des Uploads."
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
+#, fuzzy
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
"Ein solcher OnionShare-Empfangsdienst ist besonders für Journalisten und "
-"andere interessant, die Dokumente von anonymen Quellen erhalten. So genutzt, "
-"ist OnionShare sozusagen eine leichtgewichtige, einfachere und nicht ganz so "
-"sichere Variante von `SecureDrop <https://securedrop.org/>`_, einem "
-"Einsendesystem für Whistleblower."
+"andere interessant, die Dokumente von anonymen Quellen erhalten. So "
+"genutzt, ist OnionShare sozusagen eine leichtgewichtige, einfachere und "
+"nicht ganz so sichere Variante von `SecureDrop "
+"<https://securedrop.org/>`_, einem Einsendesystem für Whistleblower."
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr "Nutzung auf eigene Gefahr"
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-"Wie bei bösartigen E-Mail-Anhängen kann es sein, dass jemand deinen Rechner "
-"hacken möchte, indem er eine bösartige Datei auf deinen OnionShare-Dienst "
-"hochlädt. OnionShare hat keine Sicherheitsmechanismen, um dein System vor "
-"bösartigen Dateien zu schützen, Benutzung daher auf eigene Gefahr."
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-"Wenn du ein Office-Dokument oder eine PDF-Datei über OnionShare empfängst, "
-"kannst du diese Dateien in PDF-Dokumente per `Dangerzone <https://dangerzone."
-"rocks/>`_ umwandeln, um auf der sicheren Seite zu sein. Um dich zu schützen, "
-"kannst du nicht vertrauenswürdige Dokumente außerdem in `Tails <https://tails"
-".boum.org/>`_ oder in einer`Qubes <https://qubes-os.org/>`_-Wegwerf-VM "
-"öffnen."
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr "Tipps für einen OnionShare-Empfangsdienst"
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
+#, fuzzy
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-"Wenn du deinen eigenen anonymen Briefkasten per OnionShare betreiben willst, "
-"solltest du dies auf einem separaten, eigens dafür eingerichteten Rechner "
-"tun, der immer läuft und mit dem Internet verbunden ist; nicht mit dem, den "
-"du sonst regelmäßig benutzt."
+"Wenn du deinen eigenen anonymen Briefkasten per OnionShare betreiben "
+"willst, solltest du dies auf einem separaten, eigens dafür eingerichteten"
+" Rechner tun, der immer läuft und mit dem Internet verbunden ist; nicht "
+"mit dem, den du sonst regelmäßig benutzt."
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
+#, fuzzy
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
"Falls du deine OnionShare-Adresse auf deiner Webseite oder auf deinen "
-"Profilen in den sozialen Medien verbreiten möchtest, solltest du den Reiter "
-"speichern (siehe :ref:`save_tabs`) und den Dienst als öffentlichen Dienst "
-"betreiben (siehe :ref:`disable password`)."
+"Profilen in den sozialen Medien verbreiten möchtest, solltest du den "
+"Reiter speichern (siehe :ref:`save_tabs`) und den Dienst als öffentlichen"
+" Dienst betreiben (siehe :ref:`disable password`)."
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr "Eine Webseite hosten"
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
+#, fuzzy
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-"Mit nur einem Klick kannst du eine statische HTML-Webseite per OnionShare "
-"hosten. Öffne den Webseiten-Reiter, ziehe die Dateien und Ordner hinein, aus "
-"denen die statische Webseite besteht, und klicke auf \"Webseite "
+"Mit nur einem Klick kannst du eine statische HTML-Webseite per OnionShare"
+" hosten. Öffne den Webseiten-Reiter, ziehe die Dateien und Ordner hinein,"
+" aus denen die statische Webseite besteht, und klicke auf \"Webseite "
"veröffentlichen\"."
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-"Wenn du eine ``index.html``-Datei hinzufügst, landet man beim Öffnen der "
-"Webseite auf jener Seite. Du solltest auch die anderen HTML-, CSS- und "
-"JavaScript-Dateien und Bilder hinzufügen, aus denen deine Webseite besteht. ("
-"Beachte, dass OnionShare nur *statische* Webseiten hosten kann. OnionShare "
-"kann keine Webseiten hosten, die Code ausführen oder auf Datenbanken "
-"angewiesen sind. Man kann z.B. kein WordPress benutzen.)"
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
+#, fuzzy
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
"Wenn du keine ``index.html``-Datei hast, wird stattdessen eine "
"Verzeichnisstruktur angezeigt; beim Aufruf können Personen die Dateien "
"durchsehen und herunterladen."
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr "Content-Security-Policy"
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
+#, fuzzy
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-"Standardmäßig wird OnionShare beim Absichern deiner Webseite helfen, indem "
-"es einen strikten `Content-Security-Policy <https://en.wikipedia.org/wiki/"
-"Content_Security_Policy>`_-Header setzt. Allerdings wird hierdurch "
-"verhindert, dass Inhalte von Drittanbietern innerhalb der Webseite geladen "
-"werden."
+"Standardmäßig wird OnionShare beim Absichern deiner Webseite helfen, "
+"indem es einen strikten `Content-Security-Policy "
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_-Header setzt. "
+"Allerdings wird hierdurch verhindert, dass Inhalte von Drittanbietern "
+"innerhalb der Webseite geladen werden."
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
+#, fuzzy
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
"Falls du auch Inhalte von Drittanbieter-Webseiten laden willst, wie z.B. "
"Inhalte oder JavaScript-Bibliotheken von CDNs, musst du einen Haken bei "
-"\"Content-Security-Policy-Header deaktivieren (ermöglicht es, Ressourcen von "
-"Drittanbietern auf deiner Onion-Webseite einzubinden)\" setzen."
+"\"Content-Security-Policy-Header deaktivieren (ermöglicht es, Ressourcen "
+"von Drittanbietern auf deiner Onion-Webseite einzubinden)\" setzen."
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr "Tipps zum Betreiben eines Webseiten-Dienstes"
-#: ../../source/features.rst:105
-msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
-msgstr ""
-"Falls du eine Webseite längerfristig über OnionShare anbieten (und nicht nur "
-"kurz jemandem etwas zeigen) möchtest, solltest du dies auf einem separaten, "
-"eigens dafür eingerichteten Rechner tun, der immer läuft und mit dem "
-"Internet verbunden ist; nicht mit dem, den du sonst regelmäßig benutzt. "
-"Außerdem solltest du den Reiter speichern (see :ref:`save_tabs`), so dass du "
-"die Webseite mit derselben Adresse weiterbetreiben kannst, falls du "
-"OnionShare schließt und später wieder öffnest."
-
#: ../../source/features.rst:107
+#, fuzzy
+msgid ""
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
+msgstr ""
+"Falls du eine Webseite längerfristig über OnionShare anbieten (und nicht "
+"nur kurz jemandem etwas zeigen) möchtest, solltest du dies auf einem "
+"separaten, eigens dafür eingerichteten Rechner tun, der immer läuft und "
+"mit dem Internet verbunden ist; nicht mit dem, den du sonst regelmäßig "
+"benutzt. Außerdem solltest du den Reiter speichern (see "
+":ref:`save_tabs`), so dass du die Webseite mit derselben Adresse "
+"weiterbetreiben kannst, falls du OnionShare schließt und später wieder "
+"öffnest."
+
+#: ../../source/features.rst:110
+#, fuzzy
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
"Falls du die Webseite öffentlich betreiben wilst, solltest du sie als "
"öffentlichen Dienst hosten (see :ref:`disable_passwords`)."
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr "Anonym chatten"
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
+#, fuzzy
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
"Mit OnionShare kannst du einen komplett anonymen, sicheren Chatroom "
"aufsetzen, der nichts aufzeichnet oder sonst irgendwelche Spuren "
-"hinterlässt. Öffne einfach einen Chat-Reiter und klicke auf \"Chat starten\"."
+"hinterlässt. Öffne einfach einen Chat-Reiter und klicke auf \"Chat "
+"starten\"."
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-"Kopiere die OnionShare-Adresse nach Start des Chatservers und schicke sie "
-"den Personen, die dem Chatroom anonym beitreten sollen. Überlege dir gut, "
-"wer dem Chat beitreten können soll, und du solltest einen verschlüsselten "
-"Messenger benutzen, um die OnionShare-Adresse zu versenden."
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
+#, fuzzy
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
"Man kann dem Chatroom beitreten, indem man die OnionShare-Adresse im Tor "
-"Browser aufruft. Der Chatroom setzt JavaScript voraus, d.h. jeder Teilnehmer "
-"muss im Tor Browser seinen Sicherheitslevel auf Standard oder Safer ("
-"anstelle von Safest) setzen."
+"Browser aufruft. Der Chatroom setzt JavaScript voraus, d.h. jeder "
+"Teilnehmer muss im Tor Browser seinen Sicherheitslevel auf Standard oder "
+"Safer (anstelle von Safest) setzen."
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
+#, fuzzy
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
"Beim Betreten des Chatrooms wird einem ein zufällig erzeugter Name "
"zugewiesen. Man kann den Namen ändern, indem man einen neuen Namen im "
@@ -455,7 +438,7 @@ msgstr ""
"Chatverlauf wird nicht angezeigt, selbst wenn andere bereits zuvor im "
"Chatroot gechattet hatten, da der Chatverlauf nirgendwo gespeichert wird."
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
@@ -463,88 +446,293 @@ msgstr ""
"In einem OnionShare-Chatroom ist jeder anonym. Jeder kann seinen Namen "
"beliebig ändern und die Identität der Nutzer kann nicht überprüft werden."
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
+#, fuzzy
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
"Allerdings kannst du dir einigermaßen sicher sein, dass die Leute im "
-"Chatroom auch wirklich deine Freunde sind, wenn du die OnionShare-Adresse "
-"nur an eine kleine Anzahl vertrauenswürdiger Freunde über einen "
+"Chatroom auch wirklich deine Freunde sind, wenn du die OnionShare-Adresse"
+" nur an eine kleine Anzahl vertrauenswürdiger Freunde über einen "
"verschlüsselten Kanal geschickt hast."
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr "Wozu soll das gut sein?"
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
"Worin liegt der Sinn in OnionShare-Chatrooms, wenn du ohnehin einen "
-"verschlüsselten Messenger benutzen solltest? Sie hinterlassen weniger Spuren."
+"verschlüsselten Messenger benutzen solltest? Sie hinterlassen weniger "
+"Spuren."
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
-msgstr ""
-"Wenn du beispielsweise eine Nachricht an eine Signal-Gruppe schickst, landet "
-"eine Kopie deine Nachricht auf jedem Gerät (den Smartphones und Rechnern, "
-"soweit sie Signal Desktop benutzen) eines jeden Gruppenmitglieds. Selbst "
-"wenn \"verschwindende Nachrichten\" aktiviert ist, kann kaum nachvollzogen "
-"werden, ob alle Kopien der Nachrichten auch wirklich von allen Geräten sowie "
-"allen anderen Orten (beispielsweise einer Datenbank für Benachrichtigungen) "
-"gelöscht wurden, wo sie möglicherweise abgespeichert wurden. OnionShare-"
-"Chatrooms speichern nirgendwo Nachrichten, so dass es hier kein "
-"vergleichbares Problem gibt."
-
-#: ../../source/features.rst:137
-msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
+msgstr ""
+
+#: ../../source/features.rst:146
+#, fuzzy
+msgid ""
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
"OnionShare-Chatrooms können außerdem für einander unbekannte Personen "
-"nützlich sein, die sicher untereinander chatten wollen, ohne Benutzerkonten "
-"zu erstellen. Beispielsweise könnte eine Quelle einem Journalisten über eine "
-"Wegwerf-E-Mail-Adresse eine OnionShare-Adresse schicken und dann warten, bis "
-"der Journalist den Chatroom betritt; alles ohne die Anonymität zu gefährden."
+"nützlich sein, die sicher untereinander chatten wollen, ohne "
+"Benutzerkonten zu erstellen. Beispielsweise könnte eine Quelle einem "
+"Journalisten über eine Wegwerf-E-Mail-Adresse eine OnionShare-Adresse "
+"schicken und dann warten, bis der Journalist den Chatroom betritt; alles "
+"ohne die Anonymität zu gefährden."
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr "Wie funktioniert die Verschlüsselung?"
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
+#, fuzzy
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
"Weil OnionShare auf Tors Onion-Dienste aufbaut, sind alle Verbindungen "
-"zwischen Tor Browser und OnionShare Ende zu Ende verschlüsselt (E2EE). Wenn "
-"jemand eine Nachricht in einem OnionShare-Chatroom absetzt, wird diese durch "
-"die E2EE-Onion-Verbindung an den Chatserver gesendet, welcher sie dann "
-"wiederum an alle anderen Mitglieder des Chatrooms über sog. WebSockets "
-"weiterschickt, wiederum durch deren eigene E2EE-Onion-Verbindungen."
+"zwischen Tor Browser und OnionShare Ende zu Ende verschlüsselt (E2EE). "
+"Wenn jemand eine Nachricht in einem OnionShare-Chatroom absetzt, wird "
+"diese durch die E2EE-Onion-Verbindung an den Chatserver gesendet, welcher"
+" sie dann wiederum an alle anderen Mitglieder des Chatrooms über sog. "
+"WebSockets weiterschickt, wiederum durch deren eigene E2EE-Onion-"
+"Verbindungen."
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
"OnionShare bringt keine eigene Chatverschlüsselung mit sich. Die "
"Verschlüsselung beruht stattdessen auf der des Onion-Dienstes."
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+#~ "Bei OnionShare *ist dein eigener Rechner"
+#~ " der Webserver*. Falls du OnionShare "
+#~ "auf deinem Laptop laufen hast, um "
+#~ "jemandem Dateien zu schicken, und du "
+#~ "deinen Laptop vor Ende der "
+#~ "Dateiübertragung in den Ruhezustand schickst,"
+#~ " wird der Service so lange nicht "
+#~ "funktionieren, bis du deinen Laptop "
+#~ "wieder aufweckst und mit dem Internet"
+#~ " verbindest. OnionShare funktioniert am "
+#~ "besten, wenn du mit Leuten in "
+#~ "Echtzeit zusammenarbeitest."
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+#~ "Standardmäßig wird OnionShare den "
+#~ "entsprechenden Webserver stoppen, sobald "
+#~ "jemand deine Dateien vollständig "
+#~ "heruntergeladen hat, und die Webseite "
+#~ "wird wieder vollständig aus dem Internet"
+#~ " verschwinden. Wenn du mehreren Personen"
+#~ " den Download dieser Dateien ermöglichen"
+#~ " willst, entferne den Haken bei "
+#~ "“Dateifreigabe beenden, sobald alle Dateien"
+#~ " versendet wurden (abwählen, um das "
+#~ "Herunterladen einzelner Dateien zu erlauben)”."
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+#~ "Da du jetzt eine Webseite hast, "
+#~ "über die Dateien freigegeben werden, "
+#~ "kannst du die Adresse kopieren und "
+#~ "der Person schicken, welche die Dateien"
+#~ " empfangen soll. Falls die Dateien "
+#~ "nicht öffentlich bleiben sollen, solltest "
+#~ "du zum Verschicken der Adresse einen "
+#~ "verschlüsselten Messenger benutzen."
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+#~ "Wenn jemand Dateien auf deinen Rechner"
+#~ " hochlädt, werden sie standardmäßig in "
+#~ "einen Ordner namens ``OnionShare`` in "
+#~ "deinem Benuterverzeichnis abgelegt; sie werden"
+#~ " automatisch in einzelne Unterverzeichnisse "
+#~ "einsortiert, abhängig von der Uhrzeit "
+#~ "des Uploads."
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+#~ "Wie bei bösartigen E-Mail-Anhängen kann"
+#~ " es sein, dass jemand deinen Rechner"
+#~ " hacken möchte, indem er eine "
+#~ "bösartige Datei auf deinen OnionShare-"
+#~ "Dienst hochlädt. OnionShare hat keine "
+#~ "Sicherheitsmechanismen, um dein System vor "
+#~ "bösartigen Dateien zu schützen, Benutzung "
+#~ "daher auf eigene Gefahr."
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+#~ "Wenn du ein Office-Dokument oder "
+#~ "eine PDF-Datei über OnionShare "
+#~ "empfängst, kannst du diese Dateien in"
+#~ " PDF-Dokumente per `Dangerzone "
+#~ "<https://dangerzone.rocks/>`_ umwandeln, um auf "
+#~ "der sicheren Seite zu sein. Um "
+#~ "dich zu schützen, kannst du nicht "
+#~ "vertrauenswürdige Dokumente außerdem in `Tails"
+#~ " <https://tails.boum.org/>`_ oder in einer`Qubes"
+#~ " <https://qubes-os.org/>`_-Wegwerf-VM öffnen."
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+#~ "Wenn du eine ``index.html``-Datei hinzufügst,"
+#~ " landet man beim Öffnen der Webseite"
+#~ " auf jener Seite. Du solltest auch"
+#~ " die anderen HTML-, CSS- und "
+#~ "JavaScript-Dateien und Bilder hinzufügen, "
+#~ "aus denen deine Webseite besteht. "
+#~ "(Beachte, dass OnionShare nur *statische* "
+#~ "Webseiten hosten kann. OnionShare kann "
+#~ "keine Webseiten hosten, die Code "
+#~ "ausführen oder auf Datenbanken angewiesen "
+#~ "sind. Man kann z.B. kein WordPress "
+#~ "benutzen.)"
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+#~ "Kopiere die OnionShare-Adresse nach "
+#~ "Start des Chatservers und schicke sie"
+#~ " den Personen, die dem Chatroom "
+#~ "anonym beitreten sollen. Überlege dir "
+#~ "gut, wer dem Chat beitreten können "
+#~ "soll, und du solltest einen "
+#~ "verschlüsselten Messenger benutzen, um die "
+#~ "OnionShare-Adresse zu versenden."
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+#~ "Wenn du beispielsweise eine Nachricht an"
+#~ " eine Signal-Gruppe schickst, landet "
+#~ "eine Kopie deine Nachricht auf jedem "
+#~ "Gerät (den Smartphones und Rechnern, "
+#~ "soweit sie Signal Desktop benutzen) "
+#~ "eines jeden Gruppenmitglieds. Selbst wenn "
+#~ "\"verschwindende Nachrichten\" aktiviert ist, "
+#~ "kann kaum nachvollzogen werden, ob alle"
+#~ " Kopien der Nachrichten auch wirklich "
+#~ "von allen Geräten sowie allen anderen"
+#~ " Orten (beispielsweise einer Datenbank für"
+#~ " Benachrichtigungen) gelöscht wurden, wo "
+#~ "sie möglicherweise abgespeichert wurden. "
+#~ "OnionShare-Chatrooms speichern nirgendwo "
+#~ "Nachrichten, so dass es hier kein "
+#~ "vergleichbares Problem gibt."
+
diff --git a/docs/source/locale/de/LC_MESSAGES/help.po b/docs/source/locale/de/LC_MESSAGES/help.po
index 5cbc22a9..8da4bfec 100644
--- a/docs/source/locale/de/LC_MESSAGES/help.po
+++ b/docs/source/locale/de/LC_MESSAGES/help.po
@@ -7,82 +7,90 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-11-08 00:00+0000\n"
"Last-Translator: mv87 <mv87@dismail.de>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: de\n"
+"Language-Team: de <LL@li.org>\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.3.2\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr "Hilfe erhalten"
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
-msgstr "Falls du Hilfe mit OnionShare benötigst, kannst du Folgendes tun."
-
-#: ../../source/help.rst:7
-msgid "Read this website"
+#: ../../source/help.rst:5
+#, fuzzy
+msgid "Read This Website"
msgstr "Siehe auf dieser Webseite nach"
-#: ../../source/help.rst:9
+#: ../../source/help.rst:7
+#, fuzzy
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-"Auf dieser Webseite finden sich zahlreiche Anleitungen, wie man OnionShare "
-"benutzt. Sieh dort zuerst alle Kapitel durch, ob sie alle deine Fragen "
-"beantworten."
+"Auf dieser Webseite finden sich zahlreiche Anleitungen, wie man "
+"OnionShare benutzt. Sieh dort zuerst alle Kapitel durch, ob sie alle "
+"deine Fragen beantworten."
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+#, fuzzy
+msgid "Check the GitHub Issues"
msgstr "Siehe die Problemsektion auf GitHub durch"
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
+#, fuzzy
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-"Falls du auf dieser Webseite keine Lösung findest, siehe bitte die `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_ durch. "
-"Möglicherweise ist bereits jemand anderes auf das gleiche Problem gestoßen "
-"und hat es den Entwicklern gemeldet, und vielleicht wurde dort sogar schon "
-"eine Lösung gepostet."
+"Falls du auf dieser Webseite keine Lösung findest, siehe bitte die "
+"`GitHub issues <https://github.com/micahflee/onionshare/issues>`_ durch. "
+"Möglicherweise ist bereits jemand anderes auf das gleiche Problem "
+"gestoßen und hat es den Entwicklern gemeldet, und vielleicht wurde dort "
+"sogar schon eine Lösung gepostet."
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+#, fuzzy
+msgid "Submit an Issue Yourself"
msgstr "Selber ein Problem melden"
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
+#, fuzzy
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-"Falls du keine Lösung zu deinem Problem findest, eine Frage stellen möchtest "
-"oder einen Vorschlag für ein Feature hast, `erstelle ein Ticket auf GitHub "
-"<https://github.com/micahflee/onionshare/issues/new>`_. Hierfür benötigt man`"
-"einen GitHub-Account <https://help.github.com/articles/"
-"signing-up-for-a-new-github-account/>`_."
+"Falls du keine Lösung zu deinem Problem findest, eine Frage stellen "
+"möchtest oder einen Vorschlag für ein Feature hast, `erstelle ein Ticket "
+"auf GitHub <https://github.com/micahflee/onionshare/issues/new>`_. "
+"Hierfür benötigt man`einen GitHub-Account "
+"<https://help.github.com/articles/signing-up-for-a-new-github-"
+"account/>`_."
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+#, fuzzy
+msgid "Join our Keybase Team"
msgstr "Tritt unserem Keybase-Team bei"
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
+#, fuzzy
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
"Siehe :ref:`collaborating` für eine Anleitung, wie man unserem Team auf "
"Keybase beitritt, wo wir uns über das Projekt austauschen."
+
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr "Falls du Hilfe mit OnionShare benötigst, kannst du Folgendes tun."
+
diff --git a/docs/source/locale/de/LC_MESSAGES/install.po b/docs/source/locale/de/LC_MESSAGES/install.po
index e9df43f9..8c68fd6b 100644
--- a/docs/source/locale/de/LC_MESSAGES/install.po
+++ b/docs/source/locale/de/LC_MESSAGES/install.po
@@ -7,24 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-11-09 09:26+0000\n"
"Last-Translator: mv87 <mv87@dismail.de>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: de\n"
+"Language-Team: de <LL@li.org>\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.3.2\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr "Installation"
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+#, fuzzy
+msgid "Windows or macOS"
msgstr "Installation unter Windows oder macOS"
#: ../../source/install.rst:7
@@ -35,154 +35,232 @@ msgstr ""
"Du kannst OnionShare für Windows und macOS von der `OnionShare-Webseite "
"<https://onionshare.org/>`_ herunterladen."
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
-msgstr "Für zusätzliche Sicherheit, siehe :ref:`verifying_sigs`."
-
-#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+#: ../../source/install.rst:12
+#, fuzzy
+msgid "Install in Linux"
msgstr "Installation unter Linux mit Flatpak"
-#: ../../source/install.rst:16
+#: ../../source/install.rst:14
msgid ""
"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-"Es gibt verschiedene Möglichkeiten, OnionShare unter Linux zu installieren, "
-"aber der empfohlene Weg ist über das Flatpak-Paket. Flatpak stellt sicher, "
-"dass du immer die neuesten Abhängigkeiten nutzt und OnionShare in einer "
-"Sandbox läuft."
-#: ../../source/install.rst:18
+#: ../../source/install.rst:17
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-"Stelle sicher, dass du ``Flatpak`` und das Flathub-Repository `nach dieser "
-"Anleitung <https://flatpak.org/setup/>`_ für deine Linux-Distribution "
-"installiert hast."
-#: ../../source/install.rst:20
+#: ../../source/install.rst:19
+#, fuzzy
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
"Installiere dann OnionShare über Flathub `nach dieser Anleitung "
"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
-#: ../../source/install.rst:25
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
+msgid ""
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
+msgstr ""
+
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr "PGP-Signaturen überprüfen"
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-"Du kannst sicherstellen, dass das heruntergeladene Windows-, macOS- oder "
-"Quellpaket aus offizieller Quelle stammt und nicht verändert wurde, indem du "
-"seine PGP-Signaturen überprüfst. Unter Windows und macOS ist dieser Schritt "
-"optional und stellt lediglich einen zusätzlichen Schutzmechanismus dar: die "
-"Installer beinhalten auch ihre betriebssystemspezifischen Signaturen, und du "
-"kannst auch nur auf diese vertrauen, sofern du das möchtest."
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr "Signaturschlüssel"
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-"Windows-, macOS- und Quellpakete werden von Micah Lee, dem Hauptentwickler, "
-"mit seinem öffentlichen PGP-Schlüssel mit dem Fingerabdruck "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73`` signiert. Du kannst Micahs "
-"Schlüssel vom `Schlüsselserver keys.openpgp.org <https://keys.openpgp.org/"
-"vks/v1/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_ "
-"herunterladen."
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
+#, fuzzy
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
"Um die Signaturen zu überprüfen, musst du GnuPG installiert haben. Unter "
"macOS möchtest du wahrscheinlich `GPGTools <https://gpgtools.org/>`_ "
"verwenden, unter Windows `Gpg4win <https://www.gpg4win.org/>`_."
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr "Signaturen"
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
+#, fuzzy
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
"Die Signaturen (``.asc``-Dateien) und auch die Windows-, macOS- und "
"Quellpakete kannst du auf https://onionshare.org/dist/ in den Ordnern "
-"finden, die nach der jeweiligen Version von OnionShare benannt wurden. Du "
-"kannst sie auch auf der `Release-Seite auf GitHub <https://github.com/"
-"micahflee/onionshare/releases>`_ finden."
+"finden, die nach der jeweiligen Version von OnionShare benannt wurden. Du"
+" kannst sie auch auf der `Release-Seite auf GitHub "
+"<https://github.com/micahflee/onionshare/releases>`_ finden."
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr "Verifizierung"
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
+#, fuzzy
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
"Sobald du Micahs öffentichen Schlüssel in deinen GnuPG-Schlüsselbund "
-"importiert und die passende ``.asc``-Signatur heruntergeladen hast, kannst "
-"du die Binärdatei für macOS im Terminal wie folgt überprüfen::"
+"importiert und die passende ``.asc``-Signatur heruntergeladen hast, "
+"kannst du die Binärdatei für macOS im Terminal wie folgt überprüfen::"
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+#, fuzzy
+msgid "Or for Windows, in a command-prompt like this::"
msgstr "Oder unter Windows in der Kommandozeile wie folgt::"
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+#, fuzzy
+msgid "The expected output looks like this::"
msgstr "Eine erwartete Ausgabe könnte wiefolgt aussehen::"
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
+#, fuzzy
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-"Wenn du nicht 'Good signature from' siehst, könnte es ein Problem mit der "
-"Datei-Integrität geben (potentielle Bösartigkeit / Schädlichkeit oder ein "
-"anderes Integritätsproblem); in diesem Fall solltest du das Paket nicht "
-"installieren. (Das oben gezeigte WARNING deutet allerdings nicht auf ein "
-"Problem mit dem Paket hin: es bedeutet lediglich, dass du noch keinen 'Trust-"
-"Level' in Bezug auf Micahs PGP-Schlüssel festgelegt hast.)"
-
-#: ../../source/install.rst:66
+"Wenn du nicht 'Good signature from' siehst, könnte es ein Problem mit der"
+" Datei-Integrität geben (potentielle Bösartigkeit / Schädlichkeit oder "
+"ein anderes Integritätsproblem); in diesem Fall solltest du das Paket "
+"nicht installieren. (Das oben gezeigte WARNING deutet allerdings nicht "
+"auf ein Problem mit dem Paket hin: es bedeutet lediglich, dass du noch "
+"keinen 'Trust-Level' in Bezug auf Micahs PGP-Schlüssel festgelegt hast.)"
+
+#: ../../source/install.rst:71
+#, fuzzy
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
"Falls du mehr über die Verifizierung von PGP-Signaturen lernen möchtest, "
-"können die Leitfäden für `Qubes OS <https://www.qubes-os.org/security/"
-"verifying-signatures/>`_ und das`Tor-Projekt <https://2019.www.torproject."
-"org/docs/verifying-signatures.html.en>`_ eine Hilfestellung bieten."
+"können die Leitfäden für `Qubes OS <https://www.qubes-os.org/security"
+"/verifying-signatures/>`_ und das`Tor-Projekt "
+"<https://2019.www.torproject.org/docs/verifying-signatures.html.en>`_ "
+"eine Hilfestellung bieten."
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr "Für zusätzliche Sicherheit, siehe :ref:`verifying_sigs`."
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+#~ "Es gibt verschiedene Möglichkeiten, OnionShare"
+#~ " unter Linux zu installieren, aber "
+#~ "der empfohlene Weg ist über das "
+#~ "Flatpak-Paket. Flatpak stellt sicher, dass"
+#~ " du immer die neuesten Abhängigkeiten "
+#~ "nutzt und OnionShare in einer Sandbox"
+#~ " läuft."
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+#~ "Stelle sicher, dass du ``Flatpak`` und"
+#~ " das Flathub-Repository `nach dieser "
+#~ "Anleitung <https://flatpak.org/setup/>`_ für deine"
+#~ " Linux-Distribution installiert hast."
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+#~ "Du kannst sicherstellen, dass das "
+#~ "heruntergeladene Windows-, macOS- oder "
+#~ "Quellpaket aus offizieller Quelle stammt "
+#~ "und nicht verändert wurde, indem du "
+#~ "seine PGP-Signaturen überprüfst. Unter "
+#~ "Windows und macOS ist dieser Schritt "
+#~ "optional und stellt lediglich einen "
+#~ "zusätzlichen Schutzmechanismus dar: die "
+#~ "Installer beinhalten auch ihre "
+#~ "betriebssystemspezifischen Signaturen, und du "
+#~ "kannst auch nur auf diese vertrauen, "
+#~ "sofern du das möchtest."
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+#~ "Windows-, macOS- und Quellpakete werden "
+#~ "von Micah Lee, dem Hauptentwickler, mit"
+#~ " seinem öffentlichen PGP-Schlüssel mit "
+#~ "dem Fingerabdruck "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73`` signiert. Du"
+#~ " kannst Micahs Schlüssel vom "
+#~ "`Schlüsselserver keys.openpgp.org "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_ "
+#~ "herunterladen."
+
diff --git a/docs/source/locale/de/LC_MESSAGES/security.po b/docs/source/locale/de/LC_MESSAGES/security.po
index eefe8918..246fc58f 100644
--- a/docs/source/locale/de/LC_MESSAGES/security.po
+++ b/docs/source/locale/de/LC_MESSAGES/security.po
@@ -7,34 +7,32 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: 2020-11-09 09:26+0000\n"
"Last-Translator: mv87 <mv87@dismail.de>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: de\n"
+"Language-Team: de <LL@li.org>\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.3.2\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+#, fuzzy
+msgid "Security Design"
msgstr "Sicherheits-Design"
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+#, fuzzy
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
"Lies zuerst :ref:`how_it_works`, um die grundlegende Funktionsweise von "
"OnionShare zu verstehen."
#: ../../source/security.rst:6
msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
-msgstr ""
-"Wie jede Software kann OnionShare Fehler oder Sicherheitslücken aufweisen."
+msgstr "Wie jede Software kann OnionShare Fehler oder Sicherheitslücken aufweisen."
#: ../../source/security.rst:9
msgid "What OnionShare protects against"
@@ -43,43 +41,23 @@ msgstr "Wogegen OnionShare schützt"
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
-"**Dritte haben keinen Zugriff auf das, was über OnionShare läuft.** Wenn du "
-"OnionShare benutzt, hostest du Dienste direkt auf deinem Rechner. Wenn du "
-"beispielsweise Dateien über OnionShare freigibst, werden diese Dateien auf "
-"keinen Server hochgeladen, und wenn du einen OnionShare-Chatroom startest, "
-"wird dein Rechner zum Chatserver. Üblicherweise benötigt man zum Freigeben "
-"von Dateien oder zum Hosten von Webseiten und Chatrooms die Dienste von "
-"Drittanbietern, denen man vertrauen können muss und die Zugriff auf deine "
-"Daten haben."
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
-"**Schnüffler im Netzwerk können nicht sehen, was über OnionShare läuft.** "
-"Weil Verbindungen zwischen Onion-Diensten und Tor Browser Ende zu Ende "
-"verschlüsselt sind, kann ein Angreifer im Netzwerk nicht sehen, was über "
-"einen OnionShare-Dienst läuft. Wenn der Schnüffler auf Seite des OnionShare-"
-"Nutzers oder des Nutzers des Tor Browser sitzt oder er ein bösartiger Tor-"
-"Knoten ist, wird er nur Tor-Netzwerkverkehr sehen. Wenn der Schnüffler ein "
-"bösartiger Rendezvous-Knoten ist, über den der Tor Browser mit dem "
-"OnionShare-Onion-Dienst verbunden wird, ist der Netzwerkverkehr über den "
-"Schlüssel des Onion-Dienstes verschlüsselt."
#: ../../source/security.rst:15
msgid ""
@@ -89,36 +67,25 @@ msgid ""
"Browser users, the Tor Browser users and eavesdroppers can't learn the "
"identity of the OnionShare user."
msgstr ""
-"**Die Anonymität der OnionShare-Nutzer wird über Tor geschützt.** OnionShare "
-"und Tor Browser schützen die Anonymität ihrer Nutzer. So lange der "
-"OnionShare-Nutzer seine OnionShare-Adresse anonym den Nutzern des Tor "
-"Browsers mitteilt, können Nutzer des Tor Browsers sowie Schnüffler die "
-"Identität des OnionShare-Nutzers nicht herausfinden."
+"**Die Anonymität der OnionShare-Nutzer wird über Tor geschützt.** "
+"OnionShare und Tor Browser schützen die Anonymität ihrer Nutzer. So lange"
+" der OnionShare-Nutzer seine OnionShare-Adresse anonym den Nutzern des "
+"Tor Browsers mitteilt, können Nutzer des Tor Browsers sowie Schnüffler "
+"die Identität des OnionShare-Nutzers nicht herausfinden."
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
-"**Falls ein Angreifer einen Onion-Dienst entdeckt, wird er immer noch keinen "
-"Zugang zu irgendetwas auf diesem Dienst haben.** Es gab Angriffe auf das Tor-"
-"Netwerk, wodurch Onion-Dienste entdeckt wurden. Selbst wenn jemand die ."
-"onion-Adresse zu einem OnionShare-Dienst herausfindet, kann er hierauf nicht "
-"zugreifen, wenn er nicht auch noch das zufällig erzeugte Passwort kennt (es "
-"sei denn, freilich, der OnionShare-Nutzer deaktiviert das Passwort und macht "
-"seinen Dienst öffentlich). Das Passwort wird erzeugt, indem zwei zufällige "
-"Wörter aus einer Liste mit 6800 Wörtern gewählt werden, d.h. es gibt 6800^2 "
-"oder rund 46 Millionen mögliche Passwörter. Ein Angreifer kann allerdings "
-"nur 20 falsche Versuche machen, ehe OnionShare den Dienst stoppt und so "
-"einen Brute-Force-Angriff verhindert."
#: ../../source/security.rst:20
msgid "What OnionShare doesn't protect against"
@@ -126,47 +93,216 @@ msgstr "Wogegen OnionShare nicht schützt"
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
-"**Das Teilen einer OnionShare-Adresse könnte unsicher sein.** Der OnionShare-"
-"Nutzer ist dafür verantwortlich, die OnionShare-Adresse auf sicherem Wege "
-"mit anderen Leuten zu teilen. Wenn sie es auf unsicherem Wege teilen ("
-"beispielsweise per einfacher E-Mail, wenn der E-Mail-Verkehr von einem "
-"Angreifer mitgeschnitten wird), wird der Angreifer wissen, dass sie "
-"OnionShare benutzen. Wenn der Angreifer die Adresse im Tor Browser öffnet, "
-"ehe der beabsichtigte Empfänger sie öffnen kann, hat der Angreifer Zugriff "
-"auf den Dienst. Falls dieses Risiko laut Risikomodell besteht, muss ein "
-"sichererer Weg zum Teilen der OnionShare-Adresse gefunden werden (z.B. per "
-"verschlüsselter E-Mail oder verschlüsseltem Chat, oder per Telefon). Dies "
-"ist nicht notwendig, wenn OnionShare für etwas genutzt wird, was ohnehin "
-"nicht geheim ist."
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
-"**Das Mitteilen der OnionShare-Adresse könnte nicht anonym geschehen.** "
-"Während OnionShare und Tor Browser grundsätzlich Anonymität ermöglichen, "
-"muss der Nutzer zusätzliche Schritte unternehmen, um beim Teilen der "
-"OnionShare-Adresse anonym zu bleiben. Beispielsweise könnte er Tor "
-"verwenden, um einen anonymen E-Mail- oder Chat-Account anzulegen, um von "
-"dort aus die OnionShare-Adresse zu teilen; auf den Account dürfte er dann "
-"nur per Tor zugreifen. Das ist in solchen Fällen nicht notwendig, wo die "
-"Anonymität nicht gewahrt werden muss, beispielsweise bei Arbeitskollegen, "
-"die sich untereinander kennen und die Arbeitsdokumente teilen möchten."
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+#~ "**Dritte haben keinen Zugriff auf das,"
+#~ " was über OnionShare läuft.** Wenn du"
+#~ " OnionShare benutzt, hostest du Dienste "
+#~ "direkt auf deinem Rechner. Wenn du "
+#~ "beispielsweise Dateien über OnionShare "
+#~ "freigibst, werden diese Dateien auf "
+#~ "keinen Server hochgeladen, und wenn du"
+#~ " einen OnionShare-Chatroom startest, wird"
+#~ " dein Rechner zum Chatserver. Üblicherweise"
+#~ " benötigt man zum Freigeben von "
+#~ "Dateien oder zum Hosten von Webseiten"
+#~ " und Chatrooms die Dienste von "
+#~ "Drittanbietern, denen man vertrauen können "
+#~ "muss und die Zugriff auf deine "
+#~ "Daten haben."
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+#~ "**Schnüffler im Netzwerk können nicht "
+#~ "sehen, was über OnionShare läuft.** Weil"
+#~ " Verbindungen zwischen Onion-Diensten und"
+#~ " Tor Browser Ende zu Ende "
+#~ "verschlüsselt sind, kann ein Angreifer "
+#~ "im Netzwerk nicht sehen, was über "
+#~ "einen OnionShare-Dienst läuft. Wenn der"
+#~ " Schnüffler auf Seite des OnionShare-"
+#~ "Nutzers oder des Nutzers des Tor "
+#~ "Browser sitzt oder er ein bösartiger "
+#~ "Tor-Knoten ist, wird er nur "
+#~ "Tor-Netzwerkverkehr sehen. Wenn der "
+#~ "Schnüffler ein bösartiger Rendezvous-Knoten"
+#~ " ist, über den der Tor Browser "
+#~ "mit dem OnionShare-Onion-Dienst "
+#~ "verbunden wird, ist der Netzwerkverkehr "
+#~ "über den Schlüssel des Onion-Dienstes"
+#~ " verschlüsselt."
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+#~ "**Falls ein Angreifer einen Onion-Dienst"
+#~ " entdeckt, wird er immer noch keinen"
+#~ " Zugang zu irgendetwas auf diesem "
+#~ "Dienst haben.** Es gab Angriffe auf "
+#~ "das Tor-Netwerk, wodurch Onion-Dienste"
+#~ " entdeckt wurden. Selbst wenn jemand "
+#~ "die .onion-Adresse zu einem "
+#~ "OnionShare-Dienst herausfindet, kann er "
+#~ "hierauf nicht zugreifen, wenn er nicht"
+#~ " auch noch das zufällig erzeugte "
+#~ "Passwort kennt (es sei denn, freilich,"
+#~ " der OnionShare-Nutzer deaktiviert das "
+#~ "Passwort und macht seinen Dienst "
+#~ "öffentlich). Das Passwort wird erzeugt, "
+#~ "indem zwei zufällige Wörter aus einer"
+#~ " Liste mit 6800 Wörtern gewählt "
+#~ "werden, d.h. es gibt 6800^2 oder "
+#~ "rund 46 Millionen mögliche Passwörter. "
+#~ "Ein Angreifer kann allerdings nur 20 "
+#~ "falsche Versuche machen, ehe OnionShare "
+#~ "den Dienst stoppt und so einen "
+#~ "Brute-Force-Angriff verhindert."
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+#~ "**Das Teilen einer OnionShare-Adresse "
+#~ "könnte unsicher sein.** Der OnionShare-"
+#~ "Nutzer ist dafür verantwortlich, die "
+#~ "OnionShare-Adresse auf sicherem Wege mit"
+#~ " anderen Leuten zu teilen. Wenn sie"
+#~ " es auf unsicherem Wege teilen "
+#~ "(beispielsweise per einfacher E-Mail, wenn "
+#~ "der E-Mail-Verkehr von einem Angreifer"
+#~ " mitgeschnitten wird), wird der Angreifer"
+#~ " wissen, dass sie OnionShare benutzen. "
+#~ "Wenn der Angreifer die Adresse im "
+#~ "Tor Browser öffnet, ehe der "
+#~ "beabsichtigte Empfänger sie öffnen kann, "
+#~ "hat der Angreifer Zugriff auf den "
+#~ "Dienst. Falls dieses Risiko laut "
+#~ "Risikomodell besteht, muss ein sichererer "
+#~ "Weg zum Teilen der OnionShare-Adresse"
+#~ " gefunden werden (z.B. per verschlüsselter"
+#~ " E-Mail oder verschlüsseltem Chat, oder "
+#~ "per Telefon). Dies ist nicht notwendig,"
+#~ " wenn OnionShare für etwas genutzt "
+#~ "wird, was ohnehin nicht geheim ist."
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+#~ "**Das Mitteilen der OnionShare-Adresse "
+#~ "könnte nicht anonym geschehen.** Während "
+#~ "OnionShare und Tor Browser grundsätzlich "
+#~ "Anonymität ermöglichen, muss der Nutzer "
+#~ "zusätzliche Schritte unternehmen, um beim "
+#~ "Teilen der OnionShare-Adresse anonym zu"
+#~ " bleiben. Beispielsweise könnte er Tor "
+#~ "verwenden, um einen anonymen E-Mail- "
+#~ "oder Chat-Account anzulegen, um von "
+#~ "dort aus die OnionShare-Adresse zu "
+#~ "teilen; auf den Account dürfte er "
+#~ "dann nur per Tor zugreifen. Das "
+#~ "ist in solchen Fällen nicht notwendig,"
+#~ " wo die Anonymität nicht gewahrt "
+#~ "werden muss, beispielsweise bei "
+#~ "Arbeitskollegen, die sich untereinander kennen"
+#~ " und die Arbeitsdokumente teilen möchten."
+
diff --git a/docs/source/locale/de/LC_MESSAGES/tor.po b/docs/source/locale/de/LC_MESSAGES/tor.po
index edac72f9..84f7e205 100644
--- a/docs/source/locale/de/LC_MESSAGES/tor.po
+++ b/docs/source/locale/de/LC_MESSAGES/tor.po
@@ -7,17 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-11-09 09:26+0000\n"
"Last-Translator: mv87 <mv87@dismail.de>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: de\n"
+"Language-Team: de <LL@li.org>\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.3.2\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -25,274 +24,400 @@ msgstr "Mit dem Tor-Netzwerk verbinden"
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
-"Es gibt mehrere Möglichkeiten, wie sich OnionShare mit Tor verbinden kann. "
-"Du kannst sie in den Einstellungen ändern; dorthin gelangst du mit einem "
-"Klick auf das Zahnradsymbol rechts unten."
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+#, fuzzy
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr "Die integrierte Tor-Version benutzen"
#: ../../source/tor.rst:11
+#, fuzzy
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
"So verbindet sich OnionShare standardmäßig mit Tor, es zugleich der "
-"einfachste und zuverlässigste Weg. Es empfiehlt sich daher für die meisten "
-"Nutzer."
+"einfachste und zuverlässigste Weg. Es empfiehlt sich daher für die "
+"meisten Nutzer."
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"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 ""
-"Wenn du OnionShare startest, wird ein Tor-Prozess im Hintergrund gestartet, "
-"der speziell auf OnionShare abgestimmt ist. Dieser Tor-Prozess wird anderen "
-"Tor-Prozessen auf deinem Rechner nicht in die Quere kommen, so dass du "
-"gleichzeitig Tor Browser benutzen oder einen Tor-Systemdienst im Hintergrund "
-"laufen lassen kannst."
-
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
-msgstr "Versuche automatische Konfiguration mittels Tor Browser"
#: ../../source/tor.rst:18
+#, fuzzy
+msgid "Attempt auto-configuration with Tor Browser"
+msgstr "Versuche automatische Konfiguration mittels Tor Browser"
+
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-"Du kannst OnionShare so einrichten, dass es sich über die Tor-Version "
-"verbindet, die mit dem Tor Browser ausgeliefert wird. `Lade zunächst den Tor "
-"Browser <https://www.torproject.org>`_ herunter, falls du ihn noch nicht "
-"hast. Mit dieser Option musst du den Tor Browser im Hintergrund geöffnet "
-"lassen, während du OnionShare benutzt."
-
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+
+#: ../../source/tor.rst:24
+#, fuzzy
+msgid "Using a system ``tor`` in Windows"
msgstr "Nutze einen systemweiten Tor-Dienst in Windows"
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-"Nur etwas für Fortgeschrittene. Hierfür musst du wissen, wie du Textdateien "
-"editierst und mit Administratorrechten arbeitest."
+"Nur etwas für Fortgeschrittene. Hierfür musst du wissen, wie du "
+"Textdateien editierst und mit Administratorrechten arbeitest."
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
+#, fuzzy
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-"Besorge dir das Tor Windows Expert Bundle, welches du `hier herunterladen "
-"kannst <https://www.torproject.org/download/tor/>`_. Entpacke die ZIP-Datei "
-"und kopiere den entpackten Ordner nach ``C:\\Program Files (x86)\\`` und "
-"benenne ihn zu ``tor-win32`` um, so dass sich in diesem Ordner die beiden "
-"Ordner ``Data`` und ``Tor`` befinden."
+"Besorge dir das Tor Windows Expert Bundle, welches du `hier herunterladen"
+" kannst <https://www.torproject.org/download/tor/>`_. Entpacke die ZIP-"
+"Datei und kopiere den entpackten Ordner nach ``C:\\Program Files "
+"(x86)\\`` und benenne ihn zu ``tor-win32`` um, so dass sich in diesem "
+"Ordner die beiden Ordner ``Data`` und ``Tor`` befinden."
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
+#, fuzzy
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-"Denke dir ein Passwort für den Steuerungs-Port aus. Ich verwende ``comprised "
-"stumble rummage work avenging construct volatile``. Öffne eine Kommandozeile "
-"mit Administratorrechten und führe darin ``tor.exe --hash-password`` aus, um "
-"einen Hash deines Passworts zu erzeugen. Zum Beispiel::"
+"Denke dir ein Passwort für den Steuerungs-Port aus. Ich verwende "
+"``comprised stumble rummage work avenging construct volatile``. Öffne "
+"eine Kommandozeile mit Administratorrechten und führe darin ``tor.exe "
+"--hash-password`` aus, um einen Hash deines Passworts zu erzeugen. Zum "
+"Beispiel::"
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
+#, fuzzy
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-"Der Passwort-Hash wird nach einigen Warnungen angezeigt (die du ignorieren "
-"kannst). In meinem Fall war es "
+"Der Passwort-Hash wird nach einigen Warnungen angezeigt (die du "
+"ignorieren kannst). In meinem Fall war es "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
+#, fuzzy
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-"Erzeuge eine neue Textdatei unter ``C:\\Program Files (x86)\\tor-win32\\torrc"
-"`` und füge den Passwort-Hash ein, wobei ``HashedControlPassword`` mit dem "
-"gerade erzeugten ersetzt wird::"
+"Erzeuge eine neue Textdatei unter ``C:\\Program Files (x86)\\tor-"
+"win32\\torrc`` und füge den Passwort-Hash ein, wobei "
+"``HashedControlPassword`` mit dem gerade erzeugten ersetzt wird::"
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
+#, fuzzy
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
"Über die Kommandozeile installierst du nun tor als Service, wobei du die "
"``torrc``-Datei verwendest, die du gerade erzeugt hast (siehe `hier "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ für weitere "
-"Informationen). Zum Beispiel so::"
+"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ für "
+"weitere Informationen). Zum Beispiel so::"
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+#, fuzzy
+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:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"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 ""
-"Öffne OnionShare. Klicke auf das Einstellungs-Icon. Unter “Wie soll sich "
-"OnionShare mit Tor verbinden?” wählst du “Verbinde über den Steuerungs-Port” "
-"und setzt den Host auf ``127.0.0.1``und den Port auf ``9051``. Unter “"
-"Authentifizierungseinstellungen für Tor” wählst du “Passwort” und legst das "
-"Passwort fest, in meinem Fall ``comprised stumble rummage work avenging "
-"construct volatile``. Klicke auf “Einstellungen testen”; wenn alles klappt, "
-"solltest du sehen, dass du erfolgreich mit dem Tor-Netzwerk verbunden bist."
-
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+
+#: ../../source/tor.rst:61
+#, fuzzy
+msgid "Using a system ``tor`` in macOS"
msgstr "Benutze einen systemweiten Tor-Dienst in macOS"
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
+#, fuzzy
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-"Installiere zunächst `Homebrew <http://brew.sh/>`_, falls du es noch nicht "
-"hast. Installiere dann Tor::"
+"Installiere zunächst `Homebrew <http://brew.sh/>`_, falls du es noch "
+"nicht hast. Installiere dann Tor::"
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
-msgstr ""
-"Konfiguriere Tor nun so, dass es Verbindungen von OnionShare aus zulässt::"
+msgstr "Konfiguriere Tor nun so, dass es Verbindungen von OnionShare aus zulässt::"
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr "Und starte den systemweiten Tor-Dienst::"
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"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 ""
-"Öffne OnionShare. Klicke auf das Einstellungs-Icon. Unter \"Wie soll sich "
-"OnionShare mit Tor verbinden?\" wähle \"Verbinde über eine Socket-Datei\" "
-"und wähle als Socket-Datei ``/usr/local/var/run/tor/control.socket``. Unter "
-"\"Authentifizierungseinstellungen für Tor\" wähle \"Keine Authentifizierung "
-"oder Authentifizierung per Cookie\". Klicke auf \"Einstellungen testen\"; "
-"wenn alles klappt, solltest du erfolgreich mit dem Tor-Netzwerk verbunden "
-"sein."
-
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+#, fuzzy
+msgid "Using a system ``tor`` in Linux"
msgstr "Einen systemweiten Tor-Dienst unter Linux nutzen"
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
+#, fuzzy
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"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 ""
-"Installiere zuerst das Tor-Paket. Falls du Debian, Ubuntu oder eine ähnliche "
-"Distribution nutzt, empfiehlt sich das `offizielle Repository <https://2019."
-"www.torproject.org/docs/debian.html.en>`_ des Tor-Projekts. Zum Beispiel, "
-"unter Ubuntu 20.04::"
+"Installiere zuerst das Tor-Paket. Falls du Debian, Ubuntu oder eine "
+"ähnliche Distribution nutzt, empfiehlt sich das `offizielle Repository "
+"<https://2019.www.torproject.org/docs/debian.html.en>`_ des Tor-Projekts."
+" Zum Beispiel, unter Ubuntu 20.04::"
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
+#, fuzzy
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."
+"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 ""
-"Füge als nächstes deinen Benutzer jener Gruppe zu, unter deren ID der Tor-"
-"Prozess läuft (im Falle von Debian oder Ubuntu: ``debian-tor``) und "
+"Füge als nächstes deinen Benutzer jener Gruppe zu, unter deren ID der "
+"Tor-Prozess läuft (im Falle von Debian oder Ubuntu: ``debian-tor``) und "
"konfiguriere OnionShare so, dass es sich über die Socket-Datei des "
"systemweiten Tor-Dienstes verbindet."
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-"Füge deinen Benutzer der Gruppe ``debian-tor`` mit folgendem Befehl hinzu ("
-"ersetze dabei ``Nutzername`` mit deinem tatsächlichen Nutzernamen)::"
+"Füge deinen Benutzer der Gruppe ``debian-tor`` mit folgendem Befehl hinzu"
+" (ersetze dabei ``Nutzername`` mit deinem tatsächlichen Nutzernamen)::"
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-"Starte deinen Rechner neu. Öffne OnionShare nach dem Neustart. Klicke auf "
-"das Einstellungs-Icon. Unter \"Wie soll sich OnionShare mit Tor verbinden?\" "
-"wähle \"Verbinde über eine Socket-Datei\" und lege als Socket-Datei ``/var/"
-"run/tor/control`` fest. Unter \"Authentifizierungseinstellungen für Tor\" "
-"wähle \"Keine Authentifizierung oder Authentifizierung per Cookie\". Klicke "
-"auf \"Einstellungen testen\". Falls alles klappt, solltest du erfolgreich "
-"mit dem Tor-Netzwerk verbunden sein."
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr "Über Tor-Bridges"
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
+#, fuzzy
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"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 über sog. `Tor-Bridges <https://2019.www."
-"torproject.org/docs/bridges.html.en>`_ mit dem Tor-Netzwerk verbindet. Falls "
-"sich OnionShare erfolgreich mit dem Tor-Netzwerk verbindet, musst du keine "
-"Bridge verwenden."
+"konfigurieren, dass es sich über sog. `Tor-Bridges "
+"<https://2019.www.torproject.org/docs/bridges.html.en>`_ mit dem Tor-"
+"Netzwerk verbindet. Falls sich OnionShare erfolgreich mit dem Tor-"
+"Netzwerk verbindet, musst du keine Bridge verwenden."
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+#, fuzzy
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr "Um Bridges einzustellen, öffne die OnionShare-Einstellungen."
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
+#, fuzzy
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
-"Du kannst die integrierten \"obfs4 pluggable transports\", die integrierten "
-"\"meek_lite (Amazon) pluggable transports\" oder benutzerdefinierte Bridges "
-"verwenden; letztere findest du in Tors `Bridge-Datenbank <https://bridges."
-"torproject.org/>`_. Falls du eine Bridge benutzen musst, solltest du zuerst "
-"die intergrierten \"obfs4 pluggable transports\" probieren."
+"Du kannst die integrierten \"obfs4 pluggable transports\", die "
+"integrierten \"meek_lite (Amazon) pluggable transports\" oder "
+"benutzerdefinierte Bridges verwenden; letztere findest du in Tors "
+"`Bridge-Datenbank <https://bridges.torproject.org/>`_. Falls du eine "
+"Bridge benutzen musst, solltest du zuerst die intergrierten \"obfs4 "
+"pluggable transports\" probieren."
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+#~ "Es gibt mehrere Möglichkeiten, wie sich"
+#~ " OnionShare mit Tor verbinden kann. "
+#~ "Du kannst sie in den Einstellungen "
+#~ "ändern; dorthin gelangst du mit einem"
+#~ " Klick auf das Zahnradsymbol rechts "
+#~ "unten."
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+#~ "Wenn du OnionShare startest, wird ein"
+#~ " Tor-Prozess im Hintergrund gestartet, "
+#~ "der speziell auf OnionShare abgestimmt "
+#~ "ist. Dieser Tor-Prozess wird anderen "
+#~ "Tor-Prozessen auf deinem Rechner nicht"
+#~ " in die Quere kommen, so dass "
+#~ "du gleichzeitig Tor Browser benutzen "
+#~ "oder einen Tor-Systemdienst im "
+#~ "Hintergrund laufen lassen kannst."
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+#~ "Du kannst OnionShare so einrichten, dass"
+#~ " es sich über die Tor-Version "
+#~ "verbindet, die mit dem Tor Browser "
+#~ "ausgeliefert wird. `Lade zunächst den "
+#~ "Tor Browser <https://www.torproject.org>`_ herunter,"
+#~ " falls du ihn noch nicht hast. "
+#~ "Mit dieser Option musst du den Tor"
+#~ " Browser im Hintergrund geöffnet lassen,"
+#~ " während du OnionShare benutzt."
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+#~ "Öffne OnionShare. Klicke auf das "
+#~ "Einstellungs-Icon. Unter “Wie soll sich "
+#~ "OnionShare mit Tor verbinden?” wählst du"
+#~ " “Verbinde über den Steuerungs-Port” "
+#~ "und setzt den Host auf ``127.0.0.1``und"
+#~ " den Port auf ``9051``. Unter "
+#~ "“Authentifizierungseinstellungen für Tor” wählst "
+#~ "du “Passwort” und legst das Passwort "
+#~ "fest, in meinem Fall ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Klicke auf “Einstellungen testen”;"
+#~ " wenn alles klappt, solltest du "
+#~ "sehen, dass du erfolgreich mit dem "
+#~ "Tor-Netzwerk verbunden bist."
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+#~ "Öffne OnionShare. Klicke auf das "
+#~ "Einstellungs-Icon. Unter \"Wie soll sich"
+#~ " OnionShare mit Tor verbinden?\" wähle "
+#~ "\"Verbinde über eine Socket-Datei\" und"
+#~ " wähle als Socket-Datei "
+#~ "``/usr/local/var/run/tor/control.socket``. Unter "
+#~ "\"Authentifizierungseinstellungen für Tor\" wähle"
+#~ " \"Keine Authentifizierung oder Authentifizierung"
+#~ " per Cookie\". Klicke auf \"Einstellungen"
+#~ " testen\"; wenn alles klappt, solltest "
+#~ "du erfolgreich mit dem Tor-Netzwerk "
+#~ "verbunden sein."
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+#~ "Starte deinen Rechner neu. Öffne "
+#~ "OnionShare nach dem Neustart. Klicke auf"
+#~ " das Einstellungs-Icon. Unter \"Wie "
+#~ "soll sich OnionShare mit Tor "
+#~ "verbinden?\" wähle \"Verbinde über eine "
+#~ "Socket-Datei\" und lege als Socket-"
+#~ "Datei ``/var/run/tor/control`` fest. Unter "
+#~ "\"Authentifizierungseinstellungen für Tor\" wähle"
+#~ " \"Keine Authentifizierung oder Authentifizierung"
+#~ " per Cookie\". Klicke auf \"Einstellungen"
+#~ " testen\". Falls alles klappt, solltest "
+#~ "du erfolgreich mit dem Tor-Netzwerk "
+#~ "verbunden sein."
+
diff --git a/docs/source/locale/el/LC_MESSAGES/advanced.po b/docs/source/locale/el/LC_MESSAGES/advanced.po
index c3847657..8b9457ea 100644
--- a/docs/source/locale/el/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/el/LC_MESSAGES/advanced.po
@@ -8,104 +8,103 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -113,115 +112,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/el/LC_MESSAGES/develop.po b/docs/source/locale/el/LC_MESSAGES/develop.po
index f20ff51c..0de31f00 100644
--- a/docs/source/locale/el/LC_MESSAGES/develop.po
+++ b/docs/source/locale/el/LC_MESSAGES/develop.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -27,230 +27,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/el/LC_MESSAGES/features.po b/docs/source/locale/el/LC_MESSAGES/features.po
index 29841dd8..7932bbf7 100644
--- a/docs/source/locale/el/LC_MESSAGES/features.po
+++ b/docs/source/locale/el/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/el/LC_MESSAGES/help.po b/docs/source/locale/el/LC_MESSAGES/help.po
index d965eb13..5624b70d 100644
--- a/docs/source/locale/el/LC_MESSAGES/help.po
+++ b/docs/source/locale/el/LC_MESSAGES/help.po
@@ -8,65 +8,113 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
-msgstr ""
-
-#: ../../source/help.rst:9
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/el/LC_MESSAGES/install.po b/docs/source/locale/el/LC_MESSAGES/install.po
index a2f5b321..640c688c 100644
--- a/docs/source/locale/el/LC_MESSAGES/install.po
+++ b/docs/source/locale/el/LC_MESSAGES/install.po
@@ -8,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -31,113 +31,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/el/LC_MESSAGES/security.po b/docs/source/locale/el/LC_MESSAGES/security.po
index 13d11a17..725e516e 100644
--- a/docs/source/locale/el/LC_MESSAGES/security.po
+++ b/docs/source/locale/el/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/el/LC_MESSAGES/tor.po b/docs/source/locale/el/LC_MESSAGES/tor.po
index a4d227cd..525a9740 100644
--- a/docs/source/locale/el/LC_MESSAGES/tor.po
+++ b/docs/source/locale/el/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/en/LC_MESSAGES/advanced.po b/docs/source/locale/en/LC_MESSAGES/advanced.po
index c3847657..8b9457ea 100644
--- a/docs/source/locale/en/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/en/LC_MESSAGES/advanced.po
@@ -8,104 +8,103 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -113,115 +112,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/en/LC_MESSAGES/develop.po b/docs/source/locale/en/LC_MESSAGES/develop.po
index f20ff51c..0de31f00 100644
--- a/docs/source/locale/en/LC_MESSAGES/develop.po
+++ b/docs/source/locale/en/LC_MESSAGES/develop.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -27,230 +27,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/en/LC_MESSAGES/features.po b/docs/source/locale/en/LC_MESSAGES/features.po
index 29841dd8..7932bbf7 100644
--- a/docs/source/locale/en/LC_MESSAGES/features.po
+++ b/docs/source/locale/en/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/en/LC_MESSAGES/help.po b/docs/source/locale/en/LC_MESSAGES/help.po
index d965eb13..d1eb81e9 100644
--- a/docs/source/locale/en/LC_MESSAGES/help.po
+++ b/docs/source/locale/en/LC_MESSAGES/help.po
@@ -8,65 +8,113 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
-msgstr ""
-
-#: ../../source/help.rst:9
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/en/LC_MESSAGES/install.po b/docs/source/locale/en/LC_MESSAGES/install.po
index a2f5b321..640c688c 100644
--- a/docs/source/locale/en/LC_MESSAGES/install.po
+++ b/docs/source/locale/en/LC_MESSAGES/install.po
@@ -8,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -31,113 +31,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/en/LC_MESSAGES/security.po b/docs/source/locale/en/LC_MESSAGES/security.po
index 13d11a17..725e516e 100644
--- a/docs/source/locale/en/LC_MESSAGES/security.po
+++ b/docs/source/locale/en/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:43-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/en/LC_MESSAGES/tor.po b/docs/source/locale/en/LC_MESSAGES/tor.po
index a4d227cd..f8716f64 100644
--- a/docs/source/locale/en/LC_MESSAGES/tor.po
+++ b/docs/source/locale/en/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/es/LC_MESSAGES/advanced.po b/docs/source/locale/es/LC_MESSAGES/advanced.po
index ed59fb86..50f8aee1 100644
--- a/docs/source/locale/es/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/es/LC_MESSAGES/advanced.po
@@ -7,41 +7,37 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-09-22 13:39+0000\n"
"Last-Translator: Zuhualime Akoochimoya <zakooch@protonmail.ch>\n"
-"Language-Team: none\n"
"Language: es\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.3-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+#, fuzzy
+msgid "Advanced Usage"
msgstr "Uso avanzado"
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+#, fuzzy
+msgid "Save Tabs"
msgstr "Guardar pestañas"
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-"Por defecto, todo es temporario en OnionShare. Cuando cierras una pestaña"
-" OnionShare su dirección no existe más, y no se puede usar de nuevo. Pero"
-" a veces podrías querer que un servicio OnionShare sea persistente. Por "
-"ejemplo, esto sería útil si quieres alojar un sitio web que tenga la "
-"misma URL cuando reinicies tu computadora."
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
@@ -52,19 +48,19 @@ msgstr ""
"iniciar el servidor. Cuando se guarda una pestaña, un ícono púrpura de un"
" pin aparece a la izquierda de su estado de servidor."
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
+#, fuzzy
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
"Cuando sales de OnionShare y lo vuelves a abrir, tus pestañas guardadas "
"se iniciarán abiertas. Tendrás que arrancar cada servicio manualmente, "
"pero cuando lo hagas, se iniciarán con la misma dirección OnionShare, y "
"con la misma contraseña."
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
@@ -73,43 +69,32 @@ msgstr ""
"de la misma se almacenará en tu computadora con tus ajustes de "
"OnionShare."
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
-msgstr "Deshabilitar contraseñas"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
+msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-"Por defecto, todos los servicios OnionShare están protegidos con el "
-"nombre de usuario `onionshare` y una contraseña generada aleatoriamente. "
-"Si alguien intenta adivinar 20 veces la contraseña, y es incorrecta, tu "
-"servicio onion se detiene automáticamente para prevenir un ataque de "
-"fuerza bruta al servicio OnionShare."
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-"Pero a veces podrías querer que tu servicio OnionShare sea accesible al "
-"público. Por ejemplo, si quieres establecer un servicio OnionShare de "
-"recepción con el fin de que el público pueda enviarte archivos segura y "
-"anónimamente. En este caso, es mejor deshabilitar del todo la contraseña."
-" Si no haces esto, alguien puede forzar la detención de tu servidor "
-"haciendo solo 20 suposiciones incorrectas de tu contraseña, aún si conoce"
-" la correcta."
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
+#, fuzzy
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
@@ -117,17 +102,19 @@ msgstr ""
"casilla \"No usar una contraseña\" antes de iniciar el servidor. Entonces"
" será público y no tendrá contraseña."
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+#, fuzzy
+msgid "Scheduled Times"
msgstr "Tiempos programados"
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
+#, fuzzy
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
"OnionShare soporta la programación exacta de cuándo un servicio debiera "
"arrancar y detenerse. Antes de iniciar el servidor, haz clic en \"Mostrar"
@@ -136,12 +123,13 @@ msgstr ""
"servicio onion en el tiempo programado\", o ambas, y establece las fechas"
" y horas deseadas."
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
+#, fuzzy
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
"Si programaste un servicio para arrancar en el futuro, cuando hagas clic "
"en el botón de inicio verás un temporizador contando regresivamente hasta"
@@ -149,7 +137,7 @@ msgstr ""
"arrancado verás un temporizador contando regresivamente hasta el momento "
"en que se detendrá automáticamente."
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -161,11 +149,12 @@ msgstr ""
"público en un momento dado en el futuro si te pasa algo. Si no te pasa "
"nada, puedes cancelarlo antes de su inicio programado."
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
+#, fuzzy
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
"**Programar un servicio OnionShare para detenerse automáticamente puede "
@@ -173,83 +162,63 @@ msgstr ""
"documentos secretos mientras te aseguras que no estarán disponibles en "
"Internet por más de unos pocos días."
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+#, fuzzy
+msgid "Command-line Interface"
msgstr "Interfaz de línea de comando"
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
+#, fuzzy
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr "Además de su interfaz gráfico, OnionShare tiene una de línea de comando."
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr "Linux"
-
-#: ../../source/advanced.rst:53
+#: ../../source/advanced.rst:60
msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
-"Lamentablemente, si instalaste OnionShare usando el paquete Flatpak la "
-"interfaz de línea de comando no está soportada."
-#: ../../source/advanced.rst:55
+#: ../../source/advanced.rst:64
msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-"Si instalaste OnionShare usando un paquete del sistema operativo, puedes "
-"ejecutar ``onionshare`` desde una terminal."
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr "macOS"
-#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-"Haz un vínculo simbólico al ejecutable OnionShare de línea de comando de "
-"esta manera::"
-
-#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr "Ahora puedes ejecutar ``onionshare`` desde una terminal."
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
-msgstr "Windows"
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
-msgstr "La interfaz de línea de comando no está soportada en Windows."
-
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
+#, fuzzy
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-"Si quieres usarla igualmente, puedes establecer un entorno Windows de "
-"desarrollo (mira :ref:`starting_development`), y luego ejecutar esto en "
-"una ventana de línea de comando::"
+"Si instalaste OnionShare usando un paquete del sistema operativo, puedes "
+"ejecutar ``onionshare`` desde una terminal."
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr "Uso"
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+#, fuzzy
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
"Puedes ver la documentación de línea de comando ejecutando ``onionshare "
"--help``::"
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+#, fuzzy
+msgid "Legacy Addresses"
msgstr "Direcciones antiguas"
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
@@ -257,29 +226,32 @@ msgstr ""
"OnionShare usa servicios onion Tor v3 por defecto. Estas son direcciones "
"onion modernas que tienen 56 caracteres, por ejemplo::"
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
+#, fuzzy
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
"Pero aún tiene soporte para direcciones onion v2, el viejo tipo de "
"direcciones onion que tienen 16 caracteres, por ejemplo::"
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
+#, fuzzy
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
"OnionShare llama a las direcciones onion v2 \"direcciones antiguas\". Las"
" direcciones onion v3 son más seguras, y usar direcciones antiguas no "
"está recomendado."
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
+#, fuzzy
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
@@ -291,14 +263,135 @@ msgstr ""
"esa pestaña. Para cambiarlo debes arrancar un servicio separado en una "
"pestaña separada."
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
+#, fuzzy
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
"El Tor Project planea `descontinuar completamente los servicios onion v2 "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ el 15 de octubre "
"de 2021, y los servicios onion antiguos pronto se removerán de OnionShare"
" también."
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+#~ "Por defecto, todo es temporario en "
+#~ "OnionShare. Cuando cierras una pestaña "
+#~ "OnionShare su dirección no existe más,"
+#~ " y no se puede usar de nuevo."
+#~ " Pero a veces podrías querer que "
+#~ "un servicio OnionShare sea persistente. "
+#~ "Por ejemplo, esto sería útil si "
+#~ "quieres alojar un sitio web que "
+#~ "tenga la misma URL cuando reinicies "
+#~ "tu computadora."
+
+#~ msgid "Disable passwords"
+#~ msgstr "Deshabilitar contraseñas"
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+#~ "Por defecto, todos los servicios "
+#~ "OnionShare están protegidos con el "
+#~ "nombre de usuario `onionshare` y una "
+#~ "contraseña generada aleatoriamente. Si alguien"
+#~ " intenta adivinar 20 veces la "
+#~ "contraseña, y es incorrecta, tu servicio"
+#~ " onion se detiene automáticamente para "
+#~ "prevenir un ataque de fuerza bruta "
+#~ "al servicio OnionShare."
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+#~ "Pero a veces podrías querer que tu"
+#~ " servicio OnionShare sea accesible al "
+#~ "público. Por ejemplo, si quieres "
+#~ "establecer un servicio OnionShare de "
+#~ "recepción con el fin de que el "
+#~ "público pueda enviarte archivos segura y"
+#~ " anónimamente. En este caso, es mejor"
+#~ " deshabilitar del todo la contraseña. "
+#~ "Si no haces esto, alguien puede "
+#~ "forzar la detención de tu servidor "
+#~ "haciendo solo 20 suposiciones incorrectas "
+#~ "de tu contraseña, aún si conoce la"
+#~ " correcta."
+
+#~ msgid "Linux"
+#~ msgstr "Linux"
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+#~ "Lamentablemente, si instalaste OnionShare "
+#~ "usando el paquete Flatpak la interfaz"
+#~ " de línea de comando no está "
+#~ "soportada."
+
+#~ msgid "macOS"
+#~ msgstr "macOS"
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+#~ "Haz un vínculo simbólico al ejecutable"
+#~ " OnionShare de línea de comando de"
+#~ " esta manera::"
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr "Ahora puedes ejecutar ``onionshare`` desde una terminal."
+
+#~ msgid "Windows"
+#~ msgstr "Windows"
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr "La interfaz de línea de comando no está soportada en Windows."
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+#~ "Si quieres usarla igualmente, puedes "
+#~ "establecer un entorno Windows de "
+#~ "desarrollo (mira :ref:`starting_development`), y "
+#~ "luego ejecutar esto en una ventana "
+#~ "de línea de comando::"
+
diff --git a/docs/source/locale/es/LC_MESSAGES/develop.po b/docs/source/locale/es/LC_MESSAGES/develop.po
index 779264dc..d1538e3f 100644
--- a/docs/source/locale/es/LC_MESSAGES/develop.po
+++ b/docs/source/locale/es/LC_MESSAGES/develop.po
@@ -7,17 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-09-18 06:51+0000\n"
"Last-Translator: Zuhualime Akoochimoya <zakooch@protonmail.ch>\n"
-"Language-Team: none\n"
"Language: es\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.3-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -29,26 +28,17 @@ msgstr "Colaborando"
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-"OnionShare tiene un equipo Keybase abierto que usamos para discutir el "
-"proyecto, incluyendo hacer preguntas, compartir ideas y diseños, y hacer "
-"planes para desarrollo futuro. (También es una manera fácil de enviar "
-"mensajes directos cifrados de extremo a extremo a otros en la comunidad "
-"OnionShare, como direcciones OnionShare). Para usar Keybase, necesitas "
-"descargar la `aplicación Keybase <https://keybase.io/download>`_, crear "
-"una cuenta, y `unirte a este equipo "
-"<https://keybase.io/team/onionshare>`_. Dentro de la aplicación, vé hacia"
-" Equipos, haz clic en \"Unirte a un Equipo\", y tipea \"onionshare\"."
-
-#: ../../source/develop.rst:11
+
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
@@ -58,25 +48,28 @@ msgstr ""
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ para "
"desarrolladores y diseñafores para discutir el proyecto."
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+#, fuzzy
+msgid "Contributing Code"
msgstr "Contribuyendo código"
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
+#, fuzzy
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
"El código fuente de OnionShare está en este repositorio git: "
"https://github.com/micahflee/onionshare"
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
+#, fuzzy
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
"Si quisieras contribuir código a OnionShare, ayuda unirse al equipo "
"Keybase y hacer preguntas acerca de en qué estás pensando trabajar. "
@@ -84,10 +77,11 @@ msgstr ""
"<https://github.com/micahflee/onionshare/issues>`_ en GitHub para ver si "
"hay alguna a la cual te gustaría desarrollar."
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
+#, fuzzy
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
"Cuando estés listo para contribuir código, abre una solicitud de tiraje "
@@ -95,55 +89,44 @@ msgstr ""
"revisará, y posiblemente haga preguntas, solicite cambios, la rechace o "
"la incorpore dentro del proyecto."
-#: ../../source/develop.rst:25
-msgid "Starting development"
+#: ../../source/develop.rst:27
+#, fuzzy
+msgid "Starting Development"
msgstr "Iniciando el desarrollo"
-#: ../../source/develop.rst:27
+#: ../../source/develop.rst:29
msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
-"OnionShare está desarrollado en Python. Para empezar, debieras clonar el "
-"repositorio git en https://github.com/micahflee/onionshare/, y consultar "
-"luego al archivo ``BUILD.md``."
-
-#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr "Ese archivo contiene las instrucciones técnicas y los comandos necesarios:"
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
-msgstr "Instala las dependencias para tu plataforma"
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr "Ejecuta OnionShare desde el árbol fuente, sin construir un paquete"
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr "Construyendo paquetes"
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
-msgstr "Haciendo un lanzamiento de OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
+msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr "Consejos para depuración"
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr "Modo detallado"
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
+#, fuzzy
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
"Durante el desarrollo, es conveniente ejecutar OnionShare desde un "
"terminal y agregar el modificador ``--verbose`` (o ``-v``) al comando. "
@@ -152,7 +135,7 @@ msgstr ""
"botones cliqueados, ajustes guardados o recargados), y otra información "
"de depuración. Por ejemplo:"
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
@@ -160,21 +143,23 @@ msgstr ""
"Puedes agregar tus propios mensajes de depuración ejecutando el método "
"``Common.log`` desde ``onionshare/common.py``. Por ejemplo:"
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
+#, fuzzy
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
"Esto puede ser útil para conocer la cadena de eventos que ocurre cuando "
"usas la aplicación o el valor de ciertas variables antes y después de que"
" sean manipuladas."
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+#, fuzzy
+msgid "Local Only"
msgstr "Solo local"
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
@@ -184,142 +169,263 @@ msgstr ""
"onion sin excepción durante el desarrollo. Puedes hacer esto con el "
"modoficador ``--local-only``. Por ejemplo:"
-#: ../../source/develop.rst:157
+#: ../../source/develop.rst:164
+#, fuzzy
msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
"En este caso, cargas el URL ``http://onionshare:eject-"
"snack@127.0.0.1:17614`` en un navegador web normal como Firefox, en vez "
"de usar al Navegador Tor."
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr "Depurando en Windows"
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-"Si quieres obtener la salida de depuración del ``onionshare-gui.exe`` en "
-"Windows, nececitarás editar ``install\\pyinstaller.spec`` y cambiar "
-"``console=False`` a ``console=True``."
-
-#: ../../source/develop.rst:164
-msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
-msgstr ""
-"Luego, recompilar el EXE con ``install\\build_exe.bat`` (podrías "
-"necesitar comentar los comandos ``signtool`` en los archivos "
-"``build_exe.bat`` y ``onionshare.nsi``, según las instrucciones en "
-"``BUILD.md``)."
-
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
-msgstr ""
-"Después de esto, puedes ejecutar ``onionshare-gui.exe -v`` desde una "
-"ventana de línea de comando para ver la salida de depuración."
-
-#: ../../source/develop.rst:169
-msgid "Contributing translations"
+#: ../../source/develop.rst:167
+#, fuzzy
+msgid "Contributing Translations"
msgstr "Contribuyendo traducciones"
-#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
-msgstr ""
-"La mayor parte de OnionShare es traducible. Puedes ayudar a hacerlo más "
-"fácil de usar y más familiar y acogedor para las personas alrededor del "
-"globo. Localization Lab tiene alguna `documentación acerca de traducir "
-"OnionShare <https://wiki.localizationlab.org/index.php/OnionShare>`_."
-
-#: ../../source/develop.rst:173
+#: ../../source/develop.rst:169
msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
-"OnionShare usa Weblate para llevar un registro de las traducciones. "
-"Puedes ver el proyecto OnionShare aquí: "
-"https://hosted.weblate.org/projects/onionshare/"
-#: ../../source/develop.rst:175
-msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+#: ../../source/develop.rst:171
+#, fuzzy
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
"Para ayudar a traducir, crea una cuenta Hosted Weblate y empieza a "
"contribuir a ese proyecto."
-#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
+#: ../../source/develop.rst:174
+#, fuzzy
+msgid "Suggestions for Original English Strings"
msgstr "Sugerencias para cadenas de caracteres en el original en Inglés"
-#: ../../source/develop.rst:180
+#: ../../source/develop.rst:176
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
-"A veces las cadenas de caracteres en el original en Inglés podrían ser "
-"mejoradas, haciéndolas más fáciles de traducir a otros lenguajes."
-#: ../../source/develop.rst:182
+#: ../../source/develop.rst:178
msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
-"Si tienes sugerencias para una mejor cadena de caracteres en Inglés, por "
-"favor abre una cuestión en GitHub en vez de comentar en Weblate. Esto "
-"asegura que los desarrolladores en el nivel superior definitivamente "
-"verán la sugerencia, y pueden modificarla potencialmente a través de los "
-"procesos usuales de revisión de código."
-
-#: ../../source/develop.rst:185
-msgid "Status of translations"
+
+#: ../../source/develop.rst:182
+#, fuzzy
+msgid "Status of Translations"
msgstr "Estado de las traducciones"
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
+#, fuzzy
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
"Aquí está el estado actual de las traducciones. Si quieres empezar una "
"traducción en un lenguaje que no se encuentra aquí, por favor escríbenos "
"a la lista de correo: onionshare-dev@lists.riseup.net"
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr "Traduce el archivo .desktop"
-
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr "También puedes traducir el archivo ``install/onionshare.desktop``."
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
+#~ "OnionShare tiene un equipo Keybase "
+#~ "abierto que usamos para discutir el "
+#~ "proyecto, incluyendo hacer preguntas, "
+#~ "compartir ideas y diseños, y hacer "
+#~ "planes para desarrollo futuro. (También "
+#~ "es una manera fácil de enviar "
+#~ "mensajes directos cifrados de extremo a"
+#~ " extremo a otros en la comunidad "
+#~ "OnionShare, como direcciones OnionShare). Para"
+#~ " usar Keybase, necesitas descargar la "
+#~ "`aplicación Keybase <https://keybase.io/download>`_, "
+#~ "crear una cuenta, y `unirte a este"
+#~ " equipo <https://keybase.io/team/onionshare>`_. Dentro"
+#~ " de la aplicación, vé hacia Equipos,"
+#~ " haz clic en \"Unirte a un "
+#~ "Equipo\", y tipea \"onionshare\"."
+
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should clone the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
+#~ "OnionShare está desarrollado en Python. "
+#~ "Para empezar, debieras clonar el "
+#~ "repositorio git en "
+#~ "https://github.com/micahflee/onionshare/, y consultar "
+#~ "luego al archivo ``BUILD.md``."
+
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+#~ "Ese archivo contiene las instrucciones "
+#~ "técnicas y los comandos necesarios:"
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr "Instala las dependencias para tu plataforma"
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr "Ejecuta OnionShare desde el árbol fuente, sin construir un paquete"
+
+#~ msgid "Building packages"
+#~ msgstr "Construyendo paquetes"
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr "Haciendo un lanzamiento de OnionShare"
+
+#~ msgid "Debugging in Windows"
+#~ msgstr "Depurando en Windows"
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+#~ "Si quieres obtener la salida de "
+#~ "depuración del ``onionshare-gui.exe`` en "
+#~ "Windows, nececitarás editar "
+#~ "``install\\pyinstaller.spec`` y cambiar "
+#~ "``console=False`` a ``console=True``."
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+#~ "Luego, recompilar el EXE con "
+#~ "``install\\build_exe.bat`` (podrías necesitar "
+#~ "comentar los comandos ``signtool`` en "
+#~ "los archivos ``build_exe.bat`` y "
+#~ "``onionshare.nsi``, según las instrucciones en"
+#~ " ``BUILD.md``)."
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+#~ "Después de esto, puedes ejecutar "
+#~ "``onionshare-gui.exe -v`` desde una ventana"
+#~ " de línea de comando para ver "
+#~ "la salida de depuración."
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+#~ "La mayor parte de OnionShare es "
+#~ "traducible. Puedes ayudar a hacerlo más"
+#~ " fácil de usar y más familiar y"
+#~ " acogedor para las personas alrededor "
+#~ "del globo. Localization Lab tiene alguna"
+#~ " `documentación acerca de traducir "
+#~ "OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+#~ "OnionShare usa Weblate para llevar un"
+#~ " registro de las traducciones. Puedes "
+#~ "ver el proyecto OnionShare aquí: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+#~ "A veces las cadenas de caracteres "
+#~ "en el original en Inglés podrían "
+#~ "ser mejoradas, haciéndolas más fáciles "
+#~ "de traducir a otros lenguajes."
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+#~ "Si tienes sugerencias para una mejor "
+#~ "cadena de caracteres en Inglés, por "
+#~ "favor abre una cuestión en GitHub "
+#~ "en vez de comentar en Weblate. "
+#~ "Esto asegura que los desarrolladores en"
+#~ " el nivel superior definitivamente verán"
+#~ " la sugerencia, y pueden modificarla "
+#~ "potencialmente a través de los procesos"
+#~ " usuales de revisión de código."
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr "Traduce el archivo .desktop"
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr "También puedes traducir el archivo ``install/onionshare.desktop``."
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+#~ "Duplica la línea que empieza con "
+#~ "``Comment=``. Agrega el código de "
+#~ "lenguaje a la nueva línea, que "
+#~ "entonces se transforma en ``Comment[lang]=``"
+#~ " (lang debiera ser tu lenguaje). "
+#~ "Puedes ver qué códigos de lenguaje "
+#~ "son usados para traducción mirando a "
+#~ "los nombres de archivos en "
+#~ "``share/locale/*.json``:"
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr "Haz lo mismo para otras líneas no traducidas."
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
-"Duplica la línea que empieza con ``Comment=``. Agrega el código de "
-"lenguaje a la nueva línea, que entonces se transforma en "
-"``Comment[lang]=`` (lang debiera ser tu lenguaje). Puedes ver qué códigos"
-" de lenguaje son usados para traducción mirando a los nombres de archivos"
-" en ``share/locale/*.json``:"
-
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr "Haz lo mismo para otras líneas no traducidas."
diff --git a/docs/source/locale/es/LC_MESSAGES/features.po b/docs/source/locale/es/LC_MESSAGES/features.po
index 4e2ff5b0..5fdcb4d1 100644
--- a/docs/source/locale/es/LC_MESSAGES/features.po
+++ b/docs/source/locale/es/LC_MESSAGES/features.po
@@ -1,399 +1,740 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) Micah Lee, et al.
# This file is distributed under the same license as the OnionShare package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-09-17 05:25+0000\n"
"Last-Translator: Zuhualime Akoochimoya <zakooch@protonmail.ch>\n"
-"Language-Team: none\n"
"Language: es\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-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.3-dev\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+#, fuzzy
+msgid "How OnionShare Works"
msgstr "Cómo funciona OnionShare"
#: ../../source/features.rst:6
-msgid "OnionShare works by starting web servers locally on your own computer and making them accessible to other people as `Tor <https://www.torproject.org/>`_ `onion services <https://community.torproject.org/onion-services/>`_."
+#, fuzzy
+msgid ""
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
+"<https://community.torproject.org/onion-services/>`_."
msgstr ""
"OnionShare funciona iniciando servidores web localmente en tu propia "
-"computadora, y haciéndolos accesibles a otras peesonas como `servicios onion "
-"<https://community.torproject.org/onion-services/>`_`Tor <https://www."
-"torproject.org/>`_ ."
+"computadora, y haciéndolos accesibles a otras peesonas como `servicios "
+"onion <https://community.torproject.org/onion-services/>`_`Tor "
+"<https://www.torproject.org/>`_ ."
#: ../../source/features.rst:8
-msgid "By default, OnionShare web addresses are protected with a random password. A typical OnionShare address might look something like this::"
+msgid ""
+"By default, OnionShare web addresses are protected with a random "
+"password. A typical OnionShare address might look something like this::"
msgstr ""
"Por defecto, las direcciones web OnionShare están protegidas con una "
"contraseña aleatoria. Una dirección OnionShare típica podría parecerse a "
"algo como esto:"
#: ../../source/features.rst:12
-msgid "You're responsible for securely sharing that URL using a communication channel of your choice like in an encrypted chat message, or using something less secure like a Twitter or Facebook message, depending on your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+#, fuzzy
+msgid ""
+"You're responsible for securely sharing that URL using a communication "
+"channel of your choice like in an encrypted chat message, or using "
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
-"Tu eres responsable por compartir en forma segura ese URL, usando un canal "
-"de comunicación de tu elección, como un mensaje cifrado en una charla, o "
-"usando algo menos seguro, como un mensaje de Twitter o Facebook, dependiendo "
-"de tu `modelo de amenaza <https://ssd.eff.org/en/module/your-security-"
-"plan>`_."
+"Tu eres responsable por compartir en forma segura ese URL, usando un "
+"canal de comunicación de tu elección, como un mensaje cifrado en una "
+"charla, o usando algo menos seguro, como un mensaje de Twitter o "
+"Facebook, dependiendo de tu `modelo de amenaza "
+"<https://ssd.eff.org/en/module/your-security-plan>`_."
#: ../../source/features.rst:14
-msgid "The people who you send the URL to must then copy and paste it into `Tor Browser <https://www.torproject.org/>`_ to access the OnionShare service."
+#, fuzzy
+msgid ""
+"The people you send the URL to then copy and paste it into their `Tor "
+"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
-"Luego , las personas a quienes les envías el URL deben copiarlo y pegarlo "
-"dentro del `Navegador Tor <https://www.torproject.org/>`_ para acceder al "
-"servicio OnionShare."
+"Luego , las personas a quienes les envías el URL deben copiarlo y pegarlo"
+" dentro del `Navegador Tor <https://www.torproject.org/>`_ para acceder "
+"al servicio OnionShare."
#: ../../source/features.rst:16
-msgid "With OnionShare, *your own computer is the web server*. If you run OnionShare on your laptop to send someone files, and then suspend your laptop before the files have been downloaded, the service will not be available until your laptop is unsuspended and connected to the internet again. OnionShare works best when working with people in real-time."
+msgid ""
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
-"Con OnionShare, *tu propia computadora es el servidor web*. Si ejecutas "
-"OnionShare en tu portátil para enviarle archivos a alguien, y luego la "
-"suspendes antes de que los archivos hayan sido descargados, el servicio no "
-"estará disponible hasta que finalice la suspensión en tu portátil y se "
-"conecte de nuevo a Internet. OnionShare funciona mejor cuando trabaja con "
-"personas en tiempo real."
#: ../../source/features.rst:18
-msgid "Because your own computer is the web server, *no third party can access anything that happens in OnionShare*, not even the developers of OnionShare. It's completely private. And because OnionShare is based on Tor onion services too, it also protects your anonymity. See the :doc:`security design </security>` for more information."
-msgstr ""
-"Como tu propia computadora es el servidor web, *ningún tercero puede acceder "
-"a nada de lo que pasa en OnionShare*, ni siquiera sus desarrolladores. Es "
-"completamente privado. Y como OnionShare también está basado en los "
-"servicios onion de Tor, también protege tu anonimato. Mira el :doc:`diseño "
-"de seguridad </security>` para más información."
+#, fuzzy
+msgid ""
+"Because your own computer is the web server, *no third party can access "
+"anything that happens in OnionShare*, not even the developers of "
+"OnionShare. It's completely private. And because OnionShare is based on "
+"Tor onion services too, it also protects your anonymity. See the "
+":doc:`security design </security>` for more info."
+msgstr ""
+"Como tu propia computadora es el servidor web, *ningún tercero puede "
+"acceder a nada de lo que pasa en OnionShare*, ni siquiera sus "
+"desarrolladores. Es completamente privado. Y como OnionShare también está"
+" basado en los servicios onion de Tor, también protege tu anonimato. Mira"
+" el :doc:`diseño de seguridad </security>` para más información."
#: ../../source/features.rst:21
msgid "Share Files"
msgstr "Comparte archivos"
#: ../../source/features.rst:23
-msgid "You can use OnionShare to securely and anonymously send files and folders to people. Just open a share tab, drag in the files and folders you wish to share, and click \"Start sharing\"."
+#, fuzzy
+msgid ""
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
"Puedes usar OnionShare para enviar archivos y carpetas a las personas en "
"forma segura y anónima. Solo abre una pestaña de compartición, arrastra "
"hacia ella los archivos y carpetas que deseas compartir, y haz clic en "
"\"Iniciar compartición\"."
-#: ../../source/features.rst:27
-#: ../../source/features.rst:91
-msgid "After you add files, you'll see some settings. Make sure you choose the setting you're interested in first before you start sharing."
+#: ../../source/features.rst:27 ../../source/features.rst:93
+#, fuzzy
+msgid ""
+"After you add files, you'll see some settings. Make sure you choose the "
+"setting you're interested in before you start sharing."
msgstr ""
-"Después que agregas archivos, verás algunas configuraciones. Asegúrate de "
-"elegir primero los ajustes en los que estás interesado antes de empezar a "
-"compartir."
+"Después que agregas archivos, verás algunas configuraciones. Asegúrate de"
+" elegir primero los ajustes en los que estás interesado antes de empezar "
+"a compartir."
#: ../../source/features.rst:31
-msgid "By default, as soon as someone finishes downloading your files, OnionShare will automatically stop the server, completely removing the website from the internet. If you want to allow multiple people to download these files, uncheck the \"Stop sharing after files have been sent (uncheck to allow downloading individual files)\" box."
+msgid ""
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-"Por defecto, tan pronto como alguien termine de descargar tus archivos, "
-"OnionShare detendrá automáticamente al servidor, removiendo completamente al "
-"sitio web de Internet. Si quieres permitir que múltiples personas descarguen "
-"estos archivos, desmarca la casilla \"Detener la compartición luego que los "
-"archivos hayan sido enviados (desmarca para permitir la descarga de archivos "
-"individuales)\"."
-#: ../../source/features.rst:33
-msgid "Also, if you uncheck this box, people will be able to download individual files that you share rather than a single compressed version of all of the files."
+#: ../../source/features.rst:34
+#, fuzzy
+msgid ""
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-"Además, si desmarcas esta casilla, las personas serán capaces de descargar "
-"los archivos individuales que compartas, en vez de una única versión "
-"comprimida de todos ellos."
+"Además, si desmarcas esta casilla, las personas serán capaces de "
+"descargar los archivos individuales que compartas, en vez de una única "
+"versión comprimida de todos ellos."
-#: ../../source/features.rst:35
-msgid "When you're ready to share, click the \"Start sharing\" button. You can always click \"Stop sharing\", or quit OnionShare, to immediate take the website down. You can also click the up arrow icon in the top-right corner to show the history and progress of people downloading files from you."
+#: ../../source/features.rst:36
+#, fuzzy
+msgid ""
+"When you're ready to share, click the \"Start sharing\" button. You can "
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
"Cuando estés listo para compartir, haz clic en el botón \"Iniciar "
"compartición\". Siempre puedes hacer clic en \"Detener compartición\", o "
-"salir de OnionShare, para hacer caer al sitio web inmediatamente. También "
-"puedes hacer clic en el ícono de flecha hacia arriba en la esquina superior "
-"derecha para mostrar el historial y el progreso de las personas que están "
-"descargando archivos."
-
-#: ../../source/features.rst:39
-msgid "Now that you have a website that's sharing files, copy the address and send it to the person you want to receive the files. If the files need to stay secure, you should use an encrypted messaging app."
-msgstr ""
-"Ahora que tienes un sitio web que está compartiendo archivos, copia la "
-"dirección y envíasela a la persona que quieres que los reciba. Si estos "
-"necesitan permanecer seguros, deberías usar una aplicación de mensajería "
-"cifrada."
+"salir de OnionShare, para hacer caer al sitio web inmediatamente. También"
+" puedes hacer clic en el ícono de flecha hacia arriba en la esquina "
+"superior derecha para mostrar el historial y el progreso de las personas "
+"que están descargando archivos."
-#: ../../source/features.rst:41
-msgid "That person then must load the address in Tor Browser. After logging in with the random password that's included in the web address, they will be able to download the files directly from your computer by clicking the \"Download Files\" link in the corner."
+#: ../../source/features.rst:40
+msgid ""
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-"Esa persona debe cargar luego la dirección en el Navegador Tor. Después de "
-"iniciar sesión con la contraseña aleatoria incluída en la dirección web, "
-"serán capaces de descargar los archivos directamente desde tu computadora "
-"haciendo clic en el vínculo \"Descargar Archivos\" en la esquina."
-#: ../../source/features.rst:46
+#: ../../source/features.rst:42
+#, fuzzy
+msgid ""
+"That person then must load the address in Tor Browser. After logging in "
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
+msgstr ""
+"Esa persona debe cargar luego la dirección en el Navegador Tor. Después "
+"de iniciar sesión con la contraseña aleatoria incluída en la dirección "
+"web, serán capaces de descargar los archivos directamente desde tu "
+"computadora haciendo clic en el vínculo \"Descargar Archivos\" en la "
+"esquina."
+
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr "Recibir Archivos"
-#: ../../source/features.rst:48
-msgid "You can use OnionShare to let people anonymously upload files directly to your computer, essentially turning it into an anonymous dropbox. Open a receive tab, choose where you want files to get downloaded and other settings, and then click \"Start Receive Mode\"."
+#: ../../source/features.rst:49
+#, fuzzy
+msgid ""
+"You can use OnionShare to let people anonymously upload files directly to"
+" your computer, essentially turning it into an anonymous dropbox. Open a "
+"\"Receive tab\", choose where you want to save the files and other "
+"settings, and then click \"Start Receive Mode\"."
msgstr ""
"Puedes usar OnionShare para permitir a las personas la subida anónima de "
-"archivos directamente a tu computadora, convirtiéndola esencialmente en un "
-"buzón anónimo. Abre una pestaña de recepción, elige dónde quieres que los "
-"archivos sean descargados y otros ajustes, y luego haz clic en \"Iniciar "
-"Modo de Recepción\"."
+"archivos directamente a tu computadora, convirtiéndola esencialmente en "
+"un buzón anónimo. Abre una pestaña de recepción, elige dónde quieres que "
+"los archivos sean descargados y otros ajustes, y luego haz clic en "
+"\"Iniciar Modo de Recepción\"."
-#: ../../source/features.rst:52
-msgid "This will start the OnionShare service. Anyone that loads this address in Tor Browser will be able to upload files to your computer."
+#: ../../source/features.rst:54
+#, fuzzy
+msgid ""
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-"Esto iniciará al servicio OnionShare. Cualquiera que cargue esta dirección "
-"en el Navegador Tor será capaz de subir archivos a tu computadora."
+"Esto iniciará al servicio OnionShare. Cualquiera que cargue esta "
+"dirección en el Navegador Tor será capaz de subir archivos a tu "
+"computadora."
-#: ../../source/features.rst:56
-msgid "You can also click the down arrow icon in the top-right corner to show the history and progress of people sending files to you."
+#: ../../source/features.rst:58
+#, fuzzy
+msgid ""
+"You can also click the down \"↓\" icon in the top-right corner to show "
+"the history and progress of people sending files to you."
msgstr ""
-"También puedes hacer clic en el ícono de flecha hacia abajo en la esquina "
-"superior derecha para mostrar el historial y el progreso de las personas "
-"enviándote archivos."
+"También puedes hacer clic en el ícono de flecha hacia abajo en la esquina"
+" superior derecha para mostrar el historial y el progreso de las personas"
+" enviándote archivos."
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr "He aquí como luce cuando alguien está enviándote archivos."
-#: ../../source/features.rst:62
-msgid "When someone uploads files to your receive service, by default they get saved to a folder called ``OnionShare`` in your home folder on your computer, and they get automatically organized into separate subfolders based on the time that the files get uploaded."
-msgstr ""
-"Cuando alguien sube archivos al servicio de recepción en tu computadora, son "
-"guardados por defecto en una subcarpeta de tu carpeta personal llamada "
-"``OnionShare``, y son organizados automáticamente en subcarpetas separadas "
-"basándose en la hora en la que los archivos son subidos."
-
#: ../../source/features.rst:64
-msgid "Setting up an OnionShare receiving service is useful for journalists and others that need to securely accept documents from anonymous sources. When used in this way, OnionShare is sort of like a lightweight, simpler, not quite as secure version of `SecureDrop <https://securedrop.org/>`_, the whistleblower submission system."
+msgid ""
+"When someone uploads files to your receive service, by default they get "
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-"Establecer un servicio de recepción OnionShare es útil para periodistas y "
-"otros que necesiten aceptar documentos en forma segura desde fuentes "
+
+#: ../../source/features.rst:66
+#, fuzzy
+msgid ""
+"Setting up an OnionShare receiving service is useful for journalists and "
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
+msgstr ""
+"Establecer un servicio de recepción OnionShare es útil para periodistas y"
+" otros que necesiten aceptar documentos en forma segura desde fuentes "
"anónimas. Cuando es usado de esta manera, OnionShare es una especie de "
"versión liviana, más simple y no tan segura de `SecureDrop "
"<https://securedrop.org/>`_, el sistema de envíos para informantes."
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr "Úsalo a tu propio riesgo"
-#: ../../source/features.rst:69
-msgid "Just like with malicious email attachments, it's possible that someone could try to hack your computer by uploading a malicious file to your OnionShare service. OnionShare does not add any safety mechanisms to protect your system from malicious files, so use at your own risk."
+#: ../../source/features.rst:71
+msgid ""
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
+"OnionShare service. OnionShare does not add any safety mechanisms to "
+"protect your system from malicious files."
msgstr ""
-"De la misma manera que con adjuntos maliciosos en correos electrónicos, es "
-"posible que alguien pudiera intentar hackear tu computadora subiendo un "
-"archivo malicioso a tu servicio. OnionShare no añade ningún mecanismo de "
-"seguridad para proteger a tu sistema de archivos maliciosos, por lo que su "
-"uso es a tu propio riesgo."
-#: ../../source/features.rst:71
-msgid "If you receive an Office document or a PDF through OnionShare, you can convert these documents into PDFs that you know are safe to open using `Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself when opening untrusted documents by opening them in `Tails <https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ disposable VM."
+#: ../../source/features.rst:73
+msgid ""
+"If you receive an Office document or a PDF through OnionShare, you can "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
+"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
+"disposableVM."
msgstr ""
-"Si recibes un documento de Office o un PDF a través de OnionShare, puedes "
-"convertirlos en PDFs que sabes que serán seguros para abrir usando `"
-"Dangerzone <https://dangerzone.rocks/>`_. También puedes protegerte al abrir "
-"documentos en los que no confías haciéndolo en `Tails <https://tails.boum."
-"org/>`_ o en una Máquina Virtual descartable `Qubes <https://qubes-os.org/"
-">`_."
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr "Consejos para correr un servicio de recepción"
-#: ../../source/features.rst:76
-msgid "If you want to host your own anonymous dropbox using OnionShare, it's recommended that you do it on a separate, dedicated computer that's always powered on and connected to the internet, and not on the one you use on a regular basis."
-msgstr ""
-"Si quieres alojar tu propio buzón anónimo usando OnionShare, es recomendado "
-"que lo hagas en una computadora dedicada y separada, que siempre esté "
-"encendida y conectada a Internet, y no en la que usas regularmente."
-
#: ../../source/features.rst:78
-msgid "If you intend on advertising the OnionShare address on your website or social media profiles, then you should save the tab (see :ref:`save_tabs`) and run it as a public service (see :ref:`disable_passwords`)."
+#, fuzzy
+msgid ""
+"If you want to host your own anonymous dropbox using OnionShare, it's "
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
+msgstr ""
+"Si quieres alojar tu propio buzón anónimo usando OnionShare, es "
+"recomendado que lo hagas en una computadora dedicada y separada, que "
+"siempre esté encendida y conectada a Internet, y no en la que usas "
+"regularmente."
+
+#: ../../source/features.rst:80
+#, fuzzy
+msgid ""
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-"Si tu intención es publicitar la dirección OnionShare en tu sitio web o tus "
-"perfiles de redes sociales, entonces deberías guardar la pestaña (mira "
-":ref:`save_tabs`) y correrla como servicio público (mira "
+"Si tu intención es publicitar la dirección OnionShare en tu sitio web o "
+"tus perfiles de redes sociales, entonces deberías guardar la pestaña "
+"(mira :ref:`save_tabs`) y correrla como servicio público (mira "
":ref:`disable_passwords`)."
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr "Aloja un Sitio Web"
-#: ../../source/features.rst:83
-msgid "You can use OnionShare to host a static HTML website with just a click. Just open a website tab, drag in the files and folders that make up the static website, and click when you're ready click \"Start sharing\"."
+#: ../../source/features.rst:85
+#, fuzzy
+msgid ""
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-"Puedes usar OnionShare para alojar un sitio web con HTML estático solo con "
-"un clic. Abre una pestaña de sitio web, arrastra los archivos y carpetas que "
-"constituyen el sitio web estático, y haz clic cuando estés listo en \"Iniciar"
-" compartición\"."
+"Puedes usar OnionShare para alojar un sitio web con HTML estático solo "
+"con un clic. Abre una pestaña de sitio web, arrastra los archivos y "
+"carpetas que constituyen el sitio web estático, y haz clic cuando estés "
+"listo en \"Iniciar compartición\"."
-#: ../../source/features.rst:87
-msgid "If you add an ``index.html`` file, when someone loads your website it will render this page. You should also include any other HTML files, CSS files, JavaScript files, and images that make up the website. (Note that OnionShare only supports hosting *static* websites. It can't host websites that execute code or use databases. So you can't, for example, use WordPress.)"
+#: ../../source/features.rst:89
+msgid ""
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
+"OnionShare only supports hosting *static* websites. It can't host "
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-"Si añades un archivo ``index.html``, cuando alguien cargue tu sitio web "
-"representará gráficamente a esta página. También deberías incluir cualquier "
-"otro archivo HTML, CSS, JavaScript o imágenes que constituyan al sitio web. ("
-"Ten en cuenta que OnionShare solamente soporta el alojamiento de sitios web "
-"*estáticos*. No puede alojar sitios web que ejecuten código o usen bases de "
-"datos. Por lo que no puedes, por ejemplo, usar WordPress.)"
-#: ../../source/features.rst:89
-msgid "If you don't have an ``index.html`` file, then it will show a directory listing instead, and people who load it can look through the files and download them."
+#: ../../source/features.rst:91
+#, fuzzy
+msgid ""
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
+"download them."
msgstr ""
"Si no tienes un archivo ``index.html``, entonces mostrará un listado de "
"directorio, y las personas que lo carguen podrán mirar a través de los "
"archivos y descargarlos."
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr "Política de Seguridad de Contenido"
-#: ../../source/features.rst:98
-msgid "By default OnionShare will help secure your website by setting a strict `Content Security Police <https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However this will prevent third-party content from loading inside the web page."
-msgstr ""
-"Por defecto, OnionShare te ayudará a asegurar tu sitio web estableciendo un "
-"estricto encabezado de `Política de Seguridad de Contenido <https://en."
-"wikipedia.org/wiki/Content_Security_Policy>`_. Sin embargo, esto evitará que "
-"el contenido de terceros sea cargado dentro de la página web."
-
#: ../../source/features.rst:100
-msgid "If you want to load content from third-party websites, like assets or JavaScript libraries from CDNs, then you must check the \"Disable Content Security Policy header (allows your website to use third-party resources)\" box before starting the service."
+#, fuzzy
+msgid ""
+"By default OnionShare helps secure your website by setting a strict "
+"`Content Security Police "
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
+msgstr ""
+"Por defecto, OnionShare te ayudará a asegurar tu sitio web estableciendo "
+"un estricto encabezado de `Política de Seguridad de Contenido "
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_. Sin embargo, "
+"esto evitará que el contenido de terceros sea cargado dentro de la página"
+" web."
+
+#: ../../source/features.rst:102
+#, fuzzy
+msgid ""
+"If you want to load content from third-party websites, like assets or "
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-"Si quieres cargar contenido desde sitios web de terceros, como recursoss o "
-"bibliotecas JavaScript desde CDNs, entonces debes marcar la casilla "
-"\"Deshabilitar el encabezado de Política de Seguridad de Contenido (permite "
-"a tu sitio web usar recursos de terceros)\" antes de iniciar el servicio."
+"Si quieres cargar contenido desde sitios web de terceros, como recursoss "
+"o bibliotecas JavaScript desde CDNs, entonces debes marcar la casilla "
+"\"Deshabilitar el encabezado de Política de Seguridad de Contenido "
+"(permite a tu sitio web usar recursos de terceros)\" antes de iniciar el "
+"servicio."
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr "Consejos para correr un servicio de sitio web"
-#: ../../source/features.rst:105
-msgid "If you want to host a long-term website using OnionShare (that isn't just to quickly show someone something), it's recommended that you do it on a separate, dedicated computer that's always powered on and connected to the internet, and not on the one you use on a regular basis. You should also save the tab (see :ref:`save_tabs`) so that you can resume the website with the same address if you close OnionShare and re-open it later."
-msgstr ""
-"Si quieres alojar un sitio web a largo plazo usando OnionShare (que no sea "
-"solo para mostrarle algo a alguien rápidamente), es recomendado que lo hagas "
-"en una computadora separada y dedicada, que siempre esté encendida y "
-"conectada a Internet, y no en la que usas regularmente. También deberías "
-"guardar la pestaña (mira :ref:`save_tabs`) con el fin de que puedas reanudar "
-"al sitio web con la misma dirección, si cierras OnionShare y lo vuelves a "
-"iniciar más tarde."
-
#: ../../source/features.rst:107
-msgid "If your website is intended to be viewed by the public, you should run it as a public service (see :ref:`disable_passwords`)."
-msgstr ""
-"Si planeas que tu sitio web sea visto por el público, deberías ejecutarlo "
-"como servicio público (see :ref:`disable_passwords`)."
+#, fuzzy
+msgid ""
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
+msgstr ""
+"Si quieres alojar un sitio web a largo plazo usando OnionShare (que no "
+"sea solo para mostrarle algo a alguien rápidamente), es recomendado que "
+"lo hagas en una computadora separada y dedicada, que siempre esté "
+"encendida y conectada a Internet, y no en la que usas regularmente. "
+"También deberías guardar la pestaña (mira :ref:`save_tabs`) con el fin de"
+" que puedas reanudar al sitio web con la misma dirección, si cierras "
+"OnionShare y lo vuelves a iniciar más tarde."
#: ../../source/features.rst:110
+#, fuzzy
+msgid ""
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
+msgstr ""
+"Si planeas que tu sitio web sea visto por el público, deberías ejecutarlo"
+" como servicio público (see :ref:`disable_passwords`)."
+
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr "Chat Anónimo"
-#: ../../source/features.rst:112
-msgid "You can use OnionShare to set up a completely anonymous, secure chat room that doesn't log anything or leave any traces. Just open a chat tab and click \"Start chat server\"."
+#: ../../source/features.rst:115
+#, fuzzy
+msgid ""
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
"Puedes usar OnionShare para establecer un cuarto de chat completamente "
-"anónimo y seguro, que no registra nada o deja rastro alguno. Solo abre una "
-"pestaña de chat y haz clic en \"Iniciar servidor de chat\"."
+"anónimo y seguro, que no registra nada o deja rastro alguno. Solo abre "
+"una pestaña de chat y haz clic en \"Iniciar servidor de chat\"."
-#: ../../source/features.rst:116
-msgid "After you start the server, copy the OnionShare address and send it to the people who will join this anonymous chat room. If it's important to limit exactly who can join, you should use an encrypted messaging app to send the OnionShare address."
+#: ../../source/features.rst:119
+msgid ""
+"After you start the server, copy the OnionShare address and send it to "
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-"Después que inicies al servidor, copia la dirección OnionShare y envíala a "
-"las personas que se unirán a este cuarto anónimo de chat. Si es importante "
-"limitar exactamente quién puede unirse, deberías usar una aplicación cifrada "
-"de mensajería para enviar la dirección OnionShare."
-#: ../../source/features.rst:120
-msgid "People can join the chat room by loading its OnionShare address in Tor Browser. The chat room requires JavasScript, so everyone who wants to participate must set their security level to Standard or Safer instead of Safest."
+#: ../../source/features.rst:124
+#, fuzzy
+msgid ""
+"People can join the chat room by loading its OnionShare address in Tor "
+"Browser. The chat room requires JavasScript, so everyone who wants to "
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
"Las personas pueden unirse al cuarto de chat cargando su dirección "
-"OnionShare en el Navegador Tor. El cuarto de chat requiere JavasScript, por "
-"lo que todo aquel que quiera participar debe ajustar su nivel de seguridad a "
-"'Estándar' o 'Más Seguro' en vez de a 'El Más Seguro'."
+"OnionShare en el Navegador Tor. El cuarto de chat requiere JavasScript, "
+"por lo que todo aquel que quiera participar debe ajustar su nivel de "
+"seguridad a 'Estándar' o 'Más Seguro' en vez de a 'El Más Seguro'."
-#: ../../source/features.rst:122
-msgid "When someone joins the chat room they get assigned a random name. They can change their name by typing a new name in the box in the left panel and pressing enter. No chat history will get displayed at all, even if others were already chatting in the room, because the chat history isn't saved anywhere."
+#: ../../source/features.rst:127
+#, fuzzy
+msgid ""
+"When someone joins the chat room they get assigned a random name. They "
+"can change their name by typing a new name in the box in the left panel "
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-"Cuando alguien se une al cuarto de chat, se le asigna un nombre aleatorio. "
-"Puede cambiarlo tipeando un nombre nuevo en la casilla en el panel izquierdo "
-"y presionando Intro. Ningún historial de chat será mostrado en absoluto, aún "
-"si otros ya estaban chateando en el cuarto, porque ese historial no es "
-"guardado en ningún lado."
+"Cuando alguien se une al cuarto de chat, se le asigna un nombre "
+"aleatorio. Puede cambiarlo tipeando un nombre nuevo en la casilla en el "
+"panel izquierdo y presionando Intro. Ningún historial de chat será "
+"mostrado en absoluto, aún si otros ya estaban chateando en el cuarto, "
+"porque ese historial no es guardado en ningún lado."
-#: ../../source/features.rst:126
-msgid "In an OnionShare chat room, everyone is anonymous. Anyone can change their name to anything, and there is no way to confirm anyone's identity."
+#: ../../source/features.rst:133
+msgid ""
+"In an OnionShare chat room, everyone is anonymous. Anyone can change "
+"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
"En un cuarto de chat OnionShare, todos son anónimos. Cualquiera puede "
"cambiar su nombre a cualquier cosa, y no hay manera de confirmar la "
"identidad de nadie."
-#: ../../source/features.rst:128
-msgid "However, if you create an OnionShare chat room and securely send the address only to a small group of trusted friends using encrypted messages, then you can be reasonably confident that the people who join the chat room are your friends."
-msgstr ""
-"Sin embargo, si creas un cuarto de chat OnionShare, y envías la dirección en "
-"forma segura solamente a un grupo pequeño de amigos confiables usando "
-"mensajes cifrados, entonces puedes estar razonablemente seguro que las "
+#: ../../source/features.rst:136
+#, fuzzy
+msgid ""
+"However, if you create an OnionShare chat room and securely send the "
+"address only to a small group of trusted friends using encrypted "
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
+msgstr ""
+"Sin embargo, si creas un cuarto de chat OnionShare, y envías la dirección"
+" en forma segura solamente a un grupo pequeño de amigos confiables usando"
+" mensajes cifrados, entonces puedes estar razonablemente seguro que las "
"personas que se unan a él son tus amigos."
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr "¿Cómo es que esto es útil?"
-#: ../../source/features.rst:133
-msgid "If you need to already be using an encrypted messaging app, what's the point of an OnionShare chat room to begin with? It leaves less traces."
+#: ../../source/features.rst:141
+msgid ""
+"If you need to already be using an encrypted messaging app, what's the "
+"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
"Si para empezar ya necesitas estar usando una aplicación de mensajería "
"cifrada, ¿cuál es el punto de un cuarto de chat OnionShare? Deja menos "
"rastros."
-#: ../../source/features.rst:135
-msgid "If you send a message to a Signal group, for example, a copy of your message ends up on each device (the phones and computers, if they set up Signal Desktop) of each member of the group. Even if disappearing messages is enabled, it's hard to confirm that all copies of the messages were actually deleted from all devices, and from any other places (like notifications databases) they may have been saved to. OnionShare chat rooms don't store any messages anywhere, so this isn't a problem."
-msgstr ""
-"Si envías un mensaje a un grupo de Signal, por ejemplo, una copia del mismo "
-"termina en cada dispositivo (los teléfonos y computadoras, si configuran "
-"Signal Desktop) de cada miembro del grupo. Aún si están habilitados los "
-"mensajes evanescentes, es difícil confirmar que todas las copias de los "
-"mismos fueron realmente borradas de todos los dispositivos, y de cualquier "
-"otro lugar (como bases de datos de notificaciones) en que pudieran haber "
-"sido guardadas. Los cuartos de chat OnionShare no almacenan ningún mensaje "
-"en ningún lado, por lo que esto no es un problema."
-
-#: ../../source/features.rst:137
-msgid "OnionShare chat rooms can also be useful for anonymous people wanting to chat securely with someone without needing to create any accounts. For example, a source can send an OnionShare address to a journalist using a disposable email address, and then wait for the journalist to join the chat room, all without compromosing their anonymity."
+#: ../../source/features.rst:143
+msgid ""
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
+"notifications databases) they may have been saved to. OnionShare chat "
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
+msgstr ""
+
+#: ../../source/features.rst:146
+#, fuzzy
+msgid ""
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
"Los cuartos de chat OnionShare también pueden ser útiles para personas "
-"anónimas que quieran charlar en forma segura con alguien sin necesitar crear "
-"alguna cuenta. Por ejemplo, una fuente puede enviar una dirección OnionShare "
-"a un periodista usando una dirección de correo electrónico descartable, y "
-"luego esperar a que el periodista se una al cuarto de chat, todo eso sin "
-"comprometer su anonimato."
+"anónimas que quieran charlar en forma segura con alguien sin necesitar "
+"crear alguna cuenta. Por ejemplo, una fuente puede enviar una dirección "
+"OnionShare a un periodista usando una dirección de correo electrónico "
+"descartable, y luego esperar a que el periodista se una al cuarto de "
+"chat, todo eso sin comprometer su anonimato."
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr "¿Cómo funciona el cifrado?"
-#: ../../source/features.rst:142
-msgid "Because OnionShare relies on Tor onion services, connections between Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When someone posts a message to an OnionShare chat room, they send it to the server through the E2EE onion connection, which then sends it to all other members of the chat room using WebSockets, through their E2EE onion connections."
-msgstr ""
-"Como OnionShare cuenta con los servicios onion de Tor, todas las conexiones "
-"entre el Navegador Tor y OnionShare son cifradas de extremo a extremo (E2EE)"
-". Cuando alguien publica un mensaje a un cuarto de chat OnionShare, lo envía "
-"al servidor a través de la conexión onion E2EE, la cual lo envía luego a "
-"todos los otros miembros del cuarto de chat usando WebSockets, a través de "
-"sus conexiones onion E2EE."
+#: ../../source/features.rst:152
+#, fuzzy
+msgid ""
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
+msgstr ""
+"Como OnionShare cuenta con los servicios onion de Tor, todas las "
+"conexiones entre el Navegador Tor y OnionShare son cifradas de extremo a "
+"extremo (E2EE). Cuando alguien publica un mensaje a un cuarto de chat "
+"OnionShare, lo envía al servidor a través de la conexión onion E2EE, la "
+"cual lo envía luego a todos los otros miembros del cuarto de chat usando "
+"WebSockets, a través de sus conexiones onion E2EE."
+
+#: ../../source/features.rst:154
+msgid ""
+"OnionShare doesn't implement any chat encryption on its own. It relies on"
+" the Tor onion service's encryption instead."
+msgstr ""
+"OnionShare no implementa ningún cifrado de chat por sí mismo. En vez, "
+"cuenta con el cifrado del servicio onion de Tor."
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+#~ "Con OnionShare, *tu propia computadora "
+#~ "es el servidor web*. Si ejecutas "
+#~ "OnionShare en tu portátil para enviarle"
+#~ " archivos a alguien, y luego la "
+#~ "suspendes antes de que los archivos "
+#~ "hayan sido descargados, el servicio no"
+#~ " estará disponible hasta que finalice "
+#~ "la suspensión en tu portátil y se"
+#~ " conecte de nuevo a Internet. "
+#~ "OnionShare funciona mejor cuando trabaja "
+#~ "con personas en tiempo real."
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+#~ "Por defecto, tan pronto como alguien "
+#~ "termine de descargar tus archivos, "
+#~ "OnionShare detendrá automáticamente al "
+#~ "servidor, removiendo completamente al sitio"
+#~ " web de Internet. Si quieres permitir"
+#~ " que múltiples personas descarguen estos"
+#~ " archivos, desmarca la casilla \"Detener"
+#~ " la compartición luego que los "
+#~ "archivos hayan sido enviados (desmarca "
+#~ "para permitir la descarga de archivos"
+#~ " individuales)\"."
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+#~ "Ahora que tienes un sitio web que"
+#~ " está compartiendo archivos, copia la "
+#~ "dirección y envíasela a la persona "
+#~ "que quieres que los reciba. Si "
+#~ "estos necesitan permanecer seguros, deberías"
+#~ " usar una aplicación de mensajería "
+#~ "cifrada."
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+#~ "Cuando alguien sube archivos al servicio"
+#~ " de recepción en tu computadora, son"
+#~ " guardados por defecto en una "
+#~ "subcarpeta de tu carpeta personal "
+#~ "llamada ``OnionShare``, y son organizados "
+#~ "automáticamente en subcarpetas separadas "
+#~ "basándose en la hora en la que "
+#~ "los archivos son subidos."
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+#~ "De la misma manera que con "
+#~ "adjuntos maliciosos en correos electrónicos,"
+#~ " es posible que alguien pudiera "
+#~ "intentar hackear tu computadora subiendo "
+#~ "un archivo malicioso a tu servicio. "
+#~ "OnionShare no añade ningún mecanismo de"
+#~ " seguridad para proteger a tu sistema"
+#~ " de archivos maliciosos, por lo que"
+#~ " su uso es a tu propio riesgo."
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+#~ "Si recibes un documento de Office "
+#~ "o un PDF a través de OnionShare,"
+#~ " puedes convertirlos en PDFs que "
+#~ "sabes que serán seguros para abrir "
+#~ "usando `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "También puedes protegerte al abrir "
+#~ "documentos en los que no confías "
+#~ "haciéndolo en `Tails <https://tails.boum.org/>`_ "
+#~ "o en una Máquina Virtual descartable "
+#~ "`Qubes <https://qubes-os.org/>`_."
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+#~ "Si añades un archivo ``index.html``, "
+#~ "cuando alguien cargue tu sitio web "
+#~ "representará gráficamente a esta página. "
+#~ "También deberías incluir cualquier otro "
+#~ "archivo HTML, CSS, JavaScript o imágenes"
+#~ " que constituyan al sitio web. (Ten"
+#~ " en cuenta que OnionShare solamente "
+#~ "soporta el alojamiento de sitios web "
+#~ "*estáticos*. No puede alojar sitios web"
+#~ " que ejecuten código o usen bases "
+#~ "de datos. Por lo que no puedes,"
+#~ " por ejemplo, usar WordPress.)"
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+#~ "Después que inicies al servidor, copia"
+#~ " la dirección OnionShare y envíala a"
+#~ " las personas que se unirán a "
+#~ "este cuarto anónimo de chat. Si es"
+#~ " importante limitar exactamente quién puede"
+#~ " unirse, deberías usar una aplicación "
+#~ "cifrada de mensajería para enviar la "
+#~ "dirección OnionShare."
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+#~ "Si envías un mensaje a un grupo"
+#~ " de Signal, por ejemplo, una copia"
+#~ " del mismo termina en cada "
+#~ "dispositivo (los teléfonos y computadoras, "
+#~ "si configuran Signal Desktop) de cada"
+#~ " miembro del grupo. Aún si están "
+#~ "habilitados los mensajes evanescentes, es "
+#~ "difícil confirmar que todas las copias"
+#~ " de los mismos fueron realmente "
+#~ "borradas de todos los dispositivos, y"
+#~ " de cualquier otro lugar (como bases"
+#~ " de datos de notificaciones) en que"
+#~ " pudieran haber sido guardadas. Los "
+#~ "cuartos de chat OnionShare no almacenan"
+#~ " ningún mensaje en ningún lado, por"
+#~ " lo que esto no es un problema."
-#: ../../source/features.rst:144
-msgid "OnionShare doesn't implement any chat encryption on its own. It relies on the Tor onion service's encryption instead."
-msgstr ""
-"OnionShare no implementa ningún cifrado de chat por sí mismo. En vez, cuenta "
-"con el cifrado del servicio onion de Tor."
diff --git a/docs/source/locale/es/LC_MESSAGES/help.po b/docs/source/locale/es/LC_MESSAGES/help.po
index dad96235..aaa20e4e 100644
--- a/docs/source/locale/es/LC_MESSAGES/help.po
+++ b/docs/source/locale/es/LC_MESSAGES/help.po
@@ -1,75 +1,98 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) Micah Lee, et al.
# This file is distributed under the same license as the OnionShare package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-09-14 21:36+0000\n"
"Last-Translator: Zuhualime Akoochimoya <zakooch@protonmail.ch>\n"
-"Language-Team: none\n"
"Language: es\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-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.3-dev\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr "Obteniendo Ayuda"
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
-msgstr ""
-"Si necesitas ayuda con OnionShare, por favor sigue las instrucciones de "
-"abajo."
-
-#: ../../source/help.rst:7
-msgid "Read this website"
+#: ../../source/help.rst:5
+#, fuzzy
+msgid "Read This Website"
msgstr "Lee este sitio web"
-#: ../../source/help.rst:9
-msgid "This website is full of instructions on how to use OnionShare. Look through all of the sections first to see if it answers your questions."
+#: ../../source/help.rst:7
+#, fuzzy
+msgid ""
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-"Este sitio web está lleno de instrucciones sobre cómo usar OnionShare. Mira "
-"primero a través de todas las secciones para ver si responde a tus preguntas."
+"Este sitio web está lleno de instrucciones sobre cómo usar OnionShare. "
+"Mira primero a través de todas las secciones para ver si responde a tus "
+"preguntas."
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+#, fuzzy
+msgid "Check the GitHub Issues"
msgstr "Comprueba las cuestiones con GitHub"
-#: ../../source/help.rst:14
-msgid "If you can't find a solution in this website, please check the `GitHub issues <https://github.com/micahflee/onionshare/issues>`_. It's possible that someone else has encountered the same problem and has either raised it with the developers, or maybe even posted a solution."
+#: ../../source/help.rst:12
+#, fuzzy
+msgid ""
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-"Si no puedes encontrar una solución en este sitio web, por favor comprueba "
-"las `cuestiones con GitHub <https://github.com/micahflee/onionshare/issues>`"
-"_. Es posible que alguien más se haya encontrado con el mismo problema y lo "
-"haya elevado a los desarrolladores, o incluso también que haya publicado una "
-"solución."
+"Si no puedes encontrar una solución en este sitio web, por favor "
+"comprueba las `cuestiones con GitHub "
+"<https://github.com/micahflee/onionshare/issues>`_. Es posible que "
+"alguien más se haya encontrado con el mismo problema y lo haya elevado a "
+"los desarrolladores, o incluso también que haya publicado una solución."
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+#, fuzzy
+msgid "Submit an Issue Yourself"
msgstr "Envía una cuestión"
-#: ../../source/help.rst:19
-msgid "If you can't find a solution to your problem, or you wish to ask a question or suggest a new feature, please `submit an issue <https://github.com/micahflee/onionshare/issues/new>`_. This requires `creating an GitHub account <https://help.github.com/articles/signing-up-for-a-new-github-account/>`_."
+#: ../../source/help.rst:17
+#, fuzzy
+msgid ""
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
+"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
+"for-a-new-github-account/>`_."
msgstr ""
"Si no puedes encontrar una solución a tu problema, o deseas hacer una "
-"pregunta o sugerir una característica nueva, por favor `envía una cusestión "
-"<https://github.com/micahflee/onionshare/issues/new>`_. Esto requiere `crear "
-"una cuenta en GitHub <https://help.github.com/articles/"
-"signing-up-for-a-new-github-account/>`_."
+"pregunta o sugerir una característica nueva, por favor `envía una "
+"cusestión <https://github.com/micahflee/onionshare/issues/new>`_. Esto "
+"requiere `crear una cuenta en GitHub <https://help.github.com/articles"
+"/signing-up-for-a-new-github-account/>`_."
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+#, fuzzy
+msgid "Join our Keybase Team"
msgstr "Únete a nuestro equipo Keybase"
-#: ../../source/help.rst:24
-msgid "See :ref:`collaborating` for instructions on how to join our Keybase team that we use to discuss the project."
+#: ../../source/help.rst:22
+#, fuzzy
+msgid ""
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
-"Mira :ref:`collaborating` por instrucciones acerca de cómo unirse a nuestro "
-"equipo Keybase, al cual usamos para discutir el proyecto."
+"Mira :ref:`collaborating` por instrucciones acerca de cómo unirse a "
+"nuestro equipo Keybase, al cual usamos para discutir el proyecto."
+
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+#~ "Si necesitas ayuda con OnionShare, por"
+#~ " favor sigue las instrucciones de "
+#~ "abajo."
+
diff --git a/docs/source/locale/es/LC_MESSAGES/install.po b/docs/source/locale/es/LC_MESSAGES/install.po
index 41624bdf..3e2e377b 100644
--- a/docs/source/locale/es/LC_MESSAGES/install.po
+++ b/docs/source/locale/es/LC_MESSAGES/install.po
@@ -1,144 +1,262 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) Micah Lee, et al.
# This file is distributed under the same license as the OnionShare package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-09-14 21:36+0000\n"
"Last-Translator: Zuhualime Akoochimoya <zakooch@protonmail.ch>\n"
-"Language-Team: none\n"
"Language: es\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-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.3-dev\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr "Instalación"
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+#, fuzzy
+msgid "Windows or macOS"
msgstr "Instalar en Windows o macOS"
#: ../../source/install.rst:7
-msgid "You can download OnionShare for Windows and macOS from the `OnionShare website <https://onionshare.org/>`_."
+msgid ""
+"You can download OnionShare for Windows and macOS from the `OnionShare "
+"website <https://onionshare.org/>`_."
msgstr ""
-"Puedes descargar OnionShare para Windows o macOS desde la página web de `"
-"OnionShare <https://onionshare.org/>`_."
-
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
-msgstr "Para mayor seguridad, lee :ref:`verifying_sigs`."
+"Puedes descargar OnionShare para Windows o macOS desde la página web de "
+"`OnionShare <https://onionshare.org/>`_."
-#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+#: ../../source/install.rst:12
+#, fuzzy
+msgid "Install in Linux"
msgstr "Instalar en Linux con Flatpak"
-#: ../../source/install.rst:16
-msgid "There are various ways to install OnionShare for Linux, but the recommended way is to use the Flatpak package. Flatpak ensures that you'll always use the most latest dependencies and run OnionShare inside of a sandbox."
+#: ../../source/install.rst:14
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-"Hay varias formas de instalar OnionShare en Linux, pero recomendamos "
-"utilizar el paquete Flatpak. Flatpak garantiza que las dependencias serán "
-"siempre las más recientes y ejecutará OnionShare dentro de un contenedor "
-"aislado."
-#: ../../source/install.rst:18
-msgid "Make sure you have ``flatpak`` installed and the Flathub repository added by following `these instructions <https://flatpak.org/setup/>`_ for your Linux distribution."
+#: ../../source/install.rst:17
+msgid ""
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-"Instala ``flatpak`` y añade el repositorio Flathub siguiendo `estas "
-"instrucciones <https://flatpak.org/setup/>`_ para tu distribución Linux."
-#: ../../source/install.rst:20
-msgid "Then install OnionShare from Flathub by following `the instructions here <https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#: ../../source/install.rst:19
+#, fuzzy
+msgid ""
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
"Luego instala OnionShare desde Flathub siguiendo `estas instrucciones "
"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
-#: ../../source/install.rst:25
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
+msgid ""
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
+msgstr ""
+
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr "Verificar firmas PGP"
-#: ../../source/install.rst:27
-msgid "You can verify that the Windows, macOS, or source package you download is legitimate and hasn't been tampered with by verifying its PGP signature. For Windows and macOS, this step is optional and provides defense in depth: the installers also include their operating system-specific signatures, and you can just rely on those alone if you'd like."
+#: ../../source/install.rst:30
+msgid ""
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-"Puedes asegurate de que el paquete con el código fuente, el de Windows o el "
-"de macOS que descargaste es correcto y no ha sido manipulado verificando su "
-"firma PGP. Para Windows y macOS este paso es opcional, y provee defensa en "
-"profundidad: los instaladores también incluyen sus firmas específicas del "
-"sistema operativo, y puedes confiar solo en ellas si así lo deseas."
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr "Clave de firma"
-#: ../../source/install.rst:32
-msgid "Windows, macOS, and source packaged are signed by Micah Lee, the core developer, using his PGP public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#: ../../source/install.rst:36
+msgid ""
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-"Los paquetes para Windows, macOS, y el código fuente están firmados por "
-"Micah Lee, el desarrollador principal, usando su clave PGP pública con "
-"huella digital ``927F419D7EC82C2F149C1BD1403C2657CD994F73``. Puedes "
-"descargar la clave de Micah `desde el servidor de claves keys.openpgp.org "
-"<https://keys.openpgp.org/vks/v1/by-fingerprint/"
-"927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
-#: ../../source/install.rst:34
-msgid "In order to verify signatures, you must have GnuPG installed. For macOS you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+#: ../../source/install.rst:38
+#, fuzzy
+msgid ""
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
"Con el fin de verificar firmas, debes tener GnuPG instalado. Para macOS "
-"probablemente quieras `GPGTools <https://gpgtools.org/>`_, y para Windows, `"
-"Gpg4win <https://www.gpg4win.org/>`_."
+"probablemente quieras `GPGTools <https://gpgtools.org/>`_, y para "
+"Windows, `Gpg4win <https://www.gpg4win.org/>`_."
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr "Firmas"
-#: ../../source/install.rst:39
-msgid "You can find the signatures (``.asc`` files), as well as Windows, macOS, and source packages, at https://onionshare.org/dist/ in the folders named for each version of OnionShare. You can also find them on the `GitHub Releases page <https://github.com/micahflee/onionshare/releases>`_."
+#: ../../source/install.rst:43
+#, fuzzy
+msgid ""
+"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
"Puedes encontrar las firmas (archivos ``.asc``), como así también los "
-"paquetes para Windows, macOS y el código fuente, en https://onionshare.org/"
-"dist/ en las carpetas nombradas por cada versión de OnionShare. También "
-"puedes encontrarlas en la `página de Lanzamientos de GitHub <https://github."
-"com/micahflee/onionshare/releases>`_."
+"paquetes para Windows, macOS y el código fuente, en "
+"https://onionshare.org/dist/ en las carpetas nombradas por cada versión "
+"de OnionShare. También puedes encontrarlas en la `página de Lanzamientos "
+"de GitHub <https://github.com/micahflee/onionshare/releases>`_."
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr "Verificando"
-#: ../../source/install.rst:44
-msgid "Once you have imported Micah's public key into your GnuPG keychain, downloaded the binary, and downloaded the ``.asc`` signature, you can verify the binary for macOS in terminal like this::"
+#: ../../source/install.rst:49
+#, fuzzy
+msgid ""
+"Once you have imported Micah's public key into your GnuPG keychain, "
+"downloaded the binary, and downloaded the ``.asc`` signature, you can "
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-"Una vez que hayas importado la clave pública de Micah dentro de tu llavero "
-"GnuPG, descargado el ejecutable y la firma ``.asc``, puedes verificar el "
-"ejecutable para macOS en un terminal como sigue:"
+"Una vez que hayas importado la clave pública de Micah dentro de tu "
+"llavero GnuPG, descargado el ejecutable y la firma ``.asc``, puedes "
+"verificar el ejecutable para macOS en un terminal como sigue:"
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+#, fuzzy
+msgid "Or for Windows, in a command-prompt like this::"
msgstr "O para Windows en una línea de comando como sigue:"
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+#, fuzzy
+msgid "The expected output looks like this::"
msgstr "Una salida esperada puede lucir como esta:"
-#: ../../source/install.rst:64
-msgid "If you don't see 'Good signature from', then there might be a problem with the integrity of the file (malicious or otherwise), and you perhaps should not install the package. (The WARNING shown above, is not a problem with the package: it only means you have not defined any level of 'trust' regarding Micah's PGP key itself.)"
+#: ../../source/install.rst:69
+#, fuzzy
+msgid ""
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-"Si no ves 'Good signature from', entonces podría haber un problema con la "
-"integridad del archivo (malicioso u otra causa), y tal vez no debieras "
-"instalar el paquete. (La ADVERTENCIA mostrada arriba no es un problema con "
-"el paquete: solamente significa que no has definido ningún nivel de "
+"Si no ves 'Good signature from', entonces podría haber un problema con la"
+" integridad del archivo (malicioso u otra causa), y tal vez no debieras "
+"instalar el paquete. (La ADVERTENCIA mostrada arriba no es un problema "
+"con el paquete: solamente significa que no has definido ningún nivel de "
"'confianza' con respecto a la clave PGP de Micah en sí misma.)"
-#: ../../source/install.rst:66
-msgid "If you want to learn more about verifying PGP signatures, guides for `Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and the `Tor Project <https://2019.www.torproject.org/docs/verifying-signatures.html.en>`_ may be helpful."
+#: ../../source/install.rst:71
+#, fuzzy
+msgid ""
+"If you want to learn more about verifying PGP signatures, guides for "
+"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
-"Si quieres aprender más acerca de la verificación de firmas PGP, las guías "
-"para `Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ y "
-"el `Tor Project <https://2019.www.torproject.org/docs/verifying-signatures."
-"html.en>`_ podrían ser útiles."
+"Si quieres aprender más acerca de la verificación de firmas PGP, las "
+"guías para `Qubes OS <https://www.qubes-os.org/security/verifying-"
+"signatures/>`_ y el `Tor Project <https://2019.www.torproject.org/docs"
+"/verifying-signatures.html.en>`_ podrían ser útiles."
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr "Para mayor seguridad, lee :ref:`verifying_sigs`."
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+#~ "Hay varias formas de instalar OnionShare"
+#~ " en Linux, pero recomendamos utilizar "
+#~ "el paquete Flatpak. Flatpak garantiza "
+#~ "que las dependencias serán siempre las"
+#~ " más recientes y ejecutará OnionShare "
+#~ "dentro de un contenedor aislado."
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+#~ "Instala ``flatpak`` y añade el "
+#~ "repositorio Flathub siguiendo `estas "
+#~ "instrucciones <https://flatpak.org/setup/>`_ para tu"
+#~ " distribución Linux."
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+#~ "Puedes asegurate de que el paquete "
+#~ "con el código fuente, el de "
+#~ "Windows o el de macOS que "
+#~ "descargaste es correcto y no ha "
+#~ "sido manipulado verificando su firma "
+#~ "PGP. Para Windows y macOS este "
+#~ "paso es opcional, y provee defensa "
+#~ "en profundidad: los instaladores también "
+#~ "incluyen sus firmas específicas del "
+#~ "sistema operativo, y puedes confiar solo"
+#~ " en ellas si así lo deseas."
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+#~ "Los paquetes para Windows, macOS, y "
+#~ "el código fuente están firmados por "
+#~ "Micah Lee, el desarrollador principal, "
+#~ "usando su clave PGP pública con "
+#~ "huella digital "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. Puedes "
+#~ "descargar la clave de Micah `desde "
+#~ "el servidor de claves keys.openpgp.org "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+
diff --git a/docs/source/locale/es/LC_MESSAGES/security.po b/docs/source/locale/es/LC_MESSAGES/security.po
index 6fad2771..6a4abbed 100644
--- a/docs/source/locale/es/LC_MESSAGES/security.po
+++ b/docs/source/locale/es/LC_MESSAGES/security.po
@@ -1,29 +1,31 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) Micah Lee, et al.
# This file is distributed under the same license as the OnionShare package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-09-14 21:36+0000\n"
"Last-Translator: emma peel <emma.peel@riseup.net>\n"
-"Language-Team: none\n"
"Language: es\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-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.3-dev\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+#, fuzzy
+msgid "Security Design"
msgstr "Diseño de seguridad"
#: ../../source/security.rst:4
-msgid "First read :ref:`how_it_works` to understand the basics of how OnionShare works."
+#, fuzzy
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
"Primero lee :ref:`how_it_works` para entender las bases de cómo funciona "
"OnionShare."
@@ -39,78 +41,269 @@ msgid "What OnionShare protects against"
msgstr "Contra qué te protege OnionShare"
#: ../../source/security.rst:11
-msgid "**Third parties don't have access to anything that happens in OnionShare.** When you use OnionShare, you host services directly on your computer. For example, when you share files with OnionShare, you don't upload these files to any server, and when you start an OnionShare chat room, your computer is the chat room server itself. Traditional ways of sharing files or setting up websites and chat rooms require trusting a service with access to your data."
+msgid ""
+"**Third parties don't have access to anything that happens in "
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
-"**Ningún tercero tiene acceso a lo que pasa en OnionShare.** Cuando usas "
-"OnionShare, alojas servicios directamente en tu computadora. Por ejemplo, "
-"cuando compartes archivos con OnionShare, no los subes a ningún servidor, y "
-"cuando inicias un cuarto de chat OnionShare, tu computadora es el servidor. "
-"Las maneras tradicionales de compartir archivos o configurar sitios web y "
-"cuartos de chat requieren confiar en un servicio con acceso a tus datos."
#: ../../source/security.rst:13
-msgid "**Network eavesdroppers can't spy on anything that happens in OnionShare in transit.** Because connections between Tor onion services and Tor Browser are end-to-end encrypted, no network attackers can eavesdrop on what happens in an OnionShare service. If the eavesdropper is positioned on the OnionShare user's end, the Tor Browser user's end, or is a malicious Tor node, they will only see Tor traffic. If the eavesdropper is a malicious rendezvous node used to connect Tor Browser with OnionShare's onion service, the traffic will be encrypted using the onion service key."
+msgid ""
+"**Network eavesdroppers can't spy on anything that happens in OnionShare "
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
-"**Quienes estén observando la red no pueden espiar nada de lo que pasa en "
-"tránsito en OnionShare.** Debido a que las conexiones entre los servicios "
-"onion de Tor y el Navegador Tor están cifradas de extremo a extremo, ningún "
-"atacante puede espiar qué es lo que pasa en un servicio OnionShare. Si el "
-"espía está posicionado en el extremo del usuario de OnionShare, el extremo "
-"del usuario del Navegador Tor, o es un nodo Tor malicioso, solamente verá "
-"tráfico Tor. Si el espía es un nodo de encuentro malicioso usado para "
-"conectar al Navegador Tor con el servicio onion de OnionShare, el tráfico "
-"estará cifrado usando la clave del servicio onion."
#: ../../source/security.rst:15
-msgid "**Anonymity of OnionShare users are protected by Tor.** OnionShare and Tor Browser protect the anonymity of the users. As long as the OnionShare user anonymously communicates the OnionShare address with the Tor Browser users, the Tor Browser users and eavesdroppers can't learn the identity of the OnionShare user."
+msgid ""
+"**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
+"Tor Browser protect the anonymity of the users. As long as the OnionShare"
+" user anonymously communicates the OnionShare address with the Tor "
+"Browser users, the Tor Browser users and eavesdroppers can't learn the "
+"identity of the OnionShare user."
msgstr ""
"**El anonimato de los usuarios de OnionShare está protegido por Tor.** "
-"OnionShare y el Navegador Tor protegen el anonimato de los usuarios. En la "
-"medida en que el usuario de OnionShare comunique anónimamente la dirección "
-"OnionShare con los usuarios del Navegador Tor, ni éstos ni los espías pueden "
-"saber la identidad del usuario de OnionShare."
+"OnionShare y el Navegador Tor protegen el anonimato de los usuarios. En "
+"la medida en que el usuario de OnionShare comunique anónimamente la "
+"dirección OnionShare con los usuarios del Navegador Tor, ni éstos ni los "
+"espías pueden saber la identidad del usuario de OnionShare."
#: ../../source/security.rst:17
-msgid "**If an attacker learns about the onion service, they still can't access anything.** There have been attacks against the Tor network that can enumerate onion services. Even if someone discovers the .onion address of an OnionShare onion service, they can't access it without also knowing the service's random password (unless, of course, the OnionShare users chooses to disable the password and make it public). The password is generated by choosing two random words from a list of 6800 words, meaning there are 6800^2, or about 46 million possible password. But they can only make 20 wrong guesses before OnionShare stops the server, preventing brute force attacks against the password."
+msgid ""
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
-"**Si un atacante encuentra el servicio onion, aún así no puede acceder a "
-"nada.** Ha habido ataques en contra de la red Tor que pueden enumerar "
-"servicios onion. Aún si alguien descubre la dirección .onion de un servicio "
-"onion de OnionShare, no puede accederla sin conocer también la contraseña "
-"aleatoria del servicio (a menos, por supuesto, que el usuario de OnionShare "
-"elija deshabilitarla y hacerla pública). La contraseña es generada eligiendo "
-"dos palabras aleatorias de una lista de 6800, lo cual significa que hay 6800^"
-"2, o cerca de 46 millones de contraseñas posibles. Pero pueden hacer "
-"solamente 20 intentos fallidos antes de que OnionShare pare el servidor, "
-"evitando ataques de fuerza bruta para conseguir la contraseña."
#: ../../source/security.rst:20
msgid "What OnionShare doesn't protect against"
msgstr "Contra qué no te protege OnionShare"
#: ../../source/security.rst:22
-msgid "**Communicating the OnionShare address might not be secure.** The OnionShare user is responsible for securely communicating the OnionShare address with people. If they send it insecurely (such as through an email message, and their email is being monitored by an attacker), the eavesdropper will learn that they're using OnionShare. If the attacker loads the address in Tor Browser before the legitimate recipient gets to it, they can access the service. If this risk fits the user's threat model, they must find a more secure way to communicate the address, such as in an encrypted email, chat, or voice call. This isn't necessary in cases where OnionShare is being used for something that isn't secret."
+msgid ""
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
-"**Comunicar la dirección de OnionShare podría no ser seguro.** El usuario de "
-"OnionShare es responsable de comunicar en forma segura la dirección de "
-"OnionShare con las personas. Si lo hace de forma insegura (tal como a través "
-"de un mensaje de correo electrónico, mientras que éste está siendo "
-"monitoreado por un atacante), el espía sabrá que está usando OnionShare. Si "
-"el atacante carga la dirección en el Navegador Tor antes que el receptor "
-"legítimo lo haga, puede acceder al servicio. Si este riesgo es posible "
-"dentro del modelo de amenaza del usuario, debes encontrar una manera más "
-"segura de comunicar la dirección, tal como en un correo electrónico, charla "
-"o llamadas cifradas de voz. Esto no es necesario en casos donde OnionShare "
-"está siendo usado para algo que no es secreto."
#: ../../source/security.rst:24
-msgid "**Communicating the OnionShare address might not be anonymous.** While OnionShare and Tor Browser allow for anonymity, if the user wishes to remain anonymous they must take extra steps to ensure this while communicating the OnionShare address. For example, they might need to use Tor to create a new anonymous email or chat account, and only access it over Tor, to use for sharing the address. This isn't necessary in cases where there's no need to protect anonymity, such as co-workers who know each other sharing work documents."
+msgid ""
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
-"**Comunicar la dirección de OnionShare podría no ser anónimo.** Mientras que "
-"OnionShare y el Navegador Tor permiten el anonimato, si el usuario desea "
-"permanecer anónimo, debe tomar pasos extra para asegurarlo cuando comunica "
-"la dirección de OnionShare. Por ejemplo, podría necesitar usar Tor para "
-"crear un nuevo correo electrónico o cuenta de charla anónimos, y accederla "
-"solamente sobre Tor para compartir la dirección. Esto no es necesario en "
-"casos donde no haya necesidad de proteger el anonimato, tales como con "
-"colegas que se conocen entre sí, y comparten documentos de trabajo."
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+#~ "**Ningún tercero tiene acceso a lo "
+#~ "que pasa en OnionShare.** Cuando usas"
+#~ " OnionShare, alojas servicios directamente "
+#~ "en tu computadora. Por ejemplo, cuando"
+#~ " compartes archivos con OnionShare, no "
+#~ "los subes a ningún servidor, y "
+#~ "cuando inicias un cuarto de chat "
+#~ "OnionShare, tu computadora es el "
+#~ "servidor. Las maneras tradicionales de "
+#~ "compartir archivos o configurar sitios "
+#~ "web y cuartos de chat requieren "
+#~ "confiar en un servicio con acceso "
+#~ "a tus datos."
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+#~ "**Quienes estén observando la red no "
+#~ "pueden espiar nada de lo que pasa"
+#~ " en tránsito en OnionShare.** Debido "
+#~ "a que las conexiones entre los "
+#~ "servicios onion de Tor y el "
+#~ "Navegador Tor están cifradas de extremo"
+#~ " a extremo, ningún atacante puede "
+#~ "espiar qué es lo que pasa en "
+#~ "un servicio OnionShare. Si el espía "
+#~ "está posicionado en el extremo del "
+#~ "usuario de OnionShare, el extremo del"
+#~ " usuario del Navegador Tor, o es "
+#~ "un nodo Tor malicioso, solamente verá"
+#~ " tráfico Tor. Si el espía es un"
+#~ " nodo de encuentro malicioso usado "
+#~ "para conectar al Navegador Tor con "
+#~ "el servicio onion de OnionShare, el "
+#~ "tráfico estará cifrado usando la clave"
+#~ " del servicio onion."
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+#~ "**Si un atacante encuentra el servicio"
+#~ " onion, aún así no puede acceder "
+#~ "a nada.** Ha habido ataques en "
+#~ "contra de la red Tor que pueden"
+#~ " enumerar servicios onion. Aún si "
+#~ "alguien descubre la dirección .onion de"
+#~ " un servicio onion de OnionShare, no"
+#~ " puede accederla sin conocer también "
+#~ "la contraseña aleatoria del servicio (a"
+#~ " menos, por supuesto, que el usuario"
+#~ " de OnionShare elija deshabilitarla y "
+#~ "hacerla pública). La contraseña es "
+#~ "generada eligiendo dos palabras aleatorias "
+#~ "de una lista de 6800, lo cual "
+#~ "significa que hay 6800^2, o cerca "
+#~ "de 46 millones de contraseñas posibles."
+#~ " Pero pueden hacer solamente 20 "
+#~ "intentos fallidos antes de que "
+#~ "OnionShare pare el servidor, evitando "
+#~ "ataques de fuerza bruta para conseguir"
+#~ " la contraseña."
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+#~ "**Comunicar la dirección de OnionShare "
+#~ "podría no ser seguro.** El usuario "
+#~ "de OnionShare es responsable de "
+#~ "comunicar en forma segura la dirección"
+#~ " de OnionShare con las personas. Si"
+#~ " lo hace de forma insegura (tal "
+#~ "como a través de un mensaje de "
+#~ "correo electrónico, mientras que éste "
+#~ "está siendo monitoreado por un "
+#~ "atacante), el espía sabrá que está "
+#~ "usando OnionShare. Si el atacante carga"
+#~ " la dirección en el Navegador Tor "
+#~ "antes que el receptor legítimo lo "
+#~ "haga, puede acceder al servicio. Si "
+#~ "este riesgo es posible dentro del "
+#~ "modelo de amenaza del usuario, debes "
+#~ "encontrar una manera más segura de "
+#~ "comunicar la dirección, tal como en "
+#~ "un correo electrónico, charla o llamadas"
+#~ " cifradas de voz. Esto no es "
+#~ "necesario en casos donde OnionShare está"
+#~ " siendo usado para algo que no "
+#~ "es secreto."
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+#~ "**Comunicar la dirección de OnionShare "
+#~ "podría no ser anónimo.** Mientras que"
+#~ " OnionShare y el Navegador Tor "
+#~ "permiten el anonimato, si el usuario "
+#~ "desea permanecer anónimo, debe tomar "
+#~ "pasos extra para asegurarlo cuando "
+#~ "comunica la dirección de OnionShare. Por"
+#~ " ejemplo, podría necesitar usar Tor "
+#~ "para crear un nuevo correo electrónico"
+#~ " o cuenta de charla anónimos, y "
+#~ "accederla solamente sobre Tor para "
+#~ "compartir la dirección. Esto no es "
+#~ "necesario en casos donde no haya "
+#~ "necesidad de proteger el anonimato, "
+#~ "tales como con colegas que se "
+#~ "conocen entre sí, y comparten documentos"
+#~ " de trabajo."
+
diff --git a/docs/source/locale/es/LC_MESSAGES/tor.po b/docs/source/locale/es/LC_MESSAGES/tor.po
index 65c4b704..618c967c 100644
--- a/docs/source/locale/es/LC_MESSAGES/tor.po
+++ b/docs/source/locale/es/LC_MESSAGES/tor.po
@@ -7,17 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-09-20 02:39+0000\n"
"Last-Translator: emma peel <emma.peel@riseup.net>\n"
-"Language-Team: none\n"
"Language: es\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.3-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -25,61 +24,52 @@ msgstr "Conectar a Tor"
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
-"Hay varias opciones para conectar OnionShare a Tor. Puedes cambiarlas en "
-"Ajustes, accesibles haciendo clic en el ícono del engranaje abajo a la "
-"derecha de la ventana."
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+#, fuzzy
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr "Usar la versión de Tor incluida con OnionShare"
#: ../../source/tor.rst:11
+#, fuzzy
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-"Esta es la manera predeterminada en la que OnionShare se conecta a Tor, y "
-"también es la más simple y confiable. Por esta razón se recomienda para la "
-"mayoría de los usuarios."
+"Esta es la manera predeterminada en la que OnionShare se conecta a Tor, y"
+" 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:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"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 ""
-"Cuando abres OnionShare se inicia un proceso Tor en segundo plano que está "
-"configurado específicamente para su uso. Este proceso Tor no interferirá con "
-"otros procesos Tor en tu computadora, por lo que eres libre de correr al "
-"Navegador Tor o usar un Tor de sistema en segundo plano."
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+#, fuzzy
+msgid "Attempt auto-configuration with Tor Browser"
msgstr "Intentar configuración automática con el Navegador Tor"
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-"Puedes configurar OnionShare para conectar al Tor que viene con el Navegador "
-"Tor. Primero, `descarga el Navegador Tor <https://www.torproject.org>`_ aquí "
-"si aún no lo tienes. Con este ajuste seleccionado, necesitas mantener el "
-"Navegador Tor abierto en segundo plano mientras estás usando OnionShare."
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+#, fuzzy
+msgid "Using a system ``tor`` in Windows"
msgstr "Usar un Tor de sistema en Windows"
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
@@ -87,25 +77,28 @@ msgstr ""
"Esto es bastante avanzado. Necesitarás saber cómo editar archivos de "
"texto y hacer cosas como administrador."
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
+#, fuzzy
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-"Descarga el Paquete Experto de Tor para Windows, que puedes obtener `de aquí "
-"<https://www.torproject.org/download/tor/>`_. Extrae el archivo zip, copia "
-"la carpeta extraída a ``C:\\Program Files (x86)\\``, y renómbrala a ``tor-"
-"win32``; dentro de esa carpeta están las subcarpetas ``Data`` y ``Tor``."
+"Descarga el Paquete Experto de Tor para Windows, que puedes obtener `de "
+"aquí <https://www.torproject.org/download/tor/>`_. Extrae el archivo zip,"
+" copia la carpeta extraída a ``C:\\Program Files (x86)\\``, y renómbrala "
+"a ``tor-win32``; dentro de esa carpeta están las subcarpetas ``Data`` y "
+"``Tor``."
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
+#, fuzzy
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
"Inventa una contraseña para el puerto de control. Voy a usar ``comprised "
"stumble rummage work avenging construct volatile`` como la mía. Ahora "
@@ -113,174 +106,168 @@ msgstr ""
"``tor.exe --hash-password`` para generar un hash de tu contraseña. Por "
"ejemplo:"
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
+#, fuzzy
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-"La salida del hash de la contraseña se ve después de algunas advertencias ("
-"que puedes ignorar). En mi caso, fue "
+"La salida del hash de la contraseña se ve después de algunas advertencias"
+" (que puedes ignorar). En mi caso, fue "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
+#, fuzzy
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
"Ahora crea un nuevo archivo de texto en ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` y escríbelo en él, reemplazando el ``HashedControlPassword`` "
-"con el que acabas de generar:"
+"win32\\torrc`` y escríbelo en él, reemplazando el "
+"``HashedControlPassword`` con el que acabas de generar:"
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
+#, fuzzy
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
"En tu ventana de línea de comando como administrador, instala tor como "
-"servicio usando el archivo ``torrc`` apropiado que acabas de crear (mira `"
-"aquí <https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ para más "
-"información sobre cómo hacerlo). De esta manera::"
+"servicio usando el archivo ``torrc`` apropiado que acabas de crear (mira "
+"`aquí <https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ para"
+" más información sobre cómo hacerlo). De esta manera::"
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+#, fuzzy
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr "¡Ahora estás ejecutando un Tor de sistema en Windows!"
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"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 ""
-"Abre OnionShare. Haz clic en el ícono Ajustes. Debajo de \"¿Cómo debiera "
-"conectarse a Tor OnionShare?\" elije \"Conectar usando el puerto de control\""
-", y establece el equipo del puerto de control a ``127.0.0.1``, y el puerto a "
-"``9051``. Bajo \"Opciones de autenticación de Tor\" elije \"Contraseña\" y "
-"escribe la tuya, en mi caso ``comprised stumble rummage work avenging "
-"construct volatile``. Haz clic en el botón \"Probar Ajustes\". Si todo va "
-"bien, debieras ver que se conectó exitosamente a tor."
-
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+
+#: ../../source/tor.rst:61
+#, fuzzy
+msgid "Using a system ``tor`` in macOS"
msgstr "Usar un Tor de sistema en macOS"
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
+#, fuzzy
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
"Primero, instala `Homebrew <http://brew.sh/>`_ si es que todavía no lo "
"tienes. Luego, instala Tor::"
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr "Ahora configura Tor para permitir conexiones desde OnionShare::"
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr "E inicia el servicio Tor de sistema::"
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
+msgstr ""
+
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
msgstr ""
-"Abre OnionShare. Haz clic en el ícono Ajustes. Bajo \"¿Cómo debiera "
-"conectarse a Tor OnionShare?\" elije \"Conectar usando un archivo "
-"socket\", y establécelo a ``/usr/local/var/run/tor/control.socket``. Bajo"
-" \"Opciones de autenticación de Tor\" elije \"Sin autenticación, o "
-"autenticación por cookies\". Haz clic en el botón \"Probar Ajustes\". Si "
-"todo va bien, debieras ver que se conectó exitosamente a tor."
-
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+
+#: ../../source/tor.rst:87
+#, fuzzy
+msgid "Using a system ``tor`` in Linux"
msgstr "Usando un Tor de sistema en Linux"
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
+#, fuzzy
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"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 ""
"Primero, instala el paquete tor. Si estás usando Debian, Ubuntu o una "
"distribución de Linux similar, te recomiendo que uses el `repositorio "
"oficial <https://2019.www.torproject.org/docs/debian.html.en>`_ del Tor "
"Project. Por ejemplo, en Ubuntu 20.04::"
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
+#, fuzzy
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."
+"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 ""
"Luego, agrega tu usuario al grupo que corre el proceso Tor (en el 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:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-"Agrega tu usuario al grupo ``debian-tor`` ejecutando este comando (reemplaza "
-"``username`` con tu nombre de usuario real)::"
+"Agrega tu usuario al grupo ``debian-tor`` ejecutando este comando "
+"(reemplaza ``username`` con tu nombre de usuario real)::"
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-"Reinicia tu computadora. Luego de que vuelva a arrancar, abre OnionShare."
-" Haz clic en el ícono Ajustes. Bajo \"¿Cómo debiera conectarse a Tor "
-"OnionShare?\" elije \"Conectar usando un archivo socket\", y establécelo "
-"a ``/var/run/tor/control``. Bajo \"Opciones de autenticación de Tor\" "
-"elije \"Sin autenticación, o autenticación por cookies\". Haz clic en el "
-"botón \"Probar Ajustes\". Si todo va bien, debieras ver que se conectó "
-"exitosamente a Tor."
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr "Usar puentes Tor"
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
+#, fuzzy
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
"Si ru acceso a Internet está censurado, puedes configurar OnionShare para"
" conectarse a la red Tor usando `puentes Tor "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. Si OnionShare "
"se conecta exitosamente a Tor, no necesitas usar un puente."
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+#, fuzzy
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr "Para configurar puentes, abre los ajustes de OnionShare."
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
+#, fuzzy
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
"Puedes usar los transportes conectables obfs4 o meek_lite (Azure) "
"incorporados, o puentes personalizados, los cuales puedes obtener de la "
@@ -289,3 +276,142 @@ msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr "Usando un Tor de sistema en macOS"
+
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+#~ "Hay varias opciones para conectar "
+#~ "OnionShare a Tor. Puedes cambiarlas en"
+#~ " Ajustes, accesibles haciendo clic en "
+#~ "el ícono del engranaje abajo a la"
+#~ " derecha de la ventana."
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+#~ "Cuando abres OnionShare se inicia un "
+#~ "proceso Tor en segundo plano que "
+#~ "está configurado específicamente para su "
+#~ "uso. Este proceso Tor no interferirá "
+#~ "con otros procesos Tor en tu "
+#~ "computadora, por lo que eres libre "
+#~ "de correr al Navegador Tor o usar"
+#~ " un Tor de sistema en segundo "
+#~ "plano."
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+#~ "Puedes configurar OnionShare para conectar "
+#~ "al Tor que viene con el Navegador"
+#~ " Tor. Primero, `descarga el Navegador "
+#~ "Tor <https://www.torproject.org>`_ aquí si aún"
+#~ " no lo tienes. Con este ajuste "
+#~ "seleccionado, necesitas mantener el Navegador"
+#~ " Tor abierto en segundo plano "
+#~ "mientras estás usando OnionShare."
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+#~ "Abre OnionShare. Haz clic en el "
+#~ "ícono Ajustes. Debajo de \"¿Cómo debiera"
+#~ " conectarse a Tor OnionShare?\" elije "
+#~ "\"Conectar usando el puerto de "
+#~ "control\", y establece el equipo del "
+#~ "puerto de control a ``127.0.0.1``, y "
+#~ "el puerto a ``9051``. Bajo \"Opciones"
+#~ " de autenticación de Tor\" elije "
+#~ "\"Contraseña\" y escribe la tuya, en "
+#~ "mi caso ``comprised stumble rummage work"
+#~ " avenging construct volatile``. Haz clic"
+#~ " en el botón \"Probar Ajustes\". Si"
+#~ " todo va bien, debieras ver que "
+#~ "se conectó exitosamente a tor."
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+#~ "Abre OnionShare. Haz clic en el "
+#~ "ícono Ajustes. Bajo \"¿Cómo debiera "
+#~ "conectarse a Tor OnionShare?\" elije "
+#~ "\"Conectar usando un archivo socket\", y"
+#~ " establécelo a "
+#~ "``/usr/local/var/run/tor/control.socket``. Bajo \"Opciones"
+#~ " de autenticación de Tor\" elije "
+#~ "\"Sin autenticación, o autenticación por "
+#~ "cookies\". Haz clic en el botón "
+#~ "\"Probar Ajustes\". Si todo va bien, "
+#~ "debieras ver que se conectó exitosamente"
+#~ " a tor."
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+#~ "Reinicia tu computadora. Luego de que"
+#~ " vuelva a arrancar, abre OnionShare. "
+#~ "Haz clic en el ícono Ajustes. Bajo"
+#~ " \"¿Cómo debiera conectarse a Tor "
+#~ "OnionShare?\" elije \"Conectar usando un "
+#~ "archivo socket\", y establécelo a "
+#~ "``/var/run/tor/control``. Bajo \"Opciones de "
+#~ "autenticación de Tor\" elije \"Sin "
+#~ "autenticación, o autenticación por cookies\"."
+#~ " Haz clic en el botón \"Probar "
+#~ "Ajustes\". Si todo va bien, debieras "
+#~ "ver que se conectó exitosamente a "
+#~ "Tor."
+
diff --git a/docs/source/locale/fa/LC_MESSAGES/advanced.po b/docs/source/locale/fa/LC_MESSAGES/advanced.po
index c3847657..8b9457ea 100644
--- a/docs/source/locale/fa/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/fa/LC_MESSAGES/advanced.po
@@ -8,104 +8,103 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -113,115 +112,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/fa/LC_MESSAGES/develop.po b/docs/source/locale/fa/LC_MESSAGES/develop.po
index f20ff51c..79008008 100644
--- a/docs/source/locale/fa/LC_MESSAGES/develop.po
+++ b/docs/source/locale/fa/LC_MESSAGES/develop.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -27,230 +27,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/fa/LC_MESSAGES/features.po b/docs/source/locale/fa/LC_MESSAGES/features.po
index 29841dd8..e71451fb 100644
--- a/docs/source/locale/fa/LC_MESSAGES/features.po
+++ b/docs/source/locale/fa/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/fa/LC_MESSAGES/help.po b/docs/source/locale/fa/LC_MESSAGES/help.po
index d965eb13..d1eb81e9 100644
--- a/docs/source/locale/fa/LC_MESSAGES/help.po
+++ b/docs/source/locale/fa/LC_MESSAGES/help.po
@@ -8,65 +8,113 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
-msgstr ""
-
-#: ../../source/help.rst:9
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/fa/LC_MESSAGES/install.po b/docs/source/locale/fa/LC_MESSAGES/install.po
index a2f5b321..640c688c 100644
--- a/docs/source/locale/fa/LC_MESSAGES/install.po
+++ b/docs/source/locale/fa/LC_MESSAGES/install.po
@@ -8,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -31,113 +31,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/fa/LC_MESSAGES/security.po b/docs/source/locale/fa/LC_MESSAGES/security.po
index 13d11a17..79923cda 100644
--- a/docs/source/locale/fa/LC_MESSAGES/security.po
+++ b/docs/source/locale/fa/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/fa/LC_MESSAGES/tor.po b/docs/source/locale/fa/LC_MESSAGES/tor.po
index a4d227cd..f8716f64 100644
--- a/docs/source/locale/fa/LC_MESSAGES/tor.po
+++ b/docs/source/locale/fa/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/fr/LC_MESSAGES/advanced.po b/docs/source/locale/fr/LC_MESSAGES/advanced.po
index 3dd70b07..6d816a13 100644
--- a/docs/source/locale/fr/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/fr/LC_MESSAGES/advanced.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language: fr\n"
@@ -16,97 +16,96 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -114,115 +113,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/fr/LC_MESSAGES/develop.po b/docs/source/locale/fr/LC_MESSAGES/develop.po
index 9ce95cc9..a8b23ac9 100644
--- a/docs/source/locale/fr/LC_MESSAGES/develop.po
+++ b/docs/source/locale/fr/LC_MESSAGES/develop.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language: fr\n"
@@ -16,7 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -28,230 +28,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/fr/LC_MESSAGES/features.po b/docs/source/locale/fr/LC_MESSAGES/features.po
index ae1dae49..9e95c325 100644
--- a/docs/source/locale/fr/LC_MESSAGES/features.po
+++ b/docs/source/locale/fr/LC_MESSAGES/features.po
@@ -1,47 +1,69 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) Micah Lee, et al.
# This file is distributed under the same license as the OnionShare package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\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-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
-msgid "OnionShare works by starting web servers locally on your own computer and making them accessible to other people as `Tor <https://www.torproject.org/>`_ `onion services <https://community.torproject.org/onion-services/>`_."
+msgid ""
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
+"<https://community.torproject.org/onion-services/>`_."
msgstr ""
#: ../../source/features.rst:8
-msgid "By default, OnionShare web addresses are protected with a random password. A typical OnionShare address might look something like this::"
+msgid ""
+"By default, OnionShare web addresses are protected with a random "
+"password. A typical OnionShare address might look something like this::"
msgstr ""
#: ../../source/features.rst:12
-msgid "You're responsible for securely sharing that URL using a communication channel of your choice like in an encrypted chat message, or using something less secure like a Twitter or Facebook message, depending on your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+msgid ""
+"You're responsible for securely sharing that URL using a communication "
+"channel of your choice like in an encrypted chat message, or using "
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
-msgid "The people who you send the URL to must then copy and paste it into `Tor Browser <https://www.torproject.org/>`_ to access the OnionShare service."
+msgid ""
+"The people you send the URL to then copy and paste it into their `Tor "
+"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
-msgid "With OnionShare, *your own computer is the web server*. If you run OnionShare on your laptop to send someone files, and then suspend your laptop before the files have been downloaded, the service will not be available until your laptop is unsuspended and connected to the internet again. OnionShare works best when working with people in real-time."
+msgid ""
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
-msgid "Because your own computer is the web server, *no third party can access anything that happens in OnionShare*, not even the developers of OnionShare. It's completely private. And because OnionShare is based on Tor onion services too, it also protects your anonymity. See the :doc:`security design </security>` for more information."
+msgid ""
+"Because your own computer is the web server, *no third party can access "
+"anything that happens in OnionShare*, not even the developers of "
+"OnionShare. It's completely private. And because OnionShare is based on "
+"Tor onion services too, it also protects your anonymity. See the "
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -49,178 +71,698 @@ msgid "Share Files"
msgstr ""
#: ../../source/features.rst:23
-msgid "You can use OnionShare to securely and anonymously send files and folders to people. Just open a share tab, drag in the files and folders you wish to share, and click \"Start sharing\"."
+msgid ""
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27
-#: ../../source/features.rst:91
-msgid "After you add files, you'll see some settings. Make sure you choose the setting you're interested in first before you start sharing."
+#: ../../source/features.rst:27 ../../source/features.rst:93
+msgid ""
+"After you add files, you'll see some settings. Make sure you choose the "
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
-msgid "By default, as soon as someone finishes downloading your files, OnionShare will automatically stop the server, completely removing the website from the internet. If you want to allow multiple people to download these files, uncheck the \"Stop sharing after files have been sent (uncheck to allow downloading individual files)\" box."
+msgid ""
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
-msgid "Also, if you uncheck this box, people will be able to download individual files that you share rather than a single compressed version of all of the files."
+#: ../../source/features.rst:34
+msgid ""
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
-msgid "When you're ready to share, click the \"Start sharing\" button. You can always click \"Stop sharing\", or quit OnionShare, to immediate take the website down. You can also click the up arrow icon in the top-right corner to show the history and progress of people downloading files from you."
+#: ../../source/features.rst:36
+msgid ""
+"When you're ready to share, click the \"Start sharing\" button. You can "
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
-msgid "Now that you have a website that's sharing files, copy the address and send it to the person you want to receive the files. If the files need to stay secure, you should use an encrypted messaging app."
+#: ../../source/features.rst:40
+msgid ""
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
-msgid "That person then must load the address in Tor Browser. After logging in with the random password that's included in the web address, they will be able to download the files directly from your computer by clicking the \"Download Files\" link in the corner."
+#: ../../source/features.rst:42
+msgid ""
+"That person then must load the address in Tor Browser. After logging in "
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
-msgid "You can use OnionShare to let people anonymously upload files directly to your computer, essentially turning it into an anonymous dropbox. Open a receive tab, choose where you want files to get downloaded and other settings, and then click \"Start Receive Mode\"."
-msgstr ""
-
-#: ../../source/features.rst:52
-msgid "This will start the OnionShare service. Anyone that loads this address in Tor Browser will be able to upload files to your computer."
+#: ../../source/features.rst:49
+msgid ""
+"You can use OnionShare to let people anonymously upload files directly to"
+" your computer, essentially turning it into an anonymous dropbox. Open a "
+"\"Receive tab\", choose where you want to save the files and other "
+"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:56
-msgid "You can also click the down arrow icon in the top-right corner to show the history and progress of people sending files to you."
+#: ../../source/features.rst:54
+msgid ""
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
#: ../../source/features.rst:58
-msgid "Here is what it looks like for someone sending you files."
+msgid ""
+"You can also click the down \"↓\" icon in the top-right corner to show "
+"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:62
-msgid "When someone uploads files to your receive service, by default they get saved to a folder called ``OnionShare`` in your home folder on your computer, and they get automatically organized into separate subfolders based on the time that the files get uploaded."
+#: ../../source/features.rst:60
+msgid "Here is what it looks like for someone sending you files."
msgstr ""
#: ../../source/features.rst:64
-msgid "Setting up an OnionShare receiving service is useful for journalists and others that need to securely accept documents from anonymous sources. When used in this way, OnionShare is sort of like a lightweight, simpler, not quite as secure version of `SecureDrop <https://securedrop.org/>`_, the whistleblower submission system."
+msgid ""
+"When someone uploads files to your receive service, by default they get "
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:67
-msgid "Use at your own risk"
+#: ../../source/features.rst:66
+msgid ""
+"Setting up an OnionShare receiving service is useful for journalists and "
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
#: ../../source/features.rst:69
-msgid "Just like with malicious email attachments, it's possible that someone could try to hack your computer by uploading a malicious file to your OnionShare service. OnionShare does not add any safety mechanisms to protect your system from malicious files, so use at your own risk."
+msgid "Use at your own risk"
msgstr ""
#: ../../source/features.rst:71
-msgid "If you receive an Office document or a PDF through OnionShare, you can convert these documents into PDFs that you know are safe to open using `Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself when opening untrusted documents by opening them in `Tails <https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ disposable VM."
+msgid ""
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
+"OnionShare service. OnionShare does not add any safety mechanisms to "
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:74
-msgid "Tips for running a receive service"
+#: ../../source/features.rst:73
+msgid ""
+"If you receive an Office document or a PDF through OnionShare, you can "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
+"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
+"disposableVM."
msgstr ""
#: ../../source/features.rst:76
-msgid "If you want to host your own anonymous dropbox using OnionShare, it's recommended that you do it on a separate, dedicated computer that's always powered on and connected to the internet, and not on the one you use on a regular basis."
+msgid "Tips for running a receive service"
msgstr ""
#: ../../source/features.rst:78
-msgid "If you intend on advertising the OnionShare address on your website or social media profiles, then you should save the tab (see :ref:`save_tabs`) and run it as a public service (see :ref:`disable_passwords`)."
+msgid ""
+"If you want to host your own anonymous dropbox using OnionShare, it's "
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:81
-msgid "Host a Website"
+#: ../../source/features.rst:80
+msgid ""
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
#: ../../source/features.rst:83
-msgid "You can use OnionShare to host a static HTML website with just a click. Just open a website tab, drag in the files and folders that make up the static website, and click when you're ready click \"Start sharing\"."
+msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:87
-msgid "If you add an ``index.html`` file, when someone loads your website it will render this page. You should also include any other HTML files, CSS files, JavaScript files, and images that make up the website. (Note that OnionShare only supports hosting *static* websites. It can't host websites that execute code or use databases. So you can't, for example, use WordPress.)"
+#: ../../source/features.rst:85
+msgid ""
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
#: ../../source/features.rst:89
-msgid "If you don't have an ``index.html`` file, then it will show a directory listing instead, and people who load it can look through the files and download them."
+msgid ""
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
+"OnionShare only supports hosting *static* websites. It can't host "
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:96
-msgid "Content Security Policy"
+#: ../../source/features.rst:91
+msgid ""
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
+"download them."
msgstr ""
#: ../../source/features.rst:98
-msgid "By default OnionShare will help secure your website by setting a strict `Content Security Police <https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However this will prevent third-party content from loading inside the web page."
+msgid "Content Security Policy"
msgstr ""
#: ../../source/features.rst:100
-msgid "If you want to load content from third-party websites, like assets or JavaScript libraries from CDNs, then you must check the \"Disable Content Security Policy header (allows your website to use third-party resources)\" box before starting the service."
+msgid ""
+"By default OnionShare helps secure your website by setting a strict "
+"`Content Security Police "
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:103
-msgid "Tips for running a website service"
+#: ../../source/features.rst:102
+msgid ""
+"If you want to load content from third-party websites, like assets or "
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
#: ../../source/features.rst:105
-msgid "If you want to host a long-term website using OnionShare (that isn't just to quickly show someone something), it's recommended that you do it on a separate, dedicated computer that's always powered on and connected to the internet, and not on the one you use on a regular basis. You should also save the tab (see :ref:`save_tabs`) so that you can resume the website with the same address if you close OnionShare and re-open it later."
+msgid "Tips for running a website service"
msgstr ""
#: ../../source/features.rst:107
-msgid "If your website is intended to be viewed by the public, you should run it as a public service (see :ref:`disable_passwords`)."
+msgid ""
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
#: ../../source/features.rst:110
+msgid ""
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
+msgstr ""
+
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
-msgid "You can use OnionShare to set up a completely anonymous, secure chat room that doesn't log anything or leave any traces. Just open a chat tab and click \"Start chat server\"."
+#: ../../source/features.rst:115
+msgid ""
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
-msgid "After you start the server, copy the OnionShare address and send it to the people who will join this anonymous chat room. If it's important to limit exactly who can join, you should use an encrypted messaging app to send the OnionShare address."
+#: ../../source/features.rst:119
+msgid ""
+"After you start the server, copy the OnionShare address and send it to "
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
-msgid "People can join the chat room by loading its OnionShare address in Tor Browser. The chat room requires JavasScript, so everyone who wants to participate must set their security level to Standard or Safer instead of Safest."
+#: ../../source/features.rst:124
+msgid ""
+"People can join the chat room by loading its OnionShare address in Tor "
+"Browser. The chat room requires JavasScript, so everyone who wants to "
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
-msgid "When someone joins the chat room they get assigned a random name. They can change their name by typing a new name in the box in the left panel and pressing enter. No chat history will get displayed at all, even if others were already chatting in the room, because the chat history isn't saved anywhere."
+#: ../../source/features.rst:127
+msgid ""
+"When someone joins the chat room they get assigned a random name. They "
+"can change their name by typing a new name in the box in the left panel "
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
-msgid "In an OnionShare chat room, everyone is anonymous. Anyone can change their name to anything, and there is no way to confirm anyone's identity."
+#: ../../source/features.rst:133
+msgid ""
+"In an OnionShare chat room, everyone is anonymous. Anyone can change "
+"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
-msgid "However, if you create an OnionShare chat room and securely send the address only to a small group of trusted friends using encrypted messages, then you can be reasonably confident that the people who join the chat room are your friends."
+#: ../../source/features.rst:136
+msgid ""
+"However, if you create an OnionShare chat room and securely send the "
+"address only to a small group of trusted friends using encrypted "
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
-msgid "If you need to already be using an encrypted messaging app, what's the point of an OnionShare chat room to begin with? It leaves less traces."
+#: ../../source/features.rst:141
+msgid ""
+"If you need to already be using an encrypted messaging app, what's the "
+"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
-msgid "If you send a message to a Signal group, for example, a copy of your message ends up on each device (the phones and computers, if they set up Signal Desktop) of each member of the group. Even if disappearing messages is enabled, it's hard to confirm that all copies of the messages were actually deleted from all devices, and from any other places (like notifications databases) they may have been saved to. OnionShare chat rooms don't store any messages anywhere, so this isn't a problem."
+#: ../../source/features.rst:143
+msgid ""
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
+"notifications databases) they may have been saved to. OnionShare chat "
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
-msgid "OnionShare chat rooms can also be useful for anonymous people wanting to chat securely with someone without needing to create any accounts. For example, a source can send an OnionShare address to a journalist using a disposable email address, and then wait for the journalist to join the chat room, all without compromosing their anonymity."
+#: ../../source/features.rst:146
+msgid ""
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
-msgid "Because OnionShare relies on Tor onion services, connections between Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When someone posts a message to an OnionShare chat room, they send it to the server through the E2EE onion connection, which then sends it to all other members of the chat room using WebSockets, through their E2EE onion connections."
+#: ../../source/features.rst:152
+msgid ""
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
-msgid "OnionShare doesn't implement any chat encryption on its own. It relies on the Tor onion service's encryption instead."
-msgstr ""
+#: ../../source/features.rst:154
+msgid ""
+"OnionShare doesn't implement any chat encryption on its own. It relies on"
+" the Tor onion service's encryption instead."
+msgstr ""
+
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/fr/LC_MESSAGES/help.po b/docs/source/locale/fr/LC_MESSAGES/help.po
index 35a6d1d3..f56f624e 100644
--- a/docs/source/locale/fr/LC_MESSAGES/help.po
+++ b/docs/source/locale/fr/LC_MESSAGES/help.po
@@ -1,57 +1,121 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) Micah Lee, et al.
# This file is distributed under the same license as the OnionShare package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\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-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
+msgid ""
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:9
-msgid "This website is full of instructions on how to use OnionShare. Look through all of the sections first to see if it answers your questions."
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+msgid ""
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:14
-msgid "If you can't find a solution in this website, please check the `GitHub issues <https://github.com/micahflee/onionshare/issues>`_. It's possible that someone else has encountered the same problem and has either raised it with the developers, or maybe even posted a solution."
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+msgid ""
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
+"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
+"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:19
-msgid "If you can't find a solution to your problem, or you wish to ask a question or suggest a new feature, please `submit an issue <https://github.com/micahflee/onionshare/issues/new>`_. This requires `creating an GitHub account <https://help.github.com/articles/signing-up-for-a-new-github-account/>`_."
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+msgid ""
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
-#: ../../source/help.rst:24
-msgid "See :ref:`collaborating` for instructions on how to join our Keybase team that we use to discuss the project."
-msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/fr/LC_MESSAGES/install.po b/docs/source/locale/fr/LC_MESSAGES/install.po
index 0d7d00a6..9d749a71 100644
--- a/docs/source/locale/fr/LC_MESSAGES/install.po
+++ b/docs/source/locale/fr/LC_MESSAGES/install.po
@@ -1,101 +1,266 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) Micah Lee, et al.
# This file is distributed under the same license as the OnionShare package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\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-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
-msgid "You can download OnionShare for Windows and macOS from the `OnionShare website <https://onionshare.org/>`_."
+msgid ""
+"You can download OnionShare for Windows and macOS from the `OnionShare "
+"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
-msgid "There are various ways to install OnionShare for Linux, but the recommended way is to use the Flatpak package. Flatpak ensures that you'll always use the most latest dependencies and run OnionShare inside of a sandbox."
+#: ../../source/install.rst:17
+msgid ""
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
-msgid "Make sure you have ``flatpak`` installed and the Flathub repository added by following `these instructions <https://flatpak.org/setup/>`_ for your Linux distribution."
+#: ../../source/install.rst:19
+msgid ""
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
-msgid "Then install OnionShare from Flathub by following `the instructions here <https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
msgstr ""
-#: ../../source/install.rst:25
-msgid "Verifying PGP signatures"
+#: ../../source/install.rst:23
+msgid ""
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:27
-msgid "You can verify that the Windows, macOS, or source package you download is legitimate and hasn't been tampered with by verifying its PGP signature. For Windows and macOS, this step is optional and provides defense in depth: the installers also include their operating system-specific signatures, and you can just rely on those alone if you'd like."
+#: ../../source/install.rst:28
+msgid "Verifying PGP signatures"
msgstr ""
#: ../../source/install.rst:30
+msgid ""
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
+msgstr ""
+
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
-msgid "Windows, macOS, and source packaged are signed by Micah Lee, the core developer, using his PGP public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#: ../../source/install.rst:36
+msgid ""
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
-msgid "In order to verify signatures, you must have GnuPG installed. For macOS you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+#: ../../source/install.rst:38
+msgid ""
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
-msgid "You can find the signatures (``.asc`` files), as well as Windows, macOS, and source packages, at https://onionshare.org/dist/ in the folders named for each version of OnionShare. You can also find them on the `GitHub Releases page <https://github.com/micahflee/onionshare/releases>`_."
+#: ../../source/install.rst:43
+msgid ""
+"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
-msgid "Once you have imported Micah's public key into your GnuPG keychain, downloaded the binary, and downloaded the ``.asc`` signature, you can verify the binary for macOS in terminal like this::"
+#: ../../source/install.rst:49
+msgid ""
+"Once you have imported Micah's public key into your GnuPG keychain, "
+"downloaded the binary, and downloaded the ``.asc`` signature, you can "
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
-msgid "If you don't see 'Good signature from', then there might be a problem with the integrity of the file (malicious or otherwise), and you perhaps should not install the package. (The WARNING shown above, is not a problem with the package: it only means you have not defined any level of 'trust' regarding Micah's PGP key itself.)"
+#: ../../source/install.rst:69
+msgid ""
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
-msgid "If you want to learn more about verifying PGP signatures, guides for `Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and the `Tor Project <https://2019.www.torproject.org/docs/verifying-signatures.html.en>`_ may be helpful."
+#: ../../source/install.rst:71
+msgid ""
+"If you want to learn more about verifying PGP signatures, guides for "
+"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/fr/LC_MESSAGES/security.po b/docs/source/locale/fr/LC_MESSAGES/security.po
index 3fc4ecd6..a2f639e0 100644
--- a/docs/source/locale/fr/LC_MESSAGES/security.po
+++ b/docs/source/locale/fr/LC_MESSAGES/security.po
@@ -1,27 +1,29 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) Micah Lee, et al.
# This file is distributed under the same license as the OnionShare package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\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-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid "First read :ref:`how_it_works` to understand the basics of how OnionShare works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -33,19 +35,47 @@ msgid "What OnionShare protects against"
msgstr ""
#: ../../source/security.rst:11
-msgid "**Third parties don't have access to anything that happens in OnionShare.** When you use OnionShare, you host services directly on your computer. For example, when you share files with OnionShare, you don't upload these files to any server, and when you start an OnionShare chat room, your computer is the chat room server itself. Traditional ways of sharing files or setting up websites and chat rooms require trusting a service with access to your data."
+msgid ""
+"**Third parties don't have access to anything that happens in "
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
-msgid "**Network eavesdroppers can't spy on anything that happens in OnionShare in transit.** Because connections between Tor onion services and Tor Browser are end-to-end encrypted, no network attackers can eavesdrop on what happens in an OnionShare service. If the eavesdropper is positioned on the OnionShare user's end, the Tor Browser user's end, or is a malicious Tor node, they will only see Tor traffic. If the eavesdropper is a malicious rendezvous node used to connect Tor Browser with OnionShare's onion service, the traffic will be encrypted using the onion service key."
+msgid ""
+"**Network eavesdroppers can't spy on anything that happens in OnionShare "
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
-msgid "**Anonymity of OnionShare users are protected by Tor.** OnionShare and Tor Browser protect the anonymity of the users. As long as the OnionShare user anonymously communicates the OnionShare address with the Tor Browser users, the Tor Browser users and eavesdroppers can't learn the identity of the OnionShare user."
+msgid ""
+"**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
+"Tor Browser protect the anonymity of the users. As long as the OnionShare"
+" user anonymously communicates the OnionShare address with the Tor "
+"Browser users, the Tor Browser users and eavesdroppers can't learn the "
+"identity of the OnionShare user."
msgstr ""
#: ../../source/security.rst:17
-msgid "**If an attacker learns about the onion service, they still can't access anything.** There have been attacks against the Tor network that can enumerate onion services. Even if someone discovers the .onion address of an OnionShare onion service, they can't access it without also knowing the service's random password (unless, of course, the OnionShare users chooses to disable the password and make it public). The password is generated by choosing two random words from a list of 6800 words, meaning there are 6800^2, or about 46 million possible password. But they can only make 20 wrong guesses before OnionShare stops the server, preventing brute force attacks against the password."
+msgid ""
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -53,9 +83,131 @@ msgid "What OnionShare doesn't protect against"
msgstr ""
#: ../../source/security.rst:22
-msgid "**Communicating the OnionShare address might not be secure.** The OnionShare user is responsible for securely communicating the OnionShare address with people. If they send it insecurely (such as through an email message, and their email is being monitored by an attacker), the eavesdropper will learn that they're using OnionShare. If the attacker loads the address in Tor Browser before the legitimate recipient gets to it, they can access the service. If this risk fits the user's threat model, they must find a more secure way to communicate the address, such as in an encrypted email, chat, or voice call. This isn't necessary in cases where OnionShare is being used for something that isn't secret."
+msgid ""
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
-msgid "**Communicating the OnionShare address might not be anonymous.** While OnionShare and Tor Browser allow for anonymity, if the user wishes to remain anonymous they must take extra steps to ensure this while communicating the OnionShare address. For example, they might need to use Tor to create a new anonymous email or chat account, and only access it over Tor, to use for sharing the address. This isn't necessary in cases where there's no need to protect anonymity, such as co-workers who know each other sharing work documents."
+msgid ""
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/fr/LC_MESSAGES/tor.po b/docs/source/locale/fr/LC_MESSAGES/tor.po
index f16b041c..6060c67f 100644
--- a/docs/source/locale/fr/LC_MESSAGES/tor.po
+++ b/docs/source/locale/fr/LC_MESSAGES/tor.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language: fr\n"
@@ -16,7 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -24,194 +24,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ga/LC_MESSAGES/advanced.po b/docs/source/locale/ga/LC_MESSAGES/advanced.po
index c3847657..8b9457ea 100644
--- a/docs/source/locale/ga/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/ga/LC_MESSAGES/advanced.po
@@ -8,104 +8,103 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -113,115 +112,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ga/LC_MESSAGES/develop.po b/docs/source/locale/ga/LC_MESSAGES/develop.po
index f20ff51c..79008008 100644
--- a/docs/source/locale/ga/LC_MESSAGES/develop.po
+++ b/docs/source/locale/ga/LC_MESSAGES/develop.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -27,230 +27,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ga/LC_MESSAGES/features.po b/docs/source/locale/ga/LC_MESSAGES/features.po
index 29841dd8..e71451fb 100644
--- a/docs/source/locale/ga/LC_MESSAGES/features.po
+++ b/docs/source/locale/ga/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ga/LC_MESSAGES/help.po b/docs/source/locale/ga/LC_MESSAGES/help.po
index d965eb13..d1eb81e9 100644
--- a/docs/source/locale/ga/LC_MESSAGES/help.po
+++ b/docs/source/locale/ga/LC_MESSAGES/help.po
@@ -8,65 +8,113 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
-msgstr ""
-
-#: ../../source/help.rst:9
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ga/LC_MESSAGES/install.po b/docs/source/locale/ga/LC_MESSAGES/install.po
index a2f5b321..640c688c 100644
--- a/docs/source/locale/ga/LC_MESSAGES/install.po
+++ b/docs/source/locale/ga/LC_MESSAGES/install.po
@@ -8,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -31,113 +31,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ga/LC_MESSAGES/security.po b/docs/source/locale/ga/LC_MESSAGES/security.po
index 13d11a17..79923cda 100644
--- a/docs/source/locale/ga/LC_MESSAGES/security.po
+++ b/docs/source/locale/ga/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ga/LC_MESSAGES/tor.po b/docs/source/locale/ga/LC_MESSAGES/tor.po
index a4d227cd..f8716f64 100644
--- a/docs/source/locale/ga/LC_MESSAGES/tor.po
+++ b/docs/source/locale/ga/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/is/LC_MESSAGES/advanced.po b/docs/source/locale/is/LC_MESSAGES/advanced.po
index c3847657..8b9457ea 100644
--- a/docs/source/locale/is/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/is/LC_MESSAGES/advanced.po
@@ -8,104 +8,103 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -113,115 +112,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/is/LC_MESSAGES/develop.po b/docs/source/locale/is/LC_MESSAGES/develop.po
index f20ff51c..79008008 100644
--- a/docs/source/locale/is/LC_MESSAGES/develop.po
+++ b/docs/source/locale/is/LC_MESSAGES/develop.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -27,230 +27,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/is/LC_MESSAGES/features.po b/docs/source/locale/is/LC_MESSAGES/features.po
index 29841dd8..e71451fb 100644
--- a/docs/source/locale/is/LC_MESSAGES/features.po
+++ b/docs/source/locale/is/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/is/LC_MESSAGES/help.po b/docs/source/locale/is/LC_MESSAGES/help.po
index d965eb13..d1eb81e9 100644
--- a/docs/source/locale/is/LC_MESSAGES/help.po
+++ b/docs/source/locale/is/LC_MESSAGES/help.po
@@ -8,65 +8,113 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
-msgstr ""
-
-#: ../../source/help.rst:9
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/is/LC_MESSAGES/install.po b/docs/source/locale/is/LC_MESSAGES/install.po
index a2f5b321..640c688c 100644
--- a/docs/source/locale/is/LC_MESSAGES/install.po
+++ b/docs/source/locale/is/LC_MESSAGES/install.po
@@ -8,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -31,113 +31,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/is/LC_MESSAGES/security.po b/docs/source/locale/is/LC_MESSAGES/security.po
index 13d11a17..79923cda 100644
--- a/docs/source/locale/is/LC_MESSAGES/security.po
+++ b/docs/source/locale/is/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/is/LC_MESSAGES/tor.po b/docs/source/locale/is/LC_MESSAGES/tor.po
index a4d227cd..f8716f64 100644
--- a/docs/source/locale/is/LC_MESSAGES/tor.po
+++ b/docs/source/locale/is/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/it/LC_MESSAGES/advanced.po b/docs/source/locale/it/LC_MESSAGES/advanced.po
index c3847657..8b9457ea 100644
--- a/docs/source/locale/it/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/it/LC_MESSAGES/advanced.po
@@ -8,104 +8,103 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -113,115 +112,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/it/LC_MESSAGES/develop.po b/docs/source/locale/it/LC_MESSAGES/develop.po
index f20ff51c..79008008 100644
--- a/docs/source/locale/it/LC_MESSAGES/develop.po
+++ b/docs/source/locale/it/LC_MESSAGES/develop.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -27,230 +27,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/it/LC_MESSAGES/features.po b/docs/source/locale/it/LC_MESSAGES/features.po
index 29841dd8..e71451fb 100644
--- a/docs/source/locale/it/LC_MESSAGES/features.po
+++ b/docs/source/locale/it/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/it/LC_MESSAGES/help.po b/docs/source/locale/it/LC_MESSAGES/help.po
index d965eb13..d1eb81e9 100644
--- a/docs/source/locale/it/LC_MESSAGES/help.po
+++ b/docs/source/locale/it/LC_MESSAGES/help.po
@@ -8,65 +8,113 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
-msgstr ""
-
-#: ../../source/help.rst:9
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/it/LC_MESSAGES/install.po b/docs/source/locale/it/LC_MESSAGES/install.po
index a2f5b321..640c688c 100644
--- a/docs/source/locale/it/LC_MESSAGES/install.po
+++ b/docs/source/locale/it/LC_MESSAGES/install.po
@@ -8,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -31,113 +31,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/it/LC_MESSAGES/security.po b/docs/source/locale/it/LC_MESSAGES/security.po
index 13d11a17..79923cda 100644
--- a/docs/source/locale/it/LC_MESSAGES/security.po
+++ b/docs/source/locale/it/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/it/LC_MESSAGES/tor.po b/docs/source/locale/it/LC_MESSAGES/tor.po
index a4d227cd..f8716f64 100644
--- a/docs/source/locale/it/LC_MESSAGES/tor.po
+++ b/docs/source/locale/it/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ja/LC_MESSAGES/advanced.po b/docs/source/locale/ja/LC_MESSAGES/advanced.po
index c3847657..8b9457ea 100644
--- a/docs/source/locale/ja/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/ja/LC_MESSAGES/advanced.po
@@ -8,104 +8,103 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -113,115 +112,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ja/LC_MESSAGES/develop.po b/docs/source/locale/ja/LC_MESSAGES/develop.po
index f20ff51c..79008008 100644
--- a/docs/source/locale/ja/LC_MESSAGES/develop.po
+++ b/docs/source/locale/ja/LC_MESSAGES/develop.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -27,230 +27,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ja/LC_MESSAGES/features.po b/docs/source/locale/ja/LC_MESSAGES/features.po
index 29841dd8..e71451fb 100644
--- a/docs/source/locale/ja/LC_MESSAGES/features.po
+++ b/docs/source/locale/ja/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ja/LC_MESSAGES/help.po b/docs/source/locale/ja/LC_MESSAGES/help.po
index d965eb13..d1eb81e9 100644
--- a/docs/source/locale/ja/LC_MESSAGES/help.po
+++ b/docs/source/locale/ja/LC_MESSAGES/help.po
@@ -8,65 +8,113 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
-msgstr ""
-
-#: ../../source/help.rst:9
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ja/LC_MESSAGES/install.po b/docs/source/locale/ja/LC_MESSAGES/install.po
index a2f5b321..640c688c 100644
--- a/docs/source/locale/ja/LC_MESSAGES/install.po
+++ b/docs/source/locale/ja/LC_MESSAGES/install.po
@@ -8,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -31,113 +31,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ja/LC_MESSAGES/security.po b/docs/source/locale/ja/LC_MESSAGES/security.po
index 13d11a17..79923cda 100644
--- a/docs/source/locale/ja/LC_MESSAGES/security.po
+++ b/docs/source/locale/ja/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ja/LC_MESSAGES/tor.po b/docs/source/locale/ja/LC_MESSAGES/tor.po
index a4d227cd..f8716f64 100644
--- a/docs/source/locale/ja/LC_MESSAGES/tor.po
+++ b/docs/source/locale/ja/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/nb_NO/LC_MESSAGES/advanced.po b/docs/source/locale/nb_NO/LC_MESSAGES/advanced.po
index 17c39735..ea1dad17 100644
--- a/docs/source/locale/nb_NO/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/nb_NO/LC_MESSAGES/advanced.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language: nb_NO\n"
@@ -16,97 +16,96 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -114,115 +113,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/nb_NO/LC_MESSAGES/develop.po b/docs/source/locale/nb_NO/LC_MESSAGES/develop.po
index d1799dfc..3d663e6d 100644
--- a/docs/source/locale/nb_NO/LC_MESSAGES/develop.po
+++ b/docs/source/locale/nb_NO/LC_MESSAGES/develop.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language: nb_NO\n"
@@ -16,7 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -28,230 +28,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/nb_NO/LC_MESSAGES/features.po b/docs/source/locale/nb_NO/LC_MESSAGES/features.po
index e97263f1..766d864b 100644
--- a/docs/source/locale/nb_NO/LC_MESSAGES/features.po
+++ b/docs/source/locale/nb_NO/LC_MESSAGES/features.po
@@ -1,47 +1,69 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) Micah Lee, et al.
# This file is distributed under the same license as the OnionShare package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
"Language: nb_NO\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-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
-msgid "OnionShare works by starting web servers locally on your own computer and making them accessible to other people as `Tor <https://www.torproject.org/>`_ `onion services <https://community.torproject.org/onion-services/>`_."
+msgid ""
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
+"<https://community.torproject.org/onion-services/>`_."
msgstr ""
#: ../../source/features.rst:8
-msgid "By default, OnionShare web addresses are protected with a random password. A typical OnionShare address might look something like this::"
+msgid ""
+"By default, OnionShare web addresses are protected with a random "
+"password. A typical OnionShare address might look something like this::"
msgstr ""
#: ../../source/features.rst:12
-msgid "You're responsible for securely sharing that URL using a communication channel of your choice like in an encrypted chat message, or using something less secure like a Twitter or Facebook message, depending on your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+msgid ""
+"You're responsible for securely sharing that URL using a communication "
+"channel of your choice like in an encrypted chat message, or using "
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
-msgid "The people who you send the URL to must then copy and paste it into `Tor Browser <https://www.torproject.org/>`_ to access the OnionShare service."
+msgid ""
+"The people you send the URL to then copy and paste it into their `Tor "
+"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
-msgid "With OnionShare, *your own computer is the web server*. If you run OnionShare on your laptop to send someone files, and then suspend your laptop before the files have been downloaded, the service will not be available until your laptop is unsuspended and connected to the internet again. OnionShare works best when working with people in real-time."
+msgid ""
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
-msgid "Because your own computer is the web server, *no third party can access anything that happens in OnionShare*, not even the developers of OnionShare. It's completely private. And because OnionShare is based on Tor onion services too, it also protects your anonymity. See the :doc:`security design </security>` for more information."
+msgid ""
+"Because your own computer is the web server, *no third party can access "
+"anything that happens in OnionShare*, not even the developers of "
+"OnionShare. It's completely private. And because OnionShare is based on "
+"Tor onion services too, it also protects your anonymity. See the "
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -49,178 +71,698 @@ msgid "Share Files"
msgstr ""
#: ../../source/features.rst:23
-msgid "You can use OnionShare to securely and anonymously send files and folders to people. Just open a share tab, drag in the files and folders you wish to share, and click \"Start sharing\"."
+msgid ""
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27
-#: ../../source/features.rst:91
-msgid "After you add files, you'll see some settings. Make sure you choose the setting you're interested in first before you start sharing."
+#: ../../source/features.rst:27 ../../source/features.rst:93
+msgid ""
+"After you add files, you'll see some settings. Make sure you choose the "
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
-msgid "By default, as soon as someone finishes downloading your files, OnionShare will automatically stop the server, completely removing the website from the internet. If you want to allow multiple people to download these files, uncheck the \"Stop sharing after files have been sent (uncheck to allow downloading individual files)\" box."
+msgid ""
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
-msgid "Also, if you uncheck this box, people will be able to download individual files that you share rather than a single compressed version of all of the files."
+#: ../../source/features.rst:34
+msgid ""
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
-msgid "When you're ready to share, click the \"Start sharing\" button. You can always click \"Stop sharing\", or quit OnionShare, to immediate take the website down. You can also click the up arrow icon in the top-right corner to show the history and progress of people downloading files from you."
+#: ../../source/features.rst:36
+msgid ""
+"When you're ready to share, click the \"Start sharing\" button. You can "
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
-msgid "Now that you have a website that's sharing files, copy the address and send it to the person you want to receive the files. If the files need to stay secure, you should use an encrypted messaging app."
+#: ../../source/features.rst:40
+msgid ""
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
-msgid "That person then must load the address in Tor Browser. After logging in with the random password that's included in the web address, they will be able to download the files directly from your computer by clicking the \"Download Files\" link in the corner."
+#: ../../source/features.rst:42
+msgid ""
+"That person then must load the address in Tor Browser. After logging in "
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
-msgid "You can use OnionShare to let people anonymously upload files directly to your computer, essentially turning it into an anonymous dropbox. Open a receive tab, choose where you want files to get downloaded and other settings, and then click \"Start Receive Mode\"."
-msgstr ""
-
-#: ../../source/features.rst:52
-msgid "This will start the OnionShare service. Anyone that loads this address in Tor Browser will be able to upload files to your computer."
+#: ../../source/features.rst:49
+msgid ""
+"You can use OnionShare to let people anonymously upload files directly to"
+" your computer, essentially turning it into an anonymous dropbox. Open a "
+"\"Receive tab\", choose where you want to save the files and other "
+"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:56
-msgid "You can also click the down arrow icon in the top-right corner to show the history and progress of people sending files to you."
+#: ../../source/features.rst:54
+msgid ""
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
#: ../../source/features.rst:58
-msgid "Here is what it looks like for someone sending you files."
+msgid ""
+"You can also click the down \"↓\" icon in the top-right corner to show "
+"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:62
-msgid "When someone uploads files to your receive service, by default they get saved to a folder called ``OnionShare`` in your home folder on your computer, and they get automatically organized into separate subfolders based on the time that the files get uploaded."
+#: ../../source/features.rst:60
+msgid "Here is what it looks like for someone sending you files."
msgstr ""
#: ../../source/features.rst:64
-msgid "Setting up an OnionShare receiving service is useful for journalists and others that need to securely accept documents from anonymous sources. When used in this way, OnionShare is sort of like a lightweight, simpler, not quite as secure version of `SecureDrop <https://securedrop.org/>`_, the whistleblower submission system."
+msgid ""
+"When someone uploads files to your receive service, by default they get "
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:67
-msgid "Use at your own risk"
+#: ../../source/features.rst:66
+msgid ""
+"Setting up an OnionShare receiving service is useful for journalists and "
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
#: ../../source/features.rst:69
-msgid "Just like with malicious email attachments, it's possible that someone could try to hack your computer by uploading a malicious file to your OnionShare service. OnionShare does not add any safety mechanisms to protect your system from malicious files, so use at your own risk."
+msgid "Use at your own risk"
msgstr ""
#: ../../source/features.rst:71
-msgid "If you receive an Office document or a PDF through OnionShare, you can convert these documents into PDFs that you know are safe to open using `Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself when opening untrusted documents by opening them in `Tails <https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ disposable VM."
+msgid ""
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
+"OnionShare service. OnionShare does not add any safety mechanisms to "
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:74
-msgid "Tips for running a receive service"
+#: ../../source/features.rst:73
+msgid ""
+"If you receive an Office document or a PDF through OnionShare, you can "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
+"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
+"disposableVM."
msgstr ""
#: ../../source/features.rst:76
-msgid "If you want to host your own anonymous dropbox using OnionShare, it's recommended that you do it on a separate, dedicated computer that's always powered on and connected to the internet, and not on the one you use on a regular basis."
+msgid "Tips for running a receive service"
msgstr ""
#: ../../source/features.rst:78
-msgid "If you intend on advertising the OnionShare address on your website or social media profiles, then you should save the tab (see :ref:`save_tabs`) and run it as a public service (see :ref:`disable_passwords`)."
+msgid ""
+"If you want to host your own anonymous dropbox using OnionShare, it's "
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:81
-msgid "Host a Website"
+#: ../../source/features.rst:80
+msgid ""
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
#: ../../source/features.rst:83
-msgid "You can use OnionShare to host a static HTML website with just a click. Just open a website tab, drag in the files and folders that make up the static website, and click when you're ready click \"Start sharing\"."
+msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:87
-msgid "If you add an ``index.html`` file, when someone loads your website it will render this page. You should also include any other HTML files, CSS files, JavaScript files, and images that make up the website. (Note that OnionShare only supports hosting *static* websites. It can't host websites that execute code or use databases. So you can't, for example, use WordPress.)"
+#: ../../source/features.rst:85
+msgid ""
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
#: ../../source/features.rst:89
-msgid "If you don't have an ``index.html`` file, then it will show a directory listing instead, and people who load it can look through the files and download them."
+msgid ""
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
+"OnionShare only supports hosting *static* websites. It can't host "
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:96
-msgid "Content Security Policy"
+#: ../../source/features.rst:91
+msgid ""
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
+"download them."
msgstr ""
#: ../../source/features.rst:98
-msgid "By default OnionShare will help secure your website by setting a strict `Content Security Police <https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However this will prevent third-party content from loading inside the web page."
+msgid "Content Security Policy"
msgstr ""
#: ../../source/features.rst:100
-msgid "If you want to load content from third-party websites, like assets or JavaScript libraries from CDNs, then you must check the \"Disable Content Security Policy header (allows your website to use third-party resources)\" box before starting the service."
+msgid ""
+"By default OnionShare helps secure your website by setting a strict "
+"`Content Security Police "
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:103
-msgid "Tips for running a website service"
+#: ../../source/features.rst:102
+msgid ""
+"If you want to load content from third-party websites, like assets or "
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
#: ../../source/features.rst:105
-msgid "If you want to host a long-term website using OnionShare (that isn't just to quickly show someone something), it's recommended that you do it on a separate, dedicated computer that's always powered on and connected to the internet, and not on the one you use on a regular basis. You should also save the tab (see :ref:`save_tabs`) so that you can resume the website with the same address if you close OnionShare and re-open it later."
+msgid "Tips for running a website service"
msgstr ""
#: ../../source/features.rst:107
-msgid "If your website is intended to be viewed by the public, you should run it as a public service (see :ref:`disable_passwords`)."
+msgid ""
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
#: ../../source/features.rst:110
+msgid ""
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
+msgstr ""
+
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
-msgid "You can use OnionShare to set up a completely anonymous, secure chat room that doesn't log anything or leave any traces. Just open a chat tab and click \"Start chat server\"."
+#: ../../source/features.rst:115
+msgid ""
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
-msgid "After you start the server, copy the OnionShare address and send it to the people who will join this anonymous chat room. If it's important to limit exactly who can join, you should use an encrypted messaging app to send the OnionShare address."
+#: ../../source/features.rst:119
+msgid ""
+"After you start the server, copy the OnionShare address and send it to "
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
-msgid "People can join the chat room by loading its OnionShare address in Tor Browser. The chat room requires JavasScript, so everyone who wants to participate must set their security level to Standard or Safer instead of Safest."
+#: ../../source/features.rst:124
+msgid ""
+"People can join the chat room by loading its OnionShare address in Tor "
+"Browser. The chat room requires JavasScript, so everyone who wants to "
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
-msgid "When someone joins the chat room they get assigned a random name. They can change their name by typing a new name in the box in the left panel and pressing enter. No chat history will get displayed at all, even if others were already chatting in the room, because the chat history isn't saved anywhere."
+#: ../../source/features.rst:127
+msgid ""
+"When someone joins the chat room they get assigned a random name. They "
+"can change their name by typing a new name in the box in the left panel "
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
-msgid "In an OnionShare chat room, everyone is anonymous. Anyone can change their name to anything, and there is no way to confirm anyone's identity."
+#: ../../source/features.rst:133
+msgid ""
+"In an OnionShare chat room, everyone is anonymous. Anyone can change "
+"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
-msgid "However, if you create an OnionShare chat room and securely send the address only to a small group of trusted friends using encrypted messages, then you can be reasonably confident that the people who join the chat room are your friends."
+#: ../../source/features.rst:136
+msgid ""
+"However, if you create an OnionShare chat room and securely send the "
+"address only to a small group of trusted friends using encrypted "
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
-msgid "If you need to already be using an encrypted messaging app, what's the point of an OnionShare chat room to begin with? It leaves less traces."
+#: ../../source/features.rst:141
+msgid ""
+"If you need to already be using an encrypted messaging app, what's the "
+"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
-msgid "If you send a message to a Signal group, for example, a copy of your message ends up on each device (the phones and computers, if they set up Signal Desktop) of each member of the group. Even if disappearing messages is enabled, it's hard to confirm that all copies of the messages were actually deleted from all devices, and from any other places (like notifications databases) they may have been saved to. OnionShare chat rooms don't store any messages anywhere, so this isn't a problem."
+#: ../../source/features.rst:143
+msgid ""
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
+"notifications databases) they may have been saved to. OnionShare chat "
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
-msgid "OnionShare chat rooms can also be useful for anonymous people wanting to chat securely with someone without needing to create any accounts. For example, a source can send an OnionShare address to a journalist using a disposable email address, and then wait for the journalist to join the chat room, all without compromosing their anonymity."
+#: ../../source/features.rst:146
+msgid ""
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
-msgid "Because OnionShare relies on Tor onion services, connections between Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When someone posts a message to an OnionShare chat room, they send it to the server through the E2EE onion connection, which then sends it to all other members of the chat room using WebSockets, through their E2EE onion connections."
+#: ../../source/features.rst:152
+msgid ""
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
-msgid "OnionShare doesn't implement any chat encryption on its own. It relies on the Tor onion service's encryption instead."
-msgstr ""
+#: ../../source/features.rst:154
+msgid ""
+"OnionShare doesn't implement any chat encryption on its own. It relies on"
+" the Tor onion service's encryption instead."
+msgstr ""
+
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/nb_NO/LC_MESSAGES/help.po b/docs/source/locale/nb_NO/LC_MESSAGES/help.po
index 6499d5ec..4af7ad6f 100644
--- a/docs/source/locale/nb_NO/LC_MESSAGES/help.po
+++ b/docs/source/locale/nb_NO/LC_MESSAGES/help.po
@@ -1,57 +1,121 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) Micah Lee, et al.
# This file is distributed under the same license as the OnionShare package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
"Language: nb_NO\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-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
+msgid ""
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:9
-msgid "This website is full of instructions on how to use OnionShare. Look through all of the sections first to see if it answers your questions."
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+msgid ""
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:14
-msgid "If you can't find a solution in this website, please check the `GitHub issues <https://github.com/micahflee/onionshare/issues>`_. It's possible that someone else has encountered the same problem and has either raised it with the developers, or maybe even posted a solution."
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+msgid ""
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
+"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
+"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:19
-msgid "If you can't find a solution to your problem, or you wish to ask a question or suggest a new feature, please `submit an issue <https://github.com/micahflee/onionshare/issues/new>`_. This requires `creating an GitHub account <https://help.github.com/articles/signing-up-for-a-new-github-account/>`_."
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+msgid ""
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
-#: ../../source/help.rst:24
-msgid "See :ref:`collaborating` for instructions on how to join our Keybase team that we use to discuss the project."
-msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/nb_NO/LC_MESSAGES/install.po b/docs/source/locale/nb_NO/LC_MESSAGES/install.po
index ddc85512..a6f8363a 100644
--- a/docs/source/locale/nb_NO/LC_MESSAGES/install.po
+++ b/docs/source/locale/nb_NO/LC_MESSAGES/install.po
@@ -1,101 +1,266 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) Micah Lee, et al.
# This file is distributed under the same license as the OnionShare package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
"Language: nb_NO\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-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
-msgid "You can download OnionShare for Windows and macOS from the `OnionShare website <https://onionshare.org/>`_."
+msgid ""
+"You can download OnionShare for Windows and macOS from the `OnionShare "
+"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
-msgid "There are various ways to install OnionShare for Linux, but the recommended way is to use the Flatpak package. Flatpak ensures that you'll always use the most latest dependencies and run OnionShare inside of a sandbox."
+#: ../../source/install.rst:17
+msgid ""
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
-msgid "Make sure you have ``flatpak`` installed and the Flathub repository added by following `these instructions <https://flatpak.org/setup/>`_ for your Linux distribution."
+#: ../../source/install.rst:19
+msgid ""
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
-msgid "Then install OnionShare from Flathub by following `the instructions here <https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
msgstr ""
-#: ../../source/install.rst:25
-msgid "Verifying PGP signatures"
+#: ../../source/install.rst:23
+msgid ""
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:27
-msgid "You can verify that the Windows, macOS, or source package you download is legitimate and hasn't been tampered with by verifying its PGP signature. For Windows and macOS, this step is optional and provides defense in depth: the installers also include their operating system-specific signatures, and you can just rely on those alone if you'd like."
+#: ../../source/install.rst:28
+msgid "Verifying PGP signatures"
msgstr ""
#: ../../source/install.rst:30
+msgid ""
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
+msgstr ""
+
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
-msgid "Windows, macOS, and source packaged are signed by Micah Lee, the core developer, using his PGP public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#: ../../source/install.rst:36
+msgid ""
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
-msgid "In order to verify signatures, you must have GnuPG installed. For macOS you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+#: ../../source/install.rst:38
+msgid ""
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
-msgid "You can find the signatures (``.asc`` files), as well as Windows, macOS, and source packages, at https://onionshare.org/dist/ in the folders named for each version of OnionShare. You can also find them on the `GitHub Releases page <https://github.com/micahflee/onionshare/releases>`_."
+#: ../../source/install.rst:43
+msgid ""
+"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
-msgid "Once you have imported Micah's public key into your GnuPG keychain, downloaded the binary, and downloaded the ``.asc`` signature, you can verify the binary for macOS in terminal like this::"
+#: ../../source/install.rst:49
+msgid ""
+"Once you have imported Micah's public key into your GnuPG keychain, "
+"downloaded the binary, and downloaded the ``.asc`` signature, you can "
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
-msgid "If you don't see 'Good signature from', then there might be a problem with the integrity of the file (malicious or otherwise), and you perhaps should not install the package. (The WARNING shown above, is not a problem with the package: it only means you have not defined any level of 'trust' regarding Micah's PGP key itself.)"
+#: ../../source/install.rst:69
+msgid ""
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
-msgid "If you want to learn more about verifying PGP signatures, guides for `Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and the `Tor Project <https://2019.www.torproject.org/docs/verifying-signatures.html.en>`_ may be helpful."
+#: ../../source/install.rst:71
+msgid ""
+"If you want to learn more about verifying PGP signatures, guides for "
+"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/nb_NO/LC_MESSAGES/security.po b/docs/source/locale/nb_NO/LC_MESSAGES/security.po
index f8e68082..73593c65 100644
--- a/docs/source/locale/nb_NO/LC_MESSAGES/security.po
+++ b/docs/source/locale/nb_NO/LC_MESSAGES/security.po
@@ -1,27 +1,29 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) Micah Lee, et al.
# This file is distributed under the same license as the OnionShare package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
"Language: nb_NO\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-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid "First read :ref:`how_it_works` to understand the basics of how OnionShare works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -33,19 +35,47 @@ msgid "What OnionShare protects against"
msgstr ""
#: ../../source/security.rst:11
-msgid "**Third parties don't have access to anything that happens in OnionShare.** When you use OnionShare, you host services directly on your computer. For example, when you share files with OnionShare, you don't upload these files to any server, and when you start an OnionShare chat room, your computer is the chat room server itself. Traditional ways of sharing files or setting up websites and chat rooms require trusting a service with access to your data."
+msgid ""
+"**Third parties don't have access to anything that happens in "
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
-msgid "**Network eavesdroppers can't spy on anything that happens in OnionShare in transit.** Because connections between Tor onion services and Tor Browser are end-to-end encrypted, no network attackers can eavesdrop on what happens in an OnionShare service. If the eavesdropper is positioned on the OnionShare user's end, the Tor Browser user's end, or is a malicious Tor node, they will only see Tor traffic. If the eavesdropper is a malicious rendezvous node used to connect Tor Browser with OnionShare's onion service, the traffic will be encrypted using the onion service key."
+msgid ""
+"**Network eavesdroppers can't spy on anything that happens in OnionShare "
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
-msgid "**Anonymity of OnionShare users are protected by Tor.** OnionShare and Tor Browser protect the anonymity of the users. As long as the OnionShare user anonymously communicates the OnionShare address with the Tor Browser users, the Tor Browser users and eavesdroppers can't learn the identity of the OnionShare user."
+msgid ""
+"**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
+"Tor Browser protect the anonymity of the users. As long as the OnionShare"
+" user anonymously communicates the OnionShare address with the Tor "
+"Browser users, the Tor Browser users and eavesdroppers can't learn the "
+"identity of the OnionShare user."
msgstr ""
#: ../../source/security.rst:17
-msgid "**If an attacker learns about the onion service, they still can't access anything.** There have been attacks against the Tor network that can enumerate onion services. Even if someone discovers the .onion address of an OnionShare onion service, they can't access it without also knowing the service's random password (unless, of course, the OnionShare users chooses to disable the password and make it public). The password is generated by choosing two random words from a list of 6800 words, meaning there are 6800^2, or about 46 million possible password. But they can only make 20 wrong guesses before OnionShare stops the server, preventing brute force attacks against the password."
+msgid ""
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -53,9 +83,131 @@ msgid "What OnionShare doesn't protect against"
msgstr ""
#: ../../source/security.rst:22
-msgid "**Communicating the OnionShare address might not be secure.** The OnionShare user is responsible for securely communicating the OnionShare address with people. If they send it insecurely (such as through an email message, and their email is being monitored by an attacker), the eavesdropper will learn that they're using OnionShare. If the attacker loads the address in Tor Browser before the legitimate recipient gets to it, they can access the service. If this risk fits the user's threat model, they must find a more secure way to communicate the address, such as in an encrypted email, chat, or voice call. This isn't necessary in cases where OnionShare is being used for something that isn't secret."
+msgid ""
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
-msgid "**Communicating the OnionShare address might not be anonymous.** While OnionShare and Tor Browser allow for anonymity, if the user wishes to remain anonymous they must take extra steps to ensure this while communicating the OnionShare address. For example, they might need to use Tor to create a new anonymous email or chat account, and only access it over Tor, to use for sharing the address. This isn't necessary in cases where there's no need to protect anonymity, such as co-workers who know each other sharing work documents."
+msgid ""
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/nb_NO/LC_MESSAGES/tor.po b/docs/source/locale/nb_NO/LC_MESSAGES/tor.po
index 642f6a64..2d11e308 100644
--- a/docs/source/locale/nb_NO/LC_MESSAGES/tor.po
+++ b/docs/source/locale/nb_NO/LC_MESSAGES/tor.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-09-14 21:36+0000\n"
"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
"Language: nb_NO\n"
@@ -16,7 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -24,62 +24,52 @@ msgstr "Tilkobling til Tor"
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
-"Det er flere måter å få OnionShare til å koble til Tor-nettverket. Du kan"
-" endre dem i «Innstillinger», som du kommer til ved å trykke på "
-"tannhjulsikonet nederst til høyre i vinduet."
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+#, fuzzy
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr "Bruk Tor som det kommer innebygd i OnionShare"
#: ../../source/tor.rst:11
+#, fuzzy
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
"Dette er den forvalgte måten OnionShare kobler til Tor, og det er også "
"den enkleste og mest pålitelige måten. Derfor er det også anbefalt for de"
" fleste brukerne."
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"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 ""
-"Når du åpner OnionShare, vil det starte en Tor-prosess i bakgrunnen som "
-"er satt opp spesifikt for bruk med OnionShare. Denne Tor-prosessen har "
-"ikke innvirkning på andre Tor-prosesser på datamaskinen din, så du kan "
-"kjøre en Tor-nettleser eller bruke systemets Tor i bakgrunnen."
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+#, fuzzy
+msgid "Attempt auto-configuration with Tor Browser"
msgstr "Forsøk automatisk oppsett med Tor-nettleseren"
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-"Du kan sette opp OnionShare til å koble til Tor som den kommer levert med"
-" Tor-nettleseren. Først `last ned Tor-nettleseren "
-"<https://www.torproject.org/download/languages/>`_ hvis du ikke har den "
-"allerede. Med denne innstillingen må du ha Tor-nettleseren åpen i "
-"bakgrunnen mens du bruker OnionShare."
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+#, fuzzy
+msgid "Using a system ``tor`` in Windows"
msgstr "Bruk av systemets Tor i Windows"
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
@@ -87,149 +77,348 @@ msgstr ""
"Dette er ganske avansert. Du må vite hvordan du redigerer filer i "
"klartekst og gjøre ting som administrator."
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
+#: ../../source/tor.rst:61
#, fuzzy
-msgid "Using a system Tor in macOS"
+msgid "Using a system ``tor`` in macOS"
msgstr "Bruk av systemets Tor i Windows"
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+#, fuzzy
+msgid "Using a system ``tor`` in Linux"
msgstr "Bruk av systemets Tor på Linux"
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr "Bruk av Tor-broer"
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+#, fuzzy
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr "For å sette opp broer, åpne OnionShare-innstillingene."
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr "Bruk av systemets Tor på macOS"
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+#~ "Det er flere måter å få OnionShare"
+#~ " til å koble til Tor-nettverket. "
+#~ "Du kan endre dem i «Innstillinger», "
+#~ "som du kommer til ved å trykke "
+#~ "på tannhjulsikonet nederst til høyre i"
+#~ " vinduet."
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+#~ "Når du åpner OnionShare, vil det "
+#~ "starte en Tor-prosess i bakgrunnen "
+#~ "som er satt opp spesifikt for bruk"
+#~ " med OnionShare. Denne Tor-prosessen "
+#~ "har ikke innvirkning på andre Tor-"
+#~ "prosesser på datamaskinen din, så du "
+#~ "kan kjøre en Tor-nettleser eller "
+#~ "bruke systemets Tor i bakgrunnen."
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+#~ "Du kan sette opp OnionShare til å"
+#~ " koble til Tor som den kommer "
+#~ "levert med Tor-nettleseren. Først `last"
+#~ " ned Tor-nettleseren "
+#~ "<https://www.torproject.org/download/languages/>`_ hvis du"
+#~ " ikke har den allerede. Med denne "
+#~ "innstillingen må du ha Tor-nettleseren"
+#~ " åpen i bakgrunnen mens du bruker "
+#~ "OnionShare."
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/nl/LC_MESSAGES/advanced.po b/docs/source/locale/nl/LC_MESSAGES/advanced.po
index c3847657..8b9457ea 100644
--- a/docs/source/locale/nl/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/nl/LC_MESSAGES/advanced.po
@@ -8,104 +8,103 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -113,115 +112,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/nl/LC_MESSAGES/develop.po b/docs/source/locale/nl/LC_MESSAGES/develop.po
index f20ff51c..79008008 100644
--- a/docs/source/locale/nl/LC_MESSAGES/develop.po
+++ b/docs/source/locale/nl/LC_MESSAGES/develop.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -27,230 +27,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/nl/LC_MESSAGES/features.po b/docs/source/locale/nl/LC_MESSAGES/features.po
index 29841dd8..e71451fb 100644
--- a/docs/source/locale/nl/LC_MESSAGES/features.po
+++ b/docs/source/locale/nl/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/nl/LC_MESSAGES/help.po b/docs/source/locale/nl/LC_MESSAGES/help.po
index d965eb13..d1eb81e9 100644
--- a/docs/source/locale/nl/LC_MESSAGES/help.po
+++ b/docs/source/locale/nl/LC_MESSAGES/help.po
@@ -8,65 +8,113 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
-msgstr ""
-
-#: ../../source/help.rst:9
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/nl/LC_MESSAGES/install.po b/docs/source/locale/nl/LC_MESSAGES/install.po
index a2f5b321..640c688c 100644
--- a/docs/source/locale/nl/LC_MESSAGES/install.po
+++ b/docs/source/locale/nl/LC_MESSAGES/install.po
@@ -8,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -31,113 +31,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/nl/LC_MESSAGES/security.po b/docs/source/locale/nl/LC_MESSAGES/security.po
index 13d11a17..79923cda 100644
--- a/docs/source/locale/nl/LC_MESSAGES/security.po
+++ b/docs/source/locale/nl/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/nl/LC_MESSAGES/tor.po b/docs/source/locale/nl/LC_MESSAGES/tor.po
index a4d227cd..f8716f64 100644
--- a/docs/source/locale/nl/LC_MESSAGES/tor.po
+++ b/docs/source/locale/nl/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pl/LC_MESSAGES/advanced.po b/docs/source/locale/pl/LC_MESSAGES/advanced.po
index 702ed4fb..7fe6905c 100644
--- a/docs/source/locale/pl/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/pl/LC_MESSAGES/advanced.po
@@ -7,108 +7,107 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-09-29 20:55+0000\n"
"Last-Translator: Atrate <Atrate@protonmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.3-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+#, fuzzy
+msgid "Save Tabs"
msgstr "Zapisz karty"
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -116,114 +115,290 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pl/LC_MESSAGES/develop.po b/docs/source/locale/pl/LC_MESSAGES/develop.po
index 696f467c..8cbedb57 100644
--- a/docs/source/locale/pl/LC_MESSAGES/develop.po
+++ b/docs/source/locale/pl/LC_MESSAGES/develop.po
@@ -7,18 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-09-29 20:55+0000\n"
"Last-Translator: Atrate <Atrate@protonmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.3-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -30,233 +29,380 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-"OnionShare posiada również `listę mailingową <https://lists.riseup.net/www/"
-"subscribe/onionshare-dev>`_ dla programistów i designerów do dyskusji nad "
-"projektem."
+"OnionShare posiada również `listę mailingową "
+"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ dla "
+"programistów i designerów do dyskusji nad projektem."
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-#, fuzzy
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr "Plik ten zawiera instrukcje techniczne i niezbędne polecenia:"
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr "Plik ten zawiera instrukcje techniczne i niezbędne polecenia:"
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pl/LC_MESSAGES/features.po b/docs/source/locale/pl/LC_MESSAGES/features.po
index 29841dd8..e71451fb 100644
--- a/docs/source/locale/pl/LC_MESSAGES/features.po
+++ b/docs/source/locale/pl/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pl/LC_MESSAGES/help.po b/docs/source/locale/pl/LC_MESSAGES/help.po
index d965eb13..d1eb81e9 100644
--- a/docs/source/locale/pl/LC_MESSAGES/help.po
+++ b/docs/source/locale/pl/LC_MESSAGES/help.po
@@ -8,65 +8,113 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
-msgstr ""
-
-#: ../../source/help.rst:9
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pl/LC_MESSAGES/install.po b/docs/source/locale/pl/LC_MESSAGES/install.po
index a2f5b321..640c688c 100644
--- a/docs/source/locale/pl/LC_MESSAGES/install.po
+++ b/docs/source/locale/pl/LC_MESSAGES/install.po
@@ -8,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -31,113 +31,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pl/LC_MESSAGES/security.po b/docs/source/locale/pl/LC_MESSAGES/security.po
index 13d11a17..79923cda 100644
--- a/docs/source/locale/pl/LC_MESSAGES/security.po
+++ b/docs/source/locale/pl/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pl/LC_MESSAGES/tor.po b/docs/source/locale/pl/LC_MESSAGES/tor.po
index a4d227cd..f8716f64 100644
--- a/docs/source/locale/pl/LC_MESSAGES/tor.po
+++ b/docs/source/locale/pl/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pt_BR/LC_MESSAGES/advanced.po b/docs/source/locale/pt_BR/LC_MESSAGES/advanced.po
index c3847657..8b9457ea 100644
--- a/docs/source/locale/pt_BR/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/pt_BR/LC_MESSAGES/advanced.po
@@ -8,104 +8,103 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -113,115 +112,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pt_BR/LC_MESSAGES/develop.po b/docs/source/locale/pt_BR/LC_MESSAGES/develop.po
index f20ff51c..79008008 100644
--- a/docs/source/locale/pt_BR/LC_MESSAGES/develop.po
+++ b/docs/source/locale/pt_BR/LC_MESSAGES/develop.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -27,230 +27,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pt_BR/LC_MESSAGES/features.po b/docs/source/locale/pt_BR/LC_MESSAGES/features.po
index 29841dd8..e71451fb 100644
--- a/docs/source/locale/pt_BR/LC_MESSAGES/features.po
+++ b/docs/source/locale/pt_BR/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pt_BR/LC_MESSAGES/help.po b/docs/source/locale/pt_BR/LC_MESSAGES/help.po
index d965eb13..d1eb81e9 100644
--- a/docs/source/locale/pt_BR/LC_MESSAGES/help.po
+++ b/docs/source/locale/pt_BR/LC_MESSAGES/help.po
@@ -8,65 +8,113 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
-msgstr ""
-
-#: ../../source/help.rst:9
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pt_BR/LC_MESSAGES/install.po b/docs/source/locale/pt_BR/LC_MESSAGES/install.po
index a2f5b321..640c688c 100644
--- a/docs/source/locale/pt_BR/LC_MESSAGES/install.po
+++ b/docs/source/locale/pt_BR/LC_MESSAGES/install.po
@@ -8,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -31,113 +31,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pt_BR/LC_MESSAGES/security.po b/docs/source/locale/pt_BR/LC_MESSAGES/security.po
index 13d11a17..79923cda 100644
--- a/docs/source/locale/pt_BR/LC_MESSAGES/security.po
+++ b/docs/source/locale/pt_BR/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pt_BR/LC_MESSAGES/tor.po b/docs/source/locale/pt_BR/LC_MESSAGES/tor.po
index a4d227cd..f8716f64 100644
--- a/docs/source/locale/pt_BR/LC_MESSAGES/tor.po
+++ b/docs/source/locale/pt_BR/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pt_PT/LC_MESSAGES/advanced.po b/docs/source/locale/pt_PT/LC_MESSAGES/advanced.po
index c3847657..8b9457ea 100644
--- a/docs/source/locale/pt_PT/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/pt_PT/LC_MESSAGES/advanced.po
@@ -8,104 +8,103 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -113,115 +112,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pt_PT/LC_MESSAGES/develop.po b/docs/source/locale/pt_PT/LC_MESSAGES/develop.po
index f20ff51c..79008008 100644
--- a/docs/source/locale/pt_PT/LC_MESSAGES/develop.po
+++ b/docs/source/locale/pt_PT/LC_MESSAGES/develop.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -27,230 +27,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pt_PT/LC_MESSAGES/features.po b/docs/source/locale/pt_PT/LC_MESSAGES/features.po
index 29841dd8..e71451fb 100644
--- a/docs/source/locale/pt_PT/LC_MESSAGES/features.po
+++ b/docs/source/locale/pt_PT/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pt_PT/LC_MESSAGES/help.po b/docs/source/locale/pt_PT/LC_MESSAGES/help.po
index d965eb13..d1eb81e9 100644
--- a/docs/source/locale/pt_PT/LC_MESSAGES/help.po
+++ b/docs/source/locale/pt_PT/LC_MESSAGES/help.po
@@ -8,65 +8,113 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
-msgstr ""
-
-#: ../../source/help.rst:9
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pt_PT/LC_MESSAGES/install.po b/docs/source/locale/pt_PT/LC_MESSAGES/install.po
index a2f5b321..640c688c 100644
--- a/docs/source/locale/pt_PT/LC_MESSAGES/install.po
+++ b/docs/source/locale/pt_PT/LC_MESSAGES/install.po
@@ -8,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -31,113 +31,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pt_PT/LC_MESSAGES/security.po b/docs/source/locale/pt_PT/LC_MESSAGES/security.po
index 13d11a17..79923cda 100644
--- a/docs/source/locale/pt_PT/LC_MESSAGES/security.po
+++ b/docs/source/locale/pt_PT/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/pt_PT/LC_MESSAGES/tor.po b/docs/source/locale/pt_PT/LC_MESSAGES/tor.po
index a4d227cd..f8716f64 100644
--- a/docs/source/locale/pt_PT/LC_MESSAGES/tor.po
+++ b/docs/source/locale/pt_PT/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ro/LC_MESSAGES/advanced.po b/docs/source/locale/ro/LC_MESSAGES/advanced.po
index c3847657..8b9457ea 100644
--- a/docs/source/locale/ro/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/ro/LC_MESSAGES/advanced.po
@@ -8,104 +8,103 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -113,115 +112,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ro/LC_MESSAGES/develop.po b/docs/source/locale/ro/LC_MESSAGES/develop.po
index f20ff51c..79008008 100644
--- a/docs/source/locale/ro/LC_MESSAGES/develop.po
+++ b/docs/source/locale/ro/LC_MESSAGES/develop.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -27,230 +27,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ro/LC_MESSAGES/features.po b/docs/source/locale/ro/LC_MESSAGES/features.po
index 29841dd8..e71451fb 100644
--- a/docs/source/locale/ro/LC_MESSAGES/features.po
+++ b/docs/source/locale/ro/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ro/LC_MESSAGES/help.po b/docs/source/locale/ro/LC_MESSAGES/help.po
index d965eb13..d1eb81e9 100644
--- a/docs/source/locale/ro/LC_MESSAGES/help.po
+++ b/docs/source/locale/ro/LC_MESSAGES/help.po
@@ -8,65 +8,113 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
-msgstr ""
-
-#: ../../source/help.rst:9
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ro/LC_MESSAGES/install.po b/docs/source/locale/ro/LC_MESSAGES/install.po
index a2f5b321..640c688c 100644
--- a/docs/source/locale/ro/LC_MESSAGES/install.po
+++ b/docs/source/locale/ro/LC_MESSAGES/install.po
@@ -8,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -31,113 +31,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ro/LC_MESSAGES/security.po b/docs/source/locale/ro/LC_MESSAGES/security.po
index 13d11a17..79923cda 100644
--- a/docs/source/locale/ro/LC_MESSAGES/security.po
+++ b/docs/source/locale/ro/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ro/LC_MESSAGES/tor.po b/docs/source/locale/ro/LC_MESSAGES/tor.po
index a4d227cd..f8716f64 100644
--- a/docs/source/locale/ro/LC_MESSAGES/tor.po
+++ b/docs/source/locale/ro/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ru/LC_MESSAGES/advanced.po b/docs/source/locale/ru/LC_MESSAGES/advanced.po
index 4dfbdbd8..a25ed8e3 100644
--- a/docs/source/locale/ru/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/ru/LC_MESSAGES/advanced.po
@@ -7,108 +7,107 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-11-02 09:26+0000\n"
"Last-Translator: Yuri Slobodyanyuk <yuri@yurisk.info>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Weblate 4.3.2-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+#, fuzzy
+msgid "Advanced Usage"
msgstr "Расширенное использование"
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -116,114 +115,290 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ru/LC_MESSAGES/develop.po b/docs/source/locale/ru/LC_MESSAGES/develop.po
index 41668632..fff416ae 100644
--- a/docs/source/locale/ru/LC_MESSAGES/develop.po
+++ b/docs/source/locale/ru/LC_MESSAGES/develop.po
@@ -7,18 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-11-02 09:26+0000\n"
"Last-Translator: Yuri Slobodyanyuk <yuri@yurisk.info>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Weblate 4.3.2-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -30,229 +29,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ru/LC_MESSAGES/features.po b/docs/source/locale/ru/LC_MESSAGES/features.po
index 9ed0d74f..d2092360 100644
--- a/docs/source/locale/ru/LC_MESSAGES/features.po
+++ b/docs/source/locale/ru/LC_MESSAGES/features.po
@@ -7,34 +7,34 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-11-02 09:26+0000\n"
"Last-Translator: Yuri Slobodyanyuk <yuri@yurisk.info>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Weblate 4.3.2-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+#, fuzzy
+msgid "How OnionShare Works"
msgstr "Как работает OnionShare"
#: ../../source/features.rst:6
+#, fuzzy
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
"OnionShare работает посредством запуска веб серверов локально на Вашем "
"компьтере, делая их затем доступными другим пользователям через`Tor "
-"<https://www.torproject.org/>`_ `onion services <https://community.torproject"
-".org/onion-services/>`_."
+"<https://www.torproject.org/>`_ `onion services "
+"<https://community.torproject.org/onion-services/>`_."
#: ../../source/features.rst:8
msgid ""
@@ -46,23 +46,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -71,7 +70,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -80,309 +79,685 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ru/LC_MESSAGES/help.po b/docs/source/locale/ru/LC_MESSAGES/help.po
index 8d625745..36b8cb42 100644
--- a/docs/source/locale/ru/LC_MESSAGES/help.po
+++ b/docs/source/locale/ru/LC_MESSAGES/help.po
@@ -7,84 +7,93 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-11-04 13:26+0000\n"
"Last-Translator: Yuri Slobodyanyuk <yuri@yurisk.info>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Weblate 4.3.2-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr "Получить помощь"
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
-msgstr ""
-"Если Вам нужна помощь с OnionShare, пожалуйста, следуйте следующим "
-"интсрукциям."
-
-#: ../../source/help.rst:7
-msgid "Read this website"
+#: ../../source/help.rst:5
+#, fuzzy
+msgid "Read This Website"
msgstr "Прочитайте этот веб сайт"
-#: ../../source/help.rst:9
+#: ../../source/help.rst:7
+#, fuzzy
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
"Данный сайт содержит множество инструкций по использованию OnionShare. "
"Начните с просмотра всех разделов, возможно Вы найдете ответы на Ваши "
"вопросы."
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+#, fuzzy
+msgid "Check the GitHub Issues"
msgstr "Проверьте на Github отчеты о проблемах"
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
+#, fuzzy
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-"Если Вам не удается найти решение на этом веб сайте, пожалуйста, посмотрите "
-"здесь `GitHub issues <https://github.com/micahflee/onionshare/issues>`_. "
-"Возможно кто-то еще сталкнулся с такой же проблемой и сообщил об этом "
-"авторам или даже поделился своим решением."
+"Если Вам не удается найти решение на этом веб сайте, пожалуйста, "
+"посмотрите здесь `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. Возможно кто-то еще "
+"сталкнулся с такой же проблемой и сообщил об этом авторам или даже "
+"поделился своим решением."
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+#, fuzzy
+msgid "Submit an Issue Yourself"
msgstr "Сообщите о проблеме"
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
+#, fuzzy
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-"Если не находите решение вашей проблеме, а может хотите задать вопрос или "
-"предложить новые возможности, пожалуйста, сделайте это через `submit an "
+"Если не находите решение вашей проблеме, а может хотите задать вопрос или"
+" предложить новые возможности, пожалуйста, сделайте это через `submit an "
"issue <https://github.com/micahflee/onionshare/issues/new>`_. Для этого "
-"потребуется `создание аккаунта на Github <https://help.github.com/articles/"
-"signing-up-for-a-new-github-account/>`_."
+"потребуется `создание аккаунта на Github "
+"<https://help.github.com/articles/signing-up-for-a-new-github-"
+"account/>`_."
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+#, fuzzy
+msgid "Join our Keybase Team"
msgstr "Присоединяйтесь к нашей команде Keybase"
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
+#, fuzzy
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
-"Смотрите :ref: `collaborating` инструкции о том как присоединиться к команде "
-"Keybase в которой мы обсуждаем этот проект."
+"Смотрите :ref: `collaborating` инструкции о том как присоединиться к "
+"команде Keybase в которой мы обсуждаем этот проект."
+
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+#~ "Если Вам нужна помощь с OnionShare, "
+#~ "пожалуйста, следуйте следующим интсрукциям."
+
diff --git a/docs/source/locale/ru/LC_MESSAGES/install.po b/docs/source/locale/ru/LC_MESSAGES/install.po
index 224218f8..c47fba10 100644
--- a/docs/source/locale/ru/LC_MESSAGES/install.po
+++ b/docs/source/locale/ru/LC_MESSAGES/install.po
@@ -7,25 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-11-02 09:26+0000\n"
"Last-Translator: Yuri Slobodyanyuk <yuri@yurisk.info>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Weblate 4.3.2-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr "Установка"
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -34,112 +33,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ru/LC_MESSAGES/security.po b/docs/source/locale/ru/LC_MESSAGES/security.po
index d32a22be..9ec7a820 100644
--- a/docs/source/locale/ru/LC_MESSAGES/security.po
+++ b/docs/source/locale/ru/LC_MESSAGES/security.po
@@ -7,27 +7,26 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-11-04 13:26+0000\n"
"Last-Translator: Yuri Slobodyanyuk <yuri@yurisk.info>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Weblate 4.3.2-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+#, fuzzy
+msgid "Security Design"
msgstr "Архитектура безопасности"
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+#, fuzzy
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
"Начните с чтения :ref:`how_it_works` для понимания принципов работы "
"OnionShare."
@@ -45,25 +44,22 @@ msgstr "От чего защищает OnionShare"
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -77,16 +73,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -95,26 +91,122 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/ru/LC_MESSAGES/tor.po b/docs/source/locale/ru/LC_MESSAGES/tor.po
index a7f1683d..5b3693aa 100644
--- a/docs/source/locale/ru/LC_MESSAGES/tor.po
+++ b/docs/source/locale/ru/LC_MESSAGES/tor.po
@@ -7,18 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-11-02 09:26+0000\n"
"Last-Translator: Yuri Slobodyanyuk <yuri@yurisk.info>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Weblate 4.3.2-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -26,193 +25,392 @@ msgstr "Подключение к сети Тор"
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/sr@latin/LC_MESSAGES/advanced.po b/docs/source/locale/sr@latin/LC_MESSAGES/advanced.po
index c3847657..8b9457ea 100644
--- a/docs/source/locale/sr@latin/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/sr@latin/LC_MESSAGES/advanced.po
@@ -8,104 +8,103 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -113,115 +112,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/sr@latin/LC_MESSAGES/develop.po b/docs/source/locale/sr@latin/LC_MESSAGES/develop.po
index f20ff51c..79008008 100644
--- a/docs/source/locale/sr@latin/LC_MESSAGES/develop.po
+++ b/docs/source/locale/sr@latin/LC_MESSAGES/develop.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -27,230 +27,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/sr@latin/LC_MESSAGES/features.po b/docs/source/locale/sr@latin/LC_MESSAGES/features.po
index 29841dd8..e71451fb 100644
--- a/docs/source/locale/sr@latin/LC_MESSAGES/features.po
+++ b/docs/source/locale/sr@latin/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/sr@latin/LC_MESSAGES/help.po b/docs/source/locale/sr@latin/LC_MESSAGES/help.po
index d965eb13..d1eb81e9 100644
--- a/docs/source/locale/sr@latin/LC_MESSAGES/help.po
+++ b/docs/source/locale/sr@latin/LC_MESSAGES/help.po
@@ -8,65 +8,113 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
-msgstr ""
-
-#: ../../source/help.rst:9
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/sr@latin/LC_MESSAGES/install.po b/docs/source/locale/sr@latin/LC_MESSAGES/install.po
index a2f5b321..640c688c 100644
--- a/docs/source/locale/sr@latin/LC_MESSAGES/install.po
+++ b/docs/source/locale/sr@latin/LC_MESSAGES/install.po
@@ -8,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -31,113 +31,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/sr@latin/LC_MESSAGES/security.po b/docs/source/locale/sr@latin/LC_MESSAGES/security.po
index 13d11a17..79923cda 100644
--- a/docs/source/locale/sr@latin/LC_MESSAGES/security.po
+++ b/docs/source/locale/sr@latin/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/sr@latin/LC_MESSAGES/tor.po b/docs/source/locale/sr@latin/LC_MESSAGES/tor.po
index a4d227cd..f8716f64 100644
--- a/docs/source/locale/sr@latin/LC_MESSAGES/tor.po
+++ b/docs/source/locale/sr@latin/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/sv/LC_MESSAGES/advanced.po b/docs/source/locale/sv/LC_MESSAGES/advanced.po
index c3847657..8b9457ea 100644
--- a/docs/source/locale/sv/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/sv/LC_MESSAGES/advanced.po
@@ -8,104 +8,103 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -113,115 +112,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/sv/LC_MESSAGES/develop.po b/docs/source/locale/sv/LC_MESSAGES/develop.po
index f20ff51c..79008008 100644
--- a/docs/source/locale/sv/LC_MESSAGES/develop.po
+++ b/docs/source/locale/sv/LC_MESSAGES/develop.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -27,230 +27,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/sv/LC_MESSAGES/features.po b/docs/source/locale/sv/LC_MESSAGES/features.po
index 29841dd8..e71451fb 100644
--- a/docs/source/locale/sv/LC_MESSAGES/features.po
+++ b/docs/source/locale/sv/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/sv/LC_MESSAGES/help.po b/docs/source/locale/sv/LC_MESSAGES/help.po
index d965eb13..d1eb81e9 100644
--- a/docs/source/locale/sv/LC_MESSAGES/help.po
+++ b/docs/source/locale/sv/LC_MESSAGES/help.po
@@ -8,65 +8,113 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
-msgstr ""
-
-#: ../../source/help.rst:9
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/sv/LC_MESSAGES/install.po b/docs/source/locale/sv/LC_MESSAGES/install.po
index a2f5b321..640c688c 100644
--- a/docs/source/locale/sv/LC_MESSAGES/install.po
+++ b/docs/source/locale/sv/LC_MESSAGES/install.po
@@ -8,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -31,113 +31,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/sv/LC_MESSAGES/security.po b/docs/source/locale/sv/LC_MESSAGES/security.po
index 13d11a17..79923cda 100644
--- a/docs/source/locale/sv/LC_MESSAGES/security.po
+++ b/docs/source/locale/sv/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/sv/LC_MESSAGES/tor.po b/docs/source/locale/sv/LC_MESSAGES/tor.po
index a4d227cd..f8716f64 100644
--- a/docs/source/locale/sv/LC_MESSAGES/tor.po
+++ b/docs/source/locale/sv/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/te/LC_MESSAGES/advanced.po b/docs/source/locale/te/LC_MESSAGES/advanced.po
index c3847657..8b9457ea 100644
--- a/docs/source/locale/te/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/te/LC_MESSAGES/advanced.po
@@ -8,104 +8,103 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -113,115 +112,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/te/LC_MESSAGES/develop.po b/docs/source/locale/te/LC_MESSAGES/develop.po
index f20ff51c..79008008 100644
--- a/docs/source/locale/te/LC_MESSAGES/develop.po
+++ b/docs/source/locale/te/LC_MESSAGES/develop.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -27,230 +27,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/te/LC_MESSAGES/features.po b/docs/source/locale/te/LC_MESSAGES/features.po
index 29841dd8..e71451fb 100644
--- a/docs/source/locale/te/LC_MESSAGES/features.po
+++ b/docs/source/locale/te/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/te/LC_MESSAGES/help.po b/docs/source/locale/te/LC_MESSAGES/help.po
index d965eb13..d1eb81e9 100644
--- a/docs/source/locale/te/LC_MESSAGES/help.po
+++ b/docs/source/locale/te/LC_MESSAGES/help.po
@@ -8,65 +8,113 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
-msgstr ""
-
-#: ../../source/help.rst:9
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/te/LC_MESSAGES/install.po b/docs/source/locale/te/LC_MESSAGES/install.po
index a2f5b321..640c688c 100644
--- a/docs/source/locale/te/LC_MESSAGES/install.po
+++ b/docs/source/locale/te/LC_MESSAGES/install.po
@@ -8,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -31,113 +31,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/te/LC_MESSAGES/security.po b/docs/source/locale/te/LC_MESSAGES/security.po
index 13d11a17..79923cda 100644
--- a/docs/source/locale/te/LC_MESSAGES/security.po
+++ b/docs/source/locale/te/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/te/LC_MESSAGES/tor.po b/docs/source/locale/te/LC_MESSAGES/tor.po
index a4d227cd..f8716f64 100644
--- a/docs/source/locale/te/LC_MESSAGES/tor.po
+++ b/docs/source/locale/te/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/tr/LC_MESSAGES/advanced.po b/docs/source/locale/tr/LC_MESSAGES/advanced.po
index c3847657..8b9457ea 100644
--- a/docs/source/locale/tr/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/tr/LC_MESSAGES/advanced.po
@@ -8,104 +8,103 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -113,115 +112,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/tr/LC_MESSAGES/develop.po b/docs/source/locale/tr/LC_MESSAGES/develop.po
index f20ff51c..79008008 100644
--- a/docs/source/locale/tr/LC_MESSAGES/develop.po
+++ b/docs/source/locale/tr/LC_MESSAGES/develop.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -27,230 +27,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/tr/LC_MESSAGES/features.po b/docs/source/locale/tr/LC_MESSAGES/features.po
index 29841dd8..e71451fb 100644
--- a/docs/source/locale/tr/LC_MESSAGES/features.po
+++ b/docs/source/locale/tr/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/tr/LC_MESSAGES/help.po b/docs/source/locale/tr/LC_MESSAGES/help.po
index 103b283e..2ab7a93c 100644
--- a/docs/source/locale/tr/LC_MESSAGES/help.po
+++ b/docs/source/locale/tr/LC_MESSAGES/help.po
@@ -7,83 +7,91 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-10-07 06:22+0000\n"
"Last-Translator: Oğuz Ersen <oguzersen@protonmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: tr\n"
+"Language-Team: tr <LL@li.org>\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.3-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr "Yardım Alma"
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
-msgstr ""
-"OnionShare ile ilgili yardıma ihtiyacınız varsa, lütfen aşağıdaki "
-"talimatları izleyin."
-
-#: ../../source/help.rst:7
-msgid "Read this website"
+#: ../../source/help.rst:5
+#, fuzzy
+msgid "Read This Website"
msgstr "Bu web sitesini okuyun"
-#: ../../source/help.rst:9
+#: ../../source/help.rst:7
+#, fuzzy
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
"Bu web sitesi, OnionShare'in nasıl kullanılacağına dair talimatlarla "
-"doludur. Sorularınıza cevap verip vermediğini görmek için önce tüm bölümleri "
-"gözden geçirin."
+"doludur. Sorularınıza cevap verip vermediğini görmek için önce tüm "
+"bölümleri gözden geçirin."
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+#, fuzzy
+msgid "Check the GitHub Issues"
msgstr "GitHub sorunlarına bakın"
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
+#, fuzzy
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
"Bu web sitesinde bir çözüm bulamazsanız, lütfen `GitHub sorunlarına "
"<https://github.com/micahflee/onionshare/issues>`_ bakın. Bir başkasının "
-"aynı sorunla karşılaşması ve bunu geliştiricilere iletmesi, hatta bir çözüm "
-"göndermesi mümkündür."
+"aynı sorunla karşılaşması ve bunu geliştiricilere iletmesi, hatta bir "
+"çözüm göndermesi mümkündür."
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+#, fuzzy
+msgid "Submit an Issue Yourself"
msgstr "Kendiniz bir sorun gönderin"
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
+#, fuzzy
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
"Sorununuza bir çözüm bulamazsanız ya da bir soru sormak veya yeni bir "
-"özellik önermek istiyorsanız, lütfen `bir sorun gönderin <https://github.com/"
-"micahflee/onionshare/issues/new>`_. Bunun için `bir GitHub hesabı "
-"oluşturulması <https://help.github.com/articles/"
-"signing-up-for-a-new-github-account/>`_ gerekir."
+"özellik önermek istiyorsanız, lütfen `bir sorun gönderin "
+"<https://github.com/micahflee/onionshare/issues/new>`_. Bunun için `bir "
+"GitHub hesabı oluşturulması <https://help.github.com/articles/signing-up-"
+"for-a-new-github-account/>`_ gerekir."
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+#, fuzzy
+msgid "Join our Keybase Team"
msgstr "Keybase ekibimize katılın"
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
+#, fuzzy
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
-"Projeyi tartışmak için kullandığımız Keybase ekibimize nasıl katılacağınıza "
-"ilişkin talimatlar için :ref:`collaborating` bölümüne bakın."
+"Projeyi tartışmak için kullandığımız Keybase ekibimize nasıl "
+"katılacağınıza ilişkin talimatlar için :ref:`collaborating` bölümüne "
+"bakın."
+
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+#~ "OnionShare ile ilgili yardıma ihtiyacınız "
+#~ "varsa, lütfen aşağıdaki talimatları izleyin."
+
diff --git a/docs/source/locale/tr/LC_MESSAGES/install.po b/docs/source/locale/tr/LC_MESSAGES/install.po
index 620a9b71..b157b397 100644
--- a/docs/source/locale/tr/LC_MESSAGES/install.po
+++ b/docs/source/locale/tr/LC_MESSAGES/install.po
@@ -7,24 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-10-08 21:26+0000\n"
"Last-Translator: Oğuz Ersen <oguzersen@protonmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: tr\n"
+"Language-Team: tr <LL@li.org>\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.3-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr "Kurulum"
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+#, fuzzy
+msgid "Windows or macOS"
msgstr "Windows veya macOS'de kurulum"
#: ../../source/install.rst:7
@@ -35,150 +35,225 @@ msgstr ""
"Windows ve macOS için OnionShare'i `OnionShare web sitesinden "
"<https://onionshare.org/>`_ indirebilirsiniz."
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
-msgstr "Daha fazla güvenlik için :ref:`verifying_sigs` bölümüne bakın."
-
-#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+#: ../../source/install.rst:12
+#, fuzzy
+msgid "Install in Linux"
msgstr "Linux'te Flatpak ile kurulum"
-#: ../../source/install.rst:16
+#: ../../source/install.rst:14
msgid ""
"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-"Linux için OnionShare'i kurmanın çeşitli yolları vardır, ancak tavsiye "
-"edilen Flatpak paketini kullanmaktır. Flatpak her zaman en yeni "
-"bağımlılıkları kullanmanızı ve OnionShare'i yalıtılmış bir alanın içinde "
-"çalıştırmanızı sağlar."
-#: ../../source/install.rst:18
+#: ../../source/install.rst:17
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-"Linux dağıtımınız için `bu talimatları <https://flatpak.org/setup/>`_ "
-"izleyerek ``flatpak`` kurulu olduğundan ve Flathub deposunun eklendiğinden "
-"emin olun."
-#: ../../source/install.rst:20
+#: ../../source/install.rst:19
+#, fuzzy
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
+msgstr ""
+"Ardından, `buradaki talimatları "
+"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_ izleyerek "
+"Flathub'dan OnionShare'i kurun."
+
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
msgstr ""
-"Ardından, `buradaki talimatları <https://flathub.org/apps/details/org."
-"onionshare.OnionShare>`_ izleyerek Flathub'dan OnionShare'i kurun."
-#: ../../source/install.rst:25
+#: ../../source/install.rst:23
+msgid ""
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
+msgstr ""
+
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr "PGP imzalarını doğrulama"
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-"İndirdiğiniz Windows, macOS veya kaynak paketin uygun olduğundan ve "
-"değiştirilmediğinden PGP imzasını doğrulayarak emin olabilirsiniz. Windows "
-"ve macOS için bu adım isteğe bağlıdır ve ek koruma sağlar: kurucular ayrıca "
-"işletim sistemine özgü imzalarını da içerir ve isterseniz yalnızca bunlara "
-"güvenebilirsiniz."
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr "İmzalama anahtarı"
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-"Windows, macOS ve kaynak paketleri, ana geliştirici Micah Lee tarafından "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73`` parmak izine sahip PGP ortak "
-"anahtarını kullanarak imzalanmıştır. Micah'ın anahtarını `keys.openpgp.org "
-"anahtar sunucusundan <https://keys.openpgp.org/vks/v1/by-fingerprint/"
-"927F419D7EC82C2F149C1BD1403C2657CD994F73>`_ indirebilirsiniz."
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
+#, fuzzy
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-"İmzaları doğrulamak için GnuPG'nin kurulu olması gerekir. MacOS için `"
-"GPGTools <https://gpgtools.org/>`_, Windows için `Gpg4win <https://www."
-"gpg4win.org/>`_ kullanmak isteyebilirsiniz."
+"İmzaları doğrulamak için GnuPG'nin kurulu olması gerekir. MacOS için "
+"`GPGTools <https://gpgtools.org/>`_, Windows için `Gpg4win "
+"<https://www.gpg4win.org/>`_ kullanmak isteyebilirsiniz."
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr "İmzalar"
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
+#, fuzzy
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-"İmzalara (``.asc`` dosyaları) ek olarak Windows, macOS ve kaynak paketlerini "
-"https://onionshare.org/dist/ adresindeki OnionShare'in her sürümü için "
-"adlandırılan klasörlerin yanı sıra `GitHub Yayınlar sayfasında "
-"<https://github.com/micahflee/onionshare/releases>`_ da bulabilirsiniz."
+"İmzalara (``.asc`` dosyaları) ek olarak Windows, macOS ve kaynak "
+"paketlerini https://onionshare.org/dist/ adresindeki OnionShare'in her "
+"sürümü için adlandırılan klasörlerin yanı sıra `GitHub Yayınlar "
+"sayfasında <https://github.com/micahflee/onionshare/releases>`_ da "
+"bulabilirsiniz."
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr "Doğrulama"
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
+#, fuzzy
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
"Micah'ın ortak anahtarını GnuPG anahtar zincirinize aktardıktan, ikili "
"dosyayı ve ``.asc`` imzasını indirdikten sonra, macOS için ikili dosyayı "
"terminalde aşağıdaki şekilde doğrulayabilirsiniz::"
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+#, fuzzy
+msgid "Or for Windows, in a command-prompt like this::"
msgstr "Veya Windows için komut isteminde aşağıdaki gibi::"
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+#, fuzzy
+msgid "The expected output looks like this::"
msgstr "Aşağıdakine benzer bir çıktı alınması beklenir::"
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
+#, fuzzy
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-"'Good signature from' görmüyorsanız dosyanın bütünlüğüyle ilgili bir sorun ("
-"kötü niyetli veya başka türlü) olabilir ve belki de paketi kurmamanız "
-"gerekir. (Yukarıda gösterilen WARNING paketle ilgili bir sorun değildir: "
-"yalnızca Micah'ın PGP anahtarıyla ilgili herhangi bir 'güven' düzeyi "
-"tanımlamadığınız anlamına gelir.)"
+"'Good signature from' görmüyorsanız dosyanın bütünlüğüyle ilgili bir "
+"sorun (kötü niyetli veya başka türlü) olabilir ve belki de paketi "
+"kurmamanız gerekir. (Yukarıda gösterilen WARNING paketle ilgili bir sorun"
+" değildir: yalnızca Micah'ın PGP anahtarıyla ilgili herhangi bir 'güven' "
+"düzeyi tanımlamadığınız anlamına gelir.)"
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
+#, fuzzy
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
-"PGP imzalarının doğrulanması hakkında daha fazla bilgi edinmek istiyorsanız, "
-"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ ve `"
-"Tor Projesi <https://2019.www.torproject.org/docs/verifying-signatures.html."
-"en>`_ kılavuzları yardımcı olabilir."
+"PGP imzalarının doğrulanması hakkında daha fazla bilgi edinmek "
+"istiyorsanız, `Qubes OS <https://www.qubes-os.org/security/verifying-"
+"signatures/>`_ ve `Tor Projesi <https://2019.www.torproject.org/docs"
+"/verifying-signatures.html.en>`_ kılavuzları yardımcı olabilir."
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr "Daha fazla güvenlik için :ref:`verifying_sigs` bölümüne bakın."
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+#~ "Linux için OnionShare'i kurmanın çeşitli "
+#~ "yolları vardır, ancak tavsiye edilen "
+#~ "Flatpak paketini kullanmaktır. Flatpak her "
+#~ "zaman en yeni bağımlılıkları kullanmanızı "
+#~ "ve OnionShare'i yalıtılmış bir alanın "
+#~ "içinde çalıştırmanızı sağlar."
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+#~ "Linux dağıtımınız için `bu talimatları "
+#~ "<https://flatpak.org/setup/>`_ izleyerek ``flatpak`` "
+#~ "kurulu olduğundan ve Flathub deposunun "
+#~ "eklendiğinden emin olun."
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+#~ "İndirdiğiniz Windows, macOS veya kaynak "
+#~ "paketin uygun olduğundan ve "
+#~ "değiştirilmediğinden PGP imzasını doğrulayarak "
+#~ "emin olabilirsiniz. Windows ve macOS "
+#~ "için bu adım isteğe bağlıdır ve ek"
+#~ " koruma sağlar: kurucular ayrıca işletim"
+#~ " sistemine özgü imzalarını da içerir "
+#~ "ve isterseniz yalnızca bunlara "
+#~ "güvenebilirsiniz."
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+#~ "Windows, macOS ve kaynak paketleri, ana"
+#~ " geliştirici Micah Lee tarafından "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73`` parmak izine"
+#~ " sahip PGP ortak anahtarını kullanarak "
+#~ "imzalanmıştır. Micah'ın anahtarını `keys.openpgp.org"
+#~ " anahtar sunucusundan <https://keys.openpgp.org/vks/v1"
+#~ "/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_ "
+#~ "indirebilirsiniz."
+
diff --git a/docs/source/locale/tr/LC_MESSAGES/security.po b/docs/source/locale/tr/LC_MESSAGES/security.po
index 13d11a17..79923cda 100644
--- a/docs/source/locale/tr/LC_MESSAGES/security.po
+++ b/docs/source/locale/tr/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/tr/LC_MESSAGES/tor.po b/docs/source/locale/tr/LC_MESSAGES/tor.po
index a4d227cd..f8716f64 100644
--- a/docs/source/locale/tr/LC_MESSAGES/tor.po
+++ b/docs/source/locale/tr/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/uk/LC_MESSAGES/advanced.po b/docs/source/locale/uk/LC_MESSAGES/advanced.po
index 2aa4cb0f..85f5013f 100644
--- a/docs/source/locale/uk/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/uk/LC_MESSAGES/advanced.po
@@ -7,42 +7,38 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-09-20 23:40+0000\n"
"Last-Translator: ihor_ck <igor_ck@outlook.com>\n"
-"Language-Team: none\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Weblate 4.3-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+#, fuzzy
+msgid "Advanced Usage"
msgstr "Розширене використання"
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+#, fuzzy
+msgid "Save Tabs"
msgstr "Збереження вкладок"
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-"Типово, все в OnionShare є тимчасовим. Тільки-но ви закриєте вкладку "
-"OnionShare, її адреса більше не існує і не може бути використана знову. "
-"Але іноді вам може знадобитися служба OnionShare, яка буде постійною. "
-"Наприклад, це буде корисно, якщо ви хочете розмістити вебсайт, який може "
-"зберегти ту саму URL-адресу, навіть якщо ви перезавантажите комп’ютер."
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
@@ -53,19 +49,19 @@ msgstr ""
"сервера. Коли вкладку збережено, ліворуч від стану сервера з’являється "
"фіолетова піктограма у вигляді шпильки."
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
+#, fuzzy
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
"Коли ви вийдете з OnionShare, а потім знову відкриєте його, збережені "
"вкладки почнуть відкриватися. Вам доведеться власноруч запускати кожну "
"службу, але коли ви це зробите, вони запустяться з тієї ж адреси "
"OnionShare і з тим же паролем."
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
@@ -73,41 +69,32 @@ msgstr ""
"Якщо ви збережете вкладку, копія таємного ключа служби onion цієї вкладки"
" зберігатиметься на вашому комп’ютері з налаштуваннями OnionShare."
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
-msgstr "Вимкнення паролів"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
+msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-"Типово усі служби OnionShare захищено іменем користувача `onionshare` та "
-"випадково сформованим паролем. Якщо хтось зробить 20 неправильних спроб "
-"введення пароля, вашу службу onion буди зупинено автоматично, щоб "
-"запобігти грубому нападу на службу OnionShare."
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-"Але іноді вам може знадобитися, щоб ваша служба OnionShare була "
-"загальнодоступною. Наприклад, якщо ви хочете налаштувати службу отримання"
-" OnionShare, щоб інші могли безпечно та анонімно надсилати вам файли. У "
-"цьому випадку краще взагалі вимкнути пароль. Якщо ви цього не зробите, "
-"хтось може змусити ваш сервер зупинитися, просто зробивши 20 неправильних"
-" спроб введення паролю, навіть якщо вони знають правильний пароль."
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
+#, fuzzy
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
@@ -115,17 +102,19 @@ msgstr ""
"використовувати пароль\" перед запуском сервера. Тоді сервер буде "
"загальнодоступним і не матиме пароля."
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+#, fuzzy
+msgid "Scheduled Times"
msgstr "Запланований час"
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
+#, fuzzy
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
"OnionShare підтримує планування, коли саме служба повинна запускатися та "
"зупинятися. Перш ніж запускати сервер, натисніть \"Показати розширені "
@@ -133,19 +122,20 @@ msgstr ""
" у запланований час\", \"Зупинити службу onion у запланований час\" або "
"обидва і встановіть бажані дати та час."
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
+#, fuzzy
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
"Якщо ви запланували запуск послуги в майбутньому, після натискання кнопки"
" запуску ви побачите таймер зі зворотним відліком до моменту запуску. "
"Якщо ви запланували його зупинку в майбутньому, після його запуску ви "
"побачите таймер з відліком часу, коли його буде автоматично зупинено."
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -157,11 +147,12 @@ msgstr ""
"певний час у майбутньому, якщо з вами щось станеться. Якщо з вами нічого "
"не відбувається, ви можете вимкнути службу до запланованого запуску."
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
+#, fuzzy
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
"**Планування автоматичної зупинки служби OnionShare може бути корисним "
@@ -169,83 +160,63 @@ msgstr ""
" документами й буди певними, що вони не доступні в Інтернеті впродовж "
"більше кількох днів."
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+#, fuzzy
+msgid "Command-line Interface"
msgstr "Інтерфейс командного рядка"
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
+#, fuzzy
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr "Окрім графічного інтерфейсу, OnionShare має інтерфейс командного рядка."
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr "Linux"
-
-#: ../../source/advanced.rst:53
+#: ../../source/advanced.rst:60
msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
-"Якщо встановити OnionShare за допомогою пакунку Flatpak, на жаль, "
-"інтерфейс командного рядка не підтримуватиметься."
-#: ../../source/advanced.rst:55
+#: ../../source/advanced.rst:64
msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-"Якщо ви встановили OnionShare за допомогою пакунка операційної системи, "
-"ви можете просто запустити ``onionshare`` з термінала."
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr "macOS"
-#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-"Зробіть символічне посилання на двійковий OnionShare у командному рядку "
-"подібно до цього ::"
-
-#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr "Тепер ви можете запустити ``onionshare`` з термінала."
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
-msgstr "Windows"
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
-msgstr "Інтерфейс командного рядка не підтримується в Windows."
-
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
+#, fuzzy
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-"Якщо ви все ж хочете ним скористатися, ви можете налаштувати середовище "
-"розробки Windows (подробиці :ref:`starting_development`), а потім "
-"запустити його в командному рядку::"
+"Якщо ви встановили OnionShare за допомогою пакунка операційної системи, "
+"ви можете просто запустити ``onionshare`` з термінала."
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr "Користування"
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+#, fuzzy
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
"Ви можете переглянути документацію командного рядка, запустивши "
"``onionshare --help``::"
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+#, fuzzy
+msgid "Legacy Addresses"
msgstr "Застарілі адреси"
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
@@ -253,28 +224,31 @@ msgstr ""
"Типово, OnionShare використовує служби onion Tor v3. Це сучасні адреси "
"onion, що мають 56 символів, наприклад::"
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
+#, fuzzy
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
"Але він все ще підтримує адреси onion v2, старий тип адрес onion, які "
"мають 16 символів, наприклад::"
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
+#, fuzzy
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
"OnionShare називає адреси onion v2 \"застарілими адресами\". Адреси onion"
" v3 безпечніші, а вживання старих адрес не рекомендовано."
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
+#, fuzzy
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
@@ -286,13 +260,129 @@ msgstr ""
"режим у цій вкладці. Натомість ви повинні запустити окрему службу в "
"окремій вкладці."
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
+#, fuzzy
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
"Проєкт Tor планує `повністю припинити роботу службами onion v2 "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ 15 жовтня 2021 "
"р., а застарілі служби onion також скоро буде вилучено з OnionShare."
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+#~ "Типово, все в OnionShare є тимчасовим."
+#~ " Тільки-но ви закриєте вкладку OnionShare,"
+#~ " її адреса більше не існує і не"
+#~ " може бути використана знову. Але "
+#~ "іноді вам може знадобитися служба "
+#~ "OnionShare, яка буде постійною. Наприклад, "
+#~ "це буде корисно, якщо ви хочете "
+#~ "розмістити вебсайт, який може зберегти "
+#~ "ту саму URL-адресу, навіть якщо ви "
+#~ "перезавантажите комп’ютер."
+
+#~ msgid "Disable passwords"
+#~ msgstr "Вимкнення паролів"
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+#~ "Типово усі служби OnionShare захищено "
+#~ "іменем користувача `onionshare` та випадково"
+#~ " сформованим паролем. Якщо хтось зробить"
+#~ " 20 неправильних спроб введення пароля, "
+#~ "вашу службу onion буди зупинено "
+#~ "автоматично, щоб запобігти грубому нападу "
+#~ "на службу OnionShare."
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+#~ "Але іноді вам може знадобитися, щоб "
+#~ "ваша служба OnionShare була загальнодоступною."
+#~ " Наприклад, якщо ви хочете налаштувати "
+#~ "службу отримання OnionShare, щоб інші "
+#~ "могли безпечно та анонімно надсилати вам"
+#~ " файли. У цьому випадку краще взагалі"
+#~ " вимкнути пароль. Якщо ви цього не"
+#~ " зробите, хтось може змусити ваш "
+#~ "сервер зупинитися, просто зробивши 20 "
+#~ "неправильних спроб введення паролю, навіть "
+#~ "якщо вони знають правильний пароль."
+
+#~ msgid "Linux"
+#~ msgstr "Linux"
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+#~ "Якщо встановити OnionShare за допомогою "
+#~ "пакунку Flatpak, на жаль, інтерфейс "
+#~ "командного рядка не підтримуватиметься."
+
+#~ msgid "macOS"
+#~ msgstr "macOS"
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+#~ "Зробіть символічне посилання на двійковий "
+#~ "OnionShare у командному рядку подібно до"
+#~ " цього ::"
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr "Тепер ви можете запустити ``onionshare`` з термінала."
+
+#~ msgid "Windows"
+#~ msgstr "Windows"
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr "Інтерфейс командного рядка не підтримується в Windows."
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+#~ "Якщо ви все ж хочете ним "
+#~ "скористатися, ви можете налаштувати середовище"
+#~ " розробки Windows (подробиці "
+#~ ":ref:`starting_development`), а потім запустити "
+#~ "його в командному рядку::"
+
diff --git a/docs/source/locale/uk/LC_MESSAGES/develop.po b/docs/source/locale/uk/LC_MESSAGES/develop.po
index c60595af..f3c46431 100644
--- a/docs/source/locale/uk/LC_MESSAGES/develop.po
+++ b/docs/source/locale/uk/LC_MESSAGES/develop.po
@@ -7,18 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-09-20 02:39+0000\n"
"Last-Translator: ihor_ck <igor_ck@outlook.com>\n"
-"Language-Team: none\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Weblate 4.3-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -30,127 +29,114 @@ msgstr "Співпраця"
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-"OnionShare має відкриту команду Keybase, яку ми використовуємо для "
-"обговорення проєкту, включно з питаннями, обміном ідеями та дизайном, "
-"плануванням подальшого розвитку. (Це також простий спосіб надсилати захищені "
-"наскрізним шифруванням прямі повідомлення іншим у спільноті OnionShare, як-"
-"от адреси OnionShare.) Щоб використовувати Keybase, потрібно завантажити "
-"програму `Keybase app <https://keybase.io/download>`_, створіть обліковий "
-"запис та `приєднайтеся до цієї команди <https://keybase.io/team/onionshare>`"
-"_. У програмі перейдіть до Команди, натисніть \"Приєднатися до команди\" та "
-"введіть \"onionshare\"."
-
-#: ../../source/develop.rst:11
+
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-"OnionShare також має `список розсилки <https://lists.riseup.net/www/"
-"subscribe/onionshare-dev>` _ для розробників та дизайнерів для обговорення "
-"проєкту."
+"OnionShare також має `список розсилки "
+"<https://lists.riseup.net/www/subscribe/onionshare-dev>` _ для "
+"розробників та дизайнерів для обговорення проєкту."
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+#, fuzzy
+msgid "Contributing Code"
msgstr "Внесок до кодової бази"
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
+#, fuzzy
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-"Джерельний код OnionShare знаходиться у цьому сховищі git: https://github."
-"com/micahflee/onionshare"
+"Джерельний код OnionShare знаходиться у цьому сховищі git: "
+"https://github.com/micahflee/onionshare"
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
+#, fuzzy
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-"Якщо ви хочете допомогти кодом OnionShare, приєднайтеся до команди Keybase і "
-"поставте питання про те, над чим ви думаєте працювати. Ви також повинні "
-"переглянути всі `відкриті запити <https://github.com/micahflee/onionshare/"
-"issues>`_ на GitHub, щоб побачити, чи є такі, які ви хотіли б розробляти."
-
-#: ../../source/develop.rst:20
+"Якщо ви хочете допомогти кодом OnionShare, приєднайтеся до команди "
+"Keybase і поставте питання про те, над чим ви думаєте працювати. Ви також"
+" повинні переглянути всі `відкриті запити "
+"<https://github.com/micahflee/onionshare/issues>`_ на GitHub, щоб "
+"побачити, чи є такі, які ви хотіли б розробляти."
+
+#: ../../source/develop.rst:22
+#, fuzzy
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
"Коли ви будете готові внести код, відкрийте запит надсилання до сховища "
-"GitHub і один із супровідників проєкту перегляне його та, можливо, поставить "
-"питання, попросить змінити щось, відхилить його або об’єднає з проєктом."
+"GitHub і один із супровідників проєкту перегляне його та, можливо, "
+"поставить питання, попросить змінити щось, відхилить його або об’єднає з "
+"проєктом."
-#: ../../source/develop.rst:25
-msgid "Starting development"
+#: ../../source/develop.rst:27
+#, fuzzy
+msgid "Starting Development"
msgstr "Початок розробки"
-#: ../../source/develop.rst:27
+#: ../../source/develop.rst:29
msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
-"OnionShare розроблено на Python. Спочатку клонуйте сховище git за адресою "
-"https://github.com/micahflee/onionshare/, а потім перегляньте настанови у "
-"файлі ``BUILD.md``."
-
-#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr "Цей файл містить необхідні технічні настанови та команди:"
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
-msgstr "Встановіть залежності для вашої платформи"
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr "Запустіть OnionShare з джерельного коду без створення пакунка"
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr "Створення пакунків"
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
-msgstr "Випуск версії OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
+msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr "Поради щодо зневадження"
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr "Детальний режим"
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
+#, fuzzy
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
"Під час розробки зручно запускати OnionShare з термінала та додати до "
"команди прапор ``--verbose`` (або ``-v``). До термінала виводитиметься "
-"багато корисних повідомлень, наприклад, про ініціалізацію певних об'єктів, "
-"про події (наприклад, натискання кнопок, збереження або перезавантаження "
-"параметрів) та інші подробиці для зневаджування. Наприклад::"
+"багато корисних повідомлень, наприклад, про ініціалізацію певних "
+"об'єктів, про події (наприклад, натискання кнопок, збереження або "
+"перезавантаження параметрів) та інші подробиці для зневаджування. "
+"Наприклад::"
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
@@ -158,171 +144,286 @@ msgstr ""
"Ви можете додати власні повідомлення про зневадження, запустивши метод "
"``Common.log`` з ``onionshare/common.py``. Наприклад::"
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
+#, fuzzy
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-"Це може бути корисно для вивчення ланцюжка подій, що відбуваються під час "
-"користування програмою, або значень певних змінних до та після того, як ними "
-"маніпулюють."
+"Це може бути корисно для вивчення ланцюжка подій, що відбуваються під час"
+" користування програмою, або значень певних змінних до та після того, як "
+"ними маніпулюють."
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+#, fuzzy
+msgid "Local Only"
msgstr "Лише локальні"
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-"Tor повільний і часто під час розробки зручно взагалі знехтувати початковими "
-"службами onion. Ви можете зробити це за допомогою прапора ``--local-only``. "
-"Наприклад::"
+"Tor повільний і часто під час розробки зручно взагалі знехтувати "
+"початковими службами onion. Ви можете зробити це за допомогою прапора "
+"``--local-only``. Наприклад::"
-#: ../../source/develop.rst:157
+#: ../../source/develop.rst:164
+#, fuzzy
msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
"У цьому випадку ви завантажуєте URL-адресу ``http://onionshare:eject-"
"snack@127.0.0.1:17614`` у звичайному переглядачі, як-от Firefox, замість "
"користування Tor Browser."
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr "Зневадження на Windows"
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-"Якщо ви хочете отримати вихідні дані зневадження з ``onionshare-gui.exe`` у "
-"Windows, вам потрібно змінити ``install\\pyinstaller.spec`` й змінити "
-"``console=False`` на ``console=True``."
-
-#: ../../source/develop.rst:164
-msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
-msgstr ""
-"Потім перезберіть EXE за допомогою ``install\\build_exe.bat`` (можливо, вам "
-"доведеться закоментувати команди ``signtool`` у файлах ``build_exe.bat`` та "
-"``onionshare.nsi``, відповідно до настанов ``BUILD.md``)."
-
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
-msgstr ""
-"Після цього ви можете запустити ``onionshare-gui.exe -v`` з командного "
-"рядка, щоб побачити подробиці зневадження."
-
-#: ../../source/develop.rst:169
-msgid "Contributing translations"
+#: ../../source/develop.rst:167
+#, fuzzy
+msgid "Contributing Translations"
msgstr "Допомога з перекладами"
-#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
-msgstr ""
-"Більшість програм OnionShare можна перекласти. Ви можете допомогти зробити "
-"його простішим у користуванні та звичнішим і приємнішим для людей по всьому "
-"світу. Лабораторія локалізації має `документацію щодо перекладу OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
-
-#: ../../source/develop.rst:173
+#: ../../source/develop.rst:169
msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
-"OnionShare використовує Weblate для відстеження перекладів. Ви можете "
-"переглянути проєкт OnionShare тут: https://hosted.weblate.org/projects/"
-"onionshare/"
-#: ../../source/develop.rst:175
-msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+#: ../../source/develop.rst:171
+#, fuzzy
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
"Щоб допомогти перекласти, створіть обліковий запис на Hosted Weblate і "
"почніть допомагати цьому проєкту."
-#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
+#: ../../source/develop.rst:174
+#, fuzzy
+msgid "Suggestions for Original English Strings"
msgstr "Пропозиції для джерельних рядків англійською"
-#: ../../source/develop.rst:180
+#: ../../source/develop.rst:176
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
-"Іноді джерельні англійські рядки можна вдосконалити, щоб спростити їхній "
-"переклад іншими мовами."
-#: ../../source/develop.rst:182
+#: ../../source/develop.rst:178
msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
-"Якщо маєте пропозиції щодо поліпшення англійського рядка, відкрийте "
-"пропозицію на GitHub, а не коментуйте на Weblate. Це гарантує, що "
-"розробники, що працюють над проєктом, напевно побачать пропозицію та зможуть "
-"потенційно змінити рядок за допомогою звичайних процесів перегляду коду."
-#: ../../source/develop.rst:185
-msgid "Status of translations"
+#: ../../source/develop.rst:182
+#, fuzzy
+msgid "Status of Translations"
msgstr "Стан перекладів"
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
+#, fuzzy
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-"Ось поточний стан перекладу. Якщо ви хочете розпочати переклад мовою, якої "
-"тут немає, будь ласка, напишіть нам до списку розсилки: onionshare-dev@lists."
-"riseup.net"
-
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr "Перекладіть файл .desktop"
+"Ось поточний стан перекладу. Якщо ви хочете розпочати переклад мовою, "
+"якої тут немає, будь ласка, напишіть нам до списку розсилки: onionshare-"
+"dev@lists.riseup.net"
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr "Ви також можете перекласти файл ``install/onionshare.desktop``."
-
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
-"Дублюйте рядок, який починається на ``Comment=``. Додайте код мови до нового "
-"рядка, щоб він став ``Comment[lang]=`` (lang повинен бути вашою мовою). Ви "
-"можете побачити, які мовні коди використовуються для перекладу, переглянувши "
-"назви файлів ::"
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr "Зробіть те ж саме для інших неперекладених рядків."
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
+#~ "OnionShare має відкриту команду Keybase, "
+#~ "яку ми використовуємо для обговорення "
+#~ "проєкту, включно з питаннями, обміном "
+#~ "ідеями та дизайном, плануванням подальшого "
+#~ "розвитку. (Це також простий спосіб "
+#~ "надсилати захищені наскрізним шифруванням "
+#~ "прямі повідомлення іншим у спільноті "
+#~ "OnionShare, як-от адреси OnionShare.) Щоб "
+#~ "використовувати Keybase, потрібно завантажити "
+#~ "програму `Keybase app "
+#~ "<https://keybase.io/download>`_, створіть обліковий "
+#~ "запис та `приєднайтеся до цієї команди"
+#~ " <https://keybase.io/team/onionshare>`_. У програмі "
+#~ "перейдіть до Команди, натисніть \"Приєднатися"
+#~ " до команди\" та введіть \"onionshare\"."
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ "OnionShare розроблено на Python. Спочатку "
+#~ "клонуйте сховище git за адресою "
+#~ "https://github.com/micahflee/onionshare/, а потім "
+#~ "перегляньте настанови у файлі ``BUILD.md``."
+
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr "Цей файл містить необхідні технічні настанови та команди:"
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr "Встановіть залежності для вашої платформи"
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr "Запустіть OnionShare з джерельного коду без створення пакунка"
+
+#~ msgid "Building packages"
+#~ msgstr "Створення пакунків"
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr "Випуск версії OnionShare"
+
+#~ msgid "Debugging in Windows"
+#~ msgstr "Зневадження на Windows"
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+#~ "Якщо ви хочете отримати вихідні дані "
+#~ "зневадження з ``onionshare-gui.exe`` у "
+#~ "Windows, вам потрібно змінити "
+#~ "``install\\pyinstaller.spec`` й змінити "
+#~ "``console=False`` на ``console=True``."
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+#~ "Потім перезберіть EXE за допомогою "
+#~ "``install\\build_exe.bat`` (можливо, вам доведеться"
+#~ " закоментувати команди ``signtool`` у "
+#~ "файлах ``build_exe.bat`` та ``onionshare.nsi``, "
+#~ "відповідно до настанов ``BUILD.md``)."
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+#~ "Після цього ви можете запустити "
+#~ "``onionshare-gui.exe -v`` з командного "
+#~ "рядка, щоб побачити подробиці зневадження."
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+#~ "Більшість програм OnionShare можна перекласти."
+#~ " Ви можете допомогти зробити його "
+#~ "простішим у користуванні та звичнішим і"
+#~ " приємнішим для людей по всьому "
+#~ "світу. Лабораторія локалізації має "
+#~ "`документацію щодо перекладу OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+#~ "OnionShare використовує Weblate для "
+#~ "відстеження перекладів. Ви можете переглянути"
+#~ " проєкт OnionShare тут: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+#~ "Іноді джерельні англійські рядки можна "
+#~ "вдосконалити, щоб спростити їхній переклад "
+#~ "іншими мовами."
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+#~ "Якщо маєте пропозиції щодо поліпшення "
+#~ "англійського рядка, відкрийте пропозицію на"
+#~ " GitHub, а не коментуйте на Weblate."
+#~ " Це гарантує, що розробники, що "
+#~ "працюють над проєктом, напевно побачать "
+#~ "пропозицію та зможуть потенційно змінити "
+#~ "рядок за допомогою звичайних процесів "
+#~ "перегляду коду."
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr "Перекладіть файл .desktop"
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr "Ви також можете перекласти файл ``install/onionshare.desktop``."
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+#~ "Дублюйте рядок, який починається на "
+#~ "``Comment=``. Додайте код мови до нового"
+#~ " рядка, щоб він став ``Comment[lang]=`` "
+#~ "(lang повинен бути вашою мовою). Ви "
+#~ "можете побачити, які мовні коди "
+#~ "використовуються для перекладу, переглянувши "
+#~ "назви файлів ::"
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr "Зробіть те ж саме для інших неперекладених рядків."
+
diff --git a/docs/source/locale/uk/LC_MESSAGES/features.po b/docs/source/locale/uk/LC_MESSAGES/features.po
index 7db18a70..bf92beeb 100644
--- a/docs/source/locale/uk/LC_MESSAGES/features.po
+++ b/docs/source/locale/uk/LC_MESSAGES/features.po
@@ -1,322 +1,430 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) Micah Lee, et al.
# This file is distributed under the same license as the OnionShare package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-09-20 02:39+0000\n"
"Last-Translator: ihor_ck <igor_ck@outlook.com>\n"
-"Language-Team: none\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"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Weblate 4.3-dev\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+#, fuzzy
+msgid "How OnionShare Works"
msgstr "Як працює OnionShare"
#: ../../source/features.rst:6
-msgid "OnionShare works by starting web servers locally on your own computer and making them accessible to other people as `Tor <https://www.torproject.org/>`_ `onion services <https://community.torproject.org/onion-services/>`_."
+#, fuzzy
+msgid ""
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
+"<https://community.torproject.org/onion-services/>`_."
msgstr ""
-"OnionShare працює, запускаючи вебсервери локально на вашому комп’ютері та "
-"роблячи їх доступними для інших людей як `Tor <https://www.torproject.org/>`"
-"_ `onion служби <https://community.torproject.org/onion-services/>`_."
+"OnionShare працює, запускаючи вебсервери локально на вашому комп’ютері та"
+" роблячи їх доступними для інших людей як `Tor "
+"<https://www.torproject.org/>`_ `onion служби "
+"<https://community.torproject.org/onion-services/>`_."
#: ../../source/features.rst:8
-msgid "By default, OnionShare web addresses are protected with a random password. A typical OnionShare address might look something like this::"
+msgid ""
+"By default, OnionShare web addresses are protected with a random "
+"password. A typical OnionShare address might look something like this::"
msgstr ""
"Типово, вебадреси OnionShare захищено випадковим паролем. Типова адреса "
"OnionShare може виглядати приблизно так::"
#: ../../source/features.rst:12
-msgid "You're responsible for securely sharing that URL using a communication channel of your choice like in an encrypted chat message, or using something less secure like a Twitter or Facebook message, depending on your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+#, fuzzy
+msgid ""
+"You're responsible for securely sharing that URL using a communication "
+"channel of your choice like in an encrypted chat message, or using "
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
"Ви несете відповідальність за безпечний доступ до цієї URL-адреси за "
-"допомогою вибраного вами каналу зв'язку, як-от у зашифрованому повідомленні "
-"чату, або за використання менш захищеного повідомлення, наприклад "
-"повідомлення Twitter або Facebook, залежно від вашої `моделі загрози "
-"<https://ssd.eff.org/en/module/your-security-plan>`_."
+"допомогою вибраного вами каналу зв'язку, як-от у зашифрованому "
+"повідомленні чату, або за використання менш захищеного повідомлення, "
+"наприклад повідомлення Twitter або Facebook, залежно від вашої `моделі "
+"загрози <https://ssd.eff.org/en/module/your-security-plan>`_."
#: ../../source/features.rst:14
-msgid "The people who you send the URL to must then copy and paste it into `Tor Browser <https://www.torproject.org/>`_ to access the OnionShare service."
+#, fuzzy
+msgid ""
+"The people you send the URL to then copy and paste it into their `Tor "
+"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
-"Люди, яким ви надсилаєте URL-адресу, повинні копіювати та вставити її до `"
-"Tor Browser <https://www.torproject.org/>`_, щоб отримати доступ до служби "
-"OnionShare."
+"Люди, яким ви надсилаєте URL-адресу, повинні копіювати та вставити її до "
+"`Tor Browser <https://www.torproject.org/>`_, щоб отримати доступ до "
+"служби OnionShare."
#: ../../source/features.rst:16
-msgid "With OnionShare, *your own computer is the web server*. If you run OnionShare on your laptop to send someone files, and then suspend your laptop before the files have been downloaded, the service will not be available until your laptop is unsuspended and connected to the internet again. OnionShare works best when working with people in real-time."
+msgid ""
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
-"За допомогою OnionShare *ваш власний комп'ютер є вебсервером*. Якщо ви "
-"запустили OnionShare на своєму ноутбуці, щоб надіслати комусь файли, а потім "
-"призупинили роботу ноутбука до того, як файли буде завантажено, служба буде "
-"недоступна, доки ваш ноутбук не буде увімкнено та знову під’єднано до "
-"Інтернету. OnionShare найкраще працює для роботи з людьми в режимі реального "
-"часу."
#: ../../source/features.rst:18
-msgid "Because your own computer is the web server, *no third party can access anything that happens in OnionShare*, not even the developers of OnionShare. It's completely private. And because OnionShare is based on Tor onion services too, it also protects your anonymity. See the :doc:`security design </security>` for more information."
+#, fuzzy
+msgid ""
+"Because your own computer is the web server, *no third party can access "
+"anything that happens in OnionShare*, not even the developers of "
+"OnionShare. It's completely private. And because OnionShare is based on "
+"Tor onion services too, it also protects your anonymity. See the "
+":doc:`security design </security>` for more info."
msgstr ""
"Оскільки ваш власний комп'ютер є вебсервером, *ніхто сторонній не може "
"отримати доступ до будь-чого, що відбувається в OnionShare*, навіть "
"розробники OnionShare. Це цілковито приватно. Оскільки OnionShare теж "
-"базується на onion службах Tor, вашу анонімність також захищено. Докладніше "
-"про це :doc:`security design </security>`."
+"базується на onion службах Tor, вашу анонімність також захищено. "
+"Докладніше про це :doc:`security design </security>`."
#: ../../source/features.rst:21
msgid "Share Files"
msgstr "Надсилання файлів"
#: ../../source/features.rst:23
-msgid "You can use OnionShare to securely and anonymously send files and folders to people. Just open a share tab, drag in the files and folders you wish to share, and click \"Start sharing\"."
+#, fuzzy
+msgid ""
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
"Ви можете використовувати OnionShare, щоб безпечно та анонімно надсилати "
-"файли та теки людям. Просто відкрийте вкладку спільного доступу, перетягніть "
-"файли та теки, якими хочете поділитися і натисніть \"Почати ділитися\"."
+"файли та теки людям. Просто відкрийте вкладку спільного доступу, "
+"перетягніть файли та теки, якими хочете поділитися і натисніть \"Почати "
+"ділитися\"."
-#: ../../source/features.rst:27
-#: ../../source/features.rst:91
-msgid "After you add files, you'll see some settings. Make sure you choose the setting you're interested in first before you start sharing."
+#: ../../source/features.rst:27 ../../source/features.rst:93
+#, fuzzy
+msgid ""
+"After you add files, you'll see some settings. Make sure you choose the "
+"setting you're interested in before you start sharing."
msgstr ""
-"Після додавання файлів з'являться параметри. Перш ніж почати ділитися, обов’"
-"язково виберіть параметр, який вам потрібен."
+"Після додавання файлів з'являться параметри. Перш ніж почати ділитися, "
+"обов’язково виберіть параметр, який вам потрібен."
#: ../../source/features.rst:31
-msgid "By default, as soon as someone finishes downloading your files, OnionShare will automatically stop the server, completely removing the website from the internet. If you want to allow multiple people to download these files, uncheck the \"Stop sharing after files have been sent (uncheck to allow downloading individual files)\" box."
+msgid ""
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-"Типово, як тільки хтось закінчує завантажувати ваші файли, OnionShare "
-"автоматично зупиняє сервер, повністю вилучивши вебсайт з Інтернету. Якщо ви "
-"хочете дозволити кільком людям завантажувати ці файли, приберіть позначку "
-"біля пункту \"Закрити доступ, коли файли надіслано (приберіть позначку, щоб "
-"дозволити завантаження окремих файлів)\"."
-#: ../../source/features.rst:33
-msgid "Also, if you uncheck this box, people will be able to download individual files that you share rather than a single compressed version of all of the files."
+#: ../../source/features.rst:34
+#, fuzzy
+msgid ""
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
"Крім того, якщо прибрати цю позначку, користувачі зможуть завантажувати "
"окремі файли, якими ви ділитесь, а не одну стиснуту версію всіх файлів."
-#: ../../source/features.rst:35
-msgid "When you're ready to share, click the \"Start sharing\" button. You can always click \"Stop sharing\", or quit OnionShare, to immediate take the website down. You can also click the up arrow icon in the top-right corner to show the history and progress of people downloading files from you."
-msgstr ""
-"Коли ви будете готові поділитися, натисніть кнопку \"Почати ділитися\". Ви "
-"завжди можете натиснути \"Зупинити надсилання\" або вийти з OnionShare, щоб "
-"негайно вимкнути вебсайт. Ви також можете натиснути піктограму зі стрілкою "
-"вгору у верхньому правому куті, щоб побачити історію та поступ надсилання "
-"файлів."
-
-#: ../../source/features.rst:39
-msgid "Now that you have a website that's sharing files, copy the address and send it to the person you want to receive the files. If the files need to stay secure, you should use an encrypted messaging app."
+#: ../../source/features.rst:36
+#, fuzzy
+msgid ""
+"When you're ready to share, click the \"Start sharing\" button. You can "
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
+msgstr ""
+"Коли ви будете готові поділитися, натисніть кнопку \"Почати ділитися\". "
+"Ви завжди можете натиснути \"Зупинити надсилання\" або вийти з "
+"OnionShare, щоб негайно вимкнути вебсайт. Ви також можете натиснути "
+"піктограму зі стрілкою вгору у верхньому правому куті, щоб побачити "
+"історію та поступ надсилання файлів."
+
+#: ../../source/features.rst:40
+msgid ""
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-"Тепер, коли у вас є вебсайт, з якого надсилаються файли, копіюйте адресу та "
-"надішліть її особі, якій ви хочете надіслати файли. Якщо файли повинні "
-"залишатися в безпеці, вам варто скористатися програмою зашифрованих "
-"повідомлень."
-#: ../../source/features.rst:41
-msgid "That person then must load the address in Tor Browser. After logging in with the random password that's included in the web address, they will be able to download the files directly from your computer by clicking the \"Download Files\" link in the corner."
+#: ../../source/features.rst:42
+#, fuzzy
+msgid ""
+"That person then must load the address in Tor Browser. After logging in "
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
"Потім ця особа повинна завантажити адресу в Tor Browser. Після входу за "
"випадковим паролем, який міститься у вебадресі, вони зможуть завантажити "
-"файли безпосередньо з вашого комп’ютера, натиснувши посилання \"Завантажити "
-"файли\" в кутку."
+"файли безпосередньо з вашого комп’ютера, натиснувши посилання "
+"\"Завантажити файли\" в кутку."
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr "Отримання файлів"
-#: ../../source/features.rst:48
-msgid "You can use OnionShare to let people anonymously upload files directly to your computer, essentially turning it into an anonymous dropbox. Open a receive tab, choose where you want files to get downloaded and other settings, and then click \"Start Receive Mode\"."
+#: ../../source/features.rst:49
+#, fuzzy
+msgid ""
+"You can use OnionShare to let people anonymously upload files directly to"
+" your computer, essentially turning it into an anonymous dropbox. Open a "
+"\"Receive tab\", choose where you want to save the files and other "
+"settings, and then click \"Start Receive Mode\"."
msgstr ""
"Ви можете використовувати OnionShare, щоб дозволити людям анонімно "
-"завантажувати файли безпосередньо на ваш комп’ютер, по суті, перетворивши "
-"його на анонімну скриньку. Відкрийте вкладку отримання, виберіть, куди "
+"завантажувати файли безпосередньо на ваш комп’ютер, по суті, перетворивши"
+" його на анонімну скриньку. Відкрийте вкладку отримання, виберіть, куди "
"потрібно завантажувати файли, та інші параметри, а потім натисніть "
"\"Запустити режим отримання\"."
-#: ../../source/features.rst:52
-msgid "This will start the OnionShare service. Anyone that loads this address in Tor Browser will be able to upload files to your computer."
+#: ../../source/features.rst:54
+#, fuzzy
+msgid ""
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-"Запуститься служба OnionShare. Той, хто завантажить цю адресу в Tor Browser, "
-"зможе завантажувати файли на ваш комп’ютер."
+"Запуститься служба OnionShare. Той, хто завантажить цю адресу в Tor "
+"Browser, зможе завантажувати файли на ваш комп’ютер."
-#: ../../source/features.rst:56
-msgid "You can also click the down arrow icon in the top-right corner to show the history and progress of people sending files to you."
+#: ../../source/features.rst:58
+#, fuzzy
+msgid ""
+"You can also click the down \"↓\" icon in the top-right corner to show "
+"the history and progress of people sending files to you."
msgstr ""
-"Також можна клацнути піктограму зі стрілкою вниз у верхньому правому куті, "
-"щоб побачити історію і перебіг надсилання файлів."
+"Також можна клацнути піктограму зі стрілкою вниз у верхньому правому "
+"куті, щоб побачити історію і перебіг надсилання файлів."
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr "Ось як це виглядає для когось, хто надсилає вам файли."
-#: ../../source/features.rst:62
-msgid "When someone uploads files to your receive service, by default they get saved to a folder called ``OnionShare`` in your home folder on your computer, and they get automatically organized into separate subfolders based on the time that the files get uploaded."
-msgstr ""
-"Коли хтось завантажує файли до вашої службу отримання, типово вони "
-"зберігаються у теці з назвою ``OnionShare`` у вашій домашній теці на вашому "
-"комп'ютері та автоматично впорядковуються до окремих підтек залежно від часу "
-"завантаження файлів."
-
#: ../../source/features.rst:64
-msgid "Setting up an OnionShare receiving service is useful for journalists and others that need to securely accept documents from anonymous sources. When used in this way, OnionShare is sort of like a lightweight, simpler, not quite as secure version of `SecureDrop <https://securedrop.org/>`_, the whistleblower submission system."
+msgid ""
+"When someone uploads files to your receive service, by default they get "
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-"Налаштування служби приймання OnionShare корисно для журналістів та інших "
-"осіб, яким потрібно безпечно приймати документи від анонімних джерел. "
+
+#: ../../source/features.rst:66
+#, fuzzy
+msgid ""
+"Setting up an OnionShare receiving service is useful for journalists and "
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
+msgstr ""
+"Налаштування служби приймання OnionShare корисно для журналістів та інших"
+" осіб, яким потрібно безпечно приймати документи від анонімних джерел. "
"Використовуючи таким чином, OnionShare як легку, простішу, не настільки "
"безпечну версію `SecureDrop <https://securedrop.org/>`_, системи подання "
"таємних повідомлень викривачів."
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr "Використовуйте на власний ризик"
-#: ../../source/features.rst:69
-msgid "Just like with malicious email attachments, it's possible that someone could try to hack your computer by uploading a malicious file to your OnionShare service. OnionShare does not add any safety mechanisms to protect your system from malicious files, so use at your own risk."
+#: ../../source/features.rst:71
+msgid ""
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
+"OnionShare service. OnionShare does not add any safety mechanisms to "
+"protect your system from malicious files."
msgstr ""
-"Як і у випадку зі шкідливими вкладеннями електронної пошти, можливо, хтось "
-"може спробує зламати ваш комп’ютер, завантаживши шкідливий файл до вашої "
-"служби OnionShare. OnionShare не додає жодних механізмів безпеки, щоб "
-"захистити вашу систему від шкідливих файлів, тому використовуйте її на свій "
-"страх і ризик."
-#: ../../source/features.rst:71
-msgid "If you receive an Office document or a PDF through OnionShare, you can convert these documents into PDFs that you know are safe to open using `Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself when opening untrusted documents by opening them in `Tails <https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ disposable VM."
+#: ../../source/features.rst:73
+msgid ""
+"If you receive an Office document or a PDF through OnionShare, you can "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
+"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
+"disposableVM."
msgstr ""
-"Якщо ви отримали документ Office або PDF-файл за допомогою OnionShare, ці "
-"документи можна перетворити на PDF-файли, які можна безпечно відкрити за "
-"допомогою `Dangerzone <https://dangerzone.rocks/>`_. Ви також можете "
-"захистити себе під час відкриття ненадійних документів, відкривши їх в "
-"одноразових віртуальних машинах `Tails <https://tails.boum.org/>`_ або в `"
-"Qubes <https://qubes-os.org/>`_."
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr "Поради щодо запуску служби отримання"
-#: ../../source/features.rst:76
-msgid "If you want to host your own anonymous dropbox using OnionShare, it's recommended that you do it on a separate, dedicated computer that's always powered on and connected to the internet, and not on the one you use on a regular basis."
+#: ../../source/features.rst:78
+#, fuzzy
+msgid ""
+"If you want to host your own anonymous dropbox using OnionShare, it's "
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
"Якщо ви хочете розмістити свою власну анонімну скриньку за допомогою "
-"OnionShare, рекомендовано робити це на окремому виділеному комп’ютері, який "
-"завжди ввімкнено та під'єднано до Інтернету, а не на тому, яким ви "
+"OnionShare, рекомендовано робити це на окремому виділеному комп’ютері, "
+"який завжди ввімкнено та під'єднано до Інтернету, а не на тому, яким ви "
"користуєтеся регулярно."
-#: ../../source/features.rst:78
-msgid "If you intend on advertising the OnionShare address on your website or social media profiles, then you should save the tab (see :ref:`save_tabs`) and run it as a public service (see :ref:`disable_passwords`)."
+#: ../../source/features.rst:80
+#, fuzzy
+msgid ""
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-"Якщо ви маєте намір рекламувати адресу OnionShare на своєму вебсайті або в "
-"профілях соціальних мереж, вам слід зберегти вкладку (докладніше "
+"Якщо ви маєте намір рекламувати адресу OnionShare на своєму вебсайті або "
+"в профілях соціальних мереж, вам слід зберегти вкладку (докладніше "
":ref:`save_tabs`) і запустити її як загальнодоступну службу (докладніше "
":ref:`disable_passwords`)."
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr "Розміщення вебсайту"
-#: ../../source/features.rst:83
-msgid "You can use OnionShare to host a static HTML website with just a click. Just open a website tab, drag in the files and folders that make up the static website, and click when you're ready click \"Start sharing\"."
+#: ../../source/features.rst:85
+#, fuzzy
+msgid ""
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-"Ви можете використовувати OnionShare для розміщення статичного вебсайту HTML "
-"лише одним натисканням миші. Просто відкрийте вкладку вебсайту, перетягніть "
-"файли та теки, що складають статичний вебсайт і натисніть кнопку \"Почати "
-"ділитися\", коли будете готові."
+"Ви можете використовувати OnionShare для розміщення статичного вебсайту "
+"HTML лише одним натисканням миші. Просто відкрийте вкладку вебсайту, "
+"перетягніть файли та теки, що складають статичний вебсайт і натисніть "
+"кнопку \"Почати ділитися\", коли будете готові."
-#: ../../source/features.rst:87
-msgid "If you add an ``index.html`` file, when someone loads your website it will render this page. You should also include any other HTML files, CSS files, JavaScript files, and images that make up the website. (Note that OnionShare only supports hosting *static* websites. It can't host websites that execute code or use databases. So you can't, for example, use WordPress.)"
+#: ../../source/features.rst:89
+msgid ""
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
+"OnionShare only supports hosting *static* websites. It can't host "
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-"Якщо ви додасте файл ``index.html``, коли хтось завантажить ваш вебсайт, він "
-"покаже цю сторінку. Слід також включити будь-які інші файли HTML, файли CSS, "
-"файли JavaScript та зображення, що складають вебсайт. (Зверніть увагу, що "
-"OnionShare підтримує розміщення лише *статичних* вебсайтів. Він не може "
-"розміщувати вебсайти, які виконують код або використовують бази даних. Тож "
-"ви не можете, наприклад, використовувати WordPress.)"
-#: ../../source/features.rst:89
-msgid "If you don't have an ``index.html`` file, then it will show a directory listing instead, and people who load it can look through the files and download them."
+#: ../../source/features.rst:91
+#, fuzzy
+msgid ""
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
+"download them."
msgstr ""
"Якщо у вас немає файлу ``index.html`` замість нього буде показано список "
"каталогів, а люди, які завантажують його, зможуть оглядати файли та "
"завантажувати їх."
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr "Політика безпеки вмісту"
-#: ../../source/features.rst:98
-msgid "By default OnionShare will help secure your website by setting a strict `Content Security Police <https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However this will prevent third-party content from loading inside the web page."
+#: ../../source/features.rst:100
+#, fuzzy
+msgid ""
+"By default OnionShare helps secure your website by setting a strict "
+"`Content Security Police "
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
"Типово OnionShare допоможе захистити ваш вебсайт, встановивши надійний "
-"заголовок `Content Security Police <https://en.wikipedia.org/wiki/"
-"Content_Security_Policy>`_. Однак, це запобігає завантаженню сторонніх "
-"матеріалів на вебсторінку."
+"заголовок `Content Security Police "
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_. Однак, це "
+"запобігає завантаженню сторонніх матеріалів на вебсторінку."
-#: ../../source/features.rst:100
-msgid "If you want to load content from third-party websites, like assets or JavaScript libraries from CDNs, then you must check the \"Disable Content Security Policy header (allows your website to use third-party resources)\" box before starting the service."
+#: ../../source/features.rst:102
+#, fuzzy
+msgid ""
+"If you want to load content from third-party websites, like assets or "
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-"Якщо ви хочете завантажити вміст зі сторонніх вебсайтів, як-от активи або "
-"бібліотеки JavaScript із CDN, то перед запуском служби потрібно встановити "
-"позначку \"Не надсилати заголовок політики безпеки вмісту (дозволяє вебсайту "
-"застосовувати сторонні ресурси)\"."
+"Якщо ви хочете завантажити вміст зі сторонніх вебсайтів, як-от активи або"
+" бібліотеки JavaScript із CDN, то перед запуском служби потрібно "
+"встановити позначку \"Не надсилати заголовок політики безпеки вмісту "
+"(дозволяє вебсайту застосовувати сторонні ресурси)\"."
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr "Поради щодо запуску служби розміщення вебсайту"
-#: ../../source/features.rst:105
-msgid "If you want to host a long-term website using OnionShare (that isn't just to quickly show someone something), it's recommended that you do it on a separate, dedicated computer that's always powered on and connected to the internet, and not on the one you use on a regular basis. You should also save the tab (see :ref:`save_tabs`) so that you can resume the website with the same address if you close OnionShare and re-open it later."
-msgstr ""
-"Якщо ви хочете розмістити довгостроковий вебсайт за допомогою OnionShare (це "
-"не просто для того, щоб швидко комусь щось показати), рекомендовано робити "
-"це на окремому виділеному комп’ютері, який завжди ввімкнено та під'єднано до "
-"Інтернету, а не на той, яким ви користуєтеся регулярно. Вам також слід "
-"зберегти вкладку (подробиці :ref:`save_tabs`), щоб ви могли відновити "
-"вебсайт з тією ж адресою, якщо закриєте OnionShare і знову відкриєте його "
-"пізніше."
-
#: ../../source/features.rst:107
-msgid "If your website is intended to be viewed by the public, you should run it as a public service (see :ref:`disable_passwords`)."
+#, fuzzy
+msgid ""
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
+msgstr ""
+"Якщо ви хочете розмістити довгостроковий вебсайт за допомогою OnionShare "
+"(це не просто для того, щоб швидко комусь щось показати), рекомендовано "
+"робити це на окремому виділеному комп’ютері, який завжди ввімкнено та "
+"під'єднано до Інтернету, а не на той, яким ви користуєтеся регулярно. Вам"
+" також слід зберегти вкладку (подробиці :ref:`save_tabs`), щоб ви могли "
+"відновити вебсайт з тією ж адресою, якщо закриєте OnionShare і знову "
+"відкриєте його пізніше."
+
+#: ../../source/features.rst:110
+#, fuzzy
+msgid ""
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
"Якщо ваш вебсайт призначено для загального перегляду, вам слід запустити "
"його як загальнодоступну службу (подробиці :ref:`disable_passwords`)."
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr "Спілкуйтеся таємно"
-#: ../../source/features.rst:112
-msgid "You can use OnionShare to set up a completely anonymous, secure chat room that doesn't log anything or leave any traces. Just open a chat tab and click \"Start chat server\"."
+#: ../../source/features.rst:115
+#, fuzzy
+msgid ""
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
"Ви можете застосовувати OnionShare для створення цілковито анонімної, "
-"захищеної кімнати чату, яка нічого не реєструє та не залишає слідів. Просто "
-"відкрийте вкладку чату та натисніть \"Запустити сервер чату\"."
-
-#: ../../source/features.rst:116
-msgid "After you start the server, copy the OnionShare address and send it to the people who will join this anonymous chat room. If it's important to limit exactly who can join, you should use an encrypted messaging app to send the OnionShare address."
-msgstr ""
-"Після запуску сервера копіюйте адресу OnionShare і надішліть її людям, які "
-"приєднаються до цієї анонімної кімнати чату. Якщо важливо обмежити коло, хто "
-"може приєднатися, ви повинні використовувати зашифровані програми обміну "
-"повідомленнями для надсилання адреси OnionShare."
+"захищеної кімнати чату, яка нічого не реєструє та не залишає слідів. "
+"Просто відкрийте вкладку чату та натисніть \"Запустити сервер чату\"."
-#: ../../source/features.rst:120
-msgid "People can join the chat room by loading its OnionShare address in Tor Browser. The chat room requires JavasScript, so everyone who wants to participate must set their security level to Standard or Safer instead of Safest."
+#: ../../source/features.rst:119
+msgid ""
+"After you start the server, copy the OnionShare address and send it to "
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-"Люди можуть приєднатися до чату, завантаживши його адресу OnionShare у Tor "
-"Browser. Для чату потрібен JavasScript, тому всі, хто хоче взяти участь, "
-"повинні встановити рівень безпеки на Стандартний або Безпечніший замість "
-"Найбезпечніший."
-#: ../../source/features.rst:122
-msgid "When someone joins the chat room they get assigned a random name. They can change their name by typing a new name in the box in the left panel and pressing enter. No chat history will get displayed at all, even if others were already chatting in the room, because the chat history isn't saved anywhere."
+#: ../../source/features.rst:124
+#, fuzzy
+msgid ""
+"People can join the chat room by loading its OnionShare address in Tor "
+"Browser. The chat room requires JavasScript, so everyone who wants to "
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
+msgstr ""
+"Люди можуть приєднатися до чату, завантаживши його адресу OnionShare у "
+"Tor Browser. Для чату потрібен JavasScript, тому всі, хто хоче взяти "
+"участь, повинні встановити рівень безпеки на Стандартний або Безпечніший "
+"замість Найбезпечніший."
+
+#: ../../source/features.rst:127
+#, fuzzy
+msgid ""
+"When someone joins the chat room they get assigned a random name. They "
+"can change their name by typing a new name in the box in the left panel "
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
"Коли хтось приєднується до чату, йому присвоюється випадкове ім'я. Вони "
"можуть змінити своє ім’я, ввівши нове ім’я у полі на лівій панелі та "
@@ -324,66 +432,293 @@ msgstr ""
"навіть якщо інші вже спілкувалися в чаті, оскільки історія чату ніде не "
"зберігається."
-#: ../../source/features.rst:126
-msgid "In an OnionShare chat room, everyone is anonymous. Anyone can change their name to anything, and there is no way to confirm anyone's identity."
+#: ../../source/features.rst:133
+msgid ""
+"In an OnionShare chat room, everyone is anonymous. Anyone can change "
+"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
"У чаті OnionShare всі анонімні. Будь-хто може змінити своє ім'я на яке "
"завгодно і жодного способу підтвердження особи не існує."
-#: ../../source/features.rst:128
-msgid "However, if you create an OnionShare chat room and securely send the address only to a small group of trusted friends using encrypted messages, then you can be reasonably confident that the people who join the chat room are your friends."
+#: ../../source/features.rst:136
+#, fuzzy
+msgid ""
+"However, if you create an OnionShare chat room and securely send the "
+"address only to a small group of trusted friends using encrypted "
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-"Однак, якщо ви створюєте чат OnionShare і безпечно надсилаєте адресу лише "
-"невеликій групі надійних друзів за допомогою зашифрованих повідомлень, то ви "
-"можете бути обґрунтовано впевнені, що люди, які приєднуються до чату, є "
-"вашими друзями."
+"Однак, якщо ви створюєте чат OnionShare і безпечно надсилаєте адресу лише"
+" невеликій групі надійних друзів за допомогою зашифрованих повідомлень, "
+"то ви можете бути обґрунтовано впевнені, що люди, які приєднуються до "
+"чату, є вашими друзями."
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr "Чим це корисно?"
-#: ../../source/features.rst:133
-msgid "If you need to already be using an encrypted messaging app, what's the point of an OnionShare chat room to begin with? It leaves less traces."
+#: ../../source/features.rst:141
+msgid ""
+"If you need to already be using an encrypted messaging app, what's the "
+"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
"Якщо вам вже потрібно використовувати програму обміну зашифрованим "
"повідомленнями, то який сенс спілкування в OnionShare? Він залишає менше "
"слідів."
-#: ../../source/features.rst:135
-msgid "If you send a message to a Signal group, for example, a copy of your message ends up on each device (the phones and computers, if they set up Signal Desktop) of each member of the group. Even if disappearing messages is enabled, it's hard to confirm that all copies of the messages were actually deleted from all devices, and from any other places (like notifications databases) they may have been saved to. OnionShare chat rooms don't store any messages anywhere, so this isn't a problem."
-msgstr ""
-"Наприклад, якщо ви надсилаєте повідомлення до групи в Signal, копія "
-"повідомлення потрапляє на кожен пристрій (телефони та комп’ютери, якщо на "
-"них встановлено Signal для комп'ютерів) кожного з учасників групи. Навіть "
-"якщо ввімкнено повідомлення що зникають, важко впевнитися, що всі копії "
-"повідомлень було фактично видалено з усіх пристроїв та з будь-яких інших "
-"місць (наприклад, баз даних сповіщень), до яких вони могли бути збережені. "
-"Чати OnionShare ніде не зберігають жодних повідомлень, тому це не проблема."
-
-#: ../../source/features.rst:137
-msgid "OnionShare chat rooms can also be useful for anonymous people wanting to chat securely with someone without needing to create any accounts. For example, a source can send an OnionShare address to a journalist using a disposable email address, and then wait for the journalist to join the chat room, all without compromosing their anonymity."
-msgstr ""
-"Чати OnionShare також можуть бути корисними для анонімних людей, які хочуть "
-"безпечно спілкуватися з кимось, не створюючи жодних облікових записів. "
-"Наприклад, джерело може надіслати журналісту адресу OnionShare за допомогою "
-"одноразової адреси електронної пошти, а потім зачекати, поки журналіст "
-"приєднається до чату і все це без шкоди для їхньої анонімности."
-
-#: ../../source/features.rst:140
+#: ../../source/features.rst:143
+msgid ""
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
+"notifications databases) they may have been saved to. OnionShare chat "
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
+msgstr ""
+
+#: ../../source/features.rst:146
+#, fuzzy
+msgid ""
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
+msgstr ""
+"Чати OnionShare також можуть бути корисними для анонімних людей, які "
+"хочуть безпечно спілкуватися з кимось, не створюючи жодних облікових "
+"записів. Наприклад, джерело може надіслати журналісту адресу OnionShare "
+"за допомогою одноразової адреси електронної пошти, а потім зачекати, поки"
+" журналіст приєднається до чату і все це без шкоди для їхньої "
+"анонімности."
+
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr "Як працює шифрування?"
-#: ../../source/features.rst:142
-msgid "Because OnionShare relies on Tor onion services, connections between Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When someone posts a message to an OnionShare chat room, they send it to the server through the E2EE onion connection, which then sends it to all other members of the chat room using WebSockets, through their E2EE onion connections."
+#: ../../source/features.rst:152
+#, fuzzy
+msgid ""
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
"Оскільки OnionShare покладається на onion служби Tor, з’єднання між Tor "
"Browser та OnionShare захищено наскрізним шифруванням (E2EE). Коли хтось "
-"публікує повідомлення в кімнаті чату OnionShare, він надсилає його на сервер "
-"через E2EE onion з'єднання, який потім надсилає його всім іншим учасникам "
-"чату за допомогою WebSockets через їхні E2EE onion з'єднання."
+"публікує повідомлення в кімнаті чату OnionShare, він надсилає його на "
+"сервер через E2EE onion з'єднання, який потім надсилає його всім іншим "
+"учасникам чату за допомогою WebSockets через їхні E2EE onion з'єднання."
-#: ../../source/features.rst:144
-msgid "OnionShare doesn't implement any chat encryption on its own. It relies on the Tor onion service's encryption instead."
+#: ../../source/features.rst:154
+msgid ""
+"OnionShare doesn't implement any chat encryption on its own. It relies on"
+" the Tor onion service's encryption instead."
msgstr ""
"OnionShare самостійно не здійснює жодне шифрування чату. Натомість він "
"покладається на шифрування служби onion служби Tor."
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+#~ "За допомогою OnionShare *ваш власний "
+#~ "комп'ютер є вебсервером*. Якщо ви "
+#~ "запустили OnionShare на своєму ноутбуці, "
+#~ "щоб надіслати комусь файли, а потім "
+#~ "призупинили роботу ноутбука до того, як"
+#~ " файли буде завантажено, служба буде "
+#~ "недоступна, доки ваш ноутбук не буде "
+#~ "увімкнено та знову під’єднано до "
+#~ "Інтернету. OnionShare найкраще працює для "
+#~ "роботи з людьми в режимі реального "
+#~ "часу."
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+#~ "Типово, як тільки хтось закінчує "
+#~ "завантажувати ваші файли, OnionShare "
+#~ "автоматично зупиняє сервер, повністю вилучивши"
+#~ " вебсайт з Інтернету. Якщо ви хочете"
+#~ " дозволити кільком людям завантажувати ці"
+#~ " файли, приберіть позначку біля пункту "
+#~ "\"Закрити доступ, коли файли надіслано "
+#~ "(приберіть позначку, щоб дозволити "
+#~ "завантаження окремих файлів)\"."
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+#~ "Тепер, коли у вас є вебсайт, з "
+#~ "якого надсилаються файли, копіюйте адресу "
+#~ "та надішліть її особі, якій ви "
+#~ "хочете надіслати файли. Якщо файли "
+#~ "повинні залишатися в безпеці, вам варто"
+#~ " скористатися програмою зашифрованих повідомлень."
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+#~ "Коли хтось завантажує файли до вашої "
+#~ "службу отримання, типово вони зберігаються "
+#~ "у теці з назвою ``OnionShare`` у "
+#~ "вашій домашній теці на вашому комп'ютері"
+#~ " та автоматично впорядковуються до окремих"
+#~ " підтек залежно від часу завантаження "
+#~ "файлів."
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+#~ "Як і у випадку зі шкідливими "
+#~ "вкладеннями електронної пошти, можливо, хтось"
+#~ " може спробує зламати ваш комп’ютер, "
+#~ "завантаживши шкідливий файл до вашої "
+#~ "служби OnionShare. OnionShare не додає "
+#~ "жодних механізмів безпеки, щоб захистити "
+#~ "вашу систему від шкідливих файлів, тому"
+#~ " використовуйте її на свій страх і"
+#~ " ризик."
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+#~ "Якщо ви отримали документ Office або "
+#~ "PDF-файл за допомогою OnionShare, ці "
+#~ "документи можна перетворити на PDF-файли, "
+#~ "які можна безпечно відкрити за допомогою"
+#~ " `Dangerzone <https://dangerzone.rocks/>`_. Ви "
+#~ "також можете захистити себе під час "
+#~ "відкриття ненадійних документів, відкривши їх"
+#~ " в одноразових віртуальних машинах `Tails"
+#~ " <https://tails.boum.org/>`_ або в `Qubes "
+#~ "<https://qubes-os.org/>`_."
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+#~ "Якщо ви додасте файл ``index.html``, "
+#~ "коли хтось завантажить ваш вебсайт, він"
+#~ " покаже цю сторінку. Слід також "
+#~ "включити будь-які інші файли HTML, файли"
+#~ " CSS, файли JavaScript та зображення, "
+#~ "що складають вебсайт. (Зверніть увагу, "
+#~ "що OnionShare підтримує розміщення лише "
+#~ "*статичних* вебсайтів. Він не може "
+#~ "розміщувати вебсайти, які виконують код "
+#~ "або використовують бази даних. Тож ви"
+#~ " не можете, наприклад, використовувати "
+#~ "WordPress.)"
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+#~ "Після запуску сервера копіюйте адресу "
+#~ "OnionShare і надішліть її людям, які "
+#~ "приєднаються до цієї анонімної кімнати "
+#~ "чату. Якщо важливо обмежити коло, хто"
+#~ " може приєднатися, ви повинні "
+#~ "використовувати зашифровані програми обміну "
+#~ "повідомленнями для надсилання адреси "
+#~ "OnionShare."
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+#~ "Наприклад, якщо ви надсилаєте повідомлення "
+#~ "до групи в Signal, копія повідомлення"
+#~ " потрапляє на кожен пристрій (телефони "
+#~ "та комп’ютери, якщо на них встановлено"
+#~ " Signal для комп'ютерів) кожного з "
+#~ "учасників групи. Навіть якщо ввімкнено "
+#~ "повідомлення що зникають, важко впевнитися,"
+#~ " що всі копії повідомлень було "
+#~ "фактично видалено з усіх пристроїв та"
+#~ " з будь-яких інших місць (наприклад, "
+#~ "баз даних сповіщень), до яких вони "
+#~ "могли бути збережені. Чати OnionShare "
+#~ "ніде не зберігають жодних повідомлень, "
+#~ "тому це не проблема."
+
diff --git a/docs/source/locale/uk/LC_MESSAGES/help.po b/docs/source/locale/uk/LC_MESSAGES/help.po
index 9f5d80e6..a2cc738a 100644
--- a/docs/source/locale/uk/LC_MESSAGES/help.po
+++ b/docs/source/locale/uk/LC_MESSAGES/help.po
@@ -1,73 +1,96 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) Micah Lee, et al.
# This file is distributed under the same license as the OnionShare package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-09-18 06:51+0000\n"
"Last-Translator: ihor_ck <igor_ck@outlook.com>\n"
-"Language-Team: none\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"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Weblate 4.3-dev\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr "Довідка"
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
-msgstr "Якщо вам потрібна допомога з OnionShare, виконайте ці настанови."
-
-#: ../../source/help.rst:7
-msgid "Read this website"
+#: ../../source/help.rst:5
+#, fuzzy
+msgid "Read This Website"
msgstr "Ознайомтеся з цим вебсайтом"
-#: ../../source/help.rst:9
-msgid "This website is full of instructions on how to use OnionShare. Look through all of the sections first to see if it answers your questions."
+#: ../../source/help.rst:7
+#, fuzzy
+msgid ""
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
"Цей вебсайт наповнено настановами щодо користування OnionShare. Спочатку "
-"перегляньте всі розділи, щоб дізнатися, чи відповідає він на ваші питання."
+"перегляньте всі розділи, щоб дізнатися, чи відповідає він на ваші "
+"питання."
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+#, fuzzy
+msgid "Check the GitHub Issues"
msgstr "Перегляньте наявні проблеми на GitHub"
-#: ../../source/help.rst:14
-msgid "If you can't find a solution in this website, please check the `GitHub issues <https://github.com/micahflee/onionshare/issues>`_. It's possible that someone else has encountered the same problem and has either raised it with the developers, or maybe even posted a solution."
+#: ../../source/help.rst:12
+#, fuzzy
+msgid ""
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-"Якщо ви не можете знайти розв'язок на цьому вебсайті, перегляньте `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. Можливо, хтось "
-"інший зіткнувся з тією ж проблемою, або запитав про неї у розробників, або, "
-"можливо, навіть опублікував розв'язок."
+"Якщо ви не можете знайти розв'язок на цьому вебсайті, перегляньте `GitHub"
+" issues <https://github.com/micahflee/onionshare/issues>`_. Можливо, "
+"хтось інший зіткнувся з тією ж проблемою, або запитав про неї у "
+"розробників, або, можливо, навіть опублікував розв'язок."
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+#, fuzzy
+msgid "Submit an Issue Yourself"
msgstr "Поставте своє питання"
-#: ../../source/help.rst:19
-msgid "If you can't find a solution to your problem, or you wish to ask a question or suggest a new feature, please `submit an issue <https://github.com/micahflee/onionshare/issues/new>`_. This requires `creating an GitHub account <https://help.github.com/articles/signing-up-for-a-new-github-account/>`_."
+#: ../../source/help.rst:17
+#, fuzzy
+msgid ""
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
+"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
+"for-a-new-github-account/>`_."
msgstr ""
"Якщо не можете знайти розв'язання своєї проблеми або хочете поставити "
"питання чи запропонувати нову функцію, будь ласка, `надішліть питання "
-"<https://github.com/micahflee/onionshare/issues/new>`_. Для цього потрібно `"
-"створити обліковий запис GitHub <https://help.github.com/articles/"
-"signing-up-for-a-new-github-account/>`_."
+"<https://github.com/micahflee/onionshare/issues/new>`_. Для цього "
+"потрібно `створити обліковий запис GitHub "
+"<https://help.github.com/articles/signing-up-for-a-new-github-"
+"account/>`_."
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+#, fuzzy
+msgid "Join our Keybase Team"
msgstr "Долучайтесь до нашої команди Keybase"
-#: ../../source/help.rst:24
-msgid "See :ref:`collaborating` for instructions on how to join our Keybase team that we use to discuss the project."
+#: ../../source/help.rst:22
+#, fuzzy
+msgid ""
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
-"Читайте про :ref:`співпрацю`, щоб отримати вказівки щодо приєднання до нашої "
-"команди Keybase, яку ми використовуємо для обговорення проєкту."
+"Читайте про :ref:`співпрацю`, щоб отримати вказівки щодо приєднання до "
+"нашої команди Keybase, яку ми використовуємо для обговорення проєкту."
+
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr "Якщо вам потрібна допомога з OnionShare, виконайте ці настанови."
+
diff --git a/docs/source/locale/uk/LC_MESSAGES/install.po b/docs/source/locale/uk/LC_MESSAGES/install.po
index 20212bb9..413c2e88 100644
--- a/docs/source/locale/uk/LC_MESSAGES/install.po
+++ b/docs/source/locale/uk/LC_MESSAGES/install.po
@@ -1,144 +1,262 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) Micah Lee, et al.
# This file is distributed under the same license as the OnionShare package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-09-18 06:51+0000\n"
"Last-Translator: ihor_ck <igor_ck@outlook.com>\n"
-"Language-Team: none\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"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Weblate 4.3-dev\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr "Встановлення"
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+#, fuzzy
+msgid "Windows or macOS"
msgstr "Встановлення на Windows або macOS"
#: ../../source/install.rst:7
-msgid "You can download OnionShare for Windows and macOS from the `OnionShare website <https://onionshare.org/>`_."
+msgid ""
+"You can download OnionShare for Windows and macOS from the `OnionShare "
+"website <https://onionshare.org/>`_."
msgstr ""
-"Ви можете завантажити OnionShare для Windows та macOS із вебсайту `"
-"OnionShare website <https://onionshare.org/>`_."
-
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
-msgstr "Для додаткової безпеки перегляньте :ref:`verifying_sigs`."
+"Ви можете завантажити OnionShare для Windows та macOS із вебсайту "
+"`OnionShare website <https://onionshare.org/>`_."
-#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+#: ../../source/install.rst:12
+#, fuzzy
+msgid "Install in Linux"
msgstr "Встановлення на Linux за допомогою Flatpak"
-#: ../../source/install.rst:16
-msgid "There are various ways to install OnionShare for Linux, but the recommended way is to use the Flatpak package. Flatpak ensures that you'll always use the most latest dependencies and run OnionShare inside of a sandbox."
+#: ../../source/install.rst:14
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-"Існують різні способи встановлення OnionShare для Linux, але рекомендованим "
-"способом є використання пакунку Flatpak. Flatpak гарантує, що ви завжди "
-"будете користуватися найновішими залежностями та запускати OnionShare "
-"всередині пісочниці."
-#: ../../source/install.rst:18
-msgid "Make sure you have ``flatpak`` installed and the Flathub repository added by following `these instructions <https://flatpak.org/setup/>`_ for your Linux distribution."
+#: ../../source/install.rst:17
+msgid ""
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-"Переконайтесь, що у вас встановлено ``flatpak`` та додано сховище Flathub, "
-"дотримуючись `цих настанов <https://flatpak.org/setup/>`_ для вашого "
-"дистрибутива Linux."
-#: ../../source/install.rst:20
-msgid "Then install OnionShare from Flathub by following `the instructions here <https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#: ../../source/install.rst:19
+#, fuzzy
+msgid ""
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
"Потім встановіть OnionShare із Flathub, дотримуючись `цих настанов "
"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
-#: ../../source/install.rst:25
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
+msgid ""
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
+msgstr ""
+
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr "Перевірка підписів PGP"
-#: ../../source/install.rst:27
-msgid "You can verify that the Windows, macOS, or source package you download is legitimate and hasn't been tampered with by verifying its PGP signature. For Windows and macOS, this step is optional and provides defense in depth: the installers also include their operating system-specific signatures, and you can just rely on those alone if you'd like."
+#: ../../source/install.rst:30
+msgid ""
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-"Ви можете переконатися, що завантажений пакунок для Windows, macOS або "
-"джерельний пакунок є законним і не підробленим, перевіривши його підпис PGP. "
-"Для Windows та macOS цей крок є необов’язковим, але забезпечує додатковий "
-"захист: встановлювачі також включають свої підписи для конкретної "
-"операційної системи, тож ви можете просто покластись лише на них, якщо "
-"хочете."
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr "Ключ підпису"
-#: ../../source/install.rst:32
-msgid "Windows, macOS, and source packaged are signed by Micah Lee, the core developer, using his PGP public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#: ../../source/install.rst:36
+msgid ""
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-"Пакунки Windows, macOS та джерельні пакунки підписано основним розробником "
-"Micah Lee його відкритим ключем PGP із цифровим відбитком "
-"`927F419D7EC82C2F149C1BD1403C2657CD994F73``. Ви можете завантажити ключ "
-"Micah з сервера ключів keys.openpgp.org keyserver <https://keys.openpgp.org/"
-"vks/v1/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
-#: ../../source/install.rst:34
-msgid "In order to verify signatures, you must have GnuPG installed. For macOS you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+#: ../../source/install.rst:38
+#, fuzzy
+msgid ""
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-"Для перевірки підписів потрібно встановити GnuPG. Для macOS ви, ймовірно, "
-"захочете `GPGTools <https://gpgtools.org/>`_, а для Windows ви, ймовірно, "
-"захочете `Gpg4win <https://www.gpg4win.org/>`_."
+"Для перевірки підписів потрібно встановити GnuPG. Для macOS ви, ймовірно,"
+" захочете `GPGTools <https://gpgtools.org/>`_, а для Windows ви, "
+"ймовірно, захочете `Gpg4win <https://www.gpg4win.org/>`_."
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr "Підписи"
-#: ../../source/install.rst:39
-msgid "You can find the signatures (``.asc`` files), as well as Windows, macOS, and source packages, at https://onionshare.org/dist/ in the folders named for each version of OnionShare. You can also find them on the `GitHub Releases page <https://github.com/micahflee/onionshare/releases>`_."
+#: ../../source/install.rst:43
+#, fuzzy
+msgid ""
+"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-"Ви можете знайти підписи (файли ``.asc``), а також пакунки Windows, macOS та "
-"джерельні пакунки за адресою https://onionshare.org/dist/ у теках, названих "
-"для кожної версії OnionShare. Ви також можете знайти їх на `сторінці "
-"випусків GitHub <https://github.com/micahflee/onionshare/releases>`_."
+"Ви можете знайти підписи (файли ``.asc``), а також пакунки Windows, macOS"
+" та джерельні пакунки за адресою https://onionshare.org/dist/ у теках, "
+"названих для кожної версії OnionShare. Ви також можете знайти їх на "
+"`сторінці випусків GitHub "
+"<https://github.com/micahflee/onionshare/releases>`_."
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr "Перевірка"
-#: ../../source/install.rst:44
-msgid "Once you have imported Micah's public key into your GnuPG keychain, downloaded the binary, and downloaded the ``.asc`` signature, you can verify the binary for macOS in terminal like this::"
+#: ../../source/install.rst:49
+#, fuzzy
+msgid ""
+"Once you have imported Micah's public key into your GnuPG keychain, "
+"downloaded the binary, and downloaded the ``.asc`` signature, you can "
+"verify the binary for macOS in a terminal like this::"
msgstr ""
"Після того, як відкритий ключ Micah додано до вашої збірки ключів GnuPG, "
"завантажено двійковий файл і завантажено підпис ``.asc``, ви можете "
"перевірити двійковий файл для macOS в терміналі в такий спосіб::"
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+#, fuzzy
+msgid "Or for Windows, in a command-prompt like this::"
msgstr "Або для Windows у командному рядку у такий спосіб::"
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+#, fuzzy
+msgid "The expected output looks like this::"
msgstr "Очікуваний результат може виглядати так::"
-#: ../../source/install.rst:64
-msgid "If you don't see 'Good signature from', then there might be a problem with the integrity of the file (malicious or otherwise), and you perhaps should not install the package. (The WARNING shown above, is not a problem with the package: it only means you have not defined any level of 'trust' regarding Micah's PGP key itself.)"
+#: ../../source/install.rst:69
+#, fuzzy
+msgid ""
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
"Якщо ви не бачите 'Good signature from', можливо, проблема з цілісністю "
-"файлу (шкідлива чи інша), і, можливо, вам не слід встановлювати пакунок. ("
-"Вказане раніше ПОПЕРЕДЖЕННЯ не є проблемою з пакунком: воно означає лише, що "
-"ви не визначили жодного рівня 'довіри' щодо самого ключа PGP від Micah.)"
+"файлу (шкідлива чи інша), і, можливо, вам не слід встановлювати пакунок. "
+"(Вказане раніше ПОПЕРЕДЖЕННЯ не є проблемою з пакунком: воно означає "
+"лише, що ви не визначили жодного рівня 'довіри' щодо самого ключа PGP від"
+" Micah.)"
-#: ../../source/install.rst:66
-msgid "If you want to learn more about verifying PGP signatures, guides for `Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and the `Tor Project <https://2019.www.torproject.org/docs/verifying-signatures.html.en>`_ may be helpful."
+#: ../../source/install.rst:71
+#, fuzzy
+msgid ""
+"If you want to learn more about verifying PGP signatures, guides for "
+"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
-"Якщо ви хочете дізнатися докладніше про перевірку підписів PGP, настанови "
-"для `Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ та "
-"`Tor Project <https://2019.www.torproject.org/docs/verifying-signatures.html."
-"en>`_ можуть допомогти."
+"Якщо ви хочете дізнатися докладніше про перевірку підписів PGP, настанови"
+" для `Qubes OS <https://www.qubes-os.org/security/verifying-"
+"signatures/>`_ та `Tor Project <https://2019.www.torproject.org/docs"
+"/verifying-signatures.html.en>`_ можуть допомогти."
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr "Для додаткової безпеки перегляньте :ref:`verifying_sigs`."
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+#~ "Існують різні способи встановлення OnionShare"
+#~ " для Linux, але рекомендованим способом "
+#~ "є використання пакунку Flatpak. Flatpak "
+#~ "гарантує, що ви завжди будете "
+#~ "користуватися найновішими залежностями та "
+#~ "запускати OnionShare всередині пісочниці."
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+#~ "Переконайтесь, що у вас встановлено "
+#~ "``flatpak`` та додано сховище Flathub, "
+#~ "дотримуючись `цих настанов "
+#~ "<https://flatpak.org/setup/>`_ для вашого "
+#~ "дистрибутива Linux."
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+#~ "Ви можете переконатися, що завантажений "
+#~ "пакунок для Windows, macOS або "
+#~ "джерельний пакунок є законним і не "
+#~ "підробленим, перевіривши його підпис PGP. "
+#~ "Для Windows та macOS цей крок є"
+#~ " необов’язковим, але забезпечує додатковий "
+#~ "захист: встановлювачі також включають свої "
+#~ "підписи для конкретної операційної системи,"
+#~ " тож ви можете просто покластись лише"
+#~ " на них, якщо хочете."
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+#~ "Пакунки Windows, macOS та джерельні "
+#~ "пакунки підписано основним розробником Micah"
+#~ " Lee його відкритим ключем PGP із "
+#~ "цифровим відбитком "
+#~ "`927F419D7EC82C2F149C1BD1403C2657CD994F73``. Ви можете "
+#~ "завантажити ключ Micah з сервера ключів"
+#~ " keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+
diff --git a/docs/source/locale/uk/LC_MESSAGES/security.po b/docs/source/locale/uk/LC_MESSAGES/security.po
index 7e1deb57..aac098fe 100644
--- a/docs/source/locale/uk/LC_MESSAGES/security.po
+++ b/docs/source/locale/uk/LC_MESSAGES/security.po
@@ -1,30 +1,32 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) Micah Lee, et al.
# This file is distributed under the same license as the OnionShare package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-09-18 06:51+0000\n"
"Last-Translator: ihor_ck <igor_ck@outlook.com>\n"
-"Language-Team: none\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"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Weblate 4.3-dev\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+#, fuzzy
+msgid "Security Design"
msgstr "Побудова безпеки"
#: ../../source/security.rst:4
-msgid "First read :ref:`how_it_works` to understand the basics of how OnionShare works."
+#, fuzzy
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
"Спочатку прочитайте :ref:`how_it_works`, щоб зрозуміти основи роботи "
"OnionShare."
@@ -40,79 +42,260 @@ msgid "What OnionShare protects against"
msgstr "Від чого захищає OnionShare"
#: ../../source/security.rst:11
-msgid "**Third parties don't have access to anything that happens in OnionShare.** When you use OnionShare, you host services directly on your computer. For example, when you share files with OnionShare, you don't upload these files to any server, and when you start an OnionShare chat room, your computer is the chat room server itself. Traditional ways of sharing files or setting up websites and chat rooms require trusting a service with access to your data."
+msgid ""
+"**Third parties don't have access to anything that happens in "
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
-"**Сторонні особи не мають доступу до всього, що відбувається в OnionShare.** "
-"Коли ви користуєтеся OnionShare, ви розміщуєте служби безпосередньо на "
-"своєму комп’ютері. Наприклад, коли ви ділитесь файлами з OnionShare, ви не "
-"завантажуєте ці файли на жоден сервер, а коли ви запускаєте кімнату чату "
-"OnionShare, ваш комп'ютер сам є сервером чату. Традиційні способи обміну "
-"файлами або розгортання вебсайтів та чатів вимагають довіри до служби з "
-"доступом до ваших даних."
#: ../../source/security.rst:13
-msgid "**Network eavesdroppers can't spy on anything that happens in OnionShare in transit.** Because connections between Tor onion services and Tor Browser are end-to-end encrypted, no network attackers can eavesdrop on what happens in an OnionShare service. If the eavesdropper is positioned on the OnionShare user's end, the Tor Browser user's end, or is a malicious Tor node, they will only see Tor traffic. If the eavesdropper is a malicious rendezvous node used to connect Tor Browser with OnionShare's onion service, the traffic will be encrypted using the onion service key."
+msgid ""
+"**Network eavesdroppers can't spy on anything that happens in OnionShare "
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
-"**Мережні підслуховувачі не можуть шпигувати за тим, що відбувається в "
-"OnionShare під час передачі.** Оскільки зв’язки між службами onion Tor і Tor "
-"Browser захищено наскрізним шифруванням, жоден зловмисник з мережі не може "
-"підслуховувати те, що відбувається в службі OnionShare. Якщо підслуховувача "
-"розміщено на боці користувача OnionShare, на боці користувача Tor Browser "
-"або на шкідливому вузлі Tor, вони бачитимуть лише трафік Tor. Якщо "
-"підслуховувач — це зловмисний вузол зустрічі, який використовується для "
-"з'єднання Tor Browser зі службою onion OnionShare, трафік буде зашифровано "
-"за допомогою ключа служби onion."
#: ../../source/security.rst:15
-msgid "**Anonymity of OnionShare users are protected by Tor.** OnionShare and Tor Browser protect the anonymity of the users. As long as the OnionShare user anonymously communicates the OnionShare address with the Tor Browser users, the Tor Browser users and eavesdroppers can't learn the identity of the OnionShare user."
+msgid ""
+"**Anonymity of OnionShare users are protected by Tor.** OnionShare and "
+"Tor Browser protect the anonymity of the users. As long as the OnionShare"
+" user anonymously communicates the OnionShare address with the Tor "
+"Browser users, the Tor Browser users and eavesdroppers can't learn the "
+"identity of the OnionShare user."
msgstr ""
"**Анонімність користувачів OnionShare захищено Tor.** OnionShare і Tor "
"Browser захищають анонімність користувачів. Поки користувач OnionShare "
"анонімно з'єднується за допомогою адреси OnionShare з користувачами Tor "
-"Browser, користувачі Tor Browser та підслуховувачі не можуть дізнатись особу "
-"користувача OnionShare."
+"Browser, користувачі Tor Browser та підслуховувачі не можуть дізнатись "
+"особу користувача OnionShare."
#: ../../source/security.rst:17
-msgid "**If an attacker learns about the onion service, they still can't access anything.** There have been attacks against the Tor network that can enumerate onion services. Even if someone discovers the .onion address of an OnionShare onion service, they can't access it without also knowing the service's random password (unless, of course, the OnionShare users chooses to disable the password and make it public). The password is generated by choosing two random words from a list of 6800 words, meaning there are 6800^2, or about 46 million possible password. But they can only make 20 wrong guesses before OnionShare stops the server, preventing brute force attacks against the password."
+msgid ""
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
-"**Якщо зловмисник досліджує службу onion, він все одно не може ні до чого "
-"отримати доступ.** Існують атаки проти мережі Tor, які можуть вираховувати "
-"служби onion. Навіть якщо хтось виявить адресу .onion служби onion "
-"OnionShare, він не зможе отримати до неї доступ, не знаючи також випадкового "
-"пароля служби (якщо, звичайно, користувачі OnionShare не вирішать вимкнути "
-"пароль та зробити його загальнодоступним). Пароль створюється шляхом вибору "
-"двох випадкових слів з переліку з 6800 слів, тобто 6800^2, або близько 46 "
-"мільйонів можливих паролів. Але вони можуть зробити лише 20 неправильних "
-"спроб, перш ніж OnionShare зупинить сервер, запобігаючи грубим намаганням "
-"зламати пароль."
#: ../../source/security.rst:20
msgid "What OnionShare doesn't protect against"
msgstr "Від чого OnionShare не захищає"
#: ../../source/security.rst:22
-msgid "**Communicating the OnionShare address might not be secure.** The OnionShare user is responsible for securely communicating the OnionShare address with people. If they send it insecurely (such as through an email message, and their email is being monitored by an attacker), the eavesdropper will learn that they're using OnionShare. If the attacker loads the address in Tor Browser before the legitimate recipient gets to it, they can access the service. If this risk fits the user's threat model, they must find a more secure way to communicate the address, such as in an encrypted email, chat, or voice call. This isn't necessary in cases where OnionShare is being used for something that isn't secret."
+msgid ""
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
-"** Зв’язок з адресою OnionShare може бути ненадійним.** Користувач "
-"OnionShare несе відповідальність за безпечне передавання адреси OnionShare "
-"людям. Якщо вони надсилають його ненадійно (наприклад, через повідомлення "
-"електронної пошти, і їх електронна пошта контролюється зловмисником), "
-"підслуховувач дізнається, що вони використовують OnionShare. Якщо зловмисник "
-"завантажує адресу в Tor Browser раніше за законного одержувача, він зможе "
-"отримати доступ до служби. Якщо цей ризик є загрозливим для користувачів, їм "
-"необхідно знайти безпечніший спосіб передачі адреси, наприклад, зашифрованим "
-"електронним листом, чатом чи голосовим дзвінком. Це не обов'язково у "
-"випадках, коли OnionShare не використовується для чогось таємного."
#: ../../source/security.rst:24
-msgid "**Communicating the OnionShare address might not be anonymous.** While OnionShare and Tor Browser allow for anonymity, if the user wishes to remain anonymous they must take extra steps to ensure this while communicating the OnionShare address. For example, they might need to use Tor to create a new anonymous email or chat account, and only access it over Tor, to use for sharing the address. This isn't necessary in cases where there's no need to protect anonymity, such as co-workers who know each other sharing work documents."
+msgid ""
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
-"** Зв'язок з адресою OnionShare може бути не анонімним.** Хоча OnionShare і "
-"Tor Browser дозволяють отримати анонімність, якщо користувачі бажають "
-"залишатись анонімними, їм необхідно вжити додаткових заходів для "
-"забезпечення цього, під час повідомлення адреси OnionShare. Наприклад, їм "
-"може знадобитися використовувати Tor для створення нового анонімного "
-"облікового запису електронної пошти чи чату і входити до них лише через Tor, "
-"щоб користуватися ними для повідомлення адреси. Це не потрібно у випадках, "
-"коли немає потреби захищати анонімність, наприклад, колеги, які знають один "
-"одного, обмінюючись робочими документами."
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+#~ "**Сторонні особи не мають доступу до "
+#~ "всього, що відбувається в OnionShare.** "
+#~ "Коли ви користуєтеся OnionShare, ви "
+#~ "розміщуєте служби безпосередньо на своєму "
+#~ "комп’ютері. Наприклад, коли ви ділитесь "
+#~ "файлами з OnionShare, ви не завантажуєте"
+#~ " ці файли на жоден сервер, а "
+#~ "коли ви запускаєте кімнату чату "
+#~ "OnionShare, ваш комп'ютер сам є сервером"
+#~ " чату. Традиційні способи обміну файлами"
+#~ " або розгортання вебсайтів та чатів "
+#~ "вимагають довіри до служби з доступом"
+#~ " до ваших даних."
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+#~ "**Мережні підслуховувачі не можуть шпигувати"
+#~ " за тим, що відбувається в OnionShare"
+#~ " під час передачі.** Оскільки зв’язки "
+#~ "між службами onion Tor і Tor "
+#~ "Browser захищено наскрізним шифруванням, жоден"
+#~ " зловмисник з мережі не може "
+#~ "підслуховувати те, що відбувається в "
+#~ "службі OnionShare. Якщо підслуховувача "
+#~ "розміщено на боці користувача OnionShare, "
+#~ "на боці користувача Tor Browser або "
+#~ "на шкідливому вузлі Tor, вони бачитимуть"
+#~ " лише трафік Tor. Якщо підслуховувач "
+#~ "— це зловмисний вузол зустрічі, який "
+#~ "використовується для з'єднання Tor Browser "
+#~ "зі службою onion OnionShare, трафік буде"
+#~ " зашифровано за допомогою ключа служби "
+#~ "onion."
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+#~ "**Якщо зловмисник досліджує службу onion, "
+#~ "він все одно не може ні до "
+#~ "чого отримати доступ.** Існують атаки "
+#~ "проти мережі Tor, які можуть "
+#~ "вираховувати служби onion. Навіть якщо "
+#~ "хтось виявить адресу .onion служби onion"
+#~ " OnionShare, він не зможе отримати до"
+#~ " неї доступ, не знаючи також "
+#~ "випадкового пароля служби (якщо, звичайно, "
+#~ "користувачі OnionShare не вирішать вимкнути"
+#~ " пароль та зробити його загальнодоступним)."
+#~ " Пароль створюється шляхом вибору двох "
+#~ "випадкових слів з переліку з 6800 "
+#~ "слів, тобто 6800^2, або близько 46 "
+#~ "мільйонів можливих паролів. Але вони "
+#~ "можуть зробити лише 20 неправильних "
+#~ "спроб, перш ніж OnionShare зупинить "
+#~ "сервер, запобігаючи грубим намаганням зламати"
+#~ " пароль."
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+#~ "** Зв’язок з адресою OnionShare може "
+#~ "бути ненадійним.** Користувач OnionShare несе"
+#~ " відповідальність за безпечне передавання "
+#~ "адреси OnionShare людям. Якщо вони "
+#~ "надсилають його ненадійно (наприклад, через"
+#~ " повідомлення електронної пошти, і їх "
+#~ "електронна пошта контролюється зловмисником), "
+#~ "підслуховувач дізнається, що вони "
+#~ "використовують OnionShare. Якщо зловмисник "
+#~ "завантажує адресу в Tor Browser раніше"
+#~ " за законного одержувача, він зможе "
+#~ "отримати доступ до служби. Якщо цей "
+#~ "ризик є загрозливим для користувачів, їм"
+#~ " необхідно знайти безпечніший спосіб "
+#~ "передачі адреси, наприклад, зашифрованим "
+#~ "електронним листом, чатом чи голосовим "
+#~ "дзвінком. Це не обов'язково у випадках,"
+#~ " коли OnionShare не використовується для"
+#~ " чогось таємного."
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+#~ "** Зв'язок з адресою OnionShare може "
+#~ "бути не анонімним.** Хоча OnionShare і"
+#~ " Tor Browser дозволяють отримати "
+#~ "анонімність, якщо користувачі бажають "
+#~ "залишатись анонімними, їм необхідно вжити "
+#~ "додаткових заходів для забезпечення цього, "
+#~ "під час повідомлення адреси OnionShare. "
+#~ "Наприклад, їм може знадобитися використовувати"
+#~ " Tor для створення нового анонімного "
+#~ "облікового запису електронної пошти чи "
+#~ "чату і входити до них лише через"
+#~ " Tor, щоб користуватися ними для "
+#~ "повідомлення адреси. Це не потрібно у"
+#~ " випадках, коли немає потреби захищати "
+#~ "анонімність, наприклад, колеги, які знають "
+#~ "один одного, обмінюючись робочими документами."
+
diff --git a/docs/source/locale/uk/LC_MESSAGES/tor.po b/docs/source/locale/uk/LC_MESSAGES/tor.po
index 77513c75..64980c3b 100644
--- a/docs/source/locale/uk/LC_MESSAGES/tor.po
+++ b/docs/source/locale/uk/LC_MESSAGES/tor.po
@@ -7,18 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-09-20 02:39+0000\n"
"Last-Translator: ihor_ck <igor_ck@outlook.com>\n"
-"Language-Team: none\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Weblate 4.3-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -26,267 +25,393 @@ msgstr "З'єднання з Tor"
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
-"Існує кілька способів з'єднання OnionShare з мережею Tor. Ви можете змінити "
-"їх у параметрах, до яких можна перейти, натиснувши піктограму шестірні внизу "
-"праворуч вікна."
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+#, fuzzy
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr "Використовуйте Tor, який постачається в комплекті з OnionShare"
#: ../../source/tor.rst:11
+#, fuzzy
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
"Це типовий і водночас найпростіший та найнадійніший спосіб з'єднання "
"OnionShare з Tor. З цієї причини рекомендуємо його для більшості "
"користувачів."
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-"Коли ви відкриєте OnionShare, він запустить процес Tor у фоновому режимі, "
-"який спеціально налаштований для використання OnionShare. Цей процес Tor не "
-"заважатиме іншим процесам Tor на вашому комп'ютері, тому ви можете запустити "
-"Tor Browser або використовувати системний Tor у фоновому режимі."
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+#, fuzzy
+msgid "Attempt auto-configuration with Tor Browser"
msgstr "Спробуйте автоматичну конфігурацію за допомогою Tor Browser"
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-"Ви можете налаштувати OnionShare для під'єднання до Tor, який постачається з "
-"Tor Browser. Спочатку `завантажте Tor Browser <https://www.torproject.org>`_ "
-"звідси, якщо у вас його ще немає. Якщо вибрано цей параметр, вам потрібно "
-"залишати Tor Browser відкритим у фоновому режимі під час користування "
-"OnionShare."
-
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+
+#: ../../source/tor.rst:24
+#, fuzzy
+msgid "Using a system ``tor`` in Windows"
msgstr "Користування системним Tor на Windows"
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-"Це досить просунуто. Вам потрібно знати, як редагувати файли зі звичайним "
-"текстом та виконувати дії від імені адміністратором."
+"Це досить просунуто. Вам потрібно знати, як редагувати файли зі звичайним"
+" текстом та виконувати дії від імені адміністратором."
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
+#, fuzzy
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-"Завантажте набір експерта Tor для Windows, який ви можете отримати `звідси "
-"<https://www.torproject.org/download/tor/>`_. Розархівуйте zip-файл і "
-"скопіюйте видобуту теку в ``C:\\Program Files (x86)\\`` і перейменуйте теку "
-"в ``tor-win32``, так що всередині цієї теки будуть теки ``Data`` та ``Tor``."
+"Завантажте набір експерта Tor для Windows, який ви можете отримати "
+"`звідси <https://www.torproject.org/download/tor/>`_. Розархівуйте "
+"zip-файл і скопіюйте видобуту теку в ``C:\\Program Files (x86)\\`` і "
+"перейменуйте теку в ``tor-win32``, так що всередині цієї теки будуть теки"
+" ``Data`` та ``Tor``."
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
+#, fuzzy
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-"Створіть пароль контрольного порту. Я буду використовувати своїм паролем ``"
-"comprised stumble rummage work avenging construct volatile``. Тепер "
-"відкрийте командний рядок як адміністратор і використовуйте ``tor.exe --hash-"
-"password``, щоб створити хеш вашого пароля. Наприклад::"
+"Створіть пароль контрольного порту. Я буду використовувати своїм паролем "
+"``comprised stumble rummage work avenging construct volatile``. Тепер "
+"відкрийте командний рядок як адміністратор і використовуйте ``tor.exe "
+"--hash-password``, щоб створити хеш вашого пароля. Наприклад::"
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
+#, fuzzy
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-"Вивід хешованого пароля показано після деяких попереджень (якими ви можете "
-"знехтувати). У моєму випадку це було "
+"Вивід хешованого пароля показано після деяких попереджень (якими ви "
+"можете знехтувати). У моєму випадку це було "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
+#, fuzzy
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
"Тепер створіть новий текстовий файл в ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` та помістіть його до теки, замінивши ``HashedControlPassword``"
-" на той, який ви щойно створили:"
+"win32\\torrc`` та помістіть його до теки, замінивши "
+"``HashedControlPassword`` на той, який ви щойно створили:"
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
+#, fuzzy
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-"В командному рядку адміністратора встановіть tor як службу, використовуючи "
-"відповідний файл ``torrc``, який ви щойно створили (дивіться `тут "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ для отримання "
-"додаткових подробиць про це). Як це::"
+"В командному рядку адміністратора встановіть tor як службу, "
+"використовуючи відповідний файл ``torrc``, який ви щойно створили "
+"(дивіться `тут "
+"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ для "
+"отримання додаткових подробиць про це). Як це::"
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+#, fuzzy
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr "Тепер ви використовуєте системний Tor на Windows!"
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"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 ""
-"Відкрийте OnionShare. Клацніть піктограму Параметри. У розділі \"Як "
-"OnionShare повинен з'єднуватися з Tor?\" виберіть \"Під'єднатися через порт "
-"керування\" та встановіть хостом порту управління ``127.0.0.1``, а портом "
-"``9051``. У розділі \"Параметри автентифікації Tor\" виберіть \"Пароль\" і "
-"встановіть пароль для свого пароля, в моєму випадку ``comprised stumble "
-"rummage work avenging construct volatile``. Натисніть кнопку \"Параметри "
-"тестування\". Якщо все піде добре, ви побачите успішне з'єднання з tor."
-
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+
+#: ../../source/tor.rst:61
+#, fuzzy
+msgid "Using a system ``tor`` in macOS"
msgstr "Користування системним Tor на macOS"
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
+#, fuzzy
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-"Спочатку встановіть `Homebrew, <http://brew.sh/>`_ якщо у вас його ще немає. "
-"Потім встановіть Tor::"
+"Спочатку встановіть `Homebrew, <http://brew.sh/>`_ якщо у вас його ще "
+"немає. Потім встановіть Tor::"
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr "Тепер налаштуйте Tor, щоб дозволити з'єднання з OnionShare::"
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr "І запустіть системну Tor-службу::"
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"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 ""
-"Відкрийте OnionShare. Клацніть піктограму Параметри. У розділі \"Як "
-"OnionShare повинен з'єднуватися з Tor?\" виберіть \"Під'єднуватися через "
-"файл сокета\" та встановіть для файлу сокета шлях ``/usr/local/var/run/tor/"
-"control.socket``. У розділі \"Параметри автентифікації Tor\" виберіть \"Без "
-"автентифікації або автентифікація через cookie\". Натисніть кнопку \"Тест "
-"налаштувань\". Якщо все піде добре, ви побачите успішне з'єднання з tor."
-
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+#, fuzzy
+msgid "Using a system ``tor`` in Linux"
msgstr "Користування системним Tor на Linux"
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
+#, fuzzy
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-"Спочатку встановіть пакунок tor. Якщо ви використовуєте Debian, Ubuntu або "
-"подібний дистрибутив Linux, я раджу вам використовувати `офіційне сховище "
-"<https://2019.www.torproject.org/docs/debian.html.en>`_. Наприклад, в Ubuntu "
-"20.04::"
+"Спочатку встановіть пакунок tor. Якщо ви використовуєте Debian, Ubuntu "
+"або подібний дистрибутив Linux, я раджу вам використовувати `офіційне "
+"сховище <https://2019.www.torproject.org/docs/debian.html.en>`_. "
+"Наприклад, в Ubuntu 20.04::"
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
+#, fuzzy
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."
+"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 ""
"Потім додайте користувача до групи, яка запускає процес Tor (у випадку з "
-"Debian і Ubuntu, ``debian-tor``) і налаштуйте OnionShare для під'єднання до "
-"файлу керування сокетом Tor вашої системи."
+"Debian і Ubuntu, ``debian-tor``) і налаштуйте OnionShare для під'єднання "
+"до файлу керування сокетом Tor вашої системи."
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-"Додайте свого користувача до групи ``debian-tor``, запустивши цю команду ("
-"замініть ``username`` вашим іменем користувача)::"
+"Додайте свого користувача до групи ``debian-tor``, запустивши цю команду "
+"(замініть ``username`` вашим іменем користувача)::"
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-"Перезавантажте комп'ютер. Після повторного завантаження відкрийте "
-"OnionShare. Клацніть піктограму Параметри. У розділі \"Як OnionShare повинен "
-"з'єднуватися з Tor?\" виберіть \"Під'єднуватися через файл сокета\" та "
-"встановіть для файлу сокета шлях ``/var/run/tor/control``. У розділі "
-"\"Параметри автентифікації Tor\" виберіть \"Без автентифікації або "
-"автентифікація через cookie\". Натисніть кнопку \"Тест налаштувань\". Якщо "
-"все піде добре, ви побачите успішне підключення до Tor."
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr "Користування мостами Tor"
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
+#, fuzzy
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"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, вам не потрібно використовувати міст."
+"<https://2019.www.torproject.org/docs/bridges.html.en>`_. Якщо OnionShare"
+" успішно під'єднано до Tor, вам не потрібно використовувати міст."
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+#, fuzzy
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr "Щоб налаштувати мости, відкрийте параметри OnionShare."
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
+#, fuzzy
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
-"Ви можете використовувати вбудовані під'єднувані транспорти obfs4, вбудовані "
-"під'єднувані транспорти meek_lite (Azure) або власні мости, які ви можете "
-"отримати від Tor `BridgeDB <https://bridges.torproject.org/>`_. Якщо вам "
-"потрібно використовувати міст, ви повинні спершу спробувати вбудовані obfs4."
+"Ви можете використовувати вбудовані під'єднувані транспорти obfs4, "
+"вбудовані під'єднувані транспорти meek_lite (Azure) або власні мости, які"
+" ви можете отримати від Tor `BridgeDB "
+"<https://bridges.torproject.org/>`_. Якщо вам потрібно використовувати "
+"міст, ви повинні спершу спробувати вбудовані obfs4."
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+#~ "Існує кілька способів з'єднання OnionShare "
+#~ "з мережею Tor. Ви можете змінити "
+#~ "їх у параметрах, до яких можна "
+#~ "перейти, натиснувши піктограму шестірні внизу"
+#~ " праворуч вікна."
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+#~ "Коли ви відкриєте OnionShare, він "
+#~ "запустить процес Tor у фоновому режимі,"
+#~ " який спеціально налаштований для "
+#~ "використання OnionShare. Цей процес Tor "
+#~ "не заважатиме іншим процесам Tor на "
+#~ "вашому комп'ютері, тому ви можете "
+#~ "запустити Tor Browser або використовувати "
+#~ "системний Tor у фоновому режимі."
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+#~ "Ви можете налаштувати OnionShare для "
+#~ "під'єднання до Tor, який постачається з"
+#~ " Tor Browser. Спочатку `завантажте Tor "
+#~ "Browser <https://www.torproject.org>`_ звідси, якщо"
+#~ " у вас його ще немає. Якщо "
+#~ "вибрано цей параметр, вам потрібно "
+#~ "залишати Tor Browser відкритим у "
+#~ "фоновому режимі під час користування "
+#~ "OnionShare."
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+#~ "Відкрийте OnionShare. Клацніть піктограму "
+#~ "Параметри. У розділі \"Як OnionShare "
+#~ "повинен з'єднуватися з Tor?\" виберіть "
+#~ "\"Під'єднатися через порт керування\" та "
+#~ "встановіть хостом порту управління "
+#~ "``127.0.0.1``, а портом ``9051``. У "
+#~ "розділі \"Параметри автентифікації Tor\" "
+#~ "виберіть \"Пароль\" і встановіть пароль "
+#~ "для свого пароля, в моєму випадку "
+#~ "``comprised stumble rummage work avenging "
+#~ "construct volatile``. Натисніть кнопку "
+#~ "\"Параметри тестування\". Якщо все піде "
+#~ "добре, ви побачите успішне з'єднання з"
+#~ " tor."
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+#~ "Відкрийте OnionShare. Клацніть піктограму "
+#~ "Параметри. У розділі \"Як OnionShare "
+#~ "повинен з'єднуватися з Tor?\" виберіть "
+#~ "\"Під'єднуватися через файл сокета\" та "
+#~ "встановіть для файлу сокета шлях "
+#~ "``/usr/local/var/run/tor/control.socket``. У розділі "
+#~ "\"Параметри автентифікації Tor\" виберіть "
+#~ "\"Без автентифікації або автентифікація через"
+#~ " cookie\". Натисніть кнопку \"Тест "
+#~ "налаштувань\". Якщо все піде добре, ви"
+#~ " побачите успішне з'єднання з tor."
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+#~ "Перезавантажте комп'ютер. Після повторного "
+#~ "завантаження відкрийте OnionShare. Клацніть "
+#~ "піктограму Параметри. У розділі \"Як "
+#~ "OnionShare повинен з'єднуватися з Tor?\" "
+#~ "виберіть \"Під'єднуватися через файл сокета\""
+#~ " та встановіть для файлу сокета шлях"
+#~ " ``/var/run/tor/control``. У розділі \"Параметри"
+#~ " автентифікації Tor\" виберіть \"Без "
+#~ "автентифікації або автентифікація через "
+#~ "cookie\". Натисніть кнопку \"Тест "
+#~ "налаштувань\". Якщо все піде добре, ви"
+#~ " побачите успішне підключення до Tor."
+
diff --git a/docs/source/locale/zh_CN/LC_MESSAGES/advanced.po b/docs/source/locale/zh_CN/LC_MESSAGES/advanced.po
index c3847657..8b9457ea 100644
--- a/docs/source/locale/zh_CN/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/zh_CN/LC_MESSAGES/advanced.po
@@ -8,104 +8,103 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+msgid "Advanced Usage"
msgstr ""
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+msgid "Save Tabs"
msgstr ""
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -113,115 +112,293 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+msgid "Command-line Interface"
msgstr ""
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr ""
-
-#: ../../source/advanced.rst:53
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr ""
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr ""
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr ""
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
msgstr ""
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr ""
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+#~ msgid "Advanced usage"
+#~ msgstr ""
+
+#~ msgid "Save tabs"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid "Command line interface"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you installed OnionShare using an "
+#~ "operating system package, you can just"
+#~ " run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "macOS"
+#~ msgstr ""
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr ""
+
+#~ msgid "Windows"
+#~ msgstr ""
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/zh_CN/LC_MESSAGES/develop.po b/docs/source/locale/zh_CN/LC_MESSAGES/develop.po
index f20ff51c..79008008 100644
--- a/docs/source/locale/zh_CN/LC_MESSAGES/develop.po
+++ b/docs/source/locale/zh_CN/LC_MESSAGES/develop.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -27,230 +27,377 @@ msgstr ""
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+msgid "Contributing Code"
msgstr ""
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr ""
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
+msgid "Starting Development"
msgstr ""
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
+#: ../../source/develop.rst:167
+msgid "Contributing Translations"
msgstr ""
#: ../../source/develop.rst:169
-msgid "Contributing translations"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
+msgid "Status of Translations"
msgstr ""
-#: ../../source/develop.rst:185
-msgid "Status of translations"
-msgstr ""
-
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid "Contributing code"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
+
+#~ msgid "Starting development"
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid "Contributing translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid "Status of translations"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr ""
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/zh_CN/LC_MESSAGES/features.po b/docs/source/locale/zh_CN/LC_MESSAGES/features.po
index 29841dd8..e71451fb 100644
--- a/docs/source/locale/zh_CN/LC_MESSAGES/features.po
+++ b/docs/source/locale/zh_CN/LC_MESSAGES/features.po
@@ -8,24 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+msgid "How OnionShare Works"
msgstr ""
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -39,23 +38,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -64,7 +62,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -73,310 +71,697 @@ msgstr ""
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr ""
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr ""
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr ""
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr ""
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr ""
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr ""
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr ""
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+#~ msgid "How OnionShare works"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/zh_CN/LC_MESSAGES/help.po b/docs/source/locale/zh_CN/LC_MESSAGES/help.po
index d965eb13..d1eb81e9 100644
--- a/docs/source/locale/zh_CN/LC_MESSAGES/help.po
+++ b/docs/source/locale/zh_CN/LC_MESSAGES/help.po
@@ -8,65 +8,113 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr ""
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
+#: ../../source/help.rst:5
+msgid "Read This Website"
msgstr ""
#: ../../source/help.rst:7
-msgid "Read this website"
-msgstr ""
-
-#: ../../source/help.rst:9
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr ""
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+msgid "Check the GitHub Issues"
msgstr ""
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr ""
+
+#~ msgid "Read this website"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This website is full of instructions "
+#~ "on how to use OnionShare. Look "
+#~ "through all of the sections first "
+#~ "to see if it answers your "
+#~ "questions."
+#~ msgstr ""
+
+#~ msgid "Check the GitHub issues"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/zh_CN/LC_MESSAGES/install.po b/docs/source/locale/zh_CN/LC_MESSAGES/install.po
index a2f5b321..640c688c 100644
--- a/docs/source/locale/zh_CN/LC_MESSAGES/install.po
+++ b/docs/source/locale/zh_CN/LC_MESSAGES/install.po
@@ -8,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr ""
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+msgid "Windows or macOS"
msgstr ""
#: ../../source/install.rst:7
@@ -31,113 +31,235 @@ msgid ""
"website <https://onionshare.org/>`_."
msgstr ""
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
+#: ../../source/install.rst:12
+msgid "Install in Linux"
msgstr ""
#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+msgid ""
+"There are various ways to install OnionShare for Linux, but the "
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:16
+#: ../../source/install.rst:17
msgid ""
-"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:19
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
msgstr ""
-#: ../../source/install.rst:25
+#: ../../source/install.rst:28
msgid "Verifying PGP signatures"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:30
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
msgstr ""
-#: ../../source/install.rst:30
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr ""
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+#~ msgid "Install on Windows or macOS"
+#~ msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr ""
+
+#~ msgid "Install in Linux with Flatpak"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/zh_CN/LC_MESSAGES/security.po b/docs/source/locale/zh_CN/LC_MESSAGES/security.po
index 13d11a17..79923cda 100644
--- a/docs/source/locale/zh_CN/LC_MESSAGES/security.po
+++ b/docs/source/locale/zh_CN/LC_MESSAGES/security.po
@@ -8,23 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+msgid "Security Design"
msgstr ""
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr ""
#: ../../source/security.rst:6
@@ -38,25 +36,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -70,16 +65,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -88,27 +83,130 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+#~ msgid "Security design"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First read :ref:`how_it_works` to understand"
+#~ " the basics of how OnionShare works."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/zh_CN/LC_MESSAGES/tor.po b/docs/source/locale/zh_CN/LC_MESSAGES/tor.po
index a4d227cd..f8716f64 100644
--- a/docs/source/locale/zh_CN/LC_MESSAGES/tor.po
+++ b/docs/source/locale/zh_CN/LC_MESSAGES/tor.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -23,194 +23,392 @@ msgstr ""
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+msgid "Using a system ``tor`` in Windows"
msgstr ""
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+msgid "Using a system ``tor`` in macOS"
msgstr ""
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
+msgstr ""
+
+#: ../../source/tor.rst:87
+msgid "Using a system ``tor`` in Linux"
msgstr ""
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in macOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid "Using a system Tor in Linux"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+
diff --git a/docs/source/locale/zh_TW/LC_MESSAGES/advanced.po b/docs/source/locale/zh_TW/LC_MESSAGES/advanced.po
index 25d59108..b200ae3a 100644
--- a/docs/source/locale/zh_TW/LC_MESSAGES/advanced.po
+++ b/docs/source/locale/zh_TW/LC_MESSAGES/advanced.po
@@ -7,107 +7,107 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-20 11:48-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-10-22 12:26+0000\n"
"Last-Translator: marklin0913 <marklin0913@protonmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: zh_TW\n"
+"Language-Team: zh_TW <LL@li.org>\n"
+"Plural-Forms: nplurals=1; plural=0\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.3.1\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/advanced.rst:2
-msgid "Advanced usage"
+#, fuzzy
+msgid "Advanced Usage"
msgstr "進階使用"
#: ../../source/advanced.rst:7
-msgid "Save tabs"
+#, fuzzy
+msgid "Save Tabs"
msgstr "儲存分頁"
#: ../../source/advanced.rst:9
msgid ""
-"By default, everything in OnionShare is temporary. As soon as you close "
-"an OnionShare tab its address no longer exists and can't be used again. "
-"But sometimes you might want an OnionShare service to be persistent. For "
-"example, this would be useful if you want to host a website that can keep"
-" the same URL even if you reboot your computer."
+"Everything in OnionShare is temporary by default. If you close an "
+"OnionShare tab, its address no longer exists and it can't be used again. "
+"Sometimes you might want an OnionShare service to be persistent. This is "
+"useful if you want to host a website available from the same OnionShare "
+"address even if you reboot your computer."
msgstr ""
-#: ../../source/advanced.rst:11
+#: ../../source/advanced.rst:13
msgid ""
"To make any tab persistent, check the \"Save this tab, and automatically "
"open it when I open OnionShare\" box before starting the server. When a "
"tab is saved a purple pin icon appears to the left of its server status."
msgstr ""
-#: ../../source/advanced.rst:15
+#: ../../source/advanced.rst:18
msgid ""
"When you quit OnionShare and then open it again, your saved tabs will "
-"start out open. You'll have to manually start each service, but when you "
-"do they will start with the same OnionShare address, and with the same "
-"password."
+"start opened. You'll have to manually start each service, but when you do"
+" they will start with the same OnionShare address and password."
msgstr ""
-#: ../../source/advanced.rst:17
+#: ../../source/advanced.rst:21
msgid ""
"If you save a tab, a copy of that tab's onion service secret key will be "
"stored on your computer with your OnionShare settings."
msgstr ""
-#: ../../source/advanced.rst:22
-msgid "Disable passwords"
-msgstr "取消密碼"
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
+msgstr ""
-#: ../../source/advanced.rst:24
+#: ../../source/advanced.rst:28
msgid ""
"By default, all OnionShare services are protected with the username "
-"`onionshare` and a randomly-generated password. If someone makes 20 wrong"
-" guesses of the password, your onion service is automatically stopped to "
-"prevent a brute force attack against the OnionShare service."
+"``onionshare`` and a randomly-generated password. If someone takes 20 "
+"wrong guesses at the password, your onion service is automatically "
+"stopped to prevent a brute force attack against the OnionShare service."
msgstr ""
-#: ../../source/advanced.rst:26
+#: ../../source/advanced.rst:31
msgid ""
-"But sometimes you might want your OnionShare service to be accessible to "
-"the public. For example, if you want to set up an OnionShare receive "
-"service so the public can securely and anonymously send you files. In "
-"this case, it's better to disable the password altogether. If you don't "
-"do this, someone can force your server to stop just by making 20 wrong "
-"guesses of your password, even if they know the correct password."
+"Sometimes you might want your OnionShare service to be accessible to the "
+"public, like if you want to set up an OnionShare receive service so the "
+"public can securely and anonymously send you files. In this case, it's "
+"better to disable the password altogether. If you don't do this, someone "
+"can force your server to stop just by making 20 wrong guesses of your "
+"password, even if they know the correct password."
msgstr ""
-#: ../../source/advanced.rst:28
+#: ../../source/advanced.rst:35
msgid ""
-"To disable the password for any tab, just check the \"Don't use a "
+"To turn off the password for any tab, just check the \"Don't use a "
"password\" box before starting the server. Then the server will be public"
" and won't have a password."
msgstr ""
-#: ../../source/advanced.rst:31
-msgid "Scheduled times"
+#: ../../source/advanced.rst:38
+msgid "Scheduled Times"
msgstr ""
-#: ../../source/advanced.rst:33
+#: ../../source/advanced.rst:40
msgid ""
"OnionShare supports scheduling exactly when a service should start and "
-"stop. Before starting server, click \"Show advanced settings\" in its tab"
-" and then check the boxes next to either \"Start onion service at "
+"stop. Before starting a server, click \"Show advanced settings\" in its "
+"tab and then check the boxes next to either \"Start onion service at "
"scheduled time\", \"Stop onion service at scheduled time\", or both, and "
-"set the desired dates and times."
+"set the respective desired dates and times."
msgstr ""
-#: ../../source/advanced.rst:35
+#: ../../source/advanced.rst:43
msgid ""
"If you scheduled a service to start in the future, when you click the "
-"start button you will see a timer counting down until it will start. If "
-"you scheduled it to stop in the future, after it's started you will see a"
-" timer counting down to when it will stop automatically."
+"\"Start sharing\" button you will see a timer counting down until it "
+"starts. If you scheduled it to stop in the future, after it's started you"
+" will see a timer counting down to when it will stop automatically."
msgstr ""
-#: ../../source/advanced.rst:37
+#: ../../source/advanced.rst:46
msgid ""
"**Scheduling an OnionShare service to automatically start can be used as "
"a dead man's switch**, where your service will be made public at a given "
@@ -115,115 +115,280 @@ msgid ""
" you can cancel the service before it's scheduled to start."
msgstr ""
-#: ../../source/advanced.rst:41
+#: ../../source/advanced.rst:51
msgid ""
"**Scheduling an OnionShare service to automatically stop can be useful to"
" limit exposure**, like if you want to share secret documents while "
-"making sure they're not available on the internet for more than a few "
+"making sure they're not available on the Internet for more than a few "
"days."
msgstr ""
-#: ../../source/advanced.rst:46
-msgid "Command line interface"
+#: ../../source/advanced.rst:56
+#, fuzzy
+msgid "Command-line Interface"
msgstr "命令行介面"
-#: ../../source/advanced.rst:48
+#: ../../source/advanced.rst:58
msgid ""
-"In addition to its graphical interface, OnionShare has a command line "
+"In addition to its graphical interface, OnionShare has a command-line "
"interface."
msgstr ""
-#: ../../source/advanced.rst:51
-msgid "Linux"
-msgstr "Linux"
-
-#: ../../source/advanced.rst:53
-#, fuzzy
-msgid ""
-"If you installed OnionShare using the Flatpak package, unfortunately the "
-"command line interface isn't supported."
-msgstr "很抱歉,如果你透過Flatpak安裝OnionShare,"
-
-#: ../../source/advanced.rst:55
-msgid ""
-"If you installed OnionShare using an operating system package, you can "
-"just run ``onionshare`` from the terminal."
-msgstr "如果你透過作業系統的安裝包安裝OnionShare,你可以直接在終端機上執行“onionshare”。"
-
-#: ../../source/advanced.rst:58
-msgid "macOS"
-msgstr "macOS"
-
#: ../../source/advanced.rst:60
-msgid "Make a symbolic link to the OnionShare command line binary like this::"
+msgid ""
+"You can install just the command-line version of OnionShare using "
+"``pip3``::"
msgstr ""
#: ../../source/advanced.rst:64
-msgid "Now you can run ``onionshare`` from the terminal."
-msgstr "現在你可以在終端機上執行“onionshare”。"
-
-#: ../../source/advanced.rst:67
-msgid "Windows"
-msgstr "Windows"
+msgid ""
+"Note that you will also need the ``tor`` package installed. In macOS, "
+"install it with: ``brew install tor``"
+msgstr ""
-#: ../../source/advanced.rst:69
-msgid "The command line interface isn't supported in Windows."
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
msgstr ""
-#: ../../source/advanced.rst:71
+#: ../../source/advanced.rst:70
+#, fuzzy
msgid ""
-"If you really want to use it anyway, you can set up a Windows development"
-" environment (see :ref:`starting_development`) and then run this in a "
-"command prompt::"
-msgstr ""
+"If you installed OnionShare using the Linux Snapcraft package, you can "
+"also just run ``onionshare.cli`` to access the command-line interface "
+"version."
+msgstr "如果你透過作業系統的安裝包安裝OnionShare,你可以直接在終端機上執行“onionshare”。"
-#: ../../source/advanced.rst:76
+#: ../../source/advanced.rst:73
msgid "Usage"
msgstr "使用"
-#: ../../source/advanced.rst:78
-msgid "You can see command line documentation by running ``onionshare --help``::"
+#: ../../source/advanced.rst:75
+msgid ""
+"You can browse the command-line documentation by running ``onionshare "
+"--help``::"
msgstr ""
-#: ../../source/advanced.rst:134
-msgid "Legacy addresses"
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
msgstr ""
-#: ../../source/advanced.rst:136
+#: ../../source/advanced.rst:134
msgid ""
"OnionShare uses v3 Tor onion services by default. These are modern onion "
"addresses that have 56 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:140
+#: ../../source/advanced.rst:139
msgid ""
-"But it still has support for v2 onion addresses, the old type of onion "
-"addresses that have 16 characters, for example::"
+"OnionShare still has support for v2 onion addresses, the old type of "
+"onion addresses that have 16 characters, for example::"
msgstr ""
-#: ../../source/advanced.rst:144
+#: ../../source/advanced.rst:143
msgid ""
-"OnionShare calls v2 onion addresses \"legacy addresses\". v3 onion "
-"addresses are more secure, and using legacy addresses is not recommended."
+"OnionShare calls v2 onion addresses \"legacy addresses\", and they are "
+"not recommended, as v3 onion addresses are more secure."
msgstr ""
-#: ../../source/advanced.rst:146
+#: ../../source/advanced.rst:145
msgid ""
"To use legacy addresses, before starting a server click \"Show advanced "
-"settings\" in its tab and check the \"Use a legacy address (v2 onion "
-"service, not recommended)\" box. In legacy mode you can optionally enable"
-" Tor client authentication. Once you start a server in legacy mode you "
+"settings\" from its tab and check the \"Use a legacy address (v2 onion "
+"service, not recommended)\" box. In legacy mode you can optionally turn "
+"on Tor client authentication. Once you start a server in legacy mode you "
"cannot remove legacy mode in that tab. Instead you must start a separate "
"service in a separate tab."
msgstr ""
-#: ../../source/advanced.rst:148
+#: ../../source/advanced.rst:150
msgid ""
"Tor Project plans to `completely deprecate v2 onion services "
"<https://blog.torproject.org/v2-deprecation-timeline>`_ on October 15, "
-"2021, and legacy onion services will soon be removed from OnionShare as "
-"well."
+"2021, and legacy onion services will be removed from OnionShare before "
+"then."
msgstr ""
#~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, everything in OnionShare is"
+#~ " temporary. As soon as you close "
+#~ "an OnionShare tab its address no "
+#~ "longer exists and can't be used "
+#~ "again. But sometimes you might want "
+#~ "an OnionShare service to be persistent."
+#~ " For example, this would be useful"
+#~ " if you want to host a website"
+#~ " that can keep the same URL "
+#~ "even if you reboot your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you quit OnionShare and then "
+#~ "open it again, your saved tabs "
+#~ "will start out open. You'll have "
+#~ "to manually start each service, but "
+#~ "when you do they will start with"
+#~ " the same OnionShare address, and "
+#~ "with the same password."
+#~ msgstr ""
+
+#~ msgid "Disable passwords"
+#~ msgstr "取消密碼"
+
+#~ msgid ""
+#~ "By default, all OnionShare services are"
+#~ " protected with the username `onionshare`"
+#~ " and a randomly-generated password. "
+#~ "If someone makes 20 wrong guesses "
+#~ "of the password, your onion service "
+#~ "is automatically stopped to prevent a"
+#~ " brute force attack against the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But sometimes you might want your "
+#~ "OnionShare service to be accessible to"
+#~ " the public. For example, if you "
+#~ "want to set up an OnionShare "
+#~ "receive service so the public can "
+#~ "securely and anonymously send you files."
+#~ " In this case, it's better to "
+#~ "disable the password altogether. If you"
+#~ " don't do this, someone can force "
+#~ "your server to stop just by making"
+#~ " 20 wrong guesses of your password,"
+#~ " even if they know the correct "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To disable the password for any "
+#~ "tab, just check the \"Don't use a"
+#~ " password\" box before starting the "
+#~ "server. Then the server will be "
+#~ "public and won't have a password."
+#~ msgstr ""
+
+#~ msgid "Scheduled times"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare supports scheduling exactly when"
+#~ " a service should start and stop. "
+#~ "Before starting server, click \"Show "
+#~ "advanced settings\" in its tab and "
+#~ "then check the boxes next to "
+#~ "either \"Start onion service at "
+#~ "scheduled time\", \"Stop onion service "
+#~ "at scheduled time\", or both, and "
+#~ "set the desired dates and times."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you scheduled a service to "
+#~ "start in the future, when you "
+#~ "click the start button you will "
+#~ "see a timer counting down until it"
+#~ " will start. If you scheduled it "
+#~ "to stop in the future, after it's"
+#~ " started you will see a timer "
+#~ "counting down to when it will stop"
+#~ " automatically."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Scheduling an OnionShare service to "
+#~ "automatically stop can be useful to "
+#~ "limit exposure**, like if you want "
+#~ "to share secret documents while making"
+#~ " sure they're not available on the"
+#~ " internet for more than a few "
+#~ "days."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In addition to its graphical interface,"
+#~ " OnionShare has a command line "
+#~ "interface."
+#~ msgstr ""
+
+#~ msgid "Linux"
+#~ msgstr "Linux"
+
+#~ msgid ""
+#~ "If you installed OnionShare using the"
+#~ " Flatpak package, unfortunately the command"
+#~ " line interface isn't supported."
+#~ msgstr "很抱歉,如果你透過Flatpak安裝OnionShare,"
+
+#~ msgid "macOS"
+#~ msgstr "macOS"
+
+#~ msgid "Make a symbolic link to the OnionShare command line binary like this::"
+#~ msgstr ""
+
+#~ msgid "Now you can run ``onionshare`` from the terminal."
+#~ msgstr "現在你可以在終端機上執行“onionshare”。"
+
+#~ msgid "Windows"
+#~ msgstr "Windows"
+
+#~ msgid "The command line interface isn't supported in Windows."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you really want to use it "
+#~ "anyway, you can set up a Windows"
+#~ " development environment (see "
+#~ ":ref:`starting_development`) and then run this"
+#~ " in a command prompt::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see command line documentation"
+#~ " by running ``onionshare --help``::"
+#~ msgstr ""
+
+#~ msgid "Legacy addresses"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "But it still has support for v2"
+#~ " onion addresses, the old type of "
+#~ "onion addresses that have 16 characters,"
+#~ " for example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare calls v2 onion addresses "
+#~ "\"legacy addresses\". v3 onion addresses "
+#~ "are more secure, and using legacy "
+#~ "addresses is not recommended."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To use legacy addresses, before starting"
+#~ " a server click \"Show advanced "
+#~ "settings\" in its tab and check "
+#~ "the \"Use a legacy address (v2 "
+#~ "onion service, not recommended)\" box. "
+#~ "In legacy mode you can optionally "
+#~ "enable Tor client authentication. Once "
+#~ "you start a server in legacy mode"
+#~ " you cannot remove legacy mode in "
+#~ "that tab. Instead you must start a"
+#~ " separate service in a separate tab."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Tor Project plans to `completely "
+#~ "deprecate v2 onion services "
+#~ "<https://blog.torproject.org/v2-deprecation-timeline>`_ on"
+#~ " October 15, 2021, and legacy onion"
+#~ " services will soon be removed from"
+#~ " OnionShare as well."
+#~ msgstr ""
+
diff --git a/docs/source/locale/zh_TW/LC_MESSAGES/develop.po b/docs/source/locale/zh_TW/LC_MESSAGES/develop.po
index cbd42545..4bd7da2f 100644
--- a/docs/source/locale/zh_TW/LC_MESSAGES/develop.po
+++ b/docs/source/locale/zh_TW/LC_MESSAGES/develop.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: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-10-12 15:26+0000\n"
-"Last-Translator: marklin0913da248e4cdada422a <marklin0913@protonmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Last-Translator: marklin0913da248e4cdada422a <marklin0913@protonmail.com>"
+"\n"
"Language: zh_TW\n"
+"Language-Team: zh_TW <LL@li.org>\n"
+"Plural-Forms: nplurals=1; plural=0\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.3-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/develop.rst:2
msgid "Developing OnionShare"
@@ -29,229 +29,369 @@ msgstr "合作"
#: ../../source/develop.rst:9
msgid ""
-"OnionShare has an open Keybase team that we use to discuss the project, "
-"including asking questions, sharing ideas and designs, and making plans "
-"for future development. (It's also an easy way to send end-to-end "
-"encrypted direct messages to others in the OnionShare community, like "
-"OnionShare addresses.) To use Keybase, you need to download the `Keybase "
-"app <https://keybase.io/download>`_, make an account, and `join this team"
-" <https://keybase.io/team/onionshare>`_. Within the app, go to Teams, "
+"OnionShare has an open Keybase team to discuss the project, ask "
+"questions, share ideas and designs, and making plans for future "
+"development. (It's also an easy way to send end-to-end encrypted direct "
+"messages to others in the OnionShare community, like OnionShare "
+"addresses.) To use Keybase, download the `Keybase app "
+"<https://keybase.io/download>`_, make an account, and `join this team "
+"<https://keybase.io/team/onionshare>`_. Within the app, go to \"Teams\", "
"click \"Join a Team\", and type \"onionshare\"."
msgstr ""
-#: ../../source/develop.rst:11
+#: ../../source/develop.rst:12
msgid ""
"OnionShare also has a `mailing list "
"<https://lists.riseup.net/www/subscribe/onionshare-dev>`_ for developers "
"and and designers to discuss the project."
msgstr ""
-#: ../../source/develop.rst:14
-msgid "Contributing code"
+#: ../../source/develop.rst:15
+#, fuzzy
+msgid "Contributing Code"
msgstr "貢獻程式碼"
-#: ../../source/develop.rst:16
+#: ../../source/develop.rst:17
msgid ""
-"OnionShare source code is in this git repository: "
+"OnionShare source code is to be found in this Git repository: "
"https://github.com/micahflee/onionshare"
msgstr ""
-#: ../../source/develop.rst:18
+#: ../../source/develop.rst:19
msgid ""
"If you'd like to contribute code to OnionShare, it helps to join the "
"Keybase team and ask questions about what you're thinking of working on. "
"You should also review all of the `open issues "
"<https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if "
-"there are any that you'd like to develop."
+"there are any you'd like to tackle."
msgstr ""
-#: ../../source/develop.rst:20
+#: ../../source/develop.rst:22
msgid ""
"When you're ready to contribute code, open a pull request in the GitHub "
-"repository and one of the project maintainers will review it and possible"
+"repository and one of the project maintainers will review it and possibly"
" ask questions, request changes, reject it, or merge it into the project."
msgstr ""
-#: ../../source/develop.rst:25
-msgid "Starting development"
-msgstr "開始開發"
-
#: ../../source/develop.rst:27
-msgid ""
-"OnionShare is developed in Python. To get started, you should clone the "
-"git repository at https://github.com/micahflee/onionshare/ and then "
-"consult the ``BUILD.md`` file."
-msgstr ""
+#, fuzzy
+msgid "Starting Development"
+msgstr "開始開發"
#: ../../source/develop.rst:29
-msgid "That file contains the technical instructions and commands necessary:"
-msgstr ""
-
-#: ../../source/develop.rst:31
-msgid "Install dependencies for your platform"
+msgid ""
+"OnionShare is developed in Python. To get started, clone the Git "
+"repository at https://github.com/micahflee/onionshare/ and then consult "
+"the ``cli/README.md`` file to learn how to set up your development "
+"environment for the command-line version, and the ``desktop/README.md`` "
+"file to learn how to set up your development environment for the "
+"graphical version."
msgstr ""
#: ../../source/develop.rst:32
-msgid "Run OnionShare from the source tree, without building a package"
-msgstr ""
-
-#: ../../source/develop.rst:33
-msgid "Building packages"
-msgstr ""
-
-#: ../../source/develop.rst:34
-msgid "Making a release of OnionShare"
+msgid ""
+"Those files contain the necessary technical instructions and commands "
+"install dependencies for your platform, and to run OnionShare from the "
+"source tree."
msgstr ""
-#: ../../source/develop.rst:37
+#: ../../source/develop.rst:35
msgid "Debugging tips"
msgstr ""
-#: ../../source/develop.rst:40
+#: ../../source/develop.rst:38
msgid "Verbose mode"
msgstr ""
-#: ../../source/develop.rst:42
+#: ../../source/develop.rst:40
msgid ""
"When developing, it's convenient to run OnionShare from a terminal and "
-"add the ``--verbose`` (or ``-v``) flag to the command. This will print a "
-"lot of helpful messages to the terminal such as when certain objects are "
+"add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot "
+"of helpful messages to the terminal, such as when certain objects are "
"initialized, when events occur (like buttons clicked, settings saved or "
-"reloaded), and other debug information. For example::"
+"reloaded), and other debug info. For example::"
msgstr ""
-#: ../../source/develop.rst:111
+#: ../../source/develop.rst:117
msgid ""
"You can add your own debug messages by running the ``Common.log`` method "
"from ``onionshare/common.py``. For example::"
msgstr ""
-#: ../../source/develop.rst:115
+#: ../../source/develop.rst:121
msgid ""
"This can be useful when learning the chain of events that occur when "
-"using the application or the value of certain variables before and after "
-"they are manipulated."
+"using OnionShare, or the value of certain variables before and after they"
+" are manipulated."
msgstr ""
-#: ../../source/develop.rst:118
-msgid "Local only"
+#: ../../source/develop.rst:124
+msgid "Local Only"
msgstr ""
-#: ../../source/develop.rst:120
+#: ../../source/develop.rst:126
msgid ""
"Tor is slow, and it's often convenient to skip starting onion services "
"altogether during development. You can do this with the ``--local-only`` "
"flag. For example::"
msgstr ""
-#: ../../source/develop.rst:157
-msgid ""
-"In this case, you load the URL ``http://onionshare:eject-"
-"snack@127.0.0.1:17614`` in a normal web browser like Firefox, instead of "
-"using Tor Browser."
-msgstr ""
-
-#: ../../source/develop.rst:160
-msgid "Debugging in Windows"
-msgstr ""
-
-#: ../../source/develop.rst:162
-msgid ""
-"If you want to obtain debug output from the ``onionshare-gui.exe`` in "
-"Windows, you will need to edit ``install\\pyinstaller.spec`` and change "
-"``console=False`` to ``console=True``."
-msgstr ""
-
#: ../../source/develop.rst:164
msgid ""
-"Then rebuild the EXE with ``install\\build_exe.bat`` (you may need to "
-"comment out the ``signtool`` commands in the ``build_exe.bat`` and the "
-"``onionshare.nsi`` files, as per the ``BUILD.md`` instructions)."
+"In this case, you load the URL ``http://onionshare:train-"
+"system@127.0.0.1:17635`` in a normal web-browser like Firefox, instead of"
+" using the Tor Browser."
msgstr ""
-#: ../../source/develop.rst:166
-msgid ""
-"After this, you can run ``onionshare-gui.exe -v`` from a command prompt "
-"to see the debug output."
-msgstr ""
+#: ../../source/develop.rst:167
+#, fuzzy
+msgid "Contributing Translations"
+msgstr "貢獻翻譯"
#: ../../source/develop.rst:169
-msgid "Contributing translations"
-msgstr "貢獻翻譯"
+msgid ""
+"Help make OnionShare easier to use and more familiar and welcoming for "
+"people by translating it on `Hosted Weblate "
+"<https://hosted.weblate.org/projects/onionshare/>`_. Always keep the "
+"\"OnionShare\" in latin letters, and use \"OnionShare (localname)\" if "
+"needed."
+msgstr ""
#: ../../source/develop.rst:171
-msgid ""
-"Most of the OnionShare is translatable. You can help make it easier to "
-"use and more familiar and welcoming for people around the globe. The "
-"Localization Lab has some `documentation about translating OnionShare "
-"<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+msgid "To help translate, make a Hosted Weblate account and start contributing."
msgstr ""
-#: ../../source/develop.rst:173
-msgid ""
-"OnionShare uses Weblate to keep track of translations. You can view the "
-"OnionShare project here: https://hosted.weblate.org/projects/onionshare/"
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
msgstr ""
-#: ../../source/develop.rst:175
+#: ../../source/develop.rst:176
msgid ""
-"To help translate, make a Hosted Weblate account and start contributing "
-"to that project."
+"Sometimes the original English strings are wrong, or don't match between "
+"the application and the documentation."
msgstr ""
#: ../../source/develop.rst:178
-msgid "Suggestions for original English strings"
-msgstr ""
-
-#: ../../source/develop.rst:180
msgid ""
-"Sometimes the original English strings could be improved, making them "
-"easier to translate into other languages."
+"File source string improvements by adding @kingu to your Weblate comment,"
+" or open a GitHub issue or pull request. The latter ensures all upstream "
+"developers see the suggestion, and can potentially modify the string via "
+"the usual code review processes."
msgstr ""
#: ../../source/develop.rst:182
-msgid ""
-"If you have suggestions for a better English string, please open a GitHub"
-" issue rather than commenting in Weblate. This ensures the upstream "
-"developers will definitely see the suggestion, and can potentially modify"
-" the string via the usual code review processes."
-msgstr ""
-
-#: ../../source/develop.rst:185
-msgid "Status of translations"
+#, fuzzy
+msgid "Status of Translations"
msgstr "翻譯狀況"
-#: ../../source/develop.rst:186
+#: ../../source/develop.rst:183
msgid ""
"Here is the current translation status. If you want start a translation "
-"in a language not to be found here, please write us to the mailing list: "
+"in a language not yet started, please write to the mailing list: "
"onionshare-dev@lists.riseup.net"
msgstr ""
-#: ../../source/develop.rst:191
-msgid "Translate the .desktop file"
-msgstr "翻譯.desktop檔案"
+#~ msgid ""
+#~ "OnionShare is developed in Python. To"
+#~ " get started, you should close the"
+#~ " git repository at "
+#~ "https://github.com/micahflee/onionshare/ and then "
+#~ "consult the ``BUILD.md`` file."
+#~ msgstr ""
-#: ../../source/develop.rst:193
-msgid "You can also translate the ``install/onionshare.desktop`` file."
-msgstr ""
+#~ msgid ""
+#~ "OnionShare has an open Keybase team "
+#~ "that we use to discuss the "
+#~ "project, including asking questions, sharing"
+#~ " ideas and designs, and making plans"
+#~ " for future development. (It's also "
+#~ "an easy way to send end-to-"
+#~ "end encrypted direct messages to others"
+#~ " in the OnionShare community, like "
+#~ "OnionShare addresses.) To use Keybase, "
+#~ "you need to download the `Keybase "
+#~ "app <https://keybase.io/download>`_, make an "
+#~ "account, and `join this team "
+#~ "<https://keybase.io/team/onionshare>`_. Within the "
+#~ "app, go to Teams, click \"Join a"
+#~ " Team\", and type \"onionshare\"."
+#~ msgstr ""
-#: ../../source/develop.rst:195
-msgid ""
-"Duplicate the line that begins with ``Comment=``. Add the language code "
-"to the new line so it becomes ``Comment[lang]=`` (lang should be your "
-"language). You can see what language codes are used for translation by "
-"looking at the ``share/locale/*.json`` filenames::"
-msgstr ""
+#~ msgid ""
+#~ "OnionShare source code is in this "
+#~ "git repository: https://github.com/micahflee/onionshare"
+#~ msgstr ""
-#: ../../source/develop.rst:200
-msgid "Do the same for other untranslated lines."
-msgstr ""
+#~ msgid ""
+#~ "If you'd like to contribute code "
+#~ "to OnionShare, it helps to join "
+#~ "the Keybase team and ask questions "
+#~ "about what you're thinking of working"
+#~ " on. You should also review all "
+#~ "of the `open issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_ on "
+#~ "GitHub to see if there are any "
+#~ "that you'd like to develop."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to contribute code,"
+#~ " open a pull request in the "
+#~ "GitHub repository and one of the "
+#~ "project maintainers will review it and"
+#~ " possible ask questions, request changes,"
+#~ " reject it, or merge it into "
+#~ "the project."
+#~ msgstr ""
#~ msgid ""
#~ "OnionShare is developed in Python. To"
-#~ " get started, you should close the"
+#~ " get started, you should clone the"
#~ " git repository at "
#~ "https://github.com/micahflee/onionshare/ and then "
#~ "consult the ``BUILD.md`` file."
#~ msgstr ""
+
+#~ msgid "That file contains the technical instructions and commands necessary:"
+#~ msgstr ""
+
+#~ msgid "Install dependencies for your platform"
+#~ msgstr ""
+
+#~ msgid "Run OnionShare from the source tree, without building a package"
+#~ msgstr ""
+
+#~ msgid "Building packages"
+#~ msgstr ""
+
+#~ msgid "Making a release of OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When developing, it's convenient to run"
+#~ " OnionShare from a terminal and add"
+#~ " the ``--verbose`` (or ``-v``) flag "
+#~ "to the command. This will print a"
+#~ " lot of helpful messages to the "
+#~ "terminal such as when certain objects"
+#~ " are initialized, when events occur "
+#~ "(like buttons clicked, settings saved or"
+#~ " reloaded), and other debug information."
+#~ " For example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This can be useful when learning "
+#~ "the chain of events that occur "
+#~ "when using the application or the "
+#~ "value of certain variables before and"
+#~ " after they are manipulated."
+#~ msgstr ""
+
+#~ msgid "Local only"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In this case, you load the URL "
+#~ "``http://onionshare:eject-snack@127.0.0.1:17614`` in "
+#~ "a normal web browser like Firefox, "
+#~ "instead of using Tor Browser."
+#~ msgstr ""
+
+#~ msgid "Debugging in Windows"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to obtain debug output"
+#~ " from the ``onionshare-gui.exe`` in "
+#~ "Windows, you will need to edit "
+#~ "``install\\pyinstaller.spec`` and change "
+#~ "``console=False`` to ``console=True``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then rebuild the EXE with "
+#~ "``install\\build_exe.bat`` (you may need to"
+#~ " comment out the ``signtool`` commands "
+#~ "in the ``build_exe.bat`` and the "
+#~ "``onionshare.nsi`` files, as per the "
+#~ "``BUILD.md`` instructions)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After this, you can run ``onionshare-"
+#~ "gui.exe -v`` from a command prompt "
+#~ "to see the debug output."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Most of the OnionShare is translatable."
+#~ " You can help make it easier to"
+#~ " use and more familiar and welcoming"
+#~ " for people around the globe. The "
+#~ "Localization Lab has some `documentation "
+#~ "about translating OnionShare "
+#~ "<https://wiki.localizationlab.org/index.php/OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare uses Weblate to keep track"
+#~ " of translations. You can view the"
+#~ " OnionShare project here: "
+#~ "https://hosted.weblate.org/projects/onionshare/"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To help translate, make a Hosted "
+#~ "Weblate account and start contributing "
+#~ "to that project."
+#~ msgstr ""
+
+#~ msgid "Suggestions for original English strings"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Sometimes the original English strings "
+#~ "could be improved, making them easier"
+#~ " to translate into other languages."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have suggestions for a "
+#~ "better English string, please open a "
+#~ "GitHub issue rather than commenting in"
+#~ " Weblate. This ensures the upstream "
+#~ "developers will definitely see the "
+#~ "suggestion, and can potentially modify "
+#~ "the string via the usual code "
+#~ "review processes."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Here is the current translation status."
+#~ " If you want start a translation "
+#~ "in a language not to be found "
+#~ "here, please write us to the "
+#~ "mailing list: onionshare-dev@lists.riseup.net"
+#~ msgstr ""
+
+#~ msgid "Translate the .desktop file"
+#~ msgstr "翻譯.desktop檔案"
+
+#~ msgid "You can also translate the ``install/onionshare.desktop`` file."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Duplicate the line that begins with "
+#~ "``Comment=``. Add the language code to"
+#~ " the new line so it becomes "
+#~ "``Comment[lang]=`` (lang should be your "
+#~ "language). You can see what language "
+#~ "codes are used for translation by "
+#~ "looking at the ``share/locale/*.json`` "
+#~ "filenames::"
+#~ msgstr ""
+
+#~ msgid "Do the same for other untranslated lines."
+#~ msgstr ""
+
diff --git a/docs/source/locale/zh_TW/LC_MESSAGES/features.po b/docs/source/locale/zh_TW/LC_MESSAGES/features.po
index b6b8e98b..f56c6a26 100644
--- a/docs/source/locale/zh_TW/LC_MESSAGES/features.po
+++ b/docs/source/locale/zh_TW/LC_MESSAGES/features.po
@@ -7,27 +7,26 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-10-22 12:26+0000\n"
"Last-Translator: marklin0913 <marklin0913@protonmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: zh_TW\n"
+"Language-Team: zh_TW <LL@li.org>\n"
+"Plural-Forms: nplurals=1; plural=0\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.3.1\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/features.rst:4
-msgid "How OnionShare works"
+#, fuzzy
+msgid "How OnionShare Works"
msgstr "OnionShare 如何運作"
#: ../../source/features.rst:6
msgid ""
-"OnionShare works by starting web servers locally on your own computer and"
-" making them accessible to other people as `Tor "
-"<https://www.torproject.org/>`_ `onion services "
+"Web servers are started locally on your computer and made accessible to "
+"other people as `Tor <https://www.torproject.org/>`_ `onion services "
"<https://community.torproject.org/onion-services/>`_."
msgstr ""
@@ -41,23 +40,22 @@ msgstr ""
msgid ""
"You're responsible for securely sharing that URL using a communication "
"channel of your choice like in an encrypted chat message, or using "
-"something less secure like a Twitter or Facebook message, depending on "
-"your `threat model <https://ssd.eff.org/en/module/your-security-plan>`_."
+"something less secure like unencrypted e-mail, depending on your `threat "
+"model <https://ssd.eff.org/module/your-security-plan>`_."
msgstr ""
#: ../../source/features.rst:14
msgid ""
-"The people who you send the URL to must then copy and paste it into `Tor "
+"The people you send the URL to then copy and paste it into their `Tor "
"Browser <https://www.torproject.org/>`_ to access the OnionShare service."
msgstr ""
#: ../../source/features.rst:16
msgid ""
-"With OnionShare, *your own computer is the web server*. If you run "
-"OnionShare on your laptop to send someone files, and then suspend your "
-"laptop before the files have been downloaded, the service will not be "
-"available until your laptop is unsuspended and connected to the internet "
-"again. OnionShare works best when working with people in real-time."
+"If you run OnionShare on your laptop to send someone files, and then "
+"suspend it before the files are sent, the service will not be available "
+"until your laptop is unsuspended and on the Internet again. OnionShare "
+"works best when working with people in real-time."
msgstr ""
#: ../../source/features.rst:18
@@ -66,7 +64,7 @@ msgid ""
"anything that happens in OnionShare*, not even the developers of "
"OnionShare. It's completely private. And because OnionShare is based on "
"Tor onion services too, it also protects your anonymity. See the "
-":doc:`security design </security>` for more information."
+":doc:`security design </security>` for more info."
msgstr ""
#: ../../source/features.rst:21
@@ -75,309 +73,694 @@ msgstr "分享檔案"
#: ../../source/features.rst:23
msgid ""
-"You can use OnionShare to securely and anonymously send files and folders"
-" to people. Just open a share tab, drag in the files and folders you wish"
-" to share, and click \"Start sharing\"."
+"You can use OnionShare to send files and folders to people securely and "
+"anonymously. Open a share tab, drag in the files and folders you wish to "
+"share, and click \"Start sharing\"."
msgstr ""
-#: ../../source/features.rst:27 ../../source/features.rst:91
+#: ../../source/features.rst:27 ../../source/features.rst:93
msgid ""
"After you add files, you'll see some settings. Make sure you choose the "
-"setting you're interested in first before you start sharing."
+"setting you're interested in before you start sharing."
msgstr ""
#: ../../source/features.rst:31
msgid ""
-"By default, as soon as someone finishes downloading your files, "
-"OnionShare will automatically stop the server, completely removing the "
-"website from the internet. If you want to allow multiple people to "
-"download these files, uncheck the \"Stop sharing after files have been "
-"sent (uncheck to allow downloading individual files)\" box."
+"As soon as someone finishes downloading your files, OnionShare will "
+"automatically stop the server, removing the website from the Internet. To"
+" allow multiple people to download them, uncheck the \"Stop sharing after"
+" files have been sent (uncheck to allow downloading individual files)\" "
+"box."
msgstr ""
-#: ../../source/features.rst:33
+#: ../../source/features.rst:34
msgid ""
-"Also, if you uncheck this box, people will be able to download individual"
-" files that you share rather than a single compressed version of all of "
-"the files."
+"Also, if you uncheck this box, people will be able to download the "
+"individual files you share rather than a single compressed version of all"
+" the files."
msgstr ""
-#: ../../source/features.rst:35
+#: ../../source/features.rst:36
msgid ""
"When you're ready to share, click the \"Start sharing\" button. You can "
-"always click \"Stop sharing\", or quit OnionShare, to immediate take the "
-"website down. You can also click the up arrow icon in the top-right "
-"corner to show the history and progress of people downloading files from "
-"you."
+"always click \"Stop sharing\", or quit OnionShare, immediately taking the"
+" website down. You can also click the \"↑\" icon in the top-right corner "
+"to show the history and progress of people downloading files from you."
msgstr ""
-#: ../../source/features.rst:39
+#: ../../source/features.rst:40
msgid ""
-"Now that you have a website that's sharing files, copy the address and "
-"send it to the person you want to receive the files. If the files need to"
-" stay secure, you should use an encrypted messaging app."
+"Now that you have a OnionShare, copy the address and send it to the "
+"person you want to receive the files. If the files need to stay secure, "
+"or the person is otherwise exposed to danger, use an encrypted messaging "
+"app."
msgstr ""
-#: ../../source/features.rst:41
+#: ../../source/features.rst:42
msgid ""
"That person then must load the address in Tor Browser. After logging in "
-"with the random password that's included in the web address, they will be"
-" able to download the files directly from your computer by clicking the "
-"\"Download Files\" link in the corner."
+"with the random password included in the web address, the files can be "
+"downloaded directly from your computer by clicking the \"Download Files\""
+" link in the corner."
msgstr ""
-#: ../../source/features.rst:46
+#: ../../source/features.rst:47
msgid "Receive Files"
msgstr "接收檔案"
-#: ../../source/features.rst:48
+#: ../../source/features.rst:49
msgid ""
"You can use OnionShare to let people anonymously upload files directly to"
" your computer, essentially turning it into an anonymous dropbox. Open a "
-"receive tab, choose where you want files to get downloaded and other "
+"\"Receive tab\", choose where you want to save the files and other "
"settings, and then click \"Start Receive Mode\"."
msgstr ""
-#: ../../source/features.rst:52
+#: ../../source/features.rst:54
msgid ""
-"This will start the OnionShare service. Anyone that loads this address in"
-" Tor Browser will be able to upload files to your computer."
+"This starts the OnionShare service. Anyone loading this address in their "
+"Tor Browser will be able to upload files to your computer."
msgstr ""
-#: ../../source/features.rst:56
+#: ../../source/features.rst:58
msgid ""
-"You can also click the down arrow icon in the top-right corner to show "
+"You can also click the down \"↓\" icon in the top-right corner to show "
"the history and progress of people sending files to you."
msgstr ""
-#: ../../source/features.rst:58
+#: ../../source/features.rst:60
msgid "Here is what it looks like for someone sending you files."
msgstr "這就是當有人傳送檔案給你的時候看起來的樣子。"
-#: ../../source/features.rst:62
+#: ../../source/features.rst:64
msgid ""
"When someone uploads files to your receive service, by default they get "
-"saved to a folder called ``OnionShare`` in your home folder on your "
-"computer, and they get automatically organized into separate subfolders "
-"based on the time that the files get uploaded."
+"saved to a folder called ``OnionShare`` in the home folder on your "
+"computer, automatically organized into separate subfolders based on the "
+"time that the files get uploaded."
msgstr ""
-#: ../../source/features.rst:64
+#: ../../source/features.rst:66
msgid ""
"Setting up an OnionShare receiving service is useful for journalists and "
-"others that need to securely accept documents from anonymous sources. "
-"When used in this way, OnionShare is sort of like a lightweight, simpler,"
-" not quite as secure version of `SecureDrop <https://securedrop.org/>`_, "
-"the whistleblower submission system."
+"others needing to securely accept documents from anonymous sources. When "
+"used in this way, OnionShare is sort of like a lightweight, simpler, not "
+"quite as secure version of `SecureDrop <https://securedrop.org/>`_, the "
+"whistleblower submission system."
msgstr ""
-#: ../../source/features.rst:67
+#: ../../source/features.rst:69
msgid "Use at your own risk"
msgstr "使用風險自負"
-#: ../../source/features.rst:69
+#: ../../source/features.rst:71
msgid ""
-"Just like with malicious email attachments, it's possible that someone "
-"could try to hack your computer by uploading a malicious file to your "
+"Just like with malicious e-mail attachments, it's possible someone could "
+"try to attack your computer by uploading a malicious file to your "
"OnionShare service. OnionShare does not add any safety mechanisms to "
-"protect your system from malicious files, so use at your own risk."
+"protect your system from malicious files."
msgstr ""
-#: ../../source/features.rst:71
+#: ../../source/features.rst:73
msgid ""
"If you receive an Office document or a PDF through OnionShare, you can "
-"convert these documents into PDFs that you know are safe to open using "
-"`Dangerzone <https://dangerzone.rocks/>`_. You can also protect yourself "
-"when opening untrusted documents by opening them in `Tails "
+"convert these documents into PDFs that are safe to open using `Dangerzone"
+" <https://dangerzone.rocks/>`_. You can also protect yourself when "
+"opening untrusted documents by opening them in `Tails "
"<https://tails.boum.org/>`_ or in a `Qubes <https://qubes-os.org/>`_ "
-"disposable VM."
+"disposableVM."
msgstr ""
-#: ../../source/features.rst:74
+#: ../../source/features.rst:76
msgid "Tips for running a receive service"
msgstr ""
-#: ../../source/features.rst:76
+#: ../../source/features.rst:78
msgid ""
"If you want to host your own anonymous dropbox using OnionShare, it's "
-"recommended that you do it on a separate, dedicated computer that's "
-"always powered on and connected to the internet, and not on the one you "
-"use on a regular basis."
+"recommended you do so on a separate, dedicated computer always powered on"
+" and connected to the Internet, and not on the one you use on a regular "
+"basis."
msgstr ""
-#: ../../source/features.rst:78
+#: ../../source/features.rst:80
msgid ""
-"If you intend on advertising the OnionShare address on your website or "
-"social media profiles, then you should save the tab (see "
-":ref:`save_tabs`) and run it as a public service (see "
-":ref:`disable_passwords`)."
+"If you intend to put the OnionShare address on your website or social "
+"media profiles, save the tab (see :ref:`save_tabs`) and run it as a "
+"public service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:81
+#: ../../source/features.rst:83
msgid "Host a Website"
msgstr "架設一個網站"
-#: ../../source/features.rst:83
+#: ../../source/features.rst:85
msgid ""
-"You can use OnionShare to host a static HTML website with just a click. "
-"Just open a website tab, drag in the files and folders that make up the "
-"static website, and click when you're ready click \"Start sharing\"."
+"To host a static HTML website with OnionShare, open a website tab, drag "
+"the files and folders that make up the static content there, and click "
+"\"Start sharing\" when you are ready."
msgstr ""
-#: ../../source/features.rst:87
+#: ../../source/features.rst:89
msgid ""
-"If you add an ``index.html`` file, when someone loads your website it "
-"will render this page. You should also include any other HTML files, CSS "
-"files, JavaScript files, and images that make up the website. (Note that "
+"If you add an ``index.html`` file, it will render when someone loads your"
+" website. You should also include any other HTML files, CSS files, "
+"JavaScript files, and images that make up the website. (Note that "
"OnionShare only supports hosting *static* websites. It can't host "
-"websites that execute code or use databases. So you can't, for example, "
-"use WordPress.)"
+"websites that execute code or use databases. So you can't for example use"
+" WordPress.)"
msgstr ""
-#: ../../source/features.rst:89
+#: ../../source/features.rst:91
msgid ""
-"If you don't have an ``index.html`` file, then it will show a directory "
-"listing instead, and people who load it can look through the files and "
+"If you don't have an ``index.html`` file, it will show a directory "
+"listing instead, and people loading it can look through the files and "
"download them."
msgstr ""
-#: ../../source/features.rst:96
+#: ../../source/features.rst:98
msgid "Content Security Policy"
msgstr "內容安全政策"
-#: ../../source/features.rst:98
+#: ../../source/features.rst:100
msgid ""
-"By default OnionShare will help secure your website by setting a strict "
+"By default OnionShare helps secure your website by setting a strict "
"`Content Security Police "
-"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. However"
-" this will prevent third-party content from loading inside the web page."
+"<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ header. "
+"However, this prevents third-party content from loading inside the web "
+"page."
msgstr ""
-#: ../../source/features.rst:100
+#: ../../source/features.rst:102
msgid ""
"If you want to load content from third-party websites, like assets or "
-"JavaScript libraries from CDNs, then you must check the \"Disable Content"
-" Security Policy header (allows your website to use third-party "
-"resources)\" box before starting the service."
+"JavaScript libraries from CDNs, check the \"Don't send Content Security "
+"Policy header (allows your website to use third-party resources)\" box "
+"before starting the service."
msgstr ""
-#: ../../source/features.rst:103
+#: ../../source/features.rst:105
msgid "Tips for running a website service"
msgstr ""
-#: ../../source/features.rst:105
+#: ../../source/features.rst:107
msgid ""
-"If you want to host a long-term website using OnionShare (that isn't just"
-" to quickly show someone something), it's recommended that you do it on a"
-" separate, dedicated computer that's always powered on and connected to "
-"the internet, and not on the one you use on a regular basis. You should "
-"also save the tab (see :ref:`save_tabs`) so that you can resume the "
-"website with the same address if you close OnionShare and re-open it "
-"later."
+"If you want to host a long-term website using OnionShare (meaning not "
+"something to quickly show someone something), it's recommended you do it "
+"on a separate, dedicated computer always powered on and connected to the "
+"Internet, and not on the one you use on a regular basis. Save the tab "
+"(see :ref:`save_tabs`) so you can resume the website with the same "
+"address if you close OnionShare and re-open it later."
msgstr ""
-#: ../../source/features.rst:107
+#: ../../source/features.rst:110
msgid ""
-"If your website is intended to be viewed by the public, you should run it"
-" as a public service (see :ref:`disable_passwords`)."
+"If your website is intended for the public, you should run it as a public"
+" service (see :ref:`turn_off_passwords`)."
msgstr ""
-#: ../../source/features.rst:110
+#: ../../source/features.rst:113
msgid "Chat Anonymously"
msgstr "匿名的聊天"
-#: ../../source/features.rst:112
+#: ../../source/features.rst:115
msgid ""
-"You can use OnionShare to set up a completely anonymous, secure chat room"
-" that doesn't log anything or leave any traces. Just open a chat tab and "
-"click \"Start chat server\"."
+"You can use OnionShare to set up a private, secure chat room that doesn't"
+" log anything. Just open a chat tab and click \"Start chat server\"."
msgstr ""
-#: ../../source/features.rst:116
+#: ../../source/features.rst:119
msgid ""
"After you start the server, copy the OnionShare address and send it to "
-"the people who will join this anonymous chat room. If it's important to "
-"limit exactly who can join, you should use an encrypted messaging app to "
-"send the OnionShare address."
+"the people you want in the anonymous chat room. If it's important to "
+"limit exactly who can join, use an encrypted messaging app to send out "
+"the OnionShare address."
msgstr ""
-#: ../../source/features.rst:120
+#: ../../source/features.rst:124
msgid ""
"People can join the chat room by loading its OnionShare address in Tor "
"Browser. The chat room requires JavasScript, so everyone who wants to "
-"participate must set their security level to Standard or Safer instead of"
-" Safest."
+"participate must have their Tor Browser security level set to "
+"\"Standard\" or \"Safer\", instead of \"Safest\"."
msgstr ""
-#: ../../source/features.rst:122
+#: ../../source/features.rst:127
msgid ""
"When someone joins the chat room they get assigned a random name. They "
"can change their name by typing a new name in the box in the left panel "
-"and pressing enter. No chat history will get displayed at all, even if "
-"others were already chatting in the room, because the chat history isn't "
-"saved anywhere."
+"and pressing ↵. Since the chat history isn't saved anywhere, it doesn't "
+"get displayed at all, even if others were already chatting in the room."
msgstr ""
-#: ../../source/features.rst:126
+#: ../../source/features.rst:133
msgid ""
"In an OnionShare chat room, everyone is anonymous. Anyone can change "
"their name to anything, and there is no way to confirm anyone's identity."
msgstr ""
-#: ../../source/features.rst:128
+#: ../../source/features.rst:136
msgid ""
"However, if you create an OnionShare chat room and securely send the "
"address only to a small group of trusted friends using encrypted "
-"messages, then you can be reasonably confident that the people who join "
-"the chat room are your friends."
+"messages, you can be reasonably confident the people joining the chat "
+"room are your friends."
msgstr ""
-#: ../../source/features.rst:131
+#: ../../source/features.rst:139
msgid "How is this useful?"
msgstr "對您來說有用嗎?"
-#: ../../source/features.rst:133
+#: ../../source/features.rst:141
msgid ""
"If you need to already be using an encrypted messaging app, what's the "
"point of an OnionShare chat room to begin with? It leaves less traces."
msgstr ""
-#: ../../source/features.rst:135
+#: ../../source/features.rst:143
msgid ""
-"If you send a message to a Signal group, for example, a copy of your "
-"message ends up on each device (the phones and computers, if they set up "
-"Signal Desktop) of each member of the group. Even if disappearing "
-"messages is enabled, it's hard to confirm that all copies of the messages"
-" were actually deleted from all devices, and from any other places (like "
+"If you for example send a message to a Signal group, a copy of your "
+"message ends up on each device (the devices, and computers if they set up"
+" Signal Desktop) of each member of the group. Even if disappearing "
+"messages is turned on, it's hard to confirm all copies of the messages "
+"are actually deleted from all devices, and from any other places (like "
"notifications databases) they may have been saved to. OnionShare chat "
-"rooms don't store any messages anywhere, so this isn't a problem."
+"rooms don't store any messages anywhere, so the problem is reduced to a "
+"minimum."
msgstr ""
-#: ../../source/features.rst:137
+#: ../../source/features.rst:146
msgid ""
-"OnionShare chat rooms can also be useful for anonymous people wanting to "
-"chat securely with someone without needing to create any accounts. For "
-"example, a source can send an OnionShare address to a journalist using a "
-"disposable email address, and then wait for the journalist to join the "
-"chat room, all without compromosing their anonymity."
+"OnionShare chat rooms can also be useful for people wanting to chat "
+"anonymously and securely with someone without needing to create any "
+"accounts. For example, a source can send an OnionShare address to a "
+"journalist using a disposable e-mail address, and then wait for the "
+"journalist to join the chat room, all without compromosing their "
+"anonymity."
msgstr ""
-#: ../../source/features.rst:140
+#: ../../source/features.rst:150
msgid "How does the encryption work?"
msgstr ""
-#: ../../source/features.rst:142
+#: ../../source/features.rst:152
msgid ""
-"Because OnionShare relies on Tor onion services, connections between Tor "
-"Browser and OnionShare are all end-to-end encrypted (E2EE). When someone "
-"posts a message to an OnionShare chat room, they send it to the server "
-"through the E2EE onion connection, which then sends it to all other "
-"members of the chat room using WebSockets, through their E2EE onion "
-"connections."
+"Because OnionShare relies on Tor onion services, connections between the "
+"Tor Browser and OnionShare are all end-to-end encrypted (E2EE). When "
+"someone posts a message to an OnionShare chat room, they send it to the "
+"server through the E2EE onion connection, which then sends it to all "
+"other members of the chat room using WebSockets, through their E2EE onion"
+" connections."
msgstr ""
-#: ../../source/features.rst:144
+#: ../../source/features.rst:154
msgid ""
"OnionShare doesn't implement any chat encryption on its own. It relies on"
" the Tor onion service's encryption instead."
msgstr ""
+
+#~ msgid ""
+#~ "OnionShare works by starting web servers"
+#~ " locally on your own computer and "
+#~ "making them accessible to other people"
+#~ " as `Tor <https://www.torproject.org/>`_ `onion"
+#~ " services <https://community.torproject.org/onion-"
+#~ "services/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're responsible for securely sharing "
+#~ "that URL using a communication channel"
+#~ " of your choice like in an "
+#~ "encrypted chat message, or using "
+#~ "something less secure like a Twitter "
+#~ "or Facebook message, depending on your"
+#~ " `threat model <https://ssd.eff.org/en/module/your-"
+#~ "security-plan>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The people who you send the URL"
+#~ " to must then copy and paste it"
+#~ " into `Tor Browser "
+#~ "<https://www.torproject.org/>`_ to access the "
+#~ "OnionShare service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "With OnionShare, *your own computer is"
+#~ " the web server*. If you run "
+#~ "OnionShare on your laptop to send "
+#~ "someone files, and then suspend your "
+#~ "laptop before the files have been "
+#~ "downloaded, the service will not be "
+#~ "available until your laptop is "
+#~ "unsuspended and connected to the "
+#~ "internet again. OnionShare works best "
+#~ "when working with people in real-"
+#~ "time."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because your own computer is the "
+#~ "web server, *no third party can "
+#~ "access anything that happens in "
+#~ "OnionShare*, not even the developers of"
+#~ " OnionShare. It's completely private. And"
+#~ " because OnionShare is based on Tor"
+#~ " onion services too, it also protects"
+#~ " your anonymity. See the :doc:`security "
+#~ "design </security>` for more information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to securely "
+#~ "and anonymously send files and folders"
+#~ " to people. Just open a share "
+#~ "tab, drag in the files and folders"
+#~ " you wish to share, and click "
+#~ "\"Start sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you add files, you'll see "
+#~ "some settings. Make sure you choose "
+#~ "the setting you're interested in first"
+#~ " before you start sharing."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default, as soon as someone "
+#~ "finishes downloading your files, OnionShare"
+#~ " will automatically stop the server, "
+#~ "completely removing the website from the"
+#~ " internet. If you want to allow "
+#~ "multiple people to download these files,"
+#~ " uncheck the \"Stop sharing after "
+#~ "files have been sent (uncheck to "
+#~ "allow downloading individual files)\" box."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Also, if you uncheck this box, "
+#~ "people will be able to download "
+#~ "individual files that you share rather"
+#~ " than a single compressed version of"
+#~ " all of the files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you're ready to share, click "
+#~ "the \"Start sharing\" button. You can"
+#~ " always click \"Stop sharing\", or "
+#~ "quit OnionShare, to immediate take the"
+#~ " website down. You can also click "
+#~ "the up arrow icon in the top-"
+#~ "right corner to show the history "
+#~ "and progress of people downloading files"
+#~ " from you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now that you have a website that's"
+#~ " sharing files, copy the address and"
+#~ " send it to the person you want"
+#~ " to receive the files. If the "
+#~ "files need to stay secure, you "
+#~ "should use an encrypted messaging app."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "That person then must load the "
+#~ "address in Tor Browser. After logging"
+#~ " in with the random password that's"
+#~ " included in the web address, they"
+#~ " will be able to download the "
+#~ "files directly from your computer by "
+#~ "clicking the \"Download Files\" link in"
+#~ " the corner."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to let "
+#~ "people anonymously upload files directly "
+#~ "to your computer, essentially turning it"
+#~ " into an anonymous dropbox. Open a"
+#~ " receive tab, choose where you want"
+#~ " files to get downloaded and other"
+#~ " settings, and then click \"Start "
+#~ "Receive Mode\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This will start the OnionShare service."
+#~ " Anyone that loads this address in"
+#~ " Tor Browser will be able to "
+#~ "upload files to your computer."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also click the down arrow"
+#~ " icon in the top-right corner "
+#~ "to show the history and progress "
+#~ "of people sending files to you."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone uploads files to your "
+#~ "receive service, by default they get "
+#~ "saved to a folder called ``OnionShare``"
+#~ " in your home folder on your "
+#~ "computer, and they get automatically "
+#~ "organized into separate subfolders based "
+#~ "on the time that the files get "
+#~ "uploaded."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Setting up an OnionShare receiving "
+#~ "service is useful for journalists and"
+#~ " others that need to securely accept"
+#~ " documents from anonymous sources. When "
+#~ "used in this way, OnionShare is "
+#~ "sort of like a lightweight, simpler, "
+#~ "not quite as secure version of "
+#~ "`SecureDrop <https://securedrop.org/>`_, the "
+#~ "whistleblower submission system."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Just like with malicious email "
+#~ "attachments, it's possible that someone "
+#~ "could try to hack your computer by"
+#~ " uploading a malicious file to your"
+#~ " OnionShare service. OnionShare does not"
+#~ " add any safety mechanisms to protect"
+#~ " your system from malicious files, so"
+#~ " use at your own risk."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you receive an Office document "
+#~ "or a PDF through OnionShare, you "
+#~ "can convert these documents into PDFs"
+#~ " that you know are safe to open"
+#~ " using `Dangerzone <https://dangerzone.rocks/>`_. "
+#~ "You can also protect yourself when "
+#~ "opening untrusted documents by opening "
+#~ "them in `Tails <https://tails.boum.org/>`_ or"
+#~ " in a `Qubes <https://qubes-os.org/>`_ "
+#~ "disposable VM."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host your own "
+#~ "anonymous dropbox using OnionShare, it's "
+#~ "recommended that you do it on a"
+#~ " separate, dedicated computer that's always"
+#~ " powered on and connected to the "
+#~ "internet, and not on the one you"
+#~ " use on a regular basis."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you intend on advertising the "
+#~ "OnionShare address on your website or"
+#~ " social media profiles, then you "
+#~ "should save the tab (see "
+#~ ":ref:`save_tabs`) and run it as a "
+#~ "public service (see :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to host a"
+#~ " static HTML website with just a "
+#~ "click. Just open a website tab, "
+#~ "drag in the files and folders that"
+#~ " make up the static website, and "
+#~ "click when you're ready click \"Start"
+#~ " sharing\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you add an ``index.html`` file, "
+#~ "when someone loads your website it "
+#~ "will render this page. You should "
+#~ "also include any other HTML files, "
+#~ "CSS files, JavaScript files, and images"
+#~ " that make up the website. (Note "
+#~ "that OnionShare only supports hosting "
+#~ "*static* websites. It can't host "
+#~ "websites that execute code or use "
+#~ "databases. So you can't, for example,"
+#~ " use WordPress.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't have an ``index.html`` "
+#~ "file, then it will show a "
+#~ "directory listing instead, and people "
+#~ "who load it can look through the"
+#~ " files and download them."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "By default OnionShare will help secure"
+#~ " your website by setting a strict "
+#~ "`Content Security Police "
+#~ "<https://en.wikipedia.org/wiki/Content_Security_Policy>`_ "
+#~ "header. However this will prevent "
+#~ "third-party content from loading inside "
+#~ "the web page."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to load content from"
+#~ " third-party websites, like assets or"
+#~ " JavaScript libraries from CDNs, then "
+#~ "you must check the \"Disable Content "
+#~ "Security Policy header (allows your "
+#~ "website to use third-party resources)\""
+#~ " box before starting the service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to host a long-"
+#~ "term website using OnionShare (that "
+#~ "isn't just to quickly show someone "
+#~ "something), it's recommended that you do"
+#~ " it on a separate, dedicated computer"
+#~ " that's always powered on and "
+#~ "connected to the internet, and not "
+#~ "on the one you use on a "
+#~ "regular basis. You should also save "
+#~ "the tab (see :ref:`save_tabs`) so that"
+#~ " you can resume the website with "
+#~ "the same address if you close "
+#~ "OnionShare and re-open it later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your website is intended to be"
+#~ " viewed by the public, you should "
+#~ "run it as a public service (see"
+#~ " :ref:`disable_passwords`)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use OnionShare to set up"
+#~ " a completely anonymous, secure chat "
+#~ "room that doesn't log anything or "
+#~ "leave any traces. Just open a chat"
+#~ " tab and click \"Start chat server\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "After you start the server, copy "
+#~ "the OnionShare address and send it "
+#~ "to the people who will join this"
+#~ " anonymous chat room. If it's "
+#~ "important to limit exactly who can "
+#~ "join, you should use an encrypted "
+#~ "messaging app to send the OnionShare "
+#~ "address."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "People can join the chat room by"
+#~ " loading its OnionShare address in "
+#~ "Tor Browser. The chat room requires "
+#~ "JavasScript, so everyone who wants to"
+#~ " participate must set their security "
+#~ "level to Standard or Safer instead "
+#~ "of Safest."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When someone joins the chat room "
+#~ "they get assigned a random name. "
+#~ "They can change their name by "
+#~ "typing a new name in the box "
+#~ "in the left panel and pressing "
+#~ "enter. No chat history will get "
+#~ "displayed at all, even if others "
+#~ "were already chatting in the room, "
+#~ "because the chat history isn't saved "
+#~ "anywhere."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, if you create an OnionShare "
+#~ "chat room and securely send the "
+#~ "address only to a small group of"
+#~ " trusted friends using encrypted messages,"
+#~ " then you can be reasonably confident"
+#~ " that the people who join the "
+#~ "chat room are your friends."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you send a message to a "
+#~ "Signal group, for example, a copy "
+#~ "of your message ends up on each"
+#~ " device (the phones and computers, if"
+#~ " they set up Signal Desktop) of "
+#~ "each member of the group. Even if"
+#~ " disappearing messages is enabled, it's "
+#~ "hard to confirm that all copies of"
+#~ " the messages were actually deleted "
+#~ "from all devices, and from any "
+#~ "other places (like notifications databases)"
+#~ " they may have been saved to. "
+#~ "OnionShare chat rooms don't store any"
+#~ " messages anywhere, so this isn't a"
+#~ " problem."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "OnionShare chat rooms can also be "
+#~ "useful for anonymous people wanting to"
+#~ " chat securely with someone without "
+#~ "needing to create any accounts. For "
+#~ "example, a source can send an "
+#~ "OnionShare address to a journalist using"
+#~ " a disposable email address, and then"
+#~ " wait for the journalist to join "
+#~ "the chat room, all without compromosing"
+#~ " their anonymity."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Because OnionShare relies on Tor onion"
+#~ " services, connections between Tor Browser"
+#~ " and OnionShare are all end-to-"
+#~ "end encrypted (E2EE). When someone posts"
+#~ " a message to an OnionShare chat "
+#~ "room, they send it to the server"
+#~ " through the E2EE onion connection, "
+#~ "which then sends it to all other"
+#~ " members of the chat room using "
+#~ "WebSockets, through their E2EE onion "
+#~ "connections."
+#~ msgstr ""
+
diff --git a/docs/source/locale/zh_TW/LC_MESSAGES/help.po b/docs/source/locale/zh_TW/LC_MESSAGES/help.po
index 7241c9a0..e3476347 100644
--- a/docs/source/locale/zh_TW/LC_MESSAGES/help.po
+++ b/docs/source/locale/zh_TW/LC_MESSAGES/help.po
@@ -7,68 +7,104 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-10-22 12:26+0000\n"
"Last-Translator: marklin0913 <marklin0913@protonmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: zh_TW\n"
+"Language-Team: zh_TW <LL@li.org>\n"
+"Plural-Forms: nplurals=1; plural=0\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.3.1\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/help.rst:2
msgid "Getting Help"
msgstr "取得協助"
-#: ../../source/help.rst:4
-msgid "If you need help with OnionShare, please follow the instructions below."
-msgstr "如果您需要關於OnionShare的協助,請跟著以下的指示。"
-
-#: ../../source/help.rst:7
-msgid "Read this website"
+#: ../../source/help.rst:5
+#, fuzzy
+msgid "Read This Website"
msgstr "閱讀這個網站"
-#: ../../source/help.rst:9
+#: ../../source/help.rst:7
#, fuzzy
msgid ""
-"This website is full of instructions on how to use OnionShare. Look "
-"through all of the sections first to see if it answers your questions."
+"You will find instructions on how to use OnionShare. Look through all of "
+"the sections first to see if anything answers your questions."
msgstr "這個網站充滿了所有教你如何使用OnionShare的指示。"
-#: ../../source/help.rst:12
-msgid "Check the GitHub issues"
+#: ../../source/help.rst:10
+#, fuzzy
+msgid "Check the GitHub Issues"
msgstr "確認Github的issues"
-#: ../../source/help.rst:14
+#: ../../source/help.rst:12
msgid ""
-"If you can't find a solution in this website, please check the `GitHub "
-"issues <https://github.com/micahflee/onionshare/issues>`_. It's possible "
-"that someone else has encountered the same problem and has either raised "
-"it with the developers, or maybe even posted a solution."
+"If it isn't on the website, please check the `GitHub issues "
+"<https://github.com/micahflee/onionshare/issues>`_. It's possible someone"
+" else has encountered the same problem and either raised it with the "
+"developers, or maybe even posted a solution."
msgstr ""
-#: ../../source/help.rst:17
-msgid "Submit an issue yourself"
+#: ../../source/help.rst:15
+msgid "Submit an Issue Yourself"
msgstr ""
-#: ../../source/help.rst:19
+#: ../../source/help.rst:17
msgid ""
-"If you can't find a solution to your problem, or you wish to ask a "
-"question or suggest a new feature, please `submit an issue "
+"If you are unable to find a solution, or wish to ask a question or "
+"suggest a new feature, please `submit an issue "
"<https://github.com/micahflee/onionshare/issues/new>`_. This requires "
-"`creating an GitHub account <https://help.github.com/articles/signing-up-"
+"`creating a GitHub account <https://help.github.com/articles/signing-up-"
"for-a-new-github-account/>`_."
msgstr ""
-#: ../../source/help.rst:22
-msgid "Join our Keybase team"
+#: ../../source/help.rst:20
+msgid "Join our Keybase Team"
msgstr ""
-#: ../../source/help.rst:24
+#: ../../source/help.rst:22
msgid ""
-"See :ref:`collaborating` for instructions on how to join our Keybase team"
-" that we use to discuss the project."
+"See :ref:`collaborating` on how to join the Keybase team used to discuss "
+"the project."
msgstr ""
+
+#~ msgid "If you need help with OnionShare, please follow the instructions below."
+#~ msgstr "如果您需要關於OnionShare的協助,請跟著以下的指示。"
+
+#~ msgid ""
+#~ "If you can't find a solution in"
+#~ " this website, please check the "
+#~ "`GitHub issues "
+#~ "<https://github.com/micahflee/onionshare/issues>`_. It's "
+#~ "possible that someone else has "
+#~ "encountered the same problem and has "
+#~ "either raised it with the developers,"
+#~ " or maybe even posted a solution."
+#~ msgstr ""
+
+#~ msgid "Submit an issue yourself"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you can't find a solution to"
+#~ " your problem, or you wish to "
+#~ "ask a question or suggest a new"
+#~ " feature, please `submit an issue "
+#~ "<https://github.com/micahflee/onionshare/issues/new>`_. This "
+#~ "requires `creating an GitHub account "
+#~ "<https://help.github.com/articles/signing-up-for-a-new-"
+#~ "github-account/>`_."
+#~ msgstr ""
+
+#~ msgid "Join our Keybase team"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "See :ref:`collaborating` for instructions on"
+#~ " how to join our Keybase team "
+#~ "that we use to discuss the "
+#~ "project."
+#~ msgstr ""
+
diff --git a/docs/source/locale/zh_TW/LC_MESSAGES/install.po b/docs/source/locale/zh_TW/LC_MESSAGES/install.po
index 594bd130..40be5554 100644
--- a/docs/source/locale/zh_TW/LC_MESSAGES/install.po
+++ b/docs/source/locale/zh_TW/LC_MESSAGES/install.po
@@ -7,24 +7,25 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-10-12 15:26+0000\n"
-"Last-Translator: marklin0913da248e4cdada422a <marklin0913@protonmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Last-Translator: marklin0913da248e4cdada422a <marklin0913@protonmail.com>"
+"\n"
"Language: zh_TW\n"
+"Language-Team: zh_TW <LL@li.org>\n"
+"Plural-Forms: nplurals=1; plural=0\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.3-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/install.rst:2
msgid "Installation"
msgstr "安裝"
#: ../../source/install.rst:5
-msgid "Install on Windows or macOS"
+#, fuzzy
+msgid "Windows or macOS"
msgstr "安裝到Windows或是macOS"
#: ../../source/install.rst:7
@@ -32,115 +33,233 @@ msgid ""
"You can download OnionShare for Windows and macOS from the `OnionShare "
"website <https://onionshare.org/>`_."
msgstr ""
-"你可以從`OnionShare website <https://onionshare.org/"
-">`_下載Windows和macOS的OnionShare。"
+"你可以從`OnionShare website "
+"<https://onionshare.org/>`_下載Windows和macOS的OnionShare。"
-#: ../../source/install.rst:9
-msgid "For added security, see :ref:`verifying_sigs`."
-msgstr "增加安全性,請看:ref:`verifying_sigs`。"
-
-#: ../../source/install.rst:14
-msgid "Install in Linux with Flatpak"
+#: ../../source/install.rst:12
+#, fuzzy
+msgid "Install in Linux"
msgstr "使用Flatpak安裝到Linux"
-#: ../../source/install.rst:16
+#: ../../source/install.rst:14
msgid ""
"There are various ways to install OnionShare for Linux, but the "
-"recommended way is to use the Flatpak package. Flatpak ensures that "
-"you'll always use the most latest dependencies and run OnionShare inside "
-"of a sandbox."
+"recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
+" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
+"ensure that you'll always use the newest version and run OnionShare "
+"inside of a sandbox."
msgstr ""
-#: ../../source/install.rst:18
+#: ../../source/install.rst:17
msgid ""
-"Make sure you have ``flatpak`` installed and the Flathub repository added"
-" by following `these instructions <https://flatpak.org/setup/>`_ for your"
-" Linux distribution."
+"Snapcraft is built-in to Ubuntu and Flatpak is built-in to Fedora, but "
+"which you use is up to you. Both work in all Linux distributions."
msgstr ""
-#: ../../source/install.rst:20
+#: ../../source/install.rst:19
msgid ""
-"Then install OnionShare from Flathub by following `the instructions here "
-"<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+"**Install OnionShare using Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
msgstr ""
-#: ../../source/install.rst:25
-msgid "Verifying PGP signatures"
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
msgstr ""
-#: ../../source/install.rst:27
+#: ../../source/install.rst:23
msgid ""
-"You can verify that the Windows, macOS, or source package you download is"
-" legitimate and hasn't been tampered with by verifying its PGP signature."
-" For Windows and macOS, this step is optional and provides defense in "
-"depth: the installers also include their operating system-specific "
-"signatures, and you can just rely on those alone if you'd like."
+"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"packages from https://onionshare.org/dist/ if you prefer."
+msgstr ""
+
+#: ../../source/install.rst:28
+msgid "Verifying PGP signatures"
msgstr ""
#: ../../source/install.rst:30
+msgid ""
+"You can verify that the package you download is legitimate and hasn't "
+"been tampered with by verifying its PGP signature. For Windows and macOS,"
+" this step is optional and provides defense in depth: the OnionShare "
+"binaries include operating system-specific signatures, and you can just "
+"rely on those alone if you'd like."
+msgstr ""
+
+#: ../../source/install.rst:34
msgid "Signing key"
msgstr ""
-#: ../../source/install.rst:32
+#: ../../source/install.rst:36
msgid ""
-"Windows, macOS, and source packaged are signed by Micah Lee, the core "
-"developer, using his PGP public key with fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can download Micah's "
-"key `from the keys.openpgp.org keyserver <https://keys.openpgp.org/vks/v1"
-"/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Packages are signed by Micah Lee, the core developer, using his PGP "
+"public key with fingerprint ``927F419D7EC82C2F149C1BD1403C2657CD994F73``."
+" You can download Micah's key `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
msgstr ""
-#: ../../source/install.rst:34
+#: ../../source/install.rst:38
msgid ""
-"In order to verify signatures, you must have GnuPG installed. For macOS "
-"you probably want `GPGTools <https://gpgtools.org/>`_, and for Windows "
-"you probably want `Gpg4win <https://www.gpg4win.org/>`_."
+"You must have GnuPG installed to verify signatures. For macOS you "
+"probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
+"probably want `Gpg4win <https://www.gpg4win.org/>`_."
msgstr ""
-#: ../../source/install.rst:37
+#: ../../source/install.rst:41
msgid "Signatures"
msgstr ""
-#: ../../source/install.rst:39
+#: ../../source/install.rst:43
msgid ""
"You can find the signatures (``.asc`` files), as well as Windows, macOS, "
-"and source packages, at https://onionshare.org/dist/ in the folders named"
-" for each version of OnionShare. You can also find them on the `GitHub "
-"Releases page <https://github.com/micahflee/onionshare/releases>`_."
+"Flatpak, Snapcraft, and source packages, at https://onionshare.org/dist/ "
+"in the folders named for each version of OnionShare. You can also find "
+"them on the `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
msgstr ""
-#: ../../source/install.rst:42
+#: ../../source/install.rst:47
msgid "Verifying"
msgstr "驗證中"
-#: ../../source/install.rst:44
+#: ../../source/install.rst:49
msgid ""
"Once you have imported Micah's public key into your GnuPG keychain, "
"downloaded the binary, and downloaded the ``.asc`` signature, you can "
-"verify the binary for macOS in terminal like this::"
+"verify the binary for macOS in a terminal like this::"
msgstr ""
-#: ../../source/install.rst:48
-msgid "Or for Windows in a command prompt like this::"
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
msgstr ""
-#: ../../source/install.rst:52
-msgid "An expected output might look like this::"
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
msgstr ""
-#: ../../source/install.rst:64
+#: ../../source/install.rst:69
msgid ""
-"If you don't see 'Good signature from', then there might be a problem "
-"with the integrity of the file (malicious or otherwise), and you perhaps "
-"should not install the package. (The WARNING shown above, is not a "
-"problem with the package: it only means you have not defined any level of"
-" 'trust' regarding Micah's PGP key itself.)"
+"If you don't see 'Good signature from', there might be a problem with the"
+" integrity of the file (malicious or otherwise), and you should not "
+"install the package. (The WARNING shown above, is not a problem with the "
+"package: it only means you haven't already defined any level of 'trust' "
+"of Micah's PGP key.)"
msgstr ""
-#: ../../source/install.rst:66
+#: ../../source/install.rst:71
msgid ""
"If you want to learn more about verifying PGP signatures, guides for "
"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and"
-" the `Tor Project <https://2019.www.torproject.org/docs/verifying-"
-"signatures.html.en>`_ may be helpful."
+" the `Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ may be helpful."
msgstr ""
+
+#~ msgid "For added security, see :ref:`verifying_sigs`."
+#~ msgstr "增加安全性,請看:ref:`verifying_sigs`。"
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use the "
+#~ "Flatpak package. Flatpak ensures that "
+#~ "you'll always use the most latest "
+#~ "dependencies and run OnionShare inside "
+#~ "of a sandbox."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make sure you have ``flatpak`` installed"
+#~ " and the Flathub repository added by"
+#~ " following `these instructions "
+#~ "<https://flatpak.org/setup/>`_ for your Linux "
+#~ "distribution."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Then install OnionShare from Flathub by"
+#~ " following `the instructions here "
+#~ "<https://flathub.org/apps/details/org.onionshare.OnionShare>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can verify that the Windows, "
+#~ "macOS, or source package you download"
+#~ " is legitimate and hasn't been "
+#~ "tampered with by verifying its PGP "
+#~ "signature. For Windows and macOS, this"
+#~ " step is optional and provides "
+#~ "defense in depth: the installers also"
+#~ " include their operating system-specific"
+#~ " signatures, and you can just rely"
+#~ " on those alone if you'd like."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Windows, macOS, and source packaged are"
+#~ " signed by Micah Lee, the core "
+#~ "developer, using his PGP public key "
+#~ "with fingerprint "
+#~ "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. You can "
+#~ "download Micah's key `from the "
+#~ "keys.openpgp.org keyserver "
+#~ "<https://keys.openpgp.org/vks/v1/by-"
+#~ "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In order to verify signatures, you "
+#~ "must have GnuPG installed. For macOS "
+#~ "you probably want `GPGTools "
+#~ "<https://gpgtools.org/>`_, and for Windows you"
+#~ " probably want `Gpg4win "
+#~ "<https://www.gpg4win.org/>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can find the signatures (``.asc``"
+#~ " files), as well as Windows, macOS,"
+#~ " and source packages, at "
+#~ "https://onionshare.org/dist/ in the folders "
+#~ "named for each version of OnionShare."
+#~ " You can also find them on the"
+#~ " `GitHub Releases page "
+#~ "<https://github.com/micahflee/onionshare/releases>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you have imported Micah's public"
+#~ " key into your GnuPG keychain, "
+#~ "downloaded the binary, and downloaded "
+#~ "the ``.asc`` signature, you can verify"
+#~ " the binary for macOS in terminal "
+#~ "like this::"
+#~ msgstr ""
+
+#~ msgid "Or for Windows in a command prompt like this::"
+#~ msgstr ""
+
+#~ msgid "An expected output might look like this::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you don't see 'Good signature "
+#~ "from', then there might be a "
+#~ "problem with the integrity of the "
+#~ "file (malicious or otherwise), and you"
+#~ " perhaps should not install the "
+#~ "package. (The WARNING shown above, is"
+#~ " not a problem with the package: "
+#~ "it only means you have not defined"
+#~ " any level of 'trust' regarding "
+#~ "Micah's PGP key itself.)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you want to learn more about"
+#~ " verifying PGP signatures, guides for "
+#~ "`Qubes OS <https://www.qubes-os.org/security"
+#~ "/verifying-signatures/>`_ and the `Tor "
+#~ "Project <https://2019.www.torproject.org/docs/verifying-"
+#~ "signatures.html.en>`_ may be helpful."
+#~ msgstr ""
+
diff --git a/docs/source/locale/zh_TW/LC_MESSAGES/security.po b/docs/source/locale/zh_TW/LC_MESSAGES/security.po
index fe1b134b..55b831b1 100644
--- a/docs/source/locale/zh_TW/LC_MESSAGES/security.po
+++ b/docs/source/locale/zh_TW/LC_MESSAGES/security.po
@@ -7,26 +7,25 @@ msgid ""
msgstr ""
"Project-Id-Version: OnionShare 2.3\n"
"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-09-03 11:37-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-10-22 12:26+0000\n"
"Last-Translator: marklin0913 <marklin0913@protonmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: zh_TW\n"
+"Language-Team: zh_TW <LL@li.org>\n"
+"Plural-Forms: nplurals=1; plural=0\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.3.1\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/security.rst:2
-msgid "Security design"
+#, fuzzy
+msgid "Security Design"
msgstr "安全設計"
#: ../../source/security.rst:4
-msgid ""
-"First read :ref:`how_it_works` to understand the basics of how OnionShare"
-" works."
+#, fuzzy
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
msgstr "首先閱讀:ref:`how_it_works` 來了解基礎的OnionShare運作原理。"
#: ../../source/security.rst:6
@@ -41,25 +40,22 @@ msgstr ""
#: ../../source/security.rst:11
msgid ""
"**Third parties don't have access to anything that happens in "
-"OnionShare.** When you use OnionShare, you host services directly on your"
-" computer. For example, when you share files with OnionShare, you don't "
-"upload these files to any server, and when you start an OnionShare chat "
-"room, your computer is the chat room server itself. Traditional ways of "
-"sharing files or setting up websites and chat rooms require trusting a "
-"service with access to your data."
+"OnionShare.** Using OnionShare means hosting services directly on your "
+"computer. When sharing files with OnionShare, they are not uploaded to "
+"any server. If you make an OnionShare chat room, your computer acts as a "
+"server for that too. This avoids the traditional model of having to trust"
+" the computers of others."
msgstr ""
#: ../../source/security.rst:13
msgid ""
"**Network eavesdroppers can't spy on anything that happens in OnionShare "
-"in transit.** Because connections between Tor onion services and Tor "
-"Browser are end-to-end encrypted, no network attackers can eavesdrop on "
-"what happens in an OnionShare service. If the eavesdropper is positioned "
-"on the OnionShare user's end, the Tor Browser user's end, or is a "
-"malicious Tor node, they will only see Tor traffic. If the eavesdropper "
-"is a malicious rendezvous node used to connect Tor Browser with "
-"OnionShare's onion service, the traffic will be encrypted using the onion"
-" service key."
+"in transit.** The connection between the Tor onion service and Tor "
+"Browser is end-to-end encrypted. This means network attackers can't "
+"eavesdrop on anything except encrypted Tor traffic. Even if an "
+"eavesdropper is a malicious rendezvous node used to connect the Tor "
+"Browser with OnionShare's onion service, the traffic is encrypted using "
+"the onion service's private key."
msgstr ""
#: ../../source/security.rst:15
@@ -73,16 +69,16 @@ msgstr ""
#: ../../source/security.rst:17
msgid ""
-"**If an attacker learns about the onion service, they still can't access "
-"anything.** There have been attacks against the Tor network that can "
-"enumerate onion services. Even if someone discovers the .onion address of"
-" an OnionShare onion service, they can't access it without also knowing "
-"the service's random password (unless, of course, the OnionShare users "
-"chooses to disable the password and make it public). The password is "
-"generated by choosing two random words from a list of 6800 words, meaning"
-" there are 6800^2, or about 46 million possible password. But they can "
-"only make 20 wrong guesses before OnionShare stops the server, preventing"
-" brute force attacks against the password."
+"**If an attacker learns about the onion service, it still can't access "
+"anything.** Prior attacks against the Tor network to enumerate onion "
+"services allowed the attacker to discover private .onion addresses. If an"
+" attack discovers a private OnionShare address, a password will be "
+"prevent them from accessing it (unless the OnionShare user chooses to "
+"turn it off and make it public).. The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800^2, or about 46 "
+"million possible passwords. Only 20 wrong guesses can be made before "
+"OnionShare stops the server, preventing brute force attacks against the "
+"password."
msgstr ""
#: ../../source/security.rst:20
@@ -91,26 +87,122 @@ msgstr ""
#: ../../source/security.rst:22
msgid ""
-"**Communicating the OnionShare address might not be secure.** The "
-"OnionShare user is responsible for securely communicating the OnionShare "
-"address with people. If they send it insecurely (such as through an email"
-" message, and their email is being monitored by an attacker), the "
-"eavesdropper will learn that they're using OnionShare. If the attacker "
-"loads the address in Tor Browser before the legitimate recipient gets to "
-"it, they can access the service. If this risk fits the user's threat "
-"model, they must find a more secure way to communicate the address, such "
-"as in an encrypted email, chat, or voice call. This isn't necessary in "
-"cases where OnionShare is being used for something that isn't secret."
+"**Communicating the OnionShare address might not be secure.** "
+"Communicating the OnionShare address to people is the responsibility of "
+"the OnionShare user. If sent insecurely (such as through an email message"
+" monitored by an attacker), an eavesdropper can tell that OnionShare is "
+"being used. If the eavesdropper loads the address in Tor Browser while "
+"the service is still up, they can access it. To avoid this, the address "
+"must be communicateed securely, via encrypted text message (probably with"
+" disappearing messages enabled), encrypted email, or in person. This "
+"isn't necessary when using OnionShare for something that isn't secret."
msgstr ""
#: ../../source/security.rst:24
msgid ""
-"**Communicating the OnionShare address might not be anonymous.** While "
-"OnionShare and Tor Browser allow for anonymity, if the user wishes to "
-"remain anonymous they must take extra steps to ensure this while "
-"communicating the OnionShare address. For example, they might need to use"
-" Tor to create a new anonymous email or chat account, and only access it "
-"over Tor, to use for sharing the address. This isn't necessary in cases "
-"where there's no need to protect anonymity, such as co-workers who know "
-"each other sharing work documents."
+"**Communicating the OnionShare address might not be anonymous.** Extra "
+"steps must be taken to ensure the OnionShare address is communicated "
+"anonymously. A new email or chat account, only accessed over Tor, can be "
+"used to share the address. This isn't necessary unless anonymity is a "
+"goal."
msgstr ""
+
+#~ msgid ""
+#~ "**Third parties don't have access to "
+#~ "anything that happens in OnionShare.** "
+#~ "When you use OnionShare, you host "
+#~ "services directly on your computer. For"
+#~ " example, when you share files with"
+#~ " OnionShare, you don't upload these "
+#~ "files to any server, and when you"
+#~ " start an OnionShare chat room, your"
+#~ " computer is the chat room server "
+#~ "itself. Traditional ways of sharing "
+#~ "files or setting up websites and "
+#~ "chat rooms require trusting a service"
+#~ " with access to your data."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Network eavesdroppers can't spy on "
+#~ "anything that happens in OnionShare in"
+#~ " transit.** Because connections between Tor"
+#~ " onion services and Tor Browser are"
+#~ " end-to-end encrypted, no network "
+#~ "attackers can eavesdrop on what happens"
+#~ " in an OnionShare service. If the "
+#~ "eavesdropper is positioned on the "
+#~ "OnionShare user's end, the Tor Browser"
+#~ " user's end, or is a malicious "
+#~ "Tor node, they will only see Tor"
+#~ " traffic. If the eavesdropper is a"
+#~ " malicious rendezvous node used to "
+#~ "connect Tor Browser with OnionShare's "
+#~ "onion service, the traffic will be "
+#~ "encrypted using the onion service key."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, they still can't access"
+#~ " anything.** There have been attacks "
+#~ "against the Tor network that can "
+#~ "enumerate onion services. Even if "
+#~ "someone discovers the .onion address of"
+#~ " an OnionShare onion service, they "
+#~ "can't access it without also knowing "
+#~ "the service's random password (unless, "
+#~ "of course, the OnionShare users chooses"
+#~ " to disable the password and make "
+#~ "it public). The password is generated"
+#~ " by choosing two random words from"
+#~ " a list of 6800 words, meaning "
+#~ "there are 6800^2, or about 46 "
+#~ "million possible password. But they can"
+#~ " only make 20 wrong guesses before"
+#~ " OnionShare stops the server, preventing"
+#~ " brute force attacks against the "
+#~ "password."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be secure.** The OnionShare user"
+#~ " is responsible for securely communicating"
+#~ " the OnionShare address with people. "
+#~ "If they send it insecurely (such "
+#~ "as through an email message, and "
+#~ "their email is being monitored by "
+#~ "an attacker), the eavesdropper will "
+#~ "learn that they're using OnionShare. If"
+#~ " the attacker loads the address in"
+#~ " Tor Browser before the legitimate "
+#~ "recipient gets to it, they can "
+#~ "access the service. If this risk "
+#~ "fits the user's threat model, they "
+#~ "must find a more secure way to "
+#~ "communicate the address, such as in "
+#~ "an encrypted email, chat, or voice "
+#~ "call. This isn't necessary in cases "
+#~ "where OnionShare is being used for "
+#~ "something that isn't secret."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "**Communicating the OnionShare address might"
+#~ " not be anonymous.** While OnionShare "
+#~ "and Tor Browser allow for anonymity, "
+#~ "if the user wishes to remain "
+#~ "anonymous they must take extra steps "
+#~ "to ensure this while communicating the"
+#~ " OnionShare address. For example, they "
+#~ "might need to use Tor to create"
+#~ " a new anonymous email or chat "
+#~ "account, and only access it over "
+#~ "Tor, to use for sharing the "
+#~ "address. This isn't necessary in cases"
+#~ " where there's no need to protect "
+#~ "anonymity, such as co-workers who "
+#~ "know each other sharing work documents."
+#~ msgstr ""
+
diff --git a/docs/source/locale/zh_TW/LC_MESSAGES/tor.po b/docs/source/locale/zh_TW/LC_MESSAGES/tor.po
index d4138b9f..940b09f7 100644
--- a/docs/source/locale/zh_TW/LC_MESSAGES/tor.po
+++ b/docs/source/locale/zh_TW/LC_MESSAGES/tor.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: 2020-09-17 09:38-0700\n"
+"POT-Creation-Date: 2020-11-15 14:42-0800\n"
"PO-Revision-Date: 2020-10-12 15:26+0000\n"
-"Last-Translator: marklin0913da248e4cdada422a <marklin0913@protonmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Last-Translator: marklin0913da248e4cdada422a <marklin0913@protonmail.com>"
+"\n"
"Language: zh_TW\n"
+"Language-Team: zh_TW <LL@li.org>\n"
+"Plural-Forms: nplurals=1; plural=0\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.3-dev\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
#: ../../source/tor.rst:2
msgid "Connecting to Tor"
@@ -25,193 +25,386 @@ msgstr "連結Tor中"
#: ../../source/tor.rst:4
msgid ""
-"There are several options for how OnionShare should connect to Tor. You "
-"can change them in Settings, which you can get to by clicking the gear "
-"icon in the bottom-right of the window."
+"Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the"
+" bottom right of the OnionShare window to get to its settings."
msgstr ""
#: ../../source/tor.rst:9
-msgid "Use Tor that is bundled with OnionShare"
+msgid "Use the ``tor`` bundled with OnionShare"
msgstr ""
#: ../../source/tor.rst:11
msgid ""
-"This is the default way that OnionShare connects to Tor, and it's also "
-"the simplest and most reliable way. For this reason, it's recommended for"
-" most users."
+"This is the default, simplest and most reliable way that OnionShare "
+"connects to Tor. For this reason, it's recommended for most users."
msgstr ""
-#: ../../source/tor.rst:13
+#: ../../source/tor.rst:14
msgid ""
-"When you open OnionShare, it will launch a Tor process in the background "
-"that's configured specifically for OnionShare to use. This Tor process "
-"won't interfere with other Tor processes on your computer, so you're free"
-" to run Tor Browser or use a system Tor in the background."
+"When you open OnionShare, it launches an already configured ``tor`` "
+"process in the background for OnionShare to use. It doesn't interfere "
+"with other ``tor`` processes on your computer, so you can use the Tor "
+"Browser or the system ``tor`` on their own."
msgstr ""
-#: ../../source/tor.rst:16
-msgid "Attempt automatic configuration with Tor Browser"
+#: ../../source/tor.rst:18
+msgid "Attempt auto-configuration with Tor Browser"
msgstr ""
-#: ../../source/tor.rst:18
+#: ../../source/tor.rst:20
msgid ""
-"You can configure OnionShare to connect to the Tor that comes with Tor "
-"Browser. First, `download Tor Browser <https://www.torproject.org>`_ here"
-" if you don't already have it. With this setting selected, you need to "
-"keep Tor Browser open in the background while you're using OnionShare."
+"If you have `downloaded the Tor Browser <https://www.torproject.org>`_ "
+"and don't want two ``tor`` processes running, you can use the ``tor`` "
+"process from the Tor Browser. Keep in mind you need to keep Tor Browser "
+"open in the background while you're using OnionShare for this to work."
msgstr ""
-#: ../../source/tor.rst:21
-msgid "Using a system Tor in Windows"
+#: ../../source/tor.rst:24
+#, fuzzy
+msgid "Using a system ``tor`` in Windows"
msgstr "在Windows系統中使用Tor"
-#: ../../source/tor.rst:23
+#: ../../source/tor.rst:26
msgid ""
"This is fairly advanced. You'll need to know how edit plaintext files and"
" do stuff as an administrator."
msgstr ""
-#: ../../source/tor.rst:25
+#: ../../source/tor.rst:28
msgid ""
-"Download the Tor Windows Expert Bundle, which you can get `from here "
-"<https://www.torproject.org/download/tor/>`_. Extract the zip file and "
-"copy the extracted folder to ``C:\\Program Files (x86)\\``, and rename "
-"the folder to ``tor-win32``, so that inside that folder is the ``Data`` "
-"and ``Tor`` folders."
+"Download the Tor Windows Expert Bundle `from "
+"<https://www.torproject.org/download/tor/>`_. Extract the ZIP file and "
+"copy the extracted folder to ``C:\\Program Files (x86)\\`` Rename the "
+"extracted folder with ``Data`` and ``Tor`` in it to ``tor-win32``."
msgstr ""
-#: ../../source/tor.rst:27
+#: ../../source/tor.rst:32
msgid ""
-"Make up a control port password. I'm going to use ``comprised stumble "
-"rummage work avenging construct volatile`` as my password. Now open a "
-"command prompt as an administrator, and use ``tor.exe --hash-password`` "
-"to generate a hash of your password. For example::"
+"Make up a control port password. (Using 7 words in a sequence like "
+"``comprised stumble rummage work avenging construct volatile`` is a good "
+"idea for a password.) Now open a command prompt (``cmd``) as an "
+"administrator, and use ``tor.exe --hash-password`` to generate a hash of "
+"your password. For example::"
msgstr ""
-#: ../../source/tor.rst:32
+#: ../../source/tor.rst:39
msgid ""
"The hashed password output is displayed after some warnings (which you "
-"can ignore). In my case, it was "
+"can ignore). In the case of the above example, it is "
"``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
msgstr ""
-#: ../../source/tor.rst:34
+#: ../../source/tor.rst:41
msgid ""
"Now create a new text file at ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` and put this in it, replacing the "
+"win32\\torrc`` and put your hashed password output in it, replacing the "
"``HashedControlPassword`` with the one you just generated::"
msgstr ""
-#: ../../source/tor.rst:39
+#: ../../source/tor.rst:46
msgid ""
-"In your administrator command prompt, install tor as a service using the "
-"appropriate ``torrc`` file you just created (see `here "
-"<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ for more "
-"information on doing this). Like this::"
+"In your administrator command prompt, install ``tor`` as a service using "
+"the appropriate ``torrc`` file you just created (as described in "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
+"this::"
msgstr ""
-#: ../../source/tor.rst:43
-msgid "You're now running a system Tor in Windows!"
+#: ../../source/tor.rst:50
+msgid "You are now running a system ``tor`` process in Windows!"
msgstr ""
-#: ../../source/tor.rst:45
+#: ../../source/tor.rst:52
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using control port\", and set the "
-"control port host to ``127.0.0.1`` and the port to ``9051``. Under \"Tor "
-"authentication options\" choose \"Password\" and set the password to your"
-" password, in my case ``comprised stumble rummage work avenging construct"
-" volatile``. Click the \"Test Settings\" button. If all goes well, you "
-"should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using control port\", and "
+"set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
+"\"Tor authentication settings\" choose \"Password\" and set the password "
+"to the control port password you picked above Click the \"Test Connection"
+" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
+" controller\"."
msgstr ""
-#: ../../source/tor.rst:48
-msgid "Using a system Tor in macOS"
+#: ../../source/tor.rst:61
+#, fuzzy
+msgid "Using a system ``tor`` in macOS"
msgstr "在macOS系統中使用Tor"
-#: ../../source/tor.rst:50
+#: ../../source/tor.rst:63
msgid ""
-"First, install `Homebrew <http://brew.sh/>`_ if you don't already have "
+"First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
"it. Then, install Tor::"
msgstr ""
-#: ../../source/tor.rst:54
+#: ../../source/tor.rst:67
msgid "Now configure Tor to allow connections from OnionShare::"
msgstr ""
-#: ../../source/tor.rst:61
+#: ../../source/tor.rst:74
msgid "And start the system Tor service::"
msgstr ""
-#: ../../source/tor.rst:65
+#: ../../source/tor.rst:78
msgid ""
-"Open OnionShare. Click the Settings icon. Under \"How should OnionShare "
-"connect to Tor?\" choose \"Connect using socket file\", and set the "
-"socket file to be ``/usr/local/var/run/tor/control.socket``. Under \"Tor "
-"authentication options\" choose \"No authentication, or cookie "
-"authentication\". Click the \"Test Settings\" button. If all goes well, "
-"you should see successfully connected to tor."
+"Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
+"OnionShare connect to Tor?\" choose \"Connect using socket file\", and "
+"set the socket file to be ``/usr/local/var/run/tor/control.socket``. "
+"Under \"Tor authentication settings\" choose \"No authentication, or "
+"cookie authentication\". Click the \"Test Connection to Tor\" button."
+msgstr ""
+
+#: ../../source/tor.rst:84 ../../source/tor.rst:104
+msgid "If all goes well, you should see \"Connected to the Tor controller\"."
msgstr ""
-#: ../../source/tor.rst:68
-msgid "Using a system Tor in Linux"
+#: ../../source/tor.rst:87
+#, fuzzy
+msgid "Using a system ``tor`` in Linux"
msgstr "在Linux系統中使用Tor"
-#: ../../source/tor.rst:70
+#: ../../source/tor.rst:89
msgid ""
-"First, install the tor package. If you're using Debian, Ubuntu, or a "
-"similar Linux distro, I recommend you use Tor Project's `official "
-"repository <https://2019.www.torproject.org/docs/debian.html.en>`_. For "
-"example, in Ubuntu 20.04::"
+"First, install the ``tor`` package. If you're using Debian, Ubuntu, or a "
+"similar Linux distro, It is recommended to use the Tor Project's "
+"`official repository <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
msgstr ""
-#: ../../source/tor.rst:78
+#: ../../source/tor.rst:91
msgid ""
-"Next, add your user to the group that runs the Tor process (in the case "
-"of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to connect"
-" to your system Tor's control socket file."
+"Next, add your user to the group that runs the ``tor`` process (in the "
+"case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
+"connect to your system ``tor``'s control socket file."
msgstr ""
-#: ../../source/tor.rst:80
+#: ../../source/tor.rst:93
msgid ""
"Add your user to the ``debian-tor`` group by running this command "
"(replace ``username`` with your actual username)::"
msgstr ""
-#: ../../source/tor.rst:84
+#: ../../source/tor.rst:97
msgid ""
-"Reboot your computer. After it boots up again, open OnionShare. Click the"
-" Settings icon. Under \"How should OnionShare connect to Tor?\" choose "
-"\"Connect using socket file\", and set the socket file to be "
-"``/var/run/tor/control``. Under \"Tor authentication options\" choose "
+"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 "
-"Settings\" button. If all goes well, you should see successfully connect "
-"to Tor."
+"Connection to Tor\" button."
msgstr ""
-#: ../../source/tor.rst:87
+#: ../../source/tor.rst:107
msgid "Using Tor bridges"
msgstr ""
-#: ../../source/tor.rst:89
+#: ../../source/tor.rst:109
msgid ""
-"If your access to the internet is censored, you can configure OnionShare "
+"If your access to the Internet is censored, you can configure OnionShare "
"to connect to the Tor network using `Tor bridges "
"<https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare "
-"successfully connects to Tor, you don't need to use a bridge."
+"connects to Tor without one, you don't need to use a bridge."
msgstr ""
-#: ../../source/tor.rst:91
-msgid "To configure bridges, open OnionShare settings."
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
msgstr ""
-#: ../../source/tor.rst:93
+#: ../../source/tor.rst:113
msgid ""
"You can use the built-in obfs4 pluggable transports, the built-in "
"meek_lite (Azure) pluggable transports, or custom bridges, which you can "
"obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
-"need to use a bridge, you should try the built-in obfs4 ones first."
+"need to use a bridge, try the built-in obfs4 ones first."
msgstr ""
#~ msgid "Using a system Tor in Mac OS X"
#~ msgstr ""
+
+#~ msgid ""
+#~ "There are several options for how "
+#~ "OnionShare should connect to Tor. You"
+#~ " can change them in Settings, which"
+#~ " you can get to by clicking the"
+#~ " gear icon in the bottom-right "
+#~ "of the window."
+#~ msgstr ""
+
+#~ msgid "Use Tor that is bundled with OnionShare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is the default way that "
+#~ "OnionShare connects to Tor, and it's "
+#~ "also the simplest and most reliable "
+#~ "way. For this reason, it's recommended"
+#~ " for most users."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When you open OnionShare, it will "
+#~ "launch a Tor process in the "
+#~ "background that's configured specifically for"
+#~ " OnionShare to use. This Tor process"
+#~ " won't interfere with other Tor "
+#~ "processes on your computer, so you're"
+#~ " free to run Tor Browser or use"
+#~ " a system Tor in the background."
+#~ msgstr ""
+
+#~ msgid "Attempt automatic configuration with Tor Browser"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can configure OnionShare to connect"
+#~ " to the Tor that comes with Tor"
+#~ " Browser. First, `download Tor Browser "
+#~ "<https://www.torproject.org>`_ here if you "
+#~ "don't already have it. With this "
+#~ "setting selected, you need to keep "
+#~ "Tor Browser open in the background "
+#~ "while you're using OnionShare."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Download the Tor Windows Expert Bundle,"
+#~ " which you can get `from here "
+#~ "<https://www.torproject.org/download/tor/>`_. Extract the"
+#~ " zip file and copy the extracted "
+#~ "folder to ``C:\\Program Files (x86)\\``, "
+#~ "and rename the folder to ``tor-"
+#~ "win32``, so that inside that folder "
+#~ "is the ``Data`` and ``Tor`` folders."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Make up a control port password. "
+#~ "I'm going to use ``comprised stumble "
+#~ "rummage work avenging construct volatile`` "
+#~ "as my password. Now open a command"
+#~ " prompt as an administrator, and use"
+#~ " ``tor.exe --hash-password`` to generate"
+#~ " a hash of your password. For "
+#~ "example::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The hashed password output is displayed"
+#~ " after some warnings (which you can"
+#~ " ignore). In my case, it was "
+#~ "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now create a new text file at "
+#~ "``C:\\Program Files (x86)\\tor-win32\\torrc`` "
+#~ "and put this in it, replacing the"
+#~ " ``HashedControlPassword`` with the one you"
+#~ " just generated::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "In your administrator command prompt, "
+#~ "install tor as a service using the"
+#~ " appropriate ``torrc`` file you just "
+#~ "created (see `here "
+#~ "<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_ "
+#~ "for more information on doing this). "
+#~ "Like this::"
+#~ msgstr ""
+
+#~ msgid "You're now running a system Tor in Windows!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " control port\", and set the control"
+#~ " port host to ``127.0.0.1`` and the"
+#~ " port to ``9051``. Under \"Tor "
+#~ "authentication options\" choose \"Password\" "
+#~ "and set the password to your "
+#~ "password, in my case ``comprised stumble"
+#~ " rummage work avenging construct "
+#~ "volatile``. Click the \"Test Settings\" "
+#~ "button. If all goes well, you "
+#~ "should see successfully connected to "
+#~ "tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <http://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Open OnionShare. Click the Settings "
+#~ "icon. Under \"How should OnionShare "
+#~ "connect to Tor?\" choose \"Connect using"
+#~ " socket file\", and set the socket"
+#~ " file to be "
+#~ "``/usr/local/var/run/tor/control.socket``. Under \"Tor "
+#~ "authentication options\" choose \"No "
+#~ "authentication, or cookie authentication\". "
+#~ "Click the \"Test Settings\" button. If"
+#~ " all goes well, you should see "
+#~ "successfully connected to tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install the tor package. If "
+#~ "you're using Debian, Ubuntu, or a "
+#~ "similar Linux distro, I recommend you"
+#~ " use Tor Project's `official repository "
+#~ "<https://2019.www.torproject.org/docs/debian.html.en>`_. For "
+#~ "example, in Ubuntu 20.04::"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Reboot your computer. After it boots "
+#~ "up again, open OnionShare. Click the "
+#~ "Settings icon. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using socket file\", and set"
+#~ " the socket file to be "
+#~ "``/var/run/tor/control``. Under \"Tor authentication"
+#~ " options\" choose \"No authentication, or"
+#~ " cookie authentication\". Click the \"Test"
+#~ " Settings\" button. If all goes well,"
+#~ " you should see successfully connect "
+#~ "to Tor."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If your access to the internet is"
+#~ " censored, you can configure OnionShare "
+#~ "to connect to the Tor network "
+#~ "using `Tor bridges "
+#~ "<https://2019.www.torproject.org/docs/bridges.html.en>`_. If "
+#~ "OnionShare successfully connects to Tor, "
+#~ "you don't need to use a bridge."
+#~ msgstr ""
+
+#~ msgid "To configure bridges, open OnionShare settings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can use the built-in obfs4 "
+#~ "pluggable transports, the built-in "
+#~ "meek_lite (Azure) pluggable transports, or "
+#~ "custom bridges, which you can obtain "
+#~ "from Tor's `BridgeDB "
+#~ "<https://bridges.torproject.org/>`_. If you need "
+#~ "to use a bridge, you should try"
+#~ " the built-in obfs4 ones first."
+#~ msgstr ""
+